diff --git a/include/camera.h b/include/camera.h index 8856ab69cc..2517bde9c9 100644 --- a/include/camera.h +++ b/include/camera.h @@ -3,18 +3,6 @@ extern f32 D_8009A5EC; -enum { - CAM_FLAG_1 = 0x1, - CAM_FLAG_ENABLED = 0x2, - CAM_FLAG_LEAD_PLAYER = 0x4, - CAM_FLAG_SHAKING = 0x8, - CAM_FLAG_ORTHO = 0x10, - CAM_FLAG_80 = 0x80, - CAM_FLAG_200 = 0x200, - CAM_FLAG_400 = 0x400, - CAM_FLAG_1000 = 0x1000, -}; - void update_camera_mode_0(Camera*); void update_camera_mode_1(Camera*); void update_camera_mode_2(Camera*); diff --git a/include/common_structs.h b/include/common_structs.h index 091bd98043..4da287688d 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -784,7 +784,7 @@ typedef struct Camera { /* 0x4D6 */ u16 prevFollowFlags; /* 0x4D8 */ CameraControlSettings controlSettings; /* 0x504 */ u16 followPlayer; - /* 0x506 */ u16 unk_506; + /* 0x506 */ u16 panActive; /* 0x508 */ f32 panPhase; /* 0x50C */ f32 leadAmount; /* 0x510 */ f32 unk_510; @@ -2409,7 +2409,7 @@ typedef struct MusicEvent { typedef struct ParadeNpcInfo { /* 0x00 */ u32 initialAnim; - /* 0x04 */ u32** animList; + /* 0x04 */ AnimID* animList; /* 0x08 */ Vec3f pos; /* 0x14 */ f32 yaw; } ParadeNpcInfo; // size = 0x18 diff --git a/include/entity.h b/include/entity.h index 6b500e7d00..de4ed72d07 100644 --- a/include/entity.h +++ b/include/entity.h @@ -64,6 +64,9 @@ enum { #define BLOCK_GRID_SIZE 25 +#define TWEETSER_PATH_STOP 0x80000000 +#define TWEETSER_PATH_LOOP 0x80000001 + typedef struct SaveBlockData { /* 0x000 */ char unk_0[4]; /* 0x004 */ s16 angle; diff --git a/include/enums.h b/include/enums.h index f8b9f99f6d..3ba5d28342 100644 --- a/include/enums.h +++ b/include/enums.h @@ -3173,7 +3173,7 @@ enum NpcFlags { enum PlayerStatusFlags { PS_FLAGS_AIRBORNE = 0x0000000E, - PS_FLAGS_1 = 0x00000001, + PS_FLAGS_HAS_REFLECTION = 0x00000001, PS_FLAGS_JUMPING = 0x00000002, PS_FLAGS_FALLING = 0x00000004, PS_FLAGS_FLYING = 0x00000008, @@ -4003,6 +4003,7 @@ enum ModelFlags { }; enum TexPanner { + //select pan unit TEX_PANNER_0 = 0x0, TEX_PANNER_1 = 0x1, TEX_PANNER_2 = 0x2, @@ -4019,6 +4020,7 @@ enum TexPanner { TEX_PANNER_D = 0xD, TEX_PANNER_E = 0xE, TEX_PANNER_F = 0xF, + // select texture component TEX_PANNER_MAIN = 0, TEX_PANNER_AUX = 1, }; @@ -4232,6 +4234,7 @@ enum ColliderFlags { COLLIDER_FLAGS_SAFE_FLOOR = 0x00000100, COLLIDER_FLAGS_IGNORE_SHELL = 0x00008000, COLLIDER_FLAGS_IGNORE_PLAYER = 0x00010000, + COLLIDER_FLAGS_80000 = 0x00080000, // test version of DOCK walls? COLLIDER_FLAGS_HAS_MODEL_PARENT = 0x80000000 }; @@ -4291,16 +4294,16 @@ enum CameraInitDataFlags { enum CameraFlags { CAMERA_FLAGS_1 = 0x00000001, - CAMERA_FLAGS_2 = 0x00000002, - CAMERA_FLAGS_4 = 0x00000004, - CAMERA_FLAGS_8 = 0x00000008, - CAMERA_FLAGS_10 = 0x00000010, + CAMERA_FLAGS_ENABLED = 0x00000002, + CAMERA_FLAGS_LEAD_PLAYER = 0x00000004, + CAMERA_FLAGS_SHAKING = 0x00000008, + CAMERA_FLAGS_ORTHO = 0x00000010, CAMERA_FLAGS_20 = 0x00000020, CAMERA_FLAGS_40 = 0x00000040, CAMERA_FLAGS_80 = 0x00000080, CAMERA_FLAGS_100 = 0x00000100, - CAMERA_FLAGS_200 = 0x00000200, - CAMERA_FLAGS_400 = 0x00000400, + CAMERA_FLAGS_RENDER_ENTITIES = 0x00000200, + CAMERA_FLAGS_RENDER_MODELS = 0x00000400, CAMERA_FLAGS_800 = 0x00000800, CAMERA_FLAGS_1000 = 0x00001000, CAMERA_FLAGS_2000 = 0x00002000, diff --git a/include/macros.h b/include/macros.h index e17c21c54a..767de4532b 100644 --- a/include/macros.h +++ b/include/macros.h @@ -25,6 +25,10 @@ #define API_CALLABLE(name) ApiStatus name(Evt* script, s32 isInitialCall) +// standardized padding macros for map overlays +#define MAP_RODATA_PAD(n,name) const s32 N(rodata_pad_##name)[n] = {}; +#define MAP_STATIC_PAD(n,name) static s32 N(static_pad_##name)[n]; + #define PHYSICAL_TO_VIRTUAL(addr) (void*)((u32)(addr) + 0x80000000) #define VIRTUAL_TO_PHYSICAL(addr) (u32)((u8*)(addr) - 0x80000000) diff --git a/include/mapfs/arn_02_hit.h b/include/mapfs/arn_02_hit.h index 2f5d39d568..f9ca14d132 100644 --- a/include/mapfs/arn_02_hit.h +++ b/include/mapfs/arn_02_hit.h @@ -1,39 +1,46 @@ -#define COLLIDER_Root 0x26 -#define COLLIDER_g23 0x25 -#define COLLIDER_o75 0x24 -#define COLLIDER_iwa 0x23 -#define COLLIDER_o37 0x22 -#define COLLIDER_o92 0x21 -#define COLLIDER_o60 0x20 -#define COLLIDER_o53 0x1F -#define COLLIDER_o38 0x1E -#define COLLIDER_1wa5 0x1D -#define COLLIDER_g2 0x1C -#define COLLIDER_o91 0x1B -#define COLLIDER_o90 0x1A -#define COLLIDER_o58 0x19 -#define COLLIDER_o89 0x18 -#define COLLIDER_o88 0x17 -#define COLLIDER_o57 0x16 -#define COLLIDER_o87 0x15 -#define COLLIDER_o86 0x14 -#define COLLIDER_o56 0x13 -#define COLLIDER_o85 0x12 -#define COLLIDER_o84 0x11 -#define COLLIDER_o55 0x10 -#define COLLIDER_o83 0xF -#define COLLIDER_o82 0xE -#define COLLIDER_o54 0xD -#define COLLIDER_o81 0xC -#define COLLIDER_o80 0xB -#define COLLIDER_o59 0xA -#define COLLIDER_exite 0x9 -#define COLLIDER_tte 0x8 -#define COLLIDER_ne 0x7 -#define COLLIDER_deilie 0x6 -#define COLLIDER_deilite 0x5 -#define COLLIDER_exitw 0x4 -#define COLLIDER_ttw 0x3 -#define COLLIDER_nw 0x2 -#define COLLIDER_deiliw 0x1 -#define COLLIDER_deilitw 0x0 +#define COLLIDER_Root 0x26 +#define COLLIDER_g23 0x25 +#define COLLIDER_o75 0x24 +#define COLLIDER_iwa 0x23 +#define COLLIDER_o37 0x22 +#define COLLIDER_o92 0x21 +#define COLLIDER_o60 0x20 +#define COLLIDER_o53 0x1F +#define COLLIDER_o38 0x1E +#define COLLIDER_1wa5 0x1D +#define COLLIDER_g2 0x1C +#define COLLIDER_o91 0x1B +#define COLLIDER_o90 0x1A +#define COLLIDER_o58 0x19 +#define COLLIDER_o89 0x18 +#define COLLIDER_o88 0x17 +#define COLLIDER_o57 0x16 +#define COLLIDER_o87 0x15 +#define COLLIDER_o86 0x14 +#define COLLIDER_o56 0x13 +#define COLLIDER_o85 0x12 +#define COLLIDER_o84 0x11 +#define COLLIDER_o55 0x10 +#define COLLIDER_o83 0xF +#define COLLIDER_o82 0xE +#define COLLIDER_o54 0xD +#define COLLIDER_o81 0xC +#define COLLIDER_o80 0xB +#define COLLIDER_o59 0xA +#define COLLIDER_exite 0x9 +#define COLLIDER_tte 0x8 +#define COLLIDER_ne 0x7 +#define COLLIDER_deilie 0x6 +#define COLLIDER_deilite 0x5 +#define COLLIDER_exitw 0x4 +#define COLLIDER_ttw 0x3 +#define COLLIDER_nw 0x2 +#define COLLIDER_deiliw 0x1 +#define COLLIDER_deilitw 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g16 0x3 +#define ZONE_o61 0x2 +#define ZONE_o60 0x1 +#define ZONE_o59 0x0 + diff --git a/include/mapfs/arn_02_shape.h b/include/mapfs/arn_02_shape.h index 074e25b129..b86df2e578 100644 --- a/include/mapfs/arn_02_shape.h +++ b/include/mapfs/arn_02_shape.h @@ -1,30 +1,31 @@ -#define MODEL_Root 0x1D -#define MODEL_g6 0x1C -#define MODEL_o41 0x1B -#define MODEL_o37 0x1A -#define MODEL_o21 0x19 -#define MODEL_o20 0x18 -#define MODEL_o19 0x17 -#define MODEL_yabu 0x16 -#define MODEL_kusa1 0x15 -#define MODEL_iwa 0x14 -#define MODEL_o44 0x13 -#define MODEL_o43 0x12 -#define MODEL_o42 0x11 -#define MODEL_o38 0x10 -#define MODEL_1wa8 0xF -#define MODEL_1wa5 0xE -#define MODEL_1wa3 0xD -#define MODEL_1wa2 0xC -#define MODEL_iwa1 0xB -#define MODEL_g1 0xA -#define MODEL_o6 0x9 -#define MODEL_o3 0x8 -#define MODEL_g2 0x7 -#define MODEL_waku 0x6 -#define MODEL_soku 0x5 -#define MODEL_kusa 0x4 -#define MODEL_tuti 0x3 -#define MODEL_exit 0x2 -#define MODEL_exit2 0x1 -#define MODEL_exit1 0x0 +#define MODEL_Root 0x1D +#define MODEL_g6 0x1C +#define MODEL_o41 0x1B +#define MODEL_o37 0x1A +#define MODEL_o21 0x19 +#define MODEL_o20 0x18 +#define MODEL_o19 0x17 +#define MODEL_yabu 0x16 +#define MODEL_kusa1 0x15 +#define MODEL_iwa 0x14 +#define MODEL_o44 0x13 +#define MODEL_o43 0x12 +#define MODEL_o42 0x11 +#define MODEL_o38 0x10 +#define MODEL_1wa8 0xF +#define MODEL_1wa5 0xE +#define MODEL_1wa3 0xD +#define MODEL_1wa2 0xC +#define MODEL_iwa1 0xB +#define MODEL_g1 0xA +#define MODEL_o6 0x9 +#define MODEL_o3 0x8 +#define MODEL_g2 0x7 +#define MODEL_waku 0x6 +#define MODEL_soku 0x5 +#define MODEL_kusa 0x4 +#define MODEL_tuti 0x3 +#define MODEL_exit 0x2 +#define MODEL_exit2 0x1 +#define MODEL_exit1 0x0 + diff --git a/include/mapfs/arn_03_hit.h b/include/mapfs/arn_03_hit.h index a1a46d05b2..adc12136ac 100644 --- a/include/mapfs/arn_03_hit.h +++ b/include/mapfs/arn_03_hit.h @@ -1,44 +1,51 @@ -#define COLLIDER_Root 0x2B -#define COLLIDER_g29 0x2A -#define COLLIDER_o138 0x29 -#define COLLIDER_ie4 0x28 -#define COLLIDER_o155 0x27 -#define COLLIDER_4doa 0x26 -#define COLLIDER_4kabe 0x25 -#define COLLIDER_ie3 0x24 -#define COLLIDER_o109 0x23 -#define COLLIDER_o108 0x22 -#define COLLIDER_ie2 0x21 -#define COLLIDER_o99 0x20 -#define COLLIDER_o97 0x1F -#define COLLIDER_o96 0x1E -#define COLLIDER_ie1 0x1D -#define COLLIDER_doa 0x1C -#define COLLIDER_1kabe 0x1B -#define COLLIDER_etc 0x1A -#define COLLIDER_iwa2 0x19 -#define COLLIDER_ki2 0x18 -#define COLLIDER_ki1 0x17 -#define COLLIDER_1wa1 0x16 -#define COLLIDER_g2 0x15 -#define COLLIDER_o152 0x14 -#define COLLIDER_o151 0x13 -#define COLLIDER_o141 0x12 -#define COLLIDER_o150 0x11 -#define COLLIDER_o149 0x10 -#define COLLIDER_2 0xF -#define COLLIDER_o148 0xE -#define COLLIDER_o147 0xD -#define COLLIDER_o140 0xC -#define COLLIDER_o146 0xB -#define COLLIDER_o145 0xA -#define COLLIDER_1 0x9 -#define COLLIDER_exit 0x8 -#define COLLIDER_exite 0x7 -#define COLLIDER_ne 0x6 -#define COLLIDER_deilie 0x5 -#define COLLIDER_deilite 0x4 -#define COLLIDER_exitw 0x3 -#define COLLIDER_nw 0x2 -#define COLLIDER_deiliw 0x1 -#define COLLIDER_deilitw 0x0 +#define COLLIDER_Root 0x2B +#define COLLIDER_g29 0x2A +#define COLLIDER_o138 0x29 +#define COLLIDER_ie4 0x28 +#define COLLIDER_o155 0x27 +#define COLLIDER_4doa 0x26 +#define COLLIDER_4kabe 0x25 +#define COLLIDER_ie3 0x24 +#define COLLIDER_o109 0x23 +#define COLLIDER_o108 0x22 +#define COLLIDER_ie2 0x21 +#define COLLIDER_o99 0x20 +#define COLLIDER_o97 0x1F +#define COLLIDER_o96 0x1E +#define COLLIDER_ie1 0x1D +#define COLLIDER_doa 0x1C +#define COLLIDER_1kabe 0x1B +#define COLLIDER_etc 0x1A +#define COLLIDER_iwa2 0x19 +#define COLLIDER_ki2 0x18 +#define COLLIDER_ki1 0x17 +#define COLLIDER_1wa1 0x16 +#define COLLIDER_g2 0x15 +#define COLLIDER_o152 0x14 +#define COLLIDER_o151 0x13 +#define COLLIDER_o141 0x12 +#define COLLIDER_o150 0x11 +#define COLLIDER_o149 0x10 +#define COLLIDER_2 0xF +#define COLLIDER_o148 0xE +#define COLLIDER_o147 0xD +#define COLLIDER_o140 0xC +#define COLLIDER_o146 0xB +#define COLLIDER_o145 0xA +#define COLLIDER_1 0x9 +#define COLLIDER_exit 0x8 +#define COLLIDER_exite 0x7 +#define COLLIDER_ne 0x6 +#define COLLIDER_deilie 0x5 +#define COLLIDER_deilite 0x4 +#define COLLIDER_exitw 0x3 +#define COLLIDER_nw 0x2 +#define COLLIDER_deiliw 0x1 +#define COLLIDER_deilitw 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g15 0x3 +#define ZONE_o66 0x2 +#define ZONE_o65 0x1 +#define ZONE_o64 0x0 + diff --git a/include/mapfs/arn_03_shape.h b/include/mapfs/arn_03_shape.h index 7346d202f3..4785b21682 100644 --- a/include/mapfs/arn_03_shape.h +++ b/include/mapfs/arn_03_shape.h @@ -1,52 +1,53 @@ -#define MODEL_Root 0x33 -#define MODEL_ie4 0x32 -#define MODEL_4kusa 0x31 -#define MODEL_4doa 0x30 -#define MODEL_4yane 0x2F -#define MODEL_g23 0x2E -#define MODEL_4mado 0x2D -#define MODEL_4kabe 0x2C -#define MODEL_ie3 0x2B -#define MODEL_3kusa 0x2A -#define MODEL_3yane 0x29 -#define MODEL_3doa 0x28 -#define MODEL_g22 0x27 -#define MODEL_3mado 0x26 -#define MODEL_3kabe 0x25 -#define MODEL_ie1 0x24 -#define MODEL_1kusa 0x23 -#define MODEL_1yane 0x22 -#define MODEL_1doa 0x21 -#define MODEL_g21 0x20 -#define MODEL_1mado 0x1F -#define MODEL_1kabe 0x1E -#define MODEL_ie2 0x1D -#define MODEL_2yane 0x1C -#define MODEL_2kusa 0x1B -#define MODEL_2dai 0x1A -#define MODEL_2doa 0x19 -#define MODEL_g20 0x18 -#define MODEL_2mado 0x17 -#define MODEL_2kabe 0x16 -#define MODEL_ki 0x15 -#define MODEL_ki2 0x14 -#define MODEL_ki1 0x13 -#define MODEL_yabu 0x12 -#define MODEL_kusa1 0x11 -#define MODEL_iwa 0x10 -#define MODEL_iwa5 0xF -#define MODEL_iwa4 0xE -#define MODEL_1wa3 0xD -#define MODEL_1wa2 0xC -#define MODEL_1wa1 0xB -#define MODEL_g1 0xA -#define MODEL_o6 0x9 -#define MODEL_o3 0x8 -#define MODEL_g2 0x7 -#define MODEL_waku 0x6 -#define MODEL_soku 0x5 -#define MODEL_kusa 0x4 -#define MODEL_tuti 0x3 -#define MODEL_exit 0x2 -#define MODEL_exit2 0x1 -#define MODEL_exit1 0x0 +#define MODEL_Root 0x33 +#define MODEL_ie4 0x32 +#define MODEL_4kusa 0x31 +#define MODEL_4doa 0x30 +#define MODEL_4yane 0x2F +#define MODEL_g23 0x2E +#define MODEL_4mado 0x2D +#define MODEL_4kabe 0x2C +#define MODEL_ie3 0x2B +#define MODEL_3kusa 0x2A +#define MODEL_3yane 0x29 +#define MODEL_3doa 0x28 +#define MODEL_g22 0x27 +#define MODEL_3mado 0x26 +#define MODEL_3kabe 0x25 +#define MODEL_ie1 0x24 +#define MODEL_1kusa 0x23 +#define MODEL_1yane 0x22 +#define MODEL_1doa 0x21 +#define MODEL_g21 0x20 +#define MODEL_1mado 0x1F +#define MODEL_1kabe 0x1E +#define MODEL_ie2 0x1D +#define MODEL_2yane 0x1C +#define MODEL_2kusa 0x1B +#define MODEL_2dai 0x1A +#define MODEL_2doa 0x19 +#define MODEL_g20 0x18 +#define MODEL_2mado 0x17 +#define MODEL_2kabe 0x16 +#define MODEL_ki 0x15 +#define MODEL_ki2 0x14 +#define MODEL_ki1 0x13 +#define MODEL_yabu 0x12 +#define MODEL_kusa1 0x11 +#define MODEL_iwa 0x10 +#define MODEL_iwa5 0xF +#define MODEL_iwa4 0xE +#define MODEL_1wa3 0xD +#define MODEL_1wa2 0xC +#define MODEL_1wa1 0xB +#define MODEL_g1 0xA +#define MODEL_o6 0x9 +#define MODEL_o3 0x8 +#define MODEL_g2 0x7 +#define MODEL_waku 0x6 +#define MODEL_soku 0x5 +#define MODEL_kusa 0x4 +#define MODEL_tuti 0x3 +#define MODEL_exit 0x2 +#define MODEL_exit2 0x1 +#define MODEL_exit1 0x0 + diff --git a/include/mapfs/arn_04_hit.h b/include/mapfs/arn_04_hit.h index df6cde59bc..f1208ec783 100644 --- a/include/mapfs/arn_04_hit.h +++ b/include/mapfs/arn_04_hit.h @@ -1,38 +1,45 @@ -#define COLLIDER_Root 0x25 -#define COLLIDER_g22 0x24 -#define COLLIDER_o91 0x23 -#define COLLIDER_g21 0x22 -#define COLLIDER_o88 0x21 -#define COLLIDER_iwa 0x20 -#define COLLIDER_o54 0x1F -#define COLLIDER_o53 0x1E -#define COLLIDER_o51 0x1D -#define COLLIDER_ki2 0x1C -#define COLLIDER_ki 0x1B -#define COLLIDER_g2 0x1A -#define COLLIDER_o103 0x19 -#define COLLIDER_o66 0x18 -#define COLLIDER_o101 0x17 -#define COLLIDER_o65 0x16 -#define COLLIDER_o100 0x15 -#define COLLIDER_o99 0x14 -#define COLLIDER_o64 0x13 -#define COLLIDER_o98 0x12 -#define COLLIDER_o97 0x11 -#define COLLIDER_o63 0x10 -#define COLLIDER_o96 0xF -#define COLLIDER_o95 0xE -#define COLLIDER_o62 0xD -#define COLLIDER_o94 0xC -#define COLLIDER_o93 0xB -#define COLLIDER_o67 0xA -#define COLLIDER_exite 0x9 -#define COLLIDER_tte 0x8 -#define COLLIDER_ne 0x7 -#define COLLIDER_deilie 0x6 -#define COLLIDER_deilite 0x5 -#define COLLIDER_exitw 0x4 -#define COLLIDER_ttw 0x3 -#define COLLIDER_nw 0x2 -#define COLLIDER_deiliw 0x1 -#define COLLIDER_deilitw 0x0 +#define COLLIDER_Root 0x25 +#define COLLIDER_g22 0x24 +#define COLLIDER_o91 0x23 +#define COLLIDER_g21 0x22 +#define COLLIDER_o88 0x21 +#define COLLIDER_iwa 0x20 +#define COLLIDER_o54 0x1F +#define COLLIDER_o53 0x1E +#define COLLIDER_o51 0x1D +#define COLLIDER_ki2 0x1C +#define COLLIDER_ki 0x1B +#define COLLIDER_g2 0x1A +#define COLLIDER_o103 0x19 +#define COLLIDER_o66 0x18 +#define COLLIDER_o101 0x17 +#define COLLIDER_o65 0x16 +#define COLLIDER_o100 0x15 +#define COLLIDER_o99 0x14 +#define COLLIDER_o64 0x13 +#define COLLIDER_o98 0x12 +#define COLLIDER_o97 0x11 +#define COLLIDER_o63 0x10 +#define COLLIDER_o96 0xF +#define COLLIDER_o95 0xE +#define COLLIDER_o62 0xD +#define COLLIDER_o94 0xC +#define COLLIDER_o93 0xB +#define COLLIDER_o67 0xA +#define COLLIDER_exite 0x9 +#define COLLIDER_tte 0x8 +#define COLLIDER_ne 0x7 +#define COLLIDER_deilie 0x6 +#define COLLIDER_deilite 0x5 +#define COLLIDER_exitw 0x4 +#define COLLIDER_ttw 0x3 +#define COLLIDER_nw 0x2 +#define COLLIDER_deiliw 0x1 +#define COLLIDER_deilitw 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g16 0x3 +#define ZONE_o65 0x2 +#define ZONE_o64 0x1 +#define ZONE_o63 0x0 + diff --git a/include/mapfs/arn_04_shape.h b/include/mapfs/arn_04_shape.h index e97cd2ed0f..9413b761bd 100644 --- a/include/mapfs/arn_04_shape.h +++ b/include/mapfs/arn_04_shape.h @@ -1,28 +1,29 @@ -#define MODEL_Root 0x1B -#define MODEL_g6 0x1A -#define MODEL_o44 0x19 -#define MODEL_o37 0x18 -#define MODEL_o21 0x17 -#define MODEL_o19 0x16 -#define MODEL_yabu 0x15 -#define MODEL_kusa1 0x14 -#define MODEL_iwa 0x13 -#define MODEL_1wa8 0x12 -#define MODEL_1wa7 0x11 -#define MODEL_1wa6 0x10 -#define MODEL_1wa5 0xF -#define MODEL_iwa4 0xE -#define MODEL_1wa3 0xD -#define MODEL_1wa2 0xC -#define MODEL_iwa1 0xB -#define MODEL_g1 0xA -#define MODEL_o6 0x9 -#define MODEL_o3 0x8 -#define MODEL_g2 0x7 -#define MODEL_waku 0x6 -#define MODEL_soku 0x5 -#define MODEL_kusa 0x4 -#define MODEL_tuti 0x3 -#define MODEL_exit 0x2 -#define MODEL_exit2 0x1 -#define MODEL_exit1 0x0 +#define MODEL_Root 0x1B +#define MODEL_g6 0x1A +#define MODEL_o44 0x19 +#define MODEL_o37 0x18 +#define MODEL_o21 0x17 +#define MODEL_o19 0x16 +#define MODEL_yabu 0x15 +#define MODEL_kusa1 0x14 +#define MODEL_iwa 0x13 +#define MODEL_1wa8 0x12 +#define MODEL_1wa7 0x11 +#define MODEL_1wa6 0x10 +#define MODEL_1wa5 0xF +#define MODEL_iwa4 0xE +#define MODEL_1wa3 0xD +#define MODEL_1wa2 0xC +#define MODEL_iwa1 0xB +#define MODEL_g1 0xA +#define MODEL_o6 0x9 +#define MODEL_o3 0x8 +#define MODEL_g2 0x7 +#define MODEL_waku 0x6 +#define MODEL_soku 0x5 +#define MODEL_kusa 0x4 +#define MODEL_tuti 0x3 +#define MODEL_exit 0x2 +#define MODEL_exit2 0x1 +#define MODEL_exit1 0x0 + diff --git a/include/mapfs/arn_05_hit.h b/include/mapfs/arn_05_hit.h index 3994913885..eee94a47df 100644 --- a/include/mapfs/arn_05_hit.h +++ b/include/mapfs/arn_05_hit.h @@ -1,29 +1,36 @@ -#define COLLIDER_Root 0x1C -#define COLLIDER_ie3 0x1B -#define COLLIDER_3kusa 0x1A -#define COLLIDER_3doa 0x19 -#define COLLIDER_3kabe 0x18 -#define COLLIDER_ie2 0x17 -#define COLLIDER_o60 0x16 -#define COLLIDER_2kabe 0x15 -#define COLLIDER_2doa 0x14 -#define COLLIDER_ie1 0x13 -#define COLLIDER_1dai 0x12 -#define COLLIDER_1mado 0x11 -#define COLLIDER_1kabe 0x10 -#define COLLIDER_g2 0xF -#define COLLIDER_o83 0xE -#define COLLIDER_2 0xD -#define COLLIDER_o82 0xC -#define COLLIDER_1 0xB -#define COLLIDER_o84 0xA -#define COLLIDER_o85 0x9 -#define COLLIDER_exit 0x8 -#define COLLIDER_exite 0x7 -#define COLLIDER_ne 0x6 -#define COLLIDER_deilie 0x5 -#define COLLIDER_deilite 0x4 -#define COLLIDER_exitw 0x3 -#define COLLIDER_nw 0x2 -#define COLLIDER_deiliw 0x1 -#define COLLIDER_deilitw 0x0 +#define COLLIDER_Root 0x1C +#define COLLIDER_ie3 0x1B +#define COLLIDER_3kusa 0x1A +#define COLLIDER_3doa 0x19 +#define COLLIDER_3kabe 0x18 +#define COLLIDER_ie2 0x17 +#define COLLIDER_o60 0x16 +#define COLLIDER_2kabe 0x15 +#define COLLIDER_2doa 0x14 +#define COLLIDER_ie1 0x13 +#define COLLIDER_1dai 0x12 +#define COLLIDER_1mado 0x11 +#define COLLIDER_1kabe 0x10 +#define COLLIDER_g2 0xF +#define COLLIDER_o83 0xE +#define COLLIDER_2 0xD +#define COLLIDER_o82 0xC +#define COLLIDER_1 0xB +#define COLLIDER_o84 0xA +#define COLLIDER_o85 0x9 +#define COLLIDER_exit 0x8 +#define COLLIDER_exite 0x7 +#define COLLIDER_ne 0x6 +#define COLLIDER_deilie 0x5 +#define COLLIDER_deilite 0x4 +#define COLLIDER_exitw 0x3 +#define COLLIDER_nw 0x2 +#define COLLIDER_deiliw 0x1 +#define COLLIDER_deilitw 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g15 0x3 +#define ZONE_o66 0x2 +#define ZONE_o65 0x1 +#define ZONE_o64 0x0 + diff --git a/include/mapfs/arn_05_shape.h b/include/mapfs/arn_05_shape.h index f974410b3b..e0b72fcaca 100644 --- a/include/mapfs/arn_05_shape.h +++ b/include/mapfs/arn_05_shape.h @@ -1,45 +1,46 @@ -#define MODEL_Root 0x2C -#define MODEL_ie3 0x2B -#define MODEL_3kusa 0x2A -#define MODEL_3yane 0x29 -#define MODEL_3doa 0x28 -#define MODEL_g17 0x27 -#define MODEL_3mad 0x26 -#define MODEL_3kabe 0x25 -#define MODEL_ie2 0x24 -#define MODEL_o60 0x23 -#define MODEL_2yane 0x22 -#define MODEL_2doa 0x21 -#define MODEL_g16 0x20 -#define MODEL_2mad 0x1F -#define MODEL_2kabe 0x1E -#define MODEL_ie1 0x1D -#define MODEL_1kusa 0x1C -#define MODEL_1dai 0x1B -#define MODEL_1yane 0x1A -#define MODEL_g15 0x19 -#define MODEL_1mado 0x18 -#define MODEL_1kabe 0x17 -#define MODEL_1doa 0x16 -#define MODEL_ki 0x15 -#define MODEL_o20 0x14 -#define MODEL_o19 0x13 -#define MODEL_yabu 0x12 -#define MODEL_kusa1 0x11 -#define MODEL_iwa 0x10 -#define MODEL_o62 0xF -#define MODEL_o61 0xE -#define MODEL_1wa8 0xD -#define MODEL_1wa5 0xC -#define MODEL_1wa2 0xB -#define MODEL_g1 0xA -#define MODEL_o6 0x9 -#define MODEL_o3 0x8 -#define MODEL_g2 0x7 -#define MODEL_waku 0x6 -#define MODEL_soku 0x5 -#define MODEL_kusa 0x4 -#define MODEL_tuti 0x3 -#define MODEL_exit 0x2 -#define MODEL_exit2 0x1 -#define MODEL_exit1 0x0 +#define MODEL_Root 0x2C +#define MODEL_ie3 0x2B +#define MODEL_3kusa 0x2A +#define MODEL_3yane 0x29 +#define MODEL_3doa 0x28 +#define MODEL_g17 0x27 +#define MODEL_3mad 0x26 +#define MODEL_3kabe 0x25 +#define MODEL_ie2 0x24 +#define MODEL_o60 0x23 +#define MODEL_2yane 0x22 +#define MODEL_2doa 0x21 +#define MODEL_g16 0x20 +#define MODEL_2mad 0x1F +#define MODEL_2kabe 0x1E +#define MODEL_ie1 0x1D +#define MODEL_1kusa 0x1C +#define MODEL_1dai 0x1B +#define MODEL_1yane 0x1A +#define MODEL_g15 0x19 +#define MODEL_1mado 0x18 +#define MODEL_1kabe 0x17 +#define MODEL_1doa 0x16 +#define MODEL_ki 0x15 +#define MODEL_o20 0x14 +#define MODEL_o19 0x13 +#define MODEL_yabu 0x12 +#define MODEL_kusa1 0x11 +#define MODEL_iwa 0x10 +#define MODEL_o62 0xF +#define MODEL_o61 0xE +#define MODEL_1wa8 0xD +#define MODEL_1wa5 0xC +#define MODEL_1wa2 0xB +#define MODEL_g1 0xA +#define MODEL_o6 0x9 +#define MODEL_o3 0x8 +#define MODEL_g2 0x7 +#define MODEL_waku 0x6 +#define MODEL_soku 0x5 +#define MODEL_kusa 0x4 +#define MODEL_tuti 0x3 +#define MODEL_exit 0x2 +#define MODEL_exit2 0x1 +#define MODEL_exit1 0x0 + diff --git a/include/mapfs/arn_07_hit.h b/include/mapfs/arn_07_hit.h index 978e89085d..8f1cfae86c 100644 --- a/include/mapfs/arn_07_hit.h +++ b/include/mapfs/arn_07_hit.h @@ -1,28 +1,43 @@ -#define COLLIDER_Root 0x1B -#define COLLIDER_g17 0x1A -#define COLLIDER_o60 0x19 -#define COLLIDER_g13 0x18 -#define COLLIDER_o53 0x17 -#define COLLIDER_o52 0x16 -#define COLLIDER_o51 0x15 -#define COLLIDER_Default 0x14 -#define COLLIDER_o33 0x13 -#define COLLIDER_o32 0x12 -#define COLLIDER_o54 0x11 -#define COLLIDER_g1 0x10 -#define COLLIDER_o15 0xF -#define COLLIDER_g4 0xE -#define COLLIDER_kusa 0xD -#define COLLIDER_exit3 0xC -#define COLLIDER_n3 0xB -#define COLLIDER_tt3 0xA -#define COLLIDER_deili3 0x9 -#define COLLIDER_deilit3 0x8 -#define COLLIDER_exit2 0x7 -#define COLLIDER_ne 0x6 -#define COLLIDER_deilie 0x5 -#define COLLIDER_deilite 0x4 -#define COLLIDER_exitw 0x3 -#define COLLIDER_nw 0x2 -#define COLLIDER_deiliw 0x1 -#define COLLIDER_deilitw 0x0 +#define COLLIDER_Root 0x1B +#define COLLIDER_g17 0x1A +#define COLLIDER_o60 0x19 +#define COLLIDER_g13 0x18 +#define COLLIDER_o53 0x17 +#define COLLIDER_o52 0x16 +#define COLLIDER_o51 0x15 +#define COLLIDER_Default 0x14 +#define COLLIDER_o33 0x13 +#define COLLIDER_o32 0x12 +#define COLLIDER_o54 0x11 +#define COLLIDER_g1 0x10 +#define COLLIDER_o15 0xF +#define COLLIDER_g4 0xE +#define COLLIDER_kusa 0xD +#define COLLIDER_exit3 0xC +#define COLLIDER_n3 0xB +#define COLLIDER_tt3 0xA +#define COLLIDER_deili3 0x9 +#define COLLIDER_deilit3 0x8 +#define COLLIDER_exit2 0x7 +#define COLLIDER_ne 0x6 +#define COLLIDER_deilie 0x5 +#define COLLIDER_deilite 0x4 +#define COLLIDER_exitw 0x3 +#define COLLIDER_nw 0x2 +#define COLLIDER_deiliw 0x1 +#define COLLIDER_deilitw 0x0 + +#define ZONE_Root 0xC +#define ZONE_g1 0xB +#define ZONE_g6 0xA +#define ZONE_g7 0x9 +#define ZONE_o30 0x8 +#define ZONE_b_w 0x7 +#define ZONE_g8 0x6 +#define ZONE_b_e3 0x5 +#define ZONE_b_e1 0x4 +#define ZONE_g2 0x3 +#define ZONE_g10 0x2 +#define ZONE_s4 0x1 +#define ZONE_s1 0x0 + diff --git a/include/mapfs/arn_07_shape.h b/include/mapfs/arn_07_shape.h index 63081664f0..cf3a29c562 100644 --- a/include/mapfs/arn_07_shape.h +++ b/include/mapfs/arn_07_shape.h @@ -1,33 +1,34 @@ -#define MODEL_Root 0x20 -#define MODEL_g12 0x1F -#define MODEL_g13 0x1E -#define MODEL_o39 0x1D -#define MODEL_g14 0x1C -#define MODEL_o40 0x1B -#define MODEL_o47 0x1A -#define MODEL_o38 0x19 -#define MODEL_o37 0x18 -#define MODEL_o36 0x17 -#define MODEL_o35 0x16 -#define MODEL_Default 0x15 -#define MODEL_iwa4 0x14 -#define MODEL_iwa3 0x13 -#define MODEL_iwa2 0x12 -#define MODEL_iwa1 0x11 -#define MODEL_sigemi 0x10 -#define MODEL_ki 0xF -#define MODEL_ki3 0xE -#define MODEL_ki2 0xD -#define MODEL_ki1 0xC -#define MODEL_g1 0xB -#define MODEL_miti 0xA -#define MODEL_tuti2 0x9 -#define MODEL_o48 0x8 -#define MODEL_kusa2 0x7 -#define MODEL_g4 0x6 -#define MODEL_o49 0x5 -#define MODEL_kusa 0x4 -#define MODEL_waku 0x3 -#define MODEL_exit 0x2 -#define MODEL_exit2 0x1 -#define MODEL_exit1 0x0 +#define MODEL_Root 0x20 +#define MODEL_g12 0x1F +#define MODEL_g13 0x1E +#define MODEL_o39 0x1D +#define MODEL_g14 0x1C +#define MODEL_o40 0x1B +#define MODEL_o47 0x1A +#define MODEL_o38 0x19 +#define MODEL_o37 0x18 +#define MODEL_o36 0x17 +#define MODEL_o35 0x16 +#define MODEL_Default 0x15 +#define MODEL_iwa4 0x14 +#define MODEL_iwa3 0x13 +#define MODEL_iwa2 0x12 +#define MODEL_iwa1 0x11 +#define MODEL_sigemi 0x10 +#define MODEL_ki 0xF +#define MODEL_ki3 0xE +#define MODEL_ki2 0xD +#define MODEL_ki1 0xC +#define MODEL_g1 0xB +#define MODEL_miti 0xA +#define MODEL_tuti2 0x9 +#define MODEL_o48 0x8 +#define MODEL_kusa2 0x7 +#define MODEL_g4 0x6 +#define MODEL_o49 0x5 +#define MODEL_kusa 0x4 +#define MODEL_waku 0x3 +#define MODEL_exit 0x2 +#define MODEL_exit2 0x1 +#define MODEL_exit1 0x0 + diff --git a/include/mapfs/arn_08_hit.h b/include/mapfs/arn_08_hit.h index b842fc6f4d..765ee9abc4 100644 --- a/include/mapfs/arn_08_hit.h +++ b/include/mapfs/arn_08_hit.h @@ -1,10 +1,17 @@ -#define COLLIDER_Root 0x9 -#define COLLIDER_exits 0x8 -#define COLLIDER_ns 0x7 -#define COLLIDER_tts 0x6 -#define COLLIDER_deilis 0x5 -#define COLLIDER_deilits 0x4 -#define COLLIDER_Default 0x3 -#define COLLIDER_ido 0x2 -#define COLLIDER_kabe 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x9 +#define COLLIDER_exits 0x8 +#define COLLIDER_ns 0x7 +#define COLLIDER_tts 0x6 +#define COLLIDER_deilis 0x5 +#define COLLIDER_deilits 0x4 +#define COLLIDER_Default 0x3 +#define COLLIDER_ido 0x2 +#define COLLIDER_kabe 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x4 +#define ZONE_exits 0x3 +#define ZONE_deilis 0x2 +#define ZONE_Default 0x1 +#define ZONE_yuka 0x0 + diff --git a/include/mapfs/arn_08_shape.h b/include/mapfs/arn_08_shape.h index 064833c020..f207bf98b5 100644 --- a/include/mapfs/arn_08_shape.h +++ b/include/mapfs/arn_08_shape.h @@ -1,22 +1,23 @@ -#define MODEL_Root 0x15 -#define MODEL_g13 0x14 -#define MODEL_o49 0x13 -#define MODEL_g19 0x12 -#define MODEL_o48 0x11 -#define MODEL_g18 0x10 -#define MODEL_o47 0xF -#define MODEL_g17 0xE -#define MODEL_o44 0xD -#define MODEL_g16 0xC -#define MODEL_o46 0xB -#define MODEL_g15 0xA -#define MODEL_o45 0x9 -#define MODEL_Default 0x8 -#define MODEL_kusa 0x7 -#define MODEL_o42 0x6 -#define MODEL_ido 0x5 -#define MODEL_kabe 0x4 -#define MODEL_yuka 0x3 -#define MODEL_exit 0x2 -#define MODEL_o37 0x1 -#define MODEL_doa 0x0 +#define MODEL_Root 0x15 +#define MODEL_g13 0x14 +#define MODEL_o49 0x13 +#define MODEL_g19 0x12 +#define MODEL_o48 0x11 +#define MODEL_g18 0x10 +#define MODEL_o47 0xF +#define MODEL_g17 0xE +#define MODEL_o44 0xD +#define MODEL_g16 0xC +#define MODEL_o46 0xB +#define MODEL_g15 0xA +#define MODEL_o45 0x9 +#define MODEL_Default 0x8 +#define MODEL_kusa 0x7 +#define MODEL_o42 0x6 +#define MODEL_ido 0x5 +#define MODEL_kabe 0x4 +#define MODEL_yuka 0x3 +#define MODEL_exit 0x2 +#define MODEL_o37 0x1 +#define MODEL_doa 0x0 + diff --git a/include/mapfs/arn_09_hit.h b/include/mapfs/arn_09_hit.h index ab2fd072d2..64b2a6084b 100644 --- a/include/mapfs/arn_09_hit.h +++ b/include/mapfs/arn_09_hit.h @@ -1,9 +1,16 @@ -#define COLLIDER_Root 0x8 -#define COLLIDER_exit 0x7 -#define COLLIDER_ne 0x6 -#define COLLIDER_tte 0x5 -#define COLLIDER_deilie 0x4 -#define COLLIDER_deilite 0x3 -#define COLLIDER_Default 0x2 -#define COLLIDER_kabe 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x8 +#define COLLIDER_exit 0x7 +#define COLLIDER_ne 0x6 +#define COLLIDER_tte 0x5 +#define COLLIDER_deilie 0x4 +#define COLLIDER_deilite 0x3 +#define COLLIDER_Default 0x2 +#define COLLIDER_kabe 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x4 +#define ZONE_exit 0x3 +#define ZONE_deilie 0x2 +#define ZONE_Default 0x1 +#define ZONE_yuka 0x0 + diff --git a/include/mapfs/arn_09_shape.h b/include/mapfs/arn_09_shape.h index 291f9bef98..b86a0aae4f 100644 --- a/include/mapfs/arn_09_shape.h +++ b/include/mapfs/arn_09_shape.h @@ -1,9 +1,10 @@ -#define MODEL_Root 0x8 -#define MODEL_Default 0x7 -#define MODEL_o38 0x6 -#define MODEL_kusa 0x5 -#define MODEL_kabe 0x4 -#define MODEL_yuka 0x3 -#define MODEL_exit 0x2 -#define MODEL_o37 0x1 -#define MODEL_doa 0x0 +#define MODEL_Root 0x8 +#define MODEL_Default 0x7 +#define MODEL_o38 0x6 +#define MODEL_kusa 0x5 +#define MODEL_kabe 0x4 +#define MODEL_yuka 0x3 +#define MODEL_exit 0x2 +#define MODEL_o37 0x1 +#define MODEL_doa 0x0 + diff --git a/include/mapfs/arn_10_hit.h b/include/mapfs/arn_10_hit.h index 13cffd57bd..44ab5d2208 100644 --- a/include/mapfs/arn_10_hit.h +++ b/include/mapfs/arn_10_hit.h @@ -1,15 +1,23 @@ -#define COLLIDER_Root 0xE -#define COLLIDER_exite 0xD -#define COLLIDER_ne 0xC -#define COLLIDER_tte 0xB -#define COLLIDER_deilie 0xA -#define COLLIDER_deilite 0x9 -#define COLLIDER_exitw 0x8 -#define COLLIDER_nw 0x7 -#define COLLIDER_ttw 0x6 -#define COLLIDER_deiliw 0x5 -#define COLLIDER_deilitw 0x4 -#define COLLIDER_Default 0x3 -#define COLLIDER_o44 0x2 -#define COLLIDER_kabe 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0xE +#define COLLIDER_exite 0xD +#define COLLIDER_ne 0xC +#define COLLIDER_tte 0xB +#define COLLIDER_deilie 0xA +#define COLLIDER_deilite 0x9 +#define COLLIDER_exitw 0x8 +#define COLLIDER_nw 0x7 +#define COLLIDER_ttw 0x6 +#define COLLIDER_deiliw 0x5 +#define COLLIDER_deilitw 0x4 +#define COLLIDER_Default 0x3 +#define COLLIDER_o44 0x2 +#define COLLIDER_kabe 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x5 +#define ZONE_exitw 0x4 +#define ZONE_deilie 0x3 +#define ZONE_deiliw 0x2 +#define ZONE_Default 0x1 +#define ZONE_yuka 0x0 + diff --git a/include/mapfs/arn_10_shape.h b/include/mapfs/arn_10_shape.h index 78ada0d01c..62903f13b5 100644 --- a/include/mapfs/arn_10_shape.h +++ b/include/mapfs/arn_10_shape.h @@ -1,8 +1,9 @@ -#define MODEL_Root 0x7 -#define MODEL_Default 0x6 -#define MODEL_kabe 0x5 -#define MODEL_yuka 0x4 -#define MODEL_exit 0x3 -#define MODEL_o37 0x2 -#define MODEL_g13 0x1 -#define MODEL_o44 0x0 +#define MODEL_Root 0x7 +#define MODEL_Default 0x6 +#define MODEL_kabe 0x5 +#define MODEL_yuka 0x4 +#define MODEL_exit 0x3 +#define MODEL_o37 0x2 +#define MODEL_g13 0x1 +#define MODEL_o44 0x0 + diff --git a/include/mapfs/arn_11_hit.h b/include/mapfs/arn_11_hit.h index 5d9956298a..854526bbc2 100644 --- a/include/mapfs/arn_11_hit.h +++ b/include/mapfs/arn_11_hit.h @@ -1,15 +1,22 @@ -#define COLLIDER_Root 0xE -#define COLLIDER_g14 0xD -#define COLLIDER_o50 0xC -#define COLLIDER_o49 0xB -#define COLLIDER_o48 0xA -#define COLLIDER_g13 0x9 -#define COLLIDER_o51 0x8 -#define COLLIDER_o47 0x7 -#define COLLIDER_o45 0x6 -#define COLLIDER_o44 0x5 -#define COLLIDER_exit 0x4 -#define COLLIDER_nw 0x3 -#define COLLIDER_ttw 0x2 -#define COLLIDER_deiliw 0x1 -#define COLLIDER_deilitw 0x0 +#define COLLIDER_Root 0xE +#define COLLIDER_g14 0xD +#define COLLIDER_o50 0xC +#define COLLIDER_o49 0xB +#define COLLIDER_o48 0xA +#define COLLIDER_g13 0x9 +#define COLLIDER_o51 0x8 +#define COLLIDER_o47 0x7 +#define COLLIDER_o45 0x6 +#define COLLIDER_o44 0x5 +#define COLLIDER_exit 0x4 +#define COLLIDER_nw 0x3 +#define COLLIDER_ttw 0x2 +#define COLLIDER_deiliw 0x1 +#define COLLIDER_deilitw 0x0 + +#define ZONE_Root 0x4 +#define ZONE_exit 0x3 +#define ZONE_deilie 0x2 +#define ZONE_Default 0x1 +#define ZONE_o42 0x0 + diff --git a/include/mapfs/arn_11_shape.h b/include/mapfs/arn_11_shape.h index 94dcded41b..03370aa986 100644 --- a/include/mapfs/arn_11_shape.h +++ b/include/mapfs/arn_11_shape.h @@ -1,13 +1,14 @@ -#define MODEL_Root 0xC -#define MODEL_iwa 0xB -#define MODEL_o43 0xA -#define MODEL_o42 0x9 -#define MODEL_o41 0x8 -#define MODEL_Default 0x7 -#define MODEL_o44 0x6 -#define MODEL_o40 0x5 -#define MODEL_dai 0x4 -#define MODEL_kabe 0x3 -#define MODEL_yuka 0x2 -#define MODEL_exit 0x1 -#define MODEL_o37 0x0 +#define MODEL_Root 0xC +#define MODEL_iwa 0xB +#define MODEL_o43 0xA +#define MODEL_o42 0x9 +#define MODEL_o41 0x8 +#define MODEL_Default 0x7 +#define MODEL_o44 0x6 +#define MODEL_o40 0x5 +#define MODEL_dai 0x4 +#define MODEL_kabe 0x3 +#define MODEL_yuka 0x2 +#define MODEL_exit 0x1 +#define MODEL_o37 0x0 + diff --git a/include/mapfs/arn_12_hit.h b/include/mapfs/arn_12_hit.h index 65f1589eab..01daa55f6a 100644 --- a/include/mapfs/arn_12_hit.h +++ b/include/mapfs/arn_12_hit.h @@ -1,14 +1,22 @@ -#define COLLIDER_Root 0xD -#define COLLIDER_g18 0xC -#define COLLIDER_o54 0xB -#define COLLIDER_o53 0xA -#define COLLIDER_exite 0x9 -#define COLLIDER_ne 0x8 -#define COLLIDER_tte 0x7 -#define COLLIDER_deilie 0x6 -#define COLLIDER_deilite 0x5 -#define COLLIDER_exitw 0x4 -#define COLLIDER_nw 0x3 -#define COLLIDER_ttw 0x2 -#define COLLIDER_deiliw 0x1 -#define COLLIDER_deilitw 0x0 +#define COLLIDER_Root 0xD +#define COLLIDER_g18 0xC +#define COLLIDER_o54 0xB +#define COLLIDER_o53 0xA +#define COLLIDER_exite 0x9 +#define COLLIDER_ne 0x8 +#define COLLIDER_tte 0x7 +#define COLLIDER_deilie 0x6 +#define COLLIDER_deilite 0x5 +#define COLLIDER_exitw 0x4 +#define COLLIDER_nw 0x3 +#define COLLIDER_ttw 0x2 +#define COLLIDER_deiliw 0x1 +#define COLLIDER_deilitw 0x0 + +#define ZONE_Root 0x5 +#define ZONE_exitw 0x4 +#define ZONE_deilie 0x3 +#define ZONE_deiliw 0x2 +#define ZONE_Default 0x1 +#define ZONE_yuka 0x0 + diff --git a/include/mapfs/arn_12_shape.h b/include/mapfs/arn_12_shape.h index db5c01f99a..cbcbfec0a7 100644 --- a/include/mapfs/arn_12_shape.h +++ b/include/mapfs/arn_12_shape.h @@ -1,8 +1,9 @@ -#define MODEL_Root 0x7 -#define MODEL_Default 0x6 -#define MODEL_kabe 0x5 -#define MODEL_yuka 0x4 -#define MODEL_exit 0x3 -#define MODEL_o37 0x2 -#define MODEL_exitw 0x1 -#define MODEL_o44 0x0 +#define MODEL_Root 0x7 +#define MODEL_Default 0x6 +#define MODEL_kabe 0x5 +#define MODEL_yuka 0x4 +#define MODEL_exit 0x3 +#define MODEL_o37 0x2 +#define MODEL_exitw 0x1 +#define MODEL_o44 0x0 + diff --git a/include/mapfs/arn_13_hit.h b/include/mapfs/arn_13_hit.h index 61ec0e6d43..6c225e17d1 100644 --- a/include/mapfs/arn_13_hit.h +++ b/include/mapfs/arn_13_hit.h @@ -1,14 +1,22 @@ -#define COLLIDER_Root 0xD -#define COLLIDER_g19 0xC -#define COLLIDER_o56 0xB -#define COLLIDER_o55 0xA -#define COLLIDER_exite 0x9 -#define COLLIDER_ne 0x8 -#define COLLIDER_tte 0x7 -#define COLLIDER_deilie 0x6 -#define COLLIDER_deilite 0x5 -#define COLLIDER_exitw 0x4 -#define COLLIDER_nw 0x3 -#define COLLIDER_ttw 0x2 -#define COLLIDER_deiliw 0x1 -#define COLLIDER_deilitw 0x0 +#define COLLIDER_Root 0xD +#define COLLIDER_g19 0xC +#define COLLIDER_o56 0xB +#define COLLIDER_o55 0xA +#define COLLIDER_exite 0x9 +#define COLLIDER_ne 0x8 +#define COLLIDER_tte 0x7 +#define COLLIDER_deilie 0x6 +#define COLLIDER_deilite 0x5 +#define COLLIDER_exitw 0x4 +#define COLLIDER_nw 0x3 +#define COLLIDER_ttw 0x2 +#define COLLIDER_deiliw 0x1 +#define COLLIDER_deilitw 0x0 + +#define ZONE_Root 0x5 +#define ZONE_exitw 0x4 +#define ZONE_deilie 0x3 +#define ZONE_deiliw 0x2 +#define ZONE_Default 0x1 +#define ZONE_yuka 0x0 + diff --git a/include/mapfs/arn_13_shape.h b/include/mapfs/arn_13_shape.h index db5c01f99a..cbcbfec0a7 100644 --- a/include/mapfs/arn_13_shape.h +++ b/include/mapfs/arn_13_shape.h @@ -1,8 +1,9 @@ -#define MODEL_Root 0x7 -#define MODEL_Default 0x6 -#define MODEL_kabe 0x5 -#define MODEL_yuka 0x4 -#define MODEL_exit 0x3 -#define MODEL_o37 0x2 -#define MODEL_exitw 0x1 -#define MODEL_o44 0x0 +#define MODEL_Root 0x7 +#define MODEL_Default 0x6 +#define MODEL_kabe 0x5 +#define MODEL_yuka 0x4 +#define MODEL_exit 0x3 +#define MODEL_o37 0x2 +#define MODEL_exitw 0x1 +#define MODEL_o44 0x0 + diff --git a/include/mapfs/arn_20_hit.h b/include/mapfs/arn_20_hit.h index a0f0b3ad84..900d478607 100644 --- a/include/mapfs/arn_20_hit.h +++ b/include/mapfs/arn_20_hit.h @@ -1,22 +1,28 @@ -#define COLLIDER_Root 0x15 -#define COLLIDER_Default 0x14 -#define COLLIDER_deiliw 0x13 -#define COLLIDER_deiliwt 0x12 -#define COLLIDER_deilite 0x11 -#define COLLIDER_o222 0x10 -#define COLLIDER_deilie 0xF -#define COLLIDER_o221 0xE -#define COLLIDER_o166 0xD -#define COLLIDER_g38 0xC -#define COLLIDER_o223 0xB -#define COLLIDER_o219 0xA -#define COLLIDER_o165 0x9 -#define COLLIDER_o218 0x8 -#define COLLIDER_dgb_castle 0x7 -#define COLLIDER_g37 0x6 -#define COLLIDER_o203 0x5 -#define COLLIDER_o201 0x4 -#define COLLIDER_o200 0x3 -#define COLLIDER_o199 0x2 -#define COLLIDER_o198 0x1 -#define COLLIDER_o190 0x0 +#define COLLIDER_Root 0x15 +#define COLLIDER_Default 0x14 +#define COLLIDER_deiliw 0x13 +#define COLLIDER_deiliwt 0x12 +#define COLLIDER_deilite 0x11 +#define COLLIDER_o222 0x10 +#define COLLIDER_deilie 0xF +#define COLLIDER_o221 0xE +#define COLLIDER_o166 0xD +#define COLLIDER_g38 0xC +#define COLLIDER_o223 0xB +#define COLLIDER_o219 0xA +#define COLLIDER_o165 0x9 +#define COLLIDER_o218 0x8 +#define COLLIDER_dgb_castle 0x7 +#define COLLIDER_g37 0x6 +#define COLLIDER_o203 0x5 +#define COLLIDER_o201 0x4 +#define COLLIDER_o200 0x3 +#define COLLIDER_o199 0x2 +#define COLLIDER_o198 0x1 +#define COLLIDER_o190 0x0 + +#define ZONE_Root 0x3 +#define ZONE_6 0x2 +#define ZONE_o220 0x1 +#define ZONE_o219 0x0 + diff --git a/include/mapfs/arn_20_shape.h b/include/mapfs/arn_20_shape.h index ef4bb6e227..b94f14cbd5 100644 --- a/include/mapfs/arn_20_shape.h +++ b/include/mapfs/arn_20_shape.h @@ -1,46 +1,47 @@ -#define MODEL_Root 0x2D -#define MODEL_g38 0x2C -#define MODEL_o219 0x2B -#define MODEL_o220 0x2A -#define MODEL_o163 0x29 -#define MODEL_o214 0x28 -#define MODEL_o216 0x27 -#define MODEL_o170 0x26 -#define MODEL_o217 0x25 -#define MODEL_o162 0x24 -#define MODEL_o161 0x23 -#define MODEL_o212 0x22 -#define MODEL_o165 0x21 -#define MODEL_Default 0x20 -#define MODEL_o224 0x1F -#define MODEL_o168 0x1E -#define MODEL_o166 0x1D -#define MODEL_dgb_castle 0x1C -#define MODEL_g37 0x1B -#define MODEL_o221 0x1A -#define MODEL_o203 0x19 -#define MODEL_o201 0x18 -#define MODEL_o200 0x17 -#define MODEL_o199 0x16 -#define MODEL_o198 0x15 -#define MODEL_o192 0x14 -#define MODEL_o190 0x13 -#define MODEL_g32 0x12 -#define MODEL_o195 0x11 -#define MODEL_o194 0x10 -#define MODEL_o187 0xF -#define MODEL_o186 0xE -#define MODEL_o185 0xD -#define MODEL_o181 0xC -#define MODEL_o183 0xB -#define MODEL_o182 0xA -#define MODEL_g33 0x9 -#define MODEL_door2 0x8 -#define MODEL_d2 0x7 -#define MODEL_door1 0x6 -#define MODEL_d1 0x5 -#define MODEL_6 0x4 -#define MODEL_o169 0x3 -#define MODEL_o112 0x2 -#define MODEL_g1 0x1 -#define MODEL_frame 0x0 +#define MODEL_Root 0x2D +#define MODEL_g38 0x2C +#define MODEL_o219 0x2B +#define MODEL_o220 0x2A +#define MODEL_o163 0x29 +#define MODEL_o214 0x28 +#define MODEL_o216 0x27 +#define MODEL_o170 0x26 +#define MODEL_o217 0x25 +#define MODEL_o162 0x24 +#define MODEL_o161 0x23 +#define MODEL_o212 0x22 +#define MODEL_o165 0x21 +#define MODEL_Default 0x20 +#define MODEL_o224 0x1F +#define MODEL_o168 0x1E +#define MODEL_o166 0x1D +#define MODEL_dgb_castle 0x1C +#define MODEL_g37 0x1B +#define MODEL_o221 0x1A +#define MODEL_o203 0x19 +#define MODEL_o201 0x18 +#define MODEL_o200 0x17 +#define MODEL_o199 0x16 +#define MODEL_o198 0x15 +#define MODEL_o192 0x14 +#define MODEL_o190 0x13 +#define MODEL_g32 0x12 +#define MODEL_o195 0x11 +#define MODEL_o194 0x10 +#define MODEL_o187 0xF +#define MODEL_o186 0xE +#define MODEL_o185 0xD +#define MODEL_o181 0xC +#define MODEL_o183 0xB +#define MODEL_o182 0xA +#define MODEL_g33 0x9 +#define MODEL_door2 0x8 +#define MODEL_d2 0x7 +#define MODEL_door1 0x6 +#define MODEL_d1 0x5 +#define MODEL_6 0x4 +#define MODEL_o169 0x3 +#define MODEL_o112 0x2 +#define MODEL_g1 0x1 +#define MODEL_frame 0x0 + diff --git a/include/mapfs/arn_bt01_hit.h b/include/mapfs/arn_bt01_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/arn_bt01_hit.h +++ b/include/mapfs/arn_bt01_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/arn_bt01_shape.h b/include/mapfs/arn_bt01_shape.h index fc8e2a2cad..d6e2e27cc5 100644 --- a/include/mapfs/arn_bt01_shape.h +++ b/include/mapfs/arn_bt01_shape.h @@ -1,36 +1,37 @@ -#define MODEL_Root 0x23 -#define MODEL_dai 0x22 -#define MODEL_waku1 0x21 -#define MODEL_kusa3 0x20 -#define MODEL_iwa4 0x1F -#define MODEL_iwa3 0x1E -#define MODEL_g78 0x1D -#define MODEL_o349 0x1C -#define MODEL_o350 0x1B -#define MODEL_yuka5 0x1A -#define MODEL_yuka4 0x19 -#define MODEL_g49 0x18 -#define MODEL_waku2 0x17 -#define MODEL_kusa2 0x16 -#define MODEL_iwa2 0x15 -#define MODEL_kusa1 0x14 -#define MODEL_g88 0x13 -#define MODEL_o383 0x12 -#define MODEL_o382 0x11 -#define MODEL_o381 0x10 -#define MODEL_g87 0xF -#define MODEL_o380 0xE -#define MODEL_o379 0xD -#define MODEL_ki1 0xC -#define MODEL_iwa1 0xB -#define MODEL_kusa4 0xA -#define MODEL_g93 0x9 -#define MODEL_o399 0x8 -#define MODEL_o398 0x7 -#define MODEL_g92 0x6 -#define MODEL_o396 0x5 -#define MODEL_o395 0x4 -#define MODEL_kusa5 0x3 -#define MODEL_iwa5 0x2 -#define MODEL_waku 0x1 -#define MODEL_yuka1 0x0 +#define MODEL_Root 0x23 +#define MODEL_dai 0x22 +#define MODEL_waku1 0x21 +#define MODEL_kusa3 0x20 +#define MODEL_iwa4 0x1F +#define MODEL_iwa3 0x1E +#define MODEL_g78 0x1D +#define MODEL_o349 0x1C +#define MODEL_o350 0x1B +#define MODEL_yuka5 0x1A +#define MODEL_yuka4 0x19 +#define MODEL_g49 0x18 +#define MODEL_waku2 0x17 +#define MODEL_kusa2 0x16 +#define MODEL_iwa2 0x15 +#define MODEL_kusa1 0x14 +#define MODEL_g88 0x13 +#define MODEL_o383 0x12 +#define MODEL_o382 0x11 +#define MODEL_o381 0x10 +#define MODEL_g87 0xF +#define MODEL_o380 0xE +#define MODEL_o379 0xD +#define MODEL_ki1 0xC +#define MODEL_iwa1 0xB +#define MODEL_kusa4 0xA +#define MODEL_g93 0x9 +#define MODEL_o399 0x8 +#define MODEL_o398 0x7 +#define MODEL_g92 0x6 +#define MODEL_o396 0x5 +#define MODEL_o395 0x4 +#define MODEL_kusa5 0x3 +#define MODEL_iwa5 0x2 +#define MODEL_waku 0x1 +#define MODEL_yuka1 0x0 + diff --git a/include/mapfs/arn_bt02_hit.h b/include/mapfs/arn_bt02_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/arn_bt02_hit.h +++ b/include/mapfs/arn_bt02_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/arn_bt02_shape.h b/include/mapfs/arn_bt02_shape.h index 4395fb2590..54bee5afee 100644 --- a/include/mapfs/arn_bt02_shape.h +++ b/include/mapfs/arn_bt02_shape.h @@ -1,30 +1,31 @@ -#define MODEL_Root 0x1D -#define MODEL_dai 0x1C -#define MODEL_waku1 0x1B -#define MODEL_kusa3 0x1A -#define MODEL_iwa4 0x19 -#define MODEL_iwa3 0x18 -#define MODEL_g78 0x17 -#define MODEL_o349 0x16 -#define MODEL_o350 0x15 -#define MODEL_yuka5 0x14 -#define MODEL_yuka4 0x13 -#define MODEL_g85 0x12 -#define MODEL_waku2 0x11 -#define MODEL_kusa2 0x10 -#define MODEL_ki1 0xF -#define MODEL_iwa1 0xE -#define MODEL_kusa1 0xD -#define MODEL_yuka3 0xC -#define MODEL_iwa2 0xB -#define MODEL_ki2 0xA -#define MODEL_g73 0x9 -#define MODEL_o332 0x8 -#define MODEL_g49 0x7 -#define MODEL_koya 0x6 -#define MODEL_o333 0x5 -#define MODEL_o330 0x4 -#define MODEL_o328 0x3 -#define MODEL_o327 0x2 -#define MODEL_waku 0x1 -#define MODEL_yuka1 0x0 +#define MODEL_Root 0x1D +#define MODEL_dai 0x1C +#define MODEL_waku1 0x1B +#define MODEL_kusa3 0x1A +#define MODEL_iwa4 0x19 +#define MODEL_iwa3 0x18 +#define MODEL_g78 0x17 +#define MODEL_o349 0x16 +#define MODEL_o350 0x15 +#define MODEL_yuka5 0x14 +#define MODEL_yuka4 0x13 +#define MODEL_g85 0x12 +#define MODEL_waku2 0x11 +#define MODEL_kusa2 0x10 +#define MODEL_ki1 0xF +#define MODEL_iwa1 0xE +#define MODEL_kusa1 0xD +#define MODEL_yuka3 0xC +#define MODEL_iwa2 0xB +#define MODEL_ki2 0xA +#define MODEL_g73 0x9 +#define MODEL_o332 0x8 +#define MODEL_g49 0x7 +#define MODEL_koya 0x6 +#define MODEL_o333 0x5 +#define MODEL_o330 0x4 +#define MODEL_o328 0x3 +#define MODEL_o327 0x2 +#define MODEL_waku 0x1 +#define MODEL_yuka1 0x0 + diff --git a/include/mapfs/arn_bt03_hit.h b/include/mapfs/arn_bt03_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/arn_bt03_hit.h +++ b/include/mapfs/arn_bt03_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/arn_bt03_shape.h b/include/mapfs/arn_bt03_shape.h index 1ba9150f8c..3b33305f1a 100644 --- a/include/mapfs/arn_bt03_shape.h +++ b/include/mapfs/arn_bt03_shape.h @@ -1,31 +1,32 @@ -#define MODEL_Root 0x1E -#define MODEL_dai 0x1D -#define MODEL_waku1 0x1C -#define MODEL_kusa3 0x1B -#define MODEL_iwa4 0x1A -#define MODEL_iwa3 0x19 -#define MODEL_g78 0x18 -#define MODEL_o349 0x17 -#define MODEL_o350 0x16 -#define MODEL_yuka5 0x15 -#define MODEL_yuka4 0x14 -#define MODEL_g49 0x13 -#define MODEL_waku2 0x12 -#define MODEL_kusa2 0x11 -#define MODEL_iwa2 0x10 -#define MODEL_kusa1 0xF -#define MODEL_kusa4 0xE -#define MODEL_ki1 0xD -#define MODEL_iwa1 0xC -#define MODEL_g93 0xB -#define MODEL_o399 0xA -#define MODEL_o398 0x9 -#define MODEL_g92 0x8 -#define MODEL_o403 0x7 -#define MODEL_o381 0x6 -#define MODEL_o395 0x5 -#define MODEL_kabe2 0x4 -#define MODEL_kusa5 0x3 -#define MODEL_iwa5 0x2 -#define MODEL_waku 0x1 -#define MODEL_yuka1 0x0 +#define MODEL_Root 0x1E +#define MODEL_dai 0x1D +#define MODEL_waku1 0x1C +#define MODEL_kusa3 0x1B +#define MODEL_iwa4 0x1A +#define MODEL_iwa3 0x19 +#define MODEL_g78 0x18 +#define MODEL_o349 0x17 +#define MODEL_o350 0x16 +#define MODEL_yuka5 0x15 +#define MODEL_yuka4 0x14 +#define MODEL_g49 0x13 +#define MODEL_waku2 0x12 +#define MODEL_kusa2 0x11 +#define MODEL_iwa2 0x10 +#define MODEL_kusa1 0xF +#define MODEL_kusa4 0xE +#define MODEL_ki1 0xD +#define MODEL_iwa1 0xC +#define MODEL_g93 0xB +#define MODEL_o399 0xA +#define MODEL_o398 0x9 +#define MODEL_g92 0x8 +#define MODEL_o403 0x7 +#define MODEL_o381 0x6 +#define MODEL_o395 0x5 +#define MODEL_kabe2 0x4 +#define MODEL_kusa5 0x3 +#define MODEL_iwa5 0x2 +#define MODEL_waku 0x1 +#define MODEL_yuka1 0x0 + diff --git a/include/mapfs/arn_bt04_hit.h b/include/mapfs/arn_bt04_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/arn_bt04_hit.h +++ b/include/mapfs/arn_bt04_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/arn_bt04_shape.h b/include/mapfs/arn_bt04_shape.h index b163792c54..54e608b160 100644 --- a/include/mapfs/arn_bt04_shape.h +++ b/include/mapfs/arn_bt04_shape.h @@ -1,23 +1,24 @@ -#define MODEL_Root 0x16 -#define MODEL_dai 0x15 -#define MODEL_o349 0x14 -#define MODEL_waku1 0x13 -#define MODEL_kabe3 0x12 -#define MODEL_yuka 0x11 -#define MODEL_jun 0x10 -#define MODEL_o343 0xF -#define MODEL_o342 0xE -#define MODEL_o341 0xD -#define MODEL_o340 0xC -#define MODEL_o339 0xB -#define MODEL_o338 0xA -#define MODEL_o337 0x9 -#define MODEL_o348 0x8 -#define MODEL_g49 0x7 -#define MODEL_kusa 0x6 -#define MODEL_waku2 0x5 -#define MODEL_kabe4 0x4 -#define MODEL_kabe2 0x3 -#define MODEL_kabe1 0x2 -#define MODEL_yuka2 0x1 -#define MODEL_waku 0x0 +#define MODEL_Root 0x16 +#define MODEL_dai 0x15 +#define MODEL_o349 0x14 +#define MODEL_waku1 0x13 +#define MODEL_kabe3 0x12 +#define MODEL_yuka 0x11 +#define MODEL_jun 0x10 +#define MODEL_o343 0xF +#define MODEL_o342 0xE +#define MODEL_o341 0xD +#define MODEL_o340 0xC +#define MODEL_o339 0xB +#define MODEL_o338 0xA +#define MODEL_o337 0x9 +#define MODEL_o348 0x8 +#define MODEL_g49 0x7 +#define MODEL_kusa 0x6 +#define MODEL_waku2 0x5 +#define MODEL_kabe4 0x4 +#define MODEL_kabe2 0x3 +#define MODEL_kabe1 0x2 +#define MODEL_yuka2 0x1 +#define MODEL_waku 0x0 + diff --git a/include/mapfs/arn_bt05_hit.h b/include/mapfs/arn_bt05_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/arn_bt05_hit.h +++ b/include/mapfs/arn_bt05_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/arn_bt05_shape.h b/include/mapfs/arn_bt05_shape.h index 334b406255..62ae0cd274 100644 --- a/include/mapfs/arn_bt05_shape.h +++ b/include/mapfs/arn_bt05_shape.h @@ -1,19 +1,20 @@ -#define MODEL_Root 0x12 -#define MODEL_dai 0x11 -#define MODEL_o354 0x10 -#define MODEL_waku1 0xF -#define MODEL_kabe3 0xE -#define MODEL_yuka 0xD -#define MODEL_g49 0xC -#define MODEL_waku2 0xB -#define MODEL_kabe4 0xA -#define MODEL_doa2 0x9 -#define MODEL_o349 0x8 -#define MODEL_o350 0x7 -#define MODEL_doa1 0x6 -#define MODEL_o348 0x5 -#define MODEL_o351 0x4 -#define MODEL_kabe2 0x3 -#define MODEL_kabe1 0x2 -#define MODEL_yuka2 0x1 -#define MODEL_waku 0x0 +#define MODEL_Root 0x12 +#define MODEL_dai 0x11 +#define MODEL_o354 0x10 +#define MODEL_waku1 0xF +#define MODEL_kabe3 0xE +#define MODEL_yuka 0xD +#define MODEL_g49 0xC +#define MODEL_waku2 0xB +#define MODEL_kabe4 0xA +#define MODEL_doa2 0x9 +#define MODEL_o349 0x8 +#define MODEL_o350 0x7 +#define MODEL_doa1 0x6 +#define MODEL_o348 0x5 +#define MODEL_o351 0x4 +#define MODEL_kabe2 0x3 +#define MODEL_kabe1 0x2 +#define MODEL_yuka2 0x1 +#define MODEL_waku 0x0 + diff --git a/include/mapfs/arn_bt06_hit.h b/include/mapfs/arn_bt06_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/arn_bt06_hit.h +++ b/include/mapfs/arn_bt06_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/arn_bt06_shape.h b/include/mapfs/arn_bt06_shape.h index 60a0990a43..e73f71fd37 100644 --- a/include/mapfs/arn_bt06_shape.h +++ b/include/mapfs/arn_bt06_shape.h @@ -1,17 +1,18 @@ -#define MODEL_Root 0x10 -#define MODEL_dai 0xF -#define MODEL_heart 0xE -#define MODEL_waku1 0xD -#define MODEL_kabe3 0xC -#define MODEL_yuka 0xB -#define MODEL_g49 0xA -#define MODEL_waku2 0x9 -#define MODEL_kabe4 0x8 -#define MODEL_iwa3 0x7 -#define MODEL_iwa2 0x6 -#define MODEL_iwa1 0x5 -#define MODEL_kabe5 0x4 -#define MODEL_kabe2 0x3 -#define MODEL_kabe1 0x2 -#define MODEL_yuka2 0x1 -#define MODEL_waku 0x0 +#define MODEL_Root 0x10 +#define MODEL_dai 0xF +#define MODEL_heart 0xE +#define MODEL_waku1 0xD +#define MODEL_kabe3 0xC +#define MODEL_yuka 0xB +#define MODEL_g49 0xA +#define MODEL_waku2 0x9 +#define MODEL_kabe4 0x8 +#define MODEL_iwa3 0x7 +#define MODEL_iwa2 0x6 +#define MODEL_iwa1 0x5 +#define MODEL_kabe5 0x4 +#define MODEL_kabe2 0x3 +#define MODEL_kabe1 0x2 +#define MODEL_yuka2 0x1 +#define MODEL_waku 0x0 + diff --git a/include/mapfs/dgb_00_hit.h b/include/mapfs/dgb_00_hit.h index b149746b8f..76050b01e8 100644 --- a/include/mapfs/dgb_00_hit.h +++ b/include/mapfs/dgb_00_hit.h @@ -1 +1,4 @@ -#define COLLIDER_Root 0x0 +#define COLLIDER_Root 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/dgb_00_shape.h b/include/mapfs/dgb_00_shape.h index 98ef430c86..dee3600cd9 100644 --- a/include/mapfs/dgb_00_shape.h +++ b/include/mapfs/dgb_00_shape.h @@ -1 +1,2 @@ -#define MODEL_Root 0x0 +#define MODEL_Root 0x0 + diff --git a/include/mapfs/dgb_01_hit.h b/include/mapfs/dgb_01_hit.h index aaaa61bc1c..b0c7fff920 100644 --- a/include/mapfs/dgb_01_hit.h +++ b/include/mapfs/dgb_01_hit.h @@ -1,54 +1,73 @@ -#define COLLIDER_Root 0x35 -#define COLLIDER_Default 0x34 -#define COLLIDER_bridge 0x33 -#define COLLIDER_after 0x32 -#define COLLIDER_o526 0x31 -#define COLLIDER_o524 0x30 -#define COLLIDER_o516 0x2F -#define COLLIDER_o518 0x2E -#define COLLIDER_o511 0x2D -#define COLLIDER_o506 0x2C -#define COLLIDER_o503 0x2B -#define COLLIDER_o500 0x2A -#define COLLIDER_o498 0x29 -#define COLLIDER_before 0x28 -#define COLLIDER_o406 0x27 -#define COLLIDER_o206 0x26 -#define COLLIDER_g71 0x25 -#define COLLIDER_o343 0x24 -#define COLLIDER_o342 0x23 -#define COLLIDER_o172 0x22 -#define COLLIDER_g49 0x21 -#define COLLIDER_o346 0x20 -#define COLLIDER_o183 0x1F -#define COLLIDER_g57 0x1E -#define COLLIDER_o374 0x1D -#define COLLIDER_deilittne 0x1C -#define COLLIDER_deilitne 0x1B -#define COLLIDER_deiline 0x1A -#define COLLIDER_o378 0x19 -#define COLLIDER_deilitte 0x18 -#define COLLIDER_deilite 0x17 -#define COLLIDER_deilie 0x16 -#define COLLIDER_o382 0x15 -#define COLLIDER_deilittse 0x14 -#define COLLIDER_deilitse 0x13 -#define COLLIDER_deilise 0x12 -#define COLLIDER_o373 0x11 -#define COLLIDER_deilittnw 0x10 -#define COLLIDER_deilitnw 0xF -#define COLLIDER_deilinw 0xE -#define COLLIDER_o366 0xD -#define COLLIDER_deilittw 0xC -#define COLLIDER_deilitw 0xB -#define COLLIDER_deiliw 0xA -#define COLLIDER_o169 0x9 -#define COLLIDER_deilittsw 0x8 -#define COLLIDER_deilitsw 0x7 -#define COLLIDER_deilisw 0x6 -#define COLLIDER_o386 0x5 -#define COLLIDER_deilitts 0x4 -#define COLLIDER_deilis 0x3 -#define COLLIDER_deilits 0x2 -#define COLLIDER_g70 0x1 -#define COLLIDER_o203 0x0 +#define COLLIDER_Root 0x35 +#define COLLIDER_Default 0x34 +#define COLLIDER_bridge 0x33 +#define COLLIDER_after 0x32 +#define COLLIDER_o526 0x31 +#define COLLIDER_o524 0x30 +#define COLLIDER_o516 0x2F +#define COLLIDER_o518 0x2E +#define COLLIDER_o511 0x2D +#define COLLIDER_o506 0x2C +#define COLLIDER_o503 0x2B +#define COLLIDER_o500 0x2A +#define COLLIDER_o498 0x29 +#define COLLIDER_before 0x28 +#define COLLIDER_o406 0x27 +#define COLLIDER_o206 0x26 +#define COLLIDER_g71 0x25 +#define COLLIDER_o343 0x24 +#define COLLIDER_o342 0x23 +#define COLLIDER_o172 0x22 +#define COLLIDER_g49 0x21 +#define COLLIDER_o346 0x20 +#define COLLIDER_o183 0x1F +#define COLLIDER_g57 0x1E +#define COLLIDER_o374 0x1D +#define COLLIDER_deilittne 0x1C +#define COLLIDER_deilitne 0x1B +#define COLLIDER_deiline 0x1A +#define COLLIDER_o378 0x19 +#define COLLIDER_deilitte 0x18 +#define COLLIDER_deilite 0x17 +#define COLLIDER_deilie 0x16 +#define COLLIDER_o382 0x15 +#define COLLIDER_deilittse 0x14 +#define COLLIDER_deilitse 0x13 +#define COLLIDER_deilise 0x12 +#define COLLIDER_o373 0x11 +#define COLLIDER_deilittnw 0x10 +#define COLLIDER_deilitnw 0xF +#define COLLIDER_deilinw 0xE +#define COLLIDER_o366 0xD +#define COLLIDER_deilittw 0xC +#define COLLIDER_deilitw 0xB +#define COLLIDER_deiliw 0xA +#define COLLIDER_o169 0x9 +#define COLLIDER_deilittsw 0x8 +#define COLLIDER_deilitsw 0x7 +#define COLLIDER_deilisw 0x6 +#define COLLIDER_o386 0x5 +#define COLLIDER_deilitts 0x4 +#define COLLIDER_deilis 0x3 +#define COLLIDER_deilits 0x2 +#define COLLIDER_g70 0x1 +#define COLLIDER_o203 0x0 + +#define ZONE_Root 0x10 +#define ZONE_Default 0xF +#define ZONE_g76 0xE +#define ZONE_deiline 0xD +#define ZONE_o391 0xC +#define ZONE_o387 0xB +#define ZONE_o386 0xA +#define ZONE_deilinw 0x9 +#define ZONE_g75 0x8 +#define ZONE_deilie 0x7 +#define ZONE_o390 0x6 +#define ZONE_o389 0x5 +#define ZONE_o388 0x4 +#define ZONE_deiliw 0x3 +#define ZONE_g74 0x2 +#define ZONE_o398 0x1 +#define ZONE_o397 0x0 + diff --git a/include/mapfs/dgb_01_shape.h b/include/mapfs/dgb_01_shape.h index d5d023b7d4..50c90f099d 100644 --- a/include/mapfs/dgb_01_shape.h +++ b/include/mapfs/dgb_01_shape.h @@ -1,228 +1,229 @@ -#define MODEL_Root 0xE3 -#define MODEL_Default 0xE2 -#define MODEL_g112 0xE1 -#define MODEL_g88 0xE0 -#define MODEL_g92 0xDF -#define MODEL_o455 0xDE -#define MODEL_o454 0xDD -#define MODEL_o453 0xDC -#define MODEL_g91 0xDB -#define MODEL_o452 0xDA -#define MODEL_o451 0xD9 -#define MODEL_o450 0xD8 -#define MODEL_g90 0xD7 -#define MODEL_o449 0xD6 -#define MODEL_o448 0xD5 -#define MODEL_o447 0xD4 -#define MODEL_o446 0xD3 -#define MODEL_g240 0xD2 -#define MODEL_g328 0xD1 -#define MODEL_g339 0xD0 -#define MODEL_o1074 0xCF -#define MODEL_o1073 0xCE -#define MODEL_o1072 0xCD -#define MODEL_g338 0xCC -#define MODEL_o1084 0xCB -#define MODEL_o1083 0xCA -#define MODEL_o1082 0xC9 -#define MODEL_o1081 0xC8 -#define MODEL_o1080 0xC7 -#define MODEL_o1079 0xC6 -#define MODEL_o1078 0xC5 -#define MODEL_o1077 0xC4 -#define MODEL_o1076 0xC3 -#define MODEL_o1075 0xC2 -#define MODEL_g337 0xC1 -#define MODEL_o1095 0xC0 -#define MODEL_o1094 0xBF -#define MODEL_o1093 0xBE -#define MODEL_o1092 0xBD -#define MODEL_o1091 0xBC -#define MODEL_o1089 0xBB -#define MODEL_o1088 0xBA -#define MODEL_o1087 0xB9 -#define MODEL_o1086 0xB8 -#define MODEL_o1085 0xB7 -#define MODEL_g336 0xB6 -#define MODEL_o1103 0xB5 -#define MODEL_o1102 0xB4 -#define MODEL_o1101 0xB3 -#define MODEL_o1100 0xB2 -#define MODEL_o1099 0xB1 -#define MODEL_o1098 0xB0 -#define MODEL_o1097 0xAF -#define MODEL_o1096 0xAE -#define MODEL_g335 0xAD -#define MODEL_o1111 0xAC -#define MODEL_o1110 0xAB -#define MODEL_o1109 0xAA -#define MODEL_o1108 0xA9 -#define MODEL_o1107 0xA8 -#define MODEL_o1106 0xA7 -#define MODEL_o1105 0xA6 -#define MODEL_o1104 0xA5 -#define MODEL_g327 0xA4 -#define MODEL_g334 0xA3 -#define MODEL_o1113 0xA2 -#define MODEL_o1112 0xA1 -#define MODEL_g333 0xA0 -#define MODEL_o1133 0x9F -#define MODEL_o1132 0x9E -#define MODEL_o1131 0x9D -#define MODEL_o1130 0x9C -#define MODEL_o1129 0x9B -#define MODEL_o1128 0x9A -#define MODEL_o1127 0x99 -#define MODEL_o1126 0x98 -#define MODEL_o1125 0x97 -#define MODEL_o1124 0x96 -#define MODEL_o1123 0x95 -#define MODEL_o1122 0x94 -#define MODEL_o1121 0x93 -#define MODEL_o1120 0x92 -#define MODEL_o1119 0x91 -#define MODEL_o1118 0x90 -#define MODEL_o1117 0x8F -#define MODEL_o1116 0x8E -#define MODEL_o1115 0x8D -#define MODEL_o1114 0x8C -#define MODEL_g332 0x8B -#define MODEL_o1139 0x8A -#define MODEL_o1138 0x89 -#define MODEL_o1137 0x88 -#define MODEL_o1136 0x87 -#define MODEL_o1135 0x86 -#define MODEL_o1134 0x85 -#define MODEL_g331 0x84 -#define MODEL_o1145 0x83 -#define MODEL_o1144 0x82 -#define MODEL_o1143 0x81 -#define MODEL_o1142 0x80 -#define MODEL_o1141 0x7F -#define MODEL_o1140 0x7E -#define MODEL_g330 0x7D -#define MODEL_o1151 0x7C -#define MODEL_o1150 0x7B -#define MODEL_o1149 0x7A -#define MODEL_o1148 0x79 -#define MODEL_o1147 0x78 -#define MODEL_o1146 0x77 -#define MODEL_g329 0x76 -#define MODEL_o1156 0x75 -#define MODEL_o1155 0x74 -#define MODEL_o1154 0x73 -#define MODEL_o1153 0x72 -#define MODEL_o1152 0x71 -#define MODEL_g340 0x70 -#define MODEL_g87 0x6F -#define MODEL_g95 0x6E -#define MODEL_o468 0x6D -#define MODEL_o467 0x6C -#define MODEL_g94 0x6B -#define MODEL_o443 0x6A -#define MODEL_o442 0x69 -#define MODEL_o441 0x68 -#define MODEL_o440 0x67 -#define MODEL_o439 0x66 -#define MODEL_o438 0x65 -#define MODEL_g96 0x64 -#define MODEL_g98 0x63 -#define MODEL_o476 0x62 -#define MODEL_o475 0x61 -#define MODEL_g97 0x60 -#define MODEL_o474 0x5F -#define MODEL_o473 0x5E -#define MODEL_o472 0x5D -#define MODEL_o471 0x5C -#define MODEL_o470 0x5B -#define MODEL_o469 0x5A -#define MODEL_g71 0x59 -#define MODEL_o388 0x58 -#define MODEL_o387 0x57 -#define MODEL_o382 0x56 -#define MODEL_o271 0x55 -#define MODEL_o188 0x54 -#define MODEL_o184 0x53 -#define MODEL_o316 0x52 -#define MODEL_o273 0x51 -#define MODEL_o272 0x50 -#define MODEL_o190 0x4F -#define MODEL_o189 0x4E -#define MODEL_o169 0x4D -#define MODEL_o172 0x4C -#define MODEL_o1158 0x4B -#define MODEL_o1157 0x4A -#define MODEL_g63 0x49 -#define MODEL_o411 0x48 -#define MODEL_o409 0x47 -#define MODEL_o407 0x46 -#define MODEL_o405 0x45 -#define MODEL_o293 0x44 -#define MODEL_o292 0x43 -#define MODEL_o290 0x42 -#define MODEL_o285 0x41 -#define MODEL_g70 0x40 -#define MODEL_o203 0x3F -#define MODEL_o353 0x3E -#define MODEL_g58 0x3D -#define MODEL_g80 0x3C -#define MODEL_g82 0x3B -#define MODEL_o465 0x3A -#define MODEL_o381 0x39 -#define MODEL_g81 0x38 -#define MODEL_o466 0x37 -#define MODEL_o380 0x36 -#define MODEL_g67 0x35 -#define MODEL_g69 0x34 -#define MODEL_o301 0x33 -#define MODEL_g68 0x32 -#define MODEL_o300 0x31 -#define MODEL_g64 0x30 -#define MODEL_g66 0x2F -#define MODEL_o299 0x2E -#define MODEL_g65 0x2D -#define MODEL_o298 0x2C -#define MODEL_g46 0x2B -#define MODEL_g48 0x2A -#define MODEL_o168 0x29 -#define MODEL_g47 0x28 -#define MODEL_o167 0x27 -#define MODEL_g40 0x26 -#define MODEL_g42 0x25 -#define MODEL_o164 0x24 -#define MODEL_g41 0x23 -#define MODEL_o163 0x22 -#define MODEL_g43 0x21 -#define MODEL_g45 0x20 -#define MODEL_o166 0x1F -#define MODEL_g44 0x1E -#define MODEL_o165 0x1D -#define MODEL_g37 0x1C -#define MODEL_g39 0x1B -#define MODEL_o162 0x1A -#define MODEL_g38 0x19 -#define MODEL_o161 0x18 -#define MODEL_g86 0x17 -#define MODEL_g84 0x16 -#define MODEL_o396 0x15 -#define MODEL_o394 0x14 -#define MODEL_o393 0x13 -#define MODEL_o392 0x12 -#define MODEL_o391 0x11 -#define MODEL_o389 0x10 -#define MODEL_g61 0xF -#define MODEL_o270 0xE -#define MODEL_o269 0xD -#define MODEL_o268 0xC -#define MODEL_g50 0xB -#define MODEL_o187 0xA -#define MODEL_o186 0x9 -#define MODEL_o185 0x8 -#define MODEL_g49 0x7 -#define MODEL_o218 0x6 -#define MODEL_o183 0x5 -#define MODEL_o181 0x4 -#define MODEL_o182 0x3 -#define MODEL_g83 0x2 -#define MODEL_o384 0x1 -#define MODEL_o383 0x0 +#define MODEL_Root 0xE3 +#define MODEL_Default 0xE2 +#define MODEL_g112 0xE1 +#define MODEL_g88 0xE0 +#define MODEL_g92 0xDF +#define MODEL_o455 0xDE +#define MODEL_o454 0xDD +#define MODEL_o453 0xDC +#define MODEL_g91 0xDB +#define MODEL_o452 0xDA +#define MODEL_o451 0xD9 +#define MODEL_o450 0xD8 +#define MODEL_g90 0xD7 +#define MODEL_o449 0xD6 +#define MODEL_o448 0xD5 +#define MODEL_o447 0xD4 +#define MODEL_o446 0xD3 +#define MODEL_g240 0xD2 +#define MODEL_g328 0xD1 +#define MODEL_g339 0xD0 +#define MODEL_o1074 0xCF +#define MODEL_o1073 0xCE +#define MODEL_o1072 0xCD +#define MODEL_g338 0xCC +#define MODEL_o1084 0xCB +#define MODEL_o1083 0xCA +#define MODEL_o1082 0xC9 +#define MODEL_o1081 0xC8 +#define MODEL_o1080 0xC7 +#define MODEL_o1079 0xC6 +#define MODEL_o1078 0xC5 +#define MODEL_o1077 0xC4 +#define MODEL_o1076 0xC3 +#define MODEL_o1075 0xC2 +#define MODEL_g337 0xC1 +#define MODEL_o1095 0xC0 +#define MODEL_o1094 0xBF +#define MODEL_o1093 0xBE +#define MODEL_o1092 0xBD +#define MODEL_o1091 0xBC +#define MODEL_o1089 0xBB +#define MODEL_o1088 0xBA +#define MODEL_o1087 0xB9 +#define MODEL_o1086 0xB8 +#define MODEL_o1085 0xB7 +#define MODEL_g336 0xB6 +#define MODEL_o1103 0xB5 +#define MODEL_o1102 0xB4 +#define MODEL_o1101 0xB3 +#define MODEL_o1100 0xB2 +#define MODEL_o1099 0xB1 +#define MODEL_o1098 0xB0 +#define MODEL_o1097 0xAF +#define MODEL_o1096 0xAE +#define MODEL_g335 0xAD +#define MODEL_o1111 0xAC +#define MODEL_o1110 0xAB +#define MODEL_o1109 0xAA +#define MODEL_o1108 0xA9 +#define MODEL_o1107 0xA8 +#define MODEL_o1106 0xA7 +#define MODEL_o1105 0xA6 +#define MODEL_o1104 0xA5 +#define MODEL_g327 0xA4 +#define MODEL_g334 0xA3 +#define MODEL_o1113 0xA2 +#define MODEL_o1112 0xA1 +#define MODEL_g333 0xA0 +#define MODEL_o1133 0x9F +#define MODEL_o1132 0x9E +#define MODEL_o1131 0x9D +#define MODEL_o1130 0x9C +#define MODEL_o1129 0x9B +#define MODEL_o1128 0x9A +#define MODEL_o1127 0x99 +#define MODEL_o1126 0x98 +#define MODEL_o1125 0x97 +#define MODEL_o1124 0x96 +#define MODEL_o1123 0x95 +#define MODEL_o1122 0x94 +#define MODEL_o1121 0x93 +#define MODEL_o1120 0x92 +#define MODEL_o1119 0x91 +#define MODEL_o1118 0x90 +#define MODEL_o1117 0x8F +#define MODEL_o1116 0x8E +#define MODEL_o1115 0x8D +#define MODEL_o1114 0x8C +#define MODEL_g332 0x8B +#define MODEL_o1139 0x8A +#define MODEL_o1138 0x89 +#define MODEL_o1137 0x88 +#define MODEL_o1136 0x87 +#define MODEL_o1135 0x86 +#define MODEL_o1134 0x85 +#define MODEL_g331 0x84 +#define MODEL_o1145 0x83 +#define MODEL_o1144 0x82 +#define MODEL_o1143 0x81 +#define MODEL_o1142 0x80 +#define MODEL_o1141 0x7F +#define MODEL_o1140 0x7E +#define MODEL_g330 0x7D +#define MODEL_o1151 0x7C +#define MODEL_o1150 0x7B +#define MODEL_o1149 0x7A +#define MODEL_o1148 0x79 +#define MODEL_o1147 0x78 +#define MODEL_o1146 0x77 +#define MODEL_g329 0x76 +#define MODEL_o1156 0x75 +#define MODEL_o1155 0x74 +#define MODEL_o1154 0x73 +#define MODEL_o1153 0x72 +#define MODEL_o1152 0x71 +#define MODEL_g340 0x70 +#define MODEL_g87 0x6F +#define MODEL_g95 0x6E +#define MODEL_o468 0x6D +#define MODEL_o467 0x6C +#define MODEL_g94 0x6B +#define MODEL_o443 0x6A +#define MODEL_o442 0x69 +#define MODEL_o441 0x68 +#define MODEL_o440 0x67 +#define MODEL_o439 0x66 +#define MODEL_o438 0x65 +#define MODEL_g96 0x64 +#define MODEL_g98 0x63 +#define MODEL_o476 0x62 +#define MODEL_o475 0x61 +#define MODEL_g97 0x60 +#define MODEL_o474 0x5F +#define MODEL_o473 0x5E +#define MODEL_o472 0x5D +#define MODEL_o471 0x5C +#define MODEL_o470 0x5B +#define MODEL_o469 0x5A +#define MODEL_g71 0x59 +#define MODEL_o388 0x58 +#define MODEL_o387 0x57 +#define MODEL_o382 0x56 +#define MODEL_o271 0x55 +#define MODEL_o188 0x54 +#define MODEL_o184 0x53 +#define MODEL_o316 0x52 +#define MODEL_o273 0x51 +#define MODEL_o272 0x50 +#define MODEL_o190 0x4F +#define MODEL_o189 0x4E +#define MODEL_o169 0x4D +#define MODEL_o172 0x4C +#define MODEL_o1158 0x4B +#define MODEL_o1157 0x4A +#define MODEL_g63 0x49 +#define MODEL_o411 0x48 +#define MODEL_o409 0x47 +#define MODEL_o407 0x46 +#define MODEL_o405 0x45 +#define MODEL_o293 0x44 +#define MODEL_o292 0x43 +#define MODEL_o290 0x42 +#define MODEL_o285 0x41 +#define MODEL_g70 0x40 +#define MODEL_o203 0x3F +#define MODEL_o353 0x3E +#define MODEL_g58 0x3D +#define MODEL_g80 0x3C +#define MODEL_g82 0x3B +#define MODEL_o465 0x3A +#define MODEL_o381 0x39 +#define MODEL_g81 0x38 +#define MODEL_o466 0x37 +#define MODEL_o380 0x36 +#define MODEL_g67 0x35 +#define MODEL_g69 0x34 +#define MODEL_o301 0x33 +#define MODEL_g68 0x32 +#define MODEL_o300 0x31 +#define MODEL_g64 0x30 +#define MODEL_g66 0x2F +#define MODEL_o299 0x2E +#define MODEL_g65 0x2D +#define MODEL_o298 0x2C +#define MODEL_g46 0x2B +#define MODEL_g48 0x2A +#define MODEL_o168 0x29 +#define MODEL_g47 0x28 +#define MODEL_o167 0x27 +#define MODEL_g40 0x26 +#define MODEL_g42 0x25 +#define MODEL_o164 0x24 +#define MODEL_g41 0x23 +#define MODEL_o163 0x22 +#define MODEL_g43 0x21 +#define MODEL_g45 0x20 +#define MODEL_o166 0x1F +#define MODEL_g44 0x1E +#define MODEL_o165 0x1D +#define MODEL_g37 0x1C +#define MODEL_g39 0x1B +#define MODEL_o162 0x1A +#define MODEL_g38 0x19 +#define MODEL_o161 0x18 +#define MODEL_g86 0x17 +#define MODEL_g84 0x16 +#define MODEL_o396 0x15 +#define MODEL_o394 0x14 +#define MODEL_o393 0x13 +#define MODEL_o392 0x12 +#define MODEL_o391 0x11 +#define MODEL_o389 0x10 +#define MODEL_g61 0xF +#define MODEL_o270 0xE +#define MODEL_o269 0xD +#define MODEL_o268 0xC +#define MODEL_g50 0xB +#define MODEL_o187 0xA +#define MODEL_o186 0x9 +#define MODEL_o185 0x8 +#define MODEL_g49 0x7 +#define MODEL_o218 0x6 +#define MODEL_o183 0x5 +#define MODEL_o181 0x4 +#define MODEL_o182 0x3 +#define MODEL_g83 0x2 +#define MODEL_o384 0x1 +#define MODEL_o383 0x0 + diff --git a/include/mapfs/dgb_02_hit.h b/include/mapfs/dgb_02_hit.h index 2f76be90a7..9eb89ddae3 100644 --- a/include/mapfs/dgb_02_hit.h +++ b/include/mapfs/dgb_02_hit.h @@ -1,22 +1,28 @@ -#define COLLIDER_Root 0x15 -#define COLLIDER_g1 0x14 -#define COLLIDER_g5 0x13 -#define COLLIDER_o98 0x12 -#define COLLIDER_deilitte 0x11 -#define COLLIDER_deilite 0x10 -#define COLLIDER_deilie 0xF -#define COLLIDER_o108 0xE -#define COLLIDER_deilittne 0xD -#define COLLIDER_deilitne 0xC -#define COLLIDER_deiline 0xB -#define COLLIDER_o78 0xA -#define COLLIDER_deilittnw 0x9 -#define COLLIDER_deilitnw 0x8 -#define COLLIDER_deilinw 0x7 -#define COLLIDER_o29 0x6 -#define COLLIDER_deilittw 0x5 -#define COLLIDER_deilitw 0x4 -#define COLLIDER_deiliw 0x3 -#define COLLIDER_g2 0x2 -#define COLLIDER_o74 0x1 -#define COLLIDER_o66 0x0 +#define COLLIDER_Root 0x15 +#define COLLIDER_g1 0x14 +#define COLLIDER_g5 0x13 +#define COLLIDER_o98 0x12 +#define COLLIDER_deilitte 0x11 +#define COLLIDER_deilite 0x10 +#define COLLIDER_deilie 0xF +#define COLLIDER_o108 0xE +#define COLLIDER_deilittne 0xD +#define COLLIDER_deilitne 0xC +#define COLLIDER_deiline 0xB +#define COLLIDER_o78 0xA +#define COLLIDER_deilittnw 0x9 +#define COLLIDER_deilitnw 0x8 +#define COLLIDER_deilinw 0x7 +#define COLLIDER_o29 0x6 +#define COLLIDER_deilittw 0x5 +#define COLLIDER_deilitw 0x4 +#define COLLIDER_deiliw 0x3 +#define COLLIDER_g2 0x2 +#define COLLIDER_o74 0x1 +#define COLLIDER_o66 0x0 + +#define ZONE_Root 0x3 +#define ZONE_g1 0x2 +#define ZONE_deiline 0x1 +#define ZONE_deilinw 0x0 + diff --git a/include/mapfs/dgb_02_shape.h b/include/mapfs/dgb_02_shape.h index 7a17535c5e..262f9a9256 100644 --- a/include/mapfs/dgb_02_shape.h +++ b/include/mapfs/dgb_02_shape.h @@ -1,81 +1,82 @@ -#define MODEL_Root 0x50 -#define MODEL_g1 0x4F -#define MODEL_g66 0x4E -#define MODEL_o245 0x4D -#define MODEL_o244 0x4C -#define MODEL_o241 0x4B -#define MODEL_o239 0x4A -#define MODEL_g61 0x49 -#define MODEL_g64 0x48 -#define MODEL_o231 0x47 -#define MODEL_o230 0x46 -#define MODEL_o229 0x45 -#define MODEL_o228 0x44 -#define MODEL_o227 0x43 -#define MODEL_o226 0x42 -#define MODEL_o225 0x41 -#define MODEL_g63 0x40 -#define MODEL_o224 0x3F -#define MODEL_o223 0x3E -#define MODEL_o222 0x3D -#define MODEL_o221 0x3C -#define MODEL_o220 0x3B -#define MODEL_o219 0x3A -#define MODEL_o218 0x39 -#define MODEL_g58 0x38 -#define MODEL_o210 0x37 -#define MODEL_o209 0x36 -#define MODEL_o198 0x35 -#define MODEL_o197 0x34 -#define MODEL_o196 0x33 -#define MODEL_o195 0x32 -#define MODEL_o194 0x31 -#define MODEL_g62 0x30 -#define MODEL_o217 0x2F -#define MODEL_o216 0x2E -#define MODEL_o215 0x2D -#define MODEL_o214 0x2C -#define MODEL_o213 0x2B -#define MODEL_o212 0x2A -#define MODEL_o211 0x29 -#define MODEL_g65 0x28 -#define MODEL_o238 0x27 -#define MODEL_o237 0x26 -#define MODEL_o236 0x25 -#define MODEL_o235 0x24 -#define MODEL_o234 0x23 -#define MODEL_o233 0x22 -#define MODEL_o232 0x21 -#define MODEL_g10 0x20 -#define MODEL_o90 0x1F -#define MODEL_o89 0x1E -#define MODEL_g7 0x1D -#define MODEL_o85 0x1C -#define MODEL_o84 0x1B -#define MODEL_o27 0x1A -#define MODEL_g5 0x19 -#define MODEL_g31 0x18 -#define MODEL_o123 0x17 -#define MODEL_g26 0x16 -#define MODEL_o76 0x15 -#define MODEL_g16 0x14 -#define MODEL_g18 0x13 -#define MODEL_o102 0x12 -#define MODEL_g17 0x11 -#define MODEL_o101 0x10 -#define MODEL_g13 0xF -#define MODEL_g15 0xE -#define MODEL_o31 0xD -#define MODEL_g14 0xC -#define MODEL_o30 0xB -#define MODEL_g2 0xA -#define MODEL_o124 0x9 -#define MODEL_o61 0x8 -#define MODEL_o29 0x7 -#define MODEL_o98 0x6 -#define MODEL_o78 0x5 -#define MODEL_o75 0x4 -#define MODEL_o74 0x3 -#define MODEL_o66 0x2 -#define MODEL_o33 0x1 -#define MODEL_o28 0x0 +#define MODEL_Root 0x50 +#define MODEL_g1 0x4F +#define MODEL_g66 0x4E +#define MODEL_o245 0x4D +#define MODEL_o244 0x4C +#define MODEL_o241 0x4B +#define MODEL_o239 0x4A +#define MODEL_g61 0x49 +#define MODEL_g64 0x48 +#define MODEL_o231 0x47 +#define MODEL_o230 0x46 +#define MODEL_o229 0x45 +#define MODEL_o228 0x44 +#define MODEL_o227 0x43 +#define MODEL_o226 0x42 +#define MODEL_o225 0x41 +#define MODEL_g63 0x40 +#define MODEL_o224 0x3F +#define MODEL_o223 0x3E +#define MODEL_o222 0x3D +#define MODEL_o221 0x3C +#define MODEL_o220 0x3B +#define MODEL_o219 0x3A +#define MODEL_o218 0x39 +#define MODEL_g58 0x38 +#define MODEL_o210 0x37 +#define MODEL_o209 0x36 +#define MODEL_o198 0x35 +#define MODEL_o197 0x34 +#define MODEL_o196 0x33 +#define MODEL_o195 0x32 +#define MODEL_o194 0x31 +#define MODEL_g62 0x30 +#define MODEL_o217 0x2F +#define MODEL_o216 0x2E +#define MODEL_o215 0x2D +#define MODEL_o214 0x2C +#define MODEL_o213 0x2B +#define MODEL_o212 0x2A +#define MODEL_o211 0x29 +#define MODEL_g65 0x28 +#define MODEL_o238 0x27 +#define MODEL_o237 0x26 +#define MODEL_o236 0x25 +#define MODEL_o235 0x24 +#define MODEL_o234 0x23 +#define MODEL_o233 0x22 +#define MODEL_o232 0x21 +#define MODEL_g10 0x20 +#define MODEL_o90 0x1F +#define MODEL_o89 0x1E +#define MODEL_g7 0x1D +#define MODEL_o85 0x1C +#define MODEL_o84 0x1B +#define MODEL_o27 0x1A +#define MODEL_g5 0x19 +#define MODEL_g31 0x18 +#define MODEL_o123 0x17 +#define MODEL_g26 0x16 +#define MODEL_o76 0x15 +#define MODEL_g16 0x14 +#define MODEL_g18 0x13 +#define MODEL_o102 0x12 +#define MODEL_g17 0x11 +#define MODEL_o101 0x10 +#define MODEL_g13 0xF +#define MODEL_g15 0xE +#define MODEL_o31 0xD +#define MODEL_g14 0xC +#define MODEL_o30 0xB +#define MODEL_g2 0xA +#define MODEL_o124 0x9 +#define MODEL_o61 0x8 +#define MODEL_o29 0x7 +#define MODEL_o98 0x6 +#define MODEL_o78 0x5 +#define MODEL_o75 0x4 +#define MODEL_o74 0x3 +#define MODEL_o66 0x2 +#define MODEL_o33 0x1 +#define MODEL_o28 0x0 + diff --git a/include/mapfs/dgb_03_hit.h b/include/mapfs/dgb_03_hit.h index 9561f22846..b07fc3a865 100644 --- a/include/mapfs/dgb_03_hit.h +++ b/include/mapfs/dgb_03_hit.h @@ -1,48 +1,62 @@ -#define COLLIDER_Root 0x2F -#define COLLIDER_g1 0x2E -#define COLLIDER_g4 0x2D -#define COLLIDER_o121 0x2C -#define COLLIDER_o16 0x2B -#define COLLIDER_o15 0x2A -#define COLLIDER_o6 0x29 -#define COLLIDER_o5 0x28 -#define COLLIDER_o4 0x27 -#define COLLIDER_g5 0x26 -#define COLLIDER_o117 0x25 -#define COLLIDER_deilitn 0x24 -#define COLLIDER_deilin 0x23 -#define COLLIDER_o116 0x22 -#define COLLIDER_deilitts 0x21 -#define COLLIDER_deilits 0x20 -#define COLLIDER_deilis 0x1F -#define COLLIDER_g13 0x1E -#define COLLIDER_o113 0x1D -#define COLLIDER_o112 0x1C -#define COLLIDER_o77 0x1B -#define COLLIDER_o108 0x1A -#define COLLIDER_deilittse 0x19 -#define COLLIDER_deilitse 0x18 -#define COLLIDER_deilise 0x17 -#define COLLIDER_o107 0x16 -#define COLLIDER_deilittne 0x15 -#define COLLIDER_deilitne 0x14 -#define COLLIDER_deiline 0x13 -#define COLLIDER_de 0x12 -#define COLLIDER_deilittnw 0x11 -#define COLLIDER_deilitnw 0x10 -#define COLLIDER_deilinw 0xF -#define COLLIDER_o99 0xE -#define COLLIDER_deilittsw 0xD -#define COLLIDER_deilitsw 0xC -#define COLLIDER_deilisw 0xB -#define COLLIDER_g11 0xA -#define COLLIDER_o92 0x9 -#define COLLIDER_o81 0x8 -#define COLLIDER_o39 0x7 -#define COLLIDER_o24 0x6 -#define COLLIDER_o23 0x5 -#define COLLIDER_g2 0x4 -#define COLLIDER_o75 0x3 -#define COLLIDER_o28 0x2 -#define COLLIDER_o25 0x1 -#define COLLIDER_o29 0x0 +#define COLLIDER_Root 0x2F +#define COLLIDER_g1 0x2E +#define COLLIDER_g4 0x2D +#define COLLIDER_o121 0x2C +#define COLLIDER_o16 0x2B +#define COLLIDER_o15 0x2A +#define COLLIDER_o6 0x29 +#define COLLIDER_o5 0x28 +#define COLLIDER_o4 0x27 +#define COLLIDER_g5 0x26 +#define COLLIDER_o117 0x25 +#define COLLIDER_deilitn 0x24 +#define COLLIDER_deilin 0x23 +#define COLLIDER_o116 0x22 +#define COLLIDER_deilitts 0x21 +#define COLLIDER_deilits 0x20 +#define COLLIDER_deilis 0x1F +#define COLLIDER_g13 0x1E +#define COLLIDER_o113 0x1D +#define COLLIDER_o112 0x1C +#define COLLIDER_o77 0x1B +#define COLLIDER_o108 0x1A +#define COLLIDER_deilittse 0x19 +#define COLLIDER_deilitse 0x18 +#define COLLIDER_deilise 0x17 +#define COLLIDER_o107 0x16 +#define COLLIDER_deilittne 0x15 +#define COLLIDER_deilitne 0x14 +#define COLLIDER_deiline 0x13 +#define COLLIDER_de 0x12 +#define COLLIDER_deilittnw 0x11 +#define COLLIDER_deilitnw 0x10 +#define COLLIDER_deilinw 0xF +#define COLLIDER_o99 0xE +#define COLLIDER_deilittsw 0xD +#define COLLIDER_deilitsw 0xC +#define COLLIDER_deilisw 0xB +#define COLLIDER_g11 0xA +#define COLLIDER_o92 0x9 +#define COLLIDER_o81 0x8 +#define COLLIDER_o39 0x7 +#define COLLIDER_o24 0x6 +#define COLLIDER_o23 0x5 +#define COLLIDER_g2 0x4 +#define COLLIDER_o75 0x3 +#define COLLIDER_o28 0x2 +#define COLLIDER_o25 0x1 +#define COLLIDER_o29 0x0 + +#define ZONE_Root 0xB +#define ZONE_g1 0xA +#define ZONE_o4 0x9 +#define ZONE_o140 0x8 +#define ZONE_o134 0x7 +#define ZONE_o23 0x6 +#define ZONE_o130 0x5 +#define ZONE_o129 0x4 +#define ZONE_o139 0x3 +#define ZONE_o135 0x2 +#define ZONE_o138 0x1 +#define ZONE_o137 0x0 + diff --git a/include/mapfs/dgb_03_shape.h b/include/mapfs/dgb_03_shape.h index 7999789c3e..657a428d4c 100644 --- a/include/mapfs/dgb_03_shape.h +++ b/include/mapfs/dgb_03_shape.h @@ -1,130 +1,131 @@ -#define MODEL_Root 0x81 -#define MODEL_g40 0x80 -#define MODEL_o200 0x7F -#define MODEL_o199 0x7E -#define MODEL_o198 0x7D -#define MODEL_o197 0x7C -#define MODEL_o196 0x7B -#define MODEL_o195 0x7A -#define MODEL_g31 0x79 -#define MODEL_o194 0x78 -#define MODEL_o192 0x77 -#define MODEL_g39 0x76 -#define MODEL_o191 0x75 -#define MODEL_o190 0x74 -#define MODEL_o189 0x73 -#define MODEL_o188 0x72 -#define MODEL_o187 0x71 -#define MODEL_o186 0x70 -#define MODEL_o185 0x6F -#define MODEL_g38 0x6E -#define MODEL_o184 0x6D -#define MODEL_o183 0x6C -#define MODEL_o182 0x6B -#define MODEL_o181 0x6A -#define MODEL_o180 0x69 -#define MODEL_o179 0x68 -#define MODEL_o178 0x67 -#define MODEL_g37 0x66 -#define MODEL_o177 0x65 -#define MODEL_o176 0x64 -#define MODEL_o175 0x63 -#define MODEL_o174 0x62 -#define MODEL_o173 0x61 -#define MODEL_o172 0x60 -#define MODEL_o171 0x5F -#define MODEL_g36 0x5E -#define MODEL_o170 0x5D -#define MODEL_o169 0x5C -#define MODEL_o168 0x5B -#define MODEL_o167 0x5A -#define MODEL_o166 0x59 -#define MODEL_o165 0x58 -#define MODEL_o164 0x57 -#define MODEL_g35 0x56 -#define MODEL_o163 0x55 -#define MODEL_o162 0x54 -#define MODEL_o161 0x53 -#define MODEL_o160 0x52 -#define MODEL_o159 0x51 -#define MODEL_o158 0x50 -#define MODEL_o157 0x4F -#define MODEL_g34 0x4E -#define MODEL_o156 0x4D -#define MODEL_o155 0x4C -#define MODEL_o154 0x4B -#define MODEL_o153 0x4A -#define MODEL_o152 0x49 -#define MODEL_o151 0x48 -#define MODEL_o150 0x47 -#define MODEL_Default 0x46 -#define MODEL_o113 0x45 -#define MODEL_o111 0x44 -#define MODEL_o110 0x43 -#define MODEL_g1 0x42 -#define MODEL_g10 0x41 -#define MODEL_o91 0x40 -#define MODEL_o90 0x3F -#define MODEL_o89 0x3E -#define MODEL_g12 0x3D -#define MODEL_o87 0x3C -#define MODEL_o86 0x3B -#define MODEL_o79 0x3A -#define MODEL_g7 0x39 -#define MODEL_o85 0x38 -#define MODEL_o84 0x37 -#define MODEL_o27 0x36 -#define MODEL_g5 0x35 -#define MODEL_g25 0x34 -#define MODEL_o77 0x33 -#define MODEL_g26 0x32 -#define MODEL_o76 0x31 -#define MODEL_g22 0x30 -#define MODEL_g24 0x2F -#define MODEL_o106 0x2E -#define MODEL_g23 0x2D -#define MODEL_o105 0x2C -#define MODEL_g19 0x2B -#define MODEL_g21 0x2A -#define MODEL_o104 0x29 -#define MODEL_g20 0x28 -#define MODEL_o103 0x27 -#define MODEL_g16 0x26 -#define MODEL_g18 0x25 -#define MODEL_o102 0x24 -#define MODEL_g17 0x23 -#define MODEL_o101 0x22 -#define MODEL_g13 0x21 -#define MODEL_g15 0x20 -#define MODEL_o31 0x1F -#define MODEL_g14 0x1E -#define MODEL_o30 0x1D -#define MODEL_g11 0x1C -#define MODEL_o92 0x1B -#define MODEL_o93 0x1A -#define MODEL_o94 0x19 -#define MODEL_o95 0x18 -#define MODEL_o107 0x17 -#define MODEL_o100 0x16 -#define MODEL_o99 0x15 -#define MODEL_o83 0x14 -#define MODEL_o82 0x13 -#define MODEL_o81 0x12 -#define MODEL_o39 0x11 -#define MODEL_o24 0x10 -#define MODEL_o23 0xF -#define MODEL_o3 0xE -#define MODEL_o71 0xD -#define MODEL_o61 0xC -#define MODEL_g2 0xB -#define MODEL_o202 0xA -#define MODEL_o201 0x9 -#define MODEL_o29 0x8 -#define MODEL_o98 0x7 -#define MODEL_o78 0x6 -#define MODEL_o75 0x5 -#define MODEL_o74 0x4 -#define MODEL_o66 0x3 -#define MODEL_o33 0x2 -#define MODEL_o28 0x1 -#define MODEL_o25 0x0 +#define MODEL_Root 0x81 +#define MODEL_g40 0x80 +#define MODEL_o200 0x7F +#define MODEL_o199 0x7E +#define MODEL_o198 0x7D +#define MODEL_o197 0x7C +#define MODEL_o196 0x7B +#define MODEL_o195 0x7A +#define MODEL_g31 0x79 +#define MODEL_o194 0x78 +#define MODEL_o192 0x77 +#define MODEL_g39 0x76 +#define MODEL_o191 0x75 +#define MODEL_o190 0x74 +#define MODEL_o189 0x73 +#define MODEL_o188 0x72 +#define MODEL_o187 0x71 +#define MODEL_o186 0x70 +#define MODEL_o185 0x6F +#define MODEL_g38 0x6E +#define MODEL_o184 0x6D +#define MODEL_o183 0x6C +#define MODEL_o182 0x6B +#define MODEL_o181 0x6A +#define MODEL_o180 0x69 +#define MODEL_o179 0x68 +#define MODEL_o178 0x67 +#define MODEL_g37 0x66 +#define MODEL_o177 0x65 +#define MODEL_o176 0x64 +#define MODEL_o175 0x63 +#define MODEL_o174 0x62 +#define MODEL_o173 0x61 +#define MODEL_o172 0x60 +#define MODEL_o171 0x5F +#define MODEL_g36 0x5E +#define MODEL_o170 0x5D +#define MODEL_o169 0x5C +#define MODEL_o168 0x5B +#define MODEL_o167 0x5A +#define MODEL_o166 0x59 +#define MODEL_o165 0x58 +#define MODEL_o164 0x57 +#define MODEL_g35 0x56 +#define MODEL_o163 0x55 +#define MODEL_o162 0x54 +#define MODEL_o161 0x53 +#define MODEL_o160 0x52 +#define MODEL_o159 0x51 +#define MODEL_o158 0x50 +#define MODEL_o157 0x4F +#define MODEL_g34 0x4E +#define MODEL_o156 0x4D +#define MODEL_o155 0x4C +#define MODEL_o154 0x4B +#define MODEL_o153 0x4A +#define MODEL_o152 0x49 +#define MODEL_o151 0x48 +#define MODEL_o150 0x47 +#define MODEL_Default 0x46 +#define MODEL_o113 0x45 +#define MODEL_o111 0x44 +#define MODEL_o110 0x43 +#define MODEL_g1 0x42 +#define MODEL_g10 0x41 +#define MODEL_o91 0x40 +#define MODEL_o90 0x3F +#define MODEL_o89 0x3E +#define MODEL_g12 0x3D +#define MODEL_o87 0x3C +#define MODEL_o86 0x3B +#define MODEL_o79 0x3A +#define MODEL_g7 0x39 +#define MODEL_o85 0x38 +#define MODEL_o84 0x37 +#define MODEL_o27 0x36 +#define MODEL_g5 0x35 +#define MODEL_g25 0x34 +#define MODEL_o77 0x33 +#define MODEL_g26 0x32 +#define MODEL_o76 0x31 +#define MODEL_g22 0x30 +#define MODEL_g24 0x2F +#define MODEL_o106 0x2E +#define MODEL_g23 0x2D +#define MODEL_o105 0x2C +#define MODEL_g19 0x2B +#define MODEL_g21 0x2A +#define MODEL_o104 0x29 +#define MODEL_g20 0x28 +#define MODEL_o103 0x27 +#define MODEL_g16 0x26 +#define MODEL_g18 0x25 +#define MODEL_o102 0x24 +#define MODEL_g17 0x23 +#define MODEL_o101 0x22 +#define MODEL_g13 0x21 +#define MODEL_g15 0x20 +#define MODEL_o31 0x1F +#define MODEL_g14 0x1E +#define MODEL_o30 0x1D +#define MODEL_g11 0x1C +#define MODEL_o92 0x1B +#define MODEL_o93 0x1A +#define MODEL_o94 0x19 +#define MODEL_o95 0x18 +#define MODEL_o107 0x17 +#define MODEL_o100 0x16 +#define MODEL_o99 0x15 +#define MODEL_o83 0x14 +#define MODEL_o82 0x13 +#define MODEL_o81 0x12 +#define MODEL_o39 0x11 +#define MODEL_o24 0x10 +#define MODEL_o23 0xF +#define MODEL_o3 0xE +#define MODEL_o71 0xD +#define MODEL_o61 0xC +#define MODEL_g2 0xB +#define MODEL_o202 0xA +#define MODEL_o201 0x9 +#define MODEL_o29 0x8 +#define MODEL_o98 0x7 +#define MODEL_o78 0x6 +#define MODEL_o75 0x5 +#define MODEL_o74 0x4 +#define MODEL_o66 0x3 +#define MODEL_o33 0x2 +#define MODEL_o28 0x1 +#define MODEL_o25 0x0 + diff --git a/include/mapfs/dgb_04_hit.h b/include/mapfs/dgb_04_hit.h index aaf80107f7..5e5b0f9ee9 100644 --- a/include/mapfs/dgb_04_hit.h +++ b/include/mapfs/dgb_04_hit.h @@ -1,25 +1,34 @@ -#define COLLIDER_Root 0x18 -#define COLLIDER_g1 0x17 -#define COLLIDER_g5 0x16 -#define COLLIDER_o157 0x15 -#define COLLIDER_deilittne 0x14 -#define COLLIDER_deilitne 0x13 -#define COLLIDER_deiline 0x12 -#define COLLIDER_o156 0x11 -#define COLLIDER_deilittse 0x10 -#define COLLIDER_deilitse 0xF -#define COLLIDER_deilise 0xE -#define COLLIDER_g7 0xD -#define COLLIDER_o151 0xC -#define COLLIDER_o129 0xB -#define COLLIDER_o33 0xA -#define COLLIDER_o149 0x9 -#define COLLIDER_o66 0x8 -#define COLLIDER_g2 0x7 -#define COLLIDER_o195 0x6 -#define COLLIDER_o194 0x5 -#define COLLIDER_o135 0x4 -#define COLLIDER_o75 0x3 -#define COLLIDER_o134 0x2 -#define COLLIDER_o61 0x1 -#define COLLIDER_o28 0x0 +#define COLLIDER_Root 0x18 +#define COLLIDER_g1 0x17 +#define COLLIDER_g5 0x16 +#define COLLIDER_o157 0x15 +#define COLLIDER_deilittne 0x14 +#define COLLIDER_deilitne 0x13 +#define COLLIDER_deiline 0x12 +#define COLLIDER_o156 0x11 +#define COLLIDER_deilittse 0x10 +#define COLLIDER_deilitse 0xF +#define COLLIDER_deilise 0xE +#define COLLIDER_g7 0xD +#define COLLIDER_o151 0xC +#define COLLIDER_o129 0xB +#define COLLIDER_o33 0xA +#define COLLIDER_o149 0x9 +#define COLLIDER_o66 0x8 +#define COLLIDER_g2 0x7 +#define COLLIDER_o195 0x6 +#define COLLIDER_o194 0x5 +#define COLLIDER_o135 0x4 +#define COLLIDER_o75 0x3 +#define COLLIDER_o134 0x2 +#define COLLIDER_o61 0x1 +#define COLLIDER_o28 0x0 + +#define ZONE_Root 0x6 +#define ZONE_g1 0x5 +#define ZONE_g48 0x4 +#define ZONE_o203 0x3 +#define ZONE_o202 0x2 +#define ZONE_o201 0x1 +#define ZONE_o200 0x0 + diff --git a/include/mapfs/dgb_04_shape.h b/include/mapfs/dgb_04_shape.h index 610b33ee37..9131eec091 100644 --- a/include/mapfs/dgb_04_shape.h +++ b/include/mapfs/dgb_04_shape.h @@ -1,48 +1,49 @@ -#define MODEL_Root 0x2F -#define MODEL_g1 0x2E -#define MODEL_g40 0x2D -#define MODEL_o225 0x2C -#define MODEL_o224 0x2B -#define MODEL_o223 0x2A -#define MODEL_o220 0x29 -#define MODEL_g39 0x28 -#define MODEL_o214 0x27 -#define MODEL_o213 0x26 -#define MODEL_g10 0x25 -#define MODEL_o90 0x24 -#define MODEL_o89 0x23 -#define MODEL_g34 0x22 -#define MODEL_o193 0x21 -#define MODEL_o190 0x20 -#define MODEL_o135 0x1F -#define MODEL_o158 0x1E -#define MODEL_g32 0x1D -#define MODEL_o150 0x1C -#define MODEL_o149 0x1B -#define MODEL_g7 0x1A -#define MODEL_o85 0x19 -#define MODEL_o84 0x18 -#define MODEL_o34 0x17 -#define MODEL_o129 0x16 -#define MODEL_o128 0x15 -#define MODEL_o160 0x14 -#define MODEL_o161 0x13 -#define MODEL_g5 0x12 -#define MODEL_g37 0x11 -#define MODEL_o206 0x10 -#define MODEL_g16 0xF -#define MODEL_g18 0xE -#define MODEL_o102 0xD -#define MODEL_g17 0xC -#define MODEL_o101 0xB -#define MODEL_g36 0xA -#define MODEL_o209 0x9 -#define MODEL_o208 0x8 -#define MODEL_o207 0x7 -#define MODEL_g2 0x6 -#define MODEL_o205 0x5 -#define MODEL_o204 0x4 -#define MODEL_o159 0x3 -#define MODEL_o152 0x2 -#define MODEL_o125 0x1 -#define MODEL_o33 0x0 +#define MODEL_Root 0x2F +#define MODEL_g1 0x2E +#define MODEL_g40 0x2D +#define MODEL_o225 0x2C +#define MODEL_o224 0x2B +#define MODEL_o223 0x2A +#define MODEL_o220 0x29 +#define MODEL_g39 0x28 +#define MODEL_o214 0x27 +#define MODEL_o213 0x26 +#define MODEL_g10 0x25 +#define MODEL_o90 0x24 +#define MODEL_o89 0x23 +#define MODEL_g34 0x22 +#define MODEL_o193 0x21 +#define MODEL_o190 0x20 +#define MODEL_o135 0x1F +#define MODEL_o158 0x1E +#define MODEL_g32 0x1D +#define MODEL_o150 0x1C +#define MODEL_o149 0x1B +#define MODEL_g7 0x1A +#define MODEL_o85 0x19 +#define MODEL_o84 0x18 +#define MODEL_o34 0x17 +#define MODEL_o129 0x16 +#define MODEL_o128 0x15 +#define MODEL_o160 0x14 +#define MODEL_o161 0x13 +#define MODEL_g5 0x12 +#define MODEL_g37 0x11 +#define MODEL_o206 0x10 +#define MODEL_g16 0xF +#define MODEL_g18 0xE +#define MODEL_o102 0xD +#define MODEL_g17 0xC +#define MODEL_o101 0xB +#define MODEL_g36 0xA +#define MODEL_o209 0x9 +#define MODEL_o208 0x8 +#define MODEL_o207 0x7 +#define MODEL_g2 0x6 +#define MODEL_o205 0x5 +#define MODEL_o204 0x4 +#define MODEL_o159 0x3 +#define MODEL_o152 0x2 +#define MODEL_o125 0x1 +#define MODEL_o33 0x0 + diff --git a/include/mapfs/dgb_05_hit.h b/include/mapfs/dgb_05_hit.h index 74984f54c1..c86c10b011 100644 --- a/include/mapfs/dgb_05_hit.h +++ b/include/mapfs/dgb_05_hit.h @@ -1,22 +1,33 @@ -#define COLLIDER_Root 0x15 -#define COLLIDER_g71 0x14 -#define COLLIDER_g74 0x13 -#define COLLIDER_deilitts 0x12 -#define COLLIDER_o312 0x11 -#define COLLIDER_deilittn 0x10 -#define COLLIDER_deilitn 0xF -#define COLLIDER_deilin 0xE -#define COLLIDER_g73 0xD -#define COLLIDER_o317 0xC -#define COLLIDER_o308 0xB -#define COLLIDER_o307 0xA -#define COLLIDER_o305 0x9 -#define COLLIDER_o304 0x8 -#define COLLIDER_g72 0x7 -#define COLLIDER_o326 0x6 -#define COLLIDER_o290 0x5 -#define COLLIDER_o303 0x4 -#define COLLIDER_o302 0x3 -#define COLLIDER_o301 0x2 -#define COLLIDER_o300 0x1 -#define COLLIDER_o299 0x0 +#define COLLIDER_Root 0x15 +#define COLLIDER_g71 0x14 +#define COLLIDER_g74 0x13 +#define COLLIDER_deilitts 0x12 +#define COLLIDER_o312 0x11 +#define COLLIDER_deilittn 0x10 +#define COLLIDER_deilitn 0xF +#define COLLIDER_deilin 0xE +#define COLLIDER_g73 0xD +#define COLLIDER_o317 0xC +#define COLLIDER_o308 0xB +#define COLLIDER_o307 0xA +#define COLLIDER_o305 0x9 +#define COLLIDER_o304 0x8 +#define COLLIDER_g72 0x7 +#define COLLIDER_o326 0x6 +#define COLLIDER_o290 0x5 +#define COLLIDER_o303 0x4 +#define COLLIDER_o302 0x3 +#define COLLIDER_o301 0x2 +#define COLLIDER_o300 0x1 +#define COLLIDER_o299 0x0 + +#define ZONE_Root 0x8 +#define ZONE_g1 0x7 +#define ZONE_g48 0x6 +#define ZONE_o205 0x5 +#define ZONE_o204 0x4 +#define ZONE_o201 0x3 +#define ZONE_o202 0x2 +#define ZONE_o203 0x1 +#define ZONE_o200 0x0 + diff --git a/include/mapfs/dgb_05_shape.h b/include/mapfs/dgb_05_shape.h index 9ab178d0a2..07c6e6d0c5 100644 --- a/include/mapfs/dgb_05_shape.h +++ b/include/mapfs/dgb_05_shape.h @@ -1,34 +1,35 @@ -#define MODEL_Root 0x21 -#define MODEL_g63 0x20 -#define MODEL_g34 0x1F -#define MODEL_o158 0x1E -#define MODEL_g69 0x1D -#define MODEL_o294 0x1C -#define MODEL_g68 0x1B -#define MODEL_o293 0x1A -#define MODEL_o292 0x19 -#define MODEL_g70 0x18 -#define MODEL_o301 0x17 -#define MODEL_o296 0x16 -#define MODEL_o298 0x15 -#define MODEL_o297 0x14 -#define MODEL_g67 0x13 -#define MODEL_o290 0x12 -#define MODEL_o291 0x11 -#define MODEL_o163 0x10 -#define MODEL_g66 0xF -#define MODEL_o300 0xE -#define MODEL_o289 0xD -#define MODEL_o288 0xC -#define MODEL_g65 0xB -#define MODEL_o287 0xA -#define MODEL_o286 0x9 -#define MODEL_o285 0x8 -#define MODEL_o284 0x7 -#define MODEL_o283 0x6 -#define MODEL_o282 0x5 -#define MODEL_g64 0x4 -#define MODEL_o281 0x3 -#define MODEL_o280 0x2 -#define MODEL_o279 0x1 -#define MODEL_o278 0x0 +#define MODEL_Root 0x21 +#define MODEL_g63 0x20 +#define MODEL_g34 0x1F +#define MODEL_o158 0x1E +#define MODEL_g69 0x1D +#define MODEL_o294 0x1C +#define MODEL_g68 0x1B +#define MODEL_o293 0x1A +#define MODEL_o292 0x19 +#define MODEL_g70 0x18 +#define MODEL_o301 0x17 +#define MODEL_o296 0x16 +#define MODEL_o298 0x15 +#define MODEL_o297 0x14 +#define MODEL_g67 0x13 +#define MODEL_o290 0x12 +#define MODEL_o291 0x11 +#define MODEL_o163 0x10 +#define MODEL_g66 0xF +#define MODEL_o300 0xE +#define MODEL_o289 0xD +#define MODEL_o288 0xC +#define MODEL_g65 0xB +#define MODEL_o287 0xA +#define MODEL_o286 0x9 +#define MODEL_o285 0x8 +#define MODEL_o284 0x7 +#define MODEL_o283 0x6 +#define MODEL_o282 0x5 +#define MODEL_g64 0x4 +#define MODEL_o281 0x3 +#define MODEL_o280 0x2 +#define MODEL_o279 0x1 +#define MODEL_o278 0x0 + diff --git a/include/mapfs/dgb_06_hit.h b/include/mapfs/dgb_06_hit.h index e43076061c..b3e29ef2ef 100644 --- a/include/mapfs/dgb_06_hit.h +++ b/include/mapfs/dgb_06_hit.h @@ -1,18 +1,26 @@ -#define COLLIDER_Root 0x11 -#define COLLIDER_g42 0x10 -#define COLLIDER_g59 0xF -#define COLLIDER_o226 0xE -#define COLLIDER_o220 0xD -#define COLLIDER_deilittw 0xC -#define COLLIDER_deilitw 0xB -#define COLLIDER_deiliw 0xA -#define COLLIDER_g58 0x9 -#define COLLIDER_o225 0x8 -#define COLLIDER_o215 0x7 -#define COLLIDER_o214 0x6 -#define COLLIDER_o212 0x5 -#define COLLIDER_g35 0x4 -#define COLLIDER_o190 0x3 -#define COLLIDER_o155 0x2 -#define COLLIDER_o154 0x1 -#define COLLIDER_o183 0x0 +#define COLLIDER_Root 0x11 +#define COLLIDER_g42 0x10 +#define COLLIDER_g59 0xF +#define COLLIDER_o226 0xE +#define COLLIDER_o220 0xD +#define COLLIDER_deilittw 0xC +#define COLLIDER_deilitw 0xB +#define COLLIDER_deiliw 0xA +#define COLLIDER_g58 0x9 +#define COLLIDER_o225 0x8 +#define COLLIDER_o215 0x7 +#define COLLIDER_o214 0x6 +#define COLLIDER_o212 0x5 +#define COLLIDER_g35 0x4 +#define COLLIDER_o190 0x3 +#define COLLIDER_o155 0x2 +#define COLLIDER_o154 0x1 +#define COLLIDER_o183 0x0 + +#define ZONE_Root 0x5 +#define ZONE_g42 0x4 +#define ZONE_o229 0x3 +#define ZONE_o228 0x2 +#define ZONE_o231 0x1 +#define ZONE_o230 0x0 + diff --git a/include/mapfs/dgb_06_shape.h b/include/mapfs/dgb_06_shape.h index 6140a1fd3b..864f60b4bd 100644 --- a/include/mapfs/dgb_06_shape.h +++ b/include/mapfs/dgb_06_shape.h @@ -1,32 +1,33 @@ -#define MODEL_Root 0x1F -#define MODEL_Default 0x1E -#define MODEL_o208 0x1D -#define MODEL_g52 0x1C -#define MODEL_o191 0x1B -#define MODEL_o202 0x1A -#define MODEL_g53 0x19 -#define MODEL_o192 0x18 -#define MODEL_o203 0x17 -#define MODEL_g42 0x16 -#define MODEL_g54 0x15 -#define MODEL_o207 0x14 -#define MODEL_o206 0x13 -#define MODEL_g32 0x12 -#define MODEL_o138 0x11 -#define MODEL_o137 0x10 -#define MODEL_g34 0xF -#define MODEL_o149 0xE -#define MODEL_o148 0xD -#define MODEL_o146 0xC -#define MODEL_g36 0xB -#define MODEL_o158 0xA -#define MODEL_o157 0x9 -#define MODEL_o156 0x8 -#define MODEL_g37 0x7 -#define MODEL_g41 0x6 -#define MODEL_o161 0x5 -#define MODEL_g35 0x4 -#define MODEL_o155 0x3 -#define MODEL_o154 0x2 -#define MODEL_o150 0x1 -#define MODEL_o183 0x0 +#define MODEL_Root 0x1F +#define MODEL_Default 0x1E +#define MODEL_o208 0x1D +#define MODEL_g52 0x1C +#define MODEL_o191 0x1B +#define MODEL_o202 0x1A +#define MODEL_g53 0x19 +#define MODEL_o192 0x18 +#define MODEL_o203 0x17 +#define MODEL_g42 0x16 +#define MODEL_g54 0x15 +#define MODEL_o207 0x14 +#define MODEL_o206 0x13 +#define MODEL_g32 0x12 +#define MODEL_o138 0x11 +#define MODEL_o137 0x10 +#define MODEL_g34 0xF +#define MODEL_o149 0xE +#define MODEL_o148 0xD +#define MODEL_o146 0xC +#define MODEL_g36 0xB +#define MODEL_o158 0xA +#define MODEL_o157 0x9 +#define MODEL_o156 0x8 +#define MODEL_g37 0x7 +#define MODEL_g41 0x6 +#define MODEL_o161 0x5 +#define MODEL_g35 0x4 +#define MODEL_o155 0x3 +#define MODEL_o154 0x2 +#define MODEL_o150 0x1 +#define MODEL_o183 0x0 + diff --git a/include/mapfs/dgb_07_hit.h b/include/mapfs/dgb_07_hit.h index e37b2c3cdc..90e7be1b13 100644 --- a/include/mapfs/dgb_07_hit.h +++ b/include/mapfs/dgb_07_hit.h @@ -1,18 +1,26 @@ -#define COLLIDER_Root 0x11 -#define COLLIDER_g1 0x10 -#define COLLIDER_s10 0xF -#define COLLIDER_g43 0xE -#define COLLIDER_o208 0xD -#define COLLIDER_o207 0xC -#define COLLIDER_o204 0xB -#define COLLIDER_o203 0xA -#define COLLIDER_g31 0x9 -#define COLLIDER_o197 0x8 -#define COLLIDER_deilitts 0x7 -#define COLLIDER_deilits 0x6 -#define COLLIDER_deilis 0x5 -#define COLLIDER_g28 0x4 -#define COLLIDER_o200 0x3 -#define COLLIDER_o127 0x2 -#define COLLIDER_o133 0x1 -#define COLLIDER_o129 0x0 +#define COLLIDER_Root 0x11 +#define COLLIDER_g1 0x10 +#define COLLIDER_s10 0xF +#define COLLIDER_g43 0xE +#define COLLIDER_o208 0xD +#define COLLIDER_o207 0xC +#define COLLIDER_o204 0xB +#define COLLIDER_o203 0xA +#define COLLIDER_g31 0x9 +#define COLLIDER_o197 0x8 +#define COLLIDER_deilitts 0x7 +#define COLLIDER_deilits 0x6 +#define COLLIDER_deilis 0x5 +#define COLLIDER_g28 0x4 +#define COLLIDER_o200 0x3 +#define COLLIDER_o127 0x2 +#define COLLIDER_o133 0x1 +#define COLLIDER_o129 0x0 + +#define ZONE_Root 0x5 +#define ZONE_g1 0x4 +#define ZONE_s10 0x3 +#define ZONE_deilis 0x2 +#define ZONE_o199 0x1 +#define ZONE_o198 0x0 + diff --git a/include/mapfs/dgb_07_shape.h b/include/mapfs/dgb_07_shape.h index e0da17d55d..b183d02e3e 100644 --- a/include/mapfs/dgb_07_shape.h +++ b/include/mapfs/dgb_07_shape.h @@ -1,31 +1,32 @@ -#define MODEL_Root 0x1E -#define MODEL_g1 0x1D -#define MODEL_g10 0x1C -#define MODEL_o199 0x1B -#define MODEL_o198 0x1A -#define MODEL_o89 0x19 -#define MODEL_s07 0x18 -#define MODEL_g34 0x17 -#define MODEL_o158 0x16 -#define MODEL_Default 0x15 -#define MODEL_o197 0x14 -#define MODEL_o196 0x13 -#define MODEL_o190 0x12 -#define MODEL_o184 0x11 -#define MODEL_o183 0x10 -#define MODEL_o182 0xF -#define MODEL_o181 0xE -#define MODEL_g36 0xD -#define MODEL_o170 0xC -#define MODEL_o169 0xB -#define MODEL_o168 0xA -#define MODEL_o167 0x9 -#define MODEL_o166 0x8 -#define MODEL_o165 0x7 -#define MODEL_o164 0x6 -#define MODEL_o163 0x5 -#define MODEL_g35 0x4 -#define MODEL_o162 0x3 -#define MODEL_o161 0x2 -#define MODEL_o160 0x1 -#define MODEL_o159 0x0 +#define MODEL_Root 0x1E +#define MODEL_g1 0x1D +#define MODEL_g10 0x1C +#define MODEL_o199 0x1B +#define MODEL_o198 0x1A +#define MODEL_o89 0x19 +#define MODEL_s07 0x18 +#define MODEL_g34 0x17 +#define MODEL_o158 0x16 +#define MODEL_Default 0x15 +#define MODEL_o197 0x14 +#define MODEL_o196 0x13 +#define MODEL_o190 0x12 +#define MODEL_o184 0x11 +#define MODEL_o183 0x10 +#define MODEL_o182 0xF +#define MODEL_o181 0xE +#define MODEL_g36 0xD +#define MODEL_o170 0xC +#define MODEL_o169 0xB +#define MODEL_o168 0xA +#define MODEL_o167 0x9 +#define MODEL_o166 0x8 +#define MODEL_o165 0x7 +#define MODEL_o164 0x6 +#define MODEL_o163 0x5 +#define MODEL_g35 0x4 +#define MODEL_o162 0x3 +#define MODEL_o161 0x2 +#define MODEL_o160 0x1 +#define MODEL_o159 0x0 + diff --git a/include/mapfs/dgb_08_hit.h b/include/mapfs/dgb_08_hit.h index 0f8d196432..7a7caccfcf 100644 --- a/include/mapfs/dgb_08_hit.h +++ b/include/mapfs/dgb_08_hit.h @@ -1,23 +1,31 @@ -#define COLLIDER_Root 0x16 -#define COLLIDER_g1 0x15 -#define COLLIDER_g5 0x14 -#define COLLIDER_o157 0x13 -#define COLLIDER_deilittne 0x12 -#define COLLIDER_deilitne 0x11 -#define COLLIDER_deiline 0x10 -#define COLLIDER_o156 0xF -#define COLLIDER_deilittse 0xE -#define COLLIDER_deilitse 0xD -#define COLLIDER_deilise 0xC -#define COLLIDER_g7 0xB -#define COLLIDER_o151 0xA -#define COLLIDER_o129 0x9 -#define COLLIDER_o33 0x8 -#define COLLIDER_o149 0x7 -#define COLLIDER_o66 0x6 -#define COLLIDER_g2 0x5 -#define COLLIDER_o135 0x4 -#define COLLIDER_o75 0x3 -#define COLLIDER_o134 0x2 -#define COLLIDER_o61 0x1 -#define COLLIDER_o28 0x0 +#define COLLIDER_Root 0x16 +#define COLLIDER_g1 0x15 +#define COLLIDER_g5 0x14 +#define COLLIDER_o157 0x13 +#define COLLIDER_deilittne 0x12 +#define COLLIDER_deilitne 0x11 +#define COLLIDER_deiline 0x10 +#define COLLIDER_o156 0xF +#define COLLIDER_deilittse 0xE +#define COLLIDER_deilitse 0xD +#define COLLIDER_deilise 0xC +#define COLLIDER_g7 0xB +#define COLLIDER_o151 0xA +#define COLLIDER_o129 0x9 +#define COLLIDER_o33 0x8 +#define COLLIDER_o149 0x7 +#define COLLIDER_o66 0x6 +#define COLLIDER_g2 0x5 +#define COLLIDER_o135 0x4 +#define COLLIDER_o75 0x3 +#define COLLIDER_o134 0x2 +#define COLLIDER_o61 0x1 +#define COLLIDER_o28 0x0 + +#define ZONE_Root 0x5 +#define ZONE_g1 0x4 +#define ZONE_o162 0x3 +#define ZONE_o163 0x2 +#define ZONE_o164 0x1 +#define ZONE_o161 0x0 + diff --git a/include/mapfs/dgb_08_shape.h b/include/mapfs/dgb_08_shape.h index d0924b75d9..50ec7e3aa0 100644 --- a/include/mapfs/dgb_08_shape.h +++ b/include/mapfs/dgb_08_shape.h @@ -1,51 +1,52 @@ -#define MODEL_Root 0x32 -#define MODEL_g32 0x31 -#define MODEL_g47 0x30 -#define MODEL_o184 0x2F -#define MODEL_o183 0x2E -#define MODEL_o180 0x2D -#define MODEL_o179 0x2C -#define MODEL_o178 0x2B -#define MODEL_g43 0x2A -#define MODEL_o176 0x29 -#define MODEL_o150 0x28 -#define MODEL_o149 0x27 -#define MODEL_g45 0x26 -#define MODEL_o166 0x25 -#define MODEL_o165 0x24 -#define MODEL_o167 0x23 -#define MODEL_o169 0x22 -#define MODEL_g44 0x21 -#define MODEL_o159 0x20 -#define MODEL_o160 0x1F -#define MODEL_o163 0x1E -#define MODEL_o152 0x1D -#define MODEL_g35 0x1C -#define MODEL_g39 0x1B -#define MODEL_g41 0x1A -#define MODEL_o143 0x19 -#define MODEL_g40 0x18 -#define MODEL_o142 0x17 -#define MODEL_g36 0x16 -#define MODEL_g38 0x15 -#define MODEL_o141 0x14 -#define MODEL_g37 0x13 -#define MODEL_o140 0x12 -#define MODEL_g34 0x11 -#define MODEL_o139 0x10 -#define MODEL_o138 0xF -#define MODEL_g33 0xE -#define MODEL_o177 0xD -#define MODEL_o137 0xC -#define MODEL_o136 0xB -#define MODEL_o135 0xA -#define MODEL_o134 0x9 -#define MODEL_o133 0x8 -#define MODEL_o132 0x7 -#define MODEL_o131 0x6 -#define MODEL_o130 0x5 -#define MODEL_o129 0x4 -#define MODEL_o128 0x3 -#define MODEL_o127 0x2 -#define MODEL_o126 0x1 -#define MODEL_o125 0x0 +#define MODEL_Root 0x32 +#define MODEL_g32 0x31 +#define MODEL_g47 0x30 +#define MODEL_o184 0x2F +#define MODEL_o183 0x2E +#define MODEL_o180 0x2D +#define MODEL_o179 0x2C +#define MODEL_o178 0x2B +#define MODEL_g43 0x2A +#define MODEL_o176 0x29 +#define MODEL_o150 0x28 +#define MODEL_o149 0x27 +#define MODEL_g45 0x26 +#define MODEL_o166 0x25 +#define MODEL_o165 0x24 +#define MODEL_o167 0x23 +#define MODEL_o169 0x22 +#define MODEL_g44 0x21 +#define MODEL_o159 0x20 +#define MODEL_o160 0x1F +#define MODEL_o163 0x1E +#define MODEL_o152 0x1D +#define MODEL_g35 0x1C +#define MODEL_g39 0x1B +#define MODEL_g41 0x1A +#define MODEL_o143 0x19 +#define MODEL_g40 0x18 +#define MODEL_o142 0x17 +#define MODEL_g36 0x16 +#define MODEL_g38 0x15 +#define MODEL_o141 0x14 +#define MODEL_g37 0x13 +#define MODEL_o140 0x12 +#define MODEL_g34 0x11 +#define MODEL_o139 0x10 +#define MODEL_o138 0xF +#define MODEL_g33 0xE +#define MODEL_o177 0xD +#define MODEL_o137 0xC +#define MODEL_o136 0xB +#define MODEL_o135 0xA +#define MODEL_o134 0x9 +#define MODEL_o133 0x8 +#define MODEL_o132 0x7 +#define MODEL_o131 0x6 +#define MODEL_o130 0x5 +#define MODEL_o129 0x4 +#define MODEL_o128 0x3 +#define MODEL_o127 0x2 +#define MODEL_o126 0x1 +#define MODEL_o125 0x0 + diff --git a/include/mapfs/dgb_09_hit.h b/include/mapfs/dgb_09_hit.h index 2f76be90a7..9eb89ddae3 100644 --- a/include/mapfs/dgb_09_hit.h +++ b/include/mapfs/dgb_09_hit.h @@ -1,22 +1,28 @@ -#define COLLIDER_Root 0x15 -#define COLLIDER_g1 0x14 -#define COLLIDER_g5 0x13 -#define COLLIDER_o98 0x12 -#define COLLIDER_deilitte 0x11 -#define COLLIDER_deilite 0x10 -#define COLLIDER_deilie 0xF -#define COLLIDER_o108 0xE -#define COLLIDER_deilittne 0xD -#define COLLIDER_deilitne 0xC -#define COLLIDER_deiline 0xB -#define COLLIDER_o78 0xA -#define COLLIDER_deilittnw 0x9 -#define COLLIDER_deilitnw 0x8 -#define COLLIDER_deilinw 0x7 -#define COLLIDER_o29 0x6 -#define COLLIDER_deilittw 0x5 -#define COLLIDER_deilitw 0x4 -#define COLLIDER_deiliw 0x3 -#define COLLIDER_g2 0x2 -#define COLLIDER_o74 0x1 -#define COLLIDER_o66 0x0 +#define COLLIDER_Root 0x15 +#define COLLIDER_g1 0x14 +#define COLLIDER_g5 0x13 +#define COLLIDER_o98 0x12 +#define COLLIDER_deilitte 0x11 +#define COLLIDER_deilite 0x10 +#define COLLIDER_deilie 0xF +#define COLLIDER_o108 0xE +#define COLLIDER_deilittne 0xD +#define COLLIDER_deilitne 0xC +#define COLLIDER_deiline 0xB +#define COLLIDER_o78 0xA +#define COLLIDER_deilittnw 0x9 +#define COLLIDER_deilitnw 0x8 +#define COLLIDER_deilinw 0x7 +#define COLLIDER_o29 0x6 +#define COLLIDER_deilittw 0x5 +#define COLLIDER_deilitw 0x4 +#define COLLIDER_deiliw 0x3 +#define COLLIDER_g2 0x2 +#define COLLIDER_o74 0x1 +#define COLLIDER_o66 0x0 + +#define ZONE_Root 0x3 +#define ZONE_g1 0x2 +#define ZONE_deiline 0x1 +#define ZONE_deilinw 0x0 + diff --git a/include/mapfs/dgb_09_shape.h b/include/mapfs/dgb_09_shape.h index 5c15b0aeec..251b5b39d9 100644 --- a/include/mapfs/dgb_09_shape.h +++ b/include/mapfs/dgb_09_shape.h @@ -1,89 +1,90 @@ -#define MODEL_Root 0x58 -#define MODEL_g1 0x57 -#define MODEL_g38 0x56 -#define MODEL_o163 0x55 -#define MODEL_o162 0x54 -#define MODEL_o161 0x53 -#define MODEL_o160 0x52 -#define MODEL_g10 0x51 -#define MODEL_o90 0x50 -#define MODEL_o89 0x4F -#define MODEL_g7 0x4E -#define MODEL_g31 0x4D -#define MODEL_g36 0x4C -#define MODEL_o155 0x4B -#define MODEL_o157 0x4A -#define MODEL_o154 0x49 -#define MODEL_o152 0x48 -#define MODEL_o156 0x47 -#define MODEL_o153 0x46 -#define MODEL_o151 0x45 -#define MODEL_g35 0x44 -#define MODEL_o148 0x43 -#define MODEL_o150 0x42 -#define MODEL_o147 0x41 -#define MODEL_o145 0x40 -#define MODEL_o149 0x3F -#define MODEL_o146 0x3E -#define MODEL_o144 0x3D -#define MODEL_g34 0x3C -#define MODEL_o143 0x3B -#define MODEL_o141 0x3A -#define MODEL_o140 0x39 -#define MODEL_o138 0x38 -#define MODEL_o142 0x37 -#define MODEL_o139 0x36 -#define MODEL_o137 0x35 -#define MODEL_g33 0x34 -#define MODEL_o136 0x33 -#define MODEL_o135 0x32 -#define MODEL_o134 0x31 -#define MODEL_o133 0x30 -#define MODEL_o131 0x2F -#define MODEL_o132 0x2E -#define MODEL_o130 0x2D -#define MODEL_g32 0x2C -#define MODEL_o129 0x2B -#define MODEL_o128 0x2A -#define MODEL_o127 0x29 -#define MODEL_o126 0x28 -#define MODEL_o124 0x27 -#define MODEL_o125 0x26 -#define MODEL_o123 0x25 -#define MODEL_o85 0x24 -#define MODEL_o84 0x23 -#define MODEL_o27 0x22 -#define MODEL_g5 0x21 -#define MODEL_o165 0x20 -#define MODEL_o164 0x1F -#define MODEL_g27 0x1E -#define MODEL_g29 0x1D -#define MODEL_o119 0x1C -#define MODEL_o117 0x1B -#define MODEL_o120 0x1A -#define MODEL_g28 0x19 -#define MODEL_o118 0x18 -#define MODEL_o113 0x17 -#define MODEL_o109 0x16 -#define MODEL_g26 0x15 -#define MODEL_o76 0x14 -#define MODEL_g16 0x13 -#define MODEL_g18 0x12 -#define MODEL_o102 0x11 -#define MODEL_g17 0x10 -#define MODEL_o101 0xF -#define MODEL_g13 0xE -#define MODEL_g15 0xD -#define MODEL_o31 0xC -#define MODEL_g14 0xB -#define MODEL_o30 0xA -#define MODEL_g2 0x9 -#define MODEL_o61 0x8 -#define MODEL_o29 0x7 -#define MODEL_o98 0x6 -#define MODEL_o78 0x5 -#define MODEL_o75 0x4 -#define MODEL_o74 0x3 -#define MODEL_o66 0x2 -#define MODEL_o33 0x1 -#define MODEL_o28 0x0 +#define MODEL_Root 0x58 +#define MODEL_g1 0x57 +#define MODEL_g38 0x56 +#define MODEL_o163 0x55 +#define MODEL_o162 0x54 +#define MODEL_o161 0x53 +#define MODEL_o160 0x52 +#define MODEL_g10 0x51 +#define MODEL_o90 0x50 +#define MODEL_o89 0x4F +#define MODEL_g7 0x4E +#define MODEL_g31 0x4D +#define MODEL_g36 0x4C +#define MODEL_o155 0x4B +#define MODEL_o157 0x4A +#define MODEL_o154 0x49 +#define MODEL_o152 0x48 +#define MODEL_o156 0x47 +#define MODEL_o153 0x46 +#define MODEL_o151 0x45 +#define MODEL_g35 0x44 +#define MODEL_o148 0x43 +#define MODEL_o150 0x42 +#define MODEL_o147 0x41 +#define MODEL_o145 0x40 +#define MODEL_o149 0x3F +#define MODEL_o146 0x3E +#define MODEL_o144 0x3D +#define MODEL_g34 0x3C +#define MODEL_o143 0x3B +#define MODEL_o141 0x3A +#define MODEL_o140 0x39 +#define MODEL_o138 0x38 +#define MODEL_o142 0x37 +#define MODEL_o139 0x36 +#define MODEL_o137 0x35 +#define MODEL_g33 0x34 +#define MODEL_o136 0x33 +#define MODEL_o135 0x32 +#define MODEL_o134 0x31 +#define MODEL_o133 0x30 +#define MODEL_o131 0x2F +#define MODEL_o132 0x2E +#define MODEL_o130 0x2D +#define MODEL_g32 0x2C +#define MODEL_o129 0x2B +#define MODEL_o128 0x2A +#define MODEL_o127 0x29 +#define MODEL_o126 0x28 +#define MODEL_o124 0x27 +#define MODEL_o125 0x26 +#define MODEL_o123 0x25 +#define MODEL_o85 0x24 +#define MODEL_o84 0x23 +#define MODEL_o27 0x22 +#define MODEL_g5 0x21 +#define MODEL_o165 0x20 +#define MODEL_o164 0x1F +#define MODEL_g27 0x1E +#define MODEL_g29 0x1D +#define MODEL_o119 0x1C +#define MODEL_o117 0x1B +#define MODEL_o120 0x1A +#define MODEL_g28 0x19 +#define MODEL_o118 0x18 +#define MODEL_o113 0x17 +#define MODEL_o109 0x16 +#define MODEL_g26 0x15 +#define MODEL_o76 0x14 +#define MODEL_g16 0x13 +#define MODEL_g18 0x12 +#define MODEL_o102 0x11 +#define MODEL_g17 0x10 +#define MODEL_o101 0xF +#define MODEL_g13 0xE +#define MODEL_g15 0xD +#define MODEL_o31 0xC +#define MODEL_g14 0xB +#define MODEL_o30 0xA +#define MODEL_g2 0x9 +#define MODEL_o61 0x8 +#define MODEL_o29 0x7 +#define MODEL_o98 0x6 +#define MODEL_o78 0x5 +#define MODEL_o75 0x4 +#define MODEL_o74 0x3 +#define MODEL_o66 0x2 +#define MODEL_o33 0x1 +#define MODEL_o28 0x0 + diff --git a/include/mapfs/dgb_10_hit.h b/include/mapfs/dgb_10_hit.h index 5a17118d5b..d0b01500fa 100644 --- a/include/mapfs/dgb_10_hit.h +++ b/include/mapfs/dgb_10_hit.h @@ -1,19 +1,27 @@ -#define COLLIDER_Root 0x12 -#define COLLIDER_g1 0x11 -#define COLLIDER_s10 0x10 -#define COLLIDER_g31 0xF -#define COLLIDER_deilitt3 0xE -#define COLLIDER_deilitt2 0xD -#define COLLIDER_deilitt1 0xC -#define COLLIDER_o197 0xB -#define COLLIDER_deilitts 0xA -#define COLLIDER_deilits 0x9 -#define COLLIDER_deilis 0x8 -#define COLLIDER_g28 0x7 -#define COLLIDER_o127 0x6 -#define COLLIDER_o133 0x5 -#define COLLIDER_o129 0x4 -#define COLLIDER_o125 0x3 -#define COLLIDER_o178 0x2 -#define COLLIDER_o177 0x1 -#define COLLIDER_o174 0x0 +#define COLLIDER_Root 0x12 +#define COLLIDER_g1 0x11 +#define COLLIDER_s10 0x10 +#define COLLIDER_g31 0xF +#define COLLIDER_deilitt3 0xE +#define COLLIDER_deilitt2 0xD +#define COLLIDER_deilitt1 0xC +#define COLLIDER_o197 0xB +#define COLLIDER_deilitts 0xA +#define COLLIDER_deilits 0x9 +#define COLLIDER_deilis 0x8 +#define COLLIDER_g28 0x7 +#define COLLIDER_o127 0x6 +#define COLLIDER_o133 0x5 +#define COLLIDER_o129 0x4 +#define COLLIDER_o125 0x3 +#define COLLIDER_o178 0x2 +#define COLLIDER_o177 0x1 +#define COLLIDER_o174 0x0 + +#define ZONE_Root 0x5 +#define ZONE_g1 0x4 +#define ZONE_s10 0x3 +#define ZONE_deilis 0x2 +#define ZONE_o199 0x1 +#define ZONE_o198 0x0 + diff --git a/include/mapfs/dgb_10_shape.h b/include/mapfs/dgb_10_shape.h index 37eeea385a..d30488edc3 100644 --- a/include/mapfs/dgb_10_shape.h +++ b/include/mapfs/dgb_10_shape.h @@ -1,38 +1,39 @@ -#define MODEL_Root 0x25 -#define MODEL_g1 0x24 -#define MODEL_g10 0x23 -#define MODEL_o90 0x22 -#define MODEL_s10 0x21 -#define MODEL_g42 0x20 -#define MODEL_o207 0x1F -#define MODEL_o206 0x1E -#define MODEL_g31 0x1D -#define MODEL_o153 0x1C -#define MODEL_o152 0x1B -#define MODEL_o151 0x1A -#define MODEL_o150 0x19 -#define MODEL_g28 0x18 -#define MODEL_g39 0x17 -#define MODEL_g48 0x16 -#define MODEL_o174 0x15 -#define MODEL_o191 0x14 -#define MODEL_g47 0x13 -#define MODEL_o113 0x12 -#define MODEL_g38 0x11 -#define MODEL_g46 0x10 -#define MODEL_o177 0xF -#define MODEL_o192 0xE -#define MODEL_g45 0xD -#define MODEL_o116 0xC -#define MODEL_g37 0xB -#define MODEL_g44 0xA -#define MODEL_o178 0x9 -#define MODEL_o193 0x8 -#define MODEL_g43 0x7 -#define MODEL_o117 0x6 -#define MODEL_g40 0x5 -#define MODEL_o133 0x4 -#define MODEL_o131 0x3 -#define MODEL_o129 0x2 -#define MODEL_o127 0x1 -#define MODEL_o125 0x0 +#define MODEL_Root 0x25 +#define MODEL_g1 0x24 +#define MODEL_g10 0x23 +#define MODEL_o90 0x22 +#define MODEL_s10 0x21 +#define MODEL_g42 0x20 +#define MODEL_o207 0x1F +#define MODEL_o206 0x1E +#define MODEL_g31 0x1D +#define MODEL_o153 0x1C +#define MODEL_o152 0x1B +#define MODEL_o151 0x1A +#define MODEL_o150 0x19 +#define MODEL_g28 0x18 +#define MODEL_g39 0x17 +#define MODEL_g48 0x16 +#define MODEL_o174 0x15 +#define MODEL_o191 0x14 +#define MODEL_g47 0x13 +#define MODEL_o113 0x12 +#define MODEL_g38 0x11 +#define MODEL_g46 0x10 +#define MODEL_o177 0xF +#define MODEL_o192 0xE +#define MODEL_g45 0xD +#define MODEL_o116 0xC +#define MODEL_g37 0xB +#define MODEL_g44 0xA +#define MODEL_o178 0x9 +#define MODEL_o193 0x8 +#define MODEL_g43 0x7 +#define MODEL_o117 0x6 +#define MODEL_g40 0x5 +#define MODEL_o133 0x4 +#define MODEL_o131 0x3 +#define MODEL_o129 0x2 +#define MODEL_o127 0x1 +#define MODEL_o125 0x0 + diff --git a/include/mapfs/dgb_11_hit.h b/include/mapfs/dgb_11_hit.h index 8185a8869f..b24a00a7f7 100644 --- a/include/mapfs/dgb_11_hit.h +++ b/include/mapfs/dgb_11_hit.h @@ -1,20 +1,31 @@ -#define COLLIDER_Root 0x13 -#define COLLIDER_g1 0x12 -#define COLLIDER_g43 0x11 -#define COLLIDER_o207 0x10 -#define COLLIDER_s10 0xF -#define COLLIDER_g31 0xE -#define COLLIDER_o197 0xD -#define COLLIDER_deilitts 0xC -#define COLLIDER_deilits 0xB -#define COLLIDER_deilis 0xA -#define COLLIDER_g28 0x9 -#define COLLIDER_o206 0x8 -#define COLLIDER_o205 0x7 -#define COLLIDER_o204 0x6 -#define COLLIDER_o201 0x5 -#define COLLIDER_o198 0x4 -#define COLLIDER_o127 0x3 -#define COLLIDER_o133 0x2 -#define COLLIDER_o129 0x1 -#define COLLIDER_o125 0x0 +#define COLLIDER_Root 0x13 +#define COLLIDER_g1 0x12 +#define COLLIDER_g43 0x11 +#define COLLIDER_o207 0x10 +#define COLLIDER_s10 0xF +#define COLLIDER_g31 0xE +#define COLLIDER_o197 0xD +#define COLLIDER_deilitts 0xC +#define COLLIDER_deilits 0xB +#define COLLIDER_deilis 0xA +#define COLLIDER_g28 0x9 +#define COLLIDER_o206 0x8 +#define COLLIDER_o205 0x7 +#define COLLIDER_o204 0x6 +#define COLLIDER_o201 0x5 +#define COLLIDER_o198 0x4 +#define COLLIDER_o127 0x3 +#define COLLIDER_o133 0x2 +#define COLLIDER_o129 0x1 +#define COLLIDER_o125 0x0 + +#define ZONE_Root 0x8 +#define ZONE_g1 0x7 +#define ZONE_g43 0x6 +#define ZONE_o203 0x5 +#define ZONE_o202 0x4 +#define ZONE_s10 0x3 +#define ZONE_deilis 0x2 +#define ZONE_o199 0x1 +#define ZONE_o198 0x0 + diff --git a/include/mapfs/dgb_11_shape.h b/include/mapfs/dgb_11_shape.h index 927ffc0472..cdd4a22cdf 100644 --- a/include/mapfs/dgb_11_shape.h +++ b/include/mapfs/dgb_11_shape.h @@ -1,34 +1,35 @@ -#define MODEL_Root 0x21 -#define MODEL_g1 0x20 -#define MODEL_g10 0x1F -#define MODEL_o90 0x1E -#define MODEL_s11 0x1D -#define MODEL_g40 0x1C -#define MODEL_o194 0x1B -#define MODEL_o193 0x1A -#define MODEL_o192 0x19 -#define MODEL_o191 0x18 -#define MODEL_o190 0x17 -#define MODEL_g27 0x16 -#define MODEL_o109 0x15 -#define MODEL_g37 0x14 -#define MODEL_o185 0x13 -#define MODEL_o182 0x12 -#define MODEL_o180 0x11 -#define MODEL_o179 0x10 -#define MODEL_o178 0xF -#define MODEL_o177 0xE -#define MODEL_g31 0xD -#define MODEL_o153 0xC -#define MODEL_o152 0xB -#define MODEL_o151 0xA -#define MODEL_o150 0x9 -#define MODEL_g28 0x8 -#define MODEL_o189 0x7 -#define MODEL_o188 0x6 -#define MODEL_o187 0x5 -#define MODEL_o186 0x4 -#define MODEL_o173 0x3 -#define MODEL_o133 0x2 -#define MODEL_o131 0x1 -#define MODEL_o127 0x0 +#define MODEL_Root 0x21 +#define MODEL_g1 0x20 +#define MODEL_g10 0x1F +#define MODEL_o90 0x1E +#define MODEL_s11 0x1D +#define MODEL_g40 0x1C +#define MODEL_o194 0x1B +#define MODEL_o193 0x1A +#define MODEL_o192 0x19 +#define MODEL_o191 0x18 +#define MODEL_o190 0x17 +#define MODEL_g27 0x16 +#define MODEL_o109 0x15 +#define MODEL_g37 0x14 +#define MODEL_o185 0x13 +#define MODEL_o182 0x12 +#define MODEL_o180 0x11 +#define MODEL_o179 0x10 +#define MODEL_o178 0xF +#define MODEL_o177 0xE +#define MODEL_g31 0xD +#define MODEL_o153 0xC +#define MODEL_o152 0xB +#define MODEL_o151 0xA +#define MODEL_o150 0x9 +#define MODEL_g28 0x8 +#define MODEL_o189 0x7 +#define MODEL_o188 0x6 +#define MODEL_o187 0x5 +#define MODEL_o186 0x4 +#define MODEL_o173 0x3 +#define MODEL_o133 0x2 +#define MODEL_o131 0x1 +#define MODEL_o127 0x0 + diff --git a/include/mapfs/dgb_12_hit.h b/include/mapfs/dgb_12_hit.h index 50db0b2d9c..fbb102cb4a 100644 --- a/include/mapfs/dgb_12_hit.h +++ b/include/mapfs/dgb_12_hit.h @@ -1,19 +1,27 @@ -#define COLLIDER_Root 0x12 -#define COLLIDER_g1 0x11 -#define COLLIDER_s10 0x10 -#define COLLIDER_g46 0xF -#define COLLIDER_o216 0xE -#define COLLIDER_Default 0xD -#define COLLIDER_o202 0xC -#define COLLIDER_g31 0xB -#define COLLIDER_o197 0xA -#define COLLIDER_deilitts 0x9 -#define COLLIDER_deilits 0x8 -#define COLLIDER_deilis 0x7 -#define COLLIDER_g28 0x6 -#define COLLIDER_o200 0x5 -#define COLLIDER_o127 0x4 -#define COLLIDER_o133 0x3 -#define COLLIDER_o129 0x2 -#define COLLIDER_g52 0x1 -#define COLLIDER_o215 0x0 +#define COLLIDER_Root 0x12 +#define COLLIDER_g1 0x11 +#define COLLIDER_s10 0x10 +#define COLLIDER_g46 0xF +#define COLLIDER_o216 0xE +#define COLLIDER_Default 0xD +#define COLLIDER_o202 0xC +#define COLLIDER_g31 0xB +#define COLLIDER_o197 0xA +#define COLLIDER_deilitts 0x9 +#define COLLIDER_deilits 0x8 +#define COLLIDER_deilis 0x7 +#define COLLIDER_g28 0x6 +#define COLLIDER_o200 0x5 +#define COLLIDER_o127 0x4 +#define COLLIDER_o133 0x3 +#define COLLIDER_o129 0x2 +#define COLLIDER_g52 0x1 +#define COLLIDER_o215 0x0 + +#define ZONE_Root 0x5 +#define ZONE_g1 0x4 +#define ZONE_s10 0x3 +#define ZONE_deilis 0x2 +#define ZONE_o199 0x1 +#define ZONE_o198 0x0 + diff --git a/include/mapfs/dgb_12_shape.h b/include/mapfs/dgb_12_shape.h index c1a47e3802..40137da137 100644 --- a/include/mapfs/dgb_12_shape.h +++ b/include/mapfs/dgb_12_shape.h @@ -1,23 +1,24 @@ -#define MODEL_Root 0x16 -#define MODEL_g1 0x15 -#define MODEL_Default 0x14 -#define MODEL_o190 0x13 -#define MODEL_g10 0x12 -#define MODEL_o89 0x11 -#define MODEL_g5 0x10 -#define MODEL_g34 0xF -#define MODEL_o158 0xE -#define MODEL_g36 0xD -#define MODEL_o167 0xC -#define MODEL_o166 0xB -#define MODEL_o165 0xA -#define MODEL_o164 0x9 -#define MODEL_g38 0x8 -#define MODEL_o194 0x7 -#define MODEL_o193 0x6 -#define MODEL_o188 0x5 -#define MODEL_g35 0x4 -#define MODEL_o162 0x3 -#define MODEL_o161 0x2 -#define MODEL_o160 0x1 -#define MODEL_o159 0x0 +#define MODEL_Root 0x16 +#define MODEL_g1 0x15 +#define MODEL_Default 0x14 +#define MODEL_o190 0x13 +#define MODEL_g10 0x12 +#define MODEL_o89 0x11 +#define MODEL_g5 0x10 +#define MODEL_g34 0xF +#define MODEL_o158 0xE +#define MODEL_g36 0xD +#define MODEL_o167 0xC +#define MODEL_o166 0xB +#define MODEL_o165 0xA +#define MODEL_o164 0x9 +#define MODEL_g38 0x8 +#define MODEL_o194 0x7 +#define MODEL_o193 0x6 +#define MODEL_o188 0x5 +#define MODEL_g35 0x4 +#define MODEL_o162 0x3 +#define MODEL_o161 0x2 +#define MODEL_o160 0x1 +#define MODEL_o159 0x0 + diff --git a/include/mapfs/dgb_13_hit.h b/include/mapfs/dgb_13_hit.h index df765243fc..534e366b92 100644 --- a/include/mapfs/dgb_13_hit.h +++ b/include/mapfs/dgb_13_hit.h @@ -1,51 +1,76 @@ -#define COLLIDER_Root 0x32 -#define COLLIDER_g1 0x31 -#define COLLIDER_s10 0x30 -#define COLLIDER_g47 0x2F -#define COLLIDER_g48 0x2E -#define COLLIDER_o229 0x2D -#define COLLIDER_o228 0x2C -#define COLLIDER_o227 0x2B -#define COLLIDER_g45 0x2A -#define COLLIDER_o276 0x29 -#define COLLIDER_o223 0x28 -#define COLLIDER_o219 0x27 -#define COLLIDER_o218 0x26 -#define COLLIDER_g44 0x25 -#define COLLIDER_g62 0x24 -#define COLLIDER_o262 0x23 -#define COLLIDER_g61 0x22 -#define COLLIDER_o274 0x21 -#define COLLIDER_tansu_a 0x20 -#define COLLIDER_a4 0x1F -#define COLLIDER_o273 0x1E -#define COLLIDER_a3 0x1D -#define COLLIDER_o272 0x1C -#define COLLIDER_a2 0x1B -#define COLLIDER_o271 0x1A -#define COLLIDER_a1 0x19 -#define COLLIDER_o270 0x18 -#define COLLIDER_g64 0x17 -#define COLLIDER_o269 0x16 -#define COLLIDER_tansu_b 0x15 -#define COLLIDER_b4 0x14 -#define COLLIDER_o268 0x13 -#define COLLIDER_b3 0x12 -#define COLLIDER_o267 0x11 -#define COLLIDER_b2 0x10 -#define COLLIDER_o266 0xF -#define COLLIDER_b1 0xE -#define COLLIDER_o265 0xD -#define COLLIDER_g50 0xC -#define COLLIDER_o264 0xB -#define COLLIDER_o214 0xA -#define COLLIDER_g31 0x9 -#define COLLIDER_o197 0x8 -#define COLLIDER_deilitts 0x7 -#define COLLIDER_deilits 0x6 -#define COLLIDER_deilis 0x5 -#define COLLIDER_g28 0x4 -#define COLLIDER_o200 0x3 -#define COLLIDER_o127 0x2 -#define COLLIDER_o133 0x1 -#define COLLIDER_o129 0x0 +#define COLLIDER_Root 0x32 +#define COLLIDER_g1 0x31 +#define COLLIDER_s10 0x30 +#define COLLIDER_g47 0x2F +#define COLLIDER_g48 0x2E +#define COLLIDER_o229 0x2D +#define COLLIDER_o228 0x2C +#define COLLIDER_o227 0x2B +#define COLLIDER_g45 0x2A +#define COLLIDER_o276 0x29 +#define COLLIDER_o223 0x28 +#define COLLIDER_o219 0x27 +#define COLLIDER_o218 0x26 +#define COLLIDER_g44 0x25 +#define COLLIDER_g62 0x24 +#define COLLIDER_o262 0x23 +#define COLLIDER_g61 0x22 +#define COLLIDER_o274 0x21 +#define COLLIDER_tansu_a 0x20 +#define COLLIDER_a4 0x1F +#define COLLIDER_o273 0x1E +#define COLLIDER_a3 0x1D +#define COLLIDER_o272 0x1C +#define COLLIDER_a2 0x1B +#define COLLIDER_o271 0x1A +#define COLLIDER_a1 0x19 +#define COLLIDER_o270 0x18 +#define COLLIDER_g64 0x17 +#define COLLIDER_o269 0x16 +#define COLLIDER_tansu_b 0x15 +#define COLLIDER_b4 0x14 +#define COLLIDER_o268 0x13 +#define COLLIDER_b3 0x12 +#define COLLIDER_o267 0x11 +#define COLLIDER_b2 0x10 +#define COLLIDER_o266 0xF +#define COLLIDER_b1 0xE +#define COLLIDER_o265 0xD +#define COLLIDER_g50 0xC +#define COLLIDER_o264 0xB +#define COLLIDER_o214 0xA +#define COLLIDER_g31 0x9 +#define COLLIDER_o197 0x8 +#define COLLIDER_deilitts 0x7 +#define COLLIDER_deilits 0x6 +#define COLLIDER_deilis 0x5 +#define COLLIDER_g28 0x4 +#define COLLIDER_o200 0x3 +#define COLLIDER_o127 0x2 +#define COLLIDER_o133 0x1 +#define COLLIDER_o129 0x0 + +#define ZONE_Root 0x16 +#define ZONE_g1 0x15 +#define ZONE_g54 0x14 +#define ZONE_o277 0x13 +#define ZONE_o276 0x12 +#define ZONE_o254 0x11 +#define ZONE_o256 0x10 +#define ZONE_o272 0xF +#define ZONE_o273 0xE +#define ZONE_o262 0xD +#define ZONE_o264 0xC +#define ZONE_o266 0xB +#define ZONE_o268 0xA +#define ZONE_o270 0x9 +#define ZONE_o271 0x8 +#define ZONE_g45 0x7 +#define ZONE_o242 0x6 +#define ZONE_o241 0x5 +#define ZONE_o239 0x4 +#define ZONE_s10 0x3 +#define ZONE_deilis 0x2 +#define ZONE_o199 0x1 +#define ZONE_o198 0x0 + diff --git a/include/mapfs/dgb_13_shape.h b/include/mapfs/dgb_13_shape.h index f0c6fffab8..5af9c8e65b 100644 --- a/include/mapfs/dgb_13_shape.h +++ b/include/mapfs/dgb_13_shape.h @@ -1,84 +1,85 @@ -#define MODEL_Root 0x53 -#define MODEL_g67 0x52 -#define MODEL_o343 0x51 -#define MODEL_g68 0x50 -#define MODEL_o339 0x4F -#define MODEL_o311 0x4E -#define MODEL_o326 0x4D -#define MODEL_o324 0x4C -#define MODEL_o321 0x4B -#define MODEL_o318 0x4A -#define MODEL_Default 0x49 -#define MODEL_o292 0x48 -#define MODEL_o280 0x47 -#define MODEL_g1 0x46 -#define MODEL_o294 0x45 -#define MODEL_o293 0x44 -#define MODEL_s07 0x43 -#define MODEL_g39 0x42 -#define MODEL_g65 0x41 -#define MODEL_o431 0x40 -#define MODEL_o288 0x3F -#define MODEL_o287 0x3E -#define MODEL_o286 0x3D -#define MODEL_g64 0x3C -#define MODEL_o290 0x3B -#define MODEL_o289 0x3A -#define MODEL_tansu_b 0x39 -#define MODEL_b4 0x38 -#define MODEL_o429 0x37 -#define MODEL_o428 0x36 -#define MODEL_b3 0x35 -#define MODEL_o426 0x34 -#define MODEL_o425 0x33 -#define MODEL_b2 0x32 -#define MODEL_o423 0x31 -#define MODEL_o422 0x30 -#define MODEL_b1 0x2F -#define MODEL_o421 0x2E -#define MODEL_o420 0x2D -#define MODEL_o419 0x2C -#define MODEL_g96 0x2B -#define MODEL_o418 0x2A -#define MODEL_tansu_a 0x29 -#define MODEL_a4 0x28 -#define MODEL_o417 0x27 -#define MODEL_o413 0x26 -#define MODEL_a3 0x25 -#define MODEL_o405 0x24 -#define MODEL_o404 0x23 -#define MODEL_a2 0x22 -#define MODEL_o412 0x21 -#define MODEL_o416 0x20 -#define MODEL_o410 0x1F -#define MODEL_a1 0x1E -#define MODEL_o273 0x1D -#define MODEL_o272 0x1C -#define MODEL_g43 0x1B -#define MODEL_o215 0x1A -#define MODEL_g42 0x19 -#define MODEL_o295 0x18 -#define MODEL_o238 0x17 -#define MODEL_o203 0x16 -#define MODEL_o202 0x15 -#define MODEL_g59 0x14 -#define MODEL_o271 0x13 -#define MODEL_o270 0x12 -#define MODEL_o269 0x11 -#define MODEL_g40 0x10 -#define MODEL_o190 0xF -#define MODEL_o184 0xE -#define MODEL_o183 0xD -#define MODEL_g35 0xC -#define MODEL_bet 0xB -#define MODEL_o89 0xA -#define MODEL_o344 0x9 -#define MODEL_o167 0x8 -#define MODEL_o166 0x7 -#define MODEL_o165 0x6 -#define MODEL_o164 0x5 -#define MODEL_o163 0x4 -#define MODEL_o162 0x3 -#define MODEL_o161 0x2 -#define MODEL_o160 0x1 -#define MODEL_o159 0x0 +#define MODEL_Root 0x53 +#define MODEL_g67 0x52 +#define MODEL_o343 0x51 +#define MODEL_g68 0x50 +#define MODEL_o339 0x4F +#define MODEL_o311 0x4E +#define MODEL_o326 0x4D +#define MODEL_o324 0x4C +#define MODEL_o321 0x4B +#define MODEL_o318 0x4A +#define MODEL_Default 0x49 +#define MODEL_o292 0x48 +#define MODEL_o280 0x47 +#define MODEL_g1 0x46 +#define MODEL_o294 0x45 +#define MODEL_o293 0x44 +#define MODEL_s07 0x43 +#define MODEL_g39 0x42 +#define MODEL_g65 0x41 +#define MODEL_o431 0x40 +#define MODEL_o288 0x3F +#define MODEL_o287 0x3E +#define MODEL_o286 0x3D +#define MODEL_g64 0x3C +#define MODEL_o290 0x3B +#define MODEL_o289 0x3A +#define MODEL_tansu_b 0x39 +#define MODEL_b4 0x38 +#define MODEL_o429 0x37 +#define MODEL_o428 0x36 +#define MODEL_b3 0x35 +#define MODEL_o426 0x34 +#define MODEL_o425 0x33 +#define MODEL_b2 0x32 +#define MODEL_o423 0x31 +#define MODEL_o422 0x30 +#define MODEL_b1 0x2F +#define MODEL_o421 0x2E +#define MODEL_o420 0x2D +#define MODEL_o419 0x2C +#define MODEL_g96 0x2B +#define MODEL_o418 0x2A +#define MODEL_tansu_a 0x29 +#define MODEL_a4 0x28 +#define MODEL_o417 0x27 +#define MODEL_o413 0x26 +#define MODEL_a3 0x25 +#define MODEL_o405 0x24 +#define MODEL_o404 0x23 +#define MODEL_a2 0x22 +#define MODEL_o412 0x21 +#define MODEL_o416 0x20 +#define MODEL_o410 0x1F +#define MODEL_a1 0x1E +#define MODEL_o273 0x1D +#define MODEL_o272 0x1C +#define MODEL_g43 0x1B +#define MODEL_o215 0x1A +#define MODEL_g42 0x19 +#define MODEL_o295 0x18 +#define MODEL_o238 0x17 +#define MODEL_o203 0x16 +#define MODEL_o202 0x15 +#define MODEL_g59 0x14 +#define MODEL_o271 0x13 +#define MODEL_o270 0x12 +#define MODEL_o269 0x11 +#define MODEL_g40 0x10 +#define MODEL_o190 0xF +#define MODEL_o184 0xE +#define MODEL_o183 0xD +#define MODEL_g35 0xC +#define MODEL_bet 0xB +#define MODEL_o89 0xA +#define MODEL_o344 0x9 +#define MODEL_o167 0x8 +#define MODEL_o166 0x7 +#define MODEL_o165 0x6 +#define MODEL_o164 0x5 +#define MODEL_o163 0x4 +#define MODEL_o162 0x3 +#define MODEL_o161 0x2 +#define MODEL_o160 0x1 +#define MODEL_o159 0x0 + diff --git a/include/mapfs/dgb_14_hit.h b/include/mapfs/dgb_14_hit.h index 0f8d196432..b66756017b 100644 --- a/include/mapfs/dgb_14_hit.h +++ b/include/mapfs/dgb_14_hit.h @@ -1,23 +1,32 @@ -#define COLLIDER_Root 0x16 -#define COLLIDER_g1 0x15 -#define COLLIDER_g5 0x14 -#define COLLIDER_o157 0x13 -#define COLLIDER_deilittne 0x12 -#define COLLIDER_deilitne 0x11 -#define COLLIDER_deiline 0x10 -#define COLLIDER_o156 0xF -#define COLLIDER_deilittse 0xE -#define COLLIDER_deilitse 0xD -#define COLLIDER_deilise 0xC -#define COLLIDER_g7 0xB -#define COLLIDER_o151 0xA -#define COLLIDER_o129 0x9 -#define COLLIDER_o33 0x8 -#define COLLIDER_o149 0x7 -#define COLLIDER_o66 0x6 -#define COLLIDER_g2 0x5 -#define COLLIDER_o135 0x4 -#define COLLIDER_o75 0x3 -#define COLLIDER_o134 0x2 -#define COLLIDER_o61 0x1 -#define COLLIDER_o28 0x0 +#define COLLIDER_Root 0x16 +#define COLLIDER_g1 0x15 +#define COLLIDER_g5 0x14 +#define COLLIDER_o157 0x13 +#define COLLIDER_deilittne 0x12 +#define COLLIDER_deilitne 0x11 +#define COLLIDER_deiline 0x10 +#define COLLIDER_o156 0xF +#define COLLIDER_deilittse 0xE +#define COLLIDER_deilitse 0xD +#define COLLIDER_deilise 0xC +#define COLLIDER_g7 0xB +#define COLLIDER_o151 0xA +#define COLLIDER_o129 0x9 +#define COLLIDER_o33 0x8 +#define COLLIDER_o149 0x7 +#define COLLIDER_o66 0x6 +#define COLLIDER_g2 0x5 +#define COLLIDER_o135 0x4 +#define COLLIDER_o75 0x3 +#define COLLIDER_o134 0x2 +#define COLLIDER_o61 0x1 +#define COLLIDER_o28 0x0 + +#define ZONE_Root 0x6 +#define ZONE_g1 0x5 +#define ZONE_g33 0x4 +#define ZONE_o164 0x3 +#define ZONE_o163 0x2 +#define ZONE_o162 0x1 +#define ZONE_o161 0x0 + diff --git a/include/mapfs/dgb_14_shape.h b/include/mapfs/dgb_14_shape.h index d8f08595a8..1e9496bab6 100644 --- a/include/mapfs/dgb_14_shape.h +++ b/include/mapfs/dgb_14_shape.h @@ -1,45 +1,46 @@ -#define MODEL_Root 0x2C -#define MODEL_g1 0x2B -#define MODEL_g34 0x2A -#define MODEL_o155 0x29 -#define MODEL_o154 0x28 -#define MODEL_o153 0x27 -#define MODEL_o152 0x26 -#define MODEL_o151 0x25 -#define MODEL_g10 0x24 -#define MODEL_o90 0x23 -#define MODEL_o89 0x22 -#define MODEL_g7 0x21 -#define MODEL_o85 0x20 -#define MODEL_o84 0x1F -#define MODEL_o34 0x1E -#define MODEL_o129 0x1D -#define MODEL_o128 0x1C -#define MODEL_g5 0x1B -#define MODEL_g16 0x1A -#define MODEL_g18 0x19 -#define MODEL_o102 0x18 -#define MODEL_g17 0x17 -#define MODEL_o101 0x16 -#define MODEL_g13 0x15 -#define MODEL_g15 0x14 -#define MODEL_o31 0x13 -#define MODEL_g14 0x12 -#define MODEL_o30 0x11 -#define MODEL_g32 0x10 -#define MODEL_o150 0xF -#define MODEL_o149 0xE -#define MODEL_g2 0xD -#define MODEL_o135 0xC -#define MODEL_o29 0xB -#define MODEL_o75 0xA -#define MODEL_o108 0x9 -#define MODEL_o130 0x8 -#define MODEL_o133 0x7 -#define MODEL_o134 0x6 -#define MODEL_o125 0x5 -#define MODEL_o61 0x4 -#define MODEL_o98 0x3 -#define MODEL_o66 0x2 -#define MODEL_o33 0x1 -#define MODEL_o28 0x0 +#define MODEL_Root 0x2C +#define MODEL_g1 0x2B +#define MODEL_g34 0x2A +#define MODEL_o155 0x29 +#define MODEL_o154 0x28 +#define MODEL_o153 0x27 +#define MODEL_o152 0x26 +#define MODEL_o151 0x25 +#define MODEL_g10 0x24 +#define MODEL_o90 0x23 +#define MODEL_o89 0x22 +#define MODEL_g7 0x21 +#define MODEL_o85 0x20 +#define MODEL_o84 0x1F +#define MODEL_o34 0x1E +#define MODEL_o129 0x1D +#define MODEL_o128 0x1C +#define MODEL_g5 0x1B +#define MODEL_g16 0x1A +#define MODEL_g18 0x19 +#define MODEL_o102 0x18 +#define MODEL_g17 0x17 +#define MODEL_o101 0x16 +#define MODEL_g13 0x15 +#define MODEL_g15 0x14 +#define MODEL_o31 0x13 +#define MODEL_g14 0x12 +#define MODEL_o30 0x11 +#define MODEL_g32 0x10 +#define MODEL_o150 0xF +#define MODEL_o149 0xE +#define MODEL_g2 0xD +#define MODEL_o135 0xC +#define MODEL_o29 0xB +#define MODEL_o75 0xA +#define MODEL_o108 0x9 +#define MODEL_o130 0x8 +#define MODEL_o133 0x7 +#define MODEL_o134 0x6 +#define MODEL_o125 0x5 +#define MODEL_o61 0x4 +#define MODEL_o98 0x3 +#define MODEL_o66 0x2 +#define MODEL_o33 0x1 +#define MODEL_o28 0x0 + diff --git a/include/mapfs/dgb_15_hit.h b/include/mapfs/dgb_15_hit.h index 28811feac4..2d0e6c43a8 100644 --- a/include/mapfs/dgb_15_hit.h +++ b/include/mapfs/dgb_15_hit.h @@ -1,25 +1,31 @@ -#define COLLIDER_Root 0x18 -#define COLLIDER_g28 0x17 -#define COLLIDER_g30 0x16 -#define COLLIDER_o130 0x15 -#define COLLIDER_o127 0x14 -#define COLLIDER_deilittw 0x13 -#define COLLIDER_deilitw 0x12 -#define COLLIDER_deiliw 0x11 -#define COLLIDER_g29 0x10 -#define COLLIDER_o123 0xF -#define COLLIDER_o122 0xE -#define COLLIDER_g1 0xD -#define COLLIDER_g5 0xC -#define COLLIDER_o98 0xB -#define COLLIDER_deilitte 0xA -#define COLLIDER_deilite 0x9 -#define COLLIDER_deilie 0x8 -#define COLLIDER_o108 0x7 -#define COLLIDER_deilittne 0x6 -#define COLLIDER_deilitne 0x5 -#define COLLIDER_deiline 0x4 -#define COLLIDER_deilittnw 0x3 -#define COLLIDER_g2 0x2 -#define COLLIDER_o74 0x1 -#define COLLIDER_o66 0x0 +#define COLLIDER_Root 0x18 +#define COLLIDER_g28 0x17 +#define COLLIDER_g30 0x16 +#define COLLIDER_o130 0x15 +#define COLLIDER_o127 0x14 +#define COLLIDER_deilittw 0x13 +#define COLLIDER_deilitw 0x12 +#define COLLIDER_deiliw 0x11 +#define COLLIDER_g29 0x10 +#define COLLIDER_o123 0xF +#define COLLIDER_o122 0xE +#define COLLIDER_g1 0xD +#define COLLIDER_g5 0xC +#define COLLIDER_o98 0xB +#define COLLIDER_deilitte 0xA +#define COLLIDER_deilite 0x9 +#define COLLIDER_deilie 0x8 +#define COLLIDER_o108 0x7 +#define COLLIDER_deilittne 0x6 +#define COLLIDER_deilitne 0x5 +#define COLLIDER_deiline 0x4 +#define COLLIDER_deilittnw 0x3 +#define COLLIDER_g2 0x2 +#define COLLIDER_o74 0x1 +#define COLLIDER_o66 0x0 + +#define ZONE_Root 0x3 +#define ZONE_g1 0x2 +#define ZONE_o136 0x1 +#define ZONE_o135 0x0 + diff --git a/include/mapfs/dgb_15_shape.h b/include/mapfs/dgb_15_shape.h index 66263455e3..2270cbd4ce 100644 --- a/include/mapfs/dgb_15_shape.h +++ b/include/mapfs/dgb_15_shape.h @@ -1,100 +1,101 @@ -#define MODEL_Root 0x63 -#define MODEL_g1 0x62 -#define MODEL_g62 0x61 -#define MODEL_o233 0x60 -#define MODEL_o232 0x5F -#define MODEL_o231 0x5E -#define MODEL_g50 0x5D -#define MODEL_g57 0x5C -#define MODEL_o206 0x5B -#define MODEL_o205 0x5A -#define MODEL_o204 0x59 -#define MODEL_o203 0x58 -#define MODEL_o202 0x57 -#define MODEL_o201 0x56 -#define MODEL_o200 0x55 -#define MODEL_g56 0x54 -#define MODEL_o199 0x53 -#define MODEL_o198 0x52 -#define MODEL_o197 0x51 -#define MODEL_o196 0x50 -#define MODEL_o195 0x4F -#define MODEL_o194 0x4E -#define MODEL_o193 0x4D -#define MODEL_g55 0x4C -#define MODEL_o192 0x4B -#define MODEL_o191 0x4A -#define MODEL_o190 0x49 -#define MODEL_o189 0x48 -#define MODEL_o188 0x47 -#define MODEL_o187 0x46 -#define MODEL_o186 0x45 -#define MODEL_g54 0x44 -#define MODEL_o185 0x43 -#define MODEL_o184 0x42 -#define MODEL_o183 0x41 -#define MODEL_o182 0x40 -#define MODEL_o181 0x3F -#define MODEL_o180 0x3E -#define MODEL_o179 0x3D -#define MODEL_g53 0x3C -#define MODEL_o178 0x3B -#define MODEL_o177 0x3A -#define MODEL_o176 0x39 -#define MODEL_o175 0x38 -#define MODEL_o174 0x37 -#define MODEL_o173 0x36 -#define MODEL_o172 0x35 -#define MODEL_g52 0x34 -#define MODEL_o171 0x33 -#define MODEL_o170 0x32 -#define MODEL_o169 0x31 -#define MODEL_o168 0x30 -#define MODEL_o167 0x2F -#define MODEL_o166 0x2E -#define MODEL_o165 0x2D -#define MODEL_g51 0x2C -#define MODEL_o164 0x2B -#define MODEL_o163 0x2A -#define MODEL_o162 0x29 -#define MODEL_o161 0x28 -#define MODEL_o160 0x27 -#define MODEL_o159 0x26 -#define MODEL_o158 0x25 -#define MODEL_g46 0x24 -#define MODEL_o90 0x23 -#define MODEL_o89 0x22 -#define MODEL_o151 0x21 -#define MODEL_o150 0x20 -#define MODEL_g45 0x1F -#define MODEL_o236 0x1E -#define MODEL_o146 0x1D -#define MODEL_g7 0x1C -#define MODEL_o149 0x1B -#define MODEL_o84 0x1A -#define MODEL_o27 0x19 -#define MODEL_g5 0x18 -#define MODEL_g31 0x17 -#define MODEL_o123 0x16 -#define MODEL_g16 0x15 -#define MODEL_g18 0x14 -#define MODEL_o102 0x13 -#define MODEL_g17 0x12 -#define MODEL_o101 0x11 -#define MODEL_g35 0x10 -#define MODEL_g37 0xF -#define MODEL_o136 0xE -#define MODEL_g36 0xD -#define MODEL_o135 0xC -#define MODEL_g2 0xB -#define MODEL_o234 0xA -#define MODEL_o134 0x9 -#define MODEL_o132 0x8 -#define MODEL_o129 0x7 -#define MODEL_o128 0x6 -#define MODEL_o127 0x5 -#define MODEL_o125 0x4 -#define MODEL_o124 0x3 -#define MODEL_o98 0x2 -#define MODEL_o74 0x1 -#define MODEL_o33 0x0 +#define MODEL_Root 0x63 +#define MODEL_g1 0x62 +#define MODEL_g62 0x61 +#define MODEL_o233 0x60 +#define MODEL_o232 0x5F +#define MODEL_o231 0x5E +#define MODEL_g50 0x5D +#define MODEL_g57 0x5C +#define MODEL_o206 0x5B +#define MODEL_o205 0x5A +#define MODEL_o204 0x59 +#define MODEL_o203 0x58 +#define MODEL_o202 0x57 +#define MODEL_o201 0x56 +#define MODEL_o200 0x55 +#define MODEL_g56 0x54 +#define MODEL_o199 0x53 +#define MODEL_o198 0x52 +#define MODEL_o197 0x51 +#define MODEL_o196 0x50 +#define MODEL_o195 0x4F +#define MODEL_o194 0x4E +#define MODEL_o193 0x4D +#define MODEL_g55 0x4C +#define MODEL_o192 0x4B +#define MODEL_o191 0x4A +#define MODEL_o190 0x49 +#define MODEL_o189 0x48 +#define MODEL_o188 0x47 +#define MODEL_o187 0x46 +#define MODEL_o186 0x45 +#define MODEL_g54 0x44 +#define MODEL_o185 0x43 +#define MODEL_o184 0x42 +#define MODEL_o183 0x41 +#define MODEL_o182 0x40 +#define MODEL_o181 0x3F +#define MODEL_o180 0x3E +#define MODEL_o179 0x3D +#define MODEL_g53 0x3C +#define MODEL_o178 0x3B +#define MODEL_o177 0x3A +#define MODEL_o176 0x39 +#define MODEL_o175 0x38 +#define MODEL_o174 0x37 +#define MODEL_o173 0x36 +#define MODEL_o172 0x35 +#define MODEL_g52 0x34 +#define MODEL_o171 0x33 +#define MODEL_o170 0x32 +#define MODEL_o169 0x31 +#define MODEL_o168 0x30 +#define MODEL_o167 0x2F +#define MODEL_o166 0x2E +#define MODEL_o165 0x2D +#define MODEL_g51 0x2C +#define MODEL_o164 0x2B +#define MODEL_o163 0x2A +#define MODEL_o162 0x29 +#define MODEL_o161 0x28 +#define MODEL_o160 0x27 +#define MODEL_o159 0x26 +#define MODEL_o158 0x25 +#define MODEL_g46 0x24 +#define MODEL_o90 0x23 +#define MODEL_o89 0x22 +#define MODEL_o151 0x21 +#define MODEL_o150 0x20 +#define MODEL_g45 0x1F +#define MODEL_o236 0x1E +#define MODEL_o146 0x1D +#define MODEL_g7 0x1C +#define MODEL_o149 0x1B +#define MODEL_o84 0x1A +#define MODEL_o27 0x19 +#define MODEL_g5 0x18 +#define MODEL_g31 0x17 +#define MODEL_o123 0x16 +#define MODEL_g16 0x15 +#define MODEL_g18 0x14 +#define MODEL_o102 0x13 +#define MODEL_g17 0x12 +#define MODEL_o101 0x11 +#define MODEL_g35 0x10 +#define MODEL_g37 0xF +#define MODEL_o136 0xE +#define MODEL_g36 0xD +#define MODEL_o135 0xC +#define MODEL_g2 0xB +#define MODEL_o234 0xA +#define MODEL_o134 0x9 +#define MODEL_o132 0x8 +#define MODEL_o129 0x7 +#define MODEL_o128 0x6 +#define MODEL_o127 0x5 +#define MODEL_o125 0x4 +#define MODEL_o124 0x3 +#define MODEL_o98 0x2 +#define MODEL_o74 0x1 +#define MODEL_o33 0x0 + diff --git a/include/mapfs/dgb_16_hit.h b/include/mapfs/dgb_16_hit.h index cbbc24ccf3..16a9229b7d 100644 --- a/include/mapfs/dgb_16_hit.h +++ b/include/mapfs/dgb_16_hit.h @@ -1,11 +1,18 @@ -#define COLLIDER_Root 0xA -#define COLLIDER_g1 0x9 -#define COLLIDER_g5 0x8 -#define COLLIDER_o108 0x7 -#define COLLIDER_deilittne 0x6 -#define COLLIDER_deilitne 0x5 -#define COLLIDER_deiline 0x4 -#define COLLIDER_g2 0x3 -#define COLLIDER_o145 0x2 -#define COLLIDER_o74 0x1 -#define COLLIDER_o66 0x0 +#define COLLIDER_Root 0xA +#define COLLIDER_g1 0x9 +#define COLLIDER_g5 0x8 +#define COLLIDER_o108 0x7 +#define COLLIDER_deilittne 0x6 +#define COLLIDER_deilitne 0x5 +#define COLLIDER_deiline 0x4 +#define COLLIDER_g2 0x3 +#define COLLIDER_o145 0x2 +#define COLLIDER_o74 0x1 +#define COLLIDER_o66 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g35 0x3 +#define ZONE_o156 0x2 +#define ZONE_o155 0x1 +#define ZONE_o154 0x0 + diff --git a/include/mapfs/dgb_16_shape.h b/include/mapfs/dgb_16_shape.h index 4edfb05bd8..59dff79f71 100644 --- a/include/mapfs/dgb_16_shape.h +++ b/include/mapfs/dgb_16_shape.h @@ -1,25 +1,26 @@ -#define MODEL_Root 0x18 -#define MODEL_g1 0x17 -#define MODEL_g38 0x16 -#define MODEL_o141 0x15 -#define MODEL_o140 0x14 -#define MODEL_o139 0x13 -#define MODEL_g5 0x12 -#define MODEL_g31 0x11 -#define MODEL_o123 0x10 -#define MODEL_g10 0xF -#define MODEL_o90 0xE -#define MODEL_o89 0xD -#define MODEL_g7 0xC -#define MODEL_o85 0xB -#define MODEL_o84 0xA -#define MODEL_o34 0x9 -#define MODEL_o27 0x8 -#define MODEL_g2 0x7 -#define MODEL_o74 0x6 -#define MODEL_o108 0x5 -#define MODEL_o61 0x4 -#define MODEL_o75 0x3 -#define MODEL_o66 0x2 -#define MODEL_o33 0x1 -#define MODEL_o28 0x0 +#define MODEL_Root 0x18 +#define MODEL_g1 0x17 +#define MODEL_g38 0x16 +#define MODEL_o141 0x15 +#define MODEL_o140 0x14 +#define MODEL_o139 0x13 +#define MODEL_g5 0x12 +#define MODEL_g31 0x11 +#define MODEL_o123 0x10 +#define MODEL_g10 0xF +#define MODEL_o90 0xE +#define MODEL_o89 0xD +#define MODEL_g7 0xC +#define MODEL_o85 0xB +#define MODEL_o84 0xA +#define MODEL_o34 0x9 +#define MODEL_o27 0x8 +#define MODEL_g2 0x7 +#define MODEL_o74 0x6 +#define MODEL_o108 0x5 +#define MODEL_o61 0x4 +#define MODEL_o75 0x3 +#define MODEL_o66 0x2 +#define MODEL_o33 0x1 +#define MODEL_o28 0x0 + diff --git a/include/mapfs/dgb_17_hit.h b/include/mapfs/dgb_17_hit.h index 4fe4f124e4..63c1beefcd 100644 --- a/include/mapfs/dgb_17_hit.h +++ b/include/mapfs/dgb_17_hit.h @@ -1,16 +1,23 @@ -#define COLLIDER_Root 0xF -#define COLLIDER_g1 0xE -#define COLLIDER_g30 0xD -#define COLLIDER_o98 0xC -#define COLLIDER_deilitte 0xB -#define COLLIDER_deilite 0xA -#define COLLIDER_deilie 0x9 -#define COLLIDER_o127 0x8 -#define COLLIDER_deilittw 0x7 -#define COLLIDER_deilitw 0x6 -#define COLLIDER_deiliw 0x5 -#define COLLIDER_g31 0x4 -#define COLLIDER_o144 0x3 -#define COLLIDER_o142 0x2 -#define COLLIDER_o141 0x1 -#define COLLIDER_o140 0x0 +#define COLLIDER_Root 0xF +#define COLLIDER_g1 0xE +#define COLLIDER_g30 0xD +#define COLLIDER_o98 0xC +#define COLLIDER_deilitte 0xB +#define COLLIDER_deilite 0xA +#define COLLIDER_deilie 0x9 +#define COLLIDER_o127 0x8 +#define COLLIDER_deilittw 0x7 +#define COLLIDER_deilitw 0x6 +#define COLLIDER_deiliw 0x5 +#define COLLIDER_g31 0x4 +#define COLLIDER_o144 0x3 +#define COLLIDER_o142 0x2 +#define COLLIDER_o141 0x1 +#define COLLIDER_o140 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g1 0x3 +#define ZONE_o153 0x2 +#define ZONE_o151 0x1 +#define ZONE_o149 0x0 + diff --git a/include/mapfs/dgb_17_shape.h b/include/mapfs/dgb_17_shape.h index 3ebc038ca5..821e25d98e 100644 --- a/include/mapfs/dgb_17_shape.h +++ b/include/mapfs/dgb_17_shape.h @@ -1,34 +1,35 @@ -#define MODEL_Root 0x21 -#define MODEL_s17 0x20 -#define MODEL_g73 0x1F -#define MODEL_o241 0x1E -#define MODEL_o240 0x1D -#define MODEL_o239 0x1C -#define MODEL_g53 0x1B -#define MODEL_o197 0x1A -#define MODEL_g48 0x19 -#define MODEL_g57 0x18 -#define MODEL_g54 0x17 -#define MODEL_g56 0x16 -#define MODEL_o199 0x15 -#define MODEL_g55 0x14 -#define MODEL_o198 0x13 -#define MODEL_g39 0x12 -#define MODEL_g41 0x11 -#define MODEL_o143 0x10 -#define MODEL_g40 0xF -#define MODEL_o142 0xE -#define MODEL_g50 0xD -#define MODEL_o235 0xC -#define MODEL_o185 0xB -#define MODEL_o184 0xA -#define MODEL_o183 0x9 -#define MODEL_o182 0x8 -#define MODEL_o181 0x7 -#define MODEL_o200 0x6 -#define MODEL_o130 0x5 -#define MODEL_g49 0x4 -#define MODEL_o180 0x3 -#define MODEL_o179 0x2 -#define MODEL_o178 0x1 -#define MODEL_o177 0x0 +#define MODEL_Root 0x21 +#define MODEL_s17 0x20 +#define MODEL_g73 0x1F +#define MODEL_o241 0x1E +#define MODEL_o240 0x1D +#define MODEL_o239 0x1C +#define MODEL_g53 0x1B +#define MODEL_o197 0x1A +#define MODEL_g48 0x19 +#define MODEL_g57 0x18 +#define MODEL_g54 0x17 +#define MODEL_g56 0x16 +#define MODEL_o199 0x15 +#define MODEL_g55 0x14 +#define MODEL_o198 0x13 +#define MODEL_g39 0x12 +#define MODEL_g41 0x11 +#define MODEL_o143 0x10 +#define MODEL_g40 0xF +#define MODEL_o142 0xE +#define MODEL_g50 0xD +#define MODEL_o235 0xC +#define MODEL_o185 0xB +#define MODEL_o184 0xA +#define MODEL_o183 0x9 +#define MODEL_o182 0x8 +#define MODEL_o181 0x7 +#define MODEL_o200 0x6 +#define MODEL_o130 0x5 +#define MODEL_g49 0x4 +#define MODEL_o180 0x3 +#define MODEL_o179 0x2 +#define MODEL_o178 0x1 +#define MODEL_o177 0x0 + diff --git a/include/mapfs/dgb_18_hit.h b/include/mapfs/dgb_18_hit.h index c3d42be49d..b6c034e00e 100644 --- a/include/mapfs/dgb_18_hit.h +++ b/include/mapfs/dgb_18_hit.h @@ -1,22 +1,30 @@ -#define COLLIDER_Root 0x15 -#define COLLIDER_g1 0x14 -#define COLLIDER_g30 0x13 -#define COLLIDER_o127 0x12 -#define COLLIDER_deilittw 0x11 -#define COLLIDER_deilitw 0x10 -#define COLLIDER_deiliw 0xF -#define COLLIDER_g32 0xE -#define COLLIDER_o179 0xD -#define COLLIDER_o186 0xC -#define COLLIDER_o184 0xB -#define COLLIDER_o183 0xA -#define COLLIDER_o182 0x9 -#define COLLIDER_g46 0x8 -#define COLLIDER_o177 0x7 -#define COLLIDER_o176 0x6 -#define COLLIDER_o174 0x5 -#define COLLIDER_g31 0x4 -#define COLLIDER_o144 0x3 -#define COLLIDER_o142 0x2 -#define COLLIDER_o141 0x1 -#define COLLIDER_o140 0x0 +#define COLLIDER_Root 0x15 +#define COLLIDER_g1 0x14 +#define COLLIDER_g30 0x13 +#define COLLIDER_o127 0x12 +#define COLLIDER_deilittw 0x11 +#define COLLIDER_deilitw 0x10 +#define COLLIDER_deiliw 0xF +#define COLLIDER_g32 0xE +#define COLLIDER_o179 0xD +#define COLLIDER_o186 0xC +#define COLLIDER_o184 0xB +#define COLLIDER_o183 0xA +#define COLLIDER_o182 0x9 +#define COLLIDER_g46 0x8 +#define COLLIDER_o177 0x7 +#define COLLIDER_o176 0x6 +#define COLLIDER_o174 0x5 +#define COLLIDER_g31 0x4 +#define COLLIDER_o144 0x3 +#define COLLIDER_o142 0x2 +#define COLLIDER_o141 0x1 +#define COLLIDER_o140 0x0 + +#define ZONE_Root 0x5 +#define ZONE_g49 0x4 +#define ZONE_o189 0x3 +#define ZONE_o188 0x2 +#define ZONE_o187 0x1 +#define ZONE_o186 0x0 + diff --git a/include/mapfs/dgb_18_shape.h b/include/mapfs/dgb_18_shape.h index 33b936da70..c8dec6bab2 100644 --- a/include/mapfs/dgb_18_shape.h +++ b/include/mapfs/dgb_18_shape.h @@ -1,58 +1,59 @@ -#define MODEL_Root 0x39 -#define MODEL_s18 0x38 -#define MODEL_g74 0x37 -#define MODEL_o243 0x36 -#define MODEL_o242 0x35 -#define MODEL_o241 0x34 -#define MODEL_g58 0x33 -#define MODEL_g69 0x32 -#define MODEL_o229 0x31 -#define MODEL_o228 0x30 -#define MODEL_g71 0x2F -#define MODEL_o195 0x2E -#define MODEL_o194 0x2D -#define MODEL_g70 0x2C -#define MODEL_o247 0x2B -#define MODEL_o190 0x2A -#define MODEL_g59 0x29 -#define MODEL_o204 0x28 -#define MODEL_o203 0x27 -#define MODEL_o202 0x26 -#define MODEL_g51 0x25 -#define MODEL_o193 0x24 -#define MODEL_o192 0x23 -#define MODEL_o191 0x22 -#define MODEL_g60 0x21 -#define MODEL_o207 0x20 -#define MODEL_o206 0x1F -#define MODEL_o205 0x1E -#define MODEL_g73 0x1D -#define MODEL_o240 0x1C -#define MODEL_o239 0x1B -#define MODEL_g61 0x1A -#define MODEL_o211 0x19 -#define MODEL_o232 0x18 -#define MODEL_o209 0x17 -#define MODEL_o208 0x16 -#define MODEL_g43 0x15 -#define MODEL_o150 0x14 -#define MODEL_o149 0x13 -#define MODEL_g44 0x12 -#define MODEL_o159 0x11 -#define MODEL_o160 0x10 -#define MODEL_o163 0xF -#define MODEL_o152 0xE -#define MODEL_g35 0xD -#define MODEL_g36 0xC -#define MODEL_g38 0xB -#define MODEL_o141 0xA -#define MODEL_g37 0x9 -#define MODEL_o140 0x8 -#define MODEL_g33 0x7 -#define MODEL_o237 0x6 -#define MODEL_o135 0x5 -#define MODEL_o129 0x4 -#define MODEL_o128 0x3 -#define MODEL_o127 0x2 -#define MODEL_o126 0x1 -#define MODEL_o125 0x0 +#define MODEL_Root 0x39 +#define MODEL_s18 0x38 +#define MODEL_g74 0x37 +#define MODEL_o243 0x36 +#define MODEL_o242 0x35 +#define MODEL_o241 0x34 +#define MODEL_g58 0x33 +#define MODEL_g69 0x32 +#define MODEL_o229 0x31 +#define MODEL_o228 0x30 +#define MODEL_g71 0x2F +#define MODEL_o195 0x2E +#define MODEL_o194 0x2D +#define MODEL_g70 0x2C +#define MODEL_o247 0x2B +#define MODEL_o190 0x2A +#define MODEL_g59 0x29 +#define MODEL_o204 0x28 +#define MODEL_o203 0x27 +#define MODEL_o202 0x26 +#define MODEL_g51 0x25 +#define MODEL_o193 0x24 +#define MODEL_o192 0x23 +#define MODEL_o191 0x22 +#define MODEL_g60 0x21 +#define MODEL_o207 0x20 +#define MODEL_o206 0x1F +#define MODEL_o205 0x1E +#define MODEL_g73 0x1D +#define MODEL_o240 0x1C +#define MODEL_o239 0x1B +#define MODEL_g61 0x1A +#define MODEL_o211 0x19 +#define MODEL_o232 0x18 +#define MODEL_o209 0x17 +#define MODEL_o208 0x16 +#define MODEL_g43 0x15 +#define MODEL_o150 0x14 +#define MODEL_o149 0x13 +#define MODEL_g44 0x12 +#define MODEL_o159 0x11 +#define MODEL_o160 0x10 +#define MODEL_o163 0xF +#define MODEL_o152 0xE +#define MODEL_g35 0xD +#define MODEL_g36 0xC +#define MODEL_g38 0xB +#define MODEL_o141 0xA +#define MODEL_g37 0x9 +#define MODEL_o140 0x8 +#define MODEL_g33 0x7 +#define MODEL_o237 0x6 +#define MODEL_o135 0x5 +#define MODEL_o129 0x4 +#define MODEL_o128 0x3 +#define MODEL_o127 0x2 +#define MODEL_o126 0x1 +#define MODEL_o125 0x0 + diff --git a/include/mapfs/dgb_bt01_hit.h b/include/mapfs/dgb_bt01_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/dgb_bt01_hit.h +++ b/include/mapfs/dgb_bt01_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/dgb_bt01_shape.h b/include/mapfs/dgb_bt01_shape.h index b7822d4f73..bcf02e6219 100644 --- a/include/mapfs/dgb_bt01_shape.h +++ b/include/mapfs/dgb_bt01_shape.h @@ -1,23 +1,24 @@ -#define MODEL_Root 0x16 -#define MODEL_dai 0x15 -#define MODEL_waku1 0x14 -#define MODEL_yuka2 0x13 -#define MODEL_yuka 0x12 -#define MODEL_g49 0x11 -#define MODEL_waku2 0x10 -#define MODEL_kumonosu 0xF -#define MODEL_ten 0xE -#define MODEL_kaza2 0xD -#define MODEL_ranp3 0xC -#define MODEL_ranp2 0xB -#define MODEL_ranpu 0xA -#define MODEL_ranpdai 0x9 -#define MODEL_kiwaku 0x8 -#define MODEL_doa 0x7 -#define MODEL_hibi2 0x6 -#define MODEL_hibi 0x5 -#define MODEL_kaza1 0x4 -#define MODEL_kabe 0x3 -#define MODEL_yuka4 0x2 -#define MODEL_yuka3 0x1 -#define MODEL_waku 0x0 +#define MODEL_Root 0x16 +#define MODEL_dai 0x15 +#define MODEL_waku1 0x14 +#define MODEL_yuka2 0x13 +#define MODEL_yuka 0x12 +#define MODEL_g49 0x11 +#define MODEL_waku2 0x10 +#define MODEL_kumonosu 0xF +#define MODEL_ten 0xE +#define MODEL_kaza2 0xD +#define MODEL_ranp3 0xC +#define MODEL_ranp2 0xB +#define MODEL_ranpu 0xA +#define MODEL_ranpdai 0x9 +#define MODEL_kiwaku 0x8 +#define MODEL_doa 0x7 +#define MODEL_hibi2 0x6 +#define MODEL_hibi 0x5 +#define MODEL_kaza1 0x4 +#define MODEL_kabe 0x3 +#define MODEL_yuka4 0x2 +#define MODEL_yuka3 0x1 +#define MODEL_waku 0x0 + diff --git a/include/mapfs/dgb_bt02_hit.h b/include/mapfs/dgb_bt02_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/dgb_bt02_hit.h +++ b/include/mapfs/dgb_bt02_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/dgb_bt02_shape.h b/include/mapfs/dgb_bt02_shape.h index bdb30a416a..8183afef95 100644 --- a/include/mapfs/dgb_bt02_shape.h +++ b/include/mapfs/dgb_bt02_shape.h @@ -1,27 +1,28 @@ -#define MODEL_Root 0x1A -#define MODEL_dai 0x19 -#define MODEL_waku1 0x18 -#define MODEL_yuka2 0x17 -#define MODEL_yuka 0x16 -#define MODEL_g49 0x15 -#define MODEL_waku2 0x14 -#define MODEL_syoku 0x13 -#define MODEL_tukue1 0x12 -#define MODEL_tukue2 0x11 -#define MODEL_tukue3 0x10 -#define MODEL_kumonosu 0xF -#define MODEL_ten 0xE -#define MODEL_kaza2 0xD -#define MODEL_ranp3 0xC -#define MODEL_ranp2 0xB -#define MODEL_ranpu 0xA -#define MODEL_ranpdai 0x9 -#define MODEL_kiwaku 0x8 -#define MODEL_doa 0x7 -#define MODEL_hibi2 0x6 -#define MODEL_hibi 0x5 -#define MODEL_kaza1 0x4 -#define MODEL_kabe 0x3 -#define MODEL_yuka4 0x2 -#define MODEL_yuka3 0x1 -#define MODEL_waku 0x0 +#define MODEL_Root 0x1A +#define MODEL_dai 0x19 +#define MODEL_waku1 0x18 +#define MODEL_yuka2 0x17 +#define MODEL_yuka 0x16 +#define MODEL_g49 0x15 +#define MODEL_waku2 0x14 +#define MODEL_syoku 0x13 +#define MODEL_tukue1 0x12 +#define MODEL_tukue2 0x11 +#define MODEL_tukue3 0x10 +#define MODEL_kumonosu 0xF +#define MODEL_ten 0xE +#define MODEL_kaza2 0xD +#define MODEL_ranp3 0xC +#define MODEL_ranp2 0xB +#define MODEL_ranpu 0xA +#define MODEL_ranpdai 0x9 +#define MODEL_kiwaku 0x8 +#define MODEL_doa 0x7 +#define MODEL_hibi2 0x6 +#define MODEL_hibi 0x5 +#define MODEL_kaza1 0x4 +#define MODEL_kabe 0x3 +#define MODEL_yuka4 0x2 +#define MODEL_yuka3 0x1 +#define MODEL_waku 0x0 + diff --git a/include/mapfs/dgb_bt03_hit.h b/include/mapfs/dgb_bt03_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/dgb_bt03_hit.h +++ b/include/mapfs/dgb_bt03_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/dgb_bt03_shape.h b/include/mapfs/dgb_bt03_shape.h index d90bfcefaa..0ffc76bee8 100644 --- a/include/mapfs/dgb_bt03_shape.h +++ b/include/mapfs/dgb_bt03_shape.h @@ -1,18 +1,19 @@ -#define MODEL_Root 0x11 -#define MODEL_dai 0x10 -#define MODEL_waku1 0xF -#define MODEL_yuka 0xE -#define MODEL_g49 0xD -#define MODEL_waku2 0xC -#define MODEL_hibi 0xB -#define MODEL_mado3_3 0xA -#define MODEL_mado3 0x9 -#define MODEL_mado2_2 0x8 -#define MODEL_mado2 0x7 -#define MODEL_mado1_1 0x6 -#define MODEL_mado 0x5 -#define MODEL_kaza 0x4 -#define MODEL_kumonosu 0x3 -#define MODEL_kabe 0x2 -#define MODEL_yuka2 0x1 -#define MODEL_waku 0x0 +#define MODEL_Root 0x11 +#define MODEL_dai 0x10 +#define MODEL_waku1 0xF +#define MODEL_yuka 0xE +#define MODEL_g49 0xD +#define MODEL_waku2 0xC +#define MODEL_hibi 0xB +#define MODEL_mado3_3 0xA +#define MODEL_mado3 0x9 +#define MODEL_mado2_2 0x8 +#define MODEL_mado2 0x7 +#define MODEL_mado1_1 0x6 +#define MODEL_mado 0x5 +#define MODEL_kaza 0x4 +#define MODEL_kumonosu 0x3 +#define MODEL_kabe 0x2 +#define MODEL_yuka2 0x1 +#define MODEL_waku 0x0 + diff --git a/include/mapfs/dgb_bt04_hit.h b/include/mapfs/dgb_bt04_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/dgb_bt04_hit.h +++ b/include/mapfs/dgb_bt04_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/dgb_bt04_shape.h b/include/mapfs/dgb_bt04_shape.h index 6279196abb..bd6b7a60b1 100644 --- a/include/mapfs/dgb_bt04_shape.h +++ b/include/mapfs/dgb_bt04_shape.h @@ -1,22 +1,23 @@ -#define MODEL_Root 0x15 -#define MODEL_dai 0x14 -#define MODEL_waku1 0x13 -#define MODEL_kumo1 0x12 -#define MODEL_yuka 0x11 -#define MODEL_g49 0x10 -#define MODEL_waku2 0xF -#define MODEL_ten4 0xE -#define MODEL_kumo3 0xD -#define MODEL_ten3 0xC -#define MODEL_kumo2 0xB -#define MODEL_hikari 0xA -#define MODEL_ten2 0x9 -#define MODEL_hikari2 0x8 -#define MODEL_hahen 0x7 -#define MODEL_y_hikari 0x6 -#define MODEL_hibi 0x5 -#define MODEL_kabe 0x4 -#define MODEL_kaza 0x3 -#define MODEL_ten1 0x2 -#define MODEL_yuka2 0x1 -#define MODEL_waku 0x0 +#define MODEL_Root 0x15 +#define MODEL_dai 0x14 +#define MODEL_waku1 0x13 +#define MODEL_kumo1 0x12 +#define MODEL_yuka 0x11 +#define MODEL_g49 0x10 +#define MODEL_waku2 0xF +#define MODEL_ten4 0xE +#define MODEL_kumo3 0xD +#define MODEL_ten3 0xC +#define MODEL_kumo2 0xB +#define MODEL_hikari 0xA +#define MODEL_ten2 0x9 +#define MODEL_hikari2 0x8 +#define MODEL_hahen 0x7 +#define MODEL_y_hikari 0x6 +#define MODEL_hibi 0x5 +#define MODEL_kabe 0x4 +#define MODEL_kaza 0x3 +#define MODEL_ten1 0x2 +#define MODEL_yuka2 0x1 +#define MODEL_waku 0x0 + diff --git a/include/mapfs/dgb_bt05_hit.h b/include/mapfs/dgb_bt05_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/dgb_bt05_hit.h +++ b/include/mapfs/dgb_bt05_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/dgb_bt05_shape.h b/include/mapfs/dgb_bt05_shape.h index 0c2f08a447..7c8b573dc2 100644 --- a/include/mapfs/dgb_bt05_shape.h +++ b/include/mapfs/dgb_bt05_shape.h @@ -1,37 +1,38 @@ -#define MODEL_Root 0x24 -#define MODEL_dai 0x23 -#define MODEL_waku1 0x22 -#define MODEL_yuka2 0x21 -#define MODEL_yuka1 0x20 -#define MODEL_g49 0x1F -#define MODEL_waku2 0x1E -#define MODEL_g81 0x1D -#define MODEL_o392 0x1C -#define MODEL_o391 0x1B -#define MODEL_o390 0x1A -#define MODEL_g77 0x19 -#define MODEL_o382 0x18 -#define MODEL_o381 0x17 -#define MODEL_g78 0x16 -#define MODEL_o383 0x15 -#define MODEL_o384 0x14 -#define MODEL_g79 0x13 -#define MODEL_o385 0x12 -#define MODEL_o386 0x11 -#define MODEL_g80 0x10 -#define MODEL_o389 0xF -#define MODEL_o388 0xE -#define MODEL_o387 0xD -#define MODEL_mado3_3 0xC -#define MODEL_mado3 0xB -#define MODEL_mado2_2 0xA -#define MODEL_mado2 0x9 -#define MODEL_mado1_1 0x8 -#define MODEL_mado 0x7 -#define MODEL_kaza 0x6 -#define MODEL_kumonosu 0x5 -#define MODEL_hibi 0x4 -#define MODEL_kabe 0x3 -#define MODEL_yuka4 0x2 -#define MODEL_yuka3 0x1 -#define MODEL_waku 0x0 +#define MODEL_Root 0x24 +#define MODEL_dai 0x23 +#define MODEL_waku1 0x22 +#define MODEL_yuka2 0x21 +#define MODEL_yuka1 0x20 +#define MODEL_g49 0x1F +#define MODEL_waku2 0x1E +#define MODEL_g81 0x1D +#define MODEL_o392 0x1C +#define MODEL_o391 0x1B +#define MODEL_o390 0x1A +#define MODEL_g77 0x19 +#define MODEL_o382 0x18 +#define MODEL_o381 0x17 +#define MODEL_g78 0x16 +#define MODEL_o383 0x15 +#define MODEL_o384 0x14 +#define MODEL_g79 0x13 +#define MODEL_o385 0x12 +#define MODEL_o386 0x11 +#define MODEL_g80 0x10 +#define MODEL_o389 0xF +#define MODEL_o388 0xE +#define MODEL_o387 0xD +#define MODEL_mado3_3 0xC +#define MODEL_mado3 0xB +#define MODEL_mado2_2 0xA +#define MODEL_mado2 0x9 +#define MODEL_mado1_1 0x8 +#define MODEL_mado 0x7 +#define MODEL_kaza 0x6 +#define MODEL_kumonosu 0x5 +#define MODEL_hibi 0x4 +#define MODEL_kabe 0x3 +#define MODEL_yuka4 0x2 +#define MODEL_yuka3 0x1 +#define MODEL_waku 0x0 + diff --git a/include/mapfs/dro_01_hit.h b/include/mapfs/dro_01_hit.h index ca49c061fb..b219a0a1e3 100644 --- a/include/mapfs/dro_01_hit.h +++ b/include/mapfs/dro_01_hit.h @@ -1,41 +1,53 @@ -#define COLLIDER_Root 0x28 -#define COLLIDER_atari 0x27 -#define COLLIDER_mono6 0x26 -#define COLLIDER_mono5 0x25 -#define COLLIDER_mono4 0x24 -#define COLLIDER_mono3 0x23 -#define COLLIDER_mono2 0x22 -#define COLLIDER_mono1 0x21 -#define COLLIDER_ie2 0x20 -#define COLLIDER_exit_i2 0x1F -#define COLLIDER_ei_2 0x1E -#define COLLIDER_ei2_1 0x1D -#define COLLIDER_o1112 0x1C -#define COLLIDER_o924 0x1B -#define COLLIDER_mise 0x1A -#define COLLIDER_exit_mae 0x19 -#define COLLIDER_em_2 0x18 -#define COLLIDER_em_1 0x17 -#define COLLIDER_o917 0x16 -#define COLLIDER_ie1 0x15 -#define COLLIDER_g335 0x14 -#define COLLIDER_o1103 0x13 -#define COLLIDER_o1100 0x12 -#define COLLIDER_exit_i1 0x11 -#define COLLIDER_ei1_2 0x10 -#define COLLIDER_ei1_1 0xF -#define COLLIDER_o761 0xE -#define COLLIDER_g221 0xD -#define COLLIDER_o1099 0xC -#define COLLIDER_yasi 0xB -#define COLLIDER_kabe2 0xA -#define COLLIDER_kabe1 0x9 -#define COLLIDER_ground 0x8 -#define COLLIDER_exite 0x7 -#define COLLIDER_ne 0x6 -#define COLLIDER_deilie 0x5 -#define COLLIDER_deilite 0x4 -#define COLLIDER_exitw 0x3 -#define COLLIDER_nsw 0x2 -#define COLLIDER_deilisw 0x1 -#define COLLIDER_deilitsw 0x0 +#define COLLIDER_Root 0x28 +#define COLLIDER_atari 0x27 +#define COLLIDER_mono6 0x26 +#define COLLIDER_mono5 0x25 +#define COLLIDER_mono4 0x24 +#define COLLIDER_mono3 0x23 +#define COLLIDER_mono2 0x22 +#define COLLIDER_mono1 0x21 +#define COLLIDER_ie2 0x20 +#define COLLIDER_exit_i2 0x1F +#define COLLIDER_ei_2 0x1E +#define COLLIDER_ei2_1 0x1D +#define COLLIDER_o1112 0x1C +#define COLLIDER_o924 0x1B +#define COLLIDER_mise 0x1A +#define COLLIDER_exit_mae 0x19 +#define COLLIDER_em_2 0x18 +#define COLLIDER_em_1 0x17 +#define COLLIDER_o917 0x16 +#define COLLIDER_ie1 0x15 +#define COLLIDER_g335 0x14 +#define COLLIDER_o1103 0x13 +#define COLLIDER_o1100 0x12 +#define COLLIDER_exit_i1 0x11 +#define COLLIDER_ei1_2 0x10 +#define COLLIDER_ei1_1 0xF +#define COLLIDER_o761 0xE +#define COLLIDER_g221 0xD +#define COLLIDER_o1099 0xC +#define COLLIDER_yasi 0xB +#define COLLIDER_kabe2 0xA +#define COLLIDER_kabe1 0x9 +#define COLLIDER_ground 0x8 +#define COLLIDER_exite 0x7 +#define COLLIDER_ne 0x6 +#define COLLIDER_deilie 0x5 +#define COLLIDER_deilite 0x4 +#define COLLIDER_exitw 0x3 +#define COLLIDER_nsw 0x2 +#define COLLIDER_deilisw 0x1 +#define COLLIDER_deilitsw 0x0 + +#define ZONE_Root 0x9 +#define ZONE_g1 0x8 +#define ZONE_ie2 0x7 +#define ZONE_ie1 0x6 +#define ZONE_mise 0x5 +#define ZONE_o750 0x4 +#define ZONE_stege 0x3 +#define ZONE_exit 0x2 +#define ZONE_exite 0x1 +#define ZONE_exitsw 0x0 + diff --git a/include/mapfs/dro_01_shape.h b/include/mapfs/dro_01_shape.h index ee8a6135be..f04086972a 100644 --- a/include/mapfs/dro_01_shape.h +++ b/include/mapfs/dro_01_shape.h @@ -1,182 +1,183 @@ -#define MODEL_Root 0xB5 -#define MODEL_tubo 0xB4 -#define MODEL_g272 0xB3 -#define MODEL_o857 0xB2 -#define MODEL_o856 0xB1 -#define MODEL_o855 0xB0 -#define MODEL_o854 0xAF -#define MODEL_o853 0xAE -#define MODEL_o852 0xAD -#define MODEL_o851 0xAC -#define MODEL_o863 0xAB -#define MODEL_o858 0xAA -#define MODEL_t2 0xA9 -#define MODEL_tru2 0xA8 -#define MODEL_t1 0xA7 -#define MODEL_tru1 0xA6 -#define MODEL_8 0xA5 -#define MODEL_tubo8 0xA4 -#define MODEL_futa8 0xA3 -#define MODEL_5 0xA2 -#define MODEL_tubo5 0xA1 -#define MODEL_futa5 0xA0 -#define MODEL_k_i2 0x9F -#define MODEL_doa 0x9E -#define MODEL_doa2 0x9D -#define MODEL_ie2_naka 0x9C -#define MODEL_o883 0x9B -#define MODEL_o880 0x9A -#define MODEL_g276 0x99 -#define MODEL_o878 0x98 -#define MODEL_o877 0x97 -#define MODEL_i2n_kabe 0x96 -#define MODEL_i2n_moyo 0x95 -#define MODEL_i2_hako 0x94 -#define MODEL_o860 0x93 -#define MODEL_o859 0x92 -#define MODEL_yuka 0x91 -#define MODEL_t_nunoyane 0x90 -#define MODEL_bou1 0x8F -#define MODEL_nuno 0x8E -#define MODEL_sita2 0x8D -#define MODEL_si_ksbe 0x8C -#define MODEL_ue2 0x8B -#define MODEL_ue_waku 0x8A -#define MODEL_mado2 0x89 -#define MODEL_ue_kabe 0x88 -#define MODEL_ue_moyou 0x87 -#define MODEL_ie2 0x86 -#define MODEL_g241 0x85 -#define MODEL_waku 0x84 -#define MODEL_hasira2 0x83 -#define MODEL_moyou2 0x82 -#define MODEL_kabe2 0x81 -#define MODEL_k_i1 0x80 -#define MODEL_ie_naka 0x7F -#define MODEL_ien_kabe 0x7E -#define MODEL_ien_moyo 0x7D -#define MODEL_ien_waku 0x7C -#define MODEL_i_naka 0x7B -#define MODEL_g275 0x7A -#define MODEL_o872 0x79 -#define MODEL_o871 0x78 -#define MODEL_o868 0x77 -#define MODEL_o867 0x76 -#define MODEL_kama 0x75 -#define MODEL_3 0x74 -#define MODEL_o870 0x73 -#define MODEL_o869 0x72 -#define MODEL_o866 0x71 -#define MODEL_o862 0x70 -#define MODEL_tubo3 0x6F -#define MODEL_futa3 0x6E -#define MODEL_1_hari 0x6D -#define MODEL_1_binn 0x6C -#define MODEL_gyu1 0x6B -#define MODEL_yukamenn1 0x6A -#define MODEL_o886 0x69 -#define MODEL_ie1_doa 0x68 -#define MODEL_doa1 0x67 -#define MODEL_i_ue 0x66 -#define MODEL_1_m_waku 0x65 -#define MODEL_1_m_moyou 0x64 -#define MODEL_i_sita 0x63 -#define MODEL_1_m_kabe 0x62 -#define MODEL_mado1 0x61 -#define MODEL_ie 0x60 -#define MODEL_ie1 0x5F -#define MODEL_i1_waku 0x5E -#define MODEL_i1_moyo 0x5D -#define MODEL_i1_kabe 0x5C -#define MODEL_k_m1 0x5B -#define MODEL_mae 0x5A -#define MODEL_o835 0x59 -#define MODEL_o765 0x58 -#define MODEL_o833 0x57 -#define MODEL_o768 0x56 -#define MODEL_m_hasira 0x55 -#define MODEL_mise_doa 0x54 -#define MODEL_m_m_doa 0x53 -#define MODEL_mise_naka 0x52 -#define MODEL_mn_kabe 0x51 -#define MODEL_mn_moyo 0x50 -#define MODEL_mn_waku 0x4F -#define MODEL_mn_mado 0x4E -#define MODEL_uso_shouhin 0x4D -#define MODEL_o741 0x4C -#define MODEL_o740 0x4B -#define MODEL_o739 0x4A -#define MODEL_o738 0x49 -#define MODEL_o737 0x48 -#define MODEL_o736 0x47 -#define MODEL_naka 0x46 -#define MODEL_o890 0x45 -#define MODEL_o889 0x44 -#define MODEL_o891 0x43 -#define MODEL_o888 0x42 -#define MODEL_o887 0x41 -#define MODEL_kumonosu 0x40 -#define MODEL_poster 0x3F -#define MODEL_hone 0x3E -#define MODEL_kannbutu 0x3D -#define MODEL_binn 0x3C -#define MODEL_hako 0x3B -#define MODEL_hari 0x3A -#define MODEL_kaunnta 0x39 -#define MODEL_m_jyuu 0x38 -#define MODEL_yukamenn 0x37 -#define MODEL_m_gyu 0x36 -#define MODEL_o861 0x35 -#define MODEL_2 0x34 -#define MODEL_tubo2 0x33 -#define MODEL_futa2 0x32 -#define MODEL_shita 0x31 -#define MODEL_m_m_mado 0x30 -#define MODEL_m_m_kabe 0x2F -#define MODEL_ue 0x2E -#define MODEL_m_m_kabe2 0x2D -#define MODEL_m_m_mado2 0x2C -#define MODEL_m_m_waku 0x2B -#define MODEL_m_m_moyou 0x2A -#define MODEL_m_m_hari 0x29 -#define MODEL_mise 0x28 -#define MODEL_mise1 0x27 -#define MODEL_m_waku 0x26 -#define MODEL_m_kabe 0x25 -#define MODEL_o764 0x24 -#define MODEL_kanban 0x23 -#define MODEL_o499 0x22 -#define MODEL_etc 0x21 -#define MODEL_demise 0x20 -#define MODEL_d_bou 0x1F -#define MODEL_d_mumo 0x1E -#define MODEL_d_mono 0x1D -#define MODEL_d_hako 0x1C -#define MODEL_saku 0x1B -#define MODEL_hata 0x1A -#define MODEL_bou 0x19 -#define MODEL_back 0x18 -#define MODEL_b_waku2 0x17 -#define MODEL_b_waku 0x16 -#define MODEL_b_mado 0x15 -#define MODEL_b_moyou 0x14 -#define MODEL_b_kabe 0x13 -#define MODEL_hei 0x12 -#define MODEL_hei_2 0x11 -#define MODEL_hei_1 0x10 -#define MODEL_yasi 0xF -#define MODEL_o800 0xE -#define MODEL_o799 0xD -#define MODEL_monn 0xC -#define MODEL_kabe 0xB -#define MODEL_rennga 0xA -#define MODEL_exite 0x9 -#define MODEL_wakue 0x8 -#define MODEL_deilie 0x7 -#define MODEL_exitw 0x6 -#define MODEL_wakiw 0x5 -#define MODEL_deiliw 0x4 -#define MODEL_g1 0x3 -#define MODEL_road1 0x2 -#define MODEL_stege 0x1 -#define MODEL_frame 0x0 +#define MODEL_Root 0xB5 +#define MODEL_tubo 0xB4 +#define MODEL_g272 0xB3 +#define MODEL_o857 0xB2 +#define MODEL_o856 0xB1 +#define MODEL_o855 0xB0 +#define MODEL_o854 0xAF +#define MODEL_o853 0xAE +#define MODEL_o852 0xAD +#define MODEL_o851 0xAC +#define MODEL_o863 0xAB +#define MODEL_o858 0xAA +#define MODEL_t2 0xA9 +#define MODEL_tru2 0xA8 +#define MODEL_t1 0xA7 +#define MODEL_tru1 0xA6 +#define MODEL_8 0xA5 +#define MODEL_tubo8 0xA4 +#define MODEL_futa8 0xA3 +#define MODEL_5 0xA2 +#define MODEL_tubo5 0xA1 +#define MODEL_futa5 0xA0 +#define MODEL_k_i2 0x9F +#define MODEL_doa 0x9E +#define MODEL_doa2 0x9D +#define MODEL_ie2_naka 0x9C +#define MODEL_o883 0x9B +#define MODEL_o880 0x9A +#define MODEL_g276 0x99 +#define MODEL_o878 0x98 +#define MODEL_o877 0x97 +#define MODEL_i2n_kabe 0x96 +#define MODEL_i2n_moyo 0x95 +#define MODEL_i2_hako 0x94 +#define MODEL_o860 0x93 +#define MODEL_o859 0x92 +#define MODEL_yuka 0x91 +#define MODEL_t_nunoyane 0x90 +#define MODEL_bou1 0x8F +#define MODEL_nuno 0x8E +#define MODEL_sita2 0x8D +#define MODEL_si_ksbe 0x8C +#define MODEL_ue2 0x8B +#define MODEL_ue_waku 0x8A +#define MODEL_mado2 0x89 +#define MODEL_ue_kabe 0x88 +#define MODEL_ue_moyou 0x87 +#define MODEL_ie2 0x86 +#define MODEL_g241 0x85 +#define MODEL_waku 0x84 +#define MODEL_hasira2 0x83 +#define MODEL_moyou2 0x82 +#define MODEL_kabe2 0x81 +#define MODEL_k_i1 0x80 +#define MODEL_ie_naka 0x7F +#define MODEL_ien_kabe 0x7E +#define MODEL_ien_moyo 0x7D +#define MODEL_ien_waku 0x7C +#define MODEL_i_naka 0x7B +#define MODEL_g275 0x7A +#define MODEL_o872 0x79 +#define MODEL_o871 0x78 +#define MODEL_o868 0x77 +#define MODEL_o867 0x76 +#define MODEL_kama 0x75 +#define MODEL_3 0x74 +#define MODEL_o870 0x73 +#define MODEL_o869 0x72 +#define MODEL_o866 0x71 +#define MODEL_o862 0x70 +#define MODEL_tubo3 0x6F +#define MODEL_futa3 0x6E +#define MODEL_1_hari 0x6D +#define MODEL_1_binn 0x6C +#define MODEL_gyu1 0x6B +#define MODEL_yukamenn1 0x6A +#define MODEL_o886 0x69 +#define MODEL_ie1_doa 0x68 +#define MODEL_doa1 0x67 +#define MODEL_i_ue 0x66 +#define MODEL_1_m_waku 0x65 +#define MODEL_1_m_moyou 0x64 +#define MODEL_i_sita 0x63 +#define MODEL_1_m_kabe 0x62 +#define MODEL_mado1 0x61 +#define MODEL_ie 0x60 +#define MODEL_ie1 0x5F +#define MODEL_i1_waku 0x5E +#define MODEL_i1_moyo 0x5D +#define MODEL_i1_kabe 0x5C +#define MODEL_k_m1 0x5B +#define MODEL_mae 0x5A +#define MODEL_o835 0x59 +#define MODEL_o765 0x58 +#define MODEL_o833 0x57 +#define MODEL_o768 0x56 +#define MODEL_m_hasira 0x55 +#define MODEL_mise_doa 0x54 +#define MODEL_m_m_doa 0x53 +#define MODEL_mise_naka 0x52 +#define MODEL_mn_kabe 0x51 +#define MODEL_mn_moyo 0x50 +#define MODEL_mn_waku 0x4F +#define MODEL_mn_mado 0x4E +#define MODEL_uso_shouhin 0x4D +#define MODEL_o741 0x4C +#define MODEL_o740 0x4B +#define MODEL_o739 0x4A +#define MODEL_o738 0x49 +#define MODEL_o737 0x48 +#define MODEL_o736 0x47 +#define MODEL_naka 0x46 +#define MODEL_o890 0x45 +#define MODEL_o889 0x44 +#define MODEL_o891 0x43 +#define MODEL_o888 0x42 +#define MODEL_o887 0x41 +#define MODEL_kumonosu 0x40 +#define MODEL_poster 0x3F +#define MODEL_hone 0x3E +#define MODEL_kannbutu 0x3D +#define MODEL_binn 0x3C +#define MODEL_hako 0x3B +#define MODEL_hari 0x3A +#define MODEL_kaunnta 0x39 +#define MODEL_m_jyuu 0x38 +#define MODEL_yukamenn 0x37 +#define MODEL_m_gyu 0x36 +#define MODEL_o861 0x35 +#define MODEL_2 0x34 +#define MODEL_tubo2 0x33 +#define MODEL_futa2 0x32 +#define MODEL_shita 0x31 +#define MODEL_m_m_mado 0x30 +#define MODEL_m_m_kabe 0x2F +#define MODEL_ue 0x2E +#define MODEL_m_m_kabe2 0x2D +#define MODEL_m_m_mado2 0x2C +#define MODEL_m_m_waku 0x2B +#define MODEL_m_m_moyou 0x2A +#define MODEL_m_m_hari 0x29 +#define MODEL_mise 0x28 +#define MODEL_mise1 0x27 +#define MODEL_m_waku 0x26 +#define MODEL_m_kabe 0x25 +#define MODEL_o764 0x24 +#define MODEL_kanban 0x23 +#define MODEL_o499 0x22 +#define MODEL_etc 0x21 +#define MODEL_demise 0x20 +#define MODEL_d_bou 0x1F +#define MODEL_d_mumo 0x1E +#define MODEL_d_mono 0x1D +#define MODEL_d_hako 0x1C +#define MODEL_saku 0x1B +#define MODEL_hata 0x1A +#define MODEL_bou 0x19 +#define MODEL_back 0x18 +#define MODEL_b_waku2 0x17 +#define MODEL_b_waku 0x16 +#define MODEL_b_mado 0x15 +#define MODEL_b_moyou 0x14 +#define MODEL_b_kabe 0x13 +#define MODEL_hei 0x12 +#define MODEL_hei_2 0x11 +#define MODEL_hei_1 0x10 +#define MODEL_yasi 0xF +#define MODEL_o800 0xE +#define MODEL_o799 0xD +#define MODEL_monn 0xC +#define MODEL_kabe 0xB +#define MODEL_rennga 0xA +#define MODEL_exite 0x9 +#define MODEL_wakue 0x8 +#define MODEL_deilie 0x7 +#define MODEL_exitw 0x6 +#define MODEL_wakiw 0x5 +#define MODEL_deiliw 0x4 +#define MODEL_g1 0x3 +#define MODEL_road1 0x2 +#define MODEL_stege 0x1 +#define MODEL_frame 0x0 + diff --git a/include/mapfs/dro_02_hit.h b/include/mapfs/dro_02_hit.h index 38b0d38824..f66301483e 100644 --- a/include/mapfs/dro_02_hit.h +++ b/include/mapfs/dro_02_hit.h @@ -1,59 +1,74 @@ -#define COLLIDER_Root 0x3A -#define COLLIDER_atari 0x39 -#define COLLIDER_poster 0x38 -#define COLLIDER_a_mazinai 0x37 -#define COLLIDER_mazinai 0x36 -#define COLLIDER_o1278 0x35 -#define COLLIDER_o1241 0x34 -#define COLLIDER_o1277 0x33 -#define COLLIDER_1 0x32 -#define COLLIDER_o1309 0x31 -#define COLLIDER_o1239 0x30 -#define COLLIDER_o1274 0x2F -#define COLLIDER_o1272 0x2E -#define COLLIDER_o1266 0x2D -#define COLLIDER_o1240 0x2C -#define COLLIDER_2 0x2B -#define COLLIDER_o1227 0x2A -#define COLLIDER_o1220 0x29 -#define COLLIDER_3 0x28 -#define COLLIDER_o1219 0x27 -#define COLLIDER_o1218 0x26 -#define COLLIDER_o1217 0x25 -#define COLLIDER_4 0x24 -#define COLLIDER_4_naka 0x23 -#define COLLIDER_o1308 0x22 -#define COLLIDER_o1303 0x21 -#define COLLIDER_o1190 0x20 -#define COLLIDER_o1199 0x1F -#define COLLIDER_o1201 0x1E -#define COLLIDER_o1197 0x1D -#define COLLIDER_o1259 0x1C -#define COLLIDER_o1216 0x1B -#define COLLIDER_o1257 0x1A -#define COLLIDER_o1256 0x19 -#define COLLIDER_o1206 0x18 -#define COLLIDER_g334 0x17 -#define COLLIDER_o1205 0x16 -#define COLLIDER_5 0x15 -#define COLLIDER_o1295 0x14 -#define COLLIDER_o1166 0x13 -#define COLLIDER_o1251 0x12 -#define COLLIDER_exit5 0x11 -#define COLLIDER_o1253 0x10 -#define COLLIDER_o1252 0xF -#define COLLIDER_exit4 0xE -#define COLLIDER_o1261 0xD -#define COLLIDER_o1204 0xC -#define COLLIDER_g358 0xB -#define COLLIDER_o1289 0xA -#define COLLIDER_exit1 0x9 -#define COLLIDER_o1287 0x8 -#define COLLIDER_exitw 0x7 -#define COLLIDER_nw 0x6 -#define COLLIDER_deilitw 0x5 -#define COLLIDER_deiliw 0x4 -#define COLLIDER_stage 0x3 -#define COLLIDER_o1290 0x2 -#define COLLIDER_o776 0x1 -#define COLLIDER_o1020 0x0 +#define COLLIDER_Root 0x3A +#define COLLIDER_atari 0x39 +#define COLLIDER_poster 0x38 +#define COLLIDER_a_mazinai 0x37 +#define COLLIDER_mazinai 0x36 +#define COLLIDER_o1278 0x35 +#define COLLIDER_o1241 0x34 +#define COLLIDER_o1277 0x33 +#define COLLIDER_1 0x32 +#define COLLIDER_o1309 0x31 +#define COLLIDER_o1239 0x30 +#define COLLIDER_o1274 0x2F +#define COLLIDER_o1272 0x2E +#define COLLIDER_o1266 0x2D +#define COLLIDER_o1240 0x2C +#define COLLIDER_2 0x2B +#define COLLIDER_o1227 0x2A +#define COLLIDER_o1220 0x29 +#define COLLIDER_3 0x28 +#define COLLIDER_o1219 0x27 +#define COLLIDER_o1218 0x26 +#define COLLIDER_o1217 0x25 +#define COLLIDER_4 0x24 +#define COLLIDER_4_naka 0x23 +#define COLLIDER_o1308 0x22 +#define COLLIDER_o1303 0x21 +#define COLLIDER_o1190 0x20 +#define COLLIDER_o1199 0x1F +#define COLLIDER_o1201 0x1E +#define COLLIDER_o1197 0x1D +#define COLLIDER_o1259 0x1C +#define COLLIDER_o1216 0x1B +#define COLLIDER_o1257 0x1A +#define COLLIDER_o1256 0x19 +#define COLLIDER_o1206 0x18 +#define COLLIDER_g334 0x17 +#define COLLIDER_o1205 0x16 +#define COLLIDER_5 0x15 +#define COLLIDER_o1295 0x14 +#define COLLIDER_o1166 0x13 +#define COLLIDER_o1251 0x12 +#define COLLIDER_exit5 0x11 +#define COLLIDER_o1253 0x10 +#define COLLIDER_o1252 0xF +#define COLLIDER_exit4 0xE +#define COLLIDER_o1261 0xD +#define COLLIDER_o1204 0xC +#define COLLIDER_g358 0xB +#define COLLIDER_o1289 0xA +#define COLLIDER_exit1 0x9 +#define COLLIDER_o1287 0x8 +#define COLLIDER_exitw 0x7 +#define COLLIDER_nw 0x6 +#define COLLIDER_deilitw 0x5 +#define COLLIDER_deiliw 0x4 +#define COLLIDER_stage 0x3 +#define COLLIDER_o1290 0x2 +#define COLLIDER_o776 0x1 +#define COLLIDER_o1020 0x0 + +#define ZONE_Root 0xC +#define ZONE_kinopio 0xB +#define ZONE_o766 0xA +#define ZONE_yane 0x9 +#define ZONE_hako 0x8 +#define ZONE_roren 0x7 +#define ZONE_rorre_mae 0x6 +#define ZONE_o759 0x5 +#define ZONE_g1 0x4 +#define ZONE_mazinai 0x3 +#define ZONE_stege 0x2 +#define ZONE_exit 0x1 +#define ZONE_o760 0x0 + diff --git a/include/mapfs/dro_02_shape.h b/include/mapfs/dro_02_shape.h index 9ed4701e32..7785e9f5c7 100644 --- a/include/mapfs/dro_02_shape.h +++ b/include/mapfs/dro_02_shape.h @@ -1,165 +1,166 @@ -#define MODEL_Root 0xA4 -#define MODEL_mazinai 0xA3 -#define MODEL_kemuri 0xA2 -#define MODEL_m_hone 0xA1 -#define MODEL_m_zyu 0xA0 -#define MODEL_m_nuno2 0x9F -#define MODEL_m_nuno1 0x9E -#define MODEL_m_hasi 0x9D -#define MODEL_tubo 0x9C -#define MODEL_o971 0x9B -#define MODEL_o970 0x9A -#define MODEL_o967 0x99 -#define MODEL_o965 0x98 -#define MODEL_g241 0x97 -#define MODEL_o907 0x96 -#define MODEL_o906 0x95 -#define MODEL_t3 0x94 -#define MODEL_o956 0x93 -#define MODEL_t2 0x92 -#define MODEL_o955 0x91 -#define MODEL_t1 0x90 -#define MODEL_o958 0x8F -#define MODEL_g222 0x8E -#define MODEL_tubo5 0x8D -#define MODEL_futa5 0x8C -#define MODEL_g221 0x8B -#define MODEL_tubo4 0x8A -#define MODEL_futa4 0x89 -#define MODEL_g218 0x88 -#define MODEL_futa2 0x87 -#define MODEL_tubo2 0x86 -#define MODEL_k_i5 0x85 -#define MODEL_ie5_naka 0x84 -#define MODEL_5n_naisou 0x83 -#define MODEL_o966 0x82 -#define MODEL_o977 0x81 -#define MODEL_g254 0x80 -#define MODEL_o975 0x7F -#define MODEL_o974 0x7E -#define MODEL_g253 0x7D -#define MODEL_o973 0x7C -#define MODEL_o972 0x7B -#define MODEL_book2 0x7A -#define MODEL_book1 0x79 -#define MODEL_5n_ranpu 0x78 -#define MODEL_5n_kanbutu 0x77 -#define MODEL_5n_binn 0x76 -#define MODEL_5n_tukue 0x75 -#define MODEL_r_hako 0x74 -#define MODEL_5n_futi 0x73 -#define MODEL_5n_zyu 0x72 -#define MODEL_5_uka 0x71 -#define MODEL_5n_kabe 0x70 -#define MODEL_5_doa2 0x6F -#define MODEL_o770 0x6E -#define MODEL_5_doa 0x6D -#define MODEL_o769 0x6C -#define MODEL_g200 0x6B -#define MODEL_6_moyou 0x6A -#define MODEL_6_waku 0x69 -#define MODEL_6_kabe 0x68 -#define MODEL_ie5 0x67 -#define MODEL_yane 0x66 -#define MODEL_5_post2 0x65 -#define MODEL_5_poster 0x64 -#define MODEL_5_yane 0x63 -#define MODEL_5_waku 0x62 -#define MODEL_5_hasira2 0x61 -#define MODEL_5_moyou 0x60 -#define MODEL_5_kabe 0x5F -#define MODEL_k_i4 0x5E -#define MODEL_mae 0x5D -#define MODEL_o938 0x5C -#define MODEL_o937 0x5B -#define MODEL_o936 0x5A -#define MODEL_i4_mado 0x59 -#define MODEL_4_hasis2 0x58 -#define MODEL_ie4_naka 0x57 -#define MODEL_4_naisou 0x56 -#define MODEL_g255 0x55 -#define MODEL_o980 0x54 -#define MODEL_o979 0x53 -#define MODEL_4_ranpu 0x52 -#define MODEL_tukue 0x51 -#define MODEL_bed 0x50 -#define MODEL_o987 0x4F -#define MODEL_futon 0x4E -#define MODEL_bed__ 0x4D -#define MODEL_4n_kannbutu 0x4C -#define MODEL_4n_hari 0x4B -#define MODEL_4n_tana 0x4A -#define MODEL_4n_binn 0x49 -#define MODEL_4n_mado 0x48 -#define MODEL_4n_moyo 0x47 -#define MODEL_4n_kabe 0x46 -#define MODEL_4n_waku 0x45 -#define MODEL_4n_yane 0x44 -#define MODEL_4_yuka 0x43 -#define MODEL_g229 0x42 -#define MODEL_tubo8 0x41 -#define MODEL_futa8 0x40 -#define MODEL_i4_doa 0x3F -#define MODEL_4_doa 0x3E -#define MODEL_mobe 0x3D -#define MODEL_4_hasira2 0x3C -#define MODEL_4_kabe2 0x3B -#define MODEL_4_moyou2 0x3A -#define MODEL_4_waku2 0x39 -#define MODEL_ie4 0x38 -#define MODEL_4_saku 0x37 -#define MODEL_4_yane 0x36 -#define MODEL_4_waku 0x35 -#define MODEL_4_kabe 0x34 -#define MODEL_4_moyou 0x33 -#define MODEL_i4_bou 0x32 -#define MODEL_kanban 0x31 -#define MODEL_o852 0x30 -#define MODEL_ie3 0x2F -#define MODEL_3_yane 0x2E -#define MODEL_3_rennga 0x2D -#define MODEL_3_kabe 0x2C -#define MODEL_ie2 0x2B -#define MODEL_2_saku 0x2A -#define MODEL_2_yane 0x29 -#define MODEL_2_hasira3 0x28 -#define MODEL_2_hasira2 0x27 -#define MODEL_2_hasira 0x26 -#define MODEL_2_moyou 0x25 -#define MODEL_2_mado 0x24 -#define MODEL_2_kabe 0x23 -#define MODEL_ie1 0x22 -#define MODEL_1_saku 0x21 -#define MODEL_1_yane 0x20 -#define MODEL_1_kui 0x1F -#define MODEL_1_nuno 0x1E -#define MODEL_1_waku 0x1D -#define MODEL_1_hasira3 0x1C -#define MODEL_1_hasira2 0x1B -#define MODEL_1_hasira 0x1A -#define MODEL_1_moyou 0x19 -#define MODEL_1_mado 0x18 -#define MODEL_1_kabe 0x17 -#define MODEL_doa 0x16 -#define MODEL_1_doa 0x15 -#define MODEL_etc 0x14 -#define MODEL_saku 0x13 -#define MODEL_nuno 0x12 -#define MODEL_bou 0x11 -#define MODEL_oke 0x10 -#define MODEL_hei 0xF -#define MODEL_g_moyou 0xE -#define MODEL_h_kabe 0xD -#define MODEL_hako2 0xC -#define MODEL_hako3 0xB -#define MODEL_hako 0xA -#define MODEL_hako4 0x9 -#define MODEL_exitw 0x8 -#define MODEL_waku 0x7 -#define MODEL_bero 0x6 -#define MODEL_g1 0x5 -#define MODEL_road 0x4 -#define MODEL_frame 0x3 -#define MODEL_1_uka 0x2 -#define MODEL_stege2 0x1 -#define MODEL_stege 0x0 +#define MODEL_Root 0xA4 +#define MODEL_mazinai 0xA3 +#define MODEL_kemuri 0xA2 +#define MODEL_m_hone 0xA1 +#define MODEL_m_zyu 0xA0 +#define MODEL_m_nuno2 0x9F +#define MODEL_m_nuno1 0x9E +#define MODEL_m_hasi 0x9D +#define MODEL_tubo 0x9C +#define MODEL_o971 0x9B +#define MODEL_o970 0x9A +#define MODEL_o967 0x99 +#define MODEL_o965 0x98 +#define MODEL_g241 0x97 +#define MODEL_o907 0x96 +#define MODEL_o906 0x95 +#define MODEL_t3 0x94 +#define MODEL_o956 0x93 +#define MODEL_t2 0x92 +#define MODEL_o955 0x91 +#define MODEL_t1 0x90 +#define MODEL_o958 0x8F +#define MODEL_g222 0x8E +#define MODEL_tubo5 0x8D +#define MODEL_futa5 0x8C +#define MODEL_g221 0x8B +#define MODEL_tubo4 0x8A +#define MODEL_futa4 0x89 +#define MODEL_g218 0x88 +#define MODEL_futa2 0x87 +#define MODEL_tubo2 0x86 +#define MODEL_k_i5 0x85 +#define MODEL_ie5_naka 0x84 +#define MODEL_5n_naisou 0x83 +#define MODEL_o966 0x82 +#define MODEL_o977 0x81 +#define MODEL_g254 0x80 +#define MODEL_o975 0x7F +#define MODEL_o974 0x7E +#define MODEL_g253 0x7D +#define MODEL_o973 0x7C +#define MODEL_o972 0x7B +#define MODEL_book2 0x7A +#define MODEL_book1 0x79 +#define MODEL_5n_ranpu 0x78 +#define MODEL_5n_kanbutu 0x77 +#define MODEL_5n_binn 0x76 +#define MODEL_5n_tukue 0x75 +#define MODEL_r_hako 0x74 +#define MODEL_5n_futi 0x73 +#define MODEL_5n_zyu 0x72 +#define MODEL_5_uka 0x71 +#define MODEL_5n_kabe 0x70 +#define MODEL_5_doa2 0x6F +#define MODEL_o770 0x6E +#define MODEL_5_doa 0x6D +#define MODEL_o769 0x6C +#define MODEL_g200 0x6B +#define MODEL_6_moyou 0x6A +#define MODEL_6_waku 0x69 +#define MODEL_6_kabe 0x68 +#define MODEL_ie5 0x67 +#define MODEL_yane 0x66 +#define MODEL_5_post2 0x65 +#define MODEL_5_poster 0x64 +#define MODEL_5_yane 0x63 +#define MODEL_5_waku 0x62 +#define MODEL_5_hasira2 0x61 +#define MODEL_5_moyou 0x60 +#define MODEL_5_kabe 0x5F +#define MODEL_k_i4 0x5E +#define MODEL_mae 0x5D +#define MODEL_o938 0x5C +#define MODEL_o937 0x5B +#define MODEL_o936 0x5A +#define MODEL_i4_mado 0x59 +#define MODEL_4_hasis2 0x58 +#define MODEL_ie4_naka 0x57 +#define MODEL_4_naisou 0x56 +#define MODEL_g255 0x55 +#define MODEL_o980 0x54 +#define MODEL_o979 0x53 +#define MODEL_4_ranpu 0x52 +#define MODEL_tukue 0x51 +#define MODEL_bed 0x50 +#define MODEL_o987 0x4F +#define MODEL_futon 0x4E +#define MODEL_bed__ 0x4D +#define MODEL_4n_kannbutu 0x4C +#define MODEL_4n_hari 0x4B +#define MODEL_4n_tana 0x4A +#define MODEL_4n_binn 0x49 +#define MODEL_4n_mado 0x48 +#define MODEL_4n_moyo 0x47 +#define MODEL_4n_kabe 0x46 +#define MODEL_4n_waku 0x45 +#define MODEL_4n_yane 0x44 +#define MODEL_4_yuka 0x43 +#define MODEL_g229 0x42 +#define MODEL_tubo8 0x41 +#define MODEL_futa8 0x40 +#define MODEL_i4_doa 0x3F +#define MODEL_4_doa 0x3E +#define MODEL_mobe 0x3D +#define MODEL_4_hasira2 0x3C +#define MODEL_4_kabe2 0x3B +#define MODEL_4_moyou2 0x3A +#define MODEL_4_waku2 0x39 +#define MODEL_ie4 0x38 +#define MODEL_4_saku 0x37 +#define MODEL_4_yane 0x36 +#define MODEL_4_waku 0x35 +#define MODEL_4_kabe 0x34 +#define MODEL_4_moyou 0x33 +#define MODEL_i4_bou 0x32 +#define MODEL_kanban 0x31 +#define MODEL_o852 0x30 +#define MODEL_ie3 0x2F +#define MODEL_3_yane 0x2E +#define MODEL_3_rennga 0x2D +#define MODEL_3_kabe 0x2C +#define MODEL_ie2 0x2B +#define MODEL_2_saku 0x2A +#define MODEL_2_yane 0x29 +#define MODEL_2_hasira3 0x28 +#define MODEL_2_hasira2 0x27 +#define MODEL_2_hasira 0x26 +#define MODEL_2_moyou 0x25 +#define MODEL_2_mado 0x24 +#define MODEL_2_kabe 0x23 +#define MODEL_ie1 0x22 +#define MODEL_1_saku 0x21 +#define MODEL_1_yane 0x20 +#define MODEL_1_kui 0x1F +#define MODEL_1_nuno 0x1E +#define MODEL_1_waku 0x1D +#define MODEL_1_hasira3 0x1C +#define MODEL_1_hasira2 0x1B +#define MODEL_1_hasira 0x1A +#define MODEL_1_moyou 0x19 +#define MODEL_1_mado 0x18 +#define MODEL_1_kabe 0x17 +#define MODEL_doa 0x16 +#define MODEL_1_doa 0x15 +#define MODEL_etc 0x14 +#define MODEL_saku 0x13 +#define MODEL_nuno 0x12 +#define MODEL_bou 0x11 +#define MODEL_oke 0x10 +#define MODEL_hei 0xF +#define MODEL_g_moyou 0xE +#define MODEL_h_kabe 0xD +#define MODEL_hako2 0xC +#define MODEL_hako3 0xB +#define MODEL_hako 0xA +#define MODEL_hako4 0x9 +#define MODEL_exitw 0x8 +#define MODEL_waku 0x7 +#define MODEL_bero 0x6 +#define MODEL_g1 0x5 +#define MODEL_road 0x4 +#define MODEL_frame 0x3 +#define MODEL_1_uka 0x2 +#define MODEL_stege2 0x1 +#define MODEL_stege 0x0 + diff --git a/include/mapfs/end_00_hit.h b/include/mapfs/end_00_hit.h index 820aea5edf..daf7864f6c 100644 --- a/include/mapfs/end_00_hit.h +++ b/include/mapfs/end_00_hit.h @@ -1,25 +1,38 @@ -#define COLLIDER_Root 0x18 -#define COLLIDER_yoshi_f 0x17 -#define COLLIDER_o114 0x16 -#define COLLIDER_o111 0x15 -#define COLLIDER_iwahage 0x14 -#define COLLIDER_o93 0x13 -#define COLLIDER_sakuji 0x12 -#define COLLIDER_o87 0x11 -#define COLLIDER_nokobros 0x10 -#define COLLIDER_o52 0xF -#define COLLIDER_party_f 0xE -#define COLLIDER_o50 0xD -#define COLLIDER_o47 0xC -#define COLLIDER_o41 0xB -#define COLLIDER_Default 0xA -#define COLLIDER_g50 0x9 -#define COLLIDER_o273 0x8 -#define COLLIDER_o272 0x7 -#define COLLIDER_o271 0x6 -#define COLLIDER_o270 0x5 -#define COLLIDER_o269 0x4 -#define COLLIDER_o268 0x3 -#define COLLIDER_o267 0x2 -#define COLLIDER_o266 0x1 -#define COLLIDER_o265 0x0 +#define COLLIDER_Root 0x18 +#define COLLIDER_yoshi_f 0x17 +#define COLLIDER_o114 0x16 +#define COLLIDER_o111 0x15 +#define COLLIDER_iwahage 0x14 +#define COLLIDER_o93 0x13 +#define COLLIDER_sakuji 0x12 +#define COLLIDER_o87 0x11 +#define COLLIDER_nokobros 0x10 +#define COLLIDER_o52 0xF +#define COLLIDER_party_f 0xE +#define COLLIDER_o50 0xD +#define COLLIDER_o47 0xC +#define COLLIDER_o41 0xB +#define COLLIDER_Default 0xA +#define COLLIDER_g50 0x9 +#define COLLIDER_o273 0x8 +#define COLLIDER_o272 0x7 +#define COLLIDER_o271 0x6 +#define COLLIDER_o270 0x5 +#define COLLIDER_o269 0x4 +#define COLLIDER_o268 0x3 +#define COLLIDER_o267 0x2 +#define COLLIDER_o266 0x1 +#define COLLIDER_o265 0x0 + +#define ZONE_Root 0xA +#define ZONE_Default 0x9 +#define ZONE_o62 0x8 +#define ZONE_o61 0x7 +#define ZONE_o60 0x6 +#define ZONE_o59 0x5 +#define ZONE_o58 0x4 +#define ZONE_o57 0x3 +#define ZONE_o56 0x2 +#define ZONE_o55 0x1 +#define ZONE_o54 0x0 + diff --git a/include/mapfs/end_00_shape.h b/include/mapfs/end_00_shape.h index 6c303f8049..f5bea974e9 100644 --- a/include/mapfs/end_00_shape.h +++ b/include/mapfs/end_00_shape.h @@ -1,103 +1,104 @@ -#define MODEL_Root 0x66 -#define MODEL_yoshi_f 0x65 -#define MODEL_o166 0x64 -#define MODEL_o169 0x63 -#define MODEL_o168 0x62 -#define MODEL_o119 0x61 -#define MODEL_o118 0x60 -#define MODEL_o115 0x5F -#define MODEL_o114 0x5E -#define MODEL_o111 0x5D -#define MODEL_iwahage 0x5C -#define MODEL_o264 0x5B -#define MODEL_o95 0x5A -#define MODEL_o93 0x59 -#define MODEL_sakuji 0x58 -#define MODEL_g19 0x57 -#define MODEL_o88 0x56 -#define MODEL_g18 0x55 -#define MODEL_o89 0x54 -#define MODEL_o90 0x53 -#define MODEL_o87 0x52 -#define MODEL_g20 0x51 -#define MODEL_o84 0x50 -#define MODEL_umi 0x4F -#define MODEL_g9 0x4E -#define MODEL_g11 0x4D -#define MODEL_o81 0x4C -#define MODEL_o57 0x4B -#define MODEL_o56 0x4A -#define MODEL_o53 0x49 -#define MODEL_o52 0x48 -#define MODEL_g10 0x47 -#define MODEL_o51 0x46 -#define MODEL_g13 0x45 -#define MODEL_o68 0x44 -#define MODEL_o66 0x43 -#define MODEL_o65 0x42 -#define MODEL_o64 0x41 -#define MODEL_o60 0x40 -#define MODEL_party_f 0x3F -#define MODEL_o80 0x3E -#define MODEL_o49 0x3D -#define MODEL_o50 0x3C -#define MODEL_o47 0x3B -#define MODEL_o41 0x3A -#define MODEL_g8 0x39 -#define MODEL_o26 0x38 -#define MODEL_o23 0x37 -#define MODEL_o22 0x36 -#define MODEL_Default 0x35 -#define MODEL_g46 0x34 -#define MODEL_j27 0x33 -#define MODEL_o226 0x32 -#define MODEL_j25 0x31 -#define MODEL_g45 0x30 -#define MODEL_j24 0x2F -#define MODEL_o219 0x2E -#define MODEL_j22 0x2D -#define MODEL_g44 0x2C -#define MODEL_j21 0x2B -#define MODEL_o212 0x2A -#define MODEL_j19 0x29 -#define MODEL_g43 0x28 -#define MODEL_j18 0x27 -#define MODEL_o205 0x26 -#define MODEL_j16 0x25 -#define MODEL_g42 0x24 -#define MODEL_j15 0x23 -#define MODEL_o198 0x22 -#define MODEL_j13 0x21 -#define MODEL_g41 0x20 -#define MODEL_j12 0x1F -#define MODEL_o191 0x1E -#define MODEL_j10 0x1D -#define MODEL_g40 0x1C -#define MODEL_j9 0x1B -#define MODEL_o184 0x1A -#define MODEL_j7 0x19 -#define MODEL_g39 0x18 -#define MODEL_j6 0x17 -#define MODEL_j6_b 0x16 -#define MODEL_j4 0x15 -#define MODEL_g29 0x14 -#define MODEL_j3 0x13 -#define MODEL_j3_b 0x12 -#define MODEL_j1 0x11 -#define MODEL_g49 0x10 -#define MODEL_j26 0xF -#define MODEL_j23 0xE -#define MODEL_j20 0xD -#define MODEL_j17 0xC -#define MODEL_j14 0xB -#define MODEL_j11 0xA -#define MODEL_j8 0x9 -#define MODEL_j5 0x8 -#define MODEL_j2 0x7 -#define MODEL_bg 0x6 -#define MODEL_bg3 0x5 -#define MODEL_mountain 0x4 -#define MODEL_bg2 0x3 -#define MODEL_cloud 0x2 -#define MODEL_bg1 0x1 -#define MODEL_sky 0x0 +#define MODEL_Root 0x66 +#define MODEL_yoshi_f 0x65 +#define MODEL_o166 0x64 +#define MODEL_o169 0x63 +#define MODEL_o168 0x62 +#define MODEL_o119 0x61 +#define MODEL_o118 0x60 +#define MODEL_o115 0x5F +#define MODEL_o114 0x5E +#define MODEL_o111 0x5D +#define MODEL_iwahage 0x5C +#define MODEL_o264 0x5B +#define MODEL_o95 0x5A +#define MODEL_o93 0x59 +#define MODEL_sakuji 0x58 +#define MODEL_g19 0x57 +#define MODEL_o88 0x56 +#define MODEL_g18 0x55 +#define MODEL_o89 0x54 +#define MODEL_o90 0x53 +#define MODEL_o87 0x52 +#define MODEL_g20 0x51 +#define MODEL_o84 0x50 +#define MODEL_umi 0x4F +#define MODEL_g9 0x4E +#define MODEL_g11 0x4D +#define MODEL_o81 0x4C +#define MODEL_o57 0x4B +#define MODEL_o56 0x4A +#define MODEL_o53 0x49 +#define MODEL_o52 0x48 +#define MODEL_g10 0x47 +#define MODEL_o51 0x46 +#define MODEL_g13 0x45 +#define MODEL_o68 0x44 +#define MODEL_o66 0x43 +#define MODEL_o65 0x42 +#define MODEL_o64 0x41 +#define MODEL_o60 0x40 +#define MODEL_party_f 0x3F +#define MODEL_o80 0x3E +#define MODEL_o49 0x3D +#define MODEL_o50 0x3C +#define MODEL_o47 0x3B +#define MODEL_o41 0x3A +#define MODEL_g8 0x39 +#define MODEL_o26 0x38 +#define MODEL_o23 0x37 +#define MODEL_o22 0x36 +#define MODEL_Default 0x35 +#define MODEL_g46 0x34 +#define MODEL_j27 0x33 +#define MODEL_o226 0x32 +#define MODEL_j25 0x31 +#define MODEL_g45 0x30 +#define MODEL_j24 0x2F +#define MODEL_o219 0x2E +#define MODEL_j22 0x2D +#define MODEL_g44 0x2C +#define MODEL_j21 0x2B +#define MODEL_o212 0x2A +#define MODEL_j19 0x29 +#define MODEL_g43 0x28 +#define MODEL_j18 0x27 +#define MODEL_o205 0x26 +#define MODEL_j16 0x25 +#define MODEL_g42 0x24 +#define MODEL_j15 0x23 +#define MODEL_o198 0x22 +#define MODEL_j13 0x21 +#define MODEL_g41 0x20 +#define MODEL_j12 0x1F +#define MODEL_o191 0x1E +#define MODEL_j10 0x1D +#define MODEL_g40 0x1C +#define MODEL_j9 0x1B +#define MODEL_o184 0x1A +#define MODEL_j7 0x19 +#define MODEL_g39 0x18 +#define MODEL_j6 0x17 +#define MODEL_j6_b 0x16 +#define MODEL_j4 0x15 +#define MODEL_g29 0x14 +#define MODEL_j3 0x13 +#define MODEL_j3_b 0x12 +#define MODEL_j1 0x11 +#define MODEL_g49 0x10 +#define MODEL_j26 0xF +#define MODEL_j23 0xE +#define MODEL_j20 0xD +#define MODEL_j17 0xC +#define MODEL_j14 0xB +#define MODEL_j11 0xA +#define MODEL_j8 0x9 +#define MODEL_j5 0x8 +#define MODEL_j2 0x7 +#define MODEL_bg 0x6 +#define MODEL_bg3 0x5 +#define MODEL_mountain 0x4 +#define MODEL_bg2 0x3 +#define MODEL_cloud 0x2 +#define MODEL_bg1 0x1 +#define MODEL_sky 0x0 + diff --git a/include/mapfs/end_01_hit.h b/include/mapfs/end_01_hit.h index c736b87f09..daa3ec926a 100644 --- a/include/mapfs/end_01_hit.h +++ b/include/mapfs/end_01_hit.h @@ -1,14 +1,24 @@ -#define COLLIDER_Root 0xD -#define COLLIDER_g8 0xC -#define COLLIDER_o65 0xB -#define COLLIDER_o69 0xA -#define COLLIDER_o70 0x9 -#define COLLIDER_o68 0x8 -#define COLLIDER_o66 0x7 -#define COLLIDER_Default 0x6 -#define COLLIDER_o63 0x5 -#define COLLIDER_o62 0x4 -#define COLLIDER_o61 0x3 -#define COLLIDER_o60 0x2 -#define COLLIDER_o59 0x1 -#define COLLIDER_o58 0x0 +#define COLLIDER_Root 0xD +#define COLLIDER_g8 0xC +#define COLLIDER_o65 0xB +#define COLLIDER_o69 0xA +#define COLLIDER_o70 0x9 +#define COLLIDER_o68 0x8 +#define COLLIDER_o66 0x7 +#define COLLIDER_Default 0x6 +#define COLLIDER_o63 0x5 +#define COLLIDER_o62 0x4 +#define COLLIDER_o61 0x3 +#define COLLIDER_o60 0x2 +#define COLLIDER_o59 0x1 +#define COLLIDER_o58 0x0 + +#define ZONE_Root 0x7 +#define ZONE_Default 0x6 +#define ZONE_o63 0x5 +#define ZONE_o62 0x4 +#define ZONE_o61 0x3 +#define ZONE_o60 0x2 +#define ZONE_o59 0x1 +#define ZONE_o58 0x0 + diff --git a/include/mapfs/end_01_shape.h b/include/mapfs/end_01_shape.h index e4b48ae5ae..208743a832 100644 --- a/include/mapfs/end_01_shape.h +++ b/include/mapfs/end_01_shape.h @@ -1,92 +1,93 @@ -#define MODEL_Root 0x5B -#define MODEL_g8 0x5A -#define MODEL_o26 0x59 -#define MODEL_bush 0x58 -#define MODEL_o263 0x57 -#define MODEL_o265 0x56 -#define MODEL_o264 0x55 -#define MODEL_o269 0x54 -#define MODEL_o271 0x53 -#define MODEL_kinoko 0x52 -#define MODEL_mp8 0x51 -#define MODEL_mp7 0x50 -#define MODEL_mp6 0x4F -#define MODEL_omp5 0x4E -#define MODEL_mp4 0x4D -#define MODEL_mp3 0x4C -#define MODEL_mp2 0x4B -#define MODEL_mp1 0x4A -#define MODEL_heiho 0x49 -#define MODEL_h3 0x48 -#define MODEL_omo5 0x47 -#define MODEL_omo4 0x46 -#define MODEL_h2 0x45 -#define MODEL_omo3 0x44 -#define MODEL_omo2 0x43 -#define MODEL_omo1 0x42 -#define MODEL_h1 0x41 -#define MODEL_omo15 0x40 -#define MODEL_omo14 0x3F -#define MODEL_omo13 0x3E -#define MODEL_omo12 0x3D -#define MODEL_omo11 0x3C -#define MODEL_omo10 0x3B -#define MODEL_omo9 0x3A -#define MODEL_omo8 0x39 -#define MODEL_omo7 0x38 -#define MODEL_omo6 0x37 -#define MODEL_kobock 0x36 -#define MODEL_flo5 0x35 -#define MODEL_flo4 0x34 -#define MODEL_flo3 0x33 -#define MODEL_flo2 0x32 -#define MODEL_flo1 0x31 -#define MODEL_star_element 0x30 -#define MODEL_o142 0x2F -#define MODEL_kinopiena 0x2E -#define MODEL_kino9 0x2D -#define MODEL_kino8 0x2C -#define MODEL_kino7 0x2B -#define MODEL_kino6 0x2A -#define MODEL_kino5 0x29 -#define MODEL_kino4 0x28 -#define MODEL_kino3 0x27 -#define MODEL_kino2 0x26 -#define MODEL_kino 0x25 -#define MODEL_kino1 0x24 -#define MODEL_Default 0x23 -#define MODEL_g47 0x22 -#define MODEL_o278 0x21 -#define MODEL_o277 0x20 -#define MODEL_o276 0x1F -#define MODEL_o275 0x1E -#define MODEL_g40 0x1D -#define MODEL_o204 0x1C -#define MODEL_o203 0x1B -#define MODEL_o202 0x1A -#define MODEL_o201 0x19 -#define MODEL_g39 0x18 -#define MODEL_o260 0x17 -#define MODEL_o198 0x16 -#define MODEL_o197 0x15 -#define MODEL_o196 0x14 -#define MODEL_o195 0x13 -#define MODEL_g32 0x12 -#define MODEL_o162 0x11 -#define MODEL_o161 0x10 -#define MODEL_o160 0xF -#define MODEL_o159 0xE -#define MODEL_g30 0xD -#define MODEL_o157 0xC -#define MODEL_o166 0xB -#define MODEL_o154 0xA -#define MODEL_o153 0x9 -#define MODEL_o152 0x8 -#define MODEL_g28 0x7 -#define MODEL_j2 0x6 -#define MODEL_o146 0x5 -#define MODEL_o145 0x4 -#define MODEL_bg 0x3 -#define MODEL_mountain 0x2 -#define MODEL_bg1 0x1 -#define MODEL_sky 0x0 +#define MODEL_Root 0x5B +#define MODEL_g8 0x5A +#define MODEL_o26 0x59 +#define MODEL_bush 0x58 +#define MODEL_o263 0x57 +#define MODEL_o265 0x56 +#define MODEL_o264 0x55 +#define MODEL_o269 0x54 +#define MODEL_o271 0x53 +#define MODEL_kinoko 0x52 +#define MODEL_mp8 0x51 +#define MODEL_mp7 0x50 +#define MODEL_mp6 0x4F +#define MODEL_omp5 0x4E +#define MODEL_mp4 0x4D +#define MODEL_mp3 0x4C +#define MODEL_mp2 0x4B +#define MODEL_mp1 0x4A +#define MODEL_heiho 0x49 +#define MODEL_h3 0x48 +#define MODEL_omo5 0x47 +#define MODEL_omo4 0x46 +#define MODEL_h2 0x45 +#define MODEL_omo3 0x44 +#define MODEL_omo2 0x43 +#define MODEL_omo1 0x42 +#define MODEL_h1 0x41 +#define MODEL_omo15 0x40 +#define MODEL_omo14 0x3F +#define MODEL_omo13 0x3E +#define MODEL_omo12 0x3D +#define MODEL_omo11 0x3C +#define MODEL_omo10 0x3B +#define MODEL_omo9 0x3A +#define MODEL_omo8 0x39 +#define MODEL_omo7 0x38 +#define MODEL_omo6 0x37 +#define MODEL_kobock 0x36 +#define MODEL_flo5 0x35 +#define MODEL_flo4 0x34 +#define MODEL_flo3 0x33 +#define MODEL_flo2 0x32 +#define MODEL_flo1 0x31 +#define MODEL_star_element 0x30 +#define MODEL_o142 0x2F +#define MODEL_kinopiena 0x2E +#define MODEL_kino9 0x2D +#define MODEL_kino8 0x2C +#define MODEL_kino7 0x2B +#define MODEL_kino6 0x2A +#define MODEL_kino5 0x29 +#define MODEL_kino4 0x28 +#define MODEL_kino3 0x27 +#define MODEL_kino2 0x26 +#define MODEL_kino 0x25 +#define MODEL_kino1 0x24 +#define MODEL_Default 0x23 +#define MODEL_g47 0x22 +#define MODEL_o278 0x21 +#define MODEL_o277 0x20 +#define MODEL_o276 0x1F +#define MODEL_o275 0x1E +#define MODEL_g40 0x1D +#define MODEL_o204 0x1C +#define MODEL_o203 0x1B +#define MODEL_o202 0x1A +#define MODEL_o201 0x19 +#define MODEL_g39 0x18 +#define MODEL_o260 0x17 +#define MODEL_o198 0x16 +#define MODEL_o197 0x15 +#define MODEL_o196 0x14 +#define MODEL_o195 0x13 +#define MODEL_g32 0x12 +#define MODEL_o162 0x11 +#define MODEL_o161 0x10 +#define MODEL_o160 0xF +#define MODEL_o159 0xE +#define MODEL_g30 0xD +#define MODEL_o157 0xC +#define MODEL_o166 0xB +#define MODEL_o154 0xA +#define MODEL_o153 0x9 +#define MODEL_o152 0x8 +#define MODEL_g28 0x7 +#define MODEL_j2 0x6 +#define MODEL_o146 0x5 +#define MODEL_o145 0x4 +#define MODEL_bg 0x3 +#define MODEL_mountain 0x2 +#define MODEL_bg1 0x1 +#define MODEL_sky 0x0 + diff --git a/include/mapfs/flo_00_hit.h b/include/mapfs/flo_00_hit.h index 75f9d6737f..82fdd69ee9 100644 --- a/include/mapfs/flo_00_hit.h +++ b/include/mapfs/flo_00_hit.h @@ -1,52 +1,59 @@ -#define COLLIDER_Root 0x33 -#define COLLIDER_g12 0x32 -#define COLLIDER_g83 0x31 -#define COLLIDER_o351 0x30 -#define COLLIDER_o261 0x2F -#define COLLIDER_o240 0x2E -#define COLLIDER_g6 0x2D -#define COLLIDER_o110 0x2C -#define COLLIDER_o31 0x2B -#define COLLIDER_o141 0x2A -#define COLLIDER_g10 0x29 -#define COLLIDER_o360 0x28 -#define COLLIDER_o318 0x27 -#define COLLIDER_o317 0x26 -#define COLLIDER_o316 0x25 -#define COLLIDER_o127 0x24 -#define COLLIDER_o321 0x23 -#define COLLIDER_o320 0x22 -#define COLLIDER_o319 0x21 -#define COLLIDER_o56 0x20 -#define COLLIDER_o363 0x1F -#define COLLIDER_o129 0x1E -#define COLLIDER_g9 0x1D -#define COLLIDER_g17 0x1C -#define COLLIDER_o108 0x1B -#define COLLIDER_deilitse 0x1A -#define COLLIDER_deilise 0x19 -#define COLLIDER_g117 0x18 -#define COLLIDER_o308 0x17 -#define COLLIDER_deilite 0x16 -#define COLLIDER_deilie 0x15 -#define COLLIDER_g16 0x14 -#define COLLIDER_o106 0x13 -#define COLLIDER_deilitne 0x12 -#define COLLIDER_deiline 0x11 -#define COLLIDER_g11 0x10 -#define COLLIDER_o102 0xF -#define COLLIDER_deilitsw 0xE -#define COLLIDER_deilisw 0xD -#define COLLIDER_g118 0xC -#define COLLIDER_o311 0xB -#define COLLIDER_deilitw 0xA -#define COLLIDER_deiliw 0x9 -#define COLLIDER_g15 0x8 -#define COLLIDER_o104 0x7 -#define COLLIDER_deilitnw 0x6 -#define COLLIDER_deilinw 0x5 -#define COLLIDER_g7 0x4 -#define COLLIDER_o98 0x3 -#define COLLIDER_deilittn 0x2 -#define COLLIDER_deilitn 0x1 -#define COLLIDER_deilin 0x0 +#define COLLIDER_Root 0x33 +#define COLLIDER_g12 0x32 +#define COLLIDER_g83 0x31 +#define COLLIDER_o351 0x30 +#define COLLIDER_o261 0x2F +#define COLLIDER_o240 0x2E +#define COLLIDER_g6 0x2D +#define COLLIDER_o110 0x2C +#define COLLIDER_o31 0x2B +#define COLLIDER_o141 0x2A +#define COLLIDER_g10 0x29 +#define COLLIDER_o360 0x28 +#define COLLIDER_o318 0x27 +#define COLLIDER_o317 0x26 +#define COLLIDER_o316 0x25 +#define COLLIDER_o127 0x24 +#define COLLIDER_o321 0x23 +#define COLLIDER_o320 0x22 +#define COLLIDER_o319 0x21 +#define COLLIDER_o56 0x20 +#define COLLIDER_o363 0x1F +#define COLLIDER_o129 0x1E +#define COLLIDER_g9 0x1D +#define COLLIDER_g17 0x1C +#define COLLIDER_o108 0x1B +#define COLLIDER_deilitse 0x1A +#define COLLIDER_deilise 0x19 +#define COLLIDER_g117 0x18 +#define COLLIDER_o308 0x17 +#define COLLIDER_deilite 0x16 +#define COLLIDER_deilie 0x15 +#define COLLIDER_g16 0x14 +#define COLLIDER_o106 0x13 +#define COLLIDER_deilitne 0x12 +#define COLLIDER_deiline 0x11 +#define COLLIDER_g11 0x10 +#define COLLIDER_o102 0xF +#define COLLIDER_deilitsw 0xE +#define COLLIDER_deilisw 0xD +#define COLLIDER_g118 0xC +#define COLLIDER_o311 0xB +#define COLLIDER_deilitw 0xA +#define COLLIDER_deiliw 0x9 +#define COLLIDER_g15 0x8 +#define COLLIDER_o104 0x7 +#define COLLIDER_deilitnw 0x6 +#define COLLIDER_deilinw 0x5 +#define COLLIDER_g7 0x4 +#define COLLIDER_o98 0x3 +#define COLLIDER_deilittn 0x2 +#define COLLIDER_deilitn 0x1 +#define COLLIDER_deilin 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g12 0x3 +#define ZONE_o94 0x2 +#define ZONE_o93 0x1 +#define ZONE_o92 0x0 + diff --git a/include/mapfs/flo_00_shape.h b/include/mapfs/flo_00_shape.h index 49f28b7122..cfba0d5cfb 100644 --- a/include/mapfs/flo_00_shape.h +++ b/include/mapfs/flo_00_shape.h @@ -1,135 +1,136 @@ -#define MODEL_Root 0x86 -#define MODEL_g12 0x85 -#define MODEL_g54 0x84 -#define MODEL_g56 0x83 -#define MODEL_o171 0x82 -#define MODEL_o170 0x81 -#define MODEL_o169 0x80 -#define MODEL_o168 0x7F -#define MODEL_g55 0x7E -#define MODEL_o167 0x7D -#define MODEL_o166 0x7C -#define MODEL_o165 0x7B -#define MODEL_o164 0x7A -#define MODEL_ha 0x79 -#define MODEL_g66 0x78 -#define MODEL_o181 0x77 -#define MODEL_g65 0x76 -#define MODEL_o183 0x75 -#define MODEL_g64 0x74 -#define MODEL_o182 0x73 -#define MODEL_g63 0x72 -#define MODEL_o185 0x71 -#define MODEL_g62 0x70 -#define MODEL_o186 0x6F -#define MODEL_g61 0x6E -#define MODEL_o187 0x6D -#define MODEL_g60 0x6C -#define MODEL_o188 0x6B -#define MODEL_g49 0x6A -#define MODEL_o146 0x69 -#define MODEL_g48 0x68 -#define MODEL_o145 0x67 -#define MODEL_g47 0x66 -#define MODEL_o144 0x65 -#define MODEL_g46 0x64 -#define MODEL_o143 0x63 -#define MODEL_g45 0x62 -#define MODEL_o139 0x61 -#define MODEL_g44 0x60 -#define MODEL_o138 0x5F -#define MODEL_g43 0x5E -#define MODEL_o140 0x5D -#define MODEL_g42 0x5C -#define MODEL_o141 0x5B -#define MODEL_g41 0x5A -#define MODEL_o117 0x59 -#define MODEL_g40 0x58 -#define MODEL_o148 0x57 -#define MODEL_g39 0x56 -#define MODEL_o149 0x55 -#define MODEL_g38 0x54 -#define MODEL_o147 0x53 -#define MODEL_g36 0x52 -#define MODEL_o142 0x51 -#define MODEL_tuta 0x50 -#define MODEL_g37 0x4F -#define MODEL_o136 0x4E -#define MODEL_o134 0x4D -#define MODEL_o135 0x4C -#define MODEL_o137 0x4B -#define MODEL_g35 0x4A -#define MODEL_o132 0x49 -#define MODEL_o130 0x48 -#define MODEL_o133 0x47 -#define MODEL_o122 0x46 -#define MODEL_g29 0x45 -#define MODEL_o102 0x44 -#define MODEL_o101 0x43 -#define MODEL_g13 0x42 -#define MODEL_g14 0x41 -#define MODEL_o65 0x40 -#define MODEL_o9 0x3F -#define MODEL_o77 0x3E -#define MODEL_o76 0x3D -#define MODEL_o68 0x3C -#define MODEL_o100 0x3B -#define MODEL_g25 0x3A -#define MODEL_o87 0x39 -#define MODEL_o86 0x38 -#define MODEL_o88 0x37 -#define MODEL_o89 0x36 -#define MODEL_g1 0x35 -#define MODEL_o75 0x34 -#define MODEL_o72 0x33 -#define MODEL_g4 0x32 -#define MODEL_o90 0x31 -#define MODEL_o22 0x30 -#define MODEL_g6 0x2F -#define MODEL_g71 0x2E -#define MODEL_o206 0x2D -#define MODEL_o205 0x2C -#define MODEL_g8 0x2B -#define MODEL_o51 0x2A -#define MODEL_o54 0x29 -#define MODEL_o48 0x28 -#define MODEL_o50 0x27 -#define MODEL_g7 0x26 -#define MODEL_o99 0x25 -#define MODEL_o98 0x24 -#define MODEL_o47 0x23 -#define MODEL_o42 0x22 -#define MODEL_o44 0x21 -#define MODEL_o43 0x20 -#define MODEL_o41 0x1F -#define MODEL_o38 0x1E -#define MODEL_o30 0x1D -#define MODEL_g27 0x1C -#define MODEL_o209 0x1B -#define MODEL_o53 0x1A -#define MODEL_g10 0x19 -#define MODEL_g53 0x18 -#define MODEL_o159 0x17 -#define MODEL_o158 0x16 -#define MODEL_o157 0x15 -#define MODEL_o56 0x14 -#define MODEL_o55 0x13 -#define MODEL_g9 0x12 -#define MODEL_g70 0x11 -#define MODEL_o198 0x10 -#define MODEL_o197 0xF -#define MODEL_g69 0xE -#define MODEL_o196 0xD -#define MODEL_o195 0xC -#define MODEL_g17 0xB -#define MODEL_o58 0xA -#define MODEL_o63 0x9 -#define MODEL_g16 0x8 -#define MODEL_o60 0x7 -#define MODEL_o61 0x6 -#define MODEL_g15 0x5 -#define MODEL_o62 0x4 -#define MODEL_o59 0x3 -#define MODEL_g11 0x2 -#define MODEL_o64 0x1 -#define MODEL_o57 0x0 +#define MODEL_Root 0x86 +#define MODEL_g12 0x85 +#define MODEL_g54 0x84 +#define MODEL_g56 0x83 +#define MODEL_o171 0x82 +#define MODEL_o170 0x81 +#define MODEL_o169 0x80 +#define MODEL_o168 0x7F +#define MODEL_g55 0x7E +#define MODEL_o167 0x7D +#define MODEL_o166 0x7C +#define MODEL_o165 0x7B +#define MODEL_o164 0x7A +#define MODEL_ha 0x79 +#define MODEL_g66 0x78 +#define MODEL_o181 0x77 +#define MODEL_g65 0x76 +#define MODEL_o183 0x75 +#define MODEL_g64 0x74 +#define MODEL_o182 0x73 +#define MODEL_g63 0x72 +#define MODEL_o185 0x71 +#define MODEL_g62 0x70 +#define MODEL_o186 0x6F +#define MODEL_g61 0x6E +#define MODEL_o187 0x6D +#define MODEL_g60 0x6C +#define MODEL_o188 0x6B +#define MODEL_g49 0x6A +#define MODEL_o146 0x69 +#define MODEL_g48 0x68 +#define MODEL_o145 0x67 +#define MODEL_g47 0x66 +#define MODEL_o144 0x65 +#define MODEL_g46 0x64 +#define MODEL_o143 0x63 +#define MODEL_g45 0x62 +#define MODEL_o139 0x61 +#define MODEL_g44 0x60 +#define MODEL_o138 0x5F +#define MODEL_g43 0x5E +#define MODEL_o140 0x5D +#define MODEL_g42 0x5C +#define MODEL_o141 0x5B +#define MODEL_g41 0x5A +#define MODEL_o117 0x59 +#define MODEL_g40 0x58 +#define MODEL_o148 0x57 +#define MODEL_g39 0x56 +#define MODEL_o149 0x55 +#define MODEL_g38 0x54 +#define MODEL_o147 0x53 +#define MODEL_g36 0x52 +#define MODEL_o142 0x51 +#define MODEL_tuta 0x50 +#define MODEL_g37 0x4F +#define MODEL_o136 0x4E +#define MODEL_o134 0x4D +#define MODEL_o135 0x4C +#define MODEL_o137 0x4B +#define MODEL_g35 0x4A +#define MODEL_o132 0x49 +#define MODEL_o130 0x48 +#define MODEL_o133 0x47 +#define MODEL_o122 0x46 +#define MODEL_g29 0x45 +#define MODEL_o102 0x44 +#define MODEL_o101 0x43 +#define MODEL_g13 0x42 +#define MODEL_g14 0x41 +#define MODEL_o65 0x40 +#define MODEL_o9 0x3F +#define MODEL_o77 0x3E +#define MODEL_o76 0x3D +#define MODEL_o68 0x3C +#define MODEL_o100 0x3B +#define MODEL_g25 0x3A +#define MODEL_o87 0x39 +#define MODEL_o86 0x38 +#define MODEL_o88 0x37 +#define MODEL_o89 0x36 +#define MODEL_g1 0x35 +#define MODEL_o75 0x34 +#define MODEL_o72 0x33 +#define MODEL_g4 0x32 +#define MODEL_o90 0x31 +#define MODEL_o22 0x30 +#define MODEL_g6 0x2F +#define MODEL_g71 0x2E +#define MODEL_o206 0x2D +#define MODEL_o205 0x2C +#define MODEL_g8 0x2B +#define MODEL_o51 0x2A +#define MODEL_o54 0x29 +#define MODEL_o48 0x28 +#define MODEL_o50 0x27 +#define MODEL_g7 0x26 +#define MODEL_o99 0x25 +#define MODEL_o98 0x24 +#define MODEL_o47 0x23 +#define MODEL_o42 0x22 +#define MODEL_o44 0x21 +#define MODEL_o43 0x20 +#define MODEL_o41 0x1F +#define MODEL_o38 0x1E +#define MODEL_o30 0x1D +#define MODEL_g27 0x1C +#define MODEL_o209 0x1B +#define MODEL_o53 0x1A +#define MODEL_g10 0x19 +#define MODEL_g53 0x18 +#define MODEL_o159 0x17 +#define MODEL_o158 0x16 +#define MODEL_o157 0x15 +#define MODEL_o56 0x14 +#define MODEL_o55 0x13 +#define MODEL_g9 0x12 +#define MODEL_g70 0x11 +#define MODEL_o198 0x10 +#define MODEL_o197 0xF +#define MODEL_g69 0xE +#define MODEL_o196 0xD +#define MODEL_o195 0xC +#define MODEL_g17 0xB +#define MODEL_o58 0xA +#define MODEL_o63 0x9 +#define MODEL_g16 0x8 +#define MODEL_o60 0x7 +#define MODEL_o61 0x6 +#define MODEL_g15 0x5 +#define MODEL_o62 0x4 +#define MODEL_o59 0x3 +#define MODEL_g11 0x2 +#define MODEL_o64 0x1 +#define MODEL_o57 0x0 + diff --git a/include/mapfs/flo_03_hit.h b/include/mapfs/flo_03_hit.h index 7fdee1e48a..bccf407b4d 100644 --- a/include/mapfs/flo_03_hit.h +++ b/include/mapfs/flo_03_hit.h @@ -1,21 +1,28 @@ -#define COLLIDER_Root 0x14 -#define COLLIDER_g66 0x13 -#define COLLIDER_o237 0x12 -#define COLLIDER_g38 0x11 -#define COLLIDER_o242 0x10 -#define COLLIDER_o118 0xF -#define COLLIDER_g10 0xE -#define COLLIDER_o243 0xD -#define COLLIDER_o229 0xC -#define COLLIDER_o244 0xB -#define COLLIDER_o56 0xA -#define COLLIDER_o160 0x9 -#define COLLIDER_g29 0x8 -#define COLLIDER_g68 0x7 -#define COLLIDER_o238 0x6 -#define COLLIDER_deilite 0x5 -#define COLLIDER_deilie 0x4 -#define COLLIDER_g67 0x3 -#define COLLIDER_o151 0x2 -#define COLLIDER_deilitw 0x1 -#define COLLIDER_deiliw 0x0 +#define COLLIDER_Root 0x14 +#define COLLIDER_g66 0x13 +#define COLLIDER_o237 0x12 +#define COLLIDER_g38 0x11 +#define COLLIDER_o242 0x10 +#define COLLIDER_o118 0xF +#define COLLIDER_g10 0xE +#define COLLIDER_o243 0xD +#define COLLIDER_o229 0xC +#define COLLIDER_o244 0xB +#define COLLIDER_o56 0xA +#define COLLIDER_o160 0x9 +#define COLLIDER_g29 0x8 +#define COLLIDER_g68 0x7 +#define COLLIDER_o238 0x6 +#define COLLIDER_deilite 0x5 +#define COLLIDER_deilie 0x4 +#define COLLIDER_g67 0x3 +#define COLLIDER_o151 0x2 +#define COLLIDER_deilitw 0x1 +#define COLLIDER_deiliw 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g12 0x3 +#define ZONE_o94 0x2 +#define ZONE_o93 0x1 +#define ZONE_o92 0x0 + diff --git a/include/mapfs/flo_03_shape.h b/include/mapfs/flo_03_shape.h index df1423c402..a6863e8b41 100644 --- a/include/mapfs/flo_03_shape.h +++ b/include/mapfs/flo_03_shape.h @@ -1,30 +1,31 @@ -#define MODEL_Root 0x1D -#define MODEL_g12 0x1C -#define MODEL_g46 0x1B -#define MODEL_o161 0x1A -#define MODEL_o162 0x19 -#define MODEL_g45 0x18 -#define MODEL_o170 0x17 -#define MODEL_o157 0x16 -#define MODEL_g37 0x15 -#define MODEL_o118 0x14 -#define MODEL_g2 0x13 -#define MODEL_o88 0x12 -#define MODEL_o87 0x11 -#define MODEL_o22 0x10 -#define MODEL_o111 0xF -#define MODEL_g34 0xE -#define MODEL_o9 0xD -#define MODEL_o109 0xC -#define MODEL_o112 0xB -#define MODEL_g10 0xA -#define MODEL_o163 0x9 -#define MODEL_o56 0x8 -#define MODEL_o55 0x7 -#define MODEL_g29 0x6 -#define MODEL_g48 0x5 -#define MODEL_o165 0x4 -#define MODEL_o164 0x3 -#define MODEL_g47 0x2 -#define MODEL_o102 0x1 -#define MODEL_o101 0x0 +#define MODEL_Root 0x1D +#define MODEL_g12 0x1C +#define MODEL_g46 0x1B +#define MODEL_o161 0x1A +#define MODEL_o162 0x19 +#define MODEL_g45 0x18 +#define MODEL_o170 0x17 +#define MODEL_o157 0x16 +#define MODEL_g37 0x15 +#define MODEL_o118 0x14 +#define MODEL_g2 0x13 +#define MODEL_o88 0x12 +#define MODEL_o87 0x11 +#define MODEL_o22 0x10 +#define MODEL_o111 0xF +#define MODEL_g34 0xE +#define MODEL_o9 0xD +#define MODEL_o109 0xC +#define MODEL_o112 0xB +#define MODEL_g10 0xA +#define MODEL_o163 0x9 +#define MODEL_o56 0x8 +#define MODEL_o55 0x7 +#define MODEL_g29 0x6 +#define MODEL_g48 0x5 +#define MODEL_o165 0x4 +#define MODEL_o164 0x3 +#define MODEL_g47 0x2 +#define MODEL_o102 0x1 +#define MODEL_o101 0x0 + diff --git a/include/mapfs/flo_07_hit.h b/include/mapfs/flo_07_hit.h index 011a3af44c..fb92f9e495 100644 --- a/include/mapfs/flo_07_hit.h +++ b/include/mapfs/flo_07_hit.h @@ -1,13 +1,22 @@ -#define COLLIDER_Root 0xC -#define COLLIDER_g1 0xB -#define COLLIDER_g2 0xA -#define COLLIDER_o79 0x9 -#define COLLIDER_o78 0x8 -#define COLLIDER_o77 0x7 -#define COLLIDER_o76 0x6 -#define COLLIDER_o1 0x5 -#define COLLIDER_o5 0x4 -#define COLLIDER_g3 0x3 -#define COLLIDER_o75 0x2 -#define COLLIDER_deilite 0x1 -#define COLLIDER_deilie 0x0 +#define COLLIDER_Root 0xC +#define COLLIDER_g1 0xB +#define COLLIDER_g2 0xA +#define COLLIDER_o79 0x9 +#define COLLIDER_o78 0x8 +#define COLLIDER_o77 0x7 +#define COLLIDER_o76 0x6 +#define COLLIDER_o1 0x5 +#define COLLIDER_o5 0x4 +#define COLLIDER_g3 0x3 +#define COLLIDER_o75 0x2 +#define COLLIDER_deilite 0x1 +#define COLLIDER_deilie 0x0 + +#define ZONE_Root 0x6 +#define ZONE_g1 0x5 +#define ZONE_o5 0x4 +#define ZONE_o4 0x3 +#define ZONE_o2 0x2 +#define ZONE_o3 0x1 +#define ZONE_o1 0x0 + diff --git a/include/mapfs/flo_07_shape.h b/include/mapfs/flo_07_shape.h index bad7cbef8c..cbf1c1d56b 100644 --- a/include/mapfs/flo_07_shape.h +++ b/include/mapfs/flo_07_shape.h @@ -1,69 +1,70 @@ -#define MODEL_Root 0x44 -#define MODEL_g1 0x43 -#define MODEL_g21 0x42 -#define MODEL_o129 0x41 -#define MODEL_g24 0x40 -#define MODEL_o73 0x3F -#define MODEL_o72 0x3E -#define MODEL_o71 0x3D -#define MODEL_g23 0x3C -#define MODEL_o70 0x3B -#define MODEL_o69 0x3A -#define MODEL_o68 0x39 -#define MODEL_g22 0x38 -#define MODEL_o67 0x37 -#define MODEL_o66 0x36 -#define MODEL_o65 0x35 -#define MODEL_g12 0x34 -#define MODEL_o51 0x33 -#define MODEL_o37 0x32 -#define MODEL_o36 0x31 -#define MODEL_g36 0x30 -#define MODEL_g20 0x2F -#define MODEL_o33 0x2E -#define MODEL_o22 0x2D -#define MODEL_o57 0x2C -#define MODEL_o21 0x2B -#define MODEL_o20 0x2A -#define MODEL_o32 0x29 -#define MODEL_o30 0x28 -#define MODEL_o56 0x27 -#define MODEL_o54 0x26 -#define MODEL_g10 0x25 -#define MODEL_o31 0x24 -#define MODEL_o55 0x23 -#define MODEL_o19 0x22 -#define MODEL_g8 0x21 -#define MODEL_o24 0x20 -#define MODEL_o23 0x1F -#define MODEL_o59 0x1E -#define MODEL_o58 0x1D -#define MODEL_o35 0x1C -#define MODEL_o34 0x1B -#define MODEL_g7 0x1A -#define MODEL_o18 0x19 -#define MODEL_o29 0x18 -#define MODEL_o53 0x17 -#define MODEL_g4 0x16 -#define MODEL_o8 0x15 -#define MODEL_o7 0x14 -#define MODEL_o6 0x13 -#define MODEL_o5 0x12 -#define MODEL_g2 0x11 -#define MODEL_g25 0x10 -#define MODEL_o76 0xF -#define MODEL_o75 0xE -#define MODEL_g39 0xD -#define MODEL_o26 0xC -#define MODEL_o130 0xB -#define MODEL_o74 0xA -#define MODEL_g5 0x9 -#define MODEL_o12 0x8 -#define MODEL_o11 0x7 -#define MODEL_o9 0x6 -#define MODEL_o10 0x5 -#define MODEL_o1 0x4 -#define MODEL_o2 0x3 -#define MODEL_g3 0x2 -#define MODEL_o4 0x1 -#define MODEL_o3 0x0 +#define MODEL_Root 0x44 +#define MODEL_g1 0x43 +#define MODEL_g21 0x42 +#define MODEL_o129 0x41 +#define MODEL_g24 0x40 +#define MODEL_o73 0x3F +#define MODEL_o72 0x3E +#define MODEL_o71 0x3D +#define MODEL_g23 0x3C +#define MODEL_o70 0x3B +#define MODEL_o69 0x3A +#define MODEL_o68 0x39 +#define MODEL_g22 0x38 +#define MODEL_o67 0x37 +#define MODEL_o66 0x36 +#define MODEL_o65 0x35 +#define MODEL_g12 0x34 +#define MODEL_o51 0x33 +#define MODEL_o37 0x32 +#define MODEL_o36 0x31 +#define MODEL_g36 0x30 +#define MODEL_g20 0x2F +#define MODEL_o33 0x2E +#define MODEL_o22 0x2D +#define MODEL_o57 0x2C +#define MODEL_o21 0x2B +#define MODEL_o20 0x2A +#define MODEL_o32 0x29 +#define MODEL_o30 0x28 +#define MODEL_o56 0x27 +#define MODEL_o54 0x26 +#define MODEL_g10 0x25 +#define MODEL_o31 0x24 +#define MODEL_o55 0x23 +#define MODEL_o19 0x22 +#define MODEL_g8 0x21 +#define MODEL_o24 0x20 +#define MODEL_o23 0x1F +#define MODEL_o59 0x1E +#define MODEL_o58 0x1D +#define MODEL_o35 0x1C +#define MODEL_o34 0x1B +#define MODEL_g7 0x1A +#define MODEL_o18 0x19 +#define MODEL_o29 0x18 +#define MODEL_o53 0x17 +#define MODEL_g4 0x16 +#define MODEL_o8 0x15 +#define MODEL_o7 0x14 +#define MODEL_o6 0x13 +#define MODEL_o5 0x12 +#define MODEL_g2 0x11 +#define MODEL_g25 0x10 +#define MODEL_o76 0xF +#define MODEL_o75 0xE +#define MODEL_g39 0xD +#define MODEL_o26 0xC +#define MODEL_o130 0xB +#define MODEL_o74 0xA +#define MODEL_g5 0x9 +#define MODEL_o12 0x8 +#define MODEL_o11 0x7 +#define MODEL_o9 0x6 +#define MODEL_o10 0x5 +#define MODEL_o1 0x4 +#define MODEL_o2 0x3 +#define MODEL_g3 0x2 +#define MODEL_o4 0x1 +#define MODEL_o3 0x0 + diff --git a/include/mapfs/flo_08_hit.h b/include/mapfs/flo_08_hit.h index 5500913d6c..398975b679 100644 --- a/include/mapfs/flo_08_hit.h +++ b/include/mapfs/flo_08_hit.h @@ -1,29 +1,36 @@ -#define COLLIDER_Root 0x1C -#define COLLIDER_g1 0x1B -#define COLLIDER_g38 0x1A -#define COLLIDER_o136 0x19 -#define COLLIDER_o135 0x18 -#define COLLIDER_g71 0x17 -#define COLLIDER_o172 0x16 -#define COLLIDER_o129 0x15 -#define COLLIDER_o161 0x14 -#define COLLIDER_o114 0x13 -#define COLLIDER_g2 0x12 -#define COLLIDER_o96 0x11 -#define COLLIDER_o257 0x10 -#define COLLIDER_o223 0xF -#define COLLIDER_o137 0xE -#define COLLIDER_o133 0xD -#define COLLIDER_o1 0xC -#define COLLIDER_o9 0xB -#define COLLIDER_o132 0xA -#define COLLIDER_o158 0x9 -#define COLLIDER_g4 0x8 -#define COLLIDER_g6 0x7 -#define COLLIDER_o112 0x6 -#define COLLIDER_deilite 0x5 -#define COLLIDER_deilie 0x4 -#define COLLIDER_g5 0x3 -#define COLLIDER_o110 0x2 -#define COLLIDER_deilitw 0x1 -#define COLLIDER_deiliw 0x0 +#define COLLIDER_Root 0x1C +#define COLLIDER_g1 0x1B +#define COLLIDER_g38 0x1A +#define COLLIDER_o136 0x19 +#define COLLIDER_o135 0x18 +#define COLLIDER_g71 0x17 +#define COLLIDER_o172 0x16 +#define COLLIDER_o129 0x15 +#define COLLIDER_o161 0x14 +#define COLLIDER_o114 0x13 +#define COLLIDER_g2 0x12 +#define COLLIDER_o96 0x11 +#define COLLIDER_o257 0x10 +#define COLLIDER_o223 0xF +#define COLLIDER_o137 0xE +#define COLLIDER_o133 0xD +#define COLLIDER_o1 0xC +#define COLLIDER_o9 0xB +#define COLLIDER_o132 0xA +#define COLLIDER_o158 0x9 +#define COLLIDER_g4 0x8 +#define COLLIDER_g6 0x7 +#define COLLIDER_o112 0x6 +#define COLLIDER_deilite 0x5 +#define COLLIDER_deilie 0x4 +#define COLLIDER_g5 0x3 +#define COLLIDER_o110 0x2 +#define COLLIDER_deilitw 0x1 +#define COLLIDER_deiliw 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g1 0x3 +#define ZONE_o2 0x2 +#define ZONE_o4 0x1 +#define ZONE_o5 0x0 + diff --git a/include/mapfs/flo_08_shape.h b/include/mapfs/flo_08_shape.h index bb32641efa..c6e88afbec 100644 --- a/include/mapfs/flo_08_shape.h +++ b/include/mapfs/flo_08_shape.h @@ -1,110 +1,111 @@ -#define MODEL_Root 0x6D -#define MODEL_g1 0x6C -#define MODEL_g54 0x6B -#define MODEL_g53 0x6A -#define MODEL_o71 0x69 -#define MODEL_o70 0x68 -#define MODEL_o69 0x67 -#define MODEL_g52 0x66 -#define MODEL_o150 0x65 -#define MODEL_o149 0x64 -#define MODEL_o148 0x63 -#define MODEL_g42 0x62 -#define MODEL_o138 0x61 -#define MODEL_o125 0x60 -#define MODEL_g39 0x5F -#define MODEL_o154 0x5E -#define MODEL_o137 0x5D -#define MODEL_o129 0x5C -#define MODEL_g34 0x5B -#define MODEL_o116 0x5A -#define MODEL_o131 0x59 -#define MODEL_g31 0x58 -#define MODEL_o106 0x57 -#define MODEL_o105 0x56 -#define MODEL_g30 0x55 -#define MODEL_o109 0x54 -#define MODEL_o104 0x53 -#define MODEL_o103 0x52 -#define MODEL_o102 0x51 -#define MODEL_o101 0x50 -#define MODEL_o100 0x4F -#define MODEL_o99 0x4E -#define MODEL_o98 0x4D -#define MODEL_o97 0x4C -#define MODEL_o96 0x4B -#define MODEL_g21 0x4A -#define MODEL_o77 0x49 -#define MODEL_o76 0x48 -#define MODEL_g55 0x47 -#define MODEL_g56 0x46 -#define MODEL_o161 0x45 -#define MODEL_o160 0x44 -#define MODEL_o159 0x43 -#define MODEL_o158 0x42 -#define MODEL_g22 0x41 -#define MODEL_g23 0x40 -#define MODEL_o81 0x3F -#define MODEL_o80 0x3E -#define MODEL_o79 0x3D -#define MODEL_o78 0x3C -#define MODEL_g24 0x3B -#define MODEL_g25 0x3A -#define MODEL_o85 0x39 -#define MODEL_o84 0x38 -#define MODEL_o83 0x37 -#define MODEL_o82 0x36 -#define MODEL_g26 0x35 -#define MODEL_g27 0x34 -#define MODEL_o91 0x33 -#define MODEL_o90 0x32 -#define MODEL_o89 0x31 -#define MODEL_o88 0x30 -#define MODEL_g40 0x2F -#define MODEL_o133 0x2E -#define MODEL_o132 0x2D -#define MODEL_g15 0x2C -#define MODEL_g57 0x2B -#define MODEL_o72 0x2A -#define MODEL_o55 0x29 -#define MODEL_g18 0x28 -#define MODEL_o68 0x27 -#define MODEL_o63 0x26 -#define MODEL_o62 0x25 -#define MODEL_g16 0x24 -#define MODEL_o61 0x23 -#define MODEL_o60 0x22 -#define MODEL_g12 0x21 -#define MODEL_o38 0x20 -#define MODEL_o37 0x1F -#define MODEL_o36 0x1E -#define MODEL_o35 0x1D -#define MODEL_o34 0x1C -#define MODEL_o33 0x1B -#define MODEL_o32 0x1A -#define MODEL_o31 0x19 -#define MODEL_o28 0x18 -#define MODEL_o27 0x17 -#define MODEL_o25 0x16 -#define MODEL_g2 0x15 -#define MODEL_g38 0x14 -#define MODEL_o124 0x13 -#define MODEL_o123 0x12 -#define MODEL_g43 0x11 -#define MODEL_o140 0x10 -#define MODEL_o139 0xF -#define MODEL_o122 0xE -#define MODEL_o121 0xD -#define MODEL_g36 0xC -#define MODEL_o11 0xB -#define MODEL_o2 0xA -#define MODEL_o120 0x9 -#define MODEL_o10 0x8 -#define MODEL_o1 0x7 -#define MODEL_g4 0x6 -#define MODEL_g6 0x5 -#define MODEL_o7 0x4 -#define MODEL_o6 0x3 -#define MODEL_g5 0x2 -#define MODEL_o5 0x1 -#define MODEL_o4 0x0 +#define MODEL_Root 0x6D +#define MODEL_g1 0x6C +#define MODEL_g54 0x6B +#define MODEL_g53 0x6A +#define MODEL_o71 0x69 +#define MODEL_o70 0x68 +#define MODEL_o69 0x67 +#define MODEL_g52 0x66 +#define MODEL_o150 0x65 +#define MODEL_o149 0x64 +#define MODEL_o148 0x63 +#define MODEL_g42 0x62 +#define MODEL_o138 0x61 +#define MODEL_o125 0x60 +#define MODEL_g39 0x5F +#define MODEL_o154 0x5E +#define MODEL_o137 0x5D +#define MODEL_o129 0x5C +#define MODEL_g34 0x5B +#define MODEL_o116 0x5A +#define MODEL_o131 0x59 +#define MODEL_g31 0x58 +#define MODEL_o106 0x57 +#define MODEL_o105 0x56 +#define MODEL_g30 0x55 +#define MODEL_o109 0x54 +#define MODEL_o104 0x53 +#define MODEL_o103 0x52 +#define MODEL_o102 0x51 +#define MODEL_o101 0x50 +#define MODEL_o100 0x4F +#define MODEL_o99 0x4E +#define MODEL_o98 0x4D +#define MODEL_o97 0x4C +#define MODEL_o96 0x4B +#define MODEL_g21 0x4A +#define MODEL_o77 0x49 +#define MODEL_o76 0x48 +#define MODEL_g55 0x47 +#define MODEL_g56 0x46 +#define MODEL_o161 0x45 +#define MODEL_o160 0x44 +#define MODEL_o159 0x43 +#define MODEL_o158 0x42 +#define MODEL_g22 0x41 +#define MODEL_g23 0x40 +#define MODEL_o81 0x3F +#define MODEL_o80 0x3E +#define MODEL_o79 0x3D +#define MODEL_o78 0x3C +#define MODEL_g24 0x3B +#define MODEL_g25 0x3A +#define MODEL_o85 0x39 +#define MODEL_o84 0x38 +#define MODEL_o83 0x37 +#define MODEL_o82 0x36 +#define MODEL_g26 0x35 +#define MODEL_g27 0x34 +#define MODEL_o91 0x33 +#define MODEL_o90 0x32 +#define MODEL_o89 0x31 +#define MODEL_o88 0x30 +#define MODEL_g40 0x2F +#define MODEL_o133 0x2E +#define MODEL_o132 0x2D +#define MODEL_g15 0x2C +#define MODEL_g57 0x2B +#define MODEL_o72 0x2A +#define MODEL_o55 0x29 +#define MODEL_g18 0x28 +#define MODEL_o68 0x27 +#define MODEL_o63 0x26 +#define MODEL_o62 0x25 +#define MODEL_g16 0x24 +#define MODEL_o61 0x23 +#define MODEL_o60 0x22 +#define MODEL_g12 0x21 +#define MODEL_o38 0x20 +#define MODEL_o37 0x1F +#define MODEL_o36 0x1E +#define MODEL_o35 0x1D +#define MODEL_o34 0x1C +#define MODEL_o33 0x1B +#define MODEL_o32 0x1A +#define MODEL_o31 0x19 +#define MODEL_o28 0x18 +#define MODEL_o27 0x17 +#define MODEL_o25 0x16 +#define MODEL_g2 0x15 +#define MODEL_g38 0x14 +#define MODEL_o124 0x13 +#define MODEL_o123 0x12 +#define MODEL_g43 0x11 +#define MODEL_o140 0x10 +#define MODEL_o139 0xF +#define MODEL_o122 0xE +#define MODEL_o121 0xD +#define MODEL_g36 0xC +#define MODEL_o11 0xB +#define MODEL_o2 0xA +#define MODEL_o120 0x9 +#define MODEL_o10 0x8 +#define MODEL_o1 0x7 +#define MODEL_g4 0x6 +#define MODEL_g6 0x5 +#define MODEL_o7 0x4 +#define MODEL_o6 0x3 +#define MODEL_g5 0x2 +#define MODEL_o5 0x1 +#define MODEL_o4 0x0 + diff --git a/include/mapfs/flo_09_hit.h b/include/mapfs/flo_09_hit.h index 6bed4edd82..55450df140 100644 --- a/include/mapfs/flo_09_hit.h +++ b/include/mapfs/flo_09_hit.h @@ -1,24 +1,31 @@ -#define COLLIDER_Root 0x17 -#define COLLIDER_g1 0x16 -#define COLLIDER_g37 0x15 -#define COLLIDER_o110 0x14 -#define COLLIDER_o109 0x13 -#define COLLIDER_g9 0x12 -#define COLLIDER_o13 0x11 -#define COLLIDER_o3 0x10 -#define COLLIDER_o10 0xF -#define COLLIDER_g10 0xE -#define COLLIDER_o105 0xD -#define COLLIDER_o112 0xC -#define COLLIDER_o111 0xB -#define COLLIDER_o1 0xA -#define COLLIDER_o104 0x9 -#define COLLIDER_g2 0x8 -#define COLLIDER_g6 0x7 -#define COLLIDER_o103 0x6 -#define COLLIDER_deilite 0x5 -#define COLLIDER_deilie 0x4 -#define COLLIDER_g5 0x3 -#define COLLIDER_o101 0x2 -#define COLLIDER_deilitw 0x1 -#define COLLIDER_deiliw 0x0 +#define COLLIDER_Root 0x17 +#define COLLIDER_g1 0x16 +#define COLLIDER_g37 0x15 +#define COLLIDER_o110 0x14 +#define COLLIDER_o109 0x13 +#define COLLIDER_g9 0x12 +#define COLLIDER_o13 0x11 +#define COLLIDER_o3 0x10 +#define COLLIDER_o10 0xF +#define COLLIDER_g10 0xE +#define COLLIDER_o105 0xD +#define COLLIDER_o112 0xC +#define COLLIDER_o111 0xB +#define COLLIDER_o1 0xA +#define COLLIDER_o104 0x9 +#define COLLIDER_g2 0x8 +#define COLLIDER_g6 0x7 +#define COLLIDER_o103 0x6 +#define COLLIDER_deilite 0x5 +#define COLLIDER_deilie 0x4 +#define COLLIDER_g5 0x3 +#define COLLIDER_o101 0x2 +#define COLLIDER_deilitw 0x1 +#define COLLIDER_deiliw 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g1 0x3 +#define ZONE_o2 0x2 +#define ZONE_o4 0x1 +#define ZONE_o5 0x0 + diff --git a/include/mapfs/flo_09_shape.h b/include/mapfs/flo_09_shape.h index 69f8483919..4745b234fd 100644 --- a/include/mapfs/flo_09_shape.h +++ b/include/mapfs/flo_09_shape.h @@ -1,114 +1,115 @@ -#define MODEL_Root 0x71 -#define MODEL_g1 0x70 -#define MODEL_g37 0x6F -#define MODEL_o103 0x6E -#define MODEL_g20 0x6D -#define MODEL_g33 0x6C -#define MODEL_g34 0x6B -#define MODEL_o95 0x6A -#define MODEL_o94 0x69 -#define MODEL_o93 0x68 -#define MODEL_o92 0x67 -#define MODEL_g35 0x66 -#define MODEL_g36 0x65 -#define MODEL_o99 0x64 -#define MODEL_o98 0x63 -#define MODEL_o97 0x62 -#define MODEL_o96 0x61 -#define MODEL_o91 0x60 -#define MODEL_o90 0x5F -#define MODEL_g31 0x5E -#define MODEL_g32 0x5D -#define MODEL_o87 0x5C -#define MODEL_o86 0x5B -#define MODEL_o85 0x5A -#define MODEL_o84 0x59 -#define MODEL_g29 0x58 -#define MODEL_g30 0x57 -#define MODEL_o83 0x56 -#define MODEL_o82 0x55 -#define MODEL_o81 0x54 -#define MODEL_o80 0x53 -#define MODEL_o89 0x52 -#define MODEL_o88 0x51 -#define MODEL_g25 0x50 -#define MODEL_g26 0x4F -#define MODEL_o75 0x4E -#define MODEL_o74 0x4D -#define MODEL_o73 0x4C -#define MODEL_o72 0x4B -#define MODEL_g27 0x4A -#define MODEL_g28 0x49 -#define MODEL_o79 0x48 -#define MODEL_o78 0x47 -#define MODEL_o77 0x46 -#define MODEL_o76 0x45 -#define MODEL_o71 0x44 -#define MODEL_o70 0x43 -#define MODEL_g19 0x42 -#define MODEL_o58 0x41 -#define MODEL_o57 0x40 -#define MODEL_o56 0x3F -#define MODEL_o52 0x3E -#define MODEL_o51 0x3D -#define MODEL_o50 0x3C -#define MODEL_g18 0x3B -#define MODEL_g17 0x3A -#define MODEL_o48 0x39 -#define MODEL_o49 0x38 -#define MODEL_o46 0x37 -#define MODEL_o47 0x36 -#define MODEL_o25 0x35 -#define MODEL_o24 0x34 -#define MODEL_o23 0x33 -#define MODEL_o22 0x32 -#define MODEL_g14 0x31 -#define MODEL_o44 0x30 -#define MODEL_o45 0x2F -#define MODEL_o21 0x2E -#define MODEL_o20 0x2D -#define MODEL_o41 0x2C -#define MODEL_o40 0x2B -#define MODEL_o37 0x2A -#define MODEL_o36 0x29 -#define MODEL_o32 0x28 -#define MODEL_o33 0x27 -#define MODEL_o29 0x26 -#define MODEL_o28 0x25 -#define MODEL_g13 0x24 -#define MODEL_o39 0x23 -#define MODEL_o35 0x22 -#define MODEL_o31 0x21 -#define MODEL_o27 0x20 -#define MODEL_g12 0x1F -#define MODEL_o38 0x1E -#define MODEL_o34 0x1D -#define MODEL_o30 0x1C -#define MODEL_o26 0x1B -#define MODEL_g9 0x1A -#define MODEL_g8 0x19 -#define MODEL_o15 0x18 -#define MODEL_o14 0x17 -#define MODEL_o13 0x16 -#define MODEL_g3 0x15 -#define MODEL_o5 0x14 -#define MODEL_o4 0x13 -#define MODEL_o3 0x12 -#define MODEL_g7 0x11 -#define MODEL_o12 0x10 -#define MODEL_o11 0xF -#define MODEL_o10 0xE -#define MODEL_g10 0xD -#define MODEL_g38 0xC -#define MODEL_o105 0xB -#define MODEL_o104 0xA -#define MODEL_o2 0x9 -#define MODEL_o1 0x8 -#define MODEL_g2 0x7 -#define MODEL_g4 0x6 -#define MODEL_g6 0x5 -#define MODEL_o9 0x4 -#define MODEL_o8 0x3 -#define MODEL_g5 0x2 -#define MODEL_o7 0x1 -#define MODEL_o6 0x0 +#define MODEL_Root 0x71 +#define MODEL_g1 0x70 +#define MODEL_g37 0x6F +#define MODEL_o103 0x6E +#define MODEL_g20 0x6D +#define MODEL_g33 0x6C +#define MODEL_g34 0x6B +#define MODEL_o95 0x6A +#define MODEL_o94 0x69 +#define MODEL_o93 0x68 +#define MODEL_o92 0x67 +#define MODEL_g35 0x66 +#define MODEL_g36 0x65 +#define MODEL_o99 0x64 +#define MODEL_o98 0x63 +#define MODEL_o97 0x62 +#define MODEL_o96 0x61 +#define MODEL_o91 0x60 +#define MODEL_o90 0x5F +#define MODEL_g31 0x5E +#define MODEL_g32 0x5D +#define MODEL_o87 0x5C +#define MODEL_o86 0x5B +#define MODEL_o85 0x5A +#define MODEL_o84 0x59 +#define MODEL_g29 0x58 +#define MODEL_g30 0x57 +#define MODEL_o83 0x56 +#define MODEL_o82 0x55 +#define MODEL_o81 0x54 +#define MODEL_o80 0x53 +#define MODEL_o89 0x52 +#define MODEL_o88 0x51 +#define MODEL_g25 0x50 +#define MODEL_g26 0x4F +#define MODEL_o75 0x4E +#define MODEL_o74 0x4D +#define MODEL_o73 0x4C +#define MODEL_o72 0x4B +#define MODEL_g27 0x4A +#define MODEL_g28 0x49 +#define MODEL_o79 0x48 +#define MODEL_o78 0x47 +#define MODEL_o77 0x46 +#define MODEL_o76 0x45 +#define MODEL_o71 0x44 +#define MODEL_o70 0x43 +#define MODEL_g19 0x42 +#define MODEL_o58 0x41 +#define MODEL_o57 0x40 +#define MODEL_o56 0x3F +#define MODEL_o52 0x3E +#define MODEL_o51 0x3D +#define MODEL_o50 0x3C +#define MODEL_g18 0x3B +#define MODEL_g17 0x3A +#define MODEL_o48 0x39 +#define MODEL_o49 0x38 +#define MODEL_o46 0x37 +#define MODEL_o47 0x36 +#define MODEL_o25 0x35 +#define MODEL_o24 0x34 +#define MODEL_o23 0x33 +#define MODEL_o22 0x32 +#define MODEL_g14 0x31 +#define MODEL_o44 0x30 +#define MODEL_o45 0x2F +#define MODEL_o21 0x2E +#define MODEL_o20 0x2D +#define MODEL_o41 0x2C +#define MODEL_o40 0x2B +#define MODEL_o37 0x2A +#define MODEL_o36 0x29 +#define MODEL_o32 0x28 +#define MODEL_o33 0x27 +#define MODEL_o29 0x26 +#define MODEL_o28 0x25 +#define MODEL_g13 0x24 +#define MODEL_o39 0x23 +#define MODEL_o35 0x22 +#define MODEL_o31 0x21 +#define MODEL_o27 0x20 +#define MODEL_g12 0x1F +#define MODEL_o38 0x1E +#define MODEL_o34 0x1D +#define MODEL_o30 0x1C +#define MODEL_o26 0x1B +#define MODEL_g9 0x1A +#define MODEL_g8 0x19 +#define MODEL_o15 0x18 +#define MODEL_o14 0x17 +#define MODEL_o13 0x16 +#define MODEL_g3 0x15 +#define MODEL_o5 0x14 +#define MODEL_o4 0x13 +#define MODEL_o3 0x12 +#define MODEL_g7 0x11 +#define MODEL_o12 0x10 +#define MODEL_o11 0xF +#define MODEL_o10 0xE +#define MODEL_g10 0xD +#define MODEL_g38 0xC +#define MODEL_o105 0xB +#define MODEL_o104 0xA +#define MODEL_o2 0x9 +#define MODEL_o1 0x8 +#define MODEL_g2 0x7 +#define MODEL_g4 0x6 +#define MODEL_g6 0x5 +#define MODEL_o9 0x4 +#define MODEL_o8 0x3 +#define MODEL_g5 0x2 +#define MODEL_o7 0x1 +#define MODEL_o6 0x0 + diff --git a/include/mapfs/flo_10_hit.h b/include/mapfs/flo_10_hit.h index 857a094351..fe817ac002 100644 --- a/include/mapfs/flo_10_hit.h +++ b/include/mapfs/flo_10_hit.h @@ -1,24 +1,31 @@ -#define COLLIDER_Root 0x17 -#define COLLIDER_g1 0x16 -#define COLLIDER_water 0x15 -#define COLLIDER_o21 0x14 -#define COLLIDER_o19 0x13 -#define COLLIDER_g2 0x12 -#define COLLIDER_o87 0x11 -#define COLLIDER_o86 0x10 -#define COLLIDER_o83 0xF -#define COLLIDER_o1 0xE -#define COLLIDER_g4 0xD -#define COLLIDER_o93 0xC -#define COLLIDER_o80 0xB -#define COLLIDER_o91 0xA -#define COLLIDER_o85 0x9 -#define COLLIDER_o41 0x8 -#define COLLIDER_o79 0x7 -#define COLLIDER_o92 0x6 -#define COLLIDER_o89 0x5 -#define COLLIDER_o6 0x4 -#define COLLIDER_g3 0x3 -#define COLLIDER_o82 0x2 -#define COLLIDER_deilitw 0x1 -#define COLLIDER_deiliw 0x0 +#define COLLIDER_Root 0x17 +#define COLLIDER_g1 0x16 +#define COLLIDER_water 0x15 +#define COLLIDER_o21 0x14 +#define COLLIDER_o19 0x13 +#define COLLIDER_g2 0x12 +#define COLLIDER_o87 0x11 +#define COLLIDER_o86 0x10 +#define COLLIDER_o83 0xF +#define COLLIDER_o1 0xE +#define COLLIDER_g4 0xD +#define COLLIDER_o93 0xC +#define COLLIDER_o80 0xB +#define COLLIDER_o91 0xA +#define COLLIDER_o85 0x9 +#define COLLIDER_o41 0x8 +#define COLLIDER_o79 0x7 +#define COLLIDER_o92 0x6 +#define COLLIDER_o89 0x5 +#define COLLIDER_o6 0x4 +#define COLLIDER_g3 0x3 +#define COLLIDER_o82 0x2 +#define COLLIDER_deilitw 0x1 +#define COLLIDER_deiliw 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g1 0x3 +#define ZONE_o3 0x2 +#define ZONE_o2 0x1 +#define ZONE_o1 0x0 + diff --git a/include/mapfs/flo_10_shape.h b/include/mapfs/flo_10_shape.h index 5aeaa827a5..512593653d 100644 --- a/include/mapfs/flo_10_shape.h +++ b/include/mapfs/flo_10_shape.h @@ -1,64 +1,65 @@ -#define MODEL_Root 0x3F -#define MODEL_g1 0x3E -#define MODEL_g12 0x3D -#define MODEL_g31 0x3C -#define MODEL_o77 0x3B -#define MODEL_o109 0x3A -#define MODEL_o108 0x39 -#define MODEL_g22 0x38 -#define MODEL_o78 0x37 -#define MODEL_o25 0x36 -#define MODEL_o73 0x35 -#define MODEL_water 0x34 -#define MODEL_o119 0x33 -#define MODEL_o120 0x32 -#define MODEL_o118 0x31 -#define MODEL_o40 0x30 -#define MODEL_g27 0x2F -#define MODEL_o129 0x2E -#define MODEL_o128 0x2D -#define MODEL_o127 0x2C -#define MODEL_o104 0x2B -#define MODEL_o103 0x2A -#define MODEL_o102 0x29 -#define MODEL_o101 0x28 -#define MODEL_o100 0x27 -#define MODEL_o99 0x26 -#define MODEL_o98 0x25 -#define MODEL_ki 0x24 -#define MODEL_o49 0x23 -#define MODEL_o48 0x22 -#define MODEL_o47 0x21 -#define MODEL_o88 0x20 -#define MODEL_flower 0x1F -#define MODEL_g23 0x1E -#define MODEL_o80 0x1D -#define MODEL_o11 0x1C -#define MODEL_o10 0x1B -#define MODEL_g33 0x1A -#define MODEL_o82 0x19 -#define MODEL_o81 0x18 -#define MODEL_o117 0x17 -#define MODEL_o116 0x16 -#define MODEL_o112 0x15 -#define MODEL_o8 0x14 -#define MODEL_g2 0x13 -#define MODEL_o123 0x12 -#define MODEL_o121 0x11 -#define MODEL_o122 0x10 -#define MODEL_o87 0xF -#define MODEL_o7 0xE -#define MODEL_o96 0xD -#define MODEL_o95 0xC -#define MODEL_o85 0xB -#define MODEL_o92 0xA -#define MODEL_o1 0x9 -#define MODEL_g4 0x8 -#define MODEL_o136 0x7 -#define MODEL_o134 0x6 -#define MODEL_o126 0x5 -#define MODEL_o5 0x4 -#define MODEL_o41 0x3 -#define MODEL_g3 0x2 -#define MODEL_o4 0x1 -#define MODEL_o3 0x0 +#define MODEL_Root 0x3F +#define MODEL_g1 0x3E +#define MODEL_g12 0x3D +#define MODEL_g31 0x3C +#define MODEL_o77 0x3B +#define MODEL_o109 0x3A +#define MODEL_o108 0x39 +#define MODEL_g22 0x38 +#define MODEL_o78 0x37 +#define MODEL_o25 0x36 +#define MODEL_o73 0x35 +#define MODEL_water 0x34 +#define MODEL_o119 0x33 +#define MODEL_o120 0x32 +#define MODEL_o118 0x31 +#define MODEL_o40 0x30 +#define MODEL_g27 0x2F +#define MODEL_o129 0x2E +#define MODEL_o128 0x2D +#define MODEL_o127 0x2C +#define MODEL_o104 0x2B +#define MODEL_o103 0x2A +#define MODEL_o102 0x29 +#define MODEL_o101 0x28 +#define MODEL_o100 0x27 +#define MODEL_o99 0x26 +#define MODEL_o98 0x25 +#define MODEL_ki 0x24 +#define MODEL_o49 0x23 +#define MODEL_o48 0x22 +#define MODEL_o47 0x21 +#define MODEL_o88 0x20 +#define MODEL_flower 0x1F +#define MODEL_g23 0x1E +#define MODEL_o80 0x1D +#define MODEL_o11 0x1C +#define MODEL_o10 0x1B +#define MODEL_g33 0x1A +#define MODEL_o82 0x19 +#define MODEL_o81 0x18 +#define MODEL_o117 0x17 +#define MODEL_o116 0x16 +#define MODEL_o112 0x15 +#define MODEL_o8 0x14 +#define MODEL_g2 0x13 +#define MODEL_o123 0x12 +#define MODEL_o121 0x11 +#define MODEL_o122 0x10 +#define MODEL_o87 0xF +#define MODEL_o7 0xE +#define MODEL_o96 0xD +#define MODEL_o95 0xC +#define MODEL_o85 0xB +#define MODEL_o92 0xA +#define MODEL_o1 0x9 +#define MODEL_g4 0x8 +#define MODEL_o136 0x7 +#define MODEL_o134 0x6 +#define MODEL_o126 0x5 +#define MODEL_o5 0x4 +#define MODEL_o41 0x3 +#define MODEL_g3 0x2 +#define MODEL_o4 0x1 +#define MODEL_o3 0x0 + diff --git a/include/mapfs/flo_11_hit.h b/include/mapfs/flo_11_hit.h index 7b3da8e852..74e02ca97b 100644 --- a/include/mapfs/flo_11_hit.h +++ b/include/mapfs/flo_11_hit.h @@ -1,40 +1,48 @@ -#define COLLIDER_Root 0x27 -#define COLLIDER_g1 0x26 -#define COLLIDER_g12 0x25 -#define COLLIDER_g20 0x24 -#define COLLIDER_o91 0x23 -#define COLLIDER_o92 0x22 -#define COLLIDER_o93 0x21 -#define COLLIDER_o94 0x20 -#define COLLIDER_o95 0x1F -#define COLLIDER_o96 0x1E -#define COLLIDER_g19 0x1D -#define COLLIDER_o85 0x1C -#define COLLIDER_o84 0x1B -#define COLLIDER_o83 0x1A -#define COLLIDER_o82 0x19 -#define COLLIDER_o50 0x18 -#define COLLIDER_o49 0x17 -#define COLLIDER_g11 0x16 -#define COLLIDER_o113 0x15 -#define COLLIDER_o112 0x14 -#define COLLIDER_o107 0x13 -#define COLLIDER_o106 0x12 -#define COLLIDER_o97 0x11 -#define COLLIDER_o75 0x10 -#define COLLIDER_g2 0xF -#define COLLIDER_o111 0xE -#define COLLIDER_o110 0xD -#define COLLIDER_o109 0xC -#define COLLIDER_o105 0xB -#define COLLIDER_o104 0xA -#define COLLIDER_o90 0x9 -#define COLLIDER_g10 0x8 -#define COLLIDER_g17 0x7 -#define COLLIDER_o89 0x6 -#define COLLIDER_deilite 0x5 -#define COLLIDER_deilie 0x4 -#define COLLIDER_g16 0x3 -#define COLLIDER_o3 0x2 -#define COLLIDER_deilitw 0x1 -#define COLLIDER_deiliw 0x0 +#define COLLIDER_Root 0x27 +#define COLLIDER_g1 0x26 +#define COLLIDER_g12 0x25 +#define COLLIDER_g20 0x24 +#define COLLIDER_o91 0x23 +#define COLLIDER_o92 0x22 +#define COLLIDER_o93 0x21 +#define COLLIDER_o94 0x20 +#define COLLIDER_o95 0x1F +#define COLLIDER_o96 0x1E +#define COLLIDER_g19 0x1D +#define COLLIDER_o85 0x1C +#define COLLIDER_o84 0x1B +#define COLLIDER_o83 0x1A +#define COLLIDER_o82 0x19 +#define COLLIDER_o50 0x18 +#define COLLIDER_o49 0x17 +#define COLLIDER_g11 0x16 +#define COLLIDER_o113 0x15 +#define COLLIDER_o112 0x14 +#define COLLIDER_o107 0x13 +#define COLLIDER_o106 0x12 +#define COLLIDER_o97 0x11 +#define COLLIDER_o75 0x10 +#define COLLIDER_g2 0xF +#define COLLIDER_o111 0xE +#define COLLIDER_o110 0xD +#define COLLIDER_o109 0xC +#define COLLIDER_o105 0xB +#define COLLIDER_o104 0xA +#define COLLIDER_o90 0x9 +#define COLLIDER_g10 0x8 +#define COLLIDER_g17 0x7 +#define COLLIDER_o89 0x6 +#define COLLIDER_deilite 0x5 +#define COLLIDER_deilie 0x4 +#define COLLIDER_g16 0x3 +#define COLLIDER_o3 0x2 +#define COLLIDER_deilitw 0x1 +#define COLLIDER_deiliw 0x0 + +#define ZONE_Root 0x5 +#define ZONE_g1 0x4 +#define ZONE_o63 0x3 +#define ZONE_o62 0x2 +#define ZONE_o53 0x1 +#define ZONE_o52 0x0 + diff --git a/include/mapfs/flo_11_shape.h b/include/mapfs/flo_11_shape.h index 6a5c81197d..f97f293b59 100644 --- a/include/mapfs/flo_11_shape.h +++ b/include/mapfs/flo_11_shape.h @@ -1,24 +1,25 @@ -#define MODEL_Root 0x17 -#define MODEL_g1 0x16 -#define MODEL_g12 0x15 -#define MODEL_o99 0x14 -#define MODEL_o98 0x13 -#define MODEL_o97 0x12 -#define MODEL_o96 0x11 -#define MODEL_o91 0x10 -#define MODEL_o100 0xF -#define MODEL_g11 0xE -#define MODEL_o73 0xD -#define MODEL_o75 0xC -#define MODEL_o76 0xB -#define MODEL_o53 0xA -#define MODEL_o45 0x9 -#define MODEL_o81 0x8 -#define MODEL_g2 0x7 -#define MODEL_o43 0x6 -#define MODEL_o6 0x5 -#define MODEL_g10 0x4 -#define MODEL_o52 0x3 -#define MODEL_o51 0x2 -#define MODEL_o3 0x1 -#define MODEL_o2 0x0 +#define MODEL_Root 0x17 +#define MODEL_g1 0x16 +#define MODEL_g12 0x15 +#define MODEL_o99 0x14 +#define MODEL_o98 0x13 +#define MODEL_o97 0x12 +#define MODEL_o96 0x11 +#define MODEL_o91 0x10 +#define MODEL_o100 0xF +#define MODEL_g11 0xE +#define MODEL_o73 0xD +#define MODEL_o75 0xC +#define MODEL_o76 0xB +#define MODEL_o53 0xA +#define MODEL_o45 0x9 +#define MODEL_o81 0x8 +#define MODEL_g2 0x7 +#define MODEL_o43 0x6 +#define MODEL_o6 0x5 +#define MODEL_g10 0x4 +#define MODEL_o52 0x3 +#define MODEL_o51 0x2 +#define MODEL_o3 0x1 +#define MODEL_o2 0x0 + diff --git a/include/mapfs/flo_12_hit.h b/include/mapfs/flo_12_hit.h index 5db369bc6d..aa118e7bfd 100644 --- a/include/mapfs/flo_12_hit.h +++ b/include/mapfs/flo_12_hit.h @@ -1,17 +1,25 @@ -#define COLLIDER_Root 0x10 -#define COLLIDER_g1 0xF -#define COLLIDER_g37 0xE -#define COLLIDER_o181 0xD -#define COLLIDER_o197 0xC -#define COLLIDER_o180 0xB -#define COLLIDER_o179 0xA -#define COLLIDER_o177 0x9 -#define COLLIDER_o178 0x8 -#define COLLIDER_o176 0x7 -#define COLLIDER_g22 0x6 -#define COLLIDER_o104 0x5 -#define COLLIDER_o175 0x4 -#define COLLIDER_g10 0x3 -#define COLLIDER_o83 0x2 -#define COLLIDER_deilite 0x1 -#define COLLIDER_deilie 0x0 +#define COLLIDER_Root 0x10 +#define COLLIDER_g1 0xF +#define COLLIDER_g37 0xE +#define COLLIDER_o181 0xD +#define COLLIDER_o197 0xC +#define COLLIDER_o180 0xB +#define COLLIDER_o179 0xA +#define COLLIDER_o177 0x9 +#define COLLIDER_o178 0x8 +#define COLLIDER_o176 0x7 +#define COLLIDER_g22 0x6 +#define COLLIDER_o104 0x5 +#define COLLIDER_o175 0x4 +#define COLLIDER_g10 0x3 +#define COLLIDER_o83 0x2 +#define COLLIDER_deilite 0x1 +#define COLLIDER_deilie 0x0 + +#define ZONE_Root 0x5 +#define ZONE_g1 0x4 +#define ZONE_o5 0x3 +#define ZONE_o4 0x2 +#define ZONE_o3 0x1 +#define ZONE_o2 0x0 + diff --git a/include/mapfs/flo_12_shape.h b/include/mapfs/flo_12_shape.h index 37a21619b4..25da5a04fd 100644 --- a/include/mapfs/flo_12_shape.h +++ b/include/mapfs/flo_12_shape.h @@ -1,100 +1,101 @@ -#define MODEL_Root 0x63 -#define MODEL_g1 0x62 -#define MODEL_g41 0x61 -#define MODEL_o130 0x60 -#define MODEL_o129 0x5F -#define MODEL_o128 0x5E -#define MODEL_g48 0x5D -#define MODEL_o167 0x5C -#define MODEL_o166 0x5B -#define MODEL_g42 0x5A -#define MODEL_g49 0x59 -#define MODEL_o177 0x58 -#define MODEL_o175 0x57 -#define MODEL_o174 0x56 -#define MODEL_o173 0x55 -#define MODEL_o172 0x54 -#define MODEL_o176 0x53 -#define MODEL_g45 0x52 -#define MODEL_o164 0x51 -#define MODEL_o163 0x50 -#define MODEL_o162 0x4F -#define MODEL_o161 0x4E -#define MODEL_o160 0x4D -#define MODEL_g43 0x4C -#define MODEL_o154 0x4B -#define MODEL_o153 0x4A -#define MODEL_o152 0x49 -#define MODEL_o151 0x48 -#define MODEL_o150 0x47 -#define MODEL_o149 0x46 -#define MODEL_g37 0x45 -#define MODEL_g38 0x44 -#define MODEL_o141 0x43 -#define MODEL_o144 0x42 -#define MODEL_o146 0x41 -#define MODEL_o140 0x40 -#define MODEL_o138 0x3F -#define MODEL_g39 0x3E -#define MODEL_o145 0x3D -#define MODEL_o139 0x3C -#define MODEL_o143 0x3B -#define MODEL_o142 0x3A -#define MODEL_g40 0x39 -#define MODEL_o147 0x38 -#define MODEL_o137 0x37 -#define MODEL_g32 0x36 -#define MODEL_o114 0x35 -#define MODEL_o116 0x34 -#define MODEL_o117 0x33 -#define MODEL_o120 0x32 -#define MODEL_g30 0x31 -#define MODEL_o125 0x30 -#define MODEL_o124 0x2F -#define MODEL_o123 0x2E -#define MODEL_o122 0x2D -#define MODEL_o121 0x2C -#define MODEL_o113 0x2B -#define MODEL_g22 0x2A -#define MODEL_g46 0x29 -#define MODEL_g29 0x28 -#define MODEL_o107 0x27 -#define MODEL_o106 0x26 -#define MODEL_o105 0x25 -#define MODEL_g27 0x24 -#define MODEL_o101 0x23 -#define MODEL_o100 0x22 -#define MODEL_o99 0x21 -#define MODEL_g26 0x20 -#define MODEL_o98 0x1F -#define MODEL_o97 0x1E -#define MODEL_o96 0x1D -#define MODEL_g23 0x1C -#define MODEL_o88 0x1B -#define MODEL_o87 0x1A -#define MODEL_o86 0x19 -#define MODEL_g28 0x18 -#define MODEL_o104 0x17 -#define MODEL_o103 0x16 -#define MODEL_o102 0x15 -#define MODEL_o82 0x14 -#define MODEL_o83 0x13 -#define MODEL_g35 0x12 -#define MODEL_g47 0x11 -#define MODEL_o165 0x10 -#define MODEL_o136 0xF -#define MODEL_o135 0xE -#define MODEL_g36 0xD -#define MODEL_o148 0xC -#define MODEL_o134 0xB -#define MODEL_o133 0xA -#define MODEL_o132 0x9 -#define MODEL_g2 0x8 -#define MODEL_o171 0x7 -#define MODEL_o170 0x6 -#define MODEL_o6 0x5 -#define MODEL_g10 0x4 -#define MODEL_o2 0x3 -#define MODEL_o3 0x2 -#define MODEL_o127 0x1 -#define MODEL_o126 0x0 +#define MODEL_Root 0x63 +#define MODEL_g1 0x62 +#define MODEL_g41 0x61 +#define MODEL_o130 0x60 +#define MODEL_o129 0x5F +#define MODEL_o128 0x5E +#define MODEL_g48 0x5D +#define MODEL_o167 0x5C +#define MODEL_o166 0x5B +#define MODEL_g42 0x5A +#define MODEL_g49 0x59 +#define MODEL_o177 0x58 +#define MODEL_o175 0x57 +#define MODEL_o174 0x56 +#define MODEL_o173 0x55 +#define MODEL_o172 0x54 +#define MODEL_o176 0x53 +#define MODEL_g45 0x52 +#define MODEL_o164 0x51 +#define MODEL_o163 0x50 +#define MODEL_o162 0x4F +#define MODEL_o161 0x4E +#define MODEL_o160 0x4D +#define MODEL_g43 0x4C +#define MODEL_o154 0x4B +#define MODEL_o153 0x4A +#define MODEL_o152 0x49 +#define MODEL_o151 0x48 +#define MODEL_o150 0x47 +#define MODEL_o149 0x46 +#define MODEL_g37 0x45 +#define MODEL_g38 0x44 +#define MODEL_o141 0x43 +#define MODEL_o144 0x42 +#define MODEL_o146 0x41 +#define MODEL_o140 0x40 +#define MODEL_o138 0x3F +#define MODEL_g39 0x3E +#define MODEL_o145 0x3D +#define MODEL_o139 0x3C +#define MODEL_o143 0x3B +#define MODEL_o142 0x3A +#define MODEL_g40 0x39 +#define MODEL_o147 0x38 +#define MODEL_o137 0x37 +#define MODEL_g32 0x36 +#define MODEL_o114 0x35 +#define MODEL_o116 0x34 +#define MODEL_o117 0x33 +#define MODEL_o120 0x32 +#define MODEL_g30 0x31 +#define MODEL_o125 0x30 +#define MODEL_o124 0x2F +#define MODEL_o123 0x2E +#define MODEL_o122 0x2D +#define MODEL_o121 0x2C +#define MODEL_o113 0x2B +#define MODEL_g22 0x2A +#define MODEL_g46 0x29 +#define MODEL_g29 0x28 +#define MODEL_o107 0x27 +#define MODEL_o106 0x26 +#define MODEL_o105 0x25 +#define MODEL_g27 0x24 +#define MODEL_o101 0x23 +#define MODEL_o100 0x22 +#define MODEL_o99 0x21 +#define MODEL_g26 0x20 +#define MODEL_o98 0x1F +#define MODEL_o97 0x1E +#define MODEL_o96 0x1D +#define MODEL_g23 0x1C +#define MODEL_o88 0x1B +#define MODEL_o87 0x1A +#define MODEL_o86 0x19 +#define MODEL_g28 0x18 +#define MODEL_o104 0x17 +#define MODEL_o103 0x16 +#define MODEL_o102 0x15 +#define MODEL_o82 0x14 +#define MODEL_o83 0x13 +#define MODEL_g35 0x12 +#define MODEL_g47 0x11 +#define MODEL_o165 0x10 +#define MODEL_o136 0xF +#define MODEL_o135 0xE +#define MODEL_g36 0xD +#define MODEL_o148 0xC +#define MODEL_o134 0xB +#define MODEL_o133 0xA +#define MODEL_o132 0x9 +#define MODEL_g2 0x8 +#define MODEL_o171 0x7 +#define MODEL_o170 0x6 +#define MODEL_o6 0x5 +#define MODEL_g10 0x4 +#define MODEL_o2 0x3 +#define MODEL_o3 0x2 +#define MODEL_o127 0x1 +#define MODEL_o126 0x0 + diff --git a/include/mapfs/flo_13_hit.h b/include/mapfs/flo_13_hit.h index b68ce7eb8a..1e58ae425f 100644 --- a/include/mapfs/flo_13_hit.h +++ b/include/mapfs/flo_13_hit.h @@ -1,25 +1,32 @@ -#define COLLIDER_Root 0x18 -#define COLLIDER_g1 0x17 -#define COLLIDER_g22 0x16 -#define COLLIDER_o69 0x15 -#define COLLIDER_o68 0x14 -#define COLLIDER_g18 0x13 -#define COLLIDER_o74 0x12 -#define COLLIDER_o72 0x11 -#define COLLIDER_o60 0x10 -#define COLLIDER_g2 0xF -#define COLLIDER_o85 0xE -#define COLLIDER_o48 0xD -#define COLLIDER_o65 0xC -#define COLLIDER_o9 0xB -#define COLLIDER_o66 0xA -#define COLLIDER_o1 0x9 -#define COLLIDER_g5 0x8 -#define COLLIDER_g8 0x7 -#define COLLIDER_o47 0x6 -#define COLLIDER_deilite 0x5 -#define COLLIDER_deilie 0x4 -#define COLLIDER_g7 0x3 -#define COLLIDER_o45 0x2 -#define COLLIDER_deilitw 0x1 -#define COLLIDER_deiliw 0x0 +#define COLLIDER_Root 0x18 +#define COLLIDER_g1 0x17 +#define COLLIDER_g22 0x16 +#define COLLIDER_o69 0x15 +#define COLLIDER_o68 0x14 +#define COLLIDER_g18 0x13 +#define COLLIDER_o74 0x12 +#define COLLIDER_o72 0x11 +#define COLLIDER_o60 0x10 +#define COLLIDER_g2 0xF +#define COLLIDER_o85 0xE +#define COLLIDER_o48 0xD +#define COLLIDER_o65 0xC +#define COLLIDER_o9 0xB +#define COLLIDER_o66 0xA +#define COLLIDER_o1 0x9 +#define COLLIDER_g5 0x8 +#define COLLIDER_g8 0x7 +#define COLLIDER_o47 0x6 +#define COLLIDER_deilite 0x5 +#define COLLIDER_deilie 0x4 +#define COLLIDER_g7 0x3 +#define COLLIDER_o45 0x2 +#define COLLIDER_deilitw 0x1 +#define COLLIDER_deiliw 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g1 0x3 +#define ZONE_o2 0x2 +#define ZONE_o4 0x1 +#define ZONE_o5 0x0 + diff --git a/include/mapfs/flo_13_shape.h b/include/mapfs/flo_13_shape.h index a056bb04a8..00f90fefe7 100644 --- a/include/mapfs/flo_13_shape.h +++ b/include/mapfs/flo_13_shape.h @@ -1,82 +1,83 @@ -#define MODEL_Root 0x51 -#define MODEL_g1 0x50 -#define MODEL_g20 0x4F -#define MODEL_o63 0x4E -#define MODEL_o48 0x4D -#define MODEL_g15 0x4C -#define MODEL_o43 0x4B -#define MODEL_o42 0x4A -#define MODEL_o41 0x49 -#define MODEL_o40 0x48 -#define MODEL_g14 0x47 -#define MODEL_o36 0x46 -#define MODEL_o35 0x45 -#define MODEL_o34 0x44 -#define MODEL_o33 0x43 -#define MODEL_o32 0x42 -#define MODEL_o31 0x41 -#define MODEL_g26 0x40 -#define MODEL_o62 0x3F -#define MODEL_o61 0x3E -#define MODEL_g13 0x3D -#define MODEL_g9 0x3C -#define MODEL_o15 0x3B -#define MODEL_o77 0x3A -#define MODEL_o75 0x39 -#define MODEL_o30 0x38 -#define MODEL_o29 0x37 -#define MODEL_o52 0x36 -#define MODEL_o51 0x35 -#define MODEL_o24 0x34 -#define MODEL_o23 0x33 -#define MODEL_g12 0x32 -#define MODEL_o76 0x31 -#define MODEL_o28 0x30 -#define MODEL_o50 0x2F -#define MODEL_o22 0x2E -#define MODEL_g22 0x2D -#define MODEL_o19 0x2C -#define MODEL_o17 0x2B -#define MODEL_g10 0x2A -#define MODEL_o27 0x29 -#define MODEL_o49 0x28 -#define MODEL_o21 0x27 -#define MODEL_o74 0x26 -#define MODEL_g16 0x25 -#define MODEL_g19 0x24 -#define MODEL_o39 0x23 -#define MODEL_o38 0x22 -#define MODEL_o37 0x21 -#define MODEL_g18 0x20 -#define MODEL_o47 0x1F -#define MODEL_o46 0x1E -#define MODEL_g17 0x1D -#define MODEL_g31 0x1C -#define MODEL_o60 0x1B -#define MODEL_o81 0x1A -#define MODEL_o65 0x19 -#define MODEL_o64 0x18 -#define MODEL_o45 0x17 -#define MODEL_o44 0x16 -#define MODEL_g25 0x15 -#define MODEL_o57 0x14 -#define MODEL_o55 0x13 -#define MODEL_g24 0x12 -#define MODEL_o56 0x11 -#define MODEL_o54 0x10 -#define MODEL_g2 0xF -#define MODEL_g30 0xE -#define MODEL_o9 0xD -#define MODEL_o80 0xC -#define MODEL_o58 0xB -#define MODEL_o53 0xA -#define MODEL_o10 0x9 -#define MODEL_o2 0x8 -#define MODEL_o1 0x7 -#define MODEL_g5 0x6 -#define MODEL_g8 0x5 -#define MODEL_o14 0x4 -#define MODEL_o13 0x3 -#define MODEL_g7 0x2 -#define MODEL_o12 0x1 -#define MODEL_o11 0x0 +#define MODEL_Root 0x51 +#define MODEL_g1 0x50 +#define MODEL_g20 0x4F +#define MODEL_o63 0x4E +#define MODEL_o48 0x4D +#define MODEL_g15 0x4C +#define MODEL_o43 0x4B +#define MODEL_o42 0x4A +#define MODEL_o41 0x49 +#define MODEL_o40 0x48 +#define MODEL_g14 0x47 +#define MODEL_o36 0x46 +#define MODEL_o35 0x45 +#define MODEL_o34 0x44 +#define MODEL_o33 0x43 +#define MODEL_o32 0x42 +#define MODEL_o31 0x41 +#define MODEL_g26 0x40 +#define MODEL_o62 0x3F +#define MODEL_o61 0x3E +#define MODEL_g13 0x3D +#define MODEL_g9 0x3C +#define MODEL_o15 0x3B +#define MODEL_o77 0x3A +#define MODEL_o75 0x39 +#define MODEL_o30 0x38 +#define MODEL_o29 0x37 +#define MODEL_o52 0x36 +#define MODEL_o51 0x35 +#define MODEL_o24 0x34 +#define MODEL_o23 0x33 +#define MODEL_g12 0x32 +#define MODEL_o76 0x31 +#define MODEL_o28 0x30 +#define MODEL_o50 0x2F +#define MODEL_o22 0x2E +#define MODEL_g22 0x2D +#define MODEL_o19 0x2C +#define MODEL_o17 0x2B +#define MODEL_g10 0x2A +#define MODEL_o27 0x29 +#define MODEL_o49 0x28 +#define MODEL_o21 0x27 +#define MODEL_o74 0x26 +#define MODEL_g16 0x25 +#define MODEL_g19 0x24 +#define MODEL_o39 0x23 +#define MODEL_o38 0x22 +#define MODEL_o37 0x21 +#define MODEL_g18 0x20 +#define MODEL_o47 0x1F +#define MODEL_o46 0x1E +#define MODEL_g17 0x1D +#define MODEL_g31 0x1C +#define MODEL_o60 0x1B +#define MODEL_o81 0x1A +#define MODEL_o65 0x19 +#define MODEL_o64 0x18 +#define MODEL_o45 0x17 +#define MODEL_o44 0x16 +#define MODEL_g25 0x15 +#define MODEL_o57 0x14 +#define MODEL_o55 0x13 +#define MODEL_g24 0x12 +#define MODEL_o56 0x11 +#define MODEL_o54 0x10 +#define MODEL_g2 0xF +#define MODEL_g30 0xE +#define MODEL_o9 0xD +#define MODEL_o80 0xC +#define MODEL_o58 0xB +#define MODEL_o53 0xA +#define MODEL_o10 0x9 +#define MODEL_o2 0x8 +#define MODEL_o1 0x7 +#define MODEL_g5 0x6 +#define MODEL_g8 0x5 +#define MODEL_o14 0x4 +#define MODEL_o13 0x3 +#define MODEL_g7 0x2 +#define MODEL_o12 0x1 +#define MODEL_o11 0x0 + diff --git a/include/mapfs/flo_14_hit.h b/include/mapfs/flo_14_hit.h index 121b895200..f8eef4f87a 100644 --- a/include/mapfs/flo_14_hit.h +++ b/include/mapfs/flo_14_hit.h @@ -1,43 +1,50 @@ -#define COLLIDER_Root 0x2A -#define COLLIDER_g1 0x29 -#define COLLIDER_g38 0x28 -#define COLLIDER_o150 0x27 -#define COLLIDER_o136 0x26 -#define COLLIDER_o135 0x25 -#define COLLIDER_g45 0x24 -#define COLLIDER_o158 0x23 -#define COLLIDER_o157 0x22 -#define COLLIDER_o156 0x21 -#define COLLIDER_o155 0x20 -#define COLLIDER_o129 0x1F -#define COLLIDER_o154 0x1E -#define COLLIDER_o153 0x1D -#define COLLIDER_o152 0x1C -#define COLLIDER_o151 0x1B -#define COLLIDER_o140 0x1A -#define COLLIDER_o137 0x19 -#define COLLIDER_g9 0x18 -#define COLLIDER_g49 0x17 -#define COLLIDER_o166 0x16 -#define COLLIDER_o162 0x15 -#define COLLIDER_o130 0x14 -#define COLLIDER_g48 0x13 -#define COLLIDER_o167 0x12 -#define COLLIDER_o161 0x11 -#define COLLIDER_o131 0x10 -#define COLLIDER_o113 0xF -#define COLLIDER_g2 0xE -#define COLLIDER_o160 0xD -#define COLLIDER_o159 0xC -#define COLLIDER_o9 0xB -#define COLLIDER_o1 0xA -#define COLLIDER_o114 0x9 -#define COLLIDER_g4 0x8 -#define COLLIDER_g6 0x7 -#define COLLIDER_o112 0x6 -#define COLLIDER_deilite 0x5 -#define COLLIDER_deilie 0x4 -#define COLLIDER_g5 0x3 -#define COLLIDER_o110 0x2 -#define COLLIDER_deilitw 0x1 -#define COLLIDER_deiliw 0x0 +#define COLLIDER_Root 0x2A +#define COLLIDER_g1 0x29 +#define COLLIDER_g38 0x28 +#define COLLIDER_o150 0x27 +#define COLLIDER_o136 0x26 +#define COLLIDER_o135 0x25 +#define COLLIDER_g45 0x24 +#define COLLIDER_o158 0x23 +#define COLLIDER_o157 0x22 +#define COLLIDER_o156 0x21 +#define COLLIDER_o155 0x20 +#define COLLIDER_o129 0x1F +#define COLLIDER_o154 0x1E +#define COLLIDER_o153 0x1D +#define COLLIDER_o152 0x1C +#define COLLIDER_o151 0x1B +#define COLLIDER_o140 0x1A +#define COLLIDER_o137 0x19 +#define COLLIDER_g9 0x18 +#define COLLIDER_g49 0x17 +#define COLLIDER_o166 0x16 +#define COLLIDER_o162 0x15 +#define COLLIDER_o130 0x14 +#define COLLIDER_g48 0x13 +#define COLLIDER_o167 0x12 +#define COLLIDER_o161 0x11 +#define COLLIDER_o131 0x10 +#define COLLIDER_o113 0xF +#define COLLIDER_g2 0xE +#define COLLIDER_o160 0xD +#define COLLIDER_o159 0xC +#define COLLIDER_o9 0xB +#define COLLIDER_o1 0xA +#define COLLIDER_o114 0x9 +#define COLLIDER_g4 0x8 +#define COLLIDER_g6 0x7 +#define COLLIDER_o112 0x6 +#define COLLIDER_deilite 0x5 +#define COLLIDER_deilie 0x4 +#define COLLIDER_g5 0x3 +#define COLLIDER_o110 0x2 +#define COLLIDER_deilitw 0x1 +#define COLLIDER_deiliw 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g1 0x3 +#define ZONE_o2 0x2 +#define ZONE_o4 0x1 +#define ZONE_o5 0x0 + diff --git a/include/mapfs/flo_14_shape.h b/include/mapfs/flo_14_shape.h index 9056427cdc..bb3af39ac2 100644 --- a/include/mapfs/flo_14_shape.h +++ b/include/mapfs/flo_14_shape.h @@ -1,128 +1,129 @@ -#define MODEL_Root 0x7F -#define MODEL_g1 0x7E -#define MODEL_g32 0x7D -#define MODEL_o169 0x7C -#define MODEL_o167 0x7B -#define MODEL_g41 0x7A -#define MODEL_o138 0x79 -#define MODEL_g34 0x78 -#define MODEL_o116 0x77 -#define MODEL_g31 0x76 -#define MODEL_o108 0x75 -#define MODEL_o107 0x74 -#define MODEL_o106 0x73 -#define MODEL_o105 0x72 -#define MODEL_g30 0x71 -#define MODEL_o109 0x70 -#define MODEL_o104 0x6F -#define MODEL_o103 0x6E -#define MODEL_o102 0x6D -#define MODEL_o101 0x6C -#define MODEL_o100 0x6B -#define MODEL_o99 0x6A -#define MODEL_o98 0x69 -#define MODEL_o97 0x68 -#define MODEL_o96 0x67 -#define MODEL_g21 0x66 -#define MODEL_g28 0x65 -#define MODEL_g29 0x64 -#define MODEL_o95 0x63 -#define MODEL_o94 0x62 -#define MODEL_o93 0x61 -#define MODEL_o92 0x60 -#define MODEL_g26 0x5F -#define MODEL_g27 0x5E -#define MODEL_o91 0x5D -#define MODEL_o90 0x5C -#define MODEL_o89 0x5B -#define MODEL_o88 0x5A -#define MODEL_o87 0x59 -#define MODEL_o86 0x58 -#define MODEL_g24 0x57 -#define MODEL_g25 0x56 -#define MODEL_o85 0x55 -#define MODEL_o84 0x54 -#define MODEL_o83 0x53 -#define MODEL_o82 0x52 -#define MODEL_g22 0x51 -#define MODEL_g23 0x50 -#define MODEL_o81 0x4F -#define MODEL_o80 0x4E -#define MODEL_o79 0x4D -#define MODEL_o78 0x4C -#define MODEL_o77 0x4B -#define MODEL_o76 0x4A -#define MODEL_g15 0x49 -#define MODEL_g18 0x48 -#define MODEL_o68 0x47 -#define MODEL_o67 0x46 -#define MODEL_o66 0x45 -#define MODEL_g17 0x44 -#define MODEL_o65 0x43 -#define MODEL_o61 0x42 -#define MODEL_o72 0x41 -#define MODEL_o70 0x40 -#define MODEL_g16 0x3F -#define MODEL_o64 0x3E -#define MODEL_o60 0x3D -#define MODEL_g14 0x3C -#define MODEL_o59 0x3B -#define MODEL_o58 0x3A -#define MODEL_o57 0x39 -#define MODEL_g38 0x38 -#define MODEL_g40 0x37 -#define MODEL_o136 0x36 -#define MODEL_o135 0x35 -#define MODEL_o134 0x34 -#define MODEL_o133 0x33 -#define MODEL_o132 0x32 -#define MODEL_o131 0x31 -#define MODEL_o130 0x30 -#define MODEL_o129 0x2F -#define MODEL_o128 0x2E -#define MODEL_o127 0x2D -#define MODEL_o126 0x2C -#define MODEL_o125 0x2B -#define MODEL_o124 0x2A -#define MODEL_o123 0x29 -#define MODEL_g13 0x28 -#define MODEL_o55 0x27 -#define MODEL_o54 0x26 -#define MODEL_o52 0x25 -#define MODEL_o51 0x24 -#define MODEL_o49 0x23 -#define MODEL_o48 0x22 -#define MODEL_o44 0x21 -#define MODEL_o43 0x20 -#define MODEL_o41 0x1F -#define MODEL_o40 0x1E -#define MODEL_o39 0x1D -#define MODEL_g9 0x1C -#define MODEL_g11 0x1B -#define MODEL_o17 0x1A -#define MODEL_o18 0x19 -#define MODEL_o19 0x18 -#define MODEL_o20 0x17 -#define MODEL_g10 0x16 -#define MODEL_o15 0x15 -#define MODEL_o16 0x14 -#define MODEL_o14 0x13 -#define MODEL_o13 0x12 -#define MODEL_g2 0x11 -#define MODEL_g39 0x10 -#define MODEL_o122 0xF -#define MODEL_o121 0xE -#define MODEL_g36 0xD -#define MODEL_o11 0xC -#define MODEL_o2 0xB -#define MODEL_o137 0xA -#define MODEL_o3 0x9 -#define MODEL_o1 0x8 -#define MODEL_o10 0x7 -#define MODEL_g4 0x6 -#define MODEL_g6 0x5 -#define MODEL_o7 0x4 -#define MODEL_o6 0x3 -#define MODEL_g5 0x2 -#define MODEL_o5 0x1 -#define MODEL_o4 0x0 +#define MODEL_Root 0x7F +#define MODEL_g1 0x7E +#define MODEL_g32 0x7D +#define MODEL_o169 0x7C +#define MODEL_o167 0x7B +#define MODEL_g41 0x7A +#define MODEL_o138 0x79 +#define MODEL_g34 0x78 +#define MODEL_o116 0x77 +#define MODEL_g31 0x76 +#define MODEL_o108 0x75 +#define MODEL_o107 0x74 +#define MODEL_o106 0x73 +#define MODEL_o105 0x72 +#define MODEL_g30 0x71 +#define MODEL_o109 0x70 +#define MODEL_o104 0x6F +#define MODEL_o103 0x6E +#define MODEL_o102 0x6D +#define MODEL_o101 0x6C +#define MODEL_o100 0x6B +#define MODEL_o99 0x6A +#define MODEL_o98 0x69 +#define MODEL_o97 0x68 +#define MODEL_o96 0x67 +#define MODEL_g21 0x66 +#define MODEL_g28 0x65 +#define MODEL_g29 0x64 +#define MODEL_o95 0x63 +#define MODEL_o94 0x62 +#define MODEL_o93 0x61 +#define MODEL_o92 0x60 +#define MODEL_g26 0x5F +#define MODEL_g27 0x5E +#define MODEL_o91 0x5D +#define MODEL_o90 0x5C +#define MODEL_o89 0x5B +#define MODEL_o88 0x5A +#define MODEL_o87 0x59 +#define MODEL_o86 0x58 +#define MODEL_g24 0x57 +#define MODEL_g25 0x56 +#define MODEL_o85 0x55 +#define MODEL_o84 0x54 +#define MODEL_o83 0x53 +#define MODEL_o82 0x52 +#define MODEL_g22 0x51 +#define MODEL_g23 0x50 +#define MODEL_o81 0x4F +#define MODEL_o80 0x4E +#define MODEL_o79 0x4D +#define MODEL_o78 0x4C +#define MODEL_o77 0x4B +#define MODEL_o76 0x4A +#define MODEL_g15 0x49 +#define MODEL_g18 0x48 +#define MODEL_o68 0x47 +#define MODEL_o67 0x46 +#define MODEL_o66 0x45 +#define MODEL_g17 0x44 +#define MODEL_o65 0x43 +#define MODEL_o61 0x42 +#define MODEL_o72 0x41 +#define MODEL_o70 0x40 +#define MODEL_g16 0x3F +#define MODEL_o64 0x3E +#define MODEL_o60 0x3D +#define MODEL_g14 0x3C +#define MODEL_o59 0x3B +#define MODEL_o58 0x3A +#define MODEL_o57 0x39 +#define MODEL_g38 0x38 +#define MODEL_g40 0x37 +#define MODEL_o136 0x36 +#define MODEL_o135 0x35 +#define MODEL_o134 0x34 +#define MODEL_o133 0x33 +#define MODEL_o132 0x32 +#define MODEL_o131 0x31 +#define MODEL_o130 0x30 +#define MODEL_o129 0x2F +#define MODEL_o128 0x2E +#define MODEL_o127 0x2D +#define MODEL_o126 0x2C +#define MODEL_o125 0x2B +#define MODEL_o124 0x2A +#define MODEL_o123 0x29 +#define MODEL_g13 0x28 +#define MODEL_o55 0x27 +#define MODEL_o54 0x26 +#define MODEL_o52 0x25 +#define MODEL_o51 0x24 +#define MODEL_o49 0x23 +#define MODEL_o48 0x22 +#define MODEL_o44 0x21 +#define MODEL_o43 0x20 +#define MODEL_o41 0x1F +#define MODEL_o40 0x1E +#define MODEL_o39 0x1D +#define MODEL_g9 0x1C +#define MODEL_g11 0x1B +#define MODEL_o17 0x1A +#define MODEL_o18 0x19 +#define MODEL_o19 0x18 +#define MODEL_o20 0x17 +#define MODEL_g10 0x16 +#define MODEL_o15 0x15 +#define MODEL_o16 0x14 +#define MODEL_o14 0x13 +#define MODEL_o13 0x12 +#define MODEL_g2 0x11 +#define MODEL_g39 0x10 +#define MODEL_o122 0xF +#define MODEL_o121 0xE +#define MODEL_g36 0xD +#define MODEL_o11 0xC +#define MODEL_o2 0xB +#define MODEL_o137 0xA +#define MODEL_o3 0x9 +#define MODEL_o1 0x8 +#define MODEL_o10 0x7 +#define MODEL_g4 0x6 +#define MODEL_g6 0x5 +#define MODEL_o7 0x4 +#define MODEL_o6 0x3 +#define MODEL_g5 0x2 +#define MODEL_o5 0x1 +#define MODEL_o4 0x0 + diff --git a/include/mapfs/flo_15_hit.h b/include/mapfs/flo_15_hit.h index c3ec962dcd..98cf8d466a 100644 --- a/include/mapfs/flo_15_hit.h +++ b/include/mapfs/flo_15_hit.h @@ -1,30 +1,41 @@ -#define COLLIDER_Root 0x1D -#define COLLIDER_g53 0x1C -#define COLLIDER_g57 0x1B -#define COLLIDER_g56 0x1A -#define COLLIDER_o181 0x19 -#define COLLIDER_o37 0x18 -#define COLLIDER_o171 0x17 -#define COLLIDER_o172 0x16 -#define COLLIDER_o173 0x15 -#define COLLIDER_o174 0x14 -#define COLLIDER_o152 0x13 -#define COLLIDER_g55 0x12 -#define COLLIDER_o148 0x11 -#define COLLIDER_o141 0x10 -#define COLLIDER_o135 0xF -#define COLLIDER_g58 0xE -#define COLLIDER_o177 0xD -#define COLLIDER_g54 0xC -#define COLLIDER_o175 0xB -#define COLLIDER_g2 0xA -#define COLLIDER_o58 0x9 -#define COLLIDER_o59 0x8 -#define COLLIDER_o176 0x7 -#define COLLIDER_o170 0x6 -#define COLLIDER_o179 0x5 -#define COLLIDER_o178 0x4 -#define COLLIDER_g1 0x3 -#define COLLIDER_o35 0x2 -#define COLLIDER_deilite 0x1 -#define COLLIDER_deilie 0x0 +#define COLLIDER_Root 0x1D +#define COLLIDER_g53 0x1C +#define COLLIDER_g57 0x1B +#define COLLIDER_g56 0x1A +#define COLLIDER_o181 0x19 +#define COLLIDER_o37 0x18 +#define COLLIDER_o171 0x17 +#define COLLIDER_o172 0x16 +#define COLLIDER_o173 0x15 +#define COLLIDER_o174 0x14 +#define COLLIDER_o152 0x13 +#define COLLIDER_g55 0x12 +#define COLLIDER_o148 0x11 +#define COLLIDER_o141 0x10 +#define COLLIDER_o135 0xF +#define COLLIDER_g58 0xE +#define COLLIDER_o177 0xD +#define COLLIDER_g54 0xC +#define COLLIDER_o175 0xB +#define COLLIDER_g2 0xA +#define COLLIDER_o58 0x9 +#define COLLIDER_o59 0x8 +#define COLLIDER_o176 0x7 +#define COLLIDER_o170 0x6 +#define COLLIDER_o179 0x5 +#define COLLIDER_o178 0x4 +#define COLLIDER_g1 0x3 +#define COLLIDER_o35 0x2 +#define COLLIDER_deilite 0x1 +#define COLLIDER_deilie 0x0 + +#define ZONE_Root 0x8 +#define ZONE_g15 0x7 +#define ZONE_o50 0x6 +#define ZONE_o60 0x5 +#define ZONE_o61 0x4 +#define ZONE_g1 0x3 +#define ZONE_o43 0x2 +#define ZONE_o44 0x1 +#define ZONE_o45 0x0 + diff --git a/include/mapfs/flo_15_shape.h b/include/mapfs/flo_15_shape.h index 5f80024baf..63453cf727 100644 --- a/include/mapfs/flo_15_shape.h +++ b/include/mapfs/flo_15_shape.h @@ -1,55 +1,56 @@ -#define MODEL_Root 0x36 -#define MODEL_g1 0x35 -#define MODEL_g6 0x34 -#define MODEL_o23 0x33 -#define MODEL_o21 0x32 -#define MODEL_o20 0x31 -#define MODEL_o19 0x30 -#define MODEL_o17 0x2F -#define MODEL_o16 0x2E -#define MODEL_o15 0x2D -#define MODEL_o10 0x2C -#define MODEL_o13 0x2B -#define MODEL_o12 0x2A -#define MODEL_o18 0x29 -#define MODEL_g7 0x28 -#define MODEL_o28 0x27 -#define MODEL_g24 0x26 -#define MODEL_o70 0x25 -#define MODEL_o68 0x24 -#define MODEL_o69 0x23 -#define MODEL_o67 0x22 -#define MODEL_g17 0x21 -#define MODEL_g23 0x20 -#define MODEL_g26 0x1F -#define MODEL_o76 0x1E -#define MODEL_o75 0x1D -#define MODEL_o64 0x1C -#define MODEL_g22 0x1B -#define MODEL_o66 0x1A -#define MODEL_o63 0x19 -#define MODEL_o62 0x18 -#define MODEL_o61 0x17 -#define MODEL_o53 0x16 -#define MODEL_g21 0x15 -#define MODEL_o52 0x14 -#define MODEL_o51 0x13 -#define MODEL_o56 0x12 -#define MODEL_o55 0x11 -#define MODEL_g20 0x10 -#define MODEL_o48 0xF -#define MODEL_o49 0xE -#define MODEL_g19 0xD -#define MODEL_o60 0xC -#define MODEL_o59 0xB -#define MODEL_o58 0xA -#define MODEL_o57 0x9 -#define MODEL_g2 0x8 -#define MODEL_g25 0x7 -#define MODEL_o74 0x6 -#define MODEL_o73 0x5 -#define MODEL_o72 0x4 -#define MODEL_o3 0x3 -#define MODEL_g3 0x2 -#define MODEL_o5 0x1 -#define MODEL_o4 0x0 +#define MODEL_Root 0x36 +#define MODEL_g1 0x35 +#define MODEL_g6 0x34 +#define MODEL_o23 0x33 +#define MODEL_o21 0x32 +#define MODEL_o20 0x31 +#define MODEL_o19 0x30 +#define MODEL_o17 0x2F +#define MODEL_o16 0x2E +#define MODEL_o15 0x2D +#define MODEL_o10 0x2C +#define MODEL_o13 0x2B +#define MODEL_o12 0x2A +#define MODEL_o18 0x29 +#define MODEL_g7 0x28 +#define MODEL_o28 0x27 +#define MODEL_g24 0x26 +#define MODEL_o70 0x25 +#define MODEL_o68 0x24 +#define MODEL_o69 0x23 +#define MODEL_o67 0x22 +#define MODEL_g17 0x21 +#define MODEL_g23 0x20 +#define MODEL_g26 0x1F +#define MODEL_o76 0x1E +#define MODEL_o75 0x1D +#define MODEL_o64 0x1C +#define MODEL_g22 0x1B +#define MODEL_o66 0x1A +#define MODEL_o63 0x19 +#define MODEL_o62 0x18 +#define MODEL_o61 0x17 +#define MODEL_o53 0x16 +#define MODEL_g21 0x15 +#define MODEL_o52 0x14 +#define MODEL_o51 0x13 +#define MODEL_o56 0x12 +#define MODEL_o55 0x11 +#define MODEL_g20 0x10 +#define MODEL_o48 0xF +#define MODEL_o49 0xE +#define MODEL_g19 0xD +#define MODEL_o60 0xC +#define MODEL_o59 0xB +#define MODEL_o58 0xA +#define MODEL_o57 0x9 +#define MODEL_g2 0x8 +#define MODEL_g25 0x7 +#define MODEL_o74 0x6 +#define MODEL_o73 0x5 +#define MODEL_o72 0x4 +#define MODEL_o3 0x3 +#define MODEL_g3 0x2 +#define MODEL_o5 0x1 +#define MODEL_o4 0x0 + diff --git a/include/mapfs/flo_16_hit.h b/include/mapfs/flo_16_hit.h index a51bb3acc6..c2fe560a20 100644 --- a/include/mapfs/flo_16_hit.h +++ b/include/mapfs/flo_16_hit.h @@ -1,50 +1,57 @@ -#define COLLIDER_Root 0x31 -#define COLLIDER_g22 0x30 -#define COLLIDER_g54 0x2F -#define COLLIDER_g61 0x2E -#define COLLIDER_o256 0x2D -#define COLLIDER_o248 0x2C -#define COLLIDER_g60 0x2B -#define COLLIDER_o255 0x2A -#define COLLIDER_o247 0x29 -#define COLLIDER_g59 0x28 -#define COLLIDER_o254 0x27 -#define COLLIDER_o246 0x26 -#define COLLIDER_g58 0x25 -#define COLLIDER_o253 0x24 -#define COLLIDER_o245 0x23 -#define COLLIDER_g57 0x22 -#define COLLIDER_o252 0x21 -#define COLLIDER_o244 0x20 -#define COLLIDER_g56 0x1F -#define COLLIDER_o251 0x1E -#define COLLIDER_o243 0x1D -#define COLLIDER_g55 0x1C -#define COLLIDER_o250 0x1B -#define COLLIDER_o242 0x1A -#define COLLIDER_g43 0x19 -#define COLLIDER_o204 0x18 -#define COLLIDER_o203 0x17 -#define COLLIDER_g41 0x16 -#define COLLIDER_o257 0x15 -#define COLLIDER_o214 0x14 -#define COLLIDER_o196 0x13 -#define COLLIDER_o192 0x12 -#define COLLIDER_g6 0x11 -#define COLLIDER_o258 0x10 -#define COLLIDER_o199 0xF -#define COLLIDER_o249 0xE -#define COLLIDER_o198 0xD -#define COLLIDER_o197 0xC -#define COLLIDER_o191 0xB -#define COLLIDER_o190 0xA -#define COLLIDER_o174 0x9 -#define COLLIDER_g30 0x8 -#define COLLIDER_g31 0x7 -#define COLLIDER_o170 0x6 -#define COLLIDER_deilite 0x5 -#define COLLIDER_deilie 0x4 -#define COLLIDER_g29 0x3 -#define COLLIDER_o168 0x2 -#define COLLIDER_deilitw 0x1 -#define COLLIDER_deiliw 0x0 +#define COLLIDER_Root 0x31 +#define COLLIDER_g22 0x30 +#define COLLIDER_g54 0x2F +#define COLLIDER_g61 0x2E +#define COLLIDER_o256 0x2D +#define COLLIDER_o248 0x2C +#define COLLIDER_g60 0x2B +#define COLLIDER_o255 0x2A +#define COLLIDER_o247 0x29 +#define COLLIDER_g59 0x28 +#define COLLIDER_o254 0x27 +#define COLLIDER_o246 0x26 +#define COLLIDER_g58 0x25 +#define COLLIDER_o253 0x24 +#define COLLIDER_o245 0x23 +#define COLLIDER_g57 0x22 +#define COLLIDER_o252 0x21 +#define COLLIDER_o244 0x20 +#define COLLIDER_g56 0x1F +#define COLLIDER_o251 0x1E +#define COLLIDER_o243 0x1D +#define COLLIDER_g55 0x1C +#define COLLIDER_o250 0x1B +#define COLLIDER_o242 0x1A +#define COLLIDER_g43 0x19 +#define COLLIDER_o204 0x18 +#define COLLIDER_o203 0x17 +#define COLLIDER_g41 0x16 +#define COLLIDER_o257 0x15 +#define COLLIDER_o214 0x14 +#define COLLIDER_o196 0x13 +#define COLLIDER_o192 0x12 +#define COLLIDER_g6 0x11 +#define COLLIDER_o258 0x10 +#define COLLIDER_o199 0xF +#define COLLIDER_o249 0xE +#define COLLIDER_o198 0xD +#define COLLIDER_o197 0xC +#define COLLIDER_o191 0xB +#define COLLIDER_o190 0xA +#define COLLIDER_o174 0x9 +#define COLLIDER_g30 0x8 +#define COLLIDER_g31 0x7 +#define COLLIDER_o170 0x6 +#define COLLIDER_deilite 0x5 +#define COLLIDER_deilie 0x4 +#define COLLIDER_g29 0x3 +#define COLLIDER_o168 0x2 +#define COLLIDER_deilitw 0x1 +#define COLLIDER_deiliw 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g1 0x3 +#define ZONE_o2 0x2 +#define ZONE_o4 0x1 +#define ZONE_o5 0x0 + diff --git a/include/mapfs/flo_16_shape.h b/include/mapfs/flo_16_shape.h index 1e7e801c9f..4178cf6388 100644 --- a/include/mapfs/flo_16_shape.h +++ b/include/mapfs/flo_16_shape.h @@ -1,144 +1,145 @@ -#define MODEL_Root 0x8F -#define MODEL_g22 0x8E -#define MODEL_g63 0x8D -#define MODEL_g79 0x8C -#define MODEL_g94 0x8B -#define MODEL_o314 0x8A -#define MODEL_g16 0x89 -#define MODEL_g93 0x88 -#define MODEL_o313 0x87 -#define MODEL_o312 0x86 -#define MODEL_g78 0x85 -#define MODEL_g92 0x84 -#define MODEL_o308 0x83 -#define MODEL_g15 0x82 -#define MODEL_g91 0x81 -#define MODEL_o307 0x80 -#define MODEL_o306 0x7F -#define MODEL_g77 0x7E -#define MODEL_g90 0x7D -#define MODEL_o305 0x7C -#define MODEL_g14 0x7B -#define MODEL_g89 0x7A -#define MODEL_o304 0x79 -#define MODEL_o303 0x78 -#define MODEL_g76 0x77 -#define MODEL_g88 0x76 -#define MODEL_o302 0x75 -#define MODEL_g13 0x74 -#define MODEL_g87 0x73 -#define MODEL_o301 0x72 -#define MODEL_o300 0x71 -#define MODEL_g75 0x70 -#define MODEL_g86 0x6F -#define MODEL_o299 0x6E -#define MODEL_g12 0x6D -#define MODEL_g85 0x6C -#define MODEL_o298 0x6B -#define MODEL_o297 0x6A -#define MODEL_g74 0x69 -#define MODEL_g84 0x68 -#define MODEL_o296 0x67 -#define MODEL_g11 0x66 -#define MODEL_g83 0x65 -#define MODEL_o295 0x64 -#define MODEL_o294 0x63 -#define MODEL_g73 0x62 -#define MODEL_g82 0x61 -#define MODEL_o266 0x60 -#define MODEL_g10 0x5F -#define MODEL_g81 0x5E -#define MODEL_o264 0x5D -#define MODEL_o263 0x5C -#define MODEL_g44 0x5B -#define MODEL_g51 0x5A -#define MODEL_g52 0x59 -#define MODEL_o216 0x58 -#define MODEL_o215 0x57 -#define MODEL_o214 0x56 -#define MODEL_o213 0x55 -#define MODEL_g49 0x54 -#define MODEL_g50 0x53 -#define MODEL_o212 0x52 -#define MODEL_o211 0x51 -#define MODEL_o210 0x50 -#define MODEL_o209 0x4F -#define MODEL_o208 0x4E -#define MODEL_o207 0x4D -#define MODEL_g47 0x4C -#define MODEL_g48 0x4B -#define MODEL_o206 0x4A -#define MODEL_o205 0x49 -#define MODEL_o204 0x48 -#define MODEL_o203 0x47 -#define MODEL_g45 0x46 -#define MODEL_g46 0x45 -#define MODEL_o202 0x44 -#define MODEL_o201 0x43 -#define MODEL_o200 0x42 -#define MODEL_o199 0x41 -#define MODEL_o198 0x40 -#define MODEL_o197 0x3F -#define MODEL_g41 0x3E -#define MODEL_g97 0x3D -#define MODEL_o187 0x3C -#define MODEL_o185 0x3B -#define MODEL_g40 0x3A -#define MODEL_o183 0x39 -#define MODEL_o182 0x38 -#define MODEL_o181 0x37 -#define MODEL_o196 0x36 -#define MODEL_o195 0x35 -#define MODEL_g43 0x34 -#define MODEL_o194 0x33 -#define MODEL_o193 0x32 -#define MODEL_g39 0x31 -#define MODEL_o233 0x30 -#define MODEL_o180 0x2F -#define MODEL_o179 0x2E -#define MODEL_g38 0x2D -#define MODEL_o240 0x2C -#define MODEL_g60 0x2B -#define MODEL_o242 0x2A -#define MODEL_o241 0x29 -#define MODEL_o172 0x28 -#define MODEL_g35 0x27 -#define MODEL_o232 0x26 -#define MODEL_o247 0x25 -#define MODEL_o230 0x24 -#define MODEL_o158 0x23 -#define MODEL_g19 0x22 -#define MODEL_o229 0x21 -#define MODEL_o228 0x20 -#define MODEL_o227 0x1F -#define MODEL_o73 0x1E -#define MODEL_o70 0x1D -#define MODEL_o69 0x1C -#define MODEL_o67 0x1B -#define MODEL_g17 0x1A -#define MODEL_o140 0x19 -#define MODEL_o143 0x18 -#define MODEL_o139 0x17 -#define MODEL_o146 0x16 -#define MODEL_o138 0x15 -#define MODEL_o136 0x14 -#define MODEL_o135 0x13 -#define MODEL_o58 0x12 -#define MODEL_o142 0x11 -#define MODEL_o59 0x10 -#define MODEL_g6 0xF -#define MODEL_o335 0xE -#define MODEL_o334 0xD -#define MODEL_g59 0xC -#define MODEL_o239 0xB -#define MODEL_o238 0xA -#define MODEL_o31 0x9 -#define MODEL_o33 0x8 -#define MODEL_o34 0x7 -#define MODEL_g30 0x6 -#define MODEL_g31 0x5 -#define MODEL_o117 0x4 -#define MODEL_o116 0x3 -#define MODEL_g29 0x2 -#define MODEL_o115 0x1 -#define MODEL_o114 0x0 +#define MODEL_Root 0x8F +#define MODEL_g22 0x8E +#define MODEL_g63 0x8D +#define MODEL_g79 0x8C +#define MODEL_g94 0x8B +#define MODEL_o314 0x8A +#define MODEL_g16 0x89 +#define MODEL_g93 0x88 +#define MODEL_o313 0x87 +#define MODEL_o312 0x86 +#define MODEL_g78 0x85 +#define MODEL_g92 0x84 +#define MODEL_o308 0x83 +#define MODEL_g15 0x82 +#define MODEL_g91 0x81 +#define MODEL_o307 0x80 +#define MODEL_o306 0x7F +#define MODEL_g77 0x7E +#define MODEL_g90 0x7D +#define MODEL_o305 0x7C +#define MODEL_g14 0x7B +#define MODEL_g89 0x7A +#define MODEL_o304 0x79 +#define MODEL_o303 0x78 +#define MODEL_g76 0x77 +#define MODEL_g88 0x76 +#define MODEL_o302 0x75 +#define MODEL_g13 0x74 +#define MODEL_g87 0x73 +#define MODEL_o301 0x72 +#define MODEL_o300 0x71 +#define MODEL_g75 0x70 +#define MODEL_g86 0x6F +#define MODEL_o299 0x6E +#define MODEL_g12 0x6D +#define MODEL_g85 0x6C +#define MODEL_o298 0x6B +#define MODEL_o297 0x6A +#define MODEL_g74 0x69 +#define MODEL_g84 0x68 +#define MODEL_o296 0x67 +#define MODEL_g11 0x66 +#define MODEL_g83 0x65 +#define MODEL_o295 0x64 +#define MODEL_o294 0x63 +#define MODEL_g73 0x62 +#define MODEL_g82 0x61 +#define MODEL_o266 0x60 +#define MODEL_g10 0x5F +#define MODEL_g81 0x5E +#define MODEL_o264 0x5D +#define MODEL_o263 0x5C +#define MODEL_g44 0x5B +#define MODEL_g51 0x5A +#define MODEL_g52 0x59 +#define MODEL_o216 0x58 +#define MODEL_o215 0x57 +#define MODEL_o214 0x56 +#define MODEL_o213 0x55 +#define MODEL_g49 0x54 +#define MODEL_g50 0x53 +#define MODEL_o212 0x52 +#define MODEL_o211 0x51 +#define MODEL_o210 0x50 +#define MODEL_o209 0x4F +#define MODEL_o208 0x4E +#define MODEL_o207 0x4D +#define MODEL_g47 0x4C +#define MODEL_g48 0x4B +#define MODEL_o206 0x4A +#define MODEL_o205 0x49 +#define MODEL_o204 0x48 +#define MODEL_o203 0x47 +#define MODEL_g45 0x46 +#define MODEL_g46 0x45 +#define MODEL_o202 0x44 +#define MODEL_o201 0x43 +#define MODEL_o200 0x42 +#define MODEL_o199 0x41 +#define MODEL_o198 0x40 +#define MODEL_o197 0x3F +#define MODEL_g41 0x3E +#define MODEL_g97 0x3D +#define MODEL_o187 0x3C +#define MODEL_o185 0x3B +#define MODEL_g40 0x3A +#define MODEL_o183 0x39 +#define MODEL_o182 0x38 +#define MODEL_o181 0x37 +#define MODEL_o196 0x36 +#define MODEL_o195 0x35 +#define MODEL_g43 0x34 +#define MODEL_o194 0x33 +#define MODEL_o193 0x32 +#define MODEL_g39 0x31 +#define MODEL_o233 0x30 +#define MODEL_o180 0x2F +#define MODEL_o179 0x2E +#define MODEL_g38 0x2D +#define MODEL_o240 0x2C +#define MODEL_g60 0x2B +#define MODEL_o242 0x2A +#define MODEL_o241 0x29 +#define MODEL_o172 0x28 +#define MODEL_g35 0x27 +#define MODEL_o232 0x26 +#define MODEL_o247 0x25 +#define MODEL_o230 0x24 +#define MODEL_o158 0x23 +#define MODEL_g19 0x22 +#define MODEL_o229 0x21 +#define MODEL_o228 0x20 +#define MODEL_o227 0x1F +#define MODEL_o73 0x1E +#define MODEL_o70 0x1D +#define MODEL_o69 0x1C +#define MODEL_o67 0x1B +#define MODEL_g17 0x1A +#define MODEL_o140 0x19 +#define MODEL_o143 0x18 +#define MODEL_o139 0x17 +#define MODEL_o146 0x16 +#define MODEL_o138 0x15 +#define MODEL_o136 0x14 +#define MODEL_o135 0x13 +#define MODEL_o58 0x12 +#define MODEL_o142 0x11 +#define MODEL_o59 0x10 +#define MODEL_g6 0xF +#define MODEL_o335 0xE +#define MODEL_o334 0xD +#define MODEL_g59 0xC +#define MODEL_o239 0xB +#define MODEL_o238 0xA +#define MODEL_o31 0x9 +#define MODEL_o33 0x8 +#define MODEL_o34 0x7 +#define MODEL_g30 0x6 +#define MODEL_g31 0x5 +#define MODEL_o117 0x4 +#define MODEL_o116 0x3 +#define MODEL_g29 0x2 +#define MODEL_o115 0x1 +#define MODEL_o114 0x0 + diff --git a/include/mapfs/flo_17_hit.h b/include/mapfs/flo_17_hit.h index 87d6a319bd..76c3d0083c 100644 --- a/include/mapfs/flo_17_hit.h +++ b/include/mapfs/flo_17_hit.h @@ -1,51 +1,58 @@ -#define COLLIDER_Root 0x32 -#define COLLIDER_g1 0x31 -#define COLLIDER_g25 0x30 -#define COLLIDER_o115 0x2F -#define COLLIDER_o114 0x2E -#define COLLIDER_g24 0x2D -#define COLLIDER_o113 0x2C -#define COLLIDER_o112 0x2B -#define COLLIDER_o108 0x2A -#define COLLIDER_ki 0x29 -#define COLLIDER_o140 0x28 -#define COLLIDER_o139 0x27 -#define COLLIDER_o138 0x26 -#define COLLIDER_o13 0x25 -#define COLLIDER_o15 0x24 -#define COLLIDER_o22 0x23 -#define COLLIDER_g26 0x22 -#define COLLIDER_o134 0x21 -#define COLLIDER_o133 0x20 -#define COLLIDER_o132 0x1F -#define COLLIDER_o131 0x1E -#define COLLIDER_o130 0x1D -#define COLLIDER_o129 0x1C -#define COLLIDER_o128 0x1B -#define COLLIDER_o127 0x1A -#define COLLIDER_o126 0x19 -#define COLLIDER_o125 0x18 -#define COLLIDER_o124 0x17 -#define COLLIDER_o123 0x16 -#define COLLIDER_o122 0x15 -#define COLLIDER_o121 0x14 -#define COLLIDER_o120 0x13 -#define COLLIDER_o119 0x12 -#define COLLIDER_o118 0x11 -#define COLLIDER_o117 0x10 -#define COLLIDER_o116 0xF -#define COLLIDER_g2 0xE -#define COLLIDER_o110 0xD -#define COLLIDER_o136 0xC -#define COLLIDER_o135 0xB -#define COLLIDER_o109 0xA -#define COLLIDER_o103 0x9 -#define COLLIDER_g3 0x8 -#define COLLIDER_g5 0x7 -#define COLLIDER_o101 0x6 -#define COLLIDER_deilite 0x5 -#define COLLIDER_deilie 0x4 -#define COLLIDER_g4 0x3 -#define COLLIDER_o99 0x2 -#define COLLIDER_deilitw 0x1 -#define COLLIDER_deiliw 0x0 +#define COLLIDER_Root 0x32 +#define COLLIDER_g1 0x31 +#define COLLIDER_g25 0x30 +#define COLLIDER_o115 0x2F +#define COLLIDER_o114 0x2E +#define COLLIDER_g24 0x2D +#define COLLIDER_o113 0x2C +#define COLLIDER_o112 0x2B +#define COLLIDER_o108 0x2A +#define COLLIDER_ki 0x29 +#define COLLIDER_o140 0x28 +#define COLLIDER_o139 0x27 +#define COLLIDER_o138 0x26 +#define COLLIDER_o13 0x25 +#define COLLIDER_o15 0x24 +#define COLLIDER_o22 0x23 +#define COLLIDER_g26 0x22 +#define COLLIDER_o134 0x21 +#define COLLIDER_o133 0x20 +#define COLLIDER_o132 0x1F +#define COLLIDER_o131 0x1E +#define COLLIDER_o130 0x1D +#define COLLIDER_o129 0x1C +#define COLLIDER_o128 0x1B +#define COLLIDER_o127 0x1A +#define COLLIDER_o126 0x19 +#define COLLIDER_o125 0x18 +#define COLLIDER_o124 0x17 +#define COLLIDER_o123 0x16 +#define COLLIDER_o122 0x15 +#define COLLIDER_o121 0x14 +#define COLLIDER_o120 0x13 +#define COLLIDER_o119 0x12 +#define COLLIDER_o118 0x11 +#define COLLIDER_o117 0x10 +#define COLLIDER_o116 0xF +#define COLLIDER_g2 0xE +#define COLLIDER_o110 0xD +#define COLLIDER_o136 0xC +#define COLLIDER_o135 0xB +#define COLLIDER_o109 0xA +#define COLLIDER_o103 0x9 +#define COLLIDER_g3 0x8 +#define COLLIDER_g5 0x7 +#define COLLIDER_o101 0x6 +#define COLLIDER_deilite 0x5 +#define COLLIDER_deilie 0x4 +#define COLLIDER_g4 0x3 +#define COLLIDER_o99 0x2 +#define COLLIDER_deilitw 0x1 +#define COLLIDER_deiliw 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g1 0x3 +#define ZONE_o2 0x2 +#define ZONE_o4 0x1 +#define ZONE_o5 0x0 + diff --git a/include/mapfs/flo_17_shape.h b/include/mapfs/flo_17_shape.h index 4d7ec398a7..c343931352 100644 --- a/include/mapfs/flo_17_shape.h +++ b/include/mapfs/flo_17_shape.h @@ -1,97 +1,98 @@ -#define MODEL_Root 0x60 -#define MODEL_g1 0x5F -#define MODEL_g23 0x5E -#define MODEL_o97 0x5D -#define MODEL_o96 0x5C -#define MODEL_o95 0x5B -#define MODEL_o94 0x5A -#define MODEL_o93 0x59 -#define MODEL_o92 0x58 -#define MODEL_g22 0x57 -#define MODEL_o101 0x56 -#define MODEL_o100 0x55 -#define MODEL_o98 0x54 -#define MODEL_o88 0x53 -#define MODEL_hana 0x52 -#define MODEL_g20 0x51 -#define MODEL_o85 0x50 -#define MODEL_o84 0x4F -#define MODEL_g21 0x4E -#define MODEL_o81 0x4D -#define MODEL_o76 0x4C -#define MODEL_o75 0x4B -#define MODEL_o80 0x4A -#define MODEL_o79 0x49 -#define MODEL_g19 0x48 -#define MODEL_o78 0x47 -#define MODEL_o74 0x46 -#define MODEL_o73 0x45 -#define MODEL_o77 0x44 -#define MODEL_ibara 0x43 -#define MODEL_o56 0x42 -#define MODEL_g11 0x41 -#define MODEL_o33 0x40 -#define MODEL_o32 0x3F -#define MODEL_o31 0x3E -#define MODEL_o30 0x3D -#define MODEL_o29 0x3C -#define MODEL_o28 0x3B -#define MODEL_o27 0x3A -#define MODEL_o26 0x39 -#define MODEL_o25 0x38 -#define MODEL_o24 0x37 -#define MODEL_o23 0x36 -#define MODEL_g13 0x35 -#define MODEL_o55 0x34 -#define MODEL_o54 0x33 -#define MODEL_o53 0x32 -#define MODEL_o52 0x31 -#define MODEL_o51 0x30 -#define MODEL_o50 0x2F -#define MODEL_o49 0x2E -#define MODEL_o48 0x2D -#define MODEL_o47 0x2C -#define MODEL_o46 0x2B -#define MODEL_o45 0x2A -#define MODEL_g12 0x29 -#define MODEL_o44 0x28 -#define MODEL_o43 0x27 -#define MODEL_o42 0x26 -#define MODEL_o41 0x25 -#define MODEL_o40 0x24 -#define MODEL_o39 0x23 -#define MODEL_o38 0x22 -#define MODEL_o37 0x21 -#define MODEL_o36 0x20 -#define MODEL_o35 0x1F -#define MODEL_o34 0x1E -#define MODEL_ki 0x1D -#define MODEL_o14 0x1C -#define MODEL_o13 0x1B -#define MODEL_g7 0x1A -#define MODEL_o12 0x19 -#define MODEL_o11 0x18 -#define MODEL_o16 0x17 -#define MODEL_o15 0x16 -#define MODEL_g8 0x15 -#define MODEL_o18 0x14 -#define MODEL_o17 0x13 -#define MODEL_o22 0x12 -#define MODEL_o21 0x11 -#define MODEL_g9 0x10 -#define MODEL_o20 0xF -#define MODEL_o19 0xE -#define MODEL_g2 0xD -#define MODEL_g26 0xC -#define MODEL_o103 0xB -#define MODEL_o102 0xA -#define MODEL_o57 0x9 -#define MODEL_o7 0x8 -#define MODEL_o6 0x7 -#define MODEL_g3 0x6 -#define MODEL_g5 0x5 -#define MODEL_o5 0x4 -#define MODEL_o4 0x3 -#define MODEL_g4 0x2 -#define MODEL_o3 0x1 -#define MODEL_o2 0x0 +#define MODEL_Root 0x60 +#define MODEL_g1 0x5F +#define MODEL_g23 0x5E +#define MODEL_o97 0x5D +#define MODEL_o96 0x5C +#define MODEL_o95 0x5B +#define MODEL_o94 0x5A +#define MODEL_o93 0x59 +#define MODEL_o92 0x58 +#define MODEL_g22 0x57 +#define MODEL_o101 0x56 +#define MODEL_o100 0x55 +#define MODEL_o98 0x54 +#define MODEL_o88 0x53 +#define MODEL_hana 0x52 +#define MODEL_g20 0x51 +#define MODEL_o85 0x50 +#define MODEL_o84 0x4F +#define MODEL_g21 0x4E +#define MODEL_o81 0x4D +#define MODEL_o76 0x4C +#define MODEL_o75 0x4B +#define MODEL_o80 0x4A +#define MODEL_o79 0x49 +#define MODEL_g19 0x48 +#define MODEL_o78 0x47 +#define MODEL_o74 0x46 +#define MODEL_o73 0x45 +#define MODEL_o77 0x44 +#define MODEL_ibara 0x43 +#define MODEL_o56 0x42 +#define MODEL_g11 0x41 +#define MODEL_o33 0x40 +#define MODEL_o32 0x3F +#define MODEL_o31 0x3E +#define MODEL_o30 0x3D +#define MODEL_o29 0x3C +#define MODEL_o28 0x3B +#define MODEL_o27 0x3A +#define MODEL_o26 0x39 +#define MODEL_o25 0x38 +#define MODEL_o24 0x37 +#define MODEL_o23 0x36 +#define MODEL_g13 0x35 +#define MODEL_o55 0x34 +#define MODEL_o54 0x33 +#define MODEL_o53 0x32 +#define MODEL_o52 0x31 +#define MODEL_o51 0x30 +#define MODEL_o50 0x2F +#define MODEL_o49 0x2E +#define MODEL_o48 0x2D +#define MODEL_o47 0x2C +#define MODEL_o46 0x2B +#define MODEL_o45 0x2A +#define MODEL_g12 0x29 +#define MODEL_o44 0x28 +#define MODEL_o43 0x27 +#define MODEL_o42 0x26 +#define MODEL_o41 0x25 +#define MODEL_o40 0x24 +#define MODEL_o39 0x23 +#define MODEL_o38 0x22 +#define MODEL_o37 0x21 +#define MODEL_o36 0x20 +#define MODEL_o35 0x1F +#define MODEL_o34 0x1E +#define MODEL_ki 0x1D +#define MODEL_o14 0x1C +#define MODEL_o13 0x1B +#define MODEL_g7 0x1A +#define MODEL_o12 0x19 +#define MODEL_o11 0x18 +#define MODEL_o16 0x17 +#define MODEL_o15 0x16 +#define MODEL_g8 0x15 +#define MODEL_o18 0x14 +#define MODEL_o17 0x13 +#define MODEL_o22 0x12 +#define MODEL_o21 0x11 +#define MODEL_g9 0x10 +#define MODEL_o20 0xF +#define MODEL_o19 0xE +#define MODEL_g2 0xD +#define MODEL_g26 0xC +#define MODEL_o103 0xB +#define MODEL_o102 0xA +#define MODEL_o57 0x9 +#define MODEL_o7 0x8 +#define MODEL_o6 0x7 +#define MODEL_g3 0x6 +#define MODEL_g5 0x5 +#define MODEL_o5 0x4 +#define MODEL_o4 0x3 +#define MODEL_g4 0x2 +#define MODEL_o3 0x1 +#define MODEL_o2 0x0 + diff --git a/include/mapfs/flo_18_hit.h b/include/mapfs/flo_18_hit.h index cbd33e2502..b347bcb75f 100644 --- a/include/mapfs/flo_18_hit.h +++ b/include/mapfs/flo_18_hit.h @@ -1,29 +1,36 @@ -#define COLLIDER_Root 0x1C -#define COLLIDER_g1 0x1B -#define COLLIDER_g21 0x1A -#define COLLIDER_o136 0x19 -#define COLLIDER_g20 0x18 -#define COLLIDER_o174 0x17 -#define COLLIDER_o127 0x16 -#define COLLIDER_o175 0x15 -#define COLLIDER_o126 0x14 -#define COLLIDER_o130 0x13 -#define COLLIDER_o131 0x12 -#define COLLIDER_g11 0x11 -#define COLLIDER_o103 0x10 -#define COLLIDER_g2 0xF -#define COLLIDER_g23 0xE -#define COLLIDER_o142 0xD -#define COLLIDER_o140 0xC -#define COLLIDER_o138 0xB -#define COLLIDER_o178 0xA -#define COLLIDER_o177 0x9 -#define COLLIDER_o44 0x8 -#define COLLIDER_o171 0x7 -#define COLLIDER_o172 0x6 -#define COLLIDER_o170 0x5 -#define COLLIDER_o134 0x4 -#define COLLIDER_g10 0x3 -#define COLLIDER_o102 0x2 -#define COLLIDER_deilitw 0x1 -#define COLLIDER_deiliw 0x0 +#define COLLIDER_Root 0x1C +#define COLLIDER_g1 0x1B +#define COLLIDER_g21 0x1A +#define COLLIDER_o136 0x19 +#define COLLIDER_g20 0x18 +#define COLLIDER_o174 0x17 +#define COLLIDER_o127 0x16 +#define COLLIDER_o175 0x15 +#define COLLIDER_o126 0x14 +#define COLLIDER_o130 0x13 +#define COLLIDER_o131 0x12 +#define COLLIDER_g11 0x11 +#define COLLIDER_o103 0x10 +#define COLLIDER_g2 0xF +#define COLLIDER_g23 0xE +#define COLLIDER_o142 0xD +#define COLLIDER_o140 0xC +#define COLLIDER_o138 0xB +#define COLLIDER_o178 0xA +#define COLLIDER_o177 0x9 +#define COLLIDER_o44 0x8 +#define COLLIDER_o171 0x7 +#define COLLIDER_o172 0x6 +#define COLLIDER_o170 0x5 +#define COLLIDER_o134 0x4 +#define COLLIDER_g10 0x3 +#define COLLIDER_o102 0x2 +#define COLLIDER_deilitw 0x1 +#define COLLIDER_deiliw 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g1 0x3 +#define ZONE_o3 0x2 +#define ZONE_o2 0x1 +#define ZONE_o1 0x0 + diff --git a/include/mapfs/flo_18_shape.h b/include/mapfs/flo_18_shape.h index e964c59679..b1b07ae2ce 100644 --- a/include/mapfs/flo_18_shape.h +++ b/include/mapfs/flo_18_shape.h @@ -1,80 +1,81 @@ -#define MODEL_Root 0x4F -#define MODEL_g1 0x4E -#define MODEL_g28 0x4D -#define MODEL_o167 0x4C -#define MODEL_o140 0x4B -#define MODEL_g34 0x4A -#define MODEL_o166 0x49 -#define MODEL_o164 0x48 -#define MODEL_g35 0x47 -#define MODEL_o162 0x46 -#define MODEL_o161 0x45 -#define MODEL_o163 0x44 -#define MODEL_o160 0x43 -#define MODEL_g31 0x42 -#define MODEL_g32 0x41 -#define MODEL_o147 0x40 -#define MODEL_o146 0x3F -#define MODEL_o145 0x3E -#define MODEL_o144 0x3D -#define MODEL_g21 0x3C -#define MODEL_g30 0x3B -#define MODEL_o142 0x3A -#define MODEL_o141 0x39 -#define MODEL_o138 0x38 -#define MODEL_o143 0x37 -#define MODEL_g29 0x36 -#define MODEL_o139 0x35 -#define MODEL_o136 0x34 -#define MODEL_o137 0x33 -#define MODEL_g20 0x32 -#define MODEL_o101 0x31 -#define MODEL_g18 0x30 -#define MODEL_o148 0x2F -#define MODEL_o104 0x2E -#define MODEL_o103 0x2D -#define MODEL_o102 0x2C -#define MODEL_g16 0x2B -#define MODEL_g26 0x2A -#define MODEL_o99 0x29 -#define MODEL_o91 0x28 -#define MODEL_o95 0x27 -#define MODEL_o94 0x26 -#define MODEL_o93 0x25 -#define MODEL_o92 0x24 -#define MODEL_g25 0x23 -#define MODEL_o114 0x22 -#define MODEL_o125 0x21 -#define MODEL_o116 0x20 -#define MODEL_o115 0x1F -#define MODEL_g24 0x1E -#define MODEL_o100 0x1D -#define MODEL_g27 0x1C -#define MODEL_o113 0x1B -#define MODEL_o124 0x1A -#define MODEL_o123 0x19 -#define MODEL_o122 0x18 -#define MODEL_o121 0x17 -#define MODEL_o120 0x16 -#define MODEL_o119 0x15 -#define MODEL_o118 0x14 -#define MODEL_o117 0x13 -#define MODEL_ibara 0x12 -#define MODEL_o59 0x11 -#define MODEL_o57 0x10 -#define MODEL_o60 0xF -#define MODEL_o58 0xE -#define MODEL_o54 0xD -#define MODEL_o52 0xC -#define MODEL_o50 0xB -#define MODEL_o53 0xA -#define MODEL_o48 0x9 -#define MODEL_o51 0x8 -#define MODEL_o49 0x7 -#define MODEL_g2 0x6 -#define MODEL_o44 0x5 -#define MODEL_o43 0x4 -#define MODEL_o6 0x3 -#define MODEL_g10 0x2 -#define MODEL_o3 0x1 -#define MODEL_o2 0x0 +#define MODEL_Root 0x4F +#define MODEL_g1 0x4E +#define MODEL_g28 0x4D +#define MODEL_o167 0x4C +#define MODEL_o140 0x4B +#define MODEL_g34 0x4A +#define MODEL_o166 0x49 +#define MODEL_o164 0x48 +#define MODEL_g35 0x47 +#define MODEL_o162 0x46 +#define MODEL_o161 0x45 +#define MODEL_o163 0x44 +#define MODEL_o160 0x43 +#define MODEL_g31 0x42 +#define MODEL_g32 0x41 +#define MODEL_o147 0x40 +#define MODEL_o146 0x3F +#define MODEL_o145 0x3E +#define MODEL_o144 0x3D +#define MODEL_g21 0x3C +#define MODEL_g30 0x3B +#define MODEL_o142 0x3A +#define MODEL_o141 0x39 +#define MODEL_o138 0x38 +#define MODEL_o143 0x37 +#define MODEL_g29 0x36 +#define MODEL_o139 0x35 +#define MODEL_o136 0x34 +#define MODEL_o137 0x33 +#define MODEL_g20 0x32 +#define MODEL_o101 0x31 +#define MODEL_g18 0x30 +#define MODEL_o148 0x2F +#define MODEL_o104 0x2E +#define MODEL_o103 0x2D +#define MODEL_o102 0x2C +#define MODEL_g16 0x2B +#define MODEL_g26 0x2A +#define MODEL_o99 0x29 +#define MODEL_o91 0x28 +#define MODEL_o95 0x27 +#define MODEL_o94 0x26 +#define MODEL_o93 0x25 +#define MODEL_o92 0x24 +#define MODEL_g25 0x23 +#define MODEL_o114 0x22 +#define MODEL_o125 0x21 +#define MODEL_o116 0x20 +#define MODEL_o115 0x1F +#define MODEL_g24 0x1E +#define MODEL_o100 0x1D +#define MODEL_g27 0x1C +#define MODEL_o113 0x1B +#define MODEL_o124 0x1A +#define MODEL_o123 0x19 +#define MODEL_o122 0x18 +#define MODEL_o121 0x17 +#define MODEL_o120 0x16 +#define MODEL_o119 0x15 +#define MODEL_o118 0x14 +#define MODEL_o117 0x13 +#define MODEL_ibara 0x12 +#define MODEL_o59 0x11 +#define MODEL_o57 0x10 +#define MODEL_o60 0xF +#define MODEL_o58 0xE +#define MODEL_o54 0xD +#define MODEL_o52 0xC +#define MODEL_o50 0xB +#define MODEL_o53 0xA +#define MODEL_o48 0x9 +#define MODEL_o51 0x8 +#define MODEL_o49 0x7 +#define MODEL_g2 0x6 +#define MODEL_o44 0x5 +#define MODEL_o43 0x4 +#define MODEL_o6 0x3 +#define MODEL_g10 0x2 +#define MODEL_o3 0x1 +#define MODEL_o2 0x0 + diff --git a/include/mapfs/flo_19_hit.h b/include/mapfs/flo_19_hit.h index c73f60bf61..69b5071740 100644 --- a/include/mapfs/flo_19_hit.h +++ b/include/mapfs/flo_19_hit.h @@ -1,17 +1,24 @@ -#define COLLIDER_Root 0x10 -#define COLLIDER_g1 0xF -#define COLLIDER_g38 0xE -#define COLLIDER_o108 0xD -#define COLLIDER_o117 0xC -#define COLLIDER_g19 0xB -#define COLLIDER_o79 0xA -#define COLLIDER_o78 0x9 -#define COLLIDER_o77 0x8 -#define COLLIDER_o76 0x7 -#define COLLIDER_g3 0x6 -#define COLLIDER_o122 0x5 -#define COLLIDER_o75 0x4 -#define COLLIDER_g16 0x3 -#define COLLIDER_o74 0x2 -#define COLLIDER_deilite 0x1 -#define COLLIDER_deilie 0x0 +#define COLLIDER_Root 0x10 +#define COLLIDER_g1 0xF +#define COLLIDER_g38 0xE +#define COLLIDER_o108 0xD +#define COLLIDER_o117 0xC +#define COLLIDER_g19 0xB +#define COLLIDER_o79 0xA +#define COLLIDER_o78 0x9 +#define COLLIDER_o77 0x8 +#define COLLIDER_o76 0x7 +#define COLLIDER_g3 0x6 +#define COLLIDER_o122 0x5 +#define COLLIDER_o75 0x4 +#define COLLIDER_g16 0x3 +#define COLLIDER_o74 0x2 +#define COLLIDER_deilite 0x1 +#define COLLIDER_deilie 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g1 0x3 +#define ZONE_o7 0x2 +#define ZONE_o8 0x1 +#define ZONE_o1 0x0 + diff --git a/include/mapfs/flo_19_shape.h b/include/mapfs/flo_19_shape.h index 3761f3e245..fd9912a1c9 100644 --- a/include/mapfs/flo_19_shape.h +++ b/include/mapfs/flo_19_shape.h @@ -1,95 +1,96 @@ -#define MODEL_Root 0x5E -#define MODEL_g1 0x5D -#define MODEL_ha 0x5C -#define MODEL_o143 0x5B -#define MODEL_o133 0x5A -#define MODEL_o132 0x59 -#define MODEL_o131 0x58 -#define MODEL_g101 0x57 -#define MODEL_o142 0x56 -#define MODEL_tuta 0x55 -#define MODEL_g84 0x54 -#define MODEL_o141 0x53 -#define MODEL_o140 0x52 -#define MODEL_o139 0x51 -#define MODEL_o138 0x50 -#define MODEL_g83 0x4F -#define MODEL_o137 0x4E -#define MODEL_o136 0x4D -#define MODEL_o135 0x4C -#define MODEL_o134 0x4B -#define MODEL_g25 0x4A -#define MODEL_g33 0x49 -#define MODEL_o56 0x48 -#define MODEL_g26 0x47 -#define MODEL_o73 0x46 -#define MODEL_g29 0x45 -#define MODEL_o76 0x44 -#define MODEL_g30 0x43 -#define MODEL_o77 0x42 -#define MODEL_g28 0x41 -#define MODEL_o75 0x40 -#define MODEL_g32 0x3F -#define MODEL_o45 0x3E -#define MODEL_g27 0x3D -#define MODEL_o74 0x3C -#define MODEL_g31 0x3B -#define MODEL_o78 0x3A -#define MODEL_g15 0x39 -#define MODEL_g92 0x38 -#define MODEL_o149 0x37 -#define MODEL_g91 0x36 -#define MODEL_o148 0x35 -#define MODEL_g90 0x34 -#define MODEL_o147 0x33 -#define MODEL_g89 0x32 -#define MODEL_o47 0x31 -#define MODEL_g93 0x30 -#define MODEL_o153 0x2F -#define MODEL_o151 0x2E -#define MODEL_o30 0x2D -#define MODEL_o150 0x2C -#define MODEL_o152 0x2B -#define MODEL_o46 0x2A -#define MODEL_g19 0x29 -#define MODEL_g23 0x28 -#define MODEL_o72 0x27 -#define MODEL_o71 0x26 -#define MODEL_o67 0x25 -#define MODEL_g22 0x24 -#define MODEL_o66 0x23 -#define MODEL_o65 0x22 -#define MODEL_o64 0x21 -#define MODEL_g21 0x20 -#define MODEL_o63 0x1F -#define MODEL_o62 0x1E -#define MODEL_o61 0x1D -#define MODEL_g17 0x1C -#define MODEL_o52 0x1B -#define MODEL_o51 0x1A -#define MODEL_o50 0x19 -#define MODEL_g3 0x18 -#define MODEL_g18 0x17 -#define MODEL_o54 0x16 -#define MODEL_o55 0x15 -#define MODEL_o53 0x14 -#define MODEL_g11 0x13 -#define MODEL_o60 0x12 -#define MODEL_o59 0x11 -#define MODEL_o23 0x10 -#define MODEL_o22 0xF -#define MODEL_o21 0xE -#define MODEL_g2 0xD -#define MODEL_o58 0xC -#define MODEL_o57 0xB -#define MODEL_o29 0xA -#define MODEL_o28 0x9 -#define MODEL_o27 0x8 -#define MODEL_o26 0x7 -#define MODEL_o25 0x6 -#define MODEL_o24 0x5 -#define MODEL_o20 0x4 -#define MODEL_o19 0x3 -#define MODEL_g16 0x2 -#define MODEL_o49 0x1 -#define MODEL_o48 0x0 +#define MODEL_Root 0x5E +#define MODEL_g1 0x5D +#define MODEL_ha 0x5C +#define MODEL_o143 0x5B +#define MODEL_o133 0x5A +#define MODEL_o132 0x59 +#define MODEL_o131 0x58 +#define MODEL_g101 0x57 +#define MODEL_o142 0x56 +#define MODEL_tuta 0x55 +#define MODEL_g84 0x54 +#define MODEL_o141 0x53 +#define MODEL_o140 0x52 +#define MODEL_o139 0x51 +#define MODEL_o138 0x50 +#define MODEL_g83 0x4F +#define MODEL_o137 0x4E +#define MODEL_o136 0x4D +#define MODEL_o135 0x4C +#define MODEL_o134 0x4B +#define MODEL_g25 0x4A +#define MODEL_g33 0x49 +#define MODEL_o56 0x48 +#define MODEL_g26 0x47 +#define MODEL_o73 0x46 +#define MODEL_g29 0x45 +#define MODEL_o76 0x44 +#define MODEL_g30 0x43 +#define MODEL_o77 0x42 +#define MODEL_g28 0x41 +#define MODEL_o75 0x40 +#define MODEL_g32 0x3F +#define MODEL_o45 0x3E +#define MODEL_g27 0x3D +#define MODEL_o74 0x3C +#define MODEL_g31 0x3B +#define MODEL_o78 0x3A +#define MODEL_g15 0x39 +#define MODEL_g92 0x38 +#define MODEL_o149 0x37 +#define MODEL_g91 0x36 +#define MODEL_o148 0x35 +#define MODEL_g90 0x34 +#define MODEL_o147 0x33 +#define MODEL_g89 0x32 +#define MODEL_o47 0x31 +#define MODEL_g93 0x30 +#define MODEL_o153 0x2F +#define MODEL_o151 0x2E +#define MODEL_o30 0x2D +#define MODEL_o150 0x2C +#define MODEL_o152 0x2B +#define MODEL_o46 0x2A +#define MODEL_g19 0x29 +#define MODEL_g23 0x28 +#define MODEL_o72 0x27 +#define MODEL_o71 0x26 +#define MODEL_o67 0x25 +#define MODEL_g22 0x24 +#define MODEL_o66 0x23 +#define MODEL_o65 0x22 +#define MODEL_o64 0x21 +#define MODEL_g21 0x20 +#define MODEL_o63 0x1F +#define MODEL_o62 0x1E +#define MODEL_o61 0x1D +#define MODEL_g17 0x1C +#define MODEL_o52 0x1B +#define MODEL_o51 0x1A +#define MODEL_o50 0x19 +#define MODEL_g3 0x18 +#define MODEL_g18 0x17 +#define MODEL_o54 0x16 +#define MODEL_o55 0x15 +#define MODEL_o53 0x14 +#define MODEL_g11 0x13 +#define MODEL_o60 0x12 +#define MODEL_o59 0x11 +#define MODEL_o23 0x10 +#define MODEL_o22 0xF +#define MODEL_o21 0xE +#define MODEL_g2 0xD +#define MODEL_o58 0xC +#define MODEL_o57 0xB +#define MODEL_o29 0xA +#define MODEL_o28 0x9 +#define MODEL_o27 0x8 +#define MODEL_o26 0x7 +#define MODEL_o25 0x6 +#define MODEL_o24 0x5 +#define MODEL_o20 0x4 +#define MODEL_o19 0x3 +#define MODEL_g16 0x2 +#define MODEL_o49 0x1 +#define MODEL_o48 0x0 + diff --git a/include/mapfs/flo_21_hit.h b/include/mapfs/flo_21_hit.h index 68cae858bc..1b6b3b36b2 100644 --- a/include/mapfs/flo_21_hit.h +++ b/include/mapfs/flo_21_hit.h @@ -1,17 +1,24 @@ -#define COLLIDER_Root 0x10 -#define COLLIDER_g1 0xF -#define COLLIDER_g66 0xE -#define COLLIDER_o164 0xD -#define COLLIDER_o163 0xC -#define COLLIDER_o162 0xB -#define COLLIDER_o161 0xA -#define COLLIDER_o160 0x9 -#define COLLIDER_g23 0x8 -#define COLLIDER_o115 0x7 -#define COLLIDER_o50 0x6 -#define COLLIDER_o114 0x5 -#define COLLIDER_o59 0x4 -#define COLLIDER_g31 0x3 -#define COLLIDER_o93 0x2 -#define COLLIDER_deilitw 0x1 -#define COLLIDER_deiliw 0x0 +#define COLLIDER_Root 0x10 +#define COLLIDER_g1 0xF +#define COLLIDER_g66 0xE +#define COLLIDER_o164 0xD +#define COLLIDER_o163 0xC +#define COLLIDER_o162 0xB +#define COLLIDER_o161 0xA +#define COLLIDER_o160 0x9 +#define COLLIDER_g23 0x8 +#define COLLIDER_o115 0x7 +#define COLLIDER_o50 0x6 +#define COLLIDER_o114 0x5 +#define COLLIDER_o59 0x4 +#define COLLIDER_g31 0x3 +#define COLLIDER_o93 0x2 +#define COLLIDER_deilitw 0x1 +#define COLLIDER_deiliw 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g1 0x3 +#define ZONE_o41 0x2 +#define ZONE_o40 0x1 +#define ZONE_o39 0x0 + diff --git a/include/mapfs/flo_21_shape.h b/include/mapfs/flo_21_shape.h index 48d713738b..291f4c3c4c 100644 --- a/include/mapfs/flo_21_shape.h +++ b/include/mapfs/flo_21_shape.h @@ -1,107 +1,108 @@ -#define MODEL_Root 0x6A -#define MODEL_g1 0x69 -#define MODEL_g3 0x68 -#define MODEL_g19 0x67 -#define MODEL_o16 0x66 -#define MODEL_g18 0x65 -#define MODEL_o15 0x64 -#define MODEL_g17 0x63 -#define MODEL_o14 0x62 -#define MODEL_g12 0x61 -#define MODEL_o9 0x60 -#define MODEL_g7 0x5F -#define MODEL_o4 0x5E -#define MODEL_g6 0x5D -#define MODEL_o3 0x5C -#define MODEL_g5 0x5B -#define MODEL_o2 0x5A -#define MODEL_g4 0x59 -#define MODEL_o1 0x58 -#define MODEL_g20 0x57 -#define MODEL_g59 0x56 -#define MODEL_o19 0x55 -#define MODEL_o18 0x54 -#define MODEL_o17 0x53 -#define MODEL_g58 0x52 -#define MODEL_o22 0x51 -#define MODEL_o21 0x50 -#define MODEL_o20 0x4F -#define MODEL_g21 0x4E -#define MODEL_o146 0x4D -#define MODEL_o145 0x4C -#define MODEL_o144 0x4B -#define MODEL_o25 0x4A -#define MODEL_o143 0x49 -#define MODEL_o142 0x48 -#define MODEL_o141 0x47 -#define MODEL_o140 0x46 -#define MODEL_o139 0x45 -#define MODEL_o24 0x44 -#define MODEL_g22 0x43 -#define MODEL_g49 0x42 -#define MODEL_o70 0x41 -#define MODEL_o69 0x40 -#define MODEL_o35 0x3F -#define MODEL_o34 0x3E -#define MODEL_o33 0x3D -#define MODEL_o32 0x3C -#define MODEL_o29 0x3B -#define MODEL_o28 0x3A -#define MODEL_o105 0x39 -#define MODEL_o104 0x38 -#define MODEL_g48 0x37 -#define MODEL_o39 0x36 -#define MODEL_o38 0x35 -#define MODEL_o37 0x34 -#define MODEL_o36 0x33 -#define MODEL_o31 0x32 -#define MODEL_o30 0x31 -#define MODEL_o103 0x30 -#define MODEL_o102 0x2F -#define MODEL_g50 0x2E -#define MODEL_g60 0x2D -#define MODEL_o116 0x2C -#define MODEL_o117 0x2B -#define MODEL_g57 0x2A -#define MODEL_o137 0x29 -#define MODEL_o138 0x28 -#define MODEL_o136 0x27 -#define MODEL_g56 0x26 -#define MODEL_o133 0x25 -#define MODEL_o134 0x24 -#define MODEL_o135 0x23 -#define MODEL_g55 0x22 -#define MODEL_o130 0x21 -#define MODEL_o129 0x20 -#define MODEL_o128 0x1F -#define MODEL_g54 0x1E -#define MODEL_o125 0x1D -#define MODEL_o124 0x1C -#define MODEL_o123 0x1B -#define MODEL_g53 0x1A -#define MODEL_o120 0x19 -#define MODEL_o119 0x18 -#define MODEL_o118 0x17 -#define MODEL_g52 0x16 -#define MODEL_o115 0x15 -#define MODEL_o114 0x14 -#define MODEL_o113 0x13 -#define MODEL_g51 0x12 -#define MODEL_o110 0x11 -#define MODEL_o109 0x10 -#define MODEL_o108 0xF -#define MODEL_g23 0xE -#define MODEL_g24 0xD -#define MODEL_o132 0xC -#define MODEL_o52 0xB -#define MODEL_o51 0xA -#define MODEL_o50 0x9 -#define MODEL_g27 0x8 -#define MODEL_o131 0x7 -#define MODEL_o61 0x6 -#define MODEL_o60 0x5 -#define MODEL_o59 0x4 -#define MODEL_g29 0x3 -#define MODEL_g31 0x2 -#define MODEL_o68 0x1 -#define MODEL_o67 0x0 +#define MODEL_Root 0x6A +#define MODEL_g1 0x69 +#define MODEL_g3 0x68 +#define MODEL_g19 0x67 +#define MODEL_o16 0x66 +#define MODEL_g18 0x65 +#define MODEL_o15 0x64 +#define MODEL_g17 0x63 +#define MODEL_o14 0x62 +#define MODEL_g12 0x61 +#define MODEL_o9 0x60 +#define MODEL_g7 0x5F +#define MODEL_o4 0x5E +#define MODEL_g6 0x5D +#define MODEL_o3 0x5C +#define MODEL_g5 0x5B +#define MODEL_o2 0x5A +#define MODEL_g4 0x59 +#define MODEL_o1 0x58 +#define MODEL_g20 0x57 +#define MODEL_g59 0x56 +#define MODEL_o19 0x55 +#define MODEL_o18 0x54 +#define MODEL_o17 0x53 +#define MODEL_g58 0x52 +#define MODEL_o22 0x51 +#define MODEL_o21 0x50 +#define MODEL_o20 0x4F +#define MODEL_g21 0x4E +#define MODEL_o146 0x4D +#define MODEL_o145 0x4C +#define MODEL_o144 0x4B +#define MODEL_o25 0x4A +#define MODEL_o143 0x49 +#define MODEL_o142 0x48 +#define MODEL_o141 0x47 +#define MODEL_o140 0x46 +#define MODEL_o139 0x45 +#define MODEL_o24 0x44 +#define MODEL_g22 0x43 +#define MODEL_g49 0x42 +#define MODEL_o70 0x41 +#define MODEL_o69 0x40 +#define MODEL_o35 0x3F +#define MODEL_o34 0x3E +#define MODEL_o33 0x3D +#define MODEL_o32 0x3C +#define MODEL_o29 0x3B +#define MODEL_o28 0x3A +#define MODEL_o105 0x39 +#define MODEL_o104 0x38 +#define MODEL_g48 0x37 +#define MODEL_o39 0x36 +#define MODEL_o38 0x35 +#define MODEL_o37 0x34 +#define MODEL_o36 0x33 +#define MODEL_o31 0x32 +#define MODEL_o30 0x31 +#define MODEL_o103 0x30 +#define MODEL_o102 0x2F +#define MODEL_g50 0x2E +#define MODEL_g60 0x2D +#define MODEL_o116 0x2C +#define MODEL_o117 0x2B +#define MODEL_g57 0x2A +#define MODEL_o137 0x29 +#define MODEL_o138 0x28 +#define MODEL_o136 0x27 +#define MODEL_g56 0x26 +#define MODEL_o133 0x25 +#define MODEL_o134 0x24 +#define MODEL_o135 0x23 +#define MODEL_g55 0x22 +#define MODEL_o130 0x21 +#define MODEL_o129 0x20 +#define MODEL_o128 0x1F +#define MODEL_g54 0x1E +#define MODEL_o125 0x1D +#define MODEL_o124 0x1C +#define MODEL_o123 0x1B +#define MODEL_g53 0x1A +#define MODEL_o120 0x19 +#define MODEL_o119 0x18 +#define MODEL_o118 0x17 +#define MODEL_g52 0x16 +#define MODEL_o115 0x15 +#define MODEL_o114 0x14 +#define MODEL_o113 0x13 +#define MODEL_g51 0x12 +#define MODEL_o110 0x11 +#define MODEL_o109 0x10 +#define MODEL_o108 0xF +#define MODEL_g23 0xE +#define MODEL_g24 0xD +#define MODEL_o132 0xC +#define MODEL_o52 0xB +#define MODEL_o51 0xA +#define MODEL_o50 0x9 +#define MODEL_g27 0x8 +#define MODEL_o131 0x7 +#define MODEL_o61 0x6 +#define MODEL_o60 0x5 +#define MODEL_o59 0x4 +#define MODEL_g29 0x3 +#define MODEL_g31 0x2 +#define MODEL_o68 0x1 +#define MODEL_o67 0x0 + diff --git a/include/mapfs/flo_22_hit.h b/include/mapfs/flo_22_hit.h index 03ffe7a4cf..5c23c40b58 100644 --- a/include/mapfs/flo_22_hit.h +++ b/include/mapfs/flo_22_hit.h @@ -1,23 +1,30 @@ -#define COLLIDER_Root 0x16 -#define COLLIDER_g1 0x15 -#define COLLIDER_g14 0x14 -#define COLLIDER_o26 0x13 -#define COLLIDER_g12 0x12 -#define COLLIDER_o75 0x11 -#define COLLIDER_o30 0x10 -#define COLLIDER_o74 0xF -#define COLLIDER_o27 0xE -#define COLLIDER_o50 0xD -#define COLLIDER_o53 0xC -#define COLLIDER_o37 0xB -#define COLLIDER_g5 0xA -#define COLLIDER_o5 0x9 -#define COLLIDER_g3 0x8 -#define COLLIDER_o66 0x7 -#define COLLIDER_o65 0x6 -#define COLLIDER_o7 0x5 -#define COLLIDER_o2 0x4 -#define COLLIDER_g4 0x3 -#define COLLIDER_o25 0x2 -#define COLLIDER_deilitw 0x1 -#define COLLIDER_deiliw 0x0 +#define COLLIDER_Root 0x16 +#define COLLIDER_g1 0x15 +#define COLLIDER_g14 0x14 +#define COLLIDER_o26 0x13 +#define COLLIDER_g12 0x12 +#define COLLIDER_o75 0x11 +#define COLLIDER_o30 0x10 +#define COLLIDER_o74 0xF +#define COLLIDER_o27 0xE +#define COLLIDER_o50 0xD +#define COLLIDER_o53 0xC +#define COLLIDER_o37 0xB +#define COLLIDER_g5 0xA +#define COLLIDER_o5 0x9 +#define COLLIDER_g3 0x8 +#define COLLIDER_o66 0x7 +#define COLLIDER_o65 0x6 +#define COLLIDER_o7 0x5 +#define COLLIDER_o2 0x4 +#define COLLIDER_g4 0x3 +#define COLLIDER_o25 0x2 +#define COLLIDER_deilitw 0x1 +#define COLLIDER_deiliw 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g1 0x3 +#define ZONE_o4 0x2 +#define ZONE_o3 0x1 +#define ZONE_o5 0x0 + diff --git a/include/mapfs/flo_22_shape.h b/include/mapfs/flo_22_shape.h index 6088902cdd..662c6d339b 100644 --- a/include/mapfs/flo_22_shape.h +++ b/include/mapfs/flo_22_shape.h @@ -1,47 +1,48 @@ -#define MODEL_Root 0x2E -#define MODEL_g1 0x2D -#define MODEL_g11 0x2C -#define MODEL_o110 0x2B -#define MODEL_g20 0x2A -#define MODEL_o99 0x29 -#define MODEL_o98 0x28 -#define MODEL_g19 0x27 -#define MODEL_o97 0x26 -#define MODEL_o93 0x25 -#define MODEL_g16 0x24 -#define MODEL_o60 0x23 -#define MODEL_o59 0x22 -#define MODEL_o58 0x21 -#define MODEL_g17 0x20 -#define MODEL_o92 0x1F -#define MODEL_o91 0x1E -#define MODEL_o61 0x1D -#define MODEL_g15 0x1C -#define MODEL_o55 0x1B -#define MODEL_o53 0x1A -#define MODEL_o52 0x19 -#define MODEL_g14 0x18 -#define MODEL_o48 0x17 -#define MODEL_o46 0x16 -#define MODEL_o45 0x15 -#define MODEL_o24 0x14 -#define MODEL_g5 0x13 -#define MODEL_o6 0x12 -#define MODEL_o5 0x11 -#define MODEL_g3 0x10 -#define MODEL_g22 0xF -#define MODEL_o106 0xE -#define MODEL_o105 0xD -#define MODEL_o104 0xC -#define MODEL_o107 0xB -#define MODEL_g21 0xA -#define MODEL_o103 0x9 -#define MODEL_o101 0x8 -#define MODEL_o100 0x7 -#define MODEL_o7 0x6 -#define MODEL_o1 0x5 -#define MODEL_g4 0x4 -#define MODEL_g23 0x3 -#define MODEL_o109 0x2 -#define MODEL_o108 0x1 -#define MODEL_o3 0x0 +#define MODEL_Root 0x2E +#define MODEL_g1 0x2D +#define MODEL_g11 0x2C +#define MODEL_o110 0x2B +#define MODEL_g20 0x2A +#define MODEL_o99 0x29 +#define MODEL_o98 0x28 +#define MODEL_g19 0x27 +#define MODEL_o97 0x26 +#define MODEL_o93 0x25 +#define MODEL_g16 0x24 +#define MODEL_o60 0x23 +#define MODEL_o59 0x22 +#define MODEL_o58 0x21 +#define MODEL_g17 0x20 +#define MODEL_o92 0x1F +#define MODEL_o91 0x1E +#define MODEL_o61 0x1D +#define MODEL_g15 0x1C +#define MODEL_o55 0x1B +#define MODEL_o53 0x1A +#define MODEL_o52 0x19 +#define MODEL_g14 0x18 +#define MODEL_o48 0x17 +#define MODEL_o46 0x16 +#define MODEL_o45 0x15 +#define MODEL_o24 0x14 +#define MODEL_g5 0x13 +#define MODEL_o6 0x12 +#define MODEL_o5 0x11 +#define MODEL_g3 0x10 +#define MODEL_g22 0xF +#define MODEL_o106 0xE +#define MODEL_o105 0xD +#define MODEL_o104 0xC +#define MODEL_o107 0xB +#define MODEL_g21 0xA +#define MODEL_o103 0x9 +#define MODEL_o101 0x8 +#define MODEL_o100 0x7 +#define MODEL_o7 0x6 +#define MODEL_o1 0x5 +#define MODEL_g4 0x4 +#define MODEL_g23 0x3 +#define MODEL_o109 0x2 +#define MODEL_o108 0x1 +#define MODEL_o3 0x0 + diff --git a/include/mapfs/flo_23_hit.h b/include/mapfs/flo_23_hit.h index cdf80f28f7..295f78a651 100644 --- a/include/mapfs/flo_23_hit.h +++ b/include/mapfs/flo_23_hit.h @@ -1,21 +1,28 @@ -#define COLLIDER_Root 0x14 -#define COLLIDER_g1 0x13 -#define COLLIDER_o132 0x12 -#define COLLIDER_g44 0x11 -#define COLLIDER_o128 0x10 -#define COLLIDER_o127 0xF -#define COLLIDER_o122 0xE -#define COLLIDER_o95 0xD -#define COLLIDER_o125 0xC -#define COLLIDER_o120 0xB -#define COLLIDER_o126 0xA -#define COLLIDER_o121 0x9 -#define COLLIDER_g4 0x8 -#define COLLIDER_g6 0x7 -#define COLLIDER_o116 0x6 -#define COLLIDER_deilite 0x5 -#define COLLIDER_deilie 0x4 -#define COLLIDER_g43 0x3 -#define COLLIDER_o117 0x2 -#define COLLIDER_deilitw 0x1 -#define COLLIDER_deiliw 0x0 +#define COLLIDER_Root 0x14 +#define COLLIDER_g1 0x13 +#define COLLIDER_o132 0x12 +#define COLLIDER_g44 0x11 +#define COLLIDER_o128 0x10 +#define COLLIDER_o127 0xF +#define COLLIDER_o122 0xE +#define COLLIDER_o95 0xD +#define COLLIDER_o125 0xC +#define COLLIDER_o120 0xB +#define COLLIDER_o126 0xA +#define COLLIDER_o121 0x9 +#define COLLIDER_g4 0x8 +#define COLLIDER_g6 0x7 +#define COLLIDER_o116 0x6 +#define COLLIDER_deilite 0x5 +#define COLLIDER_deilie 0x4 +#define COLLIDER_g43 0x3 +#define COLLIDER_o117 0x2 +#define COLLIDER_deilitw 0x1 +#define COLLIDER_deiliw 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g1 0x3 +#define ZONE_o2 0x2 +#define ZONE_o4 0x1 +#define ZONE_o5 0x0 + diff --git a/include/mapfs/flo_23_shape.h b/include/mapfs/flo_23_shape.h index fc181719ae..34f0008837 100644 --- a/include/mapfs/flo_23_shape.h +++ b/include/mapfs/flo_23_shape.h @@ -1,66 +1,67 @@ -#define MODEL_Root 0x41 -#define MODEL_g1 0x40 -#define MODEL_g36 0x3F -#define MODEL_g38 0x3E -#define MODEL_o88 0x3D -#define MODEL_o87 0x3C -#define MODEL_o86 0x3B -#define MODEL_g37 0x3A -#define MODEL_o85 0x39 -#define MODEL_o84 0x38 -#define MODEL_o83 0x37 -#define MODEL_g24 0x36 -#define MODEL_o66 0x35 -#define MODEL_o65 0x34 -#define MODEL_g15 0x33 -#define MODEL_o110 0x32 -#define MODEL_o109 0x31 -#define MODEL_o108 0x30 -#define MODEL_o107 0x2F -#define MODEL_g12 0x2E -#define MODEL_g14 0x2D -#define MODEL_o34 0x2C -#define MODEL_o33 0x2B -#define MODEL_o31 0x2A -#define MODEL_g13 0x29 -#define MODEL_o36 0x28 -#define MODEL_o35 0x27 -#define MODEL_o32 0x26 -#define MODEL_o30 0x25 -#define MODEL_g23 0x24 -#define MODEL_o57 0x23 -#define MODEL_o56 0x22 -#define MODEL_o55 0x21 -#define MODEL_g27 0x20 -#define MODEL_o69 0x1F -#define MODEL_o75 0x1E -#define MODEL_o74 0x1D -#define MODEL_o71 0x1C -#define MODEL_g41 0x1B -#define MODEL_o102 0x1A -#define MODEL_o101 0x19 -#define MODEL_o99 0x18 -#define MODEL_o98 0x17 -#define MODEL_o97 0x16 -#define MODEL_g40 0x15 -#define MODEL_o95 0x14 -#define MODEL_o94 0x13 -#define MODEL_o93 0x12 -#define MODEL_o92 0x11 -#define MODEL_o91 0x10 -#define MODEL_g39 0xF -#define MODEL_g42 0xE -#define MODEL_o105 0xD -#define MODEL_o104 0xC -#define MODEL_o106 0xB -#define MODEL_o90 0xA -#define MODEL_o89 0x9 -#define MODEL_g4 0x8 -#define MODEL_g43 0x7 -#define MODEL_o114 0x6 -#define MODEL_o113 0x5 -#define MODEL_o112 0x4 -#define MODEL_o111 0x3 -#define MODEL_g6 0x2 -#define MODEL_o4 0x1 -#define MODEL_o3 0x0 +#define MODEL_Root 0x41 +#define MODEL_g1 0x40 +#define MODEL_g36 0x3F +#define MODEL_g38 0x3E +#define MODEL_o88 0x3D +#define MODEL_o87 0x3C +#define MODEL_o86 0x3B +#define MODEL_g37 0x3A +#define MODEL_o85 0x39 +#define MODEL_o84 0x38 +#define MODEL_o83 0x37 +#define MODEL_g24 0x36 +#define MODEL_o66 0x35 +#define MODEL_o65 0x34 +#define MODEL_g15 0x33 +#define MODEL_o110 0x32 +#define MODEL_o109 0x31 +#define MODEL_o108 0x30 +#define MODEL_o107 0x2F +#define MODEL_g12 0x2E +#define MODEL_g14 0x2D +#define MODEL_o34 0x2C +#define MODEL_o33 0x2B +#define MODEL_o31 0x2A +#define MODEL_g13 0x29 +#define MODEL_o36 0x28 +#define MODEL_o35 0x27 +#define MODEL_o32 0x26 +#define MODEL_o30 0x25 +#define MODEL_g23 0x24 +#define MODEL_o57 0x23 +#define MODEL_o56 0x22 +#define MODEL_o55 0x21 +#define MODEL_g27 0x20 +#define MODEL_o69 0x1F +#define MODEL_o75 0x1E +#define MODEL_o74 0x1D +#define MODEL_o71 0x1C +#define MODEL_g41 0x1B +#define MODEL_o102 0x1A +#define MODEL_o101 0x19 +#define MODEL_o99 0x18 +#define MODEL_o98 0x17 +#define MODEL_o97 0x16 +#define MODEL_g40 0x15 +#define MODEL_o95 0x14 +#define MODEL_o94 0x13 +#define MODEL_o93 0x12 +#define MODEL_o92 0x11 +#define MODEL_o91 0x10 +#define MODEL_g39 0xF +#define MODEL_g42 0xE +#define MODEL_o105 0xD +#define MODEL_o104 0xC +#define MODEL_o106 0xB +#define MODEL_o90 0xA +#define MODEL_o89 0x9 +#define MODEL_g4 0x8 +#define MODEL_g43 0x7 +#define MODEL_o114 0x6 +#define MODEL_o113 0x5 +#define MODEL_o112 0x4 +#define MODEL_o111 0x3 +#define MODEL_g6 0x2 +#define MODEL_o4 0x1 +#define MODEL_o3 0x0 + diff --git a/include/mapfs/flo_24_hit.h b/include/mapfs/flo_24_hit.h index ccbdda3c39..9e415f648e 100644 --- a/include/mapfs/flo_24_hit.h +++ b/include/mapfs/flo_24_hit.h @@ -1,33 +1,40 @@ -#define COLLIDER_Root 0x20 -#define COLLIDER_g43 0x1F -#define COLLIDER_g58 0x1E -#define COLLIDER_o177 0x1D -#define COLLIDER_o179 0x1C -#define COLLIDER_o178 0x1B -#define COLLIDER_o184 0x1A -#define COLLIDER_o183 0x19 -#define COLLIDER_o180 0x18 -#define COLLIDER_o176 0x17 -#define COLLIDER_g33 0x16 -#define COLLIDER_o168 0x15 -#define COLLIDER_o165 0x14 -#define COLLIDER_o164 0x13 -#define COLLIDER_g45 0x12 -#define COLLIDER_o169 0x11 -#define COLLIDER_o111 0x10 -#define COLLIDER_o187 0xF -#define COLLIDER_o186 0xE -#define COLLIDER_o124 0xD -#define COLLIDER_o123 0xC -#define COLLIDER_o112 0xB -#define COLLIDER_o182 0xA -#define COLLIDER_o181 0x9 -#define COLLIDER_g49 0x8 -#define COLLIDER_g51 0x7 -#define COLLIDER_o175 0x6 -#define COLLIDER_deilite 0x5 -#define COLLIDER_deilie 0x4 -#define COLLIDER_g50 0x3 -#define COLLIDER_o173 0x2 -#define COLLIDER_deilitw 0x1 -#define COLLIDER_deiliw 0x0 +#define COLLIDER_Root 0x20 +#define COLLIDER_g43 0x1F +#define COLLIDER_g58 0x1E +#define COLLIDER_o177 0x1D +#define COLLIDER_o179 0x1C +#define COLLIDER_o178 0x1B +#define COLLIDER_o184 0x1A +#define COLLIDER_o183 0x19 +#define COLLIDER_o180 0x18 +#define COLLIDER_o176 0x17 +#define COLLIDER_g33 0x16 +#define COLLIDER_o168 0x15 +#define COLLIDER_o165 0x14 +#define COLLIDER_o164 0x13 +#define COLLIDER_g45 0x12 +#define COLLIDER_o169 0x11 +#define COLLIDER_o111 0x10 +#define COLLIDER_o187 0xF +#define COLLIDER_o186 0xE +#define COLLIDER_o124 0xD +#define COLLIDER_o123 0xC +#define COLLIDER_o112 0xB +#define COLLIDER_o182 0xA +#define COLLIDER_o181 0x9 +#define COLLIDER_g49 0x8 +#define COLLIDER_g51 0x7 +#define COLLIDER_o175 0x6 +#define COLLIDER_deilite 0x5 +#define COLLIDER_deilie 0x4 +#define COLLIDER_g50 0x3 +#define COLLIDER_o173 0x2 +#define COLLIDER_deilitw 0x1 +#define COLLIDER_deiliw 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g1 0x3 +#define ZONE_o2 0x2 +#define ZONE_o4 0x1 +#define ZONE_o5 0x0 + diff --git a/include/mapfs/flo_24_shape.h b/include/mapfs/flo_24_shape.h index dbae57fca0..a2b1960c17 100644 --- a/include/mapfs/flo_24_shape.h +++ b/include/mapfs/flo_24_shape.h @@ -1,109 +1,110 @@ -#define MODEL_Root 0x6C -#define MODEL_g43 0x6B -#define MODEL_g59 0x6A -#define MODEL_g67 0x69 -#define MODEL_g72 0x68 -#define MODEL_o220 0x67 -#define MODEL_g71 0x66 -#define MODEL_o219 0x65 -#define MODEL_g73 0x64 -#define MODEL_o218 0x63 -#define MODEL_o216 0x62 -#define MODEL_o215 0x61 -#define MODEL_o214 0x60 -#define MODEL_o213 0x5F -#define MODEL_water1 0x5E -#define MODEL_g58 0x5D -#define MODEL_o192 0x5C -#define MODEL_o189 0x5B -#define MODEL_o166 0x5A -#define MODEL_o165 0x59 -#define MODEL_o164 0x58 -#define MODEL_o163 0x57 -#define MODEL_o190 0x56 -#define MODEL_o172 0x55 -#define MODEL_o173 0x54 -#define MODEL_o177 0x53 -#define MODEL_o176 0x52 -#define MODEL_o178 0x51 -#define MODEL_g62 0x50 -#define MODEL_o175 0x4F -#define MODEL_o174 0x4E -#define MODEL_g63 0x4D -#define MODEL_o182 0x4C -#define MODEL_o181 0x4B -#define MODEL_o180 0x4A -#define MODEL_o179 0x49 -#define MODEL_g64 0x48 -#define MODEL_o188 0x47 -#define MODEL_o187 0x46 -#define MODEL_o186 0x45 -#define MODEL_o185 0x44 -#define MODEL_o184 0x43 -#define MODEL_o183 0x42 -#define MODEL_g60 0x41 -#define MODEL_o191 0x40 -#define MODEL_o171 0x3F -#define MODEL_o170 0x3E -#define MODEL_g61 0x3D -#define MODEL_o169 0x3C -#define MODEL_o168 0x3B -#define MODEL_o139 0x3A -#define MODEL_o135 0x39 -#define MODEL_o167 0x38 -#define MODEL_g34 0x37 -#define MODEL_o122 0x36 -#define MODEL_o121 0x35 -#define MODEL_o112 0x34 -#define MODEL_o111 0x33 -#define MODEL_g33 0x32 -#define MODEL_o134 0x31 -#define MODEL_o133 0x30 -#define MODEL_o132 0x2F -#define MODEL_o131 0x2E -#define MODEL_o62 0x2D -#define MODEL_o61 0x2C -#define MODEL_g56 0x2B -#define MODEL_o162 0x2A -#define MODEL_o161 0x29 -#define MODEL_g52 0x28 -#define MODEL_g54 0x27 -#define MODEL_o155 0x26 -#define MODEL_o154 0x25 -#define MODEL_o152 0x24 -#define MODEL_g53 0x23 -#define MODEL_o157 0x22 -#define MODEL_o156 0x21 -#define MODEL_o153 0x20 -#define MODEL_o151 0x1F -#define MODEL_g47 0x1E -#define MODEL_o143 0x1D -#define MODEL_o142 0x1C -#define MODEL_o141 0x1B -#define MODEL_o140 0x1A -#define MODEL_g45 0x19 -#define MODEL_g74 0x18 -#define MODEL_o129 0x17 -#define MODEL_o128 0x16 -#define MODEL_o127 0x15 -#define MODEL_o125 0x14 -#define MODEL_o130 0x13 -#define MODEL_o126 0x12 -#define MODEL_o124 0x11 -#define MODEL_g44 0x10 -#define MODEL_g55 0xF -#define MODEL_o159 0xE -#define MODEL_o158 0xD -#define MODEL_o160 0xC -#define MODEL_g46 0xB -#define MODEL_o138 0xA -#define MODEL_o137 0x9 -#define MODEL_o136 0x8 -#define MODEL_o123 0x7 -#define MODEL_g49 0x6 -#define MODEL_g51 0x5 -#define MODEL_o150 0x4 -#define MODEL_o149 0x3 -#define MODEL_g50 0x2 -#define MODEL_o148 0x1 -#define MODEL_o147 0x0 +#define MODEL_Root 0x6C +#define MODEL_g43 0x6B +#define MODEL_g59 0x6A +#define MODEL_g67 0x69 +#define MODEL_g72 0x68 +#define MODEL_o220 0x67 +#define MODEL_g71 0x66 +#define MODEL_o219 0x65 +#define MODEL_g73 0x64 +#define MODEL_o218 0x63 +#define MODEL_o216 0x62 +#define MODEL_o215 0x61 +#define MODEL_o214 0x60 +#define MODEL_o213 0x5F +#define MODEL_water1 0x5E +#define MODEL_g58 0x5D +#define MODEL_o192 0x5C +#define MODEL_o189 0x5B +#define MODEL_o166 0x5A +#define MODEL_o165 0x59 +#define MODEL_o164 0x58 +#define MODEL_o163 0x57 +#define MODEL_o190 0x56 +#define MODEL_o172 0x55 +#define MODEL_o173 0x54 +#define MODEL_o177 0x53 +#define MODEL_o176 0x52 +#define MODEL_o178 0x51 +#define MODEL_g62 0x50 +#define MODEL_o175 0x4F +#define MODEL_o174 0x4E +#define MODEL_g63 0x4D +#define MODEL_o182 0x4C +#define MODEL_o181 0x4B +#define MODEL_o180 0x4A +#define MODEL_o179 0x49 +#define MODEL_g64 0x48 +#define MODEL_o188 0x47 +#define MODEL_o187 0x46 +#define MODEL_o186 0x45 +#define MODEL_o185 0x44 +#define MODEL_o184 0x43 +#define MODEL_o183 0x42 +#define MODEL_g60 0x41 +#define MODEL_o191 0x40 +#define MODEL_o171 0x3F +#define MODEL_o170 0x3E +#define MODEL_g61 0x3D +#define MODEL_o169 0x3C +#define MODEL_o168 0x3B +#define MODEL_o139 0x3A +#define MODEL_o135 0x39 +#define MODEL_o167 0x38 +#define MODEL_g34 0x37 +#define MODEL_o122 0x36 +#define MODEL_o121 0x35 +#define MODEL_o112 0x34 +#define MODEL_o111 0x33 +#define MODEL_g33 0x32 +#define MODEL_o134 0x31 +#define MODEL_o133 0x30 +#define MODEL_o132 0x2F +#define MODEL_o131 0x2E +#define MODEL_o62 0x2D +#define MODEL_o61 0x2C +#define MODEL_g56 0x2B +#define MODEL_o162 0x2A +#define MODEL_o161 0x29 +#define MODEL_g52 0x28 +#define MODEL_g54 0x27 +#define MODEL_o155 0x26 +#define MODEL_o154 0x25 +#define MODEL_o152 0x24 +#define MODEL_g53 0x23 +#define MODEL_o157 0x22 +#define MODEL_o156 0x21 +#define MODEL_o153 0x20 +#define MODEL_o151 0x1F +#define MODEL_g47 0x1E +#define MODEL_o143 0x1D +#define MODEL_o142 0x1C +#define MODEL_o141 0x1B +#define MODEL_o140 0x1A +#define MODEL_g45 0x19 +#define MODEL_g74 0x18 +#define MODEL_o129 0x17 +#define MODEL_o128 0x16 +#define MODEL_o127 0x15 +#define MODEL_o125 0x14 +#define MODEL_o130 0x13 +#define MODEL_o126 0x12 +#define MODEL_o124 0x11 +#define MODEL_g44 0x10 +#define MODEL_g55 0xF +#define MODEL_o159 0xE +#define MODEL_o158 0xD +#define MODEL_o160 0xC +#define MODEL_g46 0xB +#define MODEL_o138 0xA +#define MODEL_o137 0x9 +#define MODEL_o136 0x8 +#define MODEL_o123 0x7 +#define MODEL_g49 0x6 +#define MODEL_g51 0x5 +#define MODEL_o150 0x4 +#define MODEL_o149 0x3 +#define MODEL_g50 0x2 +#define MODEL_o148 0x1 +#define MODEL_o147 0x0 + diff --git a/include/mapfs/flo_25_hit.h b/include/mapfs/flo_25_hit.h index 2ecb2af304..afc4b01c88 100644 --- a/include/mapfs/flo_25_hit.h +++ b/include/mapfs/flo_25_hit.h @@ -1,21 +1,26 @@ -#define COLLIDER_Root 0x14 -#define COLLIDER_g1 0x13 -#define COLLIDER_g25 0x12 -#define COLLIDER_o99 0x11 -#define COLLIDER_o98 0x10 -#define COLLIDER_g10 0xF -#define COLLIDER_o94 0xE -#define COLLIDER_o21 0xD -#define COLLIDER_o42 0xC -#define COLLIDER_g2 0xB -#define COLLIDER_o2 0xA -#define COLLIDER_o3 0x9 -#define COLLIDER_g3 0x8 -#define COLLIDER_g4 0x7 -#define COLLIDER_o92 0x6 -#define COLLIDER_deilite 0x5 -#define COLLIDER_deilie 0x4 -#define COLLIDER_g7 0x3 -#define COLLIDER_o93 0x2 -#define COLLIDER_deilitw 0x1 -#define COLLIDER_deiliw 0x0 +#define COLLIDER_Root 0x14 +#define COLLIDER_g1 0x13 +#define COLLIDER_g25 0x12 +#define COLLIDER_o99 0x11 +#define COLLIDER_o98 0x10 +#define COLLIDER_g10 0xF +#define COLLIDER_o94 0xE +#define COLLIDER_o21 0xD +#define COLLIDER_o42 0xC +#define COLLIDER_g2 0xB +#define COLLIDER_o2 0xA +#define COLLIDER_o3 0x9 +#define COLLIDER_g3 0x8 +#define COLLIDER_g4 0x7 +#define COLLIDER_o92 0x6 +#define COLLIDER_deilite 0x5 +#define COLLIDER_deilie 0x4 +#define COLLIDER_g7 0x3 +#define COLLIDER_o93 0x2 +#define COLLIDER_deilitw 0x1 +#define COLLIDER_deiliw 0x0 + +#define ZONE_Root 0x2 +#define ZONE_g1 0x1 +#define ZONE_o65 0x0 + diff --git a/include/mapfs/flo_25_shape.h b/include/mapfs/flo_25_shape.h index 46053f296a..6127faf075 100644 --- a/include/mapfs/flo_25_shape.h +++ b/include/mapfs/flo_25_shape.h @@ -1,93 +1,94 @@ -#define MODEL_Root 0x5C -#define MODEL_g1 0x5B -#define MODEL_g39 0x5A -#define MODEL_g41 0x59 -#define MODEL_o139 0x58 -#define MODEL_o138 0x57 -#define MODEL_o137 0x56 -#define MODEL_g40 0x55 -#define MODEL_o136 0x54 -#define MODEL_o135 0x53 -#define MODEL_o134 0x52 -#define MODEL_g26 0x51 -#define MODEL_g37 0x50 -#define MODEL_g38 0x4F -#define MODEL_o133 0x4E -#define MODEL_o132 0x4D -#define MODEL_o131 0x4C -#define MODEL_o130 0x4B -#define MODEL_g29 0x4A -#define MODEL_g30 0x49 -#define MODEL_o108 0x48 -#define MODEL_o107 0x47 -#define MODEL_o106 0x46 -#define MODEL_o105 0x45 -#define MODEL_g27 0x44 -#define MODEL_g28 0x43 -#define MODEL_o104 0x42 -#define MODEL_o103 0x41 -#define MODEL_o102 0x40 -#define MODEL_o101 0x3F -#define MODEL_g31 0x3E -#define MODEL_g32 0x3D -#define MODEL_o114 0x3C -#define MODEL_o113 0x3B -#define MODEL_o112 0x3A -#define MODEL_o111 0x39 -#define MODEL_o109 0x38 -#define MODEL_o110 0x37 -#define MODEL_g10 0x36 -#define MODEL_o117 0x35 -#define MODEL_o21 0x34 -#define MODEL_g23 0x33 -#define MODEL_o92 0x32 -#define MODEL_o79 0x31 -#define MODEL_o91 0x30 -#define MODEL_o78 0x2F -#define MODEL_o81 0x2E -#define MODEL_o83 0x2D -#define MODEL_g18 0x2C -#define MODEL_g25 0x2B -#define MODEL_o97 0x2A -#define MODEL_o11 0x29 -#define MODEL_o10 0x28 -#define MODEL_o68 0x27 -#define MODEL_o67 0x26 -#define MODEL_o15 0x25 -#define MODEL_o14 0x24 -#define MODEL_g19 0x23 -#define MODEL_o93 0x22 -#define MODEL_o95 0x21 -#define MODEL_g5 0x20 -#define MODEL_o66 0x1F -#define MODEL_o9 0x1E -#define MODEL_o13 0x1D -#define MODEL_g6 0x1C -#define MODEL_o65 0x1B -#define MODEL_o8 0x1A -#define MODEL_g12 0x19 -#define MODEL_o45 0x18 -#define MODEL_o44 0x17 -#define MODEL_o43 0x16 -#define MODEL_o42 0x15 -#define MODEL_g2 0x14 -#define MODEL_g42 0x13 -#define MODEL_o4 0x12 -#define MODEL_o140 0x11 -#define MODEL_g15 0x10 -#define MODEL_o58 0xF -#define MODEL_o57 0xE -#define MODEL_o53 0xD -#define MODEL_o54 0xC -#define MODEL_o56 0xB -#define MODEL_o55 0xA -#define MODEL_o2 0x9 -#define MODEL_o3 0x8 -#define MODEL_o5 0x7 -#define MODEL_g3 0x6 -#define MODEL_g7 0x5 -#define MODEL_o17 0x4 -#define MODEL_o16 0x3 -#define MODEL_g4 0x2 -#define MODEL_o7 0x1 -#define MODEL_o6 0x0 +#define MODEL_Root 0x5C +#define MODEL_g1 0x5B +#define MODEL_g39 0x5A +#define MODEL_g41 0x59 +#define MODEL_o139 0x58 +#define MODEL_o138 0x57 +#define MODEL_o137 0x56 +#define MODEL_g40 0x55 +#define MODEL_o136 0x54 +#define MODEL_o135 0x53 +#define MODEL_o134 0x52 +#define MODEL_g26 0x51 +#define MODEL_g37 0x50 +#define MODEL_g38 0x4F +#define MODEL_o133 0x4E +#define MODEL_o132 0x4D +#define MODEL_o131 0x4C +#define MODEL_o130 0x4B +#define MODEL_g29 0x4A +#define MODEL_g30 0x49 +#define MODEL_o108 0x48 +#define MODEL_o107 0x47 +#define MODEL_o106 0x46 +#define MODEL_o105 0x45 +#define MODEL_g27 0x44 +#define MODEL_g28 0x43 +#define MODEL_o104 0x42 +#define MODEL_o103 0x41 +#define MODEL_o102 0x40 +#define MODEL_o101 0x3F +#define MODEL_g31 0x3E +#define MODEL_g32 0x3D +#define MODEL_o114 0x3C +#define MODEL_o113 0x3B +#define MODEL_o112 0x3A +#define MODEL_o111 0x39 +#define MODEL_o109 0x38 +#define MODEL_o110 0x37 +#define MODEL_g10 0x36 +#define MODEL_o117 0x35 +#define MODEL_o21 0x34 +#define MODEL_g23 0x33 +#define MODEL_o92 0x32 +#define MODEL_o79 0x31 +#define MODEL_o91 0x30 +#define MODEL_o78 0x2F +#define MODEL_o81 0x2E +#define MODEL_o83 0x2D +#define MODEL_g18 0x2C +#define MODEL_g25 0x2B +#define MODEL_o97 0x2A +#define MODEL_o11 0x29 +#define MODEL_o10 0x28 +#define MODEL_o68 0x27 +#define MODEL_o67 0x26 +#define MODEL_o15 0x25 +#define MODEL_o14 0x24 +#define MODEL_g19 0x23 +#define MODEL_o93 0x22 +#define MODEL_o95 0x21 +#define MODEL_g5 0x20 +#define MODEL_o66 0x1F +#define MODEL_o9 0x1E +#define MODEL_o13 0x1D +#define MODEL_g6 0x1C +#define MODEL_o65 0x1B +#define MODEL_o8 0x1A +#define MODEL_g12 0x19 +#define MODEL_o45 0x18 +#define MODEL_o44 0x17 +#define MODEL_o43 0x16 +#define MODEL_o42 0x15 +#define MODEL_g2 0x14 +#define MODEL_g42 0x13 +#define MODEL_o4 0x12 +#define MODEL_o140 0x11 +#define MODEL_g15 0x10 +#define MODEL_o58 0xF +#define MODEL_o57 0xE +#define MODEL_o53 0xD +#define MODEL_o54 0xC +#define MODEL_o56 0xB +#define MODEL_o55 0xA +#define MODEL_o2 0x9 +#define MODEL_o3 0x8 +#define MODEL_o5 0x7 +#define MODEL_g3 0x6 +#define MODEL_g7 0x5 +#define MODEL_o17 0x4 +#define MODEL_o16 0x3 +#define MODEL_g4 0x2 +#define MODEL_o7 0x1 +#define MODEL_o6 0x0 + diff --git a/include/mapfs/flo_bt01_hit.h b/include/mapfs/flo_bt01_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/flo_bt01_hit.h +++ b/include/mapfs/flo_bt01_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/flo_bt01_shape.h b/include/mapfs/flo_bt01_shape.h index 09de808a06..88f3dcb4b0 100644 --- a/include/mapfs/flo_bt01_shape.h +++ b/include/mapfs/flo_bt01_shape.h @@ -1,39 +1,40 @@ -#define MODEL_Root 0x26 -#define MODEL_dai_03 0x25 -#define MODEL_o424 0x24 -#define MODEL_o423 0x23 -#define MODEL_o422 0x22 -#define MODEL_o411 0x21 -#define MODEL_o404 0x20 -#define MODEL_o407 0x1F -#define MODEL_o401 0x1E -#define MODEL_o400 0x1D -#define MODEL_dai_04 0x1C -#define MODEL_mae3 0x1B -#define MODEL_mae2 0x1A -#define MODEL_mae1 0x19 -#define MODEL_hana1 0x18 -#define MODEL_kuki 0x17 -#define MODEL_dai_05 0x16 -#define MODEL_o390 0x15 -#define MODEL_o389 0x14 -#define MODEL_o388 0x13 -#define MODEL_o384 0x12 -#define MODEL_o383 0x11 -#define MODEL_o382 0x10 -#define MODEL_o381 0xF -#define MODEL_dai 0xE -#define MODEL_miti 0xD -#define MODEL_waku1 0xC -#define MODEL_yuka 0xB -#define MODEL_g49 0xA -#define MODEL_waku2 0x9 -#define MODEL_hana7 0x8 -#define MODEL_hana6 0x7 -#define MODEL_hana5 0x6 -#define MODEL_hana4 0x5 -#define MODEL_hana3 0x4 -#define MODEL_hana2 0x3 -#define MODEL_ha 0x2 -#define MODEL_yuka2 0x1 -#define MODEL_waku 0x0 +#define MODEL_Root 0x26 +#define MODEL_dai_03 0x25 +#define MODEL_o424 0x24 +#define MODEL_o423 0x23 +#define MODEL_o422 0x22 +#define MODEL_o411 0x21 +#define MODEL_o404 0x20 +#define MODEL_o407 0x1F +#define MODEL_o401 0x1E +#define MODEL_o400 0x1D +#define MODEL_dai_04 0x1C +#define MODEL_mae3 0x1B +#define MODEL_mae2 0x1A +#define MODEL_mae1 0x19 +#define MODEL_hana1 0x18 +#define MODEL_kuki 0x17 +#define MODEL_dai_05 0x16 +#define MODEL_o390 0x15 +#define MODEL_o389 0x14 +#define MODEL_o388 0x13 +#define MODEL_o384 0x12 +#define MODEL_o383 0x11 +#define MODEL_o382 0x10 +#define MODEL_o381 0xF +#define MODEL_dai 0xE +#define MODEL_miti 0xD +#define MODEL_waku1 0xC +#define MODEL_yuka 0xB +#define MODEL_g49 0xA +#define MODEL_waku2 0x9 +#define MODEL_hana7 0x8 +#define MODEL_hana6 0x7 +#define MODEL_hana5 0x6 +#define MODEL_hana4 0x5 +#define MODEL_hana3 0x4 +#define MODEL_hana2 0x3 +#define MODEL_ha 0x2 +#define MODEL_yuka2 0x1 +#define MODEL_waku 0x0 + diff --git a/include/mapfs/flo_bt02_hit.h b/include/mapfs/flo_bt02_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/flo_bt02_hit.h +++ b/include/mapfs/flo_bt02_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/flo_bt02_shape.h b/include/mapfs/flo_bt02_shape.h index da976627ca..82753a6406 100644 --- a/include/mapfs/flo_bt02_shape.h +++ b/include/mapfs/flo_bt02_shape.h @@ -1,49 +1,50 @@ -#define MODEL_Root 0x30 -#define MODEL_0809 0x2F -#define MODEL_g92 0x2E -#define MODEL_o419 0x2D -#define MODEL_o418 0x2C -#define MODEL_o417 0x2B -#define MODEL_8hana3 0x2A -#define MODEL_8hana2 0x29 -#define MODEL_8hana1 0x28 -#define MODEL_8hana6 0x27 -#define MODEL_8hana5 0x26 -#define MODEL_8hana4 0x25 -#define MODEL_8kuki 0x24 -#define MODEL_dai_05 0x23 -#define MODEL_o405 0x22 -#define MODEL_o404 0x21 -#define MODEL_o403 0x20 -#define MODEL_kuki 0x1F -#define MODEL_hana1 0x1E -#define MODEL_dai 0x1D -#define MODEL_mae3 0x1C -#define MODEL_mae2 0x1B -#define MODEL_mae1 0x1A -#define MODEL_miti 0x19 -#define MODEL_waku1 0x18 -#define MODEL_yuka 0x17 -#define MODEL_16 0x16 -#define MODEL_kusa7 0x15 -#define MODEL_kusa6 0x14 -#define MODEL_kusa5 0x13 -#define MODEL_o409 0x12 -#define MODEL_o408 0x11 -#define MODEL_g90 0x10 -#define MODEL_kabe1 0xF -#define MODEL_kabe2 0xE -#define MODEL_kusa4 0xD -#define MODEL_kusa2 0xC -#define MODEL_kusa3 0xB -#define MODEL_g49 0xA -#define MODEL_o414 0x9 -#define MODEL_hana7 0x8 -#define MODEL_hana6 0x7 -#define MODEL_kana5 0x6 -#define MODEL_hana4 0x5 -#define MODEL_hana3 0x4 -#define MODEL_hana2 0x3 -#define MODEL_kusa1 0x2 -#define MODEL_yuka2 0x1 -#define MODEL_waku 0x0 +#define MODEL_Root 0x30 +#define MODEL_0809 0x2F +#define MODEL_g92 0x2E +#define MODEL_o419 0x2D +#define MODEL_o418 0x2C +#define MODEL_o417 0x2B +#define MODEL_8hana3 0x2A +#define MODEL_8hana2 0x29 +#define MODEL_8hana1 0x28 +#define MODEL_8hana6 0x27 +#define MODEL_8hana5 0x26 +#define MODEL_8hana4 0x25 +#define MODEL_8kuki 0x24 +#define MODEL_dai_05 0x23 +#define MODEL_o405 0x22 +#define MODEL_o404 0x21 +#define MODEL_o403 0x20 +#define MODEL_kuki 0x1F +#define MODEL_hana1 0x1E +#define MODEL_dai 0x1D +#define MODEL_mae3 0x1C +#define MODEL_mae2 0x1B +#define MODEL_mae1 0x1A +#define MODEL_miti 0x19 +#define MODEL_waku1 0x18 +#define MODEL_yuka 0x17 +#define MODEL_16 0x16 +#define MODEL_kusa7 0x15 +#define MODEL_kusa6 0x14 +#define MODEL_kusa5 0x13 +#define MODEL_o409 0x12 +#define MODEL_o408 0x11 +#define MODEL_g90 0x10 +#define MODEL_kabe1 0xF +#define MODEL_kabe2 0xE +#define MODEL_kusa4 0xD +#define MODEL_kusa2 0xC +#define MODEL_kusa3 0xB +#define MODEL_g49 0xA +#define MODEL_o414 0x9 +#define MODEL_hana7 0x8 +#define MODEL_hana6 0x7 +#define MODEL_kana5 0x6 +#define MODEL_hana4 0x5 +#define MODEL_hana3 0x4 +#define MODEL_hana2 0x3 +#define MODEL_kusa1 0x2 +#define MODEL_yuka2 0x1 +#define MODEL_waku 0x0 + diff --git a/include/mapfs/flo_bt03_hit.h b/include/mapfs/flo_bt03_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/flo_bt03_hit.h +++ b/include/mapfs/flo_bt03_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/flo_bt03_shape.h b/include/mapfs/flo_bt03_shape.h index 56c54d999c..92ebfc1ff0 100644 --- a/include/mapfs/flo_bt03_shape.h +++ b/include/mapfs/flo_bt03_shape.h @@ -1,47 +1,48 @@ -#define MODEL_Root 0x2E -#define MODEL_kumo 0x2D -#define MODEL_o454 0x2C -#define MODEL_dai_03 0x2B -#define MODEL_piko7 0x2A -#define MODEL_piko6 0x29 -#define MODEL_piko3 0x28 -#define MODEL_piko2 0x27 -#define MODEL_piko1 0x26 -#define MODEL_piko5 0x25 -#define MODEL_piko4 0x24 -#define MODEL_o422 0x23 -#define MODEL_o420 0x22 -#define MODEL_o419 0x21 -#define MODEL_g91 0x20 -#define MODEL_o415 0x1F -#define MODEL_o414 0x1E -#define MODEL_o413 0x1D -#define MODEL_o412 0x1C -#define MODEL_dai 0x1B -#define MODEL_miti 0x1A -#define MODEL_waku1 0x19 -#define MODEL_yuka 0x18 -#define MODEL_o411 0x17 -#define MODEL_g49 0x16 -#define MODEL_waku2 0x15 -#define MODEL_o430 0x14 -#define MODEL_o429 0x13 -#define MODEL_o452 0x12 -#define MODEL_o438 0x11 -#define MODEL_lever 0x10 -#define MODEL_o440 0xF -#define MODEL_o453 0xE -#define MODEL_ki1 0xD -#define MODEL_ki2 0xC -#define MODEL_g101 0xB -#define MODEL_o458 0xA -#define MODEL_o457 0x9 -#define MODEL_o456 0x8 -#define MODEL_o455 0x7 -#define MODEL_waku 0x6 -#define MODEL_yuka2 0x5 -#define MODEL_toge2 0x4 -#define MODEL_toge1 0x3 -#define MODEL_turu3 0x2 -#define MODEL_turuu2 0x1 -#define MODEL_turu1 0x0 +#define MODEL_Root 0x2E +#define MODEL_kumo 0x2D +#define MODEL_o454 0x2C +#define MODEL_dai_03 0x2B +#define MODEL_piko7 0x2A +#define MODEL_piko6 0x29 +#define MODEL_piko3 0x28 +#define MODEL_piko2 0x27 +#define MODEL_piko1 0x26 +#define MODEL_piko5 0x25 +#define MODEL_piko4 0x24 +#define MODEL_o422 0x23 +#define MODEL_o420 0x22 +#define MODEL_o419 0x21 +#define MODEL_g91 0x20 +#define MODEL_o415 0x1F +#define MODEL_o414 0x1E +#define MODEL_o413 0x1D +#define MODEL_o412 0x1C +#define MODEL_dai 0x1B +#define MODEL_miti 0x1A +#define MODEL_waku1 0x19 +#define MODEL_yuka 0x18 +#define MODEL_o411 0x17 +#define MODEL_g49 0x16 +#define MODEL_waku2 0x15 +#define MODEL_o430 0x14 +#define MODEL_o429 0x13 +#define MODEL_o452 0x12 +#define MODEL_o438 0x11 +#define MODEL_lever 0x10 +#define MODEL_o440 0xF +#define MODEL_o453 0xE +#define MODEL_ki1 0xD +#define MODEL_ki2 0xC +#define MODEL_g101 0xB +#define MODEL_o458 0xA +#define MODEL_o457 0x9 +#define MODEL_o456 0x8 +#define MODEL_o455 0x7 +#define MODEL_waku 0x6 +#define MODEL_yuka2 0x5 +#define MODEL_toge2 0x4 +#define MODEL_toge1 0x3 +#define MODEL_turu3 0x2 +#define MODEL_turuu2 0x1 +#define MODEL_turu1 0x0 + diff --git a/include/mapfs/flo_bt04_hit.h b/include/mapfs/flo_bt04_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/flo_bt04_hit.h +++ b/include/mapfs/flo_bt04_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/flo_bt04_shape.h b/include/mapfs/flo_bt04_shape.h index b1286d6e15..a00104c29b 100644 --- a/include/mapfs/flo_bt04_shape.h +++ b/include/mapfs/flo_bt04_shape.h @@ -1,45 +1,46 @@ -#define MODEL_Root 0x2C -#define MODEL_g91 0x2B -#define MODEL_g100 0x2A -#define MODEL_o440 0x29 -#define MODEL_o439 0x28 -#define MODEL_o438 0x27 -#define MODEL_o437 0x26 -#define MODEL_g99 0x25 -#define MODEL_o436 0x24 -#define MODEL_o435 0x23 -#define MODEL_o434 0x22 -#define MODEL_o433 0x21 -#define MODEL_o432 0x20 -#define MODEL_o431 0x1F -#define MODEL_o430 0x1E -#define MODEL_o429 0x1D -#define MODEL_o428 0x1C -#define MODEL_o427 0x1B -#define MODEL_g96 0x1A -#define MODEL_o419 0x19 -#define MODEL_o418 0x18 -#define MODEL_o417 0x17 -#define MODEL_o416 0x16 -#define MODEL_poyo4 0x15 -#define MODEL_o415 0x14 -#define MODEL_poyo3 0x13 -#define MODEL_o414 0x12 -#define MODEL_poyo2 0x11 -#define MODEL_o413 0x10 -#define MODEL_poyo1 0xF -#define MODEL_o412 0xE -#define MODEL_dai 0xD -#define MODEL_waku1 0xC -#define MODEL_g49 0xB -#define MODEL_waku2 0xA -#define MODEL_waku 0x9 -#define MODEL_b 0x8 -#define MODEL_g103 0x7 -#define MODEL_b1_3 0x6 -#define MODEL_b1_2 0x5 -#define MODEL_b1_1 0x4 -#define MODEL_b3 0x3 -#define MODEL_g102 0x2 -#define MODEL_b2_1 0x1 -#define MODEL_b2_2 0x0 +#define MODEL_Root 0x2C +#define MODEL_g91 0x2B +#define MODEL_g100 0x2A +#define MODEL_o440 0x29 +#define MODEL_o439 0x28 +#define MODEL_o438 0x27 +#define MODEL_o437 0x26 +#define MODEL_g99 0x25 +#define MODEL_o436 0x24 +#define MODEL_o435 0x23 +#define MODEL_o434 0x22 +#define MODEL_o433 0x21 +#define MODEL_o432 0x20 +#define MODEL_o431 0x1F +#define MODEL_o430 0x1E +#define MODEL_o429 0x1D +#define MODEL_o428 0x1C +#define MODEL_o427 0x1B +#define MODEL_g96 0x1A +#define MODEL_o419 0x19 +#define MODEL_o418 0x18 +#define MODEL_o417 0x17 +#define MODEL_o416 0x16 +#define MODEL_poyo4 0x15 +#define MODEL_o415 0x14 +#define MODEL_poyo3 0x13 +#define MODEL_o414 0x12 +#define MODEL_poyo2 0x11 +#define MODEL_o413 0x10 +#define MODEL_poyo1 0xF +#define MODEL_o412 0xE +#define MODEL_dai 0xD +#define MODEL_waku1 0xC +#define MODEL_g49 0xB +#define MODEL_waku2 0xA +#define MODEL_waku 0x9 +#define MODEL_b 0x8 +#define MODEL_g103 0x7 +#define MODEL_b1_3 0x6 +#define MODEL_b1_2 0x5 +#define MODEL_b1_1 0x4 +#define MODEL_b3 0x3 +#define MODEL_g102 0x2 +#define MODEL_b2_1 0x1 +#define MODEL_b2_2 0x0 + diff --git a/include/mapfs/flo_bt05_hit.h b/include/mapfs/flo_bt05_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/flo_bt05_hit.h +++ b/include/mapfs/flo_bt05_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/flo_bt05_shape.h b/include/mapfs/flo_bt05_shape.h index 7fabd151ea..0a90fca7cd 100644 --- a/include/mapfs/flo_bt05_shape.h +++ b/include/mapfs/flo_bt05_shape.h @@ -1,18 +1,19 @@ -#define MODEL_Root 0x11 -#define MODEL_dai 0x10 -#define MODEL_o422 0xF -#define MODEL_o421 0xE -#define MODEL_waku1 0xD -#define MODEL_yuka 0xC -#define MODEL_g49 0xB -#define MODEL_waku2 0xA -#define MODEL_kabe5 0x9 -#define MODEL_kabe4 0x8 -#define MODEL_kabe3 0x7 -#define MODEL_kabe2 0x6 -#define MODEL_dokan2 0x5 -#define MODEL_kabe1 0x4 -#define MODEL_kabe0 0x3 -#define MODEL_yuka2 0x2 -#define MODEL_dokan1 0x1 -#define MODEL_waku 0x0 +#define MODEL_Root 0x11 +#define MODEL_dai 0x10 +#define MODEL_o422 0xF +#define MODEL_o421 0xE +#define MODEL_waku1 0xD +#define MODEL_yuka 0xC +#define MODEL_g49 0xB +#define MODEL_waku2 0xA +#define MODEL_kabe5 0x9 +#define MODEL_kabe4 0x8 +#define MODEL_kabe3 0x7 +#define MODEL_kabe2 0x6 +#define MODEL_dokan2 0x5 +#define MODEL_kabe1 0x4 +#define MODEL_kabe0 0x3 +#define MODEL_yuka2 0x2 +#define MODEL_dokan1 0x1 +#define MODEL_waku 0x0 + diff --git a/include/mapfs/flo_bt06_hit.h b/include/mapfs/flo_bt06_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/flo_bt06_hit.h +++ b/include/mapfs/flo_bt06_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/flo_bt06_shape.h b/include/mapfs/flo_bt06_shape.h index d2be3f1f7d..631b427ff3 100644 --- a/include/mapfs/flo_bt06_shape.h +++ b/include/mapfs/flo_bt06_shape.h @@ -1,28 +1,29 @@ -#define MODEL_Root 0x1B -#define MODEL_dai 0x1A -#define MODEL_o437 0x19 -#define MODEL_o436 0x18 -#define MODEL_g99 0x17 -#define MODEL_o435 0x16 -#define MODEL_o433 0x15 -#define MODEL_o431 0x14 -#define MODEL_o429 0x13 -#define MODEL_g97 0x12 -#define MODEL_o427 0x11 -#define MODEL_o425 0x10 -#define MODEL_o423 0xF -#define MODEL_o421 0xE -#define MODEL_waku1 0xD -#define MODEL_g49 0xC -#define MODEL_waku2 0xB -#define MODEL_waku 0xA -#define MODEL_g98 0x9 -#define MODEL_o434 0x8 -#define MODEL_o432 0x7 -#define MODEL_o430 0x6 -#define MODEL_o428 0x5 -#define MODEL_g96 0x4 -#define MODEL_o426 0x3 -#define MODEL_o424 0x2 -#define MODEL_o422 0x1 -#define MODEL_o420 0x0 +#define MODEL_Root 0x1B +#define MODEL_dai 0x1A +#define MODEL_o437 0x19 +#define MODEL_o436 0x18 +#define MODEL_g99 0x17 +#define MODEL_o435 0x16 +#define MODEL_o433 0x15 +#define MODEL_o431 0x14 +#define MODEL_o429 0x13 +#define MODEL_g97 0x12 +#define MODEL_o427 0x11 +#define MODEL_o425 0x10 +#define MODEL_o423 0xF +#define MODEL_o421 0xE +#define MODEL_waku1 0xD +#define MODEL_g49 0xC +#define MODEL_waku2 0xB +#define MODEL_waku 0xA +#define MODEL_g98 0x9 +#define MODEL_o434 0x8 +#define MODEL_o432 0x7 +#define MODEL_o430 0x6 +#define MODEL_o428 0x5 +#define MODEL_g96 0x4 +#define MODEL_o426 0x3 +#define MODEL_o424 0x2 +#define MODEL_o422 0x1 +#define MODEL_o420 0x0 + diff --git a/include/mapfs/gv_01_hit.h b/include/mapfs/gv_01_hit.h index f52f5ed074..7b1b6699c9 100644 --- a/include/mapfs/gv_01_hit.h +++ b/include/mapfs/gv_01_hit.h @@ -1,3 +1,8 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_en 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_en 0x0 + +#define ZONE_Root 0x2 +#define ZONE_dai 0x1 +#define ZONE_en 0x0 + diff --git a/include/mapfs/gv_01_shape.h b/include/mapfs/gv_01_shape.h index 0ed57b1425..a325b4254f 100644 --- a/include/mapfs/gv_01_shape.h +++ b/include/mapfs/gv_01_shape.h @@ -1,20 +1,21 @@ -#define MODEL_Root 0x13 -#define MODEL_r 0x12 -#define MODEL_o269 0x11 -#define MODEL_e2 0x10 -#define MODEL_o268 0xF -#define MODEL_v 0xE -#define MODEL_o267 0xD -#define MODEL_o 0xC -#define MODEL_o266 0xB -#define MODEL_e 0xA -#define MODEL_o265 0x9 -#define MODEL_m 0x8 -#define MODEL_o264 0x7 -#define MODEL_a 0x6 -#define MODEL_o262 0x5 -#define MODEL_g 0x4 -#define MODEL_o263 0x3 -#define MODEL_dai 0x2 -#define MODEL_hikari 0x1 -#define MODEL_en 0x0 +#define MODEL_Root 0x13 +#define MODEL_r 0x12 +#define MODEL_o269 0x11 +#define MODEL_e2 0x10 +#define MODEL_o268 0xF +#define MODEL_v 0xE +#define MODEL_o267 0xD +#define MODEL_o 0xC +#define MODEL_o266 0xB +#define MODEL_e 0xA +#define MODEL_o265 0x9 +#define MODEL_m 0x8 +#define MODEL_o264 0x7 +#define MODEL_a 0x6 +#define MODEL_o262 0x5 +#define MODEL_g 0x4 +#define MODEL_o263 0x3 +#define MODEL_dai 0x2 +#define MODEL_hikari 0x1 +#define MODEL_en 0x0 + diff --git a/include/mapfs/hos_00_hit.h b/include/mapfs/hos_00_hit.h index 89f297cdb1..4c2b672e60 100644 --- a/include/mapfs/hos_00_hit.h +++ b/include/mapfs/hos_00_hit.h @@ -1,32 +1,39 @@ -#define COLLIDER_Root 0x1F -#define COLLIDER_g202 0x1E -#define COLLIDER_g237 0x1D -#define COLLIDER_o475 0x1C -#define COLLIDER_o434 0x1B -#define COLLIDER_o468 0x1A -#define COLLIDER_o469 0x19 -#define COLLIDER_o432 0x18 -#define COLLIDER_o431 0x17 -#define COLLIDER_g236 0x16 -#define COLLIDER_o447 0x15 -#define COLLIDER_g235 0x14 -#define COLLIDER_o474 0x13 -#define COLLIDER_o473 0x12 -#define COLLIDER_o429 0x11 -#define COLLIDER_o465 0x10 -#define COLLIDER_o463 0xF -#define COLLIDER_o466 0xE -#define COLLIDER_o464 0xD -#define COLLIDER_g201 0xC -#define COLLIDER_g91 0xB -#define COLLIDER_o261 0xA -#define COLLIDER_deilitse 0x9 -#define COLLIDER_deilise 0x8 -#define COLLIDER_g90 0x7 -#define COLLIDER_o263 0x6 -#define COLLIDER_deilitne 0x5 -#define COLLIDER_deiline 0x4 -#define COLLIDER_g119 0x3 -#define COLLIDER_o265 0x2 -#define COLLIDER_deilitw 0x1 -#define COLLIDER_deiliw 0x0 +#define COLLIDER_Root 0x1F +#define COLLIDER_g202 0x1E +#define COLLIDER_g237 0x1D +#define COLLIDER_o475 0x1C +#define COLLIDER_o434 0x1B +#define COLLIDER_o468 0x1A +#define COLLIDER_o469 0x19 +#define COLLIDER_o432 0x18 +#define COLLIDER_o431 0x17 +#define COLLIDER_g236 0x16 +#define COLLIDER_o447 0x15 +#define COLLIDER_g235 0x14 +#define COLLIDER_o474 0x13 +#define COLLIDER_o473 0x12 +#define COLLIDER_o429 0x11 +#define COLLIDER_o465 0x10 +#define COLLIDER_o463 0xF +#define COLLIDER_o466 0xE +#define COLLIDER_o464 0xD +#define COLLIDER_g201 0xC +#define COLLIDER_g91 0xB +#define COLLIDER_o261 0xA +#define COLLIDER_deilitse 0x9 +#define COLLIDER_deilise 0x8 +#define COLLIDER_g90 0x7 +#define COLLIDER_o263 0x6 +#define COLLIDER_deilitne 0x5 +#define COLLIDER_deiline 0x4 +#define COLLIDER_g119 0x3 +#define COLLIDER_o265 0x2 +#define COLLIDER_deilitw 0x1 +#define COLLIDER_deiliw 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g124 0x3 +#define ZONE_o253 0x2 +#define ZONE_o254 0x1 +#define ZONE_o252 0x0 + diff --git a/include/mapfs/hos_00_shape.h b/include/mapfs/hos_00_shape.h index 0bf5f1e001..ce03543a99 100644 --- a/include/mapfs/hos_00_shape.h +++ b/include/mapfs/hos_00_shape.h @@ -1,65 +1,66 @@ -#define MODEL_Root 0x40 -#define MODEL_g117 0x3F -#define MODEL_g123 0x3E -#define MODEL_g126 0x3D -#define MODEL_o294 0x3C -#define MODEL_g119 0x3B -#define MODEL_o278 0x3A -#define MODEL_o277 0x39 -#define MODEL_o276 0x38 -#define MODEL_g118 0x37 -#define MODEL_o275 0x36 -#define MODEL_o274 0x35 -#define MODEL_o273 0x34 -#define MODEL_g121 0x33 -#define MODEL_o284 0x32 -#define MODEL_o283 0x31 -#define MODEL_o282 0x30 -#define MODEL_g120 0x2F -#define MODEL_o272 0x2E -#define MODEL_o271 0x2D -#define MODEL_o270 0x2C -#define MODEL_g108 0x2B -#define MODEL_o231 0x2A -#define MODEL_o279 0x29 -#define MODEL_o255 0x28 -#define MODEL_g106 0x27 -#define MODEL_o230 0x26 -#define MODEL_o225 0x25 -#define MODEL_o224 0x24 -#define MODEL_o223 0x23 -#define MODEL_g99 0x22 -#define MODEL_g105 0x21 -#define MODEL_o216 0x20 -#define MODEL_o215 0x1F -#define MODEL_o214 0x1E -#define MODEL_o211 0x1D -#define MODEL_o212 0x1C -#define MODEL_o220 0x1B -#define MODEL_g111 0x1A -#define MODEL_o265 0x19 -#define MODEL_o288 0x18 -#define MODEL_o261 0x17 -#define MODEL_g104 0x16 -#define MODEL_o289 0x15 -#define MODEL_o242 0x14 -#define MODEL_o243 0x13 -#define MODEL_o237 0x12 -#define MODEL_o244 0x11 -#define MODEL_o239 0x10 -#define MODEL_o219 0xF -#define MODEL_o218 0xE -#define MODEL_o217 0xD -#define MODEL_o221 0xC -#define MODEL_g122 0xB -#define MODEL_g84 0xA -#define MODEL_o163 0x9 -#define MODEL_o162 0x8 -#define MODEL_g83 0x7 -#define MODEL_o161 0x6 -#define MODEL_o160 0x5 -#define MODEL_g78 0x4 -#define MODEL_o80 0x3 -#define MODEL_o78 0x2 -#define MODEL_g107 0x1 -#define MODEL_o285 0x0 +#define MODEL_Root 0x40 +#define MODEL_g117 0x3F +#define MODEL_g123 0x3E +#define MODEL_g126 0x3D +#define MODEL_o294 0x3C +#define MODEL_g119 0x3B +#define MODEL_o278 0x3A +#define MODEL_o277 0x39 +#define MODEL_o276 0x38 +#define MODEL_g118 0x37 +#define MODEL_o275 0x36 +#define MODEL_o274 0x35 +#define MODEL_o273 0x34 +#define MODEL_g121 0x33 +#define MODEL_o284 0x32 +#define MODEL_o283 0x31 +#define MODEL_o282 0x30 +#define MODEL_g120 0x2F +#define MODEL_o272 0x2E +#define MODEL_o271 0x2D +#define MODEL_o270 0x2C +#define MODEL_g108 0x2B +#define MODEL_o231 0x2A +#define MODEL_o279 0x29 +#define MODEL_o255 0x28 +#define MODEL_g106 0x27 +#define MODEL_o230 0x26 +#define MODEL_o225 0x25 +#define MODEL_o224 0x24 +#define MODEL_o223 0x23 +#define MODEL_g99 0x22 +#define MODEL_g105 0x21 +#define MODEL_o216 0x20 +#define MODEL_o215 0x1F +#define MODEL_o214 0x1E +#define MODEL_o211 0x1D +#define MODEL_o212 0x1C +#define MODEL_o220 0x1B +#define MODEL_g111 0x1A +#define MODEL_o265 0x19 +#define MODEL_o288 0x18 +#define MODEL_o261 0x17 +#define MODEL_g104 0x16 +#define MODEL_o289 0x15 +#define MODEL_o242 0x14 +#define MODEL_o243 0x13 +#define MODEL_o237 0x12 +#define MODEL_o244 0x11 +#define MODEL_o239 0x10 +#define MODEL_o219 0xF +#define MODEL_o218 0xE +#define MODEL_o217 0xD +#define MODEL_o221 0xC +#define MODEL_g122 0xB +#define MODEL_g84 0xA +#define MODEL_o163 0x9 +#define MODEL_o162 0x8 +#define MODEL_g83 0x7 +#define MODEL_o161 0x6 +#define MODEL_o160 0x5 +#define MODEL_g78 0x4 +#define MODEL_o80 0x3 +#define MODEL_o78 0x2 +#define MODEL_g107 0x1 +#define MODEL_o285 0x0 + diff --git a/include/mapfs/hos_01_hit.h b/include/mapfs/hos_01_hit.h index 0d0cd11a80..3b830cf1cb 100644 --- a/include/mapfs/hos_01_hit.h +++ b/include/mapfs/hos_01_hit.h @@ -1,47 +1,58 @@ -#define COLLIDER_Root 0x2E -#define COLLIDER_g1 0x2D -#define COLLIDER_g52 0x2C -#define COLLIDER_o230 0x2B -#define COLLIDER_o229 0x2A -#define COLLIDER_o228 0x29 -#define COLLIDER_o227 0x28 -#define COLLIDER_o226 0x27 -#define COLLIDER_o225 0x26 -#define COLLIDER_g32 0x25 -#define COLLIDER_o269 0x24 -#define COLLIDER_o268 0x23 -#define COLLIDER_o168 0x22 -#define COLLIDER_o167 0x21 -#define COLLIDER_g17 0x20 -#define COLLIDER_g20 0x1F -#define COLLIDER_o267 0x1E -#define COLLIDER_o266 0x1D -#define COLLIDER_o238 0x1C -#define COLLIDER_g58 0x1B -#define COLLIDER_o254 0x1A -#define COLLIDER_o253 0x19 -#define COLLIDER_o243 0x18 -#define COLLIDER_g55 0x17 -#define COLLIDER_o260 0x16 -#define COLLIDER_o252 0x15 -#define COLLIDER_o258 0x14 -#define COLLIDER_o259 0x13 -#define COLLIDER_o240 0x12 -#define COLLIDER_g38 0x11 -#define COLLIDER_o234 0x10 -#define COLLIDER_o183 0xF -#define COLLIDER_o180 0xE -#define COLLIDER_g2 0xD -#define COLLIDER_o265 0xC -#define COLLIDER_o264 0xB -#define COLLIDER_o263 0xA -#define COLLIDER_o257 0x9 -#define COLLIDER_o7 0x8 -#define COLLIDER_o122 0x7 -#define COLLIDER_g53 0x6 -#define COLLIDER_g54 0x5 -#define COLLIDER_deilin 0x4 -#define COLLIDER_g21 0x3 -#define COLLIDER_o127 0x2 -#define COLLIDER_deilitsw 0x1 -#define COLLIDER_deilisw 0x0 +#define COLLIDER_Root 0x2E +#define COLLIDER_g1 0x2D +#define COLLIDER_g52 0x2C +#define COLLIDER_o230 0x2B +#define COLLIDER_o229 0x2A +#define COLLIDER_o228 0x29 +#define COLLIDER_o227 0x28 +#define COLLIDER_o226 0x27 +#define COLLIDER_o225 0x26 +#define COLLIDER_g32 0x25 +#define COLLIDER_o269 0x24 +#define COLLIDER_o268 0x23 +#define COLLIDER_o168 0x22 +#define COLLIDER_o167 0x21 +#define COLLIDER_g17 0x20 +#define COLLIDER_g20 0x1F +#define COLLIDER_o267 0x1E +#define COLLIDER_o266 0x1D +#define COLLIDER_o238 0x1C +#define COLLIDER_g58 0x1B +#define COLLIDER_o254 0x1A +#define COLLIDER_o253 0x19 +#define COLLIDER_o243 0x18 +#define COLLIDER_g55 0x17 +#define COLLIDER_o260 0x16 +#define COLLIDER_o252 0x15 +#define COLLIDER_o258 0x14 +#define COLLIDER_o259 0x13 +#define COLLIDER_o240 0x12 +#define COLLIDER_g38 0x11 +#define COLLIDER_o234 0x10 +#define COLLIDER_o183 0xF +#define COLLIDER_o180 0xE +#define COLLIDER_g2 0xD +#define COLLIDER_o265 0xC +#define COLLIDER_o264 0xB +#define COLLIDER_o263 0xA +#define COLLIDER_o257 0x9 +#define COLLIDER_o7 0x8 +#define COLLIDER_o122 0x7 +#define COLLIDER_g53 0x6 +#define COLLIDER_g54 0x5 +#define COLLIDER_deilin 0x4 +#define COLLIDER_g21 0x3 +#define COLLIDER_o127 0x2 +#define COLLIDER_deilitsw 0x1 +#define COLLIDER_deilisw 0x0 + +#define ZONE_Root 0x8 +#define ZONE_g1 0x7 +#define ZONE_g18 0x6 +#define ZONE_o158 0x5 +#define ZONE_o119 0x4 +#define ZONE_g2 0x3 +#define ZONE_o151 0x2 +#define ZONE_o122 0x1 +#define ZONE_o1 0x0 + diff --git a/include/mapfs/hos_01_shape.h b/include/mapfs/hos_01_shape.h index 160807e604..5cdce8965c 100644 --- a/include/mapfs/hos_01_shape.h +++ b/include/mapfs/hos_01_shape.h @@ -1,95 +1,96 @@ -#define MODEL_Root 0x5E -#define MODEL_g1 0x5D -#define MODEL_g61 0x5C -#define MODEL_group_entry 0x5B -#define MODEL_7 0x5A -#define MODEL_6 0x59 -#define MODEL_5 0x58 -#define MODEL_4 0x57 -#define MODEL_3 0x56 -#define MODEL_2 0x55 -#define MODEL_1 0x54 -#define MODEL_power 0x53 -#define MODEL_stage 0x52 -#define MODEL_star_mark 0x51 -#define MODEL_o302 0x50 -#define MODEL_g44 0x4F -#define MODEL_o337 0x4E -#define MODEL_g56 0x4D -#define MODEL_o261 0x4C -#define MODEL_o260 0x4B -#define MODEL_o259 0x4A -#define MODEL_g55 0x49 -#define MODEL_o258 0x48 -#define MODEL_o257 0x47 -#define MODEL_o256 0x46 -#define MODEL_g54 0x45 -#define MODEL_o255 0x44 -#define MODEL_o254 0x43 -#define MODEL_o253 0x42 -#define MODEL_g53 0x41 -#define MODEL_o252 0x40 -#define MODEL_o251 0x3F -#define MODEL_o250 0x3E -#define MODEL_g52 0x3D -#define MODEL_o249 0x3C -#define MODEL_o248 0x3B -#define MODEL_o247 0x3A -#define MODEL_g51 0x39 -#define MODEL_o246 0x38 -#define MODEL_o245 0x37 -#define MODEL_o244 0x36 -#define MODEL_g50 0x35 -#define MODEL_o243 0x34 -#define MODEL_o242 0x33 -#define MODEL_o241 0x32 -#define MODEL_g49 0x31 -#define MODEL_o240 0x30 -#define MODEL_o239 0x2F -#define MODEL_o238 0x2E -#define MODEL_g48 0x2D -#define MODEL_o237 0x2C -#define MODEL_o236 0x2B -#define MODEL_o235 0x2A -#define MODEL_g47 0x29 -#define MODEL_o234 0x28 -#define MODEL_o233 0x27 -#define MODEL_o232 0x26 -#define MODEL_g46 0x25 -#define MODEL_o231 0x24 -#define MODEL_o230 0x23 -#define MODEL_o229 0x22 -#define MODEL_g45 0x21 -#define MODEL_o228 0x20 -#define MODEL_o227 0x1F -#define MODEL_o226 0x1E -#define MODEL_hosi 0x1D -#define MODEL_o164 0x1C -#define MODEL_o163 0x1B -#define MODEL_o162 0x1A -#define MODEL_o161 0x19 -#define MODEL_o156 0x18 -#define MODEL_g17 0x17 -#define MODEL_g38 0x16 -#define MODEL_o212 0x15 -#define MODEL_o211 0x14 -#define MODEL_o210 0x13 -#define MODEL_g37 0x12 -#define MODEL_o334 0x11 -#define MODEL_o333 0x10 -#define MODEL_o332 0xF -#define MODEL_o331 0xE -#define MODEL_o209 0xD -#define MODEL_o208 0xC -#define MODEL_o207 0xB -#define MODEL_g32 0xA -#define MODEL_o182 0x9 -#define MODEL_o336 0x8 -#define MODEL_o180 0x7 -#define MODEL_o179 0x6 -#define MODEL_o178 0x5 -#define MODEL_o122 0x4 -#define MODEL_g2 0x3 -#define MODEL_o7 0x2 -#define MODEL_o1 0x1 -#define MODEL_o4 0x0 +#define MODEL_Root 0x5E +#define MODEL_g1 0x5D +#define MODEL_g61 0x5C +#define MODEL_group_entry 0x5B +#define MODEL_7 0x5A +#define MODEL_6 0x59 +#define MODEL_5 0x58 +#define MODEL_4 0x57 +#define MODEL_3 0x56 +#define MODEL_2 0x55 +#define MODEL_1 0x54 +#define MODEL_power 0x53 +#define MODEL_stage 0x52 +#define MODEL_star_mark 0x51 +#define MODEL_o302 0x50 +#define MODEL_g44 0x4F +#define MODEL_o337 0x4E +#define MODEL_g56 0x4D +#define MODEL_o261 0x4C +#define MODEL_o260 0x4B +#define MODEL_o259 0x4A +#define MODEL_g55 0x49 +#define MODEL_o258 0x48 +#define MODEL_o257 0x47 +#define MODEL_o256 0x46 +#define MODEL_g54 0x45 +#define MODEL_o255 0x44 +#define MODEL_o254 0x43 +#define MODEL_o253 0x42 +#define MODEL_g53 0x41 +#define MODEL_o252 0x40 +#define MODEL_o251 0x3F +#define MODEL_o250 0x3E +#define MODEL_g52 0x3D +#define MODEL_o249 0x3C +#define MODEL_o248 0x3B +#define MODEL_o247 0x3A +#define MODEL_g51 0x39 +#define MODEL_o246 0x38 +#define MODEL_o245 0x37 +#define MODEL_o244 0x36 +#define MODEL_g50 0x35 +#define MODEL_o243 0x34 +#define MODEL_o242 0x33 +#define MODEL_o241 0x32 +#define MODEL_g49 0x31 +#define MODEL_o240 0x30 +#define MODEL_o239 0x2F +#define MODEL_o238 0x2E +#define MODEL_g48 0x2D +#define MODEL_o237 0x2C +#define MODEL_o236 0x2B +#define MODEL_o235 0x2A +#define MODEL_g47 0x29 +#define MODEL_o234 0x28 +#define MODEL_o233 0x27 +#define MODEL_o232 0x26 +#define MODEL_g46 0x25 +#define MODEL_o231 0x24 +#define MODEL_o230 0x23 +#define MODEL_o229 0x22 +#define MODEL_g45 0x21 +#define MODEL_o228 0x20 +#define MODEL_o227 0x1F +#define MODEL_o226 0x1E +#define MODEL_hosi 0x1D +#define MODEL_o164 0x1C +#define MODEL_o163 0x1B +#define MODEL_o162 0x1A +#define MODEL_o161 0x19 +#define MODEL_o156 0x18 +#define MODEL_g17 0x17 +#define MODEL_g38 0x16 +#define MODEL_o212 0x15 +#define MODEL_o211 0x14 +#define MODEL_o210 0x13 +#define MODEL_g37 0x12 +#define MODEL_o334 0x11 +#define MODEL_o333 0x10 +#define MODEL_o332 0xF +#define MODEL_o331 0xE +#define MODEL_o209 0xD +#define MODEL_o208 0xC +#define MODEL_o207 0xB +#define MODEL_g32 0xA +#define MODEL_o182 0x9 +#define MODEL_o336 0x8 +#define MODEL_o180 0x7 +#define MODEL_o179 0x6 +#define MODEL_o178 0x5 +#define MODEL_o122 0x4 +#define MODEL_g2 0x3 +#define MODEL_o7 0x2 +#define MODEL_o1 0x1 +#define MODEL_o4 0x0 + diff --git a/include/mapfs/hos_02_hit.h b/include/mapfs/hos_02_hit.h index 669b0b3bf7..606680f8f8 100644 --- a/include/mapfs/hos_02_hit.h +++ b/include/mapfs/hos_02_hit.h @@ -1,20 +1,28 @@ -#define COLLIDER_Root 0x13 -#define COLLIDER_g138 0x12 -#define COLLIDER_g143 0x11 -#define COLLIDER_o434 0x10 -#define COLLIDER_o433 0xF -#define COLLIDER_g141 0xE -#define COLLIDER_o436 0xD -#define COLLIDER_o435 0xC -#define COLLIDER_o432 0xB -#define COLLIDER_o431 0xA -#define COLLIDER_o430 0x9 -#define COLLIDER_o428 0x8 -#define COLLIDER_o427 0x7 -#define COLLIDER_o417 0x6 -#define COLLIDER_g140 0x5 -#define COLLIDER_o414 0x4 -#define COLLIDER_deilite 0x3 -#define COLLIDER_deilie 0x2 -#define COLLIDER_g139 0x1 -#define COLLIDER_deiliw 0x0 +#define COLLIDER_Root 0x13 +#define COLLIDER_g138 0x12 +#define COLLIDER_g143 0x11 +#define COLLIDER_o434 0x10 +#define COLLIDER_o433 0xF +#define COLLIDER_g141 0xE +#define COLLIDER_o436 0xD +#define COLLIDER_o435 0xC +#define COLLIDER_o432 0xB +#define COLLIDER_o431 0xA +#define COLLIDER_o430 0x9 +#define COLLIDER_o428 0x8 +#define COLLIDER_o427 0x7 +#define COLLIDER_o417 0x6 +#define COLLIDER_g140 0x5 +#define COLLIDER_o414 0x4 +#define COLLIDER_deilite 0x3 +#define COLLIDER_deilie 0x2 +#define COLLIDER_g139 0x1 +#define COLLIDER_deiliw 0x0 + +#define ZONE_Root 0x5 +#define ZONE_g132 0x4 +#define ZONE_o407 0x3 +#define ZONE_o400 0x2 +#define ZONE_o403 0x1 +#define ZONE_o402 0x0 + diff --git a/include/mapfs/hos_02_shape.h b/include/mapfs/hos_02_shape.h index c4525e4b54..77b6895d9c 100644 --- a/include/mapfs/hos_02_shape.h +++ b/include/mapfs/hos_02_shape.h @@ -1,97 +1,98 @@ -#define MODEL_Root 0x60 -#define MODEL_g182 0x5F -#define MODEL_g199 0x5E -#define MODEL_g190 0x5D -#define MODEL_o540 0x5C -#define MODEL_g188 0x5B -#define MODEL_o539 0x5A -#define MODEL_g198 0x59 -#define MODEL_o548 0x58 -#define MODEL_g197 0x57 -#define MODEL_o547 0x56 -#define MODEL_g196 0x55 -#define MODEL_o546 0x54 -#define MODEL_g195 0x53 -#define MODEL_o545 0x52 -#define MODEL_g194 0x51 -#define MODEL_o544 0x50 -#define MODEL_g193 0x4F -#define MODEL_o543 0x4E -#define MODEL_g192 0x4D -#define MODEL_o542 0x4C -#define MODEL_g191 0x4B -#define MODEL_o541 0x4A -#define MODEL_g163 0x49 -#define MODEL_o472 0x48 -#define MODEL_g162 0x47 -#define MODEL_o471 0x46 -#define MODEL_g161 0x45 -#define MODEL_o470 0x44 -#define MODEL_g160 0x43 -#define MODEL_o469 0x42 -#define MODEL_g159 0x41 -#define MODEL_o468 0x40 -#define MODEL_g158 0x3F -#define MODEL_o467 0x3E -#define MODEL_g157 0x3D -#define MODEL_o466 0x3C -#define MODEL_g164 0x3B -#define MODEL_g175 0x3A -#define MODEL_g179 0x39 -#define MODEL_o348 0x38 -#define MODEL_g178 0x37 -#define MODEL_o347 0x36 -#define MODEL_g177 0x35 -#define MODEL_o458 0x34 -#define MODEL_o457 0x33 -#define MODEL_o456 0x32 -#define MODEL_g176 0x31 -#define MODEL_o465 0x30 -#define MODEL_o464 0x2F -#define MODEL_o463 0x2E -#define MODEL_o462 0x2D -#define MODEL_o461 0x2C -#define MODEL_o460 0x2B -#define MODEL_o459 0x2A -#define MODEL_g170 0x29 -#define MODEL_g174 0x28 -#define MODEL_o398 0x27 -#define MODEL_g173 0x26 -#define MODEL_o399 0x25 -#define MODEL_g172 0x24 -#define MODEL_o448 0x23 -#define MODEL_o447 0x22 -#define MODEL_o446 0x21 -#define MODEL_g171 0x20 -#define MODEL_o455 0x1F -#define MODEL_o454 0x1E -#define MODEL_o453 0x1D -#define MODEL_o452 0x1C -#define MODEL_o451 0x1B -#define MODEL_o450 0x1A -#define MODEL_o449 0x19 -#define MODEL_g165 0x18 -#define MODEL_g169 0x17 -#define MODEL_o415 0x16 -#define MODEL_g168 0x15 -#define MODEL_o414 0x14 -#define MODEL_g167 0x13 -#define MODEL_o413 0x12 -#define MODEL_o408 0x11 -#define MODEL_o407 0x10 -#define MODEL_g166 0xF -#define MODEL_o424 0xE -#define MODEL_o416 0xD -#define MODEL_o417 0xC -#define MODEL_o419 0xB -#define MODEL_o418 0xA -#define MODEL_o409 0x9 -#define MODEL_o425 0x8 -#define MODEL_g1 0x7 -#define MODEL_o552 0x6 -#define MODEL_o549 0x5 -#define MODEL_o395 0x4 -#define MODEL_g186 0x3 -#define MODEL_g183 0x2 -#define MODEL_o380 0x1 -#define MODEL_o482 0x0 +#define MODEL_Root 0x60 +#define MODEL_g182 0x5F +#define MODEL_g199 0x5E +#define MODEL_g190 0x5D +#define MODEL_o540 0x5C +#define MODEL_g188 0x5B +#define MODEL_o539 0x5A +#define MODEL_g198 0x59 +#define MODEL_o548 0x58 +#define MODEL_g197 0x57 +#define MODEL_o547 0x56 +#define MODEL_g196 0x55 +#define MODEL_o546 0x54 +#define MODEL_g195 0x53 +#define MODEL_o545 0x52 +#define MODEL_g194 0x51 +#define MODEL_o544 0x50 +#define MODEL_g193 0x4F +#define MODEL_o543 0x4E +#define MODEL_g192 0x4D +#define MODEL_o542 0x4C +#define MODEL_g191 0x4B +#define MODEL_o541 0x4A +#define MODEL_g163 0x49 +#define MODEL_o472 0x48 +#define MODEL_g162 0x47 +#define MODEL_o471 0x46 +#define MODEL_g161 0x45 +#define MODEL_o470 0x44 +#define MODEL_g160 0x43 +#define MODEL_o469 0x42 +#define MODEL_g159 0x41 +#define MODEL_o468 0x40 +#define MODEL_g158 0x3F +#define MODEL_o467 0x3E +#define MODEL_g157 0x3D +#define MODEL_o466 0x3C +#define MODEL_g164 0x3B +#define MODEL_g175 0x3A +#define MODEL_g179 0x39 +#define MODEL_o348 0x38 +#define MODEL_g178 0x37 +#define MODEL_o347 0x36 +#define MODEL_g177 0x35 +#define MODEL_o458 0x34 +#define MODEL_o457 0x33 +#define MODEL_o456 0x32 +#define MODEL_g176 0x31 +#define MODEL_o465 0x30 +#define MODEL_o464 0x2F +#define MODEL_o463 0x2E +#define MODEL_o462 0x2D +#define MODEL_o461 0x2C +#define MODEL_o460 0x2B +#define MODEL_o459 0x2A +#define MODEL_g170 0x29 +#define MODEL_g174 0x28 +#define MODEL_o398 0x27 +#define MODEL_g173 0x26 +#define MODEL_o399 0x25 +#define MODEL_g172 0x24 +#define MODEL_o448 0x23 +#define MODEL_o447 0x22 +#define MODEL_o446 0x21 +#define MODEL_g171 0x20 +#define MODEL_o455 0x1F +#define MODEL_o454 0x1E +#define MODEL_o453 0x1D +#define MODEL_o452 0x1C +#define MODEL_o451 0x1B +#define MODEL_o450 0x1A +#define MODEL_o449 0x19 +#define MODEL_g165 0x18 +#define MODEL_g169 0x17 +#define MODEL_o415 0x16 +#define MODEL_g168 0x15 +#define MODEL_o414 0x14 +#define MODEL_g167 0x13 +#define MODEL_o413 0x12 +#define MODEL_o408 0x11 +#define MODEL_o407 0x10 +#define MODEL_g166 0xF +#define MODEL_o424 0xE +#define MODEL_o416 0xD +#define MODEL_o417 0xC +#define MODEL_o419 0xB +#define MODEL_o418 0xA +#define MODEL_o409 0x9 +#define MODEL_o425 0x8 +#define MODEL_g1 0x7 +#define MODEL_o552 0x6 +#define MODEL_o549 0x5 +#define MODEL_o395 0x4 +#define MODEL_g186 0x3 +#define MODEL_g183 0x2 +#define MODEL_o380 0x1 +#define MODEL_o482 0x0 + diff --git a/include/mapfs/hos_03_hit.h b/include/mapfs/hos_03_hit.h index 658a833ea9..d1347d2cdd 100644 --- a/include/mapfs/hos_03_hit.h +++ b/include/mapfs/hos_03_hit.h @@ -1,69 +1,83 @@ -#define COLLIDER_Root 0x44 -#define COLLIDER_g1 0x43 -#define COLLIDER_hana 0x42 -#define COLLIDER_o181 0x41 -#define COLLIDER_o60 0x40 -#define COLLIDER_o63 0x3F -#define COLLIDER_o54 0x3E -#define COLLIDER_ki 0x3D -#define COLLIDER_o32 0x3C -#define COLLIDER_o35 0x3B -#define COLLIDER_g6 0x3A -#define COLLIDER_g50 0x39 -#define COLLIDER_o217 0x38 -#define COLLIDER_o216 0x37 -#define COLLIDER_g71 0x36 -#define COLLIDER_o184 0x35 -#define COLLIDER_o99 0x34 -#define COLLIDER_g39 0x33 -#define COLLIDER_o211 0x32 -#define COLLIDER_g69 0x31 -#define COLLIDER_o208 0x30 -#define COLLIDER_o207 0x2F -#define COLLIDER_o206 0x2E -#define COLLIDER_o205 0x2D -#define COLLIDER_o204 0x2C -#define COLLIDER_o203 0x2B -#define COLLIDER_g70 0x2A -#define COLLIDER_o185 0x29 -#define COLLIDER_o72 0x28 -#define COLLIDER_g30 0x27 -#define COLLIDER_o225 0x26 -#define COLLIDER_o200 0x25 -#define COLLIDER_o199 0x24 -#define COLLIDER_o198 0x23 -#define COLLIDER_o197 0x22 -#define COLLIDER_g68 0x21 -#define COLLIDER_o186 0x20 -#define COLLIDER_o100 0x1F -#define COLLIDER_g34 0x1E -#define COLLIDER_g4 0x1D -#define COLLIDER_o234 0x1C -#define COLLIDER_o224 0x1B -#define COLLIDER_o223 0x1A -#define COLLIDER_o222 0x19 -#define COLLIDER_o221 0x18 -#define COLLIDER_o220 0x17 -#define COLLIDER_o193 0x16 -#define COLLIDER_o213 0x15 -#define COLLIDER_o7 0x14 -#define COLLIDER_o6 0x13 -#define COLLIDER_o194 0x12 -#define COLLIDER_g3 0x11 -#define COLLIDER_o219 0x10 -#define COLLIDER_o195 0xF -#define COLLIDER_o235 0xE -#define COLLIDER_o218 0xD -#define COLLIDER_o18 0xC -#define COLLIDER_g29 0xB -#define COLLIDER_o73 0xA -#define COLLIDER_o71 0x9 -#define COLLIDER_g2 0x8 -#define COLLIDER_g66 0x7 -#define COLLIDER_o2 0x6 -#define COLLIDER_deilite 0x5 -#define COLLIDER_deilie 0x4 -#define COLLIDER_g65 0x3 -#define COLLIDER_o1 0x2 -#define COLLIDER_deilitsw 0x1 -#define COLLIDER_deilisw 0x0 +#define COLLIDER_Root 0x44 +#define COLLIDER_g1 0x43 +#define COLLIDER_hana 0x42 +#define COLLIDER_o181 0x41 +#define COLLIDER_o60 0x40 +#define COLLIDER_o63 0x3F +#define COLLIDER_o54 0x3E +#define COLLIDER_ki 0x3D +#define COLLIDER_o32 0x3C +#define COLLIDER_o35 0x3B +#define COLLIDER_g6 0x3A +#define COLLIDER_g50 0x39 +#define COLLIDER_o217 0x38 +#define COLLIDER_o216 0x37 +#define COLLIDER_g71 0x36 +#define COLLIDER_o184 0x35 +#define COLLIDER_o99 0x34 +#define COLLIDER_g39 0x33 +#define COLLIDER_o211 0x32 +#define COLLIDER_g69 0x31 +#define COLLIDER_o208 0x30 +#define COLLIDER_o207 0x2F +#define COLLIDER_o206 0x2E +#define COLLIDER_o205 0x2D +#define COLLIDER_o204 0x2C +#define COLLIDER_o203 0x2B +#define COLLIDER_g70 0x2A +#define COLLIDER_o185 0x29 +#define COLLIDER_o72 0x28 +#define COLLIDER_g30 0x27 +#define COLLIDER_o225 0x26 +#define COLLIDER_o200 0x25 +#define COLLIDER_o199 0x24 +#define COLLIDER_o198 0x23 +#define COLLIDER_o197 0x22 +#define COLLIDER_g68 0x21 +#define COLLIDER_o186 0x20 +#define COLLIDER_o100 0x1F +#define COLLIDER_g34 0x1E +#define COLLIDER_g4 0x1D +#define COLLIDER_o234 0x1C +#define COLLIDER_o224 0x1B +#define COLLIDER_o223 0x1A +#define COLLIDER_o222 0x19 +#define COLLIDER_o221 0x18 +#define COLLIDER_o220 0x17 +#define COLLIDER_o193 0x16 +#define COLLIDER_o213 0x15 +#define COLLIDER_o7 0x14 +#define COLLIDER_o6 0x13 +#define COLLIDER_o194 0x12 +#define COLLIDER_g3 0x11 +#define COLLIDER_o219 0x10 +#define COLLIDER_o195 0xF +#define COLLIDER_o235 0xE +#define COLLIDER_o218 0xD +#define COLLIDER_o18 0xC +#define COLLIDER_g29 0xB +#define COLLIDER_o73 0xA +#define COLLIDER_o71 0x9 +#define COLLIDER_g2 0x8 +#define COLLIDER_g66 0x7 +#define COLLIDER_o2 0x6 +#define COLLIDER_deilite 0x5 +#define COLLIDER_deilie 0x4 +#define COLLIDER_g65 0x3 +#define COLLIDER_o1 0x2 +#define COLLIDER_deilitsw 0x1 +#define COLLIDER_deilisw 0x0 + +#define ZONE_Root 0xB +#define ZONE_g1 0xA +#define ZONE_g73 0x9 +#define ZONE_o228 0x8 +#define ZONE_o227 0x7 +#define ZONE_o225 0x6 +#define ZONE_o224 0x5 +#define ZONE_o223 0x4 +#define ZONE_g72 0x3 +#define ZONE_o222 0x2 +#define ZONE_o220 0x1 +#define ZONE_o221 0x0 + diff --git a/include/mapfs/hos_03_shape.h b/include/mapfs/hos_03_shape.h index da49583734..240169ad05 100644 --- a/include/mapfs/hos_03_shape.h +++ b/include/mapfs/hos_03_shape.h @@ -1,197 +1,198 @@ -#define MODEL_Root 0xC4 -#define MODEL_g1 0xC3 -#define MODEL_o29 0xC2 -#define MODEL_g61 0xC1 -#define MODEL_o75 0xC0 -#define MODEL_o74 0xBF -#define MODEL_o181 0xBE -#define MODEL_o184 0xBD -#define MODEL_o180 0xBC -#define MODEL_o26 0xBB -#define MODEL_g76 0xBA -#define MODEL_o204 0xB9 -#define MODEL_o201 0xB8 -#define MODEL_o203 0xB7 -#define MODEL_o202 0xB6 -#define MODEL_hana 0xB5 -#define MODEL_g24 0xB4 -#define MODEL_o63 0xB3 -#define MODEL_o62 0xB2 -#define MODEL_o61 0xB1 -#define MODEL_g23 0xB0 -#define MODEL_o60 0xAF -#define MODEL_o59 0xAE -#define MODEL_o58 0xAD -#define MODEL_g22 0xAC -#define MODEL_o57 0xAB -#define MODEL_o56 0xAA -#define MODEL_o55 0xA9 -#define MODEL_g21 0xA8 -#define MODEL_o54 0xA7 -#define MODEL_o53 0xA6 -#define MODEL_o52 0xA5 -#define MODEL_ki 0xA4 -#define MODEL_g16 0xA3 -#define MODEL_g17 0xA2 -#define MODEL_o45 0xA1 -#define MODEL_o44 0xA0 -#define MODEL_o43 0x9F -#define MODEL_o42 0x9E -#define MODEL_o41 0x9D -#define MODEL_o40 0x9C -#define MODEL_g11 0x9B -#define MODEL_g14 0x9A -#define MODEL_o39 0x99 -#define MODEL_o38 0x98 -#define MODEL_o37 0x97 -#define MODEL_o36 0x96 -#define MODEL_o35 0x95 -#define MODEL_o32 0x94 -#define MODEL_sigemi 0x93 -#define MODEL_g27 0x92 -#define MODEL_o68 0x91 -#define MODEL_o71 0x90 -#define MODEL_o22 0x8F -#define MODEL_g26 0x8E -#define MODEL_o69 0x8D -#define MODEL_o70 0x8C -#define MODEL_o21 0x8B -#define MODEL_g25 0x8A -#define MODEL_o67 0x89 -#define MODEL_o66 0x88 -#define MODEL_o65 0x87 -#define MODEL_o64 0x86 -#define MODEL_o23 0x85 -#define MODEL_g6 0x84 -#define MODEL_g50 0x83 -#define MODEL_g67 0x82 -#define MODEL_g73 0x81 -#define MODEL_o190 0x80 -#define MODEL_g72 0x7F -#define MODEL_o193 0x7E -#define MODEL_g71 0x7D -#define MODEL_o192 0x7C -#define MODEL_g54 0x7B -#define MODEL_o174 0x7A -#define MODEL_o173 0x79 -#define MODEL_o172 0x78 -#define MODEL_o171 0x77 -#define MODEL_g51 0x76 -#define MODEL_g75 0x75 -#define MODEL_o197 0x74 -#define MODEL_o196 0x73 -#define MODEL_g74 0x72 -#define MODEL_o195 0x71 -#define MODEL_o194 0x70 -#define MODEL_o157 0x6F -#define MODEL_o160 0x6E -#define MODEL_o159 0x6D -#define MODEL_o158 0x6C -#define MODEL_o156 0x6B -#define MODEL_g53 0x6A -#define MODEL_o170 0x69 -#define MODEL_o169 0x68 -#define MODEL_o168 0x67 -#define MODEL_g52 0x66 -#define MODEL_o167 0x65 -#define MODEL_o166 0x64 -#define MODEL_o165 0x63 -#define MODEL_o164 0x62 -#define MODEL_o163 0x61 -#define MODEL_o162 0x60 -#define MODEL_o161 0x5F -#define MODEL_g39 0x5E -#define MODEL_o209 0x5D -#define MODEL_o208 0x5C -#define MODEL_g63 0x5B -#define MODEL_g66 0x5A -#define MODEL_o188 0x59 -#define MODEL_g65 0x58 -#define MODEL_o187 0x57 -#define MODEL_g64 0x56 -#define MODEL_o186 0x55 -#define MODEL_g42 0x54 -#define MODEL_o137 0x53 -#define MODEL_o136 0x52 -#define MODEL_o135 0x51 -#define MODEL_o134 0x50 -#define MODEL_g43 0x4F -#define MODEL_o141 0x4E -#define MODEL_o140 0x4D -#define MODEL_o139 0x4C -#define MODEL_o138 0x4B -#define MODEL_g40 0x4A -#define MODEL_g62 0x49 -#define MODEL_o145 0x48 -#define MODEL_o182 0x47 -#define MODEL_g46 0x46 -#define MODEL_o144 0x45 -#define MODEL_g45 0x44 -#define MODEL_o126 0x43 -#define MODEL_o125 0x42 -#define MODEL_o124 0x41 -#define MODEL_o123 0x40 -#define MODEL_o122 0x3F -#define MODEL_o121 0x3E -#define MODEL_o127 0x3D -#define MODEL_o132 0x3C -#define MODEL_o133 0x3B -#define MODEL_g30 0x3A -#define MODEL_o207 0x39 -#define MODEL_g57 0x38 -#define MODEL_g33 0x37 -#define MODEL_o95 0x36 -#define MODEL_o91 0x35 -#define MODEL_o90 0x34 -#define MODEL_o87 0x33 -#define MODEL_g58 0x32 -#define MODEL_o177 0x31 -#define MODEL_g56 0x30 -#define MODEL_o176 0x2F -#define MODEL_g55 0x2E -#define MODEL_o175 0x2D -#define MODEL_g49 0x2C -#define MODEL_o155 0x2B -#define MODEL_o154 0x2A -#define MODEL_o153 0x29 -#define MODEL_g47 0x28 -#define MODEL_o206 0x27 -#define MODEL_g48 0x26 -#define MODEL_o152 0x25 -#define MODEL_o151 0x24 -#define MODEL_o147 0x23 -#define MODEL_o146 0x22 -#define MODEL_g31 0x21 -#define MODEL_o81 0x20 -#define MODEL_o80 0x1F -#define MODEL_o79 0x1E -#define MODEL_o78 0x1D -#define MODEL_o77 0x1C -#define MODEL_o100 0x1B -#define MODEL_o4 0x1A -#define MODEL_g34 0x19 -#define MODEL_g29 0x18 -#define MODEL_o73 0x17 -#define MODEL_o72 0x16 -#define MODEL_g7 0x15 -#define MODEL_o16 0x14 -#define MODEL_o15 0x13 -#define MODEL_g4 0x12 -#define MODEL_o217 0x11 -#define MODEL_o12 0x10 -#define MODEL_o11 0xF -#define MODEL_o7 0xE -#define MODEL_o6 0xD -#define MODEL_g3 0xC -#define MODEL_g77 0xB -#define MODEL_o214 0xA -#define MODEL_o215 0x9 -#define MODEL_o213 0x8 -#define MODEL_o18 0x7 -#define MODEL_o1 0x6 -#define MODEL_g2 0x5 -#define MODEL_o24 0x4 -#define MODEL_o3 0x3 -#define MODEL_o2 0x2 -#define MODEL_g13 0x1 -#define MODEL_o76 0x0 +#define MODEL_Root 0xC4 +#define MODEL_g1 0xC3 +#define MODEL_o29 0xC2 +#define MODEL_g61 0xC1 +#define MODEL_o75 0xC0 +#define MODEL_o74 0xBF +#define MODEL_o181 0xBE +#define MODEL_o184 0xBD +#define MODEL_o180 0xBC +#define MODEL_o26 0xBB +#define MODEL_g76 0xBA +#define MODEL_o204 0xB9 +#define MODEL_o201 0xB8 +#define MODEL_o203 0xB7 +#define MODEL_o202 0xB6 +#define MODEL_hana 0xB5 +#define MODEL_g24 0xB4 +#define MODEL_o63 0xB3 +#define MODEL_o62 0xB2 +#define MODEL_o61 0xB1 +#define MODEL_g23 0xB0 +#define MODEL_o60 0xAF +#define MODEL_o59 0xAE +#define MODEL_o58 0xAD +#define MODEL_g22 0xAC +#define MODEL_o57 0xAB +#define MODEL_o56 0xAA +#define MODEL_o55 0xA9 +#define MODEL_g21 0xA8 +#define MODEL_o54 0xA7 +#define MODEL_o53 0xA6 +#define MODEL_o52 0xA5 +#define MODEL_ki 0xA4 +#define MODEL_g16 0xA3 +#define MODEL_g17 0xA2 +#define MODEL_o45 0xA1 +#define MODEL_o44 0xA0 +#define MODEL_o43 0x9F +#define MODEL_o42 0x9E +#define MODEL_o41 0x9D +#define MODEL_o40 0x9C +#define MODEL_g11 0x9B +#define MODEL_g14 0x9A +#define MODEL_o39 0x99 +#define MODEL_o38 0x98 +#define MODEL_o37 0x97 +#define MODEL_o36 0x96 +#define MODEL_o35 0x95 +#define MODEL_o32 0x94 +#define MODEL_sigemi 0x93 +#define MODEL_g27 0x92 +#define MODEL_o68 0x91 +#define MODEL_o71 0x90 +#define MODEL_o22 0x8F +#define MODEL_g26 0x8E +#define MODEL_o69 0x8D +#define MODEL_o70 0x8C +#define MODEL_o21 0x8B +#define MODEL_g25 0x8A +#define MODEL_o67 0x89 +#define MODEL_o66 0x88 +#define MODEL_o65 0x87 +#define MODEL_o64 0x86 +#define MODEL_o23 0x85 +#define MODEL_g6 0x84 +#define MODEL_g50 0x83 +#define MODEL_g67 0x82 +#define MODEL_g73 0x81 +#define MODEL_o190 0x80 +#define MODEL_g72 0x7F +#define MODEL_o193 0x7E +#define MODEL_g71 0x7D +#define MODEL_o192 0x7C +#define MODEL_g54 0x7B +#define MODEL_o174 0x7A +#define MODEL_o173 0x79 +#define MODEL_o172 0x78 +#define MODEL_o171 0x77 +#define MODEL_g51 0x76 +#define MODEL_g75 0x75 +#define MODEL_o197 0x74 +#define MODEL_o196 0x73 +#define MODEL_g74 0x72 +#define MODEL_o195 0x71 +#define MODEL_o194 0x70 +#define MODEL_o157 0x6F +#define MODEL_o160 0x6E +#define MODEL_o159 0x6D +#define MODEL_o158 0x6C +#define MODEL_o156 0x6B +#define MODEL_g53 0x6A +#define MODEL_o170 0x69 +#define MODEL_o169 0x68 +#define MODEL_o168 0x67 +#define MODEL_g52 0x66 +#define MODEL_o167 0x65 +#define MODEL_o166 0x64 +#define MODEL_o165 0x63 +#define MODEL_o164 0x62 +#define MODEL_o163 0x61 +#define MODEL_o162 0x60 +#define MODEL_o161 0x5F +#define MODEL_g39 0x5E +#define MODEL_o209 0x5D +#define MODEL_o208 0x5C +#define MODEL_g63 0x5B +#define MODEL_g66 0x5A +#define MODEL_o188 0x59 +#define MODEL_g65 0x58 +#define MODEL_o187 0x57 +#define MODEL_g64 0x56 +#define MODEL_o186 0x55 +#define MODEL_g42 0x54 +#define MODEL_o137 0x53 +#define MODEL_o136 0x52 +#define MODEL_o135 0x51 +#define MODEL_o134 0x50 +#define MODEL_g43 0x4F +#define MODEL_o141 0x4E +#define MODEL_o140 0x4D +#define MODEL_o139 0x4C +#define MODEL_o138 0x4B +#define MODEL_g40 0x4A +#define MODEL_g62 0x49 +#define MODEL_o145 0x48 +#define MODEL_o182 0x47 +#define MODEL_g46 0x46 +#define MODEL_o144 0x45 +#define MODEL_g45 0x44 +#define MODEL_o126 0x43 +#define MODEL_o125 0x42 +#define MODEL_o124 0x41 +#define MODEL_o123 0x40 +#define MODEL_o122 0x3F +#define MODEL_o121 0x3E +#define MODEL_o127 0x3D +#define MODEL_o132 0x3C +#define MODEL_o133 0x3B +#define MODEL_g30 0x3A +#define MODEL_o207 0x39 +#define MODEL_g57 0x38 +#define MODEL_g33 0x37 +#define MODEL_o95 0x36 +#define MODEL_o91 0x35 +#define MODEL_o90 0x34 +#define MODEL_o87 0x33 +#define MODEL_g58 0x32 +#define MODEL_o177 0x31 +#define MODEL_g56 0x30 +#define MODEL_o176 0x2F +#define MODEL_g55 0x2E +#define MODEL_o175 0x2D +#define MODEL_g49 0x2C +#define MODEL_o155 0x2B +#define MODEL_o154 0x2A +#define MODEL_o153 0x29 +#define MODEL_g47 0x28 +#define MODEL_o206 0x27 +#define MODEL_g48 0x26 +#define MODEL_o152 0x25 +#define MODEL_o151 0x24 +#define MODEL_o147 0x23 +#define MODEL_o146 0x22 +#define MODEL_g31 0x21 +#define MODEL_o81 0x20 +#define MODEL_o80 0x1F +#define MODEL_o79 0x1E +#define MODEL_o78 0x1D +#define MODEL_o77 0x1C +#define MODEL_o100 0x1B +#define MODEL_o4 0x1A +#define MODEL_g34 0x19 +#define MODEL_g29 0x18 +#define MODEL_o73 0x17 +#define MODEL_o72 0x16 +#define MODEL_g7 0x15 +#define MODEL_o16 0x14 +#define MODEL_o15 0x13 +#define MODEL_g4 0x12 +#define MODEL_o217 0x11 +#define MODEL_o12 0x10 +#define MODEL_o11 0xF +#define MODEL_o7 0xE +#define MODEL_o6 0xD +#define MODEL_g3 0xC +#define MODEL_g77 0xB +#define MODEL_o214 0xA +#define MODEL_o215 0x9 +#define MODEL_o213 0x8 +#define MODEL_o18 0x7 +#define MODEL_o1 0x6 +#define MODEL_g2 0x5 +#define MODEL_o24 0x4 +#define MODEL_o3 0x3 +#define MODEL_o2 0x2 +#define MODEL_g13 0x1 +#define MODEL_o76 0x0 + diff --git a/include/mapfs/hos_04_hit.h b/include/mapfs/hos_04_hit.h index c0058c50ba..35e84cedeb 100644 --- a/include/mapfs/hos_04_hit.h +++ b/include/mapfs/hos_04_hit.h @@ -1,18 +1,27 @@ -#define COLLIDER_Root 0x11 -#define COLLIDER_g1 0x10 -#define COLLIDER_g160 0xF -#define COLLIDER_o489 0xE -#define COLLIDER_o486 0xD -#define COLLIDER_o481 0xC -#define COLLIDER_o485 0xB -#define COLLIDER_o482 0xA -#define COLLIDER_o175 0x9 -#define COLLIDER_o480 0x8 -#define COLLIDER_g23 0x7 -#define COLLIDER_g162 0x6 -#define COLLIDER_o162 0x5 -#define COLLIDER_o163 0x4 -#define COLLIDER_g161 0x3 -#define COLLIDER_o150 0x2 -#define COLLIDER_deilitnw 0x1 -#define COLLIDER_deilinw 0x0 +#define COLLIDER_Root 0x11 +#define COLLIDER_g1 0x10 +#define COLLIDER_g160 0xF +#define COLLIDER_o489 0xE +#define COLLIDER_o486 0xD +#define COLLIDER_o481 0xC +#define COLLIDER_o485 0xB +#define COLLIDER_o482 0xA +#define COLLIDER_o175 0x9 +#define COLLIDER_o480 0x8 +#define COLLIDER_g23 0x7 +#define COLLIDER_g162 0x6 +#define COLLIDER_o162 0x5 +#define COLLIDER_o163 0x4 +#define COLLIDER_g161 0x3 +#define COLLIDER_o150 0x2 +#define COLLIDER_deilitnw 0x1 +#define COLLIDER_deilinw 0x0 + +#define ZONE_Root 0x6 +#define ZONE_g164 0x5 +#define ZONE_o494 0x4 +#define ZONE_g1 0x3 +#define ZONE_o489 0x2 +#define ZONE_o486 0x1 +#define ZONE_o488 0x0 + diff --git a/include/mapfs/hos_04_shape.h b/include/mapfs/hos_04_shape.h index 0235b4b0f5..69cbd2a6e6 100644 --- a/include/mapfs/hos_04_shape.h +++ b/include/mapfs/hos_04_shape.h @@ -1,173 +1,174 @@ -#define MODEL_Root 0xAC -#define MODEL_g161 0xAB -#define MODEL_o483 0xAA -#define MODEL_o482 0xA9 -#define MODEL_o481 0xA8 -#define MODEL_o480 0xA7 -#define MODEL_g1 0xA6 -#define MODEL_g152 0xA5 -#define MODEL_g154 0xA4 -#define MODEL_g159 0xA3 -#define MODEL_o469 0xA2 -#define MODEL_g158 0xA1 -#define MODEL_o465 0xA0 -#define MODEL_o474 0x9F -#define MODEL_o475 0x9E -#define MODEL_o468 0x9D -#define MODEL_g153 0x9C -#define MODEL_g18 0x9B -#define MODEL_o462 0x9A -#define MODEL_g19 0x99 -#define MODEL_o461 0x98 -#define MODEL_o476 0x97 -#define MODEL_o477 0x96 -#define MODEL_o459 0x95 -#define MODEL_g31 0x94 -#define MODEL_g145 0x93 -#define MODEL_g103 0x92 -#define MODEL_o86 0x91 -#define MODEL_o176 0x90 -#define MODEL_o87 0x8F -#define MODEL_g104 0x8E -#define MODEL_o352 0x8D -#define MODEL_o351 0x8C -#define MODEL_o350 0x8B -#define MODEL_o349 0x8A -#define MODEL_g102 0x89 -#define MODEL_o175 0x88 -#define MODEL_o171 0x87 -#define MODEL_g144 0x86 -#define MODEL_g68 0x85 -#define MODEL_g70 0x84 -#define MODEL_o273 0x83 -#define MODEL_o272 0x82 -#define MODEL_o271 0x81 -#define MODEL_g69 0x80 -#define MODEL_o270 0x7F -#define MODEL_o269 0x7E -#define MODEL_o416 0x7D -#define MODEL_g62 0x7C -#define MODEL_g64 0x7B -#define MODEL_o259 0x7A -#define MODEL_o258 0x79 -#define MODEL_o257 0x78 -#define MODEL_g63 0x77 -#define MODEL_o256 0x76 -#define MODEL_o255 0x75 -#define MODEL_o412 0x74 -#define MODEL_g125 0x73 -#define MODEL_g127 0x72 -#define MODEL_o411 0x71 -#define MODEL_o410 0x70 -#define MODEL_o409 0x6F -#define MODEL_o408 0x6E -#define MODEL_g126 0x6D -#define MODEL_o407 0x6C -#define MODEL_o406 0x6B -#define MODEL_o405 0x6A -#define MODEL_g71 0x69 -#define MODEL_g73 0x68 -#define MODEL_o280 0x67 -#define MODEL_o404 0x66 -#define MODEL_o279 0x65 -#define MODEL_o278 0x64 -#define MODEL_g72 0x63 -#define MODEL_o277 0x62 -#define MODEL_o276 0x61 -#define MODEL_o275 0x60 -#define MODEL_o190 0x5F -#define MODEL_g107 0x5E -#define MODEL_g109 0x5D -#define MODEL_o359 0x5C -#define MODEL_o358 0x5B -#define MODEL_o357 0x5A -#define MODEL_g143 0x59 -#define MODEL_g150 0x58 -#define MODEL_o446 0x57 -#define MODEL_o370 0x56 -#define MODEL_g149 0x55 -#define MODEL_o444 0x54 -#define MODEL_o391 0x53 -#define MODEL_g151 0x52 -#define MODEL_o448 0x51 -#define MODEL_o377 0x50 -#define MODEL_g148 0x4F -#define MODEL_o442 0x4E -#define MODEL_o398 0x4D -#define MODEL_g147 0x4C -#define MODEL_o450 0x4B -#define MODEL_o325 0x4A -#define MODEL_g146 0x49 -#define MODEL_o452 0x48 -#define MODEL_o363 0x47 -#define MODEL_g122 0x46 -#define MODEL_g124 0x45 -#define MODEL_o403 0x44 -#define MODEL_o402 0x43 -#define MODEL_o401 0x42 -#define MODEL_o400 0x41 -#define MODEL_g123 0x40 -#define MODEL_o443 0x3F -#define MODEL_o399 0x3E -#define MODEL_g119 0x3D -#define MODEL_g121 0x3C -#define MODEL_o396 0x3B -#define MODEL_o395 0x3A -#define MODEL_o394 0x39 -#define MODEL_o393 0x38 -#define MODEL_g120 0x37 -#define MODEL_o445 0x36 -#define MODEL_o392 0x35 -#define MODEL_g113 0x34 -#define MODEL_g115 0x33 -#define MODEL_o375 0x32 -#define MODEL_o374 0x31 -#define MODEL_o373 0x30 -#define MODEL_o372 0x2F -#define MODEL_g114 0x2E -#define MODEL_o447 0x2D -#define MODEL_o371 0x2C -#define MODEL_g116 0x2B -#define MODEL_g118 0x2A -#define MODEL_o382 0x29 -#define MODEL_o381 0x28 -#define MODEL_o380 0x27 -#define MODEL_o379 0x26 -#define MODEL_g117 0x25 -#define MODEL_o449 0x24 -#define MODEL_o378 0x23 -#define MODEL_g93 0x22 -#define MODEL_g95 0x21 -#define MODEL_o329 0x20 -#define MODEL_o361 0x1F -#define MODEL_o328 0x1E -#define MODEL_o327 0x1D -#define MODEL_g94 0x1C -#define MODEL_o451 0x1B -#define MODEL_o326 0x1A -#define MODEL_g110 0x19 -#define MODEL_g112 0x18 -#define MODEL_o368 0x17 -#define MODEL_o367 0x16 -#define MODEL_o366 0x15 -#define MODEL_o365 0x14 -#define MODEL_g111 0x13 -#define MODEL_o453 0x12 -#define MODEL_o364 0x11 -#define MODEL_g105 0x10 -#define MODEL_o347 0xF -#define MODEL_o346 0xE -#define MODEL_o345 0xD -#define MODEL_o417 0xC -#define MODEL_o360 0xB -#define MODEL_g2 0xA -#define MODEL_o438 0x9 -#define MODEL_o455 0x8 -#define MODEL_o170 0x7 -#define MODEL_o3 0x6 -#define MODEL_o440 0x5 -#define MODEL_o172 0x4 -#define MODEL_g163 0x3 -#define MODEL_o472 0x2 -#define MODEL_g23 0x1 -#define MODEL_o484 0x0 +#define MODEL_Root 0xAC +#define MODEL_g161 0xAB +#define MODEL_o483 0xAA +#define MODEL_o482 0xA9 +#define MODEL_o481 0xA8 +#define MODEL_o480 0xA7 +#define MODEL_g1 0xA6 +#define MODEL_g152 0xA5 +#define MODEL_g154 0xA4 +#define MODEL_g159 0xA3 +#define MODEL_o469 0xA2 +#define MODEL_g158 0xA1 +#define MODEL_o465 0xA0 +#define MODEL_o474 0x9F +#define MODEL_o475 0x9E +#define MODEL_o468 0x9D +#define MODEL_g153 0x9C +#define MODEL_g18 0x9B +#define MODEL_o462 0x9A +#define MODEL_g19 0x99 +#define MODEL_o461 0x98 +#define MODEL_o476 0x97 +#define MODEL_o477 0x96 +#define MODEL_o459 0x95 +#define MODEL_g31 0x94 +#define MODEL_g145 0x93 +#define MODEL_g103 0x92 +#define MODEL_o86 0x91 +#define MODEL_o176 0x90 +#define MODEL_o87 0x8F +#define MODEL_g104 0x8E +#define MODEL_o352 0x8D +#define MODEL_o351 0x8C +#define MODEL_o350 0x8B +#define MODEL_o349 0x8A +#define MODEL_g102 0x89 +#define MODEL_o175 0x88 +#define MODEL_o171 0x87 +#define MODEL_g144 0x86 +#define MODEL_g68 0x85 +#define MODEL_g70 0x84 +#define MODEL_o273 0x83 +#define MODEL_o272 0x82 +#define MODEL_o271 0x81 +#define MODEL_g69 0x80 +#define MODEL_o270 0x7F +#define MODEL_o269 0x7E +#define MODEL_o416 0x7D +#define MODEL_g62 0x7C +#define MODEL_g64 0x7B +#define MODEL_o259 0x7A +#define MODEL_o258 0x79 +#define MODEL_o257 0x78 +#define MODEL_g63 0x77 +#define MODEL_o256 0x76 +#define MODEL_o255 0x75 +#define MODEL_o412 0x74 +#define MODEL_g125 0x73 +#define MODEL_g127 0x72 +#define MODEL_o411 0x71 +#define MODEL_o410 0x70 +#define MODEL_o409 0x6F +#define MODEL_o408 0x6E +#define MODEL_g126 0x6D +#define MODEL_o407 0x6C +#define MODEL_o406 0x6B +#define MODEL_o405 0x6A +#define MODEL_g71 0x69 +#define MODEL_g73 0x68 +#define MODEL_o280 0x67 +#define MODEL_o404 0x66 +#define MODEL_o279 0x65 +#define MODEL_o278 0x64 +#define MODEL_g72 0x63 +#define MODEL_o277 0x62 +#define MODEL_o276 0x61 +#define MODEL_o275 0x60 +#define MODEL_o190 0x5F +#define MODEL_g107 0x5E +#define MODEL_g109 0x5D +#define MODEL_o359 0x5C +#define MODEL_o358 0x5B +#define MODEL_o357 0x5A +#define MODEL_g143 0x59 +#define MODEL_g150 0x58 +#define MODEL_o446 0x57 +#define MODEL_o370 0x56 +#define MODEL_g149 0x55 +#define MODEL_o444 0x54 +#define MODEL_o391 0x53 +#define MODEL_g151 0x52 +#define MODEL_o448 0x51 +#define MODEL_o377 0x50 +#define MODEL_g148 0x4F +#define MODEL_o442 0x4E +#define MODEL_o398 0x4D +#define MODEL_g147 0x4C +#define MODEL_o450 0x4B +#define MODEL_o325 0x4A +#define MODEL_g146 0x49 +#define MODEL_o452 0x48 +#define MODEL_o363 0x47 +#define MODEL_g122 0x46 +#define MODEL_g124 0x45 +#define MODEL_o403 0x44 +#define MODEL_o402 0x43 +#define MODEL_o401 0x42 +#define MODEL_o400 0x41 +#define MODEL_g123 0x40 +#define MODEL_o443 0x3F +#define MODEL_o399 0x3E +#define MODEL_g119 0x3D +#define MODEL_g121 0x3C +#define MODEL_o396 0x3B +#define MODEL_o395 0x3A +#define MODEL_o394 0x39 +#define MODEL_o393 0x38 +#define MODEL_g120 0x37 +#define MODEL_o445 0x36 +#define MODEL_o392 0x35 +#define MODEL_g113 0x34 +#define MODEL_g115 0x33 +#define MODEL_o375 0x32 +#define MODEL_o374 0x31 +#define MODEL_o373 0x30 +#define MODEL_o372 0x2F +#define MODEL_g114 0x2E +#define MODEL_o447 0x2D +#define MODEL_o371 0x2C +#define MODEL_g116 0x2B +#define MODEL_g118 0x2A +#define MODEL_o382 0x29 +#define MODEL_o381 0x28 +#define MODEL_o380 0x27 +#define MODEL_o379 0x26 +#define MODEL_g117 0x25 +#define MODEL_o449 0x24 +#define MODEL_o378 0x23 +#define MODEL_g93 0x22 +#define MODEL_g95 0x21 +#define MODEL_o329 0x20 +#define MODEL_o361 0x1F +#define MODEL_o328 0x1E +#define MODEL_o327 0x1D +#define MODEL_g94 0x1C +#define MODEL_o451 0x1B +#define MODEL_o326 0x1A +#define MODEL_g110 0x19 +#define MODEL_g112 0x18 +#define MODEL_o368 0x17 +#define MODEL_o367 0x16 +#define MODEL_o366 0x15 +#define MODEL_o365 0x14 +#define MODEL_g111 0x13 +#define MODEL_o453 0x12 +#define MODEL_o364 0x11 +#define MODEL_g105 0x10 +#define MODEL_o347 0xF +#define MODEL_o346 0xE +#define MODEL_o345 0xD +#define MODEL_o417 0xC +#define MODEL_o360 0xB +#define MODEL_g2 0xA +#define MODEL_o438 0x9 +#define MODEL_o455 0x8 +#define MODEL_o170 0x7 +#define MODEL_o3 0x6 +#define MODEL_o440 0x5 +#define MODEL_o172 0x4 +#define MODEL_g163 0x3 +#define MODEL_o472 0x2 +#define MODEL_g23 0x1 +#define MODEL_o484 0x0 + diff --git a/include/mapfs/hos_05_hit.h b/include/mapfs/hos_05_hit.h index f6b80fa1ec..8b6d31fcb3 100644 --- a/include/mapfs/hos_05_hit.h +++ b/include/mapfs/hos_05_hit.h @@ -1,18 +1,27 @@ -#define COLLIDER_Root 0x11 -#define COLLIDER_g1 0x10 -#define COLLIDER_g41 0xF -#define COLLIDER_g273 0xE -#define COLLIDER_o630 0xD -#define COLLIDER_g42 0xC -#define COLLIDER_o627 0xB -#define COLLIDER_g245 0xA -#define COLLIDER_o616 0x9 -#define COLLIDER_o5 0x8 -#define COLLIDER_o6 0x7 -#define COLLIDER_o562 0x6 -#define COLLIDER_o4 0x5 -#define COLLIDER_o561 0x4 -#define COLLIDER_g40 0x3 -#define COLLIDER_o42 0x2 -#define COLLIDER_deilitw 0x1 -#define COLLIDER_deiliw 0x0 +#define COLLIDER_Root 0x11 +#define COLLIDER_g1 0x10 +#define COLLIDER_g41 0xF +#define COLLIDER_g273 0xE +#define COLLIDER_o630 0xD +#define COLLIDER_g42 0xC +#define COLLIDER_o627 0xB +#define COLLIDER_g245 0xA +#define COLLIDER_o616 0x9 +#define COLLIDER_o5 0x8 +#define COLLIDER_o6 0x7 +#define COLLIDER_o562 0x6 +#define COLLIDER_o4 0x5 +#define COLLIDER_o561 0x4 +#define COLLIDER_g40 0x3 +#define COLLIDER_o42 0x2 +#define COLLIDER_deilitw 0x1 +#define COLLIDER_deiliw 0x0 + +#define ZONE_Root 0x6 +#define ZONE_g269 0x5 +#define ZONE_o622 0x4 +#define ZONE_o621 0x3 +#define ZONE_g1 0x2 +#define ZONE_o619 0x1 +#define ZONE_o620 0x0 + diff --git a/include/mapfs/hos_05_shape.h b/include/mapfs/hos_05_shape.h index 8f4495070e..072d25887b 100644 --- a/include/mapfs/hos_05_shape.h +++ b/include/mapfs/hos_05_shape.h @@ -1,168 +1,169 @@ -#define MODEL_Root 0xA7 -#define MODEL_g1 0xA6 -#define MODEL_o658 0xA5 -#define MODEL_g270 0xA4 -#define MODEL_g273 0xA3 -#define MODEL_o634 0xA2 -#define MODEL_o627 0xA1 -#define MODEL_g271 0xA0 -#define MODEL_o626 0x9F -#define MODEL_o632 0x9E -#define MODEL_o631 0x9D -#define MODEL_o630 0x9C -#define MODEL_o625 0x9B -#define MODEL_g272 0x9A -#define MODEL_o629 0x99 -#define MODEL_o628 0x98 -#define MODEL_o619 0x97 -#define MODEL_o618 0x96 -#define MODEL_g244 0x95 -#define MODEL_g276 0x94 -#define MODEL_o8 0x93 -#define MODEL_g279 0x92 -#define MODEL_o646 0x91 -#define MODEL_g277 0x90 -#define MODEL_o639 0x8F -#define MODEL_o638 0x8E -#define MODEL_o637 0x8D -#define MODEL_o636 0x8C -#define MODEL_g157 0x8B -#define MODEL_g178 0x8A -#define MODEL_o408 0x89 -#define MODEL_o407 0x88 -#define MODEL_g177 0x87 -#define MODEL_o406 0x86 -#define MODEL_o405 0x85 -#define MODEL_g176 0x84 -#define MODEL_o404 0x83 -#define MODEL_o403 0x82 -#define MODEL_g175 0x81 -#define MODEL_o402 0x80 -#define MODEL_o401 0x7F -#define MODEL_g174 0x7E -#define MODEL_o400 0x7D -#define MODEL_o399 0x7C -#define MODEL_g173 0x7B -#define MODEL_o398 0x7A -#define MODEL_o397 0x79 -#define MODEL_g172 0x78 -#define MODEL_o396 0x77 -#define MODEL_o395 0x76 -#define MODEL_g156 0x75 -#define MODEL_o364 0x74 -#define MODEL_o363 0x73 -#define MODEL_g97 0x72 -#define MODEL_o362 0x71 -#define MODEL_o394 0x70 -#define MODEL_g268 0x6F -#define MODEL_g269 0x6E -#define MODEL_o617 0x6D -#define MODEL_o616 0x6C -#define MODEL_g249 0x6B -#define MODEL_o580 0x6A -#define MODEL_g251 0x69 -#define MODEL_o579 0x68 -#define MODEL_o578 0x67 -#define MODEL_o577 0x66 -#define MODEL_g250 0x65 -#define MODEL_o576 0x64 -#define MODEL_o575 0x63 -#define MODEL_o574 0x62 -#define MODEL_g252 0x61 -#define MODEL_o587 0x60 -#define MODEL_g254 0x5F -#define MODEL_o586 0x5E -#define MODEL_o585 0x5D -#define MODEL_o584 0x5C -#define MODEL_g253 0x5B -#define MODEL_o583 0x5A -#define MODEL_o582 0x59 -#define MODEL_o581 0x58 -#define MODEL_g267 0x57 -#define MODEL_g264 0x56 -#define MODEL_o615 0x55 -#define MODEL_g266 0x54 -#define MODEL_o614 0x53 -#define MODEL_o613 0x52 -#define MODEL_o612 0x51 -#define MODEL_g265 0x50 -#define MODEL_o611 0x4F -#define MODEL_o610 0x4E -#define MODEL_o609 0x4D -#define MODEL_g261 0x4C -#define MODEL_o608 0x4B -#define MODEL_g263 0x4A -#define MODEL_o607 0x49 -#define MODEL_o606 0x48 -#define MODEL_o605 0x47 -#define MODEL_g262 0x46 -#define MODEL_o604 0x45 -#define MODEL_o603 0x44 -#define MODEL_o602 0x43 -#define MODEL_g258 0x42 -#define MODEL_o601 0x41 -#define MODEL_g260 0x40 -#define MODEL_o600 0x3F -#define MODEL_o599 0x3E -#define MODEL_o598 0x3D -#define MODEL_g259 0x3C -#define MODEL_o597 0x3B -#define MODEL_o596 0x3A -#define MODEL_o595 0x39 -#define MODEL_g255 0x38 -#define MODEL_o594 0x37 -#define MODEL_g257 0x36 -#define MODEL_o593 0x35 -#define MODEL_o592 0x34 -#define MODEL_o591 0x33 -#define MODEL_g256 0x32 -#define MODEL_o590 0x31 -#define MODEL_o589 0x30 -#define MODEL_o588 0x2F -#define MODEL_g246 0x2E -#define MODEL_o573 0x2D -#define MODEL_g248 0x2C -#define MODEL_o572 0x2B -#define MODEL_o571 0x2A -#define MODEL_o570 0x29 -#define MODEL_g247 0x28 -#define MODEL_o569 0x27 -#define MODEL_o568 0x26 -#define MODEL_o567 0x25 -#define MODEL_g104 0x24 -#define MODEL_o248 0x23 -#define MODEL_g106 0x22 -#define MODEL_o247 0x21 -#define MODEL_o246 0x20 -#define MODEL_o245 0x1F -#define MODEL_g105 0x1E -#define MODEL_o244 0x1D -#define MODEL_o243 0x1C -#define MODEL_o242 0x1B -#define MODEL_g41 0x1A -#define MODEL_o33 0x19 -#define MODEL_g5 0x18 -#define MODEL_o24 0x17 -#define MODEL_o23 0x16 -#define MODEL_o22 0x15 -#define MODEL_o21 0x14 -#define MODEL_o20 0x13 -#define MODEL_o19 0x12 -#define MODEL_o18 0x11 -#define MODEL_g42 0x10 -#define MODEL_o34 0xF -#define MODEL_o5 0xE -#define MODEL_g245 0xD -#define MODEL_o6 0xC -#define MODEL_o4 0xB -#define MODEL_o562 0xA -#define MODEL_o561 0x9 -#define MODEL_g283 0x8 -#define MODEL_o1 0x7 -#define MODEL_o32 0x6 -#define MODEL_o659 0x5 -#define MODEL_g40 0x4 -#define MODEL_o566 0x3 -#define MODEL_o565 0x2 -#define MODEL_o564 0x1 -#define MODEL_o48 0x0 +#define MODEL_Root 0xA7 +#define MODEL_g1 0xA6 +#define MODEL_o658 0xA5 +#define MODEL_g270 0xA4 +#define MODEL_g273 0xA3 +#define MODEL_o634 0xA2 +#define MODEL_o627 0xA1 +#define MODEL_g271 0xA0 +#define MODEL_o626 0x9F +#define MODEL_o632 0x9E +#define MODEL_o631 0x9D +#define MODEL_o630 0x9C +#define MODEL_o625 0x9B +#define MODEL_g272 0x9A +#define MODEL_o629 0x99 +#define MODEL_o628 0x98 +#define MODEL_o619 0x97 +#define MODEL_o618 0x96 +#define MODEL_g244 0x95 +#define MODEL_g276 0x94 +#define MODEL_o8 0x93 +#define MODEL_g279 0x92 +#define MODEL_o646 0x91 +#define MODEL_g277 0x90 +#define MODEL_o639 0x8F +#define MODEL_o638 0x8E +#define MODEL_o637 0x8D +#define MODEL_o636 0x8C +#define MODEL_g157 0x8B +#define MODEL_g178 0x8A +#define MODEL_o408 0x89 +#define MODEL_o407 0x88 +#define MODEL_g177 0x87 +#define MODEL_o406 0x86 +#define MODEL_o405 0x85 +#define MODEL_g176 0x84 +#define MODEL_o404 0x83 +#define MODEL_o403 0x82 +#define MODEL_g175 0x81 +#define MODEL_o402 0x80 +#define MODEL_o401 0x7F +#define MODEL_g174 0x7E +#define MODEL_o400 0x7D +#define MODEL_o399 0x7C +#define MODEL_g173 0x7B +#define MODEL_o398 0x7A +#define MODEL_o397 0x79 +#define MODEL_g172 0x78 +#define MODEL_o396 0x77 +#define MODEL_o395 0x76 +#define MODEL_g156 0x75 +#define MODEL_o364 0x74 +#define MODEL_o363 0x73 +#define MODEL_g97 0x72 +#define MODEL_o362 0x71 +#define MODEL_o394 0x70 +#define MODEL_g268 0x6F +#define MODEL_g269 0x6E +#define MODEL_o617 0x6D +#define MODEL_o616 0x6C +#define MODEL_g249 0x6B +#define MODEL_o580 0x6A +#define MODEL_g251 0x69 +#define MODEL_o579 0x68 +#define MODEL_o578 0x67 +#define MODEL_o577 0x66 +#define MODEL_g250 0x65 +#define MODEL_o576 0x64 +#define MODEL_o575 0x63 +#define MODEL_o574 0x62 +#define MODEL_g252 0x61 +#define MODEL_o587 0x60 +#define MODEL_g254 0x5F +#define MODEL_o586 0x5E +#define MODEL_o585 0x5D +#define MODEL_o584 0x5C +#define MODEL_g253 0x5B +#define MODEL_o583 0x5A +#define MODEL_o582 0x59 +#define MODEL_o581 0x58 +#define MODEL_g267 0x57 +#define MODEL_g264 0x56 +#define MODEL_o615 0x55 +#define MODEL_g266 0x54 +#define MODEL_o614 0x53 +#define MODEL_o613 0x52 +#define MODEL_o612 0x51 +#define MODEL_g265 0x50 +#define MODEL_o611 0x4F +#define MODEL_o610 0x4E +#define MODEL_o609 0x4D +#define MODEL_g261 0x4C +#define MODEL_o608 0x4B +#define MODEL_g263 0x4A +#define MODEL_o607 0x49 +#define MODEL_o606 0x48 +#define MODEL_o605 0x47 +#define MODEL_g262 0x46 +#define MODEL_o604 0x45 +#define MODEL_o603 0x44 +#define MODEL_o602 0x43 +#define MODEL_g258 0x42 +#define MODEL_o601 0x41 +#define MODEL_g260 0x40 +#define MODEL_o600 0x3F +#define MODEL_o599 0x3E +#define MODEL_o598 0x3D +#define MODEL_g259 0x3C +#define MODEL_o597 0x3B +#define MODEL_o596 0x3A +#define MODEL_o595 0x39 +#define MODEL_g255 0x38 +#define MODEL_o594 0x37 +#define MODEL_g257 0x36 +#define MODEL_o593 0x35 +#define MODEL_o592 0x34 +#define MODEL_o591 0x33 +#define MODEL_g256 0x32 +#define MODEL_o590 0x31 +#define MODEL_o589 0x30 +#define MODEL_o588 0x2F +#define MODEL_g246 0x2E +#define MODEL_o573 0x2D +#define MODEL_g248 0x2C +#define MODEL_o572 0x2B +#define MODEL_o571 0x2A +#define MODEL_o570 0x29 +#define MODEL_g247 0x28 +#define MODEL_o569 0x27 +#define MODEL_o568 0x26 +#define MODEL_o567 0x25 +#define MODEL_g104 0x24 +#define MODEL_o248 0x23 +#define MODEL_g106 0x22 +#define MODEL_o247 0x21 +#define MODEL_o246 0x20 +#define MODEL_o245 0x1F +#define MODEL_g105 0x1E +#define MODEL_o244 0x1D +#define MODEL_o243 0x1C +#define MODEL_o242 0x1B +#define MODEL_g41 0x1A +#define MODEL_o33 0x19 +#define MODEL_g5 0x18 +#define MODEL_o24 0x17 +#define MODEL_o23 0x16 +#define MODEL_o22 0x15 +#define MODEL_o21 0x14 +#define MODEL_o20 0x13 +#define MODEL_o19 0x12 +#define MODEL_o18 0x11 +#define MODEL_g42 0x10 +#define MODEL_o34 0xF +#define MODEL_o5 0xE +#define MODEL_g245 0xD +#define MODEL_o6 0xC +#define MODEL_o4 0xB +#define MODEL_o562 0xA +#define MODEL_o561 0x9 +#define MODEL_g283 0x8 +#define MODEL_o1 0x7 +#define MODEL_o32 0x6 +#define MODEL_o659 0x5 +#define MODEL_g40 0x4 +#define MODEL_o566 0x3 +#define MODEL_o565 0x2 +#define MODEL_o564 0x1 +#define MODEL_o48 0x0 + diff --git a/include/mapfs/hos_06_hit.h b/include/mapfs/hos_06_hit.h index 13870e3282..d6495acbd6 100644 --- a/include/mapfs/hos_06_hit.h +++ b/include/mapfs/hos_06_hit.h @@ -1,40 +1,57 @@ -#define COLLIDER_Root 0x27 -#define COLLIDER_g1 0x26 -#define COLLIDER_g49 0x25 -#define COLLIDER_g52 0x24 -#define COLLIDER_o268 0x23 -#define COLLIDER_o267 0x22 -#define COLLIDER_o156 0x21 -#define COLLIDER_o155 0x20 -#define COLLIDER_g51 0x1F -#define COLLIDER_o92 0x1E -#define COLLIDER_o153 0x1D -#define COLLIDER_g50 0x1C -#define COLLIDER_o224 0x1B -#define COLLIDER_o207 0x1A -#define COLLIDER_o151 0x19 -#define COLLIDER_o150 0x18 -#define COLLIDER_g4 0x17 -#define COLLIDER_o229 0x16 -#define COLLIDER_o170 0x15 -#define COLLIDER_o169 0x14 -#define COLLIDER_o21 0x13 -#define COLLIDER_o168 0x12 -#define COLLIDER_o167 0x11 -#define COLLIDER_o166 0x10 -#define COLLIDER_o165 0xF -#define COLLIDER_o164 0xE -#define COLLIDER_g6 0xD -#define COLLIDER_g55 0xC -#define COLLIDER_o163 0xB -#define COLLIDER_o162 0xA -#define COLLIDER_g54 0x9 -#define COLLIDER_o161 0x8 -#define COLLIDER_o160 0x7 -#define COLLIDER_g53 0x6 -#define COLLIDER_o159 0x5 -#define COLLIDER_o158 0x4 -#define COLLIDER_g3 0x3 -#define COLLIDER_o146 0x2 -#define COLLIDER_deilitw 0x1 -#define COLLIDER_deiliw 0x0 +#define COLLIDER_Root 0x27 +#define COLLIDER_g1 0x26 +#define COLLIDER_g49 0x25 +#define COLLIDER_g52 0x24 +#define COLLIDER_o268 0x23 +#define COLLIDER_o267 0x22 +#define COLLIDER_o156 0x21 +#define COLLIDER_o155 0x20 +#define COLLIDER_g51 0x1F +#define COLLIDER_o92 0x1E +#define COLLIDER_o153 0x1D +#define COLLIDER_g50 0x1C +#define COLLIDER_o224 0x1B +#define COLLIDER_o207 0x1A +#define COLLIDER_o151 0x19 +#define COLLIDER_o150 0x18 +#define COLLIDER_g4 0x17 +#define COLLIDER_o229 0x16 +#define COLLIDER_o170 0x15 +#define COLLIDER_o169 0x14 +#define COLLIDER_o21 0x13 +#define COLLIDER_o168 0x12 +#define COLLIDER_o167 0x11 +#define COLLIDER_o166 0x10 +#define COLLIDER_o165 0xF +#define COLLIDER_o164 0xE +#define COLLIDER_g6 0xD +#define COLLIDER_g55 0xC +#define COLLIDER_o163 0xB +#define COLLIDER_o162 0xA +#define COLLIDER_g54 0x9 +#define COLLIDER_o161 0x8 +#define COLLIDER_o160 0x7 +#define COLLIDER_g53 0x6 +#define COLLIDER_o159 0x5 +#define COLLIDER_o158 0x4 +#define COLLIDER_g3 0x3 +#define COLLIDER_o146 0x2 +#define COLLIDER_deilitw 0x1 +#define COLLIDER_deiliw 0x0 + +#define ZONE_Root 0xE +#define ZONE_g7 0xD +#define ZONE_o48 0xC +#define ZONE_o47 0xB +#define ZONE_o46 0xA +#define ZONE_g9 0x9 +#define ZONE_o32 0x8 +#define ZONE_g6 0x7 +#define ZONE_o42 0x6 +#define ZONE_o41 0x5 +#define ZONE_o40 0x4 +#define ZONE_g1 0x3 +#define ZONE_o39 0x2 +#define ZONE_o38 0x1 +#define ZONE_o36 0x0 + diff --git a/include/mapfs/hos_06_shape.h b/include/mapfs/hos_06_shape.h index d9cf70ab5f..cce8327b2a 100644 --- a/include/mapfs/hos_06_shape.h +++ b/include/mapfs/hos_06_shape.h @@ -1,212 +1,213 @@ -#define MODEL_Root 0xD3 -#define MODEL_g2 0xD2 -#define MODEL_g51 0xD1 -#define MODEL_o78 0xD0 -#define MODEL_g61 0xCF -#define MODEL_o90 0xCE -#define MODEL_g32 0xCD -#define MODEL_o83 0xCC -#define MODEL_g30 0xCB -#define MODEL_g34 0xCA -#define MODEL_o95 0xC9 -#define MODEL_o94 0xC8 -#define MODEL_o93 0xC7 -#define MODEL_o92 0xC6 -#define MODEL_o91 0xC5 -#define MODEL_o77 0xC4 -#define MODEL_o82 0xC3 -#define MODEL_o81 0xC2 -#define MODEL_o180 0xC1 -#define MODEL_g84 0xC0 -#define MODEL_o179 0xBF -#define MODEL_o178 0xBE -#define MODEL_g31 0xBD -#define MODEL_g92 0xBC -#define MODEL_o195 0xBB -#define MODEL_o194 0xBA -#define MODEL_o193 0xB9 -#define MODEL_o192 0xB8 -#define MODEL_o191 0xB7 -#define MODEL_g44 0xB6 -#define MODEL_o126 0xB5 -#define MODEL_o125 0xB4 -#define MODEL_o124 0xB3 -#define MODEL_o123 0xB2 -#define MODEL_g47 0xB1 -#define MODEL_o139 0xB0 -#define MODEL_o138 0xAF -#define MODEL_o137 0xAE -#define MODEL_g43 0xAD -#define MODEL_o140 0xAC -#define MODEL_o119 0xAB -#define MODEL_o117 0xAA -#define MODEL_o116 0xA9 -#define MODEL_o122 0xA8 -#define MODEL_o121 0xA7 -#define MODEL_o120 0xA6 -#define MODEL_g42 0xA5 -#define MODEL_o97 0xA4 -#define MODEL_o112 0xA3 -#define MODEL_o86 0xA2 -#define MODEL_o87 0xA1 -#define MODEL_o80 0xA0 -#define MODEL_o88 0x9F -#define MODEL_o79 0x9E -#define MODEL_o177 0x9D -#define MODEL_g50 0x9C -#define MODEL_g81 0x9B -#define MODEL_g82 0x9A -#define MODEL_o176 0x99 -#define MODEL_o175 0x98 -#define MODEL_o174 0x97 -#define MODEL_o173 0x96 -#define MODEL_o172 0x95 -#define MODEL_o171 0x94 -#define MODEL_o170 0x93 -#define MODEL_o169 0x92 -#define MODEL_o168 0x91 -#define MODEL_g29 0x90 -#define MODEL_g88 0x8F -#define MODEL_o186 0x8E -#define MODEL_g87 0x8D -#define MODEL_o185 0x8C -#define MODEL_g41 0x8B -#define MODEL_o111 0x8A -#define MODEL_o107 0x89 -#define MODEL_o108 0x88 -#define MODEL_o109 0x87 -#define MODEL_o110 0x86 -#define MODEL_o106 0x85 -#define MODEL_o105 0x84 -#define MODEL_o103 0x83 -#define MODEL_g38 0x82 -#define MODEL_o99 0x81 -#define MODEL_o102 0x80 -#define MODEL_o104 0x7F -#define MODEL_o100 0x7E -#define MODEL_o89 0x7D -#define MODEL_o85 0x7C -#define MODEL_o84 0x7B -#define MODEL_o76 0x7A -#define MODEL_o98 0x79 -#define MODEL_g10 0x78 -#define MODEL_o14 0x77 -#define MODEL_g35 0x76 -#define MODEL_g52 0x75 -#define MODEL_g86 0x74 -#define MODEL_g85 0x73 -#define MODEL_o183 0x72 -#define MODEL_o181 0x71 -#define MODEL_g59 0x70 -#define MODEL_g73 0x6F -#define MODEL_o160 0x6E -#define MODEL_o151 0x6D -#define MODEL_g58 0x6C -#define MODEL_g72 0x6B -#define MODEL_o159 0x6A -#define MODEL_o150 0x69 -#define MODEL_g57 0x68 -#define MODEL_o149 0x67 -#define MODEL_g56 0x66 -#define MODEL_o148 0x65 -#define MODEL_g55 0x64 -#define MODEL_o147 0x63 -#define MODEL_g54 0x62 -#define MODEL_g68 0x61 -#define MODEL_o158 0x60 -#define MODEL_o146 0x5F -#define MODEL_g9 0x5E -#define MODEL_o10 0x5D -#define MODEL_g11 0x5C -#define MODEL_o17 0x5B -#define MODEL_o9 0x5A -#define MODEL_g7 0x59 -#define MODEL_g90 0x58 -#define MODEL_o11 0x57 -#define MODEL_o187 0x56 -#define MODEL_g89 0x55 -#define MODEL_o188 0x54 -#define MODEL_o5 0x53 -#define MODEL_o7 0x52 -#define MODEL_g1 0x51 -#define MODEL_g49 0x50 -#define MODEL_g20 0x4F -#define MODEL_o51 0x4E -#define MODEL_o50 0x4D -#define MODEL_o49 0x4C -#define MODEL_o48 0x4B -#define MODEL_o46 0x4A -#define MODEL_o47 0x49 -#define MODEL_o45 0x48 -#define MODEL_g19 0x47 -#define MODEL_o39 0x46 -#define MODEL_o38 0x45 -#define MODEL_o37 0x44 -#define MODEL_g18 0x43 -#define MODEL_o36 0x42 -#define MODEL_o35 0x41 -#define MODEL_o34 0x40 -#define MODEL_g17 0x3F -#define MODEL_o33 0x3E -#define MODEL_o32 0x3D -#define MODEL_o31 0x3C -#define MODEL_g16 0x3B -#define MODEL_o30 0x3A -#define MODEL_o29 0x39 -#define MODEL_o28 0x38 -#define MODEL_o42 0x37 -#define MODEL_g12 0x36 -#define MODEL_g13 0x35 -#define MODEL_o27 0x34 -#define MODEL_o26 0x33 -#define MODEL_o25 0x32 -#define MODEL_o24 0x31 -#define MODEL_o23 0x30 -#define MODEL_o20 0x2F -#define MODEL_o15 0x2E -#define MODEL_o19 0x2D -#define MODEL_g53 0x2C -#define MODEL_o145 0x2B -#define MODEL_o8 0x2A -#define MODEL_o22 0x29 -#define MODEL_o21 0x28 -#define MODEL_g48 0x27 -#define MODEL_o144 0x26 -#define MODEL_o143 0x25 -#define MODEL_o142 0x24 -#define MODEL_o141 0x23 -#define MODEL_g15 0x22 -#define MODEL_g28 0x21 -#define MODEL_o75 0x20 -#define MODEL_o74 0x1F -#define MODEL_o73 0x1E -#define MODEL_g27 0x1D -#define MODEL_o72 0x1C -#define MODEL_o71 0x1B -#define MODEL_o70 0x1A -#define MODEL_g26 0x19 -#define MODEL_o69 0x18 -#define MODEL_o68 0x17 -#define MODEL_o67 0x16 -#define MODEL_g25 0x15 -#define MODEL_o66 0x14 -#define MODEL_o65 0x13 -#define MODEL_o64 0x12 -#define MODEL_g24 0x11 -#define MODEL_o63 0x10 -#define MODEL_o62 0xF -#define MODEL_o61 0xE -#define MODEL_g23 0xD -#define MODEL_o60 0xC -#define MODEL_o59 0xB -#define MODEL_o58 0xA -#define MODEL_g6 0x9 -#define MODEL_o54 0x8 -#define MODEL_o53 0x7 -#define MODEL_o52 0x6 -#define MODEL_g4 0x5 -#define MODEL_o4 0x4 -#define MODEL_o3 0x3 -#define MODEL_g3 0x2 -#define MODEL_o2 0x1 -#define MODEL_o1 0x0 +#define MODEL_Root 0xD3 +#define MODEL_g2 0xD2 +#define MODEL_g51 0xD1 +#define MODEL_o78 0xD0 +#define MODEL_g61 0xCF +#define MODEL_o90 0xCE +#define MODEL_g32 0xCD +#define MODEL_o83 0xCC +#define MODEL_g30 0xCB +#define MODEL_g34 0xCA +#define MODEL_o95 0xC9 +#define MODEL_o94 0xC8 +#define MODEL_o93 0xC7 +#define MODEL_o92 0xC6 +#define MODEL_o91 0xC5 +#define MODEL_o77 0xC4 +#define MODEL_o82 0xC3 +#define MODEL_o81 0xC2 +#define MODEL_o180 0xC1 +#define MODEL_g84 0xC0 +#define MODEL_o179 0xBF +#define MODEL_o178 0xBE +#define MODEL_g31 0xBD +#define MODEL_g92 0xBC +#define MODEL_o195 0xBB +#define MODEL_o194 0xBA +#define MODEL_o193 0xB9 +#define MODEL_o192 0xB8 +#define MODEL_o191 0xB7 +#define MODEL_g44 0xB6 +#define MODEL_o126 0xB5 +#define MODEL_o125 0xB4 +#define MODEL_o124 0xB3 +#define MODEL_o123 0xB2 +#define MODEL_g47 0xB1 +#define MODEL_o139 0xB0 +#define MODEL_o138 0xAF +#define MODEL_o137 0xAE +#define MODEL_g43 0xAD +#define MODEL_o140 0xAC +#define MODEL_o119 0xAB +#define MODEL_o117 0xAA +#define MODEL_o116 0xA9 +#define MODEL_o122 0xA8 +#define MODEL_o121 0xA7 +#define MODEL_o120 0xA6 +#define MODEL_g42 0xA5 +#define MODEL_o97 0xA4 +#define MODEL_o112 0xA3 +#define MODEL_o86 0xA2 +#define MODEL_o87 0xA1 +#define MODEL_o80 0xA0 +#define MODEL_o88 0x9F +#define MODEL_o79 0x9E +#define MODEL_o177 0x9D +#define MODEL_g50 0x9C +#define MODEL_g81 0x9B +#define MODEL_g82 0x9A +#define MODEL_o176 0x99 +#define MODEL_o175 0x98 +#define MODEL_o174 0x97 +#define MODEL_o173 0x96 +#define MODEL_o172 0x95 +#define MODEL_o171 0x94 +#define MODEL_o170 0x93 +#define MODEL_o169 0x92 +#define MODEL_o168 0x91 +#define MODEL_g29 0x90 +#define MODEL_g88 0x8F +#define MODEL_o186 0x8E +#define MODEL_g87 0x8D +#define MODEL_o185 0x8C +#define MODEL_g41 0x8B +#define MODEL_o111 0x8A +#define MODEL_o107 0x89 +#define MODEL_o108 0x88 +#define MODEL_o109 0x87 +#define MODEL_o110 0x86 +#define MODEL_o106 0x85 +#define MODEL_o105 0x84 +#define MODEL_o103 0x83 +#define MODEL_g38 0x82 +#define MODEL_o99 0x81 +#define MODEL_o102 0x80 +#define MODEL_o104 0x7F +#define MODEL_o100 0x7E +#define MODEL_o89 0x7D +#define MODEL_o85 0x7C +#define MODEL_o84 0x7B +#define MODEL_o76 0x7A +#define MODEL_o98 0x79 +#define MODEL_g10 0x78 +#define MODEL_o14 0x77 +#define MODEL_g35 0x76 +#define MODEL_g52 0x75 +#define MODEL_g86 0x74 +#define MODEL_g85 0x73 +#define MODEL_o183 0x72 +#define MODEL_o181 0x71 +#define MODEL_g59 0x70 +#define MODEL_g73 0x6F +#define MODEL_o160 0x6E +#define MODEL_o151 0x6D +#define MODEL_g58 0x6C +#define MODEL_g72 0x6B +#define MODEL_o159 0x6A +#define MODEL_o150 0x69 +#define MODEL_g57 0x68 +#define MODEL_o149 0x67 +#define MODEL_g56 0x66 +#define MODEL_o148 0x65 +#define MODEL_g55 0x64 +#define MODEL_o147 0x63 +#define MODEL_g54 0x62 +#define MODEL_g68 0x61 +#define MODEL_o158 0x60 +#define MODEL_o146 0x5F +#define MODEL_g9 0x5E +#define MODEL_o10 0x5D +#define MODEL_g11 0x5C +#define MODEL_o17 0x5B +#define MODEL_o9 0x5A +#define MODEL_g7 0x59 +#define MODEL_g90 0x58 +#define MODEL_o11 0x57 +#define MODEL_o187 0x56 +#define MODEL_g89 0x55 +#define MODEL_o188 0x54 +#define MODEL_o5 0x53 +#define MODEL_o7 0x52 +#define MODEL_g1 0x51 +#define MODEL_g49 0x50 +#define MODEL_g20 0x4F +#define MODEL_o51 0x4E +#define MODEL_o50 0x4D +#define MODEL_o49 0x4C +#define MODEL_o48 0x4B +#define MODEL_o46 0x4A +#define MODEL_o47 0x49 +#define MODEL_o45 0x48 +#define MODEL_g19 0x47 +#define MODEL_o39 0x46 +#define MODEL_o38 0x45 +#define MODEL_o37 0x44 +#define MODEL_g18 0x43 +#define MODEL_o36 0x42 +#define MODEL_o35 0x41 +#define MODEL_o34 0x40 +#define MODEL_g17 0x3F +#define MODEL_o33 0x3E +#define MODEL_o32 0x3D +#define MODEL_o31 0x3C +#define MODEL_g16 0x3B +#define MODEL_o30 0x3A +#define MODEL_o29 0x39 +#define MODEL_o28 0x38 +#define MODEL_o42 0x37 +#define MODEL_g12 0x36 +#define MODEL_g13 0x35 +#define MODEL_o27 0x34 +#define MODEL_o26 0x33 +#define MODEL_o25 0x32 +#define MODEL_o24 0x31 +#define MODEL_o23 0x30 +#define MODEL_o20 0x2F +#define MODEL_o15 0x2E +#define MODEL_o19 0x2D +#define MODEL_g53 0x2C +#define MODEL_o145 0x2B +#define MODEL_o8 0x2A +#define MODEL_o22 0x29 +#define MODEL_o21 0x28 +#define MODEL_g48 0x27 +#define MODEL_o144 0x26 +#define MODEL_o143 0x25 +#define MODEL_o142 0x24 +#define MODEL_o141 0x23 +#define MODEL_g15 0x22 +#define MODEL_g28 0x21 +#define MODEL_o75 0x20 +#define MODEL_o74 0x1F +#define MODEL_o73 0x1E +#define MODEL_g27 0x1D +#define MODEL_o72 0x1C +#define MODEL_o71 0x1B +#define MODEL_o70 0x1A +#define MODEL_g26 0x19 +#define MODEL_o69 0x18 +#define MODEL_o68 0x17 +#define MODEL_o67 0x16 +#define MODEL_g25 0x15 +#define MODEL_o66 0x14 +#define MODEL_o65 0x13 +#define MODEL_o64 0x12 +#define MODEL_g24 0x11 +#define MODEL_o63 0x10 +#define MODEL_o62 0xF +#define MODEL_o61 0xE +#define MODEL_g23 0xD +#define MODEL_o60 0xC +#define MODEL_o59 0xB +#define MODEL_o58 0xA +#define MODEL_g6 0x9 +#define MODEL_o54 0x8 +#define MODEL_o53 0x7 +#define MODEL_o52 0x6 +#define MODEL_g4 0x5 +#define MODEL_o4 0x4 +#define MODEL_o3 0x3 +#define MODEL_g3 0x2 +#define MODEL_o2 0x1 +#define MODEL_o1 0x0 + diff --git a/include/mapfs/hos_10_hit.h b/include/mapfs/hos_10_hit.h index 3f4d9a4b54..0b64366ec0 100644 --- a/include/mapfs/hos_10_hit.h +++ b/include/mapfs/hos_10_hit.h @@ -1,4 +1,10 @@ -#define COLLIDER_Root 0x3 -#define COLLIDER_g1 0x2 -#define COLLIDER_g2 0x1 -#define COLLIDER_o1 0x0 +#define COLLIDER_Root 0x3 +#define COLLIDER_g1 0x2 +#define COLLIDER_g2 0x1 +#define COLLIDER_o1 0x0 + +#define ZONE_Root 0x3 +#define ZONE_g1 0x2 +#define ZONE_g2 0x1 +#define ZONE_o1 0x0 + diff --git a/include/mapfs/hos_10_shape.h b/include/mapfs/hos_10_shape.h index d3b08a9f72..beedad3064 100644 --- a/include/mapfs/hos_10_shape.h +++ b/include/mapfs/hos_10_shape.h @@ -1,44 +1,45 @@ -#define MODEL_Root 0x2B -#define MODEL_mario_g 0x2A -#define MODEL_mario_o 0x29 -#define MODEL_Default 0x28 -#define MODEL_nagare 0x27 -#define MODEL_kumo 0x26 -#define MODEL_k13 0x25 -#define MODEL_k12 0x24 -#define MODEL_k11 0x23 -#define MODEL_k10 0x22 -#define MODEL_k9 0x21 -#define MODEL_k8 0x20 -#define MODEL_k7 0x1F -#define MODEL_k6 0x1E -#define MODEL_k5 0x1D -#define MODEL_k4 0x1C -#define MODEL_k3 0x1B -#define MODEL_k2 0x1A -#define MODEL_k1 0x19 -#define MODEL_starland 0x18 -#define MODEL_stl_2 0x17 -#define MODEL_s5 0x16 -#define MODEL_s4 0x15 -#define MODEL_s3 0x14 -#define MODEL_stl_1 0x13 -#define MODEL_ls1 0x12 -#define MODEL_s2 0x11 -#define MODEL_s1 0x10 -#define MODEL_castle 0xF -#define MODEL_c8 0xE -#define MODEL_c7 0xD -#define MODEL_c6 0xC -#define MODEL_c5 0xB -#define MODEL_c4 0xA -#define MODEL_c3 0x9 -#define MODEL_c2 0x8 -#define MODEL_c1 0x7 -#define MODEL_g3 0x6 -#define MODEL_o3 0x5 -#define MODEL_g2 0x4 -#define MODEL_o2 0x3 -#define MODEL_g1 0x2 -#define MODEL_o72 0x1 -#define MODEL_o29 0x0 +#define MODEL_Root 0x2B +#define MODEL_mario_g 0x2A +#define MODEL_mario_o 0x29 +#define MODEL_Default 0x28 +#define MODEL_nagare 0x27 +#define MODEL_kumo 0x26 +#define MODEL_k13 0x25 +#define MODEL_k12 0x24 +#define MODEL_k11 0x23 +#define MODEL_k10 0x22 +#define MODEL_k9 0x21 +#define MODEL_k8 0x20 +#define MODEL_k7 0x1F +#define MODEL_k6 0x1E +#define MODEL_k5 0x1D +#define MODEL_k4 0x1C +#define MODEL_k3 0x1B +#define MODEL_k2 0x1A +#define MODEL_k1 0x19 +#define MODEL_starland 0x18 +#define MODEL_stl_2 0x17 +#define MODEL_s5 0x16 +#define MODEL_s4 0x15 +#define MODEL_s3 0x14 +#define MODEL_stl_1 0x13 +#define MODEL_ls1 0x12 +#define MODEL_s2 0x11 +#define MODEL_s1 0x10 +#define MODEL_castle 0xF +#define MODEL_c8 0xE +#define MODEL_c7 0xD +#define MODEL_c6 0xC +#define MODEL_c5 0xB +#define MODEL_c4 0xA +#define MODEL_c3 0x9 +#define MODEL_c2 0x8 +#define MODEL_c1 0x7 +#define MODEL_g3 0x6 +#define MODEL_o3 0x5 +#define MODEL_g2 0x4 +#define MODEL_o2 0x3 +#define MODEL_g1 0x2 +#define MODEL_o72 0x1 +#define MODEL_o29 0x0 + diff --git a/include/mapfs/hos_20_hit.h b/include/mapfs/hos_20_hit.h index 7a9b87793f..08e8c63265 100644 --- a/include/mapfs/hos_20_hit.h +++ b/include/mapfs/hos_20_hit.h @@ -1,3 +1,8 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_camera 0x1 -#define COLLIDER_o56 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_camera 0x1 +#define COLLIDER_o56 0x0 + +#define ZONE_Root 0x2 +#define ZONE_camera 0x1 +#define ZONE_o56 0x0 + diff --git a/include/mapfs/hos_20_shape.h b/include/mapfs/hos_20_shape.h index a70c37233f..cc384fc94d 100644 --- a/include/mapfs/hos_20_shape.h +++ b/include/mapfs/hos_20_shape.h @@ -1,12 +1,13 @@ -#define MODEL_Root 0xB -#define MODEL_ry 0xA -#define MODEL_ry4 0x9 -#define MODEL_ry3 0x8 -#define MODEL_ry2 0x7 -#define MODEL_ry1 0x6 -#define MODEL_tube 0x5 -#define MODEL_h4 0x4 -#define MODEL_h3 0x3 -#define MODEL_hoshibg 0x2 -#define MODEL_h2 0x1 -#define MODEL_h1 0x0 +#define MODEL_Root 0xB +#define MODEL_ry 0xA +#define MODEL_ry4 0x9 +#define MODEL_ry3 0x8 +#define MODEL_ry2 0x7 +#define MODEL_ry1 0x6 +#define MODEL_tube 0x5 +#define MODEL_h4 0x4 +#define MODEL_h3 0x3 +#define MODEL_hoshibg 0x2 +#define MODEL_h2 0x1 +#define MODEL_h1 0x0 + diff --git a/include/mapfs/hos_bt01_hit.h b/include/mapfs/hos_bt01_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/hos_bt01_hit.h +++ b/include/mapfs/hos_bt01_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/hos_bt01_shape.h b/include/mapfs/hos_bt01_shape.h index 0904e11361..c4a704ce93 100644 --- a/include/mapfs/hos_bt01_shape.h +++ b/include/mapfs/hos_bt01_shape.h @@ -1,41 +1,42 @@ -#define MODEL_Root 0x28 -#define MODEL_g72 0x27 -#define MODEL_g99 0x26 -#define MODEL_o346 0x25 -#define MODEL_o365 0x24 -#define MODEL_g97 0x23 -#define MODEL_o343 0x22 -#define MODEL_o363 0x21 -#define MODEL_g96 0x20 -#define MODEL_o341 0x1F -#define MODEL_o362 0x1E -#define MODEL_g103 0x1D -#define MODEL_o354 0x1C -#define MODEL_o361 0x1B -#define MODEL_g101 0x1A -#define MODEL_o353 0x19 -#define MODEL_o359 0x18 -#define MODEL_g100 0x17 -#define MODEL_o347 0x16 -#define MODEL_o356 0x15 -#define MODEL_g98 0x14 -#define MODEL_o344 0x13 -#define MODEL_o357 0x12 -#define MODEL_g95 0x11 -#define MODEL_o338 0x10 -#define MODEL_o355 0xF -#define MODEL_o336 0xE -#define MODEL_o333 0xD -#define MODEL_o334 0xC -#define MODEL_dai 0xB -#define MODEL_g94 0xA -#define MODEL_o349 0x9 -#define MODEL_g93 0x8 -#define MODEL_o352 0x7 -#define MODEL_g92 0x6 -#define MODEL_o345 0x5 -#define MODEL_o332 0x4 -#define MODEL_waki1_2 0x3 -#define MODEL_g49 0x2 -#define MODEL_waku2 0x1 -#define MODEL_waku_2 0x0 +#define MODEL_Root 0x28 +#define MODEL_g72 0x27 +#define MODEL_g99 0x26 +#define MODEL_o346 0x25 +#define MODEL_o365 0x24 +#define MODEL_g97 0x23 +#define MODEL_o343 0x22 +#define MODEL_o363 0x21 +#define MODEL_g96 0x20 +#define MODEL_o341 0x1F +#define MODEL_o362 0x1E +#define MODEL_g103 0x1D +#define MODEL_o354 0x1C +#define MODEL_o361 0x1B +#define MODEL_g101 0x1A +#define MODEL_o353 0x19 +#define MODEL_o359 0x18 +#define MODEL_g100 0x17 +#define MODEL_o347 0x16 +#define MODEL_o356 0x15 +#define MODEL_g98 0x14 +#define MODEL_o344 0x13 +#define MODEL_o357 0x12 +#define MODEL_g95 0x11 +#define MODEL_o338 0x10 +#define MODEL_o355 0xF +#define MODEL_o336 0xE +#define MODEL_o333 0xD +#define MODEL_o334 0xC +#define MODEL_dai 0xB +#define MODEL_g94 0xA +#define MODEL_o349 0x9 +#define MODEL_g93 0x8 +#define MODEL_o352 0x7 +#define MODEL_g92 0x6 +#define MODEL_o345 0x5 +#define MODEL_o332 0x4 +#define MODEL_waki1_2 0x3 +#define MODEL_g49 0x2 +#define MODEL_waku2 0x1 +#define MODEL_waku_2 0x0 + diff --git a/include/mapfs/hos_bt02_hit.h b/include/mapfs/hos_bt02_hit.h index 6beebe566b..de5ee871e7 100644 --- a/include/mapfs/hos_bt02_hit.h +++ b/include/mapfs/hos_bt02_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_g1 0x1 -#define COLLIDER_o1 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_g1 0x1 +#define COLLIDER_o1 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/hos_bt02_shape.h b/include/mapfs/hos_bt02_shape.h index 3764f2b1e4..cf5df1e3e5 100644 --- a/include/mapfs/hos_bt02_shape.h +++ b/include/mapfs/hos_bt02_shape.h @@ -1,34 +1,35 @@ -#define MODEL_Root 0x21 -#define MODEL_g78 0x20 -#define MODEL_g94 0x1F -#define MODEL_g87 0x1E -#define MODEL_o366 0x1D -#define MODEL_o364 0x1C -#define MODEL_o365 0x1B -#define MODEL_o373 0x1A -#define MODEL_o377 0x19 -#define MODEL_g89 0x18 -#define MODEL_g92 0x17 -#define MODEL_o375 0x16 -#define MODEL_o372 0x15 -#define MODEL_g96 0x14 -#define MODEL_o376 0x13 -#define MODEL_g95 0x12 -#define MODEL_o371 0x11 -#define MODEL_g91 0x10 -#define MODEL_o346 0xF -#define MODEL_o367 0xE -#define MODEL_o354 0xD -#define MODEL_g84 0xC -#define MODEL_o352 0xB -#define MODEL_o351 0xA -#define MODEL_o350 0x9 -#define MODEL_g79 0x8 -#define MODEL_g90 0x7 -#define MODEL_o370 0x6 -#define MODEL_o369 0x5 -#define MODEL_o368 0x4 -#define MODEL_o335 0x3 -#define MODEL_o328 0x2 -#define MODEL_g93 0x1 -#define MODEL_o374 0x0 +#define MODEL_Root 0x21 +#define MODEL_g78 0x20 +#define MODEL_g94 0x1F +#define MODEL_g87 0x1E +#define MODEL_o366 0x1D +#define MODEL_o364 0x1C +#define MODEL_o365 0x1B +#define MODEL_o373 0x1A +#define MODEL_o377 0x19 +#define MODEL_g89 0x18 +#define MODEL_g92 0x17 +#define MODEL_o375 0x16 +#define MODEL_o372 0x15 +#define MODEL_g96 0x14 +#define MODEL_o376 0x13 +#define MODEL_g95 0x12 +#define MODEL_o371 0x11 +#define MODEL_g91 0x10 +#define MODEL_o346 0xF +#define MODEL_o367 0xE +#define MODEL_o354 0xD +#define MODEL_g84 0xC +#define MODEL_o352 0xB +#define MODEL_o351 0xA +#define MODEL_o350 0x9 +#define MODEL_g79 0x8 +#define MODEL_g90 0x7 +#define MODEL_o370 0x6 +#define MODEL_o369 0x5 +#define MODEL_o368 0x4 +#define MODEL_o335 0x3 +#define MODEL_o328 0x2 +#define MODEL_g93 0x1 +#define MODEL_o374 0x0 + diff --git a/include/mapfs/isk_01_hit.h b/include/mapfs/isk_01_hit.h index 1d773e07a9..5946cdb77e 100644 --- a/include/mapfs/isk_01_hit.h +++ b/include/mapfs/isk_01_hit.h @@ -1,28 +1,40 @@ -#define COLLIDER_Root 0x1B -#define COLLIDER_01 0x1A -#define COLLIDER_g194 0x19 -#define COLLIDER_g307 0x18 -#define COLLIDER_o1966 0x17 -#define COLLIDER_o1970 0x16 -#define COLLIDER_g199 0x15 -#define COLLIDER_o1205 0x14 -#define COLLIDER_g197 0x13 -#define COLLIDER_o1991 0x12 -#define COLLIDER_o1990 0x11 -#define COLLIDER_o1989 0x10 -#define COLLIDER_o1988 0xF -#define COLLIDER_o1531 0xE -#define COLLIDER_o1504 0xD -#define COLLIDER_g196 0xC -#define COLLIDER_o1185 0xB -#define COLLIDER_o1183 0xA -#define COLLIDER_o1182 0x9 -#define COLLIDER_g306 0x8 -#define COLLIDER_g311 0x7 -#define COLLIDER_o1981 0x6 -#define COLLIDER_deilite 0x5 -#define COLLIDER_deilie 0x4 -#define COLLIDER_g310 0x3 -#define COLLIDER_o1983 0x2 -#define COLLIDER_deilitw 0x1 -#define COLLIDER_deiliw 0x0 +#define COLLIDER_Root 0x1B +#define COLLIDER_01 0x1A +#define COLLIDER_g194 0x19 +#define COLLIDER_g307 0x18 +#define COLLIDER_o1966 0x17 +#define COLLIDER_o1970 0x16 +#define COLLIDER_g199 0x15 +#define COLLIDER_o1205 0x14 +#define COLLIDER_g197 0x13 +#define COLLIDER_o1991 0x12 +#define COLLIDER_o1990 0x11 +#define COLLIDER_o1989 0x10 +#define COLLIDER_o1988 0xF +#define COLLIDER_o1531 0xE +#define COLLIDER_o1504 0xD +#define COLLIDER_g196 0xC +#define COLLIDER_o1185 0xB +#define COLLIDER_o1183 0xA +#define COLLIDER_o1182 0x9 +#define COLLIDER_g306 0x8 +#define COLLIDER_g311 0x7 +#define COLLIDER_o1981 0x6 +#define COLLIDER_deilite 0x5 +#define COLLIDER_deilie 0x4 +#define COLLIDER_g310 0x3 +#define COLLIDER_o1983 0x2 +#define COLLIDER_deilitw 0x1 +#define COLLIDER_deiliw 0x0 + +#define ZONE_Root 0x9 +#define ZONE_01 0x8 +#define ZONE_g309 0x7 +#define ZONE_deilie 0x6 +#define ZONE_o1182 0x5 +#define ZONE_g306 0x4 +#define ZONE_o1183 0x3 +#define ZONE_g194 0x2 +#define ZONE_deiliw 0x1 +#define ZONE_o1185 0x0 + diff --git a/include/mapfs/isk_01_shape.h b/include/mapfs/isk_01_shape.h index 799480d116..ddff0ada63 100644 --- a/include/mapfs/isk_01_shape.h +++ b/include/mapfs/isk_01_shape.h @@ -1,37 +1,38 @@ -#define MODEL_Root 0x24 -#define MODEL_g13 0x23 -#define MODEL_g23 0x22 -#define MODEL_o112 0x21 -#define MODEL_o110 0x20 -#define MODEL_o102 0x1F -#define MODEL_g22 0x1E -#define MODEL_o101 0x1D -#define MODEL_o100 0x1C -#define MODEL_g21 0x1B -#define MODEL_o99 0x1A -#define MODEL_g14 0x19 -#define MODEL_g19 0x18 -#define MODEL_o94 0x17 -#define MODEL_o93 0x16 -#define MODEL_o92 0x15 -#define MODEL_o91 0x14 -#define MODEL_o90 0x13 -#define MODEL_g18 0x12 -#define MODEL_o89 0x11 -#define MODEL_o88 0x10 -#define MODEL_g17 0xF -#define MODEL_o87 0xE -#define MODEL_o85 0xD -#define MODEL_o84 0xC -#define MODEL_o83 0xB -#define MODEL_o81 0xA -#define MODEL_g16 0x9 -#define MODEL_o75 0x8 -#define MODEL_o74 0x7 -#define MODEL_o73 0x6 -#define MODEL_o72 0x5 -#define MODEL_o71 0x4 -#define MODEL_g15 0x3 -#define MODEL_o65 0x2 -#define MODEL_o64 0x1 -#define MODEL_o63 0x0 +#define MODEL_Root 0x24 +#define MODEL_g13 0x23 +#define MODEL_g23 0x22 +#define MODEL_o112 0x21 +#define MODEL_o110 0x20 +#define MODEL_o102 0x1F +#define MODEL_g22 0x1E +#define MODEL_o101 0x1D +#define MODEL_o100 0x1C +#define MODEL_g21 0x1B +#define MODEL_o99 0x1A +#define MODEL_g14 0x19 +#define MODEL_g19 0x18 +#define MODEL_o94 0x17 +#define MODEL_o93 0x16 +#define MODEL_o92 0x15 +#define MODEL_o91 0x14 +#define MODEL_o90 0x13 +#define MODEL_g18 0x12 +#define MODEL_o89 0x11 +#define MODEL_o88 0x10 +#define MODEL_g17 0xF +#define MODEL_o87 0xE +#define MODEL_o85 0xD +#define MODEL_o84 0xC +#define MODEL_o83 0xB +#define MODEL_o81 0xA +#define MODEL_g16 0x9 +#define MODEL_o75 0x8 +#define MODEL_o74 0x7 +#define MODEL_o73 0x6 +#define MODEL_o72 0x5 +#define MODEL_o71 0x4 +#define MODEL_g15 0x3 +#define MODEL_o65 0x2 +#define MODEL_o64 0x1 +#define MODEL_o63 0x0 + diff --git a/include/mapfs/isk_02_hit.h b/include/mapfs/isk_02_hit.h index 8c895011ef..2200c33e91 100644 --- a/include/mapfs/isk_02_hit.h +++ b/include/mapfs/isk_02_hit.h @@ -1,57 +1,81 @@ -#define COLLIDER_Root 0x38 -#define COLLIDER_02 0x37 -#define COLLIDER_g34 0x36 -#define COLLIDER_g24 0x35 -#define COLLIDER_h3o 0x34 -#define COLLIDER_h2o 0x33 -#define COLLIDER_h1o 0x32 -#define COLLIDER_g35 0x31 -#define COLLIDER_h3c 0x30 -#define COLLIDER_h2c 0x2F -#define COLLIDER_h1c 0x2E -#define COLLIDER_g23 0x2D -#define COLLIDER_o143 0x2C -#define COLLIDER_o142 0x2B -#define COLLIDER_o141 0x2A -#define COLLIDER_g22 0x29 -#define COLLIDER_o140 0x28 -#define COLLIDER_o139 0x27 -#define COLLIDER_g21 0x26 -#define COLLIDER_o138 0x25 -#define COLLIDER_g14 0x24 -#define COLLIDER_o170 0x23 -#define COLLIDER_o84 0x22 -#define COLLIDER_o86 0x21 -#define COLLIDER_o71 0x20 -#define COLLIDER_o70 0x1F -#define COLLIDER_o68 0x1E -#define COLLIDER_o69 0x1D -#define COLLIDER_o67 0x1C -#define COLLIDER_o66 0x1B -#define COLLIDER_o72 0x1A -#define COLLIDER_o73 0x19 -#define COLLIDER_o74 0x18 -#define COLLIDER_o85 0x17 -#define COLLIDER_g13 0x16 -#define COLLIDER_o114 0x15 -#define COLLIDER_o115 0x14 -#define COLLIDER_o113 0x13 -#define COLLIDER_o112 0x12 -#define COLLIDER_o107 0x11 -#define COLLIDER_o106 0x10 -#define COLLIDER_o105 0xF -#define COLLIDER_o104 0xE -#define COLLIDER_g17 0xD -#define COLLIDER_g40 0xC -#define COLLIDER_o136 0xB -#define COLLIDER_deilittne 0xA -#define COLLIDER_deilitne 0x9 -#define COLLIDER_deiline 0x8 -#define COLLIDER_g39 0x7 -#define COLLIDER_o135 0x6 -#define COLLIDER_deilite 0x5 -#define COLLIDER_deilie 0x4 -#define COLLIDER_g38 0x3 -#define COLLIDER_o134 0x2 -#define COLLIDER_deilitw 0x1 -#define COLLIDER_deiliw 0x0 +#define COLLIDER_Root 0x38 +#define COLLIDER_02 0x37 +#define COLLIDER_g34 0x36 +#define COLLIDER_g24 0x35 +#define COLLIDER_h3o 0x34 +#define COLLIDER_h2o 0x33 +#define COLLIDER_h1o 0x32 +#define COLLIDER_g35 0x31 +#define COLLIDER_h3c 0x30 +#define COLLIDER_h2c 0x2F +#define COLLIDER_h1c 0x2E +#define COLLIDER_g23 0x2D +#define COLLIDER_o143 0x2C +#define COLLIDER_o142 0x2B +#define COLLIDER_o141 0x2A +#define COLLIDER_g22 0x29 +#define COLLIDER_o140 0x28 +#define COLLIDER_o139 0x27 +#define COLLIDER_g21 0x26 +#define COLLIDER_o138 0x25 +#define COLLIDER_g14 0x24 +#define COLLIDER_o170 0x23 +#define COLLIDER_o84 0x22 +#define COLLIDER_o86 0x21 +#define COLLIDER_o71 0x20 +#define COLLIDER_o70 0x1F +#define COLLIDER_o68 0x1E +#define COLLIDER_o69 0x1D +#define COLLIDER_o67 0x1C +#define COLLIDER_o66 0x1B +#define COLLIDER_o72 0x1A +#define COLLIDER_o73 0x19 +#define COLLIDER_o74 0x18 +#define COLLIDER_o85 0x17 +#define COLLIDER_g13 0x16 +#define COLLIDER_o114 0x15 +#define COLLIDER_o115 0x14 +#define COLLIDER_o113 0x13 +#define COLLIDER_o112 0x12 +#define COLLIDER_o107 0x11 +#define COLLIDER_o106 0x10 +#define COLLIDER_o105 0xF +#define COLLIDER_o104 0xE +#define COLLIDER_g17 0xD +#define COLLIDER_g40 0xC +#define COLLIDER_o136 0xB +#define COLLIDER_deilittne 0xA +#define COLLIDER_deilitne 0x9 +#define COLLIDER_deiline 0x8 +#define COLLIDER_g39 0x7 +#define COLLIDER_o135 0x6 +#define COLLIDER_deilite 0x5 +#define COLLIDER_deilie 0x4 +#define COLLIDER_g38 0x3 +#define COLLIDER_o134 0x2 +#define COLLIDER_deilitw 0x1 +#define COLLIDER_deiliw 0x0 + +#define ZONE_Root 0x15 +#define ZONE_02 0x14 +#define ZONE_g20 0x13 +#define ZONE_o140 0x12 +#define ZONE_deiline 0x11 +#define ZONE_deilie 0x10 +#define ZONE_o74 0xF +#define ZONE_g21 0xE +#define ZONE_o139 0xD +#define ZONE_o136 0xC +#define ZONE_o134 0xB +#define ZONE_o70 0xA +#define ZONE_g17 0x9 +#define ZONE_o73 0x8 +#define ZONE_o72 0x7 +#define ZONE_o69 0x6 +#define ZONE_o68 0x5 +#define ZONE_o67 0x4 +#define ZONE_o66 0x3 +#define ZONE_g14 0x2 +#define ZONE_deiliw 0x1 +#define ZONE_o71 0x0 + diff --git a/include/mapfs/isk_02_shape.h b/include/mapfs/isk_02_shape.h index 9ec3ccd7a8..3358f598fe 100644 --- a/include/mapfs/isk_02_shape.h +++ b/include/mapfs/isk_02_shape.h @@ -1,104 +1,105 @@ -#define MODEL_Root 0x67 -#define MODEL_g314 0x66 -#define MODEL_g331 0x65 -#define MODEL_g349 0x64 -#define MODEL_g350 0x63 -#define MODEL_o2032 0x62 -#define MODEL_o2031 0x61 -#define MODEL_o2030 0x60 -#define MODEL_g336 0x5F -#define MODEL_o2013 0x5E -#define MODEL_o2012 0x5D -#define MODEL_g327 0x5C -#define MODEL_g347 0x5B -#define MODEL_g348 0x5A -#define MODEL_o2029 0x59 -#define MODEL_o2028 0x58 -#define MODEL_o2027 0x57 -#define MODEL_g335 0x56 -#define MODEL_o2011 0x55 -#define MODEL_o2010 0x54 -#define MODEL_g323 0x53 -#define MODEL_g345 0x52 -#define MODEL_g346 0x51 -#define MODEL_o2026 0x50 -#define MODEL_o2025 0x4F -#define MODEL_o2024 0x4E -#define MODEL_g324 0x4D -#define MODEL_o1996 0x4C -#define MODEL_o1995 0x4B -#define MODEL_02 0x4A -#define MODEL_g309 0x49 -#define MODEL_o1969 0x48 -#define MODEL_o1968 0x47 -#define MODEL_g308 0x46 -#define MODEL_o1967 0x45 -#define MODEL_o1966 0x44 -#define MODEL_g304 0x43 -#define MODEL_o1962 0x42 -#define MODEL_o1961 0x41 -#define MODEL_g303 0x40 -#define MODEL_o2044 0x3F -#define MODEL_o2043 0x3E -#define MODEL_o1979 0x3D -#define MODEL_o1970 0x3C -#define MODEL_o1971 0x3B -#define MODEL_o1972 0x3A -#define MODEL_o1975 0x39 -#define MODEL_o1974 0x38 -#define MODEL_o1973 0x37 -#define MODEL_o96 0x36 -#define MODEL_g7 0x35 -#define MODEL_o1978 0x34 -#define MODEL_o1977 0x33 -#define MODEL_o1976 0x32 -#define MODEL_o77 0x31 -#define MODEL_o76 0x30 -#define MODEL_o59 0x2F -#define MODEL_g45 0x2E -#define MODEL_o1244 0x2D -#define MODEL_o366 0x2C -#define MODEL_o364 0x2B -#define MODEL_o93 0x2A -#define MODEL_g202 0x29 -#define MODEL_o2046 0x28 -#define MODEL_o2045 0x27 -#define MODEL_o1233 0x26 -#define MODEL_o1231 0x25 -#define MODEL_o1232 0x24 -#define MODEL_o1494 0x23 -#define MODEL_o1493 0x22 -#define MODEL_o1492 0x21 -#define MODEL_o1491 0x20 -#define MODEL_o1246 0x1F -#define MODEL_o1229 0x1E -#define MODEL_o1227 0x1D -#define MODEL_o1225 0x1C -#define MODEL_g43 0x1B -#define MODEL_o1495 0x1A -#define MODEL_o1242 0x19 -#define MODEL_o1241 0x18 -#define MODEL_o356 0x17 -#define MODEL_o355 0x16 -#define MODEL_o354 0x15 -#define MODEL_o353 0x14 -#define MODEL_o352 0x13 -#define MODEL_o54 0x12 -#define MODEL_g6 0x11 -#define MODEL_o1964 0x10 -#define MODEL_o1497 0xF -#define MODEL_o1496 0xE -#define MODEL_o1240 0xD -#define MODEL_o1239 0xC -#define MODEL_o1965 0xB -#define MODEL_o1237 0xA -#define MODEL_o49 0x9 -#define MODEL_o48 0x8 -#define MODEL_o41 0x7 -#define MODEL_o40 0x6 -#define MODEL_o39 0x5 -#define MODEL_o38 0x4 -#define MODEL_o37 0x3 -#define MODEL_o36 0x2 -#define MODEL_o35 0x1 -#define MODEL_o34 0x0 +#define MODEL_Root 0x67 +#define MODEL_g314 0x66 +#define MODEL_g331 0x65 +#define MODEL_g349 0x64 +#define MODEL_g350 0x63 +#define MODEL_o2032 0x62 +#define MODEL_o2031 0x61 +#define MODEL_o2030 0x60 +#define MODEL_g336 0x5F +#define MODEL_o2013 0x5E +#define MODEL_o2012 0x5D +#define MODEL_g327 0x5C +#define MODEL_g347 0x5B +#define MODEL_g348 0x5A +#define MODEL_o2029 0x59 +#define MODEL_o2028 0x58 +#define MODEL_o2027 0x57 +#define MODEL_g335 0x56 +#define MODEL_o2011 0x55 +#define MODEL_o2010 0x54 +#define MODEL_g323 0x53 +#define MODEL_g345 0x52 +#define MODEL_g346 0x51 +#define MODEL_o2026 0x50 +#define MODEL_o2025 0x4F +#define MODEL_o2024 0x4E +#define MODEL_g324 0x4D +#define MODEL_o1996 0x4C +#define MODEL_o1995 0x4B +#define MODEL_02 0x4A +#define MODEL_g309 0x49 +#define MODEL_o1969 0x48 +#define MODEL_o1968 0x47 +#define MODEL_g308 0x46 +#define MODEL_o1967 0x45 +#define MODEL_o1966 0x44 +#define MODEL_g304 0x43 +#define MODEL_o1962 0x42 +#define MODEL_o1961 0x41 +#define MODEL_g303 0x40 +#define MODEL_o2044 0x3F +#define MODEL_o2043 0x3E +#define MODEL_o1979 0x3D +#define MODEL_o1970 0x3C +#define MODEL_o1971 0x3B +#define MODEL_o1972 0x3A +#define MODEL_o1975 0x39 +#define MODEL_o1974 0x38 +#define MODEL_o1973 0x37 +#define MODEL_o96 0x36 +#define MODEL_g7 0x35 +#define MODEL_o1978 0x34 +#define MODEL_o1977 0x33 +#define MODEL_o1976 0x32 +#define MODEL_o77 0x31 +#define MODEL_o76 0x30 +#define MODEL_o59 0x2F +#define MODEL_g45 0x2E +#define MODEL_o1244 0x2D +#define MODEL_o366 0x2C +#define MODEL_o364 0x2B +#define MODEL_o93 0x2A +#define MODEL_g202 0x29 +#define MODEL_o2046 0x28 +#define MODEL_o2045 0x27 +#define MODEL_o1233 0x26 +#define MODEL_o1231 0x25 +#define MODEL_o1232 0x24 +#define MODEL_o1494 0x23 +#define MODEL_o1493 0x22 +#define MODEL_o1492 0x21 +#define MODEL_o1491 0x20 +#define MODEL_o1246 0x1F +#define MODEL_o1229 0x1E +#define MODEL_o1227 0x1D +#define MODEL_o1225 0x1C +#define MODEL_g43 0x1B +#define MODEL_o1495 0x1A +#define MODEL_o1242 0x19 +#define MODEL_o1241 0x18 +#define MODEL_o356 0x17 +#define MODEL_o355 0x16 +#define MODEL_o354 0x15 +#define MODEL_o353 0x14 +#define MODEL_o352 0x13 +#define MODEL_o54 0x12 +#define MODEL_g6 0x11 +#define MODEL_o1964 0x10 +#define MODEL_o1497 0xF +#define MODEL_o1496 0xE +#define MODEL_o1240 0xD +#define MODEL_o1239 0xC +#define MODEL_o1965 0xB +#define MODEL_o1237 0xA +#define MODEL_o49 0x9 +#define MODEL_o48 0x8 +#define MODEL_o41 0x7 +#define MODEL_o40 0x6 +#define MODEL_o39 0x5 +#define MODEL_o38 0x4 +#define MODEL_o37 0x3 +#define MODEL_o36 0x2 +#define MODEL_o35 0x1 +#define MODEL_o34 0x0 + diff --git a/include/mapfs/isk_03_hit.h b/include/mapfs/isk_03_hit.h index 87624023e3..e56c3689cc 100644 --- a/include/mapfs/isk_03_hit.h +++ b/include/mapfs/isk_03_hit.h @@ -1,54 +1,103 @@ -#define COLLIDER_Root 0x35 -#define COLLIDER_03 0x34 -#define COLLIDER_g309 0x33 -#define COLLIDER_o1990 0x32 -#define COLLIDER_o1989 0x31 -#define COLLIDER_g302 0x30 -#define COLLIDER_g210 0x2F -#define COLLIDER_o1345 0x2E -#define COLLIDER_o1344 0x2D -#define COLLIDER_o1343 0x2C -#define COLLIDER_g209 0x2B -#define COLLIDER_o1352 0x2A -#define COLLIDER_o1351 0x29 -#define COLLIDER_o1350 0x28 -#define COLLIDER_03_b 0x27 -#define COLLIDER_g308 0x26 -#define COLLIDER_o1973 0x25 -#define COLLIDER_o1972 0x24 -#define COLLIDER_g52 0x23 -#define COLLIDER_o2001 0x22 -#define COLLIDER_o1996 0x21 -#define COLLIDER_g51 0x20 -#define COLLIDER_o312 0x1F -#define COLLIDER_o130 0x1E -#define COLLIDER_o390 0x1D -#define COLLIDER_o391 0x1C -#define COLLIDER_o389 0x1B -#define COLLIDER_03_a 0x1A -#define COLLIDER_g11 0x19 -#define COLLIDER_o99 0x18 -#define COLLIDER_o104 0x17 -#define COLLIDER_g260 0x16 -#define COLLIDER_o1470 0x15 -#define COLLIDER_o115 0x14 -#define COLLIDER_g46 0x13 -#define COLLIDER_o111 0x12 -#define COLLIDER_o110 0x11 -#define COLLIDER_o1992 0x10 -#define COLLIDER_o370 0xF -#define COLLIDER_o137 0xE -#define COLLIDER_o369 0xD -#define COLLIDER_g312 0xC -#define COLLIDER_g12 0xB -#define COLLIDER_o1986 0xA -#define COLLIDER_deilitnw 0x9 -#define COLLIDER_deilinw 0x8 -#define COLLIDER_g313 0x7 -#define COLLIDER_o1988 0x6 -#define COLLIDER_deilite 0x5 -#define COLLIDER_deilie 0x4 -#define COLLIDER_g16 0x3 -#define COLLIDER_o1987 0x2 -#define COLLIDER_deilitw 0x1 -#define COLLIDER_deiliw 0x0 +#define COLLIDER_Root 0x35 +#define COLLIDER_03 0x34 +#define COLLIDER_g309 0x33 +#define COLLIDER_o1990 0x32 +#define COLLIDER_o1989 0x31 +#define COLLIDER_g302 0x30 +#define COLLIDER_g210 0x2F +#define COLLIDER_o1345 0x2E +#define COLLIDER_o1344 0x2D +#define COLLIDER_o1343 0x2C +#define COLLIDER_g209 0x2B +#define COLLIDER_o1352 0x2A +#define COLLIDER_o1351 0x29 +#define COLLIDER_o1350 0x28 +#define COLLIDER_03_b 0x27 +#define COLLIDER_g308 0x26 +#define COLLIDER_o1973 0x25 +#define COLLIDER_o1972 0x24 +#define COLLIDER_g52 0x23 +#define COLLIDER_o2001 0x22 +#define COLLIDER_o1996 0x21 +#define COLLIDER_g51 0x20 +#define COLLIDER_o312 0x1F +#define COLLIDER_o130 0x1E +#define COLLIDER_o390 0x1D +#define COLLIDER_o391 0x1C +#define COLLIDER_o389 0x1B +#define COLLIDER_03_a 0x1A +#define COLLIDER_g11 0x19 +#define COLLIDER_o99 0x18 +#define COLLIDER_o104 0x17 +#define COLLIDER_g260 0x16 +#define COLLIDER_o1470 0x15 +#define COLLIDER_o115 0x14 +#define COLLIDER_g46 0x13 +#define COLLIDER_o111 0x12 +#define COLLIDER_o110 0x11 +#define COLLIDER_o1992 0x10 +#define COLLIDER_o370 0xF +#define COLLIDER_o137 0xE +#define COLLIDER_o369 0xD +#define COLLIDER_g312 0xC +#define COLLIDER_g12 0xB +#define COLLIDER_o1986 0xA +#define COLLIDER_deilitnw 0x9 +#define COLLIDER_deilinw 0x8 +#define COLLIDER_g313 0x7 +#define COLLIDER_o1988 0x6 +#define COLLIDER_deilite 0x5 +#define COLLIDER_deilie 0x4 +#define COLLIDER_g16 0x3 +#define COLLIDER_o1987 0x2 +#define COLLIDER_deilitw 0x1 +#define COLLIDER_deiliw 0x0 + +#define ZONE_Root 0x2E +#define ZONE_Default 0x2D +#define ZONE_o389 0x2C +#define ZONE_deiliw 0x2B +#define ZONE_03 0x2A +#define ZONE_C2 0x29 +#define ZONE_sd 0x28 +#define ZONE_g327 0x27 +#define ZONE_o2027 0x26 +#define ZONE_o2026 0x25 +#define ZONE_g326 0x24 +#define ZONE_o2025 0x23 +#define ZONE_g325 0x22 +#define ZONE_o2024 0x21 +#define ZONE_o2023 0x20 +#define ZONE_f2 0x1F +#define ZONE_o2032 0x1E +#define ZONE_g332 0x1D +#define ZONE_o2014 0x1C +#define ZONE_o2013 0x1B +#define ZONE_g337 0x1A +#define ZONE_o2012 0x19 +#define ZONE_o137 0x18 +#define ZONE_o1963 0x17 +#define ZONE_g330 0x16 +#define ZONE_o2009 0x15 +#define ZONE_o2008 0x14 +#define ZONE_C1 0x13 +#define ZONE_su 0x12 +#define ZONE_g323 0x11 +#define ZONE_o2021 0x10 +#define ZONE_o2020 0xF +#define ZONE_g322 0xE +#define ZONE_o2019 0xD +#define ZONE_g321 0xC +#define ZONE_o2016 0xB +#define ZONE_o2015 0xA +#define ZONE_f1 0x9 +#define ZONE_g12 0x8 +#define ZONE_g331 0x7 +#define ZONE_o390 0x6 +#define ZONE_deilie 0x5 +#define ZONE_g46 0x4 +#define ZONE_o2030 0x3 +#define ZONE_o391 0x2 +#define ZONE_g307 0x1 +#define ZONE_g329 0x0 + diff --git a/include/mapfs/isk_03_shape.h b/include/mapfs/isk_03_shape.h index 1e9ef751bb..1efc887b02 100644 --- a/include/mapfs/isk_03_shape.h +++ b/include/mapfs/isk_03_shape.h @@ -1,89 +1,90 @@ -#define MODEL_Root 0x58 -#define MODEL_03 0x57 -#define MODEL_g322 0x56 -#define MODEL_o2015 0x55 -#define MODEL_o2016 0x54 -#define MODEL_o1996 0x53 -#define MODEL_g319 0x52 -#define MODEL_g321 0x51 -#define MODEL_o1993 0x50 -#define MODEL_o1992 0x4F -#define MODEL_o1991 0x4E -#define MODEL_g302 0x4D -#define MODEL_g207 0x4C -#define MODEL_g305 0x4B -#define MODEL_o1960 0x4A -#define MODEL_o1959 0x49 -#define MODEL_o1958 0x48 -#define MODEL_g211 0x47 -#define MODEL_o1346 0x46 -#define MODEL_g306 0x45 -#define MODEL_o1341 0x44 -#define MODEL_g210 0x43 -#define MODEL_o1356 0x42 -#define MODEL_o1355 0x41 -#define MODEL_o1354 0x40 -#define MODEL_o1345 0x3F -#define MODEL_o1344 0x3E -#define MODEL_o1343 0x3D -#define MODEL_g206 0x3C -#define MODEL_o1952 0x3B -#define MODEL_g209 0x3A -#define MODEL_o1352 0x39 -#define MODEL_o1351 0x38 -#define MODEL_o1350 0x37 -#define MODEL_g208 0x36 -#define MODEL_o1349 0x35 -#define MODEL_o1348 0x34 -#define MODEL_o1347 0x33 -#define MODEL_g307 0x32 -#define MODEL_o6000 0x31 -#define MODEL_03_b 0x30 -#define MODEL_g15 0x2F -#define MODEL_o2031 0x2E -#define MODEL_o2030 0x2D -#define MODEL_o126 0x2C -#define MODEL_o125 0x2B -#define MODEL_g52 0x2A -#define MODEL_o2010 0x29 -#define MODEL_o2005 0x28 -#define MODEL_o1998 0x27 -#define MODEL_o1997 0x26 -#define MODEL_g50 0x25 -#define MODEL_o2032 0x24 -#define MODEL_o312 0x23 -#define MODEL_o130 0x22 -#define MODEL_o1874 0x21 -#define MODEL_o1873 0x20 -#define MODEL_g51 0x1F -#define MODEL_o391 0x1E -#define MODEL_o390 0x1D -#define MODEL_o389 0x1C -#define MODEL_g16 0x1B -#define MODEL_o311 0x1A -#define MODEL_o131 0x19 -#define MODEL_03_a 0x18 -#define MODEL_g11 0x17 -#define MODEL_o99 0x16 -#define MODEL_o104 0x15 -#define MODEL_o103 0x14 -#define MODEL_o100 0x13 -#define MODEL_g260 0x12 -#define MODEL_o1471 0x11 -#define MODEL_o1470 0x10 -#define MODEL_o118 0xF -#define MODEL_o115 0xE -#define MODEL_g48 0xD -#define MODEL_o377 0xC -#define MODEL_g47 0xB -#define MODEL_o111 0xA -#define MODEL_o110 0x9 -#define MODEL_o376 0x8 -#define MODEL_o375 0x7 -#define MODEL_o107 0x6 -#define MODEL_g46 0x5 -#define MODEL_o137 0x4 -#define MODEL_o370 0x3 -#define MODEL_o369 0x2 -#define MODEL_g12 0x1 -#define MODEL_o113 0x0 +#define MODEL_Root 0x58 +#define MODEL_03 0x57 +#define MODEL_g322 0x56 +#define MODEL_o2015 0x55 +#define MODEL_o2016 0x54 +#define MODEL_o1996 0x53 +#define MODEL_g319 0x52 +#define MODEL_g321 0x51 +#define MODEL_o1993 0x50 +#define MODEL_o1992 0x4F +#define MODEL_o1991 0x4E +#define MODEL_g302 0x4D +#define MODEL_g207 0x4C +#define MODEL_g305 0x4B +#define MODEL_o1960 0x4A +#define MODEL_o1959 0x49 +#define MODEL_o1958 0x48 +#define MODEL_g211 0x47 +#define MODEL_o1346 0x46 +#define MODEL_g306 0x45 +#define MODEL_o1341 0x44 +#define MODEL_g210 0x43 +#define MODEL_o1356 0x42 +#define MODEL_o1355 0x41 +#define MODEL_o1354 0x40 +#define MODEL_o1345 0x3F +#define MODEL_o1344 0x3E +#define MODEL_o1343 0x3D +#define MODEL_g206 0x3C +#define MODEL_o1952 0x3B +#define MODEL_g209 0x3A +#define MODEL_o1352 0x39 +#define MODEL_o1351 0x38 +#define MODEL_o1350 0x37 +#define MODEL_g208 0x36 +#define MODEL_o1349 0x35 +#define MODEL_o1348 0x34 +#define MODEL_o1347 0x33 +#define MODEL_g307 0x32 +#define MODEL_o6000 0x31 +#define MODEL_03_b 0x30 +#define MODEL_g15 0x2F +#define MODEL_o2031 0x2E +#define MODEL_o2030 0x2D +#define MODEL_o126 0x2C +#define MODEL_o125 0x2B +#define MODEL_g52 0x2A +#define MODEL_o2010 0x29 +#define MODEL_o2005 0x28 +#define MODEL_o1998 0x27 +#define MODEL_o1997 0x26 +#define MODEL_g50 0x25 +#define MODEL_o2032 0x24 +#define MODEL_o312 0x23 +#define MODEL_o130 0x22 +#define MODEL_o1874 0x21 +#define MODEL_o1873 0x20 +#define MODEL_g51 0x1F +#define MODEL_o391 0x1E +#define MODEL_o390 0x1D +#define MODEL_o389 0x1C +#define MODEL_g16 0x1B +#define MODEL_o311 0x1A +#define MODEL_o131 0x19 +#define MODEL_03_a 0x18 +#define MODEL_g11 0x17 +#define MODEL_o99 0x16 +#define MODEL_o104 0x15 +#define MODEL_o103 0x14 +#define MODEL_o100 0x13 +#define MODEL_g260 0x12 +#define MODEL_o1471 0x11 +#define MODEL_o1470 0x10 +#define MODEL_o118 0xF +#define MODEL_o115 0xE +#define MODEL_g48 0xD +#define MODEL_o377 0xC +#define MODEL_g47 0xB +#define MODEL_o111 0xA +#define MODEL_o110 0x9 +#define MODEL_o376 0x8 +#define MODEL_o375 0x7 +#define MODEL_o107 0x6 +#define MODEL_g46 0x5 +#define MODEL_o137 0x4 +#define MODEL_o370 0x3 +#define MODEL_o369 0x2 +#define MODEL_g12 0x1 +#define MODEL_o113 0x0 + diff --git a/include/mapfs/isk_04_hit.h b/include/mapfs/isk_04_hit.h index e316179013..0c1365b851 100644 --- a/include/mapfs/isk_04_hit.h +++ b/include/mapfs/isk_04_hit.h @@ -1,46 +1,61 @@ -#define COLLIDER_Root 0x2D -#define COLLIDER_04 0x2C -#define COLLIDER_g26 0x2B -#define COLLIDER_o203 0x2A -#define COLLIDER_o162 0x29 -#define COLLIDER_o160 0x28 -#define COLLIDER_o158 0x27 -#define COLLIDER_o155 0x26 -#define COLLIDER_o151 0x25 -#define COLLIDER_o149 0x24 -#define COLLIDER_o147 0x23 -#define COLLIDER_o145 0x22 -#define COLLIDER_g24 0x21 -#define COLLIDER_o212 0x20 -#define COLLIDER_o187 0x1F -#define COLLIDER_o186 0x1E -#define COLLIDER_o177 0x1D -#define COLLIDER_o136 0x1C -#define COLLIDER_o134 0x1B -#define COLLIDER_o133 0x1A -#define COLLIDER_o132 0x19 -#define COLLIDER_o131 0x18 -#define COLLIDER_o130 0x17 -#define COLLIDER_g27 0x16 -#define COLLIDER_g37 0x15 -#define COLLIDER_o199 0x14 -#define COLLIDER_deilitse 0x13 -#define COLLIDER_deilise 0x12 -#define COLLIDER_g36 0x11 -#define COLLIDER_o198 0x10 -#define COLLIDER_deilite 0xF -#define COLLIDER_deilie 0xE -#define COLLIDER_g35 0xD -#define COLLIDER_o197 0xC -#define COLLIDER_deilitne 0xB -#define COLLIDER_deiline 0xA -#define COLLIDER_deilittne 0x9 -#define COLLIDER_g34 0x8 -#define COLLIDER_o196 0x7 -#define COLLIDER_deilitsw 0x6 -#define COLLIDER_deilisw 0x5 -#define COLLIDER_deilittsw 0x4 -#define COLLIDER_g33 0x3 -#define COLLIDER_o195 0x2 -#define COLLIDER_deilitw 0x1 -#define COLLIDER_deiliw 0x0 +#define COLLIDER_Root 0x2D +#define COLLIDER_04 0x2C +#define COLLIDER_g26 0x2B +#define COLLIDER_o203 0x2A +#define COLLIDER_o162 0x29 +#define COLLIDER_o160 0x28 +#define COLLIDER_o158 0x27 +#define COLLIDER_o155 0x26 +#define COLLIDER_o151 0x25 +#define COLLIDER_o149 0x24 +#define COLLIDER_o147 0x23 +#define COLLIDER_o145 0x22 +#define COLLIDER_g24 0x21 +#define COLLIDER_o212 0x20 +#define COLLIDER_o187 0x1F +#define COLLIDER_o186 0x1E +#define COLLIDER_o177 0x1D +#define COLLIDER_o136 0x1C +#define COLLIDER_o134 0x1B +#define COLLIDER_o133 0x1A +#define COLLIDER_o132 0x19 +#define COLLIDER_o131 0x18 +#define COLLIDER_o130 0x17 +#define COLLIDER_g27 0x16 +#define COLLIDER_g37 0x15 +#define COLLIDER_o199 0x14 +#define COLLIDER_deilitse 0x13 +#define COLLIDER_deilise 0x12 +#define COLLIDER_g36 0x11 +#define COLLIDER_o198 0x10 +#define COLLIDER_deilite 0xF +#define COLLIDER_deilie 0xE +#define COLLIDER_g35 0xD +#define COLLIDER_o197 0xC +#define COLLIDER_deilitne 0xB +#define COLLIDER_deiline 0xA +#define COLLIDER_deilittne 0x9 +#define COLLIDER_g34 0x8 +#define COLLIDER_o196 0x7 +#define COLLIDER_deilitsw 0x6 +#define COLLIDER_deilisw 0x5 +#define COLLIDER_deilittsw 0x4 +#define COLLIDER_g33 0x3 +#define COLLIDER_o195 0x2 +#define COLLIDER_deilitw 0x1 +#define COLLIDER_deiliw 0x0 + +#define ZONE_Root 0xC +#define ZONE_04 0xB +#define ZONE_g27 0xA +#define ZONE_deilise 0x9 +#define ZONE_deilie 0x8 +#define ZONE_deiline 0x7 +#define ZONE_o119 0x6 +#define ZONE_g26 0x5 +#define ZONE_o118 0x4 +#define ZONE_g23 0x3 +#define ZONE_deilisw 0x2 +#define ZONE_deiliw 0x1 +#define ZONE_o117 0x0 + diff --git a/include/mapfs/isk_04_shape.h b/include/mapfs/isk_04_shape.h index 05b8ff9c3b..425b90dbfd 100644 --- a/include/mapfs/isk_04_shape.h +++ b/include/mapfs/isk_04_shape.h @@ -1,72 +1,73 @@ -#define MODEL_Root 0x47 -#define MODEL_04 0x46 -#define MODEL_o1975 0x45 -#define MODEL_g304 0x44 -#define MODEL_o1963 0x43 -#define MODEL_o1962 0x42 -#define MODEL_g22 0x41 -#define MODEL_o536 0x40 -#define MODEL_g262 0x3F -#define MODEL_o1482 0x3E -#define MODEL_o1481 0x3D -#define MODEL_g36 0x3C -#define MODEL_o1973 0x3B -#define MODEL_o1972 0x3A -#define MODEL_o1971 0x39 -#define MODEL_o1970 0x38 -#define MODEL_o1969 0x37 -#define MODEL_o493 0x36 -#define MODEL_o303 0x35 -#define MODEL_o300 0x34 -#define MODEL_o298 0x33 -#define MODEL_o264 0x32 -#define MODEL_g192 0x31 -#define MODEL_o1171 0x30 -#define MODEL_o1169 0x2F -#define MODEL_o1168 0x2E -#define MODEL_o1166 0x2D -#define MODEL_o1165 0x2C -#define MODEL_o1162 0x2B -#define MODEL_o1161 0x2A -#define MODEL_o1160 0x29 -#define MODEL_o1159 0x28 -#define MODEL_o1158 0x27 -#define MODEL_o1157 0x26 -#define MODEL_o1156 0x25 -#define MODEL_o1155 0x24 -#define MODEL_o1154 0x23 -#define MODEL_o1153 0x22 -#define MODEL_o1478 0x21 -#define MODEL_o1477 0x20 -#define MODEL_g72 0x1F -#define MODEL_o490 0x1E -#define MODEL_o488 0x1D -#define MODEL_o486 0x1C -#define MODEL_g71 0x1B -#define MODEL_o1671 0x1A -#define MODEL_o1669 0x19 -#define MODEL_o1476 0x18 -#define MODEL_o1966 0x17 -#define MODEL_o1467 0x16 -#define MODEL_o1302 0x15 -#define MODEL_o1300 0x14 -#define MODEL_o510 0x13 -#define MODEL_o492 0x12 -#define MODEL_o301 0x11 -#define MODEL_o491 0x10 -#define MODEL_o489 0xF -#define MODEL_o487 0xE -#define MODEL_o468 0xD -#define MODEL_o467 0xC -#define MODEL_o466 0xB -#define MODEL_o257 0xA -#define MODEL_g70 0x9 -#define MODEL_o463 0x8 -#define MODEL_o462 0x7 -#define MODEL_o461 0x6 -#define MODEL_o460 0x5 -#define MODEL_o459 0x4 -#define MODEL_o1301 0x3 -#define MODEL_g23 0x2 -#define MODEL_o508 0x1 -#define MODEL_o275 0x0 +#define MODEL_Root 0x47 +#define MODEL_04 0x46 +#define MODEL_o1975 0x45 +#define MODEL_g304 0x44 +#define MODEL_o1963 0x43 +#define MODEL_o1962 0x42 +#define MODEL_g22 0x41 +#define MODEL_o536 0x40 +#define MODEL_g262 0x3F +#define MODEL_o1482 0x3E +#define MODEL_o1481 0x3D +#define MODEL_g36 0x3C +#define MODEL_o1973 0x3B +#define MODEL_o1972 0x3A +#define MODEL_o1971 0x39 +#define MODEL_o1970 0x38 +#define MODEL_o1969 0x37 +#define MODEL_o493 0x36 +#define MODEL_o303 0x35 +#define MODEL_o300 0x34 +#define MODEL_o298 0x33 +#define MODEL_o264 0x32 +#define MODEL_g192 0x31 +#define MODEL_o1171 0x30 +#define MODEL_o1169 0x2F +#define MODEL_o1168 0x2E +#define MODEL_o1166 0x2D +#define MODEL_o1165 0x2C +#define MODEL_o1162 0x2B +#define MODEL_o1161 0x2A +#define MODEL_o1160 0x29 +#define MODEL_o1159 0x28 +#define MODEL_o1158 0x27 +#define MODEL_o1157 0x26 +#define MODEL_o1156 0x25 +#define MODEL_o1155 0x24 +#define MODEL_o1154 0x23 +#define MODEL_o1153 0x22 +#define MODEL_o1478 0x21 +#define MODEL_o1477 0x20 +#define MODEL_g72 0x1F +#define MODEL_o490 0x1E +#define MODEL_o488 0x1D +#define MODEL_o486 0x1C +#define MODEL_g71 0x1B +#define MODEL_o1671 0x1A +#define MODEL_o1669 0x19 +#define MODEL_o1476 0x18 +#define MODEL_o1966 0x17 +#define MODEL_o1467 0x16 +#define MODEL_o1302 0x15 +#define MODEL_o1300 0x14 +#define MODEL_o510 0x13 +#define MODEL_o492 0x12 +#define MODEL_o301 0x11 +#define MODEL_o491 0x10 +#define MODEL_o489 0xF +#define MODEL_o487 0xE +#define MODEL_o468 0xD +#define MODEL_o467 0xC +#define MODEL_o466 0xB +#define MODEL_o257 0xA +#define MODEL_g70 0x9 +#define MODEL_o463 0x8 +#define MODEL_o462 0x7 +#define MODEL_o461 0x6 +#define MODEL_o460 0x5 +#define MODEL_o459 0x4 +#define MODEL_o1301 0x3 +#define MODEL_g23 0x2 +#define MODEL_o508 0x1 +#define MODEL_o275 0x0 + diff --git a/include/mapfs/isk_05_hit.h b/include/mapfs/isk_05_hit.h index 47532b42af..ef6390531c 100644 --- a/include/mapfs/isk_05_hit.h +++ b/include/mapfs/isk_05_hit.h @@ -1,16 +1,29 @@ -#define COLLIDER_Root 0xF -#define COLLIDER_05 0xE -#define COLLIDER_g79 0xD -#define COLLIDER_o2005 0xC -#define COLLIDER_o1982 0xB -#define COLLIDER_o524 0xA -#define COLLIDER_g77 0x9 -#define COLLIDER_o2012 0x8 -#define COLLIDER_o2019 0x7 -#define COLLIDER_o2018 0x6 -#define COLLIDER_o2017 0x5 -#define COLLIDER_g81 0x4 -#define COLLIDER_o1962 0x3 -#define COLLIDER_deilittw 0x2 -#define COLLIDER_deilitw 0x1 -#define COLLIDER_deiliw 0x0 +#define COLLIDER_Root 0xF +#define COLLIDER_05 0xE +#define COLLIDER_g79 0xD +#define COLLIDER_o2005 0xC +#define COLLIDER_o1982 0xB +#define COLLIDER_o524 0xA +#define COLLIDER_g77 0x9 +#define COLLIDER_o2012 0x8 +#define COLLIDER_o2019 0x7 +#define COLLIDER_o2018 0x6 +#define COLLIDER_o2017 0x5 +#define COLLIDER_g81 0x4 +#define COLLIDER_o1962 0x3 +#define COLLIDER_deilittw 0x2 +#define COLLIDER_deilitw 0x1 +#define COLLIDER_deiliw 0x0 + +#define ZONE_Root 0xA +#define ZONE_Default 0x9 +#define ZONE_deiliw 0x8 +#define ZONE_o515 0x7 +#define ZONE_05 0x6 +#define ZONE_g303 0x5 +#define ZONE_o1970 0x4 +#define ZONE_o516 0x3 +#define ZONE_g81 0x2 +#define ZONE_o1966 0x1 +#define ZONE_g77 0x0 + diff --git a/include/mapfs/isk_05_shape.h b/include/mapfs/isk_05_shape.h index ef971f8bf1..2f487944c2 100644 --- a/include/mapfs/isk_05_shape.h +++ b/include/mapfs/isk_05_shape.h @@ -1,47 +1,48 @@ -#define MODEL_Root 0x2E -#define MODEL_05 0x2D -#define MODEL_o2019 0x2C -#define MODEL_o2016 0x2B -#define MODEL_g305 0x2A -#define MODEL_wan1 0x29 -#define MODEL_o2021 0x28 -#define MODEL_o2020 0x27 -#define MODEL_wan2 0x26 -#define MODEL_o2008 0x25 -#define MODEL_o2007 0x24 -#define MODEL_g307 0x23 -#define MODEL_o2010 0x22 -#define MODEL_o2009 0x21 -#define MODEL_o2006 0x20 -#define MODEL_g304 0x1F -#define MODEL_o2005 0x1E -#define MODEL_o2004 0x1D -#define MODEL_g303 0x1C -#define MODEL_o2003 0x1B -#define MODEL_o2002 0x1A -#define MODEL_o2001 0x19 -#define MODEL_o2000 0x18 -#define MODEL_o1999 0x17 -#define MODEL_g81 0x16 -#define MODEL_o528 0x15 -#define MODEL_g79 0x14 -#define MODEL_o1979 0x13 -#define MODEL_o1978 0x12 -#define MODEL_o524 0x11 -#define MODEL_o523 0x10 -#define MODEL_g78 0xF -#define MODEL_o2015 0xE -#define MODEL_o2014 0xD -#define MODEL_o2012 0xC -#define MODEL_o1983 0xB -#define MODEL_o1972 0xA -#define MODEL_o522 0x9 -#define MODEL_o521 0x8 -#define MODEL_o1994 0x7 -#define MODEL_o2030 0x6 -#define MODEL_o2027 0x5 -#define MODEL_o1992 0x4 -#define MODEL_g77 0x3 -#define MODEL_o1963 0x2 -#define MODEL_o516 0x1 -#define MODEL_o515 0x0 +#define MODEL_Root 0x2E +#define MODEL_05 0x2D +#define MODEL_o2019 0x2C +#define MODEL_o2016 0x2B +#define MODEL_g305 0x2A +#define MODEL_wan1 0x29 +#define MODEL_o2021 0x28 +#define MODEL_o2020 0x27 +#define MODEL_wan2 0x26 +#define MODEL_o2008 0x25 +#define MODEL_o2007 0x24 +#define MODEL_g307 0x23 +#define MODEL_o2010 0x22 +#define MODEL_o2009 0x21 +#define MODEL_o2006 0x20 +#define MODEL_g304 0x1F +#define MODEL_o2005 0x1E +#define MODEL_o2004 0x1D +#define MODEL_g303 0x1C +#define MODEL_o2003 0x1B +#define MODEL_o2002 0x1A +#define MODEL_o2001 0x19 +#define MODEL_o2000 0x18 +#define MODEL_o1999 0x17 +#define MODEL_g81 0x16 +#define MODEL_o528 0x15 +#define MODEL_g79 0x14 +#define MODEL_o1979 0x13 +#define MODEL_o1978 0x12 +#define MODEL_o524 0x11 +#define MODEL_o523 0x10 +#define MODEL_g78 0xF +#define MODEL_o2015 0xE +#define MODEL_o2014 0xD +#define MODEL_o2012 0xC +#define MODEL_o1983 0xB +#define MODEL_o1972 0xA +#define MODEL_o522 0x9 +#define MODEL_o521 0x8 +#define MODEL_o1994 0x7 +#define MODEL_o2030 0x6 +#define MODEL_o2027 0x5 +#define MODEL_o1992 0x4 +#define MODEL_g77 0x3 +#define MODEL_o1963 0x2 +#define MODEL_o516 0x1 +#define MODEL_o515 0x0 + diff --git a/include/mapfs/isk_06_hit.h b/include/mapfs/isk_06_hit.h index 507f590171..25df6c00bc 100644 --- a/include/mapfs/isk_06_hit.h +++ b/include/mapfs/isk_06_hit.h @@ -1,52 +1,93 @@ -#define COLLIDER_Root 0x33 -#define COLLIDER_06 0x32 -#define COLLIDER_g304 0x31 -#define COLLIDER_g277 0x30 -#define COLLIDER_o1677 0x2F -#define COLLIDER_o1676 0x2E -#define COLLIDER_o1675 0x2D -#define COLLIDER_g341 0x2C -#define COLLIDER_o2083 0x2B -#define COLLIDER_o2082 0x2A -#define COLLIDER_g281 0x29 -#define COLLIDER_o1691 0x28 -#define COLLIDER_o1690 0x27 -#define COLLIDER_o1689 0x26 -#define COLLIDER_g340 0x25 -#define COLLIDER_o2078 0x24 -#define COLLIDER_o2077 0x23 -#define COLLIDER_g343 0x22 -#define COLLIDER_o2091 0x21 -#define COLLIDER_o2090 0x20 -#define COLLIDER_06_b 0x1F -#define COLLIDER_g261 0x1E -#define COLLIDER_o2109 0x1D -#define COLLIDER_o1474 0x1C -#define COLLIDER_g55 0x1B -#define COLLIDER_o2119 0x1A -#define COLLIDER_o2118 0x19 -#define COLLIDER_o2117 0x18 -#define COLLIDER_g27 0x17 -#define COLLIDER_o1990 0x16 -#define COLLIDER_o1987 0x15 -#define COLLIDER_06_a 0x14 -#define COLLIDER_o2103 0x13 -#define COLLIDER_g64 0x12 -#define COLLIDER_o1483 0x11 -#define COLLIDER_o426 0x10 -#define COLLIDER_g62 0xF -#define COLLIDER_o2116 0xE -#define COLLIDER_o2115 0xD -#define COLLIDER_o2114 0xC -#define COLLIDER_g61 0xB -#define COLLIDER_o1981 0xA -#define COLLIDER_o1975 0x9 -#define COLLIDER_g349 0x8 -#define COLLIDER_g59 0x7 -#define COLLIDER_o2000 0x6 -#define COLLIDER_deilite 0x5 -#define COLLIDER_deilie 0x4 -#define COLLIDER_g66 0x3 -#define COLLIDER_o2001 0x2 -#define COLLIDER_deilitne 0x1 -#define COLLIDER_deiline 0x0 +#define COLLIDER_Root 0x33 +#define COLLIDER_06 0x32 +#define COLLIDER_g304 0x31 +#define COLLIDER_g277 0x30 +#define COLLIDER_o1677 0x2F +#define COLLIDER_o1676 0x2E +#define COLLIDER_o1675 0x2D +#define COLLIDER_g341 0x2C +#define COLLIDER_o2083 0x2B +#define COLLIDER_o2082 0x2A +#define COLLIDER_g281 0x29 +#define COLLIDER_o1691 0x28 +#define COLLIDER_o1690 0x27 +#define COLLIDER_o1689 0x26 +#define COLLIDER_g340 0x25 +#define COLLIDER_o2078 0x24 +#define COLLIDER_o2077 0x23 +#define COLLIDER_g343 0x22 +#define COLLIDER_o2091 0x21 +#define COLLIDER_o2090 0x20 +#define COLLIDER_06_b 0x1F +#define COLLIDER_g261 0x1E +#define COLLIDER_o2109 0x1D +#define COLLIDER_o1474 0x1C +#define COLLIDER_g55 0x1B +#define COLLIDER_o2119 0x1A +#define COLLIDER_o2118 0x19 +#define COLLIDER_o2117 0x18 +#define COLLIDER_g27 0x17 +#define COLLIDER_o1990 0x16 +#define COLLIDER_o1987 0x15 +#define COLLIDER_06_a 0x14 +#define COLLIDER_o2103 0x13 +#define COLLIDER_g64 0x12 +#define COLLIDER_o1483 0x11 +#define COLLIDER_o426 0x10 +#define COLLIDER_g62 0xF +#define COLLIDER_o2116 0xE +#define COLLIDER_o2115 0xD +#define COLLIDER_o2114 0xC +#define COLLIDER_g61 0xB +#define COLLIDER_o1981 0xA +#define COLLIDER_o1975 0x9 +#define COLLIDER_g349 0x8 +#define COLLIDER_g59 0x7 +#define COLLIDER_o2000 0x6 +#define COLLIDER_deilite 0x5 +#define COLLIDER_deilie 0x4 +#define COLLIDER_g66 0x3 +#define COLLIDER_o2001 0x2 +#define COLLIDER_deilitne 0x1 +#define COLLIDER_deiline 0x0 + +#define ZONE_Root 0x26 +#define ZONE_Default 0x25 +#define ZONE_o2017 0x24 +#define ZONE_o2016 0x23 +#define ZONE_06 0x22 +#define ZONE_C2 0x21 +#define ZONE_f2 0x20 +#define ZONE_o2032 0x1F +#define ZONE_g66 0x1E +#define ZONE_o2010 0x1D +#define ZONE_g62 0x1C +#define ZONE_o2009 0x1B +#define ZONE_o420 0x1A +#define ZONE_g309 0x19 +#define ZONE_o2007 0x18 +#define ZONE_o2006 0x17 +#define ZONE_g317 0x16 +#define ZONE_g320 0x15 +#define ZONE_o2015 0x14 +#define ZONE_g319 0x13 +#define ZONE_o2014 0x12 +#define ZONE_g318 0x11 +#define ZONE_o2012 0x10 +#define ZONE_o2011 0xF +#define ZONE_C1 0xE +#define ZONE_f1 0xD +#define ZONE_g329 0xC +#define ZONE_o2021 0xB +#define ZONE_g330 0xA +#define ZONE_o2024 0x9 +#define ZONE_g331 0x8 +#define ZONE_o2027 0x7 +#define ZONE_o2026 0x6 +#define ZONE_g321 0x5 +#define ZONE_g324 0x4 +#define ZONE_o2020 0x3 +#define ZONE_g323 0x2 +#define ZONE_o2019 0x1 +#define ZONE_g322 0x0 + diff --git a/include/mapfs/isk_06_shape.h b/include/mapfs/isk_06_shape.h index 88df942ef1..8a58c42fa7 100644 --- a/include/mapfs/isk_06_shape.h +++ b/include/mapfs/isk_06_shape.h @@ -1,105 +1,106 @@ -#define MODEL_Root 0x68 -#define MODEL_g309 0x67 -#define MODEL_g340 0x66 -#define MODEL_g336 0x65 -#define MODEL_o2045 0x64 -#define MODEL_o2044 0x63 -#define MODEL_o2046 0x62 -#define MODEL_g304 0x61 -#define MODEL_g383 0x60 -#define MODEL_o2057 0x5F -#define MODEL_g341 0x5E -#define MODEL_o2051 0x5D -#define MODEL_o2050 0x5C -#define MODEL_o2049 0x5B -#define MODEL_o2048 0x5A -#define MODEL_o2047 0x59 -#define MODEL_g276 0x58 -#define MODEL_g306 0x57 -#define MODEL_o1964 0x56 -#define MODEL_o1963 0x55 -#define MODEL_o1962 0x54 -#define MODEL_g307 0x53 -#define MODEL_o1681 0x52 -#define MODEL_g278 0x51 -#define MODEL_o1682 0x50 -#define MODEL_g277 0x4F -#define MODEL_o1680 0x4E -#define MODEL_o1679 0x4D -#define MODEL_o1678 0x4C -#define MODEL_o1677 0x4B -#define MODEL_o1676 0x4A -#define MODEL_o1675 0x49 -#define MODEL_g279 0x48 -#define MODEL_g342 0x47 -#define MODEL_o2056 0x46 -#define MODEL_o2055 0x45 -#define MODEL_o2054 0x44 -#define MODEL_o2053 0x43 -#define MODEL_o2052 0x42 -#define MODEL_g305 0x41 -#define MODEL_o1961 0x40 -#define MODEL_o1960 0x3F -#define MODEL_o1959 0x3E -#define MODEL_g281 0x3D -#define MODEL_o1691 0x3C -#define MODEL_o1690 0x3B -#define MODEL_o1689 0x3A -#define MODEL_g280 0x39 -#define MODEL_o1688 0x38 -#define MODEL_o1687 0x37 -#define MODEL_o1686 0x36 -#define MODEL_g317 0x35 -#define MODEL_o2070 0x34 -#define MODEL_g322 0x33 -#define MODEL_o2085 0x32 -#define MODEL_o2084 0x31 -#define MODEL_o2083 0x30 -#define MODEL_o2082 0x2F -#define MODEL_g321 0x2E -#define MODEL_o2068 0x2D -#define MODEL_o2067 0x2C -#define MODEL_o2059 0x2B -#define MODEL_o2058 0x2A -#define MODEL_g320 0x29 -#define MODEL_o2027 0x28 -#define MODEL_o1994 0x27 -#define MODEL_o1993 0x26 -#define MODEL_o1992 0x25 -#define MODEL_o1991 0x24 -#define MODEL_g319 0x23 -#define MODEL_o1990 0x22 -#define MODEL_o1989 0x21 -#define MODEL_o1988 0x20 -#define MODEL_g318 0x1F -#define MODEL_o1986 0x1E -#define MODEL_g310 0x1D -#define MODEL_o2069 0x1C -#define MODEL_g334 0x1B -#define MODEL_o2030 0x1A -#define MODEL_o2029 0x19 -#define MODEL_o2028 0x18 -#define MODEL_g316 0x17 -#define MODEL_o1985 0x16 -#define MODEL_o1984 0x15 -#define MODEL_o1983 0x14 -#define MODEL_o1982 0x13 -#define MODEL_g315 0x12 -#define MODEL_o1981 0x11 -#define MODEL_o1980 0x10 -#define MODEL_o1979 0xF -#define MODEL_o1978 0xE -#define MODEL_g314 0xD -#define MODEL_o1977 0xC -#define MODEL_g313 0xB -#define MODEL_o1975 0xA -#define MODEL_o1974 0x9 -#define MODEL_o1973 0x8 -#define MODEL_o1972 0x7 -#define MODEL_o2026 0x6 -#define MODEL_g312 0x5 -#define MODEL_o1971 0x4 -#define MODEL_o1970 0x3 -#define MODEL_o1969 0x2 -#define MODEL_g311 0x1 -#define MODEL_o1968 0x0 +#define MODEL_Root 0x68 +#define MODEL_g309 0x67 +#define MODEL_g340 0x66 +#define MODEL_g336 0x65 +#define MODEL_o2045 0x64 +#define MODEL_o2044 0x63 +#define MODEL_o2046 0x62 +#define MODEL_g304 0x61 +#define MODEL_g383 0x60 +#define MODEL_o2057 0x5F +#define MODEL_g341 0x5E +#define MODEL_o2051 0x5D +#define MODEL_o2050 0x5C +#define MODEL_o2049 0x5B +#define MODEL_o2048 0x5A +#define MODEL_o2047 0x59 +#define MODEL_g276 0x58 +#define MODEL_g306 0x57 +#define MODEL_o1964 0x56 +#define MODEL_o1963 0x55 +#define MODEL_o1962 0x54 +#define MODEL_g307 0x53 +#define MODEL_o1681 0x52 +#define MODEL_g278 0x51 +#define MODEL_o1682 0x50 +#define MODEL_g277 0x4F +#define MODEL_o1680 0x4E +#define MODEL_o1679 0x4D +#define MODEL_o1678 0x4C +#define MODEL_o1677 0x4B +#define MODEL_o1676 0x4A +#define MODEL_o1675 0x49 +#define MODEL_g279 0x48 +#define MODEL_g342 0x47 +#define MODEL_o2056 0x46 +#define MODEL_o2055 0x45 +#define MODEL_o2054 0x44 +#define MODEL_o2053 0x43 +#define MODEL_o2052 0x42 +#define MODEL_g305 0x41 +#define MODEL_o1961 0x40 +#define MODEL_o1960 0x3F +#define MODEL_o1959 0x3E +#define MODEL_g281 0x3D +#define MODEL_o1691 0x3C +#define MODEL_o1690 0x3B +#define MODEL_o1689 0x3A +#define MODEL_g280 0x39 +#define MODEL_o1688 0x38 +#define MODEL_o1687 0x37 +#define MODEL_o1686 0x36 +#define MODEL_g317 0x35 +#define MODEL_o2070 0x34 +#define MODEL_g322 0x33 +#define MODEL_o2085 0x32 +#define MODEL_o2084 0x31 +#define MODEL_o2083 0x30 +#define MODEL_o2082 0x2F +#define MODEL_g321 0x2E +#define MODEL_o2068 0x2D +#define MODEL_o2067 0x2C +#define MODEL_o2059 0x2B +#define MODEL_o2058 0x2A +#define MODEL_g320 0x29 +#define MODEL_o2027 0x28 +#define MODEL_o1994 0x27 +#define MODEL_o1993 0x26 +#define MODEL_o1992 0x25 +#define MODEL_o1991 0x24 +#define MODEL_g319 0x23 +#define MODEL_o1990 0x22 +#define MODEL_o1989 0x21 +#define MODEL_o1988 0x20 +#define MODEL_g318 0x1F +#define MODEL_o1986 0x1E +#define MODEL_g310 0x1D +#define MODEL_o2069 0x1C +#define MODEL_g334 0x1B +#define MODEL_o2030 0x1A +#define MODEL_o2029 0x19 +#define MODEL_o2028 0x18 +#define MODEL_g316 0x17 +#define MODEL_o1985 0x16 +#define MODEL_o1984 0x15 +#define MODEL_o1983 0x14 +#define MODEL_o1982 0x13 +#define MODEL_g315 0x12 +#define MODEL_o1981 0x11 +#define MODEL_o1980 0x10 +#define MODEL_o1979 0xF +#define MODEL_o1978 0xE +#define MODEL_g314 0xD +#define MODEL_o1977 0xC +#define MODEL_g313 0xB +#define MODEL_o1975 0xA +#define MODEL_o1974 0x9 +#define MODEL_o1973 0x8 +#define MODEL_o1972 0x7 +#define MODEL_o2026 0x6 +#define MODEL_g312 0x5 +#define MODEL_o1971 0x4 +#define MODEL_o1970 0x3 +#define MODEL_o1969 0x2 +#define MODEL_g311 0x1 +#define MODEL_o1968 0x0 + diff --git a/include/mapfs/isk_07_hit.h b/include/mapfs/isk_07_hit.h index 3ed72dc84e..8191ac275d 100644 --- a/include/mapfs/isk_07_hit.h +++ b/include/mapfs/isk_07_hit.h @@ -1,54 +1,77 @@ -#define COLLIDER_Root 0x35 -#define COLLIDER_07 0x34 -#define COLLIDER_g314 0x33 -#define COLLIDER_g317 0x32 -#define COLLIDER_o2041 0x31 -#define COLLIDER_o2040 0x30 -#define COLLIDER_o2039 0x2F -#define COLLIDER_g316 0x2E -#define COLLIDER_o2038 0x2D -#define COLLIDER_o2037 0x2C -#define COLLIDER_o2036 0x2B -#define COLLIDER_g313 0x2A -#define COLLIDER_o2027 0x29 -#define COLLIDER_o2026 0x28 -#define COLLIDER_o2025 0x27 -#define COLLIDER_g312 0x26 -#define COLLIDER_o2022 0x25 -#define COLLIDER_g203 0x24 -#define COLLIDER_o2000 0x23 -#define COLLIDER_o1994 0x22 -#define COLLIDER_g204 0x21 -#define COLLIDER_o2043 0x20 -#define COLLIDER_o1278 0x1F -#define COLLIDER_o1274 0x1E -#define COLLIDER_g68 0x1D -#define COLLIDER_o2064 0x1C -#define COLLIDER_o2063 0x1B -#define COLLIDER_o2062 0x1A -#define COLLIDER_o2061 0x19 -#define COLLIDER_o2060 0x18 -#define COLLIDER_o2059 0x17 -#define COLLIDER_o2058 0x16 -#define COLLIDER_o2057 0x15 -#define COLLIDER_o2056 0x14 -#define COLLIDER_o2055 0x13 -#define COLLIDER_g311 0x12 -#define COLLIDER_o2054 0x11 -#define COLLIDER_o1993 0x10 -#define COLLIDER_o1991 0xF -#define COLLIDER_o1988 0xE -#define COLLIDER_o1987 0xD -#define COLLIDER_o1984 0xC -#define COLLIDER_o1980 0xB -#define COLLIDER_o1979 0xA -#define COLLIDER_o1976 0x9 -#define COLLIDER_g20 0x8 -#define COLLIDER_o2009 0x7 -#define COLLIDER_deilitte 0x6 -#define COLLIDER_deilite 0x5 -#define COLLIDER_deilie 0x4 -#define COLLIDER_o2008 0x3 -#define COLLIDER_deilittw 0x2 -#define COLLIDER_deilitw 0x1 -#define COLLIDER_deiliw 0x0 +#define COLLIDER_Root 0x35 +#define COLLIDER_07 0x34 +#define COLLIDER_g314 0x33 +#define COLLIDER_g317 0x32 +#define COLLIDER_o2041 0x31 +#define COLLIDER_o2040 0x30 +#define COLLIDER_o2039 0x2F +#define COLLIDER_g316 0x2E +#define COLLIDER_o2038 0x2D +#define COLLIDER_o2037 0x2C +#define COLLIDER_o2036 0x2B +#define COLLIDER_g313 0x2A +#define COLLIDER_o2027 0x29 +#define COLLIDER_o2026 0x28 +#define COLLIDER_o2025 0x27 +#define COLLIDER_g312 0x26 +#define COLLIDER_o2022 0x25 +#define COLLIDER_g203 0x24 +#define COLLIDER_o2000 0x23 +#define COLLIDER_o1994 0x22 +#define COLLIDER_g204 0x21 +#define COLLIDER_o2043 0x20 +#define COLLIDER_o1278 0x1F +#define COLLIDER_o1274 0x1E +#define COLLIDER_g68 0x1D +#define COLLIDER_o2064 0x1C +#define COLLIDER_o2063 0x1B +#define COLLIDER_o2062 0x1A +#define COLLIDER_o2061 0x19 +#define COLLIDER_o2060 0x18 +#define COLLIDER_o2059 0x17 +#define COLLIDER_o2058 0x16 +#define COLLIDER_o2057 0x15 +#define COLLIDER_o2056 0x14 +#define COLLIDER_o2055 0x13 +#define COLLIDER_g311 0x12 +#define COLLIDER_o2054 0x11 +#define COLLIDER_o1993 0x10 +#define COLLIDER_o1991 0xF +#define COLLIDER_o1988 0xE +#define COLLIDER_o1987 0xD +#define COLLIDER_o1984 0xC +#define COLLIDER_o1980 0xB +#define COLLIDER_o1979 0xA +#define COLLIDER_o1976 0x9 +#define COLLIDER_g20 0x8 +#define COLLIDER_o2009 0x7 +#define COLLIDER_deilitte 0x6 +#define COLLIDER_deilite 0x5 +#define COLLIDER_deilie 0x4 +#define COLLIDER_o2008 0x3 +#define COLLIDER_deilittw 0x2 +#define COLLIDER_deilitw 0x1 +#define COLLIDER_deiliw 0x0 + +#define ZONE_Root 0x14 +#define ZONE_Default 0x13 +#define ZONE_o1737 0x12 +#define ZONE_deiliw 0x11 +#define ZONE_07 0x10 +#define ZONE_g314 0xF +#define ZONE_o2011 0xE +#define ZONE_o2010 0xD +#define ZONE_g312 0xC +#define ZONE_deilie 0xB +#define ZONE_o1763 0xA +#define ZONE_g20 0x9 +#define ZONE_o1764 0x8 +#define ZONE_o1762 0x7 +#define ZONE_o1761 0x6 +#define ZONE_o1760 0x5 +#define ZONE_o1759 0x4 +#define ZONE_o1758 0x3 +#define ZONE_o1757 0x2 +#define ZONE_o440 0x1 +#define ZONE_g68 0x0 + diff --git a/include/mapfs/isk_07_shape.h b/include/mapfs/isk_07_shape.h index 9168777eb4..1d4027620f 100644 --- a/include/mapfs/isk_07_shape.h +++ b/include/mapfs/isk_07_shape.h @@ -1,130 +1,131 @@ -#define MODEL_Root 0x81 -#define MODEL_g319 0x80 -#define MODEL_g328 0x7F -#define MODEL_g330 0x7E -#define MODEL_g331 0x7D -#define MODEL_o2047 0x7C -#define MODEL_o2046 0x7B -#define MODEL_o2045 0x7A -#define MODEL_g329 0x79 -#define MODEL_o2044 0x78 -#define MODEL_o2043 0x77 -#define MODEL_g324 0x76 -#define MODEL_g326 0x75 -#define MODEL_g327 0x74 -#define MODEL_o2042 0x73 -#define MODEL_o2041 0x72 -#define MODEL_o2040 0x71 -#define MODEL_g325 0x70 -#define MODEL_o2039 0x6F -#define MODEL_o2038 0x6E -#define MODEL_g320 0x6D -#define MODEL_g322 0x6C -#define MODEL_g323 0x6B -#define MODEL_o2037 0x6A -#define MODEL_o2036 0x69 -#define MODEL_o2035 0x68 -#define MODEL_g321 0x67 -#define MODEL_o2034 0x66 -#define MODEL_o2033 0x65 -#define MODEL_07 0x64 -#define MODEL_g333 0x63 -#define MODEL_o2061 0x62 -#define MODEL_o2060 0x61 -#define MODEL_o2059 0x60 -#define MODEL_o2056 0x5F -#define MODEL_o2055 0x5E -#define MODEL_o2054 0x5D -#define MODEL_g332 0x5C -#define MODEL_o2058 0x5B -#define MODEL_o2057 0x5A -#define MODEL_g315 0x59 -#define MODEL_o2022 0x58 -#define MODEL_o2021 0x57 -#define MODEL_o2020 0x56 -#define MODEL_o2019 0x55 -#define MODEL_o2018 0x54 -#define MODEL_g313 0x53 -#define MODEL_o1985 0x52 -#define MODEL_o1984 0x51 -#define MODEL_o1983 0x50 -#define MODEL_g310 0x4F -#define MODEL_o1974 0x4E -#define MODEL_o1973 0x4D -#define MODEL_g203 0x4C -#define MODEL_g311 0x4B -#define MODEL_o1962 0x4A -#define MODEL_o1259 0x49 -#define MODEL_g20 0x48 -#define MODEL_o310 0x47 -#define MODEL_o165 0x46 -#define MODEL_g204 0x45 -#define MODEL_o2105 0x44 -#define MODEL_o2104 0x43 -#define MODEL_o1979 0x42 -#define MODEL_o1978 0x41 -#define MODEL_o1275 0x40 -#define MODEL_o1274 0x3F -#define MODEL_g314 0x3E -#define MODEL_o1303 0x3D -#define MODEL_o1298 0x3C -#define MODEL_o564 0x3B -#define MODEL_o1299 0x3A -#define MODEL_g69 0x39 -#define MODEL_o2103 0x38 -#define MODEL_o2102 0x37 -#define MODEL_o2101 0x36 -#define MODEL_o2100 0x35 -#define MODEL_o2099 0x34 -#define MODEL_o2098 0x33 -#define MODEL_o2097 0x32 -#define MODEL_o2096 0x31 -#define MODEL_o2095 0x30 -#define MODEL_o2094 0x2F -#define MODEL_o2093 0x2E -#define MODEL_o2092 0x2D -#define MODEL_o2091 0x2C -#define MODEL_o2090 0x2B -#define MODEL_o2089 0x2A -#define MODEL_o2088 0x29 -#define MODEL_o2087 0x28 -#define MODEL_o2086 0x27 -#define MODEL_o2085 0x26 -#define MODEL_o2083 0x25 -#define MODEL_g68 0x24 -#define MODEL_o2082 0x23 -#define MODEL_o2081 0x22 -#define MODEL_o2080 0x21 -#define MODEL_o2079 0x20 -#define MODEL_o2078 0x1F -#define MODEL_o2077 0x1E -#define MODEL_o2076 0x1D -#define MODEL_o2075 0x1C -#define MODEL_o2074 0x1B -#define MODEL_o2073 0x1A -#define MODEL_g205 0x19 -#define MODEL_o2118 0x18 -#define MODEL_o2117 0x17 -#define MODEL_o2116 0x16 -#define MODEL_o2115 0x15 -#define MODEL_o2114 0x14 -#define MODEL_o2113 0x13 -#define MODEL_o2112 0x12 -#define MODEL_o2111 0x11 -#define MODEL_o2110 0x10 -#define MODEL_o1280 0xF -#define MODEL_o2053 0xE -#define MODEL_o2052 0xD -#define MODEL_o2051 0xC -#define MODEL_o2050 0xB -#define MODEL_o2049 0xA -#define MODEL_o2048 0x9 -#define MODEL_o2017 0x8 -#define MODEL_o2016 0x7 -#define MODEL_o2015 0x6 -#define MODEL_o2014 0x5 -#define MODEL_o2013 0x4 -#define MODEL_o2012 0x3 -#define MODEL_o2011 0x2 -#define MODEL_o2010 0x1 -#define MODEL_o1281 0x0 +#define MODEL_Root 0x81 +#define MODEL_g319 0x80 +#define MODEL_g328 0x7F +#define MODEL_g330 0x7E +#define MODEL_g331 0x7D +#define MODEL_o2047 0x7C +#define MODEL_o2046 0x7B +#define MODEL_o2045 0x7A +#define MODEL_g329 0x79 +#define MODEL_o2044 0x78 +#define MODEL_o2043 0x77 +#define MODEL_g324 0x76 +#define MODEL_g326 0x75 +#define MODEL_g327 0x74 +#define MODEL_o2042 0x73 +#define MODEL_o2041 0x72 +#define MODEL_o2040 0x71 +#define MODEL_g325 0x70 +#define MODEL_o2039 0x6F +#define MODEL_o2038 0x6E +#define MODEL_g320 0x6D +#define MODEL_g322 0x6C +#define MODEL_g323 0x6B +#define MODEL_o2037 0x6A +#define MODEL_o2036 0x69 +#define MODEL_o2035 0x68 +#define MODEL_g321 0x67 +#define MODEL_o2034 0x66 +#define MODEL_o2033 0x65 +#define MODEL_07 0x64 +#define MODEL_g333 0x63 +#define MODEL_o2061 0x62 +#define MODEL_o2060 0x61 +#define MODEL_o2059 0x60 +#define MODEL_o2056 0x5F +#define MODEL_o2055 0x5E +#define MODEL_o2054 0x5D +#define MODEL_g332 0x5C +#define MODEL_o2058 0x5B +#define MODEL_o2057 0x5A +#define MODEL_g315 0x59 +#define MODEL_o2022 0x58 +#define MODEL_o2021 0x57 +#define MODEL_o2020 0x56 +#define MODEL_o2019 0x55 +#define MODEL_o2018 0x54 +#define MODEL_g313 0x53 +#define MODEL_o1985 0x52 +#define MODEL_o1984 0x51 +#define MODEL_o1983 0x50 +#define MODEL_g310 0x4F +#define MODEL_o1974 0x4E +#define MODEL_o1973 0x4D +#define MODEL_g203 0x4C +#define MODEL_g311 0x4B +#define MODEL_o1962 0x4A +#define MODEL_o1259 0x49 +#define MODEL_g20 0x48 +#define MODEL_o310 0x47 +#define MODEL_o165 0x46 +#define MODEL_g204 0x45 +#define MODEL_o2105 0x44 +#define MODEL_o2104 0x43 +#define MODEL_o1979 0x42 +#define MODEL_o1978 0x41 +#define MODEL_o1275 0x40 +#define MODEL_o1274 0x3F +#define MODEL_g314 0x3E +#define MODEL_o1303 0x3D +#define MODEL_o1298 0x3C +#define MODEL_o564 0x3B +#define MODEL_o1299 0x3A +#define MODEL_g69 0x39 +#define MODEL_o2103 0x38 +#define MODEL_o2102 0x37 +#define MODEL_o2101 0x36 +#define MODEL_o2100 0x35 +#define MODEL_o2099 0x34 +#define MODEL_o2098 0x33 +#define MODEL_o2097 0x32 +#define MODEL_o2096 0x31 +#define MODEL_o2095 0x30 +#define MODEL_o2094 0x2F +#define MODEL_o2093 0x2E +#define MODEL_o2092 0x2D +#define MODEL_o2091 0x2C +#define MODEL_o2090 0x2B +#define MODEL_o2089 0x2A +#define MODEL_o2088 0x29 +#define MODEL_o2087 0x28 +#define MODEL_o2086 0x27 +#define MODEL_o2085 0x26 +#define MODEL_o2083 0x25 +#define MODEL_g68 0x24 +#define MODEL_o2082 0x23 +#define MODEL_o2081 0x22 +#define MODEL_o2080 0x21 +#define MODEL_o2079 0x20 +#define MODEL_o2078 0x1F +#define MODEL_o2077 0x1E +#define MODEL_o2076 0x1D +#define MODEL_o2075 0x1C +#define MODEL_o2074 0x1B +#define MODEL_o2073 0x1A +#define MODEL_g205 0x19 +#define MODEL_o2118 0x18 +#define MODEL_o2117 0x17 +#define MODEL_o2116 0x16 +#define MODEL_o2115 0x15 +#define MODEL_o2114 0x14 +#define MODEL_o2113 0x13 +#define MODEL_o2112 0x12 +#define MODEL_o2111 0x11 +#define MODEL_o2110 0x10 +#define MODEL_o1280 0xF +#define MODEL_o2053 0xE +#define MODEL_o2052 0xD +#define MODEL_o2051 0xC +#define MODEL_o2050 0xB +#define MODEL_o2049 0xA +#define MODEL_o2048 0x9 +#define MODEL_o2017 0x8 +#define MODEL_o2016 0x7 +#define MODEL_o2015 0x6 +#define MODEL_o2014 0x5 +#define MODEL_o2013 0x4 +#define MODEL_o2012 0x3 +#define MODEL_o2011 0x2 +#define MODEL_o2010 0x1 +#define MODEL_o1281 0x0 + diff --git a/include/mapfs/isk_08_hit.h b/include/mapfs/isk_08_hit.h index b43ad2c69e..f55739c570 100644 --- a/include/mapfs/isk_08_hit.h +++ b/include/mapfs/isk_08_hit.h @@ -1,36 +1,62 @@ -#define COLLIDER_Root 0x23 -#define COLLIDER_08 0x22 -#define COLLIDER_g329 0x21 -#define COLLIDER_o2032 0x20 -#define COLLIDER_o2030 0x1F -#define COLLIDER_o2029 0x1E -#define COLLIDER_g86 0x1D -#define COLLIDER_o552 0x1C -#define COLLIDER_o562 0x1B -#define COLLIDER_o550 0x1A -#define COLLIDER_g41 0x19 -#define COLLIDER_o1885 0x18 -#define COLLIDER_o2045 0x17 -#define COLLIDER_o2044 0x16 -#define COLLIDER_o2043 0x15 -#define COLLIDER_o2042 0x14 -#define COLLIDER_o2041 0x13 -#define COLLIDER_o2040 0x12 -#define COLLIDER_g42 0x11 -#define COLLIDER_g334 0x10 -#define COLLIDER_o2021 0xF -#define COLLIDER_deilite 0xE -#define COLLIDER_deilie 0xD -#define COLLIDER_g333 0xC -#define COLLIDER_o2022 0xB -#define COLLIDER_deilitne 0xA -#define COLLIDER_deiline 0x9 -#define COLLIDER_g332 0x8 -#define COLLIDER_o2020 0x7 -#define COLLIDER_deilittw 0x6 -#define COLLIDER_deilitw 0x5 -#define COLLIDER_deiliw 0x4 -#define COLLIDER_g331 0x3 -#define COLLIDER_o2019 0x2 -#define COLLIDER_deilitnw 0x1 -#define COLLIDER_deilinw 0x0 +#define COLLIDER_Root 0x23 +#define COLLIDER_08 0x22 +#define COLLIDER_g329 0x21 +#define COLLIDER_o2032 0x20 +#define COLLIDER_o2030 0x1F +#define COLLIDER_o2029 0x1E +#define COLLIDER_g86 0x1D +#define COLLIDER_o552 0x1C +#define COLLIDER_o562 0x1B +#define COLLIDER_o550 0x1A +#define COLLIDER_g41 0x19 +#define COLLIDER_o1885 0x18 +#define COLLIDER_o2045 0x17 +#define COLLIDER_o2044 0x16 +#define COLLIDER_o2043 0x15 +#define COLLIDER_o2042 0x14 +#define COLLIDER_o2041 0x13 +#define COLLIDER_o2040 0x12 +#define COLLIDER_g42 0x11 +#define COLLIDER_g334 0x10 +#define COLLIDER_o2021 0xF +#define COLLIDER_deilite 0xE +#define COLLIDER_deilie 0xD +#define COLLIDER_g333 0xC +#define COLLIDER_o2022 0xB +#define COLLIDER_deilitne 0xA +#define COLLIDER_deiline 0x9 +#define COLLIDER_g332 0x8 +#define COLLIDER_o2020 0x7 +#define COLLIDER_deilittw 0x6 +#define COLLIDER_deilitw 0x5 +#define COLLIDER_deiliw 0x4 +#define COLLIDER_g331 0x3 +#define COLLIDER_o2019 0x2 +#define COLLIDER_deilitnw 0x1 +#define COLLIDER_deilinw 0x0 + +#define ZONE_Root 0x17 +#define ZONE_08 0x16 +#define ZONE_g332 0x15 +#define ZONE_g335 0x14 +#define ZONE_deiline 0x13 +#define ZONE_o2022 0x12 +#define ZONE_g334 0x11 +#define ZONE_g330 0x10 +#define ZONE_o2026 0xF +#define ZONE_o2027 0xE +#define ZONE_o2020 0xD +#define ZONE_o2030 0xC +#define ZONE_g333 0xB +#define ZONE_o2024 0xA +#define ZONE_deilinw 0x9 +#define ZONE_g331 0x8 +#define ZONE_g329 0x7 +#define ZONE_deilie 0x6 +#define ZONE_o556 0x5 +#define ZONE_g42 0x4 +#define ZONE_o555 0x3 +#define ZONE_g41 0x2 +#define ZONE_deiliw 0x1 +#define ZONE_o320 0x0 + diff --git a/include/mapfs/isk_08_shape.h b/include/mapfs/isk_08_shape.h index 3e327b0cca..511a44fd25 100644 --- a/include/mapfs/isk_08_shape.h +++ b/include/mapfs/isk_08_shape.h @@ -1,51 +1,52 @@ -#define MODEL_Root 0x32 -#define MODEL_08 0x31 -#define MODEL_o2024 0x30 -#define MODEL_g327 0x2F -#define MODEL_o2023 0x2E -#define MODEL_o2022 0x2D -#define MODEL_o2020 0x2C -#define MODEL_o2018 0x2B -#define MODEL_o2021 0x2A -#define MODEL_o2019 0x29 -#define MODEL_o2012 0x28 -#define MODEL_g328 0x27 -#define MODEL_o2015 0x26 -#define MODEL_o2014 0x25 -#define MODEL_g293 0x24 -#define MODEL_o1876 0x23 -#define MODEL_o1875 0x22 -#define MODEL_g42 0x21 -#define MODEL_o2065 0x20 -#define MODEL_o2064 0x1F -#define MODEL_o2063 0x1E -#define MODEL_o2062 0x1D -#define MODEL_o2061 0x1C -#define MODEL_o2060 0x1B -#define MODEL_o2059 0x1A -#define MODEL_g86 0x19 -#define MODEL_o554 0x18 -#define MODEL_o552 0x17 -#define MODEL_o563 0x16 -#define MODEL_o562 0x15 -#define MODEL_o551 0x14 -#define MODEL_o550 0x13 -#define MODEL_g85 0x12 -#define MODEL_o2053 0x11 -#define MODEL_o2050 0x10 -#define MODEL_o2051 0xF -#define MODEL_o1883 0xE -#define MODEL_o1966 0xD -#define MODEL_o1462 0xC -#define MODEL_o566 0xB -#define MODEL_o339 0xA -#define MODEL_o1888 0x9 -#define MODEL_o1884 0x8 -#define MODEL_o561 0x7 -#define MODEL_g41 0x6 -#define MODEL_o2049 0x5 -#define MODEL_o2048 0x4 -#define MODEL_o320 0x3 -#define MODEL_g84 0x2 -#define MODEL_o570 0x1 -#define MODEL_o542 0x0 +#define MODEL_Root 0x32 +#define MODEL_08 0x31 +#define MODEL_o2024 0x30 +#define MODEL_g327 0x2F +#define MODEL_o2023 0x2E +#define MODEL_o2022 0x2D +#define MODEL_o2020 0x2C +#define MODEL_o2018 0x2B +#define MODEL_o2021 0x2A +#define MODEL_o2019 0x29 +#define MODEL_o2012 0x28 +#define MODEL_g328 0x27 +#define MODEL_o2015 0x26 +#define MODEL_o2014 0x25 +#define MODEL_g293 0x24 +#define MODEL_o1876 0x23 +#define MODEL_o1875 0x22 +#define MODEL_g42 0x21 +#define MODEL_o2065 0x20 +#define MODEL_o2064 0x1F +#define MODEL_o2063 0x1E +#define MODEL_o2062 0x1D +#define MODEL_o2061 0x1C +#define MODEL_o2060 0x1B +#define MODEL_o2059 0x1A +#define MODEL_g86 0x19 +#define MODEL_o554 0x18 +#define MODEL_o552 0x17 +#define MODEL_o563 0x16 +#define MODEL_o562 0x15 +#define MODEL_o551 0x14 +#define MODEL_o550 0x13 +#define MODEL_g85 0x12 +#define MODEL_o2053 0x11 +#define MODEL_o2050 0x10 +#define MODEL_o2051 0xF +#define MODEL_o1883 0xE +#define MODEL_o1966 0xD +#define MODEL_o1462 0xC +#define MODEL_o566 0xB +#define MODEL_o339 0xA +#define MODEL_o1888 0x9 +#define MODEL_o1884 0x8 +#define MODEL_o561 0x7 +#define MODEL_g41 0x6 +#define MODEL_o2049 0x5 +#define MODEL_o2048 0x4 +#define MODEL_o320 0x3 +#define MODEL_g84 0x2 +#define MODEL_o570 0x1 +#define MODEL_o542 0x0 + diff --git a/include/mapfs/isk_09_hit.h b/include/mapfs/isk_09_hit.h index 473eae9e8f..374b9ae7e9 100644 --- a/include/mapfs/isk_09_hit.h +++ b/include/mapfs/isk_09_hit.h @@ -1,54 +1,76 @@ -#define COLLIDER_Root 0x35 -#define COLLIDER_09 0x34 -#define COLLIDER_g348 0x33 -#define COLLIDER_takara01 0x32 -#define COLLIDER_takara00 0x31 -#define COLLIDER_g342 0x30 -#define COLLIDER_o2137 0x2F -#define COLLIDER_o2125 0x2E -#define COLLIDER_o2123 0x2D -#define COLLIDER_o2122 0x2C -#define COLLIDER_o2121 0x2B -#define COLLIDER_o2120 0x2A -#define COLLIDER_o2118 0x29 -#define COLLIDER_g336 0x28 -#define COLLIDER_o2105 0x27 -#define COLLIDER_o2102 0x26 -#define COLLIDER_o2099 0x25 -#define COLLIDER_o2096 0x24 -#define COLLIDER_g335 0x23 -#define COLLIDER_o2094 0x22 -#define COLLIDER_g178 0x21 -#define COLLIDER_g182 0x20 -#define COLLIDER_o2038 0x1F -#define COLLIDER_o2037 0x1E -#define COLLIDER_g181 0x1D -#define COLLIDER_o2036 0x1C -#define COLLIDER_o2035 0x1B -#define COLLIDER_g180 0x1A -#define COLLIDER_o2034 0x19 -#define COLLIDER_o2033 0x18 -#define COLLIDER_g177 0x17 -#define COLLIDER_o2032 0x16 -#define COLLIDER_o2031 0x15 -#define COLLIDER_g334 0x14 -#define COLLIDER_o2109 0x13 -#define COLLIDER_o2085 0x12 -#define COLLIDER_o2083 0x11 -#define COLLIDER_o2081 0x10 -#define COLLIDER_o2079 0xF -#define COLLIDER_g164 0xE -#define COLLIDER_o2168 0xD -#define COLLIDER_o2167 0xC -#define COLLIDER_o2166 0xB -#define COLLIDER_o2165 0xA -#define COLLIDER_o2164 0x9 -#define COLLIDER_o2163 0x8 -#define COLLIDER_o2162 0x7 -#define COLLIDER_o2161 0x6 -#define COLLIDER_o2160 0x5 -#define COLLIDER_o2159 0x4 -#define COLLIDER_g166 0x3 -#define COLLIDER_o2169 0x2 -#define COLLIDER_deilite 0x1 -#define COLLIDER_deilie 0x0 +#define COLLIDER_Root 0x35 +#define COLLIDER_09 0x34 +#define COLLIDER_g348 0x33 +#define COLLIDER_takara01 0x32 +#define COLLIDER_takara00 0x31 +#define COLLIDER_g342 0x30 +#define COLLIDER_o2137 0x2F +#define COLLIDER_o2125 0x2E +#define COLLIDER_o2123 0x2D +#define COLLIDER_o2122 0x2C +#define COLLIDER_o2121 0x2B +#define COLLIDER_o2120 0x2A +#define COLLIDER_o2118 0x29 +#define COLLIDER_g336 0x28 +#define COLLIDER_o2105 0x27 +#define COLLIDER_o2102 0x26 +#define COLLIDER_o2099 0x25 +#define COLLIDER_o2096 0x24 +#define COLLIDER_g335 0x23 +#define COLLIDER_o2094 0x22 +#define COLLIDER_g178 0x21 +#define COLLIDER_g182 0x20 +#define COLLIDER_o2038 0x1F +#define COLLIDER_o2037 0x1E +#define COLLIDER_g181 0x1D +#define COLLIDER_o2036 0x1C +#define COLLIDER_o2035 0x1B +#define COLLIDER_g180 0x1A +#define COLLIDER_o2034 0x19 +#define COLLIDER_o2033 0x18 +#define COLLIDER_g177 0x17 +#define COLLIDER_o2032 0x16 +#define COLLIDER_o2031 0x15 +#define COLLIDER_g334 0x14 +#define COLLIDER_o2109 0x13 +#define COLLIDER_o2085 0x12 +#define COLLIDER_o2083 0x11 +#define COLLIDER_o2081 0x10 +#define COLLIDER_o2079 0xF +#define COLLIDER_g164 0xE +#define COLLIDER_o2168 0xD +#define COLLIDER_o2167 0xC +#define COLLIDER_o2166 0xB +#define COLLIDER_o2165 0xA +#define COLLIDER_o2164 0x9 +#define COLLIDER_o2163 0x8 +#define COLLIDER_o2162 0x7 +#define COLLIDER_o2161 0x6 +#define COLLIDER_o2160 0x5 +#define COLLIDER_o2159 0x4 +#define COLLIDER_g166 0x3 +#define COLLIDER_o2169 0x2 +#define COLLIDER_deilite 0x1 +#define COLLIDER_deilie 0x0 + +#define ZONE_Root 0x13 +#define ZONE_Default 0x12 +#define ZONE_o2061 0x11 +#define ZONE_09 0x10 +#define ZONE_g347 0xF +#define ZONE_o2092 0xE +#define ZONE_g346 0xD +#define ZONE_o2089 0xC +#define ZONE_g345 0xB +#define ZONE_o2070 0xA +#define ZONE_g344 0x9 +#define ZONE_o2088 0x8 +#define ZONE_o2090 0x7 +#define ZONE_g335 0x6 +#define ZONE_o5000 0x5 +#define ZONE_g334 0x4 +#define ZONE_o1834 0x3 +#define ZONE_g348 0x2 +#define ZONE_o2096 0x1 +#define ZONE_g164 0x0 + diff --git a/include/mapfs/isk_09_shape.h b/include/mapfs/isk_09_shape.h index ece6b0f6ee..a07203ba93 100644 --- a/include/mapfs/isk_09_shape.h +++ b/include/mapfs/isk_09_shape.h @@ -1,131 +1,132 @@ -#define MODEL_Root 0x82 -#define MODEL_g345 0x81 -#define MODEL_o2334 0x80 -#define MODEL_g338 0x7F -#define MODEL_o2330 0x7E -#define MODEL_o2332 0x7D -#define MODEL_o2222 0x7C -#define MODEL_o2221 0x7B -#define MODEL_o2220 0x7A -#define MODEL_o2316 0x79 -#define MODEL_o2315 0x78 -#define MODEL_o2314 0x77 -#define MODEL_g340 0x76 -#define MODEL_o2181 0x75 -#define MODEL_o2176 0x74 -#define MODEL_o2173 0x73 -#define MODEL_o2167 0x72 -#define MODEL_o2166 0x71 -#define MODEL_o2164 0x70 -#define MODEL_09 0x6F -#define MODEL_g339 0x6E -#define MODEL_o2160 0x6D -#define MODEL_o2159 0x6C -#define MODEL_g178 0x6B -#define MODEL_g182 0x6A -#define MODEL_g329 0x69 -#define MODEL_o2012 0x68 -#define MODEL_o2011 0x67 -#define MODEL_g181 0x66 -#define MODEL_g328 0x65 -#define MODEL_o2010 0x64 -#define MODEL_o2009 0x63 -#define MODEL_g180 0x62 -#define MODEL_g327 0x61 -#define MODEL_o2008 0x60 -#define MODEL_o2007 0x5F -#define MODEL_g177 0x5E -#define MODEL_g321 0x5D -#define MODEL_o1996 0x5C -#define MODEL_o1995 0x5B -#define MODEL_g333 0x5A -#define MODEL_g336 0x59 -#define MODEL_o2114 0x58 -#define MODEL_o2113 0x57 -#define MODEL_o2112 0x56 -#define MODEL_g335 0x55 -#define MODEL_o2111 0x54 -#define MODEL_o2110 0x53 -#define MODEL_o2109 0x52 -#define MODEL_g334 0x51 -#define MODEL_o2108 0x50 -#define MODEL_o2107 0x4F -#define MODEL_o2106 0x4E -#define MODEL_g332 0x4D -#define MODEL_o2105 0x4C -#define MODEL_o2104 0x4B -#define MODEL_o2103 0x4A -#define MODEL_g331 0x49 -#define MODEL_o2102 0x48 -#define MODEL_o2101 0x47 -#define MODEL_o2100 0x46 -#define MODEL_o2099 0x45 -#define MODEL_o2098 0x44 -#define MODEL_g175 0x43 -#define MODEL_o2127 0x42 -#define MODEL_o2125 0x41 -#define MODEL_o2093 0x40 -#define MODEL_o2092 0x3F -#define MODEL_o2091 0x3E -#define MODEL_o2090 0x3D -#define MODEL_o2085 0x3C -#define MODEL_o2084 0x3B -#define MODEL_o2076 0x3A -#define MODEL_o2083 0x39 -#define MODEL_g166 0x38 -#define MODEL_o2422 0x37 -#define MODEL_o2421 0x36 -#define MODEL_g165 0x35 -#define MODEL_o2410 0x34 -#define MODEL_o2409 0x33 -#define MODEL_o2408 0x32 -#define MODEL_o2407 0x31 -#define MODEL_o2406 0x30 -#define MODEL_o2405 0x2F -#define MODEL_g337 0x2E -#define MODEL_o2404 0x2D -#define MODEL_o2403 0x2C -#define MODEL_o2402 0x2B -#define MODEL_o2401 0x2A -#define MODEL_o2400 0x29 -#define MODEL_o2399 0x28 -#define MODEL_o2398 0x27 -#define MODEL_o2397 0x26 -#define MODEL_o2396 0x25 -#define MODEL_o2395 0x24 -#define MODEL_o2394 0x23 -#define MODEL_o2393 0x22 -#define MODEL_o2392 0x21 -#define MODEL_o2391 0x20 -#define MODEL_o2390 0x1F -#define MODEL_o2389 0x1E -#define MODEL_o2388 0x1D -#define MODEL_o2387 0x1C -#define MODEL_o2368 0x1B -#define MODEL_o2367 0x1A -#define MODEL_o2366 0x19 -#define MODEL_o2365 0x18 -#define MODEL_o2364 0x17 -#define MODEL_o2363 0x16 -#define MODEL_o2362 0x15 -#define MODEL_o2361 0x14 -#define MODEL_o2360 0x13 -#define MODEL_g164 0x12 -#define MODEL_o2359 0x11 -#define MODEL_o2358 0x10 -#define MODEL_o2357 0xF -#define MODEL_o2356 0xE -#define MODEL_o2355 0xD -#define MODEL_o2354 0xC -#define MODEL_o2353 0xB -#define MODEL_o2352 0xA -#define MODEL_o2351 0x9 -#define MODEL_g167 0x8 -#define MODEL_o2419 0x7 -#define MODEL_o2418 0x6 -#define MODEL_o2417 0x5 -#define MODEL_o2416 0x4 -#define MODEL_o2415 0x3 -#define MODEL_o2413 0x2 -#define MODEL_o2412 0x1 -#define MODEL_o2047 0x0 +#define MODEL_Root 0x82 +#define MODEL_g345 0x81 +#define MODEL_o2334 0x80 +#define MODEL_g338 0x7F +#define MODEL_o2330 0x7E +#define MODEL_o2332 0x7D +#define MODEL_o2222 0x7C +#define MODEL_o2221 0x7B +#define MODEL_o2220 0x7A +#define MODEL_o2316 0x79 +#define MODEL_o2315 0x78 +#define MODEL_o2314 0x77 +#define MODEL_g340 0x76 +#define MODEL_o2181 0x75 +#define MODEL_o2176 0x74 +#define MODEL_o2173 0x73 +#define MODEL_o2167 0x72 +#define MODEL_o2166 0x71 +#define MODEL_o2164 0x70 +#define MODEL_09 0x6F +#define MODEL_g339 0x6E +#define MODEL_o2160 0x6D +#define MODEL_o2159 0x6C +#define MODEL_g178 0x6B +#define MODEL_g182 0x6A +#define MODEL_g329 0x69 +#define MODEL_o2012 0x68 +#define MODEL_o2011 0x67 +#define MODEL_g181 0x66 +#define MODEL_g328 0x65 +#define MODEL_o2010 0x64 +#define MODEL_o2009 0x63 +#define MODEL_g180 0x62 +#define MODEL_g327 0x61 +#define MODEL_o2008 0x60 +#define MODEL_o2007 0x5F +#define MODEL_g177 0x5E +#define MODEL_g321 0x5D +#define MODEL_o1996 0x5C +#define MODEL_o1995 0x5B +#define MODEL_g333 0x5A +#define MODEL_g336 0x59 +#define MODEL_o2114 0x58 +#define MODEL_o2113 0x57 +#define MODEL_o2112 0x56 +#define MODEL_g335 0x55 +#define MODEL_o2111 0x54 +#define MODEL_o2110 0x53 +#define MODEL_o2109 0x52 +#define MODEL_g334 0x51 +#define MODEL_o2108 0x50 +#define MODEL_o2107 0x4F +#define MODEL_o2106 0x4E +#define MODEL_g332 0x4D +#define MODEL_o2105 0x4C +#define MODEL_o2104 0x4B +#define MODEL_o2103 0x4A +#define MODEL_g331 0x49 +#define MODEL_o2102 0x48 +#define MODEL_o2101 0x47 +#define MODEL_o2100 0x46 +#define MODEL_o2099 0x45 +#define MODEL_o2098 0x44 +#define MODEL_g175 0x43 +#define MODEL_o2127 0x42 +#define MODEL_o2125 0x41 +#define MODEL_o2093 0x40 +#define MODEL_o2092 0x3F +#define MODEL_o2091 0x3E +#define MODEL_o2090 0x3D +#define MODEL_o2085 0x3C +#define MODEL_o2084 0x3B +#define MODEL_o2076 0x3A +#define MODEL_o2083 0x39 +#define MODEL_g166 0x38 +#define MODEL_o2422 0x37 +#define MODEL_o2421 0x36 +#define MODEL_g165 0x35 +#define MODEL_o2410 0x34 +#define MODEL_o2409 0x33 +#define MODEL_o2408 0x32 +#define MODEL_o2407 0x31 +#define MODEL_o2406 0x30 +#define MODEL_o2405 0x2F +#define MODEL_g337 0x2E +#define MODEL_o2404 0x2D +#define MODEL_o2403 0x2C +#define MODEL_o2402 0x2B +#define MODEL_o2401 0x2A +#define MODEL_o2400 0x29 +#define MODEL_o2399 0x28 +#define MODEL_o2398 0x27 +#define MODEL_o2397 0x26 +#define MODEL_o2396 0x25 +#define MODEL_o2395 0x24 +#define MODEL_o2394 0x23 +#define MODEL_o2393 0x22 +#define MODEL_o2392 0x21 +#define MODEL_o2391 0x20 +#define MODEL_o2390 0x1F +#define MODEL_o2389 0x1E +#define MODEL_o2388 0x1D +#define MODEL_o2387 0x1C +#define MODEL_o2368 0x1B +#define MODEL_o2367 0x1A +#define MODEL_o2366 0x19 +#define MODEL_o2365 0x18 +#define MODEL_o2364 0x17 +#define MODEL_o2363 0x16 +#define MODEL_o2362 0x15 +#define MODEL_o2361 0x14 +#define MODEL_o2360 0x13 +#define MODEL_g164 0x12 +#define MODEL_o2359 0x11 +#define MODEL_o2358 0x10 +#define MODEL_o2357 0xF +#define MODEL_o2356 0xE +#define MODEL_o2355 0xD +#define MODEL_o2354 0xC +#define MODEL_o2353 0xB +#define MODEL_o2352 0xA +#define MODEL_o2351 0x9 +#define MODEL_g167 0x8 +#define MODEL_o2419 0x7 +#define MODEL_o2418 0x6 +#define MODEL_o2417 0x5 +#define MODEL_o2416 0x4 +#define MODEL_o2415 0x3 +#define MODEL_o2413 0x2 +#define MODEL_o2412 0x1 +#define MODEL_o2047 0x0 + diff --git a/include/mapfs/isk_10_hit.h b/include/mapfs/isk_10_hit.h index 8329c0d6b7..7a90900f60 100644 --- a/include/mapfs/isk_10_hit.h +++ b/include/mapfs/isk_10_hit.h @@ -1,27 +1,39 @@ -#define COLLIDER_Root 0x1A -#define COLLIDER_10 0x19 -#define COLLIDER_g336 0x18 -#define COLLIDER_o2034 0x17 -#define COLLIDER_o2032 0x16 -#define COLLIDER_o2031 0x15 -#define COLLIDER_o2030 0x14 -#define COLLIDER_o2029 0x13 -#define COLLIDER_g338 0x12 -#define COLLIDER_o2042 0x11 -#define COLLIDER_o2041 0x10 -#define COLLIDER_o2038 0xF -#define COLLIDER_g339 0xE -#define COLLIDER_g332 0xD -#define COLLIDER_deilittn 0xC -#define COLLIDER_deilitn 0xB -#define COLLIDER_deilin 0xA -#define COLLIDER_o2012 0x9 -#define COLLIDER_g331 0x8 -#define COLLIDER_deilite 0x7 -#define COLLIDER_deilie 0x6 -#define COLLIDER_o809 0x5 -#define COLLIDER_g330 0x4 -#define COLLIDER_deilittw 0x3 -#define COLLIDER_deilitw 0x2 -#define COLLIDER_deiliw 0x1 -#define COLLIDER_o816 0x0 +#define COLLIDER_Root 0x1A +#define COLLIDER_10 0x19 +#define COLLIDER_g336 0x18 +#define COLLIDER_o2034 0x17 +#define COLLIDER_o2032 0x16 +#define COLLIDER_o2031 0x15 +#define COLLIDER_o2030 0x14 +#define COLLIDER_o2029 0x13 +#define COLLIDER_g338 0x12 +#define COLLIDER_o2042 0x11 +#define COLLIDER_o2041 0x10 +#define COLLIDER_o2038 0xF +#define COLLIDER_g339 0xE +#define COLLIDER_g332 0xD +#define COLLIDER_deilittn 0xC +#define COLLIDER_deilitn 0xB +#define COLLIDER_deilin 0xA +#define COLLIDER_o2012 0x9 +#define COLLIDER_g331 0x8 +#define COLLIDER_deilite 0x7 +#define COLLIDER_deilie 0x6 +#define COLLIDER_o809 0x5 +#define COLLIDER_g330 0x4 +#define COLLIDER_deilittw 0x3 +#define COLLIDER_deilitw 0x2 +#define COLLIDER_deiliw 0x1 +#define COLLIDER_o816 0x0 + +#define ZONE_Root 0x9 +#define ZONE_Default 0x8 +#define ZONE_deilin 0x7 +#define ZONE_o786 0x6 +#define ZONE_10 0x5 +#define ZONE_g335 0x4 +#define ZONE_deilie 0x3 +#define ZONE_o2026 0x2 +#define ZONE_deiliw 0x1 +#define ZONE_g143 0x0 + diff --git a/include/mapfs/isk_10_shape.h b/include/mapfs/isk_10_shape.h index cada1de0a9..86feb239b2 100644 --- a/include/mapfs/isk_10_shape.h +++ b/include/mapfs/isk_10_shape.h @@ -1,46 +1,47 @@ -#define MODEL_Root 0x2D -#define MODEL_10 0x2C -#define MODEL_o2037 0x2B -#define MODEL_g334 0x2A -#define MODEL_o2035 0x29 -#define MODEL_o2034 0x28 -#define MODEL_o2033 0x27 -#define MODEL_o2032 0x26 -#define MODEL_o2031 0x25 -#define MODEL_o2030 0x24 -#define MODEL_o2029 0x23 -#define MODEL_g333 0x22 -#define MODEL_o2028 0x21 -#define MODEL_o2027 0x20 -#define MODEL_g140 0x1F -#define MODEL_g328 0x1E -#define MODEL_o2010 0x1D -#define MODEL_o2011 0x1C -#define MODEL_g327 0x1B -#define MODEL_o2009 0x1A -#define MODEL_o2008 0x19 -#define MODEL_g144 0x18 -#define MODEL_o791 0x17 -#define MODEL_o809 0x16 -#define MODEL_o816 0x15 -#define MODEL_g143 0x14 -#define MODEL_o2020 0x13 -#define MODEL_o2019 0x12 -#define MODEL_o2017 0x11 -#define MODEL_o2016 0x10 -#define MODEL_o1966 0xF -#define MODEL_o1894 0xE -#define MODEL_o815 0xD -#define MODEL_o812 0xC -#define MODEL_o811 0xB -#define MODEL_o789 0xA -#define MODEL_o808 0x9 -#define MODEL_o2015 0x8 -#define MODEL_o2014 0x7 -#define MODEL_g142 0x6 -#define MODEL_o786 0x5 -#define MODEL_o785 0x4 -#define MODEL_o804 0x3 -#define MODEL_o803 0x2 -#define MODEL_g141 0x1 -#define MODEL_o801 0x0 +#define MODEL_Root 0x2D +#define MODEL_10 0x2C +#define MODEL_o2037 0x2B +#define MODEL_g334 0x2A +#define MODEL_o2035 0x29 +#define MODEL_o2034 0x28 +#define MODEL_o2033 0x27 +#define MODEL_o2032 0x26 +#define MODEL_o2031 0x25 +#define MODEL_o2030 0x24 +#define MODEL_o2029 0x23 +#define MODEL_g333 0x22 +#define MODEL_o2028 0x21 +#define MODEL_o2027 0x20 +#define MODEL_g140 0x1F +#define MODEL_g328 0x1E +#define MODEL_o2010 0x1D +#define MODEL_o2011 0x1C +#define MODEL_g327 0x1B +#define MODEL_o2009 0x1A +#define MODEL_o2008 0x19 +#define MODEL_g144 0x18 +#define MODEL_o791 0x17 +#define MODEL_o809 0x16 +#define MODEL_o816 0x15 +#define MODEL_g143 0x14 +#define MODEL_o2020 0x13 +#define MODEL_o2019 0x12 +#define MODEL_o2017 0x11 +#define MODEL_o2016 0x10 +#define MODEL_o1966 0xF +#define MODEL_o1894 0xE +#define MODEL_o815 0xD +#define MODEL_o812 0xC +#define MODEL_o811 0xB +#define MODEL_o789 0xA +#define MODEL_o808 0x9 +#define MODEL_o2015 0x8 +#define MODEL_o2014 0x7 +#define MODEL_g142 0x6 +#define MODEL_o786 0x5 +#define MODEL_o785 0x4 +#define MODEL_o804 0x3 +#define MODEL_o803 0x2 +#define MODEL_g141 0x1 +#define MODEL_o801 0x0 + diff --git a/include/mapfs/isk_11_hit.h b/include/mapfs/isk_11_hit.h index 0e5bd499b2..819d754296 100644 --- a/include/mapfs/isk_11_hit.h +++ b/include/mapfs/isk_11_hit.h @@ -1,72 +1,88 @@ -#define COLLIDER_Root 0x47 -#define COLLIDER_15 0x46 -#define COLLIDER_g345 0x45 -#define COLLIDER_o2167 0x44 -#define COLLIDER_o2171 0x43 -#define COLLIDER_o2175 0x42 -#define COLLIDER_o2169 0x41 -#define COLLIDER_o2165 0x40 -#define COLLIDER_o2184 0x3F -#define COLLIDER_g353 0x3E -#define COLLIDER_o2213 0x3D -#define COLLIDER_o2212 0x3C -#define COLLIDER_o2211 0x3B -#define COLLIDER_11 0x3A -#define COLLIDER_g358 0x39 -#define COLLIDER_g364 0x38 -#define COLLIDER_o2227 0x37 -#define COLLIDER_g363 0x36 -#define COLLIDER_o2226 0x35 -#define COLLIDER_g362 0x34 -#define COLLIDER_o2225 0x33 -#define COLLIDER_g361 0x32 -#define COLLIDER_o2224 0x31 -#define COLLIDER_g360 0x30 -#define COLLIDER_o2223 0x2F -#define COLLIDER_g359 0x2E -#define COLLIDER_o2222 0x2D -#define COLLIDER_g187 0x2C -#define COLLIDER_g327 0x2B -#define COLLIDER_o2090 0x2A -#define COLLIDER_g189 0x29 -#define COLLIDER_o2089 0x28 -#define COLLIDER_g188 0x27 -#define COLLIDER_o2088 0x26 -#define COLLIDER_g190 0x25 -#define COLLIDER_o2087 0x24 -#define COLLIDER_g186 0x23 -#define COLLIDER_o2091 0x22 -#define COLLIDER_g185 0x21 -#define COLLIDER_o2092 0x20 -#define COLLIDER_g90 0x1F -#define COLLIDER_o2221 0x1E -#define COLLIDER_o2220 0x1D -#define COLLIDER_o2219 0x1C -#define COLLIDER_o2218 0x1B -#define COLLIDER_o2217 0x1A -#define COLLIDER_o2216 0x19 -#define COLLIDER_o2215 0x18 -#define COLLIDER_o2214 0x17 -#define COLLIDER_o2186 0x16 -#define COLLIDER_g338 0x15 -#define COLLIDER_o2084 0x14 -#define COLLIDER_o2083 0x13 -#define COLLIDER_o2076 0x12 -#define COLLIDER_g93 0x11 -#define COLLIDER_g344 0x10 -#define COLLIDER_o2189 0xF -#define COLLIDER_deilitse 0xE -#define COLLIDER_deilise 0xD -#define COLLIDER_g357 0xC -#define COLLIDER_o2098 0xB -#define COLLIDER_deilite 0xA -#define COLLIDER_deilie 0x9 -#define COLLIDER_g356 0x8 -#define COLLIDER_o2099 0x7 -#define COLLIDER_deilittne 0x6 -#define COLLIDER_deilitne 0x5 -#define COLLIDER_deiline 0x4 -#define COLLIDER_g355 0x3 -#define COLLIDER_o2097 0x2 -#define COLLIDER_deilitw 0x1 -#define COLLIDER_deiliw 0x0 +#define COLLIDER_Root 0x47 +#define COLLIDER_15 0x46 +#define COLLIDER_g345 0x45 +#define COLLIDER_o2167 0x44 +#define COLLIDER_o2171 0x43 +#define COLLIDER_o2175 0x42 +#define COLLIDER_o2169 0x41 +#define COLLIDER_o2165 0x40 +#define COLLIDER_o2184 0x3F +#define COLLIDER_g353 0x3E +#define COLLIDER_o2213 0x3D +#define COLLIDER_o2212 0x3C +#define COLLIDER_o2211 0x3B +#define COLLIDER_11 0x3A +#define COLLIDER_g358 0x39 +#define COLLIDER_g364 0x38 +#define COLLIDER_o2227 0x37 +#define COLLIDER_g363 0x36 +#define COLLIDER_o2226 0x35 +#define COLLIDER_g362 0x34 +#define COLLIDER_o2225 0x33 +#define COLLIDER_g361 0x32 +#define COLLIDER_o2224 0x31 +#define COLLIDER_g360 0x30 +#define COLLIDER_o2223 0x2F +#define COLLIDER_g359 0x2E +#define COLLIDER_o2222 0x2D +#define COLLIDER_g187 0x2C +#define COLLIDER_g327 0x2B +#define COLLIDER_o2090 0x2A +#define COLLIDER_g189 0x29 +#define COLLIDER_o2089 0x28 +#define COLLIDER_g188 0x27 +#define COLLIDER_o2088 0x26 +#define COLLIDER_g190 0x25 +#define COLLIDER_o2087 0x24 +#define COLLIDER_g186 0x23 +#define COLLIDER_o2091 0x22 +#define COLLIDER_g185 0x21 +#define COLLIDER_o2092 0x20 +#define COLLIDER_g90 0x1F +#define COLLIDER_o2221 0x1E +#define COLLIDER_o2220 0x1D +#define COLLIDER_o2219 0x1C +#define COLLIDER_o2218 0x1B +#define COLLIDER_o2217 0x1A +#define COLLIDER_o2216 0x19 +#define COLLIDER_o2215 0x18 +#define COLLIDER_o2214 0x17 +#define COLLIDER_o2186 0x16 +#define COLLIDER_g338 0x15 +#define COLLIDER_o2084 0x14 +#define COLLIDER_o2083 0x13 +#define COLLIDER_o2076 0x12 +#define COLLIDER_g93 0x11 +#define COLLIDER_g344 0x10 +#define COLLIDER_o2189 0xF +#define COLLIDER_deilitse 0xE +#define COLLIDER_deilise 0xD +#define COLLIDER_g357 0xC +#define COLLIDER_o2098 0xB +#define COLLIDER_deilite 0xA +#define COLLIDER_deilie 0x9 +#define COLLIDER_g356 0x8 +#define COLLIDER_o2099 0x7 +#define COLLIDER_deilittne 0x6 +#define COLLIDER_deilitne 0x5 +#define COLLIDER_deiline 0x4 +#define COLLIDER_g355 0x3 +#define COLLIDER_o2097 0x2 +#define COLLIDER_deilitw 0x1 +#define COLLIDER_deiliw 0x0 + +#define ZONE_Root 0xD +#define ZONE_15 0xC +#define ZONE_o2212 0xB +#define ZONE_o2111 0xA +#define ZONE_o2213 0x9 +#define ZONE_o2116 0x8 +#define ZONE_11 0x7 +#define ZONE_g351 0x6 +#define ZONE_o1617 0x5 +#define ZONE_o2214 0x4 +#define ZONE_g93 0x3 +#define ZONE_o581 0x2 +#define ZONE_g90 0x1 +#define ZONE_o1734 0x0 + diff --git a/include/mapfs/isk_11_shape.h b/include/mapfs/isk_11_shape.h index d39fc12970..5aaf2876d8 100644 --- a/include/mapfs/isk_11_shape.h +++ b/include/mapfs/isk_11_shape.h @@ -1,152 +1,153 @@ -#define MODEL_Root 0x97 -#define MODEL_15 0x96 -#define MODEL_g368 0x95 -#define MODEL_o2175 0x94 -#define MODEL_g369 0x93 -#define MODEL_o2181 0x92 -#define MODEL_g373 0x91 -#define MODEL_o2203 0x90 -#define MODEL_o2202 0x8F -#define MODEL_g372 0x8E -#define MODEL_o2201 0x8D -#define MODEL_o2200 0x8C -#define MODEL_g371 0x8B -#define MODEL_o2199 0x8A -#define MODEL_o2198 0x89 -#define MODEL_g370 0x88 -#define MODEL_o2155 0x87 -#define MODEL_o2156 0x86 -#define MODEL_g367 0x85 -#define MODEL_o2178 0x84 -#define MODEL_o2182 0x83 -#define MODEL_o2195 0x82 -#define MODEL_o2186 0x81 -#define MODEL_o2170 0x80 -#define MODEL_o2166 0x7F -#define MODEL_o2165 0x7E -#define MODEL_o2162 0x7D -#define MODEL_o2161 0x7C -#define MODEL_o2253 0x7B -#define MODEL_g366 0x7A -#define MODEL_o2331 0x79 -#define MODEL_o2330 0x78 -#define MODEL_o2329 0x77 -#define MODEL_o2328 0x76 -#define MODEL_o2225 0x75 -#define MODEL_o2224 0x74 -#define MODEL_o2219 0x73 -#define MODEL_o2214 0x72 -#define MODEL_o2213 0x71 -#define MODEL_o2143 0x70 -#define MODEL_o2142 0x6F -#define MODEL_o2141 0x6E -#define MODEL_o2139 0x6D -#define MODEL_o2138 0x6C -#define MODEL_o2132 0x6B -#define MODEL_g365 0x6A -#define MODEL_o2252 0x69 -#define MODEL_o2126 0x68 -#define MODEL_o2125 0x67 -#define MODEL_g364 0x66 -#define MODEL_o2124 0x65 -#define MODEL_o2123 0x64 -#define MODEL_11 0x63 -#define MODEL_g377 0x62 -#define MODEL_o2251 0x61 -#define MODEL_o2250 0x60 -#define MODEL_o2249 0x5F -#define MODEL_g337 0x5E -#define MODEL_o2270 0x5D -#define MODEL_o2269 0x5C -#define MODEL_o2268 0x5B -#define MODEL_o2265 0x5A -#define MODEL_o2264 0x59 -#define MODEL_o2263 0x58 -#define MODEL_o2262 0x57 -#define MODEL_o2207 0x56 -#define MODEL_o2069 0x55 -#define MODEL_g375 0x54 -#define MODEL_o2235 0x53 -#define MODEL_o2234 0x52 -#define MODEL_g187 0x51 -#define MODEL_g374 0x50 -#define MODEL_o2221 0x4F -#define MODEL_o2220 0x4E -#define MODEL_g342 0x4D -#define MODEL_g381 0x4C -#define MODEL_o2261 0x4B -#define MODEL_o2260 0x4A -#define MODEL_g188 0x49 -#define MODEL_o1632 0x48 -#define MODEL_o1629 0x47 -#define MODEL_o1631 0x46 -#define MODEL_o1630 0x45 -#define MODEL_g341 0x44 -#define MODEL_g380 0x43 -#define MODEL_o2259 0x42 -#define MODEL_o2258 0x41 -#define MODEL_g189 0x40 -#define MODEL_o1633 0x3F -#define MODEL_o1636 0x3E -#define MODEL_o1634 0x3D -#define MODEL_o1635 0x3C -#define MODEL_g340 0x3B -#define MODEL_g379 0x3A -#define MODEL_o2257 0x39 -#define MODEL_o2256 0x38 -#define MODEL_g185 0x37 -#define MODEL_o1116 0x36 -#define MODEL_o1119 0x35 -#define MODEL_o1117 0x34 -#define MODEL_o1118 0x33 -#define MODEL_g339 0x32 -#define MODEL_g378 0x31 -#define MODEL_o2255 0x30 -#define MODEL_o2254 0x2F -#define MODEL_g186 0x2E -#define MODEL_o1624 0x2D -#define MODEL_o1621 0x2C -#define MODEL_o1623 0x2B -#define MODEL_o1622 0x2A -#define MODEL_g338 0x29 -#define MODEL_g343 0x28 -#define MODEL_o2078 0x27 -#define MODEL_o2077 0x26 -#define MODEL_g190 0x25 -#define MODEL_o1625 0x24 -#define MODEL_o1628 0x23 -#define MODEL_o1626 0x22 -#define MODEL_o1627 0x21 -#define MODEL_g93 0x20 -#define MODEL_o604 0x1F -#define MODEL_o603 0x1E -#define MODEL_o602 0x1D -#define MODEL_g91 0x1C -#define MODEL_o1644 0x1B -#define MODEL_o1638 0x1A -#define MODEL_o1619 0x19 -#define MODEL_o1616 0x18 -#define MODEL_o1615 0x17 -#define MODEL_o1613 0x16 -#define MODEL_o620 0x15 -#define MODEL_o594 0x14 -#define MODEL_o613 0x13 -#define MODEL_o1733 0x12 -#define MODEL_g90 0x11 -#define MODEL_o2205 0x10 -#define MODEL_o1734 0xF -#define MODEL_o1618 0xE -#define MODEL_o1617 0xD -#define MODEL_o584 0xC -#define MODEL_o583 0xB -#define MODEL_o582 0xA -#define MODEL_o581 0x9 -#define MODEL_g89 0x8 -#define MODEL_o2231 0x7 -#define MODEL_o2230 0x6 -#define MODEL_o2223 0x5 -#define MODEL_o2222 0x4 -#define MODEL_o1735 0x3 -#define MODEL_o577 0x2 -#define MODEL_o574 0x1 -#define MODEL_o573 0x0 +#define MODEL_Root 0x97 +#define MODEL_15 0x96 +#define MODEL_g368 0x95 +#define MODEL_o2175 0x94 +#define MODEL_g369 0x93 +#define MODEL_o2181 0x92 +#define MODEL_g373 0x91 +#define MODEL_o2203 0x90 +#define MODEL_o2202 0x8F +#define MODEL_g372 0x8E +#define MODEL_o2201 0x8D +#define MODEL_o2200 0x8C +#define MODEL_g371 0x8B +#define MODEL_o2199 0x8A +#define MODEL_o2198 0x89 +#define MODEL_g370 0x88 +#define MODEL_o2155 0x87 +#define MODEL_o2156 0x86 +#define MODEL_g367 0x85 +#define MODEL_o2178 0x84 +#define MODEL_o2182 0x83 +#define MODEL_o2195 0x82 +#define MODEL_o2186 0x81 +#define MODEL_o2170 0x80 +#define MODEL_o2166 0x7F +#define MODEL_o2165 0x7E +#define MODEL_o2162 0x7D +#define MODEL_o2161 0x7C +#define MODEL_o2253 0x7B +#define MODEL_g366 0x7A +#define MODEL_o2331 0x79 +#define MODEL_o2330 0x78 +#define MODEL_o2329 0x77 +#define MODEL_o2328 0x76 +#define MODEL_o2225 0x75 +#define MODEL_o2224 0x74 +#define MODEL_o2219 0x73 +#define MODEL_o2214 0x72 +#define MODEL_o2213 0x71 +#define MODEL_o2143 0x70 +#define MODEL_o2142 0x6F +#define MODEL_o2141 0x6E +#define MODEL_o2139 0x6D +#define MODEL_o2138 0x6C +#define MODEL_o2132 0x6B +#define MODEL_g365 0x6A +#define MODEL_o2252 0x69 +#define MODEL_o2126 0x68 +#define MODEL_o2125 0x67 +#define MODEL_g364 0x66 +#define MODEL_o2124 0x65 +#define MODEL_o2123 0x64 +#define MODEL_11 0x63 +#define MODEL_g377 0x62 +#define MODEL_o2251 0x61 +#define MODEL_o2250 0x60 +#define MODEL_o2249 0x5F +#define MODEL_g337 0x5E +#define MODEL_o2270 0x5D +#define MODEL_o2269 0x5C +#define MODEL_o2268 0x5B +#define MODEL_o2265 0x5A +#define MODEL_o2264 0x59 +#define MODEL_o2263 0x58 +#define MODEL_o2262 0x57 +#define MODEL_o2207 0x56 +#define MODEL_o2069 0x55 +#define MODEL_g375 0x54 +#define MODEL_o2235 0x53 +#define MODEL_o2234 0x52 +#define MODEL_g187 0x51 +#define MODEL_g374 0x50 +#define MODEL_o2221 0x4F +#define MODEL_o2220 0x4E +#define MODEL_g342 0x4D +#define MODEL_g381 0x4C +#define MODEL_o2261 0x4B +#define MODEL_o2260 0x4A +#define MODEL_g188 0x49 +#define MODEL_o1632 0x48 +#define MODEL_o1629 0x47 +#define MODEL_o1631 0x46 +#define MODEL_o1630 0x45 +#define MODEL_g341 0x44 +#define MODEL_g380 0x43 +#define MODEL_o2259 0x42 +#define MODEL_o2258 0x41 +#define MODEL_g189 0x40 +#define MODEL_o1633 0x3F +#define MODEL_o1636 0x3E +#define MODEL_o1634 0x3D +#define MODEL_o1635 0x3C +#define MODEL_g340 0x3B +#define MODEL_g379 0x3A +#define MODEL_o2257 0x39 +#define MODEL_o2256 0x38 +#define MODEL_g185 0x37 +#define MODEL_o1116 0x36 +#define MODEL_o1119 0x35 +#define MODEL_o1117 0x34 +#define MODEL_o1118 0x33 +#define MODEL_g339 0x32 +#define MODEL_g378 0x31 +#define MODEL_o2255 0x30 +#define MODEL_o2254 0x2F +#define MODEL_g186 0x2E +#define MODEL_o1624 0x2D +#define MODEL_o1621 0x2C +#define MODEL_o1623 0x2B +#define MODEL_o1622 0x2A +#define MODEL_g338 0x29 +#define MODEL_g343 0x28 +#define MODEL_o2078 0x27 +#define MODEL_o2077 0x26 +#define MODEL_g190 0x25 +#define MODEL_o1625 0x24 +#define MODEL_o1628 0x23 +#define MODEL_o1626 0x22 +#define MODEL_o1627 0x21 +#define MODEL_g93 0x20 +#define MODEL_o604 0x1F +#define MODEL_o603 0x1E +#define MODEL_o602 0x1D +#define MODEL_g91 0x1C +#define MODEL_o1644 0x1B +#define MODEL_o1638 0x1A +#define MODEL_o1619 0x19 +#define MODEL_o1616 0x18 +#define MODEL_o1615 0x17 +#define MODEL_o1613 0x16 +#define MODEL_o620 0x15 +#define MODEL_o594 0x14 +#define MODEL_o613 0x13 +#define MODEL_o1733 0x12 +#define MODEL_g90 0x11 +#define MODEL_o2205 0x10 +#define MODEL_o1734 0xF +#define MODEL_o1618 0xE +#define MODEL_o1617 0xD +#define MODEL_o584 0xC +#define MODEL_o583 0xB +#define MODEL_o582 0xA +#define MODEL_o581 0x9 +#define MODEL_g89 0x8 +#define MODEL_o2231 0x7 +#define MODEL_o2230 0x6 +#define MODEL_o2223 0x5 +#define MODEL_o2222 0x4 +#define MODEL_o1735 0x3 +#define MODEL_o577 0x2 +#define MODEL_o574 0x1 +#define MODEL_o573 0x0 + diff --git a/include/mapfs/isk_12_hit.h b/include/mapfs/isk_12_hit.h index a669b655bb..e2c09fdcad 100644 --- a/include/mapfs/isk_12_hit.h +++ b/include/mapfs/isk_12_hit.h @@ -1,67 +1,110 @@ -#define COLLIDER_Root 0x42 -#define COLLIDER_12 0x41 -#define COLLIDER_g339 0x40 -#define COLLIDER_B2 0x3F -#define COLLIDER_o2090 0x3E -#define COLLIDER_g332 0x3D -#define COLLIDER_o2059 0x3C -#define COLLIDER_o2056 0x3B -#define COLLIDER_g328 0x3A -#define COLLIDER_g282 0x39 -#define COLLIDER_o2045 0x38 -#define COLLIDER_o2044 0x37 -#define COLLIDER_g285 0x36 -#define COLLIDER_o2043 0x35 -#define COLLIDER_o2042 0x34 -#define COLLIDER_o2041 0x33 -#define COLLIDER_o2040 0x32 -#define COLLIDER_g334 0x31 -#define COLLIDER_o2080 0x30 -#define COLLIDER_o2088 0x2F -#define COLLIDER_g333 0x2E -#define COLLIDER_o2074 0x2D -#define COLLIDER_o2073 0x2C -#define COLLIDER_o2072 0x2B -#define COLLIDER_o2071 0x2A -#define COLLIDER_o2070 0x29 -#define COLLIDER_o2069 0x28 -#define COLLIDER_o2068 0x27 -#define COLLIDER_o2067 0x26 -#define COLLIDER_o2062 0x25 -#define COLLIDER_o2061 0x24 -#define COLLIDER_12_b 0x23 -#define COLLIDER_o2079 0x22 -#define COLLIDER_o2102 0x21 -#define COLLIDER_o2101 0x20 -#define COLLIDER_o2100 0x1F -#define COLLIDER_12_a 0x1E -#define COLLIDER_g301 0x1D -#define COLLIDER_o655 0x1C -#define COLLIDER_o1952 0x1B -#define COLLIDER_g294 0x1A -#define COLLIDER_o1935 0x19 -#define COLLIDER_o1930 0x18 -#define COLLIDER_o1925 0x17 -#define COLLIDER_o1920 0x16 -#define COLLIDER_o1915 0x15 -#define COLLIDER_g345 0x14 -#define COLLIDER_o2099 0x13 -#define COLLIDER_o2098 0x12 -#define COLLIDER_o1902 0x11 -#define COLLIDER_g342 0x10 -#define COLLIDER_g344 0xF -#define COLLIDER_o2033 0xE -#define COLLIDER_deilitsw 0xD -#define COLLIDER_deilisw 0xC -#define COLLIDER_g343 0xB -#define COLLIDER_o2032 0xA -#define COLLIDER_deilite 0x9 -#define COLLIDER_deilie 0x8 -#define COLLIDER_g103 0x7 -#define COLLIDER_o2031 0x6 -#define COLLIDER_deilitw 0x5 -#define COLLIDER_deiliw 0x4 -#define COLLIDER_g110 0x3 -#define COLLIDER_o2035 0x2 -#define COLLIDER_deilitnw 0x1 -#define COLLIDER_deilinw 0x0 +#define COLLIDER_Root 0x42 +#define COLLIDER_12 0x41 +#define COLLIDER_g339 0x40 +#define COLLIDER_B2 0x3F +#define COLLIDER_o2090 0x3E +#define COLLIDER_g332 0x3D +#define COLLIDER_o2059 0x3C +#define COLLIDER_o2056 0x3B +#define COLLIDER_g328 0x3A +#define COLLIDER_g282 0x39 +#define COLLIDER_o2045 0x38 +#define COLLIDER_o2044 0x37 +#define COLLIDER_g285 0x36 +#define COLLIDER_o2043 0x35 +#define COLLIDER_o2042 0x34 +#define COLLIDER_o2041 0x33 +#define COLLIDER_o2040 0x32 +#define COLLIDER_g334 0x31 +#define COLLIDER_o2080 0x30 +#define COLLIDER_o2088 0x2F +#define COLLIDER_g333 0x2E +#define COLLIDER_o2074 0x2D +#define COLLIDER_o2073 0x2C +#define COLLIDER_o2072 0x2B +#define COLLIDER_o2071 0x2A +#define COLLIDER_o2070 0x29 +#define COLLIDER_o2069 0x28 +#define COLLIDER_o2068 0x27 +#define COLLIDER_o2067 0x26 +#define COLLIDER_o2062 0x25 +#define COLLIDER_o2061 0x24 +#define COLLIDER_12_b 0x23 +#define COLLIDER_o2079 0x22 +#define COLLIDER_o2102 0x21 +#define COLLIDER_o2101 0x20 +#define COLLIDER_o2100 0x1F +#define COLLIDER_12_a 0x1E +#define COLLIDER_g301 0x1D +#define COLLIDER_o655 0x1C +#define COLLIDER_o1952 0x1B +#define COLLIDER_g294 0x1A +#define COLLIDER_o1935 0x19 +#define COLLIDER_o1930 0x18 +#define COLLIDER_o1925 0x17 +#define COLLIDER_o1920 0x16 +#define COLLIDER_o1915 0x15 +#define COLLIDER_g345 0x14 +#define COLLIDER_o2099 0x13 +#define COLLIDER_o2098 0x12 +#define COLLIDER_o1902 0x11 +#define COLLIDER_g342 0x10 +#define COLLIDER_g344 0xF +#define COLLIDER_o2033 0xE +#define COLLIDER_deilitsw 0xD +#define COLLIDER_deilisw 0xC +#define COLLIDER_g343 0xB +#define COLLIDER_o2032 0xA +#define COLLIDER_deilite 0x9 +#define COLLIDER_deilie 0x8 +#define COLLIDER_g103 0x7 +#define COLLIDER_o2031 0x6 +#define COLLIDER_deilitw 0x5 +#define COLLIDER_deiliw 0x4 +#define COLLIDER_g110 0x3 +#define COLLIDER_o2035 0x2 +#define COLLIDER_deilitnw 0x1 +#define COLLIDER_deilinw 0x0 + +#define ZONE_Root 0x28 +#define ZONE_Default 0x27 +#define ZONE_deiliw 0x26 +#define ZONE_o625 0x25 +#define ZONE_on 0x24 +#define ZONE_o2183 0x23 +#define ZONE_off 0x22 +#define ZONE_g385 0x21 +#define ZONE_o2181 0x20 +#define ZONE_o2180 0x1F +#define ZONE_g384 0x1E +#define ZONE_o2179 0x1D +#define ZONE_o2178 0x1C +#define ZONE_g383 0x1B +#define ZONE_o2177 0x1A +#define ZONE_o2176 0x19 +#define ZONE_g336 0x18 +#define ZONE_g333 0x17 +#define ZONE_o2055 0x16 +#define ZONE_o2054 0x15 +#define ZONE_g334 0x14 +#define ZONE_o2057 0x13 +#define ZONE_o2056 0x12 +#define ZONE_g335 0x11 +#define ZONE_o2169 0x10 +#define ZONE_o2059 0xF +#define ZONE_12 0xE +#define ZONE_g332 0xD +#define ZONE_o2051 0xC +#define ZONE_g103 0xB +#define ZONE_deilisw 0xA +#define ZONE_o627 0x9 +#define ZONE_o626 0x8 +#define ZONE_g99 0x7 +#define ZONE_deilie 0x6 +#define ZONE_o661 0x5 +#define ZONE_g110 0x4 +#define ZONE_o648 0x3 +#define ZONE_o2047 0x2 +#define ZONE_o2046 0x1 +#define ZONE_g107 0x0 + diff --git a/include/mapfs/isk_12_shape.h b/include/mapfs/isk_12_shape.h index 56d3a61dd9..717541d45b 100644 --- a/include/mapfs/isk_12_shape.h +++ b/include/mapfs/isk_12_shape.h @@ -1,161 +1,162 @@ -#define MODEL_Root 0xA0 -#define MODEL_12 0x9F -#define MODEL_g300 0x9E -#define MODEL_o2233 0x9D -#define MODEL_o2232 0x9C -#define MODEL_o2230 0x9B -#define MODEL_o1948 0x9A -#define MODEL_o2234 0x99 -#define MODEL_o2007 0x98 -#define MODEL_g380 0x97 -#define MODEL_B2 0x96 -#define MODEL_o2226 0x95 -#define MODEL_o2225 0x94 -#define MODEL_o2224 0x93 -#define MODEL_g366 0x92 -#define MODEL_g367 0x91 -#define MODEL_o2109 0x90 -#define MODEL_o2108 0x8F -#define MODEL_o2107 0x8E -#define MODEL_g374 0x8D -#define MODEL_g373 0x8C -#define MODEL_o2210 0x8B -#define MODEL_o2201 0x8A -#define MODEL_g376 0x89 -#define MODEL_o2211 0x88 -#define MODEL_o2212 0x87 -#define MODEL_g379 0x86 -#define MODEL_o2222 0x85 -#define MODEL_o2221 0x84 -#define MODEL_g378 0x83 -#define MODEL_o2218 0x82 -#define MODEL_o2217 0x81 -#define MODEL_g375 0x80 -#define MODEL_o2206 0x7F -#define MODEL_o2199 0x7E -#define MODEL_g368 0x7D -#define MODEL_o2186 0x7C -#define MODEL_o2184 0x7B -#define MODEL_o2183 0x7A -#define MODEL_o2182 0x79 -#define MODEL_o2162 0x78 -#define MODEL_o2161 0x77 -#define MODEL_o2156 0x76 -#define MODEL_o2154 0x75 -#define MODEL_o2150 0x74 -#define MODEL_o2112 0x73 -#define MODEL_g328 0x72 -#define MODEL_g282 0x71 -#define MODEL_g284 0x70 -#define MODEL_o1698 0x6F -#define MODEL_g330 0x6E -#define MODEL_o1699 0x6D -#define MODEL_g283 0x6C -#define MODEL_o1697 0x6B -#define MODEL_o1696 0x6A -#define MODEL_o1693 0x69 -#define MODEL_o1692 0x68 -#define MODEL_g285 0x67 -#define MODEL_g287 0x66 -#define MODEL_o1939 0x65 -#define MODEL_o1708 0x64 -#define MODEL_o1707 0x63 -#define MODEL_o1706 0x62 -#define MODEL_g286 0x61 -#define MODEL_o1938 0x60 -#define MODEL_o1705 0x5F -#define MODEL_o1704 0x5E -#define MODEL_o1703 0x5D -#define MODEL_g363 0x5C -#define MODEL_o6000 0x5B -#define MODEL_12_b 0x5A -#define MODEL_g103 0x59 -#define MODEL_o672 0x58 -#define MODEL_o641 0x57 -#define MODEL_o640 0x56 -#define MODEL_g101 0x55 -#define MODEL_o2165 0x54 -#define MODEL_o2164 0x53 -#define MODEL_g100 0x52 -#define MODEL_o2099 0x51 -#define MODEL_o2096 0x50 -#define MODEL_o670 0x4F -#define MODEL_o669 0x4E -#define MODEL_o660 0x4D -#define MODEL_o631 0x4C -#define MODEL_g364 0x4B -#define MODEL_o2105 0x4A -#define MODEL_o2104 0x49 -#define MODEL_o2103 0x48 -#define MODEL_o2102 0x47 -#define MODEL_12_a 0x46 -#define MODEL_g347 0x45 -#define MODEL_g360 0x44 -#define MODEL_g362 0x43 -#define MODEL_o2088 0x42 -#define MODEL_o2089 0x41 -#define MODEL_o2090 0x40 -#define MODEL_g361 0x3F -#define MODEL_o2072 0x3E -#define MODEL_o2069 0x3D -#define MODEL_o2071 0x3C -#define MODEL_o2070 0x3B -#define MODEL_g357 0x3A -#define MODEL_g359 0x39 -#define MODEL_o2093 0x38 -#define MODEL_o2092 0x37 -#define MODEL_o2091 0x36 -#define MODEL_g358 0x35 -#define MODEL_o2063 0x34 -#define MODEL_o2066 0x33 -#define MODEL_o2064 0x32 -#define MODEL_o2065 0x31 -#define MODEL_g354 0x30 -#define MODEL_g356 0x2F -#define MODEL_o2081 0x2E -#define MODEL_o2080 0x2D -#define MODEL_o2079 0x2C -#define MODEL_g355 0x2B -#define MODEL_o2057 0x2A -#define MODEL_o2060 0x29 -#define MODEL_o2059 0x28 -#define MODEL_o2058 0x27 -#define MODEL_g351 0x26 -#define MODEL_g353 0x25 -#define MODEL_o2076 0x24 -#define MODEL_o2077 0x23 -#define MODEL_o2078 0x22 -#define MODEL_g352 0x21 -#define MODEL_o2054 0x20 -#define MODEL_o2051 0x1F -#define MODEL_o2053 0x1E -#define MODEL_o2052 0x1D -#define MODEL_g348 0x1C -#define MODEL_g350 0x1B -#define MODEL_o2075 0x1A -#define MODEL_o2050 0x19 -#define MODEL_o2049 0x18 -#define MODEL_g349 0x17 -#define MODEL_o2045 0x16 -#define MODEL_o2048 0x15 -#define MODEL_o2046 0x14 -#define MODEL_o2047 0x13 -#define MODEL_g301 0x12 -#define MODEL_o649 0x11 -#define MODEL_o655 0x10 -#define MODEL_o1953 0xF -#define MODEL_o1952 0xE -#define MODEL_g110 0xD -#define MODEL_o659 0xC -#define MODEL_g108 0xB -#define MODEL_o1944 0xA -#define MODEL_o654 0x9 -#define MODEL_o653 0x8 -#define MODEL_o1899 0x7 -#define MODEL_o1900 0x6 -#define MODEL_o1902 0x5 -#define MODEL_g107 0x4 -#define MODEL_o1943 0x3 -#define MODEL_o648 0x2 -#define MODEL_o647 0x1 -#define MODEL_o646 0x0 +#define MODEL_Root 0xA0 +#define MODEL_12 0x9F +#define MODEL_g300 0x9E +#define MODEL_o2233 0x9D +#define MODEL_o2232 0x9C +#define MODEL_o2230 0x9B +#define MODEL_o1948 0x9A +#define MODEL_o2234 0x99 +#define MODEL_o2007 0x98 +#define MODEL_g380 0x97 +#define MODEL_B2 0x96 +#define MODEL_o2226 0x95 +#define MODEL_o2225 0x94 +#define MODEL_o2224 0x93 +#define MODEL_g366 0x92 +#define MODEL_g367 0x91 +#define MODEL_o2109 0x90 +#define MODEL_o2108 0x8F +#define MODEL_o2107 0x8E +#define MODEL_g374 0x8D +#define MODEL_g373 0x8C +#define MODEL_o2210 0x8B +#define MODEL_o2201 0x8A +#define MODEL_g376 0x89 +#define MODEL_o2211 0x88 +#define MODEL_o2212 0x87 +#define MODEL_g379 0x86 +#define MODEL_o2222 0x85 +#define MODEL_o2221 0x84 +#define MODEL_g378 0x83 +#define MODEL_o2218 0x82 +#define MODEL_o2217 0x81 +#define MODEL_g375 0x80 +#define MODEL_o2206 0x7F +#define MODEL_o2199 0x7E +#define MODEL_g368 0x7D +#define MODEL_o2186 0x7C +#define MODEL_o2184 0x7B +#define MODEL_o2183 0x7A +#define MODEL_o2182 0x79 +#define MODEL_o2162 0x78 +#define MODEL_o2161 0x77 +#define MODEL_o2156 0x76 +#define MODEL_o2154 0x75 +#define MODEL_o2150 0x74 +#define MODEL_o2112 0x73 +#define MODEL_g328 0x72 +#define MODEL_g282 0x71 +#define MODEL_g284 0x70 +#define MODEL_o1698 0x6F +#define MODEL_g330 0x6E +#define MODEL_o1699 0x6D +#define MODEL_g283 0x6C +#define MODEL_o1697 0x6B +#define MODEL_o1696 0x6A +#define MODEL_o1693 0x69 +#define MODEL_o1692 0x68 +#define MODEL_g285 0x67 +#define MODEL_g287 0x66 +#define MODEL_o1939 0x65 +#define MODEL_o1708 0x64 +#define MODEL_o1707 0x63 +#define MODEL_o1706 0x62 +#define MODEL_g286 0x61 +#define MODEL_o1938 0x60 +#define MODEL_o1705 0x5F +#define MODEL_o1704 0x5E +#define MODEL_o1703 0x5D +#define MODEL_g363 0x5C +#define MODEL_o6000 0x5B +#define MODEL_12_b 0x5A +#define MODEL_g103 0x59 +#define MODEL_o672 0x58 +#define MODEL_o641 0x57 +#define MODEL_o640 0x56 +#define MODEL_g101 0x55 +#define MODEL_o2165 0x54 +#define MODEL_o2164 0x53 +#define MODEL_g100 0x52 +#define MODEL_o2099 0x51 +#define MODEL_o2096 0x50 +#define MODEL_o670 0x4F +#define MODEL_o669 0x4E +#define MODEL_o660 0x4D +#define MODEL_o631 0x4C +#define MODEL_g364 0x4B +#define MODEL_o2105 0x4A +#define MODEL_o2104 0x49 +#define MODEL_o2103 0x48 +#define MODEL_o2102 0x47 +#define MODEL_12_a 0x46 +#define MODEL_g347 0x45 +#define MODEL_g360 0x44 +#define MODEL_g362 0x43 +#define MODEL_o2088 0x42 +#define MODEL_o2089 0x41 +#define MODEL_o2090 0x40 +#define MODEL_g361 0x3F +#define MODEL_o2072 0x3E +#define MODEL_o2069 0x3D +#define MODEL_o2071 0x3C +#define MODEL_o2070 0x3B +#define MODEL_g357 0x3A +#define MODEL_g359 0x39 +#define MODEL_o2093 0x38 +#define MODEL_o2092 0x37 +#define MODEL_o2091 0x36 +#define MODEL_g358 0x35 +#define MODEL_o2063 0x34 +#define MODEL_o2066 0x33 +#define MODEL_o2064 0x32 +#define MODEL_o2065 0x31 +#define MODEL_g354 0x30 +#define MODEL_g356 0x2F +#define MODEL_o2081 0x2E +#define MODEL_o2080 0x2D +#define MODEL_o2079 0x2C +#define MODEL_g355 0x2B +#define MODEL_o2057 0x2A +#define MODEL_o2060 0x29 +#define MODEL_o2059 0x28 +#define MODEL_o2058 0x27 +#define MODEL_g351 0x26 +#define MODEL_g353 0x25 +#define MODEL_o2076 0x24 +#define MODEL_o2077 0x23 +#define MODEL_o2078 0x22 +#define MODEL_g352 0x21 +#define MODEL_o2054 0x20 +#define MODEL_o2051 0x1F +#define MODEL_o2053 0x1E +#define MODEL_o2052 0x1D +#define MODEL_g348 0x1C +#define MODEL_g350 0x1B +#define MODEL_o2075 0x1A +#define MODEL_o2050 0x19 +#define MODEL_o2049 0x18 +#define MODEL_g349 0x17 +#define MODEL_o2045 0x16 +#define MODEL_o2048 0x15 +#define MODEL_o2046 0x14 +#define MODEL_o2047 0x13 +#define MODEL_g301 0x12 +#define MODEL_o649 0x11 +#define MODEL_o655 0x10 +#define MODEL_o1953 0xF +#define MODEL_o1952 0xE +#define MODEL_g110 0xD +#define MODEL_o659 0xC +#define MODEL_g108 0xB +#define MODEL_o1944 0xA +#define MODEL_o654 0x9 +#define MODEL_o653 0x8 +#define MODEL_o1899 0x7 +#define MODEL_o1900 0x6 +#define MODEL_o1902 0x5 +#define MODEL_g107 0x4 +#define MODEL_o1943 0x3 +#define MODEL_o648 0x2 +#define MODEL_o647 0x1 +#define MODEL_o646 0x0 + diff --git a/include/mapfs/isk_13_hit.h b/include/mapfs/isk_13_hit.h index d285a29ac7..76612fb008 100644 --- a/include/mapfs/isk_13_hit.h +++ b/include/mapfs/isk_13_hit.h @@ -1,13 +1,25 @@ -#define COLLIDER_Root 0xC -#define COLLIDER_13 0xB -#define COLLIDER_g332 0xA -#define COLLIDER_o2039 0x9 -#define COLLIDER_o2035 0x8 -#define COLLIDER_g330 0x7 -#define COLLIDER_o2016 0x6 -#define COLLIDER_o2015 0x5 -#define COLLIDER_o2014 0x4 -#define COLLIDER_g327 0x3 -#define COLLIDER_deilitw 0x2 -#define COLLIDER_o2008 0x1 -#define COLLIDER_deiliw 0x0 +#define COLLIDER_Root 0xC +#define COLLIDER_13 0xB +#define COLLIDER_g332 0xA +#define COLLIDER_o2039 0x9 +#define COLLIDER_o2035 0x8 +#define COLLIDER_g330 0x7 +#define COLLIDER_o2016 0x6 +#define COLLIDER_o2015 0x5 +#define COLLIDER_o2014 0x4 +#define COLLIDER_g327 0x3 +#define COLLIDER_deilitw 0x2 +#define COLLIDER_o2008 0x1 +#define COLLIDER_deiliw 0x0 + +#define ZONE_Root 0x9 +#define ZONE_Default 0x8 +#define ZONE_o681 0x7 +#define ZONE_deili 0x6 +#define ZONE_13 0x5 +#define ZONE_g328 0x4 +#define ZONE_o2013 0x3 +#define ZONE_g115 0x2 +#define ZONE_o2012 0x1 +#define ZONE_g327 0x0 + diff --git a/include/mapfs/isk_13_shape.h b/include/mapfs/isk_13_shape.h index e02ceb5bb7..6a90c394c0 100644 --- a/include/mapfs/isk_13_shape.h +++ b/include/mapfs/isk_13_shape.h @@ -1,39 +1,40 @@ -#define MODEL_Root 0x26 -#define MODEL_13 0x25 -#define MODEL_o2072 0x24 -#define MODEL_g340 0x23 -#define MODEL_o2070 0x22 -#define MODEL_g337 0x21 -#define MODEL_g339 0x20 -#define MODEL_o2069 0x1F -#define MODEL_o2068 0x1E -#define MODEL_g338 0x1D -#define MODEL_o2071 0x1C -#define MODEL_o2066 0x1B -#define MODEL_o2065 0x1A -#define MODEL_g335 0x19 -#define MODEL_o2051 0x18 -#define MODEL_o2050 0x17 -#define MODEL_o2049 0x16 -#define MODEL_o2048 0x15 -#define MODEL_o2047 0x14 -#define MODEL_g331 0x13 -#define MODEL_o2027 0x12 -#define MODEL_o2026 0x11 -#define MODEL_g119 0x10 -#define MODEL_o691 0xF -#define MODEL_g116 0xE -#define MODEL_o2064 0xD -#define MODEL_o2063 0xC -#define MODEL_o2062 0xB -#define MODEL_o2054 0xA -#define MODEL_o2053 0x9 -#define MODEL_o2052 0x8 -#define MODEL_o2044 0x7 -#define MODEL_o2043 0x6 -#define MODEL_o1235 0x5 -#define MODEL_o686 0x4 -#define MODEL_g115 0x3 -#define MODEL_o2085 0x2 -#define MODEL_o2084 0x1 -#define MODEL_o681 0x0 +#define MODEL_Root 0x26 +#define MODEL_13 0x25 +#define MODEL_o2072 0x24 +#define MODEL_g340 0x23 +#define MODEL_o2070 0x22 +#define MODEL_g337 0x21 +#define MODEL_g339 0x20 +#define MODEL_o2069 0x1F +#define MODEL_o2068 0x1E +#define MODEL_g338 0x1D +#define MODEL_o2071 0x1C +#define MODEL_o2066 0x1B +#define MODEL_o2065 0x1A +#define MODEL_g335 0x19 +#define MODEL_o2051 0x18 +#define MODEL_o2050 0x17 +#define MODEL_o2049 0x16 +#define MODEL_o2048 0x15 +#define MODEL_o2047 0x14 +#define MODEL_g331 0x13 +#define MODEL_o2027 0x12 +#define MODEL_o2026 0x11 +#define MODEL_g119 0x10 +#define MODEL_o691 0xF +#define MODEL_g116 0xE +#define MODEL_o2064 0xD +#define MODEL_o2063 0xC +#define MODEL_o2062 0xB +#define MODEL_o2054 0xA +#define MODEL_o2053 0x9 +#define MODEL_o2052 0x8 +#define MODEL_o2044 0x7 +#define MODEL_o2043 0x6 +#define MODEL_o1235 0x5 +#define MODEL_o686 0x4 +#define MODEL_g115 0x3 +#define MODEL_o2085 0x2 +#define MODEL_o2084 0x1 +#define MODEL_o681 0x0 + diff --git a/include/mapfs/isk_14_hit.h b/include/mapfs/isk_14_hit.h index 785ca4d600..44db7197eb 100644 --- a/include/mapfs/isk_14_hit.h +++ b/include/mapfs/isk_14_hit.h @@ -1,19 +1,31 @@ -#define COLLIDER_Root 0x12 -#define COLLIDER_14 0x11 -#define COLLIDER_g337 0x10 -#define COLLIDER_o2052 0xF -#define COLLIDER_o2051 0xE -#define COLLIDER_o2047 0xD -#define COLLIDER_o2045 0xC -#define COLLIDER_o2044 0xB -#define COLLIDER_g335 0xA -#define COLLIDER_o2043 0x9 -#define COLLIDER_o2039 0x8 -#define COLLIDER_g333 0x7 -#define COLLIDER_o2021 0x6 -#define COLLIDER_o2020 0x5 -#define COLLIDER_o2019 0x4 -#define COLLIDER_g330 0x3 -#define COLLIDER_o2010 0x2 -#define COLLIDER_deilitw 0x1 -#define COLLIDER_deiliw 0x0 +#define COLLIDER_Root 0x12 +#define COLLIDER_14 0x11 +#define COLLIDER_g337 0x10 +#define COLLIDER_o2052 0xF +#define COLLIDER_o2051 0xE +#define COLLIDER_o2047 0xD +#define COLLIDER_o2045 0xC +#define COLLIDER_o2044 0xB +#define COLLIDER_g335 0xA +#define COLLIDER_o2043 0x9 +#define COLLIDER_o2039 0x8 +#define COLLIDER_g333 0x7 +#define COLLIDER_o2021 0x6 +#define COLLIDER_o2020 0x5 +#define COLLIDER_o2019 0x4 +#define COLLIDER_g330 0x3 +#define COLLIDER_o2010 0x2 +#define COLLIDER_deilitw 0x1 +#define COLLIDER_deiliw 0x0 + +#define ZONE_Root 0x9 +#define ZONE_Default 0x8 +#define ZONE_o821 0x7 +#define ZONE_14 0x6 +#define ZONE_g331 0x5 +#define ZONE_o2018 0x4 +#define ZONE_deili 0x3 +#define ZONE_g330 0x2 +#define ZONE_o2017 0x1 +#define ZONE_g158 0x0 + diff --git a/include/mapfs/isk_14_shape.h b/include/mapfs/isk_14_shape.h index fa4cef2ca8..002c8beccd 100644 --- a/include/mapfs/isk_14_shape.h +++ b/include/mapfs/isk_14_shape.h @@ -1,51 +1,52 @@ -#define MODEL_Root 0x32 -#define MODEL_14 0x31 -#define MODEL_Default 0x30 -#define MODEL_o2059 0x2F -#define MODEL_g337 0x2E -#define MODEL_o2053 0x2D -#define MODEL_g338 0x2C -#define MODEL_g340 0x2B -#define MODEL_o2058 0x2A -#define MODEL_o2057 0x29 -#define MODEL_g339 0x28 -#define MODEL_o2056 0x27 -#define MODEL_o2055 0x26 -#define MODEL_o2054 0x25 -#define MODEL_g336 0x24 -#define MODEL_o2052 0x23 -#define MODEL_o2051 0x22 -#define MODEL_g335 0x21 -#define MODEL_o2050 0x20 -#define MODEL_o2049 0x1F -#define MODEL_o2048 0x1E -#define MODEL_o2047 0x1D -#define MODEL_o2046 0x1C -#define MODEL_o2045 0x1B -#define MODEL_o2044 0x1A -#define MODEL_g334 0x19 -#define MODEL_o2036 0x18 -#define MODEL_o2035 0x17 -#define MODEL_o2034 0x16 -#define MODEL_o2033 0x15 -#define MODEL_o2032 0x14 -#define MODEL_g160 0x13 -#define MODEL_o826 0x12 -#define MODEL_g333 0x11 -#define MODEL_o2029 0x10 -#define MODEL_o2028 0xF -#define MODEL_g159 0xE -#define MODEL_o2072 0xD -#define MODEL_o2071 0xC -#define MODEL_o2043 0xB -#define MODEL_o2041 0xA -#define MODEL_o2039 0x9 -#define MODEL_o2038 0x8 -#define MODEL_o2022 0x7 -#define MODEL_o2017 0x6 -#define MODEL_o2009 0x5 -#define MODEL_o824 0x4 -#define MODEL_g158 0x3 -#define MODEL_o2014 0x2 -#define MODEL_o821 0x1 -#define MODEL_o820 0x0 +#define MODEL_Root 0x32 +#define MODEL_14 0x31 +#define MODEL_Default 0x30 +#define MODEL_o2059 0x2F +#define MODEL_g337 0x2E +#define MODEL_o2053 0x2D +#define MODEL_g338 0x2C +#define MODEL_g340 0x2B +#define MODEL_o2058 0x2A +#define MODEL_o2057 0x29 +#define MODEL_g339 0x28 +#define MODEL_o2056 0x27 +#define MODEL_o2055 0x26 +#define MODEL_o2054 0x25 +#define MODEL_g336 0x24 +#define MODEL_o2052 0x23 +#define MODEL_o2051 0x22 +#define MODEL_g335 0x21 +#define MODEL_o2050 0x20 +#define MODEL_o2049 0x1F +#define MODEL_o2048 0x1E +#define MODEL_o2047 0x1D +#define MODEL_o2046 0x1C +#define MODEL_o2045 0x1B +#define MODEL_o2044 0x1A +#define MODEL_g334 0x19 +#define MODEL_o2036 0x18 +#define MODEL_o2035 0x17 +#define MODEL_o2034 0x16 +#define MODEL_o2033 0x15 +#define MODEL_o2032 0x14 +#define MODEL_g160 0x13 +#define MODEL_o826 0x12 +#define MODEL_g333 0x11 +#define MODEL_o2029 0x10 +#define MODEL_o2028 0xF +#define MODEL_g159 0xE +#define MODEL_o2072 0xD +#define MODEL_o2071 0xC +#define MODEL_o2043 0xB +#define MODEL_o2041 0xA +#define MODEL_o2039 0x9 +#define MODEL_o2038 0x8 +#define MODEL_o2022 0x7 +#define MODEL_o2017 0x6 +#define MODEL_o2009 0x5 +#define MODEL_o824 0x4 +#define MODEL_g158 0x3 +#define MODEL_o2014 0x2 +#define MODEL_o821 0x1 +#define MODEL_o820 0x0 + diff --git a/include/mapfs/isk_16_hit.h b/include/mapfs/isk_16_hit.h index 560a2dc2e4..15ac2f8568 100644 --- a/include/mapfs/isk_16_hit.h +++ b/include/mapfs/isk_16_hit.h @@ -1,22 +1,35 @@ -#define COLLIDER_Root 0x15 -#define COLLIDER_16 0x14 -#define COLLIDER_o2379 0x13 -#define COLLIDER_o2382 0x12 -#define COLLIDER_o2381 0x11 -#define COLLIDER_o2380 0x10 -#define COLLIDER_g372 0xF -#define COLLIDER_o2371 0xE -#define COLLIDER_g371 0xD -#define COLLIDER_deilitte 0xC -#define COLLIDER_g367 0xB -#define COLLIDER_o2311 0xA -#define COLLIDER_o2310 0x9 -#define COLLIDER_g366 0x8 -#define COLLIDER_g376 0x7 -#define COLLIDER_o2361 0x6 -#define COLLIDER_deilite 0x5 -#define COLLIDER_deilie 0x4 -#define COLLIDER_g375 0x3 -#define COLLIDER_o2363 0x2 -#define COLLIDER_deilitw 0x1 -#define COLLIDER_deiliw 0x0 +#define COLLIDER_Root 0x15 +#define COLLIDER_16 0x14 +#define COLLIDER_o2379 0x13 +#define COLLIDER_o2382 0x12 +#define COLLIDER_o2381 0x11 +#define COLLIDER_o2380 0x10 +#define COLLIDER_g372 0xF +#define COLLIDER_o2371 0xE +#define COLLIDER_g371 0xD +#define COLLIDER_deilitte 0xC +#define COLLIDER_g367 0xB +#define COLLIDER_o2311 0xA +#define COLLIDER_o2310 0x9 +#define COLLIDER_g366 0x8 +#define COLLIDER_g376 0x7 +#define COLLIDER_o2361 0x6 +#define COLLIDER_deilite 0x5 +#define COLLIDER_deilie 0x4 +#define COLLIDER_g375 0x3 +#define COLLIDER_o2363 0x2 +#define COLLIDER_deilitw 0x1 +#define COLLIDER_deiliw 0x0 + +#define ZONE_Root 0xA +#define ZONE_Default 0x9 +#define ZONE_deiliw 0x8 +#define ZONE_o2343 0x7 +#define ZONE_16 0x6 +#define ZONE_g372 0x5 +#define ZONE_deilie 0x4 +#define ZONE_o2339 0x3 +#define ZONE_g366 0x2 +#define ZONE_o2338 0x1 +#define ZONE_g369 0x0 + diff --git a/include/mapfs/isk_16_shape.h b/include/mapfs/isk_16_shape.h index 27d012ab99..2184d9cf40 100644 --- a/include/mapfs/isk_16_shape.h +++ b/include/mapfs/isk_16_shape.h @@ -1,36 +1,37 @@ -#define MODEL_Root 0x23 -#define MODEL_16 0x22 -#define MODEL_o2386 0x21 -#define MODEL_g376 0x20 -#define MODEL_g377 0x1F -#define MODEL_o2384 0x1E -#define MODEL_o2383 0x1D -#define MODEL_o2382 0x1C -#define MODEL_o2377 0x1B -#define MODEL_g371 0x1A -#define MODEL_o2359 0x19 -#define MODEL_g366 0x18 -#define MODEL_o2293 0x17 -#define MODEL_o2347 0x16 -#define MODEL_g367 0x15 -#define MODEL_o2311 0x14 -#define MODEL_o2310 0x13 -#define MODEL_g368 0x12 -#define MODEL_o2400 0x11 -#define MODEL_o2399 0x10 -#define MODEL_o2398 0xF -#define MODEL_o2364 0xE -#define MODEL_o2365 0xD -#define MODEL_o2361 0xC -#define MODEL_o2348 0xB -#define MODEL_o2346 0xA -#define MODEL_o2330 0x9 -#define MODEL_o2326 0x8 -#define MODEL_o2319 0x7 -#define MODEL_g373 0x6 -#define MODEL_o2373 0x5 -#define MODEL_o2372 0x4 -#define MODEL_o2371 0x3 -#define MODEL_g374 0x2 -#define MODEL_o2375 0x1 -#define MODEL_o2374 0x0 +#define MODEL_Root 0x23 +#define MODEL_16 0x22 +#define MODEL_o2386 0x21 +#define MODEL_g376 0x20 +#define MODEL_g377 0x1F +#define MODEL_o2384 0x1E +#define MODEL_o2383 0x1D +#define MODEL_o2382 0x1C +#define MODEL_o2377 0x1B +#define MODEL_g371 0x1A +#define MODEL_o2359 0x19 +#define MODEL_g366 0x18 +#define MODEL_o2293 0x17 +#define MODEL_o2347 0x16 +#define MODEL_g367 0x15 +#define MODEL_o2311 0x14 +#define MODEL_o2310 0x13 +#define MODEL_g368 0x12 +#define MODEL_o2400 0x11 +#define MODEL_o2399 0x10 +#define MODEL_o2398 0xF +#define MODEL_o2364 0xE +#define MODEL_o2365 0xD +#define MODEL_o2361 0xC +#define MODEL_o2348 0xB +#define MODEL_o2346 0xA +#define MODEL_o2330 0x9 +#define MODEL_o2326 0x8 +#define MODEL_o2319 0x7 +#define MODEL_g373 0x6 +#define MODEL_o2373 0x5 +#define MODEL_o2372 0x4 +#define MODEL_o2371 0x3 +#define MODEL_g374 0x2 +#define MODEL_o2375 0x1 +#define MODEL_o2374 0x0 + diff --git a/include/mapfs/isk_18_hit.h b/include/mapfs/isk_18_hit.h index f6a35fbe13..3572c7a4c2 100644 --- a/include/mapfs/isk_18_hit.h +++ b/include/mapfs/isk_18_hit.h @@ -1,31 +1,42 @@ -#define COLLIDER_Root 0x1E -#define COLLIDER_18 0x1D -#define COLLIDER_o2040 0x1C -#define COLLIDER_o2039 0x1B -#define COLLIDER_g338 0x1A -#define COLLIDER_g340 0x19 -#define COLLIDER_o2036 0x18 -#define COLLIDER_o2035 0x17 -#define COLLIDER_o2034 0x16 -#define COLLIDER_o2033 0x15 -#define COLLIDER_g339 0x14 -#define COLLIDER_o2030 0x13 -#define COLLIDER_o2029 0x12 -#define COLLIDER_o2028 0x11 -#define COLLIDER_o2027 0x10 -#define COLLIDER_suna 0xF -#define COLLIDER_deilitte 0xE -#define COLLIDER_g341 0xD -#define COLLIDER_o2053 0xC -#define COLLIDER_o2052 0xB -#define COLLIDER_o2051 0xA -#define COLLIDER_o2050 0x9 -#define COLLIDER_g342 0x8 -#define COLLIDER_bero1 0x7 -#define COLLIDER_o2013 0x6 -#define COLLIDER_deilitw 0x5 -#define COLLIDER_deiliw 0x4 -#define COLLIDER_bero2 0x3 -#define COLLIDER_o2015 0x2 -#define COLLIDER_deilite 0x1 -#define COLLIDER_deilie 0x0 +#define COLLIDER_Root 0x1E +#define COLLIDER_18 0x1D +#define COLLIDER_o2040 0x1C +#define COLLIDER_o2039 0x1B +#define COLLIDER_g338 0x1A +#define COLLIDER_g340 0x19 +#define COLLIDER_o2036 0x18 +#define COLLIDER_o2035 0x17 +#define COLLIDER_o2034 0x16 +#define COLLIDER_o2033 0x15 +#define COLLIDER_g339 0x14 +#define COLLIDER_o2030 0x13 +#define COLLIDER_o2029 0x12 +#define COLLIDER_o2028 0x11 +#define COLLIDER_o2027 0x10 +#define COLLIDER_suna 0xF +#define COLLIDER_deilitte 0xE +#define COLLIDER_g341 0xD +#define COLLIDER_o2053 0xC +#define COLLIDER_o2052 0xB +#define COLLIDER_o2051 0xA +#define COLLIDER_o2050 0x9 +#define COLLIDER_g342 0x8 +#define COLLIDER_bero1 0x7 +#define COLLIDER_o2013 0x6 +#define COLLIDER_deilitw 0x5 +#define COLLIDER_deiliw 0x4 +#define COLLIDER_bero2 0x3 +#define COLLIDER_o2015 0x2 +#define COLLIDER_deilite 0x1 +#define COLLIDER_deilie 0x0 + +#define ZONE_Root 0x8 +#define ZONE_Default 0x7 +#define ZONE_deiliw 0x6 +#define ZONE_18 0x5 +#define ZONE_bero2 0x4 +#define ZONE_o2015 0x3 +#define ZONE_yuka 0x2 +#define ZONE_o742 0x1 +#define ZONE_bero1 0x0 + diff --git a/include/mapfs/isk_18_shape.h b/include/mapfs/isk_18_shape.h index edd6fb11c5..2ece4d1006 100644 --- a/include/mapfs/isk_18_shape.h +++ b/include/mapfs/isk_18_shape.h @@ -1,82 +1,83 @@ -#define MODEL_Root 0x51 -#define MODEL_g349 0x50 -#define MODEL_g353 0x4F -#define MODEL_o2134 0x4E -#define MODEL_g352 0x4D -#define MODEL_o2133 0x4C -#define MODEL_o2132 0x4B -#define MODEL_o2131 0x4A -#define MODEL_o2130 0x49 -#define MODEL_o2129 0x48 -#define MODEL_g351 0x47 -#define MODEL_o2128 0x46 -#define MODEL_o2127 0x45 -#define MODEL_18 0x44 -#define MODEL_g342 0x43 -#define MODEL_o2124 0x42 -#define MODEL_o2123 0x41 -#define MODEL_o2122 0x40 -#define MODEL_o2103 0x3F -#define MODEL_o2102 0x3E -#define MODEL_o2092 0x3D -#define MODEL_o2099 0x3C -#define MODEL_o2098 0x3B -#define MODEL_g343 0x3A -#define MODEL_g344 0x39 -#define MODEL_o2117 0x38 -#define MODEL_o2116 0x37 -#define MODEL_o2115 0x36 -#define MODEL_g341 0x35 -#define MODEL_g338 0x34 -#define MODEL_o2091 0x33 -#define MODEL_o2090 0x32 -#define MODEL_o2089 0x31 -#define MODEL_o2088 0x30 -#define MODEL_o2087 0x2F -#define MODEL_g337 0x2E -#define MODEL_o2095 0x2D -#define MODEL_o2096 0x2C -#define MODEL_o2097 0x2B -#define MODEL_o2094 0x2A -#define MODEL_o2086 0x29 -#define MODEL_o2085 0x28 -#define MODEL_o2084 0x27 -#define MODEL_o2083 0x26 -#define MODEL_g336 0x25 -#define MODEL_o2082 0x24 -#define MODEL_g302 0x23 -#define MODEL_o1958 0x22 -#define MODEL_o1957 0x21 -#define MODEL_o1956 0x20 -#define MODEL_g122 0x1F -#define MODEL_g126 0x1E -#define MODEL_o735 0x1D -#define MODEL_o734 0x1C -#define MODEL_g125 0x1B -#define MODEL_o2140 0x1A -#define MODEL_o2139 0x19 -#define MODEL_o2138 0x18 -#define MODEL_o2137 0x17 -#define MODEL_o2136 0x16 -#define MODEL_o2072 0x15 -#define MODEL_o2076 0x14 -#define MODEL_o2078 0x13 -#define MODEL_o2080 0x12 -#define MODEL_o759 0x11 -#define MODEL_o760 0x10 -#define MODEL_o764 0xF -#define MODEL_o2141 0xE -#define MODEL_o1236 0xD -#define MODEL_g124 0xC -#define MODEL_o1730 0xB -#define MODEL_o751 0xA -#define MODEL_o750 0x9 -#define MODEL_o749 0x8 -#define MODEL_o748 0x7 -#define MODEL_o747 0x6 -#define MODEL_o746 0x5 -#define MODEL_o745 0x4 -#define MODEL_o744 0x3 -#define MODEL_o742 0x2 -#define MODEL_o762 0x1 -#define MODEL_o763 0x0 +#define MODEL_Root 0x51 +#define MODEL_g349 0x50 +#define MODEL_g353 0x4F +#define MODEL_o2134 0x4E +#define MODEL_g352 0x4D +#define MODEL_o2133 0x4C +#define MODEL_o2132 0x4B +#define MODEL_o2131 0x4A +#define MODEL_o2130 0x49 +#define MODEL_o2129 0x48 +#define MODEL_g351 0x47 +#define MODEL_o2128 0x46 +#define MODEL_o2127 0x45 +#define MODEL_18 0x44 +#define MODEL_g342 0x43 +#define MODEL_o2124 0x42 +#define MODEL_o2123 0x41 +#define MODEL_o2122 0x40 +#define MODEL_o2103 0x3F +#define MODEL_o2102 0x3E +#define MODEL_o2092 0x3D +#define MODEL_o2099 0x3C +#define MODEL_o2098 0x3B +#define MODEL_g343 0x3A +#define MODEL_g344 0x39 +#define MODEL_o2117 0x38 +#define MODEL_o2116 0x37 +#define MODEL_o2115 0x36 +#define MODEL_g341 0x35 +#define MODEL_g338 0x34 +#define MODEL_o2091 0x33 +#define MODEL_o2090 0x32 +#define MODEL_o2089 0x31 +#define MODEL_o2088 0x30 +#define MODEL_o2087 0x2F +#define MODEL_g337 0x2E +#define MODEL_o2095 0x2D +#define MODEL_o2096 0x2C +#define MODEL_o2097 0x2B +#define MODEL_o2094 0x2A +#define MODEL_o2086 0x29 +#define MODEL_o2085 0x28 +#define MODEL_o2084 0x27 +#define MODEL_o2083 0x26 +#define MODEL_g336 0x25 +#define MODEL_o2082 0x24 +#define MODEL_g302 0x23 +#define MODEL_o1958 0x22 +#define MODEL_o1957 0x21 +#define MODEL_o1956 0x20 +#define MODEL_g122 0x1F +#define MODEL_g126 0x1E +#define MODEL_o735 0x1D +#define MODEL_o734 0x1C +#define MODEL_g125 0x1B +#define MODEL_o2140 0x1A +#define MODEL_o2139 0x19 +#define MODEL_o2138 0x18 +#define MODEL_o2137 0x17 +#define MODEL_o2136 0x16 +#define MODEL_o2072 0x15 +#define MODEL_o2076 0x14 +#define MODEL_o2078 0x13 +#define MODEL_o2080 0x12 +#define MODEL_o759 0x11 +#define MODEL_o760 0x10 +#define MODEL_o764 0xF +#define MODEL_o2141 0xE +#define MODEL_o1236 0xD +#define MODEL_g124 0xC +#define MODEL_o1730 0xB +#define MODEL_o751 0xA +#define MODEL_o750 0x9 +#define MODEL_o749 0x8 +#define MODEL_o748 0x7 +#define MODEL_o747 0x6 +#define MODEL_o746 0x5 +#define MODEL_o745 0x4 +#define MODEL_o744 0x3 +#define MODEL_o742 0x2 +#define MODEL_o762 0x1 +#define MODEL_o763 0x0 + diff --git a/include/mapfs/isk_19_hit.h b/include/mapfs/isk_19_hit.h index 7505568dee..90dcc07c0b 100644 --- a/include/mapfs/isk_19_hit.h +++ b/include/mapfs/isk_19_hit.h @@ -1,17 +1,23 @@ -#define COLLIDER_Root 0x10 -#define COLLIDER_17 0xF -#define COLLIDER_o2374 0xE -#define COLLIDER_g373 0xD -#define COLLIDER_o2379 0xC -#define COLLIDER_o2378 0xB -#define COLLIDER_o2377 0xA -#define COLLIDER_o2376 0x9 -#define COLLIDER_g359 0x8 -#define COLLIDER_g375 0x7 -#define COLLIDER_o2370 0x6 -#define COLLIDER_deilite 0x5 -#define COLLIDER_deilie 0x4 -#define COLLIDER_g374 0x3 -#define COLLIDER_o2361 0x2 -#define COLLIDER_deilitw 0x1 -#define COLLIDER_deiliw 0x0 +#define COLLIDER_Root 0x10 +#define COLLIDER_17 0xF +#define COLLIDER_o2374 0xE +#define COLLIDER_g373 0xD +#define COLLIDER_o2379 0xC +#define COLLIDER_o2378 0xB +#define COLLIDER_o2377 0xA +#define COLLIDER_o2376 0x9 +#define COLLIDER_g359 0x8 +#define COLLIDER_g375 0x7 +#define COLLIDER_o2370 0x6 +#define COLLIDER_deilite 0x5 +#define COLLIDER_deilie 0x4 +#define COLLIDER_g374 0x3 +#define COLLIDER_o2361 0x2 +#define COLLIDER_deilitw 0x1 +#define COLLIDER_deiliw 0x0 + +#define ZONE_Root 0x3 +#define ZONE_Default 0x2 +#define ZONE_o2357 0x1 +#define ZONE_17 0x0 + diff --git a/include/mapfs/isk_19_shape.h b/include/mapfs/isk_19_shape.h index c2d8ddc25d..ca948a4ae9 100644 --- a/include/mapfs/isk_19_shape.h +++ b/include/mapfs/isk_19_shape.h @@ -1,24 +1,25 @@ -#define MODEL_Root 0x17 -#define MODEL_17 0x16 -#define MODEL_g374 0x15 -#define MODEL_o2376 0x14 -#define MODEL_o2375 0x13 -#define MODEL_g372 0x12 -#define MODEL_g373 0x11 -#define MODEL_o2374 0x10 -#define MODEL_o2373 0xF -#define MODEL_o2372 0xE -#define MODEL_o2369 0xD -#define MODEL_g359 0xC -#define MODEL_o2368 0xB -#define MODEL_o2231 0xA -#define MODEL_g356 0x9 -#define MODEL_o2367 0x8 -#define MODEL_o2366 0x7 -#define MODEL_o2361 0x6 -#define MODEL_o2360 0x5 -#define MODEL_g355 0x4 -#define MODEL_o2365 0x3 -#define MODEL_o2364 0x2 -#define MODEL_g354 0x1 -#define MODEL_o2220 0x0 +#define MODEL_Root 0x17 +#define MODEL_17 0x16 +#define MODEL_g374 0x15 +#define MODEL_o2376 0x14 +#define MODEL_o2375 0x13 +#define MODEL_g372 0x12 +#define MODEL_g373 0x11 +#define MODEL_o2374 0x10 +#define MODEL_o2373 0xF +#define MODEL_o2372 0xE +#define MODEL_o2369 0xD +#define MODEL_g359 0xC +#define MODEL_o2368 0xB +#define MODEL_o2231 0xA +#define MODEL_g356 0x9 +#define MODEL_o2367 0x8 +#define MODEL_o2366 0x7 +#define MODEL_o2361 0x6 +#define MODEL_o2360 0x5 +#define MODEL_g355 0x4 +#define MODEL_o2365 0x3 +#define MODEL_o2364 0x2 +#define MODEL_g354 0x1 +#define MODEL_o2220 0x0 + diff --git a/include/mapfs/isk_bt01_hit.h b/include/mapfs/isk_bt01_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/isk_bt01_hit.h +++ b/include/mapfs/isk_bt01_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/isk_bt01_shape.h b/include/mapfs/isk_bt01_shape.h index 338a35a3e2..7313bfff95 100644 --- a/include/mapfs/isk_bt01_shape.h +++ b/include/mapfs/isk_bt01_shape.h @@ -1,35 +1,36 @@ -#define MODEL_Root 0x22 -#define MODEL_g63 0x21 -#define MODEL_g70 0x20 -#define MODEL_o326 0x1F -#define MODEL_g69 0x1E -#define MODEL_o340 0x1D -#define MODEL_o325 0x1C -#define MODEL_o324 0x1B -#define MODEL_o323 0x1A -#define MODEL_o322 0x19 -#define MODEL_o321 0x18 -#define MODEL_o320 0x17 -#define MODEL_o318 0x16 -#define MODEL_g68 0x15 -#define MODEL_o315 0x14 -#define MODEL_o314 0x13 -#define MODEL_o313 0x12 -#define MODEL_o311 0x11 -#define MODEL_o310 0x10 -#define MODEL_o309 0xF -#define MODEL_dai 0xE -#define MODEL_waku1 0xD -#define MODEL_yuka 0xC -#define MODEL_g49 0xB -#define MODEL_o344 0xA -#define MODEL_o343 0x9 -#define MODEL_waku2 0x8 -#define MODEL_h4 0x7 -#define MODEL_h3 0x6 -#define MODEL_kai 0x5 -#define MODEL_h2 0x4 -#define MODEL_h1 0x3 -#define MODEL_waku 0x2 -#define MODEL_yuka2 0x1 -#define MODEL_o337 0x0 +#define MODEL_Root 0x22 +#define MODEL_g63 0x21 +#define MODEL_g70 0x20 +#define MODEL_o326 0x1F +#define MODEL_g69 0x1E +#define MODEL_o340 0x1D +#define MODEL_o325 0x1C +#define MODEL_o324 0x1B +#define MODEL_o323 0x1A +#define MODEL_o322 0x19 +#define MODEL_o321 0x18 +#define MODEL_o320 0x17 +#define MODEL_o318 0x16 +#define MODEL_g68 0x15 +#define MODEL_o315 0x14 +#define MODEL_o314 0x13 +#define MODEL_o313 0x12 +#define MODEL_o311 0x11 +#define MODEL_o310 0x10 +#define MODEL_o309 0xF +#define MODEL_dai 0xE +#define MODEL_waku1 0xD +#define MODEL_yuka 0xC +#define MODEL_g49 0xB +#define MODEL_o344 0xA +#define MODEL_o343 0x9 +#define MODEL_waku2 0x8 +#define MODEL_h4 0x7 +#define MODEL_h3 0x6 +#define MODEL_kai 0x5 +#define MODEL_h2 0x4 +#define MODEL_h1 0x3 +#define MODEL_waku 0x2 +#define MODEL_yuka2 0x1 +#define MODEL_o337 0x0 + diff --git a/include/mapfs/isk_bt02_hit.h b/include/mapfs/isk_bt02_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/isk_bt02_hit.h +++ b/include/mapfs/isk_bt02_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/isk_bt02_shape.h b/include/mapfs/isk_bt02_shape.h index 422e8f6f35..daaaebb2df 100644 --- a/include/mapfs/isk_bt02_shape.h +++ b/include/mapfs/isk_bt02_shape.h @@ -1,41 +1,42 @@ -#define MODEL_Root 0x28 -#define MODEL_g69 0x27 -#define MODEL_g96 0x26 -#define MODEL_o403 0x25 -#define MODEL_o402 0x24 -#define MODEL_o401 0x23 -#define MODEL_o400 0x22 -#define MODEL_o399 0x21 -#define MODEL_o394 0x20 -#define MODEL_o398 0x1F -#define MODEL_o397 0x1E -#define MODEL_o395 0x1D -#define MODEL_o393 0x1C -#define MODEL_o396 0x1B -#define MODEL_o392 0x1A -#define MODEL_yuka 0x19 -#define MODEL_g49 0x18 -#define MODEL_waku4 0x17 -#define MODEL_waku3 0x16 -#define MODEL_waku2 0x15 -#define MODEL_h4 0x14 -#define MODEL_h3 0x13 -#define MODEL_oku2 0x12 -#define MODEL_o391 0x11 -#define MODEL_o390 0x10 -#define MODEL_o389 0xF -#define MODEL_kai2 0xE -#define MODEL_hasi6 0xD -#define MODEL_hasi5 0xC -#define MODEL_kai1 0xB -#define MODEL_oke1 0xA -#define MODEL_o367 0x9 -#define MODEL_o366 0x8 -#define MODEL_o365 0x7 -#define MODEL_g98 0x6 -#define MODEL_waku1 0x5 -#define MODEL_hasi2 0x4 -#define MODEL_hasi1 0x3 -#define MODEL_waku 0x2 -#define MODEL_kabe 0x1 -#define MODEL_yuka2 0x0 +#define MODEL_Root 0x28 +#define MODEL_g69 0x27 +#define MODEL_g96 0x26 +#define MODEL_o403 0x25 +#define MODEL_o402 0x24 +#define MODEL_o401 0x23 +#define MODEL_o400 0x22 +#define MODEL_o399 0x21 +#define MODEL_o394 0x20 +#define MODEL_o398 0x1F +#define MODEL_o397 0x1E +#define MODEL_o395 0x1D +#define MODEL_o393 0x1C +#define MODEL_o396 0x1B +#define MODEL_o392 0x1A +#define MODEL_yuka 0x19 +#define MODEL_g49 0x18 +#define MODEL_waku4 0x17 +#define MODEL_waku3 0x16 +#define MODEL_waku2 0x15 +#define MODEL_h4 0x14 +#define MODEL_h3 0x13 +#define MODEL_oku2 0x12 +#define MODEL_o391 0x11 +#define MODEL_o390 0x10 +#define MODEL_o389 0xF +#define MODEL_kai2 0xE +#define MODEL_hasi6 0xD +#define MODEL_hasi5 0xC +#define MODEL_kai1 0xB +#define MODEL_oke1 0xA +#define MODEL_o367 0x9 +#define MODEL_o366 0x8 +#define MODEL_o365 0x7 +#define MODEL_g98 0x6 +#define MODEL_waku1 0x5 +#define MODEL_hasi2 0x4 +#define MODEL_hasi1 0x3 +#define MODEL_waku 0x2 +#define MODEL_kabe 0x1 +#define MODEL_yuka2 0x0 + diff --git a/include/mapfs/isk_bt03_hit.h b/include/mapfs/isk_bt03_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/isk_bt03_hit.h +++ b/include/mapfs/isk_bt03_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/isk_bt03_shape.h b/include/mapfs/isk_bt03_shape.h index 0dd7c4a5f7..8394c8129c 100644 --- a/include/mapfs/isk_bt03_shape.h +++ b/include/mapfs/isk_bt03_shape.h @@ -1,32 +1,33 @@ -#define MODEL_Root 0x1F -#define MODEL_dai 0x1E -#define MODEL_waku1 0x1D -#define MODEL_o415 0x1C -#define MODEL_yuka 0x1B -#define MODEL_g49 0x1A -#define MODEL_waku4 0x19 -#define MODEL_waku3 0x18 -#define MODEL_waku2 0x17 -#define MODEL_h3 0x16 -#define MODEL_h2 0x15 -#define MODEL_h1 0x14 -#define MODEL_g102 0x13 -#define MODEL_o429 0x12 -#define MODEL_o428 0x11 -#define MODEL_o427 0x10 -#define MODEL_g101 0xF -#define MODEL_o426 0xE -#define MODEL_o425 0xD -#define MODEL_o424 0xC -#define MODEL_m4 0xB -#define MODEL_m3 0xA -#define MODEL_m2 0x9 -#define MODEL_m1 0x8 -#define MODEL_k4 0x7 -#define MODEL_k3 0x6 -#define MODEL_k2 0x5 -#define MODEL_k1 0x4 -#define MODEL_o414 0x3 -#define MODEL_waku 0x2 -#define MODEL_yuka2 0x1 -#define MODEL_o431 0x0 +#define MODEL_Root 0x1F +#define MODEL_dai 0x1E +#define MODEL_waku1 0x1D +#define MODEL_o415 0x1C +#define MODEL_yuka 0x1B +#define MODEL_g49 0x1A +#define MODEL_waku4 0x19 +#define MODEL_waku3 0x18 +#define MODEL_waku2 0x17 +#define MODEL_h3 0x16 +#define MODEL_h2 0x15 +#define MODEL_h1 0x14 +#define MODEL_g102 0x13 +#define MODEL_o429 0x12 +#define MODEL_o428 0x11 +#define MODEL_o427 0x10 +#define MODEL_g101 0xF +#define MODEL_o426 0xE +#define MODEL_o425 0xD +#define MODEL_o424 0xC +#define MODEL_m4 0xB +#define MODEL_m3 0xA +#define MODEL_m2 0x9 +#define MODEL_m1 0x8 +#define MODEL_k4 0x7 +#define MODEL_k3 0x6 +#define MODEL_k2 0x5 +#define MODEL_k1 0x4 +#define MODEL_o414 0x3 +#define MODEL_waku 0x2 +#define MODEL_yuka2 0x1 +#define MODEL_o431 0x0 + diff --git a/include/mapfs/isk_bt04_hit.h b/include/mapfs/isk_bt04_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/isk_bt04_hit.h +++ b/include/mapfs/isk_bt04_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/isk_bt04_shape.h b/include/mapfs/isk_bt04_shape.h index 7803af5e8c..84ac401210 100644 --- a/include/mapfs/isk_bt04_shape.h +++ b/include/mapfs/isk_bt04_shape.h @@ -1,60 +1,61 @@ -#define MODEL_Root 0x3B -#define MODEL_g132 0x3A -#define MODEL_g133 0x39 -#define MODEL_o506 0x38 -#define MODEL_o505 0x37 -#define MODEL_o504 0x36 -#define MODEL_o503 0x35 -#define MODEL_o501 0x34 -#define MODEL_o500 0x33 -#define MODEL_o499 0x32 -#define MODEL_o498 0x31 -#define MODEL_yuka 0x30 -#define MODEL_dai 0x2F -#define MODEL_o492 0x2E -#define MODEL_o491 0x2D -#define MODEL_g49 0x2C -#define MODEL_waku1 0x2B -#define MODEL_o495 0x2A -#define MODEL_waku4 0x29 -#define MODEL_waku3 0x28 -#define MODEL_waku2 0x27 -#define MODEL_waku 0x26 -#define MODEL_ten 0x25 -#define MODEL_futi5 0x24 -#define MODEL_dai5 0x23 -#define MODEL_ha4 0x22 -#define MODEL_atama5 0x21 -#define MODEL_me5 0x20 -#define MODEL_kuti5 0x1F -#define MODEL_kage5 0x1E -#define MODEL_futi4 0x1D -#define MODEL_dai4 0x1C -#define MODEL_ha3 0x1B -#define MODEL_atama4 0x1A -#define MODEL_me4 0x19 -#define MODEL_kuti4 0x18 -#define MODEL_kage4 0x17 -#define MODEL_futi3 0x16 -#define MODEL_dai3 0x15 -#define MODEL_ha2 0x14 -#define MODEL_atama3 0x13 -#define MODEL_me3 0x12 -#define MODEL_kuti3 0x11 -#define MODEL_kage3 0x10 -#define MODEL_futi2 0xF -#define MODEL_dai2 0xE -#define MODEL_ha5 0xD -#define MODEL_atama2 0xC -#define MODEL_me2 0xB -#define MODEL_kuti2 0xA -#define MODEL_kage2 0x9 -#define MODEL_futi1 0x8 -#define MODEL_dai1 0x7 -#define MODEL_ha1 0x6 -#define MODEL_atama1 0x5 -#define MODEL_me1 0x4 -#define MODEL_kuti1 0x3 -#define MODEL_kage1 0x2 -#define MODEL_yuka2 0x1 -#define MODEL_kabe 0x0 +#define MODEL_Root 0x3B +#define MODEL_g132 0x3A +#define MODEL_g133 0x39 +#define MODEL_o506 0x38 +#define MODEL_o505 0x37 +#define MODEL_o504 0x36 +#define MODEL_o503 0x35 +#define MODEL_o501 0x34 +#define MODEL_o500 0x33 +#define MODEL_o499 0x32 +#define MODEL_o498 0x31 +#define MODEL_yuka 0x30 +#define MODEL_dai 0x2F +#define MODEL_o492 0x2E +#define MODEL_o491 0x2D +#define MODEL_g49 0x2C +#define MODEL_waku1 0x2B +#define MODEL_o495 0x2A +#define MODEL_waku4 0x29 +#define MODEL_waku3 0x28 +#define MODEL_waku2 0x27 +#define MODEL_waku 0x26 +#define MODEL_ten 0x25 +#define MODEL_futi5 0x24 +#define MODEL_dai5 0x23 +#define MODEL_ha4 0x22 +#define MODEL_atama5 0x21 +#define MODEL_me5 0x20 +#define MODEL_kuti5 0x1F +#define MODEL_kage5 0x1E +#define MODEL_futi4 0x1D +#define MODEL_dai4 0x1C +#define MODEL_ha3 0x1B +#define MODEL_atama4 0x1A +#define MODEL_me4 0x19 +#define MODEL_kuti4 0x18 +#define MODEL_kage4 0x17 +#define MODEL_futi3 0x16 +#define MODEL_dai3 0x15 +#define MODEL_ha2 0x14 +#define MODEL_atama3 0x13 +#define MODEL_me3 0x12 +#define MODEL_kuti3 0x11 +#define MODEL_kage3 0x10 +#define MODEL_futi2 0xF +#define MODEL_dai2 0xE +#define MODEL_ha5 0xD +#define MODEL_atama2 0xC +#define MODEL_me2 0xB +#define MODEL_kuti2 0xA +#define MODEL_kage2 0x9 +#define MODEL_futi1 0x8 +#define MODEL_dai1 0x7 +#define MODEL_ha1 0x6 +#define MODEL_atama1 0x5 +#define MODEL_me1 0x4 +#define MODEL_kuti1 0x3 +#define MODEL_kage1 0x2 +#define MODEL_yuka2 0x1 +#define MODEL_kabe 0x0 + diff --git a/include/mapfs/isk_bt05_hit.h b/include/mapfs/isk_bt05_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/isk_bt05_hit.h +++ b/include/mapfs/isk_bt05_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/isk_bt05_shape.h b/include/mapfs/isk_bt05_shape.h index 57bb1aff31..2798cd4fa6 100644 --- a/include/mapfs/isk_bt05_shape.h +++ b/include/mapfs/isk_bt05_shape.h @@ -1,27 +1,28 @@ -#define MODEL_Root 0x1A -#define MODEL_dai 0x19 -#define MODEL_waku1 0x18 -#define MODEL_kakera 0x17 -#define MODEL_o524 0x16 -#define MODEL_o522 0x15 -#define MODEL_o521 0x14 -#define MODEL_o520 0x13 -#define MODEL_o519 0x12 -#define MODEL_o514 0x11 -#define MODEL_o513 0x10 -#define MODEL_yuka 0xF -#define MODEL_g49 0xE -#define MODEL_waku4 0xD -#define MODEL_waku3 0xC -#define MODEL_waku2 0xB -#define MODEL_ten2 0xA -#define MODEL_suna 0x9 -#define MODEL_waku 0x8 -#define MODEL_ten 0x7 -#define MODEL_yuka2 0x6 -#define MODEL_g131 0x5 -#define MODEL_o508 0x4 -#define MODEL_o454 0x3 -#define MODEL_o457 0x2 -#define MODEL_o455 0x1 -#define MODEL_o456 0x0 +#define MODEL_Root 0x1A +#define MODEL_dai 0x19 +#define MODEL_waku1 0x18 +#define MODEL_kakera 0x17 +#define MODEL_o524 0x16 +#define MODEL_o522 0x15 +#define MODEL_o521 0x14 +#define MODEL_o520 0x13 +#define MODEL_o519 0x12 +#define MODEL_o514 0x11 +#define MODEL_o513 0x10 +#define MODEL_yuka 0xF +#define MODEL_g49 0xE +#define MODEL_waku4 0xD +#define MODEL_waku3 0xC +#define MODEL_waku2 0xB +#define MODEL_ten2 0xA +#define MODEL_suna 0x9 +#define MODEL_waku 0x8 +#define MODEL_ten 0x7 +#define MODEL_yuka2 0x6 +#define MODEL_g131 0x5 +#define MODEL_o508 0x4 +#define MODEL_o454 0x3 +#define MODEL_o457 0x2 +#define MODEL_o455 0x1 +#define MODEL_o456 0x0 + diff --git a/include/mapfs/isk_bt06_hit.h b/include/mapfs/isk_bt06_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/isk_bt06_hit.h +++ b/include/mapfs/isk_bt06_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/isk_bt06_shape.h b/include/mapfs/isk_bt06_shape.h index e9b80b38b1..b5595cd60d 100644 --- a/include/mapfs/isk_bt06_shape.h +++ b/include/mapfs/isk_bt06_shape.h @@ -1,27 +1,28 @@ -#define MODEL_Root 0x1A -#define MODEL_dai 0x19 -#define MODEL_kazari 0x18 -#define MODEL_kesu 0x17 -#define MODEL_o516 0x16 -#define MODEL_o515 0x15 -#define MODEL_o512 0x14 -#define MODEL_waku1 0x13 -#define MODEL_yuka 0x12 -#define MODEL_g49 0x11 -#define MODEL_waku4 0x10 -#define MODEL_waku3 0xF -#define MODEL_waku2 0xE -#define MODEL_dan 0xD -#define MODEL_dan2 0xC -#define MODEL_o523 0xB -#define MODEL_o522 0xA -#define MODEL_o521 0x9 -#define MODEL_o520 0x8 -#define MODEL_o519 0x7 -#define MODEL_yuka2 0x6 -#define MODEL_kabe 0x5 -#define MODEL_o524 0x4 -#define MODEL_o454 0x3 -#define MODEL_o455 0x2 -#define MODEL_o456 0x1 -#define MODEL_waku 0x0 +#define MODEL_Root 0x1A +#define MODEL_dai 0x19 +#define MODEL_kazari 0x18 +#define MODEL_kesu 0x17 +#define MODEL_o516 0x16 +#define MODEL_o515 0x15 +#define MODEL_o512 0x14 +#define MODEL_waku1 0x13 +#define MODEL_yuka 0x12 +#define MODEL_g49 0x11 +#define MODEL_waku4 0x10 +#define MODEL_waku3 0xF +#define MODEL_waku2 0xE +#define MODEL_dan 0xD +#define MODEL_dan2 0xC +#define MODEL_o523 0xB +#define MODEL_o522 0xA +#define MODEL_o521 0x9 +#define MODEL_o520 0x8 +#define MODEL_o519 0x7 +#define MODEL_yuka2 0x6 +#define MODEL_kabe 0x5 +#define MODEL_o524 0x4 +#define MODEL_o454 0x3 +#define MODEL_o455 0x2 +#define MODEL_o456 0x1 +#define MODEL_waku 0x0 + diff --git a/include/mapfs/isk_bt07_hit.h b/include/mapfs/isk_bt07_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/isk_bt07_hit.h +++ b/include/mapfs/isk_bt07_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/isk_bt07_shape.h b/include/mapfs/isk_bt07_shape.h index 706eea155c..e8bd9c85c8 100644 --- a/include/mapfs/isk_bt07_shape.h +++ b/include/mapfs/isk_bt07_shape.h @@ -1,26 +1,27 @@ -#define MODEL_Root 0x19 -#define MODEL_dai 0x18 -#define MODEL_waku1 0x17 -#define MODEL_yuka 0x16 -#define MODEL_g49 0x15 -#define MODEL_waku4 0x14 -#define MODEL_waku3 0x13 -#define MODEL_waku2 0x12 -#define MODEL_dan 0x11 -#define MODEL_dan2 0x10 -#define MODEL_o539 0xF -#define MODEL_o538 0xE -#define MODEL_o537 0xD -#define MODEL_o536 0xC -#define MODEL_o535 0xB -#define MODEL_yuka2 0xA -#define MODEL_kazari 0x9 -#define MODEL_o533 0x8 -#define MODEL_o532 0x7 -#define MODEL_o531 0x6 -#define MODEL_kabe 0x5 -#define MODEL_o524 0x4 -#define MODEL_o454 0x3 -#define MODEL_o455 0x2 -#define MODEL_o456 0x1 -#define MODEL_waku 0x0 +#define MODEL_Root 0x19 +#define MODEL_dai 0x18 +#define MODEL_waku1 0x17 +#define MODEL_yuka 0x16 +#define MODEL_g49 0x15 +#define MODEL_waku4 0x14 +#define MODEL_waku3 0x13 +#define MODEL_waku2 0x12 +#define MODEL_dan 0x11 +#define MODEL_dan2 0x10 +#define MODEL_o539 0xF +#define MODEL_o538 0xE +#define MODEL_o537 0xD +#define MODEL_o536 0xC +#define MODEL_o535 0xB +#define MODEL_yuka2 0xA +#define MODEL_kazari 0x9 +#define MODEL_o533 0x8 +#define MODEL_o532 0x7 +#define MODEL_o531 0x6 +#define MODEL_kabe 0x5 +#define MODEL_o524 0x4 +#define MODEL_o454 0x3 +#define MODEL_o455 0x2 +#define MODEL_o456 0x1 +#define MODEL_waku 0x0 + diff --git a/include/mapfs/isk_bt08_hit.h b/include/mapfs/isk_bt08_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/isk_bt08_hit.h +++ b/include/mapfs/isk_bt08_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/isk_bt08_shape.h b/include/mapfs/isk_bt08_shape.h index 3a5edf895d..6d29657a7a 100644 --- a/include/mapfs/isk_bt08_shape.h +++ b/include/mapfs/isk_bt08_shape.h @@ -1,36 +1,37 @@ -#define MODEL_Root 0x23 -#define MODEL_g69 0x22 -#define MODEL_g96 0x21 -#define MODEL_o403 0x20 -#define MODEL_o402 0x1F -#define MODEL_o401 0x1E -#define MODEL_o400 0x1D -#define MODEL_o399 0x1C -#define MODEL_o394 0x1B -#define MODEL_o398 0x1A -#define MODEL_o397 0x19 -#define MODEL_o395 0x18 -#define MODEL_o393 0x17 -#define MODEL_o396 0x16 -#define MODEL_o392 0x15 -#define MODEL_yuka 0x14 -#define MODEL_g98 0x13 -#define MODEL_waku4 0x12 -#define MODEL_waku3 0x11 -#define MODEL_waku2 0x10 -#define MODEL_waku1 0xF -#define MODEL_kabe2 0xE -#define MODEL_oke2_3 0xD -#define MODEL_oke2_2 0xC -#define MODEL_oke2_1 0xB -#define MODEL_oke1_3 0xA -#define MODEL_oke1_2 0x9 -#define MODEL_oke1_1 0x8 -#define MODEL_hasi4 0x7 -#define MODEL_hasi3 0x6 -#define MODEL_hasi2 0x5 -#define MODEL_hasi1 0x4 -#define MODEL_yane 0x3 -#define MODEL_waku 0x2 -#define MODEL_kabe 0x1 -#define MODEL_yuka2 0x0 +#define MODEL_Root 0x23 +#define MODEL_g69 0x22 +#define MODEL_g96 0x21 +#define MODEL_o403 0x20 +#define MODEL_o402 0x1F +#define MODEL_o401 0x1E +#define MODEL_o400 0x1D +#define MODEL_o399 0x1C +#define MODEL_o394 0x1B +#define MODEL_o398 0x1A +#define MODEL_o397 0x19 +#define MODEL_o395 0x18 +#define MODEL_o393 0x17 +#define MODEL_o396 0x16 +#define MODEL_o392 0x15 +#define MODEL_yuka 0x14 +#define MODEL_g98 0x13 +#define MODEL_waku4 0x12 +#define MODEL_waku3 0x11 +#define MODEL_waku2 0x10 +#define MODEL_waku1 0xF +#define MODEL_kabe2 0xE +#define MODEL_oke2_3 0xD +#define MODEL_oke2_2 0xC +#define MODEL_oke2_1 0xB +#define MODEL_oke1_3 0xA +#define MODEL_oke1_2 0x9 +#define MODEL_oke1_1 0x8 +#define MODEL_hasi4 0x7 +#define MODEL_hasi3 0x6 +#define MODEL_hasi2 0x5 +#define MODEL_hasi1 0x4 +#define MODEL_yane 0x3 +#define MODEL_waku 0x2 +#define MODEL_kabe 0x1 +#define MODEL_yuka2 0x0 + diff --git a/include/mapfs/iwa_00_hit.h b/include/mapfs/iwa_00_hit.h index 57452d3d4a..0a915e913e 100644 --- a/include/mapfs/iwa_00_hit.h +++ b/include/mapfs/iwa_00_hit.h @@ -1,43 +1,51 @@ -#define COLLIDER_Root 0x2A -#define COLLIDER_map1 0x29 -#define COLLIDER_section4 0x28 -#define COLLIDER_o1103 0x27 -#define COLLIDER_o1102 0x26 -#define COLLIDER_o1089 0x25 -#define COLLIDER_o976 0x24 -#define COLLIDER_o975 0x23 -#define COLLIDER_o974 0x22 -#define COLLIDER_o977 0x21 -#define COLLIDER_o838 0x20 -#define COLLIDER_section3 0x1F -#define COLLIDER_kame2 0x1E -#define COLLIDER_o1098 0x1D -#define COLLIDER_o965 0x1C -#define COLLIDER_o964 0x1B -#define COLLIDER_o1088 0x1A -#define COLLIDER_o958 0x19 -#define COLLIDER_o966 0x18 -#define COLLIDER_o967 0x17 -#define COLLIDER_o971 0x16 -#define COLLIDER_o970 0x15 -#define COLLIDER_o968 0x14 -#define COLLIDER_o969 0x13 -#define COLLIDER_o879 0x12 -#define COLLIDER_o963 0x11 -#define COLLIDER_section1 0x10 -#define COLLIDER_o973 0xF -#define COLLIDER_o972 0xE -#define COLLIDER_o1087 0xD -#define COLLIDER_suberi01 0xC -#define COLLIDER_o957 0xB -#define COLLIDER_g324 0xA -#define COLLIDER_o1096 0x9 -#define COLLIDER_o1095 0x8 -#define COLLIDER_s4_n 0x7 -#define COLLIDER_s3_n 0x6 -#define COLLIDER_deilit2 0x5 -#define COLLIDER_deili2 0x4 -#define COLLIDER_s1_n 0x3 -#define COLLIDER_deilit1 0x2 -#define COLLIDER_deili1 0x1 -#define COLLIDER_st1 0x0 +#define COLLIDER_Root 0x2A +#define COLLIDER_map1 0x29 +#define COLLIDER_section4 0x28 +#define COLLIDER_o1103 0x27 +#define COLLIDER_o1102 0x26 +#define COLLIDER_o1089 0x25 +#define COLLIDER_o976 0x24 +#define COLLIDER_o975 0x23 +#define COLLIDER_o974 0x22 +#define COLLIDER_o977 0x21 +#define COLLIDER_o838 0x20 +#define COLLIDER_section3 0x1F +#define COLLIDER_kame2 0x1E +#define COLLIDER_o1098 0x1D +#define COLLIDER_o965 0x1C +#define COLLIDER_o964 0x1B +#define COLLIDER_o1088 0x1A +#define COLLIDER_o958 0x19 +#define COLLIDER_o966 0x18 +#define COLLIDER_o967 0x17 +#define COLLIDER_o971 0x16 +#define COLLIDER_o970 0x15 +#define COLLIDER_o968 0x14 +#define COLLIDER_o969 0x13 +#define COLLIDER_o879 0x12 +#define COLLIDER_o963 0x11 +#define COLLIDER_section1 0x10 +#define COLLIDER_o973 0xF +#define COLLIDER_o972 0xE +#define COLLIDER_o1087 0xD +#define COLLIDER_suberi01 0xC +#define COLLIDER_o957 0xB +#define COLLIDER_g324 0xA +#define COLLIDER_o1096 0x9 +#define COLLIDER_o1095 0x8 +#define COLLIDER_s4_n 0x7 +#define COLLIDER_s3_n 0x6 +#define COLLIDER_deilit2 0x5 +#define COLLIDER_deili2 0x4 +#define COLLIDER_s1_n 0x3 +#define COLLIDER_deilit1 0x2 +#define COLLIDER_deili1 0x1 +#define COLLIDER_st1 0x0 + +#define ZONE_Root 0x5 +#define ZONE_g297 0x4 +#define ZONE_o970 0x3 +#define ZONE_o969 0x2 +#define ZONE_o985 0x1 +#define ZONE_o968 0x0 + diff --git a/include/mapfs/iwa_00_shape.h b/include/mapfs/iwa_00_shape.h index 18fffbf583..77e69f6a3a 100644 --- a/include/mapfs/iwa_00_shape.h +++ b/include/mapfs/iwa_00_shape.h @@ -1,41 +1,42 @@ -#define MODEL_Root 0x28 -#define MODEL_suberi 0x27 -#define MODEL_suberi01 0x26 -#define MODEL_kabe 0x25 -#define MODEL_o969 0x24 -#define MODEL_o837 0x23 -#define MODEL_o957 0x22 -#define MODEL_o992 0x21 -#define MODEL_o993 0x20 -#define MODEL_sen1 0x1F -#define MODEL_se1 0x1E -#define MODEL_hashi 0x1D -#define MODEL_o1061 0x1C -#define MODEL_o976 0x1B -#define MODEL_kusa 0x1A -#define MODEL_o950 0x19 -#define MODEL_toi 0x18 -#define MODEL_o949 0x17 -#define MODEL_water 0x16 -#define MODEL_o933 0x15 -#define MODEL_o926 0x14 -#define MODEL_ishi 0x13 -#define MODEL_o1018 0x12 -#define MODEL_o1019 0x11 -#define MODEL_bero 0x10 -#define MODEL_o911 0xF -#define MODEL_s_ishi 0xE -#define MODEL_o1056 0xD -#define MODEL_o896 0xC -#define MODEL_o895 0xB -#define MODEL_o893 0xA -#define MODEL_g326 0x9 -#define MODEL_o965 0x8 -#define MODEL_o1069 0x7 -#define MODEL_o1068 0x6 -#define MODEL_o1067 0x5 -#define MODEL_o1065 0x4 -#define MODEL_jimen 0x3 -#define MODEL_o882 0x2 -#define MODEL_o838 0x1 -#define MODEL_o1066 0x0 +#define MODEL_Root 0x28 +#define MODEL_suberi 0x27 +#define MODEL_suberi01 0x26 +#define MODEL_kabe 0x25 +#define MODEL_o969 0x24 +#define MODEL_o837 0x23 +#define MODEL_o957 0x22 +#define MODEL_o992 0x21 +#define MODEL_o993 0x20 +#define MODEL_sen1 0x1F +#define MODEL_se1 0x1E +#define MODEL_hashi 0x1D +#define MODEL_o1061 0x1C +#define MODEL_o976 0x1B +#define MODEL_kusa 0x1A +#define MODEL_o950 0x19 +#define MODEL_toi 0x18 +#define MODEL_o949 0x17 +#define MODEL_water 0x16 +#define MODEL_o933 0x15 +#define MODEL_o926 0x14 +#define MODEL_ishi 0x13 +#define MODEL_o1018 0x12 +#define MODEL_o1019 0x11 +#define MODEL_bero 0x10 +#define MODEL_o911 0xF +#define MODEL_s_ishi 0xE +#define MODEL_o1056 0xD +#define MODEL_o896 0xC +#define MODEL_o895 0xB +#define MODEL_o893 0xA +#define MODEL_g326 0x9 +#define MODEL_o965 0x8 +#define MODEL_o1069 0x7 +#define MODEL_o1068 0x6 +#define MODEL_o1067 0x5 +#define MODEL_o1065 0x4 +#define MODEL_jimen 0x3 +#define MODEL_o882 0x2 +#define MODEL_o838 0x1 +#define MODEL_o1066 0x0 + diff --git a/include/mapfs/iwa_01_hit.h b/include/mapfs/iwa_01_hit.h index 1ca279eb61..040d092ae9 100644 --- a/include/mapfs/iwa_01_hit.h +++ b/include/mapfs/iwa_01_hit.h @@ -1,54 +1,66 @@ -#define COLLIDER_Root 0x35 -#define COLLIDER_g298 0x34 -#define COLLIDER_st2 0x33 -#define COLLIDER_o1060 0x32 -#define COLLIDER_st1 0x31 -#define COLLIDER_g283 0x30 -#define COLLIDER_o1065 0x2F -#define COLLIDER_o1064 0x2E -#define COLLIDER_o1063 0x2D -#define COLLIDER_o1062 0x2C -#define COLLIDER_tonnel 0x2B -#define COLLIDER_o1082 0x2A -#define COLLIDER_o1079 0x29 -#define COLLIDER_o1072 0x28 -#define COLLIDER_o1067 0x27 -#define COLLIDER_o1047 0x26 -#define COLLIDER_o986 0x25 -#define COLLIDER_o983 0x24 -#define COLLIDER_o982 0x23 -#define COLLIDER_o981 0x22 -#define COLLIDER_deilit4 0x21 -#define COLLIDER_deili4 0x20 -#define COLLIDER_t_n 0x1F -#define COLLIDER_o901 0x1E -#define COLLIDER_section4 0x1D -#define COLLIDER_o1081 0x1C -#define COLLIDER_o1078 0x1B -#define COLLIDER_deilit3 0x1A -#define COLLIDER_deili3 0x19 -#define COLLIDER_o874 0x18 -#define COLLIDER_s4_n 0x17 -#define COLLIDER_section3 0x16 -#define COLLIDER_noko 0x15 -#define COLLIDER_o1077 0x14 -#define COLLIDER_o869 0x13 -#define COLLIDER_o980 0x12 -#define COLLIDER_suberi01 0x11 -#define COLLIDER_o870 0x10 -#define COLLIDER_section2 0xF -#define COLLIDER_o1075 0xE -#define COLLIDER_o976 0xD -#define COLLIDER_o975 0xC -#define COLLIDER_suberi1 0xB -#define COLLIDER_o865 0xA -#define COLLIDER_section1 0x9 -#define COLLIDER_o1076 0x8 -#define COLLIDER_deilit2 0x7 -#define COLLIDER_deili2 0x6 -#define COLLIDER_deilit1 0x5 -#define COLLIDER_deili1 0x4 -#define COLLIDER_o974 0x3 -#define COLLIDER_o972 0x2 -#define COLLIDER_s1_n 0x1 -#define COLLIDER_o844 0x0 +#define COLLIDER_Root 0x35 +#define COLLIDER_g298 0x34 +#define COLLIDER_st2 0x33 +#define COLLIDER_o1060 0x32 +#define COLLIDER_st1 0x31 +#define COLLIDER_g283 0x30 +#define COLLIDER_o1065 0x2F +#define COLLIDER_o1064 0x2E +#define COLLIDER_o1063 0x2D +#define COLLIDER_o1062 0x2C +#define COLLIDER_tonnel 0x2B +#define COLLIDER_o1082 0x2A +#define COLLIDER_o1079 0x29 +#define COLLIDER_o1072 0x28 +#define COLLIDER_o1067 0x27 +#define COLLIDER_o1047 0x26 +#define COLLIDER_o986 0x25 +#define COLLIDER_o983 0x24 +#define COLLIDER_o982 0x23 +#define COLLIDER_o981 0x22 +#define COLLIDER_deilit4 0x21 +#define COLLIDER_deili4 0x20 +#define COLLIDER_t_n 0x1F +#define COLLIDER_o901 0x1E +#define COLLIDER_section4 0x1D +#define COLLIDER_o1081 0x1C +#define COLLIDER_o1078 0x1B +#define COLLIDER_deilit3 0x1A +#define COLLIDER_deili3 0x19 +#define COLLIDER_o874 0x18 +#define COLLIDER_s4_n 0x17 +#define COLLIDER_section3 0x16 +#define COLLIDER_noko 0x15 +#define COLLIDER_o1077 0x14 +#define COLLIDER_o869 0x13 +#define COLLIDER_o980 0x12 +#define COLLIDER_suberi01 0x11 +#define COLLIDER_o870 0x10 +#define COLLIDER_section2 0xF +#define COLLIDER_o1075 0xE +#define COLLIDER_o976 0xD +#define COLLIDER_o975 0xC +#define COLLIDER_suberi1 0xB +#define COLLIDER_o865 0xA +#define COLLIDER_section1 0x9 +#define COLLIDER_o1076 0x8 +#define COLLIDER_deilit2 0x7 +#define COLLIDER_deili2 0x6 +#define COLLIDER_deilit1 0x5 +#define COLLIDER_deili1 0x4 +#define COLLIDER_o974 0x3 +#define COLLIDER_o972 0x2 +#define COLLIDER_s1_n 0x1 +#define COLLIDER_o844 0x0 + +#define ZONE_Root 0x9 +#define ZONE_g283 0x8 +#define ZONE_section3 0x7 +#define ZONE_suberi01 0x6 +#define ZONE_section2 0x5 +#define ZONE_suberi1 0x4 +#define ZONE_section1 0x3 +#define ZONE_o973 0x2 +#define ZONE_o972 0x1 +#define ZONE_default 0x0 + diff --git a/include/mapfs/iwa_01_shape.h b/include/mapfs/iwa_01_shape.h index af2fa60d8d..3669a99a4f 100644 --- a/include/mapfs/iwa_01_shape.h +++ b/include/mapfs/iwa_01_shape.h @@ -1,47 +1,48 @@ -#define MODEL_Root 0x2E -#define MODEL_s_ishi 0x2D -#define MODEL_o945 0x2C -#define MODEL_o941 0x2B -#define MODEL_o922 0x2A -#define MODEL_sen2 0x29 -#define MODEL_se2 0x28 -#define MODEL_sen1 0x27 -#define MODEL_se1 0x26 -#define MODEL_g290 0x25 -#define MODEL_o957 0x24 -#define MODEL_o956 0x23 -#define MODEL_o952 0x22 -#define MODEL_o947 0x21 -#define MODEL_g288 0x20 -#define MODEL_o989 0x1F -#define MODEL_o990 0x1E -#define MODEL_o992 0x1D -#define MODEL_bero 0x1C -#define MODEL_sprash2 0x1B -#define MODEL_dummy_sprash2 0x1A -#define MODEL_tonnel 0x19 -#define MODEL_o946 0x18 -#define MODEL_o908 0x17 -#define MODEL_ishi 0x16 -#define MODEL_o1020 0x15 -#define MODEL_o1021 0x14 -#define MODEL_o944 0x13 -#define MODEL_o928 0x12 -#define MODEL_suberi 0x11 -#define MODEL_suberi01 0x10 -#define MODEL_suberi1 0xF -#define MODEL_kabe 0xE -#define MODEL_o907 0xD -#define MODEL_o976 0xC -#define MODEL_o842 0xB -#define MODEL_o865 0xA -#define MODEL_o1074 0x9 -#define MODEL_o1075 0x8 -#define MODEL_o1073 0x7 -#define MODEL_o1071 0x6 -#define MODEL_jimen 0x5 -#define MODEL_o902 0x4 -#define MODEL_o974 0x3 -#define MODEL_cam2b 0x2 -#define MODEL_cam1 0x1 -#define MODEL_westf2 0x0 +#define MODEL_Root 0x2E +#define MODEL_s_ishi 0x2D +#define MODEL_o945 0x2C +#define MODEL_o941 0x2B +#define MODEL_o922 0x2A +#define MODEL_sen2 0x29 +#define MODEL_se2 0x28 +#define MODEL_sen1 0x27 +#define MODEL_se1 0x26 +#define MODEL_g290 0x25 +#define MODEL_o957 0x24 +#define MODEL_o956 0x23 +#define MODEL_o952 0x22 +#define MODEL_o947 0x21 +#define MODEL_g288 0x20 +#define MODEL_o989 0x1F +#define MODEL_o990 0x1E +#define MODEL_o992 0x1D +#define MODEL_bero 0x1C +#define MODEL_sprash2 0x1B +#define MODEL_dummy_sprash2 0x1A +#define MODEL_tonnel 0x19 +#define MODEL_o946 0x18 +#define MODEL_o908 0x17 +#define MODEL_ishi 0x16 +#define MODEL_o1020 0x15 +#define MODEL_o1021 0x14 +#define MODEL_o944 0x13 +#define MODEL_o928 0x12 +#define MODEL_suberi 0x11 +#define MODEL_suberi01 0x10 +#define MODEL_suberi1 0xF +#define MODEL_kabe 0xE +#define MODEL_o907 0xD +#define MODEL_o976 0xC +#define MODEL_o842 0xB +#define MODEL_o865 0xA +#define MODEL_o1074 0x9 +#define MODEL_o1075 0x8 +#define MODEL_o1073 0x7 +#define MODEL_o1071 0x6 +#define MODEL_jimen 0x5 +#define MODEL_o902 0x4 +#define MODEL_o974 0x3 +#define MODEL_cam2b 0x2 +#define MODEL_cam1 0x1 +#define MODEL_westf2 0x0 + diff --git a/include/mapfs/iwa_02_hit.h b/include/mapfs/iwa_02_hit.h index 944339eb8e..7bc2926fdb 100644 --- a/include/mapfs/iwa_02_hit.h +++ b/include/mapfs/iwa_02_hit.h @@ -1,53 +1,61 @@ -#define COLLIDER_Root 0x34 -#define COLLIDER_fmap1 0x33 -#define COLLIDER_o1443 0x32 -#define COLLIDER_o1433 0x31 -#define COLLIDER_o1432 0x30 -#define COLLIDER_o1430 0x2F -#define COLLIDER_g346 0x2E -#define COLLIDER_o1437 0x2D -#define COLLIDER_tt1 0x2C -#define COLLIDER_o1331 0x2B -#define COLLIDER_deilit3 0x2A -#define COLLIDER_deili3 0x29 -#define COLLIDER_o1329 0x28 -#define COLLIDER_o1308 0x27 -#define COLLIDER_deilit2 0x26 -#define COLLIDER_deili2 0x25 -#define COLLIDER_noko1 0x24 -#define COLLIDER_o1305 0x23 -#define COLLIDER_g345 0x22 -#define COLLIDER_o1445 0x21 -#define COLLIDER_o1328 0x20 -#define COLLIDER_o1325 0x1F -#define COLLIDER_kame2 0x1E -#define COLLIDER_o1330 0x1D -#define COLLIDER_section_3 0x1C -#define COLLIDER_o1323 0x1B -#define COLLIDER_o1439 0x1A -#define COLLIDER_o1322 0x19 -#define COLLIDER_o1321 0x18 -#define COLLIDER_o1320 0x17 -#define COLLIDER_o1324 0x16 -#define COLLIDER_o1428 0x15 -#define COLLIDER_o1446 0x14 -#define COLLIDER_section_2 0x13 -#define COLLIDER_o1440 0x12 -#define COLLIDER_o1334 0x11 -#define COLLIDER_o1314 0x10 -#define COLLIDER_o1307 0xF -#define COLLIDER_o1205 0xE -#define COLLIDER_section_1 0xD -#define COLLIDER_o1441 0xC -#define COLLIDER_o1338 0xB -#define COLLIDER_noridai 0xA -#define COLLIDER_o1333 0x9 -#define COLLIDER_o1310 0x8 -#define COLLIDER_o1313 0x7 -#define COLLIDER_o1093 0x6 -#define COLLIDER_tonnel 0x5 -#define COLLIDER_o1442 0x4 -#define COLLIDER_deilit1 0x3 -#define COLLIDER_deili1 0x2 -#define COLLIDER_o1311 0x1 -#define COLLIDER_t_n 0x0 +#define COLLIDER_Root 0x34 +#define COLLIDER_fmap1 0x33 +#define COLLIDER_o1443 0x32 +#define COLLIDER_o1433 0x31 +#define COLLIDER_o1432 0x30 +#define COLLIDER_o1430 0x2F +#define COLLIDER_g346 0x2E +#define COLLIDER_o1437 0x2D +#define COLLIDER_tt1 0x2C +#define COLLIDER_o1331 0x2B +#define COLLIDER_deilit3 0x2A +#define COLLIDER_deili3 0x29 +#define COLLIDER_o1329 0x28 +#define COLLIDER_o1308 0x27 +#define COLLIDER_deilit2 0x26 +#define COLLIDER_deili2 0x25 +#define COLLIDER_noko1 0x24 +#define COLLIDER_o1305 0x23 +#define COLLIDER_g345 0x22 +#define COLLIDER_o1445 0x21 +#define COLLIDER_o1328 0x20 +#define COLLIDER_o1325 0x1F +#define COLLIDER_kame2 0x1E +#define COLLIDER_o1330 0x1D +#define COLLIDER_section_3 0x1C +#define COLLIDER_o1323 0x1B +#define COLLIDER_o1439 0x1A +#define COLLIDER_o1322 0x19 +#define COLLIDER_o1321 0x18 +#define COLLIDER_o1320 0x17 +#define COLLIDER_o1324 0x16 +#define COLLIDER_o1428 0x15 +#define COLLIDER_o1446 0x14 +#define COLLIDER_section_2 0x13 +#define COLLIDER_o1440 0x12 +#define COLLIDER_o1334 0x11 +#define COLLIDER_o1314 0x10 +#define COLLIDER_o1307 0xF +#define COLLIDER_o1205 0xE +#define COLLIDER_section_1 0xD +#define COLLIDER_o1441 0xC +#define COLLIDER_o1338 0xB +#define COLLIDER_noridai 0xA +#define COLLIDER_o1333 0x9 +#define COLLIDER_o1310 0x8 +#define COLLIDER_o1313 0x7 +#define COLLIDER_o1093 0x6 +#define COLLIDER_tonnel 0x5 +#define COLLIDER_o1442 0x4 +#define COLLIDER_deilit1 0x3 +#define COLLIDER_deili1 0x2 +#define COLLIDER_o1311 0x1 +#define COLLIDER_t_n 0x0 + +#define ZONE_Root 0x5 +#define ZONE_fmap1 0x4 +#define ZONE_o1312 0x3 +#define ZONE_o1313 0x2 +#define ZONE_o1314 0x1 +#define ZONE_o1315 0x0 + diff --git a/include/mapfs/iwa_02_shape.h b/include/mapfs/iwa_02_shape.h index a283eea9d7..da56e674c3 100644 --- a/include/mapfs/iwa_02_shape.h +++ b/include/mapfs/iwa_02_shape.h @@ -1,32 +1,33 @@ -#define MODEL_Root 0x1F -#define MODEL_kabe 0x1E -#define MODEL_o1419 0x1D -#define MODEL_o1092 0x1C -#define MODEL_o1277 0x1B -#define MODEL_o1242 0x1A -#define MODEL_o1343 0x19 -#define MODEL_o1344 0x18 -#define MODEL_jimen 0x17 -#define MODEL_o1409 0x16 -#define MODEL_o1408 0x15 -#define MODEL_o1398 0x14 -#define MODEL_s_ishi 0x13 -#define MODEL_o1272 0x12 -#define MODEL_o1404 0x11 -#define MODEL_o1403 0x10 -#define MODEL_g360 0xF -#define MODEL_o1366 0xE -#define MODEL_o1364 0xD -#define MODEL_fuchi 0xC -#define MODEL_o1389 0xB -#define MODEL_o1311 0xA -#define MODEL_o1310 0x9 -#define MODEL_o1411 0x8 -#define MODEL_bero 0x7 -#define MODEL_tonnel 0x6 -#define MODEL_o1256 0x5 -#define MODEL_o1298 0x4 -#define MODEL_ishi 0x3 -#define MODEL_o1287 0x2 -#define MODEL_o1289 0x1 -#define MODEL_o1286 0x0 +#define MODEL_Root 0x1F +#define MODEL_kabe 0x1E +#define MODEL_o1419 0x1D +#define MODEL_o1092 0x1C +#define MODEL_o1277 0x1B +#define MODEL_o1242 0x1A +#define MODEL_o1343 0x19 +#define MODEL_o1344 0x18 +#define MODEL_jimen 0x17 +#define MODEL_o1409 0x16 +#define MODEL_o1408 0x15 +#define MODEL_o1398 0x14 +#define MODEL_s_ishi 0x13 +#define MODEL_o1272 0x12 +#define MODEL_o1404 0x11 +#define MODEL_o1403 0x10 +#define MODEL_g360 0xF +#define MODEL_o1366 0xE +#define MODEL_o1364 0xD +#define MODEL_fuchi 0xC +#define MODEL_o1389 0xB +#define MODEL_o1311 0xA +#define MODEL_o1310 0x9 +#define MODEL_o1411 0x8 +#define MODEL_bero 0x7 +#define MODEL_tonnel 0x6 +#define MODEL_o1256 0x5 +#define MODEL_o1298 0x4 +#define MODEL_ishi 0x3 +#define MODEL_o1287 0x2 +#define MODEL_o1289 0x1 +#define MODEL_o1286 0x0 + diff --git a/include/mapfs/iwa_03_hit.h b/include/mapfs/iwa_03_hit.h index abf6cff5d7..9fa50ff5ff 100644 --- a/include/mapfs/iwa_03_hit.h +++ b/include/mapfs/iwa_03_hit.h @@ -1,40 +1,59 @@ -#define COLLIDER_Root 0x27 -#define COLLIDER_g278 0x26 -#define COLLIDER_o998 0x25 -#define COLLIDER_fmap1 0x24 -#define COLLIDER_g277 0x23 -#define COLLIDER_st1 0x22 -#define COLLIDER_o993 0x21 -#define COLLIDER_g273 0x20 -#define COLLIDER_o966 0x1F -#define COLLIDER_o964 0x1E -#define COLLIDER_section_1 0x1D -#define COLLIDER_o969 0x1C -#define COLLIDER_noko1 0x1B -#define COLLIDER_o1003 0x1A -#define COLLIDER_deilit1 0x19 -#define COLLIDER_deili1 0x18 -#define COLLIDER_s3_n 0x17 -#define COLLIDER_o898 0x16 -#define COLLIDER_section_2 0x15 -#define COLLIDER_o1006 0x14 -#define COLLIDER_o963 0x13 -#define COLLIDER_patapata 0x12 -#define COLLIDER_o951 0x11 -#define COLLIDER_o950 0x10 -#define COLLIDER_o955 0xF -#define COLLIDER_o1014 0xE -#define COLLIDER_o954 0xD -#define COLLIDER_o953 0xC -#define COLLIDER_uro 0xB -#define COLLIDER_o949 0xA -#define COLLIDER_suberi0 0x9 -#define COLLIDER_o895 0x8 -#define COLLIDER_section_3 0x7 -#define COLLIDER_noko2 0x6 -#define COLLIDER_o1005 0x5 -#define COLLIDER_o1002 0x4 -#define COLLIDER_o959 0x3 -#define COLLIDER_o958 0x2 -#define COLLIDER_o960 0x1 -#define COLLIDER_o860 0x0 +#define COLLIDER_Root 0x27 +#define COLLIDER_g278 0x26 +#define COLLIDER_o998 0x25 +#define COLLIDER_fmap1 0x24 +#define COLLIDER_g277 0x23 +#define COLLIDER_st1 0x22 +#define COLLIDER_o993 0x21 +#define COLLIDER_g273 0x20 +#define COLLIDER_o966 0x1F +#define COLLIDER_o964 0x1E +#define COLLIDER_section_1 0x1D +#define COLLIDER_o969 0x1C +#define COLLIDER_noko1 0x1B +#define COLLIDER_o1003 0x1A +#define COLLIDER_deilit1 0x19 +#define COLLIDER_deili1 0x18 +#define COLLIDER_s3_n 0x17 +#define COLLIDER_o898 0x16 +#define COLLIDER_section_2 0x15 +#define COLLIDER_o1006 0x14 +#define COLLIDER_o963 0x13 +#define COLLIDER_patapata 0x12 +#define COLLIDER_o951 0x11 +#define COLLIDER_o950 0x10 +#define COLLIDER_o955 0xF +#define COLLIDER_o1014 0xE +#define COLLIDER_o954 0xD +#define COLLIDER_o953 0xC +#define COLLIDER_uro 0xB +#define COLLIDER_o949 0xA +#define COLLIDER_suberi0 0x9 +#define COLLIDER_o895 0x8 +#define COLLIDER_section_3 0x7 +#define COLLIDER_noko2 0x6 +#define COLLIDER_o1005 0x5 +#define COLLIDER_o1002 0x4 +#define COLLIDER_o959 0x3 +#define COLLIDER_o958 0x2 +#define COLLIDER_o960 0x1 +#define COLLIDER_o860 0x0 + +#define ZONE_Root 0x10 +#define ZONE_b 0xF +#define ZONE_o1006 0xE +#define ZONE_o1007 0xD +#define ZONE_g 0xC +#define ZONE_o992 0xB +#define ZONE_o1005 0xA +#define ZONE_o 0x9 +#define ZONE_o1004 0x8 +#define ZONE_v 0x7 +#define ZONE_o999 0x6 +#define ZONE_o1000 0x5 +#define ZONE_o1001 0x4 +#define ZONE_p 0x3 +#define ZONE_o998 0x2 +#define ZONE_o997 0x1 +#define ZONE_o996 0x0 + diff --git a/include/mapfs/iwa_03_shape.h b/include/mapfs/iwa_03_shape.h index 5a3d31aebd..fe19386f33 100644 --- a/include/mapfs/iwa_03_shape.h +++ b/include/mapfs/iwa_03_shape.h @@ -1,42 +1,43 @@ -#define MODEL_Root 0x29 -#define MODEL_ishi 0x28 -#define MODEL_o950 0x27 -#define MODEL_o951 0x26 -#define MODEL_o934 0x25 -#define MODEL_jimen 0x24 -#define MODEL_o915 0x23 -#define MODEL_o895 0x22 -#define MODEL_o898 0x21 -#define MODEL_o943 0x20 -#define MODEL_o945 0x1F -#define MODEL_suberi 0x1E -#define MODEL_suberi0 0x1D -#define MODEL_s_ishi 0x1C -#define MODEL_o948 0x1B -#define MODEL_o917 0x1A -#define MODEL_o921 0x19 -#define MODEL_kusa 0x18 -#define MODEL_o1001 0x17 -#define MODEL_kabe 0x16 -#define MODEL_o1013 0x15 -#define MODEL_o942 0x14 -#define MODEL_o941 0x13 -#define MODEL_o925 0x12 -#define MODEL_o859 0x11 -#define MODEL_o894 0x10 -#define MODEL_o897 0xF -#define MODEL_sen1 0xE -#define MODEL_se1 0xD -#define MODEL_isifuci 0xC -#define MODEL_o997 0xB -#define MODEL_o987 0xA -#define MODEL_o986 0x9 -#define MODEL_o984 0x8 -#define MODEL_o982 0x7 -#define MODEL_fuchi 0x6 -#define MODEL_o967 0x5 -#define MODEL_o960 0x4 -#define MODEL_o1009 0x3 -#define MODEL_o955 0x2 -#define MODEL_o1007 0x1 -#define MODEL_bero 0x0 +#define MODEL_Root 0x29 +#define MODEL_ishi 0x28 +#define MODEL_o950 0x27 +#define MODEL_o951 0x26 +#define MODEL_o934 0x25 +#define MODEL_jimen 0x24 +#define MODEL_o915 0x23 +#define MODEL_o895 0x22 +#define MODEL_o898 0x21 +#define MODEL_o943 0x20 +#define MODEL_o945 0x1F +#define MODEL_suberi 0x1E +#define MODEL_suberi0 0x1D +#define MODEL_s_ishi 0x1C +#define MODEL_o948 0x1B +#define MODEL_o917 0x1A +#define MODEL_o921 0x19 +#define MODEL_kusa 0x18 +#define MODEL_o1001 0x17 +#define MODEL_kabe 0x16 +#define MODEL_o1013 0x15 +#define MODEL_o942 0x14 +#define MODEL_o941 0x13 +#define MODEL_o925 0x12 +#define MODEL_o859 0x11 +#define MODEL_o894 0x10 +#define MODEL_o897 0xF +#define MODEL_sen1 0xE +#define MODEL_se1 0xD +#define MODEL_isifuci 0xC +#define MODEL_o997 0xB +#define MODEL_o987 0xA +#define MODEL_o986 0x9 +#define MODEL_o984 0x8 +#define MODEL_o982 0x7 +#define MODEL_fuchi 0x6 +#define MODEL_o967 0x5 +#define MODEL_o960 0x4 +#define MODEL_o1009 0x3 +#define MODEL_o955 0x2 +#define MODEL_o1007 0x1 +#define MODEL_bero 0x0 + diff --git a/include/mapfs/iwa_04_hit.h b/include/mapfs/iwa_04_hit.h index bfa5baf12d..bf47fcbe05 100644 --- a/include/mapfs/iwa_04_hit.h +++ b/include/mapfs/iwa_04_hit.h @@ -1,71 +1,85 @@ -#define COLLIDER_Root 0x46 -#define COLLIDER_g343 0x45 -#define COLLIDER_o1177 0x44 -#define COLLIDER_o1176 0x43 -#define COLLIDER_o1175 0x42 -#define COLLIDER_o1174 0x41 -#define COLLIDER_o1171 0x40 -#define COLLIDER_g323 0x3F -#define COLLIDER_o1110 0x3E -#define COLLIDER_o1111 0x3D -#define COLLIDER_g317 0x3C -#define COLLIDER_o1107 0x3B -#define COLLIDER_o1090 0x3A -#define COLLIDER_g315 0x39 -#define COLLIDER_o1083 0x38 -#define COLLIDER_g296 0x37 -#define COLLIDER_o1035 0x36 -#define COLLIDER_o1036 0x35 -#define COLLIDER_o1039 0x34 -#define COLLIDER_o1041 0x33 -#define COLLIDER_o1042 0x32 -#define COLLIDER_o1040 0x31 -#define COLLIDER_g277 0x30 -#define COLLIDER_g298 0x2F -#define COLLIDER_o993 0x2E -#define COLLIDER_g297 0x2D -#define COLLIDER_o992 0x2C -#define COLLIDER_g295 0x2B -#define COLLIDER_o985 0x2A -#define COLLIDER_g294 0x29 -#define COLLIDER_o984 0x28 -#define COLLIDER_g293 0x27 -#define COLLIDER_o983 0x26 -#define COLLIDER_g292 0x25 -#define COLLIDER_o982 0x24 -#define COLLIDER_g291 0x23 -#define COLLIDER_o981 0x22 -#define COLLIDER_g290 0x21 -#define COLLIDER_o980 0x20 -#define COLLIDER_g289 0x1F -#define COLLIDER_o979 0x1E -#define COLLIDER_g278 0x1D -#define COLLIDER_o962 0x1C -#define COLLIDER_Default 0x1B -#define COLLIDER_o1183 0x1A -#define COLLIDER_noko4 0x19 -#define COLLIDER_noko3 0x18 -#define COLLIDER_o1180 0x17 -#define COLLIDER_o1112 0x16 -#define COLLIDER_deilite 0x15 -#define COLLIDER_noko2 0x14 -#define COLLIDER_deilie 0x13 -#define COLLIDER_o960 0x12 -#define COLLIDER_o955 0x11 -#define COLLIDER_o958 0x10 -#define COLLIDER_o1170 0xF -#define COLLIDER_o1169 0xE -#define COLLIDER_o1044 0xD -#define COLLIDER_g286 0xC -#define COLLIDER_o1179 0xB -#define COLLIDER_noko1 0xA -#define COLLIDER_o1119 0x9 -#define COLLIDER_o1117 0x8 -#define COLLIDER_o1116 0x7 -#define COLLIDER_o1115 0x6 -#define COLLIDER_o1114 0x5 -#define COLLIDER_o1113 0x4 -#define COLLIDER_deiliw 0x3 -#define COLLIDER_deilitw 0x2 -#define COLLIDER_o970 0x1 -#define COLLIDER_o1038 0x0 +#define COLLIDER_Root 0x46 +#define COLLIDER_g343 0x45 +#define COLLIDER_o1177 0x44 +#define COLLIDER_o1176 0x43 +#define COLLIDER_o1175 0x42 +#define COLLIDER_o1174 0x41 +#define COLLIDER_o1171 0x40 +#define COLLIDER_g323 0x3F +#define COLLIDER_o1110 0x3E +#define COLLIDER_o1111 0x3D +#define COLLIDER_g317 0x3C +#define COLLIDER_o1107 0x3B +#define COLLIDER_o1090 0x3A +#define COLLIDER_g315 0x39 +#define COLLIDER_o1083 0x38 +#define COLLIDER_g296 0x37 +#define COLLIDER_o1035 0x36 +#define COLLIDER_o1036 0x35 +#define COLLIDER_o1039 0x34 +#define COLLIDER_o1041 0x33 +#define COLLIDER_o1042 0x32 +#define COLLIDER_o1040 0x31 +#define COLLIDER_g277 0x30 +#define COLLIDER_g298 0x2F +#define COLLIDER_o993 0x2E +#define COLLIDER_g297 0x2D +#define COLLIDER_o992 0x2C +#define COLLIDER_g295 0x2B +#define COLLIDER_o985 0x2A +#define COLLIDER_g294 0x29 +#define COLLIDER_o984 0x28 +#define COLLIDER_g293 0x27 +#define COLLIDER_o983 0x26 +#define COLLIDER_g292 0x25 +#define COLLIDER_o982 0x24 +#define COLLIDER_g291 0x23 +#define COLLIDER_o981 0x22 +#define COLLIDER_g290 0x21 +#define COLLIDER_o980 0x20 +#define COLLIDER_g289 0x1F +#define COLLIDER_o979 0x1E +#define COLLIDER_g278 0x1D +#define COLLIDER_o962 0x1C +#define COLLIDER_Default 0x1B +#define COLLIDER_o1183 0x1A +#define COLLIDER_noko4 0x19 +#define COLLIDER_noko3 0x18 +#define COLLIDER_o1180 0x17 +#define COLLIDER_o1112 0x16 +#define COLLIDER_deilite 0x15 +#define COLLIDER_noko2 0x14 +#define COLLIDER_deilie 0x13 +#define COLLIDER_o960 0x12 +#define COLLIDER_o955 0x11 +#define COLLIDER_o958 0x10 +#define COLLIDER_o1170 0xF +#define COLLIDER_o1169 0xE +#define COLLIDER_o1044 0xD +#define COLLIDER_g286 0xC +#define COLLIDER_o1179 0xB +#define COLLIDER_noko1 0xA +#define COLLIDER_o1119 0x9 +#define COLLIDER_o1117 0x8 +#define COLLIDER_o1116 0x7 +#define COLLIDER_o1115 0x6 +#define COLLIDER_o1114 0x5 +#define COLLIDER_o1113 0x4 +#define COLLIDER_deiliw 0x3 +#define COLLIDER_deilitw 0x2 +#define COLLIDER_o970 0x1 +#define COLLIDER_o1038 0x0 + +#define ZONE_Root 0xB +#define ZONE_g304 0xA +#define ZONE_o1059 0x9 +#define ZONE_o1058 0x8 +#define ZONE_g303 0x7 +#define ZONE_o1056 0x6 +#define ZONE_o1055 0x5 +#define ZONE_o1054 0x4 +#define ZONE_g299 0x3 +#define ZONE_o1052 0x2 +#define ZONE_o1051 0x1 +#define ZONE_o1050 0x0 + diff --git a/include/mapfs/iwa_04_shape.h b/include/mapfs/iwa_04_shape.h index 1536f916d6..a8d790ac35 100644 --- a/include/mapfs/iwa_04_shape.h +++ b/include/mapfs/iwa_04_shape.h @@ -1,76 +1,77 @@ -#define MODEL_Root 0x4B -#define MODEL_g329 0x4A -#define MODEL_o1154 0x49 -#define MODEL_o1153 0x48 -#define MODEL_o1152 0x47 -#define MODEL_o1150 0x46 -#define MODEL_o1144 0x45 -#define MODEL_o1141 0x44 -#define MODEL_o1139 0x43 -#define MODEL_saku 0x42 -#define MODEL_o1082 0x41 -#define MODEL_o1076 0x40 -#define MODEL_o1073 0x3F -#define MODEL_o1070 0x3E -#define MODEL_o1098 0x3D -#define MODEL_o1071 0x3C -#define MODEL_o1074 0x3B -#define MODEL_o1080 0x3A -#define MODEL_o1096 0x39 -#define MODEL_o1068 0x38 -#define MODEL_kusa 0x37 -#define MODEL_o1137 0x36 -#define MODEL_o1136 0x35 -#define MODEL_o1135 0x34 -#define MODEL_o1077 0x33 -#define MODEL_jimen 0x32 -#define MODEL_o960 0x31 -#define MODEL_o1121 0x30 -#define MODEL_o970 0x2F -#define MODEL_fuci_isi 0x2E -#define MODEL_o1099 0x2D -#define MODEL_o1064 0x2C -#define MODEL_o1100 0x2B -#define MODEL_o1111 0x2A -#define MODEL_o1110 0x29 -#define MODEL_s_ishi 0x28 -#define MODEL_o991 0x27 -#define MODEL_fuchi 0x26 -#define MODEL_o1106 0x25 -#define MODEL_o1102 0x24 -#define MODEL_bero 0x23 -#define MODEL_o1127 0x22 -#define MODEL_hage 0x21 -#define MODEL_o994 0x20 -#define MODEL_o986 0x1F -#define MODEL_hashi 0x1E -#define MODEL_g298 0x1D -#define MODEL_o993 0x1C -#define MODEL_g297 0x1B -#define MODEL_o992 0x1A -#define MODEL_g295 0x19 -#define MODEL_o985 0x18 -#define MODEL_g294 0x17 -#define MODEL_o984 0x16 -#define MODEL_g293 0x15 -#define MODEL_o983 0x14 -#define MODEL_g292 0x13 -#define MODEL_o982 0x12 -#define MODEL_g291 0x11 -#define MODEL_o981 0x10 -#define MODEL_g290 0xF -#define MODEL_o980 0xE -#define MODEL_g289 0xD -#define MODEL_o979 0xC -#define MODEL_g278 0xB -#define MODEL_o962 0xA -#define MODEL_o1002 0x9 -#define MODEL_o1034 0x8 -#define MODEL_o996 0x7 -#define MODEL_kabe 0x6 -#define MODEL_o1117 0x5 -#define MODEL_o1115 0x4 -#define MODEL_o959 0x3 -#define MODEL_o955 0x2 -#define MODEL_o953 0x1 -#define MODEL_o951 0x0 +#define MODEL_Root 0x4B +#define MODEL_g329 0x4A +#define MODEL_o1154 0x49 +#define MODEL_o1153 0x48 +#define MODEL_o1152 0x47 +#define MODEL_o1150 0x46 +#define MODEL_o1144 0x45 +#define MODEL_o1141 0x44 +#define MODEL_o1139 0x43 +#define MODEL_saku 0x42 +#define MODEL_o1082 0x41 +#define MODEL_o1076 0x40 +#define MODEL_o1073 0x3F +#define MODEL_o1070 0x3E +#define MODEL_o1098 0x3D +#define MODEL_o1071 0x3C +#define MODEL_o1074 0x3B +#define MODEL_o1080 0x3A +#define MODEL_o1096 0x39 +#define MODEL_o1068 0x38 +#define MODEL_kusa 0x37 +#define MODEL_o1137 0x36 +#define MODEL_o1136 0x35 +#define MODEL_o1135 0x34 +#define MODEL_o1077 0x33 +#define MODEL_jimen 0x32 +#define MODEL_o960 0x31 +#define MODEL_o1121 0x30 +#define MODEL_o970 0x2F +#define MODEL_fuci_isi 0x2E +#define MODEL_o1099 0x2D +#define MODEL_o1064 0x2C +#define MODEL_o1100 0x2B +#define MODEL_o1111 0x2A +#define MODEL_o1110 0x29 +#define MODEL_s_ishi 0x28 +#define MODEL_o991 0x27 +#define MODEL_fuchi 0x26 +#define MODEL_o1106 0x25 +#define MODEL_o1102 0x24 +#define MODEL_bero 0x23 +#define MODEL_o1127 0x22 +#define MODEL_hage 0x21 +#define MODEL_o994 0x20 +#define MODEL_o986 0x1F +#define MODEL_hashi 0x1E +#define MODEL_g298 0x1D +#define MODEL_o993 0x1C +#define MODEL_g297 0x1B +#define MODEL_o992 0x1A +#define MODEL_g295 0x19 +#define MODEL_o985 0x18 +#define MODEL_g294 0x17 +#define MODEL_o984 0x16 +#define MODEL_g293 0x15 +#define MODEL_o983 0x14 +#define MODEL_g292 0x13 +#define MODEL_o982 0x12 +#define MODEL_g291 0x11 +#define MODEL_o981 0x10 +#define MODEL_g290 0xF +#define MODEL_o980 0xE +#define MODEL_g289 0xD +#define MODEL_o979 0xC +#define MODEL_g278 0xB +#define MODEL_o962 0xA +#define MODEL_o1002 0x9 +#define MODEL_o1034 0x8 +#define MODEL_o996 0x7 +#define MODEL_kabe 0x6 +#define MODEL_o1117 0x5 +#define MODEL_o1115 0x4 +#define MODEL_o959 0x3 +#define MODEL_o955 0x2 +#define MODEL_o953 0x1 +#define MODEL_o951 0x0 + diff --git a/include/mapfs/iwa_10_hit.h b/include/mapfs/iwa_10_hit.h index 63be9b2e20..19009b0a5f 100644 --- a/include/mapfs/iwa_10_hit.h +++ b/include/mapfs/iwa_10_hit.h @@ -1,101 +1,109 @@ -#define COLLIDER_Root 0x64 -#define COLLIDER_g105 0x63 -#define COLLIDER_k7 0x62 -#define COLLIDER_k6 0x61 -#define COLLIDER_k5 0x60 -#define COLLIDER_k4 0x5F -#define COLLIDER_k3 0x5E -#define COLLIDER_k2 0x5D -#define COLLIDER_k1 0x5C -#define COLLIDER_g104 0x5B -#define COLLIDER_o394 0x5A -#define COLLIDER_g102 0x59 -#define COLLIDER_deilit11 0x58 -#define COLLIDER_deili1 0x57 -#define COLLIDER_o269 0x56 -#define COLLIDER_g101 0x55 -#define COLLIDER_o385 0x54 -#define COLLIDER_o384 0x53 -#define COLLIDER_g100 0x52 -#define COLLIDER_tt4 0x51 -#define COLLIDER_tt3 0x50 -#define COLLIDER_tt2 0x4F -#define COLLIDER_tt1 0x4E -#define COLLIDER_g56 0x4D -#define COLLIDER_o284 0x4C -#define COLLIDER_deilitk 0x4B -#define COLLIDER_deilik 0x4A -#define COLLIDER_o281 0x49 -#define COLLIDER_g98 0x48 -#define COLLIDER_o378 0x47 -#define COLLIDER_o373 0x46 -#define COLLIDER_g95 0x45 -#define COLLIDER_o395 0x44 -#define COLLIDER_o367 0x43 -#define COLLIDER_g58 0x42 -#define COLLIDER_o275_k 0x41 -#define COLLIDER_o289 0x40 -#define COLLIDER_o288 0x3F -#define COLLIDER_iwa_station 0x3E -#define COLLIDER_o109 0x3D -#define COLLIDER_o231 0x3C -#define COLLIDER_o84 0x3B -#define COLLIDER_o229 0x3A -#define COLLIDER_o230 0x39 -#define COLLIDER_o464 0x38 -#define COLLIDER_o108 0x37 -#define COLLIDER_Default 0x36 -#define COLLIDER_o391 0x35 -#define COLLIDER_o273 0x34 -#define COLLIDER_o265 0x33 -#define COLLIDER_g115 0x32 -#define COLLIDER_o463 0x31 -#define COLLIDER_o462 0x30 -#define COLLIDER_o461 0x2F -#define COLLIDER_o460 0x2E -#define COLLIDER_o286 0x2D -#define COLLIDER_o261 0x2C -#define COLLIDER_o263 0x2B -#define COLLIDER_o424 0x2A -#define COLLIDER_o423 0x29 -#define COLLIDER_o422 0x28 -#define COLLIDER_o421 0x27 -#define COLLIDER_o420 0x26 -#define COLLIDER_g112 0x25 -#define COLLIDER_o435 0x24 -#define COLLIDER_o434 0x23 -#define COLLIDER_o433 0x22 -#define COLLIDER_o432 0x21 -#define COLLIDER_o431 0x20 -#define COLLIDER_o430 0x1F -#define COLLIDER_g111 0x1E -#define COLLIDER_o223 0x1D -#define COLLIDER_o436 0x1C -#define COLLIDER_g110 0x1B -#define COLLIDER_o438 0x1A -#define COLLIDER_o437 0x19 -#define COLLIDER_g109 0x18 -#define COLLIDER_o447 0x17 -#define COLLIDER_o446 0x16 -#define COLLIDER_o445 0x15 -#define COLLIDER_o397 0x14 -#define COLLIDER_g107 0x13 -#define COLLIDER_o465 0x12 -#define COLLIDER_o439 0x11 -#define COLLIDER_o440 0x10 -#define COLLIDER_g113 0xF -#define COLLIDER_o429 0xE -#define COLLIDER_o428 0xD -#define COLLIDER_o351 0xC -#define COLLIDER_o427 0xB -#define COLLIDER_g114 0xA -#define COLLIDER_o425 0x9 -#define COLLIDER_o260 0x8 -#define COLLIDER_o459 0x7 -#define COLLIDER_o458 0x6 -#define COLLIDER_o457 0x5 -#define COLLIDER_o456 0x4 -#define COLLIDER_o455 0x3 -#define COLLIDER_o454 0x2 -#define COLLIDER_o453 0x1 -#define COLLIDER_o426 0x0 +#define COLLIDER_Root 0x64 +#define COLLIDER_g105 0x63 +#define COLLIDER_k7 0x62 +#define COLLIDER_k6 0x61 +#define COLLIDER_k5 0x60 +#define COLLIDER_k4 0x5F +#define COLLIDER_k3 0x5E +#define COLLIDER_k2 0x5D +#define COLLIDER_k1 0x5C +#define COLLIDER_g104 0x5B +#define COLLIDER_o394 0x5A +#define COLLIDER_g102 0x59 +#define COLLIDER_deilit11 0x58 +#define COLLIDER_deili1 0x57 +#define COLLIDER_o269 0x56 +#define COLLIDER_g101 0x55 +#define COLLIDER_o385 0x54 +#define COLLIDER_o384 0x53 +#define COLLIDER_g100 0x52 +#define COLLIDER_tt4 0x51 +#define COLLIDER_tt3 0x50 +#define COLLIDER_tt2 0x4F +#define COLLIDER_tt1 0x4E +#define COLLIDER_g56 0x4D +#define COLLIDER_o284 0x4C +#define COLLIDER_deilitk 0x4B +#define COLLIDER_deilik 0x4A +#define COLLIDER_o281 0x49 +#define COLLIDER_g98 0x48 +#define COLLIDER_o378 0x47 +#define COLLIDER_o373 0x46 +#define COLLIDER_g95 0x45 +#define COLLIDER_o395 0x44 +#define COLLIDER_o367 0x43 +#define COLLIDER_g58 0x42 +#define COLLIDER_o275_k 0x41 +#define COLLIDER_o289 0x40 +#define COLLIDER_o288 0x3F +#define COLLIDER_iwa_station 0x3E +#define COLLIDER_o109 0x3D +#define COLLIDER_o231 0x3C +#define COLLIDER_o84 0x3B +#define COLLIDER_o229 0x3A +#define COLLIDER_o230 0x39 +#define COLLIDER_o464 0x38 +#define COLLIDER_o108 0x37 +#define COLLIDER_Default 0x36 +#define COLLIDER_o391 0x35 +#define COLLIDER_o273 0x34 +#define COLLIDER_o265 0x33 +#define COLLIDER_g115 0x32 +#define COLLIDER_o463 0x31 +#define COLLIDER_o462 0x30 +#define COLLIDER_o461 0x2F +#define COLLIDER_o460 0x2E +#define COLLIDER_o286 0x2D +#define COLLIDER_o261 0x2C +#define COLLIDER_o263 0x2B +#define COLLIDER_o424 0x2A +#define COLLIDER_o423 0x29 +#define COLLIDER_o422 0x28 +#define COLLIDER_o421 0x27 +#define COLLIDER_o420 0x26 +#define COLLIDER_g112 0x25 +#define COLLIDER_o435 0x24 +#define COLLIDER_o434 0x23 +#define COLLIDER_o433 0x22 +#define COLLIDER_o432 0x21 +#define COLLIDER_o431 0x20 +#define COLLIDER_o430 0x1F +#define COLLIDER_g111 0x1E +#define COLLIDER_o223 0x1D +#define COLLIDER_o436 0x1C +#define COLLIDER_g110 0x1B +#define COLLIDER_o438 0x1A +#define COLLIDER_o437 0x19 +#define COLLIDER_g109 0x18 +#define COLLIDER_o447 0x17 +#define COLLIDER_o446 0x16 +#define COLLIDER_o445 0x15 +#define COLLIDER_o397 0x14 +#define COLLIDER_g107 0x13 +#define COLLIDER_o465 0x12 +#define COLLIDER_o439 0x11 +#define COLLIDER_o440 0x10 +#define COLLIDER_g113 0xF +#define COLLIDER_o429 0xE +#define COLLIDER_o428 0xD +#define COLLIDER_o351 0xC +#define COLLIDER_o427 0xB +#define COLLIDER_g114 0xA +#define COLLIDER_o425 0x9 +#define COLLIDER_o260 0x8 +#define COLLIDER_o459 0x7 +#define COLLIDER_o458 0x6 +#define COLLIDER_o457 0x5 +#define COLLIDER_o456 0x4 +#define COLLIDER_o455 0x3 +#define COLLIDER_o454 0x2 +#define COLLIDER_o453 0x1 +#define COLLIDER_o426 0x0 + +#define ZONE_Root 0x5 +#define ZONE_Default 0x4 +#define ZONE_o277 0x3 +#define ZONE_o282 0x2 +#define ZONE_o283 0x1 +#define ZONE_o278 0x0 + diff --git a/include/mapfs/iwa_10_shape.h b/include/mapfs/iwa_10_shape.h index b2c1eb3410..c7000d56c9 100644 --- a/include/mapfs/iwa_10_shape.h +++ b/include/mapfs/iwa_10_shape.h @@ -1,120 +1,121 @@ -#define MODEL_Root 0x77 -#define MODEL_Default 0x76 -#define MODEL_o578 0x75 -#define MODEL_o572 0x74 -#define MODEL_g95 0x73 -#define MODEL_o492 0x72 -#define MODEL_o491 0x71 -#define MODEL_kabe 0x70 -#define MODEL_o261 0x6F -#define MODEL_g67 0x6E -#define MODEL_o303 0x6D -#define MODEL_o302 0x6C -#define MODEL_g55 0x6B -#define MODEL_o256 0x6A -#define MODEL_g73 0x69 -#define MODEL_o266 0x68 -#define MODEL_s_ishi 0x67 -#define MODEL_o213 0x66 -#define MODEL_saku 0x65 -#define MODEL_o574 0x64 -#define MODEL_tokei 0x63 -#define MODEL_g42 0x62 -#define MODEL_o362 0x61 -#define MODEL_o337 0x60 -#define MODEL_o150 0x5F -#define MODEL_short 0x5E -#define MODEL_o147 0x5D -#define MODEL_long 0x5C -#define MODEL_o148 0x5B -#define MODEL_fumi 0x5A -#define MODEL_fumi2 0x59 -#define MODEL_o281 0x58 -#define MODEL_o280 0x57 -#define MODEL_o282 0x56 -#define MODEL_fumi1 0x55 -#define MODEL_o278 0x54 -#define MODEL_o277 0x53 -#define MODEL_o279 0x52 -#define MODEL_kemuri 0x51 -#define MODEL_km 0x50 -#define MODEL_poppo 0x4F -#define MODEL_piston 0x4E -#define MODEL_p3 0x4D -#define MODEL_16 0x4C -#define MODEL_p2 0x4B -#define MODEL_15 0x4A -#define MODEL_p1 0x49 -#define MODEL_14 0x48 -#define MODEL_syarin 0x47 -#define MODEL_s4 0x46 -#define MODEL_13 0x45 -#define MODEL_s3 0x44 -#define MODEL_12 0x43 -#define MODEL_s2 0x42 -#define MODEL_11 0x41 -#define MODEL_s1 0x40 -#define MODEL_10 0x3F -#define MODEL_bell 0x3E -#define MODEL_09 0x3D -#define MODEL_entotsu 0x3C -#define MODEL_07 0x3B -#define MODEL_08 0x3A -#define MODEL_kisya_door2 0x39 -#define MODEL_omote2 0x38 -#define MODEL_ura2 0x37 -#define MODEL_kisya_door 0x36 -#define MODEL_omote 0x35 -#define MODEL_ura 0x34 -#define MODEL_hontai 0x33 -#define MODEL_06 0x32 -#define MODEL_05 0x31 -#define MODEL_04 0x30 -#define MODEL_03 0x2F -#define MODEL_02 0x2E -#define MODEL_01 0x2D -#define MODEL_iwa_station 0x2C -#define MODEL_station 0x2B -#define MODEL_o559 0x2A -#define MODEL_o109 0x29 -#define MODEL_o304 0x28 -#define MODEL_o86 0x27 -#define MODEL_g57 0x26 -#define MODEL_o110 0x25 -#define MODEL_o234 0x24 -#define MODEL_o242 0x23 -#define MODEL_o248 0x22 -#define MODEL_o246 0x21 -#define MODEL_o228 0x20 -#define MODEL_o230 0x1F -#define MODEL_jimen 0x1E -#define MODEL_o327 0x1D -#define MODEL_o347 0x1C -#define MODEL_o346 0x1B -#define MODEL_o344 0x1A -#define MODEL_o290 0x19 -#define MODEL_o310 0x18 -#define MODEL_o311 0x17 -#define MODEL_o338 0x16 -#define MODEL_o265 0x15 -#define MODEL_kusa 0x14 -#define MODEL_k7 0x13 -#define MODEL_k6 0x12 -#define MODEL_k5 0x11 -#define MODEL_k4 0x10 -#define MODEL_k3 0xF -#define MODEL_k2 0xE -#define MODEL_k1 0xD -#define MODEL_obj 0xC -#define MODEL_o571 0xB -#define MODEL_o336 0xA -#define MODEL_o348 0x9 -#define MODEL_o355 0x8 -#define MODEL_o306 0x7 -#define MODEL_stage 0x6 -#define MODEL_o308 0x5 -#define MODEL_o68 0x4 -#define MODEL_o216 0x3 -#define MODEL_g115 0x2 -#define MODEL_o567 0x1 -#define MODEL_o324 0x0 +#define MODEL_Root 0x77 +#define MODEL_Default 0x76 +#define MODEL_o578 0x75 +#define MODEL_o572 0x74 +#define MODEL_g95 0x73 +#define MODEL_o492 0x72 +#define MODEL_o491 0x71 +#define MODEL_kabe 0x70 +#define MODEL_o261 0x6F +#define MODEL_g67 0x6E +#define MODEL_o303 0x6D +#define MODEL_o302 0x6C +#define MODEL_g55 0x6B +#define MODEL_o256 0x6A +#define MODEL_g73 0x69 +#define MODEL_o266 0x68 +#define MODEL_s_ishi 0x67 +#define MODEL_o213 0x66 +#define MODEL_saku 0x65 +#define MODEL_o574 0x64 +#define MODEL_tokei 0x63 +#define MODEL_g42 0x62 +#define MODEL_o362 0x61 +#define MODEL_o337 0x60 +#define MODEL_o150 0x5F +#define MODEL_short 0x5E +#define MODEL_o147 0x5D +#define MODEL_long 0x5C +#define MODEL_o148 0x5B +#define MODEL_fumi 0x5A +#define MODEL_fumi2 0x59 +#define MODEL_o281 0x58 +#define MODEL_o280 0x57 +#define MODEL_o282 0x56 +#define MODEL_fumi1 0x55 +#define MODEL_o278 0x54 +#define MODEL_o277 0x53 +#define MODEL_o279 0x52 +#define MODEL_kemuri 0x51 +#define MODEL_km 0x50 +#define MODEL_poppo 0x4F +#define MODEL_piston 0x4E +#define MODEL_p3 0x4D +#define MODEL_16 0x4C +#define MODEL_p2 0x4B +#define MODEL_15 0x4A +#define MODEL_p1 0x49 +#define MODEL_14 0x48 +#define MODEL_syarin 0x47 +#define MODEL_s4 0x46 +#define MODEL_13 0x45 +#define MODEL_s3 0x44 +#define MODEL_12 0x43 +#define MODEL_s2 0x42 +#define MODEL_11 0x41 +#define MODEL_s1 0x40 +#define MODEL_10 0x3F +#define MODEL_bell 0x3E +#define MODEL_09 0x3D +#define MODEL_entotsu 0x3C +#define MODEL_07 0x3B +#define MODEL_08 0x3A +#define MODEL_kisya_door2 0x39 +#define MODEL_omote2 0x38 +#define MODEL_ura2 0x37 +#define MODEL_kisya_door 0x36 +#define MODEL_omote 0x35 +#define MODEL_ura 0x34 +#define MODEL_hontai 0x33 +#define MODEL_06 0x32 +#define MODEL_05 0x31 +#define MODEL_04 0x30 +#define MODEL_03 0x2F +#define MODEL_02 0x2E +#define MODEL_01 0x2D +#define MODEL_iwa_station 0x2C +#define MODEL_station 0x2B +#define MODEL_o559 0x2A +#define MODEL_o109 0x29 +#define MODEL_o304 0x28 +#define MODEL_o86 0x27 +#define MODEL_g57 0x26 +#define MODEL_o110 0x25 +#define MODEL_o234 0x24 +#define MODEL_o242 0x23 +#define MODEL_o248 0x22 +#define MODEL_o246 0x21 +#define MODEL_o228 0x20 +#define MODEL_o230 0x1F +#define MODEL_jimen 0x1E +#define MODEL_o327 0x1D +#define MODEL_o347 0x1C +#define MODEL_o346 0x1B +#define MODEL_o344 0x1A +#define MODEL_o290 0x19 +#define MODEL_o310 0x18 +#define MODEL_o311 0x17 +#define MODEL_o338 0x16 +#define MODEL_o265 0x15 +#define MODEL_kusa 0x14 +#define MODEL_k7 0x13 +#define MODEL_k6 0x12 +#define MODEL_k5 0x11 +#define MODEL_k4 0x10 +#define MODEL_k3 0xF +#define MODEL_k2 0xE +#define MODEL_k1 0xD +#define MODEL_obj 0xC +#define MODEL_o571 0xB +#define MODEL_o336 0xA +#define MODEL_o348 0x9 +#define MODEL_o355 0x8 +#define MODEL_o306 0x7 +#define MODEL_stage 0x6 +#define MODEL_o308 0x5 +#define MODEL_o68 0x4 +#define MODEL_o216 0x3 +#define MODEL_g115 0x2 +#define MODEL_o567 0x1 +#define MODEL_o324 0x0 + diff --git a/include/mapfs/iwa_11_hit.h b/include/mapfs/iwa_11_hit.h index 39ace2e2f0..b6587cbcd3 100644 --- a/include/mapfs/iwa_11_hit.h +++ b/include/mapfs/iwa_11_hit.h @@ -1,17 +1,24 @@ -#define COLLIDER_Root 0x10 -#define COLLIDER_g85 0xF -#define COLLIDER_deilii 0xE -#define COLLIDER_deiliti 0xD -#define COLLIDER_deilim 0xC -#define COLLIDER_deilitm 0xB -#define COLLIDER_iwa_side 0xA -#define COLLIDER_i2 0x9 -#define COLLIDER_f2 0x8 -#define COLLIDER_e2 0x7 -#define COLLIDER_d2 0x6 -#define COLLIDER_t2 0x5 -#define COLLIDER_c2 0x4 -#define COLLIDER_b2 0x3 -#define COLLIDER_a3 0x2 -#define COLLIDER_o481 0x1 -#define COLLIDER_o480 0x0 +#define COLLIDER_Root 0x10 +#define COLLIDER_g85 0xF +#define COLLIDER_deilii 0xE +#define COLLIDER_deiliti 0xD +#define COLLIDER_deilim 0xC +#define COLLIDER_deilitm 0xB +#define COLLIDER_iwa_side 0xA +#define COLLIDER_i2 0x9 +#define COLLIDER_f2 0x8 +#define COLLIDER_e2 0x7 +#define COLLIDER_d2 0x6 +#define COLLIDER_t2 0x5 +#define COLLIDER_c2 0x4 +#define COLLIDER_b2 0x3 +#define COLLIDER_a3 0x2 +#define COLLIDER_o481 0x1 +#define COLLIDER_o480 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g85 0x3 +#define ZONE_a3 0x2 +#define ZONE_i2 0x1 +#define ZONE_m2 0x0 + diff --git a/include/mapfs/iwa_11_shape.h b/include/mapfs/iwa_11_shape.h index e38ed1efa0..0c9cdba7fa 100644 --- a/include/mapfs/iwa_11_shape.h +++ b/include/mapfs/iwa_11_shape.h @@ -1,133 +1,134 @@ -#define MODEL_Root 0x84 -#define MODEL_iwa 0x83 -#define MODEL_kowappa_iwa 0x82 -#define MODEL_iwa_side 0x81 -#define MODEL_i9 0x80 -#define MODEL_i8 0x7F -#define MODEL_i7 0x7E -#define MODEL_i6 0x7D -#define MODEL_i5 0x7C -#define MODEL_i4 0x7B -#define MODEL_i3 0x7A -#define MODEL_i2 0x79 -#define MODEL_i1 0x78 -#define MODEL_field_f 0x77 -#define MODEL_f6 0x76 -#define MODEL_f7 0x75 -#define MODEL_f5 0x74 -#define MODEL_f4 0x73 -#define MODEL_f3 0x72 -#define MODEL_f2 0x71 -#define MODEL_f1 0x70 -#define MODEL_field_e 0x6F -#define MODEL_e7 0x6E -#define MODEL_e6 0x6D -#define MODEL_e5 0x6C -#define MODEL_e4 0x6B -#define MODEL_e3 0x6A -#define MODEL_e2 0x69 -#define MODEL_e1 0x68 -#define MODEL_field_d 0x67 -#define MODEL_d9 0x66 -#define MODEL_d8 0x65 -#define MODEL_d7 0x64 -#define MODEL_d6 0x63 -#define MODEL_d5 0x62 -#define MODEL_d4 0x61 -#define MODEL_d3 0x60 -#define MODEL_d2 0x5F -#define MODEL_d1 0x5E -#define MODEL_turen 0x5D -#define MODEL_t8 0x5C -#define MODEL_t7 0x5B -#define MODEL_t6 0x5A -#define MODEL_t5 0x59 -#define MODEL_t4 0x58 -#define MODEL_t3 0x57 -#define MODEL_t2 0x56 -#define MODEL_t1 0x55 -#define MODEL_field_c 0x54 -#define MODEL_cc 0x53 -#define MODEL_cb 0x52 -#define MODEL_ca 0x51 -#define MODEL_c9 0x50 -#define MODEL_c8 0x4F -#define MODEL_c7 0x4E -#define MODEL_c6 0x4D -#define MODEL_c5 0x4C -#define MODEL_c4 0x4B -#define MODEL_c2 0x4A -#define MODEL_c1 0x49 -#define MODEL_field_b 0x48 -#define MODEL_b8 0x47 -#define MODEL_b4 0x46 -#define MODEL_b7 0x45 -#define MODEL_b6 0x44 -#define MODEL_b5 0x43 -#define MODEL_b3 0x42 -#define MODEL_b2 0x41 -#define MODEL_b1 0x40 -#define MODEL_field_a 0x3F -#define MODEL_a7 0x3E -#define MODEL_ac 0x3D -#define MODEL_ab 0x3C -#define MODEL_aa 0x3B -#define MODEL_a9 0x3A -#define MODEL_a8 0x39 -#define MODEL_a6 0x38 -#define MODEL_a5 0x37 -#define MODEL_a4 0x36 -#define MODEL_a3 0x35 -#define MODEL_a2 0x34 -#define MODEL_a1 0x33 -#define MODEL_mac_side 0x32 -#define MODEL_md 0x31 -#define MODEL_mc 0x30 -#define MODEL_ma 0x2F -#define MODEL_mb 0x2E -#define MODEL_m9 0x2D -#define MODEL_m8 0x2C -#define MODEL_m7 0x2B -#define MODEL_m6 0x2A -#define MODEL_m5 0x29 -#define MODEL_m4 0x28 -#define MODEL_m3 0x27 -#define MODEL_m2 0x26 -#define MODEL_m1 0x25 -#define MODEL_kemuri 0x24 -#define MODEL_km 0x23 -#define MODEL_poppo 0x22 -#define MODEL_piston 0x21 -#define MODEL_p3 0x20 -#define MODEL_16 0x1F -#define MODEL_p2 0x1E -#define MODEL_15 0x1D -#define MODEL_p1 0x1C -#define MODEL_14 0x1B -#define MODEL_syarin 0x1A -#define MODEL_s4 0x19 -#define MODEL_13 0x18 -#define MODEL_s3 0x17 -#define MODEL_12 0x16 -#define MODEL_s2 0x15 -#define MODEL_11 0x14 -#define MODEL_s1 0x13 -#define MODEL_10 0x12 -#define MODEL_bell 0x11 -#define MODEL_09 0x10 -#define MODEL_entotsu 0xF -#define MODEL_07 0xE -#define MODEL_08 0xD -#define MODEL_kisya_door2 0xC -#define MODEL_omote2 0xB -#define MODEL_ura2 0xA -#define MODEL_kisya_door 0x9 -#define MODEL_omote 0x8 -#define MODEL_ura 0x7 -#define MODEL_hontai 0x6 -#define MODEL_06 0x5 -#define MODEL_05 0x4 -#define MODEL_04 0x3 -#define MODEL_03 0x2 -#define MODEL_02 0x1 -#define MODEL_01 0x0 +#define MODEL_Root 0x84 +#define MODEL_iwa 0x83 +#define MODEL_kowappa_iwa 0x82 +#define MODEL_iwa_side 0x81 +#define MODEL_i9 0x80 +#define MODEL_i8 0x7F +#define MODEL_i7 0x7E +#define MODEL_i6 0x7D +#define MODEL_i5 0x7C +#define MODEL_i4 0x7B +#define MODEL_i3 0x7A +#define MODEL_i2 0x79 +#define MODEL_i1 0x78 +#define MODEL_field_f 0x77 +#define MODEL_f6 0x76 +#define MODEL_f7 0x75 +#define MODEL_f5 0x74 +#define MODEL_f4 0x73 +#define MODEL_f3 0x72 +#define MODEL_f2 0x71 +#define MODEL_f1 0x70 +#define MODEL_field_e 0x6F +#define MODEL_e7 0x6E +#define MODEL_e6 0x6D +#define MODEL_e5 0x6C +#define MODEL_e4 0x6B +#define MODEL_e3 0x6A +#define MODEL_e2 0x69 +#define MODEL_e1 0x68 +#define MODEL_field_d 0x67 +#define MODEL_d9 0x66 +#define MODEL_d8 0x65 +#define MODEL_d7 0x64 +#define MODEL_d6 0x63 +#define MODEL_d5 0x62 +#define MODEL_d4 0x61 +#define MODEL_d3 0x60 +#define MODEL_d2 0x5F +#define MODEL_d1 0x5E +#define MODEL_turen 0x5D +#define MODEL_t8 0x5C +#define MODEL_t7 0x5B +#define MODEL_t6 0x5A +#define MODEL_t5 0x59 +#define MODEL_t4 0x58 +#define MODEL_t3 0x57 +#define MODEL_t2 0x56 +#define MODEL_t1 0x55 +#define MODEL_field_c 0x54 +#define MODEL_cc 0x53 +#define MODEL_cb 0x52 +#define MODEL_ca 0x51 +#define MODEL_c9 0x50 +#define MODEL_c8 0x4F +#define MODEL_c7 0x4E +#define MODEL_c6 0x4D +#define MODEL_c5 0x4C +#define MODEL_c4 0x4B +#define MODEL_c2 0x4A +#define MODEL_c1 0x49 +#define MODEL_field_b 0x48 +#define MODEL_b8 0x47 +#define MODEL_b4 0x46 +#define MODEL_b7 0x45 +#define MODEL_b6 0x44 +#define MODEL_b5 0x43 +#define MODEL_b3 0x42 +#define MODEL_b2 0x41 +#define MODEL_b1 0x40 +#define MODEL_field_a 0x3F +#define MODEL_a7 0x3E +#define MODEL_ac 0x3D +#define MODEL_ab 0x3C +#define MODEL_aa 0x3B +#define MODEL_a9 0x3A +#define MODEL_a8 0x39 +#define MODEL_a6 0x38 +#define MODEL_a5 0x37 +#define MODEL_a4 0x36 +#define MODEL_a3 0x35 +#define MODEL_a2 0x34 +#define MODEL_a1 0x33 +#define MODEL_mac_side 0x32 +#define MODEL_md 0x31 +#define MODEL_mc 0x30 +#define MODEL_ma 0x2F +#define MODEL_mb 0x2E +#define MODEL_m9 0x2D +#define MODEL_m8 0x2C +#define MODEL_m7 0x2B +#define MODEL_m6 0x2A +#define MODEL_m5 0x29 +#define MODEL_m4 0x28 +#define MODEL_m3 0x27 +#define MODEL_m2 0x26 +#define MODEL_m1 0x25 +#define MODEL_kemuri 0x24 +#define MODEL_km 0x23 +#define MODEL_poppo 0x22 +#define MODEL_piston 0x21 +#define MODEL_p3 0x20 +#define MODEL_16 0x1F +#define MODEL_p2 0x1E +#define MODEL_15 0x1D +#define MODEL_p1 0x1C +#define MODEL_14 0x1B +#define MODEL_syarin 0x1A +#define MODEL_s4 0x19 +#define MODEL_13 0x18 +#define MODEL_s3 0x17 +#define MODEL_12 0x16 +#define MODEL_s2 0x15 +#define MODEL_11 0x14 +#define MODEL_s1 0x13 +#define MODEL_10 0x12 +#define MODEL_bell 0x11 +#define MODEL_09 0x10 +#define MODEL_entotsu 0xF +#define MODEL_07 0xE +#define MODEL_08 0xD +#define MODEL_kisya_door2 0xC +#define MODEL_omote2 0xB +#define MODEL_ura2 0xA +#define MODEL_kisya_door 0x9 +#define MODEL_omote 0x8 +#define MODEL_ura 0x7 +#define MODEL_hontai 0x6 +#define MODEL_06 0x5 +#define MODEL_05 0x4 +#define MODEL_04 0x3 +#define MODEL_03 0x2 +#define MODEL_02 0x1 +#define MODEL_01 0x0 + diff --git a/include/mapfs/iwa_bt01_hit.h b/include/mapfs/iwa_bt01_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/iwa_bt01_hit.h +++ b/include/mapfs/iwa_bt01_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/iwa_bt01_shape.h b/include/mapfs/iwa_bt01_shape.h index bd57744492..a56669a629 100644 --- a/include/mapfs/iwa_bt01_shape.h +++ b/include/mapfs/iwa_bt01_shape.h @@ -1,28 +1,29 @@ -#define MODEL_Root 0x1B -#define MODEL_dai 0x1A -#define MODEL_waku1 0x19 -#define MODEL_o331 0x18 -#define MODEL_iwa1 0x17 -#define MODEL_yuka 0x16 -#define MODEL_b 0x15 -#define MODEL_o375 0x14 -#define MODEL_o374 0x13 -#define MODEL_b_oiwa2 0x12 -#define MODEL_b_oiwa1 0x11 -#define MODEL_b_futi2 0x10 -#define MODEL_b_futi1 0xF -#define MODEL_b_kabe2 0xE -#define MODEL_a 0xD -#define MODEL_kabe3 0xC -#define MODEL_kabe1 0xB -#define MODEL_yuka3 0xA -#define MODEL_a_futi2 0x9 -#define MODEL_a_futi1 0x8 -#define MODEL_a_kabe2 0x7 -#define MODEL_g49 0x6 -#define MODEL_iwa3 0x5 -#define MODEL_iwa2 0x4 -#define MODEL_waku2 0x3 -#define MODEL_oiwa1 0x2 -#define MODEL_yuka2 0x1 -#define MODEL_waku 0x0 +#define MODEL_Root 0x1B +#define MODEL_dai 0x1A +#define MODEL_waku1 0x19 +#define MODEL_o331 0x18 +#define MODEL_iwa1 0x17 +#define MODEL_yuka 0x16 +#define MODEL_b 0x15 +#define MODEL_o375 0x14 +#define MODEL_o374 0x13 +#define MODEL_b_oiwa2 0x12 +#define MODEL_b_oiwa1 0x11 +#define MODEL_b_futi2 0x10 +#define MODEL_b_futi1 0xF +#define MODEL_b_kabe2 0xE +#define MODEL_a 0xD +#define MODEL_kabe3 0xC +#define MODEL_kabe1 0xB +#define MODEL_yuka3 0xA +#define MODEL_a_futi2 0x9 +#define MODEL_a_futi1 0x8 +#define MODEL_a_kabe2 0x7 +#define MODEL_g49 0x6 +#define MODEL_iwa3 0x5 +#define MODEL_iwa2 0x4 +#define MODEL_waku2 0x3 +#define MODEL_oiwa1 0x2 +#define MODEL_yuka2 0x1 +#define MODEL_waku 0x0 + diff --git a/include/mapfs/iwa_bt02_hit.h b/include/mapfs/iwa_bt02_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/iwa_bt02_hit.h +++ b/include/mapfs/iwa_bt02_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/iwa_bt02_shape.h b/include/mapfs/iwa_bt02_shape.h index 6ccd1dfcb6..9be8cfa427 100644 --- a/include/mapfs/iwa_bt02_shape.h +++ b/include/mapfs/iwa_bt02_shape.h @@ -1,21 +1,22 @@ -#define MODEL_Root 0x14 -#define MODEL_dai 0x13 -#define MODEL_waku1 0x12 -#define MODEL_o331 0x11 -#define MODEL_iwa1 0x10 -#define MODEL_yuka 0xF -#define MODEL_g49 0xE -#define MODEL_waku2 0xD -#define MODEL_iwa2 0xC -#define MODEL_iwa 0xB -#define MODEL_futi 0xA -#define MODEL_hasira2 0x9 -#define MODEL_tuna2 0x8 -#define MODEL_yuka3 0x7 -#define MODEL_kabe 0x6 -#define MODEL_ita 0x5 -#define MODEL_hasira1 0x4 -#define MODEL_tuna1 0x3 -#define MODEL_su 0x2 -#define MODEL_kabe2 0x1 -#define MODEL_waku 0x0 +#define MODEL_Root 0x14 +#define MODEL_dai 0x13 +#define MODEL_waku1 0x12 +#define MODEL_o331 0x11 +#define MODEL_iwa1 0x10 +#define MODEL_yuka 0xF +#define MODEL_g49 0xE +#define MODEL_waku2 0xD +#define MODEL_iwa2 0xC +#define MODEL_iwa 0xB +#define MODEL_futi 0xA +#define MODEL_hasira2 0x9 +#define MODEL_tuna2 0x8 +#define MODEL_yuka3 0x7 +#define MODEL_kabe 0x6 +#define MODEL_ita 0x5 +#define MODEL_hasira1 0x4 +#define MODEL_tuna1 0x3 +#define MODEL_su 0x2 +#define MODEL_kabe2 0x1 +#define MODEL_waku 0x0 + diff --git a/include/mapfs/jan_00_hit.h b/include/mapfs/jan_00_hit.h index 91e9e4d3ad..6978324541 100644 --- a/include/mapfs/jan_00_hit.h +++ b/include/mapfs/jan_00_hit.h @@ -1,21 +1,27 @@ -#define COLLIDER_Root 0x14 -#define COLLIDER_g47 0x13 -#define COLLIDER_o90 0x12 -#define COLLIDER_o257 0x11 -#define COLLIDER_g61 0x10 -#define COLLIDER_o293 0xF -#define COLLIDER_o286 0xE -#define COLLIDER_o282 0xD -#define COLLIDER_o281 0xC -#define COLLIDER_o280 0xB -#define COLLIDER_o279 0xA -#define COLLIDER_o278 0x9 -#define COLLIDER_g1 0x8 -#define COLLIDER_g62 0x7 -#define COLLIDER_o96 0x6 -#define COLLIDER_deilitne 0x5 -#define COLLIDER_deiline 0x4 -#define COLLIDER_g12 0x3 -#define COLLIDER_o94 0x2 -#define COLLIDER_deilitse 0x1 -#define COLLIDER_deilise 0x0 +#define COLLIDER_Root 0x14 +#define COLLIDER_g47 0x13 +#define COLLIDER_o90 0x12 +#define COLLIDER_o257 0x11 +#define COLLIDER_g61 0x10 +#define COLLIDER_o293 0xF +#define COLLIDER_o286 0xE +#define COLLIDER_o282 0xD +#define COLLIDER_o281 0xC +#define COLLIDER_o280 0xB +#define COLLIDER_o279 0xA +#define COLLIDER_o278 0x9 +#define COLLIDER_g1 0x8 +#define COLLIDER_g62 0x7 +#define COLLIDER_o96 0x6 +#define COLLIDER_deilitne 0x5 +#define COLLIDER_deiline 0x4 +#define COLLIDER_g12 0x3 +#define COLLIDER_o94 0x2 +#define COLLIDER_deilitse 0x1 +#define COLLIDER_deilise 0x0 + +#define ZONE_Root 0x3 +#define ZONE_g1 0x2 +#define ZONE_o95 0x1 +#define ZONE_o93 0x0 + diff --git a/include/mapfs/jan_00_shape.h b/include/mapfs/jan_00_shape.h index c1eee098d9..2d86712c1c 100644 --- a/include/mapfs/jan_00_shape.h +++ b/include/mapfs/jan_00_shape.h @@ -1,94 +1,95 @@ -#define MODEL_Root 0x5D -#define MODEL_g72 0x5C -#define MODEL_kujira 0x5B -#define MODEL_shita 0x5A -#define MODEL_bero 0x59 -#define MODEL_dou 0x58 -#define MODEL_hoppe 0x57 -#define MODEL_karada 0x56 -#define MODEL_onaka 0x55 -#define MODEL_kuchi 0x54 -#define MODEL_o173 0x53 -#define MODEL_hire_hidari 0x52 -#define MODEL_o167 0x51 -#define MODEL_hire_migi 0x50 -#define MODEL_o168 0x4F -#define MODEL_me2 0x4E -#define MODEL_o183 0x4D -#define MODEL_me 0x4C -#define MODEL_o170 0x4B -#define MODEL_g85 0x4A -#define MODEL_g53 0x49 -#define MODEL_o236 0x48 -#define MODEL_o235 0x47 -#define MODEL_o234 0x46 -#define MODEL_g30 0x45 -#define MODEL_o140 0x44 -#define MODEL_o141 0x43 -#define MODEL_o203 0x42 -#define MODEL_g58 0x41 -#define MODEL_o250 0x40 -#define MODEL_o249 0x3F -#define MODEL_o248 0x3E -#define MODEL_o259 0x3D -#define MODEL_o317 0x3C -#define MODEL_o318 0x3B -#define MODEL_g77 0x3A -#define MODEL_o306 0x39 -#define MODEL_o304 0x38 -#define MODEL_g59 0x37 -#define MODEL_o298 0x36 -#define MODEL_o260 0x35 -#define MODEL_o257 0x34 -#define MODEL_o256 0x33 -#define MODEL_o255 0x32 -#define MODEL_o252 0x31 -#define MODEL_g47 0x30 -#define MODEL_g57 0x2F -#define MODEL_g55 0x2E -#define MODEL_o242 0x2D -#define MODEL_o241 0x2C -#define MODEL_o240 0x2B -#define MODEL_g54 0x2A -#define MODEL_o239 0x29 -#define MODEL_o238 0x28 -#define MODEL_o237 0x27 -#define MODEL_g50 0x26 -#define MODEL_g90 0x25 -#define MODEL_o89 0x24 -#define MODEL_g89 0x23 -#define MODEL_o92 0x22 -#define MODEL_g88 0x21 -#define MODEL_o230 0x20 -#define MODEL_g87 0x1F -#define MODEL_o90 0x1E -#define MODEL_g86 0x1D -#define MODEL_o243 0x1C -#define MODEL_g56 0x1B -#define MODEL_o247 0x1A -#define MODEL_o246 0x19 -#define MODEL_g49 0x18 -#define MODEL_o273 0x17 -#define MODEL_o272 0x16 -#define MODEL_o245 0x15 -#define MODEL_o244 0x14 -#define MODEL_o218 0x13 -#define MODEL_o221 0x12 -#define MODEL_g1 0x11 -#define MODEL_g28 0x10 -#define MODEL_o135 0xF -#define MODEL_o52 0xE -#define MODEL_o142 0xD -#define MODEL_g11 0xC -#define MODEL_o54 0xB -#define MODEL_o53 0xA -#define MODEL_o45 0x9 -#define MODEL_g2 0x8 -#define MODEL_o277 0x7 -#define MODEL_o274 0x6 -#define MODEL_o6 0x5 -#define MODEL_g12 0x4 -#define MODEL_o44 0x3 -#define MODEL_o43 0x2 -#define MODEL_o3 0x1 -#define MODEL_o2 0x0 +#define MODEL_Root 0x5D +#define MODEL_g72 0x5C +#define MODEL_kujira 0x5B +#define MODEL_shita 0x5A +#define MODEL_bero 0x59 +#define MODEL_dou 0x58 +#define MODEL_hoppe 0x57 +#define MODEL_karada 0x56 +#define MODEL_onaka 0x55 +#define MODEL_kuchi 0x54 +#define MODEL_o173 0x53 +#define MODEL_hire_hidari 0x52 +#define MODEL_o167 0x51 +#define MODEL_hire_migi 0x50 +#define MODEL_o168 0x4F +#define MODEL_me2 0x4E +#define MODEL_o183 0x4D +#define MODEL_me 0x4C +#define MODEL_o170 0x4B +#define MODEL_g85 0x4A +#define MODEL_g53 0x49 +#define MODEL_o236 0x48 +#define MODEL_o235 0x47 +#define MODEL_o234 0x46 +#define MODEL_g30 0x45 +#define MODEL_o140 0x44 +#define MODEL_o141 0x43 +#define MODEL_o203 0x42 +#define MODEL_g58 0x41 +#define MODEL_o250 0x40 +#define MODEL_o249 0x3F +#define MODEL_o248 0x3E +#define MODEL_o259 0x3D +#define MODEL_o317 0x3C +#define MODEL_o318 0x3B +#define MODEL_g77 0x3A +#define MODEL_o306 0x39 +#define MODEL_o304 0x38 +#define MODEL_g59 0x37 +#define MODEL_o298 0x36 +#define MODEL_o260 0x35 +#define MODEL_o257 0x34 +#define MODEL_o256 0x33 +#define MODEL_o255 0x32 +#define MODEL_o252 0x31 +#define MODEL_g47 0x30 +#define MODEL_g57 0x2F +#define MODEL_g55 0x2E +#define MODEL_o242 0x2D +#define MODEL_o241 0x2C +#define MODEL_o240 0x2B +#define MODEL_g54 0x2A +#define MODEL_o239 0x29 +#define MODEL_o238 0x28 +#define MODEL_o237 0x27 +#define MODEL_g50 0x26 +#define MODEL_g90 0x25 +#define MODEL_o89 0x24 +#define MODEL_g89 0x23 +#define MODEL_o92 0x22 +#define MODEL_g88 0x21 +#define MODEL_o230 0x20 +#define MODEL_g87 0x1F +#define MODEL_o90 0x1E +#define MODEL_g86 0x1D +#define MODEL_o243 0x1C +#define MODEL_g56 0x1B +#define MODEL_o247 0x1A +#define MODEL_o246 0x19 +#define MODEL_g49 0x18 +#define MODEL_o273 0x17 +#define MODEL_o272 0x16 +#define MODEL_o245 0x15 +#define MODEL_o244 0x14 +#define MODEL_o218 0x13 +#define MODEL_o221 0x12 +#define MODEL_g1 0x11 +#define MODEL_g28 0x10 +#define MODEL_o135 0xF +#define MODEL_o52 0xE +#define MODEL_o142 0xD +#define MODEL_g11 0xC +#define MODEL_o54 0xB +#define MODEL_o53 0xA +#define MODEL_o45 0x9 +#define MODEL_g2 0x8 +#define MODEL_o277 0x7 +#define MODEL_o274 0x6 +#define MODEL_o6 0x5 +#define MODEL_g12 0x4 +#define MODEL_o44 0x3 +#define MODEL_o43 0x2 +#define MODEL_o3 0x1 +#define MODEL_o2 0x0 + diff --git a/include/mapfs/jan_01_hit.h b/include/mapfs/jan_01_hit.h index 04dd24848a..ad3ea516f3 100644 --- a/include/mapfs/jan_01_hit.h +++ b/include/mapfs/jan_01_hit.h @@ -1,45 +1,51 @@ -#define COLLIDER_Root 0x2C -#define COLLIDER_g1 0x2B -#define COLLIDER_g61 0x2A -#define COLLIDER_o209 0x29 -#define COLLIDER_o208 0x28 -#define COLLIDER_g39 0x27 -#define COLLIDER_o143 0x26 -#define COLLIDER_o223 0x25 -#define COLLIDER_o142 0x24 -#define COLLIDER_o141 0x23 -#define COLLIDER_o140 0x22 -#define COLLIDER_o222 0x21 -#define COLLIDER_o139 0x20 -#define COLLIDER_g40 0x1F -#define COLLIDER_o145 0x1E -#define COLLIDER_o144 0x1D -#define COLLIDER_g22 0x1C -#define COLLIDER_o76 0x1B -#define COLLIDER_o138 0x1A -#define COLLIDER_o137 0x19 -#define COLLIDER_o136 0x18 -#define COLLIDER_o135 0x17 -#define COLLIDER_g11 0x16 -#define COLLIDER_g24 0x15 -#define COLLIDER_o205 0x14 -#define COLLIDER_o103 0x13 -#define COLLIDER_o204 0x12 -#define COLLIDER_o155 0x11 -#define COLLIDER_o152 0x10 -#define COLLIDER_o203 0xF -#define COLLIDER_o84 0xE -#define COLLIDER_o134 0xD -#define COLLIDER_iwa 0xC -#define COLLIDER_o55 0xB -#define COLLIDER_o51 0xA -#define COLLIDER_o132 0x9 -#define COLLIDER_g3 0x8 -#define COLLIDER_g7 0x7 -#define COLLIDER_o77 0x6 -#define COLLIDER_deilite 0x5 -#define COLLIDER_deilie 0x4 -#define COLLIDER_g6 0x3 -#define COLLIDER_o75 0x2 -#define COLLIDER_deilitw 0x1 -#define COLLIDER_deiliw 0x0 +#define COLLIDER_Root 0x2C +#define COLLIDER_g1 0x2B +#define COLLIDER_g61 0x2A +#define COLLIDER_o209 0x29 +#define COLLIDER_o208 0x28 +#define COLLIDER_g39 0x27 +#define COLLIDER_o143 0x26 +#define COLLIDER_o223 0x25 +#define COLLIDER_o142 0x24 +#define COLLIDER_o141 0x23 +#define COLLIDER_o140 0x22 +#define COLLIDER_o222 0x21 +#define COLLIDER_o139 0x20 +#define COLLIDER_g40 0x1F +#define COLLIDER_o145 0x1E +#define COLLIDER_o144 0x1D +#define COLLIDER_g22 0x1C +#define COLLIDER_o76 0x1B +#define COLLIDER_o138 0x1A +#define COLLIDER_o137 0x19 +#define COLLIDER_o136 0x18 +#define COLLIDER_o135 0x17 +#define COLLIDER_g11 0x16 +#define COLLIDER_g24 0x15 +#define COLLIDER_o205 0x14 +#define COLLIDER_o103 0x13 +#define COLLIDER_o204 0x12 +#define COLLIDER_o155 0x11 +#define COLLIDER_o152 0x10 +#define COLLIDER_o203 0xF +#define COLLIDER_o84 0xE +#define COLLIDER_o134 0xD +#define COLLIDER_iwa 0xC +#define COLLIDER_o55 0xB +#define COLLIDER_o51 0xA +#define COLLIDER_o132 0x9 +#define COLLIDER_g3 0x8 +#define COLLIDER_g7 0x7 +#define COLLIDER_o77 0x6 +#define COLLIDER_deilite 0x5 +#define COLLIDER_deilie 0x4 +#define COLLIDER_g6 0x3 +#define COLLIDER_o75 0x2 +#define COLLIDER_deilitw 0x1 +#define COLLIDER_deiliw 0x0 + +#define ZONE_Root 0x3 +#define ZONE_g1 0x2 +#define ZONE_o138 0x1 +#define ZONE_o139 0x0 + diff --git a/include/mapfs/jan_01_shape.h b/include/mapfs/jan_01_shape.h index 6f27c6f80f..6d21d3aae9 100644 --- a/include/mapfs/jan_01_shape.h +++ b/include/mapfs/jan_01_shape.h @@ -1,100 +1,101 @@ -#define MODEL_Root 0x63 -#define MODEL_g11 0x62 -#define MODEL_g31 0x61 -#define MODEL_g38 0x60 -#define MODEL_o127 0x5F -#define MODEL_o126 0x5E -#define MODEL_g32 0x5D -#define MODEL_o99 0x5C -#define MODEL_o98 0x5B -#define MODEL_g21 0x5A -#define MODEL_o71 0x59 -#define MODEL_o70 0x58 -#define MODEL_g30 0x57 -#define MODEL_o125 0x56 -#define MODEL_o123 0x55 -#define MODEL_o124 0x54 -#define MODEL_o122 0x53 -#define MODEL_o120 0x52 -#define MODEL_o117 0x51 -#define MODEL_o116 0x50 -#define MODEL_o96 0x4F -#define MODEL_o121 0x4E -#define MODEL_o119 0x4D -#define MODEL_o118 0x4C -#define MODEL_o115 0x4B -#define MODEL_g24 0x4A -#define MODEL_g37 0x49 -#define MODEL_o114 0x48 -#define MODEL_o113 0x47 -#define MODEL_o112 0x46 -#define MODEL_g36 0x45 -#define MODEL_o111 0x44 -#define MODEL_o110 0x43 -#define MODEL_o109 0x42 -#define MODEL_g35 0x41 -#define MODEL_o108 0x40 -#define MODEL_o107 0x3F -#define MODEL_o106 0x3E -#define MODEL_g34 0x3D -#define MODEL_o105 0x3C -#define MODEL_o104 0x3B -#define MODEL_o103 0x3A -#define MODEL_g33 0x39 -#define MODEL_o102 0x38 -#define MODEL_o101 0x37 -#define MODEL_o100 0x36 -#define MODEL_g29 0x35 -#define MODEL_o92 0x34 -#define MODEL_o91 0x33 -#define MODEL_o90 0x32 -#define MODEL_g28 0x31 -#define MODEL_o89 0x30 -#define MODEL_o88 0x2F -#define MODEL_o87 0x2E -#define MODEL_g26 0x2D -#define MODEL_o83 0x2C -#define MODEL_o82 0x2B -#define MODEL_o81 0x2A -#define MODEL_g25 0x29 -#define MODEL_o80 0x28 -#define MODEL_o79 0x27 -#define MODEL_o78 0x26 -#define MODEL_g27 0x25 -#define MODEL_o86 0x24 -#define MODEL_o85 0x23 -#define MODEL_o84 0x22 -#define MODEL_kusa 0x21 -#define MODEL_o63 0x20 -#define MODEL_o14 0x1F -#define MODEL_hana 0x1E -#define MODEL_o67 0x1D -#define MODEL_o66 0x1C -#define MODEL_o62 0x1B -#define MODEL_o61 0x1A -#define MODEL_o15 0x19 -#define MODEL_o16 0x18 -#define MODEL_iwa 0x17 -#define MODEL_o128 0x16 -#define MODEL_o55 0x15 -#define MODEL_o54 0x14 -#define MODEL_o51 0x13 -#define MODEL_o25 0x12 -#define MODEL_g1 0x11 -#define MODEL_g5 0x10 -#define MODEL_o7 0xF -#define MODEL_o6 0xE -#define MODEL_o75 0xD -#define MODEL_g22 0xC -#define MODEL_g46 0xB -#define MODEL_o132 0xA -#define MODEL_o131 0x9 -#define MODEL_o129 0x8 -#define MODEL_o72 0x7 -#define MODEL_g3 0x6 -#define MODEL_g7 0x5 -#define MODEL_o13 0x4 -#define MODEL_o12 0x3 -#define MODEL_g6 0x2 -#define MODEL_o11 0x1 -#define MODEL_o10 0x0 +#define MODEL_Root 0x63 +#define MODEL_g11 0x62 +#define MODEL_g31 0x61 +#define MODEL_g38 0x60 +#define MODEL_o127 0x5F +#define MODEL_o126 0x5E +#define MODEL_g32 0x5D +#define MODEL_o99 0x5C +#define MODEL_o98 0x5B +#define MODEL_g21 0x5A +#define MODEL_o71 0x59 +#define MODEL_o70 0x58 +#define MODEL_g30 0x57 +#define MODEL_o125 0x56 +#define MODEL_o123 0x55 +#define MODEL_o124 0x54 +#define MODEL_o122 0x53 +#define MODEL_o120 0x52 +#define MODEL_o117 0x51 +#define MODEL_o116 0x50 +#define MODEL_o96 0x4F +#define MODEL_o121 0x4E +#define MODEL_o119 0x4D +#define MODEL_o118 0x4C +#define MODEL_o115 0x4B +#define MODEL_g24 0x4A +#define MODEL_g37 0x49 +#define MODEL_o114 0x48 +#define MODEL_o113 0x47 +#define MODEL_o112 0x46 +#define MODEL_g36 0x45 +#define MODEL_o111 0x44 +#define MODEL_o110 0x43 +#define MODEL_o109 0x42 +#define MODEL_g35 0x41 +#define MODEL_o108 0x40 +#define MODEL_o107 0x3F +#define MODEL_o106 0x3E +#define MODEL_g34 0x3D +#define MODEL_o105 0x3C +#define MODEL_o104 0x3B +#define MODEL_o103 0x3A +#define MODEL_g33 0x39 +#define MODEL_o102 0x38 +#define MODEL_o101 0x37 +#define MODEL_o100 0x36 +#define MODEL_g29 0x35 +#define MODEL_o92 0x34 +#define MODEL_o91 0x33 +#define MODEL_o90 0x32 +#define MODEL_g28 0x31 +#define MODEL_o89 0x30 +#define MODEL_o88 0x2F +#define MODEL_o87 0x2E +#define MODEL_g26 0x2D +#define MODEL_o83 0x2C +#define MODEL_o82 0x2B +#define MODEL_o81 0x2A +#define MODEL_g25 0x29 +#define MODEL_o80 0x28 +#define MODEL_o79 0x27 +#define MODEL_o78 0x26 +#define MODEL_g27 0x25 +#define MODEL_o86 0x24 +#define MODEL_o85 0x23 +#define MODEL_o84 0x22 +#define MODEL_kusa 0x21 +#define MODEL_o63 0x20 +#define MODEL_o14 0x1F +#define MODEL_hana 0x1E +#define MODEL_o67 0x1D +#define MODEL_o66 0x1C +#define MODEL_o62 0x1B +#define MODEL_o61 0x1A +#define MODEL_o15 0x19 +#define MODEL_o16 0x18 +#define MODEL_iwa 0x17 +#define MODEL_o128 0x16 +#define MODEL_o55 0x15 +#define MODEL_o54 0x14 +#define MODEL_o51 0x13 +#define MODEL_o25 0x12 +#define MODEL_g1 0x11 +#define MODEL_g5 0x10 +#define MODEL_o7 0xF +#define MODEL_o6 0xE +#define MODEL_o75 0xD +#define MODEL_g22 0xC +#define MODEL_g46 0xB +#define MODEL_o132 0xA +#define MODEL_o131 0x9 +#define MODEL_o129 0x8 +#define MODEL_o72 0x7 +#define MODEL_g3 0x6 +#define MODEL_g7 0x5 +#define MODEL_o13 0x4 +#define MODEL_o12 0x3 +#define MODEL_g6 0x2 +#define MODEL_o11 0x1 +#define MODEL_o10 0x0 + diff --git a/include/mapfs/jan_02_hit.h b/include/mapfs/jan_02_hit.h index 7a241f9dab..e9fae69809 100644 --- a/include/mapfs/jan_02_hit.h +++ b/include/mapfs/jan_02_hit.h @@ -1,71 +1,78 @@ -#define COLLIDER_Root 0x46 -#define COLLIDER_g1 0x45 -#define COLLIDER_g40 0x44 -#define COLLIDER_g112 0x43 -#define COLLIDER_o388 0x42 -#define COLLIDER_o387 0x41 -#define COLLIDER_o386 0x40 -#define COLLIDER_o385 0x3F -#define COLLIDER_o384 0x3E -#define COLLIDER_o383 0x3D -#define COLLIDER_o382 0x3C -#define COLLIDER_o381 0x3B -#define COLLIDER_o380 0x3A -#define COLLIDER_o379 0x39 -#define COLLIDER_o378 0x38 -#define COLLIDER_o377 0x37 -#define COLLIDER_g111 0x36 -#define COLLIDER_o364 0x35 -#define COLLIDER_o342 0x34 -#define COLLIDER_o343 0x33 -#define COLLIDER_o259 0x32 -#define COLLIDER_o111 0x31 -#define COLLIDER_g39 0x30 -#define COLLIDER_o351 0x2F -#define COLLIDER_o319 0x2E -#define COLLIDER_o318 0x2D -#define COLLIDER_o317 0x2C -#define COLLIDER_o316 0x2B -#define COLLIDER_g26 0x2A -#define COLLIDER_g28 0x29 -#define COLLIDER_o350 0x28 -#define COLLIDER_o218 0x27 -#define COLLIDER_o242 0x26 -#define COLLIDER_o241 0x25 -#define COLLIDER_g25 0x24 -#define COLLIDER_o349 0x23 -#define COLLIDER_o222 0x22 -#define COLLIDER_o326 0x21 -#define COLLIDER_g57 0x20 -#define COLLIDER_o348 0x1F -#define COLLIDER_o196 0x1E -#define COLLIDER_o239 0x1D -#define COLLIDER_o130 0x1C -#define COLLIDER_g32 0x1B -#define COLLIDER_g96 0x1A -#define COLLIDER_o338 0x19 -#define COLLIDER_o337 0x18 -#define COLLIDER_g95 0x17 -#define COLLIDER_o390 0x16 -#define COLLIDER_o389 0x15 -#define COLLIDER_o347 0x14 -#define COLLIDER_o346 0x13 -#define COLLIDER_o334 0x12 -#define COLLIDER_o333 0x11 -#define COLLIDER_o332 0x10 -#define COLLIDER_o331 0xF -#define COLLIDER_g94 0xE -#define COLLIDER_o330 0xD -#define COLLIDER_o329 0xC -#define COLLIDER_o328 0xB -#define COLLIDER_o327 0xA -#define COLLIDER_o363 0x9 -#define COLLIDER_g2 0x8 -#define COLLIDER_g92 0x7 -#define COLLIDER_o166 0x6 -#define COLLIDER_deilite 0x5 -#define COLLIDER_deilie 0x4 -#define COLLIDER_g91 0x3 -#define COLLIDER_o168 0x2 -#define COLLIDER_deilitnw 0x1 -#define COLLIDER_deilinw 0x0 +#define COLLIDER_Root 0x46 +#define COLLIDER_g1 0x45 +#define COLLIDER_g40 0x44 +#define COLLIDER_g112 0x43 +#define COLLIDER_o388 0x42 +#define COLLIDER_o387 0x41 +#define COLLIDER_o386 0x40 +#define COLLIDER_o385 0x3F +#define COLLIDER_o384 0x3E +#define COLLIDER_o383 0x3D +#define COLLIDER_o382 0x3C +#define COLLIDER_o381 0x3B +#define COLLIDER_o380 0x3A +#define COLLIDER_o379 0x39 +#define COLLIDER_o378 0x38 +#define COLLIDER_o377 0x37 +#define COLLIDER_g111 0x36 +#define COLLIDER_o364 0x35 +#define COLLIDER_o342 0x34 +#define COLLIDER_o343 0x33 +#define COLLIDER_o259 0x32 +#define COLLIDER_o111 0x31 +#define COLLIDER_g39 0x30 +#define COLLIDER_o351 0x2F +#define COLLIDER_o319 0x2E +#define COLLIDER_o318 0x2D +#define COLLIDER_o317 0x2C +#define COLLIDER_o316 0x2B +#define COLLIDER_g26 0x2A +#define COLLIDER_g28 0x29 +#define COLLIDER_o350 0x28 +#define COLLIDER_o218 0x27 +#define COLLIDER_o242 0x26 +#define COLLIDER_o241 0x25 +#define COLLIDER_g25 0x24 +#define COLLIDER_o349 0x23 +#define COLLIDER_o222 0x22 +#define COLLIDER_o326 0x21 +#define COLLIDER_g57 0x20 +#define COLLIDER_o348 0x1F +#define COLLIDER_o196 0x1E +#define COLLIDER_o239 0x1D +#define COLLIDER_o130 0x1C +#define COLLIDER_g32 0x1B +#define COLLIDER_g96 0x1A +#define COLLIDER_o338 0x19 +#define COLLIDER_o337 0x18 +#define COLLIDER_g95 0x17 +#define COLLIDER_o390 0x16 +#define COLLIDER_o389 0x15 +#define COLLIDER_o347 0x14 +#define COLLIDER_o346 0x13 +#define COLLIDER_o334 0x12 +#define COLLIDER_o333 0x11 +#define COLLIDER_o332 0x10 +#define COLLIDER_o331 0xF +#define COLLIDER_g94 0xE +#define COLLIDER_o330 0xD +#define COLLIDER_o329 0xC +#define COLLIDER_o328 0xB +#define COLLIDER_o327 0xA +#define COLLIDER_o363 0x9 +#define COLLIDER_g2 0x8 +#define COLLIDER_g92 0x7 +#define COLLIDER_o166 0x6 +#define COLLIDER_deilite 0x5 +#define COLLIDER_deilie 0x4 +#define COLLIDER_g91 0x3 +#define COLLIDER_o168 0x2 +#define COLLIDER_deilitnw 0x1 +#define COLLIDER_deilinw 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g1 0x3 +#define ZONE_o168 0x2 +#define ZONE_o166 0x1 +#define ZONE_o5 0x0 + diff --git a/include/mapfs/jan_02_shape.h b/include/mapfs/jan_02_shape.h index 99ab1c7b34..d5bf48ee7f 100644 --- a/include/mapfs/jan_02_shape.h +++ b/include/mapfs/jan_02_shape.h @@ -1,135 +1,136 @@ -#define MODEL_Root 0x86 -#define MODEL_g1 0x85 -#define MODEL_g32 0x84 -#define MODEL_g91 0x83 -#define MODEL_g45 0x82 -#define MODEL_g47 0x81 -#define MODEL_o323 0x80 -#define MODEL_o164 0x7F -#define MODEL_o161 0x7E -#define MODEL_g86 0x7D -#define MODEL_g84 0x7C -#define MODEL_o278 0x7B -#define MODEL_o277 0x7A -#define MODEL_o322 0x79 -#define MODEL_o293 0x78 -#define MODEL_o291 0x77 -#define MODEL_o290 0x76 -#define MODEL_o289 0x75 -#define MODEL_o288 0x74 -#define MODEL_o287 0x73 -#define MODEL_g76 0x72 -#define MODEL_o255 0x71 -#define MODEL_o254 0x70 -#define MODEL_o253 0x6F -#define MODEL_o286 0x6E -#define MODEL_o285 0x6D -#define MODEL_g77 0x6C -#define MODEL_o257 0x6B -#define MODEL_o256 0x6A -#define MODEL_o284 0x69 -#define MODEL_o283 0x68 -#define MODEL_g82 0x67 -#define MODEL_o273 0x66 -#define MODEL_o272 0x65 -#define MODEL_o271 0x64 -#define MODEL_g81 0x63 -#define MODEL_o270 0x62 -#define MODEL_o269 0x61 -#define MODEL_o268 0x60 -#define MODEL_o201 0x5F -#define MODEL_o76 0x5E -#define MODEL_o75 0x5D -#define MODEL_g33 0x5C -#define MODEL_o101 0x5B -#define MODEL_o100 0x5A -#define MODEL_o200 0x59 -#define MODEL_g40 0x58 -#define MODEL_o324 0x57 -#define MODEL_g90 0x56 -#define MODEL_o310 0x55 -#define MODEL_o309 0x54 -#define MODEL_o306 0x53 -#define MODEL_o305 0x52 -#define MODEL_o111 0x51 -#define MODEL_o120 0x50 -#define MODEL_o153 0x4F -#define MODEL_g79 0x4E -#define MODEL_o264 0x4D -#define MODEL_o263 0x4C -#define MODEL_o262 0x4B -#define MODEL_g46 0x4A -#define MODEL_o154 0x49 -#define MODEL_g78 0x48 -#define MODEL_o261 0x47 -#define MODEL_o260 0x46 -#define MODEL_o259 0x45 -#define MODEL_g85 0x44 -#define MODEL_o282 0x43 -#define MODEL_o281 0x42 -#define MODEL_o280 0x41 -#define MODEL_g89 0x40 -#define MODEL_o103 0x3F -#define MODEL_o202 0x3E -#define MODEL_o203 0x3D -#define MODEL_g39 0x3C -#define MODEL_g67 0x3B -#define MODEL_o235 0x3A -#define MODEL_o234 0x39 -#define MODEL_o233 0x38 -#define MODEL_o232 0x37 -#define MODEL_g66 0x36 -#define MODEL_o231 0x35 -#define MODEL_o230 0x34 -#define MODEL_o229 0x33 -#define MODEL_o228 0x32 -#define MODEL_g65 0x31 -#define MODEL_o227 0x30 -#define MODEL_o226 0x2F -#define MODEL_o225 0x2E -#define MODEL_o224 0x2D -#define MODEL_g60 0x2C -#define MODEL_o214 0x2B -#define MODEL_o215 0x2A -#define MODEL_o210 0x29 -#define MODEL_o209 0x28 -#define MODEL_g26 0x27 -#define MODEL_g28 0x26 -#define MODEL_g95 0x25 -#define MODEL_o327 0x24 -#define MODEL_o219 0x23 -#define MODEL_o218 0x22 -#define MODEL_g74 0x21 -#define MODEL_o242 0x20 -#define MODEL_o241 0x1F -#define MODEL_g25 0x1E -#define MODEL_g94 0x1D -#define MODEL_o326 0x1C -#define MODEL_o223 0x1B -#define MODEL_o222 0x1A -#define MODEL_g93 0x19 -#define MODEL_o318 0x18 -#define MODEL_o317 0x17 -#define MODEL_o316 0x16 -#define MODEL_o315 0x15 -#define MODEL_o314 0x14 -#define MODEL_o313 0x13 -#define MODEL_o312 0x12 -#define MODEL_o311 0x11 -#define MODEL_g57 0x10 -#define MODEL_o325 0xF -#define MODEL_o304 0xE -#define MODEL_o196 0xD -#define MODEL_g92 0xC -#define MODEL_o130 0xB -#define MODEL_o123 0xA -#define MODEL_g70 0x9 -#define MODEL_o240 0x8 -#define MODEL_o239 0x7 -#define MODEL_o131 0x6 -#define MODEL_g88 0x5 -#define MODEL_o300 0x4 -#define MODEL_g2 0x3 -#define MODEL_o5 0x2 -#define MODEL_o4 0x1 -#define MODEL_o1 0x0 +#define MODEL_Root 0x86 +#define MODEL_g1 0x85 +#define MODEL_g32 0x84 +#define MODEL_g91 0x83 +#define MODEL_g45 0x82 +#define MODEL_g47 0x81 +#define MODEL_o323 0x80 +#define MODEL_o164 0x7F +#define MODEL_o161 0x7E +#define MODEL_g86 0x7D +#define MODEL_g84 0x7C +#define MODEL_o278 0x7B +#define MODEL_o277 0x7A +#define MODEL_o322 0x79 +#define MODEL_o293 0x78 +#define MODEL_o291 0x77 +#define MODEL_o290 0x76 +#define MODEL_o289 0x75 +#define MODEL_o288 0x74 +#define MODEL_o287 0x73 +#define MODEL_g76 0x72 +#define MODEL_o255 0x71 +#define MODEL_o254 0x70 +#define MODEL_o253 0x6F +#define MODEL_o286 0x6E +#define MODEL_o285 0x6D +#define MODEL_g77 0x6C +#define MODEL_o257 0x6B +#define MODEL_o256 0x6A +#define MODEL_o284 0x69 +#define MODEL_o283 0x68 +#define MODEL_g82 0x67 +#define MODEL_o273 0x66 +#define MODEL_o272 0x65 +#define MODEL_o271 0x64 +#define MODEL_g81 0x63 +#define MODEL_o270 0x62 +#define MODEL_o269 0x61 +#define MODEL_o268 0x60 +#define MODEL_o201 0x5F +#define MODEL_o76 0x5E +#define MODEL_o75 0x5D +#define MODEL_g33 0x5C +#define MODEL_o101 0x5B +#define MODEL_o100 0x5A +#define MODEL_o200 0x59 +#define MODEL_g40 0x58 +#define MODEL_o324 0x57 +#define MODEL_g90 0x56 +#define MODEL_o310 0x55 +#define MODEL_o309 0x54 +#define MODEL_o306 0x53 +#define MODEL_o305 0x52 +#define MODEL_o111 0x51 +#define MODEL_o120 0x50 +#define MODEL_o153 0x4F +#define MODEL_g79 0x4E +#define MODEL_o264 0x4D +#define MODEL_o263 0x4C +#define MODEL_o262 0x4B +#define MODEL_g46 0x4A +#define MODEL_o154 0x49 +#define MODEL_g78 0x48 +#define MODEL_o261 0x47 +#define MODEL_o260 0x46 +#define MODEL_o259 0x45 +#define MODEL_g85 0x44 +#define MODEL_o282 0x43 +#define MODEL_o281 0x42 +#define MODEL_o280 0x41 +#define MODEL_g89 0x40 +#define MODEL_o103 0x3F +#define MODEL_o202 0x3E +#define MODEL_o203 0x3D +#define MODEL_g39 0x3C +#define MODEL_g67 0x3B +#define MODEL_o235 0x3A +#define MODEL_o234 0x39 +#define MODEL_o233 0x38 +#define MODEL_o232 0x37 +#define MODEL_g66 0x36 +#define MODEL_o231 0x35 +#define MODEL_o230 0x34 +#define MODEL_o229 0x33 +#define MODEL_o228 0x32 +#define MODEL_g65 0x31 +#define MODEL_o227 0x30 +#define MODEL_o226 0x2F +#define MODEL_o225 0x2E +#define MODEL_o224 0x2D +#define MODEL_g60 0x2C +#define MODEL_o214 0x2B +#define MODEL_o215 0x2A +#define MODEL_o210 0x29 +#define MODEL_o209 0x28 +#define MODEL_g26 0x27 +#define MODEL_g28 0x26 +#define MODEL_g95 0x25 +#define MODEL_o327 0x24 +#define MODEL_o219 0x23 +#define MODEL_o218 0x22 +#define MODEL_g74 0x21 +#define MODEL_o242 0x20 +#define MODEL_o241 0x1F +#define MODEL_g25 0x1E +#define MODEL_g94 0x1D +#define MODEL_o326 0x1C +#define MODEL_o223 0x1B +#define MODEL_o222 0x1A +#define MODEL_g93 0x19 +#define MODEL_o318 0x18 +#define MODEL_o317 0x17 +#define MODEL_o316 0x16 +#define MODEL_o315 0x15 +#define MODEL_o314 0x14 +#define MODEL_o313 0x13 +#define MODEL_o312 0x12 +#define MODEL_o311 0x11 +#define MODEL_g57 0x10 +#define MODEL_o325 0xF +#define MODEL_o304 0xE +#define MODEL_o196 0xD +#define MODEL_g92 0xC +#define MODEL_o130 0xB +#define MODEL_o123 0xA +#define MODEL_g70 0x9 +#define MODEL_o240 0x8 +#define MODEL_o239 0x7 +#define MODEL_o131 0x6 +#define MODEL_g88 0x5 +#define MODEL_o300 0x4 +#define MODEL_g2 0x3 +#define MODEL_o5 0x2 +#define MODEL_o4 0x1 +#define MODEL_o1 0x0 + diff --git a/include/mapfs/jan_03_hit.h b/include/mapfs/jan_03_hit.h index 790e8136e8..ed090728b6 100644 --- a/include/mapfs/jan_03_hit.h +++ b/include/mapfs/jan_03_hit.h @@ -1,83 +1,94 @@ -#define COLLIDER_Root 0x52 -#define COLLIDER_g1 0x51 -#define COLLIDER_g51 0x50 -#define COLLIDER_g52 0x4F -#define COLLIDER_g72 0x4E -#define COLLIDER_o423 0x4D -#define COLLIDER_o422 0x4C -#define COLLIDER_g67 0x4B -#define COLLIDER_o605 0x4A -#define COLLIDER_o390 0x49 -#define COLLIDER_g53 0x48 -#define COLLIDER_o258 0x47 -#define COLLIDER_o256 0x46 -#define COLLIDER_o197 0x45 -#define COLLIDER_o190 0x44 -#define COLLIDER_g61 0x43 -#define COLLIDER_o370 0x42 -#define COLLIDER_g60 0x41 -#define COLLIDER_o200 0x40 -#define COLLIDER_o199 0x3F -#define COLLIDER_g41 0x3E -#define COLLIDER_g105 0x3D -#define COLLIDER_o396 0x3C -#define COLLIDER_o395 0x3B -#define COLLIDER_o394 0x3A -#define COLLIDER_o393 0x39 -#define COLLIDER_o392 0x38 -#define COLLIDER_o391 0x37 -#define COLLIDER_g50 0x36 -#define COLLIDER_o614 0x35 -#define COLLIDER_o160 0x34 -#define COLLIDER_o404 0x33 -#define COLLIDER_o123 0x32 -#define COLLIDER_g48 0x31 -#define COLLIDER_o161 0x30 -#define COLLIDER_o156 0x2F -#define COLLIDER_g73 0x2E -#define COLLIDER_g75 0x2D -#define COLLIDER_o582 0x2C -#define COLLIDER_o293 0x2B -#define COLLIDER_g74 0x2A -#define COLLIDER_o596 0x29 -#define COLLIDER_o576 0x28 -#define COLLIDER_o408 0x27 -#define COLLIDER_o266 0x26 -#define COLLIDER_o268 0x25 -#define COLLIDER_o263 0x24 -#define COLLIDER_o259 0x23 -#define COLLIDER_g81 0x22 -#define COLLIDER_o440 0x21 -#define COLLIDER_o316 0x20 -#define COLLIDER_o421 0x1F -#define COLLIDER_o361 0x1E -#define COLLIDER_g22 0x1D -#define COLLIDER_g109 0x1C -#define COLLIDER_o611 0x1B -#define COLLIDER_o610 0x1A -#define COLLIDER_o420 0x19 -#define COLLIDER_o419 0x18 -#define COLLIDER_o418 0x17 -#define COLLIDER_g108 0x16 -#define COLLIDER_o609 0x15 -#define COLLIDER_o608 0x14 -#define COLLIDER_o517 0x13 -#define COLLIDER_o469 0x12 -#define COLLIDER_o468 0x11 -#define COLLIDER_o467 0x10 -#define COLLIDER_o417 0xF -#define COLLIDER_o416 0xE -#define COLLIDER_o415 0xD -#define COLLIDER_g2 0xC -#define COLLIDER_g39 0xB -#define COLLIDER_o124 0xA -#define COLLIDER_deilitnw 0x9 -#define COLLIDER_deilinw 0x8 -#define COLLIDER_g38 0x7 -#define COLLIDER_o122 0x6 -#define COLLIDER_deilite 0x5 -#define COLLIDER_deilie 0x4 -#define COLLIDER_g37 0x3 -#define COLLIDER_o120 0x2 -#define COLLIDER_deilitw 0x1 -#define COLLIDER_deiliw 0x0 +#define COLLIDER_Root 0x52 +#define COLLIDER_g1 0x51 +#define COLLIDER_g51 0x50 +#define COLLIDER_g52 0x4F +#define COLLIDER_g72 0x4E +#define COLLIDER_o423 0x4D +#define COLLIDER_o422 0x4C +#define COLLIDER_g67 0x4B +#define COLLIDER_o605 0x4A +#define COLLIDER_o390 0x49 +#define COLLIDER_g53 0x48 +#define COLLIDER_o258 0x47 +#define COLLIDER_o256 0x46 +#define COLLIDER_o197 0x45 +#define COLLIDER_o190 0x44 +#define COLLIDER_g61 0x43 +#define COLLIDER_o370 0x42 +#define COLLIDER_g60 0x41 +#define COLLIDER_o200 0x40 +#define COLLIDER_o199 0x3F +#define COLLIDER_g41 0x3E +#define COLLIDER_g105 0x3D +#define COLLIDER_o396 0x3C +#define COLLIDER_o395 0x3B +#define COLLIDER_o394 0x3A +#define COLLIDER_o393 0x39 +#define COLLIDER_o392 0x38 +#define COLLIDER_o391 0x37 +#define COLLIDER_g50 0x36 +#define COLLIDER_o614 0x35 +#define COLLIDER_o160 0x34 +#define COLLIDER_o404 0x33 +#define COLLIDER_o123 0x32 +#define COLLIDER_g48 0x31 +#define COLLIDER_o161 0x30 +#define COLLIDER_o156 0x2F +#define COLLIDER_g73 0x2E +#define COLLIDER_g75 0x2D +#define COLLIDER_o582 0x2C +#define COLLIDER_o293 0x2B +#define COLLIDER_g74 0x2A +#define COLLIDER_o596 0x29 +#define COLLIDER_o576 0x28 +#define COLLIDER_o408 0x27 +#define COLLIDER_o266 0x26 +#define COLLIDER_o268 0x25 +#define COLLIDER_o263 0x24 +#define COLLIDER_o259 0x23 +#define COLLIDER_g81 0x22 +#define COLLIDER_o440 0x21 +#define COLLIDER_o316 0x20 +#define COLLIDER_o421 0x1F +#define COLLIDER_o361 0x1E +#define COLLIDER_g22 0x1D +#define COLLIDER_g109 0x1C +#define COLLIDER_o611 0x1B +#define COLLIDER_o610 0x1A +#define COLLIDER_o420 0x19 +#define COLLIDER_o419 0x18 +#define COLLIDER_o418 0x17 +#define COLLIDER_g108 0x16 +#define COLLIDER_o609 0x15 +#define COLLIDER_o608 0x14 +#define COLLIDER_o517 0x13 +#define COLLIDER_o469 0x12 +#define COLLIDER_o468 0x11 +#define COLLIDER_o467 0x10 +#define COLLIDER_o417 0xF +#define COLLIDER_o416 0xE +#define COLLIDER_o415 0xD +#define COLLIDER_g2 0xC +#define COLLIDER_g39 0xB +#define COLLIDER_o124 0xA +#define COLLIDER_deilitnw 0x9 +#define COLLIDER_deilinw 0x8 +#define COLLIDER_g38 0x7 +#define COLLIDER_o122 0x6 +#define COLLIDER_deilite 0x5 +#define COLLIDER_deilie 0x4 +#define COLLIDER_g37 0x3 +#define COLLIDER_o120 0x2 +#define COLLIDER_deilitw 0x1 +#define COLLIDER_deiliw 0x0 + +#define ZONE_Root 0x8 +#define ZONE_g1 0x7 +#define ZONE_g81 0x6 +#define ZONE_o253 0x5 +#define ZONE_o252 0x4 +#define ZONE_g22 0x3 +#define ZONE_o261 0x2 +#define ZONE_o260 0x1 +#define ZONE_o6 0x0 + diff --git a/include/mapfs/jan_03_shape.h b/include/mapfs/jan_03_shape.h index a008d22067..f4dfdb5c15 100644 --- a/include/mapfs/jan_03_shape.h +++ b/include/mapfs/jan_03_shape.h @@ -1,195 +1,196 @@ -#define MODEL_Root 0xC2 -#define MODEL_g1 0xC1 -#define MODEL_g100 0xC0 -#define MODEL_o361 0xBF -#define MODEL_g98 0xBE -#define MODEL_o355 0xBD -#define MODEL_o354 0xBC -#define MODEL_o312 0xBB -#define MODEL_g89 0xBA -#define MODEL_o328 0xB9 -#define MODEL_o327 0xB8 -#define MODEL_o326 0xB7 -#define MODEL_o475 0xB6 -#define MODEL_o117 0xB5 -#define MODEL_g51 0xB4 -#define MODEL_g52 0xB3 -#define MODEL_g106 0xB2 -#define MODEL_o370 0xB1 -#define MODEL_o255 0xB0 -#define MODEL_o254 0xAF -#define MODEL_g67 0xAE -#define MODEL_o485 0xAD -#define MODEL_o243 0xAC -#define MODEL_g68 0xAB -#define MODEL_o240 0xAA -#define MODEL_o239 0xA9 -#define MODEL_g72 0xA8 -#define MODEL_o253 0xA7 -#define MODEL_o238 0xA6 -#define MODEL_o252 0xA5 -#define MODEL_o237 0xA4 -#define MODEL_g53 0xA3 -#define MODEL_o257 0xA2 -#define MODEL_o256 0xA1 -#define MODEL_o175 0xA0 -#define MODEL_o174 0x9F -#define MODEL_o172 0x9E -#define MODEL_o171 0x9D -#define MODEL_o170 0x9C -#define MODEL_g61 0x9B -#define MODEL_o482 0x9A -#define MODEL_o481 0x99 -#define MODEL_o183 0x98 -#define MODEL_o205 0x97 -#define MODEL_o204 0x96 -#define MODEL_o203 0x95 -#define MODEL_o202 0x94 -#define MODEL_o198 0x93 -#define MODEL_o197 0x92 -#define MODEL_g56 0x91 -#define MODEL_o196 0x90 -#define MODEL_o193 0x8F -#define MODEL_o190 0x8E -#define MODEL_o187 0x8D -#define MODEL_g118 0x8C -#define MODEL_g120 0x8B -#define MODEL_o258 0x8A -#define MODEL_o173 0x89 -#define MODEL_g119 0x88 -#define MODEL_o178 0x87 -#define MODEL_o177 0x86 -#define MODEL_g113 0x85 -#define MODEL_g117 0x84 -#define MODEL_o195 0x83 -#define MODEL_g116 0x82 -#define MODEL_o192 0x81 -#define MODEL_g115 0x80 -#define MODEL_o186 0x7F -#define MODEL_g114 0x7E -#define MODEL_o189 0x7D -#define MODEL_g111 0x7C -#define MODEL_o200 0x7B -#define MODEL_o199 0x7A -#define MODEL_g41 0x79 -#define MODEL_g126 0x78 -#define MODEL_g136 0x77 -#define MODEL_o465 0x76 -#define MODEL_o463 0x75 -#define MODEL_g128 0x74 -#define MODEL_o434 0x73 -#define MODEL_o433 0x72 -#define MODEL_g124 0x71 -#define MODEL_o427 0x70 -#define MODEL_o426 0x6F -#define MODEL_o425 0x6E -#define MODEL_o376 0x6D -#define MODEL_o377 0x6C -#define MODEL_o378 0x6B -#define MODEL_o423 0x6A -#define MODEL_o424 0x69 -#define MODEL_o379 0x68 -#define MODEL_g127 0x67 -#define MODEL_o405 0x66 -#define MODEL_o417 0x65 -#define MODEL_o418 0x64 -#define MODEL_o428 0x63 -#define MODEL_o415 0x62 -#define MODEL_g104 0x61 -#define MODEL_o273 0x60 -#define MODEL_o272 0x5F -#define MODEL_g45 0x5E -#define MODEL_o368 0x5D -#define MODEL_o367 0x5C -#define MODEL_o366 0x5B -#define MODEL_o365 0x5A -#define MODEL_o364 0x59 -#define MODEL_o363 0x58 -#define MODEL_o141 0x57 -#define MODEL_g123 0x56 -#define MODEL_o480 0x55 -#define MODEL_o479 0x54 -#define MODEL_o414 0x53 -#define MODEL_o413 0x52 -#define MODEL_g121 0x51 -#define MODEL_o411 0x50 -#define MODEL_o409 0x4F -#define MODEL_o407 0x4E -#define MODEL_g44 0x4D -#define MODEL_o140 0x4C -#define MODEL_o139 0x4B -#define MODEL_g50 0x4A -#define MODEL_o123 0x49 -#define MODEL_o122 0x48 -#define MODEL_g109 0x47 -#define MODEL_o421 0x46 -#define MODEL_o422 0x45 -#define MODEL_g110 0x44 -#define MODEL_o393 0x43 -#define MODEL_o392 0x42 -#define MODEL_g48 0x41 -#define MODEL_o161 0x40 -#define MODEL_o156 0x3F -#define MODEL_g73 0x3E -#define MODEL_g76 0x3D -#define MODEL_o448 0x3C -#define MODEL_o290 0x3B -#define MODEL_o281 0x3A -#define MODEL_o288 0x39 -#define MODEL_o274 0x38 -#define MODEL_g130 0x37 -#define MODEL_o446 0x36 -#define MODEL_o445 0x35 -#define MODEL_o444 0x34 -#define MODEL_g129 0x33 -#define MODEL_o443 0x32 -#define MODEL_o442 0x31 -#define MODEL_o439 0x30 -#define MODEL_g77 0x2F -#define MODEL_o293 0x2E -#define MODEL_g75 0x2D -#define MODEL_o271 0x2C -#define MODEL_o270 0x2B -#define MODEL_g74 0x2A -#define MODEL_o266 0x29 -#define MODEL_o437 0x28 -#define MODEL_o263 0x27 -#define MODEL_o262 0x26 -#define MODEL_o259 0x25 -#define MODEL_o264 0x24 -#define MODEL_g81 0x23 -#define MODEL_g97 0x22 -#define MODEL_o352 0x21 -#define MODEL_o351 0x20 -#define MODEL_o350 0x1F -#define MODEL_g138 0x1E -#define MODEL_o474 0x1D -#define MODEL_o473 0x1C -#define MODEL_o472 0x1B -#define MODEL_o471 0x1A -#define MODEL_g86 0x19 -#define MODEL_o316 0x18 -#define MODEL_o484 0x17 -#define MODEL_g133 0x16 -#define MODEL_o121 0x15 -#define MODEL_o119 0x14 -#define MODEL_o371 0x13 -#define MODEL_g22 0x12 -#define MODEL_o450 0x11 -#define MODEL_o451 0x10 -#define MODEL_o455 0xF -#define MODEL_o435 0xE -#define MODEL_g36 0xD -#define MODEL_o118 0xC -#define MODEL_o115 0xB -#define MODEL_o1 0xA -#define MODEL_g2 0x9 -#define MODEL_g39 0x8 -#define MODEL_o76 0x7 -#define MODEL_o75 0x6 -#define MODEL_g38 0x5 -#define MODEL_o5 0x4 -#define MODEL_o4 0x3 -#define MODEL_g37 0x2 -#define MODEL_o3 0x1 -#define MODEL_o2 0x0 +#define MODEL_Root 0xC2 +#define MODEL_g1 0xC1 +#define MODEL_g100 0xC0 +#define MODEL_o361 0xBF +#define MODEL_g98 0xBE +#define MODEL_o355 0xBD +#define MODEL_o354 0xBC +#define MODEL_o312 0xBB +#define MODEL_g89 0xBA +#define MODEL_o328 0xB9 +#define MODEL_o327 0xB8 +#define MODEL_o326 0xB7 +#define MODEL_o475 0xB6 +#define MODEL_o117 0xB5 +#define MODEL_g51 0xB4 +#define MODEL_g52 0xB3 +#define MODEL_g106 0xB2 +#define MODEL_o370 0xB1 +#define MODEL_o255 0xB0 +#define MODEL_o254 0xAF +#define MODEL_g67 0xAE +#define MODEL_o485 0xAD +#define MODEL_o243 0xAC +#define MODEL_g68 0xAB +#define MODEL_o240 0xAA +#define MODEL_o239 0xA9 +#define MODEL_g72 0xA8 +#define MODEL_o253 0xA7 +#define MODEL_o238 0xA6 +#define MODEL_o252 0xA5 +#define MODEL_o237 0xA4 +#define MODEL_g53 0xA3 +#define MODEL_o257 0xA2 +#define MODEL_o256 0xA1 +#define MODEL_o175 0xA0 +#define MODEL_o174 0x9F +#define MODEL_o172 0x9E +#define MODEL_o171 0x9D +#define MODEL_o170 0x9C +#define MODEL_g61 0x9B +#define MODEL_o482 0x9A +#define MODEL_o481 0x99 +#define MODEL_o183 0x98 +#define MODEL_o205 0x97 +#define MODEL_o204 0x96 +#define MODEL_o203 0x95 +#define MODEL_o202 0x94 +#define MODEL_o198 0x93 +#define MODEL_o197 0x92 +#define MODEL_g56 0x91 +#define MODEL_o196 0x90 +#define MODEL_o193 0x8F +#define MODEL_o190 0x8E +#define MODEL_o187 0x8D +#define MODEL_g118 0x8C +#define MODEL_g120 0x8B +#define MODEL_o258 0x8A +#define MODEL_o173 0x89 +#define MODEL_g119 0x88 +#define MODEL_o178 0x87 +#define MODEL_o177 0x86 +#define MODEL_g113 0x85 +#define MODEL_g117 0x84 +#define MODEL_o195 0x83 +#define MODEL_g116 0x82 +#define MODEL_o192 0x81 +#define MODEL_g115 0x80 +#define MODEL_o186 0x7F +#define MODEL_g114 0x7E +#define MODEL_o189 0x7D +#define MODEL_g111 0x7C +#define MODEL_o200 0x7B +#define MODEL_o199 0x7A +#define MODEL_g41 0x79 +#define MODEL_g126 0x78 +#define MODEL_g136 0x77 +#define MODEL_o465 0x76 +#define MODEL_o463 0x75 +#define MODEL_g128 0x74 +#define MODEL_o434 0x73 +#define MODEL_o433 0x72 +#define MODEL_g124 0x71 +#define MODEL_o427 0x70 +#define MODEL_o426 0x6F +#define MODEL_o425 0x6E +#define MODEL_o376 0x6D +#define MODEL_o377 0x6C +#define MODEL_o378 0x6B +#define MODEL_o423 0x6A +#define MODEL_o424 0x69 +#define MODEL_o379 0x68 +#define MODEL_g127 0x67 +#define MODEL_o405 0x66 +#define MODEL_o417 0x65 +#define MODEL_o418 0x64 +#define MODEL_o428 0x63 +#define MODEL_o415 0x62 +#define MODEL_g104 0x61 +#define MODEL_o273 0x60 +#define MODEL_o272 0x5F +#define MODEL_g45 0x5E +#define MODEL_o368 0x5D +#define MODEL_o367 0x5C +#define MODEL_o366 0x5B +#define MODEL_o365 0x5A +#define MODEL_o364 0x59 +#define MODEL_o363 0x58 +#define MODEL_o141 0x57 +#define MODEL_g123 0x56 +#define MODEL_o480 0x55 +#define MODEL_o479 0x54 +#define MODEL_o414 0x53 +#define MODEL_o413 0x52 +#define MODEL_g121 0x51 +#define MODEL_o411 0x50 +#define MODEL_o409 0x4F +#define MODEL_o407 0x4E +#define MODEL_g44 0x4D +#define MODEL_o140 0x4C +#define MODEL_o139 0x4B +#define MODEL_g50 0x4A +#define MODEL_o123 0x49 +#define MODEL_o122 0x48 +#define MODEL_g109 0x47 +#define MODEL_o421 0x46 +#define MODEL_o422 0x45 +#define MODEL_g110 0x44 +#define MODEL_o393 0x43 +#define MODEL_o392 0x42 +#define MODEL_g48 0x41 +#define MODEL_o161 0x40 +#define MODEL_o156 0x3F +#define MODEL_g73 0x3E +#define MODEL_g76 0x3D +#define MODEL_o448 0x3C +#define MODEL_o290 0x3B +#define MODEL_o281 0x3A +#define MODEL_o288 0x39 +#define MODEL_o274 0x38 +#define MODEL_g130 0x37 +#define MODEL_o446 0x36 +#define MODEL_o445 0x35 +#define MODEL_o444 0x34 +#define MODEL_g129 0x33 +#define MODEL_o443 0x32 +#define MODEL_o442 0x31 +#define MODEL_o439 0x30 +#define MODEL_g77 0x2F +#define MODEL_o293 0x2E +#define MODEL_g75 0x2D +#define MODEL_o271 0x2C +#define MODEL_o270 0x2B +#define MODEL_g74 0x2A +#define MODEL_o266 0x29 +#define MODEL_o437 0x28 +#define MODEL_o263 0x27 +#define MODEL_o262 0x26 +#define MODEL_o259 0x25 +#define MODEL_o264 0x24 +#define MODEL_g81 0x23 +#define MODEL_g97 0x22 +#define MODEL_o352 0x21 +#define MODEL_o351 0x20 +#define MODEL_o350 0x1F +#define MODEL_g138 0x1E +#define MODEL_o474 0x1D +#define MODEL_o473 0x1C +#define MODEL_o472 0x1B +#define MODEL_o471 0x1A +#define MODEL_g86 0x19 +#define MODEL_o316 0x18 +#define MODEL_o484 0x17 +#define MODEL_g133 0x16 +#define MODEL_o121 0x15 +#define MODEL_o119 0x14 +#define MODEL_o371 0x13 +#define MODEL_g22 0x12 +#define MODEL_o450 0x11 +#define MODEL_o451 0x10 +#define MODEL_o455 0xF +#define MODEL_o435 0xE +#define MODEL_g36 0xD +#define MODEL_o118 0xC +#define MODEL_o115 0xB +#define MODEL_o1 0xA +#define MODEL_g2 0x9 +#define MODEL_g39 0x8 +#define MODEL_o76 0x7 +#define MODEL_o75 0x6 +#define MODEL_g38 0x5 +#define MODEL_o5 0x4 +#define MODEL_o4 0x3 +#define MODEL_g37 0x2 +#define MODEL_o3 0x1 +#define MODEL_o2 0x0 + diff --git a/include/mapfs/jan_04_hit.h b/include/mapfs/jan_04_hit.h index 101142981d..99514e9447 100644 --- a/include/mapfs/jan_04_hit.h +++ b/include/mapfs/jan_04_hit.h @@ -1,73 +1,80 @@ -#define COLLIDER_Root 0x48 -#define COLLIDER_g1 0x47 -#define COLLIDER_g38 0x46 -#define COLLIDER_o161 0x45 -#define COLLIDER_o160 0x44 -#define COLLIDER_o159 0x43 -#define COLLIDER_o158 0x42 -#define COLLIDER_g24 0x41 -#define COLLIDER_g40 0x40 -#define COLLIDER_o156 0x3F -#define COLLIDER_o157 0x3E -#define COLLIDER_g39 0x3D -#define COLLIDER_o165 0x3C -#define COLLIDER_o164 0x3B -#define COLLIDER_o120 0x3A -#define COLLIDER_o166 0x39 -#define COLLIDER_o122 0x38 -#define COLLIDER_o121 0x37 -#define COLLIDER_o163 0x36 -#define COLLIDER_o119 0x35 -#define COLLIDER_o162 0x34 -#define COLLIDER_o118 0x33 -#define COLLIDER_o191 0x32 -#define COLLIDER_o190 0x31 -#define COLLIDER_o167 0x30 -#define COLLIDER_g19 0x2F -#define COLLIDER_o139 0x2E -#define COLLIDER_o124 0x2D -#define COLLIDER_o123 0x2C -#define COLLIDER_o34 0x2B -#define COLLIDER_g23 0x2A -#define COLLIDER_g27 0x29 -#define COLLIDER_o54 0x28 -#define COLLIDER_o113 0x27 -#define COLLIDER_g26 0x26 -#define COLLIDER_o53 0x25 -#define COLLIDER_o111 0x24 -#define COLLIDER_g25 0x23 -#define COLLIDER_o52 0x22 -#define COLLIDER_o109 0x21 -#define COLLIDER_g16 0x20 -#define COLLIDER_g18 0x1F -#define COLLIDER_o116 0x1E -#define COLLIDER_o72 0x1D -#define COLLIDER_g17 0x1C -#define COLLIDER_o115 0x1B -#define COLLIDER_o71 0x1A -#define COLLIDER_g6 0x19 -#define COLLIDER_g30 0x18 -#define COLLIDER_o136 0x17 -#define COLLIDER_o135 0x16 -#define COLLIDER_o35 0x15 -#define COLLIDER_g32 0x14 -#define COLLIDER_o134 0x13 -#define COLLIDER_o133 0x12 -#define COLLIDER_o131 0x11 -#define COLLIDER_g10 0x10 -#define COLLIDER_o58 0xF -#define COLLIDER_o31 0xE -#define COLLIDER_o30 0xD -#define COLLIDER_o27 0xC -#define COLLIDER_o32 0xB -#define COLLIDER_g28 0xA -#define COLLIDER_o128 0x9 -#define COLLIDER_o127 0x8 -#define COLLIDER_o126 0x7 -#define COLLIDER_o125 0x6 -#define COLLIDER_o23 0x5 -#define COLLIDER_o1 0x4 -#define COLLIDER_g2 0x3 -#define COLLIDER_o51 0x2 -#define COLLIDER_deilitw 0x1 -#define COLLIDER_deiliw 0x0 +#define COLLIDER_Root 0x48 +#define COLLIDER_g1 0x47 +#define COLLIDER_g38 0x46 +#define COLLIDER_o161 0x45 +#define COLLIDER_o160 0x44 +#define COLLIDER_o159 0x43 +#define COLLIDER_o158 0x42 +#define COLLIDER_g24 0x41 +#define COLLIDER_g40 0x40 +#define COLLIDER_o156 0x3F +#define COLLIDER_o157 0x3E +#define COLLIDER_g39 0x3D +#define COLLIDER_o165 0x3C +#define COLLIDER_o164 0x3B +#define COLLIDER_o120 0x3A +#define COLLIDER_o166 0x39 +#define COLLIDER_o122 0x38 +#define COLLIDER_o121 0x37 +#define COLLIDER_o163 0x36 +#define COLLIDER_o119 0x35 +#define COLLIDER_o162 0x34 +#define COLLIDER_o118 0x33 +#define COLLIDER_o191 0x32 +#define COLLIDER_o190 0x31 +#define COLLIDER_o167 0x30 +#define COLLIDER_g19 0x2F +#define COLLIDER_o139 0x2E +#define COLLIDER_o124 0x2D +#define COLLIDER_o123 0x2C +#define COLLIDER_o34 0x2B +#define COLLIDER_g23 0x2A +#define COLLIDER_g27 0x29 +#define COLLIDER_o54 0x28 +#define COLLIDER_o113 0x27 +#define COLLIDER_g26 0x26 +#define COLLIDER_o53 0x25 +#define COLLIDER_o111 0x24 +#define COLLIDER_g25 0x23 +#define COLLIDER_o52 0x22 +#define COLLIDER_o109 0x21 +#define COLLIDER_g16 0x20 +#define COLLIDER_g18 0x1F +#define COLLIDER_o116 0x1E +#define COLLIDER_o72 0x1D +#define COLLIDER_g17 0x1C +#define COLLIDER_o115 0x1B +#define COLLIDER_o71 0x1A +#define COLLIDER_g6 0x19 +#define COLLIDER_g30 0x18 +#define COLLIDER_o136 0x17 +#define COLLIDER_o135 0x16 +#define COLLIDER_o35 0x15 +#define COLLIDER_g32 0x14 +#define COLLIDER_o134 0x13 +#define COLLIDER_o133 0x12 +#define COLLIDER_o131 0x11 +#define COLLIDER_g10 0x10 +#define COLLIDER_o58 0xF +#define COLLIDER_o31 0xE +#define COLLIDER_o30 0xD +#define COLLIDER_o27 0xC +#define COLLIDER_o32 0xB +#define COLLIDER_g28 0xA +#define COLLIDER_o128 0x9 +#define COLLIDER_o127 0x8 +#define COLLIDER_o126 0x7 +#define COLLIDER_o125 0x6 +#define COLLIDER_o23 0x5 +#define COLLIDER_o1 0x4 +#define COLLIDER_g2 0x3 +#define COLLIDER_o51 0x2 +#define COLLIDER_deilitw 0x1 +#define COLLIDER_deiliw 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g1 0x3 +#define ZONE_o52 0x2 +#define ZONE_o51 0x1 +#define ZONE_o50 0x0 + diff --git a/include/mapfs/jan_04_shape.h b/include/mapfs/jan_04_shape.h index 99efd0cd80..d9c8e3e837 100644 --- a/include/mapfs/jan_04_shape.h +++ b/include/mapfs/jan_04_shape.h @@ -1,92 +1,93 @@ -#define MODEL_Root 0x5B -#define MODEL_g1 0x5A -#define MODEL_g12 0x59 -#define MODEL_o61 0x58 -#define MODEL_o60 0x57 -#define MODEL_g20 0x56 -#define MODEL_g32 0x55 -#define MODEL_o87 0x54 -#define MODEL_g31 0x53 -#define MODEL_o88 0x52 -#define MODEL_g30 0x51 -#define MODEL_o86 0x50 -#define MODEL_g29 0x4F -#define MODEL_o92 0x4E -#define MODEL_g28 0x4D -#define MODEL_o91 0x4C -#define MODEL_g27 0x4B -#define MODEL_o89 0x4A -#define MODEL_g26 0x49 -#define MODEL_o85 0x48 -#define MODEL_g25 0x47 -#define MODEL_o83 0x46 -#define MODEL_g24 0x45 -#define MODEL_o81 0x44 -#define MODEL_g23 0x43 -#define MODEL_o82 0x42 -#define MODEL_g15 0x41 -#define MODEL_o69 0x40 -#define MODEL_o68 0x3F -#define MODEL_g19 0x3E -#define MODEL_o79 0x3D -#define MODEL_o78 0x3C -#define MODEL_o77 0x3B -#define MODEL_o76 0x3A -#define MODEL_o75 0x39 -#define MODEL_o74 0x38 -#define MODEL_g13 0x37 -#define MODEL_g22 0x36 -#define MODEL_o105 0x35 -#define MODEL_o104 0x34 -#define MODEL_o103 0x33 -#define MODEL_o102 0x32 -#define MODEL_o101 0x31 -#define MODEL_o100 0x30 -#define MODEL_g21 0x2F -#define MODEL_o98 0x2E -#define MODEL_o97 0x2D -#define MODEL_o96 0x2C -#define MODEL_o95 0x2B -#define MODEL_o94 0x2A -#define MODEL_o99 0x29 -#define MODEL_g14 0x28 -#define MODEL_o67 0x27 -#define MODEL_o66 0x26 -#define MODEL_o65 0x25 -#define MODEL_o64 0x24 -#define MODEL_o63 0x23 -#define MODEL_o34 0x22 -#define MODEL_g5 0x21 -#define MODEL_o19 0x20 -#define MODEL_o18 0x1F -#define MODEL_o17 0x1E -#define MODEL_o16 0x1D -#define MODEL_o10 0x1C -#define MODEL_o9 0x1B -#define MODEL_g16 0x1A -#define MODEL_g18 0x19 -#define MODEL_o73 0x18 -#define MODEL_o72 0x17 -#define MODEL_g17 0x16 -#define MODEL_o108 0x15 -#define MODEL_o106 0x14 -#define MODEL_g6 0x13 -#define MODEL_g11 0x12 -#define MODEL_o59 0x11 -#define MODEL_o55 0x10 -#define MODEL_o45 0xF -#define MODEL_o44 0xE -#define MODEL_o43 0xD -#define MODEL_g10 0xC -#define MODEL_o58 0xB -#define MODEL_o53 0xA -#define MODEL_o30 0x9 -#define MODEL_o27 0x8 -#define MODEL_o32 0x7 -#define MODEL_o23 0x6 -#define MODEL_o57 0x5 -#define MODEL_o35 0x4 -#define MODEL_g2 0x3 -#define MODEL_o3 0x2 -#define MODEL_o2 0x1 -#define MODEL_o6 0x0 +#define MODEL_Root 0x5B +#define MODEL_g1 0x5A +#define MODEL_g12 0x59 +#define MODEL_o61 0x58 +#define MODEL_o60 0x57 +#define MODEL_g20 0x56 +#define MODEL_g32 0x55 +#define MODEL_o87 0x54 +#define MODEL_g31 0x53 +#define MODEL_o88 0x52 +#define MODEL_g30 0x51 +#define MODEL_o86 0x50 +#define MODEL_g29 0x4F +#define MODEL_o92 0x4E +#define MODEL_g28 0x4D +#define MODEL_o91 0x4C +#define MODEL_g27 0x4B +#define MODEL_o89 0x4A +#define MODEL_g26 0x49 +#define MODEL_o85 0x48 +#define MODEL_g25 0x47 +#define MODEL_o83 0x46 +#define MODEL_g24 0x45 +#define MODEL_o81 0x44 +#define MODEL_g23 0x43 +#define MODEL_o82 0x42 +#define MODEL_g15 0x41 +#define MODEL_o69 0x40 +#define MODEL_o68 0x3F +#define MODEL_g19 0x3E +#define MODEL_o79 0x3D +#define MODEL_o78 0x3C +#define MODEL_o77 0x3B +#define MODEL_o76 0x3A +#define MODEL_o75 0x39 +#define MODEL_o74 0x38 +#define MODEL_g13 0x37 +#define MODEL_g22 0x36 +#define MODEL_o105 0x35 +#define MODEL_o104 0x34 +#define MODEL_o103 0x33 +#define MODEL_o102 0x32 +#define MODEL_o101 0x31 +#define MODEL_o100 0x30 +#define MODEL_g21 0x2F +#define MODEL_o98 0x2E +#define MODEL_o97 0x2D +#define MODEL_o96 0x2C +#define MODEL_o95 0x2B +#define MODEL_o94 0x2A +#define MODEL_o99 0x29 +#define MODEL_g14 0x28 +#define MODEL_o67 0x27 +#define MODEL_o66 0x26 +#define MODEL_o65 0x25 +#define MODEL_o64 0x24 +#define MODEL_o63 0x23 +#define MODEL_o34 0x22 +#define MODEL_g5 0x21 +#define MODEL_o19 0x20 +#define MODEL_o18 0x1F +#define MODEL_o17 0x1E +#define MODEL_o16 0x1D +#define MODEL_o10 0x1C +#define MODEL_o9 0x1B +#define MODEL_g16 0x1A +#define MODEL_g18 0x19 +#define MODEL_o73 0x18 +#define MODEL_o72 0x17 +#define MODEL_g17 0x16 +#define MODEL_o108 0x15 +#define MODEL_o106 0x14 +#define MODEL_g6 0x13 +#define MODEL_g11 0x12 +#define MODEL_o59 0x11 +#define MODEL_o55 0x10 +#define MODEL_o45 0xF +#define MODEL_o44 0xE +#define MODEL_o43 0xD +#define MODEL_g10 0xC +#define MODEL_o58 0xB +#define MODEL_o53 0xA +#define MODEL_o30 0x9 +#define MODEL_o27 0x8 +#define MODEL_o32 0x7 +#define MODEL_o23 0x6 +#define MODEL_o57 0x5 +#define MODEL_o35 0x4 +#define MODEL_g2 0x3 +#define MODEL_o3 0x2 +#define MODEL_o2 0x1 +#define MODEL_o6 0x0 + diff --git a/include/mapfs/jan_05_hit.h b/include/mapfs/jan_05_hit.h index f706fd7efc..7b52caf47c 100644 --- a/include/mapfs/jan_05_hit.h +++ b/include/mapfs/jan_05_hit.h @@ -1,91 +1,99 @@ -#define COLLIDER_Root 0x5A -#define COLLIDER_g1 0x59 -#define COLLIDER_g42 0x58 -#define COLLIDER_o194 0x57 -#define COLLIDER_o193 0x56 -#define COLLIDER_o192 0x55 -#define COLLIDER_o191 0x54 -#define COLLIDER_o190 0x53 -#define COLLIDER_o189 0x52 -#define COLLIDER_g25 0x51 -#define COLLIDER_o1 0x50 -#define COLLIDER_g30 0x4F -#define COLLIDER_o21 0x4E -#define COLLIDER_o92 0x4D -#define COLLIDER_o94 0x4C -#define COLLIDER_g44 0x4B -#define COLLIDER_o225 0x4A -#define COLLIDER_o224 0x49 -#define COLLIDER_o223 0x48 -#define COLLIDER_o222 0x47 -#define COLLIDER_o221 0x46 -#define COLLIDER_o220 0x45 -#define COLLIDER_o219 0x44 -#define COLLIDER_o218 0x43 -#define COLLIDER_o217 0x42 -#define COLLIDER_o216 0x41 -#define COLLIDER_o215 0x40 -#define COLLIDER_o214 0x3F -#define COLLIDER_o213 0x3E -#define COLLIDER_o64 0x3D -#define COLLIDER_o135 0x3C -#define COLLIDER_g35 0x3B -#define COLLIDER_o188 0x3A -#define COLLIDER_o187 0x39 -#define COLLIDER_o170 0x38 -#define COLLIDER_o169 0x37 -#define COLLIDER_o167 0x36 -#define COLLIDER_o166 0x35 -#define COLLIDER_o164 0x34 -#define COLLIDER_o162 0x33 -#define COLLIDER_g28 0x32 -#define COLLIDER_o118 0x31 -#define COLLIDER_o114 0x30 -#define COLLIDER_g21 0x2F -#define COLLIDER_o87 0x2E -#define COLLIDER_g33 0x2D -#define COLLIDER_o77 0x2C -#define COLLIDER_o157 0x2B -#define COLLIDER_o75 0x2A -#define COLLIDER_o155 0x29 -#define COLLIDER_g29 0x28 -#define COLLIDER_o229 0x27 -#define COLLIDER_o160 0x26 -#define COLLIDER_o120 0x25 -#define COLLIDER_g6 0x24 -#define COLLIDER_g41 0x23 -#define COLLIDER_o183 0x22 -#define COLLIDER_o182 0x21 -#define COLLIDER_o181 0x20 -#define COLLIDER_g40 0x1F -#define COLLIDER_o185 0x1E -#define COLLIDER_o184 0x1D -#define COLLIDER_o76 0x1C -#define COLLIDER_g39 0x1B -#define COLLIDER_o180 0x1A -#define COLLIDER_o179 0x19 -#define COLLIDER_o178 0x18 -#define COLLIDER_o23 0x17 -#define COLLIDER_g20 0x16 -#define COLLIDER_o81 0x15 -#define COLLIDER_o65 0x14 -#define COLLIDER_o63 0x13 -#define COLLIDER_o66 0x12 -#define COLLIDER_g2 0x11 -#define COLLIDER_g18 0x10 -#define COLLIDER_o73 0xF -#define COLLIDER_deilitse 0xE -#define COLLIDER_deilise 0xD -#define COLLIDER_g17 0xC -#define COLLIDER_o71 0xB -#define COLLIDER_deilite 0xA -#define COLLIDER_deilie 0x9 -#define COLLIDER_g16 0x8 -#define COLLIDER_o69 0x7 -#define COLLIDER_deilitn 0x6 -#define COLLIDER_deilin 0x5 -#define COLLIDER_g15 0x4 -#define COLLIDER_o227 0x3 -#define COLLIDER_o67 0x2 -#define COLLIDER_deilitw 0x1 -#define COLLIDER_deiliw 0x0 +#define COLLIDER_Root 0x5A +#define COLLIDER_g1 0x59 +#define COLLIDER_g42 0x58 +#define COLLIDER_o194 0x57 +#define COLLIDER_o193 0x56 +#define COLLIDER_o192 0x55 +#define COLLIDER_o191 0x54 +#define COLLIDER_o190 0x53 +#define COLLIDER_o189 0x52 +#define COLLIDER_g25 0x51 +#define COLLIDER_o1 0x50 +#define COLLIDER_g30 0x4F +#define COLLIDER_o21 0x4E +#define COLLIDER_o92 0x4D +#define COLLIDER_o94 0x4C +#define COLLIDER_g44 0x4B +#define COLLIDER_o225 0x4A +#define COLLIDER_o224 0x49 +#define COLLIDER_o223 0x48 +#define COLLIDER_o222 0x47 +#define COLLIDER_o221 0x46 +#define COLLIDER_o220 0x45 +#define COLLIDER_o219 0x44 +#define COLLIDER_o218 0x43 +#define COLLIDER_o217 0x42 +#define COLLIDER_o216 0x41 +#define COLLIDER_o215 0x40 +#define COLLIDER_o214 0x3F +#define COLLIDER_o213 0x3E +#define COLLIDER_o64 0x3D +#define COLLIDER_o135 0x3C +#define COLLIDER_g35 0x3B +#define COLLIDER_o188 0x3A +#define COLLIDER_o187 0x39 +#define COLLIDER_o170 0x38 +#define COLLIDER_o169 0x37 +#define COLLIDER_o167 0x36 +#define COLLIDER_o166 0x35 +#define COLLIDER_o164 0x34 +#define COLLIDER_o162 0x33 +#define COLLIDER_g28 0x32 +#define COLLIDER_o118 0x31 +#define COLLIDER_o114 0x30 +#define COLLIDER_g21 0x2F +#define COLLIDER_o87 0x2E +#define COLLIDER_g33 0x2D +#define COLLIDER_o77 0x2C +#define COLLIDER_o157 0x2B +#define COLLIDER_o75 0x2A +#define COLLIDER_o155 0x29 +#define COLLIDER_g29 0x28 +#define COLLIDER_o229 0x27 +#define COLLIDER_o160 0x26 +#define COLLIDER_o120 0x25 +#define COLLIDER_g6 0x24 +#define COLLIDER_g41 0x23 +#define COLLIDER_o183 0x22 +#define COLLIDER_o182 0x21 +#define COLLIDER_o181 0x20 +#define COLLIDER_g40 0x1F +#define COLLIDER_o185 0x1E +#define COLLIDER_o184 0x1D +#define COLLIDER_o76 0x1C +#define COLLIDER_g39 0x1B +#define COLLIDER_o180 0x1A +#define COLLIDER_o179 0x19 +#define COLLIDER_o178 0x18 +#define COLLIDER_o23 0x17 +#define COLLIDER_g20 0x16 +#define COLLIDER_o81 0x15 +#define COLLIDER_o65 0x14 +#define COLLIDER_o63 0x13 +#define COLLIDER_o66 0x12 +#define COLLIDER_g2 0x11 +#define COLLIDER_g18 0x10 +#define COLLIDER_o73 0xF +#define COLLIDER_deilitse 0xE +#define COLLIDER_deilise 0xD +#define COLLIDER_g17 0xC +#define COLLIDER_o71 0xB +#define COLLIDER_deilite 0xA +#define COLLIDER_deilie 0x9 +#define COLLIDER_g16 0x8 +#define COLLIDER_o69 0x7 +#define COLLIDER_deilitn 0x6 +#define COLLIDER_deilin 0x5 +#define COLLIDER_g15 0x4 +#define COLLIDER_o227 0x3 +#define COLLIDER_o67 0x2 +#define COLLIDER_deilitw 0x1 +#define COLLIDER_deiliw 0x0 + +#define ZONE_Root 0x5 +#define ZONE_g1 0x4 +#define ZONE_o52 0x3 +#define ZONE_o51 0x2 +#define ZONE_o50 0x1 +#define ZONE_o59 0x0 + diff --git a/include/mapfs/jan_05_shape.h b/include/mapfs/jan_05_shape.h index 4d30f12ee8..4e76dd565f 100644 --- a/include/mapfs/jan_05_shape.h +++ b/include/mapfs/jan_05_shape.h @@ -1,121 +1,122 @@ -#define MODEL_Root 0x78 -#define MODEL_g1 0x77 -#define MODEL_g25 0x76 -#define MODEL_o101 0x75 -#define MODEL_o100 0x74 -#define MODEL_g30 0x73 -#define MODEL_g32 0x72 -#define MODEL_o148 0x71 -#define MODEL_o145 0x70 -#define MODEL_g31 0x6F -#define MODEL_o147 0x6E -#define MODEL_o144 0x6D -#define MODEL_o143 0x6C -#define MODEL_g26 0x6B -#define MODEL_g35 0x6A -#define MODEL_o63 0x69 -#define MODEL_g34 0x68 -#define MODEL_o65 0x67 -#define MODEL_g33 0x66 -#define MODEL_o64 0x65 -#define MODEL_o105 0x64 -#define MODEL_o125 0x63 -#define MODEL_o124 0x62 -#define MODEL_o111 0x61 -#define MODEL_o103 0x60 -#define MODEL_g51 0x5F -#define MODEL_o106 0x5E -#define MODEL_g50 0x5D -#define MODEL_o126 0x5C -#define MODEL_g49 0x5B -#define MODEL_o102 0x5A -#define MODEL_g48 0x59 -#define MODEL_o138 0x58 -#define MODEL_g47 0x57 -#define MODEL_o139 0x56 -#define MODEL_g46 0x55 -#define MODEL_o133 0x54 -#define MODEL_g45 0x53 -#define MODEL_o132 0x52 -#define MODEL_g44 0x51 -#define MODEL_o131 0x50 -#define MODEL_g43 0x4F -#define MODEL_o137 0x4E -#define MODEL_g42 0x4D -#define MODEL_o134 0x4C -#define MODEL_g41 0x4B -#define MODEL_o142 0x4A -#define MODEL_g40 0x49 -#define MODEL_o140 0x48 -#define MODEL_g39 0x47 -#define MODEL_o141 0x46 -#define MODEL_g27 0x45 -#define MODEL_o130 0x44 -#define MODEL_o129 0x43 -#define MODEL_o113 0x42 -#define MODEL_o112 0x41 -#define MODEL_g28 0x40 -#define MODEL_o119 0x3F -#define MODEL_o118 0x3E -#define MODEL_o117 0x3D -#define MODEL_o116 0x3C -#define MODEL_o114 0x3B -#define MODEL_g21 0x3A -#define MODEL_g24 0x39 -#define MODEL_o99 0x38 -#define MODEL_o98 0x37 -#define MODEL_o97 0x36 -#define MODEL_o96 0x35 -#define MODEL_o95 0x34 -#define MODEL_o94 0x33 -#define MODEL_g23 0x32 -#define MODEL_o93 0x31 -#define MODEL_o92 0x30 -#define MODEL_o91 0x2F -#define MODEL_o90 0x2E -#define MODEL_o89 0x2D -#define MODEL_o88 0x2C -#define MODEL_g22 0x2B -#define MODEL_o87 0x2A -#define MODEL_o86 0x29 -#define MODEL_o85 0x28 -#define MODEL_o84 0x27 -#define MODEL_o83 0x26 -#define MODEL_o34 0x25 -#define MODEL_g5 0x24 -#define MODEL_o19 0x23 -#define MODEL_o18 0x22 -#define MODEL_o17 0x21 -#define MODEL_o16 0x20 -#define MODEL_g29 0x1F -#define MODEL_o121 0x1E -#define MODEL_o120 0x1D -#define MODEL_g6 0x1C -#define MODEL_g20 0x1B -#define MODEL_o81 0x1A -#define MODEL_o73 0x19 -#define MODEL_o71 0x18 -#define MODEL_o69 0x17 -#define MODEL_g19 0x16 -#define MODEL_o75 0x15 -#define MODEL_o72 0x14 -#define MODEL_o70 0x13 -#define MODEL_o68 0x12 -#define MODEL_o23 0x11 -#define MODEL_o77 0x10 -#define MODEL_o76 0xF -#define MODEL_g2 0xE -#define MODEL_o67 0xD -#define MODEL_g18 0xC -#define MODEL_o57 0xB -#define MODEL_o56 0xA -#define MODEL_g17 0x9 -#define MODEL_o44 0x8 -#define MODEL_o43 0x7 -#define MODEL_g16 0x6 -#define MODEL_o48 0x5 -#define MODEL_o47 0x4 -#define MODEL_g15 0x3 -#define MODEL_o80 0x2 -#define MODEL_o79 0x1 -#define MODEL_o78 0x0 +#define MODEL_Root 0x78 +#define MODEL_g1 0x77 +#define MODEL_g25 0x76 +#define MODEL_o101 0x75 +#define MODEL_o100 0x74 +#define MODEL_g30 0x73 +#define MODEL_g32 0x72 +#define MODEL_o148 0x71 +#define MODEL_o145 0x70 +#define MODEL_g31 0x6F +#define MODEL_o147 0x6E +#define MODEL_o144 0x6D +#define MODEL_o143 0x6C +#define MODEL_g26 0x6B +#define MODEL_g35 0x6A +#define MODEL_o63 0x69 +#define MODEL_g34 0x68 +#define MODEL_o65 0x67 +#define MODEL_g33 0x66 +#define MODEL_o64 0x65 +#define MODEL_o105 0x64 +#define MODEL_o125 0x63 +#define MODEL_o124 0x62 +#define MODEL_o111 0x61 +#define MODEL_o103 0x60 +#define MODEL_g51 0x5F +#define MODEL_o106 0x5E +#define MODEL_g50 0x5D +#define MODEL_o126 0x5C +#define MODEL_g49 0x5B +#define MODEL_o102 0x5A +#define MODEL_g48 0x59 +#define MODEL_o138 0x58 +#define MODEL_g47 0x57 +#define MODEL_o139 0x56 +#define MODEL_g46 0x55 +#define MODEL_o133 0x54 +#define MODEL_g45 0x53 +#define MODEL_o132 0x52 +#define MODEL_g44 0x51 +#define MODEL_o131 0x50 +#define MODEL_g43 0x4F +#define MODEL_o137 0x4E +#define MODEL_g42 0x4D +#define MODEL_o134 0x4C +#define MODEL_g41 0x4B +#define MODEL_o142 0x4A +#define MODEL_g40 0x49 +#define MODEL_o140 0x48 +#define MODEL_g39 0x47 +#define MODEL_o141 0x46 +#define MODEL_g27 0x45 +#define MODEL_o130 0x44 +#define MODEL_o129 0x43 +#define MODEL_o113 0x42 +#define MODEL_o112 0x41 +#define MODEL_g28 0x40 +#define MODEL_o119 0x3F +#define MODEL_o118 0x3E +#define MODEL_o117 0x3D +#define MODEL_o116 0x3C +#define MODEL_o114 0x3B +#define MODEL_g21 0x3A +#define MODEL_g24 0x39 +#define MODEL_o99 0x38 +#define MODEL_o98 0x37 +#define MODEL_o97 0x36 +#define MODEL_o96 0x35 +#define MODEL_o95 0x34 +#define MODEL_o94 0x33 +#define MODEL_g23 0x32 +#define MODEL_o93 0x31 +#define MODEL_o92 0x30 +#define MODEL_o91 0x2F +#define MODEL_o90 0x2E +#define MODEL_o89 0x2D +#define MODEL_o88 0x2C +#define MODEL_g22 0x2B +#define MODEL_o87 0x2A +#define MODEL_o86 0x29 +#define MODEL_o85 0x28 +#define MODEL_o84 0x27 +#define MODEL_o83 0x26 +#define MODEL_o34 0x25 +#define MODEL_g5 0x24 +#define MODEL_o19 0x23 +#define MODEL_o18 0x22 +#define MODEL_o17 0x21 +#define MODEL_o16 0x20 +#define MODEL_g29 0x1F +#define MODEL_o121 0x1E +#define MODEL_o120 0x1D +#define MODEL_g6 0x1C +#define MODEL_g20 0x1B +#define MODEL_o81 0x1A +#define MODEL_o73 0x19 +#define MODEL_o71 0x18 +#define MODEL_o69 0x17 +#define MODEL_g19 0x16 +#define MODEL_o75 0x15 +#define MODEL_o72 0x14 +#define MODEL_o70 0x13 +#define MODEL_o68 0x12 +#define MODEL_o23 0x11 +#define MODEL_o77 0x10 +#define MODEL_o76 0xF +#define MODEL_g2 0xE +#define MODEL_o67 0xD +#define MODEL_g18 0xC +#define MODEL_o57 0xB +#define MODEL_o56 0xA +#define MODEL_g17 0x9 +#define MODEL_o44 0x8 +#define MODEL_o43 0x7 +#define MODEL_g16 0x6 +#define MODEL_o48 0x5 +#define MODEL_o47 0x4 +#define MODEL_g15 0x3 +#define MODEL_o80 0x2 +#define MODEL_o79 0x1 +#define MODEL_o78 0x0 + diff --git a/include/mapfs/jan_06_hit.h b/include/mapfs/jan_06_hit.h index 72bed7e900..a4e9c0a4d6 100644 --- a/include/mapfs/jan_06_hit.h +++ b/include/mapfs/jan_06_hit.h @@ -1,115 +1,124 @@ -#define COLLIDER_Root 0x72 -#define COLLIDER_g1 0x71 -#define COLLIDER_g47 0x70 -#define COLLIDER_o216 0x6F -#define COLLIDER_o215 0x6E -#define COLLIDER_o214 0x6D -#define COLLIDER_o212 0x6C -#define COLLIDER_o211 0x6B -#define COLLIDER_o210 0x6A -#define COLLIDER_o209 0x69 -#define COLLIDER_g14 0x68 -#define COLLIDER_o259 0x67 -#define COLLIDER_o258 0x66 -#define COLLIDER_o257 0x65 -#define COLLIDER_o1 0x64 -#define COLLIDER_g46 0x63 -#define COLLIDER_o271 0x62 -#define COLLIDER_o200 0x61 -#define COLLIDER_o198 0x60 -#define COLLIDER_o207 0x5F -#define COLLIDER_o206 0x5E -#define COLLIDER_g37 0x5D -#define COLLIDER_o169 0x5C -#define COLLIDER_o168 0x5B -#define COLLIDER_o167 0x5A -#define COLLIDER_g36 0x59 -#define COLLIDER_o247 0x58 -#define COLLIDER_o180 0x57 -#define COLLIDER_o166 0x56 -#define COLLIDER_g35 0x55 -#define COLLIDER_g49 0x54 -#define COLLIDER_o245 0x53 -#define COLLIDER_o244 0x52 -#define COLLIDER_o243 0x51 -#define COLLIDER_o242 0x50 -#define COLLIDER_o241 0x4F -#define COLLIDER_o240 0x4E -#define COLLIDER_o239 0x4D -#define COLLIDER_o238 0x4C -#define COLLIDER_o237 0x4B -#define COLLIDER_o236 0x4A -#define COLLIDER_o235 0x49 -#define COLLIDER_o234 0x48 -#define COLLIDER_o233 0x47 -#define COLLIDER_o232 0x46 -#define COLLIDER_g50 0x45 -#define COLLIDER_o185 0x44 -#define COLLIDER_o183 0x43 -#define COLLIDER_o246 0x42 -#define COLLIDER_o163 0x41 -#define COLLIDER_o161 0x40 -#define COLLIDER_o160 0x3F -#define COLLIDER_g26 0x3E -#define COLLIDER_o120 0x3D -#define COLLIDER_o115 0x3C -#define COLLIDER_g34 0x3B -#define COLLIDER_o74 0x3A -#define COLLIDER_o157 0x39 -#define COLLIDER_o71 0x38 -#define COLLIDER_o154 0x37 -#define COLLIDER_o69 0x36 -#define COLLIDER_o152 0x35 -#define COLLIDER_g18 0x34 -#define COLLIDER_o151 0x33 -#define COLLIDER_o90 0x32 -#define COLLIDER_o87 0x31 -#define COLLIDER_o149 0x30 -#define COLLIDER_g15 0x2F -#define COLLIDER_g40 0x2E -#define COLLIDER_o253 0x2D -#define COLLIDER_o252 0x2C -#define COLLIDER_o251 0x2B -#define COLLIDER_o250 0x2A -#define COLLIDER_o249 0x29 -#define COLLIDER_o248 0x28 -#define COLLIDER_o179 0x27 -#define COLLIDER_o175 0x26 -#define COLLIDER_g38 0x25 -#define COLLIDER_o174 0x24 -#define COLLIDER_o173 0x23 -#define COLLIDER_o172 0x22 -#define COLLIDER_o171 0x21 -#define COLLIDER_o170 0x20 -#define COLLIDER_o75 0x1F -#define COLLIDER_g17 0x1E -#define COLLIDER_o84 0x1D -#define COLLIDER_o81 0x1C -#define COLLIDER_o78 0x1B -#define COLLIDER_o30 0x1A -#define COLLIDER_o70 0x19 -#define COLLIDER_o86 0x18 -#define COLLIDER_g39 0x17 -#define COLLIDER_o256 0x16 -#define COLLIDER_o255 0x15 -#define COLLIDER_o254 0x14 -#define COLLIDER_o177 0x13 -#define COLLIDER_o176 0x12 -#define COLLIDER_o20 0x11 -#define COLLIDER_g2 0x10 -#define COLLIDER_g32 0xF -#define COLLIDER_o62 0xE -#define COLLIDER_deilite 0xD -#define COLLIDER_deilie 0xC -#define COLLIDER_g31 0xB -#define COLLIDER_o64 0xA -#define COLLIDER_deilits 0x9 -#define COLLIDER_deilis 0x8 -#define COLLIDER_g30 0x7 -#define COLLIDER_o66 0x6 -#define COLLIDER_deilitn 0x5 -#define COLLIDER_deilin 0x4 -#define COLLIDER_g29 0x3 -#define COLLIDER_o60 0x2 -#define COLLIDER_deilitw 0x1 -#define COLLIDER_deiliw 0x0 +#define COLLIDER_Root 0x72 +#define COLLIDER_g1 0x71 +#define COLLIDER_g47 0x70 +#define COLLIDER_o216 0x6F +#define COLLIDER_o215 0x6E +#define COLLIDER_o214 0x6D +#define COLLIDER_o212 0x6C +#define COLLIDER_o211 0x6B +#define COLLIDER_o210 0x6A +#define COLLIDER_o209 0x69 +#define COLLIDER_g14 0x68 +#define COLLIDER_o259 0x67 +#define COLLIDER_o258 0x66 +#define COLLIDER_o257 0x65 +#define COLLIDER_o1 0x64 +#define COLLIDER_g46 0x63 +#define COLLIDER_o271 0x62 +#define COLLIDER_o200 0x61 +#define COLLIDER_o198 0x60 +#define COLLIDER_o207 0x5F +#define COLLIDER_o206 0x5E +#define COLLIDER_g37 0x5D +#define COLLIDER_o169 0x5C +#define COLLIDER_o168 0x5B +#define COLLIDER_o167 0x5A +#define COLLIDER_g36 0x59 +#define COLLIDER_o247 0x58 +#define COLLIDER_o180 0x57 +#define COLLIDER_o166 0x56 +#define COLLIDER_g35 0x55 +#define COLLIDER_g49 0x54 +#define COLLIDER_o245 0x53 +#define COLLIDER_o244 0x52 +#define COLLIDER_o243 0x51 +#define COLLIDER_o242 0x50 +#define COLLIDER_o241 0x4F +#define COLLIDER_o240 0x4E +#define COLLIDER_o239 0x4D +#define COLLIDER_o238 0x4C +#define COLLIDER_o237 0x4B +#define COLLIDER_o236 0x4A +#define COLLIDER_o235 0x49 +#define COLLIDER_o234 0x48 +#define COLLIDER_o233 0x47 +#define COLLIDER_o232 0x46 +#define COLLIDER_g50 0x45 +#define COLLIDER_o185 0x44 +#define COLLIDER_o183 0x43 +#define COLLIDER_o246 0x42 +#define COLLIDER_o163 0x41 +#define COLLIDER_o161 0x40 +#define COLLIDER_o160 0x3F +#define COLLIDER_g26 0x3E +#define COLLIDER_o120 0x3D +#define COLLIDER_o115 0x3C +#define COLLIDER_g34 0x3B +#define COLLIDER_o74 0x3A +#define COLLIDER_o157 0x39 +#define COLLIDER_o71 0x38 +#define COLLIDER_o154 0x37 +#define COLLIDER_o69 0x36 +#define COLLIDER_o152 0x35 +#define COLLIDER_g18 0x34 +#define COLLIDER_o151 0x33 +#define COLLIDER_o90 0x32 +#define COLLIDER_o87 0x31 +#define COLLIDER_o149 0x30 +#define COLLIDER_g15 0x2F +#define COLLIDER_g40 0x2E +#define COLLIDER_o253 0x2D +#define COLLIDER_o252 0x2C +#define COLLIDER_o251 0x2B +#define COLLIDER_o250 0x2A +#define COLLIDER_o249 0x29 +#define COLLIDER_o248 0x28 +#define COLLIDER_o179 0x27 +#define COLLIDER_o175 0x26 +#define COLLIDER_g38 0x25 +#define COLLIDER_o174 0x24 +#define COLLIDER_o173 0x23 +#define COLLIDER_o172 0x22 +#define COLLIDER_o171 0x21 +#define COLLIDER_o170 0x20 +#define COLLIDER_o75 0x1F +#define COLLIDER_g17 0x1E +#define COLLIDER_o84 0x1D +#define COLLIDER_o81 0x1C +#define COLLIDER_o78 0x1B +#define COLLIDER_o30 0x1A +#define COLLIDER_o70 0x19 +#define COLLIDER_o86 0x18 +#define COLLIDER_g39 0x17 +#define COLLIDER_o256 0x16 +#define COLLIDER_o255 0x15 +#define COLLIDER_o254 0x14 +#define COLLIDER_o177 0x13 +#define COLLIDER_o176 0x12 +#define COLLIDER_o20 0x11 +#define COLLIDER_g2 0x10 +#define COLLIDER_g32 0xF +#define COLLIDER_o62 0xE +#define COLLIDER_deilite 0xD +#define COLLIDER_deilie 0xC +#define COLLIDER_g31 0xB +#define COLLIDER_o64 0xA +#define COLLIDER_deilits 0x9 +#define COLLIDER_deilis 0x8 +#define COLLIDER_g30 0x7 +#define COLLIDER_o66 0x6 +#define COLLIDER_deilitn 0x5 +#define COLLIDER_deilin 0x4 +#define COLLIDER_g29 0x3 +#define COLLIDER_o60 0x2 +#define COLLIDER_deilitw 0x1 +#define COLLIDER_deiliw 0x0 + +#define ZONE_Root 0x6 +#define ZONE_g1 0x5 +#define ZONE_o59 0x4 +#define ZONE_o57 0x3 +#define ZONE_o52 0x2 +#define ZONE_o51 0x1 +#define ZONE_o50 0x0 + diff --git a/include/mapfs/jan_06_shape.h b/include/mapfs/jan_06_shape.h index 9897cc33de..bbe9873d54 100644 --- a/include/mapfs/jan_06_shape.h +++ b/include/mapfs/jan_06_shape.h @@ -1,146 +1,147 @@ -#define MODEL_Root 0x91 -#define MODEL_g1 0x90 -#define MODEL_g57 0x8F -#define MODEL_o50 0x8E -#define MODEL_o86 0x8D -#define MODEL_o73 0x8C -#define MODEL_o74 0x8B -#define MODEL_g14 0x8A -#define MODEL_o61 0x89 -#define MODEL_o60 0x88 -#define MODEL_g19 0x87 -#define MODEL_g21 0x86 -#define MODEL_o96 0x85 -#define MODEL_o94 0x84 -#define MODEL_g20 0x83 -#define MODEL_o95 0x82 -#define MODEL_o92 0x81 -#define MODEL_o91 0x80 -#define MODEL_g40 0x7F -#define MODEL_g41 0x7E -#define MODEL_o158 0x7D -#define MODEL_o157 0x7C -#define MODEL_o156 0x7B -#define MODEL_o155 0x7A -#define MODEL_o154 0x79 -#define MODEL_o153 0x78 -#define MODEL_o159 0x77 -#define MODEL_o152 0x76 -#define MODEL_g33 0x75 -#define MODEL_o150 0x74 -#define MODEL_o149 0x73 -#define MODEL_o141 0x72 -#define MODEL_o140 0x71 -#define MODEL_g11 0x70 -#define MODEL_o162 0x6F -#define MODEL_o151 0x6E -#define MODEL_o57 0x6D -#define MODEL_o56 0x6C -#define MODEL_o55 0x6B -#define MODEL_o148 0x6A -#define MODEL_o147 0x69 -#define MODEL_o146 0x68 -#define MODEL_o58 0x67 -#define MODEL_g28 0x66 -#define MODEL_g56 0x65 -#define MODEL_o139 0x64 -#define MODEL_g55 0x63 -#define MODEL_o131 0x62 -#define MODEL_g54 0x61 -#define MODEL_o137 0x60 -#define MODEL_g53 0x5F -#define MODEL_o124 0x5E -#define MODEL_g52 0x5D -#define MODEL_o123 0x5C -#define MODEL_g51 0x5B -#define MODEL_o126 0x5A -#define MODEL_g50 0x59 -#define MODEL_o125 0x58 -#define MODEL_g49 0x57 -#define MODEL_o132 0x56 -#define MODEL_g48 0x55 -#define MODEL_o129 0x54 -#define MODEL_g47 0x53 -#define MODEL_o128 0x52 -#define MODEL_g46 0x51 -#define MODEL_o127 0x50 -#define MODEL_g45 0x4F -#define MODEL_o130 0x4E -#define MODEL_g44 0x4D -#define MODEL_o135 0x4C -#define MODEL_g43 0x4B -#define MODEL_o136 0x4A -#define MODEL_o138 0x49 -#define MODEL_g38 0x48 -#define MODEL_o121 0x47 -#define MODEL_o122 0x46 -#define MODEL_o133 0x45 -#define MODEL_o134 0x44 -#define MODEL_g26 0x43 -#define MODEL_o120 0x42 -#define MODEL_o119 0x41 -#define MODEL_o118 0x40 -#define MODEL_o117 0x3F -#define MODEL_o116 0x3E -#define MODEL_o115 0x3D -#define MODEL_g34 0x3C -#define MODEL_g36 0x3B -#define MODEL_o108 0x3A -#define MODEL_o104 0x39 -#define MODEL_o105 0x38 -#define MODEL_o106 0x37 -#define MODEL_o144 0x36 -#define MODEL_o107 0x35 -#define MODEL_g35 0x34 -#define MODEL_o102 0x33 -#define MODEL_o98 0x32 -#define MODEL_o99 0x31 -#define MODEL_o100 0x30 -#define MODEL_o142 0x2F -#define MODEL_o101 0x2E -#define MODEL_g22 0x2D -#define MODEL_o103 0x2C -#define MODEL_o97 0x2B -#define MODEL_g5 0x2A -#define MODEL_o52 0x29 -#define MODEL_o51 0x28 -#define MODEL_o17 0x27 -#define MODEL_o16 0x26 -#define MODEL_o10 0x25 -#define MODEL_o9 0x24 -#define MODEL_g18 0x23 -#define MODEL_o90 0x22 -#define MODEL_o89 0x21 -#define MODEL_o88 0x20 -#define MODEL_o87 0x1F -#define MODEL_g15 0x1E -#define MODEL_g42 0x1D -#define MODEL_o161 0x1C -#define MODEL_o160 0x1B -#define MODEL_g17 0x1A -#define MODEL_o84 0x19 -#define MODEL_o81 0x18 -#define MODEL_o78 0x17 -#define MODEL_o69 0x16 -#define MODEL_o70 0x15 -#define MODEL_g16 0x14 -#define MODEL_o83 0x13 -#define MODEL_o82 0x12 -#define MODEL_o79 0x11 -#define MODEL_o71 0x10 -#define MODEL_o72 0xF -#define MODEL_o75 0xE -#define MODEL_g2 0xD -#define MODEL_g32 0xC -#define MODEL_o48 0xB -#define MODEL_o47 0xA -#define MODEL_g31 0x9 -#define MODEL_o46 0x8 -#define MODEL_o45 0x7 -#define MODEL_g30 0x6 -#define MODEL_o44 0x5 -#define MODEL_o43 0x4 -#define MODEL_g29 0x3 -#define MODEL_o3 0x2 -#define MODEL_o2 0x1 -#define MODEL_o6 0x0 +#define MODEL_Root 0x91 +#define MODEL_g1 0x90 +#define MODEL_g57 0x8F +#define MODEL_o50 0x8E +#define MODEL_o86 0x8D +#define MODEL_o73 0x8C +#define MODEL_o74 0x8B +#define MODEL_g14 0x8A +#define MODEL_o61 0x89 +#define MODEL_o60 0x88 +#define MODEL_g19 0x87 +#define MODEL_g21 0x86 +#define MODEL_o96 0x85 +#define MODEL_o94 0x84 +#define MODEL_g20 0x83 +#define MODEL_o95 0x82 +#define MODEL_o92 0x81 +#define MODEL_o91 0x80 +#define MODEL_g40 0x7F +#define MODEL_g41 0x7E +#define MODEL_o158 0x7D +#define MODEL_o157 0x7C +#define MODEL_o156 0x7B +#define MODEL_o155 0x7A +#define MODEL_o154 0x79 +#define MODEL_o153 0x78 +#define MODEL_o159 0x77 +#define MODEL_o152 0x76 +#define MODEL_g33 0x75 +#define MODEL_o150 0x74 +#define MODEL_o149 0x73 +#define MODEL_o141 0x72 +#define MODEL_o140 0x71 +#define MODEL_g11 0x70 +#define MODEL_o162 0x6F +#define MODEL_o151 0x6E +#define MODEL_o57 0x6D +#define MODEL_o56 0x6C +#define MODEL_o55 0x6B +#define MODEL_o148 0x6A +#define MODEL_o147 0x69 +#define MODEL_o146 0x68 +#define MODEL_o58 0x67 +#define MODEL_g28 0x66 +#define MODEL_g56 0x65 +#define MODEL_o139 0x64 +#define MODEL_g55 0x63 +#define MODEL_o131 0x62 +#define MODEL_g54 0x61 +#define MODEL_o137 0x60 +#define MODEL_g53 0x5F +#define MODEL_o124 0x5E +#define MODEL_g52 0x5D +#define MODEL_o123 0x5C +#define MODEL_g51 0x5B +#define MODEL_o126 0x5A +#define MODEL_g50 0x59 +#define MODEL_o125 0x58 +#define MODEL_g49 0x57 +#define MODEL_o132 0x56 +#define MODEL_g48 0x55 +#define MODEL_o129 0x54 +#define MODEL_g47 0x53 +#define MODEL_o128 0x52 +#define MODEL_g46 0x51 +#define MODEL_o127 0x50 +#define MODEL_g45 0x4F +#define MODEL_o130 0x4E +#define MODEL_g44 0x4D +#define MODEL_o135 0x4C +#define MODEL_g43 0x4B +#define MODEL_o136 0x4A +#define MODEL_o138 0x49 +#define MODEL_g38 0x48 +#define MODEL_o121 0x47 +#define MODEL_o122 0x46 +#define MODEL_o133 0x45 +#define MODEL_o134 0x44 +#define MODEL_g26 0x43 +#define MODEL_o120 0x42 +#define MODEL_o119 0x41 +#define MODEL_o118 0x40 +#define MODEL_o117 0x3F +#define MODEL_o116 0x3E +#define MODEL_o115 0x3D +#define MODEL_g34 0x3C +#define MODEL_g36 0x3B +#define MODEL_o108 0x3A +#define MODEL_o104 0x39 +#define MODEL_o105 0x38 +#define MODEL_o106 0x37 +#define MODEL_o144 0x36 +#define MODEL_o107 0x35 +#define MODEL_g35 0x34 +#define MODEL_o102 0x33 +#define MODEL_o98 0x32 +#define MODEL_o99 0x31 +#define MODEL_o100 0x30 +#define MODEL_o142 0x2F +#define MODEL_o101 0x2E +#define MODEL_g22 0x2D +#define MODEL_o103 0x2C +#define MODEL_o97 0x2B +#define MODEL_g5 0x2A +#define MODEL_o52 0x29 +#define MODEL_o51 0x28 +#define MODEL_o17 0x27 +#define MODEL_o16 0x26 +#define MODEL_o10 0x25 +#define MODEL_o9 0x24 +#define MODEL_g18 0x23 +#define MODEL_o90 0x22 +#define MODEL_o89 0x21 +#define MODEL_o88 0x20 +#define MODEL_o87 0x1F +#define MODEL_g15 0x1E +#define MODEL_g42 0x1D +#define MODEL_o161 0x1C +#define MODEL_o160 0x1B +#define MODEL_g17 0x1A +#define MODEL_o84 0x19 +#define MODEL_o81 0x18 +#define MODEL_o78 0x17 +#define MODEL_o69 0x16 +#define MODEL_o70 0x15 +#define MODEL_g16 0x14 +#define MODEL_o83 0x13 +#define MODEL_o82 0x12 +#define MODEL_o79 0x11 +#define MODEL_o71 0x10 +#define MODEL_o72 0xF +#define MODEL_o75 0xE +#define MODEL_g2 0xD +#define MODEL_g32 0xC +#define MODEL_o48 0xB +#define MODEL_o47 0xA +#define MODEL_g31 0x9 +#define MODEL_o46 0x8 +#define MODEL_o45 0x7 +#define MODEL_g30 0x6 +#define MODEL_o44 0x5 +#define MODEL_o43 0x4 +#define MODEL_g29 0x3 +#define MODEL_o3 0x2 +#define MODEL_o2 0x1 +#define MODEL_o6 0x0 + diff --git a/include/mapfs/jan_07_hit.h b/include/mapfs/jan_07_hit.h index cb3895ed16..00350a77e8 100644 --- a/include/mapfs/jan_07_hit.h +++ b/include/mapfs/jan_07_hit.h @@ -1,19 +1,26 @@ -#define COLLIDER_Root 0x12 -#define COLLIDER_g1 0x11 -#define COLLIDER_g16 0x10 -#define COLLIDER_o64 0xF -#define COLLIDER_g14 0xE -#define COLLIDER_o68 0xD -#define COLLIDER_o67 0xC -#define COLLIDER_o66 0xB -#define COLLIDER_o65 0xA -#define COLLIDER_o62 0x9 -#define COLLIDER_o59 0x8 -#define COLLIDER_g3 0x7 -#define COLLIDER_o63 0x6 -#define COLLIDER_o54 0x5 -#define COLLIDER_o3 0x4 -#define COLLIDER_g2 0x3 -#define COLLIDER_o5 0x2 -#define COLLIDER_deilitw 0x1 -#define COLLIDER_deiliw 0x0 +#define COLLIDER_Root 0x12 +#define COLLIDER_g1 0x11 +#define COLLIDER_g16 0x10 +#define COLLIDER_o64 0xF +#define COLLIDER_g14 0xE +#define COLLIDER_o68 0xD +#define COLLIDER_o67 0xC +#define COLLIDER_o66 0xB +#define COLLIDER_o65 0xA +#define COLLIDER_o62 0x9 +#define COLLIDER_o59 0x8 +#define COLLIDER_g3 0x7 +#define COLLIDER_o63 0x6 +#define COLLIDER_o54 0x5 +#define COLLIDER_o3 0x4 +#define COLLIDER_g2 0x3 +#define COLLIDER_o5 0x2 +#define COLLIDER_deilitw 0x1 +#define COLLIDER_deiliw 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g1 0x3 +#define ZONE_o6 0x2 +#define ZONE_o5 0x1 +#define ZONE_o4 0x0 + diff --git a/include/mapfs/jan_07_shape.h b/include/mapfs/jan_07_shape.h index e8f5dcf756..867b9587b2 100644 --- a/include/mapfs/jan_07_shape.h +++ b/include/mapfs/jan_07_shape.h @@ -1,38 +1,39 @@ -#define MODEL_Root 0x25 -#define MODEL_g1 0x24 -#define MODEL_g14 0x23 -#define MODEL_g18 0x22 -#define MODEL_o25 0x21 -#define MODEL_g17 0x20 -#define MODEL_o30 0x1F -#define MODEL_g16 0x1E -#define MODEL_o52 0x1D -#define MODEL_g15 0x1C -#define MODEL_o53 0x1B -#define MODEL_o24 0x1A -#define MODEL_o50 0x19 -#define MODEL_o51 0x18 -#define MODEL_o29 0x17 -#define MODEL_g13 0x16 -#define MODEL_o56 0x15 -#define MODEL_o55 0x14 -#define MODEL_o47 0x13 -#define MODEL_o46 0x12 -#define MODEL_o45 0x11 -#define MODEL_g7 0x10 -#define MODEL_o23 0xF -#define MODEL_o22 0xE -#define MODEL_g8 0xD -#define MODEL_o11 0xC -#define MODEL_o10 0xB -#define MODEL_o9 0xA -#define MODEL_o8 0x9 -#define MODEL_o7 0x8 -#define MODEL_o6 0x7 -#define MODEL_g3 0x6 -#define MODEL_o54 0x5 -#define MODEL_o4 0x4 -#define MODEL_o5 0x3 -#define MODEL_g2 0x2 -#define MODEL_o2 0x1 -#define MODEL_o1 0x0 +#define MODEL_Root 0x25 +#define MODEL_g1 0x24 +#define MODEL_g14 0x23 +#define MODEL_g18 0x22 +#define MODEL_o25 0x21 +#define MODEL_g17 0x20 +#define MODEL_o30 0x1F +#define MODEL_g16 0x1E +#define MODEL_o52 0x1D +#define MODEL_g15 0x1C +#define MODEL_o53 0x1B +#define MODEL_o24 0x1A +#define MODEL_o50 0x19 +#define MODEL_o51 0x18 +#define MODEL_o29 0x17 +#define MODEL_g13 0x16 +#define MODEL_o56 0x15 +#define MODEL_o55 0x14 +#define MODEL_o47 0x13 +#define MODEL_o46 0x12 +#define MODEL_o45 0x11 +#define MODEL_g7 0x10 +#define MODEL_o23 0xF +#define MODEL_o22 0xE +#define MODEL_g8 0xD +#define MODEL_o11 0xC +#define MODEL_o10 0xB +#define MODEL_o9 0xA +#define MODEL_o8 0x9 +#define MODEL_o7 0x8 +#define MODEL_o6 0x7 +#define MODEL_g3 0x6 +#define MODEL_o54 0x5 +#define MODEL_o4 0x4 +#define MODEL_o5 0x3 +#define MODEL_g2 0x2 +#define MODEL_o2 0x1 +#define MODEL_o1 0x0 + diff --git a/include/mapfs/jan_08_hit.h b/include/mapfs/jan_08_hit.h index 81138bd9dd..82e9f4b399 100644 --- a/include/mapfs/jan_08_hit.h +++ b/include/mapfs/jan_08_hit.h @@ -1,94 +1,102 @@ -#define COLLIDER_Root 0x5D -#define COLLIDER_g1 0x5C -#define COLLIDER_g57 0x5B -#define COLLIDER_o207 0x5A -#define COLLIDER_o206 0x59 -#define COLLIDER_o205 0x58 -#define COLLIDER_g40 0x57 -#define COLLIDER_o1 0x56 -#define COLLIDER_g56 0x55 -#define COLLIDER_o70 0x54 -#define COLLIDER_o88 0x53 -#define COLLIDER_o59 0x52 -#define COLLIDER_g55 0x51 -#define COLLIDER_o192 0x50 -#define COLLIDER_o189 0x4F -#define COLLIDER_o188 0x4E -#define COLLIDER_o186 0x4D -#define COLLIDER_g59 0x4C -#define COLLIDER_o204 0x4B -#define COLLIDER_o203 0x4A -#define COLLIDER_o202 0x49 -#define COLLIDER_g58 0x48 -#define COLLIDER_o219 0x47 -#define COLLIDER_o218 0x46 -#define COLLIDER_o217 0x45 -#define COLLIDER_o216 0x44 -#define COLLIDER_o215 0x43 -#define COLLIDER_o214 0x42 -#define COLLIDER_o213 0x41 -#define COLLIDER_o212 0x40 -#define COLLIDER_o211 0x3F -#define COLLIDER_o210 0x3E -#define COLLIDER_o209 0x3D -#define COLLIDER_g43 0x3C -#define COLLIDER_o133 0x3B -#define COLLIDER_o131 0x3A -#define COLLIDER_o187 0x39 -#define COLLIDER_g54 0x38 -#define COLLIDER_o81 0x37 -#define COLLIDER_o184 0x36 -#define COLLIDER_o79 0x35 -#define COLLIDER_o182 0x34 -#define COLLIDER_g37 0x33 -#define COLLIDER_g39 0x32 -#define COLLIDER_o108 0x31 -#define COLLIDER_o179 0x30 -#define COLLIDER_g36 0x2F -#define COLLIDER_o104 0x2E -#define COLLIDER_o181 0x2D -#define COLLIDER_g38 0x2C -#define COLLIDER_o106 0x2B -#define COLLIDER_o177 0x2A -#define COLLIDER_g28 0x29 -#define COLLIDER_g30 0x28 -#define COLLIDER_o93 0x27 -#define COLLIDER_o92 0x26 -#define COLLIDER_o94 0x25 -#define COLLIDER_o98 0x24 -#define COLLIDER_o233 0x23 -#define COLLIDER_o99 0x22 -#define COLLIDER_g50 0x21 -#define COLLIDER_o201 0x20 -#define COLLIDER_o200 0x1F -#define COLLIDER_o199 0x1E -#define COLLIDER_o198 0x1D -#define COLLIDER_o232 0x1C -#define COLLIDER_o84 0x1B -#define COLLIDER_g48 0x1A -#define COLLIDER_o236 0x19 -#define COLLIDER_o235 0x18 -#define COLLIDER_o234 0x17 -#define COLLIDER_o175 0x16 -#define COLLIDER_o174 0x15 -#define COLLIDER_o173 0x14 -#define COLLIDER_g49 0x13 -#define COLLIDER_o230 0x12 -#define COLLIDER_o229 0x11 -#define COLLIDER_o228 0x10 -#define COLLIDER_o227 0xF -#define COLLIDER_o226 0xE -#define COLLIDER_g2 0xD -#define COLLIDER_g34 0xC -#define COLLIDER_o221 0xB -#define COLLIDER_o43 0xA -#define COLLIDER_deilite 0x9 -#define COLLIDER_odeilie 0x8 -#define COLLIDER_g33 0x7 -#define COLLIDER_o47 0x6 -#define COLLIDER_deilitn 0x5 -#define COLLIDER_deilin 0x4 -#define COLLIDER_g32 0x3 -#define COLLIDER_o3 0x2 -#define COLLIDER_deilitsw 0x1 -#define COLLIDER_deilisw 0x0 +#define COLLIDER_Root 0x5D +#define COLLIDER_g1 0x5C +#define COLLIDER_g57 0x5B +#define COLLIDER_o207 0x5A +#define COLLIDER_o206 0x59 +#define COLLIDER_o205 0x58 +#define COLLIDER_g40 0x57 +#define COLLIDER_o1 0x56 +#define COLLIDER_g56 0x55 +#define COLLIDER_o70 0x54 +#define COLLIDER_o88 0x53 +#define COLLIDER_o59 0x52 +#define COLLIDER_g55 0x51 +#define COLLIDER_o192 0x50 +#define COLLIDER_o189 0x4F +#define COLLIDER_o188 0x4E +#define COLLIDER_o186 0x4D +#define COLLIDER_g59 0x4C +#define COLLIDER_o204 0x4B +#define COLLIDER_o203 0x4A +#define COLLIDER_o202 0x49 +#define COLLIDER_g58 0x48 +#define COLLIDER_o219 0x47 +#define COLLIDER_o218 0x46 +#define COLLIDER_o217 0x45 +#define COLLIDER_o216 0x44 +#define COLLIDER_o215 0x43 +#define COLLIDER_o214 0x42 +#define COLLIDER_o213 0x41 +#define COLLIDER_o212 0x40 +#define COLLIDER_o211 0x3F +#define COLLIDER_o210 0x3E +#define COLLIDER_o209 0x3D +#define COLLIDER_g43 0x3C +#define COLLIDER_o133 0x3B +#define COLLIDER_o131 0x3A +#define COLLIDER_o187 0x39 +#define COLLIDER_g54 0x38 +#define COLLIDER_o81 0x37 +#define COLLIDER_o184 0x36 +#define COLLIDER_o79 0x35 +#define COLLIDER_o182 0x34 +#define COLLIDER_g37 0x33 +#define COLLIDER_g39 0x32 +#define COLLIDER_o108 0x31 +#define COLLIDER_o179 0x30 +#define COLLIDER_g36 0x2F +#define COLLIDER_o104 0x2E +#define COLLIDER_o181 0x2D +#define COLLIDER_g38 0x2C +#define COLLIDER_o106 0x2B +#define COLLIDER_o177 0x2A +#define COLLIDER_g28 0x29 +#define COLLIDER_g30 0x28 +#define COLLIDER_o93 0x27 +#define COLLIDER_o92 0x26 +#define COLLIDER_o94 0x25 +#define COLLIDER_o98 0x24 +#define COLLIDER_o233 0x23 +#define COLLIDER_o99 0x22 +#define COLLIDER_g50 0x21 +#define COLLIDER_o201 0x20 +#define COLLIDER_o200 0x1F +#define COLLIDER_o199 0x1E +#define COLLIDER_o198 0x1D +#define COLLIDER_o232 0x1C +#define COLLIDER_o84 0x1B +#define COLLIDER_g48 0x1A +#define COLLIDER_o236 0x19 +#define COLLIDER_o235 0x18 +#define COLLIDER_o234 0x17 +#define COLLIDER_o175 0x16 +#define COLLIDER_o174 0x15 +#define COLLIDER_o173 0x14 +#define COLLIDER_g49 0x13 +#define COLLIDER_o230 0x12 +#define COLLIDER_o229 0x11 +#define COLLIDER_o228 0x10 +#define COLLIDER_o227 0xF +#define COLLIDER_o226 0xE +#define COLLIDER_g2 0xD +#define COLLIDER_g34 0xC +#define COLLIDER_o221 0xB +#define COLLIDER_o43 0xA +#define COLLIDER_deilite 0x9 +#define COLLIDER_odeilie 0x8 +#define COLLIDER_g33 0x7 +#define COLLIDER_o47 0x6 +#define COLLIDER_deilitn 0x5 +#define COLLIDER_deilin 0x4 +#define COLLIDER_g32 0x3 +#define COLLIDER_o3 0x2 +#define COLLIDER_deilitsw 0x1 +#define COLLIDER_deilisw 0x0 + +#define ZONE_Root 0x5 +#define ZONE_g1 0x4 +#define ZONE_o60 0x3 +#define ZONE_o52 0x2 +#define ZONE_o51 0x1 +#define ZONE_o50 0x0 + diff --git a/include/mapfs/jan_08_shape.h b/include/mapfs/jan_08_shape.h index 4e54d60aa1..c5c36242f6 100644 --- a/include/mapfs/jan_08_shape.h +++ b/include/mapfs/jan_08_shape.h @@ -1,117 +1,118 @@ -#define MODEL_Root 0x74 -#define MODEL_g1 0x73 -#define MODEL_g66 0x72 -#define MODEL_o97 0x71 -#define MODEL_o98 0x70 -#define MODEL_o82 0x6F -#define MODEL_o83 0x6E -#define MODEL_g40 0x6D -#define MODEL_o111 0x6C -#define MODEL_o110 0x6B -#define MODEL_g54 0x6A -#define MODEL_g51 0x69 -#define MODEL_o68 0x68 -#define MODEL_g50 0x67 -#define MODEL_o67 0x66 -#define MODEL_g53 0x65 -#define MODEL_o64 0x64 -#define MODEL_g49 0x63 -#define MODEL_o59 0x62 -#define MODEL_g41 0x61 -#define MODEL_g65 0x60 -#define MODEL_o161 0x5F -#define MODEL_g64 0x5E -#define MODEL_o163 0x5D -#define MODEL_g63 0x5C -#define MODEL_o160 0x5B -#define MODEL_g62 0x5A -#define MODEL_o159 0x59 -#define MODEL_g61 0x58 -#define MODEL_o158 0x57 -#define MODEL_g60 0x56 -#define MODEL_o113 0x55 -#define MODEL_g59 0x54 -#define MODEL_o115 0x53 -#define MODEL_g58 0x52 -#define MODEL_o156 0x51 -#define MODEL_g57 0x50 -#define MODEL_o114 0x4F -#define MODEL_g56 0x4E -#define MODEL_o123 0x4D -#define MODEL_g55 0x4C -#define MODEL_o164 0x4B -#define MODEL_o162 0x4A -#define MODEL_o122 0x49 -#define MODEL_o112 0x48 -#define MODEL_g42 0x47 -#define MODEL_o130 0x46 -#define MODEL_o129 0x45 -#define MODEL_o128 0x44 -#define MODEL_o127 0x43 -#define MODEL_g43 0x42 -#define MODEL_o136 0x41 -#define MODEL_o135 0x40 -#define MODEL_o134 0x3F -#define MODEL_o133 0x3E -#define MODEL_o131 0x3D -#define MODEL_g44 0x3C -#define MODEL_g47 0x3B -#define MODEL_o154 0x3A -#define MODEL_o153 0x39 -#define MODEL_o152 0x38 -#define MODEL_o151 0x37 -#define MODEL_o150 0x36 -#define MODEL_o149 0x35 -#define MODEL_g46 0x34 -#define MODEL_o148 0x33 -#define MODEL_o147 0x32 -#define MODEL_o146 0x31 -#define MODEL_o145 0x30 -#define MODEL_o144 0x2F -#define MODEL_o143 0x2E -#define MODEL_g45 0x2D -#define MODEL_o142 0x2C -#define MODEL_o141 0x2B -#define MODEL_o140 0x2A -#define MODEL_o139 0x29 -#define MODEL_o138 0x28 -#define MODEL_o137 0x27 -#define MODEL_g5 0x26 -#define MODEL_o17 0x25 -#define MODEL_o16 0x24 -#define MODEL_o10 0x23 -#define MODEL_o9 0x22 -#define MODEL_g37 0x21 -#define MODEL_g39 0x20 -#define MODEL_o109 0x1F -#define MODEL_o108 0x1E -#define MODEL_g38 0x1D -#define MODEL_o107 0x1C -#define MODEL_o106 0x1B -#define MODEL_g36 0x1A -#define MODEL_o105 0x19 -#define MODEL_o104 0x18 -#define MODEL_g28 0x17 -#define MODEL_g30 0x16 -#define MODEL_o93 0x15 -#define MODEL_o92 0x14 -#define MODEL_o94 0x13 -#define MODEL_o99 0x12 -#define MODEL_g29 0x11 -#define MODEL_o88 0x10 -#define MODEL_o86 0xF -#define MODEL_o87 0xE -#define MODEL_o62 0xD -#define MODEL_o84 0xC -#define MODEL_g2 0xB -#define MODEL_g34 0xA -#define MODEL_o103 0x9 -#define MODEL_o102 0x8 -#define MODEL_o101 0x7 -#define MODEL_g33 0x6 -#define MODEL_o48 0x5 -#define MODEL_o47 0x4 -#define MODEL_g32 0x3 -#define MODEL_o3 0x2 -#define MODEL_o2 0x1 -#define MODEL_o6 0x0 +#define MODEL_Root 0x74 +#define MODEL_g1 0x73 +#define MODEL_g66 0x72 +#define MODEL_o97 0x71 +#define MODEL_o98 0x70 +#define MODEL_o82 0x6F +#define MODEL_o83 0x6E +#define MODEL_g40 0x6D +#define MODEL_o111 0x6C +#define MODEL_o110 0x6B +#define MODEL_g54 0x6A +#define MODEL_g51 0x69 +#define MODEL_o68 0x68 +#define MODEL_g50 0x67 +#define MODEL_o67 0x66 +#define MODEL_g53 0x65 +#define MODEL_o64 0x64 +#define MODEL_g49 0x63 +#define MODEL_o59 0x62 +#define MODEL_g41 0x61 +#define MODEL_g65 0x60 +#define MODEL_o161 0x5F +#define MODEL_g64 0x5E +#define MODEL_o163 0x5D +#define MODEL_g63 0x5C +#define MODEL_o160 0x5B +#define MODEL_g62 0x5A +#define MODEL_o159 0x59 +#define MODEL_g61 0x58 +#define MODEL_o158 0x57 +#define MODEL_g60 0x56 +#define MODEL_o113 0x55 +#define MODEL_g59 0x54 +#define MODEL_o115 0x53 +#define MODEL_g58 0x52 +#define MODEL_o156 0x51 +#define MODEL_g57 0x50 +#define MODEL_o114 0x4F +#define MODEL_g56 0x4E +#define MODEL_o123 0x4D +#define MODEL_g55 0x4C +#define MODEL_o164 0x4B +#define MODEL_o162 0x4A +#define MODEL_o122 0x49 +#define MODEL_o112 0x48 +#define MODEL_g42 0x47 +#define MODEL_o130 0x46 +#define MODEL_o129 0x45 +#define MODEL_o128 0x44 +#define MODEL_o127 0x43 +#define MODEL_g43 0x42 +#define MODEL_o136 0x41 +#define MODEL_o135 0x40 +#define MODEL_o134 0x3F +#define MODEL_o133 0x3E +#define MODEL_o131 0x3D +#define MODEL_g44 0x3C +#define MODEL_g47 0x3B +#define MODEL_o154 0x3A +#define MODEL_o153 0x39 +#define MODEL_o152 0x38 +#define MODEL_o151 0x37 +#define MODEL_o150 0x36 +#define MODEL_o149 0x35 +#define MODEL_g46 0x34 +#define MODEL_o148 0x33 +#define MODEL_o147 0x32 +#define MODEL_o146 0x31 +#define MODEL_o145 0x30 +#define MODEL_o144 0x2F +#define MODEL_o143 0x2E +#define MODEL_g45 0x2D +#define MODEL_o142 0x2C +#define MODEL_o141 0x2B +#define MODEL_o140 0x2A +#define MODEL_o139 0x29 +#define MODEL_o138 0x28 +#define MODEL_o137 0x27 +#define MODEL_g5 0x26 +#define MODEL_o17 0x25 +#define MODEL_o16 0x24 +#define MODEL_o10 0x23 +#define MODEL_o9 0x22 +#define MODEL_g37 0x21 +#define MODEL_g39 0x20 +#define MODEL_o109 0x1F +#define MODEL_o108 0x1E +#define MODEL_g38 0x1D +#define MODEL_o107 0x1C +#define MODEL_o106 0x1B +#define MODEL_g36 0x1A +#define MODEL_o105 0x19 +#define MODEL_o104 0x18 +#define MODEL_g28 0x17 +#define MODEL_g30 0x16 +#define MODEL_o93 0x15 +#define MODEL_o92 0x14 +#define MODEL_o94 0x13 +#define MODEL_o99 0x12 +#define MODEL_g29 0x11 +#define MODEL_o88 0x10 +#define MODEL_o86 0xF +#define MODEL_o87 0xE +#define MODEL_o62 0xD +#define MODEL_o84 0xC +#define MODEL_g2 0xB +#define MODEL_g34 0xA +#define MODEL_o103 0x9 +#define MODEL_o102 0x8 +#define MODEL_o101 0x7 +#define MODEL_g33 0x6 +#define MODEL_o48 0x5 +#define MODEL_o47 0x4 +#define MODEL_g32 0x3 +#define MODEL_o3 0x2 +#define MODEL_o2 0x1 +#define MODEL_o6 0x0 + diff --git a/include/mapfs/jan_09_hit.h b/include/mapfs/jan_09_hit.h index 5360f2e4b5..7bbed15e88 100644 --- a/include/mapfs/jan_09_hit.h +++ b/include/mapfs/jan_09_hit.h @@ -1,82 +1,90 @@ -#define COLLIDER_Root 0x51 -#define COLLIDER_g1 0x50 -#define COLLIDER_g68 0x4F -#define COLLIDER_o223 0x4E -#define COLLIDER_o222 0x4D -#define COLLIDER_o221 0x4C -#define COLLIDER_g51 0x4B -#define COLLIDER_o1 0x4A -#define COLLIDER_g64 0x49 -#define COLLIDER_o88 0x48 -#define COLLIDER_o82 0x47 -#define COLLIDER_o84 0x46 -#define COLLIDER_o78 0x45 -#define COLLIDER_g62 0x44 -#define COLLIDER_o202 0x43 -#define COLLIDER_o257 0x42 -#define COLLIDER_o198 0x41 -#define COLLIDER_o196 0x40 -#define COLLIDER_o195 0x3F -#define COLLIDER_o194 0x3E -#define COLLIDER_o192 0x3D -#define COLLIDER_o187 0x3C -#define COLLIDER_g73 0x3B -#define COLLIDER_o220 0x3A -#define COLLIDER_o219 0x39 -#define COLLIDER_o218 0x38 -#define COLLIDER_g72 0x37 -#define COLLIDER_o244 0x36 -#define COLLIDER_o243 0x35 -#define COLLIDER_o242 0x34 -#define COLLIDER_o241 0x33 -#define COLLIDER_o240 0x32 -#define COLLIDER_o239 0x31 -#define COLLIDER_o238 0x30 -#define COLLIDER_o237 0x2F -#define COLLIDER_o236 0x2E -#define COLLIDER_o235 0x2D -#define COLLIDER_o234 0x2C -#define COLLIDER_o233 0x2B -#define COLLIDER_o232 0x2A -#define COLLIDER_o231 0x29 -#define COLLIDER_o230 0x28 -#define COLLIDER_o229 0x27 -#define COLLIDER_o228 0x26 -#define COLLIDER_g3 0x25 -#define COLLIDER_o124 0x24 -#define COLLIDER_o208 0x23 -#define COLLIDER_g61 0x22 -#define COLLIDER_o99 0x21 -#define COLLIDER_o185 0x20 -#define COLLIDER_o97 0x1F -#define COLLIDER_o183 0x1E -#define COLLIDER_g6 0x1D -#define COLLIDER_g40 0x1C -#define COLLIDER_o71 0x1B -#define COLLIDER_o72 0x1A -#define COLLIDER_o73 0x19 -#define COLLIDER_g67 0x18 -#define COLLIDER_o207 0x17 -#define COLLIDER_o23 0x16 -#define COLLIDER_g66 0x15 -#define COLLIDER_o206 0x14 -#define COLLIDER_o205 0x13 -#define COLLIDER_o93 0x12 -#define COLLIDER_g65 0x11 -#define COLLIDER_o204 0x10 -#define COLLIDER_o203 0xF -#define COLLIDER_o182 0xE -#define COLLIDER_g2 0xD -#define COLLIDER_g38 0xC -#define COLLIDER_o91 0xB -#define COLLIDER_deilite 0xA -#define COLLIDER_deilie 0x9 -#define COLLIDER_g37 0x8 -#define COLLIDER_o47 0x7 -#define COLLIDER_deilits 0x6 -#define COLLIDER_deilis 0x5 -#define COLLIDER_g41 0x4 -#define COLLIDER_o245 0x3 -#define COLLIDER_o43 0x2 -#define COLLIDER_deilitw 0x1 -#define COLLIDER_deiliw 0x0 +#define COLLIDER_Root 0x51 +#define COLLIDER_g1 0x50 +#define COLLIDER_g68 0x4F +#define COLLIDER_o223 0x4E +#define COLLIDER_o222 0x4D +#define COLLIDER_o221 0x4C +#define COLLIDER_g51 0x4B +#define COLLIDER_o1 0x4A +#define COLLIDER_g64 0x49 +#define COLLIDER_o88 0x48 +#define COLLIDER_o82 0x47 +#define COLLIDER_o84 0x46 +#define COLLIDER_o78 0x45 +#define COLLIDER_g62 0x44 +#define COLLIDER_o202 0x43 +#define COLLIDER_o257 0x42 +#define COLLIDER_o198 0x41 +#define COLLIDER_o196 0x40 +#define COLLIDER_o195 0x3F +#define COLLIDER_o194 0x3E +#define COLLIDER_o192 0x3D +#define COLLIDER_o187 0x3C +#define COLLIDER_g73 0x3B +#define COLLIDER_o220 0x3A +#define COLLIDER_o219 0x39 +#define COLLIDER_o218 0x38 +#define COLLIDER_g72 0x37 +#define COLLIDER_o244 0x36 +#define COLLIDER_o243 0x35 +#define COLLIDER_o242 0x34 +#define COLLIDER_o241 0x33 +#define COLLIDER_o240 0x32 +#define COLLIDER_o239 0x31 +#define COLLIDER_o238 0x30 +#define COLLIDER_o237 0x2F +#define COLLIDER_o236 0x2E +#define COLLIDER_o235 0x2D +#define COLLIDER_o234 0x2C +#define COLLIDER_o233 0x2B +#define COLLIDER_o232 0x2A +#define COLLIDER_o231 0x29 +#define COLLIDER_o230 0x28 +#define COLLIDER_o229 0x27 +#define COLLIDER_o228 0x26 +#define COLLIDER_g3 0x25 +#define COLLIDER_o124 0x24 +#define COLLIDER_o208 0x23 +#define COLLIDER_g61 0x22 +#define COLLIDER_o99 0x21 +#define COLLIDER_o185 0x20 +#define COLLIDER_o97 0x1F +#define COLLIDER_o183 0x1E +#define COLLIDER_g6 0x1D +#define COLLIDER_g40 0x1C +#define COLLIDER_o71 0x1B +#define COLLIDER_o72 0x1A +#define COLLIDER_o73 0x19 +#define COLLIDER_g67 0x18 +#define COLLIDER_o207 0x17 +#define COLLIDER_o23 0x16 +#define COLLIDER_g66 0x15 +#define COLLIDER_o206 0x14 +#define COLLIDER_o205 0x13 +#define COLLIDER_o93 0x12 +#define COLLIDER_g65 0x11 +#define COLLIDER_o204 0x10 +#define COLLIDER_o203 0xF +#define COLLIDER_o182 0xE +#define COLLIDER_g2 0xD +#define COLLIDER_g38 0xC +#define COLLIDER_o91 0xB +#define COLLIDER_deilite 0xA +#define COLLIDER_deilie 0x9 +#define COLLIDER_g37 0x8 +#define COLLIDER_o47 0x7 +#define COLLIDER_deilits 0x6 +#define COLLIDER_deilis 0x5 +#define COLLIDER_g41 0x4 +#define COLLIDER_o245 0x3 +#define COLLIDER_o43 0x2 +#define COLLIDER_deilitw 0x1 +#define COLLIDER_deiliw 0x0 + +#define ZONE_Root 0x5 +#define ZONE_g23 0x4 +#define ZONE_o79 0x3 +#define ZONE_o86 0x2 +#define ZONE_o85 0x1 +#define ZONE_o84 0x0 + diff --git a/include/mapfs/jan_09_shape.h b/include/mapfs/jan_09_shape.h index f7beb3f533..4ac1e4a9da 100644 --- a/include/mapfs/jan_09_shape.h +++ b/include/mapfs/jan_09_shape.h @@ -1,122 +1,123 @@ -#define MODEL_Root 0x79 -#define MODEL_g1 0x78 -#define MODEL_g51 0x77 -#define MODEL_o180 0x76 -#define MODEL_o179 0x75 -#define MODEL_g3 0x74 -#define MODEL_o210 0x73 -#define MODEL_g50 0x72 -#define MODEL_o176 0x71 -#define MODEL_o175 0x70 -#define MODEL_o174 0x6F -#define MODEL_o173 0x6E -#define MODEL_o172 0x6D -#define MODEL_o171 0x6C -#define MODEL_o170 0x6B -#define MODEL_o169 0x6A -#define MODEL_g52 0x69 -#define MODEL_g60 0x68 -#define MODEL_o81 0x67 -#define MODEL_g59 0x66 -#define MODEL_o88 0x65 -#define MODEL_g58 0x64 -#define MODEL_o82 0x63 -#define MODEL_g57 0x62 -#define MODEL_o84 0x61 -#define MODEL_g56 0x60 -#define MODEL_o83 0x5F -#define MODEL_g55 0x5E -#define MODEL_o78 0x5D -#define MODEL_g42 0x5C -#define MODEL_g95 0x5B -#define MODEL_o159 0x5A -#define MODEL_g94 0x59 -#define MODEL_o158 0x58 -#define MODEL_o164 0x57 -#define MODEL_o163 0x56 -#define MODEL_o177 0x55 -#define MODEL_o178 0x54 -#define MODEL_g89 0x53 -#define MODEL_o115 0x52 -#define MODEL_g88 0x51 -#define MODEL_o113 0x50 -#define MODEL_g87 0x4F -#define MODEL_o121 0x4E -#define MODEL_g86 0x4D -#define MODEL_o153 0x4C -#define MODEL_g85 0x4B -#define MODEL_o119 0x4A -#define MODEL_g84 0x49 -#define MODEL_o118 0x48 -#define MODEL_g83 0x47 -#define MODEL_o155 0x46 -#define MODEL_g82 0x45 -#define MODEL_o154 0x44 -#define MODEL_g81 0x43 -#define MODEL_o117 0x42 -#define MODEL_g80 0x41 -#define MODEL_o116 0x40 -#define MODEL_g79 0x3F -#define MODEL_o110 0x3E -#define MODEL_o166 0x3D -#define MODEL_o157 0x3C -#define MODEL_o120 0x3B -#define MODEL_o114 0x3A -#define MODEL_g43 0x39 -#define MODEL_o128 0x38 -#define MODEL_o127 0x37 -#define MODEL_o126 0x36 -#define MODEL_o125 0x35 -#define MODEL_g48 0x34 -#define MODEL_o151 0x33 -#define MODEL_o150 0x32 -#define MODEL_g44 0x31 -#define MODEL_g45 0x30 -#define MODEL_o134 0x2F -#define MODEL_o133 0x2E -#define MODEL_o132 0x2D -#define MODEL_o131 0x2C -#define MODEL_o130 0x2B -#define MODEL_o129 0x2A -#define MODEL_g46 0x29 -#define MODEL_o140 0x28 -#define MODEL_o139 0x27 -#define MODEL_o138 0x26 -#define MODEL_o137 0x25 -#define MODEL_o136 0x24 -#define MODEL_o135 0x23 -#define MODEL_g47 0x22 -#define MODEL_o146 0x21 -#define MODEL_o145 0x20 -#define MODEL_o144 0x1F -#define MODEL_o143 0x1E -#define MODEL_o142 0x1D -#define MODEL_o141 0x1C -#define MODEL_g5 0x1B -#define MODEL_o17 0x1A -#define MODEL_o16 0x19 -#define MODEL_o10 0x18 -#define MODEL_o9 0x17 -#define MODEL_g6 0x16 -#define MODEL_g40 0x15 -#define MODEL_o71 0x14 -#define MODEL_o72 0x13 -#define MODEL_g39 0x12 -#define MODEL_o105 0x11 -#define MODEL_o104 0x10 -#define MODEL_o73 0xF -#define MODEL_o23 0xE -#define MODEL_o94 0xD -#define MODEL_o93 0xC -#define MODEL_o6 0xB -#define MODEL_g2 0xA -#define MODEL_g38 0x9 -#define MODEL_o3 0x8 -#define MODEL_o2 0x7 -#define MODEL_g37 0x6 -#define MODEL_o48 0x5 -#define MODEL_o47 0x4 -#define MODEL_g41 0x3 -#define MODEL_o109 0x2 -#define MODEL_o108 0x1 -#define MODEL_o107 0x0 +#define MODEL_Root 0x79 +#define MODEL_g1 0x78 +#define MODEL_g51 0x77 +#define MODEL_o180 0x76 +#define MODEL_o179 0x75 +#define MODEL_g3 0x74 +#define MODEL_o210 0x73 +#define MODEL_g50 0x72 +#define MODEL_o176 0x71 +#define MODEL_o175 0x70 +#define MODEL_o174 0x6F +#define MODEL_o173 0x6E +#define MODEL_o172 0x6D +#define MODEL_o171 0x6C +#define MODEL_o170 0x6B +#define MODEL_o169 0x6A +#define MODEL_g52 0x69 +#define MODEL_g60 0x68 +#define MODEL_o81 0x67 +#define MODEL_g59 0x66 +#define MODEL_o88 0x65 +#define MODEL_g58 0x64 +#define MODEL_o82 0x63 +#define MODEL_g57 0x62 +#define MODEL_o84 0x61 +#define MODEL_g56 0x60 +#define MODEL_o83 0x5F +#define MODEL_g55 0x5E +#define MODEL_o78 0x5D +#define MODEL_g42 0x5C +#define MODEL_g95 0x5B +#define MODEL_o159 0x5A +#define MODEL_g94 0x59 +#define MODEL_o158 0x58 +#define MODEL_o164 0x57 +#define MODEL_o163 0x56 +#define MODEL_o177 0x55 +#define MODEL_o178 0x54 +#define MODEL_g89 0x53 +#define MODEL_o115 0x52 +#define MODEL_g88 0x51 +#define MODEL_o113 0x50 +#define MODEL_g87 0x4F +#define MODEL_o121 0x4E +#define MODEL_g86 0x4D +#define MODEL_o153 0x4C +#define MODEL_g85 0x4B +#define MODEL_o119 0x4A +#define MODEL_g84 0x49 +#define MODEL_o118 0x48 +#define MODEL_g83 0x47 +#define MODEL_o155 0x46 +#define MODEL_g82 0x45 +#define MODEL_o154 0x44 +#define MODEL_g81 0x43 +#define MODEL_o117 0x42 +#define MODEL_g80 0x41 +#define MODEL_o116 0x40 +#define MODEL_g79 0x3F +#define MODEL_o110 0x3E +#define MODEL_o166 0x3D +#define MODEL_o157 0x3C +#define MODEL_o120 0x3B +#define MODEL_o114 0x3A +#define MODEL_g43 0x39 +#define MODEL_o128 0x38 +#define MODEL_o127 0x37 +#define MODEL_o126 0x36 +#define MODEL_o125 0x35 +#define MODEL_g48 0x34 +#define MODEL_o151 0x33 +#define MODEL_o150 0x32 +#define MODEL_g44 0x31 +#define MODEL_g45 0x30 +#define MODEL_o134 0x2F +#define MODEL_o133 0x2E +#define MODEL_o132 0x2D +#define MODEL_o131 0x2C +#define MODEL_o130 0x2B +#define MODEL_o129 0x2A +#define MODEL_g46 0x29 +#define MODEL_o140 0x28 +#define MODEL_o139 0x27 +#define MODEL_o138 0x26 +#define MODEL_o137 0x25 +#define MODEL_o136 0x24 +#define MODEL_o135 0x23 +#define MODEL_g47 0x22 +#define MODEL_o146 0x21 +#define MODEL_o145 0x20 +#define MODEL_o144 0x1F +#define MODEL_o143 0x1E +#define MODEL_o142 0x1D +#define MODEL_o141 0x1C +#define MODEL_g5 0x1B +#define MODEL_o17 0x1A +#define MODEL_o16 0x19 +#define MODEL_o10 0x18 +#define MODEL_o9 0x17 +#define MODEL_g6 0x16 +#define MODEL_g40 0x15 +#define MODEL_o71 0x14 +#define MODEL_o72 0x13 +#define MODEL_g39 0x12 +#define MODEL_o105 0x11 +#define MODEL_o104 0x10 +#define MODEL_o73 0xF +#define MODEL_o23 0xE +#define MODEL_o94 0xD +#define MODEL_o93 0xC +#define MODEL_o6 0xB +#define MODEL_g2 0xA +#define MODEL_g38 0x9 +#define MODEL_o3 0x8 +#define MODEL_o2 0x7 +#define MODEL_g37 0x6 +#define MODEL_o48 0x5 +#define MODEL_o47 0x4 +#define MODEL_g41 0x3 +#define MODEL_o109 0x2 +#define MODEL_o108 0x1 +#define MODEL_o107 0x0 + diff --git a/include/mapfs/jan_10_hit.h b/include/mapfs/jan_10_hit.h index 7f1965be11..6c1b5b1480 100644 --- a/include/mapfs/jan_10_hit.h +++ b/include/mapfs/jan_10_hit.h @@ -1,38 +1,45 @@ -#define COLLIDER_Root 0x25 -#define COLLIDER_g1 0x24 -#define COLLIDER_g31 0x23 -#define COLLIDER_o93 0x22 -#define COLLIDER_g11 0x21 -#define COLLIDER_o1 0x20 -#define COLLIDER_g26 0x1F -#define COLLIDER_o22 0x1E -#define COLLIDER_o23 0x1D -#define COLLIDER_o11 0x1C -#define COLLIDER_g15 0x1B -#define COLLIDER_g32 0x1A -#define COLLIDER_o99 0x19 -#define COLLIDER_o98 0x18 -#define COLLIDER_o97 0x17 -#define COLLIDER_o96 0x16 -#define COLLIDER_o95 0x15 -#define COLLIDER_o94 0x14 -#define COLLIDER_o83 0x13 -#define COLLIDER_o82 0x12 -#define COLLIDER_o91 0x11 -#define COLLIDER_g25 0x10 -#define COLLIDER_o81 0xF -#define COLLIDER_o20 0xE -#define COLLIDER_g2 0xD -#define COLLIDER_g27 0xC -#define COLLIDER_o89 0xB -#define COLLIDER_o16 0xA -#define COLLIDER_g8 0x9 -#define COLLIDER_o3 0x8 -#define COLLIDER_o73 0x7 -#define COLLIDER_o2 0x6 -#define COLLIDER_o19 0x5 -#define COLLIDER_g10 0x4 -#define COLLIDER_o100 0x3 -#define COLLIDER_o17 0x2 -#define COLLIDER_deilite 0x1 -#define COLLIDER_deilie 0x0 +#define COLLIDER_Root 0x25 +#define COLLIDER_g1 0x24 +#define COLLIDER_g31 0x23 +#define COLLIDER_o93 0x22 +#define COLLIDER_g11 0x21 +#define COLLIDER_o1 0x20 +#define COLLIDER_g26 0x1F +#define COLLIDER_o22 0x1E +#define COLLIDER_o23 0x1D +#define COLLIDER_o11 0x1C +#define COLLIDER_g15 0x1B +#define COLLIDER_g32 0x1A +#define COLLIDER_o99 0x19 +#define COLLIDER_o98 0x18 +#define COLLIDER_o97 0x17 +#define COLLIDER_o96 0x16 +#define COLLIDER_o95 0x15 +#define COLLIDER_o94 0x14 +#define COLLIDER_o83 0x13 +#define COLLIDER_o82 0x12 +#define COLLIDER_o91 0x11 +#define COLLIDER_g25 0x10 +#define COLLIDER_o81 0xF +#define COLLIDER_o20 0xE +#define COLLIDER_g2 0xD +#define COLLIDER_g27 0xC +#define COLLIDER_o89 0xB +#define COLLIDER_o16 0xA +#define COLLIDER_g8 0x9 +#define COLLIDER_o3 0x8 +#define COLLIDER_o73 0x7 +#define COLLIDER_o2 0x6 +#define COLLIDER_o19 0x5 +#define COLLIDER_g10 0x4 +#define COLLIDER_o100 0x3 +#define COLLIDER_o17 0x2 +#define COLLIDER_deilite 0x1 +#define COLLIDER_deilie 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g1 0x3 +#define ZONE_o19 0x2 +#define ZONE_o20 0x1 +#define ZONE_o17 0x0 + diff --git a/include/mapfs/jan_10_shape.h b/include/mapfs/jan_10_shape.h index a47739289a..a9f2095199 100644 --- a/include/mapfs/jan_10_shape.h +++ b/include/mapfs/jan_10_shape.h @@ -1,72 +1,73 @@ -#define MODEL_Root 0x47 -#define MODEL_g1 0x46 -#define MODEL_g11 0x45 -#define MODEL_o28 0x44 -#define MODEL_o73 0x43 -#define MODEL_o27 0x42 -#define MODEL_g22 0x41 -#define MODEL_g24 0x40 -#define MODEL_o79 0x3F -#define MODEL_o78 0x3E -#define MODEL_g23 0x3D -#define MODEL_o76 0x3C -#define MODEL_o75 0x3B -#define MODEL_o74 0x3A -#define MODEL_g12 0x39 -#define MODEL_g30 0x38 -#define MODEL_o34 0x37 -#define MODEL_g29 0x36 -#define MODEL_o33 0x35 -#define MODEL_g28 0x34 -#define MODEL_o38 0x33 -#define MODEL_g27 0x32 -#define MODEL_o37 0x31 -#define MODEL_g26 0x30 -#define MODEL_o30 0x2F -#define MODEL_g25 0x2E -#define MODEL_o29 0x2D -#define MODEL_o42 0x2C -#define MODEL_g13 0x2B -#define MODEL_o46 0x2A -#define MODEL_o45 0x29 -#define MODEL_o44 0x28 -#define MODEL_o43 0x27 -#define MODEL_g14 0x26 -#define MODEL_o51 0x25 -#define MODEL_o50 0x24 -#define MODEL_o49 0x23 -#define MODEL_o48 0x22 -#define MODEL_o47 0x21 -#define MODEL_g15 0x20 -#define MODEL_g18 0x1F -#define MODEL_o69 0x1E -#define MODEL_o68 0x1D -#define MODEL_o67 0x1C -#define MODEL_o66 0x1B -#define MODEL_o65 0x1A -#define MODEL_o64 0x19 -#define MODEL_g17 0x18 -#define MODEL_o63 0x17 -#define MODEL_o62 0x16 -#define MODEL_o61 0x15 -#define MODEL_o60 0x14 -#define MODEL_o59 0x13 -#define MODEL_o58 0x12 -#define MODEL_g6 0x11 -#define MODEL_o8 0x10 -#define MODEL_o7 0xF -#define MODEL_g2 0xE -#define MODEL_g9 0xD -#define MODEL_o19 0xC -#define MODEL_o2 0xB -#define MODEL_g8 0xA -#define MODEL_o23 0x9 -#define MODEL_o21 0x8 -#define MODEL_o20 0x7 -#define MODEL_o16 0x6 -#define MODEL_o15 0x5 -#define MODEL_o80 0x4 -#define MODEL_g10 0x3 -#define MODEL_o26 0x2 -#define MODEL_o25 0x1 -#define MODEL_o24 0x0 +#define MODEL_Root 0x47 +#define MODEL_g1 0x46 +#define MODEL_g11 0x45 +#define MODEL_o28 0x44 +#define MODEL_o73 0x43 +#define MODEL_o27 0x42 +#define MODEL_g22 0x41 +#define MODEL_g24 0x40 +#define MODEL_o79 0x3F +#define MODEL_o78 0x3E +#define MODEL_g23 0x3D +#define MODEL_o76 0x3C +#define MODEL_o75 0x3B +#define MODEL_o74 0x3A +#define MODEL_g12 0x39 +#define MODEL_g30 0x38 +#define MODEL_o34 0x37 +#define MODEL_g29 0x36 +#define MODEL_o33 0x35 +#define MODEL_g28 0x34 +#define MODEL_o38 0x33 +#define MODEL_g27 0x32 +#define MODEL_o37 0x31 +#define MODEL_g26 0x30 +#define MODEL_o30 0x2F +#define MODEL_g25 0x2E +#define MODEL_o29 0x2D +#define MODEL_o42 0x2C +#define MODEL_g13 0x2B +#define MODEL_o46 0x2A +#define MODEL_o45 0x29 +#define MODEL_o44 0x28 +#define MODEL_o43 0x27 +#define MODEL_g14 0x26 +#define MODEL_o51 0x25 +#define MODEL_o50 0x24 +#define MODEL_o49 0x23 +#define MODEL_o48 0x22 +#define MODEL_o47 0x21 +#define MODEL_g15 0x20 +#define MODEL_g18 0x1F +#define MODEL_o69 0x1E +#define MODEL_o68 0x1D +#define MODEL_o67 0x1C +#define MODEL_o66 0x1B +#define MODEL_o65 0x1A +#define MODEL_o64 0x19 +#define MODEL_g17 0x18 +#define MODEL_o63 0x17 +#define MODEL_o62 0x16 +#define MODEL_o61 0x15 +#define MODEL_o60 0x14 +#define MODEL_o59 0x13 +#define MODEL_o58 0x12 +#define MODEL_g6 0x11 +#define MODEL_o8 0x10 +#define MODEL_o7 0xF +#define MODEL_g2 0xE +#define MODEL_g9 0xD +#define MODEL_o19 0xC +#define MODEL_o2 0xB +#define MODEL_g8 0xA +#define MODEL_o23 0x9 +#define MODEL_o21 0x8 +#define MODEL_o20 0x7 +#define MODEL_o16 0x6 +#define MODEL_o15 0x5 +#define MODEL_o80 0x4 +#define MODEL_g10 0x3 +#define MODEL_o26 0x2 +#define MODEL_o25 0x1 +#define MODEL_o24 0x0 + diff --git a/include/mapfs/jan_11_hit.h b/include/mapfs/jan_11_hit.h index 984c31359e..9378040895 100644 --- a/include/mapfs/jan_11_hit.h +++ b/include/mapfs/jan_11_hit.h @@ -1,17 +1,24 @@ -#define COLLIDER_Root 0x10 -#define COLLIDER_g1 0xF -#define COLLIDER_g19 0xE -#define COLLIDER_o146 0xD -#define COLLIDER_o145 0xC -#define COLLIDER_o144 0xB -#define COLLIDER_o142 0xA -#define COLLIDER_o98 0x9 -#define COLLIDER_o122 0x8 -#define COLLIDER_g18 0x7 -#define COLLIDER_o149 0x6 -#define COLLIDER_o27 0x5 -#define COLLIDER_o150 0x4 -#define COLLIDER_o141 0x3 -#define COLLIDER_g20 0x2 -#define COLLIDER_o10 0x1 -#define COLLIDER_o147 0x0 +#define COLLIDER_Root 0x10 +#define COLLIDER_g1 0xF +#define COLLIDER_g19 0xE +#define COLLIDER_o146 0xD +#define COLLIDER_o145 0xC +#define COLLIDER_o144 0xB +#define COLLIDER_o142 0xA +#define COLLIDER_o98 0x9 +#define COLLIDER_o122 0x8 +#define COLLIDER_g18 0x7 +#define COLLIDER_o149 0x6 +#define COLLIDER_o27 0x5 +#define COLLIDER_o150 0x4 +#define COLLIDER_o141 0x3 +#define COLLIDER_g20 0x2 +#define COLLIDER_o10 0x1 +#define COLLIDER_o147 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g1 0x3 +#define ZONE_o17 0x2 +#define ZONE_o18 0x1 +#define ZONE_o16 0x0 + diff --git a/include/mapfs/jan_11_shape.h b/include/mapfs/jan_11_shape.h index 5c70cdf7fe..82773513cb 100644 --- a/include/mapfs/jan_11_shape.h +++ b/include/mapfs/jan_11_shape.h @@ -1,40 +1,41 @@ -#define MODEL_Root 0x27 -#define MODEL_g1 0x26 -#define MODEL_o125 0x25 -#define MODEL_g17 0x24 -#define MODEL_o140 0x23 -#define MODEL_g13 0x22 -#define MODEL_o124 0x21 -#define MODEL_o123 0x20 -#define MODEL_o122 0x1F -#define MODEL_o121 0x1E -#define MODEL_o118 0x1D -#define MODEL_o113 0x1C -#define MODEL_o100 0x1B -#define MODEL_o98 0x1A -#define MODEL_o92 0x19 -#define MODEL_o82 0x18 -#define MODEL_g12 0x17 -#define MODEL_o79 0x16 -#define MODEL_o78 0x15 -#define MODEL_o76 0x14 -#define MODEL_o75 0x13 -#define MODEL_g10 0x12 -#define MODEL_o61 0x11 -#define MODEL_o60 0x10 -#define MODEL_o68 0xF -#define MODEL_o59 0xE -#define MODEL_g16 0xD -#define MODEL_o129 0xC -#define MODEL_o128 0xB -#define MODEL_o127 0xA -#define MODEL_o126 0x9 -#define MODEL_g11 0x8 -#define MODEL_o72 0x7 -#define MODEL_o70 0x6 -#define MODEL_o69 0x5 -#define MODEL_o71 0x4 -#define MODEL_o81 0x3 -#define MODEL_o27 0x2 -#define MODEL_g9 0x1 -#define MODEL_o141 0x0 +#define MODEL_Root 0x27 +#define MODEL_g1 0x26 +#define MODEL_o125 0x25 +#define MODEL_g17 0x24 +#define MODEL_o140 0x23 +#define MODEL_g13 0x22 +#define MODEL_o124 0x21 +#define MODEL_o123 0x20 +#define MODEL_o122 0x1F +#define MODEL_o121 0x1E +#define MODEL_o118 0x1D +#define MODEL_o113 0x1C +#define MODEL_o100 0x1B +#define MODEL_o98 0x1A +#define MODEL_o92 0x19 +#define MODEL_o82 0x18 +#define MODEL_g12 0x17 +#define MODEL_o79 0x16 +#define MODEL_o78 0x15 +#define MODEL_o76 0x14 +#define MODEL_o75 0x13 +#define MODEL_g10 0x12 +#define MODEL_o61 0x11 +#define MODEL_o60 0x10 +#define MODEL_o68 0xF +#define MODEL_o59 0xE +#define MODEL_g16 0xD +#define MODEL_o129 0xC +#define MODEL_o128 0xB +#define MODEL_o127 0xA +#define MODEL_o126 0x9 +#define MODEL_g11 0x8 +#define MODEL_o72 0x7 +#define MODEL_o70 0x6 +#define MODEL_o69 0x5 +#define MODEL_o71 0x4 +#define MODEL_o81 0x3 +#define MODEL_o27 0x2 +#define MODEL_g9 0x1 +#define MODEL_o141 0x0 + diff --git a/include/mapfs/jan_12_hit.h b/include/mapfs/jan_12_hit.h index 76e06996f3..06d799c012 100644 --- a/include/mapfs/jan_12_hit.h +++ b/include/mapfs/jan_12_hit.h @@ -1,33 +1,40 @@ -#define COLLIDER_Root 0x20 -#define COLLIDER_g1 0x1F -#define COLLIDER_g35 0x1E -#define COLLIDER_o99 0x1D -#define COLLIDER_o98 0x1C -#define COLLIDER_g31 0x1B -#define COLLIDER_o100 0x1A -#define COLLIDER_g4 0x19 -#define COLLIDER_o71 0x18 -#define COLLIDER_o70 0x17 -#define COLLIDER_o56 0x16 -#define COLLIDER_g5 0x15 -#define COLLIDER_g30 0x14 -#define COLLIDER_o97 0x13 -#define COLLIDER_o96 0x12 -#define COLLIDER_o12 0x11 -#define COLLIDER_o83 0x10 -#define COLLIDER_o82 0xF -#define COLLIDER_g2 0xE -#define COLLIDER_o110 0xD -#define COLLIDER_o78 0xC -#define COLLIDER_o48 0xB -#define COLLIDER_o47 0xA -#define COLLIDER_o1 0x9 -#define COLLIDER_g20 0x8 -#define COLLIDER_g21 0x7 -#define COLLIDER_o29 0x6 -#define COLLIDER_deilitn 0x5 -#define COLLIDER_deilin 0x4 -#define COLLIDER_g19 0x3 -#define COLLIDER_o27 0x2 -#define COLLIDER_deilits 0x1 -#define COLLIDER_deilis 0x0 +#define COLLIDER_Root 0x20 +#define COLLIDER_g1 0x1F +#define COLLIDER_g35 0x1E +#define COLLIDER_o99 0x1D +#define COLLIDER_o98 0x1C +#define COLLIDER_g31 0x1B +#define COLLIDER_o100 0x1A +#define COLLIDER_g4 0x19 +#define COLLIDER_o71 0x18 +#define COLLIDER_o70 0x17 +#define COLLIDER_o56 0x16 +#define COLLIDER_g5 0x15 +#define COLLIDER_g30 0x14 +#define COLLIDER_o97 0x13 +#define COLLIDER_o96 0x12 +#define COLLIDER_o12 0x11 +#define COLLIDER_o83 0x10 +#define COLLIDER_o82 0xF +#define COLLIDER_g2 0xE +#define COLLIDER_o110 0xD +#define COLLIDER_o78 0xC +#define COLLIDER_o48 0xB +#define COLLIDER_o47 0xA +#define COLLIDER_o1 0x9 +#define COLLIDER_g20 0x8 +#define COLLIDER_g21 0x7 +#define COLLIDER_o29 0x6 +#define COLLIDER_deilitn 0x5 +#define COLLIDER_deilin 0x4 +#define COLLIDER_g19 0x3 +#define COLLIDER_o27 0x2 +#define COLLIDER_deilits 0x1 +#define COLLIDER_deilis 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g1 0x3 +#define ZONE_o28 0x2 +#define ZONE_o27 0x1 +#define ZONE_o26 0x0 + diff --git a/include/mapfs/jan_12_shape.h b/include/mapfs/jan_12_shape.h index 5b11c03f05..a02477313e 100644 --- a/include/mapfs/jan_12_shape.h +++ b/include/mapfs/jan_12_shape.h @@ -1,56 +1,57 @@ -#define MODEL_Root 0x37 -#define MODEL_g1 0x36 -#define MODEL_g35 0x35 -#define MODEL_g7 0x34 -#define MODEL_o19 0x33 -#define MODEL_o17 0x32 -#define MODEL_o9 0x31 -#define MODEL_o8 0x30 -#define MODEL_g30 0x2F -#define MODEL_o72 0x2E -#define MODEL_o71 0x2D -#define MODEL_o70 0x2C -#define MODEL_g29 0x2B -#define MODEL_o79 0x2A -#define MODEL_g22 0x29 -#define MODEL_o39 0x28 -#define MODEL_o38 0x27 -#define MODEL_g4 0x26 -#define MODEL_g26 0x25 -#define MODEL_o56 0x24 -#define MODEL_g25 0x23 -#define MODEL_o81 0x22 -#define MODEL_o53 0x21 -#define MODEL_g31 0x20 -#define MODEL_g14 0x1F -#define MODEL_o26 0x1E -#define MODEL_g13 0x1D -#define MODEL_o12 0x1C -#define MODEL_g5 0x1B -#define MODEL_o20 0x1A -#define MODEL_g36 0x19 -#define MODEL_o77 0x18 -#define MODEL_o76 0x17 -#define MODEL_g3 0x16 -#define MODEL_g28 0x15 -#define MODEL_o67 0x14 -#define MODEL_o66 0x13 -#define MODEL_o65 0x12 -#define MODEL_o64 0x11 -#define MODEL_g27 0x10 -#define MODEL_o63 0xF -#define MODEL_o62 0xE -#define MODEL_o6 0xD -#define MODEL_o35 0xC -#define MODEL_g2 0xB -#define MODEL_o47 0xA -#define MODEL_o48 0x9 -#define MODEL_o14 0x8 -#define MODEL_o1 0x7 -#define MODEL_g20 0x6 -#define MODEL_g21 0x5 -#define MODEL_o5 0x4 -#define MODEL_o4 0x3 -#define MODEL_g19 0x2 -#define MODEL_o3 0x1 -#define MODEL_o2 0x0 +#define MODEL_Root 0x37 +#define MODEL_g1 0x36 +#define MODEL_g35 0x35 +#define MODEL_g7 0x34 +#define MODEL_o19 0x33 +#define MODEL_o17 0x32 +#define MODEL_o9 0x31 +#define MODEL_o8 0x30 +#define MODEL_g30 0x2F +#define MODEL_o72 0x2E +#define MODEL_o71 0x2D +#define MODEL_o70 0x2C +#define MODEL_g29 0x2B +#define MODEL_o79 0x2A +#define MODEL_g22 0x29 +#define MODEL_o39 0x28 +#define MODEL_o38 0x27 +#define MODEL_g4 0x26 +#define MODEL_g26 0x25 +#define MODEL_o56 0x24 +#define MODEL_g25 0x23 +#define MODEL_o81 0x22 +#define MODEL_o53 0x21 +#define MODEL_g31 0x20 +#define MODEL_g14 0x1F +#define MODEL_o26 0x1E +#define MODEL_g13 0x1D +#define MODEL_o12 0x1C +#define MODEL_g5 0x1B +#define MODEL_o20 0x1A +#define MODEL_g36 0x19 +#define MODEL_o77 0x18 +#define MODEL_o76 0x17 +#define MODEL_g3 0x16 +#define MODEL_g28 0x15 +#define MODEL_o67 0x14 +#define MODEL_o66 0x13 +#define MODEL_o65 0x12 +#define MODEL_o64 0x11 +#define MODEL_g27 0x10 +#define MODEL_o63 0xF +#define MODEL_o62 0xE +#define MODEL_o6 0xD +#define MODEL_o35 0xC +#define MODEL_g2 0xB +#define MODEL_o47 0xA +#define MODEL_o48 0x9 +#define MODEL_o14 0x8 +#define MODEL_o1 0x7 +#define MODEL_g20 0x6 +#define MODEL_g21 0x5 +#define MODEL_o5 0x4 +#define MODEL_o4 0x3 +#define MODEL_g19 0x2 +#define MODEL_o3 0x1 +#define MODEL_o2 0x0 + diff --git a/include/mapfs/jan_13_hit.h b/include/mapfs/jan_13_hit.h index 206a1b423c..ef07076533 100644 --- a/include/mapfs/jan_13_hit.h +++ b/include/mapfs/jan_13_hit.h @@ -1,30 +1,37 @@ -#define COLLIDER_Root 0x1D -#define COLLIDER_g1 0x1C -#define COLLIDER_g18 0x1B -#define COLLIDER_o76 0x1A -#define COLLIDER_o33 0x19 -#define COLLIDER_g29 0x18 -#define COLLIDER_o49 0x17 -#define COLLIDER_o53 0x16 -#define COLLIDER_o52 0x15 -#define COLLIDER_o51 0x14 -#define COLLIDER_o50 0x13 -#define COLLIDER_g20 0x12 -#define COLLIDER_g59 0x11 -#define COLLIDER_o113 0x10 -#define COLLIDER_o110 0xF -#define COLLIDER_o115 0xE -#define COLLIDER_o114 0xD -#define COLLIDER_o101 0xC -#define COLLIDER_o28 0xB -#define COLLIDER_o102 0xA -#define COLLIDER_o31 0x9 -#define COLLIDER_g2 0x8 -#define COLLIDER_g28 0x7 -#define COLLIDER_o48 0x6 -#define COLLIDER_deilitn 0x5 -#define COLLIDER_deilin 0x4 -#define COLLIDER_g27 0x3 -#define COLLIDER_o46 0x2 -#define COLLIDER_deilits 0x1 -#define COLLIDER_deilis 0x0 +#define COLLIDER_Root 0x1D +#define COLLIDER_g1 0x1C +#define COLLIDER_g18 0x1B +#define COLLIDER_o76 0x1A +#define COLLIDER_o33 0x19 +#define COLLIDER_g29 0x18 +#define COLLIDER_o49 0x17 +#define COLLIDER_o53 0x16 +#define COLLIDER_o52 0x15 +#define COLLIDER_o51 0x14 +#define COLLIDER_o50 0x13 +#define COLLIDER_g20 0x12 +#define COLLIDER_g59 0x11 +#define COLLIDER_o113 0x10 +#define COLLIDER_o110 0xF +#define COLLIDER_o115 0xE +#define COLLIDER_o114 0xD +#define COLLIDER_o101 0xC +#define COLLIDER_o28 0xB +#define COLLIDER_o102 0xA +#define COLLIDER_o31 0x9 +#define COLLIDER_g2 0x8 +#define COLLIDER_g28 0x7 +#define COLLIDER_o48 0x6 +#define COLLIDER_deilitn 0x5 +#define COLLIDER_deilin 0x4 +#define COLLIDER_g27 0x3 +#define COLLIDER_o46 0x2 +#define COLLIDER_deilits 0x1 +#define COLLIDER_deilis 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g1 0x3 +#define ZONE_o28 0x2 +#define ZONE_o27 0x1 +#define ZONE_o26 0x0 + diff --git a/include/mapfs/jan_13_shape.h b/include/mapfs/jan_13_shape.h index 7ef5088eb9..cabd2b6efe 100644 --- a/include/mapfs/jan_13_shape.h +++ b/include/mapfs/jan_13_shape.h @@ -1,66 +1,67 @@ -#define MODEL_Root 0x41 -#define MODEL_g1 0x40 -#define MODEL_g20 0x3F -#define MODEL_o36 0x3E -#define MODEL_o34 0x3D -#define MODEL_g18 0x3C -#define MODEL_o33 0x3B -#define MODEL_g17 0x3A -#define MODEL_g40 0x39 -#define MODEL_o71 0x38 -#define MODEL_g45 0x37 -#define MODEL_o76 0x36 -#define MODEL_g44 0x35 -#define MODEL_o75 0x34 -#define MODEL_g43 0x33 -#define MODEL_o74 0x32 -#define MODEL_g42 0x31 -#define MODEL_o73 0x30 -#define MODEL_g41 0x2F -#define MODEL_o72 0x2E -#define MODEL_g37 0x2D -#define MODEL_g7 0x2C -#define MODEL_o17 0x2B -#define MODEL_o9 0x2A -#define MODEL_o8 0x29 -#define MODEL_g11 0x28 -#define MODEL_o22 0x27 -#define MODEL_g32 0x26 -#define MODEL_o48 0x25 -#define MODEL_o47 0x24 -#define MODEL_g31 0x23 -#define MODEL_o81 0x22 -#define MODEL_g4 0x21 -#define MODEL_o82 0x20 -#define MODEL_o10 0x1F -#define MODEL_g5 0x1E -#define MODEL_o68 0x1D -#define MODEL_g21 0x1C -#define MODEL_o65 0x1B -#define MODEL_o66 0x1A -#define MODEL_g33 0x19 -#define MODEL_g35 0x18 -#define MODEL_o56 0x17 -#define MODEL_o55 0x16 -#define MODEL_o54 0x15 -#define MODEL_o53 0x14 -#define MODEL_g34 0x13 -#define MODEL_o52 0x12 -#define MODEL_o51 0x11 -#define MODEL_o50 0x10 -#define MODEL_o49 0xF -#define MODEL_g2 0xE -#define MODEL_g46 0xD -#define MODEL_o80 0xC -#define MODEL_o79 0xB -#define MODEL_o78 0xA -#define MODEL_o77 0x9 -#define MODEL_o31 0x8 -#define MODEL_o28 0x7 -#define MODEL_g28 0x6 -#define MODEL_g30 0x5 -#define MODEL_o5 0x4 -#define MODEL_o4 0x3 -#define MODEL_g29 0x2 -#define MODEL_o3 0x1 -#define MODEL_o2 0x0 +#define MODEL_Root 0x41 +#define MODEL_g1 0x40 +#define MODEL_g20 0x3F +#define MODEL_o36 0x3E +#define MODEL_o34 0x3D +#define MODEL_g18 0x3C +#define MODEL_o33 0x3B +#define MODEL_g17 0x3A +#define MODEL_g40 0x39 +#define MODEL_o71 0x38 +#define MODEL_g45 0x37 +#define MODEL_o76 0x36 +#define MODEL_g44 0x35 +#define MODEL_o75 0x34 +#define MODEL_g43 0x33 +#define MODEL_o74 0x32 +#define MODEL_g42 0x31 +#define MODEL_o73 0x30 +#define MODEL_g41 0x2F +#define MODEL_o72 0x2E +#define MODEL_g37 0x2D +#define MODEL_g7 0x2C +#define MODEL_o17 0x2B +#define MODEL_o9 0x2A +#define MODEL_o8 0x29 +#define MODEL_g11 0x28 +#define MODEL_o22 0x27 +#define MODEL_g32 0x26 +#define MODEL_o48 0x25 +#define MODEL_o47 0x24 +#define MODEL_g31 0x23 +#define MODEL_o81 0x22 +#define MODEL_g4 0x21 +#define MODEL_o82 0x20 +#define MODEL_o10 0x1F +#define MODEL_g5 0x1E +#define MODEL_o68 0x1D +#define MODEL_g21 0x1C +#define MODEL_o65 0x1B +#define MODEL_o66 0x1A +#define MODEL_g33 0x19 +#define MODEL_g35 0x18 +#define MODEL_o56 0x17 +#define MODEL_o55 0x16 +#define MODEL_o54 0x15 +#define MODEL_o53 0x14 +#define MODEL_g34 0x13 +#define MODEL_o52 0x12 +#define MODEL_o51 0x11 +#define MODEL_o50 0x10 +#define MODEL_o49 0xF +#define MODEL_g2 0xE +#define MODEL_g46 0xD +#define MODEL_o80 0xC +#define MODEL_o79 0xB +#define MODEL_o78 0xA +#define MODEL_o77 0x9 +#define MODEL_o31 0x8 +#define MODEL_o28 0x7 +#define MODEL_g28 0x6 +#define MODEL_g30 0x5 +#define MODEL_o5 0x4 +#define MODEL_o4 0x3 +#define MODEL_g29 0x2 +#define MODEL_o3 0x1 +#define MODEL_o2 0x0 + diff --git a/include/mapfs/jan_14_hit.h b/include/mapfs/jan_14_hit.h index 1cde90f3d7..c6602b1156 100644 --- a/include/mapfs/jan_14_hit.h +++ b/include/mapfs/jan_14_hit.h @@ -1,39 +1,46 @@ -#define COLLIDER_Root 0x26 -#define COLLIDER_g1 0x25 -#define COLLIDER_g56 0x24 -#define COLLIDER_o122 0x23 -#define COLLIDER_o121 0x22 -#define COLLIDER_g45 0x21 -#define COLLIDER_o80 0x20 -#define COLLIDER_o10 0x1F -#define COLLIDER_o76 0x1E -#define COLLIDER_o79 0x1D -#define COLLIDER_o78 0x1C -#define COLLIDER_g19 0x1B -#define COLLIDER_o34 0x1A -#define COLLIDER_o107 0x19 -#define COLLIDER_o13 0x18 -#define COLLIDER_g20 0x17 -#define COLLIDER_o120 0x16 -#define COLLIDER_o119 0x15 -#define COLLIDER_o118 0x14 -#define COLLIDER_o103 0x13 -#define COLLIDER_o117 0x12 -#define COLLIDER_o104 0x11 -#define COLLIDER_o100 0x10 -#define COLLIDER_o98 0xF -#define COLLIDER_o12 0xE -#define COLLIDER_g2 0xD -#define COLLIDER_o106 0xC -#define COLLIDER_o97 0xB -#define COLLIDER_o28 0xA -#define COLLIDER_o105 0x9 -#define COLLIDER_g36 0x8 -#define COLLIDER_g38 0x7 -#define COLLIDER_o55 0x6 -#define COLLIDER_deilitn 0x5 -#define COLLIDER_deilin 0x4 -#define COLLIDER_g37 0x3 -#define COLLIDER_o53 0x2 -#define COLLIDER_deilits 0x1 -#define COLLIDER_deilis 0x0 +#define COLLIDER_Root 0x26 +#define COLLIDER_g1 0x25 +#define COLLIDER_g56 0x24 +#define COLLIDER_o122 0x23 +#define COLLIDER_o121 0x22 +#define COLLIDER_g45 0x21 +#define COLLIDER_o80 0x20 +#define COLLIDER_o10 0x1F +#define COLLIDER_o76 0x1E +#define COLLIDER_o79 0x1D +#define COLLIDER_o78 0x1C +#define COLLIDER_g19 0x1B +#define COLLIDER_o34 0x1A +#define COLLIDER_o107 0x19 +#define COLLIDER_o13 0x18 +#define COLLIDER_g20 0x17 +#define COLLIDER_o120 0x16 +#define COLLIDER_o119 0x15 +#define COLLIDER_o118 0x14 +#define COLLIDER_o103 0x13 +#define COLLIDER_o117 0x12 +#define COLLIDER_o104 0x11 +#define COLLIDER_o100 0x10 +#define COLLIDER_o98 0xF +#define COLLIDER_o12 0xE +#define COLLIDER_g2 0xD +#define COLLIDER_o106 0xC +#define COLLIDER_o97 0xB +#define COLLIDER_o28 0xA +#define COLLIDER_o105 0x9 +#define COLLIDER_g36 0x8 +#define COLLIDER_g38 0x7 +#define COLLIDER_o55 0x6 +#define COLLIDER_deilitn 0x5 +#define COLLIDER_deilin 0x4 +#define COLLIDER_g37 0x3 +#define COLLIDER_o53 0x2 +#define COLLIDER_deilits 0x1 +#define COLLIDER_deilis 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g1 0x3 +#define ZONE_o28 0x2 +#define ZONE_o27 0x1 +#define ZONE_o26 0x0 + diff --git a/include/mapfs/jan_14_shape.h b/include/mapfs/jan_14_shape.h index 00b5205416..b6185edc3c 100644 --- a/include/mapfs/jan_14_shape.h +++ b/include/mapfs/jan_14_shape.h @@ -1,78 +1,79 @@ -#define MODEL_Root 0x4D -#define MODEL_g1 0x4C -#define MODEL_g45 0x4B -#define MODEL_g50 0x4A -#define MODEL_o83 0x49 -#define MODEL_o82 0x48 -#define MODEL_g49 0x47 -#define MODEL_o9 0x46 -#define MODEL_o8 0x45 -#define MODEL_g48 0x44 -#define MODEL_o80 0x43 -#define MODEL_o81 0x42 -#define MODEL_g47 0x41 -#define MODEL_o76 0x40 -#define MODEL_o77 0x3F -#define MODEL_g46 0x3E -#define MODEL_o79 0x3D -#define MODEL_o78 0x3C -#define MODEL_g51 0x3B -#define MODEL_g33 0x3A -#define MODEL_o54 0x39 -#define MODEL_g32 0x38 -#define MODEL_o40 0x37 -#define MODEL_g19 0x36 -#define MODEL_g7 0x35 -#define MODEL_o50 0x34 -#define MODEL_o17 0x33 -#define MODEL_g20 0x32 -#define MODEL_o34 0x31 -#define MODEL_g53 0x30 -#define MODEL_o92 0x2F -#define MODEL_o91 0x2E -#define MODEL_g11 0x2D -#define MODEL_o22 0x2C -#define MODEL_g4 0x2B -#define MODEL_o99 0x2A -#define MODEL_o10 0x29 -#define MODEL_g5 0x28 -#define MODEL_o90 0x27 -#define MODEL_o89 0x26 -#define MODEL_o88 0x25 -#define MODEL_o87 0x24 -#define MODEL_o86 0x23 -#define MODEL_o12 0x22 -#define MODEL_g39 0x21 -#define MODEL_g44 0x20 -#define MODEL_o75 0x1F -#define MODEL_o73 0x1E -#define MODEL_o72 0x1D -#define MODEL_g40 0x1C -#define MODEL_o59 0x1B -#define MODEL_o58 0x1A -#define MODEL_o57 0x19 -#define MODEL_o56 0x18 -#define MODEL_g43 0x17 -#define MODEL_o71 0x16 -#define MODEL_o70 0x15 -#define MODEL_o69 0x14 -#define MODEL_o68 0x13 -#define MODEL_g42 0x12 -#define MODEL_o67 0x11 -#define MODEL_o65 0x10 -#define MODEL_o64 0xF -#define MODEL_g41 0xE -#define MODEL_o63 0xD -#define MODEL_o62 0xC -#define MODEL_o61 0xB -#define MODEL_o60 0xA -#define MODEL_g2 0x9 -#define MODEL_o31 0x8 -#define MODEL_o28 0x7 -#define MODEL_g36 0x6 -#define MODEL_g38 0x5 -#define MODEL_o5 0x4 -#define MODEL_o4 0x3 -#define MODEL_g37 0x2 -#define MODEL_o3 0x1 -#define MODEL_o2 0x0 +#define MODEL_Root 0x4D +#define MODEL_g1 0x4C +#define MODEL_g45 0x4B +#define MODEL_g50 0x4A +#define MODEL_o83 0x49 +#define MODEL_o82 0x48 +#define MODEL_g49 0x47 +#define MODEL_o9 0x46 +#define MODEL_o8 0x45 +#define MODEL_g48 0x44 +#define MODEL_o80 0x43 +#define MODEL_o81 0x42 +#define MODEL_g47 0x41 +#define MODEL_o76 0x40 +#define MODEL_o77 0x3F +#define MODEL_g46 0x3E +#define MODEL_o79 0x3D +#define MODEL_o78 0x3C +#define MODEL_g51 0x3B +#define MODEL_g33 0x3A +#define MODEL_o54 0x39 +#define MODEL_g32 0x38 +#define MODEL_o40 0x37 +#define MODEL_g19 0x36 +#define MODEL_g7 0x35 +#define MODEL_o50 0x34 +#define MODEL_o17 0x33 +#define MODEL_g20 0x32 +#define MODEL_o34 0x31 +#define MODEL_g53 0x30 +#define MODEL_o92 0x2F +#define MODEL_o91 0x2E +#define MODEL_g11 0x2D +#define MODEL_o22 0x2C +#define MODEL_g4 0x2B +#define MODEL_o99 0x2A +#define MODEL_o10 0x29 +#define MODEL_g5 0x28 +#define MODEL_o90 0x27 +#define MODEL_o89 0x26 +#define MODEL_o88 0x25 +#define MODEL_o87 0x24 +#define MODEL_o86 0x23 +#define MODEL_o12 0x22 +#define MODEL_g39 0x21 +#define MODEL_g44 0x20 +#define MODEL_o75 0x1F +#define MODEL_o73 0x1E +#define MODEL_o72 0x1D +#define MODEL_g40 0x1C +#define MODEL_o59 0x1B +#define MODEL_o58 0x1A +#define MODEL_o57 0x19 +#define MODEL_o56 0x18 +#define MODEL_g43 0x17 +#define MODEL_o71 0x16 +#define MODEL_o70 0x15 +#define MODEL_o69 0x14 +#define MODEL_o68 0x13 +#define MODEL_g42 0x12 +#define MODEL_o67 0x11 +#define MODEL_o65 0x10 +#define MODEL_o64 0xF +#define MODEL_g41 0xE +#define MODEL_o63 0xD +#define MODEL_o62 0xC +#define MODEL_o61 0xB +#define MODEL_o60 0xA +#define MODEL_g2 0x9 +#define MODEL_o31 0x8 +#define MODEL_o28 0x7 +#define MODEL_g36 0x6 +#define MODEL_g38 0x5 +#define MODEL_o5 0x4 +#define MODEL_o4 0x3 +#define MODEL_g37 0x2 +#define MODEL_o3 0x1 +#define MODEL_o2 0x0 + diff --git a/include/mapfs/jan_15_hit.h b/include/mapfs/jan_15_hit.h index 27d920bb01..86f72ba1e5 100644 --- a/include/mapfs/jan_15_hit.h +++ b/include/mapfs/jan_15_hit.h @@ -1,28 +1,35 @@ -#define COLLIDER_Root 0x1B -#define COLLIDER_g1 0x1A -#define COLLIDER_g44 0x19 -#define COLLIDER_o100 0x18 -#define COLLIDER_o99 0x17 -#define COLLIDER_g19 0x16 -#define COLLIDER_g45 0x15 -#define COLLIDER_o98 0x14 -#define COLLIDER_o97 0x13 -#define COLLIDER_o8 0x12 -#define COLLIDER_o93 0x11 -#define COLLIDER_o94 0x10 -#define COLLIDER_o92 0xF -#define COLLIDER_g2 0xE -#define COLLIDER_o105 0xD -#define COLLIDER_o91 0xC -#define COLLIDER_o90 0xB -#define COLLIDER_o89 0xA -#define COLLIDER_o3 0x9 -#define COLLIDER_g33 0x8 -#define COLLIDER_g35 0x7 -#define COLLIDER_o60 0x6 -#define COLLIDER_deilite 0x5 -#define COLLIDER_deilie 0x4 -#define COLLIDER_g34 0x3 -#define COLLIDER_o58 0x2 -#define COLLIDER_deilits 0x1 -#define COLLIDER_deilis 0x0 +#define COLLIDER_Root 0x1B +#define COLLIDER_g1 0x1A +#define COLLIDER_g44 0x19 +#define COLLIDER_o100 0x18 +#define COLLIDER_o99 0x17 +#define COLLIDER_g19 0x16 +#define COLLIDER_g45 0x15 +#define COLLIDER_o98 0x14 +#define COLLIDER_o97 0x13 +#define COLLIDER_o8 0x12 +#define COLLIDER_o93 0x11 +#define COLLIDER_o94 0x10 +#define COLLIDER_o92 0xF +#define COLLIDER_g2 0xE +#define COLLIDER_o105 0xD +#define COLLIDER_o91 0xC +#define COLLIDER_o90 0xB +#define COLLIDER_o89 0xA +#define COLLIDER_o3 0x9 +#define COLLIDER_g33 0x8 +#define COLLIDER_g35 0x7 +#define COLLIDER_o60 0x6 +#define COLLIDER_deilite 0x5 +#define COLLIDER_deilie 0x4 +#define COLLIDER_g34 0x3 +#define COLLIDER_o58 0x2 +#define COLLIDER_deilits 0x1 +#define COLLIDER_deilis 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g1 0x3 +#define ZONE_o28 0x2 +#define ZONE_o27 0x1 +#define ZONE_o26 0x0 + diff --git a/include/mapfs/jan_15_shape.h b/include/mapfs/jan_15_shape.h index 888140efec..8cd9c68b6e 100644 --- a/include/mapfs/jan_15_shape.h +++ b/include/mapfs/jan_15_shape.h @@ -1,62 +1,63 @@ -#define MODEL_Root 0x3D -#define MODEL_g1 0x3C -#define MODEL_g19 0x3B -#define MODEL_g42 0x3A -#define MODEL_o84 0x39 -#define MODEL_o83 0x38 -#define MODEL_g7 0x37 -#define MODEL_o55 0x36 -#define MODEL_o53 0x35 -#define MODEL_o52 0x34 -#define MODEL_o17 0x33 -#define MODEL_o9 0x32 -#define MODEL_o8 0x31 -#define MODEL_g41 0x30 -#define MODEL_o82 0x2F -#define MODEL_g11 0x2E -#define MODEL_o22 0x2D -#define MODEL_g4 0x2C -#define MODEL_o101 0x2B -#define MODEL_o10 0x2A -#define MODEL_g5 0x29 -#define MODEL_o12 0x28 -#define MODEL_g28 0x27 -#define MODEL_g47 0x26 -#define MODEL_o95 0x25 -#define MODEL_o94 0x24 -#define MODEL_o81 0x23 -#define MODEL_o80 0x22 -#define MODEL_o79 0x21 -#define MODEL_o78 0x20 -#define MODEL_o77 0x1F -#define MODEL_o76 0x1E -#define MODEL_o46 0x1D -#define MODEL_g36 0x1C -#define MODEL_o63 0x1B -#define MODEL_o62 0x1A -#define MODEL_g37 0x19 -#define MODEL_g38 0x18 -#define MODEL_o67 0x17 -#define MODEL_o66 0x16 -#define MODEL_o65 0x15 -#define MODEL_o64 0x14 -#define MODEL_g40 0x13 -#define MODEL_o75 0x12 -#define MODEL_o74 0x11 -#define MODEL_o73 0x10 -#define MODEL_o72 0xF -#define MODEL_g39 0xE -#define MODEL_o71 0xD -#define MODEL_o70 0xC -#define MODEL_o69 0xB -#define MODEL_o68 0xA -#define MODEL_g45 0x9 -#define MODEL_o93 0x8 -#define MODEL_o87 0x7 -#define MODEL_g33 0x6 -#define MODEL_g35 0x5 -#define MODEL_o5 0x4 -#define MODEL_o4 0x3 -#define MODEL_g34 0x2 -#define MODEL_o3 0x1 -#define MODEL_o2 0x0 +#define MODEL_Root 0x3D +#define MODEL_g1 0x3C +#define MODEL_g19 0x3B +#define MODEL_g42 0x3A +#define MODEL_o84 0x39 +#define MODEL_o83 0x38 +#define MODEL_g7 0x37 +#define MODEL_o55 0x36 +#define MODEL_o53 0x35 +#define MODEL_o52 0x34 +#define MODEL_o17 0x33 +#define MODEL_o9 0x32 +#define MODEL_o8 0x31 +#define MODEL_g41 0x30 +#define MODEL_o82 0x2F +#define MODEL_g11 0x2E +#define MODEL_o22 0x2D +#define MODEL_g4 0x2C +#define MODEL_o101 0x2B +#define MODEL_o10 0x2A +#define MODEL_g5 0x29 +#define MODEL_o12 0x28 +#define MODEL_g28 0x27 +#define MODEL_g47 0x26 +#define MODEL_o95 0x25 +#define MODEL_o94 0x24 +#define MODEL_o81 0x23 +#define MODEL_o80 0x22 +#define MODEL_o79 0x21 +#define MODEL_o78 0x20 +#define MODEL_o77 0x1F +#define MODEL_o76 0x1E +#define MODEL_o46 0x1D +#define MODEL_g36 0x1C +#define MODEL_o63 0x1B +#define MODEL_o62 0x1A +#define MODEL_g37 0x19 +#define MODEL_g38 0x18 +#define MODEL_o67 0x17 +#define MODEL_o66 0x16 +#define MODEL_o65 0x15 +#define MODEL_o64 0x14 +#define MODEL_g40 0x13 +#define MODEL_o75 0x12 +#define MODEL_o74 0x11 +#define MODEL_o73 0x10 +#define MODEL_o72 0xF +#define MODEL_g39 0xE +#define MODEL_o71 0xD +#define MODEL_o70 0xC +#define MODEL_o69 0xB +#define MODEL_o68 0xA +#define MODEL_g45 0x9 +#define MODEL_o93 0x8 +#define MODEL_o87 0x7 +#define MODEL_g33 0x6 +#define MODEL_g35 0x5 +#define MODEL_o5 0x4 +#define MODEL_o4 0x3 +#define MODEL_g34 0x2 +#define MODEL_o3 0x1 +#define MODEL_o2 0x0 + diff --git a/include/mapfs/jan_16_hit.h b/include/mapfs/jan_16_hit.h index f326bd07e5..dc3b45d792 100644 --- a/include/mapfs/jan_16_hit.h +++ b/include/mapfs/jan_16_hit.h @@ -1,47 +1,54 @@ -#define COLLIDER_Root 0x2E -#define COLLIDER_g1 0x2D -#define COLLIDER_g26 0x2C -#define COLLIDER_g47 0x2B -#define COLLIDER_o129 0x2A -#define COLLIDER_o128 0x29 -#define COLLIDER_o127 0x28 -#define COLLIDER_o126 0x27 -#define COLLIDER_o110 0x26 -#define COLLIDER_o63 0x25 -#define COLLIDER_o102 0x24 -#define COLLIDER_o50 0x23 -#define COLLIDER_g37 0x22 -#define COLLIDER_o130 0x21 -#define COLLIDER_o113 0x20 -#define COLLIDER_o119 0x1F -#define COLLIDER_o97 0x1E -#define COLLIDER_g25 0x1D -#define COLLIDER_o45 0x1C -#define COLLIDER_o38 0x1B -#define COLLIDER_o39 0x1A -#define COLLIDER_g24 0x19 -#define COLLIDER_g40 0x18 -#define COLLIDER_o137 0x17 -#define COLLIDER_o108 0x16 -#define COLLIDER_o98 0x15 -#define COLLIDER_o99 0x14 -#define COLLIDER_o138 0x13 -#define COLLIDER_o112 0x12 -#define COLLIDER_o136 0x11 -#define COLLIDER_o111 0x10 -#define COLLIDER_g39 0xF -#define COLLIDER_o135 0xE -#define COLLIDER_o134 0xD -#define COLLIDER_o133 0xC -#define COLLIDER_o104 0xB -#define COLLIDER_o96 0xA -#define COLLIDER_o83 0x9 -#define COLLIDER_g3 0x8 -#define COLLIDER_g30 0x7 -#define COLLIDER_o81 0x6 -#define COLLIDER_deilite 0x5 -#define COLLIDER_deilie 0x4 -#define COLLIDER_g2 0x3 -#define COLLIDER_o79 0x2 -#define COLLIDER_deilitw 0x1 -#define COLLIDER_deiliw 0x0 +#define COLLIDER_Root 0x2E +#define COLLIDER_g1 0x2D +#define COLLIDER_g26 0x2C +#define COLLIDER_g47 0x2B +#define COLLIDER_o129 0x2A +#define COLLIDER_o128 0x29 +#define COLLIDER_o127 0x28 +#define COLLIDER_o126 0x27 +#define COLLIDER_o110 0x26 +#define COLLIDER_o63 0x25 +#define COLLIDER_o102 0x24 +#define COLLIDER_o50 0x23 +#define COLLIDER_g37 0x22 +#define COLLIDER_o130 0x21 +#define COLLIDER_o113 0x20 +#define COLLIDER_o119 0x1F +#define COLLIDER_o97 0x1E +#define COLLIDER_g25 0x1D +#define COLLIDER_o45 0x1C +#define COLLIDER_o38 0x1B +#define COLLIDER_o39 0x1A +#define COLLIDER_g24 0x19 +#define COLLIDER_g40 0x18 +#define COLLIDER_o137 0x17 +#define COLLIDER_o108 0x16 +#define COLLIDER_o98 0x15 +#define COLLIDER_o99 0x14 +#define COLLIDER_o138 0x13 +#define COLLIDER_o112 0x12 +#define COLLIDER_o136 0x11 +#define COLLIDER_o111 0x10 +#define COLLIDER_g39 0xF +#define COLLIDER_o135 0xE +#define COLLIDER_o134 0xD +#define COLLIDER_o133 0xC +#define COLLIDER_o104 0xB +#define COLLIDER_o96 0xA +#define COLLIDER_o83 0x9 +#define COLLIDER_g3 0x8 +#define COLLIDER_g30 0x7 +#define COLLIDER_o81 0x6 +#define COLLIDER_deilite 0x5 +#define COLLIDER_deilie 0x4 +#define COLLIDER_g2 0x3 +#define COLLIDER_o79 0x2 +#define COLLIDER_deilitw 0x1 +#define COLLIDER_deiliw 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g1 0x3 +#define ZONE_o34 0x2 +#define ZONE_o33 0x1 +#define ZONE_o1 0x0 + diff --git a/include/mapfs/jan_16_shape.h b/include/mapfs/jan_16_shape.h index 2626669f99..483357711f 100644 --- a/include/mapfs/jan_16_shape.h +++ b/include/mapfs/jan_16_shape.h @@ -1,87 +1,88 @@ -#define MODEL_Root 0x56 -#define MODEL_g1 0x55 -#define MODEL_g40 0x54 -#define MODEL_o96 0x53 -#define MODEL_o95 0x52 -#define MODEL_g26 0x51 -#define MODEL_g16 0x50 -#define MODEL_g51 0x4F -#define MODEL_o111 0x4E -#define MODEL_g50 0x4D -#define MODEL_o110 0x4C -#define MODEL_g49 0x4B -#define MODEL_o109 0x4A -#define MODEL_g48 0x49 -#define MODEL_o63 0x48 -#define MODEL_g21 0x47 -#define MODEL_o61 0x46 -#define MODEL_o108 0x45 -#define MODEL_o107 0x44 -#define MODEL_g33 0x43 -#define MODEL_o90 0x42 -#define MODEL_o89 0x41 -#define MODEL_o88 0x40 -#define MODEL_o87 0x3F -#define MODEL_g11 0x3E -#define MODEL_o49 0x3D -#define MODEL_o48 0x3C -#define MODEL_o47 0x3B -#define MODEL_o46 0x3A -#define MODEL_o52 0x39 -#define MODEL_o51 0x38 -#define MODEL_o50 0x37 -#define MODEL_g55 0x36 -#define MODEL_g56 0x35 -#define MODEL_o128 0x34 -#define MODEL_o127 0x33 -#define MODEL_o126 0x32 -#define MODEL_o125 0x31 -#define MODEL_o124 0x30 -#define MODEL_o123 0x2F -#define MODEL_o122 0x2E -#define MODEL_o121 0x2D -#define MODEL_g54 0x2C -#define MODEL_g53 0x2B -#define MODEL_o120 0x2A -#define MODEL_o116 0x29 -#define MODEL_o31 0x28 -#define MODEL_o117 0x27 -#define MODEL_o119 0x26 -#define MODEL_o28 0x25 -#define MODEL_o115 0x24 -#define MODEL_g6 0x23 -#define MODEL_o32 0x22 -#define MODEL_o30 0x21 -#define MODEL_o26 0x20 -#define MODEL_o21 0x1F -#define MODEL_o20 0x1E -#define MODEL_o9 0x1D -#define MODEL_g25 0x1C -#define MODEL_g32 0x1B -#define MODEL_g39 0x1A -#define MODEL_o94 0x19 -#define MODEL_o93 0x18 -#define MODEL_o92 0x17 -#define MODEL_g38 0x16 -#define MODEL_g47 0x15 -#define MODEL_o82 0x14 -#define MODEL_o83 0x13 -#define MODEL_o85 0x12 -#define MODEL_o86 0x11 -#define MODEL_o84 0x10 -#define MODEL_o81 0xF -#define MODEL_o42 0xE -#define MODEL_g10 0xD -#define MODEL_o39 0xC -#define MODEL_o45 0xB -#define MODEL_o38 0xA -#define MODEL_g24 0x9 -#define MODEL_o7 0x8 -#define MODEL_o1 0x7 -#define MODEL_g3 0x6 -#define MODEL_g30 0x5 -#define MODEL_o6 0x4 -#define MODEL_o5 0x3 -#define MODEL_g2 0x2 -#define MODEL_o4 0x1 -#define MODEL_o3 0x0 +#define MODEL_Root 0x56 +#define MODEL_g1 0x55 +#define MODEL_g40 0x54 +#define MODEL_o96 0x53 +#define MODEL_o95 0x52 +#define MODEL_g26 0x51 +#define MODEL_g16 0x50 +#define MODEL_g51 0x4F +#define MODEL_o111 0x4E +#define MODEL_g50 0x4D +#define MODEL_o110 0x4C +#define MODEL_g49 0x4B +#define MODEL_o109 0x4A +#define MODEL_g48 0x49 +#define MODEL_o63 0x48 +#define MODEL_g21 0x47 +#define MODEL_o61 0x46 +#define MODEL_o108 0x45 +#define MODEL_o107 0x44 +#define MODEL_g33 0x43 +#define MODEL_o90 0x42 +#define MODEL_o89 0x41 +#define MODEL_o88 0x40 +#define MODEL_o87 0x3F +#define MODEL_g11 0x3E +#define MODEL_o49 0x3D +#define MODEL_o48 0x3C +#define MODEL_o47 0x3B +#define MODEL_o46 0x3A +#define MODEL_o52 0x39 +#define MODEL_o51 0x38 +#define MODEL_o50 0x37 +#define MODEL_g55 0x36 +#define MODEL_g56 0x35 +#define MODEL_o128 0x34 +#define MODEL_o127 0x33 +#define MODEL_o126 0x32 +#define MODEL_o125 0x31 +#define MODEL_o124 0x30 +#define MODEL_o123 0x2F +#define MODEL_o122 0x2E +#define MODEL_o121 0x2D +#define MODEL_g54 0x2C +#define MODEL_g53 0x2B +#define MODEL_o120 0x2A +#define MODEL_o116 0x29 +#define MODEL_o31 0x28 +#define MODEL_o117 0x27 +#define MODEL_o119 0x26 +#define MODEL_o28 0x25 +#define MODEL_o115 0x24 +#define MODEL_g6 0x23 +#define MODEL_o32 0x22 +#define MODEL_o30 0x21 +#define MODEL_o26 0x20 +#define MODEL_o21 0x1F +#define MODEL_o20 0x1E +#define MODEL_o9 0x1D +#define MODEL_g25 0x1C +#define MODEL_g32 0x1B +#define MODEL_g39 0x1A +#define MODEL_o94 0x19 +#define MODEL_o93 0x18 +#define MODEL_o92 0x17 +#define MODEL_g38 0x16 +#define MODEL_g47 0x15 +#define MODEL_o82 0x14 +#define MODEL_o83 0x13 +#define MODEL_o85 0x12 +#define MODEL_o86 0x11 +#define MODEL_o84 0x10 +#define MODEL_o81 0xF +#define MODEL_o42 0xE +#define MODEL_g10 0xD +#define MODEL_o39 0xC +#define MODEL_o45 0xB +#define MODEL_o38 0xA +#define MODEL_g24 0x9 +#define MODEL_o7 0x8 +#define MODEL_o1 0x7 +#define MODEL_g3 0x6 +#define MODEL_g30 0x5 +#define MODEL_o6 0x4 +#define MODEL_o5 0x3 +#define MODEL_g2 0x2 +#define MODEL_o4 0x1 +#define MODEL_o3 0x0 + diff --git a/include/mapfs/jan_17_hit.h b/include/mapfs/jan_17_hit.h index b0c6df7456..e6b7d4caf9 100644 --- a/include/mapfs/jan_17_hit.h +++ b/include/mapfs/jan_17_hit.h @@ -1,27 +1,41 @@ -#define COLLIDER_Root 0x1A -#define COLLIDER_g1 0x19 -#define COLLIDER_g12 0x18 -#define COLLIDER_o48 0x17 -#define COLLIDER_o47 0x16 -#define COLLIDER_o26 0x15 -#define COLLIDER_g3 0x14 -#define COLLIDER_o75 0x13 -#define COLLIDER_o74 0x12 -#define COLLIDER_o72 0x11 -#define COLLIDER_o73 0x10 -#define COLLIDER_o71 0xF -#define COLLIDER_o70 0xE -#define COLLIDER_o13 0xD -#define COLLIDER_o68 0xC -#define COLLIDER_o67 0xB -#define COLLIDER_o6 0xA -#define COLLIDER_o3 0x9 -#define COLLIDER_g4 0x8 -#define COLLIDER_g17 0x7 -#define COLLIDER_o46 0x6 -#define COLLIDER_deilite 0x5 -#define COLLIDER_deilie 0x4 -#define COLLIDER_g16 0x3 -#define COLLIDER_o45 0x2 -#define COLLIDER_deilitw 0x1 -#define COLLIDER_deiliw 0x0 +#define COLLIDER_Root 0x1A +#define COLLIDER_g1 0x19 +#define COLLIDER_g12 0x18 +#define COLLIDER_o48 0x17 +#define COLLIDER_o47 0x16 +#define COLLIDER_o26 0x15 +#define COLLIDER_g3 0x14 +#define COLLIDER_o75 0x13 +#define COLLIDER_o74 0x12 +#define COLLIDER_o72 0x11 +#define COLLIDER_o73 0x10 +#define COLLIDER_o71 0xF +#define COLLIDER_o70 0xE +#define COLLIDER_o13 0xD +#define COLLIDER_o68 0xC +#define COLLIDER_o67 0xB +#define COLLIDER_o6 0xA +#define COLLIDER_o3 0x9 +#define COLLIDER_g4 0x8 +#define COLLIDER_g17 0x7 +#define COLLIDER_o46 0x6 +#define COLLIDER_deilite 0x5 +#define COLLIDER_deilie 0x4 +#define COLLIDER_g16 0x3 +#define COLLIDER_o45 0x2 +#define COLLIDER_deilitw 0x1 +#define COLLIDER_deiliw 0x0 + +#define ZONE_Root 0xB +#define ZONE_g1 0xA +#define ZONE_g15 0x9 +#define ZONE_o44 0x8 +#define ZONE_o45 0x7 +#define ZONE_o43 0x6 +#define ZONE_g3 0x5 +#define ZONE_o6 0x4 +#define ZONE_g14 0x3 +#define ZONE_o40 0x2 +#define ZONE_o41 0x1 +#define ZONE_o39 0x0 + diff --git a/include/mapfs/jan_17_shape.h b/include/mapfs/jan_17_shape.h index 041d7b0f6e..b0c29dc296 100644 --- a/include/mapfs/jan_17_shape.h +++ b/include/mapfs/jan_17_shape.h @@ -1,26 +1,27 @@ -#define MODEL_Root 0x19 -#define MODEL_g1 0x18 -#define MODEL_g12 0x17 -#define MODEL_g14 0x16 -#define MODEL_o51 0x15 -#define MODEL_o49 0x14 -#define MODEL_o34 0x13 -#define MODEL_o33 0x12 -#define MODEL_o31 0x11 -#define MODEL_o26 0x10 -#define MODEL_g3 0xF -#define MODEL_g7 0xE -#define MODEL_o4 0xD -#define MODEL_o8 0xC -#define MODEL_o6 0xB -#define MODEL_o7 0xA -#define MODEL_g6 0x9 -#define MODEL_o53 0x8 -#define MODEL_o52 0x7 -#define MODEL_g4 0x6 -#define MODEL_g17 0x5 -#define MODEL_o11 0x4 -#define MODEL_o10 0x3 -#define MODEL_g16 0x2 -#define MODEL_o9 0x1 -#define MODEL_o5 0x0 +#define MODEL_Root 0x19 +#define MODEL_g1 0x18 +#define MODEL_g12 0x17 +#define MODEL_g14 0x16 +#define MODEL_o51 0x15 +#define MODEL_o49 0x14 +#define MODEL_o34 0x13 +#define MODEL_o33 0x12 +#define MODEL_o31 0x11 +#define MODEL_o26 0x10 +#define MODEL_g3 0xF +#define MODEL_g7 0xE +#define MODEL_o4 0xD +#define MODEL_o8 0xC +#define MODEL_o6 0xB +#define MODEL_o7 0xA +#define MODEL_g6 0x9 +#define MODEL_o53 0x8 +#define MODEL_o52 0x7 +#define MODEL_g4 0x6 +#define MODEL_g17 0x5 +#define MODEL_o11 0x4 +#define MODEL_o10 0x3 +#define MODEL_g16 0x2 +#define MODEL_o9 0x1 +#define MODEL_o5 0x0 + diff --git a/include/mapfs/jan_18_hit.h b/include/mapfs/jan_18_hit.h index 0a4e19a0cd..74b2accad1 100644 --- a/include/mapfs/jan_18_hit.h +++ b/include/mapfs/jan_18_hit.h @@ -1,14 +1,19 @@ -#define COLLIDER_Root 0xD -#define COLLIDER_g1 0xC -#define COLLIDER_g2 0xB -#define COLLIDER_o27 0xA -#define COLLIDER_o5 0x9 -#define COLLIDER_g4 0x8 -#define COLLIDER_g8 0x7 -#define COLLIDER_o25 0x6 -#define COLLIDER_deilitn 0x5 -#define COLLIDER_deilin 0x4 -#define COLLIDER_g7 0x3 -#define COLLIDER_o23 0x2 -#define COLLIDER_deilitse 0x1 -#define COLLIDER_deilis 0x0 +#define COLLIDER_Root 0xD +#define COLLIDER_g1 0xC +#define COLLIDER_g2 0xB +#define COLLIDER_o27 0xA +#define COLLIDER_o5 0x9 +#define COLLIDER_g4 0x8 +#define COLLIDER_g8 0x7 +#define COLLIDER_o25 0x6 +#define COLLIDER_deilitn 0x5 +#define COLLIDER_deilin 0x4 +#define COLLIDER_g7 0x3 +#define COLLIDER_o23 0x2 +#define COLLIDER_deilitse 0x1 +#define COLLIDER_deilis 0x0 + +#define ZONE_Root 0x2 +#define ZONE_g1 0x1 +#define ZONE_o10 0x0 + diff --git a/include/mapfs/jan_18_shape.h b/include/mapfs/jan_18_shape.h index bc8427d2ed..063089297d 100644 --- a/include/mapfs/jan_18_shape.h +++ b/include/mapfs/jan_18_shape.h @@ -1,25 +1,26 @@ -#define MODEL_Root 0x18 -#define MODEL_g1 0x17 -#define MODEL_g4 0x16 -#define MODEL_g6 0x15 -#define MODEL_o19 0x14 -#define MODEL_o18 0x13 -#define MODEL_o17 0x12 -#define MODEL_o16 0x11 -#define MODEL_o15 0x10 -#define MODEL_g5 0xF -#define MODEL_o12 0xE -#define MODEL_o11 0xD -#define MODEL_o10 0xC -#define MODEL_o8 0xB -#define MODEL_o7 0xA -#define MODEL_g2 0x9 -#define MODEL_o23 0x8 -#define MODEL_o14 0x7 -#define MODEL_o6 0x6 -#define MODEL_o3 0x5 -#define MODEL_g7 0x4 -#define MODEL_g9 0x3 -#define MODEL_o22 0x2 -#define MODEL_g8 0x1 -#define MODEL_o5 0x0 +#define MODEL_Root 0x18 +#define MODEL_g1 0x17 +#define MODEL_g4 0x16 +#define MODEL_g6 0x15 +#define MODEL_o19 0x14 +#define MODEL_o18 0x13 +#define MODEL_o17 0x12 +#define MODEL_o16 0x11 +#define MODEL_o15 0x10 +#define MODEL_g5 0xF +#define MODEL_o12 0xE +#define MODEL_o11 0xD +#define MODEL_o10 0xC +#define MODEL_o8 0xB +#define MODEL_o7 0xA +#define MODEL_g2 0x9 +#define MODEL_o23 0x8 +#define MODEL_o14 0x7 +#define MODEL_o6 0x6 +#define MODEL_o3 0x5 +#define MODEL_g7 0x4 +#define MODEL_g9 0x3 +#define MODEL_o22 0x2 +#define MODEL_g8 0x1 +#define MODEL_o5 0x0 + diff --git a/include/mapfs/jan_19_hit.h b/include/mapfs/jan_19_hit.h index 28d22a2a01..5d4506f736 100644 --- a/include/mapfs/jan_19_hit.h +++ b/include/mapfs/jan_19_hit.h @@ -1,23 +1,37 @@ -#define COLLIDER_Root 0x16 -#define COLLIDER_g1 0x15 -#define COLLIDER_g20 0x14 -#define COLLIDER_o68 0x13 -#define COLLIDER_o67 0x12 -#define COLLIDER_o66 0x11 -#define COLLIDER_o65 0x10 -#define COLLIDER_o64 0xF -#define COLLIDER_o63 0xE -#define COLLIDER_o62 0xD -#define COLLIDER_o61 0xC -#define COLLIDER_o60 0xB -#define COLLIDER_o59 0xA -#define COLLIDER_o58 0x9 -#define COLLIDER_g4 0x8 -#define COLLIDER_g17 0x7 -#define COLLIDER_o46 0x6 -#define COLLIDER_deilite 0x5 -#define COLLIDER_deilie 0x4 -#define COLLIDER_g16 0x3 -#define COLLIDER_o45 0x2 -#define COLLIDER_deilitw 0x1 -#define COLLIDER_deiliw 0x0 +#define COLLIDER_Root 0x16 +#define COLLIDER_g1 0x15 +#define COLLIDER_g20 0x14 +#define COLLIDER_o68 0x13 +#define COLLIDER_o67 0x12 +#define COLLIDER_o66 0x11 +#define COLLIDER_o65 0x10 +#define COLLIDER_o64 0xF +#define COLLIDER_o63 0xE +#define COLLIDER_o62 0xD +#define COLLIDER_o61 0xC +#define COLLIDER_o60 0xB +#define COLLIDER_o59 0xA +#define COLLIDER_o58 0x9 +#define COLLIDER_g4 0x8 +#define COLLIDER_g17 0x7 +#define COLLIDER_o46 0x6 +#define COLLIDER_deilite 0x5 +#define COLLIDER_deilie 0x4 +#define COLLIDER_g16 0x3 +#define COLLIDER_o45 0x2 +#define COLLIDER_deilitw 0x1 +#define COLLIDER_deiliw 0x0 + +#define ZONE_Root 0xB +#define ZONE_g1 0xA +#define ZONE_g15 0x9 +#define ZONE_o44 0x8 +#define ZONE_o45 0x7 +#define ZONE_o43 0x6 +#define ZONE_g3 0x5 +#define ZONE_o6 0x4 +#define ZONE_g14 0x3 +#define ZONE_o40 0x2 +#define ZONE_o41 0x1 +#define ZONE_o39 0x0 + diff --git a/include/mapfs/jan_19_shape.h b/include/mapfs/jan_19_shape.h index 1aaf038bc9..c68500218a 100644 --- a/include/mapfs/jan_19_shape.h +++ b/include/mapfs/jan_19_shape.h @@ -1,19 +1,20 @@ -#define MODEL_Root 0x12 -#define MODEL_g1 0x11 -#define MODEL_g3 0x10 -#define MODEL_g20 0xF -#define MODEL_o49 0xE -#define MODEL_o4 0xD -#define MODEL_o8 0xC -#define MODEL_o6 0xB -#define MODEL_o7 0xA -#define MODEL_g19 0x9 -#define MODEL_o52 0x8 -#define MODEL_o53 0x7 -#define MODEL_g4 0x6 -#define MODEL_g17 0x5 -#define MODEL_o11 0x4 -#define MODEL_o10 0x3 -#define MODEL_g16 0x2 -#define MODEL_o5 0x1 -#define MODEL_o9 0x0 +#define MODEL_Root 0x12 +#define MODEL_g1 0x11 +#define MODEL_g3 0x10 +#define MODEL_g20 0xF +#define MODEL_o49 0xE +#define MODEL_o4 0xD +#define MODEL_o8 0xC +#define MODEL_o6 0xB +#define MODEL_o7 0xA +#define MODEL_g19 0x9 +#define MODEL_o52 0x8 +#define MODEL_o53 0x7 +#define MODEL_g4 0x6 +#define MODEL_g17 0x5 +#define MODEL_o11 0x4 +#define MODEL_o10 0x3 +#define MODEL_g16 0x2 +#define MODEL_o5 0x1 +#define MODEL_o9 0x0 + diff --git a/include/mapfs/jan_22_hit.h b/include/mapfs/jan_22_hit.h index a23f31c94e..27a1a0fc82 100644 --- a/include/mapfs/jan_22_hit.h +++ b/include/mapfs/jan_22_hit.h @@ -1,68 +1,81 @@ -#define COLLIDER_Root 0x43 -#define COLLIDER_g1 0x42 -#define COLLIDER_g118 0x41 -#define COLLIDER_o328 0x40 -#define COLLIDER_o327 0x3F -#define COLLIDER_o326 0x3E -#define COLLIDER_o316 0x3D -#define COLLIDER_o315 0x3C -#define COLLIDER_o314 0x3B -#define COLLIDER_g110 0x3A -#define COLLIDER_o293 0x39 -#define COLLIDER_o292 0x38 -#define COLLIDER_o291 0x37 -#define COLLIDER_g111 0x36 -#define COLLIDER_o294 0x35 -#define COLLIDER_g86 0x34 -#define COLLIDER_o241 0x33 -#define COLLIDER_o240 0x32 -#define COLLIDER_o246 0x31 -#define COLLIDER_g48 0x30 -#define COLLIDER_g82 0x2F -#define COLLIDER_o222 0x2E -#define COLLIDER_o221 0x2D -#define COLLIDER_o220 0x2C -#define COLLIDER_o219 0x2B -#define COLLIDER_o218 0x2A -#define COLLIDER_o217 0x29 -#define COLLIDER_g29 0x28 -#define COLLIDER_o346 0x27 -#define COLLIDER_o339 0x26 -#define COLLIDER_o235 0x25 -#define COLLIDER_o237 0x24 -#define COLLIDER_o100 0x23 -#define COLLIDER_o170 0x22 -#define COLLIDER_g39 0x21 -#define COLLIDER_o171 0x20 -#define COLLIDER_o122 0x1F -#define COLLIDER_o124 0x1E -#define COLLIDER_g3 0x1D -#define COLLIDER_o10 0x1C -#define COLLIDER_o67 0x1B -#define COLLIDER_g32 0x1A -#define COLLIDER_o276 0x19 -#define COLLIDER_o119 0x18 -#define COLLIDER_g2 0x17 -#define COLLIDER_o304 0x16 -#define COLLIDER_o289 0x15 -#define COLLIDER_o288 0x14 -#define COLLIDER_o287 0x13 -#define COLLIDER_o286 0x12 -#define COLLIDER_o70 0x11 -#define COLLIDER_o283 0x10 -#define COLLIDER_o282 0xF -#define COLLIDER_o281 0xE -#define COLLIDER_o280 0xD -#define COLLIDER_o149 0xC -#define COLLIDER_g18 0xB -#define COLLIDER_g60 0xA -#define COLLIDER_deilite 0x9 -#define COLLIDER_deilie 0x8 -#define COLLIDER_g53 0x7 -#define COLLIDER_o148 0x6 -#define COLLIDER_deilitn 0x5 -#define COLLIDER_deilin 0x4 -#define COLLIDER_g52 0x3 -#define COLLIDER_o146 0x2 -#define COLLIDER_deilitw 0x1 -#define COLLIDER_deiliw 0x0 +#define COLLIDER_Root 0x43 +#define COLLIDER_g1 0x42 +#define COLLIDER_g118 0x41 +#define COLLIDER_o328 0x40 +#define COLLIDER_o327 0x3F +#define COLLIDER_o326 0x3E +#define COLLIDER_o316 0x3D +#define COLLIDER_o315 0x3C +#define COLLIDER_o314 0x3B +#define COLLIDER_g110 0x3A +#define COLLIDER_o293 0x39 +#define COLLIDER_o292 0x38 +#define COLLIDER_o291 0x37 +#define COLLIDER_g111 0x36 +#define COLLIDER_o294 0x35 +#define COLLIDER_g86 0x34 +#define COLLIDER_o241 0x33 +#define COLLIDER_o240 0x32 +#define COLLIDER_o246 0x31 +#define COLLIDER_g48 0x30 +#define COLLIDER_g82 0x2F +#define COLLIDER_o222 0x2E +#define COLLIDER_o221 0x2D +#define COLLIDER_o220 0x2C +#define COLLIDER_o219 0x2B +#define COLLIDER_o218 0x2A +#define COLLIDER_o217 0x29 +#define COLLIDER_g29 0x28 +#define COLLIDER_o346 0x27 +#define COLLIDER_o339 0x26 +#define COLLIDER_o235 0x25 +#define COLLIDER_o237 0x24 +#define COLLIDER_o100 0x23 +#define COLLIDER_o170 0x22 +#define COLLIDER_g39 0x21 +#define COLLIDER_o171 0x20 +#define COLLIDER_o122 0x1F +#define COLLIDER_o124 0x1E +#define COLLIDER_g3 0x1D +#define COLLIDER_o10 0x1C +#define COLLIDER_o67 0x1B +#define COLLIDER_g32 0x1A +#define COLLIDER_o276 0x19 +#define COLLIDER_o119 0x18 +#define COLLIDER_g2 0x17 +#define COLLIDER_o304 0x16 +#define COLLIDER_o289 0x15 +#define COLLIDER_o288 0x14 +#define COLLIDER_o287 0x13 +#define COLLIDER_o286 0x12 +#define COLLIDER_o70 0x11 +#define COLLIDER_o283 0x10 +#define COLLIDER_o282 0xF +#define COLLIDER_o281 0xE +#define COLLIDER_o280 0xD +#define COLLIDER_o149 0xC +#define COLLIDER_g18 0xB +#define COLLIDER_g60 0xA +#define COLLIDER_deilite 0x9 +#define COLLIDER_deilie 0x8 +#define COLLIDER_g53 0x7 +#define COLLIDER_o148 0x6 +#define COLLIDER_deilitn 0x5 +#define COLLIDER_deilin 0x4 +#define COLLIDER_g52 0x3 +#define COLLIDER_o146 0x2 +#define COLLIDER_deilitw 0x1 +#define COLLIDER_deiliw 0x0 + +#define ZONE_Root 0xA +#define ZONE_g57 0x9 +#define ZONE_o147 0x8 +#define ZONE_g56 0x7 +#define ZONE_o146 0x6 +#define ZONE_o145 0x5 +#define ZONE_o144 0x4 +#define ZONE_g55 0x3 +#define ZONE_o143 0x2 +#define ZONE_o142 0x1 +#define ZONE_o141 0x0 + diff --git a/include/mapfs/jan_22_shape.h b/include/mapfs/jan_22_shape.h index 8f77e60697..d4ff886989 100644 --- a/include/mapfs/jan_22_shape.h +++ b/include/mapfs/jan_22_shape.h @@ -1,162 +1,163 @@ -#define MODEL_Root 0xA1 -#define MODEL_g83 0xA0 -#define MODEL_g104 0x9F -#define MODEL_o257 0x9E -#define MODEL_o256 0x9D -#define MODEL_o261 0x9C -#define MODEL_g88 0x9B -#define MODEL_g89 0x9A -#define MODEL_o272 0x99 -#define MODEL_o274 0x98 -#define MODEL_o267 0x97 -#define MODEL_o275 0x96 -#define MODEL_g90 0x95 -#define MODEL_o269 0x94 -#define MODEL_g91 0x93 -#define MODEL_o271 0x92 -#define MODEL_o263 0x91 -#define MODEL_g101 0x90 -#define MODEL_o248 0x8F -#define MODEL_o246 0x8E -#define MODEL_o255 0x8D -#define MODEL_g87 0x8C -#define MODEL_o250 0x8B -#define MODEL_o249 0x8A -#define MODEL_g85 0x89 -#define MODEL_o276 0x88 -#define MODEL_o238 0x87 -#define MODEL_o241 0x86 -#define MODEL_o242 0x85 -#define MODEL_g86 0x84 -#define MODEL_o240 0x83 -#define MODEL_o243 0x82 -#define MODEL_o245 0x81 -#define MODEL_g102 0x80 -#define MODEL_o305 0x7F -#define MODEL_o253 0x7E -#define MODEL_o239 0x7D -#define MODEL_o254 0x7C -#define MODEL_o262 0x7B -#define MODEL_g84 0x7A -#define MODEL_o277 0x79 -#define MODEL_o251 0x78 -#define MODEL_g1 0x77 -#define MODEL_g52 0x76 -#define MODEL_g44 0x75 -#define MODEL_g45 0x74 -#define MODEL_g47 0x73 -#define MODEL_o132 0x72 -#define MODEL_g46 0x71 -#define MODEL_o131 0x70 -#define MODEL_g59 0x6F -#define MODEL_o179 0x6E -#define MODEL_o178 0x6D -#define MODEL_o177 0x6C -#define MODEL_o176 0x6B -#define MODEL_o130 0x6A -#define MODEL_o129 0x69 -#define MODEL_g38 0x68 -#define MODEL_g33 0x67 -#define MODEL_g35 0x66 -#define MODEL_o113 0x65 -#define MODEL_g34 0x64 -#define MODEL_o112 0x63 -#define MODEL_g60 0x62 -#define MODEL_o181 0x61 -#define MODEL_o180 0x60 -#define MODEL_o117 0x5F -#define MODEL_o116 0x5E -#define MODEL_g48 0x5D -#define MODEL_g29 0x5C -#define MODEL_g130 0x5B -#define MODEL_o368 0x5A -#define MODEL_o382 0x59 -#define MODEL_o379 0x58 -#define MODEL_o369 0x57 -#define MODEL_o378 0x56 -#define MODEL_o375 0x55 -#define MODEL_o372 0x54 -#define MODEL_o366 0x53 -#define MODEL_g57 0x52 -#define MODEL_o172 0x51 -#define MODEL_o171 0x50 -#define MODEL_o170 0x4F -#define MODEL_o169 0x4E -#define MODEL_o168 0x4D -#define MODEL_o167 0x4C -#define MODEL_o166 0x4B -#define MODEL_o153 0x4A -#define MODEL_g58 0x49 -#define MODEL_o175 0x48 -#define MODEL_o174 0x47 -#define MODEL_o173 0x46 -#define MODEL_o148 0x45 -#define MODEL_g39 0x44 -#define MODEL_o123 0x43 -#define MODEL_o145 0x42 -#define MODEL_g54 0x41 -#define MODEL_o147 0x40 -#define MODEL_g53 0x3F -#define MODEL_o124 0x3E -#define MODEL_o146 0x3D -#define MODEL_g3 0x3C -#define MODEL_g49 0x3B -#define MODEL_o319 0x3A -#define MODEL_o318 0x39 -#define MODEL_g19 0x38 -#define MODEL_o60 0x37 -#define MODEL_o62 0x36 -#define MODEL_o59 0x35 -#define MODEL_o56 0x34 -#define MODEL_g11 0x33 -#define MODEL_o138 0x32 -#define MODEL_o22 0x31 -#define MODEL_g4 0x30 -#define MODEL_o320 0x2F -#define MODEL_o10 0x2E -#define MODEL_g5 0x2D -#define MODEL_g127 0x2C -#define MODEL_o351 0x2B -#define MODEL_g126 0x2A -#define MODEL_o350 0x29 -#define MODEL_g125 0x28 -#define MODEL_o349 0x27 -#define MODEL_g115 0x26 -#define MODEL_o339 0x25 -#define MODEL_g114 0x24 -#define MODEL_o338 0x23 -#define MODEL_g113 0x22 -#define MODEL_o337 0x21 -#define MODEL_g51 0x20 -#define MODEL_o144 0x1F -#define MODEL_g50 0x1E -#define MODEL_o143 0x1D -#define MODEL_o20 0x1C -#define MODEL_g26 0x1B -#define MODEL_g107 0x1A -#define MODEL_o93 0x19 -#define MODEL_o78 0x18 -#define MODEL_g106 0x17 -#define MODEL_o134 0x16 -#define MODEL_o133 0x15 -#define MODEL_g105 0x14 -#define MODEL_o94 0x13 -#define MODEL_o81 0x12 -#define MODEL_g128 0x11 -#define MODEL_o365 0x10 -#define MODEL_o360 0xF -#define MODEL_o361 0xE -#define MODEL_o362 0xD -#define MODEL_o363 0xC -#define MODEL_o364 0xB -#define MODEL_o353 0xA -#define MODEL_g2 0x9 -#define MODEL_o70 0x8 -#define MODEL_o14 0x7 -#define MODEL_g18 0x6 -#define MODEL_g56 0x5 -#define MODEL_o5 0x4 -#define MODEL_o4 0x3 -#define MODEL_g55 0x2 -#define MODEL_o3 0x1 -#define MODEL_o2 0x0 +#define MODEL_Root 0xA1 +#define MODEL_g83 0xA0 +#define MODEL_g104 0x9F +#define MODEL_o257 0x9E +#define MODEL_o256 0x9D +#define MODEL_o261 0x9C +#define MODEL_g88 0x9B +#define MODEL_g89 0x9A +#define MODEL_o272 0x99 +#define MODEL_o274 0x98 +#define MODEL_o267 0x97 +#define MODEL_o275 0x96 +#define MODEL_g90 0x95 +#define MODEL_o269 0x94 +#define MODEL_g91 0x93 +#define MODEL_o271 0x92 +#define MODEL_o263 0x91 +#define MODEL_g101 0x90 +#define MODEL_o248 0x8F +#define MODEL_o246 0x8E +#define MODEL_o255 0x8D +#define MODEL_g87 0x8C +#define MODEL_o250 0x8B +#define MODEL_o249 0x8A +#define MODEL_g85 0x89 +#define MODEL_o276 0x88 +#define MODEL_o238 0x87 +#define MODEL_o241 0x86 +#define MODEL_o242 0x85 +#define MODEL_g86 0x84 +#define MODEL_o240 0x83 +#define MODEL_o243 0x82 +#define MODEL_o245 0x81 +#define MODEL_g102 0x80 +#define MODEL_o305 0x7F +#define MODEL_o253 0x7E +#define MODEL_o239 0x7D +#define MODEL_o254 0x7C +#define MODEL_o262 0x7B +#define MODEL_g84 0x7A +#define MODEL_o277 0x79 +#define MODEL_o251 0x78 +#define MODEL_g1 0x77 +#define MODEL_g52 0x76 +#define MODEL_g44 0x75 +#define MODEL_g45 0x74 +#define MODEL_g47 0x73 +#define MODEL_o132 0x72 +#define MODEL_g46 0x71 +#define MODEL_o131 0x70 +#define MODEL_g59 0x6F +#define MODEL_o179 0x6E +#define MODEL_o178 0x6D +#define MODEL_o177 0x6C +#define MODEL_o176 0x6B +#define MODEL_o130 0x6A +#define MODEL_o129 0x69 +#define MODEL_g38 0x68 +#define MODEL_g33 0x67 +#define MODEL_g35 0x66 +#define MODEL_o113 0x65 +#define MODEL_g34 0x64 +#define MODEL_o112 0x63 +#define MODEL_g60 0x62 +#define MODEL_o181 0x61 +#define MODEL_o180 0x60 +#define MODEL_o117 0x5F +#define MODEL_o116 0x5E +#define MODEL_g48 0x5D +#define MODEL_g29 0x5C +#define MODEL_g130 0x5B +#define MODEL_o368 0x5A +#define MODEL_o382 0x59 +#define MODEL_o379 0x58 +#define MODEL_o369 0x57 +#define MODEL_o378 0x56 +#define MODEL_o375 0x55 +#define MODEL_o372 0x54 +#define MODEL_o366 0x53 +#define MODEL_g57 0x52 +#define MODEL_o172 0x51 +#define MODEL_o171 0x50 +#define MODEL_o170 0x4F +#define MODEL_o169 0x4E +#define MODEL_o168 0x4D +#define MODEL_o167 0x4C +#define MODEL_o166 0x4B +#define MODEL_o153 0x4A +#define MODEL_g58 0x49 +#define MODEL_o175 0x48 +#define MODEL_o174 0x47 +#define MODEL_o173 0x46 +#define MODEL_o148 0x45 +#define MODEL_g39 0x44 +#define MODEL_o123 0x43 +#define MODEL_o145 0x42 +#define MODEL_g54 0x41 +#define MODEL_o147 0x40 +#define MODEL_g53 0x3F +#define MODEL_o124 0x3E +#define MODEL_o146 0x3D +#define MODEL_g3 0x3C +#define MODEL_g49 0x3B +#define MODEL_o319 0x3A +#define MODEL_o318 0x39 +#define MODEL_g19 0x38 +#define MODEL_o60 0x37 +#define MODEL_o62 0x36 +#define MODEL_o59 0x35 +#define MODEL_o56 0x34 +#define MODEL_g11 0x33 +#define MODEL_o138 0x32 +#define MODEL_o22 0x31 +#define MODEL_g4 0x30 +#define MODEL_o320 0x2F +#define MODEL_o10 0x2E +#define MODEL_g5 0x2D +#define MODEL_g127 0x2C +#define MODEL_o351 0x2B +#define MODEL_g126 0x2A +#define MODEL_o350 0x29 +#define MODEL_g125 0x28 +#define MODEL_o349 0x27 +#define MODEL_g115 0x26 +#define MODEL_o339 0x25 +#define MODEL_g114 0x24 +#define MODEL_o338 0x23 +#define MODEL_g113 0x22 +#define MODEL_o337 0x21 +#define MODEL_g51 0x20 +#define MODEL_o144 0x1F +#define MODEL_g50 0x1E +#define MODEL_o143 0x1D +#define MODEL_o20 0x1C +#define MODEL_g26 0x1B +#define MODEL_g107 0x1A +#define MODEL_o93 0x19 +#define MODEL_o78 0x18 +#define MODEL_g106 0x17 +#define MODEL_o134 0x16 +#define MODEL_o133 0x15 +#define MODEL_g105 0x14 +#define MODEL_o94 0x13 +#define MODEL_o81 0x12 +#define MODEL_g128 0x11 +#define MODEL_o365 0x10 +#define MODEL_o360 0xF +#define MODEL_o361 0xE +#define MODEL_o362 0xD +#define MODEL_o363 0xC +#define MODEL_o364 0xB +#define MODEL_o353 0xA +#define MODEL_g2 0x9 +#define MODEL_o70 0x8 +#define MODEL_o14 0x7 +#define MODEL_g18 0x6 +#define MODEL_g56 0x5 +#define MODEL_o5 0x4 +#define MODEL_o4 0x3 +#define MODEL_g55 0x2 +#define MODEL_o3 0x1 +#define MODEL_o2 0x0 + diff --git a/include/mapfs/jan_23_hit.h b/include/mapfs/jan_23_hit.h index 77b35a9027..fb92134dd0 100644 --- a/include/mapfs/jan_23_hit.h +++ b/include/mapfs/jan_23_hit.h @@ -1,13 +1,18 @@ -#define COLLIDER_Root 0xC -#define COLLIDER_g1 0xB -#define COLLIDER_g7 0xA -#define COLLIDER_o39 0x9 -#define COLLIDER_o31 0x8 -#define COLLIDER_o24 0x7 -#define COLLIDER_o5 0x6 -#define COLLIDER_o3 0x5 -#define COLLIDER_o38 0x4 -#define COLLIDER_g2 0x3 -#define COLLIDER_o30 0x2 -#define COLLIDER_deilitw 0x1 -#define COLLIDER_deiliw 0x0 +#define COLLIDER_Root 0xC +#define COLLIDER_g1 0xB +#define COLLIDER_g7 0xA +#define COLLIDER_o39 0x9 +#define COLLIDER_o31 0x8 +#define COLLIDER_o24 0x7 +#define COLLIDER_o5 0x6 +#define COLLIDER_o3 0x5 +#define COLLIDER_o38 0x4 +#define COLLIDER_g2 0x3 +#define COLLIDER_o30 0x2 +#define COLLIDER_deilitw 0x1 +#define COLLIDER_deiliw 0x0 + +#define ZONE_Root 0x2 +#define ZONE_g1 0x1 +#define ZONE_o29 0x0 + diff --git a/include/mapfs/jan_23_shape.h b/include/mapfs/jan_23_shape.h index 75d0ebce0b..966d3d28a9 100644 --- a/include/mapfs/jan_23_shape.h +++ b/include/mapfs/jan_23_shape.h @@ -1,27 +1,28 @@ -#define MODEL_Root 0x1A -#define MODEL_g1 0x19 -#define MODEL_g4 0x18 -#define MODEL_g5 0x17 -#define MODEL_o12 0x16 -#define MODEL_o8 0x15 -#define MODEL_o29 0x14 -#define MODEL_g10 0x13 -#define MODEL_o39 0x12 -#define MODEL_o40 0x11 -#define MODEL_o41 0x10 -#define MODEL_o35 0xF -#define MODEL_o11 0xE -#define MODEL_o10 0xD -#define MODEL_o7 0xC -#define MODEL_g7 0xB -#define MODEL_o32 0xA -#define MODEL_o28 0x9 -#define MODEL_o27 0x8 -#define MODEL_o24 0x7 -#define MODEL_o22 0x6 -#define MODEL_g2 0x5 -#define MODEL_g9 0x4 -#define MODEL_o34 0x3 -#define MODEL_o33 0x2 -#define MODEL_o5 0x1 -#define MODEL_o3 0x0 +#define MODEL_Root 0x1A +#define MODEL_g1 0x19 +#define MODEL_g4 0x18 +#define MODEL_g5 0x17 +#define MODEL_o12 0x16 +#define MODEL_o8 0x15 +#define MODEL_o29 0x14 +#define MODEL_g10 0x13 +#define MODEL_o39 0x12 +#define MODEL_o40 0x11 +#define MODEL_o41 0x10 +#define MODEL_o35 0xF +#define MODEL_o11 0xE +#define MODEL_o10 0xD +#define MODEL_o7 0xC +#define MODEL_g7 0xB +#define MODEL_o32 0xA +#define MODEL_o28 0x9 +#define MODEL_o27 0x8 +#define MODEL_o24 0x7 +#define MODEL_o22 0x6 +#define MODEL_g2 0x5 +#define MODEL_g9 0x4 +#define MODEL_o34 0x3 +#define MODEL_o33 0x2 +#define MODEL_o5 0x1 +#define MODEL_o3 0x0 + diff --git a/include/mapfs/jan_bt00_hit.h b/include/mapfs/jan_bt00_hit.h index 6beebe566b..de5ee871e7 100644 --- a/include/mapfs/jan_bt00_hit.h +++ b/include/mapfs/jan_bt00_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_g1 0x1 -#define COLLIDER_o1 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_g1 0x1 +#define COLLIDER_o1 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/jan_bt00_shape.h b/include/mapfs/jan_bt00_shape.h index 78e394c9df..9314f704a3 100644 --- a/include/mapfs/jan_bt00_shape.h +++ b/include/mapfs/jan_bt00_shape.h @@ -1,56 +1,57 @@ -#define MODEL_Root 0x37 -#define MODEL_g87 0x36 -#define MODEL_g86 0x35 -#define MODEL_o387 0x34 -#define MODEL_o382 0x33 -#define MODEL_o386 0x32 -#define MODEL_o385 0x31 -#define MODEL_o384 0x30 -#define MODEL_g85 0x2F -#define MODEL_o381 0x2E -#define MODEL_o380 0x2D -#define MODEL_g83 0x2C -#define MODEL_g89 0x2B -#define MODEL_o353 0x2A -#define MODEL_o352 0x29 -#define MODEL_o349 0x28 -#define MODEL_o345 0x27 -#define MODEL_o346 0x26 -#define MODEL_o351 0x25 -#define MODEL_o350 0x24 -#define MODEL_o344 0x23 -#define MODEL_o391 0x22 -#define MODEL_g76 0x21 -#define MODEL_g88 0x20 -#define MODEL_o369 0x1F -#define MODEL_o368 0x1E -#define MODEL_o366 0x1D -#define MODEL_o364 0x1C -#define MODEL_o367 0x1B -#define MODEL_o365 0x1A -#define MODEL_o363 0x19 -#define MODEL_o362 0x18 -#define MODEL_o390 0x17 -#define MODEL_g80 0x16 -#define MODEL_o354 0x15 -#define MODEL_o355 0x14 -#define MODEL_g82 0x13 -#define MODEL_o360 0x12 -#define MODEL_o361 0x11 -#define MODEL_o375 0x10 -#define MODEL_o374 0xF -#define MODEL_o372 0xE -#define MODEL_o373 0xD -#define MODEL_g73 0xC -#define MODEL_o388 0xB -#define MODEL_o336 0xA -#define MODEL_o335 0x9 -#define MODEL_o334 0x8 -#define MODEL_o333 0x7 -#define MODEL_o332 0x6 -#define MODEL_g74 0x5 -#define MODEL_o338 0x4 -#define MODEL_o337 0x3 -#define MODEL_g75 0x2 -#define MODEL_o340 0x1 -#define MODEL_o339 0x0 +#define MODEL_Root 0x37 +#define MODEL_g87 0x36 +#define MODEL_g86 0x35 +#define MODEL_o387 0x34 +#define MODEL_o382 0x33 +#define MODEL_o386 0x32 +#define MODEL_o385 0x31 +#define MODEL_o384 0x30 +#define MODEL_g85 0x2F +#define MODEL_o381 0x2E +#define MODEL_o380 0x2D +#define MODEL_g83 0x2C +#define MODEL_g89 0x2B +#define MODEL_o353 0x2A +#define MODEL_o352 0x29 +#define MODEL_o349 0x28 +#define MODEL_o345 0x27 +#define MODEL_o346 0x26 +#define MODEL_o351 0x25 +#define MODEL_o350 0x24 +#define MODEL_o344 0x23 +#define MODEL_o391 0x22 +#define MODEL_g76 0x21 +#define MODEL_g88 0x20 +#define MODEL_o369 0x1F +#define MODEL_o368 0x1E +#define MODEL_o366 0x1D +#define MODEL_o364 0x1C +#define MODEL_o367 0x1B +#define MODEL_o365 0x1A +#define MODEL_o363 0x19 +#define MODEL_o362 0x18 +#define MODEL_o390 0x17 +#define MODEL_g80 0x16 +#define MODEL_o354 0x15 +#define MODEL_o355 0x14 +#define MODEL_g82 0x13 +#define MODEL_o360 0x12 +#define MODEL_o361 0x11 +#define MODEL_o375 0x10 +#define MODEL_o374 0xF +#define MODEL_o372 0xE +#define MODEL_o373 0xD +#define MODEL_g73 0xC +#define MODEL_o388 0xB +#define MODEL_o336 0xA +#define MODEL_o335 0x9 +#define MODEL_o334 0x8 +#define MODEL_o333 0x7 +#define MODEL_o332 0x6 +#define MODEL_g74 0x5 +#define MODEL_o338 0x4 +#define MODEL_o337 0x3 +#define MODEL_g75 0x2 +#define MODEL_o340 0x1 +#define MODEL_o339 0x0 + diff --git a/include/mapfs/jan_bt01_hit.h b/include/mapfs/jan_bt01_hit.h index 6beebe566b..de5ee871e7 100644 --- a/include/mapfs/jan_bt01_hit.h +++ b/include/mapfs/jan_bt01_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_g1 0x1 -#define COLLIDER_o1 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_g1 0x1 +#define COLLIDER_o1 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/jan_bt01_shape.h b/include/mapfs/jan_bt01_shape.h index ebfa47df21..64431047e2 100644 --- a/include/mapfs/jan_bt01_shape.h +++ b/include/mapfs/jan_bt01_shape.h @@ -1,66 +1,67 @@ -#define MODEL_Root 0x41 -#define MODEL_g1 0x40 -#define MODEL_g18 0x3F -#define MODEL_g21 0x3E -#define MODEL_o80 0x3D -#define MODEL_o79 0x3C -#define MODEL_o78 0x3B -#define MODEL_o77 0x3A -#define MODEL_o76 0x39 -#define MODEL_o75 0x38 -#define MODEL_o74 0x37 -#define MODEL_o73 0x36 -#define MODEL_g20 0x35 -#define MODEL_o72 0x34 -#define MODEL_o71 0x33 -#define MODEL_o70 0x32 -#define MODEL_o69 0x31 -#define MODEL_o68 0x30 -#define MODEL_o67 0x2F -#define MODEL_o66 0x2E -#define MODEL_o65 0x2D -#define MODEL_g19 0x2C -#define MODEL_o63 0x2B -#define MODEL_o62 0x2A -#define MODEL_o61 0x29 -#define MODEL_g17 0x28 -#define MODEL_g15 0x27 -#define MODEL_o29 0x26 -#define MODEL_o26 0x25 -#define MODEL_o25 0x24 -#define MODEL_g13 0x23 -#define MODEL_o59 0x22 -#define MODEL_o58 0x21 -#define MODEL_o57 0x20 -#define MODEL_o56 0x1F -#define MODEL_o50 0x1E -#define MODEL_g12 0x1D -#define MODEL_o46 0x1C -#define MODEL_o45 0x1B -#define MODEL_o43 0x1A -#define MODEL_o48 0x19 -#define MODEL_o44 0x18 -#define MODEL_o47 0x17 -#define MODEL_o33 0x16 -#define MODEL_o49 0x15 -#define MODEL_o86 0x14 -#define MODEL_g16 0x13 -#define MODEL_o85 0x12 -#define MODEL_o60 0x11 -#define MODEL_o28 0x10 -#define MODEL_o27 0xF -#define MODEL_o24 0xE -#define MODEL_o23 0xD -#define MODEL_g14 0xC -#define MODEL_o53 0xB -#define MODEL_o54 0xA -#define MODEL_o55 0x9 -#define MODEL_g5 0x8 -#define MODEL_o10 0x7 -#define MODEL_o9 0x6 -#define MODEL_o8 0x5 -#define MODEL_o7 0x4 -#define MODEL_o6 0x3 -#define MODEL_g3 0x2 -#define MODEL_o4 0x1 -#define MODEL_o5 0x0 +#define MODEL_Root 0x41 +#define MODEL_g1 0x40 +#define MODEL_g18 0x3F +#define MODEL_g21 0x3E +#define MODEL_o80 0x3D +#define MODEL_o79 0x3C +#define MODEL_o78 0x3B +#define MODEL_o77 0x3A +#define MODEL_o76 0x39 +#define MODEL_o75 0x38 +#define MODEL_o74 0x37 +#define MODEL_o73 0x36 +#define MODEL_g20 0x35 +#define MODEL_o72 0x34 +#define MODEL_o71 0x33 +#define MODEL_o70 0x32 +#define MODEL_o69 0x31 +#define MODEL_o68 0x30 +#define MODEL_o67 0x2F +#define MODEL_o66 0x2E +#define MODEL_o65 0x2D +#define MODEL_g19 0x2C +#define MODEL_o63 0x2B +#define MODEL_o62 0x2A +#define MODEL_o61 0x29 +#define MODEL_g17 0x28 +#define MODEL_g15 0x27 +#define MODEL_o29 0x26 +#define MODEL_o26 0x25 +#define MODEL_o25 0x24 +#define MODEL_g13 0x23 +#define MODEL_o59 0x22 +#define MODEL_o58 0x21 +#define MODEL_o57 0x20 +#define MODEL_o56 0x1F +#define MODEL_o50 0x1E +#define MODEL_g12 0x1D +#define MODEL_o46 0x1C +#define MODEL_o45 0x1B +#define MODEL_o43 0x1A +#define MODEL_o48 0x19 +#define MODEL_o44 0x18 +#define MODEL_o47 0x17 +#define MODEL_o33 0x16 +#define MODEL_o49 0x15 +#define MODEL_o86 0x14 +#define MODEL_g16 0x13 +#define MODEL_o85 0x12 +#define MODEL_o60 0x11 +#define MODEL_o28 0x10 +#define MODEL_o27 0xF +#define MODEL_o24 0xE +#define MODEL_o23 0xD +#define MODEL_g14 0xC +#define MODEL_o53 0xB +#define MODEL_o54 0xA +#define MODEL_o55 0x9 +#define MODEL_g5 0x8 +#define MODEL_o10 0x7 +#define MODEL_o9 0x6 +#define MODEL_o8 0x5 +#define MODEL_o7 0x4 +#define MODEL_o6 0x3 +#define MODEL_g3 0x2 +#define MODEL_o4 0x1 +#define MODEL_o5 0x0 + diff --git a/include/mapfs/jan_bt02_hit.h b/include/mapfs/jan_bt02_hit.h index 6beebe566b..de5ee871e7 100644 --- a/include/mapfs/jan_bt02_hit.h +++ b/include/mapfs/jan_bt02_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_g1 0x1 -#define COLLIDER_o1 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_g1 0x1 +#define COLLIDER_o1 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/jan_bt02_shape.h b/include/mapfs/jan_bt02_shape.h index a1f0fe47b7..edb464f7a4 100644 --- a/include/mapfs/jan_bt02_shape.h +++ b/include/mapfs/jan_bt02_shape.h @@ -1,47 +1,48 @@ -#define MODEL_Root 0x2E -#define MODEL_g18 0x2D -#define MODEL_o56 0x2C -#define MODEL_o59 0x2B -#define MODEL_g14 0x2A -#define MODEL_o26 0x29 -#define MODEL_o25 0x28 -#define MODEL_g12 0x27 -#define MODEL_o46 0x26 -#define MODEL_o43 0x25 -#define MODEL_o45 0x24 -#define MODEL_o33 0x23 -#define MODEL_o72 0x22 -#define MODEL_o47 0x21 -#define MODEL_o44 0x20 -#define MODEL_o48 0x1F -#define MODEL_o49 0x1E -#define MODEL_g19 0x1D -#define MODEL_o67 0x1C -#define MODEL_o68 0x1B -#define MODEL_g15 0x1A -#define MODEL_o55 0x19 -#define MODEL_o54 0x18 -#define MODEL_o53 0x17 -#define MODEL_o62 0x16 -#define MODEL_o63 0x15 -#define MODEL_o61 0x14 -#define MODEL_o60 0x13 -#define MODEL_o58 0x12 -#define MODEL_g5 0x11 -#define MODEL_o10 0x10 -#define MODEL_o9 0xF -#define MODEL_o8 0xE -#define MODEL_o7 0xD -#define MODEL_o6 0xC -#define MODEL_o70 0xB -#define MODEL_o3 0xA -#define MODEL_g1 0x9 -#define MODEL_g17 0x8 -#define MODEL_o66 0x7 -#define MODEL_o65 0x6 -#define MODEL_o64 0x5 -#define MODEL_g16 0x4 -#define MODEL_o57 0x3 -#define MODEL_g3 0x2 -#define MODEL_o71 0x1 -#define MODEL_o5 0x0 +#define MODEL_Root 0x2E +#define MODEL_g18 0x2D +#define MODEL_o56 0x2C +#define MODEL_o59 0x2B +#define MODEL_g14 0x2A +#define MODEL_o26 0x29 +#define MODEL_o25 0x28 +#define MODEL_g12 0x27 +#define MODEL_o46 0x26 +#define MODEL_o43 0x25 +#define MODEL_o45 0x24 +#define MODEL_o33 0x23 +#define MODEL_o72 0x22 +#define MODEL_o47 0x21 +#define MODEL_o44 0x20 +#define MODEL_o48 0x1F +#define MODEL_o49 0x1E +#define MODEL_g19 0x1D +#define MODEL_o67 0x1C +#define MODEL_o68 0x1B +#define MODEL_g15 0x1A +#define MODEL_o55 0x19 +#define MODEL_o54 0x18 +#define MODEL_o53 0x17 +#define MODEL_o62 0x16 +#define MODEL_o63 0x15 +#define MODEL_o61 0x14 +#define MODEL_o60 0x13 +#define MODEL_o58 0x12 +#define MODEL_g5 0x11 +#define MODEL_o10 0x10 +#define MODEL_o9 0xF +#define MODEL_o8 0xE +#define MODEL_o7 0xD +#define MODEL_o6 0xC +#define MODEL_o70 0xB +#define MODEL_o3 0xA +#define MODEL_g1 0x9 +#define MODEL_g17 0x8 +#define MODEL_o66 0x7 +#define MODEL_o65 0x6 +#define MODEL_o64 0x5 +#define MODEL_g16 0x4 +#define MODEL_o57 0x3 +#define MODEL_g3 0x2 +#define MODEL_o71 0x1 +#define MODEL_o5 0x0 + diff --git a/include/mapfs/jan_bt03_hit.h b/include/mapfs/jan_bt03_hit.h index 6beebe566b..de5ee871e7 100644 --- a/include/mapfs/jan_bt03_hit.h +++ b/include/mapfs/jan_bt03_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_g1 0x1 -#define COLLIDER_o1 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_g1 0x1 +#define COLLIDER_o1 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/jan_bt03_shape.h b/include/mapfs/jan_bt03_shape.h index c5fdbe711d..5a64e826ec 100644 --- a/include/mapfs/jan_bt03_shape.h +++ b/include/mapfs/jan_bt03_shape.h @@ -1,69 +1,70 @@ -#define MODEL_Root 0x44 -#define MODEL_g1 0x43 -#define MODEL_g39 0x42 -#define MODEL_g44 0x41 -#define MODEL_o91 0x40 -#define MODEL_o90 0x3F -#define MODEL_o86 0x3E -#define MODEL_o89 0x3D -#define MODEL_g43 0x3C -#define MODEL_o88 0x3B -#define MODEL_o87 0x3A -#define MODEL_g41 0x39 -#define MODEL_o81 0x38 -#define MODEL_o80 0x37 -#define MODEL_o79 0x36 -#define MODEL_o78 0x35 -#define MODEL_o77 0x34 -#define MODEL_o94 0x33 -#define MODEL_g40 0x32 -#define MODEL_o76 0x31 -#define MODEL_o75 0x30 -#define MODEL_o74 0x2F -#define MODEL_o73 0x2E -#define MODEL_o72 0x2D -#define MODEL_o93 0x2C -#define MODEL_g34 0x2B -#define MODEL_o85 0x2A -#define MODEL_o84 0x29 -#define MODEL_o83 0x28 -#define MODEL_o82 0x27 -#define MODEL_o56 0x26 -#define MODEL_o55 0x25 -#define MODEL_g38 0x24 -#define MODEL_g33 0x23 -#define MODEL_o27 0x22 -#define MODEL_o28 0x21 -#define MODEL_o29 0x20 -#define MODEL_o60 0x1F -#define MODEL_o59 0x1E -#define MODEL_o92 0x1D -#define MODEL_g17 0x1C -#define MODEL_o34 0x1B -#define MODEL_o33 0x1A -#define MODEL_o40 0x19 -#define MODEL_o39 0x18 -#define MODEL_o41 0x17 -#define MODEL_g2 0x16 -#define MODEL_g42 0x15 -#define MODEL_o36 0x14 -#define MODEL_o35 0x13 -#define MODEL_g22 0x12 -#define MODEL_o46 0x11 -#define MODEL_o45 0x10 -#define MODEL_g35 0xF -#define MODEL_o67 0xE -#define MODEL_o66 0xD -#define MODEL_o65 0xC -#define MODEL_o62 0xB -#define MODEL_o61 0xA -#define MODEL_g4 0x9 -#define MODEL_o8 0x8 -#define MODEL_o7 0x7 -#define MODEL_o6 0x6 -#define MODEL_g3 0x5 -#define MODEL_o5 0x4 -#define MODEL_o4 0x3 -#define MODEL_o3 0x2 -#define MODEL_o2 0x1 -#define MODEL_o1 0x0 +#define MODEL_Root 0x44 +#define MODEL_g1 0x43 +#define MODEL_g39 0x42 +#define MODEL_g44 0x41 +#define MODEL_o91 0x40 +#define MODEL_o90 0x3F +#define MODEL_o86 0x3E +#define MODEL_o89 0x3D +#define MODEL_g43 0x3C +#define MODEL_o88 0x3B +#define MODEL_o87 0x3A +#define MODEL_g41 0x39 +#define MODEL_o81 0x38 +#define MODEL_o80 0x37 +#define MODEL_o79 0x36 +#define MODEL_o78 0x35 +#define MODEL_o77 0x34 +#define MODEL_o94 0x33 +#define MODEL_g40 0x32 +#define MODEL_o76 0x31 +#define MODEL_o75 0x30 +#define MODEL_o74 0x2F +#define MODEL_o73 0x2E +#define MODEL_o72 0x2D +#define MODEL_o93 0x2C +#define MODEL_g34 0x2B +#define MODEL_o85 0x2A +#define MODEL_o84 0x29 +#define MODEL_o83 0x28 +#define MODEL_o82 0x27 +#define MODEL_o56 0x26 +#define MODEL_o55 0x25 +#define MODEL_g38 0x24 +#define MODEL_g33 0x23 +#define MODEL_o27 0x22 +#define MODEL_o28 0x21 +#define MODEL_o29 0x20 +#define MODEL_o60 0x1F +#define MODEL_o59 0x1E +#define MODEL_o92 0x1D +#define MODEL_g17 0x1C +#define MODEL_o34 0x1B +#define MODEL_o33 0x1A +#define MODEL_o40 0x19 +#define MODEL_o39 0x18 +#define MODEL_o41 0x17 +#define MODEL_g2 0x16 +#define MODEL_g42 0x15 +#define MODEL_o36 0x14 +#define MODEL_o35 0x13 +#define MODEL_g22 0x12 +#define MODEL_o46 0x11 +#define MODEL_o45 0x10 +#define MODEL_g35 0xF +#define MODEL_o67 0xE +#define MODEL_o66 0xD +#define MODEL_o65 0xC +#define MODEL_o62 0xB +#define MODEL_o61 0xA +#define MODEL_g4 0x9 +#define MODEL_o8 0x8 +#define MODEL_o7 0x7 +#define MODEL_o6 0x6 +#define MODEL_g3 0x5 +#define MODEL_o5 0x4 +#define MODEL_o4 0x3 +#define MODEL_o3 0x2 +#define MODEL_o2 0x1 +#define MODEL_o1 0x0 + diff --git a/include/mapfs/jan_bt04_hit.h b/include/mapfs/jan_bt04_hit.h index 6beebe566b..de5ee871e7 100644 --- a/include/mapfs/jan_bt04_hit.h +++ b/include/mapfs/jan_bt04_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_g1 0x1 -#define COLLIDER_o1 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_g1 0x1 +#define COLLIDER_o1 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/jan_bt04_shape.h b/include/mapfs/jan_bt04_shape.h index efa1d1c1c4..7461ce0bd2 100644 --- a/include/mapfs/jan_bt04_shape.h +++ b/include/mapfs/jan_bt04_shape.h @@ -1,68 +1,69 @@ -#define MODEL_Root 0x43 -#define MODEL_g1 0x42 -#define MODEL_g111 0x41 -#define MODEL_o270 0x40 -#define MODEL_o269 0x3F -#define MODEL_o268 0x3E -#define MODEL_g113 0x3D -#define MODEL_o266 0x3C -#define MODEL_o265 0x3B -#define MODEL_o264 0x3A -#define MODEL_g112 0x39 -#define MODEL_o276 0x38 -#define MODEL_o274 0x37 -#define MODEL_o278 0x36 -#define MODEL_o277 0x35 -#define MODEL_o279 0x34 -#define MODEL_o275 0x33 -#define MODEL_o253 0x32 -#define MODEL_o271 0x31 -#define MODEL_o280 0x30 -#define MODEL_o281 0x2F -#define MODEL_g110 0x2E -#define MODEL_o249 0x2D -#define MODEL_o248 0x2C -#define MODEL_o247 0x2B -#define MODEL_o250 0x2A -#define MODEL_g10 0x29 -#define MODEL_o37 0x28 -#define MODEL_o33 0x27 -#define MODEL_o34 0x26 -#define MODEL_o31 0x25 -#define MODEL_o28 0x24 -#define MODEL_o27 0x23 -#define MODEL_o29 0x22 -#define MODEL_g2 0x21 -#define MODEL_g9 0x20 -#define MODEL_o36 0x1F -#define MODEL_o35 0x1E -#define MODEL_o32 0x1D -#define MODEL_o30 0x1C -#define MODEL_o24 0x1B -#define MODEL_o23 0x1A -#define MODEL_g7 0x19 -#define MODEL_o26 0x18 -#define MODEL_o25 0x17 -#define MODEL_o22 0x16 -#define MODEL_o21 0x15 -#define MODEL_g6 0x14 -#define MODEL_o19 0x13 -#define MODEL_o20 0x12 -#define MODEL_o18 0x11 -#define MODEL_o16 0x10 -#define MODEL_o251 0xF -#define MODEL_o272 0xE -#define MODEL_g8 0xD -#define MODEL_o15 0xC -#define MODEL_o14 0xB -#define MODEL_o13 0xA -#define MODEL_g5 0x9 -#define MODEL_o12 0x8 -#define MODEL_o11 0x7 -#define MODEL_o10 0x6 -#define MODEL_o9 0x5 -#define MODEL_o8 0x4 -#define MODEL_g4 0x3 -#define MODEL_o7 0x2 -#define MODEL_o6 0x1 -#define MODEL_o5 0x0 +#define MODEL_Root 0x43 +#define MODEL_g1 0x42 +#define MODEL_g111 0x41 +#define MODEL_o270 0x40 +#define MODEL_o269 0x3F +#define MODEL_o268 0x3E +#define MODEL_g113 0x3D +#define MODEL_o266 0x3C +#define MODEL_o265 0x3B +#define MODEL_o264 0x3A +#define MODEL_g112 0x39 +#define MODEL_o276 0x38 +#define MODEL_o274 0x37 +#define MODEL_o278 0x36 +#define MODEL_o277 0x35 +#define MODEL_o279 0x34 +#define MODEL_o275 0x33 +#define MODEL_o253 0x32 +#define MODEL_o271 0x31 +#define MODEL_o280 0x30 +#define MODEL_o281 0x2F +#define MODEL_g110 0x2E +#define MODEL_o249 0x2D +#define MODEL_o248 0x2C +#define MODEL_o247 0x2B +#define MODEL_o250 0x2A +#define MODEL_g10 0x29 +#define MODEL_o37 0x28 +#define MODEL_o33 0x27 +#define MODEL_o34 0x26 +#define MODEL_o31 0x25 +#define MODEL_o28 0x24 +#define MODEL_o27 0x23 +#define MODEL_o29 0x22 +#define MODEL_g2 0x21 +#define MODEL_g9 0x20 +#define MODEL_o36 0x1F +#define MODEL_o35 0x1E +#define MODEL_o32 0x1D +#define MODEL_o30 0x1C +#define MODEL_o24 0x1B +#define MODEL_o23 0x1A +#define MODEL_g7 0x19 +#define MODEL_o26 0x18 +#define MODEL_o25 0x17 +#define MODEL_o22 0x16 +#define MODEL_o21 0x15 +#define MODEL_g6 0x14 +#define MODEL_o19 0x13 +#define MODEL_o20 0x12 +#define MODEL_o18 0x11 +#define MODEL_o16 0x10 +#define MODEL_o251 0xF +#define MODEL_o272 0xE +#define MODEL_g8 0xD +#define MODEL_o15 0xC +#define MODEL_o14 0xB +#define MODEL_o13 0xA +#define MODEL_g5 0x9 +#define MODEL_o12 0x8 +#define MODEL_o11 0x7 +#define MODEL_o10 0x6 +#define MODEL_o9 0x5 +#define MODEL_o8 0x4 +#define MODEL_g4 0x3 +#define MODEL_o7 0x2 +#define MODEL_o6 0x1 +#define MODEL_o5 0x0 + diff --git a/include/mapfs/kgr_01_hit.h b/include/mapfs/kgr_01_hit.h index fc43259b67..be64c48774 100644 --- a/include/mapfs/kgr_01_hit.h +++ b/include/mapfs/kgr_01_hit.h @@ -1,11 +1,16 @@ -#define COLLIDER_Root 0xA -#define COLLIDER_exit 0x9 -#define COLLIDER_ne 0x8 -#define COLLIDER_deilie 0x7 -#define COLLIDER_deilite 0x6 -#define COLLIDER_exitw 0x5 -#define COLLIDER_o50 0x4 -#define COLLIDER_Default 0x3 -#define COLLIDER_o46 0x2 -#define COLLIDER_sita 0x1 -#define COLLIDER_kabe 0x0 +#define COLLIDER_Root 0xA +#define COLLIDER_exit 0x9 +#define COLLIDER_ne 0x8 +#define COLLIDER_deilie 0x7 +#define COLLIDER_deilite 0x6 +#define COLLIDER_exitw 0x5 +#define COLLIDER_o50 0x4 +#define COLLIDER_Default 0x3 +#define COLLIDER_o46 0x2 +#define COLLIDER_sita 0x1 +#define COLLIDER_kabe 0x0 + +#define ZONE_Root 0x2 +#define ZONE_Default 0x1 +#define ZONE_o45 0x0 + diff --git a/include/mapfs/kgr_01_shape.h b/include/mapfs/kgr_01_shape.h index b4eebba511..d5981a4626 100644 --- a/include/mapfs/kgr_01_shape.h +++ b/include/mapfs/kgr_01_shape.h @@ -1,11 +1,12 @@ -#define MODEL_Root 0xA -#define MODEL_Default 0x9 -#define MODEL_g10 0x8 -#define MODEL_o41 0x7 -#define MODEL_g9 0x6 -#define MODEL_o46 0x5 -#define MODEL_sita 0x4 -#define MODEL_hige 0x3 -#define MODEL_ago 0x2 -#define MODEL_kabe 0x1 -#define MODEL_ue 0x0 +#define MODEL_Root 0xA +#define MODEL_Default 0x9 +#define MODEL_g10 0x8 +#define MODEL_o41 0x7 +#define MODEL_g9 0x6 +#define MODEL_o46 0x5 +#define MODEL_sita 0x4 +#define MODEL_hige 0x3 +#define MODEL_ago 0x2 +#define MODEL_kabe 0x1 +#define MODEL_ue 0x0 + diff --git a/include/mapfs/kgr_02_hit.h b/include/mapfs/kgr_02_hit.h index 7374c6f58b..d54cfd216f 100644 --- a/include/mapfs/kgr_02_hit.h +++ b/include/mapfs/kgr_02_hit.h @@ -1,8 +1,13 @@ -#define COLLIDER_Root 0x7 -#define COLLIDER_exitw 0x6 -#define COLLIDER_nw 0x5 -#define COLLIDER_deiliw 0x4 -#define COLLIDER_deilitw 0x3 -#define COLLIDER_g1 0x2 -#define COLLIDER_o21 0x1 -#define COLLIDER_ue 0x0 +#define COLLIDER_Root 0x7 +#define COLLIDER_exitw 0x6 +#define COLLIDER_nw 0x5 +#define COLLIDER_deiliw 0x4 +#define COLLIDER_deilitw 0x3 +#define COLLIDER_g1 0x2 +#define COLLIDER_o21 0x1 +#define COLLIDER_ue 0x0 + +#define ZONE_Root 0x2 +#define ZONE_g1 0x1 +#define ZONE_o9 0x0 + diff --git a/include/mapfs/kgr_02_shape.h b/include/mapfs/kgr_02_shape.h index 0481ce58ba..6a8067d16e 100644 --- a/include/mapfs/kgr_02_shape.h +++ b/include/mapfs/kgr_02_shape.h @@ -1,26 +1,27 @@ -#define MODEL_Root 0x19 -#define MODEL_g5 0x18 -#define MODEL_bin4 0x17 -#define MODEL_bin3 0x16 -#define MODEL_bin2 0x15 -#define MODEL_bin1 0x14 -#define MODEL_hako6 0x13 -#define MODEL_hako5 0x12 -#define MODEL_hako4 0x11 -#define MODEL_hako3 0x10 -#define MODEL_hako2 0xF -#define MODEL_hako1 0xE -#define MODEL_fune 0xD -#define MODEL_fune_u 0xC -#define MODEL_fune_s 0xB -#define MODEL_mizu 0xA -#define MODEL_o30 0x9 -#define MODEL_misu1 0x8 -#define MODEL_o28 0x7 -#define MODEL_g1 0x6 -#define MODEL_o31 0x5 -#define MODEL_exit 0x4 -#define MODEL_sita 0x3 -#define MODEL_o21 0x2 -#define MODEL_ue 0x1 -#define MODEL_hone 0x0 +#define MODEL_Root 0x19 +#define MODEL_g5 0x18 +#define MODEL_bin4 0x17 +#define MODEL_bin3 0x16 +#define MODEL_bin2 0x15 +#define MODEL_bin1 0x14 +#define MODEL_hako6 0x13 +#define MODEL_hako5 0x12 +#define MODEL_hako4 0x11 +#define MODEL_hako3 0x10 +#define MODEL_hako2 0xF +#define MODEL_hako1 0xE +#define MODEL_fune 0xD +#define MODEL_fune_u 0xC +#define MODEL_fune_s 0xB +#define MODEL_mizu 0xA +#define MODEL_o30 0x9 +#define MODEL_misu1 0x8 +#define MODEL_o28 0x7 +#define MODEL_g1 0x6 +#define MODEL_o31 0x5 +#define MODEL_exit 0x4 +#define MODEL_sita 0x3 +#define MODEL_o21 0x2 +#define MODEL_ue 0x1 +#define MODEL_hone 0x0 + diff --git a/include/mapfs/kgr_bt01_hit.h b/include/mapfs/kgr_bt01_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/kgr_bt01_hit.h +++ b/include/mapfs/kgr_bt01_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/kgr_bt01_shape.h b/include/mapfs/kgr_bt01_shape.h index 9bc06d979b..9862c78b8e 100644 --- a/include/mapfs/kgr_bt01_shape.h +++ b/include/mapfs/kgr_bt01_shape.h @@ -1,28 +1,29 @@ -#define MODEL_Root 0x1B -#define MODEL_Default 0x1A -#define MODEL_g77 0x19 -#define MODEL_mizu2 0x18 -#define MODEL_mizu1 0x17 -#define MODEL_bin4 0x16 -#define MODEL_bin3 0x15 -#define MODEL_bin2 0x14 -#define MODEL_bin1 0x13 -#define MODEL_hako6 0x12 -#define MODEL_hako5 0x11 -#define MODEL_hako4 0x10 -#define MODEL_hako2 0xF -#define MODEL_hako1 0xE -#define MODEL_hune 0xD -#define MODEL_fune1 0xC -#define MODEL_fune2 0xB -#define MODEL_dai 0xA -#define MODEL_hone 0x9 -#define MODEL_o347 0x8 -#define MODEL_yuka 0x7 -#define MODEL_waku1 0x6 -#define MODEL_g49 0x5 -#define MODEL_o353 0x4 -#define MODEL_hone2 0x3 -#define MODEL_waku2 0x2 -#define MODEL_waku 0x1 -#define MODEL_kabe 0x0 +#define MODEL_Root 0x1B +#define MODEL_Default 0x1A +#define MODEL_g77 0x19 +#define MODEL_mizu2 0x18 +#define MODEL_mizu1 0x17 +#define MODEL_bin4 0x16 +#define MODEL_bin3 0x15 +#define MODEL_bin2 0x14 +#define MODEL_bin1 0x13 +#define MODEL_hako6 0x12 +#define MODEL_hako5 0x11 +#define MODEL_hako4 0x10 +#define MODEL_hako2 0xF +#define MODEL_hako1 0xE +#define MODEL_hune 0xD +#define MODEL_fune1 0xC +#define MODEL_fune2 0xB +#define MODEL_dai 0xA +#define MODEL_hone 0x9 +#define MODEL_o347 0x8 +#define MODEL_yuka 0x7 +#define MODEL_waku1 0x6 +#define MODEL_g49 0x5 +#define MODEL_o353 0x4 +#define MODEL_hone2 0x3 +#define MODEL_waku2 0x2 +#define MODEL_waku 0x1 +#define MODEL_kabe 0x0 + diff --git a/include/mapfs/kkj_00_hit.h b/include/mapfs/kkj_00_hit.h index ba3b335c5f..dfc3fc7f39 100644 --- a/include/mapfs/kkj_00_hit.h +++ b/include/mapfs/kkj_00_hit.h @@ -1,106 +1,115 @@ -#define COLLIDER_Root 0x69 -#define COLLIDER_kaidan 0x68 -#define COLLIDER_o322 0x67 -#define COLLIDER_o320 0x66 -#define COLLIDER_o318 0x65 -#define COLLIDER_o316 0x64 -#define COLLIDER_o114 0x63 -#define COLLIDER_o109 0x62 -#define COLLIDER_o113 0x61 -#define COLLIDER_o103 0x60 -#define COLLIDER_g1 0x5F -#define COLLIDER_eastside 0x5E -#define COLLIDER_o268 0x5D -#define COLLIDER_o267 0x5C -#define COLLIDER_o265 0x5B -#define COLLIDER_o262 0x5A -#define COLLIDER_o261 0x59 -#define COLLIDER_o260 0x58 -#define COLLIDER_o259 0x57 -#define COLLIDER_o258 0x56 -#define COLLIDER_o257 0x55 -#define COLLIDER_o256 0x54 -#define COLLIDER_o255 0x53 -#define COLLIDER_o253 0x52 -#define COLLIDER_westside 0x51 -#define COLLIDER_o245 0x50 -#define COLLIDER_o241 0x4F -#define COLLIDER_o65 0x4E -#define COLLIDER_o160 0x4D -#define COLLIDER_o137 0x4C -#define COLLIDER_o134 0x4B -#define COLLIDER_o150 0x4A -#define COLLIDER_o240 0x49 -#define COLLIDER_o252 0x48 -#define COLLIDER_o39 0x47 -#define COLLIDER_o59 0x46 -#define COLLIDER_o152 0x45 -#define COLLIDER_o247 0x44 -#define COLLIDER_o249 0x43 -#define COLLIDER_o68 0x42 -#define COLLIDER_o246 0x41 -#define COLLIDER_upper_east 0x40 -#define COLLIDER_o187 0x3F -#define COLLIDER_o289 0x3E -#define COLLIDER_o283 0x3D -#define COLLIDER_o163 0x3C -#define COLLIDER_o287 0x3B -#define COLLIDER_upper_center 0x3A -#define COLLIDER_o129 0x39 -#define COLLIDER_o128 0x38 -#define COLLIDER_o127 0x37 -#define COLLIDER_o280 0x36 -#define COLLIDER_o286 0x35 -#define COLLIDER_upper_weat 0x34 -#define COLLIDER_o288 0x33 -#define COLLIDER_o122 0x32 -#define COLLIDER_o121 0x31 -#define COLLIDER_o284 0x30 -#define COLLIDER_o276 0x2F -#define COLLIDER_entrance 0x2E -#define COLLIDER_o293 0x2D -#define COLLIDER_o292 0x2C -#define COLLIDER_o290 0x2B -#define COLLIDER_o248 0x2A -#define COLLIDER_o273 0x29 -#define COLLIDER_o271 0x28 -#define COLLIDER_o291 0x27 -#define COLLIDER_o57 0x26 -#define COLLIDER_edge 0x25 -#define COLLIDER_o295 0x24 -#define COLLIDER_o296 0x23 -#define COLLIDER_o244 0x22 -#define COLLIDER_o208 0x21 -#define COLLIDER_o294 0x20 -#define COLLIDER_o36 0x1F -#define COLLIDER_g51 0x1E -#define COLLIDER_bero8 0x1D -#define COLLIDER_o203 0x1C -#define COLLIDER_deilite 0x1B -#define COLLIDER_deilie 0x1A -#define COLLIDER_tte 0x19 -#define COLLIDER_bero7 0x18 -#define COLLIDER_o233 0x17 -#define COLLIDER_deilitne 0x16 -#define COLLIDER_deiline 0x15 -#define COLLIDER_ttne 0x14 -#define COLLIDER_bero6 0x13 -#define COLLIDER_o225 0x12 -#define COLLIDER_deilitnw 0x11 -#define COLLIDER_deilinw 0x10 -#define COLLIDER_ttnw 0xF -#define COLLIDER_bero5 0xE -#define COLLIDER_o200 0xD -#define COLLIDER_deilitw 0xC -#define COLLIDER_deiliw 0xB -#define COLLIDER_ttw 0xA -#define COLLIDER_g52 0x9 -#define COLLIDER_o332 0x8 -#define COLLIDER_deilitn 0x7 -#define COLLIDER_deilin 0x6 -#define COLLIDER_ttn 0x5 -#define COLLIDER_g2 0x4 -#define COLLIDER_o8 0x3 -#define COLLIDER_deilits 0x2 -#define COLLIDER_deilis 0x1 -#define COLLIDER_tts 0x0 +#define COLLIDER_Root 0x69 +#define COLLIDER_kaidan 0x68 +#define COLLIDER_o322 0x67 +#define COLLIDER_o320 0x66 +#define COLLIDER_o318 0x65 +#define COLLIDER_o316 0x64 +#define COLLIDER_o114 0x63 +#define COLLIDER_o109 0x62 +#define COLLIDER_o113 0x61 +#define COLLIDER_o103 0x60 +#define COLLIDER_g1 0x5F +#define COLLIDER_eastside 0x5E +#define COLLIDER_o268 0x5D +#define COLLIDER_o267 0x5C +#define COLLIDER_o265 0x5B +#define COLLIDER_o262 0x5A +#define COLLIDER_o261 0x59 +#define COLLIDER_o260 0x58 +#define COLLIDER_o259 0x57 +#define COLLIDER_o258 0x56 +#define COLLIDER_o257 0x55 +#define COLLIDER_o256 0x54 +#define COLLIDER_o255 0x53 +#define COLLIDER_o253 0x52 +#define COLLIDER_westside 0x51 +#define COLLIDER_o245 0x50 +#define COLLIDER_o241 0x4F +#define COLLIDER_o65 0x4E +#define COLLIDER_o160 0x4D +#define COLLIDER_o137 0x4C +#define COLLIDER_o134 0x4B +#define COLLIDER_o150 0x4A +#define COLLIDER_o240 0x49 +#define COLLIDER_o252 0x48 +#define COLLIDER_o39 0x47 +#define COLLIDER_o59 0x46 +#define COLLIDER_o152 0x45 +#define COLLIDER_o247 0x44 +#define COLLIDER_o249 0x43 +#define COLLIDER_o68 0x42 +#define COLLIDER_o246 0x41 +#define COLLIDER_upper_east 0x40 +#define COLLIDER_o187 0x3F +#define COLLIDER_o289 0x3E +#define COLLIDER_o283 0x3D +#define COLLIDER_o163 0x3C +#define COLLIDER_o287 0x3B +#define COLLIDER_upper_center 0x3A +#define COLLIDER_o129 0x39 +#define COLLIDER_o128 0x38 +#define COLLIDER_o127 0x37 +#define COLLIDER_o280 0x36 +#define COLLIDER_o286 0x35 +#define COLLIDER_upper_weat 0x34 +#define COLLIDER_o288 0x33 +#define COLLIDER_o122 0x32 +#define COLLIDER_o121 0x31 +#define COLLIDER_o284 0x30 +#define COLLIDER_o276 0x2F +#define COLLIDER_entrance 0x2E +#define COLLIDER_o293 0x2D +#define COLLIDER_o292 0x2C +#define COLLIDER_o290 0x2B +#define COLLIDER_o248 0x2A +#define COLLIDER_o273 0x29 +#define COLLIDER_o271 0x28 +#define COLLIDER_o291 0x27 +#define COLLIDER_o57 0x26 +#define COLLIDER_edge 0x25 +#define COLLIDER_o295 0x24 +#define COLLIDER_o296 0x23 +#define COLLIDER_o244 0x22 +#define COLLIDER_o208 0x21 +#define COLLIDER_o294 0x20 +#define COLLIDER_o36 0x1F +#define COLLIDER_g51 0x1E +#define COLLIDER_bero8 0x1D +#define COLLIDER_o203 0x1C +#define COLLIDER_deilite 0x1B +#define COLLIDER_deilie 0x1A +#define COLLIDER_tte 0x19 +#define COLLIDER_bero7 0x18 +#define COLLIDER_o233 0x17 +#define COLLIDER_deilitne 0x16 +#define COLLIDER_deiline 0x15 +#define COLLIDER_ttne 0x14 +#define COLLIDER_bero6 0x13 +#define COLLIDER_o225 0x12 +#define COLLIDER_deilitnw 0x11 +#define COLLIDER_deilinw 0x10 +#define COLLIDER_ttnw 0xF +#define COLLIDER_bero5 0xE +#define COLLIDER_o200 0xD +#define COLLIDER_deilitw 0xC +#define COLLIDER_deiliw 0xB +#define COLLIDER_ttw 0xA +#define COLLIDER_g52 0x9 +#define COLLIDER_o332 0x8 +#define COLLIDER_deilitn 0x7 +#define COLLIDER_deilin 0x6 +#define COLLIDER_ttn 0x5 +#define COLLIDER_g2 0x4 +#define COLLIDER_o8 0x3 +#define COLLIDER_deilits 0x2 +#define COLLIDER_deilis 0x1 +#define COLLIDER_tts 0x0 + +#define ZONE_Root 0x6 +#define ZONE_g3 0x5 +#define ZONE_o243 0x4 +#define ZONE_o242 0x3 +#define ZONE_o154 0x2 +#define ZONE_o241 0x1 +#define ZONE_o208 0x0 + diff --git a/include/mapfs/kkj_00_shape.h b/include/mapfs/kkj_00_shape.h index a712c9e005..fa341949b9 100644 --- a/include/mapfs/kkj_00_shape.h +++ b/include/mapfs/kkj_00_shape.h @@ -1,129 +1,130 @@ -#define MODEL_Root 0x80 -#define MODEL_g41 0x7F -#define MODEL_g48 0x7E -#define MODEL_o94 0x7D -#define MODEL_g8 0x7C -#define MODEL_o255 0x7B -#define MODEL_o248 0x7A -#define MODEL_o147 0x79 -#define MODEL_o140 0x78 -#define MODEL_o188 0x77 -#define MODEL_o30 0x76 -#define MODEL_o251 0x75 -#define MODEL_o34 0x74 -#define MODEL_o53 0x73 -#define MODEL_o54 0x72 -#define MODEL_g39 0x71 -#define MODEL_o232 0x70 -#define MODEL_o231 0x6F -#define MODEL_g40 0x6E -#define MODEL_o201 0x6D -#define MODEL_o200 0x6C -#define MODEL_g17 0x6B -#define MODEL_o256 0x6A -#define MODEL_o123 0x69 -#define MODEL_kinoreri 0x68 -#define MODEL_o119 0x67 -#define MODEL_o118 0x66 -#define MODEL_g18 0x65 -#define MODEL_o252 0x64 -#define MODEL_o136 0x63 -#define MODEL_o135 0x62 -#define MODEL_o137 0x61 -#define MODEL_o134 0x60 -#define MODEL_o56 0x5F -#define MODEL_g20 0x5E -#define MODEL_o211 0x5D -#define MODEL_o214 0x5C -#define MODEL_o215 0x5B -#define MODEL_o176 0x5A -#define MODEL_o175 0x59 -#define MODEL_o172 0x58 -#define MODEL_o171 0x57 -#define MODEL_o174 0x56 -#define MODEL_o173 0x55 -#define MODEL_o167 0x54 -#define MODEL_o166 0x53 -#define MODEL_o165 0x52 -#define MODEL_o164 0x51 -#define MODEL_o163 0x50 -#define MODEL_o121 0x4F -#define MODEL_o59 0x4E -#define MODEL_enter 0x4D -#define MODEL_o127 0x4C -#define MODEL_o128 0x4B -#define MODEL_o129 0x4A -#define MODEL_o130 0x49 -#define MODEL_o170 0x48 -#define MODEL_o143 0x47 -#define MODEL_o142 0x46 -#define MODEL_o169 0x45 -#define MODEL_o125 0x44 -#define MODEL_o124 0x43 -#define MODEL_g44 0x42 -#define MODEL_o258 0x41 -#define MODEL_o257 0x40 -#define MODEL_g6 0x3F -#define MODEL_o57 0x3E -#define MODEL_o93 0x3D -#define MODEL_o122 0x3C -#define MODEL_o58 0x3B -#define MODEL_o161 0x3A -#define MODEL_o162 0x39 -#define MODEL_kaidan 0x38 -#define MODEL_o99 0x37 -#define MODEL_o101 0x36 -#define MODEL_o115 0x35 -#define MODEL_o107 0x34 -#define MODEL_o114 0x33 -#define MODEL_o113 0x32 -#define MODEL_o109 0x31 -#define MODEL_o103 0x30 -#define MODEL_o22 0x2F -#define MODEL_g25 0x2E -#define MODEL_o160 0x2D -#define MODEL_o52 0x2C -#define MODEL_o213 0x2B -#define MODEL_o212 0x2A -#define MODEL_o210 0x29 -#define MODEL_o209 0x28 -#define MODEL_o39 0x27 -#define MODEL_o152 0x26 -#define MODEL_g1 0x25 -#define MODEL_o97 0x24 -#define MODEL_o36 0x23 -#define MODEL_chandelier 0x22 -#define MODEL_o71 0x21 -#define MODEL_o72 0x20 -#define MODEL_o74 0x1F -#define MODEL_g43 0x1E -#define MODEL_o80 0x1D -#define MODEL_o65 0x1C -#define MODEL_o247 0x1B -#define MODEL_o187 0x1A -#define MODEL_g38 0x19 -#define MODEL_o249 0x18 -#define MODEL_g32 0x17 -#define MODEL_door7 0x16 -#define MODEL_g31 0x15 -#define MODEL_door8 0x14 -#define MODEL_g29 0x13 -#define MODEL_door5 0x12 -#define MODEL_g26 0x11 -#define MODEL_enter2 0x10 -#define MODEL_door2 0xF -#define MODEL_enter1 0xE -#define MODEL_door1 0xD -#define MODEL_g33 0xC -#define MODEL_enter4 0xB -#define MODEL_door4 0xA -#define MODEL_enter3 0x9 -#define MODEL_door3 0x8 -#define MODEL_g42 0x7 -#define MODEL_g51 0x6 -#define MODEL_o204 0x5 -#define MODEL_g50 0x4 -#define MODEL_o234 0x3 -#define MODEL_o233 0x2 -#define MODEL_g2 0x1 -#define MODEL_o7 0x0 +#define MODEL_Root 0x80 +#define MODEL_g41 0x7F +#define MODEL_g48 0x7E +#define MODEL_o94 0x7D +#define MODEL_g8 0x7C +#define MODEL_o255 0x7B +#define MODEL_o248 0x7A +#define MODEL_o147 0x79 +#define MODEL_o140 0x78 +#define MODEL_o188 0x77 +#define MODEL_o30 0x76 +#define MODEL_o251 0x75 +#define MODEL_o34 0x74 +#define MODEL_o53 0x73 +#define MODEL_o54 0x72 +#define MODEL_g39 0x71 +#define MODEL_o232 0x70 +#define MODEL_o231 0x6F +#define MODEL_g40 0x6E +#define MODEL_o201 0x6D +#define MODEL_o200 0x6C +#define MODEL_g17 0x6B +#define MODEL_o256 0x6A +#define MODEL_o123 0x69 +#define MODEL_kinoreri 0x68 +#define MODEL_o119 0x67 +#define MODEL_o118 0x66 +#define MODEL_g18 0x65 +#define MODEL_o252 0x64 +#define MODEL_o136 0x63 +#define MODEL_o135 0x62 +#define MODEL_o137 0x61 +#define MODEL_o134 0x60 +#define MODEL_o56 0x5F +#define MODEL_g20 0x5E +#define MODEL_o211 0x5D +#define MODEL_o214 0x5C +#define MODEL_o215 0x5B +#define MODEL_o176 0x5A +#define MODEL_o175 0x59 +#define MODEL_o172 0x58 +#define MODEL_o171 0x57 +#define MODEL_o174 0x56 +#define MODEL_o173 0x55 +#define MODEL_o167 0x54 +#define MODEL_o166 0x53 +#define MODEL_o165 0x52 +#define MODEL_o164 0x51 +#define MODEL_o163 0x50 +#define MODEL_o121 0x4F +#define MODEL_o59 0x4E +#define MODEL_enter 0x4D +#define MODEL_o127 0x4C +#define MODEL_o128 0x4B +#define MODEL_o129 0x4A +#define MODEL_o130 0x49 +#define MODEL_o170 0x48 +#define MODEL_o143 0x47 +#define MODEL_o142 0x46 +#define MODEL_o169 0x45 +#define MODEL_o125 0x44 +#define MODEL_o124 0x43 +#define MODEL_g44 0x42 +#define MODEL_o258 0x41 +#define MODEL_o257 0x40 +#define MODEL_g6 0x3F +#define MODEL_o57 0x3E +#define MODEL_o93 0x3D +#define MODEL_o122 0x3C +#define MODEL_o58 0x3B +#define MODEL_o161 0x3A +#define MODEL_o162 0x39 +#define MODEL_kaidan 0x38 +#define MODEL_o99 0x37 +#define MODEL_o101 0x36 +#define MODEL_o115 0x35 +#define MODEL_o107 0x34 +#define MODEL_o114 0x33 +#define MODEL_o113 0x32 +#define MODEL_o109 0x31 +#define MODEL_o103 0x30 +#define MODEL_o22 0x2F +#define MODEL_g25 0x2E +#define MODEL_o160 0x2D +#define MODEL_o52 0x2C +#define MODEL_o213 0x2B +#define MODEL_o212 0x2A +#define MODEL_o210 0x29 +#define MODEL_o209 0x28 +#define MODEL_o39 0x27 +#define MODEL_o152 0x26 +#define MODEL_g1 0x25 +#define MODEL_o97 0x24 +#define MODEL_o36 0x23 +#define MODEL_chandelier 0x22 +#define MODEL_o71 0x21 +#define MODEL_o72 0x20 +#define MODEL_o74 0x1F +#define MODEL_g43 0x1E +#define MODEL_o80 0x1D +#define MODEL_o65 0x1C +#define MODEL_o247 0x1B +#define MODEL_o187 0x1A +#define MODEL_g38 0x19 +#define MODEL_o249 0x18 +#define MODEL_g32 0x17 +#define MODEL_door7 0x16 +#define MODEL_g31 0x15 +#define MODEL_door8 0x14 +#define MODEL_g29 0x13 +#define MODEL_door5 0x12 +#define MODEL_g26 0x11 +#define MODEL_enter2 0x10 +#define MODEL_door2 0xF +#define MODEL_enter1 0xE +#define MODEL_door1 0xD +#define MODEL_g33 0xC +#define MODEL_enter4 0xB +#define MODEL_door4 0xA +#define MODEL_enter3 0x9 +#define MODEL_door3 0x8 +#define MODEL_g42 0x7 +#define MODEL_g51 0x6 +#define MODEL_o204 0x5 +#define MODEL_g50 0x4 +#define MODEL_o234 0x3 +#define MODEL_o233 0x2 +#define MODEL_g2 0x1 +#define MODEL_o7 0x0 + diff --git a/include/mapfs/kkj_01_hit.h b/include/mapfs/kkj_01_hit.h index 74289a508b..cd187a0484 100644 --- a/include/mapfs/kkj_01_hit.h +++ b/include/mapfs/kkj_01_hit.h @@ -1,97 +1,104 @@ -#define COLLIDER_Root 0x60 -#define COLLIDER_g75 0x5F -#define COLLIDER_g77 0x5E -#define COLLIDER_o457 0x5D -#define COLLIDER_o456 0x5C -#define COLLIDER_o455 0x5B -#define COLLIDER_o451 0x5A -#define COLLIDER_o450 0x59 -#define COLLIDER_o449 0x58 -#define COLLIDER_migi 0x57 -#define COLLIDER_o385 0x56 -#define COLLIDER_o384 0x55 -#define COLLIDER_o383 0x54 -#define COLLIDER_o350 0x53 -#define COLLIDER_o285 0x52 -#define COLLIDER_o352 0x51 -#define COLLIDER_o349 0x50 -#define COLLIDER_hidari 0x4F -#define COLLIDER_o379 0x4E -#define COLLIDER_o378 0x4D -#define COLLIDER_o65 0x4C -#define COLLIDER_o377 0x4B -#define COLLIDER_o348 0x4A -#define COLLIDER_o356 0x49 -#define COLLIDER_o362 0x48 -#define COLLIDER_o361 0x47 -#define COLLIDER_o318 0x46 -#define COLLIDER_o316 0x45 -#define COLLIDER_center 0x44 -#define COLLIDER_o380 0x43 -#define COLLIDER_o275 0x42 -#define COLLIDER_o300 0x41 -#define COLLIDER_upper 0x40 -#define COLLIDER_o187 0x3F -#define COLLIDER_o338 0x3E -#define COLLIDER_o381 0x3D -#define COLLIDER_o295 0x3C -#define COLLIDER_o58 0x3B -#define COLLIDER_o358 0x3A -#define COLLIDER_o354 0x39 -#define COLLIDER_o342 0x38 -#define COLLIDER_left_floor 0x37 -#define COLLIDER_o252 0x36 -#define COLLIDER_o357 0x35 -#define COLLIDER_right_flower 0x34 -#define COLLIDER_o288 0x33 -#define COLLIDER_o382 0x32 -#define COLLIDER_enter 0x31 -#define COLLIDER_o208 0x30 -#define COLLIDER_o386 0x2F -#define COLLIDER_hidarishita 0x2E -#define COLLIDER_o410 0x2D -#define COLLIDER_o53 0x2C -#define COLLIDER_o294 0x2B -#define COLLIDER_migishita 0x2A -#define COLLIDER_o391 0x29 -#define COLLIDER_o390 0x28 -#define COLLIDER_naka 0x27 -#define COLLIDER_o254 0x26 -#define COLLIDER_o289 0x25 -#define COLLIDER_o273 0x24 -#define COLLIDER_g66 0x23 -#define COLLIDER_g73 0x22 -#define COLLIDER_o405 0x21 -#define COLLIDER_deilite 0x20 -#define COLLIDER_deilie 0x1F -#define COLLIDER_tte 0x1E -#define COLLIDER_g68 0x1D -#define COLLIDER_o403 0x1C -#define COLLIDER_deilitse 0x1B -#define COLLIDER_deilise 0x1A -#define COLLIDER_ttse 0x19 -#define COLLIDER_g72 0x18 -#define COLLIDER_o401 0x17 -#define COLLIDER_deilitw 0x16 -#define COLLIDER_deiliw 0x15 -#define COLLIDER_ttw 0x14 -#define COLLIDER_g69 0x13 -#define COLLIDER_o399 0x12 -#define COLLIDER_deilitsw 0x11 -#define COLLIDER_deilisw 0x10 -#define COLLIDER_ttsw 0xF -#define COLLIDER_g71 0xE -#define COLLIDER_o397 0xD -#define COLLIDER_deilitn2 0xC -#define COLLIDER_deilin2 0xB -#define COLLIDER_ttn2 0xA -#define COLLIDER_g70 0x9 -#define COLLIDER_o395 0x8 -#define COLLIDER_deilitn 0x7 -#define COLLIDER_deilin 0x6 -#define COLLIDER_ttn 0x5 -#define COLLIDER_g67 0x4 -#define COLLIDER_o393 0x3 -#define COLLIDER_deilits 0x2 -#define COLLIDER_deilis 0x1 -#define COLLIDER_tts 0x0 +#define COLLIDER_Root 0x60 +#define COLLIDER_g75 0x5F +#define COLLIDER_g77 0x5E +#define COLLIDER_o457 0x5D +#define COLLIDER_o456 0x5C +#define COLLIDER_o455 0x5B +#define COLLIDER_o451 0x5A +#define COLLIDER_o450 0x59 +#define COLLIDER_o449 0x58 +#define COLLIDER_migi 0x57 +#define COLLIDER_o385 0x56 +#define COLLIDER_o384 0x55 +#define COLLIDER_o383 0x54 +#define COLLIDER_o350 0x53 +#define COLLIDER_o285 0x52 +#define COLLIDER_o352 0x51 +#define COLLIDER_o349 0x50 +#define COLLIDER_hidari 0x4F +#define COLLIDER_o379 0x4E +#define COLLIDER_o378 0x4D +#define COLLIDER_o65 0x4C +#define COLLIDER_o377 0x4B +#define COLLIDER_o348 0x4A +#define COLLIDER_o356 0x49 +#define COLLIDER_o362 0x48 +#define COLLIDER_o361 0x47 +#define COLLIDER_o318 0x46 +#define COLLIDER_o316 0x45 +#define COLLIDER_center 0x44 +#define COLLIDER_o380 0x43 +#define COLLIDER_o275 0x42 +#define COLLIDER_o300 0x41 +#define COLLIDER_upper 0x40 +#define COLLIDER_o187 0x3F +#define COLLIDER_o338 0x3E +#define COLLIDER_o381 0x3D +#define COLLIDER_o295 0x3C +#define COLLIDER_o58 0x3B +#define COLLIDER_o358 0x3A +#define COLLIDER_o354 0x39 +#define COLLIDER_o342 0x38 +#define COLLIDER_left_floor 0x37 +#define COLLIDER_o252 0x36 +#define COLLIDER_o357 0x35 +#define COLLIDER_right_flower 0x34 +#define COLLIDER_o288 0x33 +#define COLLIDER_o382 0x32 +#define COLLIDER_enter 0x31 +#define COLLIDER_o208 0x30 +#define COLLIDER_o386 0x2F +#define COLLIDER_hidarishita 0x2E +#define COLLIDER_o410 0x2D +#define COLLIDER_o53 0x2C +#define COLLIDER_o294 0x2B +#define COLLIDER_migishita 0x2A +#define COLLIDER_o391 0x29 +#define COLLIDER_o390 0x28 +#define COLLIDER_naka 0x27 +#define COLLIDER_o254 0x26 +#define COLLIDER_o289 0x25 +#define COLLIDER_o273 0x24 +#define COLLIDER_g66 0x23 +#define COLLIDER_g73 0x22 +#define COLLIDER_o405 0x21 +#define COLLIDER_deilite 0x20 +#define COLLIDER_deilie 0x1F +#define COLLIDER_tte 0x1E +#define COLLIDER_g68 0x1D +#define COLLIDER_o403 0x1C +#define COLLIDER_deilitse 0x1B +#define COLLIDER_deilise 0x1A +#define COLLIDER_ttse 0x19 +#define COLLIDER_g72 0x18 +#define COLLIDER_o401 0x17 +#define COLLIDER_deilitw 0x16 +#define COLLIDER_deiliw 0x15 +#define COLLIDER_ttw 0x14 +#define COLLIDER_g69 0x13 +#define COLLIDER_o399 0x12 +#define COLLIDER_deilitsw 0x11 +#define COLLIDER_deilisw 0x10 +#define COLLIDER_ttsw 0xF +#define COLLIDER_g71 0xE +#define COLLIDER_o397 0xD +#define COLLIDER_deilitn2 0xC +#define COLLIDER_deilin2 0xB +#define COLLIDER_ttn2 0xA +#define COLLIDER_g70 0x9 +#define COLLIDER_o395 0x8 +#define COLLIDER_deilitn 0x7 +#define COLLIDER_deilin 0x6 +#define COLLIDER_ttn 0x5 +#define COLLIDER_g67 0x4 +#define COLLIDER_o393 0x3 +#define COLLIDER_deilits 0x2 +#define COLLIDER_deilis 0x1 +#define COLLIDER_tts 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g1 0x3 +#define ZONE_o345 0x2 +#define ZONE_o344 0x1 +#define ZONE_o273 0x0 + diff --git a/include/mapfs/kkj_01_shape.h b/include/mapfs/kkj_01_shape.h index e3f5ce49f1..3f5faad143 100644 --- a/include/mapfs/kkj_01_shape.h +++ b/include/mapfs/kkj_01_shape.h @@ -1,176 +1,177 @@ -#define MODEL_Root 0xAF -#define MODEL_g60 0xAE -#define MODEL_g74 0xAD -#define MODEL_g89 0xAC -#define MODEL_o429 0xAB -#define MODEL_o428 0xAA -#define MODEL_o427 0xA9 -#define MODEL_o426 0xA8 -#define MODEL_o425 0xA7 -#define MODEL_o424 0xA6 -#define MODEL_o423 0xA5 -#define MODEL_o422 0xA4 -#define MODEL_o421 0xA3 -#define MODEL_o418 0xA2 -#define MODEL_o420 0xA1 -#define MODEL_o413 0xA0 -#define MODEL_o437 0x9F -#define MODEL_o436 0x9E -#define MODEL_o435 0x9D -#define MODEL_o417 0x9C -#define MODEL_g83 0x9B -#define MODEL_o390 0x9A -#define MODEL_o389 0x99 -#define MODEL_o388 0x98 -#define MODEL_g82 0x97 -#define MODEL_o386 0x96 -#define MODEL_o385 0x95 -#define MODEL_o384 0x94 -#define MODEL_g81 0x93 -#define MODEL_o382 0x92 -#define MODEL_o381 0x91 -#define MODEL_o380 0x90 -#define MODEL_g80 0x8F -#define MODEL_o378 0x8E -#define MODEL_o377 0x8D -#define MODEL_o376 0x8C -#define MODEL_g79 0x8B -#define MODEL_o374 0x8A -#define MODEL_o373 0x89 -#define MODEL_o372 0x88 -#define MODEL_g76 0x87 -#define MODEL_o358 0x86 -#define MODEL_o359 0x85 -#define MODEL_o355 0x84 -#define MODEL_g94 0x83 -#define MODEL_g95 0x82 -#define MODEL_o338 0x81 -#define MODEL_hashira 0x80 -#define MODEL_g70 0x7F -#define MODEL_o189 0x7E -#define MODEL_o188 0x7D -#define MODEL_g69 0x7C -#define MODEL_o80 0x7B -#define MODEL_o140 0x7A -#define MODEL_g68 0x79 -#define MODEL_o65 0x78 -#define MODEL_o246 0x77 -#define MODEL_g67 0x76 -#define MODEL_o347 0x75 -#define MODEL_o348 0x74 -#define MODEL_mado 0x73 -#define MODEL_o317 0x72 -#define MODEL_g97 0x71 -#define MODEL_o287 0x70 -#define MODEL_o260 0x6F -#define MODEL_o57 0x6E -#define MODEL_g96 0x6D -#define MODEL_o54 0x6C -#define MODEL_o31 0x6B -#define MODEL_o53 0x6A -#define MODEL_o290 0x69 -#define MODEL_g39 0x68 -#define MODEL_o232 0x67 -#define MODEL_o231 0x66 -#define MODEL_g58 0x65 -#define MODEL_o335 0x64 -#define MODEL_o334 0x63 -#define MODEL_g47 0x62 -#define MODEL_o324 0x61 -#define MODEL_o323 0x60 -#define MODEL_g99 0x5F -#define MODEL_o450 0x5E -#define MODEL_o449 0x5D -#define MODEL_o448 0x5C -#define MODEL_o447 0x5B -#define MODEL_g98 0x5A -#define MODEL_o453 0x59 -#define MODEL_o341 0x58 -#define MODEL_o340 0x57 -#define MODEL_o339 0x56 -#define MODEL_o451 0x55 -#define MODEL_g65 0x54 -#define MODEL_o314 0x53 -#define MODEL_o318 0x52 -#define MODEL_o445 0x51 -#define MODEL_o316 0x50 -#define MODEL_o446 0x4F -#define MODEL_g63 0x4E -#define MODEL_migikaidan 0x4D -#define MODEL_g72 0x4C -#define MODEL_o282 0x4B -#define MODEL_o281 0x4A -#define MODEL_o280 0x49 -#define MODEL_o277 0x48 -#define MODEL_o350 0x47 -#define MODEL_o349 0x46 -#define MODEL_o284 0x45 -#define MODEL_o286 0x44 -#define MODEL_o285 0x43 -#define MODEL_o283 0x42 -#define MODEL_hidarikaidan 0x41 -#define MODEL_g71 0x40 -#define MODEL_o174 0x3F -#define MODEL_o173 0x3E -#define MODEL_o121 0x3D -#define MODEL_o271 0x3C -#define MODEL_o270 0x3B -#define MODEL_o269 0x3A -#define MODEL_hidari_tesuri 0x39 -#define MODEL_o265 0x38 -#define MODEL_o244 0x37 -#define MODEL_o243 0x36 -#define MODEL_enter 0x35 -#define MODEL_o199 0x34 -#define MODEL_o198 0x33 -#define MODEL_o197 0x32 -#define MODEL_o196 0x31 -#define MODEL_o195 0x30 -#define MODEL_o194 0x2F -#define MODEL_o193 0x2E -#define MODEL_o192 0x2D -#define MODEL_o191 0x2C -#define MODEL_o190 0x2B -#define MODEL_upper 0x2A -#define MODEL_o454 0x29 -#define MODEL_o452 0x28 -#define MODEL_o296 0x27 -#define MODEL_o295 0x26 -#define MODEL_o58 0x25 -#define MODEL_right_flower 0x24 -#define MODEL_o305 0x23 -#define MODEL_o304 0x22 -#define MODEL_o303 0x21 -#define MODEL_left_flower 0x20 -#define MODEL_o302 0x1F -#define MODEL_o301 0x1E -#define MODEL_o300 0x1D -#define MODEL_g1 0x1C -#define MODEL_o294 0x1B -#define MODEL_o254 0x1A -#define MODEL_g38 0x19 -#define MODEL_enter9 0x18 -#define MODEL_door9 0x17 -#define MODEL_enter8 0x16 -#define MODEL_door8 0x15 -#define MODEL_enter7 0x14 -#define MODEL_door7 0x13 -#define MODEL_enter6 0x12 -#define MODEL_door6 0x11 -#define MODEL_enter5 0x10 -#define MODEL_door5 0xF -#define MODEL_g33 0xE -#define MODEL_enter4 0xD -#define MODEL_door4 0xC -#define MODEL_enter3 0xB -#define MODEL_door3 0xA -#define MODEL_g26 0x9 -#define MODEL_enter2 0x8 -#define MODEL_door2 0x7 -#define MODEL_enter1 0x6 -#define MODEL_door1 0x5 -#define MODEL_g61 0x4 -#define MODEL_o330 0x3 -#define MODEL_o337 0x2 -#define MODEL_o321 0x1 -#define MODEL_o7 0x0 +#define MODEL_Root 0xAF +#define MODEL_g60 0xAE +#define MODEL_g74 0xAD +#define MODEL_g89 0xAC +#define MODEL_o429 0xAB +#define MODEL_o428 0xAA +#define MODEL_o427 0xA9 +#define MODEL_o426 0xA8 +#define MODEL_o425 0xA7 +#define MODEL_o424 0xA6 +#define MODEL_o423 0xA5 +#define MODEL_o422 0xA4 +#define MODEL_o421 0xA3 +#define MODEL_o418 0xA2 +#define MODEL_o420 0xA1 +#define MODEL_o413 0xA0 +#define MODEL_o437 0x9F +#define MODEL_o436 0x9E +#define MODEL_o435 0x9D +#define MODEL_o417 0x9C +#define MODEL_g83 0x9B +#define MODEL_o390 0x9A +#define MODEL_o389 0x99 +#define MODEL_o388 0x98 +#define MODEL_g82 0x97 +#define MODEL_o386 0x96 +#define MODEL_o385 0x95 +#define MODEL_o384 0x94 +#define MODEL_g81 0x93 +#define MODEL_o382 0x92 +#define MODEL_o381 0x91 +#define MODEL_o380 0x90 +#define MODEL_g80 0x8F +#define MODEL_o378 0x8E +#define MODEL_o377 0x8D +#define MODEL_o376 0x8C +#define MODEL_g79 0x8B +#define MODEL_o374 0x8A +#define MODEL_o373 0x89 +#define MODEL_o372 0x88 +#define MODEL_g76 0x87 +#define MODEL_o358 0x86 +#define MODEL_o359 0x85 +#define MODEL_o355 0x84 +#define MODEL_g94 0x83 +#define MODEL_g95 0x82 +#define MODEL_o338 0x81 +#define MODEL_hashira 0x80 +#define MODEL_g70 0x7F +#define MODEL_o189 0x7E +#define MODEL_o188 0x7D +#define MODEL_g69 0x7C +#define MODEL_o80 0x7B +#define MODEL_o140 0x7A +#define MODEL_g68 0x79 +#define MODEL_o65 0x78 +#define MODEL_o246 0x77 +#define MODEL_g67 0x76 +#define MODEL_o347 0x75 +#define MODEL_o348 0x74 +#define MODEL_mado 0x73 +#define MODEL_o317 0x72 +#define MODEL_g97 0x71 +#define MODEL_o287 0x70 +#define MODEL_o260 0x6F +#define MODEL_o57 0x6E +#define MODEL_g96 0x6D +#define MODEL_o54 0x6C +#define MODEL_o31 0x6B +#define MODEL_o53 0x6A +#define MODEL_o290 0x69 +#define MODEL_g39 0x68 +#define MODEL_o232 0x67 +#define MODEL_o231 0x66 +#define MODEL_g58 0x65 +#define MODEL_o335 0x64 +#define MODEL_o334 0x63 +#define MODEL_g47 0x62 +#define MODEL_o324 0x61 +#define MODEL_o323 0x60 +#define MODEL_g99 0x5F +#define MODEL_o450 0x5E +#define MODEL_o449 0x5D +#define MODEL_o448 0x5C +#define MODEL_o447 0x5B +#define MODEL_g98 0x5A +#define MODEL_o453 0x59 +#define MODEL_o341 0x58 +#define MODEL_o340 0x57 +#define MODEL_o339 0x56 +#define MODEL_o451 0x55 +#define MODEL_g65 0x54 +#define MODEL_o314 0x53 +#define MODEL_o318 0x52 +#define MODEL_o445 0x51 +#define MODEL_o316 0x50 +#define MODEL_o446 0x4F +#define MODEL_g63 0x4E +#define MODEL_migikaidan 0x4D +#define MODEL_g72 0x4C +#define MODEL_o282 0x4B +#define MODEL_o281 0x4A +#define MODEL_o280 0x49 +#define MODEL_o277 0x48 +#define MODEL_o350 0x47 +#define MODEL_o349 0x46 +#define MODEL_o284 0x45 +#define MODEL_o286 0x44 +#define MODEL_o285 0x43 +#define MODEL_o283 0x42 +#define MODEL_hidarikaidan 0x41 +#define MODEL_g71 0x40 +#define MODEL_o174 0x3F +#define MODEL_o173 0x3E +#define MODEL_o121 0x3D +#define MODEL_o271 0x3C +#define MODEL_o270 0x3B +#define MODEL_o269 0x3A +#define MODEL_hidari_tesuri 0x39 +#define MODEL_o265 0x38 +#define MODEL_o244 0x37 +#define MODEL_o243 0x36 +#define MODEL_enter 0x35 +#define MODEL_o199 0x34 +#define MODEL_o198 0x33 +#define MODEL_o197 0x32 +#define MODEL_o196 0x31 +#define MODEL_o195 0x30 +#define MODEL_o194 0x2F +#define MODEL_o193 0x2E +#define MODEL_o192 0x2D +#define MODEL_o191 0x2C +#define MODEL_o190 0x2B +#define MODEL_upper 0x2A +#define MODEL_o454 0x29 +#define MODEL_o452 0x28 +#define MODEL_o296 0x27 +#define MODEL_o295 0x26 +#define MODEL_o58 0x25 +#define MODEL_right_flower 0x24 +#define MODEL_o305 0x23 +#define MODEL_o304 0x22 +#define MODEL_o303 0x21 +#define MODEL_left_flower 0x20 +#define MODEL_o302 0x1F +#define MODEL_o301 0x1E +#define MODEL_o300 0x1D +#define MODEL_g1 0x1C +#define MODEL_o294 0x1B +#define MODEL_o254 0x1A +#define MODEL_g38 0x19 +#define MODEL_enter9 0x18 +#define MODEL_door9 0x17 +#define MODEL_enter8 0x16 +#define MODEL_door8 0x15 +#define MODEL_enter7 0x14 +#define MODEL_door7 0x13 +#define MODEL_enter6 0x12 +#define MODEL_door6 0x11 +#define MODEL_enter5 0x10 +#define MODEL_door5 0xF +#define MODEL_g33 0xE +#define MODEL_enter4 0xD +#define MODEL_door4 0xC +#define MODEL_enter3 0xB +#define MODEL_door3 0xA +#define MODEL_g26 0x9 +#define MODEL_enter2 0x8 +#define MODEL_door2 0x7 +#define MODEL_enter1 0x6 +#define MODEL_door1 0x5 +#define MODEL_g61 0x4 +#define MODEL_o330 0x3 +#define MODEL_o337 0x2 +#define MODEL_o321 0x1 +#define MODEL_o7 0x0 + diff --git a/include/mapfs/kkj_02_hit.h b/include/mapfs/kkj_02_hit.h index 630babcc6d..f09f27a79f 100644 --- a/include/mapfs/kkj_02_hit.h +++ b/include/mapfs/kkj_02_hit.h @@ -1,37 +1,43 @@ -#define COLLIDER_Root 0x24 -#define COLLIDER_g91 0x23 -#define COLLIDER_o689 0x22 -#define COLLIDER_o688 0x21 -#define COLLIDER_o687 0x20 -#define COLLIDER_g78 0x1F -#define COLLIDER_o612 0x1E -#define COLLIDER_o575 0x1D -#define COLLIDER_exit1 0x1C -#define COLLIDER_o603 0x1B -#define COLLIDER_o608 0x1A -#define COLLIDER_g76 0x19 -#define COLLIDER_o616 0x18 -#define COLLIDER_o610 0x17 -#define COLLIDER_o538 0x16 -#define COLLIDER_step2 0x15 -#define COLLIDER_o602 0x14 -#define COLLIDER_g72 0x13 -#define COLLIDER_o609 0x12 -#define COLLIDER_o536 0x11 -#define COLLIDER_o615 0x10 -#define COLLIDER_step1 0xF -#define COLLIDER_g75 0xE -#define COLLIDER_o504 0xD -#define COLLIDER_o559 0xC -#define COLLIDER_o604 0xB -#define COLLIDER_enter1 0xA -#define COLLIDER_g89 0x9 -#define COLLIDER_o605 0x8 -#define COLLIDER_o596 0x7 -#define COLLIDER_g94 0x6 -#define COLLIDER_exit 0x5 -#define COLLIDER_deilit2 0x4 -#define COLLIDER_deili2 0x3 -#define COLLIDER_enter 0x2 -#define COLLIDER_deilit1 0x1 -#define COLLIDER_deili1 0x0 +#define COLLIDER_Root 0x24 +#define COLLIDER_g91 0x23 +#define COLLIDER_o689 0x22 +#define COLLIDER_o688 0x21 +#define COLLIDER_o687 0x20 +#define COLLIDER_g78 0x1F +#define COLLIDER_o612 0x1E +#define COLLIDER_o575 0x1D +#define COLLIDER_exit1 0x1C +#define COLLIDER_o603 0x1B +#define COLLIDER_o608 0x1A +#define COLLIDER_g76 0x19 +#define COLLIDER_o616 0x18 +#define COLLIDER_o610 0x17 +#define COLLIDER_o538 0x16 +#define COLLIDER_step2 0x15 +#define COLLIDER_o602 0x14 +#define COLLIDER_g72 0x13 +#define COLLIDER_o609 0x12 +#define COLLIDER_o536 0x11 +#define COLLIDER_o615 0x10 +#define COLLIDER_step1 0xF +#define COLLIDER_g75 0xE +#define COLLIDER_o504 0xD +#define COLLIDER_o559 0xC +#define COLLIDER_o604 0xB +#define COLLIDER_enter1 0xA +#define COLLIDER_g89 0x9 +#define COLLIDER_o605 0x8 +#define COLLIDER_o596 0x7 +#define COLLIDER_g94 0x6 +#define COLLIDER_exit 0x5 +#define COLLIDER_deilit2 0x4 +#define COLLIDER_deili2 0x3 +#define COLLIDER_enter 0x2 +#define COLLIDER_deilit1 0x1 +#define COLLIDER_deili1 0x0 + +#define ZONE_Root 0x3 +#define ZONE_g75 0x2 +#define ZONE_02 0x1 +#define ZONE_o599 0x0 + diff --git a/include/mapfs/kkj_02_shape.h b/include/mapfs/kkj_02_shape.h index 0c2a012876..25beee429c 100644 --- a/include/mapfs/kkj_02_shape.h +++ b/include/mapfs/kkj_02_shape.h @@ -1,109 +1,110 @@ -#define MODEL_Root 0x6C -#define MODEL_g88 0x6B -#define MODEL_g98 0x6A -#define MODEL_g100 0x69 -#define MODEL_o624 0x68 -#define MODEL_o623 0x67 -#define MODEL_o622 0x66 -#define MODEL_g99 0x65 -#define MODEL_o621 0x64 -#define MODEL_o620 0x63 -#define MODEL_o619 0x62 -#define MODEL_g94 0x61 -#define MODEL_g96 0x60 -#define MODEL_o617 0x5F -#define MODEL_o616 0x5E -#define MODEL_o618 0x5D -#define MODEL_o614 0x5C -#define MODEL_o613 0x5B -#define MODEL_o615 0x5A -#define MODEL_g97 0x59 -#define MODEL_o612 0x58 -#define MODEL_o611 0x57 -#define MODEL_o610 0x56 -#define MODEL_g95 0x55 -#define MODEL_o608 0x54 -#define MODEL_o607 0x53 -#define MODEL_o606 0x52 -#define MODEL_o603 0x51 -#define MODEL_o602 0x50 -#define MODEL_o605 0x4F -#define MODEL_o604 0x4E -#define MODEL_o601 0x4D -#define MODEL_g74 0x4C -#define MODEL_o495 0x4B -#define MODEL_o496 0x4A -#define MODEL_g75 0x49 -#define MODEL_o558 0x48 -#define MODEL_o530 0x47 -#define MODEL_enter2 0x46 -#define MODEL_enter1 0x45 -#define MODEL_g72 0x44 -#define MODEL_o600 0x43 -#define MODEL_o539 0x42 -#define MODEL_o536 0x41 -#define MODEL_o535 0x40 -#define MODEL_step1 0x3F -#define MODEL_g78 0x3E -#define MODEL_o597 0x3D -#define MODEL_o575 0x3C -#define MODEL_o573 0x3B -#define MODEL_o531 0x3A -#define MODEL_exit1 0x39 -#define MODEL_g101 0x38 -#define MODEL_g73 0x37 -#define MODEL_o527 0x36 -#define MODEL_o526 0x35 -#define MODEL_o524 0x34 -#define MODEL_o523 0x33 -#define MODEL_o521 0x32 -#define MODEL_o520 0x31 -#define MODEL_o498 0x30 -#define MODEL_o497 0x2F -#define MODEL_o503 0x2E -#define MODEL_o502 0x2D -#define MODEL_g87 0x2C -#define MODEL_o591 0x2B -#define MODEL_o590 0x2A -#define MODEL_o588 0x29 -#define MODEL_o587 0x28 -#define MODEL_o585 0x27 -#define MODEL_o584 0x26 -#define MODEL_o582 0x25 -#define MODEL_o581 0x24 -#define MODEL_o579 0x23 -#define MODEL_o578 0x22 -#define MODEL_g71 0x21 -#define MODEL_o475 0x20 -#define MODEL_o476 0x1F -#define MODEL_o477 0x1E -#define MODEL_o478 0x1D -#define MODEL_o479 0x1C -#define MODEL_o480 0x1B -#define MODEL_o481 0x1A -#define MODEL_o482 0x19 -#define MODEL_o483 0x18 -#define MODEL_g80 0x17 -#define MODEL_o554 0x16 -#define MODEL_o553 0x15 -#define MODEL_o552 0x14 -#define MODEL_o551 0x13 -#define MODEL_o550 0x12 -#define MODEL_o549 0x11 -#define MODEL_o548 0x10 -#define MODEL_o547 0xF -#define MODEL_o546 0xE -#define MODEL_g92 0xD -#define MODEL_g84 0xC -#define MODEL_g85 0xB -#define MODEL_door4 0xA -#define MODEL_g86 0x9 -#define MODEL_door3 0x8 -#define MODEL_g81 0x7 -#define MODEL_g83 0x6 -#define MODEL_door2 0x5 -#define MODEL_g82 0x4 -#define MODEL_door1 0x3 -#define MODEL_g89 0x2 -#define MODEL_o474 0x1 -#define MODEL_o555 0x0 +#define MODEL_Root 0x6C +#define MODEL_g88 0x6B +#define MODEL_g98 0x6A +#define MODEL_g100 0x69 +#define MODEL_o624 0x68 +#define MODEL_o623 0x67 +#define MODEL_o622 0x66 +#define MODEL_g99 0x65 +#define MODEL_o621 0x64 +#define MODEL_o620 0x63 +#define MODEL_o619 0x62 +#define MODEL_g94 0x61 +#define MODEL_g96 0x60 +#define MODEL_o617 0x5F +#define MODEL_o616 0x5E +#define MODEL_o618 0x5D +#define MODEL_o614 0x5C +#define MODEL_o613 0x5B +#define MODEL_o615 0x5A +#define MODEL_g97 0x59 +#define MODEL_o612 0x58 +#define MODEL_o611 0x57 +#define MODEL_o610 0x56 +#define MODEL_g95 0x55 +#define MODEL_o608 0x54 +#define MODEL_o607 0x53 +#define MODEL_o606 0x52 +#define MODEL_o603 0x51 +#define MODEL_o602 0x50 +#define MODEL_o605 0x4F +#define MODEL_o604 0x4E +#define MODEL_o601 0x4D +#define MODEL_g74 0x4C +#define MODEL_o495 0x4B +#define MODEL_o496 0x4A +#define MODEL_g75 0x49 +#define MODEL_o558 0x48 +#define MODEL_o530 0x47 +#define MODEL_enter2 0x46 +#define MODEL_enter1 0x45 +#define MODEL_g72 0x44 +#define MODEL_o600 0x43 +#define MODEL_o539 0x42 +#define MODEL_o536 0x41 +#define MODEL_o535 0x40 +#define MODEL_step1 0x3F +#define MODEL_g78 0x3E +#define MODEL_o597 0x3D +#define MODEL_o575 0x3C +#define MODEL_o573 0x3B +#define MODEL_o531 0x3A +#define MODEL_exit1 0x39 +#define MODEL_g101 0x38 +#define MODEL_g73 0x37 +#define MODEL_o527 0x36 +#define MODEL_o526 0x35 +#define MODEL_o524 0x34 +#define MODEL_o523 0x33 +#define MODEL_o521 0x32 +#define MODEL_o520 0x31 +#define MODEL_o498 0x30 +#define MODEL_o497 0x2F +#define MODEL_o503 0x2E +#define MODEL_o502 0x2D +#define MODEL_g87 0x2C +#define MODEL_o591 0x2B +#define MODEL_o590 0x2A +#define MODEL_o588 0x29 +#define MODEL_o587 0x28 +#define MODEL_o585 0x27 +#define MODEL_o584 0x26 +#define MODEL_o582 0x25 +#define MODEL_o581 0x24 +#define MODEL_o579 0x23 +#define MODEL_o578 0x22 +#define MODEL_g71 0x21 +#define MODEL_o475 0x20 +#define MODEL_o476 0x1F +#define MODEL_o477 0x1E +#define MODEL_o478 0x1D +#define MODEL_o479 0x1C +#define MODEL_o480 0x1B +#define MODEL_o481 0x1A +#define MODEL_o482 0x19 +#define MODEL_o483 0x18 +#define MODEL_g80 0x17 +#define MODEL_o554 0x16 +#define MODEL_o553 0x15 +#define MODEL_o552 0x14 +#define MODEL_o551 0x13 +#define MODEL_o550 0x12 +#define MODEL_o549 0x11 +#define MODEL_o548 0x10 +#define MODEL_o547 0xF +#define MODEL_o546 0xE +#define MODEL_g92 0xD +#define MODEL_g84 0xC +#define MODEL_g85 0xB +#define MODEL_door4 0xA +#define MODEL_g86 0x9 +#define MODEL_door3 0x8 +#define MODEL_g81 0x7 +#define MODEL_g83 0x6 +#define MODEL_door2 0x5 +#define MODEL_g82 0x4 +#define MODEL_door1 0x3 +#define MODEL_g89 0x2 +#define MODEL_o474 0x1 +#define MODEL_o555 0x0 + diff --git a/include/mapfs/kkj_03_hit.h b/include/mapfs/kkj_03_hit.h index cab3523d61..1c64be4fc1 100644 --- a/include/mapfs/kkj_03_hit.h +++ b/include/mapfs/kkj_03_hit.h @@ -1,43 +1,50 @@ -#define COLLIDER_Root 0x2A -#define COLLIDER_g93 0x29 -#define COLLIDER_o604 0x28 -#define COLLIDER_o581 0x27 -#define COLLIDER_o579 0x26 -#define COLLIDER_o513 0x25 -#define COLLIDER_o511 0x24 -#define COLLIDER_g92 0x23 -#define COLLIDER_o520 0x22 -#define COLLIDER_o512 0x21 -#define COLLIDER_o510 0x20 -#define COLLIDER_o603 0x1F -#define COLLIDER_g91 0x1E -#define COLLIDER_o626 0x1D -#define COLLIDER_o625 0x1C -#define COLLIDER_o518 0x1B -#define COLLIDER_o506 0x1A -#define COLLIDER_o504 0x19 -#define COLLIDER_g88 0x18 -#define COLLIDER_o516 0x17 -#define COLLIDER_o501 0x16 -#define COLLIDER_o499 0x15 -#define COLLIDER_o602 0x14 -#define COLLIDER_g87 0x13 -#define COLLIDER_o599 0x12 -#define COLLIDER_o584 0x11 -#define COLLIDER_o583 0x10 -#define COLLIDER_o500 0xF -#define COLLIDER_o498 0xE -#define COLLIDER_g82 0xD -#define COLLIDER_o597 0xC -#define COLLIDER_o596 0xB -#define COLLIDER_o598 0xA -#define COLLIDER_o595 0x9 -#define COLLIDER_o594 0x8 -#define COLLIDER_o593 0x7 -#define COLLIDER_g117 0x6 -#define COLLIDER_g101 0x5 -#define COLLIDER_deili2 0x4 -#define COLLIDER_deilit2 0x3 -#define COLLIDER_g80 0x2 -#define COLLIDER_deili1 0x1 -#define COLLIDER_deilit1 0x0 +#define COLLIDER_Root 0x2A +#define COLLIDER_g93 0x29 +#define COLLIDER_o604 0x28 +#define COLLIDER_o581 0x27 +#define COLLIDER_o579 0x26 +#define COLLIDER_o513 0x25 +#define COLLIDER_o511 0x24 +#define COLLIDER_g92 0x23 +#define COLLIDER_o520 0x22 +#define COLLIDER_o512 0x21 +#define COLLIDER_o510 0x20 +#define COLLIDER_o603 0x1F +#define COLLIDER_g91 0x1E +#define COLLIDER_o626 0x1D +#define COLLIDER_o625 0x1C +#define COLLIDER_o518 0x1B +#define COLLIDER_o506 0x1A +#define COLLIDER_o504 0x19 +#define COLLIDER_g88 0x18 +#define COLLIDER_o516 0x17 +#define COLLIDER_o501 0x16 +#define COLLIDER_o499 0x15 +#define COLLIDER_o602 0x14 +#define COLLIDER_g87 0x13 +#define COLLIDER_o599 0x12 +#define COLLIDER_o584 0x11 +#define COLLIDER_o583 0x10 +#define COLLIDER_o500 0xF +#define COLLIDER_o498 0xE +#define COLLIDER_g82 0xD +#define COLLIDER_o597 0xC +#define COLLIDER_o596 0xB +#define COLLIDER_o598 0xA +#define COLLIDER_o595 0x9 +#define COLLIDER_o594 0x8 +#define COLLIDER_o593 0x7 +#define COLLIDER_g117 0x6 +#define COLLIDER_g101 0x5 +#define COLLIDER_deili2 0x4 +#define COLLIDER_deilit2 0x3 +#define COLLIDER_g80 0x2 +#define COLLIDER_deili1 0x1 +#define COLLIDER_deilit1 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g2 0x3 +#define ZONE_o492 0x2 +#define ZONE_o493 0x1 +#define ZONE_o491 0x0 + diff --git a/include/mapfs/kkj_03_shape.h b/include/mapfs/kkj_03_shape.h index 7fa50fdf78..5ae88db894 100644 --- a/include/mapfs/kkj_03_shape.h +++ b/include/mapfs/kkj_03_shape.h @@ -1,168 +1,169 @@ -#define MODEL_Root 0xA7 -#define MODEL_g137 0xA6 -#define MODEL_g156 0xA5 -#define MODEL_g159 0xA4 -#define MODEL_o725 0xA3 -#define MODEL_o723 0xA2 -#define MODEL_o722 0xA1 -#define MODEL_o718 0xA0 -#define MODEL_o719 0x9F -#define MODEL_g142 0x9E -#define MODEL_g144 0x9D -#define MODEL_o691 0x9C -#define MODEL_o690 0x9B -#define MODEL_o689 0x9A -#define MODEL_o688 0x99 -#define MODEL_g141 0x98 -#define MODEL_o683 0x97 -#define MODEL_o682 0x96 -#define MODEL_o681 0x95 -#define MODEL_o680 0x94 -#define MODEL_o715 0x93 -#define MODEL_g136 0x92 -#define MODEL_g140 0x91 -#define MODEL_o679 0x90 -#define MODEL_o678 0x8F -#define MODEL_o677 0x8E -#define MODEL_o676 0x8D -#define MODEL_g99 0x8C -#define MODEL_o464 0x8B -#define MODEL_o463 0x8A -#define MODEL_g97 0x89 -#define MODEL_o466 0x88 -#define MODEL_o468 0x87 -#define MODEL_g90 0x86 -#define MODEL_o461 0x85 -#define MODEL_o462 0x84 -#define MODEL_g86 0x83 -#define MODEL_o380 0x82 -#define MODEL_o458 0x81 -#define MODEL_g135 0x80 -#define MODEL_g98 0x7F -#define MODEL_o472 0x7E -#define MODEL_o471 0x7D -#define MODEL_o375 0x7C -#define MODEL_o376 0x7B -#define MODEL_g96 0x7A -#define MODEL_o398 0x79 -#define MODEL_o389 0x78 -#define MODEL_o373 0x77 -#define MODEL_o371 0x76 -#define MODEL_g89 0x75 -#define MODEL_o395 0x74 -#define MODEL_o383 0x73 -#define MODEL_o356 0x72 -#define MODEL_o357 0x71 -#define MODEL_g81 0x70 -#define MODEL_o469 0x6F -#define MODEL_o470 0x6E -#define MODEL_o360 0x6D -#define MODEL_o358 0x6C -#define MODEL_g127 0x6B -#define MODEL_g102 0x6A -#define MODEL_g105 0x69 -#define MODEL_door4 0x68 -#define MODEL_g104 0x67 -#define MODEL_door3 0x66 -#define MODEL_g120 0x65 -#define MODEL_g123 0x64 -#define MODEL_o609 0x63 -#define MODEL_o608 0x62 -#define MODEL_o607 0x61 -#define MODEL_g122 0x60 -#define MODEL_o606 0x5F -#define MODEL_o605 0x5E -#define MODEL_o604 0x5D -#define MODEL_g121 0x5C -#define MODEL_o603 0x5B -#define MODEL_o602 0x5A -#define MODEL_o601 0x59 -#define MODEL_g116 0x58 -#define MODEL_g119 0x57 -#define MODEL_o600 0x56 -#define MODEL_o599 0x55 -#define MODEL_o598 0x54 -#define MODEL_g118 0x53 -#define MODEL_o597 0x52 -#define MODEL_o596 0x51 -#define MODEL_o595 0x50 -#define MODEL_g117 0x4F -#define MODEL_o594 0x4E -#define MODEL_o593 0x4D -#define MODEL_o592 0x4C -#define MODEL_g83 0x4B -#define MODEL_g85 0x4A -#define MODEL_door2 0x49 -#define MODEL_g84 0x48 -#define MODEL_door1 0x47 -#define MODEL_g126 0x46 -#define MODEL_g93 0x45 -#define MODEL_g132 0x44 -#define MODEL_o621 0x43 -#define MODEL_o620 0x42 -#define MODEL_g79 0x41 -#define MODEL_o377 0x40 -#define MODEL_o591 0x3F -#define MODEL_o579 0x3E -#define MODEL_yuka5 0x3D -#define MODEL_o454 0x3C -#define MODEL_o455 0x3B -#define MODEL_o513 0x3A -#define MODEL_o511 0x39 -#define MODEL_g92 0x38 -#define MODEL_g131 0x37 -#define MODEL_o619 0x36 -#define MODEL_o618 0x35 -#define MODEL_g77 0x34 -#define MODEL_o367 0x33 -#define MODEL_o530 0x32 -#define MODEL_o520 0x31 -#define MODEL_yuka4 0x30 -#define MODEL_o453 0x2F -#define MODEL_o452 0x2E -#define MODEL_o512 0x2D -#define MODEL_o508 0x2C -#define MODEL_g91 0x2B -#define MODEL_g133 0x2A -#define MODEL_o623 0x29 -#define MODEL_o622 0x28 -#define MODEL_g76 0x27 -#define MODEL_o319 0x26 -#define MODEL_o528 0x25 -#define MODEL_o518 0x24 -#define MODEL_yuka3 0x23 -#define MODEL_o625 0x22 -#define MODEL_o624 0x21 -#define MODEL_o504 0x20 -#define MODEL_o502 0x1F -#define MODEL_g88 0x1E -#define MODEL_g129 0x1D -#define MODEL_o615 0x1C -#define MODEL_o614 0x1B -#define MODEL_g75 0x1A -#define MODEL_o342 0x19 -#define MODEL_o526 0x18 -#define MODEL_o516 0x17 -#define MODEL_yuka2 0x16 -#define MODEL_o445 0x15 -#define MODEL_o449 0x14 -#define MODEL_o499 0x13 -#define MODEL_o497 0x12 -#define MODEL_g87 0x11 -#define MODEL_g128 0x10 -#define MODEL_o613 0xF -#define MODEL_o612 0xE -#define MODEL_g78 0xD -#define MODEL_o369 0xC -#define MODEL_o583 0xB -#define MODEL_o524 0xA -#define MODEL_yuka1 0x9 -#define MODEL_o451 0x8 -#define MODEL_o450 0x7 -#define MODEL_o498 0x6 -#define MODEL_o496 0x5 -#define MODEL_g125 0x4 -#define MODEL_g101 0x3 -#define MODEL_o474 0x2 -#define MODEL_g80 0x1 -#define MODEL_o7 0x0 +#define MODEL_Root 0xA7 +#define MODEL_g137 0xA6 +#define MODEL_g156 0xA5 +#define MODEL_g159 0xA4 +#define MODEL_o725 0xA3 +#define MODEL_o723 0xA2 +#define MODEL_o722 0xA1 +#define MODEL_o718 0xA0 +#define MODEL_o719 0x9F +#define MODEL_g142 0x9E +#define MODEL_g144 0x9D +#define MODEL_o691 0x9C +#define MODEL_o690 0x9B +#define MODEL_o689 0x9A +#define MODEL_o688 0x99 +#define MODEL_g141 0x98 +#define MODEL_o683 0x97 +#define MODEL_o682 0x96 +#define MODEL_o681 0x95 +#define MODEL_o680 0x94 +#define MODEL_o715 0x93 +#define MODEL_g136 0x92 +#define MODEL_g140 0x91 +#define MODEL_o679 0x90 +#define MODEL_o678 0x8F +#define MODEL_o677 0x8E +#define MODEL_o676 0x8D +#define MODEL_g99 0x8C +#define MODEL_o464 0x8B +#define MODEL_o463 0x8A +#define MODEL_g97 0x89 +#define MODEL_o466 0x88 +#define MODEL_o468 0x87 +#define MODEL_g90 0x86 +#define MODEL_o461 0x85 +#define MODEL_o462 0x84 +#define MODEL_g86 0x83 +#define MODEL_o380 0x82 +#define MODEL_o458 0x81 +#define MODEL_g135 0x80 +#define MODEL_g98 0x7F +#define MODEL_o472 0x7E +#define MODEL_o471 0x7D +#define MODEL_o375 0x7C +#define MODEL_o376 0x7B +#define MODEL_g96 0x7A +#define MODEL_o398 0x79 +#define MODEL_o389 0x78 +#define MODEL_o373 0x77 +#define MODEL_o371 0x76 +#define MODEL_g89 0x75 +#define MODEL_o395 0x74 +#define MODEL_o383 0x73 +#define MODEL_o356 0x72 +#define MODEL_o357 0x71 +#define MODEL_g81 0x70 +#define MODEL_o469 0x6F +#define MODEL_o470 0x6E +#define MODEL_o360 0x6D +#define MODEL_o358 0x6C +#define MODEL_g127 0x6B +#define MODEL_g102 0x6A +#define MODEL_g105 0x69 +#define MODEL_door4 0x68 +#define MODEL_g104 0x67 +#define MODEL_door3 0x66 +#define MODEL_g120 0x65 +#define MODEL_g123 0x64 +#define MODEL_o609 0x63 +#define MODEL_o608 0x62 +#define MODEL_o607 0x61 +#define MODEL_g122 0x60 +#define MODEL_o606 0x5F +#define MODEL_o605 0x5E +#define MODEL_o604 0x5D +#define MODEL_g121 0x5C +#define MODEL_o603 0x5B +#define MODEL_o602 0x5A +#define MODEL_o601 0x59 +#define MODEL_g116 0x58 +#define MODEL_g119 0x57 +#define MODEL_o600 0x56 +#define MODEL_o599 0x55 +#define MODEL_o598 0x54 +#define MODEL_g118 0x53 +#define MODEL_o597 0x52 +#define MODEL_o596 0x51 +#define MODEL_o595 0x50 +#define MODEL_g117 0x4F +#define MODEL_o594 0x4E +#define MODEL_o593 0x4D +#define MODEL_o592 0x4C +#define MODEL_g83 0x4B +#define MODEL_g85 0x4A +#define MODEL_door2 0x49 +#define MODEL_g84 0x48 +#define MODEL_door1 0x47 +#define MODEL_g126 0x46 +#define MODEL_g93 0x45 +#define MODEL_g132 0x44 +#define MODEL_o621 0x43 +#define MODEL_o620 0x42 +#define MODEL_g79 0x41 +#define MODEL_o377 0x40 +#define MODEL_o591 0x3F +#define MODEL_o579 0x3E +#define MODEL_yuka5 0x3D +#define MODEL_o454 0x3C +#define MODEL_o455 0x3B +#define MODEL_o513 0x3A +#define MODEL_o511 0x39 +#define MODEL_g92 0x38 +#define MODEL_g131 0x37 +#define MODEL_o619 0x36 +#define MODEL_o618 0x35 +#define MODEL_g77 0x34 +#define MODEL_o367 0x33 +#define MODEL_o530 0x32 +#define MODEL_o520 0x31 +#define MODEL_yuka4 0x30 +#define MODEL_o453 0x2F +#define MODEL_o452 0x2E +#define MODEL_o512 0x2D +#define MODEL_o508 0x2C +#define MODEL_g91 0x2B +#define MODEL_g133 0x2A +#define MODEL_o623 0x29 +#define MODEL_o622 0x28 +#define MODEL_g76 0x27 +#define MODEL_o319 0x26 +#define MODEL_o528 0x25 +#define MODEL_o518 0x24 +#define MODEL_yuka3 0x23 +#define MODEL_o625 0x22 +#define MODEL_o624 0x21 +#define MODEL_o504 0x20 +#define MODEL_o502 0x1F +#define MODEL_g88 0x1E +#define MODEL_g129 0x1D +#define MODEL_o615 0x1C +#define MODEL_o614 0x1B +#define MODEL_g75 0x1A +#define MODEL_o342 0x19 +#define MODEL_o526 0x18 +#define MODEL_o516 0x17 +#define MODEL_yuka2 0x16 +#define MODEL_o445 0x15 +#define MODEL_o449 0x14 +#define MODEL_o499 0x13 +#define MODEL_o497 0x12 +#define MODEL_g87 0x11 +#define MODEL_g128 0x10 +#define MODEL_o613 0xF +#define MODEL_o612 0xE +#define MODEL_g78 0xD +#define MODEL_o369 0xC +#define MODEL_o583 0xB +#define MODEL_o524 0xA +#define MODEL_yuka1 0x9 +#define MODEL_o451 0x8 +#define MODEL_o450 0x7 +#define MODEL_o498 0x6 +#define MODEL_o496 0x5 +#define MODEL_g125 0x4 +#define MODEL_g101 0x3 +#define MODEL_o474 0x2 +#define MODEL_g80 0x1 +#define MODEL_o7 0x0 + diff --git a/include/mapfs/kkj_10_hit.h b/include/mapfs/kkj_10_hit.h index 4bbca42b20..27b764d57b 100644 --- a/include/mapfs/kkj_10_hit.h +++ b/include/mapfs/kkj_10_hit.h @@ -1,107 +1,116 @@ -#define COLLIDER_Root 0x6A -#define COLLIDER_kaidan 0x69 -#define COLLIDER_o322 0x68 -#define COLLIDER_o320 0x67 -#define COLLIDER_o318 0x66 -#define COLLIDER_o316 0x65 -#define COLLIDER_o114 0x64 -#define COLLIDER_o109 0x63 -#define COLLIDER_o113 0x62 -#define COLLIDER_o103 0x61 -#define COLLIDER_g1 0x60 -#define COLLIDER_eastside 0x5F -#define COLLIDER_o268 0x5E -#define COLLIDER_o267 0x5D -#define COLLIDER_o265 0x5C -#define COLLIDER_o262 0x5B -#define COLLIDER_o261 0x5A -#define COLLIDER_o260 0x59 -#define COLLIDER_o259 0x58 -#define COLLIDER_o258 0x57 -#define COLLIDER_o257 0x56 -#define COLLIDER_o256 0x55 -#define COLLIDER_o255 0x54 -#define COLLIDER_o253 0x53 -#define COLLIDER_westside 0x52 -#define COLLIDER_o245 0x51 -#define COLLIDER_o241 0x50 -#define COLLIDER_o65 0x4F -#define COLLIDER_o160 0x4E -#define COLLIDER_o137 0x4D -#define COLLIDER_o134 0x4C -#define COLLIDER_o150 0x4B -#define COLLIDER_o240 0x4A -#define COLLIDER_o252 0x49 -#define COLLIDER_o39 0x48 -#define COLLIDER_o59 0x47 -#define COLLIDER_o152 0x46 -#define COLLIDER_o247 0x45 -#define COLLIDER_o249 0x44 -#define COLLIDER_o68 0x43 -#define COLLIDER_o246 0x42 -#define COLLIDER_upper_east 0x41 -#define COLLIDER_o187 0x40 -#define COLLIDER_o289 0x3F -#define COLLIDER_o283 0x3E -#define COLLIDER_o163 0x3D -#define COLLIDER_o287 0x3C -#define COLLIDER_upper_center 0x3B -#define COLLIDER_o129 0x3A -#define COLLIDER_o128 0x39 -#define COLLIDER_o127 0x38 -#define COLLIDER_o280 0x37 -#define COLLIDER_o286 0x36 -#define COLLIDER_upper_weat 0x35 -#define COLLIDER_o288 0x34 -#define COLLIDER_o122 0x33 -#define COLLIDER_o121 0x32 -#define COLLIDER_o284 0x31 -#define COLLIDER_o276 0x30 -#define COLLIDER_entrance 0x2F -#define COLLIDER_o293 0x2E -#define COLLIDER_o292 0x2D -#define COLLIDER_o290 0x2C -#define COLLIDER_o248 0x2B -#define COLLIDER_o273 0x2A -#define COLLIDER_o271 0x29 -#define COLLIDER_o291 0x28 -#define COLLIDER_o57 0x27 -#define COLLIDER_edge 0x26 -#define COLLIDER_o295 0x25 -#define COLLIDER_o296 0x24 -#define COLLIDER_o244 0x23 -#define COLLIDER_o208 0x22 -#define COLLIDER_o294 0x21 -#define COLLIDER_o36 0x20 -#define COLLIDER_o83 0x1F -#define COLLIDER_g51 0x1E -#define COLLIDER_bero8 0x1D -#define COLLIDER_o203 0x1C -#define COLLIDER_deilite 0x1B -#define COLLIDER_deilie 0x1A -#define COLLIDER_tte 0x19 -#define COLLIDER_bero7 0x18 -#define COLLIDER_o233 0x17 -#define COLLIDER_deilitne 0x16 -#define COLLIDER_deiline 0x15 -#define COLLIDER_ttne 0x14 -#define COLLIDER_bero6 0x13 -#define COLLIDER_o225 0x12 -#define COLLIDER_deilitnw 0x11 -#define COLLIDER_deilinw 0x10 -#define COLLIDER_ttnw 0xF -#define COLLIDER_bero5 0xE -#define COLLIDER_o200 0xD -#define COLLIDER_deilitw 0xC -#define COLLIDER_deiliw 0xB -#define COLLIDER_ttw 0xA -#define COLLIDER_g52 0x9 -#define COLLIDER_o332 0x8 -#define COLLIDER_deilitn 0x7 -#define COLLIDER_deilin 0x6 -#define COLLIDER_ttn 0x5 -#define COLLIDER_g2 0x4 -#define COLLIDER_o8 0x3 -#define COLLIDER_deilits 0x2 -#define COLLIDER_deilis 0x1 -#define COLLIDER_tts 0x0 +#define COLLIDER_Root 0x6A +#define COLLIDER_kaidan 0x69 +#define COLLIDER_o322 0x68 +#define COLLIDER_o320 0x67 +#define COLLIDER_o318 0x66 +#define COLLIDER_o316 0x65 +#define COLLIDER_o114 0x64 +#define COLLIDER_o109 0x63 +#define COLLIDER_o113 0x62 +#define COLLIDER_o103 0x61 +#define COLLIDER_g1 0x60 +#define COLLIDER_eastside 0x5F +#define COLLIDER_o268 0x5E +#define COLLIDER_o267 0x5D +#define COLLIDER_o265 0x5C +#define COLLIDER_o262 0x5B +#define COLLIDER_o261 0x5A +#define COLLIDER_o260 0x59 +#define COLLIDER_o259 0x58 +#define COLLIDER_o258 0x57 +#define COLLIDER_o257 0x56 +#define COLLIDER_o256 0x55 +#define COLLIDER_o255 0x54 +#define COLLIDER_o253 0x53 +#define COLLIDER_westside 0x52 +#define COLLIDER_o245 0x51 +#define COLLIDER_o241 0x50 +#define COLLIDER_o65 0x4F +#define COLLIDER_o160 0x4E +#define COLLIDER_o137 0x4D +#define COLLIDER_o134 0x4C +#define COLLIDER_o150 0x4B +#define COLLIDER_o240 0x4A +#define COLLIDER_o252 0x49 +#define COLLIDER_o39 0x48 +#define COLLIDER_o59 0x47 +#define COLLIDER_o152 0x46 +#define COLLIDER_o247 0x45 +#define COLLIDER_o249 0x44 +#define COLLIDER_o68 0x43 +#define COLLIDER_o246 0x42 +#define COLLIDER_upper_east 0x41 +#define COLLIDER_o187 0x40 +#define COLLIDER_o289 0x3F +#define COLLIDER_o283 0x3E +#define COLLIDER_o163 0x3D +#define COLLIDER_o287 0x3C +#define COLLIDER_upper_center 0x3B +#define COLLIDER_o129 0x3A +#define COLLIDER_o128 0x39 +#define COLLIDER_o127 0x38 +#define COLLIDER_o280 0x37 +#define COLLIDER_o286 0x36 +#define COLLIDER_upper_weat 0x35 +#define COLLIDER_o288 0x34 +#define COLLIDER_o122 0x33 +#define COLLIDER_o121 0x32 +#define COLLIDER_o284 0x31 +#define COLLIDER_o276 0x30 +#define COLLIDER_entrance 0x2F +#define COLLIDER_o293 0x2E +#define COLLIDER_o292 0x2D +#define COLLIDER_o290 0x2C +#define COLLIDER_o248 0x2B +#define COLLIDER_o273 0x2A +#define COLLIDER_o271 0x29 +#define COLLIDER_o291 0x28 +#define COLLIDER_o57 0x27 +#define COLLIDER_edge 0x26 +#define COLLIDER_o295 0x25 +#define COLLIDER_o296 0x24 +#define COLLIDER_o244 0x23 +#define COLLIDER_o208 0x22 +#define COLLIDER_o294 0x21 +#define COLLIDER_o36 0x20 +#define COLLIDER_o83 0x1F +#define COLLIDER_g51 0x1E +#define COLLIDER_bero8 0x1D +#define COLLIDER_o203 0x1C +#define COLLIDER_deilite 0x1B +#define COLLIDER_deilie 0x1A +#define COLLIDER_tte 0x19 +#define COLLIDER_bero7 0x18 +#define COLLIDER_o233 0x17 +#define COLLIDER_deilitne 0x16 +#define COLLIDER_deiline 0x15 +#define COLLIDER_ttne 0x14 +#define COLLIDER_bero6 0x13 +#define COLLIDER_o225 0x12 +#define COLLIDER_deilitnw 0x11 +#define COLLIDER_deilinw 0x10 +#define COLLIDER_ttnw 0xF +#define COLLIDER_bero5 0xE +#define COLLIDER_o200 0xD +#define COLLIDER_deilitw 0xC +#define COLLIDER_deiliw 0xB +#define COLLIDER_ttw 0xA +#define COLLIDER_g52 0x9 +#define COLLIDER_o332 0x8 +#define COLLIDER_deilitn 0x7 +#define COLLIDER_deilin 0x6 +#define COLLIDER_ttn 0x5 +#define COLLIDER_g2 0x4 +#define COLLIDER_o8 0x3 +#define COLLIDER_deilits 0x2 +#define COLLIDER_deilis 0x1 +#define COLLIDER_tts 0x0 + +#define ZONE_Root 0x6 +#define ZONE_g3 0x5 +#define ZONE_o243 0x4 +#define ZONE_o242 0x3 +#define ZONE_o154 0x2 +#define ZONE_o241 0x1 +#define ZONE_o208 0x0 + diff --git a/include/mapfs/kkj_10_shape.h b/include/mapfs/kkj_10_shape.h index 291493f9f0..19d256a671 100644 --- a/include/mapfs/kkj_10_shape.h +++ b/include/mapfs/kkj_10_shape.h @@ -1,135 +1,136 @@ -#define MODEL_Root 0x86 -#define MODEL_g1 0x85 -#define MODEL_g52 0x84 -#define MODEL_o274 0x83 -#define MODEL_o273 0x82 -#define MODEL_g46 0x81 -#define MODEL_o56 0x80 -#define MODEL_o134 0x7F -#define MODEL_o137 0x7E -#define MODEL_o136 0x7D -#define MODEL_o135 0x7C -#define MODEL_g20 0x7B -#define MODEL_o176 0x7A -#define MODEL_o175 0x79 -#define MODEL_o172 0x78 -#define MODEL_o171 0x77 -#define MODEL_o174 0x76 -#define MODEL_o173 0x75 -#define MODEL_o167 0x74 -#define MODEL_o166 0x73 -#define MODEL_o165 0x72 -#define MODEL_o164 0x71 -#define MODEL_o163 0x70 -#define MODEL_o121 0x6F -#define MODEL_o59 0x6E -#define MODEL_o103 0x6D -#define MODEL_o113 0x6C -#define MODEL_o214 0x6B -#define MODEL_o215 0x6A -#define MODEL_o211 0x69 -#define MODEL_g47 0x68 -#define MODEL_g25 0x67 -#define MODEL_o154 0x66 -#define MODEL_o209 0x65 -#define MODEL_o210 0x64 -#define MODEL_o213 0x63 -#define MODEL_o212 0x62 -#define MODEL_tesuri 0x61 -#define MODEL_o152 0x60 -#define MODEL_o150 0x5F -#define MODEL_o39 0x5E -#define MODEL_o160 0x5D -#define MODEL_o52 0x5C -#define MODEL_g48 0x5B -#define MODEL_o255 0x5A -#define MODEL_g51 0x59 -#define MODEL_o254 0x58 -#define MODEL_o253 0x57 -#define MODEL_o252 0x56 -#define MODEL_g50 0x55 -#define MODEL_o251 0x54 -#define MODEL_o250 0x53 -#define MODEL_o249 0x52 -#define MODEL_g49 0x51 -#define MODEL_o248 0x50 -#define MODEL_o247 0x4F -#define MODEL_o246 0x4E -#define MODEL_g6 0x4D -#define MODEL_o93 0x4C -#define MODEL_o122 0x4B -#define MODEL_o58 0x4A -#define MODEL_o57 0x49 -#define MODEL_o162 0x48 -#define MODEL_o161 0x47 -#define MODEL_kaidan 0x46 -#define MODEL_o115 0x45 -#define MODEL_o107 0x44 -#define MODEL_o114 0x43 -#define MODEL_o109 0x42 -#define MODEL_o99 0x41 -#define MODEL_o101 0x40 -#define MODEL_o22 0x3F -#define MODEL_g42 0x3E -#define MODEL_g44 0x3D -#define MODEL_o189 0x3C -#define MODEL_o188 0x3B -#define MODEL_g11 0x3A -#define MODEL_o80 0x39 -#define MODEL_o140 0x38 -#define MODEL_g7 0x37 -#define MODEL_o65 0x36 -#define MODEL_o147 0x35 -#define MODEL_g8 0x34 -#define MODEL_o244 0x33 -#define MODEL_o245 0x32 -#define MODEL_chandelier 0x31 -#define MODEL_o71 0x30 -#define MODEL_o72 0x2F -#define MODEL_o74 0x2E -#define MODEL_g17 0x2D -#define MODEL_o123 0x2C -#define MODEL_kinoreri 0x2B -#define MODEL_o119 0x2A -#define MODEL_o118 0x29 -#define MODEL_o94 0x28 -#define MODEL_g3 0x27 -#define MODEL_o208 0x26 -#define MODEL_o97 0x25 -#define MODEL_o54 0x24 -#define MODEL_o53 0x23 -#define MODEL_o34 0x22 -#define MODEL_o31 0x21 -#define MODEL_o30 0x20 -#define MODEL_g43 0x1F -#define MODEL_o257 0x1E -#define MODEL_g32 0x1D -#define MODEL_door7 0x1C -#define MODEL_g31 0x1B -#define MODEL_door8 0x1A -#define MODEL_g29 0x19 -#define MODEL_door5 0x18 -#define MODEL_g26 0x17 -#define MODEL_enter2 0x16 -#define MODEL_door2 0x15 -#define MODEL_enter1 0x14 -#define MODEL_door1 0x13 -#define MODEL_g33 0x12 -#define MODEL_enter4 0x11 -#define MODEL_door4 0x10 -#define MODEL_enter3 0xF -#define MODEL_door3 0xE -#define MODEL_g38 0xD -#define MODEL_bero8 0xC -#define MODEL_o204 0xB -#define MODEL_bero7 0xA -#define MODEL_o234 0x9 -#define MODEL_o233 0x8 -#define MODEL_bero5 0x7 -#define MODEL_o201 0x6 -#define MODEL_o200 0x5 -#define MODEL_g39 0x4 -#define MODEL_o232 0x3 -#define MODEL_o231 0x2 -#define MODEL_g2 0x1 -#define MODEL_o7 0x0 +#define MODEL_Root 0x86 +#define MODEL_g1 0x85 +#define MODEL_g52 0x84 +#define MODEL_o274 0x83 +#define MODEL_o273 0x82 +#define MODEL_g46 0x81 +#define MODEL_o56 0x80 +#define MODEL_o134 0x7F +#define MODEL_o137 0x7E +#define MODEL_o136 0x7D +#define MODEL_o135 0x7C +#define MODEL_g20 0x7B +#define MODEL_o176 0x7A +#define MODEL_o175 0x79 +#define MODEL_o172 0x78 +#define MODEL_o171 0x77 +#define MODEL_o174 0x76 +#define MODEL_o173 0x75 +#define MODEL_o167 0x74 +#define MODEL_o166 0x73 +#define MODEL_o165 0x72 +#define MODEL_o164 0x71 +#define MODEL_o163 0x70 +#define MODEL_o121 0x6F +#define MODEL_o59 0x6E +#define MODEL_o103 0x6D +#define MODEL_o113 0x6C +#define MODEL_o214 0x6B +#define MODEL_o215 0x6A +#define MODEL_o211 0x69 +#define MODEL_g47 0x68 +#define MODEL_g25 0x67 +#define MODEL_o154 0x66 +#define MODEL_o209 0x65 +#define MODEL_o210 0x64 +#define MODEL_o213 0x63 +#define MODEL_o212 0x62 +#define MODEL_tesuri 0x61 +#define MODEL_o152 0x60 +#define MODEL_o150 0x5F +#define MODEL_o39 0x5E +#define MODEL_o160 0x5D +#define MODEL_o52 0x5C +#define MODEL_g48 0x5B +#define MODEL_o255 0x5A +#define MODEL_g51 0x59 +#define MODEL_o254 0x58 +#define MODEL_o253 0x57 +#define MODEL_o252 0x56 +#define MODEL_g50 0x55 +#define MODEL_o251 0x54 +#define MODEL_o250 0x53 +#define MODEL_o249 0x52 +#define MODEL_g49 0x51 +#define MODEL_o248 0x50 +#define MODEL_o247 0x4F +#define MODEL_o246 0x4E +#define MODEL_g6 0x4D +#define MODEL_o93 0x4C +#define MODEL_o122 0x4B +#define MODEL_o58 0x4A +#define MODEL_o57 0x49 +#define MODEL_o162 0x48 +#define MODEL_o161 0x47 +#define MODEL_kaidan 0x46 +#define MODEL_o115 0x45 +#define MODEL_o107 0x44 +#define MODEL_o114 0x43 +#define MODEL_o109 0x42 +#define MODEL_o99 0x41 +#define MODEL_o101 0x40 +#define MODEL_o22 0x3F +#define MODEL_g42 0x3E +#define MODEL_g44 0x3D +#define MODEL_o189 0x3C +#define MODEL_o188 0x3B +#define MODEL_g11 0x3A +#define MODEL_o80 0x39 +#define MODEL_o140 0x38 +#define MODEL_g7 0x37 +#define MODEL_o65 0x36 +#define MODEL_o147 0x35 +#define MODEL_g8 0x34 +#define MODEL_o244 0x33 +#define MODEL_o245 0x32 +#define MODEL_chandelier 0x31 +#define MODEL_o71 0x30 +#define MODEL_o72 0x2F +#define MODEL_o74 0x2E +#define MODEL_g17 0x2D +#define MODEL_o123 0x2C +#define MODEL_kinoreri 0x2B +#define MODEL_o119 0x2A +#define MODEL_o118 0x29 +#define MODEL_o94 0x28 +#define MODEL_g3 0x27 +#define MODEL_o208 0x26 +#define MODEL_o97 0x25 +#define MODEL_o54 0x24 +#define MODEL_o53 0x23 +#define MODEL_o34 0x22 +#define MODEL_o31 0x21 +#define MODEL_o30 0x20 +#define MODEL_g43 0x1F +#define MODEL_o257 0x1E +#define MODEL_g32 0x1D +#define MODEL_door7 0x1C +#define MODEL_g31 0x1B +#define MODEL_door8 0x1A +#define MODEL_g29 0x19 +#define MODEL_door5 0x18 +#define MODEL_g26 0x17 +#define MODEL_enter2 0x16 +#define MODEL_door2 0x15 +#define MODEL_enter1 0x14 +#define MODEL_door1 0x13 +#define MODEL_g33 0x12 +#define MODEL_enter4 0x11 +#define MODEL_door4 0x10 +#define MODEL_enter3 0xF +#define MODEL_door3 0xE +#define MODEL_g38 0xD +#define MODEL_bero8 0xC +#define MODEL_o204 0xB +#define MODEL_bero7 0xA +#define MODEL_o234 0x9 +#define MODEL_o233 0x8 +#define MODEL_bero5 0x7 +#define MODEL_o201 0x6 +#define MODEL_o200 0x5 +#define MODEL_g39 0x4 +#define MODEL_o232 0x3 +#define MODEL_o231 0x2 +#define MODEL_g2 0x1 +#define MODEL_o7 0x0 + diff --git a/include/mapfs/kkj_11_hit.h b/include/mapfs/kkj_11_hit.h index cb599386be..3ced927408 100644 --- a/include/mapfs/kkj_11_hit.h +++ b/include/mapfs/kkj_11_hit.h @@ -1,91 +1,98 @@ -#define COLLIDER_Root 0x5A -#define COLLIDER_g75 0x59 -#define COLLIDER_migi 0x58 -#define COLLIDER_o385 0x57 -#define COLLIDER_o384 0x56 -#define COLLIDER_o383 0x55 -#define COLLIDER_o350 0x54 -#define COLLIDER_o285 0x53 -#define COLLIDER_o352 0x52 -#define COLLIDER_o349 0x51 -#define COLLIDER_hidari 0x50 -#define COLLIDER_o379 0x4F -#define COLLIDER_o378 0x4E -#define COLLIDER_o65 0x4D -#define COLLIDER_o377 0x4C -#define COLLIDER_o348 0x4B -#define COLLIDER_o356 0x4A -#define COLLIDER_o362 0x49 -#define COLLIDER_o361 0x48 -#define COLLIDER_o318 0x47 -#define COLLIDER_o316 0x46 -#define COLLIDER_center 0x45 -#define COLLIDER_o380 0x44 -#define COLLIDER_o275 0x43 -#define COLLIDER_o300 0x42 -#define COLLIDER_upper 0x41 -#define COLLIDER_o187 0x40 -#define COLLIDER_o338 0x3F -#define COLLIDER_o381 0x3E -#define COLLIDER_o295 0x3D -#define COLLIDER_o58 0x3C -#define COLLIDER_o358 0x3B -#define COLLIDER_o354 0x3A -#define COLLIDER_o342 0x39 -#define COLLIDER_left_floor 0x38 -#define COLLIDER_o252 0x37 -#define COLLIDER_o357 0x36 -#define COLLIDER_right_flower 0x35 -#define COLLIDER_o288 0x34 -#define COLLIDER_o382 0x33 -#define COLLIDER_enter 0x32 -#define COLLIDER_o208 0x31 -#define COLLIDER_o386 0x30 -#define COLLIDER_hidarishita 0x2F -#define COLLIDER_o410 0x2E -#define COLLIDER_o409 0x2D -#define COLLIDER_o53 0x2C -#define COLLIDER_o294 0x2B -#define COLLIDER_migishita 0x2A -#define COLLIDER_o391 0x29 -#define COLLIDER_o390 0x28 -#define COLLIDER_naka 0x27 -#define COLLIDER_o254 0x26 -#define COLLIDER_o289 0x25 -#define COLLIDER_o273 0x24 -#define COLLIDER_g66 0x23 -#define COLLIDER_g73 0x22 -#define COLLIDER_o405 0x21 -#define COLLIDER_deilite 0x20 -#define COLLIDER_deilie 0x1F -#define COLLIDER_tte 0x1E -#define COLLIDER_g68 0x1D -#define COLLIDER_o403 0x1C -#define COLLIDER_deilitse 0x1B -#define COLLIDER_deilise 0x1A -#define COLLIDER_ttse 0x19 -#define COLLIDER_g72 0x18 -#define COLLIDER_o401 0x17 -#define COLLIDER_deilitw 0x16 -#define COLLIDER_deiliw 0x15 -#define COLLIDER_ttw 0x14 -#define COLLIDER_g69 0x13 -#define COLLIDER_o399 0x12 -#define COLLIDER_deilitsw 0x11 -#define COLLIDER_deilisw 0x10 -#define COLLIDER_ttsw 0xF -#define COLLIDER_g71 0xE -#define COLLIDER_o397 0xD -#define COLLIDER_deilitn2 0xC -#define COLLIDER_deilin2 0xB -#define COLLIDER_ttn2 0xA -#define COLLIDER_g70 0x9 -#define COLLIDER_o395 0x8 -#define COLLIDER_deilitn 0x7 -#define COLLIDER_deilin 0x6 -#define COLLIDER_ttn 0x5 -#define COLLIDER_g67 0x4 -#define COLLIDER_o393 0x3 -#define COLLIDER_deilits 0x2 -#define COLLIDER_deilis 0x1 -#define COLLIDER_tts 0x0 +#define COLLIDER_Root 0x5A +#define COLLIDER_g75 0x59 +#define COLLIDER_migi 0x58 +#define COLLIDER_o385 0x57 +#define COLLIDER_o384 0x56 +#define COLLIDER_o383 0x55 +#define COLLIDER_o350 0x54 +#define COLLIDER_o285 0x53 +#define COLLIDER_o352 0x52 +#define COLLIDER_o349 0x51 +#define COLLIDER_hidari 0x50 +#define COLLIDER_o379 0x4F +#define COLLIDER_o378 0x4E +#define COLLIDER_o65 0x4D +#define COLLIDER_o377 0x4C +#define COLLIDER_o348 0x4B +#define COLLIDER_o356 0x4A +#define COLLIDER_o362 0x49 +#define COLLIDER_o361 0x48 +#define COLLIDER_o318 0x47 +#define COLLIDER_o316 0x46 +#define COLLIDER_center 0x45 +#define COLLIDER_o380 0x44 +#define COLLIDER_o275 0x43 +#define COLLIDER_o300 0x42 +#define COLLIDER_upper 0x41 +#define COLLIDER_o187 0x40 +#define COLLIDER_o338 0x3F +#define COLLIDER_o381 0x3E +#define COLLIDER_o295 0x3D +#define COLLIDER_o58 0x3C +#define COLLIDER_o358 0x3B +#define COLLIDER_o354 0x3A +#define COLLIDER_o342 0x39 +#define COLLIDER_left_floor 0x38 +#define COLLIDER_o252 0x37 +#define COLLIDER_o357 0x36 +#define COLLIDER_right_flower 0x35 +#define COLLIDER_o288 0x34 +#define COLLIDER_o382 0x33 +#define COLLIDER_enter 0x32 +#define COLLIDER_o208 0x31 +#define COLLIDER_o386 0x30 +#define COLLIDER_hidarishita 0x2F +#define COLLIDER_o410 0x2E +#define COLLIDER_o409 0x2D +#define COLLIDER_o53 0x2C +#define COLLIDER_o294 0x2B +#define COLLIDER_migishita 0x2A +#define COLLIDER_o391 0x29 +#define COLLIDER_o390 0x28 +#define COLLIDER_naka 0x27 +#define COLLIDER_o254 0x26 +#define COLLIDER_o289 0x25 +#define COLLIDER_o273 0x24 +#define COLLIDER_g66 0x23 +#define COLLIDER_g73 0x22 +#define COLLIDER_o405 0x21 +#define COLLIDER_deilite 0x20 +#define COLLIDER_deilie 0x1F +#define COLLIDER_tte 0x1E +#define COLLIDER_g68 0x1D +#define COLLIDER_o403 0x1C +#define COLLIDER_deilitse 0x1B +#define COLLIDER_deilise 0x1A +#define COLLIDER_ttse 0x19 +#define COLLIDER_g72 0x18 +#define COLLIDER_o401 0x17 +#define COLLIDER_deilitw 0x16 +#define COLLIDER_deiliw 0x15 +#define COLLIDER_ttw 0x14 +#define COLLIDER_g69 0x13 +#define COLLIDER_o399 0x12 +#define COLLIDER_deilitsw 0x11 +#define COLLIDER_deilisw 0x10 +#define COLLIDER_ttsw 0xF +#define COLLIDER_g71 0xE +#define COLLIDER_o397 0xD +#define COLLIDER_deilitn2 0xC +#define COLLIDER_deilin2 0xB +#define COLLIDER_ttn2 0xA +#define COLLIDER_g70 0x9 +#define COLLIDER_o395 0x8 +#define COLLIDER_deilitn 0x7 +#define COLLIDER_deilin 0x6 +#define COLLIDER_ttn 0x5 +#define COLLIDER_g67 0x4 +#define COLLIDER_o393 0x3 +#define COLLIDER_deilits 0x2 +#define COLLIDER_deilis 0x1 +#define COLLIDER_tts 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g1 0x3 +#define ZONE_o345 0x2 +#define ZONE_o344 0x1 +#define ZONE_o273 0x0 + diff --git a/include/mapfs/kkj_11_shape.h b/include/mapfs/kkj_11_shape.h index 66c86637dc..e41ede9a18 100644 --- a/include/mapfs/kkj_11_shape.h +++ b/include/mapfs/kkj_11_shape.h @@ -1,133 +1,134 @@ -#define MODEL_Root 0x84 -#define MODEL_g1 0x83 -#define MODEL_g81 0x82 -#define MODEL_o366 0x81 -#define MODEL_o365 0x80 -#define MODEL_o364 0x7F -#define MODEL_g70 0x7E -#define MODEL_o343 0x7D -#define MODEL_o344 0x7C -#define MODEL_o342 0x7B -#define MODEL_o341 0x7A -#define MODEL_o340 0x79 -#define MODEL_mado 0x78 -#define MODEL_o318 0x77 -#define MODEL_o316 0x76 -#define MODEL_o311 0x75 -#define MODEL_o313 0x74 -#define MODEL_hashira 0x73 -#define MODEL_g78 0x72 -#define MODEL_o65 0x71 -#define MODEL_o246 0x70 -#define MODEL_g77 0x6F -#define MODEL_o80 0x6E -#define MODEL_o140 0x6D -#define MODEL_g76 0x6C -#define MODEL_o189 0x6B -#define MODEL_o188 0x6A -#define MODEL_g74 0x69 -#define MODEL_o356 0x68 -#define MODEL_o357 0x67 -#define MODEL_exit 0x66 -#define MODEL_o345 0x65 -#define MODEL_g55 0x64 -#define MODEL_o127 0x63 -#define MODEL_o128 0x62 -#define MODEL_o129 0x61 -#define MODEL_g19 0x60 -#define MODEL_o170 0x5F -#define MODEL_o143 0x5E -#define MODEL_o142 0x5D -#define MODEL_g18 0x5C -#define MODEL_o169 0x5B -#define MODEL_o125 0x5A -#define MODEL_o124 0x59 -#define MODEL_upper 0x58 -#define MODEL_o296 0x57 -#define MODEL_o295 0x56 -#define MODEL_o58 0x55 -#define MODEL_o57 0x54 -#define MODEL_right_flower 0x53 -#define MODEL_o305 0x52 -#define MODEL_o304 0x51 -#define MODEL_o303 0x50 -#define MODEL_left_flower 0x4F -#define MODEL_o302 0x4E -#define MODEL_o301 0x4D -#define MODEL_o300 0x4C -#define MODEL_migikaidan 0x4B -#define MODEL_g80 0x4A -#define MODEL_o282 0x49 -#define MODEL_o281 0x48 -#define MODEL_o280 0x47 -#define MODEL_g79 0x46 -#define MODEL_o279 0x45 -#define MODEL_o278 0x44 -#define MODEL_o277 0x43 -#define MODEL_o339 0x42 -#define MODEL_o284 0x41 -#define MODEL_o287 0x40 -#define MODEL_o286 0x3F -#define MODEL_o285 0x3E -#define MODEL_o283 0x3D -#define MODEL_hidarikaidan 0x3C -#define MODEL_g69 0x3B -#define MODEL_o121 0x3A -#define MODEL_o173 0x39 -#define MODEL_o174 0x38 -#define MODEL_g68 0x37 -#define MODEL_o269 0x36 -#define MODEL_o270 0x35 -#define MODEL_o271 0x34 -#define MODEL_hidari_tesuri 0x33 -#define MODEL_o265 0x32 -#define MODEL_o244 0x31 -#define MODEL_o260 0x30 -#define MODEL_o243 0x2F -#define MODEL_g3 0x2E -#define MODEL_o294 0x2D -#define MODEL_o254 0x2C -#define MODEL_o54 0x2B -#define MODEL_o53 0x2A -#define MODEL_o31 0x29 -#define MODEL_o30 0x28 -#define MODEL_o290 0x27 -#define MODEL_g61 0x26 -#define MODEL_enter9 0x25 -#define MODEL_door9 0x24 -#define MODEL_enter8 0x23 -#define MODEL_door8 0x22 -#define MODEL_enter7 0x21 -#define MODEL_door7 0x20 -#define MODEL_enter6 0x1F -#define MODEL_door6 0x1E -#define MODEL_enter5 0x1D -#define MODEL_door5 0x1C -#define MODEL_g33 0x1B -#define MODEL_enter4 0x1A -#define MODEL_door4 0x19 -#define MODEL_enter3 0x18 -#define MODEL_door3 0x17 -#define MODEL_g26 0x16 -#define MODEL_enter2 0x15 -#define MODEL_door2 0x14 -#define MODEL_enter1 0x13 -#define MODEL_door1 0x12 -#define MODEL_g38 0x11 -#define MODEL_g49 0x10 -#define MODEL_o330 0xF -#define MODEL_g59 0xE -#define MODEL_o337 0xD -#define MODEL_g58 0xC -#define MODEL_o335 0xB -#define MODEL_o334 0xA -#define MODEL_g47 0x9 -#define MODEL_o324 0x8 -#define MODEL_o323 0x7 -#define MODEL_g46 0x6 -#define MODEL_o321 0x5 -#define MODEL_g39 0x4 -#define MODEL_o232 0x3 -#define MODEL_o231 0x2 -#define MODEL_g2 0x1 -#define MODEL_o7 0x0 +#define MODEL_Root 0x84 +#define MODEL_g1 0x83 +#define MODEL_g81 0x82 +#define MODEL_o366 0x81 +#define MODEL_o365 0x80 +#define MODEL_o364 0x7F +#define MODEL_g70 0x7E +#define MODEL_o343 0x7D +#define MODEL_o344 0x7C +#define MODEL_o342 0x7B +#define MODEL_o341 0x7A +#define MODEL_o340 0x79 +#define MODEL_mado 0x78 +#define MODEL_o318 0x77 +#define MODEL_o316 0x76 +#define MODEL_o311 0x75 +#define MODEL_o313 0x74 +#define MODEL_hashira 0x73 +#define MODEL_g78 0x72 +#define MODEL_o65 0x71 +#define MODEL_o246 0x70 +#define MODEL_g77 0x6F +#define MODEL_o80 0x6E +#define MODEL_o140 0x6D +#define MODEL_g76 0x6C +#define MODEL_o189 0x6B +#define MODEL_o188 0x6A +#define MODEL_g74 0x69 +#define MODEL_o356 0x68 +#define MODEL_o357 0x67 +#define MODEL_exit 0x66 +#define MODEL_o345 0x65 +#define MODEL_g55 0x64 +#define MODEL_o127 0x63 +#define MODEL_o128 0x62 +#define MODEL_o129 0x61 +#define MODEL_g19 0x60 +#define MODEL_o170 0x5F +#define MODEL_o143 0x5E +#define MODEL_o142 0x5D +#define MODEL_g18 0x5C +#define MODEL_o169 0x5B +#define MODEL_o125 0x5A +#define MODEL_o124 0x59 +#define MODEL_upper 0x58 +#define MODEL_o296 0x57 +#define MODEL_o295 0x56 +#define MODEL_o58 0x55 +#define MODEL_o57 0x54 +#define MODEL_right_flower 0x53 +#define MODEL_o305 0x52 +#define MODEL_o304 0x51 +#define MODEL_o303 0x50 +#define MODEL_left_flower 0x4F +#define MODEL_o302 0x4E +#define MODEL_o301 0x4D +#define MODEL_o300 0x4C +#define MODEL_migikaidan 0x4B +#define MODEL_g80 0x4A +#define MODEL_o282 0x49 +#define MODEL_o281 0x48 +#define MODEL_o280 0x47 +#define MODEL_g79 0x46 +#define MODEL_o279 0x45 +#define MODEL_o278 0x44 +#define MODEL_o277 0x43 +#define MODEL_o339 0x42 +#define MODEL_o284 0x41 +#define MODEL_o287 0x40 +#define MODEL_o286 0x3F +#define MODEL_o285 0x3E +#define MODEL_o283 0x3D +#define MODEL_hidarikaidan 0x3C +#define MODEL_g69 0x3B +#define MODEL_o121 0x3A +#define MODEL_o173 0x39 +#define MODEL_o174 0x38 +#define MODEL_g68 0x37 +#define MODEL_o269 0x36 +#define MODEL_o270 0x35 +#define MODEL_o271 0x34 +#define MODEL_hidari_tesuri 0x33 +#define MODEL_o265 0x32 +#define MODEL_o244 0x31 +#define MODEL_o260 0x30 +#define MODEL_o243 0x2F +#define MODEL_g3 0x2E +#define MODEL_o294 0x2D +#define MODEL_o254 0x2C +#define MODEL_o54 0x2B +#define MODEL_o53 0x2A +#define MODEL_o31 0x29 +#define MODEL_o30 0x28 +#define MODEL_o290 0x27 +#define MODEL_g61 0x26 +#define MODEL_enter9 0x25 +#define MODEL_door9 0x24 +#define MODEL_enter8 0x23 +#define MODEL_door8 0x22 +#define MODEL_enter7 0x21 +#define MODEL_door7 0x20 +#define MODEL_enter6 0x1F +#define MODEL_door6 0x1E +#define MODEL_enter5 0x1D +#define MODEL_door5 0x1C +#define MODEL_g33 0x1B +#define MODEL_enter4 0x1A +#define MODEL_door4 0x19 +#define MODEL_enter3 0x18 +#define MODEL_door3 0x17 +#define MODEL_g26 0x16 +#define MODEL_enter2 0x15 +#define MODEL_door2 0x14 +#define MODEL_enter1 0x13 +#define MODEL_door1 0x12 +#define MODEL_g38 0x11 +#define MODEL_g49 0x10 +#define MODEL_o330 0xF +#define MODEL_g59 0xE +#define MODEL_o337 0xD +#define MODEL_g58 0xC +#define MODEL_o335 0xB +#define MODEL_o334 0xA +#define MODEL_g47 0x9 +#define MODEL_o324 0x8 +#define MODEL_o323 0x7 +#define MODEL_g46 0x6 +#define MODEL_o321 0x5 +#define MODEL_g39 0x4 +#define MODEL_o232 0x3 +#define MODEL_o231 0x2 +#define MODEL_g2 0x1 +#define MODEL_o7 0x0 + diff --git a/include/mapfs/kkj_12_hit.h b/include/mapfs/kkj_12_hit.h index 630babcc6d..f09f27a79f 100644 --- a/include/mapfs/kkj_12_hit.h +++ b/include/mapfs/kkj_12_hit.h @@ -1,37 +1,43 @@ -#define COLLIDER_Root 0x24 -#define COLLIDER_g91 0x23 -#define COLLIDER_o689 0x22 -#define COLLIDER_o688 0x21 -#define COLLIDER_o687 0x20 -#define COLLIDER_g78 0x1F -#define COLLIDER_o612 0x1E -#define COLLIDER_o575 0x1D -#define COLLIDER_exit1 0x1C -#define COLLIDER_o603 0x1B -#define COLLIDER_o608 0x1A -#define COLLIDER_g76 0x19 -#define COLLIDER_o616 0x18 -#define COLLIDER_o610 0x17 -#define COLLIDER_o538 0x16 -#define COLLIDER_step2 0x15 -#define COLLIDER_o602 0x14 -#define COLLIDER_g72 0x13 -#define COLLIDER_o609 0x12 -#define COLLIDER_o536 0x11 -#define COLLIDER_o615 0x10 -#define COLLIDER_step1 0xF -#define COLLIDER_g75 0xE -#define COLLIDER_o504 0xD -#define COLLIDER_o559 0xC -#define COLLIDER_o604 0xB -#define COLLIDER_enter1 0xA -#define COLLIDER_g89 0x9 -#define COLLIDER_o605 0x8 -#define COLLIDER_o596 0x7 -#define COLLIDER_g94 0x6 -#define COLLIDER_exit 0x5 -#define COLLIDER_deilit2 0x4 -#define COLLIDER_deili2 0x3 -#define COLLIDER_enter 0x2 -#define COLLIDER_deilit1 0x1 -#define COLLIDER_deili1 0x0 +#define COLLIDER_Root 0x24 +#define COLLIDER_g91 0x23 +#define COLLIDER_o689 0x22 +#define COLLIDER_o688 0x21 +#define COLLIDER_o687 0x20 +#define COLLIDER_g78 0x1F +#define COLLIDER_o612 0x1E +#define COLLIDER_o575 0x1D +#define COLLIDER_exit1 0x1C +#define COLLIDER_o603 0x1B +#define COLLIDER_o608 0x1A +#define COLLIDER_g76 0x19 +#define COLLIDER_o616 0x18 +#define COLLIDER_o610 0x17 +#define COLLIDER_o538 0x16 +#define COLLIDER_step2 0x15 +#define COLLIDER_o602 0x14 +#define COLLIDER_g72 0x13 +#define COLLIDER_o609 0x12 +#define COLLIDER_o536 0x11 +#define COLLIDER_o615 0x10 +#define COLLIDER_step1 0xF +#define COLLIDER_g75 0xE +#define COLLIDER_o504 0xD +#define COLLIDER_o559 0xC +#define COLLIDER_o604 0xB +#define COLLIDER_enter1 0xA +#define COLLIDER_g89 0x9 +#define COLLIDER_o605 0x8 +#define COLLIDER_o596 0x7 +#define COLLIDER_g94 0x6 +#define COLLIDER_exit 0x5 +#define COLLIDER_deilit2 0x4 +#define COLLIDER_deili2 0x3 +#define COLLIDER_enter 0x2 +#define COLLIDER_deilit1 0x1 +#define COLLIDER_deili1 0x0 + +#define ZONE_Root 0x3 +#define ZONE_g75 0x2 +#define ZONE_02 0x1 +#define ZONE_o599 0x0 + diff --git a/include/mapfs/kkj_12_shape.h b/include/mapfs/kkj_12_shape.h index f229378a2f..667eeebcd0 100644 --- a/include/mapfs/kkj_12_shape.h +++ b/include/mapfs/kkj_12_shape.h @@ -1,129 +1,130 @@ -#define MODEL_Root 0x80 -#define MODEL_g96 0x7F -#define MODEL_g115 0x7E -#define MODEL_o695 0x7D -#define MODEL_o694 0x7C -#define MODEL_g101 0x7B -#define MODEL_g114 0x7A -#define MODEL_o692 0x79 -#define MODEL_o691 0x78 -#define MODEL_o690 0x77 -#define MODEL_g102 0x76 -#define MODEL_o628 0x75 -#define MODEL_o627 0x74 -#define MODEL_o626 0x73 -#define MODEL_g104 0x72 -#define MODEL_g107 0x71 -#define MODEL_o648 0x70 -#define MODEL_o647 0x6F -#define MODEL_o646 0x6E -#define MODEL_o645 0x6D -#define MODEL_o644 0x6C -#define MODEL_o643 0x6B -#define MODEL_g106 0x6A -#define MODEL_o700 0x69 -#define MODEL_o641 0x68 -#define MODEL_o640 0x67 -#define MODEL_g105 0x66 -#define MODEL_o639 0x65 -#define MODEL_o638 0x64 -#define MODEL_o637 0x63 -#define MODEL_o636 0x62 -#define MODEL_o635 0x61 -#define MODEL_o634 0x60 -#define MODEL_o633 0x5F -#define MODEL_o632 0x5E -#define MODEL_g109 0x5D -#define MODEL_o658 0x5C -#define MODEL_o657 0x5B -#define MODEL_o656 0x5A -#define MODEL_o655 0x59 -#define MODEL_o693 0x58 -#define MODEL_g108 0x57 -#define MODEL_o653 0x56 -#define MODEL_o652 0x55 -#define MODEL_o651 0x54 -#define MODEL_o650 0x53 -#define MODEL_o649 0x52 -#define MODEL_g75 0x51 -#define MODEL_o624 0x50 -#define MODEL_o623 0x4F -#define MODEL_o496 0x4E -#define MODEL_o616 0x4D -#define MODEL_enter2 0x4C -#define MODEL_enter1 0x4B -#define MODEL_g98 0x4A -#define MODEL_g73 0x49 -#define MODEL_o528 0x48 -#define MODEL_o527 0x47 -#define MODEL_o526 0x46 -#define MODEL_o525 0x45 -#define MODEL_o524 0x44 -#define MODEL_o523 0x43 -#define MODEL_o522 0x42 -#define MODEL_o521 0x41 -#define MODEL_o520 0x40 -#define MODEL_o499 0x3F -#define MODEL_o498 0x3E -#define MODEL_o497 0x3D -#define MODEL_o504 0x3C -#define MODEL_o503 0x3B -#define MODEL_o502 0x3A -#define MODEL_g87 0x39 -#define MODEL_o592 0x38 -#define MODEL_o591 0x37 -#define MODEL_o590 0x36 -#define MODEL_o589 0x35 -#define MODEL_o588 0x34 -#define MODEL_o587 0x33 -#define MODEL_o586 0x32 -#define MODEL_o585 0x31 -#define MODEL_o584 0x30 -#define MODEL_o583 0x2F -#define MODEL_o582 0x2E -#define MODEL_o581 0x2D -#define MODEL_o580 0x2C -#define MODEL_o579 0x2B -#define MODEL_o578 0x2A -#define MODEL_g99 0x29 -#define MODEL_g92 0x28 -#define MODEL_g95 0x27 -#define MODEL_o613 0x26 -#define MODEL_o612 0x25 -#define MODEL_o611 0x24 -#define MODEL_g94 0x23 -#define MODEL_o610 0x22 -#define MODEL_o609 0x21 -#define MODEL_o608 0x20 -#define MODEL_g93 0x1F -#define MODEL_o607 0x1E -#define MODEL_o606 0x1D -#define MODEL_o605 0x1C -#define MODEL_g84 0x1B -#define MODEL_g85 0x1A -#define MODEL_door4 0x19 -#define MODEL_g86 0x18 -#define MODEL_door3 0x17 -#define MODEL_g88 0x16 -#define MODEL_g91 0x15 -#define MODEL_o604 0x14 -#define MODEL_o603 0x13 -#define MODEL_o602 0x12 -#define MODEL_g90 0x11 -#define MODEL_o601 0x10 -#define MODEL_o600 0xF -#define MODEL_o599 0xE -#define MODEL_g89 0xD -#define MODEL_o598 0xC -#define MODEL_o597 0xB -#define MODEL_o596 0xA -#define MODEL_g81 0x9 -#define MODEL_g83 0x8 -#define MODEL_door2 0x7 -#define MODEL_g82 0x6 -#define MODEL_door1 0x5 -#define MODEL_g97 0x4 -#define MODEL_g71 0x3 -#define MODEL_o474 0x2 -#define MODEL_g80 0x1 -#define MODEL_o555 0x0 +#define MODEL_Root 0x80 +#define MODEL_g96 0x7F +#define MODEL_g115 0x7E +#define MODEL_o695 0x7D +#define MODEL_o694 0x7C +#define MODEL_g101 0x7B +#define MODEL_g114 0x7A +#define MODEL_o692 0x79 +#define MODEL_o691 0x78 +#define MODEL_o690 0x77 +#define MODEL_g102 0x76 +#define MODEL_o628 0x75 +#define MODEL_o627 0x74 +#define MODEL_o626 0x73 +#define MODEL_g104 0x72 +#define MODEL_g107 0x71 +#define MODEL_o648 0x70 +#define MODEL_o647 0x6F +#define MODEL_o646 0x6E +#define MODEL_o645 0x6D +#define MODEL_o644 0x6C +#define MODEL_o643 0x6B +#define MODEL_g106 0x6A +#define MODEL_o700 0x69 +#define MODEL_o641 0x68 +#define MODEL_o640 0x67 +#define MODEL_g105 0x66 +#define MODEL_o639 0x65 +#define MODEL_o638 0x64 +#define MODEL_o637 0x63 +#define MODEL_o636 0x62 +#define MODEL_o635 0x61 +#define MODEL_o634 0x60 +#define MODEL_o633 0x5F +#define MODEL_o632 0x5E +#define MODEL_g109 0x5D +#define MODEL_o658 0x5C +#define MODEL_o657 0x5B +#define MODEL_o656 0x5A +#define MODEL_o655 0x59 +#define MODEL_o693 0x58 +#define MODEL_g108 0x57 +#define MODEL_o653 0x56 +#define MODEL_o652 0x55 +#define MODEL_o651 0x54 +#define MODEL_o650 0x53 +#define MODEL_o649 0x52 +#define MODEL_g75 0x51 +#define MODEL_o624 0x50 +#define MODEL_o623 0x4F +#define MODEL_o496 0x4E +#define MODEL_o616 0x4D +#define MODEL_enter2 0x4C +#define MODEL_enter1 0x4B +#define MODEL_g98 0x4A +#define MODEL_g73 0x49 +#define MODEL_o528 0x48 +#define MODEL_o527 0x47 +#define MODEL_o526 0x46 +#define MODEL_o525 0x45 +#define MODEL_o524 0x44 +#define MODEL_o523 0x43 +#define MODEL_o522 0x42 +#define MODEL_o521 0x41 +#define MODEL_o520 0x40 +#define MODEL_o499 0x3F +#define MODEL_o498 0x3E +#define MODEL_o497 0x3D +#define MODEL_o504 0x3C +#define MODEL_o503 0x3B +#define MODEL_o502 0x3A +#define MODEL_g87 0x39 +#define MODEL_o592 0x38 +#define MODEL_o591 0x37 +#define MODEL_o590 0x36 +#define MODEL_o589 0x35 +#define MODEL_o588 0x34 +#define MODEL_o587 0x33 +#define MODEL_o586 0x32 +#define MODEL_o585 0x31 +#define MODEL_o584 0x30 +#define MODEL_o583 0x2F +#define MODEL_o582 0x2E +#define MODEL_o581 0x2D +#define MODEL_o580 0x2C +#define MODEL_o579 0x2B +#define MODEL_o578 0x2A +#define MODEL_g99 0x29 +#define MODEL_g92 0x28 +#define MODEL_g95 0x27 +#define MODEL_o613 0x26 +#define MODEL_o612 0x25 +#define MODEL_o611 0x24 +#define MODEL_g94 0x23 +#define MODEL_o610 0x22 +#define MODEL_o609 0x21 +#define MODEL_o608 0x20 +#define MODEL_g93 0x1F +#define MODEL_o607 0x1E +#define MODEL_o606 0x1D +#define MODEL_o605 0x1C +#define MODEL_g84 0x1B +#define MODEL_g85 0x1A +#define MODEL_door4 0x19 +#define MODEL_g86 0x18 +#define MODEL_door3 0x17 +#define MODEL_g88 0x16 +#define MODEL_g91 0x15 +#define MODEL_o604 0x14 +#define MODEL_o603 0x13 +#define MODEL_o602 0x12 +#define MODEL_g90 0x11 +#define MODEL_o601 0x10 +#define MODEL_o600 0xF +#define MODEL_o599 0xE +#define MODEL_g89 0xD +#define MODEL_o598 0xC +#define MODEL_o597 0xB +#define MODEL_o596 0xA +#define MODEL_g81 0x9 +#define MODEL_g83 0x8 +#define MODEL_door2 0x7 +#define MODEL_g82 0x6 +#define MODEL_door1 0x5 +#define MODEL_g97 0x4 +#define MODEL_g71 0x3 +#define MODEL_o474 0x2 +#define MODEL_g80 0x1 +#define MODEL_o555 0x0 + diff --git a/include/mapfs/kkj_13_hit.h b/include/mapfs/kkj_13_hit.h index cab3523d61..1c64be4fc1 100644 --- a/include/mapfs/kkj_13_hit.h +++ b/include/mapfs/kkj_13_hit.h @@ -1,43 +1,50 @@ -#define COLLIDER_Root 0x2A -#define COLLIDER_g93 0x29 -#define COLLIDER_o604 0x28 -#define COLLIDER_o581 0x27 -#define COLLIDER_o579 0x26 -#define COLLIDER_o513 0x25 -#define COLLIDER_o511 0x24 -#define COLLIDER_g92 0x23 -#define COLLIDER_o520 0x22 -#define COLLIDER_o512 0x21 -#define COLLIDER_o510 0x20 -#define COLLIDER_o603 0x1F -#define COLLIDER_g91 0x1E -#define COLLIDER_o626 0x1D -#define COLLIDER_o625 0x1C -#define COLLIDER_o518 0x1B -#define COLLIDER_o506 0x1A -#define COLLIDER_o504 0x19 -#define COLLIDER_g88 0x18 -#define COLLIDER_o516 0x17 -#define COLLIDER_o501 0x16 -#define COLLIDER_o499 0x15 -#define COLLIDER_o602 0x14 -#define COLLIDER_g87 0x13 -#define COLLIDER_o599 0x12 -#define COLLIDER_o584 0x11 -#define COLLIDER_o583 0x10 -#define COLLIDER_o500 0xF -#define COLLIDER_o498 0xE -#define COLLIDER_g82 0xD -#define COLLIDER_o597 0xC -#define COLLIDER_o596 0xB -#define COLLIDER_o598 0xA -#define COLLIDER_o595 0x9 -#define COLLIDER_o594 0x8 -#define COLLIDER_o593 0x7 -#define COLLIDER_g117 0x6 -#define COLLIDER_g101 0x5 -#define COLLIDER_deili2 0x4 -#define COLLIDER_deilit2 0x3 -#define COLLIDER_g80 0x2 -#define COLLIDER_deili1 0x1 -#define COLLIDER_deilit1 0x0 +#define COLLIDER_Root 0x2A +#define COLLIDER_g93 0x29 +#define COLLIDER_o604 0x28 +#define COLLIDER_o581 0x27 +#define COLLIDER_o579 0x26 +#define COLLIDER_o513 0x25 +#define COLLIDER_o511 0x24 +#define COLLIDER_g92 0x23 +#define COLLIDER_o520 0x22 +#define COLLIDER_o512 0x21 +#define COLLIDER_o510 0x20 +#define COLLIDER_o603 0x1F +#define COLLIDER_g91 0x1E +#define COLLIDER_o626 0x1D +#define COLLIDER_o625 0x1C +#define COLLIDER_o518 0x1B +#define COLLIDER_o506 0x1A +#define COLLIDER_o504 0x19 +#define COLLIDER_g88 0x18 +#define COLLIDER_o516 0x17 +#define COLLIDER_o501 0x16 +#define COLLIDER_o499 0x15 +#define COLLIDER_o602 0x14 +#define COLLIDER_g87 0x13 +#define COLLIDER_o599 0x12 +#define COLLIDER_o584 0x11 +#define COLLIDER_o583 0x10 +#define COLLIDER_o500 0xF +#define COLLIDER_o498 0xE +#define COLLIDER_g82 0xD +#define COLLIDER_o597 0xC +#define COLLIDER_o596 0xB +#define COLLIDER_o598 0xA +#define COLLIDER_o595 0x9 +#define COLLIDER_o594 0x8 +#define COLLIDER_o593 0x7 +#define COLLIDER_g117 0x6 +#define COLLIDER_g101 0x5 +#define COLLIDER_deili2 0x4 +#define COLLIDER_deilit2 0x3 +#define COLLIDER_g80 0x2 +#define COLLIDER_deili1 0x1 +#define COLLIDER_deilit1 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g2 0x3 +#define ZONE_o492 0x2 +#define ZONE_o493 0x1 +#define ZONE_o491 0x0 + diff --git a/include/mapfs/kkj_13_shape.h b/include/mapfs/kkj_13_shape.h index 08fba745aa..07a46e8d03 100644 --- a/include/mapfs/kkj_13_shape.h +++ b/include/mapfs/kkj_13_shape.h @@ -1,172 +1,173 @@ -#define MODEL_Root 0xAB -#define MODEL_g135 0xAA -#define MODEL_g153 0xA9 -#define MODEL_o691 0xA8 -#define MODEL_g138 0xA7 -#define MODEL_g144 0xA6 -#define MODEL_o662 0xA5 -#define MODEL_o660 0xA4 -#define MODEL_o697 0xA3 -#define MODEL_o658 0xA2 -#define MODEL_o657 0xA1 -#define MODEL_g150 0xA0 -#define MODEL_o682 0x9F -#define MODEL_o680 0x9E -#define MODEL_o698 0x9D -#define MODEL_o678 0x9C -#define MODEL_o677 0x9B -#define MODEL_o685 0x9A -#define MODEL_g136 0x99 -#define MODEL_g141 0x98 -#define MODEL_o637 0x97 -#define MODEL_o636 0x96 -#define MODEL_o635 0x95 -#define MODEL_o634 0x94 -#define MODEL_g97 0x93 -#define MODEL_o466 0x92 -#define MODEL_o468 0x91 -#define MODEL_g90 0x90 -#define MODEL_o461 0x8F -#define MODEL_o462 0x8E -#define MODEL_g99 0x8D -#define MODEL_o464 0x8C -#define MODEL_o463 0x8B -#define MODEL_g86 0x8A -#define MODEL_o380 0x89 -#define MODEL_o458 0x88 -#define MODEL_g137 0x87 -#define MODEL_g89 0x86 -#define MODEL_o395 0x85 -#define MODEL_o383 0x84 -#define MODEL_o356 0x83 -#define MODEL_o357 0x82 -#define MODEL_g96 0x81 -#define MODEL_o398 0x80 -#define MODEL_o389 0x7F -#define MODEL_o373 0x7E -#define MODEL_o371 0x7D -#define MODEL_g98 0x7C -#define MODEL_o472 0x7B -#define MODEL_o471 0x7A -#define MODEL_o375 0x79 -#define MODEL_o376 0x78 -#define MODEL_g81 0x77 -#define MODEL_o469 0x76 -#define MODEL_o470 0x75 -#define MODEL_o360 0x74 -#define MODEL_o358 0x73 -#define MODEL_g127 0x72 -#define MODEL_g120 0x71 -#define MODEL_g123 0x70 -#define MODEL_o609 0x6F -#define MODEL_o608 0x6E -#define MODEL_o607 0x6D -#define MODEL_g122 0x6C -#define MODEL_o606 0x6B -#define MODEL_o605 0x6A -#define MODEL_o604 0x69 -#define MODEL_g121 0x68 -#define MODEL_o603 0x67 -#define MODEL_o602 0x66 -#define MODEL_o601 0x65 -#define MODEL_g102 0x64 -#define MODEL_g105 0x63 -#define MODEL_door4 0x62 -#define MODEL_g104 0x61 -#define MODEL_door3 0x60 -#define MODEL_g116 0x5F -#define MODEL_g119 0x5E -#define MODEL_o600 0x5D -#define MODEL_o599 0x5C -#define MODEL_o598 0x5B -#define MODEL_g118 0x5A -#define MODEL_o597 0x59 -#define MODEL_o596 0x58 -#define MODEL_o595 0x57 -#define MODEL_g117 0x56 -#define MODEL_o594 0x55 -#define MODEL_o593 0x54 -#define MODEL_o592 0x53 -#define MODEL_g83 0x52 -#define MODEL_g85 0x51 -#define MODEL_door2 0x50 -#define MODEL_g84 0x4F -#define MODEL_door1 0x4E -#define MODEL_g126 0x4D -#define MODEL_g93 0x4C -#define MODEL_g132 0x4B -#define MODEL_o621 0x4A -#define MODEL_o620 0x49 -#define MODEL_g79 0x48 -#define MODEL_o377 0x47 -#define MODEL_o591 0x46 -#define MODEL_o579 0x45 -#define MODEL_yuka5 0x44 -#define MODEL_o455 0x43 -#define MODEL_o454 0x42 -#define MODEL_o513 0x41 -#define MODEL_o511 0x40 -#define MODEL_g92 0x3F -#define MODEL_g131 0x3E -#define MODEL_o619 0x3D -#define MODEL_o618 0x3C -#define MODEL_g77 0x3B -#define MODEL_o367 0x3A -#define MODEL_o530 0x39 -#define MODEL_o520 0x38 -#define MODEL_yuka4 0x37 -#define MODEL_o452 0x36 -#define MODEL_o453 0x35 -#define MODEL_o512 0x34 -#define MODEL_o508 0x33 -#define MODEL_g91 0x32 -#define MODEL_g146 0x31 -#define MODEL_o665 0x30 -#define MODEL_o664 0x2F -#define MODEL_o663 0x2E -#define MODEL_g133 0x2D -#define MODEL_o623 0x2C -#define MODEL_o622 0x2B -#define MODEL_g152 0x2A -#define MODEL_o689 0x29 -#define MODEL_o687 0x28 -#define MODEL_g154 0x27 -#define MODEL_o690 0x26 -#define MODEL_o700 0x25 -#define MODEL_o699 0x24 -#define MODEL_g147 0x23 -#define MODEL_o669 0x22 -#define MODEL_o668 0x21 -#define MODEL_o667 0x20 -#define MODEL_o666 0x1F -#define MODEL_g88 0x1E -#define MODEL_g129 0x1D -#define MODEL_o615 0x1C -#define MODEL_o614 0x1B -#define MODEL_g148 0x1A -#define MODEL_o672 0x19 -#define MODEL_o671 0x18 -#define MODEL_o670 0x17 -#define MODEL_g149 0x16 -#define MODEL_o675 0x15 -#define MODEL_o676 0x14 -#define MODEL_o674 0x13 -#define MODEL_o673 0x12 -#define MODEL_g87 0x11 -#define MODEL_g128 0x10 -#define MODEL_o613 0xF -#define MODEL_o612 0xE -#define MODEL_g78 0xD -#define MODEL_o369 0xC -#define MODEL_o583 0xB -#define MODEL_o524 0xA -#define MODEL_yuka1 0x9 -#define MODEL_o451 0x8 -#define MODEL_o450 0x7 -#define MODEL_o498 0x6 -#define MODEL_o496 0x5 -#define MODEL_g125 0x4 -#define MODEL_g101 0x3 -#define MODEL_o474 0x2 -#define MODEL_g80 0x1 -#define MODEL_o7 0x0 +#define MODEL_Root 0xAB +#define MODEL_g135 0xAA +#define MODEL_g153 0xA9 +#define MODEL_o691 0xA8 +#define MODEL_g138 0xA7 +#define MODEL_g144 0xA6 +#define MODEL_o662 0xA5 +#define MODEL_o660 0xA4 +#define MODEL_o697 0xA3 +#define MODEL_o658 0xA2 +#define MODEL_o657 0xA1 +#define MODEL_g150 0xA0 +#define MODEL_o682 0x9F +#define MODEL_o680 0x9E +#define MODEL_o698 0x9D +#define MODEL_o678 0x9C +#define MODEL_o677 0x9B +#define MODEL_o685 0x9A +#define MODEL_g136 0x99 +#define MODEL_g141 0x98 +#define MODEL_o637 0x97 +#define MODEL_o636 0x96 +#define MODEL_o635 0x95 +#define MODEL_o634 0x94 +#define MODEL_g97 0x93 +#define MODEL_o466 0x92 +#define MODEL_o468 0x91 +#define MODEL_g90 0x90 +#define MODEL_o461 0x8F +#define MODEL_o462 0x8E +#define MODEL_g99 0x8D +#define MODEL_o464 0x8C +#define MODEL_o463 0x8B +#define MODEL_g86 0x8A +#define MODEL_o380 0x89 +#define MODEL_o458 0x88 +#define MODEL_g137 0x87 +#define MODEL_g89 0x86 +#define MODEL_o395 0x85 +#define MODEL_o383 0x84 +#define MODEL_o356 0x83 +#define MODEL_o357 0x82 +#define MODEL_g96 0x81 +#define MODEL_o398 0x80 +#define MODEL_o389 0x7F +#define MODEL_o373 0x7E +#define MODEL_o371 0x7D +#define MODEL_g98 0x7C +#define MODEL_o472 0x7B +#define MODEL_o471 0x7A +#define MODEL_o375 0x79 +#define MODEL_o376 0x78 +#define MODEL_g81 0x77 +#define MODEL_o469 0x76 +#define MODEL_o470 0x75 +#define MODEL_o360 0x74 +#define MODEL_o358 0x73 +#define MODEL_g127 0x72 +#define MODEL_g120 0x71 +#define MODEL_g123 0x70 +#define MODEL_o609 0x6F +#define MODEL_o608 0x6E +#define MODEL_o607 0x6D +#define MODEL_g122 0x6C +#define MODEL_o606 0x6B +#define MODEL_o605 0x6A +#define MODEL_o604 0x69 +#define MODEL_g121 0x68 +#define MODEL_o603 0x67 +#define MODEL_o602 0x66 +#define MODEL_o601 0x65 +#define MODEL_g102 0x64 +#define MODEL_g105 0x63 +#define MODEL_door4 0x62 +#define MODEL_g104 0x61 +#define MODEL_door3 0x60 +#define MODEL_g116 0x5F +#define MODEL_g119 0x5E +#define MODEL_o600 0x5D +#define MODEL_o599 0x5C +#define MODEL_o598 0x5B +#define MODEL_g118 0x5A +#define MODEL_o597 0x59 +#define MODEL_o596 0x58 +#define MODEL_o595 0x57 +#define MODEL_g117 0x56 +#define MODEL_o594 0x55 +#define MODEL_o593 0x54 +#define MODEL_o592 0x53 +#define MODEL_g83 0x52 +#define MODEL_g85 0x51 +#define MODEL_door2 0x50 +#define MODEL_g84 0x4F +#define MODEL_door1 0x4E +#define MODEL_g126 0x4D +#define MODEL_g93 0x4C +#define MODEL_g132 0x4B +#define MODEL_o621 0x4A +#define MODEL_o620 0x49 +#define MODEL_g79 0x48 +#define MODEL_o377 0x47 +#define MODEL_o591 0x46 +#define MODEL_o579 0x45 +#define MODEL_yuka5 0x44 +#define MODEL_o455 0x43 +#define MODEL_o454 0x42 +#define MODEL_o513 0x41 +#define MODEL_o511 0x40 +#define MODEL_g92 0x3F +#define MODEL_g131 0x3E +#define MODEL_o619 0x3D +#define MODEL_o618 0x3C +#define MODEL_g77 0x3B +#define MODEL_o367 0x3A +#define MODEL_o530 0x39 +#define MODEL_o520 0x38 +#define MODEL_yuka4 0x37 +#define MODEL_o452 0x36 +#define MODEL_o453 0x35 +#define MODEL_o512 0x34 +#define MODEL_o508 0x33 +#define MODEL_g91 0x32 +#define MODEL_g146 0x31 +#define MODEL_o665 0x30 +#define MODEL_o664 0x2F +#define MODEL_o663 0x2E +#define MODEL_g133 0x2D +#define MODEL_o623 0x2C +#define MODEL_o622 0x2B +#define MODEL_g152 0x2A +#define MODEL_o689 0x29 +#define MODEL_o687 0x28 +#define MODEL_g154 0x27 +#define MODEL_o690 0x26 +#define MODEL_o700 0x25 +#define MODEL_o699 0x24 +#define MODEL_g147 0x23 +#define MODEL_o669 0x22 +#define MODEL_o668 0x21 +#define MODEL_o667 0x20 +#define MODEL_o666 0x1F +#define MODEL_g88 0x1E +#define MODEL_g129 0x1D +#define MODEL_o615 0x1C +#define MODEL_o614 0x1B +#define MODEL_g148 0x1A +#define MODEL_o672 0x19 +#define MODEL_o671 0x18 +#define MODEL_o670 0x17 +#define MODEL_g149 0x16 +#define MODEL_o675 0x15 +#define MODEL_o676 0x14 +#define MODEL_o674 0x13 +#define MODEL_o673 0x12 +#define MODEL_g87 0x11 +#define MODEL_g128 0x10 +#define MODEL_o613 0xF +#define MODEL_o612 0xE +#define MODEL_g78 0xD +#define MODEL_o369 0xC +#define MODEL_o583 0xB +#define MODEL_o524 0xA +#define MODEL_yuka1 0x9 +#define MODEL_o451 0x8 +#define MODEL_o450 0x7 +#define MODEL_o498 0x6 +#define MODEL_o496 0x5 +#define MODEL_g125 0x4 +#define MODEL_g101 0x3 +#define MODEL_o474 0x2 +#define MODEL_g80 0x1 +#define MODEL_o7 0x0 + diff --git a/include/mapfs/kkj_14_hit.h b/include/mapfs/kkj_14_hit.h index 0ecfc45699..b65fdbeeeb 100644 --- a/include/mapfs/kkj_14_hit.h +++ b/include/mapfs/kkj_14_hit.h @@ -1,46 +1,51 @@ -#define COLLIDER_Root 0x2D -#define COLLIDER_g1 0x2C -#define COLLIDER_g36 0x2B -#define COLLIDER_o135 0x2A -#define COLLIDER_o25 0x29 -#define COLLIDER_o141 0x28 -#define COLLIDER_o142 0x27 -#define COLLIDER_o143 0x26 -#define COLLIDER_o129 0x25 -#define COLLIDER_g14 0x24 -#define COLLIDER_o98 0x23 -#define COLLIDER_o47 0x22 -#define COLLIDER_o43 0x21 -#define COLLIDER_o45 0x20 -#define COLLIDER_bed 0x1F -#define COLLIDER_o140 0x1E -#define COLLIDER_g27 0x1D -#define COLLIDER_o125 0x1C -#define COLLIDER_o120 0x1B -#define COLLIDER_o119 0x1A -#define COLLIDER_o130 0x19 -#define COLLIDER_o128 0x18 -#define COLLIDER_g6 0x17 -#define COLLIDER_o89 0x16 -#define COLLIDER_o12 0x15 -#define COLLIDER_g2 0x14 -#define COLLIDER_g26 0x13 -#define COLLIDER_o110 0x12 -#define COLLIDER_o109 0x11 -#define COLLIDER_o9 0x10 -#define COLLIDER_g24 0xF -#define COLLIDER_o106 0xE -#define COLLIDER_o105 0xD -#define COLLIDER_o104 0xC -#define COLLIDER_o8 0xB -#define COLLIDER_g3 0xA -#define COLLIDER_g34 0x9 -#define COLLIDER_o134 0x8 -#define COLLIDER_tte 0x7 -#define COLLIDER_deilite 0x6 -#define COLLIDER_deilie 0x5 -#define COLLIDER_g33 0x4 -#define COLLIDER_o112 0x3 -#define COLLIDER_ttw 0x2 -#define COLLIDER_deilitw 0x1 -#define COLLIDER_deiliw 0x0 +#define COLLIDER_Root 0x2D +#define COLLIDER_g1 0x2C +#define COLLIDER_g36 0x2B +#define COLLIDER_o135 0x2A +#define COLLIDER_o25 0x29 +#define COLLIDER_o141 0x28 +#define COLLIDER_o142 0x27 +#define COLLIDER_o143 0x26 +#define COLLIDER_o129 0x25 +#define COLLIDER_g14 0x24 +#define COLLIDER_o98 0x23 +#define COLLIDER_o47 0x22 +#define COLLIDER_o43 0x21 +#define COLLIDER_o45 0x20 +#define COLLIDER_bed 0x1F +#define COLLIDER_o140 0x1E +#define COLLIDER_g27 0x1D +#define COLLIDER_o125 0x1C +#define COLLIDER_o120 0x1B +#define COLLIDER_o119 0x1A +#define COLLIDER_o130 0x19 +#define COLLIDER_o128 0x18 +#define COLLIDER_g6 0x17 +#define COLLIDER_o89 0x16 +#define COLLIDER_o12 0x15 +#define COLLIDER_g2 0x14 +#define COLLIDER_g26 0x13 +#define COLLIDER_o110 0x12 +#define COLLIDER_o109 0x11 +#define COLLIDER_o9 0x10 +#define COLLIDER_g24 0xF +#define COLLIDER_o106 0xE +#define COLLIDER_o105 0xD +#define COLLIDER_o104 0xC +#define COLLIDER_o8 0xB +#define COLLIDER_g3 0xA +#define COLLIDER_g34 0x9 +#define COLLIDER_o134 0x8 +#define COLLIDER_tte 0x7 +#define COLLIDER_deilite 0x6 +#define COLLIDER_deilie 0x5 +#define COLLIDER_g33 0x4 +#define COLLIDER_o112 0x3 +#define COLLIDER_ttw 0x2 +#define COLLIDER_deilitw 0x1 +#define COLLIDER_deiliw 0x0 + +#define ZONE_Root 0x2 +#define ZONE_g1 0x1 +#define ZONE_o111 0x0 + diff --git a/include/mapfs/kkj_14_shape.h b/include/mapfs/kkj_14_shape.h index 8d21588b1b..15f5b50bd8 100644 --- a/include/mapfs/kkj_14_shape.h +++ b/include/mapfs/kkj_14_shape.h @@ -1,137 +1,138 @@ -#define MODEL_Root 0x88 -#define MODEL_g1 0x87 -#define MODEL_o155 0x86 -#define MODEL_g37 0x85 -#define MODEL_o135 0x84 -#define MODEL_o134 0x83 -#define MODEL_mado 0x82 -#define MODEL_g29 0x81 -#define MODEL_o85 0x80 -#define MODEL_o86 0x7F -#define MODEL_g28 0x7E -#define MODEL_o83 0x7D -#define MODEL_o84 0x7C -#define MODEL_baru 0x7B -#define MODEL_o81 0x7A -#define MODEL_o80 0x79 -#define MODEL_g19 0x78 -#define MODEL_o79 0x77 -#define MODEL_o78 0x76 -#define MODEL_o77 0x75 -#define MODEL_o76 0x74 -#define MODEL_o75 0x73 -#define MODEL_o74 0x72 -#define MODEL_o71 0x71 -#define MODEL_o70 0x70 -#define MODEL_o69 0x6F -#define MODEL_o72 0x6E -#define MODEL_o73 0x6D -#define MODEL_hasira 0x6C -#define MODEL_o68 0x6B -#define MODEL_o67 0x6A -#define MODEL_o66 0x69 -#define MODEL_o31 0x68 -#define MODEL_o30 0x67 -#define MODEL_o29 0x66 -#define MODEL_g14 0x65 -#define MODEL_o98 0x64 -#define MODEL_o48 0x63 -#define MODEL_o44 0x62 -#define MODEL_o47 0x61 -#define MODEL_o46 0x60 -#define MODEL_o43 0x5F -#define MODEL_o45 0x5E -#define MODEL_g8 0x5D -#define MODEL_o10 0x5C -#define MODEL_o11 0x5B -#define MODEL_g16 0x5A -#define MODEL_o61 0x59 -#define MODEL_o60 0x58 -#define MODEL_o59 0x57 -#define MODEL_denki 0x56 -#define MODEL_o34 0x55 -#define MODEL_o33 0x54 -#define MODEL_o32 0x53 -#define MODEL_danro 0x52 -#define MODEL_g45 0x51 -#define MODEL_o157 0x50 -#define MODEL_o42 0x4F -#define MODEL_o35 0x4E -#define MODEL_g27 0x4D -#define MODEL_o159 0x4C -#define MODEL_o111 0x4B -#define MODEL_g38 0x4A -#define MODEL_o146 0x49 -#define MODEL_o143 0x48 -#define MODEL_o141 0x47 -#define MODEL_g39 0x46 -#define MODEL_o145 0x45 -#define MODEL_o144 0x44 -#define MODEL_o142 0x43 -#define MODEL_g30 0x42 -#define MODEL_o39 0x41 -#define MODEL_g42 0x40 -#define MODEL_o95 0x3F -#define MODEL_o94 0x3E -#define MODEL_o38 0x3D -#define MODEL_o37 0x3C -#define MODEL_o1 0x3B -#define MODEL_g7 0x3A -#define MODEL_o15 0x39 -#define MODEL_o16 0x38 -#define MODEL_o41 0x37 -#define MODEL_o154 0x36 -#define MODEL_o40 0x35 -#define MODEL_bed 0x34 -#define MODEL_o28 0x33 -#define MODEL_o25 0x32 -#define MODEL_o24 0x31 -#define MODEL_o27 0x30 -#define MODEL_o26 0x2F -#define MODEL_o22 0x2E -#define MODEL_o21 0x2D -#define MODEL_o20 0x2C -#define MODEL_g6 0x2B -#define MODEL_g17 0x2A -#define MODEL_o65 0x29 -#define MODEL_o64 0x28 -#define MODEL_o63 0x27 -#define MODEL_o62 0x26 -#define MODEL_g21 0x25 -#define MODEL_o92 0x24 -#define MODEL_o93 0x23 -#define MODEL_o91 0x22 -#define MODEL_o90 0x21 -#define MODEL_o89 0x20 -#define MODEL_o55 0x1F -#define MODEL_o54 0x1E -#define MODEL_g15 0x1D -#define MODEL_o52 0x1C -#define MODEL_o51 0x1B -#define MODEL_g9 0x1A -#define MODEL_o19 0x19 -#define MODEL_o13 0x18 -#define MODEL_o12 0x17 -#define MODEL_g2 0x16 -#define MODEL_g26 0x15 -#define MODEL_o110 0x14 -#define MODEL_o109 0x13 -#define MODEL_o9 0x12 -#define MODEL_g25 0x11 -#define MODEL_o108 0x10 -#define MODEL_o107 0xF -#define MODEL_o58 0xE -#define MODEL_g24 0xD -#define MODEL_o106 0xC -#define MODEL_o105 0xB -#define MODEL_o104 0xA -#define MODEL_o8 0x9 -#define MODEL_g23 0x8 -#define MODEL_o103 0x7 -#define MODEL_o102 0x6 -#define MODEL_o101 0x5 -#define MODEL_o7 0x4 -#define MODEL_g4 0x3 -#define MODEL_o4 0x2 -#define MODEL_g3 0x1 -#define MODEL_o2 0x0 +#define MODEL_Root 0x88 +#define MODEL_g1 0x87 +#define MODEL_o155 0x86 +#define MODEL_g37 0x85 +#define MODEL_o135 0x84 +#define MODEL_o134 0x83 +#define MODEL_mado 0x82 +#define MODEL_g29 0x81 +#define MODEL_o85 0x80 +#define MODEL_o86 0x7F +#define MODEL_g28 0x7E +#define MODEL_o83 0x7D +#define MODEL_o84 0x7C +#define MODEL_baru 0x7B +#define MODEL_o81 0x7A +#define MODEL_o80 0x79 +#define MODEL_g19 0x78 +#define MODEL_o79 0x77 +#define MODEL_o78 0x76 +#define MODEL_o77 0x75 +#define MODEL_o76 0x74 +#define MODEL_o75 0x73 +#define MODEL_o74 0x72 +#define MODEL_o71 0x71 +#define MODEL_o70 0x70 +#define MODEL_o69 0x6F +#define MODEL_o72 0x6E +#define MODEL_o73 0x6D +#define MODEL_hasira 0x6C +#define MODEL_o68 0x6B +#define MODEL_o67 0x6A +#define MODEL_o66 0x69 +#define MODEL_o31 0x68 +#define MODEL_o30 0x67 +#define MODEL_o29 0x66 +#define MODEL_g14 0x65 +#define MODEL_o98 0x64 +#define MODEL_o48 0x63 +#define MODEL_o44 0x62 +#define MODEL_o47 0x61 +#define MODEL_o46 0x60 +#define MODEL_o43 0x5F +#define MODEL_o45 0x5E +#define MODEL_g8 0x5D +#define MODEL_o10 0x5C +#define MODEL_o11 0x5B +#define MODEL_g16 0x5A +#define MODEL_o61 0x59 +#define MODEL_o60 0x58 +#define MODEL_o59 0x57 +#define MODEL_denki 0x56 +#define MODEL_o34 0x55 +#define MODEL_o33 0x54 +#define MODEL_o32 0x53 +#define MODEL_danro 0x52 +#define MODEL_g45 0x51 +#define MODEL_o157 0x50 +#define MODEL_o42 0x4F +#define MODEL_o35 0x4E +#define MODEL_g27 0x4D +#define MODEL_o159 0x4C +#define MODEL_o111 0x4B +#define MODEL_g38 0x4A +#define MODEL_o146 0x49 +#define MODEL_o143 0x48 +#define MODEL_o141 0x47 +#define MODEL_g39 0x46 +#define MODEL_o145 0x45 +#define MODEL_o144 0x44 +#define MODEL_o142 0x43 +#define MODEL_g30 0x42 +#define MODEL_o39 0x41 +#define MODEL_g42 0x40 +#define MODEL_o95 0x3F +#define MODEL_o94 0x3E +#define MODEL_o38 0x3D +#define MODEL_o37 0x3C +#define MODEL_o1 0x3B +#define MODEL_g7 0x3A +#define MODEL_o15 0x39 +#define MODEL_o16 0x38 +#define MODEL_o41 0x37 +#define MODEL_o154 0x36 +#define MODEL_o40 0x35 +#define MODEL_bed 0x34 +#define MODEL_o28 0x33 +#define MODEL_o25 0x32 +#define MODEL_o24 0x31 +#define MODEL_o27 0x30 +#define MODEL_o26 0x2F +#define MODEL_o22 0x2E +#define MODEL_o21 0x2D +#define MODEL_o20 0x2C +#define MODEL_g6 0x2B +#define MODEL_g17 0x2A +#define MODEL_o65 0x29 +#define MODEL_o64 0x28 +#define MODEL_o63 0x27 +#define MODEL_o62 0x26 +#define MODEL_g21 0x25 +#define MODEL_o92 0x24 +#define MODEL_o93 0x23 +#define MODEL_o91 0x22 +#define MODEL_o90 0x21 +#define MODEL_o89 0x20 +#define MODEL_o55 0x1F +#define MODEL_o54 0x1E +#define MODEL_g15 0x1D +#define MODEL_o52 0x1C +#define MODEL_o51 0x1B +#define MODEL_g9 0x1A +#define MODEL_o19 0x19 +#define MODEL_o13 0x18 +#define MODEL_o12 0x17 +#define MODEL_g2 0x16 +#define MODEL_g26 0x15 +#define MODEL_o110 0x14 +#define MODEL_o109 0x13 +#define MODEL_o9 0x12 +#define MODEL_g25 0x11 +#define MODEL_o108 0x10 +#define MODEL_o107 0xF +#define MODEL_o58 0xE +#define MODEL_g24 0xD +#define MODEL_o106 0xC +#define MODEL_o105 0xB +#define MODEL_o104 0xA +#define MODEL_o8 0x9 +#define MODEL_g23 0x8 +#define MODEL_o103 0x7 +#define MODEL_o102 0x6 +#define MODEL_o101 0x5 +#define MODEL_o7 0x4 +#define MODEL_g4 0x3 +#define MODEL_o4 0x2 +#define MODEL_g3 0x1 +#define MODEL_o2 0x0 + diff --git a/include/mapfs/kkj_15_hit.h b/include/mapfs/kkj_15_hit.h index 69af1c2f06..6512bd59cd 100644 --- a/include/mapfs/kkj_15_hit.h +++ b/include/mapfs/kkj_15_hit.h @@ -1,35 +1,41 @@ -#define COLLIDER_Root 0x22 -#define COLLIDER_g1 0x21 -#define COLLIDER_g25 0x20 -#define COLLIDER_o99 0x1F -#define COLLIDER_o98 0x1E -#define COLLIDER_o97 0x1D -#define COLLIDER_o96 0x1C -#define COLLIDER_o95 0x1B -#define COLLIDER_g22 0x1A -#define COLLIDER_o68 0x19 -#define COLLIDER_o66 0x18 -#define COLLIDER_o5 0x17 -#define COLLIDER_hasira 0x16 -#define COLLIDER_o70 0x15 -#define COLLIDER_o40 0x14 -#define COLLIDER_kabin 0x13 -#define COLLIDER_o90 0x12 -#define COLLIDER_o77 0x11 -#define COLLIDER_isu 0x10 -#define COLLIDER_o21 0xF -#define COLLIDER_o19 0xE -#define COLLIDER_desk 0xD -#define COLLIDER_o94 0xC -#define COLLIDER_o75 0xB -#define COLLIDER_o76 0xA -#define COLLIDER_o12 0x9 -#define COLLIDER_o100 0x8 -#define COLLIDER_g2 0x7 -#define COLLIDER_o25 0x6 -#define COLLIDER_o1 0x5 -#define COLLIDER_g4 0x4 -#define COLLIDER_o93 0x3 -#define COLLIDER_tte 0x2 -#define COLLIDER_deilite 0x1 -#define COLLIDER_deilie 0x0 +#define COLLIDER_Root 0x22 +#define COLLIDER_g1 0x21 +#define COLLIDER_g25 0x20 +#define COLLIDER_o99 0x1F +#define COLLIDER_o98 0x1E +#define COLLIDER_o97 0x1D +#define COLLIDER_o96 0x1C +#define COLLIDER_o95 0x1B +#define COLLIDER_g22 0x1A +#define COLLIDER_o68 0x19 +#define COLLIDER_o66 0x18 +#define COLLIDER_o5 0x17 +#define COLLIDER_hasira 0x16 +#define COLLIDER_o70 0x15 +#define COLLIDER_o40 0x14 +#define COLLIDER_kabin 0x13 +#define COLLIDER_o90 0x12 +#define COLLIDER_o77 0x11 +#define COLLIDER_isu 0x10 +#define COLLIDER_o21 0xF +#define COLLIDER_o19 0xE +#define COLLIDER_desk 0xD +#define COLLIDER_o94 0xC +#define COLLIDER_o75 0xB +#define COLLIDER_o76 0xA +#define COLLIDER_o12 0x9 +#define COLLIDER_o100 0x8 +#define COLLIDER_g2 0x7 +#define COLLIDER_o25 0x6 +#define COLLIDER_o1 0x5 +#define COLLIDER_g4 0x4 +#define COLLIDER_o93 0x3 +#define COLLIDER_tte 0x2 +#define COLLIDER_deilite 0x1 +#define COLLIDER_deilie 0x0 + +#define ZONE_Root 0x3 +#define ZONE_g1 0x2 +#define ZONE_o90 0x1 +#define ZONE_o25 0x0 + diff --git a/include/mapfs/kkj_15_shape.h b/include/mapfs/kkj_15_shape.h index 2b9e8bb628..97e3be387c 100644 --- a/include/mapfs/kkj_15_shape.h +++ b/include/mapfs/kkj_15_shape.h @@ -1,107 +1,108 @@ -#define MODEL_Root 0x6A -#define MODEL_g1 0x69 -#define MODEL_g29 0x68 -#define MODEL_g34 0x67 -#define MODEL_o139 0x66 -#define MODEL_o138 0x65 -#define MODEL_o137 0x64 -#define MODEL_g30 0x63 -#define MODEL_o120 0x62 -#define MODEL_o118 0x61 -#define MODEL_o116 0x60 -#define MODEL_g28 0x5F -#define MODEL_g25 0x5E -#define MODEL_g27 0x5D -#define MODEL_o114 0x5C -#define MODEL_o113 0x5B -#define MODEL_o115 0x5A -#define MODEL_o111 0x59 -#define MODEL_o110 0x58 -#define MODEL_o109 0x57 -#define MODEL_o108 0x56 -#define MODEL_g26 0x55 -#define MODEL_o106 0x54 -#define MODEL_o105 0x53 -#define MODEL_o104 0x52 -#define MODEL_o103 0x51 -#define MODEL_o102 0x50 -#define MODEL_o101 0x4F -#define MODEL_o152 0x4E -#define MODEL_g22 0x4D -#define MODEL_g24 0x4C -#define MODEL_o43 0x4B -#define MODEL_o151 0x4A -#define MODEL_o78 0x49 -#define MODEL_o79 0x48 -#define MODEL_o80 0x47 -#define MODEL_o81 0x46 -#define MODEL_o82 0x45 -#define MODEL_o11 0x44 -#define MODEL_o10 0x43 -#define MODEL_o9 0x42 -#define MODEL_g23 0x41 -#define MODEL_o73 0x40 -#define MODEL_o72 0x3F -#define MODEL_o71 0x3E -#define MODEL_o50 0x3D -#define MODEL_o68 0x3C -#define MODEL_o67 0x3B -#define MODEL_o66 0x3A -#define MODEL_o65 0x39 -#define MODEL_o5 0x38 -#define MODEL_o96 0x37 -#define MODEL_o94 0x36 -#define MODEL_hasira 0x35 -#define MODEL_o70 0x34 -#define MODEL_o69 0x33 -#define MODEL_o40 0x32 -#define MODEL_o39 0x31 -#define MODEL_kabin 0x30 -#define MODEL_o86 0x2F -#define MODEL_o85 0x2E -#define MODEL_o84 0x2D -#define MODEL_o83 0x2C -#define MODEL_o77 0x2B -#define MODEL_o15 0x2A -#define MODEL_o17 0x29 -#define MODEL_o16 0x28 -#define MODEL_mado 0x27 -#define MODEL_g14 0x26 -#define MODEL_o38 0x25 -#define MODEL_o37 0x24 -#define MODEL_o36 0x23 -#define MODEL_o35 0x22 -#define MODEL_g13 0x21 -#define MODEL_o32 0x20 -#define MODEL_o31 0x1F -#define MODEL_o34 0x1E -#define MODEL_o33 0x1D -#define MODEL_isu 0x1C -#define MODEL_o22 0x1B -#define MODEL_o21 0x1A -#define MODEL_o20 0x19 -#define MODEL_o19 0x18 -#define MODEL_o18 0x17 -#define MODEL_desk 0x16 -#define MODEL_o89 0x15 -#define MODEL_o88 0x14 -#define MODEL_o76 0x13 -#define MODEL_o75 0x12 -#define MODEL_o74 0x11 -#define MODEL_o13 0x10 -#define MODEL_o12 0xF -#define MODEL_g2 0xE -#define MODEL_o87 0xD -#define MODEL_o26 0xC -#define MODEL_o100 0xB -#define MODEL_o25 0xA -#define MODEL_o99 0x9 -#define MODEL_o98 0x8 -#define MODEL_o97 0x7 -#define MODEL_o92 0x6 -#define MODEL_o95 0x5 -#define MODEL_o90 0x4 -#define MODEL_g3 0x3 -#define MODEL_o2 0x2 -#define MODEL_g4 0x1 -#define MODEL_o3 0x0 +#define MODEL_Root 0x6A +#define MODEL_g1 0x69 +#define MODEL_g29 0x68 +#define MODEL_g34 0x67 +#define MODEL_o139 0x66 +#define MODEL_o138 0x65 +#define MODEL_o137 0x64 +#define MODEL_g30 0x63 +#define MODEL_o120 0x62 +#define MODEL_o118 0x61 +#define MODEL_o116 0x60 +#define MODEL_g28 0x5F +#define MODEL_g25 0x5E +#define MODEL_g27 0x5D +#define MODEL_o114 0x5C +#define MODEL_o113 0x5B +#define MODEL_o115 0x5A +#define MODEL_o111 0x59 +#define MODEL_o110 0x58 +#define MODEL_o109 0x57 +#define MODEL_o108 0x56 +#define MODEL_g26 0x55 +#define MODEL_o106 0x54 +#define MODEL_o105 0x53 +#define MODEL_o104 0x52 +#define MODEL_o103 0x51 +#define MODEL_o102 0x50 +#define MODEL_o101 0x4F +#define MODEL_o152 0x4E +#define MODEL_g22 0x4D +#define MODEL_g24 0x4C +#define MODEL_o43 0x4B +#define MODEL_o151 0x4A +#define MODEL_o78 0x49 +#define MODEL_o79 0x48 +#define MODEL_o80 0x47 +#define MODEL_o81 0x46 +#define MODEL_o82 0x45 +#define MODEL_o11 0x44 +#define MODEL_o10 0x43 +#define MODEL_o9 0x42 +#define MODEL_g23 0x41 +#define MODEL_o73 0x40 +#define MODEL_o72 0x3F +#define MODEL_o71 0x3E +#define MODEL_o50 0x3D +#define MODEL_o68 0x3C +#define MODEL_o67 0x3B +#define MODEL_o66 0x3A +#define MODEL_o65 0x39 +#define MODEL_o5 0x38 +#define MODEL_o96 0x37 +#define MODEL_o94 0x36 +#define MODEL_hasira 0x35 +#define MODEL_o70 0x34 +#define MODEL_o69 0x33 +#define MODEL_o40 0x32 +#define MODEL_o39 0x31 +#define MODEL_kabin 0x30 +#define MODEL_o86 0x2F +#define MODEL_o85 0x2E +#define MODEL_o84 0x2D +#define MODEL_o83 0x2C +#define MODEL_o77 0x2B +#define MODEL_o15 0x2A +#define MODEL_o17 0x29 +#define MODEL_o16 0x28 +#define MODEL_mado 0x27 +#define MODEL_g14 0x26 +#define MODEL_o38 0x25 +#define MODEL_o37 0x24 +#define MODEL_o36 0x23 +#define MODEL_o35 0x22 +#define MODEL_g13 0x21 +#define MODEL_o32 0x20 +#define MODEL_o31 0x1F +#define MODEL_o34 0x1E +#define MODEL_o33 0x1D +#define MODEL_isu 0x1C +#define MODEL_o22 0x1B +#define MODEL_o21 0x1A +#define MODEL_o20 0x19 +#define MODEL_o19 0x18 +#define MODEL_o18 0x17 +#define MODEL_desk 0x16 +#define MODEL_o89 0x15 +#define MODEL_o88 0x14 +#define MODEL_o76 0x13 +#define MODEL_o75 0x12 +#define MODEL_o74 0x11 +#define MODEL_o13 0x10 +#define MODEL_o12 0xF +#define MODEL_g2 0xE +#define MODEL_o87 0xD +#define MODEL_o26 0xC +#define MODEL_o100 0xB +#define MODEL_o25 0xA +#define MODEL_o99 0x9 +#define MODEL_o98 0x8 +#define MODEL_o97 0x7 +#define MODEL_o92 0x6 +#define MODEL_o95 0x5 +#define MODEL_o90 0x4 +#define MODEL_g3 0x3 +#define MODEL_o2 0x2 +#define MODEL_g4 0x1 +#define MODEL_o3 0x0 + diff --git a/include/mapfs/kkj_16_hit.h b/include/mapfs/kkj_16_hit.h index 1727f91687..e698947853 100644 --- a/include/mapfs/kkj_16_hit.h +++ b/include/mapfs/kkj_16_hit.h @@ -1,47 +1,55 @@ -#define COLLIDER_Root 0x2E -#define COLLIDER_g1 0x2D -#define COLLIDER_isu 0x2C -#define COLLIDER_o258 0x2B -#define COLLIDER_o248 0x2A -#define COLLIDER_hon 0x29 -#define COLLIDER_o188 0x28 -#define COLLIDER_o187 0x27 -#define COLLIDER_o186 0x26 -#define COLLIDER_tesri2 0x25 -#define COLLIDER_o275 0x24 -#define COLLIDER_o75 0x23 -#define COLLIDER_o74 0x22 -#define COLLIDER_tukue 0x21 -#define COLLIDER_o253 0x20 -#define COLLIDER_o252 0x1F -#define COLLIDER_o251 0x1E -#define COLLIDER_o250 0x1D -#define COLLIDER_o249 0x1C -#define COLLIDER_o185 0x1B -#define COLLIDER_o35 0x1A -#define COLLIDER_tana 0x19 -#define COLLIDER_o65 0x18 -#define COLLIDER_o20 0x17 -#define COLLIDER_hondana 0x16 -#define COLLIDER_o247 0x15 -#define COLLIDER_o179 0x14 -#define COLLIDER_o178 0x13 -#define COLLIDER_o177 0x12 -#define COLLIDER_o176 0x11 -#define COLLIDER_o175 0x10 -#define COLLIDER_o174 0xF -#define COLLIDER_o173 0xE -#define COLLIDER_o172 0xD -#define COLLIDER_o171 0xC -#define COLLIDER_g2 0xB -#define COLLIDER_o181 0xA -#define COLLIDER_o180 0x9 -#define COLLIDER_o170 0x8 -#define COLLIDER_o152 0x7 -#define COLLIDER_o151 0x6 -#define COLLIDER_o1 0x5 -#define COLLIDER_g7 0x4 -#define COLLIDER_o169 0x3 -#define COLLIDER_tte 0x2 -#define COLLIDER_deilite 0x1 -#define COLLIDER_deilie 0x0 +#define COLLIDER_Root 0x2E +#define COLLIDER_g1 0x2D +#define COLLIDER_isu 0x2C +#define COLLIDER_o258 0x2B +#define COLLIDER_o248 0x2A +#define COLLIDER_hon 0x29 +#define COLLIDER_o188 0x28 +#define COLLIDER_o187 0x27 +#define COLLIDER_o186 0x26 +#define COLLIDER_tesri2 0x25 +#define COLLIDER_o275 0x24 +#define COLLIDER_o75 0x23 +#define COLLIDER_o74 0x22 +#define COLLIDER_tukue 0x21 +#define COLLIDER_o253 0x20 +#define COLLIDER_o252 0x1F +#define COLLIDER_o251 0x1E +#define COLLIDER_o250 0x1D +#define COLLIDER_o249 0x1C +#define COLLIDER_o185 0x1B +#define COLLIDER_o35 0x1A +#define COLLIDER_tana 0x19 +#define COLLIDER_o65 0x18 +#define COLLIDER_o20 0x17 +#define COLLIDER_hondana 0x16 +#define COLLIDER_o247 0x15 +#define COLLIDER_o179 0x14 +#define COLLIDER_o178 0x13 +#define COLLIDER_o177 0x12 +#define COLLIDER_o176 0x11 +#define COLLIDER_o175 0x10 +#define COLLIDER_o174 0xF +#define COLLIDER_o173 0xE +#define COLLIDER_o172 0xD +#define COLLIDER_o171 0xC +#define COLLIDER_g2 0xB +#define COLLIDER_o181 0xA +#define COLLIDER_o180 0x9 +#define COLLIDER_o170 0x8 +#define COLLIDER_o152 0x7 +#define COLLIDER_o151 0x6 +#define COLLIDER_o1 0x5 +#define COLLIDER_g7 0x4 +#define COLLIDER_o169 0x3 +#define COLLIDER_tte 0x2 +#define COLLIDER_deilite 0x1 +#define COLLIDER_deilie 0x0 + +#define ZONE_Root 0x5 +#define ZONE_g1 0x4 +#define ZONE_tesri2 0x3 +#define ZONE_o72 0x2 +#define ZONE_g2 0x1 +#define ZONE_o1 0x0 + diff --git a/include/mapfs/kkj_16_shape.h b/include/mapfs/kkj_16_shape.h index ad2beb7e31..c87a8abb75 100644 --- a/include/mapfs/kkj_16_shape.h +++ b/include/mapfs/kkj_16_shape.h @@ -1,144 +1,145 @@ -#define MODEL_Root 0x8F -#define MODEL_g1 0x8E -#define MODEL_g33 0x8D -#define MODEL_o211 0x8C -#define MODEL_o210 0x8B -#define MODEL_o209 0x8A -#define MODEL_o208 0x89 -#define MODEL_o207 0x88 -#define MODEL_isu 0x87 -#define MODEL_o177 0x86 -#define MODEL_o176 0x85 -#define MODEL_o175 0x84 -#define MODEL_o174 0x83 -#define MODEL_hon 0x82 -#define MODEL_o164 0x81 -#define MODEL_o163 0x80 -#define MODEL_o162 0x7F -#define MODEL_g19 0x7E -#define MODEL_o161 0x7D -#define MODEL_o159 0x7C -#define MODEL_o158 0x7B -#define MODEL_mado 0x7A -#define MODEL_g16 0x79 -#define MODEL_o134 0x78 -#define MODEL_o133 0x77 -#define MODEL_g15 0x76 -#define MODEL_o132 0x75 -#define MODEL_o131 0x74 -#define MODEL_kabe 0x73 -#define MODEL_g26 0x72 -#define MODEL_o170 0x71 -#define MODEL_o171 0x70 -#define MODEL_o172 0x6F -#define MODEL_o173 0x6E -#define MODEL_g25 0x6D -#define MODEL_o110 0x6C -#define MODEL_o109 0x6B -#define MODEL_o108 0x6A -#define MODEL_o107 0x69 -#define MODEL_g24 0x68 -#define MODEL_o117 0x67 -#define MODEL_o116 0x66 -#define MODEL_g23 0x65 -#define MODEL_o102 0x64 -#define MODEL_o101 0x63 -#define MODEL_o100 0x62 -#define MODEL_o99 0x61 -#define MODEL_g27 0x60 -#define MODEL_o191 0x5F -#define MODEL_o190 0x5E -#define MODEL_o189 0x5D -#define MODEL_o188 0x5C -#define MODEL_tesri2 0x5B -#define MODEL_o74 0x5A -#define MODEL_o73 0x59 -#define MODEL_o72 0x58 -#define MODEL_tesri 0x57 -#define MODEL_o19 0x56 -#define MODEL_o9 0x55 -#define MODEL_o5 0x54 -#define MODEL_g10 0x53 -#define MODEL_o186 0x52 -#define MODEL_o185 0x51 -#define MODEL_o184 0x50 -#define MODEL_o183 0x4F -#define MODEL_o95 0x4E -#define MODEL_o94 0x4D -#define MODEL_o93 0x4C -#define MODEL_o89 0x4B -#define MODEL_o166 0x4A -#define MODEL_o88 0x49 -#define MODEL_o87 0x48 -#define MODEL_o80 0x47 -#define MODEL_o165 0x46 -#define MODEL_o79 0x45 -#define MODEL_o78 0x44 -#define MODEL_g4 0x43 -#define MODEL_o40 0x42 -#define MODEL_o39 0x41 -#define MODEL_o38 0x40 -#define MODEL_o18 0x3F -#define MODEL_o17 0x3E -#define MODEL_o16 0x3D -#define MODEL_o153 0x3C -#define MODEL_o12 0x3B -#define MODEL_o11 0x3A -#define MODEL_o10 0x39 -#define MODEL_tukue 0x38 -#define MODEL_o47 0x37 -#define MODEL_o46 0x36 -#define MODEL_o45 0x35 -#define MODEL_o44 0x34 -#define MODEL_o35 0x33 -#define MODEL_o156 0x32 -#define MODEL_o157 0x31 -#define MODEL_o187 0x30 -#define MODEL_tana 0x2F -#define MODEL_g29 0x2E -#define MODEL_o65 0x2D -#define MODEL_o64 0x2C -#define MODEL_o63 0x2B -#define MODEL_g28 0x2A -#define MODEL_o22 0x29 -#define MODEL_o21 0x28 -#define MODEL_o20 0x27 -#define MODEL_hondana 0x26 -#define MODEL_o60 0x25 -#define MODEL_o61 0x24 -#define MODEL_o62 0x23 -#define MODEL_o169 0x22 -#define MODEL_o168 0x21 -#define MODEL_o167 0x20 -#define MODEL_o59 0x1F -#define MODEL_o58 0x1E -#define MODEL_o57 0x1D -#define MODEL_o56 0x1C -#define MODEL_o55 0x1B -#define MODEL_o54 0x1A -#define MODEL_o53 0x19 -#define MODEL_o52 0x18 -#define MODEL_o51 0x17 -#define MODEL_o50 0x16 -#define MODEL_o49 0x15 -#define MODEL_o48 0x14 -#define MODEL_o31 0x13 -#define MODEL_o30 0x12 -#define MODEL_o29 0x11 -#define MODEL_o28 0x10 -#define MODEL_o27 0xF -#define MODEL_o26 0xE -#define MODEL_o25 0xD -#define MODEL_o24 0xC -#define MODEL_o23 0xB -#define MODEL_o4 0xA -#define MODEL_o3 0x9 -#define MODEL_o2 0x8 -#define MODEL_g2 0x7 -#define MODEL_o152 0x6 -#define MODEL_o151 0x5 -#define MODEL_o1 0x4 -#define MODEL_g21 0x3 -#define MODEL_o43 0x2 -#define MODEL_g7 0x1 -#define MODEL_o41 0x0 +#define MODEL_Root 0x8F +#define MODEL_g1 0x8E +#define MODEL_g33 0x8D +#define MODEL_o211 0x8C +#define MODEL_o210 0x8B +#define MODEL_o209 0x8A +#define MODEL_o208 0x89 +#define MODEL_o207 0x88 +#define MODEL_isu 0x87 +#define MODEL_o177 0x86 +#define MODEL_o176 0x85 +#define MODEL_o175 0x84 +#define MODEL_o174 0x83 +#define MODEL_hon 0x82 +#define MODEL_o164 0x81 +#define MODEL_o163 0x80 +#define MODEL_o162 0x7F +#define MODEL_g19 0x7E +#define MODEL_o161 0x7D +#define MODEL_o159 0x7C +#define MODEL_o158 0x7B +#define MODEL_mado 0x7A +#define MODEL_g16 0x79 +#define MODEL_o134 0x78 +#define MODEL_o133 0x77 +#define MODEL_g15 0x76 +#define MODEL_o132 0x75 +#define MODEL_o131 0x74 +#define MODEL_kabe 0x73 +#define MODEL_g26 0x72 +#define MODEL_o170 0x71 +#define MODEL_o171 0x70 +#define MODEL_o172 0x6F +#define MODEL_o173 0x6E +#define MODEL_g25 0x6D +#define MODEL_o110 0x6C +#define MODEL_o109 0x6B +#define MODEL_o108 0x6A +#define MODEL_o107 0x69 +#define MODEL_g24 0x68 +#define MODEL_o117 0x67 +#define MODEL_o116 0x66 +#define MODEL_g23 0x65 +#define MODEL_o102 0x64 +#define MODEL_o101 0x63 +#define MODEL_o100 0x62 +#define MODEL_o99 0x61 +#define MODEL_g27 0x60 +#define MODEL_o191 0x5F +#define MODEL_o190 0x5E +#define MODEL_o189 0x5D +#define MODEL_o188 0x5C +#define MODEL_tesri2 0x5B +#define MODEL_o74 0x5A +#define MODEL_o73 0x59 +#define MODEL_o72 0x58 +#define MODEL_tesri 0x57 +#define MODEL_o19 0x56 +#define MODEL_o9 0x55 +#define MODEL_o5 0x54 +#define MODEL_g10 0x53 +#define MODEL_o186 0x52 +#define MODEL_o185 0x51 +#define MODEL_o184 0x50 +#define MODEL_o183 0x4F +#define MODEL_o95 0x4E +#define MODEL_o94 0x4D +#define MODEL_o93 0x4C +#define MODEL_o89 0x4B +#define MODEL_o166 0x4A +#define MODEL_o88 0x49 +#define MODEL_o87 0x48 +#define MODEL_o80 0x47 +#define MODEL_o165 0x46 +#define MODEL_o79 0x45 +#define MODEL_o78 0x44 +#define MODEL_g4 0x43 +#define MODEL_o40 0x42 +#define MODEL_o39 0x41 +#define MODEL_o38 0x40 +#define MODEL_o18 0x3F +#define MODEL_o17 0x3E +#define MODEL_o16 0x3D +#define MODEL_o153 0x3C +#define MODEL_o12 0x3B +#define MODEL_o11 0x3A +#define MODEL_o10 0x39 +#define MODEL_tukue 0x38 +#define MODEL_o47 0x37 +#define MODEL_o46 0x36 +#define MODEL_o45 0x35 +#define MODEL_o44 0x34 +#define MODEL_o35 0x33 +#define MODEL_o156 0x32 +#define MODEL_o157 0x31 +#define MODEL_o187 0x30 +#define MODEL_tana 0x2F +#define MODEL_g29 0x2E +#define MODEL_o65 0x2D +#define MODEL_o64 0x2C +#define MODEL_o63 0x2B +#define MODEL_g28 0x2A +#define MODEL_o22 0x29 +#define MODEL_o21 0x28 +#define MODEL_o20 0x27 +#define MODEL_hondana 0x26 +#define MODEL_o60 0x25 +#define MODEL_o61 0x24 +#define MODEL_o62 0x23 +#define MODEL_o169 0x22 +#define MODEL_o168 0x21 +#define MODEL_o167 0x20 +#define MODEL_o59 0x1F +#define MODEL_o58 0x1E +#define MODEL_o57 0x1D +#define MODEL_o56 0x1C +#define MODEL_o55 0x1B +#define MODEL_o54 0x1A +#define MODEL_o53 0x19 +#define MODEL_o52 0x18 +#define MODEL_o51 0x17 +#define MODEL_o50 0x16 +#define MODEL_o49 0x15 +#define MODEL_o48 0x14 +#define MODEL_o31 0x13 +#define MODEL_o30 0x12 +#define MODEL_o29 0x11 +#define MODEL_o28 0x10 +#define MODEL_o27 0xF +#define MODEL_o26 0xE +#define MODEL_o25 0xD +#define MODEL_o24 0xC +#define MODEL_o23 0xB +#define MODEL_o4 0xA +#define MODEL_o3 0x9 +#define MODEL_o2 0x8 +#define MODEL_g2 0x7 +#define MODEL_o152 0x6 +#define MODEL_o151 0x5 +#define MODEL_o1 0x4 +#define MODEL_g21 0x3 +#define MODEL_o43 0x2 +#define MODEL_g7 0x1 +#define MODEL_o41 0x0 + diff --git a/include/mapfs/kkj_17_hit.h b/include/mapfs/kkj_17_hit.h index a5974d8d2b..53415edb71 100644 --- a/include/mapfs/kkj_17_hit.h +++ b/include/mapfs/kkj_17_hit.h @@ -1,32 +1,37 @@ -#define COLLIDER_Root 0x1F -#define COLLIDER_g1 0x1E -#define COLLIDER_tubo 0x1D -#define COLLIDER_o83 0x1C -#define COLLIDER_o92 0x1B -#define COLLIDER_o44 0x1A -#define COLLIDER_g15 0x19 -#define COLLIDER_o43 0x18 -#define COLLIDER_isu 0x17 -#define COLLIDER_o93 0x16 -#define COLLIDER_o40 0x15 -#define COLLIDER_g13 0x14 -#define COLLIDER_o51 0x13 -#define COLLIDER_o91 0x12 -#define COLLIDER_tana 0x11 -#define COLLIDER_o30 0x10 -#define COLLIDER_g9 0xF -#define COLLIDER_o97 0xE -#define COLLIDER_o28 0xD -#define COLLIDER_hako 0xC -#define COLLIDER_o90 0xB -#define COLLIDER_o89 0xA -#define COLLIDER_g2 0x9 -#define COLLIDER_o99 0x8 -#define COLLIDER_o98 0x7 -#define COLLIDER_o88 0x6 -#define COLLIDER_o8 0x5 -#define COLLIDER_g4 0x4 -#define COLLIDER_o86 0x3 -#define COLLIDER_ttw 0x2 -#define COLLIDER_deilitw 0x1 -#define COLLIDER_deiliw 0x0 +#define COLLIDER_Root 0x1F +#define COLLIDER_g1 0x1E +#define COLLIDER_tubo 0x1D +#define COLLIDER_o83 0x1C +#define COLLIDER_o92 0x1B +#define COLLIDER_o44 0x1A +#define COLLIDER_g15 0x19 +#define COLLIDER_o43 0x18 +#define COLLIDER_isu 0x17 +#define COLLIDER_o93 0x16 +#define COLLIDER_o40 0x15 +#define COLLIDER_g13 0x14 +#define COLLIDER_o51 0x13 +#define COLLIDER_o91 0x12 +#define COLLIDER_tana 0x11 +#define COLLIDER_o30 0x10 +#define COLLIDER_g9 0xF +#define COLLIDER_o97 0xE +#define COLLIDER_o28 0xD +#define COLLIDER_hako 0xC +#define COLLIDER_o90 0xB +#define COLLIDER_o89 0xA +#define COLLIDER_g2 0x9 +#define COLLIDER_o99 0x8 +#define COLLIDER_o98 0x7 +#define COLLIDER_o88 0x6 +#define COLLIDER_o8 0x5 +#define COLLIDER_g4 0x4 +#define COLLIDER_o86 0x3 +#define COLLIDER_ttw 0x2 +#define COLLIDER_deilitw 0x1 +#define COLLIDER_deiliw 0x0 + +#define ZONE_Root 0x2 +#define ZONE_g1 0x1 +#define ZONE_o6 0x0 + diff --git a/include/mapfs/kkj_17_shape.h b/include/mapfs/kkj_17_shape.h index dc19686ba6..38c1d12078 100644 --- a/include/mapfs/kkj_17_shape.h +++ b/include/mapfs/kkj_17_shape.h @@ -1,72 +1,73 @@ -#define MODEL_Root 0x47 -#define MODEL_g1 0x46 -#define MODEL_g20 0x45 -#define MODEL_o81 0x44 -#define MODEL_o80 0x43 -#define MODEL_o79 0x42 -#define MODEL_hon 0x41 -#define MODEL_o78 0x40 -#define MODEL_o77 0x3F -#define MODEL_o76 0x3E -#define MODEL_ki 0x3D -#define MODEL_o54 0x3C -#define MODEL_tubo 0x3B -#define MODEL_o83 0x3A -#define MODEL_o82 0x39 -#define MODEL_o70 0x38 -#define MODEL_o44 0x37 -#define MODEL_g15 0x36 -#define MODEL_o49 0x35 -#define MODEL_o43 0x34 -#define MODEL_isu 0x33 -#define MODEL_o68 0x32 -#define MODEL_o67 0x31 -#define MODEL_o66 0x30 -#define MODEL_o65 0x2F -#define MODEL_o42 0x2E -#define MODEL_o41 0x2D -#define MODEL_o40 0x2C -#define MODEL_o39 0x2B -#define MODEL_g13 0x2A -#define MODEL_o69 0x29 -#define MODEL_o51 0x28 -#define MODEL_o53 0x27 -#define MODEL_o50 0x26 -#define MODEL_o27 0x25 -#define MODEL_tana 0x24 -#define MODEL_o35 0x23 -#define MODEL_o34 0x22 -#define MODEL_o36 0x21 -#define MODEL_o30 0x20 -#define MODEL_g9 0x1F -#define MODEL_o48 0x1E -#define MODEL_o47 0x1D -#define MODEL_o46 0x1C -#define MODEL_o45 0x1B -#define MODEL_o29 0x1A -#define MODEL_o28 0x19 -#define MODEL_hako 0x18 -#define MODEL_g21 0x17 -#define MODEL_o25 0x16 -#define MODEL_o26 0x15 -#define MODEL_o22 0x14 -#define MODEL_o19 0x13 -#define MODEL_o24 0x12 -#define MODEL_o23 0x11 -#define MODEL_o21 0x10 -#define MODEL_o20 0xF -#define MODEL_o18 0xE -#define MODEL_g6 0xD -#define MODEL_o16 0xC -#define MODEL_o15 0xB -#define MODEL_o14 0xA -#define MODEL_o13 0x9 -#define MODEL_g2 0x8 -#define MODEL_o12 0x7 -#define MODEL_o8 0x6 -#define MODEL_o6 0x5 -#define MODEL_o1 0x4 -#define MODEL_g3 0x3 -#define MODEL_o2 0x2 -#define MODEL_g4 0x1 -#define MODEL_o3 0x0 +#define MODEL_Root 0x47 +#define MODEL_g1 0x46 +#define MODEL_g20 0x45 +#define MODEL_o81 0x44 +#define MODEL_o80 0x43 +#define MODEL_o79 0x42 +#define MODEL_hon 0x41 +#define MODEL_o78 0x40 +#define MODEL_o77 0x3F +#define MODEL_o76 0x3E +#define MODEL_ki 0x3D +#define MODEL_o54 0x3C +#define MODEL_tubo 0x3B +#define MODEL_o83 0x3A +#define MODEL_o82 0x39 +#define MODEL_o70 0x38 +#define MODEL_o44 0x37 +#define MODEL_g15 0x36 +#define MODEL_o49 0x35 +#define MODEL_o43 0x34 +#define MODEL_isu 0x33 +#define MODEL_o68 0x32 +#define MODEL_o67 0x31 +#define MODEL_o66 0x30 +#define MODEL_o65 0x2F +#define MODEL_o42 0x2E +#define MODEL_o41 0x2D +#define MODEL_o40 0x2C +#define MODEL_o39 0x2B +#define MODEL_g13 0x2A +#define MODEL_o69 0x29 +#define MODEL_o51 0x28 +#define MODEL_o53 0x27 +#define MODEL_o50 0x26 +#define MODEL_o27 0x25 +#define MODEL_tana 0x24 +#define MODEL_o35 0x23 +#define MODEL_o34 0x22 +#define MODEL_o36 0x21 +#define MODEL_o30 0x20 +#define MODEL_g9 0x1F +#define MODEL_o48 0x1E +#define MODEL_o47 0x1D +#define MODEL_o46 0x1C +#define MODEL_o45 0x1B +#define MODEL_o29 0x1A +#define MODEL_o28 0x19 +#define MODEL_hako 0x18 +#define MODEL_g21 0x17 +#define MODEL_o25 0x16 +#define MODEL_o26 0x15 +#define MODEL_o22 0x14 +#define MODEL_o19 0x13 +#define MODEL_o24 0x12 +#define MODEL_o23 0x11 +#define MODEL_o21 0x10 +#define MODEL_o20 0xF +#define MODEL_o18 0xE +#define MODEL_g6 0xD +#define MODEL_o16 0xC +#define MODEL_o15 0xB +#define MODEL_o14 0xA +#define MODEL_o13 0x9 +#define MODEL_g2 0x8 +#define MODEL_o12 0x7 +#define MODEL_o8 0x6 +#define MODEL_o6 0x5 +#define MODEL_o1 0x4 +#define MODEL_g3 0x3 +#define MODEL_o2 0x2 +#define MODEL_g4 0x1 +#define MODEL_o3 0x0 + diff --git a/include/mapfs/kkj_18_hit.h b/include/mapfs/kkj_18_hit.h index 4ecbb5f768..eaca1829f0 100644 --- a/include/mapfs/kkj_18_hit.h +++ b/include/mapfs/kkj_18_hit.h @@ -1,28 +1,33 @@ -#define COLLIDER_Root 0x1B -#define COLLIDER_g1 0x1A -#define COLLIDER_g14 0x19 -#define COLLIDER_o56 0x18 -#define COLLIDER_o55 0x17 -#define COLLIDER_g13 0x16 -#define COLLIDER_o54 0x15 -#define COLLIDER_o53 0x14 -#define COLLIDER_g10 0x13 -#define COLLIDER_o57 0x12 -#define COLLIDER_g15 0x11 -#define COLLIDER_o62 0x10 -#define COLLIDER_o61 0xF -#define COLLIDER_o59 0xE -#define COLLIDER_o58 0xD -#define COLLIDER_g7 0xC -#define COLLIDER_o40 0xB -#define COLLIDER_o37 0xA -#define COLLIDER_o19 0x9 -#define COLLIDER_g4 0x8 -#define COLLIDER_o64 0x7 -#define COLLIDER_o63 0x6 -#define COLLIDER_o5 0x5 -#define COLLIDER_g6 0x4 -#define COLLIDER_o52 0x3 -#define COLLIDER_ttw 0x2 -#define COLLIDER_deilitw 0x1 -#define COLLIDER_deiliw 0x0 +#define COLLIDER_Root 0x1B +#define COLLIDER_g1 0x1A +#define COLLIDER_g14 0x19 +#define COLLIDER_o56 0x18 +#define COLLIDER_o55 0x17 +#define COLLIDER_g13 0x16 +#define COLLIDER_o54 0x15 +#define COLLIDER_o53 0x14 +#define COLLIDER_g10 0x13 +#define COLLIDER_o57 0x12 +#define COLLIDER_g15 0x11 +#define COLLIDER_o62 0x10 +#define COLLIDER_o61 0xF +#define COLLIDER_o59 0xE +#define COLLIDER_o58 0xD +#define COLLIDER_g7 0xC +#define COLLIDER_o40 0xB +#define COLLIDER_o37 0xA +#define COLLIDER_o19 0x9 +#define COLLIDER_g4 0x8 +#define COLLIDER_o64 0x7 +#define COLLIDER_o63 0x6 +#define COLLIDER_o5 0x5 +#define COLLIDER_g6 0x4 +#define COLLIDER_o52 0x3 +#define COLLIDER_ttw 0x2 +#define COLLIDER_deilitw 0x1 +#define COLLIDER_deiliw 0x0 + +#define ZONE_Root 0x2 +#define ZONE_g1 0x1 +#define ZONE_o6 0x0 + diff --git a/include/mapfs/kkj_18_shape.h b/include/mapfs/kkj_18_shape.h index 53af86ae2f..8bfa085c44 100644 --- a/include/mapfs/kkj_18_shape.h +++ b/include/mapfs/kkj_18_shape.h @@ -1,56 +1,57 @@ -#define MODEL_Root 0x37 -#define MODEL_g1 0x36 -#define MODEL_o61 0x35 -#define MODEL_g14 0x34 -#define MODEL_g16 0x33 -#define MODEL_o55 0x32 -#define MODEL_o54 0x31 -#define MODEL_g15 0x30 -#define MODEL_o53 0x2F -#define MODEL_o52 0x2E -#define MODEL_g10 0x2D -#define MODEL_g13 0x2C -#define MODEL_o33 0x2B -#define MODEL_o36 0x2A -#define MODEL_o35 0x29 -#define MODEL_o34 0x28 -#define MODEL_o32 0x27 -#define MODEL_o31 0x26 -#define MODEL_g9 0x25 -#define MODEL_o49 0x24 -#define MODEL_o25 0x23 -#define MODEL_o24 0x22 -#define MODEL_o23 0x21 -#define MODEL_o22 0x20 -#define MODEL_g7 0x1F -#define MODEL_g12 0x1E -#define MODEL_o45 0x1D -#define MODEL_o44 0x1C -#define MODEL_o43 0x1B -#define MODEL_o42 0x1A -#define MODEL_o41 0x19 -#define MODEL_g11 0x18 -#define MODEL_o56 0x17 -#define MODEL_o40 0x16 -#define MODEL_o39 0x15 -#define MODEL_o38 0x14 -#define MODEL_o37 0x13 -#define MODEL_o48 0x12 -#define MODEL_o30 0x11 -#define MODEL_o28 0x10 -#define MODEL_o19 0xF -#define MODEL_g4 0xE -#define MODEL_o47 0xD -#define MODEL_o8 0xC -#define MODEL_o7 0xB -#define MODEL_o6 0xA -#define MODEL_o5 0x9 -#define MODEL_g3 0x8 -#define MODEL_o4 0x7 -#define MODEL_o3 0x6 -#define MODEL_o2 0x5 -#define MODEL_o1 0x4 -#define MODEL_g5 0x3 -#define MODEL_o9 0x2 -#define MODEL_g6 0x1 -#define MODEL_o10 0x0 +#define MODEL_Root 0x37 +#define MODEL_g1 0x36 +#define MODEL_o61 0x35 +#define MODEL_g14 0x34 +#define MODEL_g16 0x33 +#define MODEL_o55 0x32 +#define MODEL_o54 0x31 +#define MODEL_g15 0x30 +#define MODEL_o53 0x2F +#define MODEL_o52 0x2E +#define MODEL_g10 0x2D +#define MODEL_g13 0x2C +#define MODEL_o33 0x2B +#define MODEL_o36 0x2A +#define MODEL_o35 0x29 +#define MODEL_o34 0x28 +#define MODEL_o32 0x27 +#define MODEL_o31 0x26 +#define MODEL_g9 0x25 +#define MODEL_o49 0x24 +#define MODEL_o25 0x23 +#define MODEL_o24 0x22 +#define MODEL_o23 0x21 +#define MODEL_o22 0x20 +#define MODEL_g7 0x1F +#define MODEL_g12 0x1E +#define MODEL_o45 0x1D +#define MODEL_o44 0x1C +#define MODEL_o43 0x1B +#define MODEL_o42 0x1A +#define MODEL_o41 0x19 +#define MODEL_g11 0x18 +#define MODEL_o56 0x17 +#define MODEL_o40 0x16 +#define MODEL_o39 0x15 +#define MODEL_o38 0x14 +#define MODEL_o37 0x13 +#define MODEL_o48 0x12 +#define MODEL_o30 0x11 +#define MODEL_o28 0x10 +#define MODEL_o19 0xF +#define MODEL_g4 0xE +#define MODEL_o47 0xD +#define MODEL_o8 0xC +#define MODEL_o7 0xB +#define MODEL_o6 0xA +#define MODEL_o5 0x9 +#define MODEL_g3 0x8 +#define MODEL_o4 0x7 +#define MODEL_o3 0x6 +#define MODEL_o2 0x5 +#define MODEL_o1 0x4 +#define MODEL_g5 0x3 +#define MODEL_o9 0x2 +#define MODEL_g6 0x1 +#define MODEL_o10 0x0 + diff --git a/include/mapfs/kkj_19_hit.h b/include/mapfs/kkj_19_hit.h index 57d0550245..dfaff46b67 100644 --- a/include/mapfs/kkj_19_hit.h +++ b/include/mapfs/kkj_19_hit.h @@ -1,30 +1,35 @@ -#define COLLIDER_Root 0x1D -#define COLLIDER_g1 0x1C -#define COLLIDER_g25 0x1B -#define COLLIDER_o115 0x1A -#define COLLIDER_o114 0x19 -#define COLLIDER_o108 0x18 -#define COLLIDER_o107 0x17 -#define COLLIDER_o106 0x16 -#define COLLIDER_o105 0x15 -#define COLLIDER_o110 0x14 -#define COLLIDER_o103 0x13 -#define COLLIDER_o102 0x12 -#define COLLIDER_o101 0x11 -#define COLLIDER_o109 0x10 -#define COLLIDER_g6 0xF -#define COLLIDER_o190 0xE -#define COLLIDER_o189 0xD -#define COLLIDER_o117 0xC -#define COLLIDER_o116 0xB -#define COLLIDER_o74 0xA -#define COLLIDER_o100 0x9 -#define COLLIDER_g31 0x8 -#define COLLIDER_o118 0x7 -#define COLLIDER_o104 0x6 -#define COLLIDER_o99 0x5 -#define COLLIDER_g29 0x4 -#define COLLIDER_o98 0x3 -#define COLLIDER_ttse 0x2 -#define COLLIDER_deilitse 0x1 -#define COLLIDER_deilise 0x0 +#define COLLIDER_Root 0x1D +#define COLLIDER_g1 0x1C +#define COLLIDER_g25 0x1B +#define COLLIDER_o115 0x1A +#define COLLIDER_o114 0x19 +#define COLLIDER_o108 0x18 +#define COLLIDER_o107 0x17 +#define COLLIDER_o106 0x16 +#define COLLIDER_o105 0x15 +#define COLLIDER_o110 0x14 +#define COLLIDER_o103 0x13 +#define COLLIDER_o102 0x12 +#define COLLIDER_o101 0x11 +#define COLLIDER_o109 0x10 +#define COLLIDER_g6 0xF +#define COLLIDER_o190 0xE +#define COLLIDER_o189 0xD +#define COLLIDER_o117 0xC +#define COLLIDER_o116 0xB +#define COLLIDER_o74 0xA +#define COLLIDER_o100 0x9 +#define COLLIDER_g31 0x8 +#define COLLIDER_o118 0x7 +#define COLLIDER_o104 0x6 +#define COLLIDER_o99 0x5 +#define COLLIDER_g29 0x4 +#define COLLIDER_o98 0x3 +#define COLLIDER_ttse 0x2 +#define COLLIDER_deilitse 0x1 +#define COLLIDER_deilise 0x0 + +#define ZONE_Root 0x2 +#define ZONE_g1 0x1 +#define ZONE_o1 0x0 + diff --git a/include/mapfs/kkj_19_shape.h b/include/mapfs/kkj_19_shape.h index 230e5b0adc..13068a5818 100644 --- a/include/mapfs/kkj_19_shape.h +++ b/include/mapfs/kkj_19_shape.h @@ -1,118 +1,119 @@ -#define MODEL_Root 0x75 -#define MODEL_g1 0x74 -#define MODEL_g2 0x73 -#define MODEL_g19 0x72 -#define MODEL_o55 0x71 -#define MODEL_g18 0x70 -#define MODEL_o54 0x6F -#define MODEL_o53 0x6E -#define MODEL_o52 0x6D -#define MODEL_g20 0x6C -#define MODEL_o91 0x6B -#define MODEL_o92 0x6A -#define MODEL_g10 0x69 -#define MODEL_o24 0x68 -#define MODEL_o23 0x67 -#define MODEL_g17 0x66 -#define MODEL_o47 0x65 -#define MODEL_o48 0x64 -#define MODEL_g21 0x63 -#define MODEL_o62 0x62 -#define MODEL_o61 0x61 -#define MODEL_g23 0x60 -#define MODEL_o67 0x5F -#define MODEL_o66 0x5E -#define MODEL_g22 0x5D -#define MODEL_o65 0x5C -#define MODEL_o64 0x5B -#define MODEL_g35 0x5A -#define MODEL_o116 0x59 -#define MODEL_g28 0x58 -#define MODEL_g31 0x57 -#define MODEL_o128 0x56 -#define MODEL_o111 0x55 -#define MODEL_o108 0x54 -#define MODEL_o103 0x53 -#define MODEL_o100 0x52 -#define MODEL_o99 0x51 -#define MODEL_g26 0x50 -#define MODEL_o90 0x4F -#define MODEL_o89 0x4E -#define MODEL_o88 0x4D -#define MODEL_o87 0x4C -#define MODEL_o86 0x4B -#define MODEL_o85 0x4A -#define MODEL_g27 0x49 -#define MODEL_o84 0x48 -#define MODEL_o83 0x47 -#define MODEL_o82 0x46 -#define MODEL_o81 0x45 -#define MODEL_o80 0x44 -#define MODEL_o79 0x43 -#define MODEL_o78 0x42 -#define MODEL_o77 0x41 -#define MODEL_g25 0x40 -#define MODEL_o74 0x3F -#define MODEL_g24 0x3E -#define MODEL_o73 0x3D -#define MODEL_o72 0x3C -#define MODEL_o71 0x3B -#define MODEL_o70 0x3A -#define MODEL_o69 0x39 -#define MODEL_o68 0x38 -#define MODEL_g14 0x37 -#define MODEL_o50 0x36 -#define MODEL_o46 0x35 -#define MODEL_g15 0x34 -#define MODEL_o43 0x33 -#define MODEL_o42 0x32 -#define MODEL_o41 0x31 -#define MODEL_o40 0x30 -#define MODEL_g12 0x2F -#define MODEL_o32 0x2E -#define MODEL_o31 0x2D -#define MODEL_o30 0x2C -#define MODEL_o29 0x2B -#define MODEL_g7 0x2A -#define MODEL_o18 0x29 -#define MODEL_o19 0x28 -#define MODEL_o17 0x27 -#define MODEL_g13 0x26 -#define MODEL_o38 0x25 -#define MODEL_o37 0x24 -#define MODEL_o36 0x23 -#define MODEL_o35 0x22 -#define MODEL_o34 0x21 -#define MODEL_o33 0x20 -#define MODEL_g11 0x1F -#define MODEL_o28 0x1E -#define MODEL_o27 0x1D -#define MODEL_g5 0x1C -#define MODEL_o26 0x1B -#define MODEL_o96 0x1A -#define MODEL_o44 0x19 -#define MODEL_o25 0x18 -#define MODEL_g33 0x17 -#define MODEL_o8 0x16 -#define MODEL_o21 0x15 -#define MODEL_o113 0x14 -#define MODEL_o20 0x13 -#define MODEL_o5 0x12 -#define MODEL_o4 0x11 -#define MODEL_g4 0x10 -#define MODEL_o45 0xF -#define MODEL_o7 0xE -#define MODEL_o6 0xD -#define MODEL_o3 0xC -#define MODEL_o2 0xB -#define MODEL_g6 0xA -#define MODEL_o98 0x9 -#define MODEL_o39 0x8 -#define MODEL_o16 0x7 -#define MODEL_o15 0x6 -#define MODEL_o14 0x5 -#define MODEL_o9 0x4 -#define MODEL_g30 0x3 -#define MODEL_o95 0x2 -#define MODEL_g29 0x1 -#define MODEL_o94 0x0 +#define MODEL_Root 0x75 +#define MODEL_g1 0x74 +#define MODEL_g2 0x73 +#define MODEL_g19 0x72 +#define MODEL_o55 0x71 +#define MODEL_g18 0x70 +#define MODEL_o54 0x6F +#define MODEL_o53 0x6E +#define MODEL_o52 0x6D +#define MODEL_g20 0x6C +#define MODEL_o91 0x6B +#define MODEL_o92 0x6A +#define MODEL_g10 0x69 +#define MODEL_o24 0x68 +#define MODEL_o23 0x67 +#define MODEL_g17 0x66 +#define MODEL_o47 0x65 +#define MODEL_o48 0x64 +#define MODEL_g21 0x63 +#define MODEL_o62 0x62 +#define MODEL_o61 0x61 +#define MODEL_g23 0x60 +#define MODEL_o67 0x5F +#define MODEL_o66 0x5E +#define MODEL_g22 0x5D +#define MODEL_o65 0x5C +#define MODEL_o64 0x5B +#define MODEL_g35 0x5A +#define MODEL_o116 0x59 +#define MODEL_g28 0x58 +#define MODEL_g31 0x57 +#define MODEL_o128 0x56 +#define MODEL_o111 0x55 +#define MODEL_o108 0x54 +#define MODEL_o103 0x53 +#define MODEL_o100 0x52 +#define MODEL_o99 0x51 +#define MODEL_g26 0x50 +#define MODEL_o90 0x4F +#define MODEL_o89 0x4E +#define MODEL_o88 0x4D +#define MODEL_o87 0x4C +#define MODEL_o86 0x4B +#define MODEL_o85 0x4A +#define MODEL_g27 0x49 +#define MODEL_o84 0x48 +#define MODEL_o83 0x47 +#define MODEL_o82 0x46 +#define MODEL_o81 0x45 +#define MODEL_o80 0x44 +#define MODEL_o79 0x43 +#define MODEL_o78 0x42 +#define MODEL_o77 0x41 +#define MODEL_g25 0x40 +#define MODEL_o74 0x3F +#define MODEL_g24 0x3E +#define MODEL_o73 0x3D +#define MODEL_o72 0x3C +#define MODEL_o71 0x3B +#define MODEL_o70 0x3A +#define MODEL_o69 0x39 +#define MODEL_o68 0x38 +#define MODEL_g14 0x37 +#define MODEL_o50 0x36 +#define MODEL_o46 0x35 +#define MODEL_g15 0x34 +#define MODEL_o43 0x33 +#define MODEL_o42 0x32 +#define MODEL_o41 0x31 +#define MODEL_o40 0x30 +#define MODEL_g12 0x2F +#define MODEL_o32 0x2E +#define MODEL_o31 0x2D +#define MODEL_o30 0x2C +#define MODEL_o29 0x2B +#define MODEL_g7 0x2A +#define MODEL_o18 0x29 +#define MODEL_o19 0x28 +#define MODEL_o17 0x27 +#define MODEL_g13 0x26 +#define MODEL_o38 0x25 +#define MODEL_o37 0x24 +#define MODEL_o36 0x23 +#define MODEL_o35 0x22 +#define MODEL_o34 0x21 +#define MODEL_o33 0x20 +#define MODEL_g11 0x1F +#define MODEL_o28 0x1E +#define MODEL_o27 0x1D +#define MODEL_g5 0x1C +#define MODEL_o26 0x1B +#define MODEL_o96 0x1A +#define MODEL_o44 0x19 +#define MODEL_o25 0x18 +#define MODEL_g33 0x17 +#define MODEL_o8 0x16 +#define MODEL_o21 0x15 +#define MODEL_o113 0x14 +#define MODEL_o20 0x13 +#define MODEL_o5 0x12 +#define MODEL_o4 0x11 +#define MODEL_g4 0x10 +#define MODEL_o45 0xF +#define MODEL_o7 0xE +#define MODEL_o6 0xD +#define MODEL_o3 0xC +#define MODEL_o2 0xB +#define MODEL_g6 0xA +#define MODEL_o98 0x9 +#define MODEL_o39 0x8 +#define MODEL_o16 0x7 +#define MODEL_o15 0x6 +#define MODEL_o14 0x5 +#define MODEL_o9 0x4 +#define MODEL_g30 0x3 +#define MODEL_o95 0x2 +#define MODEL_g29 0x1 +#define MODEL_o94 0x0 + diff --git a/include/mapfs/kkj_20_hit.h b/include/mapfs/kkj_20_hit.h index 945252769b..bc0f5b4845 100644 --- a/include/mapfs/kkj_20_hit.h +++ b/include/mapfs/kkj_20_hit.h @@ -1,29 +1,34 @@ -#define COLLIDER_Root 0x1C -#define COLLIDER_g1 0x1B -#define COLLIDER_g9 0x1A -#define COLLIDER_o34 0x19 -#define COLLIDER_o33 0x18 -#define COLLIDER_o80 0x17 -#define COLLIDER_o79 0x16 -#define COLLIDER_g7 0x15 -#define COLLIDER_o81 0x14 -#define COLLIDER_o15 0x13 -#define COLLIDER_g10 0x12 -#define COLLIDER_o41 0x11 -#define COLLIDER_o40 0x10 -#define COLLIDER_o39 0xF -#define COLLIDER_o38 0xE -#define COLLIDER_o37 0xD -#define COLLIDER_g13 0xC -#define COLLIDER_o77 0xB -#define COLLIDER_g15 0xA -#define COLLIDER_o76 0x9 -#define COLLIDER_o75 0x8 -#define COLLIDER_g4 0x7 -#define COLLIDER_o78 0x6 -#define COLLIDER_o6 0x5 -#define COLLIDER_g6 0x4 -#define COLLIDER_o74 0x3 -#define COLLIDER_ttw 0x2 -#define COLLIDER_deilitw 0x1 -#define COLLIDER_deiliw 0x0 +#define COLLIDER_Root 0x1C +#define COLLIDER_g1 0x1B +#define COLLIDER_g9 0x1A +#define COLLIDER_o34 0x19 +#define COLLIDER_o33 0x18 +#define COLLIDER_o80 0x17 +#define COLLIDER_o79 0x16 +#define COLLIDER_g7 0x15 +#define COLLIDER_o81 0x14 +#define COLLIDER_o15 0x13 +#define COLLIDER_g10 0x12 +#define COLLIDER_o41 0x11 +#define COLLIDER_o40 0x10 +#define COLLIDER_o39 0xF +#define COLLIDER_o38 0xE +#define COLLIDER_o37 0xD +#define COLLIDER_g13 0xC +#define COLLIDER_o77 0xB +#define COLLIDER_g15 0xA +#define COLLIDER_o76 0x9 +#define COLLIDER_o75 0x8 +#define COLLIDER_g4 0x7 +#define COLLIDER_o78 0x6 +#define COLLIDER_o6 0x5 +#define COLLIDER_g6 0x4 +#define COLLIDER_o74 0x3 +#define COLLIDER_ttw 0x2 +#define COLLIDER_deilitw 0x1 +#define COLLIDER_deiliw 0x0 + +#define ZONE_Root 0x2 +#define ZONE_g1 0x1 +#define ZONE_o6 0x0 + diff --git a/include/mapfs/kkj_20_shape.h b/include/mapfs/kkj_20_shape.h index 98d75ae3ec..d7802d4729 100644 --- a/include/mapfs/kkj_20_shape.h +++ b/include/mapfs/kkj_20_shape.h @@ -1,82 +1,83 @@ -#define MODEL_Root 0x51 -#define MODEL_g1 0x50 -#define MODEL_g2 0x4F -#define MODEL_o67 0x4E -#define MODEL_o66 0x4D -#define MODEL_o65 0x4C -#define MODEL_o64 0x4B -#define MODEL_o63 0x4A -#define MODEL_g13 0x49 -#define MODEL_g14 0x48 -#define MODEL_o62 0x47 -#define MODEL_o61 0x46 -#define MODEL_o60 0x45 -#define MODEL_o59 0x44 -#define MODEL_o58 0x43 -#define MODEL_o57 0x42 -#define MODEL_o56 0x41 -#define MODEL_o55 0x40 -#define MODEL_o54 0x3F -#define MODEL_o53 0x3E -#define MODEL_o52 0x3D -#define MODEL_o51 0x3C -#define MODEL_o50 0x3B -#define MODEL_o49 0x3A -#define MODEL_g10 0x39 -#define MODEL_g12 0x38 -#define MODEL_o48 0x37 -#define MODEL_o47 0x36 -#define MODEL_o46 0x35 -#define MODEL_o45 0x34 -#define MODEL_g11 0x33 -#define MODEL_o44 0x32 -#define MODEL_o43 0x31 -#define MODEL_o42 0x30 -#define MODEL_o41 0x2F -#define MODEL_o40 0x2E -#define MODEL_o39 0x2D -#define MODEL_o38 0x2C -#define MODEL_o37 0x2B -#define MODEL_g9 0x2A -#define MODEL_o36 0x29 -#define MODEL_o34 0x28 -#define MODEL_o33 0x27 -#define MODEL_o32 0x26 -#define MODEL_o29 0x25 -#define MODEL_g16 0x24 -#define MODEL_o31 0x23 -#define MODEL_o72 0x22 -#define MODEL_g15 0x21 -#define MODEL_o30 0x20 -#define MODEL_o35 0x1F -#define MODEL_g7 0x1E -#define MODEL_o73 0x1D -#define MODEL_o27 0x1C -#define MODEL_o26 0x1B -#define MODEL_o16 0x1A -#define MODEL_o15 0x19 -#define MODEL_o12 0x18 -#define MODEL_g8 0x17 -#define MODEL_o25 0x16 -#define MODEL_o24 0x15 -#define MODEL_o23 0x14 -#define MODEL_o22 0x13 -#define MODEL_o21 0x12 -#define MODEL_o20 0x11 -#define MODEL_o19 0x10 -#define MODEL_o18 0xF -#define MODEL_g4 0xE -#define MODEL_o71 0xD -#define MODEL_o8 0xC -#define MODEL_o7 0xB -#define MODEL_o6 0xA -#define MODEL_o5 0x9 -#define MODEL_g3 0x8 -#define MODEL_o4 0x7 -#define MODEL_o3 0x6 -#define MODEL_o2 0x5 -#define MODEL_o1 0x4 -#define MODEL_g5 0x3 -#define MODEL_o9 0x2 -#define MODEL_g6 0x1 -#define MODEL_o10 0x0 +#define MODEL_Root 0x51 +#define MODEL_g1 0x50 +#define MODEL_g2 0x4F +#define MODEL_o67 0x4E +#define MODEL_o66 0x4D +#define MODEL_o65 0x4C +#define MODEL_o64 0x4B +#define MODEL_o63 0x4A +#define MODEL_g13 0x49 +#define MODEL_g14 0x48 +#define MODEL_o62 0x47 +#define MODEL_o61 0x46 +#define MODEL_o60 0x45 +#define MODEL_o59 0x44 +#define MODEL_o58 0x43 +#define MODEL_o57 0x42 +#define MODEL_o56 0x41 +#define MODEL_o55 0x40 +#define MODEL_o54 0x3F +#define MODEL_o53 0x3E +#define MODEL_o52 0x3D +#define MODEL_o51 0x3C +#define MODEL_o50 0x3B +#define MODEL_o49 0x3A +#define MODEL_g10 0x39 +#define MODEL_g12 0x38 +#define MODEL_o48 0x37 +#define MODEL_o47 0x36 +#define MODEL_o46 0x35 +#define MODEL_o45 0x34 +#define MODEL_g11 0x33 +#define MODEL_o44 0x32 +#define MODEL_o43 0x31 +#define MODEL_o42 0x30 +#define MODEL_o41 0x2F +#define MODEL_o40 0x2E +#define MODEL_o39 0x2D +#define MODEL_o38 0x2C +#define MODEL_o37 0x2B +#define MODEL_g9 0x2A +#define MODEL_o36 0x29 +#define MODEL_o34 0x28 +#define MODEL_o33 0x27 +#define MODEL_o32 0x26 +#define MODEL_o29 0x25 +#define MODEL_g16 0x24 +#define MODEL_o31 0x23 +#define MODEL_o72 0x22 +#define MODEL_g15 0x21 +#define MODEL_o30 0x20 +#define MODEL_o35 0x1F +#define MODEL_g7 0x1E +#define MODEL_o73 0x1D +#define MODEL_o27 0x1C +#define MODEL_o26 0x1B +#define MODEL_o16 0x1A +#define MODEL_o15 0x19 +#define MODEL_o12 0x18 +#define MODEL_g8 0x17 +#define MODEL_o25 0x16 +#define MODEL_o24 0x15 +#define MODEL_o23 0x14 +#define MODEL_o22 0x13 +#define MODEL_o21 0x12 +#define MODEL_o20 0x11 +#define MODEL_o19 0x10 +#define MODEL_o18 0xF +#define MODEL_g4 0xE +#define MODEL_o71 0xD +#define MODEL_o8 0xC +#define MODEL_o7 0xB +#define MODEL_o6 0xA +#define MODEL_o5 0x9 +#define MODEL_g3 0x8 +#define MODEL_o4 0x7 +#define MODEL_o3 0x6 +#define MODEL_o2 0x5 +#define MODEL_o1 0x4 +#define MODEL_g5 0x3 +#define MODEL_o9 0x2 +#define MODEL_g6 0x1 +#define MODEL_o10 0x0 + diff --git a/include/mapfs/kkj_21_hit.h b/include/mapfs/kkj_21_hit.h index 89d9f52b22..43c3fcff5d 100644 --- a/include/mapfs/kkj_21_hit.h +++ b/include/mapfs/kkj_21_hit.h @@ -1,33 +1,38 @@ -#define COLLIDER_Root 0x20 -#define COLLIDER_g1 0x1F -#define COLLIDER_g39 0x1E -#define COLLIDER_o166 0x1D -#define COLLIDER_o168 0x1C -#define COLLIDER_o165 0x1B -#define COLLIDER_g38 0x1A -#define COLLIDER_o164 0x19 -#define COLLIDER_o185 0x18 -#define COLLIDER_o156 0x17 -#define COLLIDER_o157 0x16 -#define COLLIDER_o170 0x15 -#define COLLIDER_g32 0x14 -#define COLLIDER_o131 0x13 -#define COLLIDER_o127 0x12 -#define COLLIDER_g37 0x11 -#define COLLIDER_o184 0x10 -#define COLLIDER_o183 0xF -#define COLLIDER_o158 0xE -#define COLLIDER_o150 0xD -#define COLLIDER_g11 0xC -#define COLLIDER_g41 0xB -#define COLLIDER_o182 0xA -#define COLLIDER_o181 0x9 -#define COLLIDER_o180 0x8 -#define COLLIDER_o179 0x7 -#define COLLIDER_o177 0x6 -#define COLLIDER_o175 0x5 -#define COLLIDER_g14 0x4 -#define COLLIDER_o174 0x3 -#define COLLIDER_tte 0x2 -#define COLLIDER_deilite 0x1 -#define COLLIDER_deilie 0x0 +#define COLLIDER_Root 0x20 +#define COLLIDER_g1 0x1F +#define COLLIDER_g39 0x1E +#define COLLIDER_o166 0x1D +#define COLLIDER_o168 0x1C +#define COLLIDER_o165 0x1B +#define COLLIDER_g38 0x1A +#define COLLIDER_o164 0x19 +#define COLLIDER_o185 0x18 +#define COLLIDER_o156 0x17 +#define COLLIDER_o157 0x16 +#define COLLIDER_o170 0x15 +#define COLLIDER_g32 0x14 +#define COLLIDER_o131 0x13 +#define COLLIDER_o127 0x12 +#define COLLIDER_g37 0x11 +#define COLLIDER_o184 0x10 +#define COLLIDER_o183 0xF +#define COLLIDER_o158 0xE +#define COLLIDER_o150 0xD +#define COLLIDER_g11 0xC +#define COLLIDER_g41 0xB +#define COLLIDER_o182 0xA +#define COLLIDER_o181 0x9 +#define COLLIDER_o180 0x8 +#define COLLIDER_o179 0x7 +#define COLLIDER_o177 0x6 +#define COLLIDER_o175 0x5 +#define COLLIDER_g14 0x4 +#define COLLIDER_o174 0x3 +#define COLLIDER_tte 0x2 +#define COLLIDER_deilite 0x1 +#define COLLIDER_deilie 0x0 + +#define ZONE_Root 0x2 +#define ZONE_g1 0x1 +#define ZONE_o6 0x0 + diff --git a/include/mapfs/kkj_21_shape.h b/include/mapfs/kkj_21_shape.h index d50c11f23d..e9ddc21c28 100644 --- a/include/mapfs/kkj_21_shape.h +++ b/include/mapfs/kkj_21_shape.h @@ -1,44 +1,45 @@ -#define MODEL_Root 0x2B -#define MODEL_g1 0x2A -#define MODEL_g39 0x29 -#define MODEL_o166 0x28 -#define MODEL_o168 0x27 -#define MODEL_o167 0x26 -#define MODEL_o165 0x25 -#define MODEL_g38 0x24 -#define MODEL_o164 0x23 -#define MODEL_o157 0x22 -#define MODEL_o156 0x21 -#define MODEL_o170 0x20 -#define MODEL_o169 0x1F -#define MODEL_g37 0x1E -#define MODEL_o163 0x1D -#define MODEL_o162 0x1C -#define MODEL_o161 0x1B -#define MODEL_o160 0x1A -#define MODEL_o19 0x19 -#define MODEL_o159 0x18 -#define MODEL_g36 0x17 -#define MODEL_o158 0x16 -#define MODEL_o151 0x15 -#define MODEL_o150 0x14 -#define MODEL_g32 0x13 -#define MODEL_o131 0x12 -#define MODEL_o127 0x11 -#define MODEL_g11 0x10 -#define MODEL_g12 0xF -#define MODEL_o112 0xE -#define MODEL_o56 0xD -#define MODEL_o54 0xC -#define MODEL_o53 0xB -#define MODEL_g30 0xA -#define MODEL_o171 0x9 -#define MODEL_o140 0x8 -#define MODEL_o51 0x7 -#define MODEL_o50 0x6 -#define MODEL_o49 0x5 -#define MODEL_o48 0x4 -#define MODEL_g13 0x3 -#define MODEL_o57 0x2 -#define MODEL_g14 0x1 -#define MODEL_o58 0x0 +#define MODEL_Root 0x2B +#define MODEL_g1 0x2A +#define MODEL_g39 0x29 +#define MODEL_o166 0x28 +#define MODEL_o168 0x27 +#define MODEL_o167 0x26 +#define MODEL_o165 0x25 +#define MODEL_g38 0x24 +#define MODEL_o164 0x23 +#define MODEL_o157 0x22 +#define MODEL_o156 0x21 +#define MODEL_o170 0x20 +#define MODEL_o169 0x1F +#define MODEL_g37 0x1E +#define MODEL_o163 0x1D +#define MODEL_o162 0x1C +#define MODEL_o161 0x1B +#define MODEL_o160 0x1A +#define MODEL_o19 0x19 +#define MODEL_o159 0x18 +#define MODEL_g36 0x17 +#define MODEL_o158 0x16 +#define MODEL_o151 0x15 +#define MODEL_o150 0x14 +#define MODEL_g32 0x13 +#define MODEL_o131 0x12 +#define MODEL_o127 0x11 +#define MODEL_g11 0x10 +#define MODEL_g12 0xF +#define MODEL_o112 0xE +#define MODEL_o56 0xD +#define MODEL_o54 0xC +#define MODEL_o53 0xB +#define MODEL_g30 0xA +#define MODEL_o171 0x9 +#define MODEL_o140 0x8 +#define MODEL_o51 0x7 +#define MODEL_o50 0x6 +#define MODEL_o49 0x5 +#define MODEL_o48 0x4 +#define MODEL_g13 0x3 +#define MODEL_o57 0x2 +#define MODEL_g14 0x1 +#define MODEL_o58 0x0 + diff --git a/include/mapfs/kkj_22_hit.h b/include/mapfs/kkj_22_hit.h index 76e81b9f3d..e34ae058ca 100644 --- a/include/mapfs/kkj_22_hit.h +++ b/include/mapfs/kkj_22_hit.h @@ -1,50 +1,60 @@ -#define COLLIDER_Root 0x31 -#define COLLIDER_g1 0x30 -#define COLLIDER_g7 0x2F -#define COLLIDER_o34 0x2E -#define COLLIDER_o33 0x2D -#define COLLIDER_o30 0x2C -#define COLLIDER_g5 0x2B -#define COLLIDER_o115 0x2A -#define COLLIDER_o114 0x29 -#define COLLIDER_o113 0x28 -#define COLLIDER_o112 0x27 -#define COLLIDER_o36 0x26 -#define COLLIDER_o37 0x25 -#define COLLIDER_o39 0x24 -#define COLLIDER_o38 0x23 -#define COLLIDER_g4 0x22 -#define COLLIDER_o85 0x21 -#define COLLIDER_o84 0x20 -#define COLLIDER_o81 0x1F -#define COLLIDER_o5 0x1E -#define COLLIDER_g3 0x1D -#define COLLIDER_o3 0x1C -#define COLLIDER_o66 0x1B -#define COLLIDER_o69 0x1A -#define COLLIDER_o74 0x19 -#define COLLIDER_o75 0x18 -#define COLLIDER_o78 0x17 -#define COLLIDER_g2 0x16 -#define COLLIDER_o117 0x15 -#define COLLIDER_o8 0x14 -#define COLLIDER_o6 0x13 -#define COLLIDER_g9 0x12 -#define COLLIDER_o12 0x11 -#define COLLIDER_o10 0x10 -#define COLLIDER_o65 0xF -#define COLLIDER_o118 0xE -#define COLLIDER_g10 0xD -#define COLLIDER_o116 0xC -#define COLLIDER_o50 0xB -#define COLLIDER_g31 0xA -#define COLLIDER_g43 0x9 -#define COLLIDER_o111 0x8 -#define COLLIDER_ttnw 0x7 -#define COLLIDER_deilitnw 0x6 -#define COLLIDER_deilinw 0x5 -#define COLLIDER_g42 0x4 -#define COLLIDER_o108 0x3 -#define COLLIDER_ttw 0x2 -#define COLLIDER_deilitw 0x1 -#define COLLIDER_deiliw 0x0 +#define COLLIDER_Root 0x31 +#define COLLIDER_g1 0x30 +#define COLLIDER_g7 0x2F +#define COLLIDER_o34 0x2E +#define COLLIDER_o33 0x2D +#define COLLIDER_o30 0x2C +#define COLLIDER_g5 0x2B +#define COLLIDER_o115 0x2A +#define COLLIDER_o114 0x29 +#define COLLIDER_o113 0x28 +#define COLLIDER_o112 0x27 +#define COLLIDER_o36 0x26 +#define COLLIDER_o37 0x25 +#define COLLIDER_o39 0x24 +#define COLLIDER_o38 0x23 +#define COLLIDER_g4 0x22 +#define COLLIDER_o85 0x21 +#define COLLIDER_o84 0x20 +#define COLLIDER_o81 0x1F +#define COLLIDER_o5 0x1E +#define COLLIDER_g3 0x1D +#define COLLIDER_o3 0x1C +#define COLLIDER_o66 0x1B +#define COLLIDER_o69 0x1A +#define COLLIDER_o74 0x19 +#define COLLIDER_o75 0x18 +#define COLLIDER_o78 0x17 +#define COLLIDER_g2 0x16 +#define COLLIDER_o117 0x15 +#define COLLIDER_o8 0x14 +#define COLLIDER_o6 0x13 +#define COLLIDER_g9 0x12 +#define COLLIDER_o12 0x11 +#define COLLIDER_o10 0x10 +#define COLLIDER_o65 0xF +#define COLLIDER_o118 0xE +#define COLLIDER_g10 0xD +#define COLLIDER_o116 0xC +#define COLLIDER_o50 0xB +#define COLLIDER_g31 0xA +#define COLLIDER_g43 0x9 +#define COLLIDER_o111 0x8 +#define COLLIDER_ttnw 0x7 +#define COLLIDER_deilitnw 0x6 +#define COLLIDER_deilinw 0x5 +#define COLLIDER_g42 0x4 +#define COLLIDER_o108 0x3 +#define COLLIDER_ttw 0x2 +#define COLLIDER_deilitw 0x1 +#define COLLIDER_deiliw 0x0 + +#define ZONE_Root 0x7 +#define ZONE_g3 0x6 +#define ZONE_o5 0x5 +#define ZONE_o4 0x4 +#define ZONE_o3 0x3 +#define ZONE_g1 0x2 +#define ZONE_o2 0x1 +#define ZONE_o1 0x0 + diff --git a/include/mapfs/kkj_22_shape.h b/include/mapfs/kkj_22_shape.h index b134c058bc..fb1b417205 100644 --- a/include/mapfs/kkj_22_shape.h +++ b/include/mapfs/kkj_22_shape.h @@ -1,126 +1,127 @@ -#define MODEL_Root 0x7D -#define MODEL_g40 0x7C -#define MODEL_g7 0x7B -#define MODEL_o35 0x7A -#define MODEL_o34 0x79 -#define MODEL_o32 0x78 -#define MODEL_o33 0x77 -#define MODEL_o31 0x76 -#define MODEL_o30 0x75 -#define MODEL_g6 0x74 -#define MODEL_o29 0x73 -#define MODEL_o28 0x72 -#define MODEL_o27 0x71 -#define MODEL_o26 0x70 -#define MODEL_o25 0x6F -#define MODEL_o105 0x6E -#define MODEL_g1 0x6D -#define MODEL_g41 0x6C -#define MODEL_o24 0x6B -#define MODEL_o23 0x6A -#define MODEL_o22 0x69 -#define MODEL_o21 0x68 -#define MODEL_o20 0x67 -#define MODEL_o19 0x66 -#define MODEL_o18 0x65 -#define MODEL_o17 0x64 -#define MODEL_o16 0x63 -#define MODEL_o15 0x62 -#define MODEL_o14 0x61 -#define MODEL_o13 0x60 -#define MODEL_g5 0x5F -#define MODEL_o36 0x5E -#define MODEL_o37 0x5D -#define MODEL_o39 0x5C -#define MODEL_o38 0x5B -#define MODEL_g4 0x5A -#define MODEL_o86 0x59 -#define MODEL_o85 0x58 -#define MODEL_o84 0x57 -#define MODEL_o83 0x56 -#define MODEL_o82 0x55 -#define MODEL_o81 0x54 -#define MODEL_o5 0x53 -#define MODEL_o4 0x52 -#define MODEL_g3 0x51 -#define MODEL_g30 0x50 -#define MODEL_o80 0x4F -#define MODEL_o79 0x4E -#define MODEL_o78 0x4D -#define MODEL_g29 0x4C -#define MODEL_o77 0x4B -#define MODEL_o76 0x4A -#define MODEL_o75 0x49 -#define MODEL_g28 0x48 -#define MODEL_o74 0x47 -#define MODEL_o73 0x46 -#define MODEL_o72 0x45 -#define MODEL_g27 0x44 -#define MODEL_o71 0x43 -#define MODEL_o70 0x42 -#define MODEL_o69 0x41 -#define MODEL_g26 0x40 -#define MODEL_o68 0x3F -#define MODEL_o67 0x3E -#define MODEL_o66 0x3D -#define MODEL_g25 0x3C -#define MODEL_o3 0x3B -#define MODEL_o2 0x3A -#define MODEL_o1 0x39 -#define MODEL_g2 0x38 -#define MODEL_g42 0x37 -#define MODEL_o93 0x36 -#define MODEL_o92 0x35 -#define MODEL_o91 0x34 -#define MODEL_o8 0x33 -#define MODEL_o6 0x32 -#define MODEL_g9 0x31 -#define MODEL_g43 0x30 -#define MODEL_o90 0x2F -#define MODEL_o89 0x2E -#define MODEL_o9 0x2D -#define MODEL_o106 0x2C -#define MODEL_o65 0x2B -#define MODEL_o11 0x2A -#define MODEL_o12 0x29 -#define MODEL_o10 0x28 -#define MODEL_g10 0x27 -#define MODEL_g33 0x26 -#define MODEL_g35 0x25 -#define MODEL_o95 0x24 -#define MODEL_g34 0x23 -#define MODEL_o94 0x22 -#define MODEL_g36 0x21 -#define MODEL_g39 0x20 -#define MODEL_o104 0x1F -#define MODEL_o103 0x1E -#define MODEL_o102 0x1D -#define MODEL_g38 0x1C -#define MODEL_o101 0x1B -#define MODEL_o100 0x1A -#define MODEL_o99 0x19 -#define MODEL_g37 0x18 -#define MODEL_o98 0x17 -#define MODEL_o97 0x16 -#define MODEL_o96 0x15 -#define MODEL_g15 0x14 -#define MODEL_g17 0x13 -#define MODEL_o52 0x12 -#define MODEL_g16 0x11 -#define MODEL_o51 0x10 -#define MODEL_g11 0xF -#define MODEL_g14 0xE -#define MODEL_o50 0xD -#define MODEL_o49 0xC -#define MODEL_o48 0xB -#define MODEL_g13 0xA -#define MODEL_o47 0x9 -#define MODEL_o46 0x8 -#define MODEL_o45 0x7 -#define MODEL_g12 0x6 -#define MODEL_o44 0x5 -#define MODEL_o43 0x4 -#define MODEL_o42 0x3 -#define MODEL_g31 0x2 -#define MODEL_o88 0x1 -#define MODEL_o87 0x0 +#define MODEL_Root 0x7D +#define MODEL_g40 0x7C +#define MODEL_g7 0x7B +#define MODEL_o35 0x7A +#define MODEL_o34 0x79 +#define MODEL_o32 0x78 +#define MODEL_o33 0x77 +#define MODEL_o31 0x76 +#define MODEL_o30 0x75 +#define MODEL_g6 0x74 +#define MODEL_o29 0x73 +#define MODEL_o28 0x72 +#define MODEL_o27 0x71 +#define MODEL_o26 0x70 +#define MODEL_o25 0x6F +#define MODEL_o105 0x6E +#define MODEL_g1 0x6D +#define MODEL_g41 0x6C +#define MODEL_o24 0x6B +#define MODEL_o23 0x6A +#define MODEL_o22 0x69 +#define MODEL_o21 0x68 +#define MODEL_o20 0x67 +#define MODEL_o19 0x66 +#define MODEL_o18 0x65 +#define MODEL_o17 0x64 +#define MODEL_o16 0x63 +#define MODEL_o15 0x62 +#define MODEL_o14 0x61 +#define MODEL_o13 0x60 +#define MODEL_g5 0x5F +#define MODEL_o36 0x5E +#define MODEL_o37 0x5D +#define MODEL_o39 0x5C +#define MODEL_o38 0x5B +#define MODEL_g4 0x5A +#define MODEL_o86 0x59 +#define MODEL_o85 0x58 +#define MODEL_o84 0x57 +#define MODEL_o83 0x56 +#define MODEL_o82 0x55 +#define MODEL_o81 0x54 +#define MODEL_o5 0x53 +#define MODEL_o4 0x52 +#define MODEL_g3 0x51 +#define MODEL_g30 0x50 +#define MODEL_o80 0x4F +#define MODEL_o79 0x4E +#define MODEL_o78 0x4D +#define MODEL_g29 0x4C +#define MODEL_o77 0x4B +#define MODEL_o76 0x4A +#define MODEL_o75 0x49 +#define MODEL_g28 0x48 +#define MODEL_o74 0x47 +#define MODEL_o73 0x46 +#define MODEL_o72 0x45 +#define MODEL_g27 0x44 +#define MODEL_o71 0x43 +#define MODEL_o70 0x42 +#define MODEL_o69 0x41 +#define MODEL_g26 0x40 +#define MODEL_o68 0x3F +#define MODEL_o67 0x3E +#define MODEL_o66 0x3D +#define MODEL_g25 0x3C +#define MODEL_o3 0x3B +#define MODEL_o2 0x3A +#define MODEL_o1 0x39 +#define MODEL_g2 0x38 +#define MODEL_g42 0x37 +#define MODEL_o93 0x36 +#define MODEL_o92 0x35 +#define MODEL_o91 0x34 +#define MODEL_o8 0x33 +#define MODEL_o6 0x32 +#define MODEL_g9 0x31 +#define MODEL_g43 0x30 +#define MODEL_o90 0x2F +#define MODEL_o89 0x2E +#define MODEL_o9 0x2D +#define MODEL_o106 0x2C +#define MODEL_o65 0x2B +#define MODEL_o11 0x2A +#define MODEL_o12 0x29 +#define MODEL_o10 0x28 +#define MODEL_g10 0x27 +#define MODEL_g33 0x26 +#define MODEL_g35 0x25 +#define MODEL_o95 0x24 +#define MODEL_g34 0x23 +#define MODEL_o94 0x22 +#define MODEL_g36 0x21 +#define MODEL_g39 0x20 +#define MODEL_o104 0x1F +#define MODEL_o103 0x1E +#define MODEL_o102 0x1D +#define MODEL_g38 0x1C +#define MODEL_o101 0x1B +#define MODEL_o100 0x1A +#define MODEL_o99 0x19 +#define MODEL_g37 0x18 +#define MODEL_o98 0x17 +#define MODEL_o97 0x16 +#define MODEL_o96 0x15 +#define MODEL_g15 0x14 +#define MODEL_g17 0x13 +#define MODEL_o52 0x12 +#define MODEL_g16 0x11 +#define MODEL_o51 0x10 +#define MODEL_g11 0xF +#define MODEL_g14 0xE +#define MODEL_o50 0xD +#define MODEL_o49 0xC +#define MODEL_o48 0xB +#define MODEL_g13 0xA +#define MODEL_o47 0x9 +#define MODEL_o46 0x8 +#define MODEL_o45 0x7 +#define MODEL_g12 0x6 +#define MODEL_o44 0x5 +#define MODEL_o43 0x4 +#define MODEL_o42 0x3 +#define MODEL_g31 0x2 +#define MODEL_o88 0x1 +#define MODEL_o87 0x0 + diff --git a/include/mapfs/kkj_23_hit.h b/include/mapfs/kkj_23_hit.h index 02e58deb0f..3941866809 100644 --- a/include/mapfs/kkj_23_hit.h +++ b/include/mapfs/kkj_23_hit.h @@ -1,21 +1,26 @@ -#define COLLIDER_Root 0x14 -#define COLLIDER_g1 0x13 -#define COLLIDER_g9 0x12 -#define COLLIDER_o38 0x11 -#define COLLIDER_o36 0x10 -#define COLLIDER_o6 0xF -#define COLLIDER_g2 0xE -#define COLLIDER_o37 0xD -#define COLLIDER_o35 0xC -#define COLLIDER_o11 0xB -#define COLLIDER_g11 0xA -#define COLLIDER_g3 0x9 -#define COLLIDER_o34 0x8 -#define COLLIDER_tte 0x7 -#define COLLIDER_deilite 0x6 -#define COLLIDER_deilie 0x5 -#define COLLIDER_g6 0x4 -#define COLLIDER_o30 0x3 -#define COLLIDER_ttw 0x2 -#define COLLIDER_deilitw 0x1 -#define COLLIDER_deiliw 0x0 +#define COLLIDER_Root 0x14 +#define COLLIDER_g1 0x13 +#define COLLIDER_g9 0x12 +#define COLLIDER_o38 0x11 +#define COLLIDER_o36 0x10 +#define COLLIDER_o6 0xF +#define COLLIDER_g2 0xE +#define COLLIDER_o37 0xD +#define COLLIDER_o35 0xC +#define COLLIDER_o11 0xB +#define COLLIDER_g11 0xA +#define COLLIDER_g3 0x9 +#define COLLIDER_o34 0x8 +#define COLLIDER_tte 0x7 +#define COLLIDER_deilite 0x6 +#define COLLIDER_deilie 0x5 +#define COLLIDER_g6 0x4 +#define COLLIDER_o30 0x3 +#define COLLIDER_ttw 0x2 +#define COLLIDER_deilitw 0x1 +#define COLLIDER_deiliw 0x0 + +#define ZONE_Root 0x2 +#define ZONE_g1 0x1 +#define ZONE_o1 0x0 + diff --git a/include/mapfs/kkj_23_shape.h b/include/mapfs/kkj_23_shape.h index 16dbf6237f..4603de7d5d 100644 --- a/include/mapfs/kkj_23_shape.h +++ b/include/mapfs/kkj_23_shape.h @@ -1,40 +1,41 @@ -#define MODEL_Root 0x27 -#define MODEL_g1 0x26 -#define MODEL_g12 0x25 -#define MODEL_o22 0x24 -#define MODEL_o21 0x23 -#define MODEL_o20 0x22 -#define MODEL_o19 0x21 -#define MODEL_o18 0x20 -#define MODEL_g10 0x1F -#define MODEL_o26 0x1E -#define MODEL_o8 0x1D -#define MODEL_o7 0x1C -#define MODEL_o2 0x1B -#define MODEL_o6 0x1A -#define MODEL_g9 0x19 -#define MODEL_g13 0x18 -#define MODEL_o24 0x17 -#define MODEL_o23 0x16 -#define MODEL_o25 0x15 -#define MODEL_o14 0x14 -#define MODEL_o13 0x13 -#define MODEL_o12 0x12 -#define MODEL_o3 0x11 -#define MODEL_o11 0x10 -#define MODEL_g2 0xF -#define MODEL_o16 0xE -#define MODEL_o15 0xD -#define MODEL_o1 0xC -#define MODEL_g11 0xB -#define MODEL_o27 0xA -#define MODEL_g3 0x9 -#define MODEL_g5 0x8 -#define MODEL_o5 0x7 -#define MODEL_g4 0x6 -#define MODEL_o4 0x5 -#define MODEL_g6 0x4 -#define MODEL_g8 0x3 -#define MODEL_o10 0x2 -#define MODEL_g7 0x1 -#define MODEL_o9 0x0 +#define MODEL_Root 0x27 +#define MODEL_g1 0x26 +#define MODEL_g12 0x25 +#define MODEL_o22 0x24 +#define MODEL_o21 0x23 +#define MODEL_o20 0x22 +#define MODEL_o19 0x21 +#define MODEL_o18 0x20 +#define MODEL_g10 0x1F +#define MODEL_o26 0x1E +#define MODEL_o8 0x1D +#define MODEL_o7 0x1C +#define MODEL_o2 0x1B +#define MODEL_o6 0x1A +#define MODEL_g9 0x19 +#define MODEL_g13 0x18 +#define MODEL_o24 0x17 +#define MODEL_o23 0x16 +#define MODEL_o25 0x15 +#define MODEL_o14 0x14 +#define MODEL_o13 0x13 +#define MODEL_o12 0x12 +#define MODEL_o3 0x11 +#define MODEL_o11 0x10 +#define MODEL_g2 0xF +#define MODEL_o16 0xE +#define MODEL_o15 0xD +#define MODEL_o1 0xC +#define MODEL_g11 0xB +#define MODEL_o27 0xA +#define MODEL_g3 0x9 +#define MODEL_g5 0x8 +#define MODEL_o5 0x7 +#define MODEL_g4 0x6 +#define MODEL_o4 0x5 +#define MODEL_g6 0x4 +#define MODEL_g8 0x3 +#define MODEL_o10 0x2 +#define MODEL_g7 0x1 +#define MODEL_o9 0x0 + diff --git a/include/mapfs/kkj_24_hit.h b/include/mapfs/kkj_24_hit.h index 449a5e8813..76b7a98b1f 100644 --- a/include/mapfs/kkj_24_hit.h +++ b/include/mapfs/kkj_24_hit.h @@ -1,31 +1,44 @@ -#define COLLIDER_Root 0x1E -#define COLLIDER_g1 0x1D -#define COLLIDER_g26 0x1C -#define COLLIDER_o148 0x1B -#define COLLIDER_o147 0x1A -#define COLLIDER_o145 0x19 -#define COLLIDER_g5 0x18 -#define COLLIDER_o154 0x17 -#define COLLIDER_o153 0x16 -#define COLLIDER_o152 0x15 -#define COLLIDER_o55 0x14 -#define COLLIDER_o151 0x13 -#define COLLIDER_o150 0x12 -#define COLLIDER_o149 0x11 -#define COLLIDER_g24 0x10 -#define COLLIDER_o138 0xF -#define COLLIDER_o136 0xE -#define COLLIDER_o134 0xD -#define COLLIDER_o75 0xC -#define COLLIDER_o127 0xB -#define COLLIDER_g13 0xA -#define COLLIDER_g14 0x9 -#define COLLIDER_o131 0x8 -#define COLLIDER_tte2 0x7 -#define COLLIDER_deilite2 0x6 -#define COLLIDER_deilie2 0x5 -#define COLLIDER_g9 0x4 -#define COLLIDER_o130 0x3 -#define COLLIDER_tte 0x2 -#define COLLIDER_deilite 0x1 -#define COLLIDER_deilie 0x0 +#define COLLIDER_Root 0x1E +#define COLLIDER_g1 0x1D +#define COLLIDER_g26 0x1C +#define COLLIDER_o148 0x1B +#define COLLIDER_o147 0x1A +#define COLLIDER_o145 0x19 +#define COLLIDER_g5 0x18 +#define COLLIDER_o154 0x17 +#define COLLIDER_o153 0x16 +#define COLLIDER_o152 0x15 +#define COLLIDER_o55 0x14 +#define COLLIDER_o151 0x13 +#define COLLIDER_o150 0x12 +#define COLLIDER_o149 0x11 +#define COLLIDER_g24 0x10 +#define COLLIDER_o138 0xF +#define COLLIDER_o136 0xE +#define COLLIDER_o134 0xD +#define COLLIDER_o75 0xC +#define COLLIDER_o127 0xB +#define COLLIDER_g13 0xA +#define COLLIDER_g14 0x9 +#define COLLIDER_o131 0x8 +#define COLLIDER_tte2 0x7 +#define COLLIDER_deilite2 0x6 +#define COLLIDER_deilie2 0x5 +#define COLLIDER_g9 0x4 +#define COLLIDER_o130 0x3 +#define COLLIDER_tte 0x2 +#define COLLIDER_deilite 0x1 +#define COLLIDER_deilie 0x0 + +#define ZONE_Root 0xA +#define ZONE_g3 0x9 +#define ZONE_o13 0x8 +#define ZONE_o14 0x7 +#define ZONE_o12 0x6 +#define ZONE_g2 0x5 +#define ZONE_o3 0x4 +#define ZONE_g1 0x3 +#define ZONE_o15 0x2 +#define ZONE_o16 0x1 +#define ZONE_o5 0x0 + diff --git a/include/mapfs/kkj_24_shape.h b/include/mapfs/kkj_24_shape.h index 42d56b81f3..919f10b35a 100644 --- a/include/mapfs/kkj_24_shape.h +++ b/include/mapfs/kkj_24_shape.h @@ -1,68 +1,69 @@ -#define MODEL_Root 0x43 -#define MODEL_g1 0x42 -#define MODEL_g27 0x41 -#define MODEL_o124 0x40 -#define MODEL_o123 0x3F -#define MODEL_g26 0x3E -#define MODEL_o120 0x3D -#define MODEL_o119 0x3C -#define MODEL_o118 0x3B -#define MODEL_o117 0x3A -#define MODEL_o116 0x39 -#define MODEL_o115 0x38 -#define MODEL_g2 0x37 -#define MODEL_g22 0x36 -#define MODEL_o88 0x35 -#define MODEL_o86 0x34 -#define MODEL_o85 0x33 -#define MODEL_o84 0x32 -#define MODEL_o83 0x31 -#define MODEL_o82 0x30 -#define MODEL_o81 0x2F -#define MODEL_g3 0x2E -#define MODEL_o45 0x2D -#define MODEL_o44 0x2C -#define MODEL_o42 0x2B -#define MODEL_o41 0x2A -#define MODEL_o40 0x29 -#define MODEL_o39 0x28 -#define MODEL_o14 0x27 -#define MODEL_o2 0x26 -#define MODEL_g5 0x25 -#define MODEL_o56 0x24 -#define MODEL_o55 0x23 -#define MODEL_o52 0x22 -#define MODEL_o51 0x21 -#define MODEL_o50 0x20 -#define MODEL_g24 0x1F -#define MODEL_o48 0x1E -#define MODEL_o99 0x1D -#define MODEL_o1 0x1C -#define MODEL_g13 0x1B -#define MODEL_g18 0x1A -#define MODEL_g20 0x19 -#define MODEL_o78 0x18 -#define MODEL_g19 0x17 -#define MODEL_o77 0x16 -#define MODEL_g14 0x15 -#define MODEL_o76 0x14 -#define MODEL_o75 0x13 -#define MODEL_o74 0x12 -#define MODEL_g6 0x11 -#define MODEL_g8 0x10 -#define MODEL_o58 0xF -#define MODEL_g7 0xE -#define MODEL_o57 0xD -#define MODEL_g9 0xC -#define MODEL_g12 0xB -#define MODEL_o67 0xA -#define MODEL_o66 0x9 -#define MODEL_o65 0x8 -#define MODEL_g11 0x7 -#define MODEL_o64 0x6 -#define MODEL_o63 0x5 -#define MODEL_o62 0x4 -#define MODEL_g10 0x3 -#define MODEL_o61 0x2 -#define MODEL_o60 0x1 -#define MODEL_o59 0x0 +#define MODEL_Root 0x43 +#define MODEL_g1 0x42 +#define MODEL_g27 0x41 +#define MODEL_o124 0x40 +#define MODEL_o123 0x3F +#define MODEL_g26 0x3E +#define MODEL_o120 0x3D +#define MODEL_o119 0x3C +#define MODEL_o118 0x3B +#define MODEL_o117 0x3A +#define MODEL_o116 0x39 +#define MODEL_o115 0x38 +#define MODEL_g2 0x37 +#define MODEL_g22 0x36 +#define MODEL_o88 0x35 +#define MODEL_o86 0x34 +#define MODEL_o85 0x33 +#define MODEL_o84 0x32 +#define MODEL_o83 0x31 +#define MODEL_o82 0x30 +#define MODEL_o81 0x2F +#define MODEL_g3 0x2E +#define MODEL_o45 0x2D +#define MODEL_o44 0x2C +#define MODEL_o42 0x2B +#define MODEL_o41 0x2A +#define MODEL_o40 0x29 +#define MODEL_o39 0x28 +#define MODEL_o14 0x27 +#define MODEL_o2 0x26 +#define MODEL_g5 0x25 +#define MODEL_o56 0x24 +#define MODEL_o55 0x23 +#define MODEL_o52 0x22 +#define MODEL_o51 0x21 +#define MODEL_o50 0x20 +#define MODEL_g24 0x1F +#define MODEL_o48 0x1E +#define MODEL_o99 0x1D +#define MODEL_o1 0x1C +#define MODEL_g13 0x1B +#define MODEL_g18 0x1A +#define MODEL_g20 0x19 +#define MODEL_o78 0x18 +#define MODEL_g19 0x17 +#define MODEL_o77 0x16 +#define MODEL_g14 0x15 +#define MODEL_o76 0x14 +#define MODEL_o75 0x13 +#define MODEL_o74 0x12 +#define MODEL_g6 0x11 +#define MODEL_g8 0x10 +#define MODEL_o58 0xF +#define MODEL_g7 0xE +#define MODEL_o57 0xD +#define MODEL_g9 0xC +#define MODEL_g12 0xB +#define MODEL_o67 0xA +#define MODEL_o66 0x9 +#define MODEL_o65 0x8 +#define MODEL_g11 0x7 +#define MODEL_o64 0x6 +#define MODEL_o63 0x5 +#define MODEL_o62 0x4 +#define MODEL_g10 0x3 +#define MODEL_o61 0x2 +#define MODEL_o60 0x1 +#define MODEL_o59 0x0 + diff --git a/include/mapfs/kkj_25_hit.h b/include/mapfs/kkj_25_hit.h index f87f0cc86e..770b393cde 100644 --- a/include/mapfs/kkj_25_hit.h +++ b/include/mapfs/kkj_25_hit.h @@ -1,15 +1,26 @@ -#define COLLIDER_Root 0xE -#define COLLIDER_g1 0xD -#define COLLIDER_g19 0xC -#define COLLIDER_o128 0xB -#define COLLIDER_g30 0xA -#define COLLIDER_o175 0x9 -#define COLLIDER_o127 0x8 -#define COLLIDER_g21 0x7 -#define COLLIDER_o126 0x6 -#define COLLIDER_o99 0x5 -#define COLLIDER_g20 0x4 -#define COLLIDER_o125 0x3 -#define COLLIDER_ttw 0x2 -#define COLLIDER_deilitw 0x1 -#define COLLIDER_deiliw 0x0 +#define COLLIDER_Root 0xE +#define COLLIDER_g1 0xD +#define COLLIDER_g19 0xC +#define COLLIDER_o128 0xB +#define COLLIDER_g30 0xA +#define COLLIDER_o175 0x9 +#define COLLIDER_o127 0x8 +#define COLLIDER_g21 0x7 +#define COLLIDER_o126 0x6 +#define COLLIDER_o99 0x5 +#define COLLIDER_g20 0x4 +#define COLLIDER_o125 0x3 +#define COLLIDER_ttw 0x2 +#define COLLIDER_deilitw 0x1 +#define COLLIDER_deiliw 0x0 + +#define ZONE_Root 0x8 +#define ZONE_g2 0x7 +#define ZONE_o9 0x6 +#define ZONE_o8 0x5 +#define ZONE_o10 0x4 +#define ZONE_o6 0x3 +#define ZONE_g1 0x2 +#define ZONE_o15 0x1 +#define ZONE_o1 0x0 + diff --git a/include/mapfs/kkj_25_shape.h b/include/mapfs/kkj_25_shape.h index 53c5bc8615..a3eb0d1515 100644 --- a/include/mapfs/kkj_25_shape.h +++ b/include/mapfs/kkj_25_shape.h @@ -1,174 +1,175 @@ -#define MODEL_Root 0xAD -#define MODEL_g1 0xAC -#define MODEL_g51 0xAB -#define MODEL_o122 0xAA -#define MODEL_g19 0xA9 -#define MODEL_g54 0xA8 -#define MODEL_o126 0xA7 -#define MODEL_o125 0xA6 -#define MODEL_g10 0xA5 -#define MODEL_g18 0xA4 -#define MODEL_o73 0xA3 -#define MODEL_g17 0xA2 -#define MODEL_o70 0xA1 -#define MODEL_g16 0xA0 -#define MODEL_o67 0x9F -#define MODEL_g15 0x9E -#define MODEL_o64 0x9D -#define MODEL_g14 0x9C -#define MODEL_o61 0x9B -#define MODEL_g13 0x9A -#define MODEL_o58 0x99 -#define MODEL_g12 0x98 -#define MODEL_o55 0x97 -#define MODEL_g11 0x96 -#define MODEL_o52 0x95 -#define MODEL_g3 0x94 -#define MODEL_o4 0x93 -#define MODEL_g33 0x92 -#define MODEL_o74 0x91 -#define MODEL_o71 0x90 -#define MODEL_o68 0x8F -#define MODEL_o65 0x8E -#define MODEL_o62 0x8D -#define MODEL_o59 0x8C -#define MODEL_o56 0x8B -#define MODEL_o53 0x8A -#define MODEL_o2 0x89 -#define MODEL_g32 0x88 -#define MODEL_o75 0x87 -#define MODEL_o72 0x86 -#define MODEL_o69 0x85 -#define MODEL_o66 0x84 -#define MODEL_o63 0x83 -#define MODEL_o60 0x82 -#define MODEL_o57 0x81 -#define MODEL_o54 0x80 -#define MODEL_o51 0x7F -#define MODEL_g7 0x7E -#define MODEL_o43 0x7D -#define MODEL_o42 0x7C -#define MODEL_o41 0x7B -#define MODEL_o40 0x7A -#define MODEL_o39 0x79 -#define MODEL_o38 0x78 -#define MODEL_o37 0x77 -#define MODEL_o36 0x76 -#define MODEL_o35 0x75 -#define MODEL_o6 0x74 -#define MODEL_g31 0x73 -#define MODEL_o50 0x72 -#define MODEL_o49 0x71 -#define MODEL_o48 0x70 -#define MODEL_o47 0x6F -#define MODEL_o46 0x6E -#define MODEL_o45 0x6D -#define MODEL_o44 0x6C -#define MODEL_o28 0x6B -#define MODEL_o27 0x6A -#define MODEL_o26 0x69 -#define MODEL_o25 0x68 -#define MODEL_o24 0x67 -#define MODEL_o23 0x66 -#define MODEL_o22 0x65 -#define MODEL_o21 0x64 -#define MODEL_o20 0x63 -#define MODEL_o19 0x62 -#define MODEL_o18 0x61 -#define MODEL_o8 0x60 -#define MODEL_o33 0x5F -#define MODEL_g2 0x5E -#define MODEL_g6 0x5D -#define MODEL_o32 0x5C -#define MODEL_o31 0x5B -#define MODEL_o5 0x5A -#define MODEL_o1 0x59 -#define MODEL_g30 0x58 -#define MODEL_g49 0x57 -#define MODEL_o146 0x56 -#define MODEL_o121 0x55 -#define MODEL_g48 0x54 -#define MODEL_o145 0x53 -#define MODEL_o120 0x52 -#define MODEL_g47 0x51 -#define MODEL_o144 0x50 -#define MODEL_o119 0x4F -#define MODEL_g46 0x4E -#define MODEL_o143 0x4D -#define MODEL_o118 0x4C -#define MODEL_g45 0x4B -#define MODEL_o142 0x4A -#define MODEL_o117 0x49 -#define MODEL_g44 0x48 -#define MODEL_o141 0x47 -#define MODEL_o116 0x46 -#define MODEL_g43 0x45 -#define MODEL_o140 0x44 -#define MODEL_o115 0x43 -#define MODEL_g42 0x42 -#define MODEL_o139 0x41 -#define MODEL_o114 0x40 -#define MODEL_g41 0x3F -#define MODEL_o138 0x3E -#define MODEL_o113 0x3D -#define MODEL_g40 0x3C -#define MODEL_o137 0x3B -#define MODEL_o112 0x3A -#define MODEL_g39 0x39 -#define MODEL_o136 0x38 -#define MODEL_o111 0x37 -#define MODEL_g38 0x36 -#define MODEL_o135 0x35 -#define MODEL_o110 0x34 -#define MODEL_g37 0x33 -#define MODEL_o134 0x32 -#define MODEL_o109 0x31 -#define MODEL_g36 0x30 -#define MODEL_o133 0x2F -#define MODEL_o108 0x2E -#define MODEL_g35 0x2D -#define MODEL_o131 0x2C -#define MODEL_o107 0x2B -#define MODEL_g34 0x2A -#define MODEL_o130 0x29 -#define MODEL_o90 0x28 -#define MODEL_g21 0x27 -#define MODEL_g56 0x26 -#define MODEL_o151 0x25 -#define MODEL_o150 0x24 -#define MODEL_o149 0x23 -#define MODEL_o148 0x22 -#define MODEL_o147 0x21 -#define MODEL_g26 0x20 -#define MODEL_g29 0x1F -#define MODEL_o106 0x1E -#define MODEL_o105 0x1D -#define MODEL_o104 0x1C -#define MODEL_o87 0x1B -#define MODEL_g28 0x1A -#define MODEL_o102 0x19 -#define MODEL_o101 0x18 -#define MODEL_o100 0x17 -#define MODEL_o99 0x16 -#define MODEL_o98 0x15 -#define MODEL_o95 0x14 -#define MODEL_o93 0x13 -#define MODEL_o92 0x12 -#define MODEL_o94 0x11 -#define MODEL_o89 0x10 -#define MODEL_o88 0xF -#define MODEL_g22 0xE -#define MODEL_o83 0xD -#define MODEL_o82 0xC -#define MODEL_o103 0xB -#define MODEL_o80 0xA -#define MODEL_o78 0x9 -#define MODEL_o77 0x8 -#define MODEL_o76 0x7 -#define MODEL_g20 0x6 -#define MODEL_g25 0x5 -#define MODEL_o85 0x4 -#define MODEL_g24 0x3 -#define MODEL_o84 0x2 -#define MODEL_g50 0x1 -#define MODEL_o81 0x0 +#define MODEL_Root 0xAD +#define MODEL_g1 0xAC +#define MODEL_g51 0xAB +#define MODEL_o122 0xAA +#define MODEL_g19 0xA9 +#define MODEL_g54 0xA8 +#define MODEL_o126 0xA7 +#define MODEL_o125 0xA6 +#define MODEL_g10 0xA5 +#define MODEL_g18 0xA4 +#define MODEL_o73 0xA3 +#define MODEL_g17 0xA2 +#define MODEL_o70 0xA1 +#define MODEL_g16 0xA0 +#define MODEL_o67 0x9F +#define MODEL_g15 0x9E +#define MODEL_o64 0x9D +#define MODEL_g14 0x9C +#define MODEL_o61 0x9B +#define MODEL_g13 0x9A +#define MODEL_o58 0x99 +#define MODEL_g12 0x98 +#define MODEL_o55 0x97 +#define MODEL_g11 0x96 +#define MODEL_o52 0x95 +#define MODEL_g3 0x94 +#define MODEL_o4 0x93 +#define MODEL_g33 0x92 +#define MODEL_o74 0x91 +#define MODEL_o71 0x90 +#define MODEL_o68 0x8F +#define MODEL_o65 0x8E +#define MODEL_o62 0x8D +#define MODEL_o59 0x8C +#define MODEL_o56 0x8B +#define MODEL_o53 0x8A +#define MODEL_o2 0x89 +#define MODEL_g32 0x88 +#define MODEL_o75 0x87 +#define MODEL_o72 0x86 +#define MODEL_o69 0x85 +#define MODEL_o66 0x84 +#define MODEL_o63 0x83 +#define MODEL_o60 0x82 +#define MODEL_o57 0x81 +#define MODEL_o54 0x80 +#define MODEL_o51 0x7F +#define MODEL_g7 0x7E +#define MODEL_o43 0x7D +#define MODEL_o42 0x7C +#define MODEL_o41 0x7B +#define MODEL_o40 0x7A +#define MODEL_o39 0x79 +#define MODEL_o38 0x78 +#define MODEL_o37 0x77 +#define MODEL_o36 0x76 +#define MODEL_o35 0x75 +#define MODEL_o6 0x74 +#define MODEL_g31 0x73 +#define MODEL_o50 0x72 +#define MODEL_o49 0x71 +#define MODEL_o48 0x70 +#define MODEL_o47 0x6F +#define MODEL_o46 0x6E +#define MODEL_o45 0x6D +#define MODEL_o44 0x6C +#define MODEL_o28 0x6B +#define MODEL_o27 0x6A +#define MODEL_o26 0x69 +#define MODEL_o25 0x68 +#define MODEL_o24 0x67 +#define MODEL_o23 0x66 +#define MODEL_o22 0x65 +#define MODEL_o21 0x64 +#define MODEL_o20 0x63 +#define MODEL_o19 0x62 +#define MODEL_o18 0x61 +#define MODEL_o8 0x60 +#define MODEL_o33 0x5F +#define MODEL_g2 0x5E +#define MODEL_g6 0x5D +#define MODEL_o32 0x5C +#define MODEL_o31 0x5B +#define MODEL_o5 0x5A +#define MODEL_o1 0x59 +#define MODEL_g30 0x58 +#define MODEL_g49 0x57 +#define MODEL_o146 0x56 +#define MODEL_o121 0x55 +#define MODEL_g48 0x54 +#define MODEL_o145 0x53 +#define MODEL_o120 0x52 +#define MODEL_g47 0x51 +#define MODEL_o144 0x50 +#define MODEL_o119 0x4F +#define MODEL_g46 0x4E +#define MODEL_o143 0x4D +#define MODEL_o118 0x4C +#define MODEL_g45 0x4B +#define MODEL_o142 0x4A +#define MODEL_o117 0x49 +#define MODEL_g44 0x48 +#define MODEL_o141 0x47 +#define MODEL_o116 0x46 +#define MODEL_g43 0x45 +#define MODEL_o140 0x44 +#define MODEL_o115 0x43 +#define MODEL_g42 0x42 +#define MODEL_o139 0x41 +#define MODEL_o114 0x40 +#define MODEL_g41 0x3F +#define MODEL_o138 0x3E +#define MODEL_o113 0x3D +#define MODEL_g40 0x3C +#define MODEL_o137 0x3B +#define MODEL_o112 0x3A +#define MODEL_g39 0x39 +#define MODEL_o136 0x38 +#define MODEL_o111 0x37 +#define MODEL_g38 0x36 +#define MODEL_o135 0x35 +#define MODEL_o110 0x34 +#define MODEL_g37 0x33 +#define MODEL_o134 0x32 +#define MODEL_o109 0x31 +#define MODEL_g36 0x30 +#define MODEL_o133 0x2F +#define MODEL_o108 0x2E +#define MODEL_g35 0x2D +#define MODEL_o131 0x2C +#define MODEL_o107 0x2B +#define MODEL_g34 0x2A +#define MODEL_o130 0x29 +#define MODEL_o90 0x28 +#define MODEL_g21 0x27 +#define MODEL_g56 0x26 +#define MODEL_o151 0x25 +#define MODEL_o150 0x24 +#define MODEL_o149 0x23 +#define MODEL_o148 0x22 +#define MODEL_o147 0x21 +#define MODEL_g26 0x20 +#define MODEL_g29 0x1F +#define MODEL_o106 0x1E +#define MODEL_o105 0x1D +#define MODEL_o104 0x1C +#define MODEL_o87 0x1B +#define MODEL_g28 0x1A +#define MODEL_o102 0x19 +#define MODEL_o101 0x18 +#define MODEL_o100 0x17 +#define MODEL_o99 0x16 +#define MODEL_o98 0x15 +#define MODEL_o95 0x14 +#define MODEL_o93 0x13 +#define MODEL_o92 0x12 +#define MODEL_o94 0x11 +#define MODEL_o89 0x10 +#define MODEL_o88 0xF +#define MODEL_g22 0xE +#define MODEL_o83 0xD +#define MODEL_o82 0xC +#define MODEL_o103 0xB +#define MODEL_o80 0xA +#define MODEL_o78 0x9 +#define MODEL_o77 0x8 +#define MODEL_o76 0x7 +#define MODEL_g20 0x6 +#define MODEL_g25 0x5 +#define MODEL_o85 0x4 +#define MODEL_g24 0x3 +#define MODEL_o84 0x2 +#define MODEL_g50 0x1 +#define MODEL_o81 0x0 + diff --git a/include/mapfs/kkj_26_hit.h b/include/mapfs/kkj_26_hit.h index 873752e2c2..abbc4ab8f3 100644 --- a/include/mapfs/kkj_26_hit.h +++ b/include/mapfs/kkj_26_hit.h @@ -1,8 +1,13 @@ -#define COLLIDER_Root 0x7 -#define COLLIDER_g32 0x6 -#define COLLIDER_o116 0x5 -#define COLLIDER_g1 0x4 -#define COLLIDER_o119 0x3 -#define COLLIDER_ttw 0x2 -#define COLLIDER_deilitw 0x1 -#define COLLIDER_deiliw 0x0 +#define COLLIDER_Root 0x7 +#define COLLIDER_g32 0x6 +#define COLLIDER_o116 0x5 +#define COLLIDER_g1 0x4 +#define COLLIDER_o119 0x3 +#define COLLIDER_ttw 0x2 +#define COLLIDER_deilitw 0x1 +#define COLLIDER_deiliw 0x0 + +#define ZONE_Root 0x2 +#define ZONE_g1 0x1 +#define ZONE_o73 0x0 + diff --git a/include/mapfs/kkj_26_shape.h b/include/mapfs/kkj_26_shape.h index 302256eddc..3cd4db8bf5 100644 --- a/include/mapfs/kkj_26_shape.h +++ b/include/mapfs/kkj_26_shape.h @@ -1,45 +1,46 @@ -#define MODEL_Root 0x2C -#define MODEL_g1 0x2B -#define MODEL_o106 0x2A -#define MODEL_mado 0x29 -#define MODEL_g29 0x28 -#define MODEL_o86 0x27 -#define MODEL_o85 0x26 -#define MODEL_g28 0x25 -#define MODEL_o84 0x24 -#define MODEL_o83 0x23 -#define MODEL_baru 0x22 -#define MODEL_o81 0x21 -#define MODEL_o80 0x20 -#define MODEL_g19 0x1F -#define MODEL_o79 0x1E -#define MODEL_o78 0x1D -#define MODEL_o77 0x1C -#define MODEL_o76 0x1B -#define MODEL_o75 0x1A -#define MODEL_o74 0x19 -#define MODEL_o71 0x18 -#define MODEL_o70 0x17 -#define MODEL_o69 0x16 -#define MODEL_o72 0x15 -#define MODEL_o73 0x14 -#define MODEL_bed 0x13 -#define MODEL_o28 0x12 -#define MODEL_o25 0x11 -#define MODEL_o24 0x10 -#define MODEL_o27 0xF -#define MODEL_o26 0xE -#define MODEL_o22 0xD -#define MODEL_o21 0xC -#define MODEL_o20 0xB -#define MODEL_g6 0xA -#define MODEL_g17 0x9 -#define MODEL_o65 0x8 -#define MODEL_o64 0x7 -#define MODEL_o63 0x6 -#define MODEL_o62 0x5 -#define MODEL_g2 0x4 -#define MODEL_g26 0x3 -#define MODEL_o110 0x2 -#define MODEL_g24 0x1 -#define MODEL_o105 0x0 +#define MODEL_Root 0x2C +#define MODEL_g1 0x2B +#define MODEL_o106 0x2A +#define MODEL_mado 0x29 +#define MODEL_g29 0x28 +#define MODEL_o86 0x27 +#define MODEL_o85 0x26 +#define MODEL_g28 0x25 +#define MODEL_o84 0x24 +#define MODEL_o83 0x23 +#define MODEL_baru 0x22 +#define MODEL_o81 0x21 +#define MODEL_o80 0x20 +#define MODEL_g19 0x1F +#define MODEL_o79 0x1E +#define MODEL_o78 0x1D +#define MODEL_o77 0x1C +#define MODEL_o76 0x1B +#define MODEL_o75 0x1A +#define MODEL_o74 0x19 +#define MODEL_o71 0x18 +#define MODEL_o70 0x17 +#define MODEL_o69 0x16 +#define MODEL_o72 0x15 +#define MODEL_o73 0x14 +#define MODEL_bed 0x13 +#define MODEL_o28 0x12 +#define MODEL_o25 0x11 +#define MODEL_o24 0x10 +#define MODEL_o27 0xF +#define MODEL_o26 0xE +#define MODEL_o22 0xD +#define MODEL_o21 0xC +#define MODEL_o20 0xB +#define MODEL_g6 0xA +#define MODEL_g17 0x9 +#define MODEL_o65 0x8 +#define MODEL_o64 0x7 +#define MODEL_o63 0x6 +#define MODEL_o62 0x5 +#define MODEL_g2 0x4 +#define MODEL_g26 0x3 +#define MODEL_o110 0x2 +#define MODEL_g24 0x1 +#define MODEL_o105 0x0 + diff --git a/include/mapfs/kkj_27_hit.h b/include/mapfs/kkj_27_hit.h index 844a35d125..b5a23f145a 100644 --- a/include/mapfs/kkj_27_hit.h +++ b/include/mapfs/kkj_27_hit.h @@ -1,14 +1,20 @@ -#define COLLIDER_Root 0xD -#define COLLIDER_g29 0xC -#define COLLIDER_o127 0xB -#define COLLIDER_o122 0xA -#define COLLIDER_o120 0x9 -#define COLLIDER_o124 0x8 -#define COLLIDER_o193 0x7 -#define COLLIDER_g42 0x6 -#define COLLIDER_o192 0x5 -#define COLLIDER_o189 0x4 -#define COLLIDER_g41 0x3 -#define COLLIDER_o191 0x2 -#define COLLIDER_deilits 0x1 -#define COLLIDER_deilis 0x0 +#define COLLIDER_Root 0xD +#define COLLIDER_g29 0xC +#define COLLIDER_o127 0xB +#define COLLIDER_o122 0xA +#define COLLIDER_o120 0x9 +#define COLLIDER_o124 0x8 +#define COLLIDER_o193 0x7 +#define COLLIDER_g42 0x6 +#define COLLIDER_o192 0x5 +#define COLLIDER_o189 0x4 +#define COLLIDER_g41 0x3 +#define COLLIDER_o191 0x2 +#define COLLIDER_deilits 0x1 +#define COLLIDER_deilis 0x0 + +#define ZONE_Root 0x3 +#define ZONE_g41 0x2 +#define ZONE_o189 0x1 +#define ZONE_o190 0x0 + diff --git a/include/mapfs/kkj_27_shape.h b/include/mapfs/kkj_27_shape.h index 9d5b87e0bc..80abc71db8 100644 --- a/include/mapfs/kkj_27_shape.h +++ b/include/mapfs/kkj_27_shape.h @@ -1,56 +1,57 @@ -#define MODEL_Root 0x37 -#define MODEL_g56 0x36 -#define MODEL_g29 0x35 -#define MODEL_o100 0x34 -#define MODEL_g30 0x33 -#define MODEL_o118 0x32 -#define MODEL_o117 0x31 -#define MODEL_o116 0x30 -#define MODEL_g31 0x2F -#define MODEL_o127 0x2E -#define MODEL_o125 0x2D -#define MODEL_o39 0x2C -#define MODEL_o123 0x2B -#define MODEL_o122 0x2A -#define MODEL_o121 0x29 -#define MODEL_o120 0x28 -#define MODEL_o128 0x27 -#define MODEL_o124 0x26 -#define MODEL_o209 0x25 -#define MODEL_o129 0x24 -#define MODEL_g28 0x23 -#define MODEL_g45 0x22 -#define MODEL_o205 0x21 -#define MODEL_o207 0x20 -#define MODEL_o172 0x1F -#define MODEL_o176 0x1E -#define MODEL_o180 0x1D -#define MODEL_g39 0x1C -#define MODEL_o179 0x1B -#define MODEL_o178 0x1A -#define MODEL_o177 0x19 -#define MODEL_g38 0x18 -#define MODEL_o175 0x17 -#define MODEL_o174 0x16 -#define MODEL_o173 0x15 -#define MODEL_g37 0x14 -#define MODEL_o171 0x13 -#define MODEL_o170 0x12 -#define MODEL_o169 0x11 -#define MODEL_g53 0x10 -#define MODEL_o114 0xF -#define MODEL_o113 0xE -#define MODEL_o112 0xD -#define MODEL_g44 0xC -#define MODEL_o186 0xB -#define MODEL_g43 0xA -#define MODEL_o184 0x9 -#define MODEL_o183 0x8 -#define MODEL_g40 0x7 -#define MODEL_o182 0x6 -#define MODEL_g55 0x5 -#define MODEL_o185 0x4 -#define MODEL_g54 0x3 -#define MODEL_o181 0x2 -#define MODEL_g41 0x1 -#define MODEL_o187 0x0 +#define MODEL_Root 0x37 +#define MODEL_g56 0x36 +#define MODEL_g29 0x35 +#define MODEL_o100 0x34 +#define MODEL_g30 0x33 +#define MODEL_o118 0x32 +#define MODEL_o117 0x31 +#define MODEL_o116 0x30 +#define MODEL_g31 0x2F +#define MODEL_o127 0x2E +#define MODEL_o125 0x2D +#define MODEL_o39 0x2C +#define MODEL_o123 0x2B +#define MODEL_o122 0x2A +#define MODEL_o121 0x29 +#define MODEL_o120 0x28 +#define MODEL_o128 0x27 +#define MODEL_o124 0x26 +#define MODEL_o209 0x25 +#define MODEL_o129 0x24 +#define MODEL_g28 0x23 +#define MODEL_g45 0x22 +#define MODEL_o205 0x21 +#define MODEL_o207 0x20 +#define MODEL_o172 0x1F +#define MODEL_o176 0x1E +#define MODEL_o180 0x1D +#define MODEL_g39 0x1C +#define MODEL_o179 0x1B +#define MODEL_o178 0x1A +#define MODEL_o177 0x19 +#define MODEL_g38 0x18 +#define MODEL_o175 0x17 +#define MODEL_o174 0x16 +#define MODEL_o173 0x15 +#define MODEL_g37 0x14 +#define MODEL_o171 0x13 +#define MODEL_o170 0x12 +#define MODEL_o169 0x11 +#define MODEL_g53 0x10 +#define MODEL_o114 0xF +#define MODEL_o113 0xE +#define MODEL_o112 0xD +#define MODEL_g44 0xC +#define MODEL_o186 0xB +#define MODEL_g43 0xA +#define MODEL_o184 0x9 +#define MODEL_o183 0x8 +#define MODEL_g40 0x7 +#define MODEL_o182 0x6 +#define MODEL_g55 0x5 +#define MODEL_o185 0x4 +#define MODEL_g54 0x3 +#define MODEL_o181 0x2 +#define MODEL_g41 0x1 +#define MODEL_o187 0x0 + diff --git a/include/mapfs/kkj_28_hit.h b/include/mapfs/kkj_28_hit.h index 03622085ba..a60c0ab2fa 100644 --- a/include/mapfs/kkj_28_hit.h +++ b/include/mapfs/kkj_28_hit.h @@ -1,34 +1,39 @@ -#define COLLIDER_Root 0x21 -#define COLLIDER_g1 0x20 -#define COLLIDER_g37 0x1F -#define COLLIDER_o166 0x1E -#define COLLIDER_o164 0x1D -#define COLLIDER_g35 0x1C -#define COLLIDER_o150 0x1B -#define COLLIDER_o146 0x1A -#define COLLIDER_o141 0x19 -#define COLLIDER_o125 0x18 -#define COLLIDER_o131 0x17 -#define COLLIDER_o127 0x16 -#define COLLIDER_g29 0x15 -#define COLLIDER_g40 0x14 -#define COLLIDER_o175 0x13 -#define COLLIDER_o174 0x12 -#define COLLIDER_o173 0x11 -#define COLLIDER_g39 0x10 -#define COLLIDER_o172 0xF -#define COLLIDER_o171 0xE -#define COLLIDER_o170 0xD -#define COLLIDER_g38 0xC -#define COLLIDER_o169 0xB -#define COLLIDER_o168 0xA -#define COLLIDER_o167 0x9 -#define COLLIDER_g11 0x8 -#define COLLIDER_o163 0x7 -#define COLLIDER_o162 0x6 -#define COLLIDER_o160 0x5 -#define COLLIDER_g14 0x4 -#define COLLIDER_o158 0x3 -#define COLLIDER_tte 0x2 -#define COLLIDER_deilite 0x1 -#define COLLIDER_deilie 0x0 +#define COLLIDER_Root 0x21 +#define COLLIDER_g1 0x20 +#define COLLIDER_g37 0x1F +#define COLLIDER_o166 0x1E +#define COLLIDER_o164 0x1D +#define COLLIDER_g35 0x1C +#define COLLIDER_o150 0x1B +#define COLLIDER_o146 0x1A +#define COLLIDER_o141 0x19 +#define COLLIDER_o125 0x18 +#define COLLIDER_o131 0x17 +#define COLLIDER_o127 0x16 +#define COLLIDER_g29 0x15 +#define COLLIDER_g40 0x14 +#define COLLIDER_o175 0x13 +#define COLLIDER_o174 0x12 +#define COLLIDER_o173 0x11 +#define COLLIDER_g39 0x10 +#define COLLIDER_o172 0xF +#define COLLIDER_o171 0xE +#define COLLIDER_o170 0xD +#define COLLIDER_g38 0xC +#define COLLIDER_o169 0xB +#define COLLIDER_o168 0xA +#define COLLIDER_o167 0x9 +#define COLLIDER_g11 0x8 +#define COLLIDER_o163 0x7 +#define COLLIDER_o162 0x6 +#define COLLIDER_o160 0x5 +#define COLLIDER_g14 0x4 +#define COLLIDER_o158 0x3 +#define COLLIDER_tte 0x2 +#define COLLIDER_deilite 0x1 +#define COLLIDER_deilie 0x0 + +#define ZONE_Root 0x2 +#define ZONE_g1 0x1 +#define ZONE_o6 0x0 + diff --git a/include/mapfs/kkj_28_shape.h b/include/mapfs/kkj_28_shape.h index f2562923bf..d53a748c23 100644 --- a/include/mapfs/kkj_28_shape.h +++ b/include/mapfs/kkj_28_shape.h @@ -1,170 +1,171 @@ -#define MODEL_Root 0xA9 -#define MODEL_g40 0xA8 -#define MODEL_g36 0xA7 -#define MODEL_o154 0xA6 -#define MODEL_o153 0xA5 -#define MODEL_o152 0xA4 -#define MODEL_o151 0xA3 -#define MODEL_o150 0xA2 -#define MODEL_g43 0xA1 -#define MODEL_o174 0xA0 -#define MODEL_o173 0x9F -#define MODEL_g37 0x9E -#define MODEL_o160 0x9D -#define MODEL_o175 0x9C -#define MODEL_o166 0x9B -#define MODEL_o159 0x9A -#define MODEL_o161 0x99 -#define MODEL_o158 0x98 -#define MODEL_o157 0x97 -#define MODEL_g38 0x96 -#define MODEL_o162 0x95 -#define MODEL_g39 0x94 -#define MODEL_o164 0x93 -#define MODEL_o163 0x92 -#define MODEL_g1 0x91 -#define MODEL_g34 0x90 -#define MODEL_o156 0x8F -#define MODEL_o155 0x8E -#define MODEL_o138 0x8D -#define MODEL_o137 0x8C -#define MODEL_g33 0x8B -#define MODEL_g45 0x8A -#define MODEL_o176 0x89 -#define MODEL_g12 0x88 -#define MODEL_o112 0x87 -#define MODEL_o56 0x86 -#define MODEL_o54 0x85 -#define MODEL_o53 0x84 -#define MODEL_o135 0x83 -#define MODEL_o134 0x82 -#define MODEL_g35 0x81 -#define MODEL_o146 0x80 -#define MODEL_o145 0x7F -#define MODEL_o144 0x7E -#define MODEL_o143 0x7D -#define MODEL_o142 0x7C -#define MODEL_o141 0x7B -#define MODEL_g31 0x7A -#define MODEL_o126 0x79 -#define MODEL_o124 0x78 -#define MODEL_o125 0x77 -#define MODEL_o123 0x76 -#define MODEL_g32 0x75 -#define MODEL_o131 0x74 -#define MODEL_o132 0x73 -#define MODEL_o130 0x72 -#define MODEL_o129 0x71 -#define MODEL_o128 0x70 -#define MODEL_o127 0x6F -#define MODEL_g29 0x6E -#define MODEL_g22 0x6D -#define MODEL_g27 0x6C -#define MODEL_g28 0x6B -#define MODEL_o111 0x6A -#define MODEL_o110 0x69 -#define MODEL_o109 0x68 -#define MODEL_o108 0x67 -#define MODEL_o107 0x66 -#define MODEL_o106 0x65 -#define MODEL_o105 0x64 -#define MODEL_o104 0x63 -#define MODEL_o103 0x62 -#define MODEL_o102 0x61 -#define MODEL_o101 0x60 -#define MODEL_g26 0x5F -#define MODEL_o121 0x5E -#define MODEL_o120 0x5D -#define MODEL_o119 0x5C -#define MODEL_g25 0x5B -#define MODEL_o97 0x5A -#define MODEL_o96 0x59 -#define MODEL_g24 0x58 -#define MODEL_o95 0x57 -#define MODEL_o94 0x56 -#define MODEL_g23 0x55 -#define MODEL_o93 0x54 -#define MODEL_o92 0x53 -#define MODEL_o91 0x52 -#define MODEL_o90 0x51 -#define MODEL_o89 0x50 -#define MODEL_o88 0x4F -#define MODEL_o87 0x4E -#define MODEL_o86 0x4D -#define MODEL_g15 0x4C -#define MODEL_g20 0x4B -#define MODEL_g21 0x4A -#define MODEL_o85 0x49 -#define MODEL_o84 0x48 -#define MODEL_o83 0x47 -#define MODEL_o82 0x46 -#define MODEL_o81 0x45 -#define MODEL_o80 0x44 -#define MODEL_o79 0x43 -#define MODEL_o78 0x42 -#define MODEL_o77 0x41 -#define MODEL_o76 0x40 -#define MODEL_o75 0x3F -#define MODEL_g19 0x3E -#define MODEL_o117 0x3D -#define MODEL_o116 0x3C -#define MODEL_o118 0x3B -#define MODEL_g18 0x3A -#define MODEL_o71 0x39 -#define MODEL_o70 0x38 -#define MODEL_g17 0x37 -#define MODEL_o69 0x36 -#define MODEL_o68 0x35 -#define MODEL_g16 0x34 -#define MODEL_o67 0x33 -#define MODEL_o66 0x32 -#define MODEL_o65 0x31 -#define MODEL_o64 0x30 -#define MODEL_o63 0x2F -#define MODEL_o62 0x2E -#define MODEL_o61 0x2D -#define MODEL_o60 0x2C -#define MODEL_g3 0x2B -#define MODEL_g7 0x2A -#define MODEL_g10 0x29 -#define MODEL_o47 0x28 -#define MODEL_o46 0x27 -#define MODEL_o45 0x26 -#define MODEL_o44 0x25 -#define MODEL_o43 0x24 -#define MODEL_o42 0x23 -#define MODEL_o41 0x22 -#define MODEL_o40 0x21 -#define MODEL_o39 0x20 -#define MODEL_o38 0x1F -#define MODEL_o23 0x1E -#define MODEL_g9 0x1D -#define MODEL_o37 0x1C -#define MODEL_o36 0x1B -#define MODEL_o20 0x1A -#define MODEL_g8 0x19 -#define MODEL_o33 0x18 -#define MODEL_o34 0x17 -#define MODEL_g6 0x16 -#define MODEL_o32 0x15 -#define MODEL_o28 0x14 -#define MODEL_g5 0x13 -#define MODEL_o31 0x12 -#define MODEL_o24 0x11 -#define MODEL_o25 0x10 -#define MODEL_o27 0xF -#define MODEL_o22 0xE -#define MODEL_o19 0xD -#define MODEL_o21 0xC -#define MODEL_o18 0xB -#define MODEL_g11 0xA -#define MODEL_o52 0x9 -#define MODEL_o51 0x8 -#define MODEL_o50 0x7 -#define MODEL_o49 0x6 -#define MODEL_o48 0x5 -#define MODEL_g13 0x4 -#define MODEL_o57 0x3 -#define MODEL_g14 0x2 -#define MODEL_o59 0x1 -#define MODEL_o58 0x0 +#define MODEL_Root 0xA9 +#define MODEL_g40 0xA8 +#define MODEL_g36 0xA7 +#define MODEL_o154 0xA6 +#define MODEL_o153 0xA5 +#define MODEL_o152 0xA4 +#define MODEL_o151 0xA3 +#define MODEL_o150 0xA2 +#define MODEL_g43 0xA1 +#define MODEL_o174 0xA0 +#define MODEL_o173 0x9F +#define MODEL_g37 0x9E +#define MODEL_o160 0x9D +#define MODEL_o175 0x9C +#define MODEL_o166 0x9B +#define MODEL_o159 0x9A +#define MODEL_o161 0x99 +#define MODEL_o158 0x98 +#define MODEL_o157 0x97 +#define MODEL_g38 0x96 +#define MODEL_o162 0x95 +#define MODEL_g39 0x94 +#define MODEL_o164 0x93 +#define MODEL_o163 0x92 +#define MODEL_g1 0x91 +#define MODEL_g34 0x90 +#define MODEL_o156 0x8F +#define MODEL_o155 0x8E +#define MODEL_o138 0x8D +#define MODEL_o137 0x8C +#define MODEL_g33 0x8B +#define MODEL_g45 0x8A +#define MODEL_o176 0x89 +#define MODEL_g12 0x88 +#define MODEL_o112 0x87 +#define MODEL_o56 0x86 +#define MODEL_o54 0x85 +#define MODEL_o53 0x84 +#define MODEL_o135 0x83 +#define MODEL_o134 0x82 +#define MODEL_g35 0x81 +#define MODEL_o146 0x80 +#define MODEL_o145 0x7F +#define MODEL_o144 0x7E +#define MODEL_o143 0x7D +#define MODEL_o142 0x7C +#define MODEL_o141 0x7B +#define MODEL_g31 0x7A +#define MODEL_o126 0x79 +#define MODEL_o124 0x78 +#define MODEL_o125 0x77 +#define MODEL_o123 0x76 +#define MODEL_g32 0x75 +#define MODEL_o131 0x74 +#define MODEL_o132 0x73 +#define MODEL_o130 0x72 +#define MODEL_o129 0x71 +#define MODEL_o128 0x70 +#define MODEL_o127 0x6F +#define MODEL_g29 0x6E +#define MODEL_g22 0x6D +#define MODEL_g27 0x6C +#define MODEL_g28 0x6B +#define MODEL_o111 0x6A +#define MODEL_o110 0x69 +#define MODEL_o109 0x68 +#define MODEL_o108 0x67 +#define MODEL_o107 0x66 +#define MODEL_o106 0x65 +#define MODEL_o105 0x64 +#define MODEL_o104 0x63 +#define MODEL_o103 0x62 +#define MODEL_o102 0x61 +#define MODEL_o101 0x60 +#define MODEL_g26 0x5F +#define MODEL_o121 0x5E +#define MODEL_o120 0x5D +#define MODEL_o119 0x5C +#define MODEL_g25 0x5B +#define MODEL_o97 0x5A +#define MODEL_o96 0x59 +#define MODEL_g24 0x58 +#define MODEL_o95 0x57 +#define MODEL_o94 0x56 +#define MODEL_g23 0x55 +#define MODEL_o93 0x54 +#define MODEL_o92 0x53 +#define MODEL_o91 0x52 +#define MODEL_o90 0x51 +#define MODEL_o89 0x50 +#define MODEL_o88 0x4F +#define MODEL_o87 0x4E +#define MODEL_o86 0x4D +#define MODEL_g15 0x4C +#define MODEL_g20 0x4B +#define MODEL_g21 0x4A +#define MODEL_o85 0x49 +#define MODEL_o84 0x48 +#define MODEL_o83 0x47 +#define MODEL_o82 0x46 +#define MODEL_o81 0x45 +#define MODEL_o80 0x44 +#define MODEL_o79 0x43 +#define MODEL_o78 0x42 +#define MODEL_o77 0x41 +#define MODEL_o76 0x40 +#define MODEL_o75 0x3F +#define MODEL_g19 0x3E +#define MODEL_o117 0x3D +#define MODEL_o116 0x3C +#define MODEL_o118 0x3B +#define MODEL_g18 0x3A +#define MODEL_o71 0x39 +#define MODEL_o70 0x38 +#define MODEL_g17 0x37 +#define MODEL_o69 0x36 +#define MODEL_o68 0x35 +#define MODEL_g16 0x34 +#define MODEL_o67 0x33 +#define MODEL_o66 0x32 +#define MODEL_o65 0x31 +#define MODEL_o64 0x30 +#define MODEL_o63 0x2F +#define MODEL_o62 0x2E +#define MODEL_o61 0x2D +#define MODEL_o60 0x2C +#define MODEL_g3 0x2B +#define MODEL_g7 0x2A +#define MODEL_g10 0x29 +#define MODEL_o47 0x28 +#define MODEL_o46 0x27 +#define MODEL_o45 0x26 +#define MODEL_o44 0x25 +#define MODEL_o43 0x24 +#define MODEL_o42 0x23 +#define MODEL_o41 0x22 +#define MODEL_o40 0x21 +#define MODEL_o39 0x20 +#define MODEL_o38 0x1F +#define MODEL_o23 0x1E +#define MODEL_g9 0x1D +#define MODEL_o37 0x1C +#define MODEL_o36 0x1B +#define MODEL_o20 0x1A +#define MODEL_g8 0x19 +#define MODEL_o33 0x18 +#define MODEL_o34 0x17 +#define MODEL_g6 0x16 +#define MODEL_o32 0x15 +#define MODEL_o28 0x14 +#define MODEL_g5 0x13 +#define MODEL_o31 0x12 +#define MODEL_o24 0x11 +#define MODEL_o25 0x10 +#define MODEL_o27 0xF +#define MODEL_o22 0xE +#define MODEL_o19 0xD +#define MODEL_o21 0xC +#define MODEL_o18 0xB +#define MODEL_g11 0xA +#define MODEL_o52 0x9 +#define MODEL_o51 0x8 +#define MODEL_o50 0x7 +#define MODEL_o49 0x6 +#define MODEL_o48 0x5 +#define MODEL_g13 0x4 +#define MODEL_o57 0x3 +#define MODEL_g14 0x2 +#define MODEL_o59 0x1 +#define MODEL_o58 0x0 + diff --git a/include/mapfs/kkj_29_hit.h b/include/mapfs/kkj_29_hit.h index 03622085ba..a60c0ab2fa 100644 --- a/include/mapfs/kkj_29_hit.h +++ b/include/mapfs/kkj_29_hit.h @@ -1,34 +1,39 @@ -#define COLLIDER_Root 0x21 -#define COLLIDER_g1 0x20 -#define COLLIDER_g37 0x1F -#define COLLIDER_o166 0x1E -#define COLLIDER_o164 0x1D -#define COLLIDER_g35 0x1C -#define COLLIDER_o150 0x1B -#define COLLIDER_o146 0x1A -#define COLLIDER_o141 0x19 -#define COLLIDER_o125 0x18 -#define COLLIDER_o131 0x17 -#define COLLIDER_o127 0x16 -#define COLLIDER_g29 0x15 -#define COLLIDER_g40 0x14 -#define COLLIDER_o175 0x13 -#define COLLIDER_o174 0x12 -#define COLLIDER_o173 0x11 -#define COLLIDER_g39 0x10 -#define COLLIDER_o172 0xF -#define COLLIDER_o171 0xE -#define COLLIDER_o170 0xD -#define COLLIDER_g38 0xC -#define COLLIDER_o169 0xB -#define COLLIDER_o168 0xA -#define COLLIDER_o167 0x9 -#define COLLIDER_g11 0x8 -#define COLLIDER_o163 0x7 -#define COLLIDER_o162 0x6 -#define COLLIDER_o160 0x5 -#define COLLIDER_g14 0x4 -#define COLLIDER_o158 0x3 -#define COLLIDER_tte 0x2 -#define COLLIDER_deilite 0x1 -#define COLLIDER_deilie 0x0 +#define COLLIDER_Root 0x21 +#define COLLIDER_g1 0x20 +#define COLLIDER_g37 0x1F +#define COLLIDER_o166 0x1E +#define COLLIDER_o164 0x1D +#define COLLIDER_g35 0x1C +#define COLLIDER_o150 0x1B +#define COLLIDER_o146 0x1A +#define COLLIDER_o141 0x19 +#define COLLIDER_o125 0x18 +#define COLLIDER_o131 0x17 +#define COLLIDER_o127 0x16 +#define COLLIDER_g29 0x15 +#define COLLIDER_g40 0x14 +#define COLLIDER_o175 0x13 +#define COLLIDER_o174 0x12 +#define COLLIDER_o173 0x11 +#define COLLIDER_g39 0x10 +#define COLLIDER_o172 0xF +#define COLLIDER_o171 0xE +#define COLLIDER_o170 0xD +#define COLLIDER_g38 0xC +#define COLLIDER_o169 0xB +#define COLLIDER_o168 0xA +#define COLLIDER_o167 0x9 +#define COLLIDER_g11 0x8 +#define COLLIDER_o163 0x7 +#define COLLIDER_o162 0x6 +#define COLLIDER_o160 0x5 +#define COLLIDER_g14 0x4 +#define COLLIDER_o158 0x3 +#define COLLIDER_tte 0x2 +#define COLLIDER_deilite 0x1 +#define COLLIDER_deilie 0x0 + +#define ZONE_Root 0x2 +#define ZONE_g1 0x1 +#define ZONE_o6 0x0 + diff --git a/include/mapfs/kkj_29_shape.h b/include/mapfs/kkj_29_shape.h index 44d0007648..985605799c 100644 --- a/include/mapfs/kkj_29_shape.h +++ b/include/mapfs/kkj_29_shape.h @@ -1,147 +1,148 @@ -#define MODEL_Root 0x92 -#define MODEL_g1 0x91 -#define MODEL_g33 0x90 -#define MODEL_g12 0x8F -#define MODEL_o112 0x8E -#define MODEL_o56 0x8D -#define MODEL_o54 0x8C -#define MODEL_o53 0x8B -#define MODEL_g30 0x8A -#define MODEL_o140 0x89 -#define MODEL_o135 0x88 -#define MODEL_o134 0x87 -#define MODEL_g36 0x86 -#define MODEL_o154 0x85 -#define MODEL_o153 0x84 -#define MODEL_o152 0x83 -#define MODEL_o151 0x82 -#define MODEL_o150 0x81 -#define MODEL_g35 0x80 -#define MODEL_o146 0x7F -#define MODEL_o145 0x7E -#define MODEL_o144 0x7D -#define MODEL_o143 0x7C -#define MODEL_o142 0x7B -#define MODEL_o141 0x7A -#define MODEL_g31 0x79 -#define MODEL_o125 0x78 -#define MODEL_o123 0x77 -#define MODEL_g32 0x76 -#define MODEL_o131 0x75 -#define MODEL_o132 0x74 -#define MODEL_o130 0x73 -#define MODEL_o129 0x72 -#define MODEL_o127 0x71 -#define MODEL_g29 0x70 -#define MODEL_o157 0x6F -#define MODEL_o156 0x6E -#define MODEL_g22 0x6D -#define MODEL_g27 0x6C -#define MODEL_g28 0x6B -#define MODEL_o111 0x6A -#define MODEL_o110 0x69 -#define MODEL_o109 0x68 -#define MODEL_o108 0x67 -#define MODEL_o107 0x66 -#define MODEL_o106 0x65 -#define MODEL_o105 0x64 -#define MODEL_o104 0x63 -#define MODEL_o103 0x62 -#define MODEL_o102 0x61 -#define MODEL_o101 0x60 -#define MODEL_g26 0x5F -#define MODEL_o121 0x5E -#define MODEL_o120 0x5D -#define MODEL_o119 0x5C -#define MODEL_g25 0x5B -#define MODEL_o97 0x5A -#define MODEL_o96 0x59 -#define MODEL_g24 0x58 -#define MODEL_o95 0x57 -#define MODEL_o94 0x56 -#define MODEL_g23 0x55 -#define MODEL_o93 0x54 -#define MODEL_o92 0x53 -#define MODEL_o91 0x52 -#define MODEL_o90 0x51 -#define MODEL_o89 0x50 -#define MODEL_o88 0x4F -#define MODEL_o87 0x4E -#define MODEL_o86 0x4D -#define MODEL_g15 0x4C -#define MODEL_g20 0x4B -#define MODEL_g21 0x4A -#define MODEL_o85 0x49 -#define MODEL_o84 0x48 -#define MODEL_o83 0x47 -#define MODEL_o82 0x46 -#define MODEL_o81 0x45 -#define MODEL_o80 0x44 -#define MODEL_o79 0x43 -#define MODEL_o78 0x42 -#define MODEL_o77 0x41 -#define MODEL_o76 0x40 -#define MODEL_o75 0x3F -#define MODEL_g19 0x3E -#define MODEL_o117 0x3D -#define MODEL_o116 0x3C -#define MODEL_o118 0x3B -#define MODEL_g18 0x3A -#define MODEL_o71 0x39 -#define MODEL_o70 0x38 -#define MODEL_g17 0x37 -#define MODEL_o69 0x36 -#define MODEL_o68 0x35 -#define MODEL_g16 0x34 -#define MODEL_o67 0x33 -#define MODEL_o66 0x32 -#define MODEL_o65 0x31 -#define MODEL_o64 0x30 -#define MODEL_o63 0x2F -#define MODEL_o62 0x2E -#define MODEL_o61 0x2D -#define MODEL_o60 0x2C -#define MODEL_g3 0x2B -#define MODEL_g7 0x2A -#define MODEL_g10 0x29 -#define MODEL_o47 0x28 -#define MODEL_o46 0x27 -#define MODEL_o45 0x26 -#define MODEL_o44 0x25 -#define MODEL_o43 0x24 -#define MODEL_o42 0x23 -#define MODEL_o41 0x22 -#define MODEL_o40 0x21 -#define MODEL_o39 0x20 -#define MODEL_o38 0x1F -#define MODEL_o23 0x1E -#define MODEL_g9 0x1D -#define MODEL_o37 0x1C -#define MODEL_o36 0x1B -#define MODEL_o20 0x1A -#define MODEL_g8 0x19 -#define MODEL_o33 0x18 -#define MODEL_o34 0x17 -#define MODEL_g6 0x16 -#define MODEL_o32 0x15 -#define MODEL_o28 0x14 -#define MODEL_g5 0x13 -#define MODEL_o31 0x12 -#define MODEL_o24 0x11 -#define MODEL_o25 0x10 -#define MODEL_o27 0xF -#define MODEL_o22 0xE -#define MODEL_o19 0xD -#define MODEL_o21 0xC -#define MODEL_o18 0xB -#define MODEL_g11 0xA -#define MODEL_o52 0x9 -#define MODEL_o51 0x8 -#define MODEL_o50 0x7 -#define MODEL_o49 0x6 -#define MODEL_o48 0x5 -#define MODEL_g13 0x4 -#define MODEL_o57 0x3 -#define MODEL_g14 0x2 -#define MODEL_o59 0x1 -#define MODEL_o58 0x0 +#define MODEL_Root 0x92 +#define MODEL_g1 0x91 +#define MODEL_g33 0x90 +#define MODEL_g12 0x8F +#define MODEL_o112 0x8E +#define MODEL_o56 0x8D +#define MODEL_o54 0x8C +#define MODEL_o53 0x8B +#define MODEL_g30 0x8A +#define MODEL_o140 0x89 +#define MODEL_o135 0x88 +#define MODEL_o134 0x87 +#define MODEL_g36 0x86 +#define MODEL_o154 0x85 +#define MODEL_o153 0x84 +#define MODEL_o152 0x83 +#define MODEL_o151 0x82 +#define MODEL_o150 0x81 +#define MODEL_g35 0x80 +#define MODEL_o146 0x7F +#define MODEL_o145 0x7E +#define MODEL_o144 0x7D +#define MODEL_o143 0x7C +#define MODEL_o142 0x7B +#define MODEL_o141 0x7A +#define MODEL_g31 0x79 +#define MODEL_o125 0x78 +#define MODEL_o123 0x77 +#define MODEL_g32 0x76 +#define MODEL_o131 0x75 +#define MODEL_o132 0x74 +#define MODEL_o130 0x73 +#define MODEL_o129 0x72 +#define MODEL_o127 0x71 +#define MODEL_g29 0x70 +#define MODEL_o157 0x6F +#define MODEL_o156 0x6E +#define MODEL_g22 0x6D +#define MODEL_g27 0x6C +#define MODEL_g28 0x6B +#define MODEL_o111 0x6A +#define MODEL_o110 0x69 +#define MODEL_o109 0x68 +#define MODEL_o108 0x67 +#define MODEL_o107 0x66 +#define MODEL_o106 0x65 +#define MODEL_o105 0x64 +#define MODEL_o104 0x63 +#define MODEL_o103 0x62 +#define MODEL_o102 0x61 +#define MODEL_o101 0x60 +#define MODEL_g26 0x5F +#define MODEL_o121 0x5E +#define MODEL_o120 0x5D +#define MODEL_o119 0x5C +#define MODEL_g25 0x5B +#define MODEL_o97 0x5A +#define MODEL_o96 0x59 +#define MODEL_g24 0x58 +#define MODEL_o95 0x57 +#define MODEL_o94 0x56 +#define MODEL_g23 0x55 +#define MODEL_o93 0x54 +#define MODEL_o92 0x53 +#define MODEL_o91 0x52 +#define MODEL_o90 0x51 +#define MODEL_o89 0x50 +#define MODEL_o88 0x4F +#define MODEL_o87 0x4E +#define MODEL_o86 0x4D +#define MODEL_g15 0x4C +#define MODEL_g20 0x4B +#define MODEL_g21 0x4A +#define MODEL_o85 0x49 +#define MODEL_o84 0x48 +#define MODEL_o83 0x47 +#define MODEL_o82 0x46 +#define MODEL_o81 0x45 +#define MODEL_o80 0x44 +#define MODEL_o79 0x43 +#define MODEL_o78 0x42 +#define MODEL_o77 0x41 +#define MODEL_o76 0x40 +#define MODEL_o75 0x3F +#define MODEL_g19 0x3E +#define MODEL_o117 0x3D +#define MODEL_o116 0x3C +#define MODEL_o118 0x3B +#define MODEL_g18 0x3A +#define MODEL_o71 0x39 +#define MODEL_o70 0x38 +#define MODEL_g17 0x37 +#define MODEL_o69 0x36 +#define MODEL_o68 0x35 +#define MODEL_g16 0x34 +#define MODEL_o67 0x33 +#define MODEL_o66 0x32 +#define MODEL_o65 0x31 +#define MODEL_o64 0x30 +#define MODEL_o63 0x2F +#define MODEL_o62 0x2E +#define MODEL_o61 0x2D +#define MODEL_o60 0x2C +#define MODEL_g3 0x2B +#define MODEL_g7 0x2A +#define MODEL_g10 0x29 +#define MODEL_o47 0x28 +#define MODEL_o46 0x27 +#define MODEL_o45 0x26 +#define MODEL_o44 0x25 +#define MODEL_o43 0x24 +#define MODEL_o42 0x23 +#define MODEL_o41 0x22 +#define MODEL_o40 0x21 +#define MODEL_o39 0x20 +#define MODEL_o38 0x1F +#define MODEL_o23 0x1E +#define MODEL_g9 0x1D +#define MODEL_o37 0x1C +#define MODEL_o36 0x1B +#define MODEL_o20 0x1A +#define MODEL_g8 0x19 +#define MODEL_o33 0x18 +#define MODEL_o34 0x17 +#define MODEL_g6 0x16 +#define MODEL_o32 0x15 +#define MODEL_o28 0x14 +#define MODEL_g5 0x13 +#define MODEL_o31 0x12 +#define MODEL_o24 0x11 +#define MODEL_o25 0x10 +#define MODEL_o27 0xF +#define MODEL_o22 0xE +#define MODEL_o19 0xD +#define MODEL_o21 0xC +#define MODEL_o18 0xB +#define MODEL_g11 0xA +#define MODEL_o52 0x9 +#define MODEL_o51 0x8 +#define MODEL_o50 0x7 +#define MODEL_o49 0x6 +#define MODEL_o48 0x5 +#define MODEL_g13 0x4 +#define MODEL_o57 0x3 +#define MODEL_g14 0x2 +#define MODEL_o59 0x1 +#define MODEL_o58 0x0 + diff --git a/include/mapfs/kkj_bt01_hit.h b/include/mapfs/kkj_bt01_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/kkj_bt01_hit.h +++ b/include/mapfs/kkj_bt01_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/kkj_bt01_shape.h b/include/mapfs/kkj_bt01_shape.h index fdcde523db..e0090cdeae 100644 --- a/include/mapfs/kkj_bt01_shape.h +++ b/include/mapfs/kkj_bt01_shape.h @@ -1,29 +1,30 @@ -#define MODEL_Root 0x1C -#define MODEL_dai 0x1B -#define MODEL_g91 0x1A -#define MODEL_hasira 0x19 -#define MODEL_hana 0x18 -#define MODEL_ha1 0x17 -#define MODEL_ha2 0x16 -#define MODEL_saku 0x15 -#define MODEL_waki1_2 0x14 -#define MODEL_hi 0x13 -#define MODEL_hkr3 0x12 -#define MODEL_o414 0x11 -#define MODEL_o406 0x10 -#define MODEL_hkr1 0xF -#define MODEL_yuka1 0xE -#define MODEL_yuka2 0xD -#define MODEL_g49 0xC -#define MODEL_waku2 0xB -#define MODEL_syokudai 0xA -#define MODEL_maku 0x9 -#define MODEL_daiza2 0x8 -#define MODEL_daiz1 0x7 -#define MODEL_hasira2 0x6 -#define MODEL_hasira1 0x5 -#define MODEL_waku_2 0x4 -#define MODEL_garasu 0x3 -#define MODEL_sann 0x2 -#define MODEL_waku 0x1 -#define MODEL_kabe1 0x0 +#define MODEL_Root 0x1C +#define MODEL_dai 0x1B +#define MODEL_g91 0x1A +#define MODEL_hasira 0x19 +#define MODEL_hana 0x18 +#define MODEL_ha1 0x17 +#define MODEL_ha2 0x16 +#define MODEL_saku 0x15 +#define MODEL_waki1_2 0x14 +#define MODEL_hi 0x13 +#define MODEL_hkr3 0x12 +#define MODEL_o414 0x11 +#define MODEL_o406 0x10 +#define MODEL_hkr1 0xF +#define MODEL_yuka1 0xE +#define MODEL_yuka2 0xD +#define MODEL_g49 0xC +#define MODEL_waku2 0xB +#define MODEL_syokudai 0xA +#define MODEL_maku 0x9 +#define MODEL_daiza2 0x8 +#define MODEL_daiz1 0x7 +#define MODEL_hasira2 0x6 +#define MODEL_hasira1 0x5 +#define MODEL_waku_2 0x4 +#define MODEL_garasu 0x3 +#define MODEL_sann 0x2 +#define MODEL_waku 0x1 +#define MODEL_kabe1 0x0 + diff --git a/include/mapfs/kkj_bt02_hit.h b/include/mapfs/kkj_bt02_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/kkj_bt02_hit.h +++ b/include/mapfs/kkj_bt02_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/kkj_bt02_shape.h b/include/mapfs/kkj_bt02_shape.h index 87a30b8339..98a74af337 100644 --- a/include/mapfs/kkj_bt02_shape.h +++ b/include/mapfs/kkj_bt02_shape.h @@ -1,13 +1,14 @@ -#define MODEL_Root 0xC -#define MODEL_dai 0xB -#define MODEL_futi4 0xA -#define MODEL_futi3 0x9 -#define MODEL_waki1_2 0x8 -#define MODEL_yuka1 0x7 -#define MODEL_g49 0x6 -#define MODEL_o498 0x5 -#define MODEL_waku2 0x4 -#define MODEL_yuka2 0x3 -#define MODEL_waku_2 0x2 -#define MODEL_futi2 0x1 -#define MODEL_futi1 0x0 +#define MODEL_Root 0xC +#define MODEL_dai 0xB +#define MODEL_futi4 0xA +#define MODEL_futi3 0x9 +#define MODEL_waki1_2 0x8 +#define MODEL_yuka1 0x7 +#define MODEL_g49 0x6 +#define MODEL_o498 0x5 +#define MODEL_waku2 0x4 +#define MODEL_yuka2 0x3 +#define MODEL_waku_2 0x2 +#define MODEL_futi2 0x1 +#define MODEL_futi1 0x0 + diff --git a/include/mapfs/kmr_00_hit.h b/include/mapfs/kmr_00_hit.h index 65dde7a8dd..2560b09631 100644 --- a/include/mapfs/kmr_00_hit.h +++ b/include/mapfs/kmr_00_hit.h @@ -1,25 +1,32 @@ -#define COLLIDER_Root 0x18 -#define COLLIDER_g190 0x17 -#define COLLIDER_s_5 0x16 -#define COLLIDER_o360 0x15 -#define COLLIDER_o260 0x14 -#define COLLIDER_o239 0x13 -#define COLLIDER_s_4 0x12 -#define COLLIDER_o270 0x11 -#define COLLIDER_oku_4 0x10 -#define COLLIDER_o241 0xF -#define COLLIDER_o458 0xE -#define COLLIDER_s_3 0xD -#define COLLIDER_o261 0xC -#define COLLIDER_o271 0xB -#define COLLIDER_o242 0xA -#define COLLIDER_s_1 0x9 -#define COLLIDER_o435 0x8 -#define COLLIDER_o434 0x7 -#define COLLIDER_o433 0x6 -#define COLLIDER_o574 0x5 -#define COLLIDER_g122 0x4 -#define COLLIDER_o565 0x3 -#define COLLIDER_d1 0x2 -#define COLLIDER_deilit1 0x1 -#define COLLIDER_deili1 0x0 +#define COLLIDER_Root 0x18 +#define COLLIDER_g190 0x17 +#define COLLIDER_s_5 0x16 +#define COLLIDER_o360 0x15 +#define COLLIDER_o260 0x14 +#define COLLIDER_o239 0x13 +#define COLLIDER_s_4 0x12 +#define COLLIDER_o270 0x11 +#define COLLIDER_oku_4 0x10 +#define COLLIDER_o241 0xF +#define COLLIDER_o458 0xE +#define COLLIDER_s_3 0xD +#define COLLIDER_o261 0xC +#define COLLIDER_o271 0xB +#define COLLIDER_o242 0xA +#define COLLIDER_s_1 0x9 +#define COLLIDER_o435 0x8 +#define COLLIDER_o434 0x7 +#define COLLIDER_o433 0x6 +#define COLLIDER_o574 0x5 +#define COLLIDER_g122 0x4 +#define COLLIDER_o565 0x3 +#define COLLIDER_d1 0x2 +#define COLLIDER_deilit1 0x1 +#define COLLIDER_deili1 0x0 + +#define ZONE_Root 0x4 +#define ZONE_Default 0x3 +#define ZONE_o301 0x2 +#define ZONE_berongo 0x1 +#define ZONE_o299 0x0 + diff --git a/include/mapfs/kmr_00_shape.h b/include/mapfs/kmr_00_shape.h index a4b7a3d356..082800a489 100644 --- a/include/mapfs/kmr_00_shape.h +++ b/include/mapfs/kmr_00_shape.h @@ -1,80 +1,81 @@ -#define MODEL_Root 0x4F -#define MODEL_maru 0x4E -#define MODEL_m4 0x4D -#define MODEL_o323 0x4C -#define MODEL_m3 0x4B -#define MODEL_o322 0x4A -#define MODEL_m2 0x49 -#define MODEL_o266 0x48 -#define MODEL_m1 0x47 -#define MODEL_o267 0x46 -#define MODEL_move 0x45 -#define MODEL_ki_2 0x44 -#define MODEL_ha2_3 0x43 -#define MODEL_ha2_2 0x42 -#define MODEL_ha2_1 0x41 -#define MODEL_moku2 0x40 -#define MODEL_ki_1 0x3F -#define MODEL_ha2 0x3E -#define MODEL_ha1 0x3D -#define MODEL_moku1 0x3C -#define MODEL_reef_p2 0x3B -#define MODEL_reef_2 0x3A -#define MODEL_reef_p1 0x39 -#define MODEL_reef_1 0x38 -#define MODEL_reef_l2 0x37 -#define MODEL_reef_4 0x36 -#define MODEL_reef_l1 0x35 -#define MODEL_reef_3 0x34 -#define MODEL_oll 0x33 -#define MODEL_g160 0x32 -#define MODEL_37_2 0x31 -#define MODEL_37 0x30 -#define MODEL_o424 0x2F -#define MODEL_19 0x2E -#define MODEL_w4 0x2D -#define MODEL_35 0x2C -#define MODEL_34 0x2B -#define MODEL_33 0x2A -#define MODEL_32 0x29 -#define MODEL_w3 0x28 -#define MODEL_30 0x27 -#define MODEL_29 0x26 -#define MODEL_27 0x25 -#define MODEL_o482 0x24 -#define MODEL_23 0x23 -#define MODEL_15 0x22 -#define MODEL_jimen 0x21 -#define MODEL_28 0x20 -#define MODEL_17 0x1F -#define MODEL_16 0x1E -#define MODEL_12 0x1D -#define MODEL_11 0x1C -#define MODEL_13 0x1B -#define MODEL_10 0x1A -#define MODEL_9 0x19 -#define MODEL_8 0x18 -#define MODEL_7 0x17 -#define MODEL_o478 0x16 -#define MODEL_6 0x15 -#define MODEL_5 0x14 -#define MODEL_4_1 0x13 -#define MODEL_4 0x12 -#define MODEL_3 0x11 -#define MODEL_o395_1 0x10 -#define MODEL_o395 0xF -#define MODEL_2_1 0xE -#define MODEL_2 0xD -#define MODEL_1 0xC -#define MODEL_o474 0xB -#define MODEL_g177 0xA -#define MODEL_o467 0x9 -#define MODEL_Default 0x8 -#define MODEL_o470 0x7 -#define MODEL_o469 0x6 -#define MODEL_o481 0x5 -#define MODEL_o480 0x4 -#define MODEL_jime 0x3 -#define MODEL_ji_3 0x2 -#define MODEL_ji_2 0x1 -#define MODEL_ji_1 0x0 +#define MODEL_Root 0x4F +#define MODEL_maru 0x4E +#define MODEL_m4 0x4D +#define MODEL_o323 0x4C +#define MODEL_m3 0x4B +#define MODEL_o322 0x4A +#define MODEL_m2 0x49 +#define MODEL_o266 0x48 +#define MODEL_m1 0x47 +#define MODEL_o267 0x46 +#define MODEL_move 0x45 +#define MODEL_ki_2 0x44 +#define MODEL_ha2_3 0x43 +#define MODEL_ha2_2 0x42 +#define MODEL_ha2_1 0x41 +#define MODEL_moku2 0x40 +#define MODEL_ki_1 0x3F +#define MODEL_ha2 0x3E +#define MODEL_ha1 0x3D +#define MODEL_moku1 0x3C +#define MODEL_reef_p2 0x3B +#define MODEL_reef_2 0x3A +#define MODEL_reef_p1 0x39 +#define MODEL_reef_1 0x38 +#define MODEL_reef_l2 0x37 +#define MODEL_reef_4 0x36 +#define MODEL_reef_l1 0x35 +#define MODEL_reef_3 0x34 +#define MODEL_oll 0x33 +#define MODEL_g160 0x32 +#define MODEL_37_2 0x31 +#define MODEL_37 0x30 +#define MODEL_o424 0x2F +#define MODEL_19 0x2E +#define MODEL_w4 0x2D +#define MODEL_35 0x2C +#define MODEL_34 0x2B +#define MODEL_33 0x2A +#define MODEL_32 0x29 +#define MODEL_w3 0x28 +#define MODEL_30 0x27 +#define MODEL_29 0x26 +#define MODEL_27 0x25 +#define MODEL_o482 0x24 +#define MODEL_23 0x23 +#define MODEL_15 0x22 +#define MODEL_jimen 0x21 +#define MODEL_28 0x20 +#define MODEL_17 0x1F +#define MODEL_16 0x1E +#define MODEL_12 0x1D +#define MODEL_11 0x1C +#define MODEL_13 0x1B +#define MODEL_10 0x1A +#define MODEL_9 0x19 +#define MODEL_8 0x18 +#define MODEL_7 0x17 +#define MODEL_o478 0x16 +#define MODEL_6 0x15 +#define MODEL_5 0x14 +#define MODEL_4_1 0x13 +#define MODEL_4 0x12 +#define MODEL_3 0x11 +#define MODEL_o395_1 0x10 +#define MODEL_o395 0xF +#define MODEL_2_1 0xE +#define MODEL_2 0xD +#define MODEL_1 0xC +#define MODEL_o474 0xB +#define MODEL_g177 0xA +#define MODEL_o467 0x9 +#define MODEL_Default 0x8 +#define MODEL_o470 0x7 +#define MODEL_o469 0x6 +#define MODEL_o481 0x5 +#define MODEL_o480 0x4 +#define MODEL_jime 0x3 +#define MODEL_ji_3 0x2 +#define MODEL_ji_2 0x1 +#define MODEL_ji_1 0x0 + diff --git a/include/mapfs/kmr_02_hit.h b/include/mapfs/kmr_02_hit.h index 79a9ec7d7d..24fba0e287 100644 --- a/include/mapfs/kmr_02_hit.h +++ b/include/mapfs/kmr_02_hit.h @@ -1,107 +1,124 @@ -#define COLLIDER_Root 0x6A -#define COLLIDER_hi 0x69 -#define COLLIDER_o757 0x68 -#define COLLIDER_g264 0x67 -#define COLLIDER_o723 0x66 -#define COLLIDER_o482 0x65 -#define COLLIDER_o599 0x64 -#define COLLIDER_Default 0x63 -#define COLLIDER_o772 0x62 -#define COLLIDER_o771 0x61 -#define COLLIDER_s_6 0x60 -#define COLLIDER_o722 0x5F -#define COLLIDER_o600 0x5E -#define COLLIDER_o601 0x5D -#define COLLIDER_s_8 0x5C -#define COLLIDER_o764 0x5B -#define COLLIDER_o408 0x5A -#define COLLIDER_o414 0x59 -#define COLLIDER_s_7 0x58 -#define COLLIDER_o407 0x57 -#define COLLIDER_s_5 0x56 -#define COLLIDER_o718 0x55 -#define COLLIDER_o561 0x54 -#define COLLIDER_noko2 0x53 -#define COLLIDER_o404 0x52 -#define COLLIDER_noko1 0x51 -#define COLLIDER_s_4 0x50 -#define COLLIDER_noko5 0x4F -#define COLLIDER_o403 0x4E -#define COLLIDER_o411 0x4D -#define COLLIDER_o357 0x4C -#define COLLIDER_s_3 0x4B -#define COLLIDER_o402 0x4A -#define COLLIDER_noko3 0x49 -#define COLLIDER_o356 0x48 -#define COLLIDER_s_2 0x47 -#define COLLIDER_o719 0x46 -#define COLLIDER_o604 0x45 -#define COLLIDER_o712 0x44 -#define COLLIDER_o401 0x43 -#define COLLIDER_noko4 0x42 -#define COLLIDER_s_1 0x41 -#define COLLIDER_o409 0x40 -#define COLLIDER_o608 0x3F -#define COLLIDER_o611 0x3E -#define COLLIDER_o400 0x3D -#define COLLIDER_g97 0x3C -#define COLLIDER_o273 0x3B -#define COLLIDER_o271 0x3A -#define COLLIDER_o397 0x39 -#define COLLIDER_o420 0x38 -#define COLLIDER_o423 0x37 -#define COLLIDER_o767 0x36 -#define COLLIDER_g187 0x35 -#define COLLIDER_o487 0x34 -#define COLLIDER_o478 0x33 -#define COLLIDER_g244 0x32 -#define COLLIDER_o645 0x31 -#define COLLIDER_o641 0x30 -#define COLLIDER_g198 0x2F -#define COLLIDER_o504 0x2E -#define COLLIDER_g241 0x2D -#define COLLIDER_o618 0x2C -#define COLLIDER_g222 0x2B -#define COLLIDER_o570 0x2A -#define COLLIDER_monohashi 0x29 -#define COLLIDER_o549 0x28 -#define COLLIDER_o547 0x27 -#define COLLIDER_o542 0x26 -#define COLLIDER_o625 0x25 -#define COLLIDER_naka 0x24 -#define COLLIDER_o761 0x23 -#define COLLIDER_o619 0x22 -#define COLLIDER_o432 0x21 -#define COLLIDER_o453 0x20 -#define COLLIDER_o435 0x1F -#define COLLIDER_o436 0x1E -#define COLLIDER_inside 0x1D -#define COLLIDER_heater 0x1C -#define COLLIDER_kabe_nenrin 0x1B -#define COLLIDER_g92 0x1A -#define COLLIDER_o724 0x19 -#define COLLIDER_o147 0x18 -#define COLLIDER_o617 0x17 -#define COLLIDER_mm2 0x16 -#define COLLIDER_mm1 0x15 -#define COLLIDER_tt2 0x14 -#define COLLIDER_tt1 0x13 -#define COLLIDER_deilit8 0x12 -#define COLLIDER_deilit7 0x11 -#define COLLIDER_deilit6 0x10 -#define COLLIDER_deilit5 0xF -#define COLLIDER_deilit4_1 0xE -#define COLLIDER_deilit4 0xD -#define COLLIDER_deilit3 0xC -#define COLLIDER_deili3 0xB -#define COLLIDER_deilit2 0xA -#define COLLIDER_deili2 0x9 -#define COLLIDER_deilit1 0x8 -#define COLLIDER_deili1 0x7 -#define COLLIDER_d3 0x6 -#define COLLIDER_d2 0x5 -#define COLLIDER_d1 0x4 -#define COLLIDER_g247 0x3 -#define COLLIDER_o652 0x2 -#define COLLIDER_o651 0x1 -#define COLLIDER_o649 0x0 +#define COLLIDER_Root 0x6A +#define COLLIDER_hi 0x69 +#define COLLIDER_o757 0x68 +#define COLLIDER_g264 0x67 +#define COLLIDER_o723 0x66 +#define COLLIDER_o482 0x65 +#define COLLIDER_o599 0x64 +#define COLLIDER_Default 0x63 +#define COLLIDER_o772 0x62 +#define COLLIDER_o771 0x61 +#define COLLIDER_s_6 0x60 +#define COLLIDER_o722 0x5F +#define COLLIDER_o600 0x5E +#define COLLIDER_o601 0x5D +#define COLLIDER_s_8 0x5C +#define COLLIDER_o764 0x5B +#define COLLIDER_o408 0x5A +#define COLLIDER_o414 0x59 +#define COLLIDER_s_7 0x58 +#define COLLIDER_o407 0x57 +#define COLLIDER_s_5 0x56 +#define COLLIDER_o718 0x55 +#define COLLIDER_o561 0x54 +#define COLLIDER_noko2 0x53 +#define COLLIDER_o404 0x52 +#define COLLIDER_noko1 0x51 +#define COLLIDER_s_4 0x50 +#define COLLIDER_noko5 0x4F +#define COLLIDER_o403 0x4E +#define COLLIDER_o411 0x4D +#define COLLIDER_o357 0x4C +#define COLLIDER_s_3 0x4B +#define COLLIDER_o402 0x4A +#define COLLIDER_noko3 0x49 +#define COLLIDER_o356 0x48 +#define COLLIDER_s_2 0x47 +#define COLLIDER_o719 0x46 +#define COLLIDER_o604 0x45 +#define COLLIDER_o712 0x44 +#define COLLIDER_o401 0x43 +#define COLLIDER_noko4 0x42 +#define COLLIDER_s_1 0x41 +#define COLLIDER_o409 0x40 +#define COLLIDER_o608 0x3F +#define COLLIDER_o611 0x3E +#define COLLIDER_o400 0x3D +#define COLLIDER_g97 0x3C +#define COLLIDER_o273 0x3B +#define COLLIDER_o271 0x3A +#define COLLIDER_o397 0x39 +#define COLLIDER_o420 0x38 +#define COLLIDER_o423 0x37 +#define COLLIDER_o767 0x36 +#define COLLIDER_g187 0x35 +#define COLLIDER_o487 0x34 +#define COLLIDER_o478 0x33 +#define COLLIDER_g244 0x32 +#define COLLIDER_o645 0x31 +#define COLLIDER_o641 0x30 +#define COLLIDER_g198 0x2F +#define COLLIDER_o504 0x2E +#define COLLIDER_g241 0x2D +#define COLLIDER_o618 0x2C +#define COLLIDER_g222 0x2B +#define COLLIDER_o570 0x2A +#define COLLIDER_monohashi 0x29 +#define COLLIDER_o549 0x28 +#define COLLIDER_o547 0x27 +#define COLLIDER_o542 0x26 +#define COLLIDER_o625 0x25 +#define COLLIDER_naka 0x24 +#define COLLIDER_o761 0x23 +#define COLLIDER_o619 0x22 +#define COLLIDER_o432 0x21 +#define COLLIDER_o453 0x20 +#define COLLIDER_o435 0x1F +#define COLLIDER_o436 0x1E +#define COLLIDER_inside 0x1D +#define COLLIDER_heater 0x1C +#define COLLIDER_kabe_nenrin 0x1B +#define COLLIDER_g92 0x1A +#define COLLIDER_o724 0x19 +#define COLLIDER_o147 0x18 +#define COLLIDER_o617 0x17 +#define COLLIDER_mm2 0x16 +#define COLLIDER_mm1 0x15 +#define COLLIDER_tt2 0x14 +#define COLLIDER_tt1 0x13 +#define COLLIDER_deilit8 0x12 +#define COLLIDER_deilit7 0x11 +#define COLLIDER_deilit6 0x10 +#define COLLIDER_deilit5 0xF +#define COLLIDER_deilit4_1 0xE +#define COLLIDER_deilit4 0xD +#define COLLIDER_deilit3 0xC +#define COLLIDER_deili3 0xB +#define COLLIDER_deilit2 0xA +#define COLLIDER_deili2 0x9 +#define COLLIDER_deilit1 0x8 +#define COLLIDER_deili1 0x7 +#define COLLIDER_d3 0x6 +#define COLLIDER_d2 0x5 +#define COLLIDER_d1 0x4 +#define COLLIDER_g247 0x3 +#define COLLIDER_o652 0x2 +#define COLLIDER_o651 0x1 +#define COLLIDER_o649 0x0 + +#define ZONE_Root 0xE +#define ZONE_g130 0xD +#define ZONE_camstop_w 0xC +#define ZONE_camstop_se 0xB +#define ZONE_camstop_sw 0xA +#define ZONE_g125 0x9 +#define ZONE_o314 0x8 +#define ZONE_o313 0x7 +#define ZONE_kuri 0x6 +#define ZONE_g120 0x5 +#define ZONE_ura 0x4 +#define ZONE_g119 0x3 +#define ZONE_kino 0x2 +#define ZONE_g122 0x1 +#define ZONE_o308 0x0 + diff --git a/include/mapfs/kmr_02_shape.h b/include/mapfs/kmr_02_shape.h index 23faf38e39..a52c31ae6f 100644 --- a/include/mapfs/kmr_02_shape.h +++ b/include/mapfs/kmr_02_shape.h @@ -1,196 +1,197 @@ -#define MODEL_Root 0xC3 -#define MODEL_mom2 0xC2 -#define MODEL_4 0xC1 -#define MODEL_o491 0xC0 -#define MODEL_g196 0xBF -#define MODEL_o489 0xBE -#define MODEL_g197 0xBD -#define MODEL_o490 0xBC -#define MODEL_3 0xBB -#define MODEL_o445 0xBA -#define MODEL_o444 0xB9 -#define MODEL_2 0xB8 -#define MODEL_2_3 0xB7 -#define MODEL_2_2 0xB6 -#define MODEL_2_1 0xB5 -#define MODEL_1 0xB4 -#define MODEL_1_3 0xB3 -#define MODEL_1_2 0xB2 -#define MODEL_1_1 0xB1 -#define MODEL_g178 0xB0 -#define MODEL_stage 0xAF -#define MODEL_mon 0xAE -#define MODEL_mon_bou 0xAD -#define MODEL_m_b 0xAC -#define MODEL_mon_door 0xAB -#define MODEL_m_d_2 0xAA -#define MODEL_m_d2 0xA9 -#define MODEL_m_d_1 0xA8 -#define MODEL_m_d1 0xA7 -#define MODEL_k_1 0xA6 -#define MODEL_g118 0xA5 -#define MODEL_kanban 0xA4 -#define MODEL_kusaeda_1 0xA3 -#define MODEL_o246 0xA2 -#define MODEL_o245 0xA1 -#define MODEL_o244 0xA0 -#define MODEL_o243 0x9F -#define MODEL_o242 0x9E -#define MODEL_o238 0x9D -#define MODEL_kinopi 0x9C -#define MODEL_k_door 0x9B -#define MODEL_g127 0x9A -#define MODEL_o275 0x99 -#define MODEL_k_kabe 0x98 -#define MODEL_g129 0x97 -#define MODEL_o272 0x96 -#define MODEL_g116 0x95 -#define MODEL_k_k_3 0x94 -#define MODEL_g115 0x93 -#define MODEL_k_k_2 0x92 -#define MODEL_g114 0x91 -#define MODEL_k_k_1 0x90 -#define MODEL_g141 0x8F -#define MODEL_o320 0x8E -#define MODEL_kino_in 0x8D -#define MODEL_o561 0x8C -#define MODEL_o480 0x8B -#define MODEL_o479 0x8A -#define MODEL_o477 0x89 -#define MODEL_o425 0x88 -#define MODEL_o339 0x87 -#define MODEL_kb_4 0x86 -#define MODEL_kb_3 0x85 -#define MODEL_kb_2 0x84 -#define MODEL_kb_1 0x83 -#define MODEL_ky_2 0x82 -#define MODEL_ky_1 0x81 -#define MODEL_o422 0x80 -#define MODEL_o424 0x7F -#define MODEL_kino_out 0x7E -#define MODEL_o250 0x7D -#define MODEL_neko 0x7C -#define MODEL_kbe 0x7B -#define MODEL_yuka 0x7A -#define MODEL_ke 0x79 -#define MODEL_kino_mon 0x78 -#define MODEL_o357 0x77 -#define MODEL_o358 0x76 -#define MODEL_o359 0x75 -#define MODEL_off 0x74 -#define MODEL_o565 0x73 -#define MODEL_o564 0x72 -#define MODEL_o268 0x71 -#define MODEL_kaidan 0x70 -#define MODEL_kuribou_house 0x6F -#define MODEL_monohoshi 0x6E -#define MODEL_o352 0x6D -#define MODEL_o375 0x6C -#define MODEL_o369 0x6B -#define MODEL_o350 0x6A -#define MODEL_o437 0x69 -#define MODEL_happa 0x68 -#define MODEL_g54 0x67 -#define MODEL_o131 0x66 -#define MODEL_g55 0x65 -#define MODEL_o130 0x64 -#define MODEL_door 0x63 -#define MODEL_g41 0x62 -#define MODEL_ura_exit 0x61 -#define MODEL_g40 0x60 -#define MODEL_syoumen_enter 0x5F -#define MODEL_kaiten_yane 0x5E -#define MODEL_sotokabe 0x5D -#define MODEL_door_ki 0x5C -#define MODEL_o123 0x5B -#define MODEL_o121 0x5A -#define MODEL_o122 0x59 -#define MODEL_o137 0x58 -#define MODEL_yane2 0x57 -#define MODEL_o451 0x56 -#define MODEL_yane1 0x55 -#define MODEL_o140 0x54 -#define MODEL_inside 0x53 -#define MODEL_of 0x52 -#define MODEL_o563 0x51 -#define MODEL_o553 0x50 -#define MODEL_o551 0x4F -#define MODEL_o554 0x4E -#define MODEL_o550 0x4D -#define MODEL_o416 0x4C -#define MODEL_o413 0x4B -#define MODEL_o549 0x4A -#define MODEL_o420 0x49 -#define MODEL_o548 0x48 -#define MODEL_o547 0x47 -#define MODEL_o541 0x46 -#define MODEL_o534 0x45 -#define MODEL_o104 0x44 -#define MODEL_floor 0x43 -#define MODEL_tana4_1 0x42 -#define MODEL_o419 0x41 -#define MODEL_o562 0x40 -#define MODEL_o417 0x3F -#define MODEL_o107 0x3E -#define MODEL_o106 0x3D -#define MODEL_dome_eye 0x3C -#define MODEL_dome_hontai 0x3B -#define MODEL_heya_ishi 0x3A -#define MODEL_kabe 0x39 -#define MODEL_kabe_nenrin 0x38 -#define MODEL_window 0x37 -#define MODEL_tana2 0x36 -#define MODEL_tana1 0x35 -#define MODEL_table2 0x34 -#define MODEL_table1 0x33 -#define MODEL_isu 0x32 -#define MODEL_eda 0x31 -#define MODEL_o43 0x30 -#define MODEL_eda_hontai 0x2F -#define MODEL_tana 0x2E -#define MODEL_o110 0x2D -#define MODEL_g160 0x2C -#define MODEL_o379 0x2B -#define MODEL_road 0x2A -#define MODEL_o367 0x29 -#define MODEL_o475 0x28 -#define MODEL_field 0x27 -#define MODEL_gake 0x26 -#define MODEL_frame 0x25 -#define MODEL_obj 0x24 -#define MODEL_sasso_1 0x23 -#define MODEL_o486 0x22 -#define MODEL_o488 0x21 -#define MODEL_o485 0x20 -#define MODEL_o287 0x1F -#define MODEL_o289 0x1E -#define MODEL_o286 0x1D -#define MODEL_kuki_1 0x1C -#define MODEL_o282 0x1B -#define MODEL_ha_1 0x1A -#define MODEL_ki_1 0x19 -#define MODEL_midori 0x18 -#define MODEL_kiki 0x17 -#define MODEL_kusa_3 0x16 -#define MODEL_kusa3_1 0x15 -#define MODEL_kusa_2 0x14 -#define MODEL_mae_shigemi 0x13 -#define MODEL_kusa_1 0x12 -#define MODEL_kusa3 0x11 -#define MODEL_kusa2 0x10 -#define MODEL_kusa1 0xF -#define MODEL_saku 0xE -#define MODEL_o484 0xD -#define MODEL_o195 0xC -#define MODEL_o428 0xB -#define MODEL_o426 0xA -#define MODEL_berongo 0x9 -#define MODEL_g121 0x8 -#define MODEL_o148 0x7 -#define MODEL_o112 0x6 -#define MODEL_g120 0x5 -#define MODEL_o145 0x4 -#define MODEL_o111 0x3 -#define MODEL_g119 0x2 -#define MODEL_o147 0x1 -#define MODEL_o113 0x0 +#define MODEL_Root 0xC3 +#define MODEL_mom2 0xC2 +#define MODEL_4 0xC1 +#define MODEL_o491 0xC0 +#define MODEL_g196 0xBF +#define MODEL_o489 0xBE +#define MODEL_g197 0xBD +#define MODEL_o490 0xBC +#define MODEL_3 0xBB +#define MODEL_o445 0xBA +#define MODEL_o444 0xB9 +#define MODEL_2 0xB8 +#define MODEL_2_3 0xB7 +#define MODEL_2_2 0xB6 +#define MODEL_2_1 0xB5 +#define MODEL_1 0xB4 +#define MODEL_1_3 0xB3 +#define MODEL_1_2 0xB2 +#define MODEL_1_1 0xB1 +#define MODEL_g178 0xB0 +#define MODEL_stage 0xAF +#define MODEL_mon 0xAE +#define MODEL_mon_bou 0xAD +#define MODEL_m_b 0xAC +#define MODEL_mon_door 0xAB +#define MODEL_m_d_2 0xAA +#define MODEL_m_d2 0xA9 +#define MODEL_m_d_1 0xA8 +#define MODEL_m_d1 0xA7 +#define MODEL_k_1 0xA6 +#define MODEL_g118 0xA5 +#define MODEL_kanban 0xA4 +#define MODEL_kusaeda_1 0xA3 +#define MODEL_o246 0xA2 +#define MODEL_o245 0xA1 +#define MODEL_o244 0xA0 +#define MODEL_o243 0x9F +#define MODEL_o242 0x9E +#define MODEL_o238 0x9D +#define MODEL_kinopi 0x9C +#define MODEL_k_door 0x9B +#define MODEL_g127 0x9A +#define MODEL_o275 0x99 +#define MODEL_k_kabe 0x98 +#define MODEL_g129 0x97 +#define MODEL_o272 0x96 +#define MODEL_g116 0x95 +#define MODEL_k_k_3 0x94 +#define MODEL_g115 0x93 +#define MODEL_k_k_2 0x92 +#define MODEL_g114 0x91 +#define MODEL_k_k_1 0x90 +#define MODEL_g141 0x8F +#define MODEL_o320 0x8E +#define MODEL_kino_in 0x8D +#define MODEL_o561 0x8C +#define MODEL_o480 0x8B +#define MODEL_o479 0x8A +#define MODEL_o477 0x89 +#define MODEL_o425 0x88 +#define MODEL_o339 0x87 +#define MODEL_kb_4 0x86 +#define MODEL_kb_3 0x85 +#define MODEL_kb_2 0x84 +#define MODEL_kb_1 0x83 +#define MODEL_ky_2 0x82 +#define MODEL_ky_1 0x81 +#define MODEL_o422 0x80 +#define MODEL_o424 0x7F +#define MODEL_kino_out 0x7E +#define MODEL_o250 0x7D +#define MODEL_neko 0x7C +#define MODEL_kbe 0x7B +#define MODEL_yuka 0x7A +#define MODEL_ke 0x79 +#define MODEL_kino_mon 0x78 +#define MODEL_o357 0x77 +#define MODEL_o358 0x76 +#define MODEL_o359 0x75 +#define MODEL_off 0x74 +#define MODEL_o565 0x73 +#define MODEL_o564 0x72 +#define MODEL_o268 0x71 +#define MODEL_kaidan 0x70 +#define MODEL_kuribou_house 0x6F +#define MODEL_monohoshi 0x6E +#define MODEL_o352 0x6D +#define MODEL_o375 0x6C +#define MODEL_o369 0x6B +#define MODEL_o350 0x6A +#define MODEL_o437 0x69 +#define MODEL_happa 0x68 +#define MODEL_g54 0x67 +#define MODEL_o131 0x66 +#define MODEL_g55 0x65 +#define MODEL_o130 0x64 +#define MODEL_door 0x63 +#define MODEL_g41 0x62 +#define MODEL_ura_exit 0x61 +#define MODEL_g40 0x60 +#define MODEL_syoumen_enter 0x5F +#define MODEL_kaiten_yane 0x5E +#define MODEL_sotokabe 0x5D +#define MODEL_door_ki 0x5C +#define MODEL_o123 0x5B +#define MODEL_o121 0x5A +#define MODEL_o122 0x59 +#define MODEL_o137 0x58 +#define MODEL_yane2 0x57 +#define MODEL_o451 0x56 +#define MODEL_yane1 0x55 +#define MODEL_o140 0x54 +#define MODEL_inside 0x53 +#define MODEL_of 0x52 +#define MODEL_o563 0x51 +#define MODEL_o553 0x50 +#define MODEL_o551 0x4F +#define MODEL_o554 0x4E +#define MODEL_o550 0x4D +#define MODEL_o416 0x4C +#define MODEL_o413 0x4B +#define MODEL_o549 0x4A +#define MODEL_o420 0x49 +#define MODEL_o548 0x48 +#define MODEL_o547 0x47 +#define MODEL_o541 0x46 +#define MODEL_o534 0x45 +#define MODEL_o104 0x44 +#define MODEL_floor 0x43 +#define MODEL_tana4_1 0x42 +#define MODEL_o419 0x41 +#define MODEL_o562 0x40 +#define MODEL_o417 0x3F +#define MODEL_o107 0x3E +#define MODEL_o106 0x3D +#define MODEL_dome_eye 0x3C +#define MODEL_dome_hontai 0x3B +#define MODEL_heya_ishi 0x3A +#define MODEL_kabe 0x39 +#define MODEL_kabe_nenrin 0x38 +#define MODEL_window 0x37 +#define MODEL_tana2 0x36 +#define MODEL_tana1 0x35 +#define MODEL_table2 0x34 +#define MODEL_table1 0x33 +#define MODEL_isu 0x32 +#define MODEL_eda 0x31 +#define MODEL_o43 0x30 +#define MODEL_eda_hontai 0x2F +#define MODEL_tana 0x2E +#define MODEL_o110 0x2D +#define MODEL_g160 0x2C +#define MODEL_o379 0x2B +#define MODEL_road 0x2A +#define MODEL_o367 0x29 +#define MODEL_o475 0x28 +#define MODEL_field 0x27 +#define MODEL_gake 0x26 +#define MODEL_frame 0x25 +#define MODEL_obj 0x24 +#define MODEL_sasso_1 0x23 +#define MODEL_o486 0x22 +#define MODEL_o488 0x21 +#define MODEL_o485 0x20 +#define MODEL_o287 0x1F +#define MODEL_o289 0x1E +#define MODEL_o286 0x1D +#define MODEL_kuki_1 0x1C +#define MODEL_o282 0x1B +#define MODEL_ha_1 0x1A +#define MODEL_ki_1 0x19 +#define MODEL_midori 0x18 +#define MODEL_kiki 0x17 +#define MODEL_kusa_3 0x16 +#define MODEL_kusa3_1 0x15 +#define MODEL_kusa_2 0x14 +#define MODEL_mae_shigemi 0x13 +#define MODEL_kusa_1 0x12 +#define MODEL_kusa3 0x11 +#define MODEL_kusa2 0x10 +#define MODEL_kusa1 0xF +#define MODEL_saku 0xE +#define MODEL_o484 0xD +#define MODEL_o195 0xC +#define MODEL_o428 0xB +#define MODEL_o426 0xA +#define MODEL_berongo 0x9 +#define MODEL_g121 0x8 +#define MODEL_o148 0x7 +#define MODEL_o112 0x6 +#define MODEL_g120 0x5 +#define MODEL_o145 0x4 +#define MODEL_o111 0x3 +#define MODEL_g119 0x2 +#define MODEL_o147 0x1 +#define MODEL_o113 0x0 + diff --git a/include/mapfs/kmr_03_hit.h b/include/mapfs/kmr_03_hit.h index d21a9e98eb..c7f9e6c1b6 100644 --- a/include/mapfs/kmr_03_hit.h +++ b/include/mapfs/kmr_03_hit.h @@ -1,60 +1,69 @@ -#define COLLIDER_Root 0x3B -#define COLLIDER_g174 0x3A -#define COLLIDER_o419 0x39 -#define COLLIDER_o418 0x38 -#define COLLIDER_o407 0x37 -#define COLLIDER_move 0x36 -#define COLLIDER_km 0x35 -#define COLLIDER_ki 0x34 -#define COLLIDER_Default 0x33 -#define COLLIDER_o422 0x32 -#define COLLIDER_o355 0x31 -#define COLLIDER_6 0x30 -#define COLLIDER_o241 0x2F -#define COLLIDER_o245 0x2E -#define COLLIDER_o240 0x2D -#define COLLIDER_o243 0x2C -#define COLLIDER_o334 0x2B -#define COLLIDER_o328 0x2A -#define COLLIDER_o318 0x29 -#define COLLIDER_o280 0x28 -#define COLLIDER_noko4 0x27 -#define COLLIDER_o222 0x26 -#define COLLIDER_o219 0x25 -#define COLLIDER_5 0x24 -#define COLLIDER_noko3 0x23 -#define COLLIDER_o198 0x22 -#define COLLIDER_4 0x21 -#define COLLIDER_noko2 0x20 -#define COLLIDER_o343 0x1F -#define COLLIDER_o342 0x1E -#define COLLIDER_o341 0x1D -#define COLLIDER_3 0x1C -#define COLLIDER_o309 0x1B -#define COLLIDER_o308 0x1A -#define COLLIDER_o257 0x19 -#define COLLIDER_o260 0x18 -#define COLLIDER_o259 0x17 -#define COLLIDER_o258 0x16 -#define COLLIDER_2 0x15 -#define COLLIDER_o431 0x14 -#define COLLIDER_o340 0x13 -#define COLLIDER_o339 0x12 -#define COLLIDER_o338 0x11 -#define COLLIDER_o276 0x10 -#define COLLIDER_1 0xF -#define COLLIDER_o228 0xE -#define COLLIDER_noko1 0xD -#define COLLIDER_o86 0xC -#define COLLIDER_o347 0xB -#define COLLIDER_s_1 0xA -#define COLLIDER_tt1 0x9 -#define COLLIDER_o231 0x8 -#define COLLIDER_o349 0x7 -#define COLLIDER_deilit2 0x6 -#define COLLIDER_deili2 0x5 -#define COLLIDER_deilit1 0x4 -#define COLLIDER_deili1 0x3 -#define COLLIDER_g176 0x2 -#define COLLIDER_o424 0x1 -#define COLLIDER_o423 0x0 +#define COLLIDER_Root 0x3B +#define COLLIDER_g174 0x3A +#define COLLIDER_o419 0x39 +#define COLLIDER_o418 0x38 +#define COLLIDER_o407 0x37 +#define COLLIDER_move 0x36 +#define COLLIDER_km 0x35 +#define COLLIDER_ki 0x34 +#define COLLIDER_Default 0x33 +#define COLLIDER_o422 0x32 +#define COLLIDER_o355 0x31 +#define COLLIDER_6 0x30 +#define COLLIDER_o241 0x2F +#define COLLIDER_o245 0x2E +#define COLLIDER_o240 0x2D +#define COLLIDER_o243 0x2C +#define COLLIDER_o334 0x2B +#define COLLIDER_o328 0x2A +#define COLLIDER_o318 0x29 +#define COLLIDER_o280 0x28 +#define COLLIDER_noko4 0x27 +#define COLLIDER_o222 0x26 +#define COLLIDER_o219 0x25 +#define COLLIDER_5 0x24 +#define COLLIDER_noko3 0x23 +#define COLLIDER_o198 0x22 +#define COLLIDER_4 0x21 +#define COLLIDER_noko2 0x20 +#define COLLIDER_o343 0x1F +#define COLLIDER_o342 0x1E +#define COLLIDER_o341 0x1D +#define COLLIDER_3 0x1C +#define COLLIDER_o309 0x1B +#define COLLIDER_o308 0x1A +#define COLLIDER_o257 0x19 +#define COLLIDER_o260 0x18 +#define COLLIDER_o259 0x17 +#define COLLIDER_o258 0x16 +#define COLLIDER_2 0x15 +#define COLLIDER_o431 0x14 +#define COLLIDER_o340 0x13 +#define COLLIDER_o339 0x12 +#define COLLIDER_o338 0x11 +#define COLLIDER_o276 0x10 +#define COLLIDER_1 0xF +#define COLLIDER_o228 0xE +#define COLLIDER_noko1 0xD +#define COLLIDER_o86 0xC +#define COLLIDER_o347 0xB +#define COLLIDER_s_1 0xA +#define COLLIDER_tt1 0x9 +#define COLLIDER_o231 0x8 +#define COLLIDER_o349 0x7 +#define COLLIDER_deilit2 0x6 +#define COLLIDER_deili2 0x5 +#define COLLIDER_deilit1 0x4 +#define COLLIDER_deili1 0x3 +#define COLLIDER_g176 0x2 +#define COLLIDER_o424 0x1 +#define COLLIDER_o423 0x0 + +#define ZONE_Root 0x6 +#define ZONE_Default 0x5 +#define ZONE_o97 0x4 +#define ZONE_o96 0x3 +#define ZONE_o94 0x2 +#define ZONE_o88 0x1 +#define ZONE_o86 0x0 + diff --git a/include/mapfs/kmr_03_shape.h b/include/mapfs/kmr_03_shape.h index aa696b4a06..d870e36e2b 100644 --- a/include/mapfs/kmr_03_shape.h +++ b/include/mapfs/kmr_03_shape.h @@ -1,73 +1,74 @@ -#define MODEL_Root 0x48 -#define MODEL_g87 0x47 -#define MODEL_o263 0x46 -#define MODEL_Default 0x45 -#define MODEL_o266 0x44 -#define MODEL_o261 0x43 -#define MODEL_move 0x42 -#define MODEL_k_m 0x41 -#define MODEL_km 0x40 -#define MODEL_ki 0x3F -#define MODEL_ue 0x3E -#define MODEL_sita 0x3D -#define MODEL_g82 0x3C -#define MODEL_o242 0x3B -#define MODEL_o243 0x3A -#define MODEL_g81 0x39 -#define MODEL_o238 0x38 -#define MODEL_o236 0x37 -#define MODEL_o235 0x36 -#define MODEL_obj 0x35 -#define MODEL_kusa_6 0x34 -#define MODEL_o98 0x33 -#define MODEL_o97 0x32 -#define MODEL_kusa_4 0x31 -#define MODEL_o84 0x30 -#define MODEL_kusa_3 0x2F -#define MODEL_o95 0x2E -#define MODEL_kusa_2 0x2D -#define MODEL_o83 0x2C -#define MODEL_gakeha 0x2B -#define MODEL_o94 0x2A -#define MODEL_o93 0x29 -#define MODEL_o92 0x28 -#define MODEL_saku 0x27 -#define MODEL_o260 0x26 -#define MODEL_saku_1 0x25 -#define MODEL_o194 0x24 -#define MODEL_kinko 0x23 -#define MODEL_o86 0x22 -#define MODEL_kaidan 0x21 -#define MODEL_kaidan_2 0x20 -#define MODEL_o259 0x1F -#define MODEL_o223 0x1E -#define MODEL_o80 0x1D -#define MODEL_o206 0x1C -#define MODEL_o205 0x1B -#define MODEL_o71 0x1A -#define MODEL_kaidan_1 0x19 -#define MODEL_o74 0x18 -#define MODEL_o204 0x17 -#define MODEL_o203 0x16 -#define MODEL_o70 0x15 -#define MODEL_jimen 0x14 -#define MODEL_jimen_3 0x13 -#define MODEL_jimen_1 0x12 -#define MODEL_o202 0x11 -#define MODEL_michi 0x10 -#define MODEL_michi_4 0xF -#define MODEL_o197 0xE -#define MODEL_michi_3 0xD -#define MODEL_michi_22 0xC -#define MODEL_jimen_2 0xB -#define MODEL_michi_1 0xA -#define MODEL_stage 0x9 -#define MODEL_o258 0x8 -#define MODEL_o222 0x7 -#define MODEL_bero_1 0x6 -#define MODEL_bero_t1 0x5 -#define MODEL_bero_2 0x4 -#define MODEL_berot_2 0x3 -#define MODEL_gake_2 0x2 -#define MODEL_gake_1 0x1 -#define MODEL_frame 0x0 +#define MODEL_Root 0x48 +#define MODEL_g87 0x47 +#define MODEL_o263 0x46 +#define MODEL_Default 0x45 +#define MODEL_o266 0x44 +#define MODEL_o261 0x43 +#define MODEL_move 0x42 +#define MODEL_k_m 0x41 +#define MODEL_km 0x40 +#define MODEL_ki 0x3F +#define MODEL_ue 0x3E +#define MODEL_sita 0x3D +#define MODEL_g82 0x3C +#define MODEL_o242 0x3B +#define MODEL_o243 0x3A +#define MODEL_g81 0x39 +#define MODEL_o238 0x38 +#define MODEL_o236 0x37 +#define MODEL_o235 0x36 +#define MODEL_obj 0x35 +#define MODEL_kusa_6 0x34 +#define MODEL_o98 0x33 +#define MODEL_o97 0x32 +#define MODEL_kusa_4 0x31 +#define MODEL_o84 0x30 +#define MODEL_kusa_3 0x2F +#define MODEL_o95 0x2E +#define MODEL_kusa_2 0x2D +#define MODEL_o83 0x2C +#define MODEL_gakeha 0x2B +#define MODEL_o94 0x2A +#define MODEL_o93 0x29 +#define MODEL_o92 0x28 +#define MODEL_saku 0x27 +#define MODEL_o260 0x26 +#define MODEL_saku_1 0x25 +#define MODEL_o194 0x24 +#define MODEL_kinko 0x23 +#define MODEL_o86 0x22 +#define MODEL_kaidan 0x21 +#define MODEL_kaidan_2 0x20 +#define MODEL_o259 0x1F +#define MODEL_o223 0x1E +#define MODEL_o80 0x1D +#define MODEL_o206 0x1C +#define MODEL_o205 0x1B +#define MODEL_o71 0x1A +#define MODEL_kaidan_1 0x19 +#define MODEL_o74 0x18 +#define MODEL_o204 0x17 +#define MODEL_o203 0x16 +#define MODEL_o70 0x15 +#define MODEL_jimen 0x14 +#define MODEL_jimen_3 0x13 +#define MODEL_jimen_1 0x12 +#define MODEL_o202 0x11 +#define MODEL_michi 0x10 +#define MODEL_michi_4 0xF +#define MODEL_o197 0xE +#define MODEL_michi_3 0xD +#define MODEL_michi_22 0xC +#define MODEL_jimen_2 0xB +#define MODEL_michi_1 0xA +#define MODEL_stage 0x9 +#define MODEL_o258 0x8 +#define MODEL_o222 0x7 +#define MODEL_bero_1 0x6 +#define MODEL_bero_t1 0x5 +#define MODEL_bero_2 0x4 +#define MODEL_berot_2 0x3 +#define MODEL_gake_2 0x2 +#define MODEL_gake_1 0x1 +#define MODEL_frame 0x0 + diff --git a/include/mapfs/kmr_04_hit.h b/include/mapfs/kmr_04_hit.h index 808d2b6f2c..310fdfaa78 100644 --- a/include/mapfs/kmr_04_hit.h +++ b/include/mapfs/kmr_04_hit.h @@ -1,57 +1,65 @@ -#define COLLIDER_Root 0x38 -#define COLLIDER_Default 0x37 -#define COLLIDER_o416 0x36 -#define COLLIDER_o415 0x35 -#define COLLIDER_o413 0x34 -#define COLLIDER_o412 0x33 -#define COLLIDER_o411 0x32 -#define COLLIDER_o410_1 0x31 -#define COLLIDER_o410 0x30 -#define COLLIDER_o409 0x2F -#define COLLIDER_g211 0x2E -#define COLLIDER_o402 0x2D -#define COLLIDER_o399 0x2C -#define COLLIDER_g208 0x2B -#define COLLIDER_o389 0x2A -#define COLLIDER_g207 0x29 -#define COLLIDER_o387 0x28 -#define COLLIDER_g180 0x27 -#define COLLIDER_o347 0x26 -#define COLLIDER_o346 0x25 -#define COLLIDER_o345 0x24 -#define COLLIDER_g182 0x23 -#define COLLIDER_o344 0x22 -#define COLLIDER_g179 0x21 -#define COLLIDER_o341 0x20 -#define COLLIDER_o342 0x1F -#define COLLIDER_g181 0x1E -#define COLLIDER_o336 0x1D -#define COLLIDER_o335 0x1C -#define COLLIDER_g186 0x1B -#define COLLIDER_o333 0x1A -#define COLLIDER_o334 0x19 -#define COLLIDER_g185 0x18 -#define COLLIDER_o350 0x17 -#define COLLIDER_o271 0x16 -#define COLLIDER_o349 0x15 -#define COLLIDER_o348 0x14 -#define COLLIDER_g184 0x13 -#define COLLIDER_o354 0x12 -#define COLLIDER_o231 0x11 -#define COLLIDER_o112 0x10 -#define COLLIDER_o353 0xF -#define COLLIDER_g183 0xE -#define COLLIDER_o280 0xD -#define COLLIDER_o359 0xC -#define COLLIDER_o355 0xB -#define COLLIDER_o356 0xA -#define COLLIDER_o407 0x9 -#define COLLIDER_g178 0x8 -#define COLLIDER_o365 0x7 -#define COLLIDER_o358 0x6 -#define COLLIDER_o357 0x5 -#define COLLIDER_g121 0x4 -#define COLLIDER_o419 0x3 -#define COLLIDER_o420 0x2 -#define COLLIDER_deilit1 0x1 -#define COLLIDER_deili1 0x0 +#define COLLIDER_Root 0x38 +#define COLLIDER_Default 0x37 +#define COLLIDER_o416 0x36 +#define COLLIDER_o415 0x35 +#define COLLIDER_o413 0x34 +#define COLLIDER_o412 0x33 +#define COLLIDER_o411 0x32 +#define COLLIDER_o410_1 0x31 +#define COLLIDER_o410 0x30 +#define COLLIDER_o409 0x2F +#define COLLIDER_g211 0x2E +#define COLLIDER_o402 0x2D +#define COLLIDER_o399 0x2C +#define COLLIDER_g208 0x2B +#define COLLIDER_o389 0x2A +#define COLLIDER_g207 0x29 +#define COLLIDER_o387 0x28 +#define COLLIDER_g180 0x27 +#define COLLIDER_o347 0x26 +#define COLLIDER_o346 0x25 +#define COLLIDER_o345 0x24 +#define COLLIDER_g182 0x23 +#define COLLIDER_o344 0x22 +#define COLLIDER_g179 0x21 +#define COLLIDER_o341 0x20 +#define COLLIDER_o342 0x1F +#define COLLIDER_g181 0x1E +#define COLLIDER_o336 0x1D +#define COLLIDER_o335 0x1C +#define COLLIDER_g186 0x1B +#define COLLIDER_o333 0x1A +#define COLLIDER_o334 0x19 +#define COLLIDER_g185 0x18 +#define COLLIDER_o350 0x17 +#define COLLIDER_o271 0x16 +#define COLLIDER_o349 0x15 +#define COLLIDER_o348 0x14 +#define COLLIDER_g184 0x13 +#define COLLIDER_o354 0x12 +#define COLLIDER_o231 0x11 +#define COLLIDER_o112 0x10 +#define COLLIDER_o353 0xF +#define COLLIDER_g183 0xE +#define COLLIDER_o280 0xD +#define COLLIDER_o359 0xC +#define COLLIDER_o355 0xB +#define COLLIDER_o356 0xA +#define COLLIDER_o407 0x9 +#define COLLIDER_g178 0x8 +#define COLLIDER_o365 0x7 +#define COLLIDER_o358 0x6 +#define COLLIDER_o357 0x5 +#define COLLIDER_g121 0x4 +#define COLLIDER_o419 0x3 +#define COLLIDER_o420 0x2 +#define COLLIDER_deilit1 0x1 +#define COLLIDER_deili1 0x0 + +#define ZONE_Root 0x5 +#define ZONE_Default 0x4 +#define ZONE_o223 0x3 +#define ZONE_field 0x2 +#define ZONE_bero 0x1 +#define ZONE_o215 0x0 + diff --git a/include/mapfs/kmr_04_shape.h b/include/mapfs/kmr_04_shape.h index fa816eeaf8..9dd4a3bfc0 100644 --- a/include/mapfs/kmr_04_shape.h +++ b/include/mapfs/kmr_04_shape.h @@ -1,65 +1,66 @@ -#define MODEL_Root 0x40 -#define MODEL_g114 0x3F -#define MODEL_o248 0x3E -#define MODEL_o247 0x3D -#define MODEL_obj 0x3C -#define MODEL_g107 0x3B -#define MODEL_o234 0x3A -#define MODEL_mae_shigemi 0x39 -#define MODEL_kusa 0x38 -#define MODEL_o239 0x37 -#define MODEL_o212 0x36 -#define MODEL_o182 0x35 -#define MODEL_o181 0x34 -#define MODEL_o205 0x33 -#define MODEL_o235 0x32 -#define MODEL_g113 0x31 -#define MODEL_o213 0x30 -#define MODEL_saku 0x2F -#define MODEL_o196 0x2E -#define MODEL_o255 0x2D -#define MODEL_kinoko 0x2C -#define MODEL_k2 0x2B -#define MODEL_k 0x2A -#define MODEL_hart 0x29 -#define MODEL_hart_2 0x28 -#define MODEL_hart_1 0x27 -#define MODEL_happakusa 0x26 -#define MODEL_h_3 0x25 -#define MODEL_o180 0x24 -#define MODEL_o179 0x23 -#define MODEL_h_2 0x22 -#define MODEL_o209 0x21 -#define MODEL_o208 0x20 -#define MODEL_h_1 0x1F -#define MODEL_o211 0x1E -#define MODEL_o210 0x1D -#define MODEL_ki 0x1C -#define MODEL_ki_3 0x1B -#define MODEL_o192 0x1A -#define MODEL_o191 0x19 -#define MODEL_ki_2 0x18 -#define MODEL_o194 0x17 -#define MODEL_o193 0x16 -#define MODEL_ki_1 0x15 -#define MODEL_o237 0x14 -#define MODEL_o236 0x13 -#define MODEL_berongo 0x12 -#define MODEL_o112 0x11 -#define MODEL_o148 0x10 -#define MODEL_field 0xF -#define MODEL_o257 0xE -#define MODEL_o256 0xD -#define MODEL_o190 0xC -#define MODEL_frame 0xB -#define MODEL_g111 0xA -#define MODEL_o244 0x9 -#define MODEL_o226 0x8 -#define MODEL_o230 0x7 -#define MODEL_o227 0x6 -#define MODEL_o228 0x5 -#define MODEL_o206 0x4 -#define MODEL_o232 0x3 -#define MODEL_o231 0x2 -#define MODEL_o214 0x1 -#define MODEL_o246 0x0 +#define MODEL_Root 0x40 +#define MODEL_g114 0x3F +#define MODEL_o248 0x3E +#define MODEL_o247 0x3D +#define MODEL_obj 0x3C +#define MODEL_g107 0x3B +#define MODEL_o234 0x3A +#define MODEL_mae_shigemi 0x39 +#define MODEL_kusa 0x38 +#define MODEL_o239 0x37 +#define MODEL_o212 0x36 +#define MODEL_o182 0x35 +#define MODEL_o181 0x34 +#define MODEL_o205 0x33 +#define MODEL_o235 0x32 +#define MODEL_g113 0x31 +#define MODEL_o213 0x30 +#define MODEL_saku 0x2F +#define MODEL_o196 0x2E +#define MODEL_o255 0x2D +#define MODEL_kinoko 0x2C +#define MODEL_k2 0x2B +#define MODEL_k 0x2A +#define MODEL_hart 0x29 +#define MODEL_hart_2 0x28 +#define MODEL_hart_1 0x27 +#define MODEL_happakusa 0x26 +#define MODEL_h_3 0x25 +#define MODEL_o180 0x24 +#define MODEL_o179 0x23 +#define MODEL_h_2 0x22 +#define MODEL_o209 0x21 +#define MODEL_o208 0x20 +#define MODEL_h_1 0x1F +#define MODEL_o211 0x1E +#define MODEL_o210 0x1D +#define MODEL_ki 0x1C +#define MODEL_ki_3 0x1B +#define MODEL_o192 0x1A +#define MODEL_o191 0x19 +#define MODEL_ki_2 0x18 +#define MODEL_o194 0x17 +#define MODEL_o193 0x16 +#define MODEL_ki_1 0x15 +#define MODEL_o237 0x14 +#define MODEL_o236 0x13 +#define MODEL_berongo 0x12 +#define MODEL_o112 0x11 +#define MODEL_o148 0x10 +#define MODEL_field 0xF +#define MODEL_o257 0xE +#define MODEL_o256 0xD +#define MODEL_o190 0xC +#define MODEL_frame 0xB +#define MODEL_g111 0xA +#define MODEL_o244 0x9 +#define MODEL_o226 0x8 +#define MODEL_o230 0x7 +#define MODEL_o227 0x6 +#define MODEL_o228 0x5 +#define MODEL_o206 0x4 +#define MODEL_o232 0x3 +#define MODEL_o231 0x2 +#define MODEL_o214 0x1 +#define MODEL_o246 0x0 + diff --git a/include/mapfs/kmr_05_hit.h b/include/mapfs/kmr_05_hit.h index 02953d8a10..5ccdc91934 100644 --- a/include/mapfs/kmr_05_hit.h +++ b/include/mapfs/kmr_05_hit.h @@ -1,76 +1,89 @@ -#define COLLIDER_Root 0x4B -#define COLLIDER_g425 0x4A -#define COLLIDER_k_11 0x49 -#define COLLIDER_o1238 0x48 -#define COLLIDER_k_1 0x47 -#define COLLIDER_o1178 0x46 -#define COLLIDER_o1181 0x45 -#define COLLIDER_o1077 0x44 -#define COLLIDER_s_12 0x43 -#define COLLIDER_o1177 0x42 -#define COLLIDER_o1189 0x41 -#define COLLIDER_o1107 0x40 -#define COLLIDER_s_11 0x3F -#define COLLIDER_o1111 0x3E -#define COLLIDER_o1175 0x3D -#define COLLIDER_o1179 0x3C -#define COLLIDER_o1150 0x3B -#define COLLIDER_o1345 0x3A -#define COLLIDER_s_10 0x39 -#define COLLIDER_o1344 0x38 -#define COLLIDER_o1106 0x37 -#define COLLIDER_o1083 0x36 -#define COLLIDER_o1081 0x35 -#define COLLIDER_s_9 0x34 -#define COLLIDER_o1089 0x33 -#define COLLIDER_o1343 0x32 -#define COLLIDER_o1090 0x31 -#define COLLIDER_o1135 0x30 -#define COLLIDER_s_8 0x2F -#define COLLIDER_o1333 0x2E -#define COLLIDER_o1289 0x2D -#define COLLIDER_o1134 0x2C -#define COLLIDER_s_7 0x2B -#define COLLIDER_o1116 0x2A -#define COLLIDER_o1130 0x29 -#define COLLIDER_o1113 0x28 -#define COLLIDER_s_6 0x27 -#define COLLIDER_o1148 0x26 -#define COLLIDER_o1230 0x25 -#define COLLIDER_o1157 0x24 -#define COLLIDER_o1123 0x23 -#define COLLIDER_o1124 0x22 -#define COLLIDER_s_5 0x21 -#define COLLIDER_o1341 0x20 -#define COLLIDER_o1109 0x1F -#define COLLIDER_o1121 0x1E -#define COLLIDER_o1120 0x1D -#define COLLIDER_o1244 0x1C -#define COLLIDER_s_4 0x1B -#define COLLIDER_o1342 0x1A -#define COLLIDER_o1118 0x19 -#define COLLIDER_o1105 0x18 -#define COLLIDER_s_3 0x17 -#define COLLIDER_o1119 0x16 -#define COLLIDER_o1079 0x15 -#define COLLIDER_o1110 0x14 -#define COLLIDER_o1223 0x13 -#define COLLIDER_s_2 0x12 -#define COLLIDER_o1346 0x11 -#define COLLIDER_o1117 0x10 -#define COLLIDER_o1200 0xF -#define COLLIDER_o1075 0xE -#define COLLIDER_s_1 0xD -#define COLLIDER_o1201 0xC -#define COLLIDER_o1094 0xB -#define COLLIDER_o1103 0xA -#define COLLIDER_o1131 0x9 -#define COLLIDER_g344 0x8 -#define COLLIDER_t2 0x7 -#define COLLIDER_t1 0x6 -#define COLLIDER_d2 0x5 -#define COLLIDER_d1 0x4 -#define COLLIDER_deilit2 0x3 -#define COLLIDER_deili2 0x2 -#define COLLIDER_deilit1 0x1 -#define COLLIDER_deili1 0x0 +#define COLLIDER_Root 0x4B +#define COLLIDER_g425 0x4A +#define COLLIDER_k_11 0x49 +#define COLLIDER_o1238 0x48 +#define COLLIDER_k_1 0x47 +#define COLLIDER_o1178 0x46 +#define COLLIDER_o1181 0x45 +#define COLLIDER_o1077 0x44 +#define COLLIDER_s_12 0x43 +#define COLLIDER_o1177 0x42 +#define COLLIDER_o1189 0x41 +#define COLLIDER_o1107 0x40 +#define COLLIDER_s_11 0x3F +#define COLLIDER_o1111 0x3E +#define COLLIDER_o1175 0x3D +#define COLLIDER_o1179 0x3C +#define COLLIDER_o1150 0x3B +#define COLLIDER_o1345 0x3A +#define COLLIDER_s_10 0x39 +#define COLLIDER_o1344 0x38 +#define COLLIDER_o1106 0x37 +#define COLLIDER_o1083 0x36 +#define COLLIDER_o1081 0x35 +#define COLLIDER_s_9 0x34 +#define COLLIDER_o1089 0x33 +#define COLLIDER_o1343 0x32 +#define COLLIDER_o1090 0x31 +#define COLLIDER_o1135 0x30 +#define COLLIDER_s_8 0x2F +#define COLLIDER_o1333 0x2E +#define COLLIDER_o1289 0x2D +#define COLLIDER_o1134 0x2C +#define COLLIDER_s_7 0x2B +#define COLLIDER_o1116 0x2A +#define COLLIDER_o1130 0x29 +#define COLLIDER_o1113 0x28 +#define COLLIDER_s_6 0x27 +#define COLLIDER_o1148 0x26 +#define COLLIDER_o1230 0x25 +#define COLLIDER_o1157 0x24 +#define COLLIDER_o1123 0x23 +#define COLLIDER_o1124 0x22 +#define COLLIDER_s_5 0x21 +#define COLLIDER_o1341 0x20 +#define COLLIDER_o1109 0x1F +#define COLLIDER_o1121 0x1E +#define COLLIDER_o1120 0x1D +#define COLLIDER_o1244 0x1C +#define COLLIDER_s_4 0x1B +#define COLLIDER_o1342 0x1A +#define COLLIDER_o1118 0x19 +#define COLLIDER_o1105 0x18 +#define COLLIDER_s_3 0x17 +#define COLLIDER_o1119 0x16 +#define COLLIDER_o1079 0x15 +#define COLLIDER_o1110 0x14 +#define COLLIDER_o1223 0x13 +#define COLLIDER_s_2 0x12 +#define COLLIDER_o1346 0x11 +#define COLLIDER_o1117 0x10 +#define COLLIDER_o1200 0xF +#define COLLIDER_o1075 0xE +#define COLLIDER_s_1 0xD +#define COLLIDER_o1201 0xC +#define COLLIDER_o1094 0xB +#define COLLIDER_o1103 0xA +#define COLLIDER_o1131 0x9 +#define COLLIDER_g344 0x8 +#define COLLIDER_t2 0x7 +#define COLLIDER_t1 0x6 +#define COLLIDER_d2 0x5 +#define COLLIDER_d1 0x4 +#define COLLIDER_deilit2 0x3 +#define COLLIDER_deili2 0x2 +#define COLLIDER_deilit1 0x1 +#define COLLIDER_deili1 0x0 + +#define ZONE_Root 0xA +#define ZONE_Default 0x9 +#define ZONE_o1046 0x8 +#define ZONE_michi 0x7 +#define ZONE_bero1 0x6 +#define ZONE_o1035 0x5 +#define ZONE_o1034 0x4 +#define ZONE_o1040 0x3 +#define ZONE_o1041 0x2 +#define ZONE_michi_1 0x1 +#define ZONE_o1036 0x0 + diff --git a/include/mapfs/kmr_05_shape.h b/include/mapfs/kmr_05_shape.h index a8defdba9b..c95999b824 100644 --- a/include/mapfs/kmr_05_shape.h +++ b/include/mapfs/kmr_05_shape.h @@ -1,113 +1,114 @@ -#define MODEL_Root 0x70 -#define MODEL_obj 0x6F -#define MODEL_kusa 0x6E -#define MODEL_o1168 0x6D -#define MODEL_kinoko 0x6C -#define MODEL_usokinoko 0x6B -#define MODEL_ha 0x6A -#define MODEL_o1031 0x69 -#define MODEL_o849 0x68 -#define MODEL_o1170 0x67 -#define MODEL_kinoha 0x66 -#define MODEL_kiha 0x65 -#define MODEL_o884 0x64 -#define MODEL_o883 0x63 -#define MODEL_kiha_2 0x62 -#define MODEL_o1181 0x61 -#define MODEL_o1180 0x60 -#define MODEL_kiha_1 0x5F -#define MODEL_o1172 0x5E -#define MODEL_o1171 0x5D -#define MODEL_ishi 0x5C -#define MODEL_o1096 0x5B -#define MODEL_o1094 0x5A -#define MODEL_o1090 0x59 -#define MODEL_o1093 0x58 -#define MODEL_ki 0x57 -#define MODEL_ki_2 0x56 -#define MODEL_ha2_3 0x55 -#define MODEL_ha2_2 0x54 -#define MODEL_ha2_1 0x53 -#define MODEL_miki2_2 0x52 -#define MODEL_miki2_1 0x51 -#define MODEL_o1065 0x50 -#define MODEL_bero2 0x4F -#define MODEL_o1025 0x4E -#define MODEL_o1024 0x4D -#define MODEL_bero_1 0x4C -#define MODEL_o981 0x4B -#define MODEL_o1034 0x4A -#define MODEL_honntai 0x49 -#define MODEL_cam3 0x48 -#define MODEL_jimen_5 0x47 -#define MODEL_m_5_3 0x46 -#define MODEL_m_5_2 0x45 -#define MODEL_cam2 0x44 -#define MODEL_o1032 0x43 -#define MODEL_o1051 0x42 -#define MODEL_o1061 0x41 -#define MODEL_o1048 0x40 -#define MODEL_cam1 0x3F -#define MODEL_michi_4 0x3E -#define MODEL_michi_3 0x3D -#define MODEL_michi_2 0x3C -#define MODEL_michi_1 0x3B -#define MODEL_o1052 0x3A -#define MODEL_o1044 0x39 -#define MODEL_jimen4_5 0x38 -#define MODEL_jimen_4 0x37 -#define MODEL_jimen3_5 0x36 -#define MODEL_jimen_3 0x35 -#define MODEL_jimen2_5 0x34 -#define MODEL_jimen_2 0x33 -#define MODEL_jimen1_5 0x32 -#define MODEL_jimen_1 0x31 -#define MODEL_k 0x30 -#define MODEL_k8 0x2F -#define MODEL_k7 0x2E -#define MODEL_k6 0x2D -#define MODEL_k5 0x2C -#define MODEL_k4 0x2B -#define MODEL_k3 0x2A -#define MODEL_k2 0x29 -#define MODEL_k1 0x28 -#define MODEL_kabekusa 0x27 -#define MODEL_o882 0x26 -#define MODEL_kabe 0x25 -#define MODEL_gake_2 0x24 -#define MODEL_o1080 0x23 -#define MODEL_gake 0x22 -#define MODEL_o1075 0x21 -#define MODEL_o1074 0x20 -#define MODEL_w5 0x1F -#define MODEL_w4 0x1E -#define MODEL_w3 0x1D -#define MODEL_w2 0x1C -#define MODEL_w1 0x1B -#define MODEL_o1027 0x1A -#define MODEL_g354 0x19 -#define MODEL_o1176 0x18 -#define MODEL_o1179 0x17 -#define MODEL_saku_2 0x16 -#define MODEL_o1095 0x15 -#define MODEL_o1177 0x14 -#define MODEL_o1187 0x13 -#define MODEL_o1178 0x12 -#define MODEL_o1174 0x11 -#define MODEL_o1205 0x10 -#define MODEL_ha1_3 0xF -#define MODEL_ha1_2 0xE -#define MODEL_ha1_1 0xD -#define MODEL_miki1_2 0xC -#define MODEL_miki1_1 0xB -#define MODEL_o1066 0xA -#define MODEL_o1058 0x9 -#define MODEL_o1056 0x8 -#define MODEL_o1057 0x7 -#define MODEL_o1098 0x6 -#define MODEL_o1097 0x5 -#define MODEL_o1173 0x4 -#define MODEL_o1047 0x3 -#define MODEL_o1107 0x2 -#define MODEL_back2 0x1 -#define MODEL_back3 0x0 +#define MODEL_Root 0x70 +#define MODEL_obj 0x6F +#define MODEL_kusa 0x6E +#define MODEL_o1168 0x6D +#define MODEL_kinoko 0x6C +#define MODEL_usokinoko 0x6B +#define MODEL_ha 0x6A +#define MODEL_o1031 0x69 +#define MODEL_o849 0x68 +#define MODEL_o1170 0x67 +#define MODEL_kinoha 0x66 +#define MODEL_kiha 0x65 +#define MODEL_o884 0x64 +#define MODEL_o883 0x63 +#define MODEL_kiha_2 0x62 +#define MODEL_o1181 0x61 +#define MODEL_o1180 0x60 +#define MODEL_kiha_1 0x5F +#define MODEL_o1172 0x5E +#define MODEL_o1171 0x5D +#define MODEL_ishi 0x5C +#define MODEL_o1096 0x5B +#define MODEL_o1094 0x5A +#define MODEL_o1090 0x59 +#define MODEL_o1093 0x58 +#define MODEL_ki 0x57 +#define MODEL_ki_2 0x56 +#define MODEL_ha2_3 0x55 +#define MODEL_ha2_2 0x54 +#define MODEL_ha2_1 0x53 +#define MODEL_miki2_2 0x52 +#define MODEL_miki2_1 0x51 +#define MODEL_o1065 0x50 +#define MODEL_bero2 0x4F +#define MODEL_o1025 0x4E +#define MODEL_o1024 0x4D +#define MODEL_bero_1 0x4C +#define MODEL_o981 0x4B +#define MODEL_o1034 0x4A +#define MODEL_honntai 0x49 +#define MODEL_cam3 0x48 +#define MODEL_jimen_5 0x47 +#define MODEL_m_5_3 0x46 +#define MODEL_m_5_2 0x45 +#define MODEL_cam2 0x44 +#define MODEL_o1032 0x43 +#define MODEL_o1051 0x42 +#define MODEL_o1061 0x41 +#define MODEL_o1048 0x40 +#define MODEL_cam1 0x3F +#define MODEL_michi_4 0x3E +#define MODEL_michi_3 0x3D +#define MODEL_michi_2 0x3C +#define MODEL_michi_1 0x3B +#define MODEL_o1052 0x3A +#define MODEL_o1044 0x39 +#define MODEL_jimen4_5 0x38 +#define MODEL_jimen_4 0x37 +#define MODEL_jimen3_5 0x36 +#define MODEL_jimen_3 0x35 +#define MODEL_jimen2_5 0x34 +#define MODEL_jimen_2 0x33 +#define MODEL_jimen1_5 0x32 +#define MODEL_jimen_1 0x31 +#define MODEL_k 0x30 +#define MODEL_k8 0x2F +#define MODEL_k7 0x2E +#define MODEL_k6 0x2D +#define MODEL_k5 0x2C +#define MODEL_k4 0x2B +#define MODEL_k3 0x2A +#define MODEL_k2 0x29 +#define MODEL_k1 0x28 +#define MODEL_kabekusa 0x27 +#define MODEL_o882 0x26 +#define MODEL_kabe 0x25 +#define MODEL_gake_2 0x24 +#define MODEL_o1080 0x23 +#define MODEL_gake 0x22 +#define MODEL_o1075 0x21 +#define MODEL_o1074 0x20 +#define MODEL_w5 0x1F +#define MODEL_w4 0x1E +#define MODEL_w3 0x1D +#define MODEL_w2 0x1C +#define MODEL_w1 0x1B +#define MODEL_o1027 0x1A +#define MODEL_g354 0x19 +#define MODEL_o1176 0x18 +#define MODEL_o1179 0x17 +#define MODEL_saku_2 0x16 +#define MODEL_o1095 0x15 +#define MODEL_o1177 0x14 +#define MODEL_o1187 0x13 +#define MODEL_o1178 0x12 +#define MODEL_o1174 0x11 +#define MODEL_o1205 0x10 +#define MODEL_ha1_3 0xF +#define MODEL_ha1_2 0xE +#define MODEL_ha1_1 0xD +#define MODEL_miki1_2 0xC +#define MODEL_miki1_1 0xB +#define MODEL_o1066 0xA +#define MODEL_o1058 0x9 +#define MODEL_o1056 0x8 +#define MODEL_o1057 0x7 +#define MODEL_o1098 0x6 +#define MODEL_o1097 0x5 +#define MODEL_o1173 0x4 +#define MODEL_o1047 0x3 +#define MODEL_o1107 0x2 +#define MODEL_back2 0x1 +#define MODEL_back3 0x0 + diff --git a/include/mapfs/kmr_06_hit.h b/include/mapfs/kmr_06_hit.h index 4a674a63ea..b89ef64fe1 100644 --- a/include/mapfs/kmr_06_hit.h +++ b/include/mapfs/kmr_06_hit.h @@ -1,29 +1,36 @@ -#define COLLIDER_Root 0x1C -#define COLLIDER_4 0x1B -#define COLLIDER_o836 0x1A -#define COLLIDER_o842 0x19 -#define COLLIDER_o850 0x18 -#define COLLIDER_3 0x17 -#define COLLIDER_o835 0x16 -#define COLLIDER_o841 0x15 -#define COLLIDER_o851 0x14 -#define COLLIDER_o852 0x13 -#define COLLIDER_2 0x12 -#define COLLIDER_o857 0x11 -#define COLLIDER_o834 0x10 -#define COLLIDER_o832 0xF -#define COLLIDER_8 0xE -#define COLLIDER_o840 0xD -#define COLLIDER_o847 0xC -#define COLLIDER_1 0xB -#define COLLIDER_o833 0xA -#define COLLIDER_o831 0x9 -#define COLLIDER_s_2 0x8 -#define COLLIDER_deilit2 0x7 -#define COLLIDER_deili2 0x6 -#define COLLIDER_s_1 0x5 -#define COLLIDER_deilit1 0x4 -#define COLLIDER_deili1 0x3 -#define COLLIDER_k 0x2 -#define COLLIDER_kk2 0x1 -#define COLLIDER_kk1 0x0 +#define COLLIDER_Root 0x1C +#define COLLIDER_4 0x1B +#define COLLIDER_o836 0x1A +#define COLLIDER_o842 0x19 +#define COLLIDER_o850 0x18 +#define COLLIDER_3 0x17 +#define COLLIDER_o835 0x16 +#define COLLIDER_o841 0x15 +#define COLLIDER_o851 0x14 +#define COLLIDER_o852 0x13 +#define COLLIDER_2 0x12 +#define COLLIDER_o857 0x11 +#define COLLIDER_o834 0x10 +#define COLLIDER_o832 0xF +#define COLLIDER_8 0xE +#define COLLIDER_o840 0xD +#define COLLIDER_o847 0xC +#define COLLIDER_1 0xB +#define COLLIDER_o833 0xA +#define COLLIDER_o831 0x9 +#define COLLIDER_s_2 0x8 +#define COLLIDER_deilit2 0x7 +#define COLLIDER_deili2 0x6 +#define COLLIDER_s_1 0x5 +#define COLLIDER_deilit1 0x4 +#define COLLIDER_deili1 0x3 +#define COLLIDER_k 0x2 +#define COLLIDER_kk2 0x1 +#define COLLIDER_kk1 0x0 + +#define ZONE_Root 0x4 +#define ZONE_s_1 0x3 +#define ZONE_bero_2 0x2 +#define ZONE_bero_1 0x1 +#define ZONE_o62 0x0 + diff --git a/include/mapfs/kmr_06_shape.h b/include/mapfs/kmr_06_shape.h index d8236347b2..312827736a 100644 --- a/include/mapfs/kmr_06_shape.h +++ b/include/mapfs/kmr_06_shape.h @@ -1,51 +1,52 @@ -#define MODEL_Root 0x32 -#define MODEL_g278 0x31 -#define MODEL_o832 0x30 -#define MODEL_g242 0x2F -#define MODEL_bero_2 0x2E -#define MODEL_o830 0x2D -#define MODEL_o829 0x2C -#define MODEL_bero_1 0x2B -#define MODEL_o828 0x2A -#define MODEL_o827 0x29 -#define MODEL_kusa 0x28 -#define MODEL_mae_kusa 0x27 -#define MODEL_michi 0x26 -#define MODEL_michi1 0x25 -#define MODEL_jimen 0x24 -#define MODEL_jimen5 0x23 -#define MODEL_g270 0x22 -#define MODEL_green_edge 0x21 -#define MODEL_kabe 0x20 -#define MODEL_w5 0x1F -#define MODEL_w2 0x1E -#define MODEL_w1 0x1D -#define MODEL_g277 0x1C -#define MODEL_o820 0x1B -#define MODEL_o821 0x1A -#define MODEL_o850 0x19 -#define MODEL_o851 0x18 -#define MODEL_ikenasou 0x17 -#define MODEL_o860 0x16 -#define MODEL_o859 0x15 -#define MODEL_o855 0x14 -#define MODEL_o852 0x13 -#define MODEL_o856 0x12 -#define MODEL_o791 0x11 -#define MODEL_chakinoko 0x10 -#define MODEL_o822 0xF -#define MODEL_o823 0xE -#define MODEL_o824 0xD -#define MODEL_o825 0xC -#define MODEL_o826 0xB -#define MODEL_naka_kusa 0xA -#define MODEL_ushiro_kusa 0x9 -#define MODEL_o806 0x8 -#define MODEL_o804 0x7 -#define MODEL_o800 0x6 -#define MODEL_o798 0x5 -#define MODEL_o797 0x4 -#define MODEL_o835 0x3 -#define MODEL_o834 0x2 -#define MODEL_jimen2 0x1 -#define MODEL_jimen1 0x0 +#define MODEL_Root 0x32 +#define MODEL_g278 0x31 +#define MODEL_o832 0x30 +#define MODEL_g242 0x2F +#define MODEL_bero_2 0x2E +#define MODEL_o830 0x2D +#define MODEL_o829 0x2C +#define MODEL_bero_1 0x2B +#define MODEL_o828 0x2A +#define MODEL_o827 0x29 +#define MODEL_kusa 0x28 +#define MODEL_mae_kusa 0x27 +#define MODEL_michi 0x26 +#define MODEL_michi1 0x25 +#define MODEL_jimen 0x24 +#define MODEL_jimen5 0x23 +#define MODEL_g270 0x22 +#define MODEL_green_edge 0x21 +#define MODEL_kabe 0x20 +#define MODEL_w5 0x1F +#define MODEL_w2 0x1E +#define MODEL_w1 0x1D +#define MODEL_g277 0x1C +#define MODEL_o820 0x1B +#define MODEL_o821 0x1A +#define MODEL_o850 0x19 +#define MODEL_o851 0x18 +#define MODEL_ikenasou 0x17 +#define MODEL_o860 0x16 +#define MODEL_o859 0x15 +#define MODEL_o855 0x14 +#define MODEL_o852 0x13 +#define MODEL_o856 0x12 +#define MODEL_o791 0x11 +#define MODEL_chakinoko 0x10 +#define MODEL_o822 0xF +#define MODEL_o823 0xE +#define MODEL_o824 0xD +#define MODEL_o825 0xC +#define MODEL_o826 0xB +#define MODEL_naka_kusa 0xA +#define MODEL_ushiro_kusa 0x9 +#define MODEL_o806 0x8 +#define MODEL_o804 0x7 +#define MODEL_o800 0x6 +#define MODEL_o798 0x5 +#define MODEL_o797 0x4 +#define MODEL_o835 0x3 +#define MODEL_o834 0x2 +#define MODEL_jimen2 0x1 +#define MODEL_jimen1 0x0 + diff --git a/include/mapfs/kmr_07_hit.h b/include/mapfs/kmr_07_hit.h index 90bb545eac..c679cabd16 100644 --- a/include/mapfs/kmr_07_hit.h +++ b/include/mapfs/kmr_07_hit.h @@ -1,41 +1,49 @@ -#define COLLIDER_Root 0x28 -#define COLLIDER_Default 0x27 -#define COLLIDER_o969 0x26 -#define COLLIDER_o959 0x25 -#define COLLIDER_9 0x24 -#define COLLIDER_o855 0x23 -#define COLLIDER_o857 0x22 -#define COLLIDER_8 0x21 -#define COLLIDER_o949 0x20 -#define COLLIDER_o956 0x1F -#define COLLIDER_7 0x1E -#define COLLIDER_o947 0x1D -#define COLLIDER_o940 0x1C -#define COLLIDER_6 0x1B -#define COLLIDER_noko1 0x1A -#define COLLIDER_o957 0x19 -#define COLLIDER_o950 0x18 -#define COLLIDER_5 0x17 -#define COLLIDER_o954 0x16 -#define COLLIDER_o955 0x15 -#define COLLIDER_4 0x14 -#define COLLIDER_o953 0x13 -#define COLLIDER_o948 0x12 -#define COLLIDER_3 0x11 -#define COLLIDER_o952 0x10 -#define COLLIDER_o951 0xF -#define COLLIDER_2 0xE -#define COLLIDER_o945 0xD -#define COLLIDER_o946 0xC -#define COLLIDER_1 0xB -#define COLLIDER_o958 0xA -#define COLLIDER_o944 0x9 -#define COLLIDER_s_2 0x8 -#define COLLIDER_deilit2 0x7 -#define COLLIDER_deili2 0x6 -#define COLLIDER_s_1 0x5 -#define COLLIDER_deilit1 0x4 -#define COLLIDER_deili1 0x3 -#define COLLIDER_10 0x2 -#define COLLIDER_o968 0x1 -#define COLLIDER_o967 0x0 +#define COLLIDER_Root 0x28 +#define COLLIDER_Default 0x27 +#define COLLIDER_o969 0x26 +#define COLLIDER_o959 0x25 +#define COLLIDER_9 0x24 +#define COLLIDER_o855 0x23 +#define COLLIDER_o857 0x22 +#define COLLIDER_8 0x21 +#define COLLIDER_o949 0x20 +#define COLLIDER_o956 0x1F +#define COLLIDER_7 0x1E +#define COLLIDER_o947 0x1D +#define COLLIDER_o940 0x1C +#define COLLIDER_6 0x1B +#define COLLIDER_noko1 0x1A +#define COLLIDER_o957 0x19 +#define COLLIDER_o950 0x18 +#define COLLIDER_5 0x17 +#define COLLIDER_o954 0x16 +#define COLLIDER_o955 0x15 +#define COLLIDER_4 0x14 +#define COLLIDER_o953 0x13 +#define COLLIDER_o948 0x12 +#define COLLIDER_3 0x11 +#define COLLIDER_o952 0x10 +#define COLLIDER_o951 0xF +#define COLLIDER_2 0xE +#define COLLIDER_o945 0xD +#define COLLIDER_o946 0xC +#define COLLIDER_1 0xB +#define COLLIDER_o958 0xA +#define COLLIDER_o944 0x9 +#define COLLIDER_s_2 0x8 +#define COLLIDER_deilit2 0x7 +#define COLLIDER_deili2 0x6 +#define COLLIDER_s_1 0x5 +#define COLLIDER_deilit1 0x4 +#define COLLIDER_deili1 0x3 +#define COLLIDER_10 0x2 +#define COLLIDER_o968 0x1 +#define COLLIDER_o967 0x0 + +#define ZONE_Root 0x5 +#define ZONE_s_1 0x4 +#define ZONE_cam_ue2 0x3 +#define ZONE_cam_ue 0x2 +#define ZONE_o72 0x1 +#define ZONE_bero_1 0x0 + diff --git a/include/mapfs/kmr_07_shape.h b/include/mapfs/kmr_07_shape.h index 5a653005d4..31f0ee0889 100644 --- a/include/mapfs/kmr_07_shape.h +++ b/include/mapfs/kmr_07_shape.h @@ -1,57 +1,58 @@ -#define MODEL_Root 0x38 -#define MODEL_tochi2 0x37 -#define MODEL_g269 0x36 -#define MODEL_o859 0x35 -#define MODEL_s_2 0x34 -#define MODEL_o868 0x33 -#define MODEL_michi_2 0x32 -#define MODEL_jimen_2 0x31 -#define MODEL_kabe_2 0x30 -#define MODEL_bero_2 0x2F -#define MODEL_o855 0x2E -#define MODEL_o854 0x2D -#define MODEL_s_1 0x2C -#define MODEL_g263 0x2B -#define MODEL_o853 0x2A -#define MODEL_o852 0x29 -#define MODEL_g245 0x28 -#define MODEL_chakinoko 0x27 -#define MODEL_ha2 0x26 -#define MODEL_ha1 0x25 -#define MODEL_tochi1 0x24 -#define MODEL_kusao_2 0x23 -#define MODEL_o869 0x22 -#define MODEL_michi_1 0x21 -#define MODEL_jimen_1 0x20 -#define MODEL_kabe_1 0x1F -#define MODEL_g267 0x1E -#define MODEL_o857 0x1D -#define MODEL_o856 0x1C -#define MODEL_g277 0x1B -#define MODEL_o879 0x1A -#define MODEL_kusao_1 0x19 -#define MODEL_o898 0x18 -#define MODEL_o895 0x17 -#define MODEL_o840 0x16 -#define MODEL_o896 0x15 -#define MODEL_o899 0x14 -#define MODEL_o897 0x13 -#define MODEL_o871 0x12 -#define MODEL_o872 0x11 -#define MODEL_o797 0x10 -#define MODEL_o798 0xF -#define MODEL_o799 0xE -#define MODEL_o800 0xD -#define MODEL_ha3 0xC -#define MODEL_4_2 0xB -#define MODEL_4_1 0xA -#define MODEL_3_2 0x9 -#define MODEL_3_1 0x8 -#define MODEL_2_2 0x7 -#define MODEL_2_1 0x6 -#define MODEL_1_2 0x5 -#define MODEL_1_1 0x4 -#define MODEL_o827 0x3 -#define MODEL_o826 0x2 -#define MODEL_o873 0x1 -#define MODEL_o875 0x0 +#define MODEL_Root 0x38 +#define MODEL_tochi2 0x37 +#define MODEL_g269 0x36 +#define MODEL_o859 0x35 +#define MODEL_s_2 0x34 +#define MODEL_o868 0x33 +#define MODEL_michi_2 0x32 +#define MODEL_jimen_2 0x31 +#define MODEL_kabe_2 0x30 +#define MODEL_bero_2 0x2F +#define MODEL_o855 0x2E +#define MODEL_o854 0x2D +#define MODEL_s_1 0x2C +#define MODEL_g263 0x2B +#define MODEL_o853 0x2A +#define MODEL_o852 0x29 +#define MODEL_g245 0x28 +#define MODEL_chakinoko 0x27 +#define MODEL_ha2 0x26 +#define MODEL_ha1 0x25 +#define MODEL_tochi1 0x24 +#define MODEL_kusao_2 0x23 +#define MODEL_o869 0x22 +#define MODEL_michi_1 0x21 +#define MODEL_jimen_1 0x20 +#define MODEL_kabe_1 0x1F +#define MODEL_g267 0x1E +#define MODEL_o857 0x1D +#define MODEL_o856 0x1C +#define MODEL_g277 0x1B +#define MODEL_o879 0x1A +#define MODEL_kusao_1 0x19 +#define MODEL_o898 0x18 +#define MODEL_o895 0x17 +#define MODEL_o840 0x16 +#define MODEL_o896 0x15 +#define MODEL_o899 0x14 +#define MODEL_o897 0x13 +#define MODEL_o871 0x12 +#define MODEL_o872 0x11 +#define MODEL_o797 0x10 +#define MODEL_o798 0xF +#define MODEL_o799 0xE +#define MODEL_o800 0xD +#define MODEL_ha3 0xC +#define MODEL_4_2 0xB +#define MODEL_4_1 0xA +#define MODEL_3_2 0x9 +#define MODEL_3_1 0x8 +#define MODEL_2_2 0x7 +#define MODEL_2_1 0x6 +#define MODEL_1_2 0x5 +#define MODEL_1_1 0x4 +#define MODEL_o827 0x3 +#define MODEL_o826 0x2 +#define MODEL_o873 0x1 +#define MODEL_o875 0x0 + diff --git a/include/mapfs/kmr_09_hit.h b/include/mapfs/kmr_09_hit.h index c75f264fbf..c7eeac4c8e 100644 --- a/include/mapfs/kmr_09_hit.h +++ b/include/mapfs/kmr_09_hit.h @@ -1,14 +1,20 @@ -#define COLLIDER_Root 0xD -#define COLLIDER_g74 0xC -#define COLLIDER_kan 0xB -#define COLLIDER_s_1 0xA -#define COLLIDER_o79 0x9 -#define COLLIDER_o78 0x8 -#define COLLIDER_t2 0x7 -#define COLLIDER_t1 0x6 -#define COLLIDER_d2 0x5 -#define COLLIDER_d1 0x4 -#define COLLIDER_deilit2 0x3 -#define COLLIDER_deili2 0x2 -#define COLLIDER_deilit1 0x1 -#define COLLIDER_deili1 0x0 +#define COLLIDER_Root 0xD +#define COLLIDER_g74 0xC +#define COLLIDER_kan 0xB +#define COLLIDER_s_1 0xA +#define COLLIDER_o79 0x9 +#define COLLIDER_o78 0x8 +#define COLLIDER_t2 0x7 +#define COLLIDER_t1 0x6 +#define COLLIDER_d2 0x5 +#define COLLIDER_d1 0x4 +#define COLLIDER_deilit2 0x3 +#define COLLIDER_deili2 0x2 +#define COLLIDER_deilit1 0x1 +#define COLLIDER_deili1 0x0 + +#define ZONE_Root 0x3 +#define ZONE_g2 0x2 +#define ZONE_bero 0x1 +#define ZONE_o59 0x0 + diff --git a/include/mapfs/kmr_09_shape.h b/include/mapfs/kmr_09_shape.h index ba2e9adae6..30dd5cd564 100644 --- a/include/mapfs/kmr_09_shape.h +++ b/include/mapfs/kmr_09_shape.h @@ -1,55 +1,56 @@ -#define MODEL_Root 0x36 -#define MODEL_g114 0x35 -#define MODEL_o320 0x34 -#define MODEL_kinoko_2 0x33 -#define MODEL_k_kinoko 0x32 -#define MODEL_g2 0x31 -#define MODEL_g30 0x30 -#define MODEL_o82 0x2F -#define MODEL_o81 0x2E -#define MODEL_g22 0x2D -#define MODEL_o59 0x2C -#define MODEL_g23 0x2B -#define MODEL_o61 0x2A -#define MODEL_o60 0x29 -#define MODEL_michi 0x28 -#define MODEL_michi_1 0x27 -#define MODEL_jimen 0x26 -#define MODEL_jimen_2 0x25 -#define MODEL_kabe 0x24 -#define MODEL_kabe_3 0x23 -#define MODEL_saku_3 0x22 -#define MODEL_bero_2 0x21 -#define MODEL_o152 0x20 -#define MODEL_o151 0x1F -#define MODEL_bero_1 0x1E -#define MODEL_o55 0x1D -#define MODEL_o56 0x1C -#define MODEL_o153 0x1B -#define MODEL_g8 0x1A -#define MODEL_near_shigemi1 0x19 -#define MODEL_edge_shigemi 0x18 -#define MODEL_green_edge 0x17 -#define MODEL_g68 0x16 -#define MODEL_o237 0x15 -#define MODEL_o62 0x14 -#define MODEL_o325 0x13 -#define MODEL_o63 0x12 -#define MODEL_o326 0x11 -#define MODEL_ikenasou 0x10 -#define MODEL_cha_kinoko 0xF -#define MODEL_o247 0xE -#define MODEL_saku_1 0xD -#define MODEL_o80 0xC -#define MODEL_o327 0xB -#define MODEL_o77 0xA -#define MODEL_o328 0x9 -#define MODEL_o76 0x8 -#define MODEL_o329 0x7 -#define MODEL_o75 0x6 -#define MODEL_o72 0x5 -#define MODEL_o73 0x4 -#define MODEL_o74 0x3 -#define MODEL_near_shigemi2 0x2 -#define MODEL_far_shigemi 0x1 -#define MODEL_jimen_1 0x0 +#define MODEL_Root 0x36 +#define MODEL_g114 0x35 +#define MODEL_o320 0x34 +#define MODEL_kinoko_2 0x33 +#define MODEL_k_kinoko 0x32 +#define MODEL_g2 0x31 +#define MODEL_g30 0x30 +#define MODEL_o82 0x2F +#define MODEL_o81 0x2E +#define MODEL_g22 0x2D +#define MODEL_o59 0x2C +#define MODEL_g23 0x2B +#define MODEL_o61 0x2A +#define MODEL_o60 0x29 +#define MODEL_michi 0x28 +#define MODEL_michi_1 0x27 +#define MODEL_jimen 0x26 +#define MODEL_jimen_2 0x25 +#define MODEL_kabe 0x24 +#define MODEL_kabe_3 0x23 +#define MODEL_saku_3 0x22 +#define MODEL_bero_2 0x21 +#define MODEL_o152 0x20 +#define MODEL_o151 0x1F +#define MODEL_bero_1 0x1E +#define MODEL_o55 0x1D +#define MODEL_o56 0x1C +#define MODEL_o153 0x1B +#define MODEL_g8 0x1A +#define MODEL_near_shigemi1 0x19 +#define MODEL_edge_shigemi 0x18 +#define MODEL_green_edge 0x17 +#define MODEL_g68 0x16 +#define MODEL_o237 0x15 +#define MODEL_o62 0x14 +#define MODEL_o325 0x13 +#define MODEL_o63 0x12 +#define MODEL_o326 0x11 +#define MODEL_ikenasou 0x10 +#define MODEL_cha_kinoko 0xF +#define MODEL_o247 0xE +#define MODEL_saku_1 0xD +#define MODEL_o80 0xC +#define MODEL_o327 0xB +#define MODEL_o77 0xA +#define MODEL_o328 0x9 +#define MODEL_o76 0x8 +#define MODEL_o329 0x7 +#define MODEL_o75 0x6 +#define MODEL_o72 0x5 +#define MODEL_o73 0x4 +#define MODEL_o74 0x3 +#define MODEL_near_shigemi2 0x2 +#define MODEL_far_shigemi 0x1 +#define MODEL_jimen_1 0x0 + diff --git a/include/mapfs/kmr_10_hit.h b/include/mapfs/kmr_10_hit.h index d21d100f8e..843af1750d 100644 --- a/include/mapfs/kmr_10_hit.h +++ b/include/mapfs/kmr_10_hit.h @@ -1,49 +1,62 @@ -#define COLLIDER_Root 0x30 -#define COLLIDER_g405 0x2F -#define COLLIDER_5 0x2E -#define COLLIDER_k1 0x2D -#define COLLIDER_11 0x2C -#define COLLIDER_ki_a 0x2B -#define COLLIDER_8 0x2A -#define COLLIDER_o1352 0x29 -#define COLLIDER_o1350 0x28 -#define COLLIDER_o1426 0x27 -#define COLLIDER_o1424 0x26 -#define COLLIDER_o1342 0x25 -#define COLLIDER_noko2 0x24 -#define COLLIDER_7 0x23 -#define COLLIDER_o1310 0x22 -#define COLLIDER_o1056 0x21 -#define COLLIDER_6 0x20 -#define COLLIDER_o1317 0x1F -#define COLLIDER_o1308 0x1E -#define COLLIDER_o1319 0x1D -#define COLLIDER_o852 0x1C -#define COLLIDER_4 0x1B -#define COLLIDER_k7 0x1A -#define COLLIDER_k5 0x19 -#define COLLIDER_o1316 0x18 -#define COLLIDER_3 0x17 -#define COLLIDER_k2 0x16 -#define COLLIDER_k8 0x15 -#define COLLIDER_miki1_2 0x14 -#define COLLIDER_miki1_1 0x13 -#define COLLIDER_2 0x12 -#define COLLIDER_jimen_1 0x11 -#define COLLIDER_o1106 0x10 -#define COLLIDER_ha1_3 0xF -#define COLLIDER_o1066 0xE -#define COLLIDER_1 0xD -#define COLLIDER_o1327 0xC -#define COLLIDER_o1107 0xB -#define COLLIDER_o1331 0xA -#define COLLIDER_bero2 0x9 -#define COLLIDER_t2 0x8 -#define COLLIDER_t1 0x7 -#define COLLIDER_deili3 0x6 -#define COLLIDER_d2 0x5 -#define COLLIDER_deilit2 0x4 -#define COLLIDER_deili2 0x3 -#define COLLIDER_d1 0x2 -#define COLLIDER_deili1 0x1 -#define COLLIDER_deilit1 0x0 +#define COLLIDER_Root 0x30 +#define COLLIDER_g405 0x2F +#define COLLIDER_5 0x2E +#define COLLIDER_k1 0x2D +#define COLLIDER_11 0x2C +#define COLLIDER_ki_a 0x2B +#define COLLIDER_8 0x2A +#define COLLIDER_o1352 0x29 +#define COLLIDER_o1350 0x28 +#define COLLIDER_o1426 0x27 +#define COLLIDER_o1424 0x26 +#define COLLIDER_o1342 0x25 +#define COLLIDER_noko2 0x24 +#define COLLIDER_7 0x23 +#define COLLIDER_o1310 0x22 +#define COLLIDER_o1056 0x21 +#define COLLIDER_6 0x20 +#define COLLIDER_o1317 0x1F +#define COLLIDER_o1308 0x1E +#define COLLIDER_o1319 0x1D +#define COLLIDER_o852 0x1C +#define COLLIDER_4 0x1B +#define COLLIDER_k7 0x1A +#define COLLIDER_k5 0x19 +#define COLLIDER_o1316 0x18 +#define COLLIDER_3 0x17 +#define COLLIDER_k2 0x16 +#define COLLIDER_k8 0x15 +#define COLLIDER_miki1_2 0x14 +#define COLLIDER_miki1_1 0x13 +#define COLLIDER_2 0x12 +#define COLLIDER_jimen_1 0x11 +#define COLLIDER_o1106 0x10 +#define COLLIDER_ha1_3 0xF +#define COLLIDER_o1066 0xE +#define COLLIDER_1 0xD +#define COLLIDER_o1327 0xC +#define COLLIDER_o1107 0xB +#define COLLIDER_o1331 0xA +#define COLLIDER_bero2 0x9 +#define COLLIDER_t2 0x8 +#define COLLIDER_t1 0x7 +#define COLLIDER_deili3 0x6 +#define COLLIDER_d2 0x5 +#define COLLIDER_deilit2 0x4 +#define COLLIDER_deili2 0x3 +#define COLLIDER_d1 0x2 +#define COLLIDER_deili1 0x1 +#define COLLIDER_deilit1 0x0 + +#define ZONE_Root 0xA +#define ZONE_g392 0x9 +#define ZONE_o1355 0x8 +#define ZONE_g391 0x7 +#define ZONE_2 0x6 +#define ZONE_o1354 0x5 +#define ZONE_g390 0x4 +#define ZONE_1 0x3 +#define ZONE_o1348 0x2 +#define ZONE_Default 0x1 +#define ZONE_o1025 0x0 + diff --git a/include/mapfs/kmr_10_shape.h b/include/mapfs/kmr_10_shape.h index 7852443700..3dc8e867be 100644 --- a/include/mapfs/kmr_10_shape.h +++ b/include/mapfs/kmr_10_shape.h @@ -1,79 +1,80 @@ -#define MODEL_Root 0x4E -#define MODEL_mac 0x4D -#define MODEL_m_mici 0x4C -#define MODEL_o1310 0x4B -#define MODEL_o1319 0x4A -#define MODEL_o1311 0x49 -#define MODEL_g350 0x48 -#define MODEL_o1373 0x47 -#define MODEL_o1372 0x46 -#define MODEL_o1365 0x45 -#define MODEL_o1364 0x44 -#define MODEL_o1363 0x43 -#define MODEL_o1362 0x42 -#define MODEL_o1327 0x41 -#define MODEL_o1106 0x40 -#define MODEL_o1104 0x3F -#define MODEL_o1103 0x3E -#define MODEL_o1101 0x3D -#define MODEL_ki_1 0x3C -#define MODEL_ha1_3 0x3B -#define MODEL_ha1_2 0x3A -#define MODEL_ha1_1 0x39 -#define MODEL_miki1_2 0x38 -#define MODEL_miki1_1 0x37 -#define MODEL_o1066 0x36 -#define MODEL_bero 0x35 -#define MODEL_o1306 0x34 -#define MODEL_o1305 0x33 -#define MODEL_g386 0x32 -#define MODEL_o1353 0x31 -#define MODEL_o1349 0x30 -#define MODEL_kmr 0x2F -#define MODEL_obj 0x2E -#define MODEL_kusa 0x2D -#define MODEL_o1416 0x2C -#define MODEL_o1336 0x2B -#define MODEL_kinoko 0x2A -#define MODEL_ha 0x29 -#define MODEL_o1335 0x28 -#define MODEL_o1334 0x27 -#define MODEL_o1056 0x26 -#define MODEL_saku 0x25 -#define MODEL_saku_2 0x24 -#define MODEL_bero2 0x23 -#define MODEL_o1025 0x22 -#define MODEL_o1024 0x21 -#define MODEL_honntai 0x20 -#define MODEL_cam1 0x1F -#define MODEL_jimen3_5 0x1E -#define MODEL_o1308 0x1D -#define MODEL_jimen_1 0x1C -#define MODEL_k 0x1B -#define MODEL_o1384 0x1A -#define MODEL_o1382 0x19 -#define MODEL_k7 0x18 -#define MODEL_k6 0x17 -#define MODEL_k5 0x16 -#define MODEL_k4 0x15 -#define MODEL_k3 0x14 -#define MODEL_k2 0x13 -#define MODEL_k1 0x12 -#define MODEL_k0 0x11 -#define MODEL_g391 0x10 -#define MODEL_o1424 0xF -#define MODEL_o1425 0xE -#define MODEL_o1427 0xD -#define MODEL_o1426 0xC -#define MODEL_o1397 0xB -#define MODEL_o1430 0xA -#define MODEL_o1429 0x9 -#define MODEL_o1432 0x8 -#define MODEL_o1431 0x7 -#define MODEL_o1057 0x6 -#define MODEL_o1399 0x5 -#define MODEL_o1329 0x4 -#define MODEL_o1317 0x3 -#define MODEL_o1316 0x2 -#define MODEL_o1314 0x1 -#define MODEL_o1417 0x0 +#define MODEL_Root 0x4E +#define MODEL_mac 0x4D +#define MODEL_m_mici 0x4C +#define MODEL_o1310 0x4B +#define MODEL_o1319 0x4A +#define MODEL_o1311 0x49 +#define MODEL_g350 0x48 +#define MODEL_o1373 0x47 +#define MODEL_o1372 0x46 +#define MODEL_o1365 0x45 +#define MODEL_o1364 0x44 +#define MODEL_o1363 0x43 +#define MODEL_o1362 0x42 +#define MODEL_o1327 0x41 +#define MODEL_o1106 0x40 +#define MODEL_o1104 0x3F +#define MODEL_o1103 0x3E +#define MODEL_o1101 0x3D +#define MODEL_ki_1 0x3C +#define MODEL_ha1_3 0x3B +#define MODEL_ha1_2 0x3A +#define MODEL_ha1_1 0x39 +#define MODEL_miki1_2 0x38 +#define MODEL_miki1_1 0x37 +#define MODEL_o1066 0x36 +#define MODEL_bero 0x35 +#define MODEL_o1306 0x34 +#define MODEL_o1305 0x33 +#define MODEL_g386 0x32 +#define MODEL_o1353 0x31 +#define MODEL_o1349 0x30 +#define MODEL_kmr 0x2F +#define MODEL_obj 0x2E +#define MODEL_kusa 0x2D +#define MODEL_o1416 0x2C +#define MODEL_o1336 0x2B +#define MODEL_kinoko 0x2A +#define MODEL_ha 0x29 +#define MODEL_o1335 0x28 +#define MODEL_o1334 0x27 +#define MODEL_o1056 0x26 +#define MODEL_saku 0x25 +#define MODEL_saku_2 0x24 +#define MODEL_bero2 0x23 +#define MODEL_o1025 0x22 +#define MODEL_o1024 0x21 +#define MODEL_honntai 0x20 +#define MODEL_cam1 0x1F +#define MODEL_jimen3_5 0x1E +#define MODEL_o1308 0x1D +#define MODEL_jimen_1 0x1C +#define MODEL_k 0x1B +#define MODEL_o1384 0x1A +#define MODEL_o1382 0x19 +#define MODEL_k7 0x18 +#define MODEL_k6 0x17 +#define MODEL_k5 0x16 +#define MODEL_k4 0x15 +#define MODEL_k3 0x14 +#define MODEL_k2 0x13 +#define MODEL_k1 0x12 +#define MODEL_k0 0x11 +#define MODEL_g391 0x10 +#define MODEL_o1424 0xF +#define MODEL_o1425 0xE +#define MODEL_o1427 0xD +#define MODEL_o1426 0xC +#define MODEL_o1397 0xB +#define MODEL_o1430 0xA +#define MODEL_o1429 0x9 +#define MODEL_o1432 0x8 +#define MODEL_o1431 0x7 +#define MODEL_o1057 0x6 +#define MODEL_o1399 0x5 +#define MODEL_o1329 0x4 +#define MODEL_o1317 0x3 +#define MODEL_o1316 0x2 +#define MODEL_o1314 0x1 +#define MODEL_o1417 0x0 + diff --git a/include/mapfs/kmr_11_hit.h b/include/mapfs/kmr_11_hit.h index c36e70a4a0..a7727f80ae 100644 --- a/include/mapfs/kmr_11_hit.h +++ b/include/mapfs/kmr_11_hit.h @@ -1,45 +1,66 @@ -#define COLLIDER_Root 0x2C -#define COLLIDER_g174 0x2B -#define COLLIDER_o486 0x2A -#define COLLIDER_o485 0x29 -#define COLLIDER_o484 0x28 -#define COLLIDER_o483 0x27 -#define COLLIDER_east 0x26 -#define COLLIDER_deilitne 0x25 -#define COLLIDER_deiline 0x24 -#define COLLIDER_ok422 0x23 -#define COLLIDER_ok478 0x22 -#define COLLIDER_o482 0x21 -#define COLLIDER_point 0x20 -#define COLLIDER_road2 0x1F -#define COLLIDER_o195 0x1E -#define COLLIDER_o477 0x1D -#define COLLIDER_o476 0x1C -#define COLLIDER_o465 0x1B -#define COLLIDER_west 0x1A -#define COLLIDER_kusa4 0x19 -#define COLLIDER_deilitw 0x18 -#define COLLIDER_deiliw 0x17 -#define COLLIDER_ok479 0x16 -#define COLLIDER_o475 0x15 -#define COLLIDER_o419 0x14 -#define COLLIDER_o405 0x13 -#define COLLIDER_o406 0x12 -#define COLLIDER_o389 0x11 -#define COLLIDER_stage 0x10 -#define COLLIDER_o427 0xF -#define COLLIDER_o429 0xE -#define COLLIDER_kusa2 0xD -#define COLLIDER_kusa1 0xC -#define COLLIDER_tree2 0xB -#define COLLIDER_tree1 0xA -#define COLLIDER_bridge 0x9 -#define COLLIDER_b1 0x8 -#define COLLIDER_kuriking_toride 0x7 -#define COLLIDER_o509 0x6 -#define COLLIDER_tt 0x5 -#define COLLIDER_en2 0x4 -#define COLLIDER_en1 0x3 -#define COLLIDER_shita 0x2 -#define COLLIDER_o488 0x1 -#define COLLIDER_o403 0x0 +#define COLLIDER_Root 0x2C +#define COLLIDER_g174 0x2B +#define COLLIDER_o486 0x2A +#define COLLIDER_o485 0x29 +#define COLLIDER_o484 0x28 +#define COLLIDER_o483 0x27 +#define COLLIDER_east 0x26 +#define COLLIDER_deilitne 0x25 +#define COLLIDER_deiline 0x24 +#define COLLIDER_ok422 0x23 +#define COLLIDER_ok478 0x22 +#define COLLIDER_o482 0x21 +#define COLLIDER_point 0x20 +#define COLLIDER_road2 0x1F +#define COLLIDER_o195 0x1E +#define COLLIDER_o477 0x1D +#define COLLIDER_o476 0x1C +#define COLLIDER_o465 0x1B +#define COLLIDER_west 0x1A +#define COLLIDER_kusa4 0x19 +#define COLLIDER_deilitw 0x18 +#define COLLIDER_deiliw 0x17 +#define COLLIDER_ok479 0x16 +#define COLLIDER_o475 0x15 +#define COLLIDER_o419 0x14 +#define COLLIDER_o405 0x13 +#define COLLIDER_o406 0x12 +#define COLLIDER_o389 0x11 +#define COLLIDER_stage 0x10 +#define COLLIDER_o427 0xF +#define COLLIDER_o429 0xE +#define COLLIDER_kusa2 0xD +#define COLLIDER_kusa1 0xC +#define COLLIDER_tree2 0xB +#define COLLIDER_tree1 0xA +#define COLLIDER_bridge 0x9 +#define COLLIDER_b1 0x8 +#define COLLIDER_kuriking_toride 0x7 +#define COLLIDER_o509 0x6 +#define COLLIDER_tt 0x5 +#define COLLIDER_en2 0x4 +#define COLLIDER_en1 0x3 +#define COLLIDER_shita 0x2 +#define COLLIDER_o488 0x1 +#define COLLIDER_o403 0x0 + +#define ZONE_Root 0x12 +#define ZONE_Default 0x11 +#define ZONE_o482 0x10 +#define ZONE_o479 0xF +#define ZONE_higashi 0xE +#define ZONE_point 0xD +#define ZONE_o438 0xC +#define ZONE_road2 0xB +#define ZONE_nishi 0xA +#define ZONE_west_side 0x9 +#define ZONE_event_cam 0x8 +#define ZONE_c2_2 0x7 +#define ZONE_c2_1 0x6 +#define ZONE_c1_2 0x5 +#define ZONE_c1_1 0x4 +#define ZONE_obj 0x3 +#define ZONE_deiline 0x2 +#define ZONE_field 0x1 +#define ZONE_bridge 0x0 + diff --git a/include/mapfs/kmr_11_shape.h b/include/mapfs/kmr_11_shape.h index 09478f8d4a..018f742ecb 100644 --- a/include/mapfs/kmr_11_shape.h +++ b/include/mapfs/kmr_11_shape.h @@ -1,141 +1,142 @@ -#define MODEL_Root 0x8C -#define MODEL_g173 0x8B -#define MODEL_dummy29 0x8A -#define MODEL_dummy28 0x89 -#define MODEL_dummy27 0x88 -#define MODEL_dummy23 0x87 -#define MODEL_dummy22 0x86 -#define MODEL_dummy21 0x85 -#define MODEL_dummy11 0x84 -#define MODEL_dummy10 0x83 -#define MODEL_dummy9 0x82 -#define MODEL_dummy8 0x81 -#define MODEL_dummy6 0x80 -#define MODEL_dummy5 0x7F -#define MODEL_dummy4 0x7E -#define MODEL_dummy7 0x7D -#define MODEL_g172 0x7C -#define MODEL_dummy1 0x7B -#define MODEL_dummy2 0x7A -#define MODEL_dummy3 0x79 -#define MODEL_dummy30 0x78 -#define MODEL_dummy31 0x77 -#define MODEL_dummy32 0x76 -#define MODEL_dummy 0x75 -#define MODEL_event_cam 0x74 -#define MODEL_c2_2 0x73 -#define MODEL_c2_1 0x72 -#define MODEL_c1_2 0x71 -#define MODEL_c1_1 0x70 -#define MODEL_g169 0x6F -#define MODEL_o432 0x6E -#define MODEL_o431 0x6D -#define MODEL_o430 0x6C -#define MODEL_o429 0x6B -#define MODEL_kuki_3 0x6A -#define MODEL_ha_3 0x69 -#define MODEL_obj 0x68 -#define MODEL_zasso_2 0x67 -#define MODEL_z_1 0x66 -#define MODEL_kusa_3 0x65 -#define MODEL_kusa3_1 0x64 -#define MODEL_kusa_2 0x63 -#define MODEL_mae_shigemi 0x62 -#define MODEL_kusa_1 0x61 -#define MODEL_kusa4 0x60 -#define MODEL_kusa3 0x5F -#define MODEL_kusa2 0x5E -#define MODEL_kusa1 0x5D -#define MODEL_o519 0x5C -#define MODEL_o518 0x5B -#define MODEL_o195 0x5A -#define MODEL_o527 0x59 -#define MODEL_o422 0x58 -#define MODEL_o524 0x57 -#define MODEL_o517 0x56 -#define MODEL_o418 0x55 -#define MODEL_o417 0x54 -#define MODEL_o147 0x53 -#define MODEL_o113 0x52 -#define MODEL_o427 0x51 -#define MODEL_o464 0x50 -#define MODEL_tree 0x4F -#define MODEL_o349 0x4E -#define MODEL_o352 0x4D -#define MODEL_o461 0x4C -#define MODEL_o458 0x4B -#define MODEL_g170 0x4A -#define MODEL_o389 0x49 -#define MODEL_field 0x48 -#define MODEL_o525 0x47 -#define MODEL_o510 0x46 -#define MODEL_o474 0x45 -#define MODEL_o468 0x44 -#define MODEL_o467 0x43 -#define MODEL_point 0x42 -#define MODEL_o465 0x41 -#define MODEL_o457 0x40 -#define MODEL_o406 0x3F -#define MODEL_o405 0x3E -#define MODEL_o438 0x3D -#define MODEL_road2 0x3C -#define MODEL_o404 0x3B -#define MODEL_o355 0x3A -#define MODEL_stage 0x39 -#define MODEL_o515 0x38 -#define MODEL_o387 0x37 -#define MODEL_o386 0x36 -#define MODEL_bridge 0x35 -#define MODEL_bb 0x34 -#define MODEL_b6 0x33 -#define MODEL_b5 0x32 -#define MODEL_b4 0x31 -#define MODEL_b3 0x30 -#define MODEL_b2 0x2F -#define MODEL_b1 0x2E -#define MODEL_g176 0x2D -#define MODEL_o433 0x2C -#define MODEL_g175tm 0x2B -#define MODEL_o423 0x2A -#define MODEL_o521 0x29 -#define MODEL_o393 0x28 -#define MODEL_o526 0x27 -#define MODEL_o528 0x26 -#define MODEL_kuriking_toride 0x25 -#define MODEL_sotokabe 0x24 -#define MODEL_tf3 0x23 -#define MODEL_tf2 0x22 -#define MODEL_tf1 0x21 -#define MODEL_te3 0x20 -#define MODEL_te2 0x1F -#define MODEL_te1 0x1E -#define MODEL_td3 0x1D -#define MODEL_td2 0x1C -#define MODEL_td1 0x1B -#define MODEL_tc3 0x1A -#define MODEL_tc2 0x19 -#define MODEL_tc1 0x18 -#define MODEL_tb3 0x17 -#define MODEL_tb2 0x16 -#define MODEL_tb1 0x15 -#define MODEL_ta3 0x14 -#define MODEL_ta2 0x13 -#define MODEL_ta1 0x12 -#define MODEL_mekakushi 0x11 -#define MODEL_eye_mask 0x10 -#define MODEL_tobira 0xF -#define MODEL_to2 0xE -#define MODEL_o416 0xD -#define MODEL_to1 0xC -#define MODEL_o415 0xB -#define MODEL_shita 0xA -#define MODEL_o402 0x9 -#define MODEL_o403 0x8 -#define MODEL_o369 0x7 -#define MODEL_o368 0x6 -#define MODEL_o414 0x5 -#define MODEL_ue 0x4 -#define MODEL_mado3 0x3 -#define MODEL_mado2 0x2 -#define MODEL_mado1 0x1 -#define MODEL_top 0x0 +#define MODEL_Root 0x8C +#define MODEL_g173 0x8B +#define MODEL_dummy29 0x8A +#define MODEL_dummy28 0x89 +#define MODEL_dummy27 0x88 +#define MODEL_dummy23 0x87 +#define MODEL_dummy22 0x86 +#define MODEL_dummy21 0x85 +#define MODEL_dummy11 0x84 +#define MODEL_dummy10 0x83 +#define MODEL_dummy9 0x82 +#define MODEL_dummy8 0x81 +#define MODEL_dummy6 0x80 +#define MODEL_dummy5 0x7F +#define MODEL_dummy4 0x7E +#define MODEL_dummy7 0x7D +#define MODEL_g172 0x7C +#define MODEL_dummy1 0x7B +#define MODEL_dummy2 0x7A +#define MODEL_dummy3 0x79 +#define MODEL_dummy30 0x78 +#define MODEL_dummy31 0x77 +#define MODEL_dummy32 0x76 +#define MODEL_dummy 0x75 +#define MODEL_event_cam 0x74 +#define MODEL_c2_2 0x73 +#define MODEL_c2_1 0x72 +#define MODEL_c1_2 0x71 +#define MODEL_c1_1 0x70 +#define MODEL_g169 0x6F +#define MODEL_o432 0x6E +#define MODEL_o431 0x6D +#define MODEL_o430 0x6C +#define MODEL_o429 0x6B +#define MODEL_kuki_3 0x6A +#define MODEL_ha_3 0x69 +#define MODEL_obj 0x68 +#define MODEL_zasso_2 0x67 +#define MODEL_z_1 0x66 +#define MODEL_kusa_3 0x65 +#define MODEL_kusa3_1 0x64 +#define MODEL_kusa_2 0x63 +#define MODEL_mae_shigemi 0x62 +#define MODEL_kusa_1 0x61 +#define MODEL_kusa4 0x60 +#define MODEL_kusa3 0x5F +#define MODEL_kusa2 0x5E +#define MODEL_kusa1 0x5D +#define MODEL_o519 0x5C +#define MODEL_o518 0x5B +#define MODEL_o195 0x5A +#define MODEL_o527 0x59 +#define MODEL_o422 0x58 +#define MODEL_o524 0x57 +#define MODEL_o517 0x56 +#define MODEL_o418 0x55 +#define MODEL_o417 0x54 +#define MODEL_o147 0x53 +#define MODEL_o113 0x52 +#define MODEL_o427 0x51 +#define MODEL_o464 0x50 +#define MODEL_tree 0x4F +#define MODEL_o349 0x4E +#define MODEL_o352 0x4D +#define MODEL_o461 0x4C +#define MODEL_o458 0x4B +#define MODEL_g170 0x4A +#define MODEL_o389 0x49 +#define MODEL_field 0x48 +#define MODEL_o525 0x47 +#define MODEL_o510 0x46 +#define MODEL_o474 0x45 +#define MODEL_o468 0x44 +#define MODEL_o467 0x43 +#define MODEL_point 0x42 +#define MODEL_o465 0x41 +#define MODEL_o457 0x40 +#define MODEL_o406 0x3F +#define MODEL_o405 0x3E +#define MODEL_o438 0x3D +#define MODEL_road2 0x3C +#define MODEL_o404 0x3B +#define MODEL_o355 0x3A +#define MODEL_stage 0x39 +#define MODEL_o515 0x38 +#define MODEL_o387 0x37 +#define MODEL_o386 0x36 +#define MODEL_bridge 0x35 +#define MODEL_bb 0x34 +#define MODEL_b6 0x33 +#define MODEL_b5 0x32 +#define MODEL_b4 0x31 +#define MODEL_b3 0x30 +#define MODEL_b2 0x2F +#define MODEL_b1 0x2E +#define MODEL_g176 0x2D +#define MODEL_o433 0x2C +#define MODEL_g175tm 0x2B +#define MODEL_o423 0x2A +#define MODEL_o521 0x29 +#define MODEL_o393 0x28 +#define MODEL_o526 0x27 +#define MODEL_o528 0x26 +#define MODEL_kuriking_toride 0x25 +#define MODEL_sotokabe 0x24 +#define MODEL_tf3 0x23 +#define MODEL_tf2 0x22 +#define MODEL_tf1 0x21 +#define MODEL_te3 0x20 +#define MODEL_te2 0x1F +#define MODEL_te1 0x1E +#define MODEL_td3 0x1D +#define MODEL_td2 0x1C +#define MODEL_td1 0x1B +#define MODEL_tc3 0x1A +#define MODEL_tc2 0x19 +#define MODEL_tc1 0x18 +#define MODEL_tb3 0x17 +#define MODEL_tb2 0x16 +#define MODEL_tb1 0x15 +#define MODEL_ta3 0x14 +#define MODEL_ta2 0x13 +#define MODEL_ta1 0x12 +#define MODEL_mekakushi 0x11 +#define MODEL_eye_mask 0x10 +#define MODEL_tobira 0xF +#define MODEL_to2 0xE +#define MODEL_o416 0xD +#define MODEL_to1 0xC +#define MODEL_o415 0xB +#define MODEL_shita 0xA +#define MODEL_o402 0x9 +#define MODEL_o403 0x8 +#define MODEL_o369 0x7 +#define MODEL_o368 0x6 +#define MODEL_o414 0x5 +#define MODEL_ue 0x4 +#define MODEL_mado3 0x3 +#define MODEL_mado2 0x2 +#define MODEL_mado1 0x1 +#define MODEL_top 0x0 + diff --git a/include/mapfs/kmr_12_hit.h b/include/mapfs/kmr_12_hit.h index 7805e8fdb2..a4cdadddd0 100644 --- a/include/mapfs/kmr_12_hit.h +++ b/include/mapfs/kmr_12_hit.h @@ -1,14 +1,20 @@ -#define COLLIDER_Root 0xD -#define COLLIDER_Default 0xC -#define COLLIDER_o157 0xB -#define COLLIDER_o78 0xA -#define COLLIDER_s_1 0x9 -#define COLLIDER_o79 0x8 -#define COLLIDER_t2 0x7 -#define COLLIDER_t1 0x6 -#define COLLIDER_d2 0x5 -#define COLLIDER_deilit2 0x4 -#define COLLIDER_deili2 0x3 -#define COLLIDER_d1 0x2 -#define COLLIDER_deilit1 0x1 -#define COLLIDER_deili1 0x0 +#define COLLIDER_Root 0xD +#define COLLIDER_Default 0xC +#define COLLIDER_o157 0xB +#define COLLIDER_o78 0xA +#define COLLIDER_s_1 0x9 +#define COLLIDER_o79 0x8 +#define COLLIDER_t2 0x7 +#define COLLIDER_t1 0x6 +#define COLLIDER_d2 0x5 +#define COLLIDER_deilit2 0x4 +#define COLLIDER_deili2 0x3 +#define COLLIDER_d1 0x2 +#define COLLIDER_deilit1 0x1 +#define COLLIDER_deili1 0x0 + +#define ZONE_Root 0x3 +#define ZONE_g2 0x2 +#define ZONE_bero 0x1 +#define ZONE_o59 0x0 + diff --git a/include/mapfs/kmr_12_shape.h b/include/mapfs/kmr_12_shape.h index fb5d2ee4ab..3dc32a01ba 100644 --- a/include/mapfs/kmr_12_shape.h +++ b/include/mapfs/kmr_12_shape.h @@ -1,41 +1,42 @@ -#define MODEL_Root 0x28 -#define MODEL_g69 0x27 -#define MODEL_o166 0x26 -#define MODEL_g8 0x25 -#define MODEL_o164 0x24 -#define MODEL_o158 0x23 -#define MODEL_green_edge 0x22 -#define MODEL_g2 0x21 -#define MODEL_g30 0x20 -#define MODEL_o82 0x1F -#define MODEL_o81 0x1E -#define MODEL_g22 0x1D -#define MODEL_o59 0x1C -#define MODEL_g23 0x1B -#define MODEL_o61 0x1A -#define MODEL_o60 0x19 -#define MODEL_michi 0x18 -#define MODEL_michi_1 0x17 -#define MODEL_jimen 0x16 -#define MODEL_jimen_2 0x15 -#define MODEL_kabe 0x14 -#define MODEL_kabe_3 0x13 -#define MODEL_bero_2 0x12 -#define MODEL_o152 0x11 -#define MODEL_o151 0x10 -#define MODEL_bero_1 0xF -#define MODEL_o55 0xE -#define MODEL_o56 0xD -#define MODEL_g73 0xC -#define MODEL_o153 0xB -#define MODEL_o169 0xA -#define MODEL_o160 0x9 -#define MODEL_ikenasou 0x8 -#define MODEL_cha_kinoko 0x7 -#define MODEL_o159 0x6 -#define MODEL_far_shigemi 0x5 -#define MODEL_o154 0x4 -#define MODEL_o80 0x3 -#define MODEL_o162 0x2 -#define MODEL_o157 0x1 -#define MODEL_jimen_1 0x0 +#define MODEL_Root 0x28 +#define MODEL_g69 0x27 +#define MODEL_o166 0x26 +#define MODEL_g8 0x25 +#define MODEL_o164 0x24 +#define MODEL_o158 0x23 +#define MODEL_green_edge 0x22 +#define MODEL_g2 0x21 +#define MODEL_g30 0x20 +#define MODEL_o82 0x1F +#define MODEL_o81 0x1E +#define MODEL_g22 0x1D +#define MODEL_o59 0x1C +#define MODEL_g23 0x1B +#define MODEL_o61 0x1A +#define MODEL_o60 0x19 +#define MODEL_michi 0x18 +#define MODEL_michi_1 0x17 +#define MODEL_jimen 0x16 +#define MODEL_jimen_2 0x15 +#define MODEL_kabe 0x14 +#define MODEL_kabe_3 0x13 +#define MODEL_bero_2 0x12 +#define MODEL_o152 0x11 +#define MODEL_o151 0x10 +#define MODEL_bero_1 0xF +#define MODEL_o55 0xE +#define MODEL_o56 0xD +#define MODEL_g73 0xC +#define MODEL_o153 0xB +#define MODEL_o169 0xA +#define MODEL_o160 0x9 +#define MODEL_ikenasou 0x8 +#define MODEL_cha_kinoko 0x7 +#define MODEL_o159 0x6 +#define MODEL_far_shigemi 0x5 +#define MODEL_o154 0x4 +#define MODEL_o80 0x3 +#define MODEL_o162 0x2 +#define MODEL_o157 0x1 +#define MODEL_jimen_1 0x0 + diff --git a/include/mapfs/kmr_20_hit.h b/include/mapfs/kmr_20_hit.h index 1c030b964d..b929555466 100644 --- a/include/mapfs/kmr_20_hit.h +++ b/include/mapfs/kmr_20_hit.h @@ -1,44 +1,54 @@ -#define COLLIDER_Root 0x2B -#define COLLIDER_g72 0x2A -#define COLLIDER_g75 0x29 -#define COLLIDER_o240 0x28 -#define COLLIDER_o312 0x27 -#define COLLIDER_g76 0x26 -#define COLLIDER_o367 0x25 -#define COLLIDER_o357 0x24 -#define COLLIDER_o352 0x23 -#define COLLIDER_o251 0x22 -#define COLLIDER_o311 0x21 -#define COLLIDER_o252 0x20 -#define COLLIDER_g77 0x1F -#define COLLIDER_o366 0x1E -#define COLLIDER_o355 0x1D -#define COLLIDER_o332 0x1C -#define COLLIDER_o314 0x1B -#define COLLIDER_o313 0x1A -#define COLLIDER_o310 0x19 -#define COLLIDER_g74 0x18 -#define COLLIDER_o246 0x17 -#define COLLIDER_o245 0x16 -#define COLLIDER_g84 0x15 -#define COLLIDER_o349 0x14 -#define COLLIDER_o347 0x13 -#define COLLIDER_o348 0x12 -#define COLLIDER_o350 0x11 -#define COLLIDER_o337 0x10 -#define COLLIDER_o341 0xF -#define COLLIDER_o305 0xE -#define COLLIDER_o244 0xD -#define COLLIDER_g73 0xC -#define COLLIDER_o365 0xB -#define COLLIDER_o364 0xA -#define COLLIDER_o363 0x9 -#define COLLIDER_o362 0x8 -#define COLLIDER_o361 0x7 -#define COLLIDER_o360 0x6 -#define COLLIDER_o359 0x5 -#define COLLIDER_o317 0x4 -#define COLLIDER_o316 0x3 -#define COLLIDER_o304 0x2 -#define COLLIDER_o130 0x1 -#define COLLIDER_o307 0x0 +#define COLLIDER_Root 0x2B +#define COLLIDER_g72 0x2A +#define COLLIDER_g75 0x29 +#define COLLIDER_o240 0x28 +#define COLLIDER_o312 0x27 +#define COLLIDER_g76 0x26 +#define COLLIDER_o367 0x25 +#define COLLIDER_o357 0x24 +#define COLLIDER_o352 0x23 +#define COLLIDER_o251 0x22 +#define COLLIDER_o311 0x21 +#define COLLIDER_o252 0x20 +#define COLLIDER_g77 0x1F +#define COLLIDER_o366 0x1E +#define COLLIDER_o355 0x1D +#define COLLIDER_o332 0x1C +#define COLLIDER_o314 0x1B +#define COLLIDER_o313 0x1A +#define COLLIDER_o310 0x19 +#define COLLIDER_g74 0x18 +#define COLLIDER_o246 0x17 +#define COLLIDER_o245 0x16 +#define COLLIDER_g84 0x15 +#define COLLIDER_o349 0x14 +#define COLLIDER_o347 0x13 +#define COLLIDER_o348 0x12 +#define COLLIDER_o350 0x11 +#define COLLIDER_o337 0x10 +#define COLLIDER_o341 0xF +#define COLLIDER_o305 0xE +#define COLLIDER_o244 0xD +#define COLLIDER_g73 0xC +#define COLLIDER_o365 0xB +#define COLLIDER_o364 0xA +#define COLLIDER_o363 0x9 +#define COLLIDER_o362 0x8 +#define COLLIDER_o361 0x7 +#define COLLIDER_o360 0x6 +#define COLLIDER_o359 0x5 +#define COLLIDER_o317 0x4 +#define COLLIDER_o316 0x3 +#define COLLIDER_o304 0x2 +#define COLLIDER_o130 0x1 +#define COLLIDER_o307 0x0 + +#define ZONE_Root 0x7 +#define ZONE_g2 0x6 +#define ZONE_o14 0x5 +#define ZONE_o3 0x4 +#define ZONE_o2 0x3 +#define ZONE_g1 0x2 +#define ZONE_o18 0x1 +#define ZONE_o1 0x0 + diff --git a/include/mapfs/kmr_20_shape.h b/include/mapfs/kmr_20_shape.h index 1cf91a9e23..aa30a8c341 100644 --- a/include/mapfs/kmr_20_shape.h +++ b/include/mapfs/kmr_20_shape.h @@ -1,272 +1,273 @@ -#define MODEL_Root 0x10F -#define MODEL_g1 0x10E -#define MODEL_g62 0x10D -#define MODEL_g56 0x10C -#define MODEL_g16 0x10B -#define MODEL_o250 0x10A -#define MODEL_o248 0x109 -#define MODEL_o246 0x108 -#define MODEL_o244 0x107 -#define MODEL_o242 0x106 -#define MODEL_o58 0x105 -#define MODEL_o57 0x104 -#define MODEL_o56 0x103 -#define MODEL_o55 0x102 -#define MODEL_o54 0x101 -#define MODEL_g17 0x100 -#define MODEL_o62 0xFF -#define MODEL_o63 0xFE -#define MODEL_o61 0xFD -#define MODEL_g110 0xFC -#define MODEL_o400 0xFB -#define MODEL_o399 0xFA -#define MODEL_o398 0xF9 -#define MODEL_g8 0xF8 -#define MODEL_o59 0xF7 -#define MODEL_o60 0xF6 -#define MODEL_o18 0xF5 -#define MODEL_g18 0xF4 -#define MODEL_o67 0xF3 -#define MODEL_o65 0xF2 -#define MODEL_o66 0xF1 -#define MODEL_g46 0xF0 -#define MODEL_o167 0xEF -#define MODEL_o166 0xEE -#define MODEL_o155 0xED -#define MODEL_o154 0xEC -#define MODEL_o159 0xEB -#define MODEL_o161 0xEA -#define MODEL_o352 0xE9 -#define MODEL_o160 0xE8 -#define MODEL_g64 0xE7 -#define MODEL_o301 0xE6 -#define MODEL_o263 0xE5 -#define MODEL_o285 0xE4 -#define MODEL_o284 0xE3 -#define MODEL_o273 0xE2 -#define MODEL_o395 0xE1 -#define MODEL_o274 0xE0 -#define MODEL_o272 0xDF -#define MODEL_o300 0xDE -#define MODEL_o299 0xDD -#define MODEL_g9 0xDC -#define MODEL_o24 0xDB -#define MODEL_o23 0xDA -#define MODEL_o22 0xD9 -#define MODEL_g67 0xD8 -#define MODEL_o296 0xD7 -#define MODEL_o295 0xD6 -#define MODEL_o294 0xD5 -#define MODEL_o240 0xD4 -#define MODEL_o239 0xD3 -#define MODEL_o238 0xD2 -#define MODEL_g6 0xD1 -#define MODEL_o25 0xD0 -#define MODEL_o254 0xCF -#define MODEL_o27 0xCE -#define MODEL_o12 0xCD -#define MODEL_o26 0xCC -#define MODEL_o11 0xCB -#define MODEL_g7 0xCA -#define MODEL_o29 0xC9 -#define MODEL_o16 0xC8 -#define MODEL_o28 0xC7 -#define MODEL_o14 0xC6 -#define MODEL_o17 0xC5 -#define MODEL_o13 0xC4 -#define MODEL_o15 0xC3 -#define MODEL_o235 0xC2 -#define MODEL_o236 0xC1 -#define MODEL_o232 0xC0 -#define MODEL_o233 0xBF -#define MODEL_o231 0xBE -#define MODEL_o234 0xBD -#define MODEL_o118 0xBC -#define MODEL_o96 0xBB -#define MODEL_o230 0xBA -#define MODEL_g10 0xB9 -#define MODEL_o162 0xB8 -#define MODEL_o98 0xB7 -#define MODEL_o97 0xB6 -#define MODEL_o30 0xB5 -#define MODEL_o43 0xB4 -#define MODEL_o34 0xB3 -#define MODEL_g49 0xB2 -#define MODEL_o308 0xB1 -#define MODEL_o307 0xB0 -#define MODEL_g50 0xAF -#define MODEL_o200 0xAE -#define MODEL_o201 0xAD -#define MODEL_o195 0xAC -#define MODEL_o197 0xAB -#define MODEL_o196 0xAA -#define MODEL_o198 0xA9 -#define MODEL_o199 0xA8 -#define MODEL_o153 0xA7 -#define MODEL_o194 0xA6 -#define MODEL_g21 0xA5 -#define MODEL_g48 0xA4 -#define MODEL_o191 0xA3 -#define MODEL_o190 0xA2 -#define MODEL_o186 0xA1 -#define MODEL_o189 0xA0 -#define MODEL_o188 0x9F -#define MODEL_o183 0x9E -#define MODEL_o178 0x9D -#define MODEL_o177 0x9C -#define MODEL_o175 0x9B -#define MODEL_o172 0x9A -#define MODEL_o170 0x99 -#define MODEL_g61 0x98 -#define MODEL_o100 0x97 -#define MODEL_g44 0x96 -#define MODEL_o203 0x95 -#define MODEL_o152 0x94 -#define MODEL_o151 0x93 -#define MODEL_o150 0x92 -#define MODEL_g20 0x91 -#define MODEL_g2 0x90 -#define MODEL_g5 0x8F -#define MODEL_o40 0x8E -#define MODEL_o39 0x8D -#define MODEL_o6 0x8C -#define MODEL_g58 0x8B -#define MODEL_o31 0x8A -#define MODEL_o5 0x89 -#define MODEL_o44 0x88 -#define MODEL_g59 0x87 -#define MODEL_o52 0x86 -#define MODEL_o249 0x85 -#define MODEL_o247 0x84 -#define MODEL_o245 0x83 -#define MODEL_o243 0x82 -#define MODEL_o241 0x81 -#define MODEL_g72 0x80 -#define MODEL_o381 0x7F -#define MODEL_o380 0x7E -#define MODEL_o324 0x7D -#define MODEL_o319 0x7C -#define MODEL_o318 0x7B -#define MODEL_g76 0x7A -#define MODEL_o323 0x79 -#define MODEL_o322 0x78 -#define MODEL_o321 0x77 -#define MODEL_g29 0x76 -#define MODEL_g60 0x75 -#define MODEL_o256 0x74 -#define MODEL_o113 0x73 -#define MODEL_g34 0x72 -#define MODEL_o115 0x71 -#define MODEL_o114 0x70 -#define MODEL_g14 0x6F -#define MODEL_o69 0x6E -#define MODEL_o36 0x6D -#define MODEL_g19 0x6C -#define MODEL_g100 0x6B -#define MODEL_g102 0x6A -#define MODEL_o388 0x69 -#define MODEL_g101 0x68 -#define MODEL_o389 0x67 -#define MODEL_g104 0x66 -#define MODEL_o386 0x65 -#define MODEL_g103 0x64 -#define MODEL_o391 0x63 -#define MODEL_g105 0x62 -#define MODEL_o390 0x61 -#define MODEL_g107 0x60 -#define MODEL_o392 0x5F -#define MODEL_g109 0x5E -#define MODEL_o394 0x5D -#define MODEL_g106 0x5C -#define MODEL_o385 0x5B -#define MODEL_g108 0x5A -#define MODEL_o393 0x59 -#define MODEL_g88 0x58 -#define MODEL_g87 0x57 -#define MODEL_o359 0x56 -#define MODEL_o131 0x55 -#define MODEL_o358 0x54 -#define MODEL_g89 0x53 -#define MODEL_o364 0x52 -#define MODEL_o365 0x51 -#define MODEL_o362 0x50 -#define MODEL_o363 0x4F -#define MODEL_o367 0x4E -#define MODEL_o306 0x4D -#define MODEL_g80 0x4C -#define MODEL_o340 0x4B -#define MODEL_o341 0x4A -#define MODEL_o345 0x49 -#define MODEL_o336 0x48 -#define MODEL_o338 0x47 -#define MODEL_o339 0x46 -#define MODEL_o337 0x45 -#define MODEL_g86 0x44 -#define MODEL_o109 0x43 -#define MODEL_o138 0x42 -#define MODEL_o129 0x41 -#define MODEL_o111 0x40 -#define MODEL_o370 0x3F -#define MODEL_o360 0x3E -#define MODEL_o375 0x3D -#define MODEL_g28 0x3C -#define MODEL_g37 0x3B -#define MODEL_o376 0x3A -#define MODEL_o216 0x39 -#define MODEL_o214 0x38 -#define MODEL_o130 0x37 -#define MODEL_g33 0x36 -#define MODEL_g40 0x35 -#define MODEL_o146 0x34 -#define MODEL_o149 0x33 -#define MODEL_o145 0x32 -#define MODEL_o132 0x31 -#define MODEL_o108 0x30 -#define MODEL_o210 0x2F -#define MODEL_o107 0x2E -#define MODEL_o117 0x2D -#define MODEL_o112 0x2C -#define MODEL_g30 0x2B -#define MODEL_o110 0x2A -#define MODEL_o134 0x29 -#define MODEL_o356 0x28 -#define MODEL_o355 0x27 -#define MODEL_o120 0x26 -#define MODEL_g55 0x25 -#define MODEL_o224 0x24 -#define MODEL_o223 0x23 -#define MODEL_o222 0x22 -#define MODEL_g91 0x21 -#define MODEL_g96 0x20 -#define MODEL_o374 0x1F -#define MODEL_g95 0x1E -#define MODEL_o373 0x1D -#define MODEL_g94 0x1C -#define MODEL_o372 0x1B -#define MODEL_g93 0x1A -#define MODEL_o371 0x19 -#define MODEL_g92 0x18 -#define MODEL_o227 0x17 -#define MODEL_g54 0x16 -#define MODEL_o369 0x15 -#define MODEL_o368 0x14 -#define MODEL_o219 0x13 -#define MODEL_o220 0x12 -#define MODEL_g77 0x11 -#define MODEL_o221 0x10 -#define MODEL_g53 0xF -#define MODEL_o213 0xE -#define MODEL_o212 0xD -#define MODEL_o211 0xC -#define MODEL_g15 0xB -#define MODEL_o326 0xA -#define MODEL_o325 0x9 -#define MODEL_g4 0x8 -#define MODEL_g98 0x7 -#define MODEL_o382 0x6 -#define MODEL_o3 0x5 -#define MODEL_o303 0x4 -#define MODEL_o302 0x3 -#define MODEL_o4 0x2 -#define MODEL_g97 0x1 -#define MODEL_o377 0x0 +#define MODEL_Root 0x10F +#define MODEL_g1 0x10E +#define MODEL_g62 0x10D +#define MODEL_g56 0x10C +#define MODEL_g16 0x10B +#define MODEL_o250 0x10A +#define MODEL_o248 0x109 +#define MODEL_o246 0x108 +#define MODEL_o244 0x107 +#define MODEL_o242 0x106 +#define MODEL_o58 0x105 +#define MODEL_o57 0x104 +#define MODEL_o56 0x103 +#define MODEL_o55 0x102 +#define MODEL_o54 0x101 +#define MODEL_g17 0x100 +#define MODEL_o62 0xFF +#define MODEL_o63 0xFE +#define MODEL_o61 0xFD +#define MODEL_g110 0xFC +#define MODEL_o400 0xFB +#define MODEL_o399 0xFA +#define MODEL_o398 0xF9 +#define MODEL_g8 0xF8 +#define MODEL_o59 0xF7 +#define MODEL_o60 0xF6 +#define MODEL_o18 0xF5 +#define MODEL_g18 0xF4 +#define MODEL_o67 0xF3 +#define MODEL_o65 0xF2 +#define MODEL_o66 0xF1 +#define MODEL_g46 0xF0 +#define MODEL_o167 0xEF +#define MODEL_o166 0xEE +#define MODEL_o155 0xED +#define MODEL_o154 0xEC +#define MODEL_o159 0xEB +#define MODEL_o161 0xEA +#define MODEL_o352 0xE9 +#define MODEL_o160 0xE8 +#define MODEL_g64 0xE7 +#define MODEL_o301 0xE6 +#define MODEL_o263 0xE5 +#define MODEL_o285 0xE4 +#define MODEL_o284 0xE3 +#define MODEL_o273 0xE2 +#define MODEL_o395 0xE1 +#define MODEL_o274 0xE0 +#define MODEL_o272 0xDF +#define MODEL_o300 0xDE +#define MODEL_o299 0xDD +#define MODEL_g9 0xDC +#define MODEL_o24 0xDB +#define MODEL_o23 0xDA +#define MODEL_o22 0xD9 +#define MODEL_g67 0xD8 +#define MODEL_o296 0xD7 +#define MODEL_o295 0xD6 +#define MODEL_o294 0xD5 +#define MODEL_o240 0xD4 +#define MODEL_o239 0xD3 +#define MODEL_o238 0xD2 +#define MODEL_g6 0xD1 +#define MODEL_o25 0xD0 +#define MODEL_o254 0xCF +#define MODEL_o27 0xCE +#define MODEL_o12 0xCD +#define MODEL_o26 0xCC +#define MODEL_o11 0xCB +#define MODEL_g7 0xCA +#define MODEL_o29 0xC9 +#define MODEL_o16 0xC8 +#define MODEL_o28 0xC7 +#define MODEL_o14 0xC6 +#define MODEL_o17 0xC5 +#define MODEL_o13 0xC4 +#define MODEL_o15 0xC3 +#define MODEL_o235 0xC2 +#define MODEL_o236 0xC1 +#define MODEL_o232 0xC0 +#define MODEL_o233 0xBF +#define MODEL_o231 0xBE +#define MODEL_o234 0xBD +#define MODEL_o118 0xBC +#define MODEL_o96 0xBB +#define MODEL_o230 0xBA +#define MODEL_g10 0xB9 +#define MODEL_o162 0xB8 +#define MODEL_o98 0xB7 +#define MODEL_o97 0xB6 +#define MODEL_o30 0xB5 +#define MODEL_o43 0xB4 +#define MODEL_o34 0xB3 +#define MODEL_g49 0xB2 +#define MODEL_o308 0xB1 +#define MODEL_o307 0xB0 +#define MODEL_g50 0xAF +#define MODEL_o200 0xAE +#define MODEL_o201 0xAD +#define MODEL_o195 0xAC +#define MODEL_o197 0xAB +#define MODEL_o196 0xAA +#define MODEL_o198 0xA9 +#define MODEL_o199 0xA8 +#define MODEL_o153 0xA7 +#define MODEL_o194 0xA6 +#define MODEL_g21 0xA5 +#define MODEL_g48 0xA4 +#define MODEL_o191 0xA3 +#define MODEL_o190 0xA2 +#define MODEL_o186 0xA1 +#define MODEL_o189 0xA0 +#define MODEL_o188 0x9F +#define MODEL_o183 0x9E +#define MODEL_o178 0x9D +#define MODEL_o177 0x9C +#define MODEL_o175 0x9B +#define MODEL_o172 0x9A +#define MODEL_o170 0x99 +#define MODEL_g61 0x98 +#define MODEL_o100 0x97 +#define MODEL_g44 0x96 +#define MODEL_o203 0x95 +#define MODEL_o152 0x94 +#define MODEL_o151 0x93 +#define MODEL_o150 0x92 +#define MODEL_g20 0x91 +#define MODEL_g2 0x90 +#define MODEL_g5 0x8F +#define MODEL_o40 0x8E +#define MODEL_o39 0x8D +#define MODEL_o6 0x8C +#define MODEL_g58 0x8B +#define MODEL_o31 0x8A +#define MODEL_o5 0x89 +#define MODEL_o44 0x88 +#define MODEL_g59 0x87 +#define MODEL_o52 0x86 +#define MODEL_o249 0x85 +#define MODEL_o247 0x84 +#define MODEL_o245 0x83 +#define MODEL_o243 0x82 +#define MODEL_o241 0x81 +#define MODEL_g72 0x80 +#define MODEL_o381 0x7F +#define MODEL_o380 0x7E +#define MODEL_o324 0x7D +#define MODEL_o319 0x7C +#define MODEL_o318 0x7B +#define MODEL_g76 0x7A +#define MODEL_o323 0x79 +#define MODEL_o322 0x78 +#define MODEL_o321 0x77 +#define MODEL_g29 0x76 +#define MODEL_g60 0x75 +#define MODEL_o256 0x74 +#define MODEL_o113 0x73 +#define MODEL_g34 0x72 +#define MODEL_o115 0x71 +#define MODEL_o114 0x70 +#define MODEL_g14 0x6F +#define MODEL_o69 0x6E +#define MODEL_o36 0x6D +#define MODEL_g19 0x6C +#define MODEL_g100 0x6B +#define MODEL_g102 0x6A +#define MODEL_o388 0x69 +#define MODEL_g101 0x68 +#define MODEL_o389 0x67 +#define MODEL_g104 0x66 +#define MODEL_o386 0x65 +#define MODEL_g103 0x64 +#define MODEL_o391 0x63 +#define MODEL_g105 0x62 +#define MODEL_o390 0x61 +#define MODEL_g107 0x60 +#define MODEL_o392 0x5F +#define MODEL_g109 0x5E +#define MODEL_o394 0x5D +#define MODEL_g106 0x5C +#define MODEL_o385 0x5B +#define MODEL_g108 0x5A +#define MODEL_o393 0x59 +#define MODEL_g88 0x58 +#define MODEL_g87 0x57 +#define MODEL_o359 0x56 +#define MODEL_o131 0x55 +#define MODEL_o358 0x54 +#define MODEL_g89 0x53 +#define MODEL_o364 0x52 +#define MODEL_o365 0x51 +#define MODEL_o362 0x50 +#define MODEL_o363 0x4F +#define MODEL_o367 0x4E +#define MODEL_o306 0x4D +#define MODEL_g80 0x4C +#define MODEL_o340 0x4B +#define MODEL_o341 0x4A +#define MODEL_o345 0x49 +#define MODEL_o336 0x48 +#define MODEL_o338 0x47 +#define MODEL_o339 0x46 +#define MODEL_o337 0x45 +#define MODEL_g86 0x44 +#define MODEL_o109 0x43 +#define MODEL_o138 0x42 +#define MODEL_o129 0x41 +#define MODEL_o111 0x40 +#define MODEL_o370 0x3F +#define MODEL_o360 0x3E +#define MODEL_o375 0x3D +#define MODEL_g28 0x3C +#define MODEL_g37 0x3B +#define MODEL_o376 0x3A +#define MODEL_o216 0x39 +#define MODEL_o214 0x38 +#define MODEL_o130 0x37 +#define MODEL_g33 0x36 +#define MODEL_g40 0x35 +#define MODEL_o146 0x34 +#define MODEL_o149 0x33 +#define MODEL_o145 0x32 +#define MODEL_o132 0x31 +#define MODEL_o108 0x30 +#define MODEL_o210 0x2F +#define MODEL_o107 0x2E +#define MODEL_o117 0x2D +#define MODEL_o112 0x2C +#define MODEL_g30 0x2B +#define MODEL_o110 0x2A +#define MODEL_o134 0x29 +#define MODEL_o356 0x28 +#define MODEL_o355 0x27 +#define MODEL_o120 0x26 +#define MODEL_g55 0x25 +#define MODEL_o224 0x24 +#define MODEL_o223 0x23 +#define MODEL_o222 0x22 +#define MODEL_g91 0x21 +#define MODEL_g96 0x20 +#define MODEL_o374 0x1F +#define MODEL_g95 0x1E +#define MODEL_o373 0x1D +#define MODEL_g94 0x1C +#define MODEL_o372 0x1B +#define MODEL_g93 0x1A +#define MODEL_o371 0x19 +#define MODEL_g92 0x18 +#define MODEL_o227 0x17 +#define MODEL_g54 0x16 +#define MODEL_o369 0x15 +#define MODEL_o368 0x14 +#define MODEL_o219 0x13 +#define MODEL_o220 0x12 +#define MODEL_g77 0x11 +#define MODEL_o221 0x10 +#define MODEL_g53 0xF +#define MODEL_o213 0xE +#define MODEL_o212 0xD +#define MODEL_o211 0xC +#define MODEL_g15 0xB +#define MODEL_o326 0xA +#define MODEL_o325 0x9 +#define MODEL_g4 0x8 +#define MODEL_g98 0x7 +#define MODEL_o382 0x6 +#define MODEL_o3 0x5 +#define MODEL_o303 0x4 +#define MODEL_o302 0x3 +#define MODEL_o4 0x2 +#define MODEL_g97 0x1 +#define MODEL_o377 0x0 + diff --git a/include/mapfs/kmr_21_hit.h b/include/mapfs/kmr_21_hit.h index b149746b8f..76050b01e8 100644 --- a/include/mapfs/kmr_21_hit.h +++ b/include/mapfs/kmr_21_hit.h @@ -1 +1,4 @@ -#define COLLIDER_Root 0x0 +#define COLLIDER_Root 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/kmr_21_shape.h b/include/mapfs/kmr_21_shape.h index 98ef430c86..dee3600cd9 100644 --- a/include/mapfs/kmr_21_shape.h +++ b/include/mapfs/kmr_21_shape.h @@ -1 +1,2 @@ -#define MODEL_Root 0x0 +#define MODEL_Root 0x0 + diff --git a/include/mapfs/kmr_22_hit.h b/include/mapfs/kmr_22_hit.h index b149746b8f..76050b01e8 100644 --- a/include/mapfs/kmr_22_hit.h +++ b/include/mapfs/kmr_22_hit.h @@ -1 +1,4 @@ -#define COLLIDER_Root 0x0 +#define COLLIDER_Root 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/kmr_22_shape.h b/include/mapfs/kmr_22_shape.h index 98ef430c86..dee3600cd9 100644 --- a/include/mapfs/kmr_22_shape.h +++ b/include/mapfs/kmr_22_shape.h @@ -1 +1,2 @@ -#define MODEL_Root 0x0 +#define MODEL_Root 0x0 + diff --git a/include/mapfs/kmr_23_hit.h b/include/mapfs/kmr_23_hit.h index b149746b8f..76050b01e8 100644 --- a/include/mapfs/kmr_23_hit.h +++ b/include/mapfs/kmr_23_hit.h @@ -1 +1,4 @@ -#define COLLIDER_Root 0x0 +#define COLLIDER_Root 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/kmr_23_shape.h b/include/mapfs/kmr_23_shape.h index 98ef430c86..dee3600cd9 100644 --- a/include/mapfs/kmr_23_shape.h +++ b/include/mapfs/kmr_23_shape.h @@ -1 +1,2 @@ -#define MODEL_Root 0x0 +#define MODEL_Root 0x0 + diff --git a/include/mapfs/kmr_24_hit.h b/include/mapfs/kmr_24_hit.h index b149746b8f..76050b01e8 100644 --- a/include/mapfs/kmr_24_hit.h +++ b/include/mapfs/kmr_24_hit.h @@ -1 +1,4 @@ -#define COLLIDER_Root 0x0 +#define COLLIDER_Root 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/kmr_24_shape.h b/include/mapfs/kmr_24_shape.h index 98ef430c86..dee3600cd9 100644 --- a/include/mapfs/kmr_24_shape.h +++ b/include/mapfs/kmr_24_shape.h @@ -1 +1,2 @@ -#define MODEL_Root 0x0 +#define MODEL_Root 0x0 + diff --git a/include/mapfs/kmr_30_hit.h b/include/mapfs/kmr_30_hit.h index 6aa44c61bb..beb342b473 100644 --- a/include/mapfs/kmr_30_hit.h +++ b/include/mapfs/kmr_30_hit.h @@ -1,5 +1,10 @@ -#define COLLIDER_Root 0x4 -#define COLLIDER_Default 0x3 -#define COLLIDER_o244 0x2 -#define COLLIDER_o390 0x1 -#define COLLIDER_o389 0x0 +#define COLLIDER_Root 0x4 +#define COLLIDER_Default 0x3 +#define COLLIDER_o244 0x2 +#define COLLIDER_o390 0x1 +#define COLLIDER_o389 0x0 + +#define ZONE_Root 0x2 +#define ZONE_Default 0x1 +#define ZONE_o390 0x0 + diff --git a/include/mapfs/kmr_30_shape.h b/include/mapfs/kmr_30_shape.h index 7e52054bfd..26f7d847ca 100644 --- a/include/mapfs/kmr_30_shape.h +++ b/include/mapfs/kmr_30_shape.h @@ -1,86 +1,87 @@ -#define MODEL_Root 0x55 -#define MODEL_the_end 0x54 -#define MODEL_n 0x53 -#define MODEL_d 0x52 -#define MODEL_e 0x51 -#define MODEL_h 0x50 -#define MODEL_t 0x4F -#define MODEL_reflection 0x4E -#define MODEL_ref_castle 0x4D -#define MODEL_ref_house 0x4C -#define MODEL_g1 0x4B -#define MODEL_g19 0x4A -#define MODEL_g62 0x49 -#define MODEL_g102 0x48 -#define MODEL_o387 0x47 -#define MODEL_o386 0x46 -#define MODEL_g29 0x45 -#define MODEL_o388 0x44 -#define MODEL_o146 0x43 -#define MODEL_o149 0x42 -#define MODEL_o110 0x41 -#define MODEL_o134 0x40 -#define MODEL_o356 0x3F -#define MODEL_o355 0x3E -#define MODEL_o120 0x3D -#define MODEL_o109 0x3C -#define MODEL_o138 0x3B -#define MODEL_o129 0x3A -#define MODEL_o132 0x39 -#define MODEL_o117 0x38 -#define MODEL_o145 0x37 -#define MODEL_o69 0x36 -#define MODEL_o36 0x35 -#define MODEL_o256 0x34 -#define MODEL_o113 0x33 -#define MODEL_o115 0x32 -#define MODEL_o114 0x31 -#define MODEL_o358 0x30 -#define MODEL_o359 0x2F -#define MODEL_g54 0x2E -#define MODEL_o369 0x2D -#define MODEL_o368 0x2C -#define MODEL_o219 0x2B -#define MODEL_o220 0x2A -#define MODEL_o221 0x29 -#define MODEL_g91 0x28 -#define MODEL_o374 0x27 -#define MODEL_o373 0x26 -#define MODEL_o372 0x25 -#define MODEL_o371 0x24 -#define MODEL_o227 0x23 -#define MODEL_g88 0x22 -#define MODEL_o375 0x21 -#define MODEL_g53 0x20 -#define MODEL_o213 0x1F -#define MODEL_o212 0x1E -#define MODEL_o211 0x1D -#define MODEL_g15 0x1C -#define MODEL_o209 0x1B -#define MODEL_g4 0x1A -#define MODEL_o303 0x19 -#define MODEL_o302 0x18 -#define MODEL_o4 0x17 -#define MODEL_g86 0x16 -#define MODEL_o224 0x15 -#define MODEL_o223 0x14 -#define MODEL_o222 0x13 -#define MODEL_bg 0x12 -#define MODEL_g100 0x11 -#define MODEL_o390 0x10 -#define MODEL_o379 0xF -#define MODEL_g89 0xE -#define MODEL_o364 0xD -#define MODEL_o365 0xC -#define MODEL_o362 0xB -#define MODEL_o306 0xA -#define MODEL_g80 0x9 -#define MODEL_o340 0x8 -#define MODEL_o341 0x7 -#define MODEL_o345 0x6 -#define MODEL_o338 0x5 -#define MODEL_o337 0x4 -#define MODEL_o360 0x3 -#define MODEL_g106 0x2 -#define MODEL_o413 0x1 -#define MODEL_o412 0x0 +#define MODEL_Root 0x55 +#define MODEL_the_end 0x54 +#define MODEL_n 0x53 +#define MODEL_d 0x52 +#define MODEL_e 0x51 +#define MODEL_h 0x50 +#define MODEL_t 0x4F +#define MODEL_reflection 0x4E +#define MODEL_ref_castle 0x4D +#define MODEL_ref_house 0x4C +#define MODEL_g1 0x4B +#define MODEL_g19 0x4A +#define MODEL_g62 0x49 +#define MODEL_g102 0x48 +#define MODEL_o387 0x47 +#define MODEL_o386 0x46 +#define MODEL_g29 0x45 +#define MODEL_o388 0x44 +#define MODEL_o146 0x43 +#define MODEL_o149 0x42 +#define MODEL_o110 0x41 +#define MODEL_o134 0x40 +#define MODEL_o356 0x3F +#define MODEL_o355 0x3E +#define MODEL_o120 0x3D +#define MODEL_o109 0x3C +#define MODEL_o138 0x3B +#define MODEL_o129 0x3A +#define MODEL_o132 0x39 +#define MODEL_o117 0x38 +#define MODEL_o145 0x37 +#define MODEL_o69 0x36 +#define MODEL_o36 0x35 +#define MODEL_o256 0x34 +#define MODEL_o113 0x33 +#define MODEL_o115 0x32 +#define MODEL_o114 0x31 +#define MODEL_o358 0x30 +#define MODEL_o359 0x2F +#define MODEL_g54 0x2E +#define MODEL_o369 0x2D +#define MODEL_o368 0x2C +#define MODEL_o219 0x2B +#define MODEL_o220 0x2A +#define MODEL_o221 0x29 +#define MODEL_g91 0x28 +#define MODEL_o374 0x27 +#define MODEL_o373 0x26 +#define MODEL_o372 0x25 +#define MODEL_o371 0x24 +#define MODEL_o227 0x23 +#define MODEL_g88 0x22 +#define MODEL_o375 0x21 +#define MODEL_g53 0x20 +#define MODEL_o213 0x1F +#define MODEL_o212 0x1E +#define MODEL_o211 0x1D +#define MODEL_g15 0x1C +#define MODEL_o209 0x1B +#define MODEL_g4 0x1A +#define MODEL_o303 0x19 +#define MODEL_o302 0x18 +#define MODEL_o4 0x17 +#define MODEL_g86 0x16 +#define MODEL_o224 0x15 +#define MODEL_o223 0x14 +#define MODEL_o222 0x13 +#define MODEL_bg 0x12 +#define MODEL_g100 0x11 +#define MODEL_o390 0x10 +#define MODEL_o379 0xF +#define MODEL_g89 0xE +#define MODEL_o364 0xD +#define MODEL_o365 0xC +#define MODEL_o362 0xB +#define MODEL_o306 0xA +#define MODEL_g80 0x9 +#define MODEL_o340 0x8 +#define MODEL_o341 0x7 +#define MODEL_o345 0x6 +#define MODEL_o338 0x5 +#define MODEL_o337 0x4 +#define MODEL_o360 0x3 +#define MODEL_g106 0x2 +#define MODEL_o413 0x1 +#define MODEL_o412 0x0 + diff --git a/include/mapfs/kmr_bt03_hit.h b/include/mapfs/kmr_bt03_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/kmr_bt03_hit.h +++ b/include/mapfs/kmr_bt03_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/kmr_bt03_shape.h b/include/mapfs/kmr_bt03_shape.h index 45adac66e8..7eee3a92d9 100644 --- a/include/mapfs/kmr_bt03_shape.h +++ b/include/mapfs/kmr_bt03_shape.h @@ -1,46 +1,47 @@ -#define MODEL_Root 0x2D -#define MODEL_m_n 0x2C -#define MODEL_m4 0x2B -#define MODEL_m3 0x2A -#define MODEL_m2 0x29 -#define MODEL_m1 0x28 -#define MODEL_n2 0x27 -#define MODEL_n1 0x26 -#define MODEL_g61 0x25 -#define MODEL_o288 0x24 -#define MODEL_kusa1 0x23 -#define MODEL_futi 0x22 -#define MODEL_miti 0x21 -#define MODEL_yaka2 0x20 -#define MODEL_gake 0x1F -#define MODEL_dai 0x1E -#define MODEL_o302 0x1D -#define MODEL_waku1 0x1C -#define MODEL_kinoko 0x1B -#define MODEL_ha3 0x1A -#define MODEL_yuka 0x19 -#define MODEL_g49 0x18 -#define MODEL_waku2 0x17 -#define MODEL_k2_2 0x16 -#define MODEL_k2 0x15 -#define MODEL_iwa2 0x14 -#define MODEL_k1_2 0x13 -#define MODEL_k1 0x12 -#define MODEL_ha1_2 0x11 -#define MODEL_ha1 0x10 -#define MODEL_miki 0xF -#define MODEL_k6_2 0xE -#define MODEL_k6 0xD -#define MODEL_ha2 0xC -#define MODEL_k3_2 0xB -#define MODEL_k3 0xA -#define MODEL_k5_2 0x9 -#define MODEL_k5 0x8 -#define MODEL_yuka2 0x7 -#define MODEL_waku 0x6 -#define MODEL_kumo2 0x5 -#define MODEL_g60 0x4 -#define MODEL_o255 0x3 -#define MODEL_kumo1 0x2 -#define MODEL_g59 0x1 -#define MODEL_o254 0x0 +#define MODEL_Root 0x2D +#define MODEL_m_n 0x2C +#define MODEL_m4 0x2B +#define MODEL_m3 0x2A +#define MODEL_m2 0x29 +#define MODEL_m1 0x28 +#define MODEL_n2 0x27 +#define MODEL_n1 0x26 +#define MODEL_g61 0x25 +#define MODEL_o288 0x24 +#define MODEL_kusa1 0x23 +#define MODEL_futi 0x22 +#define MODEL_miti 0x21 +#define MODEL_yaka2 0x20 +#define MODEL_gake 0x1F +#define MODEL_dai 0x1E +#define MODEL_o302 0x1D +#define MODEL_waku1 0x1C +#define MODEL_kinoko 0x1B +#define MODEL_ha3 0x1A +#define MODEL_yuka 0x19 +#define MODEL_g49 0x18 +#define MODEL_waku2 0x17 +#define MODEL_k2_2 0x16 +#define MODEL_k2 0x15 +#define MODEL_iwa2 0x14 +#define MODEL_k1_2 0x13 +#define MODEL_k1 0x12 +#define MODEL_ha1_2 0x11 +#define MODEL_ha1 0x10 +#define MODEL_miki 0xF +#define MODEL_k6_2 0xE +#define MODEL_k6 0xD +#define MODEL_ha2 0xC +#define MODEL_k3_2 0xB +#define MODEL_k3 0xA +#define MODEL_k5_2 0x9 +#define MODEL_k5 0x8 +#define MODEL_yuka2 0x7 +#define MODEL_waku 0x6 +#define MODEL_kumo2 0x5 +#define MODEL_g60 0x4 +#define MODEL_o255 0x3 +#define MODEL_kumo1 0x2 +#define MODEL_g59 0x1 +#define MODEL_o254 0x0 + diff --git a/include/mapfs/kmr_bt04_hit.h b/include/mapfs/kmr_bt04_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/kmr_bt04_hit.h +++ b/include/mapfs/kmr_bt04_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/kmr_bt04_shape.h b/include/mapfs/kmr_bt04_shape.h index e57ecd5fff..bd27af7700 100644 --- a/include/mapfs/kmr_bt04_shape.h +++ b/include/mapfs/kmr_bt04_shape.h @@ -1,39 +1,40 @@ -#define MODEL_Root 0x26 -#define MODEL_m_n 0x25 -#define MODEL_m4 0x24 -#define MODEL_m3 0x23 -#define MODEL_m2 0x22 -#define MODEL_m1 0x21 -#define MODEL_n2 0x20 -#define MODEL_n1 0x1F -#define MODEL_dai 0x1E -#define MODEL_o287 0x1D -#define MODEL_waku1 0x1C -#define MODEL_yuka 0x1B -#define MODEL_g49 0x1A -#define MODEL_waku2 0x19 -#define MODEL_k2_2 0x18 -#define MODEL_k2 0x17 -#define MODEL_k1_2 0x16 -#define MODEL_k1 0x15 -#define MODEL_k3_2 0x14 -#define MODEL_k3 0x13 -#define MODEL_ha2 0x12 -#define MODEL_ha1_2 0x11 -#define MODEL_ha1 0x10 -#define MODEL_saku2 0xF -#define MODEL_miki 0xE -#define MODEL_iwa2 0xD -#define MODEL_iwa 0xC -#define MODEL_k4 0xB -#define MODEL_saku 0xA -#define MODEL_k5_2 0x9 -#define MODEL_k5 0x8 -#define MODEL_waku 0x7 -#define MODEL_yuka2 0x6 -#define MODEL_g59 0x5 -#define MODEL_g61 0x4 -#define MODEL_o265 0x3 -#define MODEL_g58 0x2 -#define MODEL_g60 0x1 -#define MODEL_o263 0x0 +#define MODEL_Root 0x26 +#define MODEL_m_n 0x25 +#define MODEL_m4 0x24 +#define MODEL_m3 0x23 +#define MODEL_m2 0x22 +#define MODEL_m1 0x21 +#define MODEL_n2 0x20 +#define MODEL_n1 0x1F +#define MODEL_dai 0x1E +#define MODEL_o287 0x1D +#define MODEL_waku1 0x1C +#define MODEL_yuka 0x1B +#define MODEL_g49 0x1A +#define MODEL_waku2 0x19 +#define MODEL_k2_2 0x18 +#define MODEL_k2 0x17 +#define MODEL_k1_2 0x16 +#define MODEL_k1 0x15 +#define MODEL_k3_2 0x14 +#define MODEL_k3 0x13 +#define MODEL_ha2 0x12 +#define MODEL_ha1_2 0x11 +#define MODEL_ha1 0x10 +#define MODEL_saku2 0xF +#define MODEL_miki 0xE +#define MODEL_iwa2 0xD +#define MODEL_iwa 0xC +#define MODEL_k4 0xB +#define MODEL_saku 0xA +#define MODEL_k5_2 0x9 +#define MODEL_k5 0x8 +#define MODEL_waku 0x7 +#define MODEL_yuka2 0x6 +#define MODEL_g59 0x5 +#define MODEL_g61 0x4 +#define MODEL_o265 0x3 +#define MODEL_g58 0x2 +#define MODEL_g60 0x1 +#define MODEL_o263 0x0 + diff --git a/include/mapfs/kmr_bt05_hit.h b/include/mapfs/kmr_bt05_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/kmr_bt05_hit.h +++ b/include/mapfs/kmr_bt05_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/kmr_bt05_shape.h b/include/mapfs/kmr_bt05_shape.h index 335b0c0129..9a1509b165 100644 --- a/include/mapfs/kmr_bt05_shape.h +++ b/include/mapfs/kmr_bt05_shape.h @@ -1,39 +1,40 @@ -#define MODEL_Root 0x26 -#define MODEL_m_n 0x25 -#define MODEL_m4 0x24 -#define MODEL_m3 0x23 -#define MODEL_m2 0x22 -#define MODEL_m1 0x21 -#define MODEL_n2 0x20 -#define MODEL_n1 0x1F -#define MODEL_dai 0x1E -#define MODEL_o303 0x1D -#define MODEL_waku1 0x1C -#define MODEL_o302 0x1B -#define MODEL_yuka 0x1A -#define MODEL_g49 0x19 -#define MODEL_waku2 0x18 -#define MODEL_k2_2 0x17 -#define MODEL_k2 0x16 -#define MODEL_iwa2 0x15 -#define MODEL_k1_2 0x14 -#define MODEL_k1 0x13 -#define MODEL_ha1_2 0x12 -#define MODEL_ha1 0x11 -#define MODEL_miki 0x10 -#define MODEL_ha2 0xF -#define MODEL_k3_2 0xE -#define MODEL_k3 0xD -#define MODEL_iwa1 0xC -#define MODEL_k6 0xB -#define MODEL_k5_2 0xA -#define MODEL_k5 0x9 -#define MODEL_k4 0x8 -#define MODEL_yuka2 0x7 -#define MODEL_yama3b 0x6 -#define MODEL_yama3 0x5 -#define MODEL_yama2b 0x4 -#define MODEL_yama2 0x3 -#define MODEL_yama1b 0x2 -#define MODEL_yama1 0x1 -#define MODEL_waku 0x0 +#define MODEL_Root 0x26 +#define MODEL_m_n 0x25 +#define MODEL_m4 0x24 +#define MODEL_m3 0x23 +#define MODEL_m2 0x22 +#define MODEL_m1 0x21 +#define MODEL_n2 0x20 +#define MODEL_n1 0x1F +#define MODEL_dai 0x1E +#define MODEL_o303 0x1D +#define MODEL_waku1 0x1C +#define MODEL_o302 0x1B +#define MODEL_yuka 0x1A +#define MODEL_g49 0x19 +#define MODEL_waku2 0x18 +#define MODEL_k2_2 0x17 +#define MODEL_k2 0x16 +#define MODEL_iwa2 0x15 +#define MODEL_k1_2 0x14 +#define MODEL_k1 0x13 +#define MODEL_ha1_2 0x12 +#define MODEL_ha1 0x11 +#define MODEL_miki 0x10 +#define MODEL_ha2 0xF +#define MODEL_k3_2 0xE +#define MODEL_k3 0xD +#define MODEL_iwa1 0xC +#define MODEL_k6 0xB +#define MODEL_k5_2 0xA +#define MODEL_k5 0x9 +#define MODEL_k4 0x8 +#define MODEL_yuka2 0x7 +#define MODEL_yama3b 0x6 +#define MODEL_yama3 0x5 +#define MODEL_yama2b 0x4 +#define MODEL_yama2 0x3 +#define MODEL_yama1b 0x2 +#define MODEL_yama1 0x1 +#define MODEL_waku 0x0 + diff --git a/include/mapfs/kmr_bt06_hit.h b/include/mapfs/kmr_bt06_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/kmr_bt06_hit.h +++ b/include/mapfs/kmr_bt06_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/kmr_bt06_shape.h b/include/mapfs/kmr_bt06_shape.h index 437bc524e3..1a7ab1e73b 100644 --- a/include/mapfs/kmr_bt06_shape.h +++ b/include/mapfs/kmr_bt06_shape.h @@ -1,46 +1,47 @@ -#define MODEL_Root 0x2D -#define MODEL_batu 0x2C -#define MODEL_o311 0x2B -#define MODEL_ki 0x2A -#define MODEL_g66 0x29 -#define MODEL_o309 0x28 -#define MODEL_o308 0x27 -#define MODEL_o307 0x26 -#define MODEL_g65 0x25 -#define MODEL_o306 0x24 -#define MODEL_g64 0x23 -#define MODEL_o303 0x22 -#define MODEL_ha3 0x21 -#define MODEL_m_n 0x20 -#define MODEL_m3 0x1F -#define MODEL_m2 0x1E -#define MODEL_n2 0x1D -#define MODEL_n1 0x1C -#define MODEL_kinoko 0x1B -#define MODEL_dai 0x1A -#define MODEL_o313 0x19 -#define MODEL_waku1 0x18 -#define MODEL_yuka 0x17 -#define MODEL_g70 0x16 -#define MODEL_waku2 0x15 -#define MODEL_k1_2 0x14 -#define MODEL_k1 0x13 -#define MODEL_o312 0x12 -#define MODEL_iwa2 0x11 -#define MODEL_k2_2 0x10 -#define MODEL_k2 0xF -#define MODEL_k5_2 0xE -#define MODEL_k5 0xD -#define MODEL_waku 0xC -#define MODEL_yuka2 0xB -#define MODEL_g49 0xA -#define MODEL_ha1_2 0x9 -#define MODEL_ha1 0x8 -#define MODEL_miki 0x7 -#define MODEL_ha2 0x6 -#define MODEL_kumo2 0x5 -#define MODEL_g60 0x4 -#define MODEL_o255 0x3 -#define MODEL_kumo1 0x2 -#define MODEL_g59 0x1 -#define MODEL_o254 0x0 +#define MODEL_Root 0x2D +#define MODEL_batu 0x2C +#define MODEL_o311 0x2B +#define MODEL_ki 0x2A +#define MODEL_g66 0x29 +#define MODEL_o309 0x28 +#define MODEL_o308 0x27 +#define MODEL_o307 0x26 +#define MODEL_g65 0x25 +#define MODEL_o306 0x24 +#define MODEL_g64 0x23 +#define MODEL_o303 0x22 +#define MODEL_ha3 0x21 +#define MODEL_m_n 0x20 +#define MODEL_m3 0x1F +#define MODEL_m2 0x1E +#define MODEL_n2 0x1D +#define MODEL_n1 0x1C +#define MODEL_kinoko 0x1B +#define MODEL_dai 0x1A +#define MODEL_o313 0x19 +#define MODEL_waku1 0x18 +#define MODEL_yuka 0x17 +#define MODEL_g70 0x16 +#define MODEL_waku2 0x15 +#define MODEL_k1_2 0x14 +#define MODEL_k1 0x13 +#define MODEL_o312 0x12 +#define MODEL_iwa2 0x11 +#define MODEL_k2_2 0x10 +#define MODEL_k2 0xF +#define MODEL_k5_2 0xE +#define MODEL_k5 0xD +#define MODEL_waku 0xC +#define MODEL_yuka2 0xB +#define MODEL_g49 0xA +#define MODEL_ha1_2 0x9 +#define MODEL_ha1 0x8 +#define MODEL_miki 0x7 +#define MODEL_ha2 0x6 +#define MODEL_kumo2 0x5 +#define MODEL_g60 0x4 +#define MODEL_o255 0x3 +#define MODEL_kumo1 0x2 +#define MODEL_g59 0x1 +#define MODEL_o254 0x0 + diff --git a/include/mapfs/kpa_01_hit.h b/include/mapfs/kpa_01_hit.h index 3376975f2b..1f07186efc 100644 --- a/include/mapfs/kpa_01_hit.h +++ b/include/mapfs/kpa_01_hit.h @@ -1,34 +1,40 @@ -#define COLLIDER_Root 0x21 -#define COLLIDER_g18 0x20 -#define COLLIDER_o104 0x1F -#define COLLIDER_ami 0x1E -#define COLLIDER_o125 0x1D -#define COLLIDER_4 0x1C -#define COLLIDER_o175 0x1B -#define COLLIDER_o174 0x1A -#define COLLIDER_o160 0x19 -#define COLLIDER_o64 0x18 -#define COLLIDER_o173 0x17 -#define COLLIDER_3 0x16 -#define COLLIDER_o178 0x15 -#define COLLIDER_o177 0x14 -#define COLLIDER_o176 0x13 -#define COLLIDER_2 0x12 -#define COLLIDER_o181 0x11 -#define COLLIDER_o71 0x10 -#define COLLIDER_o180 0xF -#define COLLIDER_o179 0xE -#define COLLIDER_1 0xD -#define COLLIDER_o166 0xC -#define COLLIDER_yuka 0xB -#define COLLIDER_kabe 0xA -#define COLLIDER_exit2 0x9 -#define COLLIDER_tte 0x8 -#define COLLIDER_ne 0x7 -#define COLLIDER_deilie 0x6 -#define COLLIDER_deilite 0x5 -#define COLLIDER_exit1 0x4 -#define COLLIDER_ttw 0x3 -#define COLLIDER_nw 0x2 -#define COLLIDER_deiliw 0x1 -#define COLLIDER_deilitw 0x0 +#define COLLIDER_Root 0x21 +#define COLLIDER_g18 0x20 +#define COLLIDER_o104 0x1F +#define COLLIDER_ami 0x1E +#define COLLIDER_o125 0x1D +#define COLLIDER_4 0x1C +#define COLLIDER_o175 0x1B +#define COLLIDER_o174 0x1A +#define COLLIDER_o160 0x19 +#define COLLIDER_o64 0x18 +#define COLLIDER_o173 0x17 +#define COLLIDER_3 0x16 +#define COLLIDER_o178 0x15 +#define COLLIDER_o177 0x14 +#define COLLIDER_o176 0x13 +#define COLLIDER_2 0x12 +#define COLLIDER_o181 0x11 +#define COLLIDER_o71 0x10 +#define COLLIDER_o180 0xF +#define COLLIDER_o179 0xE +#define COLLIDER_1 0xD +#define COLLIDER_o166 0xC +#define COLLIDER_yuka 0xB +#define COLLIDER_kabe 0xA +#define COLLIDER_exit2 0x9 +#define COLLIDER_tte 0x8 +#define COLLIDER_ne 0x7 +#define COLLIDER_deilie 0x6 +#define COLLIDER_deilite 0x5 +#define COLLIDER_exit1 0x4 +#define COLLIDER_ttw 0x3 +#define COLLIDER_nw 0x2 +#define COLLIDER_deiliw 0x1 +#define COLLIDER_deilitw 0x0 + +#define ZONE_Root 0x3 +#define ZONE_g25 0x2 +#define ZONE_o168 0x1 +#define ZONE_o167 0x0 + diff --git a/include/mapfs/kpa_01_shape.h b/include/mapfs/kpa_01_shape.h index b00eae599d..209ddb5a69 100644 --- a/include/mapfs/kpa_01_shape.h +++ b/include/mapfs/kpa_01_shape.h @@ -1,63 +1,64 @@ -#define MODEL_Root 0x3E -#define MODEL_g22 0x3D -#define MODEL_o162 0x3C -#define MODEL_o157 0x3B -#define MODEL_saku 0x3A -#define MODEL_yougan 0x39 -#define MODEL_o180 0x38 -#define MODEL_g18 0x37 -#define MODEL_o188 0x36 -#define MODEL_o187 0x35 -#define MODEL_o186 0x34 -#define MODEL_o185 0x33 -#define MODEL_futi 0x32 -#define MODEL_ami 0x31 -#define MODEL_o182 0x30 -#define MODEL_o181 0x2F -#define MODEL_g16 0x2E -#define MODEL_o179 0x2D -#define MODEL_o178 0x2C -#define MODEL_7 0x2B -#define MODEL_o203 0x2A -#define MODEL_o76 0x29 -#define MODEL_o174 0x28 -#define MODEL_o75 0x27 -#define MODEL_6 0x26 -#define MODEL_o201 0x25 -#define MODEL_o74 0x24 -#define MODEL_o173 0x23 -#define MODEL_o73 0x22 -#define MODEL_5 0x21 -#define MODEL_o200 0x20 -#define MODEL_o72 0x1F -#define MODEL_o172 0x1E -#define MODEL_o71 0x1D -#define MODEL_4 0x1C -#define MODEL_o199 0x1B -#define MODEL_o70 0x1A -#define MODEL_o171 0x19 -#define MODEL_o69 0x18 -#define MODEL_3 0x17 -#define MODEL_o198 0x16 -#define MODEL_o68 0x15 -#define MODEL_o165 0x14 -#define MODEL_o67 0x13 -#define MODEL_2 0x12 -#define MODEL_o190 0x11 -#define MODEL_o66 0x10 -#define MODEL_o170 0xF -#define MODEL_o64 0xE -#define MODEL_1 0xD -#define MODEL_o189 0xC -#define MODEL_o65 0xB -#define MODEL_o167 0xA -#define MODEL_o63 0x9 -#define MODEL_exit2 0x8 -#define MODEL_g32 0x7 -#define MODEL_o205 0x6 -#define MODEL_o177 0x5 -#define MODEL_o176 0x4 -#define MODEL_exit1 0x3 -#define MODEL_o46 0x2 -#define MODEL_o175 0x1 -#define MODEL_o45 0x0 +#define MODEL_Root 0x3E +#define MODEL_g22 0x3D +#define MODEL_o162 0x3C +#define MODEL_o157 0x3B +#define MODEL_saku 0x3A +#define MODEL_yougan 0x39 +#define MODEL_o180 0x38 +#define MODEL_g18 0x37 +#define MODEL_o188 0x36 +#define MODEL_o187 0x35 +#define MODEL_o186 0x34 +#define MODEL_o185 0x33 +#define MODEL_futi 0x32 +#define MODEL_ami 0x31 +#define MODEL_o182 0x30 +#define MODEL_o181 0x2F +#define MODEL_g16 0x2E +#define MODEL_o179 0x2D +#define MODEL_o178 0x2C +#define MODEL_7 0x2B +#define MODEL_o203 0x2A +#define MODEL_o76 0x29 +#define MODEL_o174 0x28 +#define MODEL_o75 0x27 +#define MODEL_6 0x26 +#define MODEL_o201 0x25 +#define MODEL_o74 0x24 +#define MODEL_o173 0x23 +#define MODEL_o73 0x22 +#define MODEL_5 0x21 +#define MODEL_o200 0x20 +#define MODEL_o72 0x1F +#define MODEL_o172 0x1E +#define MODEL_o71 0x1D +#define MODEL_4 0x1C +#define MODEL_o199 0x1B +#define MODEL_o70 0x1A +#define MODEL_o171 0x19 +#define MODEL_o69 0x18 +#define MODEL_3 0x17 +#define MODEL_o198 0x16 +#define MODEL_o68 0x15 +#define MODEL_o165 0x14 +#define MODEL_o67 0x13 +#define MODEL_2 0x12 +#define MODEL_o190 0x11 +#define MODEL_o66 0x10 +#define MODEL_o170 0xF +#define MODEL_o64 0xE +#define MODEL_1 0xD +#define MODEL_o189 0xC +#define MODEL_o65 0xB +#define MODEL_o167 0xA +#define MODEL_o63 0x9 +#define MODEL_exit2 0x8 +#define MODEL_g32 0x7 +#define MODEL_o205 0x6 +#define MODEL_o177 0x5 +#define MODEL_o176 0x4 +#define MODEL_exit1 0x3 +#define MODEL_o46 0x2 +#define MODEL_o175 0x1 +#define MODEL_o45 0x0 + diff --git a/include/mapfs/kpa_03_hit.h b/include/mapfs/kpa_03_hit.h index e26a321311..1d1389a71d 100644 --- a/include/mapfs/kpa_03_hit.h +++ b/include/mapfs/kpa_03_hit.h @@ -1,47 +1,52 @@ -#define COLLIDER_Root 0x2E -#define COLLIDER_exite 0x2D -#define COLLIDER_tte 0x2C -#define COLLIDER_ne 0x2B -#define COLLIDER_deilie 0x2A -#define COLLIDER_deilite 0x29 -#define COLLIDER_exitw 0x28 -#define COLLIDER_ttw 0x27 -#define COLLIDER_nw 0x26 -#define COLLIDER_deiliw 0x25 -#define COLLIDER_deilitw 0x24 -#define COLLIDER_g20 0x23 -#define COLLIDER_o125 0x22 -#define COLLIDER_o128 0x21 -#define COLLIDER_o141 0x20 -#define COLLIDER_g25 0x1F -#define COLLIDER_o124 0x1E -#define COLLIDER_o140 0x1D -#define COLLIDER_o139 0x1C -#define COLLIDER_g24 0x1B -#define COLLIDER_o123 0x1A -#define COLLIDER_o138 0x19 -#define COLLIDER_o137 0x18 -#define COLLIDER_g23 0x17 -#define COLLIDER_o122 0x16 -#define COLLIDER_o136 0x15 -#define COLLIDER_o135 0x14 -#define COLLIDER_g22 0x13 -#define COLLIDER_o121 0x12 -#define COLLIDER_o134 0x11 -#define COLLIDER_o133 0x10 -#define COLLIDER_g21 0xF -#define COLLIDER_o120 0xE -#define COLLIDER_o132 0xD -#define COLLIDER_o131 0xC -#define COLLIDER_g27 0xB -#define COLLIDER_o119 0xA -#define COLLIDER_o130 0x9 -#define COLLIDER_o129 0x8 -#define COLLIDER_g26 0x7 -#define COLLIDER_o118 0x6 -#define COLLIDER_o127 0x5 -#define COLLIDER_o126 0x4 -#define COLLIDER_1 0x3 -#define COLLIDER_o117 0x2 -#define COLLIDER_kabe 0x1 -#define COLLIDER_1_yuka 0x0 +#define COLLIDER_Root 0x2E +#define COLLIDER_exite 0x2D +#define COLLIDER_tte 0x2C +#define COLLIDER_ne 0x2B +#define COLLIDER_deilie 0x2A +#define COLLIDER_deilite 0x29 +#define COLLIDER_exitw 0x28 +#define COLLIDER_ttw 0x27 +#define COLLIDER_nw 0x26 +#define COLLIDER_deiliw 0x25 +#define COLLIDER_deilitw 0x24 +#define COLLIDER_g20 0x23 +#define COLLIDER_o125 0x22 +#define COLLIDER_o128 0x21 +#define COLLIDER_o141 0x20 +#define COLLIDER_g25 0x1F +#define COLLIDER_o124 0x1E +#define COLLIDER_o140 0x1D +#define COLLIDER_o139 0x1C +#define COLLIDER_g24 0x1B +#define COLLIDER_o123 0x1A +#define COLLIDER_o138 0x19 +#define COLLIDER_o137 0x18 +#define COLLIDER_g23 0x17 +#define COLLIDER_o122 0x16 +#define COLLIDER_o136 0x15 +#define COLLIDER_o135 0x14 +#define COLLIDER_g22 0x13 +#define COLLIDER_o121 0x12 +#define COLLIDER_o134 0x11 +#define COLLIDER_o133 0x10 +#define COLLIDER_g21 0xF +#define COLLIDER_o120 0xE +#define COLLIDER_o132 0xD +#define COLLIDER_o131 0xC +#define COLLIDER_g27 0xB +#define COLLIDER_o119 0xA +#define COLLIDER_o130 0x9 +#define COLLIDER_o129 0x8 +#define COLLIDER_g26 0x7 +#define COLLIDER_o118 0x6 +#define COLLIDER_o127 0x5 +#define COLLIDER_o126 0x4 +#define COLLIDER_1 0x3 +#define COLLIDER_o117 0x2 +#define COLLIDER_kabe 0x1 +#define COLLIDER_1_yuka 0x0 + +#define ZONE_Root 0x2 +#define ZONE_g16 0x1 +#define ZONE_o102 0x0 + diff --git a/include/mapfs/kpa_03_shape.h b/include/mapfs/kpa_03_shape.h index b8c5b64937..ca845dc7b7 100644 --- a/include/mapfs/kpa_03_shape.h +++ b/include/mapfs/kpa_03_shape.h @@ -1,67 +1,68 @@ -#define MODEL_Root 0x42 -#define MODEL_g10 0x41 -#define MODEL_o112 0x40 -#define MODEL_o47 0x3F -#define MODEL_saku 0x3E -#define MODEL_g17 0x3D -#define MODEL_o125 0x3C -#define MODEL_o111 0x3B -#define MODEL_o110 0x3A -#define MODEL_o109 0x39 -#define MODEL_o108 0x38 -#define MODEL_o107 0x37 -#define MODEL_o106 0x36 -#define MODEL_o103 0x35 -#define MODEL_o100 0x34 -#define MODEL_exit2 0x33 -#define MODEL_o49 0x32 -#define MODEL_o48 0x31 -#define MODEL_exit 0x30 -#define MODEL_o50 0x2F -#define MODEL_o123 0x2E -#define MODEL_o51 0x2D -#define MODEL_9 0x2C -#define MODEL_o140 0x2B -#define MODEL_9_yuka 0x2A -#define MODEL_o122 0x29 -#define MODEL_o62 0x28 -#define MODEL_8 0x27 -#define MODEL_o139 0x26 -#define MODEL_8_yuka 0x25 -#define MODEL_o120 0x24 -#define MODEL_o65 0x23 -#define MODEL_7 0x22 -#define MODEL_o138 0x21 -#define MODEL_7_yuka 0x20 -#define MODEL_o119 0x1F -#define MODEL_o56 0x1E -#define MODEL_6 0x1D -#define MODEL_o137 0x1C -#define MODEL_6_yuka 0x1B -#define MODEL_o118 0x1A -#define MODEL_o63 0x19 -#define MODEL_5 0x18 -#define MODEL_o136 0x17 -#define MODEL_5_yuka 0x16 -#define MODEL_o117 0x15 -#define MODEL_o69 0x14 -#define MODEL_4 0x13 -#define MODEL_o135 0x12 -#define MODEL_4_yuka 0x11 -#define MODEL_o116 0x10 -#define MODEL_o68 0xF -#define MODEL_3 0xE -#define MODEL_o134 0xD -#define MODEL_3_yuka 0xC -#define MODEL_o115 0xB -#define MODEL_o67 0xA -#define MODEL_2 0x9 -#define MODEL_o133 0x8 -#define MODEL_2_yuka 0x7 -#define MODEL_o114 0x6 -#define MODEL_o53 0x5 -#define MODEL_1 0x4 -#define MODEL_o132 0x3 -#define MODEL_1_yuka 0x2 -#define MODEL_o113 0x1 -#define MODEL_o66 0x0 +#define MODEL_Root 0x42 +#define MODEL_g10 0x41 +#define MODEL_o112 0x40 +#define MODEL_o47 0x3F +#define MODEL_saku 0x3E +#define MODEL_g17 0x3D +#define MODEL_o125 0x3C +#define MODEL_o111 0x3B +#define MODEL_o110 0x3A +#define MODEL_o109 0x39 +#define MODEL_o108 0x38 +#define MODEL_o107 0x37 +#define MODEL_o106 0x36 +#define MODEL_o103 0x35 +#define MODEL_o100 0x34 +#define MODEL_exit2 0x33 +#define MODEL_o49 0x32 +#define MODEL_o48 0x31 +#define MODEL_exit 0x30 +#define MODEL_o50 0x2F +#define MODEL_o123 0x2E +#define MODEL_o51 0x2D +#define MODEL_9 0x2C +#define MODEL_o140 0x2B +#define MODEL_9_yuka 0x2A +#define MODEL_o122 0x29 +#define MODEL_o62 0x28 +#define MODEL_8 0x27 +#define MODEL_o139 0x26 +#define MODEL_8_yuka 0x25 +#define MODEL_o120 0x24 +#define MODEL_o65 0x23 +#define MODEL_7 0x22 +#define MODEL_o138 0x21 +#define MODEL_7_yuka 0x20 +#define MODEL_o119 0x1F +#define MODEL_o56 0x1E +#define MODEL_6 0x1D +#define MODEL_o137 0x1C +#define MODEL_6_yuka 0x1B +#define MODEL_o118 0x1A +#define MODEL_o63 0x19 +#define MODEL_5 0x18 +#define MODEL_o136 0x17 +#define MODEL_5_yuka 0x16 +#define MODEL_o117 0x15 +#define MODEL_o69 0x14 +#define MODEL_4 0x13 +#define MODEL_o135 0x12 +#define MODEL_4_yuka 0x11 +#define MODEL_o116 0x10 +#define MODEL_o68 0xF +#define MODEL_3 0xE +#define MODEL_o134 0xD +#define MODEL_3_yuka 0xC +#define MODEL_o115 0xB +#define MODEL_o67 0xA +#define MODEL_2 0x9 +#define MODEL_o133 0x8 +#define MODEL_2_yuka 0x7 +#define MODEL_o114 0x6 +#define MODEL_o53 0x5 +#define MODEL_1 0x4 +#define MODEL_o132 0x3 +#define MODEL_1_yuka 0x2 +#define MODEL_o113 0x1 +#define MODEL_o66 0x0 + diff --git a/include/mapfs/kpa_04_hit.h b/include/mapfs/kpa_04_hit.h index 237f0df781..3ace4340e4 100644 --- a/include/mapfs/kpa_04_hit.h +++ b/include/mapfs/kpa_04_hit.h @@ -1,31 +1,45 @@ -#define COLLIDER_Root 0x1E -#define COLLIDER_g1 0x1D -#define COLLIDER_g25 0x1C -#define COLLIDER_g26 0x1B -#define COLLIDER_g34 0x1A -#define COLLIDER_o160 0x19 -#define COLLIDER_g28 0x18 -#define COLLIDER_o141 0x17 -#define COLLIDER_g2 0x16 -#define COLLIDER_g21 0x15 -#define COLLIDER_o165 0x14 -#define COLLIDER_deilitts 0x13 -#define COLLIDER_deilits 0x12 -#define COLLIDER_deilis 0x11 -#define COLLIDER_o80 0x10 -#define COLLIDER_deiliwtt 0xF -#define COLLIDER_deiliwt 0xE -#define COLLIDER_deiliw 0xD -#define COLLIDER_g20 0xC -#define COLLIDER_o119 0xB -#define COLLIDER_o118 0xA -#define COLLIDER_o115 0x9 -#define COLLIDER_g15 0x8 -#define COLLIDER_o103 0x7 -#define COLLIDER_o102 0x6 -#define COLLIDER_o60 0x5 -#define COLLIDER_g4 0x4 -#define COLLIDER_o100 0x3 -#define COLLIDER_o163 0x2 -#define COLLIDER_o162 0x1 -#define COLLIDER_o161 0x0 +#define COLLIDER_Root 0x1E +#define COLLIDER_g1 0x1D +#define COLLIDER_g25 0x1C +#define COLLIDER_g26 0x1B +#define COLLIDER_g34 0x1A +#define COLLIDER_o160 0x19 +#define COLLIDER_g28 0x18 +#define COLLIDER_o141 0x17 +#define COLLIDER_g2 0x16 +#define COLLIDER_g21 0x15 +#define COLLIDER_o165 0x14 +#define COLLIDER_deilitts 0x13 +#define COLLIDER_deilits 0x12 +#define COLLIDER_deilis 0x11 +#define COLLIDER_o80 0x10 +#define COLLIDER_deiliwtt 0xF +#define COLLIDER_deiliwt 0xE +#define COLLIDER_deiliw 0xD +#define COLLIDER_g20 0xC +#define COLLIDER_o119 0xB +#define COLLIDER_o118 0xA +#define COLLIDER_o115 0x9 +#define COLLIDER_g15 0x8 +#define COLLIDER_o103 0x7 +#define COLLIDER_o102 0x6 +#define COLLIDER_o60 0x5 +#define COLLIDER_g4 0x4 +#define COLLIDER_o100 0x3 +#define COLLIDER_o163 0x2 +#define COLLIDER_o162 0x1 +#define COLLIDER_o161 0x0 + +#define ZONE_Root 0xB +#define ZONE_g1 0xA +#define ZONE_g22 0x9 +#define ZONE_o166 0x8 +#define ZONE_o165 0x7 +#define ZONE_g2 0x6 +#define ZONE_o71 0x5 +#define ZONE_o60 0x4 +#define ZONE_o27 0x3 +#define ZONE_o11 0x2 +#define ZONE_o83 0x1 +#define ZONE_o163 0x0 + diff --git a/include/mapfs/kpa_04_shape.h b/include/mapfs/kpa_04_shape.h index f51d7496d6..34ce623d76 100644 --- a/include/mapfs/kpa_04_shape.h +++ b/include/mapfs/kpa_04_shape.h @@ -1,41 +1,42 @@ -#define MODEL_Root 0x28 -#define MODEL_g42 0x27 -#define MODEL_o191 0x26 -#define MODEL_g22 0x25 -#define MODEL_g45 0x24 -#define MODEL_o180 0x23 -#define MODEL_g44 0x22 -#define MODEL_o193 0x21 -#define MODEL_hikari 0x20 -#define MODEL_o192 0x1F -#define MODEL_g1 0x1E -#define MODEL_g2 0x1D -#define MODEL_o187 0x1C -#define MODEL_g8 0x1B -#define MODEL_g20 0x1A -#define MODEL_o103 0x19 -#define MODEL_o102 0x18 -#define MODEL_g41 0x17 -#define MODEL_o164 0x16 -#define MODEL_o163 0x15 -#define MODEL_o71 0x14 -#define MODEL_o67 0x13 -#define MODEL_o65 0x12 -#define MODEL_o177 0x11 -#define MODEL_o176 0x10 -#define MODEL_g15 0xF -#define MODEL_o169 0xE -#define MODEL_o79 0xD -#define MODEL_o60 0xC -#define MODEL_o56 0xB -#define MODEL_o54 0xA -#define MODEL_g6 0x9 -#define MODEL_o160 0x8 -#define MODEL_o27 0x7 -#define MODEL_o25 0x6 -#define MODEL_o24 0x5 -#define MODEL_g4 0x4 -#define MODEL_o52 0x3 -#define MODEL_o11 0x2 -#define MODEL_o8 0x1 -#define MODEL_o7 0x0 +#define MODEL_Root 0x28 +#define MODEL_g42 0x27 +#define MODEL_o191 0x26 +#define MODEL_g22 0x25 +#define MODEL_g45 0x24 +#define MODEL_o180 0x23 +#define MODEL_g44 0x22 +#define MODEL_o193 0x21 +#define MODEL_hikari 0x20 +#define MODEL_o192 0x1F +#define MODEL_g1 0x1E +#define MODEL_g2 0x1D +#define MODEL_o187 0x1C +#define MODEL_g8 0x1B +#define MODEL_g20 0x1A +#define MODEL_o103 0x19 +#define MODEL_o102 0x18 +#define MODEL_g41 0x17 +#define MODEL_o164 0x16 +#define MODEL_o163 0x15 +#define MODEL_o71 0x14 +#define MODEL_o67 0x13 +#define MODEL_o65 0x12 +#define MODEL_o177 0x11 +#define MODEL_o176 0x10 +#define MODEL_g15 0xF +#define MODEL_o169 0xE +#define MODEL_o79 0xD +#define MODEL_o60 0xC +#define MODEL_o56 0xB +#define MODEL_o54 0xA +#define MODEL_g6 0x9 +#define MODEL_o160 0x8 +#define MODEL_o27 0x7 +#define MODEL_o25 0x6 +#define MODEL_o24 0x5 +#define MODEL_g4 0x4 +#define MODEL_o52 0x3 +#define MODEL_o11 0x2 +#define MODEL_o8 0x1 +#define MODEL_o7 0x0 + diff --git a/include/mapfs/kpa_08_hit.h b/include/mapfs/kpa_08_hit.h index 8823b70e44..250e239c9d 100644 --- a/include/mapfs/kpa_08_hit.h +++ b/include/mapfs/kpa_08_hit.h @@ -1,20 +1,27 @@ -#define COLLIDER_Root 0x13 -#define COLLIDER_move2 0x12 -#define COLLIDER_o90 0x11 -#define COLLIDER_move1 0x10 -#define COLLIDER_o19 0xF -#define COLLIDER_g29 0xE -#define COLLIDER_e 0xD -#define COLLIDER_w 0xC -#define COLLIDER_box 0xB -#define COLLIDER_yuka 0xA -#define COLLIDER_o71 0x9 -#define COLLIDER_bero1 0x8 -#define COLLIDER_nw 0x7 -#define COLLIDER_ttw 0x6 -#define COLLIDER_deilitw 0x5 -#define COLLIDER_deiliw 0x4 -#define COLLIDER_bero2 0x3 -#define COLLIDER_ne 0x2 -#define COLLIDER_deilite 0x1 -#define COLLIDER_deilie 0x0 +#define COLLIDER_Root 0x13 +#define COLLIDER_move2 0x12 +#define COLLIDER_o90 0x11 +#define COLLIDER_move1 0x10 +#define COLLIDER_o19 0xF +#define COLLIDER_g29 0xE +#define COLLIDER_e 0xD +#define COLLIDER_w 0xC +#define COLLIDER_box 0xB +#define COLLIDER_yuka 0xA +#define COLLIDER_o71 0x9 +#define COLLIDER_bero1 0x8 +#define COLLIDER_nw 0x7 +#define COLLIDER_ttw 0x6 +#define COLLIDER_deilitw 0x5 +#define COLLIDER_deiliw 0x4 +#define COLLIDER_bero2 0x3 +#define COLLIDER_ne 0x2 +#define COLLIDER_deilite 0x1 +#define COLLIDER_deilie 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g14 0x3 +#define ZONE_yuka 0x2 +#define ZONE_nigi 0x1 +#define ZONE_hidari 0x0 + diff --git a/include/mapfs/kpa_08_shape.h b/include/mapfs/kpa_08_shape.h index 4d4871afeb..7b7c7a3a85 100644 --- a/include/mapfs/kpa_08_shape.h +++ b/include/mapfs/kpa_08_shape.h @@ -1,80 +1,81 @@ -#define MODEL_Root 0x4F -#define MODEL_doa2 0x4E -#define MODEL_o159 0x4D -#define MODEL_doa1 0x4C -#define MODEL_o160 0x4B -#define MODEL_shadelier 0x4A -#define MODEL_hi4 0x49 -#define MODEL_hi3 0x48 -#define MODEL_hi2 0x47 -#define MODEL_hi 0x46 -#define MODEL_kusari 0x45 -#define MODEL_waku 0x44 -#define MODEL_move2 0x43 -#define MODEL_m2_yuka 0x42 -#define MODEL_o177 0x41 -#define MODEL_move 0x40 -#define MODEL_m_yuka 0x3F -#define MODEL_o174 0x3E -#define MODEL_tumiki 0x3D -#define MODEL_t_yuka 0x3C -#define MODEL_o173 0x3B -#define MODEL_o172 0x3A -#define MODEL_o171 0x39 -#define MODEL_yuka 0x38 -#define MODEL_o141 0x37 -#define MODEL_zyu 0x36 -#define MODEL_exit2 0x35 -#define MODEL_o187 0x34 -#define MODEL_o186 0x33 -#define MODEL_o185 0x32 -#define MODEL_o184 0x31 -#define MODEL_o183 0x30 -#define MODEL_exit 0x2F -#define MODEL_o182 0x2E -#define MODEL_o152 0x2D -#define MODEL_o151 0x2C -#define MODEL_o150 0x2B -#define MODEL_o149 0x2A -#define MODEL_o148 0x29 -#define MODEL_g25 0x28 -#define MODEL_o188 0x27 -#define MODEL_o139 0x26 -#define MODEL_g27 0x25 -#define MODEL_o112 0x24 -#define MODEL_o111 0x23 -#define MODEL_o110 0x22 -#define MODEL_o109 0x21 -#define MODEL_o108 0x20 -#define MODEL_o107 0x1F -#define MODEL_o106 0x1E -#define MODEL_g26 0x1D -#define MODEL_o105 0x1C -#define MODEL_o104 0x1B -#define MODEL_o103 0x1A -#define MODEL_o102 0x19 -#define MODEL_o101 0x18 -#define MODEL_o100 0x17 -#define MODEL_g28 0x16 -#define MODEL_o119 0x15 -#define MODEL_o118 0x14 -#define MODEL_o117 0x13 -#define MODEL_o116 0x12 -#define MODEL_o115 0x11 -#define MODEL_o114 0x10 -#define MODEL_o113 0xF -#define MODEL_g29 0xE -#define MODEL_o125 0xD -#define MODEL_o124 0xC -#define MODEL_o123 0xB -#define MODEL_o122 0xA -#define MODEL_o121 0x9 -#define MODEL_o120 0x8 -#define MODEL_g31 0x7 -#define MODEL_o138 0x6 -#define MODEL_o137 0x5 -#define MODEL_o136 0x4 -#define MODEL_o135 0x3 -#define MODEL_o134 0x2 -#define MODEL_o133 0x1 -#define MODEL_o132 0x0 +#define MODEL_Root 0x4F +#define MODEL_doa2 0x4E +#define MODEL_o159 0x4D +#define MODEL_doa1 0x4C +#define MODEL_o160 0x4B +#define MODEL_shadelier 0x4A +#define MODEL_hi4 0x49 +#define MODEL_hi3 0x48 +#define MODEL_hi2 0x47 +#define MODEL_hi 0x46 +#define MODEL_kusari 0x45 +#define MODEL_waku 0x44 +#define MODEL_move2 0x43 +#define MODEL_m2_yuka 0x42 +#define MODEL_o177 0x41 +#define MODEL_move 0x40 +#define MODEL_m_yuka 0x3F +#define MODEL_o174 0x3E +#define MODEL_tumiki 0x3D +#define MODEL_t_yuka 0x3C +#define MODEL_o173 0x3B +#define MODEL_o172 0x3A +#define MODEL_o171 0x39 +#define MODEL_yuka 0x38 +#define MODEL_o141 0x37 +#define MODEL_zyu 0x36 +#define MODEL_exit2 0x35 +#define MODEL_o187 0x34 +#define MODEL_o186 0x33 +#define MODEL_o185 0x32 +#define MODEL_o184 0x31 +#define MODEL_o183 0x30 +#define MODEL_exit 0x2F +#define MODEL_o182 0x2E +#define MODEL_o152 0x2D +#define MODEL_o151 0x2C +#define MODEL_o150 0x2B +#define MODEL_o149 0x2A +#define MODEL_o148 0x29 +#define MODEL_g25 0x28 +#define MODEL_o188 0x27 +#define MODEL_o139 0x26 +#define MODEL_g27 0x25 +#define MODEL_o112 0x24 +#define MODEL_o111 0x23 +#define MODEL_o110 0x22 +#define MODEL_o109 0x21 +#define MODEL_o108 0x20 +#define MODEL_o107 0x1F +#define MODEL_o106 0x1E +#define MODEL_g26 0x1D +#define MODEL_o105 0x1C +#define MODEL_o104 0x1B +#define MODEL_o103 0x1A +#define MODEL_o102 0x19 +#define MODEL_o101 0x18 +#define MODEL_o100 0x17 +#define MODEL_g28 0x16 +#define MODEL_o119 0x15 +#define MODEL_o118 0x14 +#define MODEL_o117 0x13 +#define MODEL_o116 0x12 +#define MODEL_o115 0x11 +#define MODEL_o114 0x10 +#define MODEL_o113 0xF +#define MODEL_g29 0xE +#define MODEL_o125 0xD +#define MODEL_o124 0xC +#define MODEL_o123 0xB +#define MODEL_o122 0xA +#define MODEL_o121 0x9 +#define MODEL_o120 0x8 +#define MODEL_g31 0x7 +#define MODEL_o138 0x6 +#define MODEL_o137 0x5 +#define MODEL_o136 0x4 +#define MODEL_o135 0x3 +#define MODEL_o134 0x2 +#define MODEL_o133 0x1 +#define MODEL_o132 0x0 + diff --git a/include/mapfs/kpa_09_hit.h b/include/mapfs/kpa_09_hit.h index 8b1455ef5a..1a7ec6f06b 100644 --- a/include/mapfs/kpa_09_hit.h +++ b/include/mapfs/kpa_09_hit.h @@ -1,21 +1,28 @@ -#define COLLIDER_Root 0x14 -#define COLLIDER_move2 0x13 -#define COLLIDER_o106 0x12 -#define COLLIDER_move 0x11 -#define COLLIDER_o19 0x10 -#define COLLIDER_g2 0xF -#define COLLIDER_e 0xE -#define COLLIDER_w 0xD -#define COLLIDER_box 0xC -#define COLLIDER_yuka 0xB -#define COLLIDER_kabe 0xA -#define COLLIDER_bero2 0x9 -#define COLLIDER_ne 0x8 -#define COLLIDER_tte 0x7 -#define COLLIDER_deilite 0x6 -#define COLLIDER_deilie 0x5 -#define COLLIDER_bero 0x4 -#define COLLIDER_nw 0x3 -#define COLLIDER_ttw 0x2 -#define COLLIDER_deilitw 0x1 -#define COLLIDER_deiliw 0x0 +#define COLLIDER_Root 0x14 +#define COLLIDER_move2 0x13 +#define COLLIDER_o106 0x12 +#define COLLIDER_move 0x11 +#define COLLIDER_o19 0x10 +#define COLLIDER_g2 0xF +#define COLLIDER_e 0xE +#define COLLIDER_w 0xD +#define COLLIDER_box 0xC +#define COLLIDER_yuka 0xB +#define COLLIDER_kabe 0xA +#define COLLIDER_bero2 0x9 +#define COLLIDER_ne 0x8 +#define COLLIDER_tte 0x7 +#define COLLIDER_deilite 0x6 +#define COLLIDER_deilie 0x5 +#define COLLIDER_bero 0x4 +#define COLLIDER_nw 0x3 +#define COLLIDER_ttw 0x2 +#define COLLIDER_deilitw 0x1 +#define COLLIDER_deiliw 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g14 0x3 +#define ZONE_yuka 0x2 +#define ZONE_nigi 0x1 +#define ZONE_hidari 0x0 + diff --git a/include/mapfs/kpa_09_shape.h b/include/mapfs/kpa_09_shape.h index 6801c8b77e..d388df0f74 100644 --- a/include/mapfs/kpa_09_shape.h +++ b/include/mapfs/kpa_09_shape.h @@ -1,85 +1,86 @@ -#define MODEL_Root 0x54 -#define MODEL_g49 0x53 -#define MODEL_o181 0x52 -#define MODEL_g48 0x51 -#define MODEL_o180 0x50 -#define MODEL_doa2 0x4F -#define MODEL_o159 0x4E -#define MODEL_doa1 0x4D -#define MODEL_o160 0x4C -#define MODEL_shadelier 0x4B -#define MODEL_hi4 0x4A -#define MODEL_hi3 0x49 -#define MODEL_hi2 0x48 -#define MODEL_hi 0x47 -#define MODEL_kusari 0x46 -#define MODEL_waku 0x45 -#define MODEL_move2 0x44 -#define MODEL_m_yuka2 0x43 -#define MODEL_o163 0x42 -#define MODEL_move 0x41 -#define MODEL_m_yuka 0x40 -#define MODEL_o167 0x3F -#define MODEL_tumiki 0x3E -#define MODEL_t_yuka 0x3D -#define MODEL_o166 0x3C -#define MODEL_o165 0x3B -#define MODEL_o164 0x3A -#define MODEL_yuka 0x39 -#define MODEL_o141 0x38 -#define MODEL_zyu 0x37 -#define MODEL_exit2 0x36 -#define MODEL_o184 0x35 -#define MODEL_o173 0x34 -#define MODEL_o157 0x33 -#define MODEL_o155 0x32 -#define MODEL_o154 0x31 -#define MODEL_o153 0x30 -#define MODEL_exit 0x2F -#define MODEL_o179 0x2E -#define MODEL_o152 0x2D -#define MODEL_o151 0x2C -#define MODEL_o150 0x2B -#define MODEL_o149 0x2A -#define MODEL_o148 0x29 -#define MODEL_g25 0x28 -#define MODEL_o182 0x27 -#define MODEL_o139 0x26 -#define MODEL_g27 0x25 -#define MODEL_o112 0x24 -#define MODEL_o111 0x23 -#define MODEL_o110 0x22 -#define MODEL_o109 0x21 -#define MODEL_o108 0x20 -#define MODEL_o107 0x1F -#define MODEL_o106 0x1E -#define MODEL_g26 0x1D -#define MODEL_o105 0x1C -#define MODEL_o104 0x1B -#define MODEL_o103 0x1A -#define MODEL_o102 0x19 -#define MODEL_o101 0x18 -#define MODEL_o100 0x17 -#define MODEL_g28 0x16 -#define MODEL_o119 0x15 -#define MODEL_o118 0x14 -#define MODEL_o117 0x13 -#define MODEL_o116 0x12 -#define MODEL_o115 0x11 -#define MODEL_o114 0x10 -#define MODEL_o113 0xF -#define MODEL_g29 0xE -#define MODEL_o125 0xD -#define MODEL_o124 0xC -#define MODEL_o123 0xB -#define MODEL_o122 0xA -#define MODEL_o121 0x9 -#define MODEL_o120 0x8 -#define MODEL_g31 0x7 -#define MODEL_o138 0x6 -#define MODEL_o137 0x5 -#define MODEL_o136 0x4 -#define MODEL_o135 0x3 -#define MODEL_o134 0x2 -#define MODEL_o133 0x1 -#define MODEL_o132 0x0 +#define MODEL_Root 0x54 +#define MODEL_g49 0x53 +#define MODEL_o181 0x52 +#define MODEL_g48 0x51 +#define MODEL_o180 0x50 +#define MODEL_doa2 0x4F +#define MODEL_o159 0x4E +#define MODEL_doa1 0x4D +#define MODEL_o160 0x4C +#define MODEL_shadelier 0x4B +#define MODEL_hi4 0x4A +#define MODEL_hi3 0x49 +#define MODEL_hi2 0x48 +#define MODEL_hi 0x47 +#define MODEL_kusari 0x46 +#define MODEL_waku 0x45 +#define MODEL_move2 0x44 +#define MODEL_m_yuka2 0x43 +#define MODEL_o163 0x42 +#define MODEL_move 0x41 +#define MODEL_m_yuka 0x40 +#define MODEL_o167 0x3F +#define MODEL_tumiki 0x3E +#define MODEL_t_yuka 0x3D +#define MODEL_o166 0x3C +#define MODEL_o165 0x3B +#define MODEL_o164 0x3A +#define MODEL_yuka 0x39 +#define MODEL_o141 0x38 +#define MODEL_zyu 0x37 +#define MODEL_exit2 0x36 +#define MODEL_o184 0x35 +#define MODEL_o173 0x34 +#define MODEL_o157 0x33 +#define MODEL_o155 0x32 +#define MODEL_o154 0x31 +#define MODEL_o153 0x30 +#define MODEL_exit 0x2F +#define MODEL_o179 0x2E +#define MODEL_o152 0x2D +#define MODEL_o151 0x2C +#define MODEL_o150 0x2B +#define MODEL_o149 0x2A +#define MODEL_o148 0x29 +#define MODEL_g25 0x28 +#define MODEL_o182 0x27 +#define MODEL_o139 0x26 +#define MODEL_g27 0x25 +#define MODEL_o112 0x24 +#define MODEL_o111 0x23 +#define MODEL_o110 0x22 +#define MODEL_o109 0x21 +#define MODEL_o108 0x20 +#define MODEL_o107 0x1F +#define MODEL_o106 0x1E +#define MODEL_g26 0x1D +#define MODEL_o105 0x1C +#define MODEL_o104 0x1B +#define MODEL_o103 0x1A +#define MODEL_o102 0x19 +#define MODEL_o101 0x18 +#define MODEL_o100 0x17 +#define MODEL_g28 0x16 +#define MODEL_o119 0x15 +#define MODEL_o118 0x14 +#define MODEL_o117 0x13 +#define MODEL_o116 0x12 +#define MODEL_o115 0x11 +#define MODEL_o114 0x10 +#define MODEL_o113 0xF +#define MODEL_g29 0xE +#define MODEL_o125 0xD +#define MODEL_o124 0xC +#define MODEL_o123 0xB +#define MODEL_o122 0xA +#define MODEL_o121 0x9 +#define MODEL_o120 0x8 +#define MODEL_g31 0x7 +#define MODEL_o138 0x6 +#define MODEL_o137 0x5 +#define MODEL_o136 0x4 +#define MODEL_o135 0x3 +#define MODEL_o134 0x2 +#define MODEL_o133 0x1 +#define MODEL_o132 0x0 + diff --git a/include/mapfs/kpa_100_hit.h b/include/mapfs/kpa_100_hit.h index b149746b8f..76050b01e8 100644 --- a/include/mapfs/kpa_100_hit.h +++ b/include/mapfs/kpa_100_hit.h @@ -1 +1,4 @@ -#define COLLIDER_Root 0x0 +#define COLLIDER_Root 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/kpa_100_shape.h b/include/mapfs/kpa_100_shape.h index 98ef430c86..dee3600cd9 100644 --- a/include/mapfs/kpa_100_shape.h +++ b/include/mapfs/kpa_100_shape.h @@ -1 +1,2 @@ -#define MODEL_Root 0x0 +#define MODEL_Root 0x0 + diff --git a/include/mapfs/kpa_101_hit.h b/include/mapfs/kpa_101_hit.h index b149746b8f..76050b01e8 100644 --- a/include/mapfs/kpa_101_hit.h +++ b/include/mapfs/kpa_101_hit.h @@ -1 +1,4 @@ -#define COLLIDER_Root 0x0 +#define COLLIDER_Root 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/kpa_101_shape.h b/include/mapfs/kpa_101_shape.h index 98ef430c86..dee3600cd9 100644 --- a/include/mapfs/kpa_101_shape.h +++ b/include/mapfs/kpa_101_shape.h @@ -1 +1,2 @@ -#define MODEL_Root 0x0 +#define MODEL_Root 0x0 + diff --git a/include/mapfs/kpa_102_hit.h b/include/mapfs/kpa_102_hit.h index c36bf16d35..0041f6b87a 100644 --- a/include/mapfs/kpa_102_hit.h +++ b/include/mapfs/kpa_102_hit.h @@ -1,13 +1,20 @@ -#define COLLIDER_Root 0xC -#define COLLIDER_n 0xB -#define COLLIDER_kabe 0xA -#define COLLIDER_yuka 0x9 -#define COLLIDER_exite 0x8 -#define COLLIDER_ne 0x7 -#define COLLIDER_tte 0x6 -#define COLLIDER_deilie 0x5 -#define COLLIDER_deilite 0x4 -#define COLLIDER_exitw 0x3 -#define COLLIDER_nw 0x2 -#define COLLIDER_deiliw 0x1 -#define COLLIDER_deilitw 0x0 +#define COLLIDER_Root 0xC +#define COLLIDER_n 0xB +#define COLLIDER_kabe 0xA +#define COLLIDER_yuka 0x9 +#define COLLIDER_exite 0x8 +#define COLLIDER_ne 0x7 +#define COLLIDER_tte 0x6 +#define COLLIDER_deilie 0x5 +#define COLLIDER_deilite 0x4 +#define COLLIDER_exitw 0x3 +#define COLLIDER_nw 0x2 +#define COLLIDER_deiliw 0x1 +#define COLLIDER_deilitw 0x0 + +#define ZONE_Root 0x4 +#define ZONE_n 0x3 +#define ZONE_exite 0x2 +#define ZONE_exitw 0x1 +#define ZONE_yuka 0x0 + diff --git a/include/mapfs/kpa_102_shape.h b/include/mapfs/kpa_102_shape.h index c0b9a44ac4..30b300a3df 100644 --- a/include/mapfs/kpa_102_shape.h +++ b/include/mapfs/kpa_102_shape.h @@ -1,81 +1,82 @@ -#define MODEL_Root 0x50 -#define MODEL_g120 0x4F -#define MODEL_akr4 0x4E -#define MODEL_o661 0x4D -#define MODEL_akr3 0x4C -#define MODEL_o663 0x4B -#define MODEL_akr2 0x4A -#define MODEL_o657 0x49 -#define MODEL_akr1 0x48 -#define MODEL_o655 0x47 -#define MODEL_akari 0x46 -#define MODEL_hi16 0x45 -#define MODEL_hi15 0x44 -#define MODEL_hi14 0x43 -#define MODEL_hi13 0x42 -#define MODEL_hi12 0x41 -#define MODEL_hi11 0x40 -#define MODEL_hi0 0x3F -#define MODEL_hi9 0x3E -#define MODEL_hi8 0x3D -#define MODEL_hi7 0x3C -#define MODEL_hi6 0x3B -#define MODEL_hi5 0x3A -#define MODEL_hi4 0x39 -#define MODEL_hi3 0x38 -#define MODEL_hi2 0x37 -#define MODEL_hi1 0x36 -#define MODEL_kusari 0x35 -#define MODEL_wa 0x34 -#define MODEL_okuue 0x33 -#define MODEL_o665 0x32 -#define MODEL_hasira2 0x31 -#define MODEL_o570 0x30 -#define MODEL_o569 0x2F -#define MODEL_o568 0x2E -#define MODEL_os_mae 0x2D -#define MODEL_hasi 0x2C -#define MODEL_toge 0x2B -#define MODEL_o623 0x2A -#define MODEL_g115 0x29 -#define MODEL_o616 0x28 -#define MODEL_o613 0x27 -#define MODEL_o610 0x26 -#define MODEL_o607 0x25 -#define MODEL_o604 0x24 -#define MODEL_o601 0x23 -#define MODEL_o598 0x22 -#define MODEL_o595 0x21 -#define MODEL_g114 0x20 -#define MODEL_o571 0x1F -#define MODEL_o614 0x1E -#define MODEL_o611 0x1D -#define MODEL_o608 0x1C -#define MODEL_o605 0x1B -#define MODEL_o602 0x1A -#define MODEL_o599 0x19 -#define MODEL_o596 0x18 -#define MODEL_o572 0x17 -#define MODEL_o617 0x16 -#define MODEL_hasira 0x15 -#define MODEL_h1_oku 0x14 -#define MODEL_h1_hisi 0x13 -#define MODEL_h1_sai 0x12 -#define MODEL_yuka 0x11 -#define MODEL_1_isi 0x10 -#define MODEL_1_zyu 0xF -#define MODEL_exit 0xE -#define MODEL_o624 0xD -#define MODEL_e2 0xC -#define MODEL_g119 0xB -#define MODEL_o632 0xA -#define MODEL_g118 0x9 -#define MODEL_o631 0x8 -#define MODEL_o630 0x7 -#define MODEL_o541 0x6 -#define MODEL_e1 0x5 -#define MODEL_o546 0x4 -#define MODEL_o629 0x3 -#define MODEL_o628 0x2 -#define MODEL_o627 0x1 -#define MODEL_o626 0x0 +#define MODEL_Root 0x50 +#define MODEL_g120 0x4F +#define MODEL_akr4 0x4E +#define MODEL_o661 0x4D +#define MODEL_akr3 0x4C +#define MODEL_o663 0x4B +#define MODEL_akr2 0x4A +#define MODEL_o657 0x49 +#define MODEL_akr1 0x48 +#define MODEL_o655 0x47 +#define MODEL_akari 0x46 +#define MODEL_hi16 0x45 +#define MODEL_hi15 0x44 +#define MODEL_hi14 0x43 +#define MODEL_hi13 0x42 +#define MODEL_hi12 0x41 +#define MODEL_hi11 0x40 +#define MODEL_hi0 0x3F +#define MODEL_hi9 0x3E +#define MODEL_hi8 0x3D +#define MODEL_hi7 0x3C +#define MODEL_hi6 0x3B +#define MODEL_hi5 0x3A +#define MODEL_hi4 0x39 +#define MODEL_hi3 0x38 +#define MODEL_hi2 0x37 +#define MODEL_hi1 0x36 +#define MODEL_kusari 0x35 +#define MODEL_wa 0x34 +#define MODEL_okuue 0x33 +#define MODEL_o665 0x32 +#define MODEL_hasira2 0x31 +#define MODEL_o570 0x30 +#define MODEL_o569 0x2F +#define MODEL_o568 0x2E +#define MODEL_os_mae 0x2D +#define MODEL_hasi 0x2C +#define MODEL_toge 0x2B +#define MODEL_o623 0x2A +#define MODEL_g115 0x29 +#define MODEL_o616 0x28 +#define MODEL_o613 0x27 +#define MODEL_o610 0x26 +#define MODEL_o607 0x25 +#define MODEL_o604 0x24 +#define MODEL_o601 0x23 +#define MODEL_o598 0x22 +#define MODEL_o595 0x21 +#define MODEL_g114 0x20 +#define MODEL_o571 0x1F +#define MODEL_o614 0x1E +#define MODEL_o611 0x1D +#define MODEL_o608 0x1C +#define MODEL_o605 0x1B +#define MODEL_o602 0x1A +#define MODEL_o599 0x19 +#define MODEL_o596 0x18 +#define MODEL_o572 0x17 +#define MODEL_o617 0x16 +#define MODEL_hasira 0x15 +#define MODEL_h1_oku 0x14 +#define MODEL_h1_hisi 0x13 +#define MODEL_h1_sai 0x12 +#define MODEL_yuka 0x11 +#define MODEL_1_isi 0x10 +#define MODEL_1_zyu 0xF +#define MODEL_exit 0xE +#define MODEL_o624 0xD +#define MODEL_e2 0xC +#define MODEL_g119 0xB +#define MODEL_o632 0xA +#define MODEL_g118 0x9 +#define MODEL_o631 0x8 +#define MODEL_o630 0x7 +#define MODEL_o541 0x6 +#define MODEL_e1 0x5 +#define MODEL_o546 0x4 +#define MODEL_o629 0x3 +#define MODEL_o628 0x2 +#define MODEL_o627 0x1 +#define MODEL_o626 0x0 + diff --git a/include/mapfs/kpa_10_hit.h b/include/mapfs/kpa_10_hit.h index 2a33c070f5..3ad2d3a35d 100644 --- a/include/mapfs/kpa_10_hit.h +++ b/include/mapfs/kpa_10_hit.h @@ -1,113 +1,123 @@ -#define COLLIDER_Root 0x70 -#define COLLIDER_g162 0x6F -#define COLLIDER_g168 0x6E -#define COLLIDER_o1178 0x6D -#define COLLIDER_deilittne 0x6C -#define COLLIDER_deilitne 0x6B -#define COLLIDER_deiline 0x6A -#define COLLIDER_o1176 0x69 -#define COLLIDER_deilittn 0x68 -#define COLLIDER_deilitn 0x67 -#define COLLIDER_deilin 0x66 -#define COLLIDER_o1152 0x65 -#define COLLIDER_deilitsw 0x64 -#define COLLIDER_deilisw 0x63 -#define COLLIDER_o1149 0x62 -#define COLLIDER_deilitw 0x61 -#define COLLIDER_deiliw 0x60 -#define COLLIDER_o1146 0x5F -#define COLLIDER_deilitse 0x5E -#define COLLIDER_deilise 0x5D -#define COLLIDER_o1143 0x5C -#define COLLIDER_deilite 0x5B -#define COLLIDER_deilie 0x5A -#define COLLIDER_g167 0x59 -#define COLLIDER_o1271 0x58 -#define COLLIDER_o1270 0x57 -#define COLLIDER_o1269 0x56 -#define COLLIDER_o1135 0x55 -#define COLLIDER_o1134 0x54 -#define COLLIDER_o1133 0x53 -#define COLLIDER_o1132 0x52 -#define COLLIDER_o1131 0x51 -#define COLLIDER_o1130 0x50 -#define COLLIDER_o1129 0x4F -#define COLLIDER_o1128 0x4E -#define COLLIDER_o1124 0x4D -#define COLLIDER_o1123 0x4C -#define COLLIDER_o1122 0x4B -#define COLLIDER_o1121 0x4A -#define COLLIDER_o1120 0x49 -#define COLLIDER_o1119 0x48 -#define COLLIDER_o1118 0x47 -#define COLLIDER_o1117 0x46 -#define COLLIDER_o1116 0x45 -#define COLLIDER_o1115 0x44 -#define COLLIDER_o1114 0x43 -#define COLLIDER_o1113 0x42 -#define COLLIDER_o1112 0x41 -#define COLLIDER_o1111 0x40 -#define COLLIDER_o1110 0x3F -#define COLLIDER_o1109 0x3E -#define COLLIDER_o1105 0x3D -#define COLLIDER_o1104 0x3C -#define COLLIDER_o1103 0x3B -#define COLLIDER_o1102 0x3A -#define COLLIDER_o1101 0x39 -#define COLLIDER_o1100 0x38 -#define COLLIDER_o1099 0x37 -#define COLLIDER_o1098 0x36 -#define COLLIDER_o1097 0x35 -#define COLLIDER_o1096 0x34 -#define COLLIDER_o1095 0x33 -#define COLLIDER_o1094 0x32 -#define COLLIDER_o1093 0x31 -#define COLLIDER_o1092 0x30 -#define COLLIDER_o1091 0x2F -#define COLLIDER_o1090 0x2E -#define COLLIDER_o1088 0x2D -#define COLLIDER_o1087 0x2C -#define COLLIDER_o1086 0x2B -#define COLLIDER_o1085 0x2A -#define COLLIDER_o1084 0x29 -#define COLLIDER_o1083 0x28 -#define COLLIDER_o1082 0x27 -#define COLLIDER_o1081 0x26 -#define COLLIDER_o1080 0x25 -#define COLLIDER_o1079 0x24 -#define COLLIDER_o1078 0x23 -#define COLLIDER_o1077 0x22 -#define COLLIDER_o1076 0x21 -#define COLLIDER_o1075 0x20 -#define COLLIDER_o1074 0x1F -#define COLLIDER_o1073 0x1E -#define COLLIDER_o1252 0x1D -#define COLLIDER_o1251 0x1C -#define COLLIDER_o1197 0x1B -#define COLLIDER_g163 0x1A -#define COLLIDER_g177 0x19 -#define COLLIDER_o1266 0x18 -#define COLLIDER_o1265 0x17 -#define COLLIDER_o1264 0x16 -#define COLLIDER_o1263 0x15 -#define COLLIDER_o1262 0x14 -#define COLLIDER_o1261 0x13 -#define COLLIDER_o1260 0x12 -#define COLLIDER_o1259 0x11 -#define COLLIDER_o1258 0x10 -#define COLLIDER_o1257 0xF -#define COLLIDER_o1256 0xE -#define COLLIDER_o1255 0xD -#define COLLIDER_o1254 0xC -#define COLLIDER_o1253 0xB -#define COLLIDER_g171 0xA -#define COLLIDER_g175 0x9 -#define COLLIDER_o1234 0x8 -#define COLLIDER_g174 0x7 -#define COLLIDER_o1228 0x6 -#define COLLIDER_o1273 0x5 -#define COLLIDER_g173 0x4 -#define COLLIDER_o1223 0x3 -#define COLLIDER_g170 0x2 -#define COLLIDER_o1194 0x1 -#define COLLIDER_o1191 0x0 +#define COLLIDER_Root 0x70 +#define COLLIDER_g162 0x6F +#define COLLIDER_g168 0x6E +#define COLLIDER_o1178 0x6D +#define COLLIDER_deilittne 0x6C +#define COLLIDER_deilitne 0x6B +#define COLLIDER_deiline 0x6A +#define COLLIDER_o1176 0x69 +#define COLLIDER_deilittn 0x68 +#define COLLIDER_deilitn 0x67 +#define COLLIDER_deilin 0x66 +#define COLLIDER_o1152 0x65 +#define COLLIDER_deilitsw 0x64 +#define COLLIDER_deilisw 0x63 +#define COLLIDER_o1149 0x62 +#define COLLIDER_deilitw 0x61 +#define COLLIDER_deiliw 0x60 +#define COLLIDER_o1146 0x5F +#define COLLIDER_deilitse 0x5E +#define COLLIDER_deilise 0x5D +#define COLLIDER_o1143 0x5C +#define COLLIDER_deilite 0x5B +#define COLLIDER_deilie 0x5A +#define COLLIDER_g167 0x59 +#define COLLIDER_o1271 0x58 +#define COLLIDER_o1270 0x57 +#define COLLIDER_o1269 0x56 +#define COLLIDER_o1135 0x55 +#define COLLIDER_o1134 0x54 +#define COLLIDER_o1133 0x53 +#define COLLIDER_o1132 0x52 +#define COLLIDER_o1131 0x51 +#define COLLIDER_o1130 0x50 +#define COLLIDER_o1129 0x4F +#define COLLIDER_o1128 0x4E +#define COLLIDER_o1124 0x4D +#define COLLIDER_o1123 0x4C +#define COLLIDER_o1122 0x4B +#define COLLIDER_o1121 0x4A +#define COLLIDER_o1120 0x49 +#define COLLIDER_o1119 0x48 +#define COLLIDER_o1118 0x47 +#define COLLIDER_o1117 0x46 +#define COLLIDER_o1116 0x45 +#define COLLIDER_o1115 0x44 +#define COLLIDER_o1114 0x43 +#define COLLIDER_o1113 0x42 +#define COLLIDER_o1112 0x41 +#define COLLIDER_o1111 0x40 +#define COLLIDER_o1110 0x3F +#define COLLIDER_o1109 0x3E +#define COLLIDER_o1105 0x3D +#define COLLIDER_o1104 0x3C +#define COLLIDER_o1103 0x3B +#define COLLIDER_o1102 0x3A +#define COLLIDER_o1101 0x39 +#define COLLIDER_o1100 0x38 +#define COLLIDER_o1099 0x37 +#define COLLIDER_o1098 0x36 +#define COLLIDER_o1097 0x35 +#define COLLIDER_o1096 0x34 +#define COLLIDER_o1095 0x33 +#define COLLIDER_o1094 0x32 +#define COLLIDER_o1093 0x31 +#define COLLIDER_o1092 0x30 +#define COLLIDER_o1091 0x2F +#define COLLIDER_o1090 0x2E +#define COLLIDER_o1088 0x2D +#define COLLIDER_o1087 0x2C +#define COLLIDER_o1086 0x2B +#define COLLIDER_o1085 0x2A +#define COLLIDER_o1084 0x29 +#define COLLIDER_o1083 0x28 +#define COLLIDER_o1082 0x27 +#define COLLIDER_o1081 0x26 +#define COLLIDER_o1080 0x25 +#define COLLIDER_o1079 0x24 +#define COLLIDER_o1078 0x23 +#define COLLIDER_o1077 0x22 +#define COLLIDER_o1076 0x21 +#define COLLIDER_o1075 0x20 +#define COLLIDER_o1074 0x1F +#define COLLIDER_o1073 0x1E +#define COLLIDER_o1252 0x1D +#define COLLIDER_o1251 0x1C +#define COLLIDER_o1197 0x1B +#define COLLIDER_g163 0x1A +#define COLLIDER_g177 0x19 +#define COLLIDER_o1266 0x18 +#define COLLIDER_o1265 0x17 +#define COLLIDER_o1264 0x16 +#define COLLIDER_o1263 0x15 +#define COLLIDER_o1262 0x14 +#define COLLIDER_o1261 0x13 +#define COLLIDER_o1260 0x12 +#define COLLIDER_o1259 0x11 +#define COLLIDER_o1258 0x10 +#define COLLIDER_o1257 0xF +#define COLLIDER_o1256 0xE +#define COLLIDER_o1255 0xD +#define COLLIDER_o1254 0xC +#define COLLIDER_o1253 0xB +#define COLLIDER_g171 0xA +#define COLLIDER_g175 0x9 +#define COLLIDER_o1234 0x8 +#define COLLIDER_g174 0x7 +#define COLLIDER_o1228 0x6 +#define COLLIDER_o1273 0x5 +#define COLLIDER_g173 0x4 +#define COLLIDER_o1223 0x3 +#define COLLIDER_g170 0x2 +#define COLLIDER_o1194 0x1 +#define COLLIDER_o1191 0x0 + +#define ZONE_Root 0x7 +#define ZONE_g162 0x6 +#define ZONE_g168 0x5 +#define ZONE_o1069 0x4 +#define ZONE_g166 0x3 +#define ZONE_o1171 0x2 +#define ZONE_g163 0x1 +#define ZONE_o1062 0x0 + diff --git a/include/mapfs/kpa_10_shape.h b/include/mapfs/kpa_10_shape.h index c8df0384d3..23eae75600 100644 --- a/include/mapfs/kpa_10_shape.h +++ b/include/mapfs/kpa_10_shape.h @@ -1,202 +1,203 @@ -#define MODEL_Root 0xC9 -#define MODEL_o2116 0xC8 -#define MODEL_o2115 0xC7 -#define MODEL_o2114 0xC6 -#define MODEL_o2113 0xC5 -#define MODEL_o2112 0xC4 -#define MODEL_o2111 0xC3 -#define MODEL_o2110 0xC2 -#define MODEL_o2109 0xC1 -#define MODEL_o2108 0xC0 -#define MODEL_g318 0xBF -#define MODEL_g346 0xBE -#define MODEL_o2107 0xBD -#define MODEL_o2106 0xBC -#define MODEL_o2105 0xBB -#define MODEL_o2104 0xBA -#define MODEL_g345 0xB9 -#define MODEL_o2098 0xB8 -#define MODEL_g344 0xB7 -#define MODEL_o2092 0xB6 -#define MODEL_g343 0xB5 -#define MODEL_o2091 0xB4 -#define MODEL_o2090 0xB3 -#define MODEL_o2089 0xB2 -#define MODEL_o2088 0xB1 -#define MODEL_g340 0xB0 -#define MODEL_g342 0xAF -#define MODEL_o2087 0xAE -#define MODEL_g341 0xAD -#define MODEL_o2086 0xAC -#define MODEL_o2085 0xAB -#define MODEL_o2084 0xAA -#define MODEL_o2083 0xA9 -#define MODEL_o2082 0xA8 -#define MODEL_o2081 0xA7 -#define MODEL_g339 0xA6 -#define MODEL_o2075 0xA5 -#define MODEL_g338 0xA4 -#define MODEL_o2069 0xA3 -#define MODEL_g337 0xA2 -#define MODEL_o2068 0xA1 -#define MODEL_o2067 0xA0 -#define MODEL_o2066 0x9F -#define MODEL_o2065 0x9E -#define MODEL_g336 0x9D -#define MODEL_o2059 0x9C -#define MODEL_g335 0x9B -#define MODEL_o2053 0x9A -#define MODEL_g334 0x99 -#define MODEL_o2047 0x98 -#define MODEL_g333 0x97 -#define MODEL_o2046 0x96 -#define MODEL_o2045 0x95 -#define MODEL_o2044 0x94 -#define MODEL_o2043 0x93 -#define MODEL_g332 0x92 -#define MODEL_o2042 0x91 -#define MODEL_o2041 0x90 -#define MODEL_o2040 0x8F -#define MODEL_o2039 0x8E -#define MODEL_g331 0x8D -#define MODEL_o2038 0x8C -#define MODEL_o2037 0x8B -#define MODEL_o2036 0x8A -#define MODEL_o2035 0x89 -#define MODEL_g330 0x88 -#define MODEL_o2034 0x87 -#define MODEL_o2033 0x86 -#define MODEL_o2032 0x85 -#define MODEL_o2031 0x84 -#define MODEL_g329 0x83 -#define MODEL_o2030 0x82 -#define MODEL_o2029 0x81 -#define MODEL_o2028 0x80 -#define MODEL_o2027 0x7F -#define MODEL_g328 0x7E -#define MODEL_o2026 0x7D -#define MODEL_o2025 0x7C -#define MODEL_o2024 0x7B -#define MODEL_o2023 0x7A -#define MODEL_g327 0x79 -#define MODEL_o2022 0x78 -#define MODEL_o2021 0x77 -#define MODEL_o2020 0x76 -#define MODEL_o2019 0x75 -#define MODEL_g326 0x74 -#define MODEL_o2018 0x73 -#define MODEL_o2017 0x72 -#define MODEL_o2016 0x71 -#define MODEL_o2015 0x70 -#define MODEL_g325 0x6F -#define MODEL_o2009 0x6E -#define MODEL_g324 0x6D -#define MODEL_o2003 0x6C -#define MODEL_g323 0x6B -#define MODEL_o1997 0x6A -#define MODEL_g322 0x69 -#define MODEL_o1996 0x68 -#define MODEL_o1995 0x67 -#define MODEL_o1994 0x66 -#define MODEL_o1993 0x65 -#define MODEL_o1992 0x64 -#define MODEL_o1991 0x63 -#define MODEL_g321 0x62 -#define MODEL_o1990 0x61 -#define MODEL_o1989 0x60 -#define MODEL_o1988 0x5F -#define MODEL_o1987 0x5E -#define MODEL_o1986 0x5D -#define MODEL_o1985 0x5C -#define MODEL_g320 0x5B -#define MODEL_o1984 0x5A -#define MODEL_o1983 0x59 -#define MODEL_o1982 0x58 -#define MODEL_o1981 0x57 -#define MODEL_o1980 0x56 -#define MODEL_o1979 0x55 -#define MODEL_g319 0x54 -#define MODEL_o1978 0x53 -#define MODEL_o1977 0x52 -#define MODEL_o1976 0x51 -#define MODEL_o1975 0x50 -#define MODEL_o1974 0x4F -#define MODEL_o1973 0x4E -#define MODEL_g312 0x4D -#define MODEL_g317 0x4C -#define MODEL_o1972 0x4B -#define MODEL_o1971 0x4A -#define MODEL_o1970 0x49 -#define MODEL_o1969 0x48 -#define MODEL_o1968 0x47 -#define MODEL_o1967 0x46 -#define MODEL_o1966 0x45 -#define MODEL_o1965 0x44 -#define MODEL_o1964 0x43 -#define MODEL_o1963 0x42 -#define MODEL_o1962 0x41 -#define MODEL_o1961 0x40 -#define MODEL_o1960 0x3F -#define MODEL_o1959 0x3E -#define MODEL_o1958 0x3D -#define MODEL_o1957 0x3C -#define MODEL_g316 0x3B -#define MODEL_o1956 0x3A -#define MODEL_o1955 0x39 -#define MODEL_o1954 0x38 -#define MODEL_o1953 0x37 -#define MODEL_o1952 0x36 -#define MODEL_o1951 0x35 -#define MODEL_g315 0x34 -#define MODEL_o1950 0x33 -#define MODEL_o1949 0x32 -#define MODEL_o1948 0x31 -#define MODEL_o1947 0x30 -#define MODEL_o1946 0x2F -#define MODEL_g314 0x2E -#define MODEL_o1945 0x2D -#define MODEL_o1944 0x2C -#define MODEL_o1943 0x2B -#define MODEL_o1942 0x2A -#define MODEL_o1941 0x29 -#define MODEL_o1940 0x28 -#define MODEL_o1939 0x27 -#define MODEL_o1938 0x26 -#define MODEL_o1937 0x25 -#define MODEL_o1936 0x24 -#define MODEL_o1935 0x23 -#define MODEL_o1934 0x22 -#define MODEL_o1933 0x21 -#define MODEL_o1932 0x20 -#define MODEL_o1931 0x1F -#define MODEL_o1930 0x1E -#define MODEL_o1929 0x1D -#define MODEL_o1928 0x1C -#define MODEL_o1927 0x1B -#define MODEL_o1926 0x1A -#define MODEL_o1925 0x19 -#define MODEL_o1924 0x18 -#define MODEL_o1923 0x17 -#define MODEL_g313 0x16 -#define MODEL_o1922 0x15 -#define MODEL_o1921 0x14 -#define MODEL_o1920 0x13 -#define MODEL_o1919 0x12 -#define MODEL_o1918 0x11 -#define MODEL_o1917 0x10 -#define MODEL_g309 0xF -#define MODEL_g311 0xE -#define MODEL_o1915 0xD -#define MODEL_o1914 0xC -#define MODEL_o1913 0xB -#define MODEL_o1912 0xA -#define MODEL_o1911 0x9 -#define MODEL_o1910 0x8 -#define MODEL_g310 0x7 -#define MODEL_o1909 0x6 -#define MODEL_o1908 0x5 -#define MODEL_o1907 0x4 -#define MODEL_o1906 0x3 -#define MODEL_o1905 0x2 -#define MODEL_o1904 0x1 -#define MODEL_o1903 0x0 +#define MODEL_Root 0xC9 +#define MODEL_o2116 0xC8 +#define MODEL_o2115 0xC7 +#define MODEL_o2114 0xC6 +#define MODEL_o2113 0xC5 +#define MODEL_o2112 0xC4 +#define MODEL_o2111 0xC3 +#define MODEL_o2110 0xC2 +#define MODEL_o2109 0xC1 +#define MODEL_o2108 0xC0 +#define MODEL_g318 0xBF +#define MODEL_g346 0xBE +#define MODEL_o2107 0xBD +#define MODEL_o2106 0xBC +#define MODEL_o2105 0xBB +#define MODEL_o2104 0xBA +#define MODEL_g345 0xB9 +#define MODEL_o2098 0xB8 +#define MODEL_g344 0xB7 +#define MODEL_o2092 0xB6 +#define MODEL_g343 0xB5 +#define MODEL_o2091 0xB4 +#define MODEL_o2090 0xB3 +#define MODEL_o2089 0xB2 +#define MODEL_o2088 0xB1 +#define MODEL_g340 0xB0 +#define MODEL_g342 0xAF +#define MODEL_o2087 0xAE +#define MODEL_g341 0xAD +#define MODEL_o2086 0xAC +#define MODEL_o2085 0xAB +#define MODEL_o2084 0xAA +#define MODEL_o2083 0xA9 +#define MODEL_o2082 0xA8 +#define MODEL_o2081 0xA7 +#define MODEL_g339 0xA6 +#define MODEL_o2075 0xA5 +#define MODEL_g338 0xA4 +#define MODEL_o2069 0xA3 +#define MODEL_g337 0xA2 +#define MODEL_o2068 0xA1 +#define MODEL_o2067 0xA0 +#define MODEL_o2066 0x9F +#define MODEL_o2065 0x9E +#define MODEL_g336 0x9D +#define MODEL_o2059 0x9C +#define MODEL_g335 0x9B +#define MODEL_o2053 0x9A +#define MODEL_g334 0x99 +#define MODEL_o2047 0x98 +#define MODEL_g333 0x97 +#define MODEL_o2046 0x96 +#define MODEL_o2045 0x95 +#define MODEL_o2044 0x94 +#define MODEL_o2043 0x93 +#define MODEL_g332 0x92 +#define MODEL_o2042 0x91 +#define MODEL_o2041 0x90 +#define MODEL_o2040 0x8F +#define MODEL_o2039 0x8E +#define MODEL_g331 0x8D +#define MODEL_o2038 0x8C +#define MODEL_o2037 0x8B +#define MODEL_o2036 0x8A +#define MODEL_o2035 0x89 +#define MODEL_g330 0x88 +#define MODEL_o2034 0x87 +#define MODEL_o2033 0x86 +#define MODEL_o2032 0x85 +#define MODEL_o2031 0x84 +#define MODEL_g329 0x83 +#define MODEL_o2030 0x82 +#define MODEL_o2029 0x81 +#define MODEL_o2028 0x80 +#define MODEL_o2027 0x7F +#define MODEL_g328 0x7E +#define MODEL_o2026 0x7D +#define MODEL_o2025 0x7C +#define MODEL_o2024 0x7B +#define MODEL_o2023 0x7A +#define MODEL_g327 0x79 +#define MODEL_o2022 0x78 +#define MODEL_o2021 0x77 +#define MODEL_o2020 0x76 +#define MODEL_o2019 0x75 +#define MODEL_g326 0x74 +#define MODEL_o2018 0x73 +#define MODEL_o2017 0x72 +#define MODEL_o2016 0x71 +#define MODEL_o2015 0x70 +#define MODEL_g325 0x6F +#define MODEL_o2009 0x6E +#define MODEL_g324 0x6D +#define MODEL_o2003 0x6C +#define MODEL_g323 0x6B +#define MODEL_o1997 0x6A +#define MODEL_g322 0x69 +#define MODEL_o1996 0x68 +#define MODEL_o1995 0x67 +#define MODEL_o1994 0x66 +#define MODEL_o1993 0x65 +#define MODEL_o1992 0x64 +#define MODEL_o1991 0x63 +#define MODEL_g321 0x62 +#define MODEL_o1990 0x61 +#define MODEL_o1989 0x60 +#define MODEL_o1988 0x5F +#define MODEL_o1987 0x5E +#define MODEL_o1986 0x5D +#define MODEL_o1985 0x5C +#define MODEL_g320 0x5B +#define MODEL_o1984 0x5A +#define MODEL_o1983 0x59 +#define MODEL_o1982 0x58 +#define MODEL_o1981 0x57 +#define MODEL_o1980 0x56 +#define MODEL_o1979 0x55 +#define MODEL_g319 0x54 +#define MODEL_o1978 0x53 +#define MODEL_o1977 0x52 +#define MODEL_o1976 0x51 +#define MODEL_o1975 0x50 +#define MODEL_o1974 0x4F +#define MODEL_o1973 0x4E +#define MODEL_g312 0x4D +#define MODEL_g317 0x4C +#define MODEL_o1972 0x4B +#define MODEL_o1971 0x4A +#define MODEL_o1970 0x49 +#define MODEL_o1969 0x48 +#define MODEL_o1968 0x47 +#define MODEL_o1967 0x46 +#define MODEL_o1966 0x45 +#define MODEL_o1965 0x44 +#define MODEL_o1964 0x43 +#define MODEL_o1963 0x42 +#define MODEL_o1962 0x41 +#define MODEL_o1961 0x40 +#define MODEL_o1960 0x3F +#define MODEL_o1959 0x3E +#define MODEL_o1958 0x3D +#define MODEL_o1957 0x3C +#define MODEL_g316 0x3B +#define MODEL_o1956 0x3A +#define MODEL_o1955 0x39 +#define MODEL_o1954 0x38 +#define MODEL_o1953 0x37 +#define MODEL_o1952 0x36 +#define MODEL_o1951 0x35 +#define MODEL_g315 0x34 +#define MODEL_o1950 0x33 +#define MODEL_o1949 0x32 +#define MODEL_o1948 0x31 +#define MODEL_o1947 0x30 +#define MODEL_o1946 0x2F +#define MODEL_g314 0x2E +#define MODEL_o1945 0x2D +#define MODEL_o1944 0x2C +#define MODEL_o1943 0x2B +#define MODEL_o1942 0x2A +#define MODEL_o1941 0x29 +#define MODEL_o1940 0x28 +#define MODEL_o1939 0x27 +#define MODEL_o1938 0x26 +#define MODEL_o1937 0x25 +#define MODEL_o1936 0x24 +#define MODEL_o1935 0x23 +#define MODEL_o1934 0x22 +#define MODEL_o1933 0x21 +#define MODEL_o1932 0x20 +#define MODEL_o1931 0x1F +#define MODEL_o1930 0x1E +#define MODEL_o1929 0x1D +#define MODEL_o1928 0x1C +#define MODEL_o1927 0x1B +#define MODEL_o1926 0x1A +#define MODEL_o1925 0x19 +#define MODEL_o1924 0x18 +#define MODEL_o1923 0x17 +#define MODEL_g313 0x16 +#define MODEL_o1922 0x15 +#define MODEL_o1921 0x14 +#define MODEL_o1920 0x13 +#define MODEL_o1919 0x12 +#define MODEL_o1918 0x11 +#define MODEL_o1917 0x10 +#define MODEL_g309 0xF +#define MODEL_g311 0xE +#define MODEL_o1915 0xD +#define MODEL_o1914 0xC +#define MODEL_o1913 0xB +#define MODEL_o1912 0xA +#define MODEL_o1911 0x9 +#define MODEL_o1910 0x8 +#define MODEL_g310 0x7 +#define MODEL_o1909 0x6 +#define MODEL_o1908 0x5 +#define MODEL_o1907 0x4 +#define MODEL_o1906 0x3 +#define MODEL_o1905 0x2 +#define MODEL_o1904 0x1 +#define MODEL_o1903 0x0 + diff --git a/include/mapfs/kpa_111_hit.h b/include/mapfs/kpa_111_hit.h index 5060fb70ae..ba06f57dd4 100644 --- a/include/mapfs/kpa_111_hit.h +++ b/include/mapfs/kpa_111_hit.h @@ -1,41 +1,56 @@ -#define COLLIDER_Root 0x28 -#define COLLIDER_g1 0x27 -#define COLLIDER_g2 0x26 -#define COLLIDER_g21 0x25 -#define COLLIDER_o112 0x24 -#define COLLIDER_deilinet 0x23 -#define COLLIDER_deiline 0x22 -#define COLLIDER_o80 0x21 -#define COLLIDER_deiliwtt 0x20 -#define COLLIDER_deiliwt 0x1F -#define COLLIDER_deiliw 0x1E -#define COLLIDER_g8 0x1D -#define COLLIDER_g29 0x1C -#define COLLIDER_kpa_c 0x1B -#define COLLIDER_kpa_r 0x1A -#define COLLIDER_kpa_l 0x19 -#define COLLIDER_g31 0x18 -#define COLLIDER_o146 0x17 -#define COLLIDER_o145 0x16 -#define COLLIDER_o144 0x15 -#define COLLIDER_g30 0x14 -#define COLLIDER_o143 0x13 -#define COLLIDER_o142 0x12 -#define COLLIDER_o141 0x11 -#define COLLIDER_g20 0x10 -#define COLLIDER_o119 0xF -#define COLLIDER_o118 0xE -#define COLLIDER_o115 0xD -#define COLLIDER_g15 0xC -#define COLLIDER_o103 0xB -#define COLLIDER_o102 0xA -#define COLLIDER_o60 0x9 -#define COLLIDER_g19 0x8 -#define COLLIDER_o113 0x7 -#define COLLIDER_o110 0x6 -#define COLLIDER_g18 0x5 -#define COLLIDER_o108 0x4 -#define COLLIDER_o105 0x3 -#define COLLIDER_g4 0x2 -#define COLLIDER_o100 0x1 -#define COLLIDER_o11 0x0 +#define COLLIDER_Root 0x28 +#define COLLIDER_g1 0x27 +#define COLLIDER_g2 0x26 +#define COLLIDER_g21 0x25 +#define COLLIDER_o112 0x24 +#define COLLIDER_deilinet 0x23 +#define COLLIDER_deiline 0x22 +#define COLLIDER_o80 0x21 +#define COLLIDER_deiliwtt 0x20 +#define COLLIDER_deiliwt 0x1F +#define COLLIDER_deiliw 0x1E +#define COLLIDER_g8 0x1D +#define COLLIDER_g29 0x1C +#define COLLIDER_kpa_c 0x1B +#define COLLIDER_kpa_r 0x1A +#define COLLIDER_kpa_l 0x19 +#define COLLIDER_g31 0x18 +#define COLLIDER_o146 0x17 +#define COLLIDER_o145 0x16 +#define COLLIDER_o144 0x15 +#define COLLIDER_g30 0x14 +#define COLLIDER_o143 0x13 +#define COLLIDER_o142 0x12 +#define COLLIDER_o141 0x11 +#define COLLIDER_g20 0x10 +#define COLLIDER_o119 0xF +#define COLLIDER_o118 0xE +#define COLLIDER_o115 0xD +#define COLLIDER_g15 0xC +#define COLLIDER_o103 0xB +#define COLLIDER_o102 0xA +#define COLLIDER_o60 0x9 +#define COLLIDER_g19 0x8 +#define COLLIDER_o113 0x7 +#define COLLIDER_o110 0x6 +#define COLLIDER_g18 0x5 +#define COLLIDER_o108 0x4 +#define COLLIDER_o105 0x3 +#define COLLIDER_g4 0x2 +#define COLLIDER_o100 0x1 +#define COLLIDER_o11 0x0 + +#define ZONE_Root 0xC +#define ZONE_g1 0xB +#define ZONE_g2 0xA +#define ZONE_deilie 0x9 +#define ZONE_deiline 0x8 +#define ZONE_deilin 0x7 +#define ZONE_deilinw 0x6 +#define ZONE_deiliw 0x5 +#define ZONE_o115 0x4 +#define ZONE_o60 0x3 +#define ZONE_o110 0x2 +#define ZONE_o105 0x1 +#define ZONE_o11 0x0 + diff --git a/include/mapfs/kpa_111_shape.h b/include/mapfs/kpa_111_shape.h index 63e52cbf1c..209fe47c7d 100644 --- a/include/mapfs/kpa_111_shape.h +++ b/include/mapfs/kpa_111_shape.h @@ -1,54 +1,55 @@ -#define MODEL_Root 0x35 -#define MODEL_g1 0x34 -#define MODEL_g23 0x33 -#define MODEL_o119 0x32 -#define MODEL_g22 0x31 -#define MODEL_o118 0x30 -#define MODEL_o117 0x2F -#define MODEL_o116 0x2E -#define MODEL_g2 0x2D -#define MODEL_o89 0x2C -#define MODEL_o88 0x2B -#define MODEL_o12 0x2A -#define MODEL_o13 0x29 -#define MODEL_g8 0x28 -#define MODEL_g21 0x27 -#define MODEL_o105 0x26 -#define MODEL_o104 0x25 -#define MODEL_g20 0x24 -#define MODEL_o103 0x23 -#define MODEL_o102 0x22 -#define MODEL_g19 0x21 -#define MODEL_o101 0x20 -#define MODEL_o100 0x1F -#define MODEL_g16 0x1E -#define MODEL_o86 0x1D -#define MODEL_o71 0x1C -#define MODEL_o67 0x1B -#define MODEL_o65 0x1A -#define MODEL_g15 0x19 -#define MODEL_o83 0x18 -#define MODEL_o79 0x17 -#define MODEL_o60 0x16 -#define MODEL_o56 0x15 -#define MODEL_o54 0x14 -#define MODEL_o115 0x13 -#define MODEL_g7 0x12 -#define MODEL_o98 0x11 -#define MODEL_o97 0x10 -#define MODEL_o33 0xF -#define MODEL_o31 0xE -#define MODEL_o30 0xD -#define MODEL_o112 0xC -#define MODEL_g6 0xB -#define MODEL_o96 0xA -#define MODEL_o27 0x9 -#define MODEL_o25 0x8 -#define MODEL_o24 0x7 -#define MODEL_o113 0x6 -#define MODEL_g4 0x5 -#define MODEL_o52 0x4 -#define MODEL_o11 0x3 -#define MODEL_o8 0x2 -#define MODEL_o7 0x1 -#define MODEL_o114 0x0 +#define MODEL_Root 0x35 +#define MODEL_g1 0x34 +#define MODEL_g23 0x33 +#define MODEL_o119 0x32 +#define MODEL_g22 0x31 +#define MODEL_o118 0x30 +#define MODEL_o117 0x2F +#define MODEL_o116 0x2E +#define MODEL_g2 0x2D +#define MODEL_o89 0x2C +#define MODEL_o88 0x2B +#define MODEL_o12 0x2A +#define MODEL_o13 0x29 +#define MODEL_g8 0x28 +#define MODEL_g21 0x27 +#define MODEL_o105 0x26 +#define MODEL_o104 0x25 +#define MODEL_g20 0x24 +#define MODEL_o103 0x23 +#define MODEL_o102 0x22 +#define MODEL_g19 0x21 +#define MODEL_o101 0x20 +#define MODEL_o100 0x1F +#define MODEL_g16 0x1E +#define MODEL_o86 0x1D +#define MODEL_o71 0x1C +#define MODEL_o67 0x1B +#define MODEL_o65 0x1A +#define MODEL_g15 0x19 +#define MODEL_o83 0x18 +#define MODEL_o79 0x17 +#define MODEL_o60 0x16 +#define MODEL_o56 0x15 +#define MODEL_o54 0x14 +#define MODEL_o115 0x13 +#define MODEL_g7 0x12 +#define MODEL_o98 0x11 +#define MODEL_o97 0x10 +#define MODEL_o33 0xF +#define MODEL_o31 0xE +#define MODEL_o30 0xD +#define MODEL_o112 0xC +#define MODEL_g6 0xB +#define MODEL_o96 0xA +#define MODEL_o27 0x9 +#define MODEL_o25 0x8 +#define MODEL_o24 0x7 +#define MODEL_o113 0x6 +#define MODEL_g4 0x5 +#define MODEL_o52 0x4 +#define MODEL_o11 0x3 +#define MODEL_o8 0x2 +#define MODEL_o7 0x1 +#define MODEL_o114 0x0 + diff --git a/include/mapfs/kpa_112_hit.h b/include/mapfs/kpa_112_hit.h index 0c61938b1a..6c2df62f78 100644 --- a/include/mapfs/kpa_112_hit.h +++ b/include/mapfs/kpa_112_hit.h @@ -1,25 +1,36 @@ -#define COLLIDER_Root 0x18 -#define COLLIDER_g1 0x17 -#define COLLIDER_g2 0x16 -#define COLLIDER_g41 0x15 -#define COLLIDER_o115 0x14 -#define COLLIDER_deilits 0x13 -#define COLLIDER_deilis 0x12 -#define COLLIDER_o144 0x11 -#define COLLIDER_deilite 0x10 -#define COLLIDER_deilie 0xF -#define COLLIDER_g40 0xE -#define COLLIDER_o247 0xD -#define COLLIDER_o245 0xC -#define COLLIDER_g38 0xB -#define COLLIDER_o243 0xA -#define COLLIDER_o239 0x9 -#define COLLIDER_g36 0x8 -#define COLLIDER_o229 0x7 -#define COLLIDER_o227 0x6 -#define COLLIDER_g35 0x5 -#define COLLIDER_o226 0x4 -#define COLLIDER_o224 0x3 -#define COLLIDER_g6 0x2 -#define COLLIDER_o223 0x1 -#define COLLIDER_o136 0x0 +#define COLLIDER_Root 0x18 +#define COLLIDER_g1 0x17 +#define COLLIDER_g2 0x16 +#define COLLIDER_g41 0x15 +#define COLLIDER_o115 0x14 +#define COLLIDER_deilits 0x13 +#define COLLIDER_deilis 0x12 +#define COLLIDER_o144 0x11 +#define COLLIDER_deilite 0x10 +#define COLLIDER_deilie 0xF +#define COLLIDER_g40 0xE +#define COLLIDER_o247 0xD +#define COLLIDER_o245 0xC +#define COLLIDER_g38 0xB +#define COLLIDER_o243 0xA +#define COLLIDER_o239 0x9 +#define COLLIDER_g36 0x8 +#define COLLIDER_o229 0x7 +#define COLLIDER_o227 0x6 +#define COLLIDER_g35 0x5 +#define COLLIDER_o226 0x4 +#define COLLIDER_o224 0x3 +#define COLLIDER_g6 0x2 +#define COLLIDER_o223 0x1 +#define COLLIDER_o136 0x0 + +#define ZONE_Root 0x8 +#define ZONE_g1 0x7 +#define ZONE_deilis 0x6 +#define ZONE_deilie 0x5 +#define ZONE_o247 0x4 +#define ZONE_o243 0x3 +#define ZONE_o227 0x2 +#define ZONE_o224 0x1 +#define ZONE_o136 0x0 + diff --git a/include/mapfs/kpa_112_shape.h b/include/mapfs/kpa_112_shape.h index f413e29caa..d380a4431e 100644 --- a/include/mapfs/kpa_112_shape.h +++ b/include/mapfs/kpa_112_shape.h @@ -1,37 +1,38 @@ -#define MODEL_Root 0x24 -#define MODEL_g1 0x23 -#define MODEL_g2 0x22 -#define MODEL_o246 0x21 -#define MODEL_o245 0x20 -#define MODEL_o244 0x1F -#define MODEL_o242 0x1E -#define MODEL_o243 0x1D -#define MODEL_g39 0x1C -#define MODEL_o241 0x1B -#define MODEL_o240 0x1A -#define MODEL_o239 0x19 -#define MODEL_o238 0x18 -#define MODEL_g38 0x17 -#define MODEL_o237 0x16 -#define MODEL_o236 0x15 -#define MODEL_o235 0x14 -#define MODEL_o234 0x13 -#define MODEL_o144 0x12 -#define MODEL_o115 0x11 -#define MODEL_o202 0x10 -#define MODEL_o221 0xF -#define MODEL_g34 0xE -#define MODEL_o220 0xD -#define MODEL_o219 0xC -#define MODEL_o218 0xB -#define MODEL_o217 0xA -#define MODEL_g32 0x9 -#define MODEL_o207 0x8 -#define MODEL_o203 0x7 -#define MODEL_o196 0x6 -#define MODEL_o194 0x5 -#define MODEL_g6 0x4 -#define MODEL_o147 0x3 -#define MODEL_o146 0x2 -#define MODEL_o136 0x1 -#define MODEL_o96 0x0 +#define MODEL_Root 0x24 +#define MODEL_g1 0x23 +#define MODEL_g2 0x22 +#define MODEL_o246 0x21 +#define MODEL_o245 0x20 +#define MODEL_o244 0x1F +#define MODEL_o242 0x1E +#define MODEL_o243 0x1D +#define MODEL_g39 0x1C +#define MODEL_o241 0x1B +#define MODEL_o240 0x1A +#define MODEL_o239 0x19 +#define MODEL_o238 0x18 +#define MODEL_g38 0x17 +#define MODEL_o237 0x16 +#define MODEL_o236 0x15 +#define MODEL_o235 0x14 +#define MODEL_o234 0x13 +#define MODEL_o144 0x12 +#define MODEL_o115 0x11 +#define MODEL_o202 0x10 +#define MODEL_o221 0xF +#define MODEL_g34 0xE +#define MODEL_o220 0xD +#define MODEL_o219 0xC +#define MODEL_o218 0xB +#define MODEL_o217 0xA +#define MODEL_g32 0x9 +#define MODEL_o207 0x8 +#define MODEL_o203 0x7 +#define MODEL_o196 0x6 +#define MODEL_o194 0x5 +#define MODEL_g6 0x4 +#define MODEL_o147 0x3 +#define MODEL_o146 0x2 +#define MODEL_o136 0x1 +#define MODEL_o96 0x0 + diff --git a/include/mapfs/kpa_113_hit.h b/include/mapfs/kpa_113_hit.h index 72bf960e8e..cb60f7e67b 100644 --- a/include/mapfs/kpa_113_hit.h +++ b/include/mapfs/kpa_113_hit.h @@ -1,44 +1,59 @@ -#define COLLIDER_Root 0x2B -#define COLLIDER_g1 0x2A -#define COLLIDER_g2 0x29 -#define COLLIDER_g21 0x28 -#define COLLIDER_o116 0x27 -#define COLLIDER_deiliett 0x26 -#define COLLIDER_deiliet 0x25 -#define COLLIDER_deilie 0x24 -#define COLLIDER_o93 0x23 -#define COLLIDER_deilinwt 0x22 -#define COLLIDER_deilinw 0x21 -#define COLLIDER_o80 0x20 -#define COLLIDER_deiliwt 0x1F -#define COLLIDER_deiliw 0x1E -#define COLLIDER_g29 0x1D -#define COLLIDER_g32 0x1C -#define COLLIDER_o150 0x1B -#define COLLIDER_o149 0x1A -#define COLLIDER_o148 0x19 -#define COLLIDER_g31 0x18 -#define COLLIDER_o147 0x17 -#define COLLIDER_o146 0x16 -#define COLLIDER_o145 0x15 -#define COLLIDER_g30 0x14 -#define COLLIDER_kpa_c 0x13 -#define COLLIDER_kpa_r 0x12 -#define COLLIDER_kpa_l 0x11 -#define COLLIDER_g20 0x10 -#define COLLIDER_o119 0xF -#define COLLIDER_o118 0xE -#define COLLIDER_o115 0xD -#define COLLIDER_g15 0xC -#define COLLIDER_o103 0xB -#define COLLIDER_o102 0xA -#define COLLIDER_o60 0x9 -#define COLLIDER_g19 0x8 -#define COLLIDER_o113 0x7 -#define COLLIDER_o110 0x6 -#define COLLIDER_g18 0x5 -#define COLLIDER_o108 0x4 -#define COLLIDER_o105 0x3 -#define COLLIDER_g4 0x2 -#define COLLIDER_o100 0x1 -#define COLLIDER_o11 0x0 +#define COLLIDER_Root 0x2B +#define COLLIDER_g1 0x2A +#define COLLIDER_g2 0x29 +#define COLLIDER_g21 0x28 +#define COLLIDER_o116 0x27 +#define COLLIDER_deiliett 0x26 +#define COLLIDER_deiliet 0x25 +#define COLLIDER_deilie 0x24 +#define COLLIDER_o93 0x23 +#define COLLIDER_deilinwt 0x22 +#define COLLIDER_deilinw 0x21 +#define COLLIDER_o80 0x20 +#define COLLIDER_deiliwt 0x1F +#define COLLIDER_deiliw 0x1E +#define COLLIDER_g29 0x1D +#define COLLIDER_g32 0x1C +#define COLLIDER_o150 0x1B +#define COLLIDER_o149 0x1A +#define COLLIDER_o148 0x19 +#define COLLIDER_g31 0x18 +#define COLLIDER_o147 0x17 +#define COLLIDER_o146 0x16 +#define COLLIDER_o145 0x15 +#define COLLIDER_g30 0x14 +#define COLLIDER_kpa_c 0x13 +#define COLLIDER_kpa_r 0x12 +#define COLLIDER_kpa_l 0x11 +#define COLLIDER_g20 0x10 +#define COLLIDER_o119 0xF +#define COLLIDER_o118 0xE +#define COLLIDER_o115 0xD +#define COLLIDER_g15 0xC +#define COLLIDER_o103 0xB +#define COLLIDER_o102 0xA +#define COLLIDER_o60 0x9 +#define COLLIDER_g19 0x8 +#define COLLIDER_o113 0x7 +#define COLLIDER_o110 0x6 +#define COLLIDER_g18 0x5 +#define COLLIDER_o108 0x4 +#define COLLIDER_o105 0x3 +#define COLLIDER_g4 0x2 +#define COLLIDER_o100 0x1 +#define COLLIDER_o11 0x0 + +#define ZONE_Root 0xC +#define ZONE_g1 0xB +#define ZONE_g2 0xA +#define ZONE_deilie 0x9 +#define ZONE_deiline 0x8 +#define ZONE_deilin 0x7 +#define ZONE_deilinw 0x6 +#define ZONE_deiliw 0x5 +#define ZONE_o115 0x4 +#define ZONE_o60 0x3 +#define ZONE_o110 0x2 +#define ZONE_o105 0x1 +#define ZONE_o11 0x0 + diff --git a/include/mapfs/kpa_113_shape.h b/include/mapfs/kpa_113_shape.h index a4fb422904..4bdae250de 100644 --- a/include/mapfs/kpa_113_shape.h +++ b/include/mapfs/kpa_113_shape.h @@ -1,57 +1,58 @@ -#define MODEL_Root 0x38 -#define MODEL_g26 0x37 -#define MODEL_g28 0x36 -#define MODEL_o137 0x35 -#define MODEL_g27 0x34 -#define MODEL_o136 0x33 -#define MODEL_g1 0x32 -#define MODEL_o117 0x31 -#define MODEL_o116 0x30 -#define MODEL_g2 0x2F -#define MODEL_o89 0x2E -#define MODEL_o88 0x2D -#define MODEL_o12 0x2C -#define MODEL_o13 0x2B -#define MODEL_g8 0x2A -#define MODEL_g21 0x29 -#define MODEL_o105 0x28 -#define MODEL_o104 0x27 -#define MODEL_g20 0x26 -#define MODEL_o103 0x25 -#define MODEL_o102 0x24 -#define MODEL_g19 0x23 -#define MODEL_o101 0x22 -#define MODEL_o100 0x21 -#define MODEL_g16 0x20 -#define MODEL_o86 0x1F -#define MODEL_o71 0x1E -#define MODEL_o67 0x1D -#define MODEL_o65 0x1C -#define MODEL_o135 0x1B -#define MODEL_o134 0x1A -#define MODEL_g15 0x19 -#define MODEL_o83 0x18 -#define MODEL_o79 0x17 -#define MODEL_o60 0x16 -#define MODEL_o56 0x15 -#define MODEL_o54 0x14 -#define MODEL_o115 0x13 -#define MODEL_g7 0x12 -#define MODEL_o98 0x11 -#define MODEL_o97 0x10 -#define MODEL_o33 0xF -#define MODEL_o31 0xE -#define MODEL_o30 0xD -#define MODEL_o112 0xC -#define MODEL_g6 0xB -#define MODEL_o96 0xA -#define MODEL_o27 0x9 -#define MODEL_o25 0x8 -#define MODEL_o24 0x7 -#define MODEL_o113 0x6 -#define MODEL_g4 0x5 -#define MODEL_o52 0x4 -#define MODEL_o11 0x3 -#define MODEL_o8 0x2 -#define MODEL_o7 0x1 -#define MODEL_o114 0x0 +#define MODEL_Root 0x38 +#define MODEL_g26 0x37 +#define MODEL_g28 0x36 +#define MODEL_o137 0x35 +#define MODEL_g27 0x34 +#define MODEL_o136 0x33 +#define MODEL_g1 0x32 +#define MODEL_o117 0x31 +#define MODEL_o116 0x30 +#define MODEL_g2 0x2F +#define MODEL_o89 0x2E +#define MODEL_o88 0x2D +#define MODEL_o12 0x2C +#define MODEL_o13 0x2B +#define MODEL_g8 0x2A +#define MODEL_g21 0x29 +#define MODEL_o105 0x28 +#define MODEL_o104 0x27 +#define MODEL_g20 0x26 +#define MODEL_o103 0x25 +#define MODEL_o102 0x24 +#define MODEL_g19 0x23 +#define MODEL_o101 0x22 +#define MODEL_o100 0x21 +#define MODEL_g16 0x20 +#define MODEL_o86 0x1F +#define MODEL_o71 0x1E +#define MODEL_o67 0x1D +#define MODEL_o65 0x1C +#define MODEL_o135 0x1B +#define MODEL_o134 0x1A +#define MODEL_g15 0x19 +#define MODEL_o83 0x18 +#define MODEL_o79 0x17 +#define MODEL_o60 0x16 +#define MODEL_o56 0x15 +#define MODEL_o54 0x14 +#define MODEL_o115 0x13 +#define MODEL_g7 0x12 +#define MODEL_o98 0x11 +#define MODEL_o97 0x10 +#define MODEL_o33 0xF +#define MODEL_o31 0xE +#define MODEL_o30 0xD +#define MODEL_o112 0xC +#define MODEL_g6 0xB +#define MODEL_o96 0xA +#define MODEL_o27 0x9 +#define MODEL_o25 0x8 +#define MODEL_o24 0x7 +#define MODEL_o113 0x6 +#define MODEL_g4 0x5 +#define MODEL_o52 0x4 +#define MODEL_o11 0x3 +#define MODEL_o8 0x2 +#define MODEL_o7 0x1 +#define MODEL_o114 0x0 + diff --git a/include/mapfs/kpa_114_hit.h b/include/mapfs/kpa_114_hit.h index b149746b8f..76050b01e8 100644 --- a/include/mapfs/kpa_114_hit.h +++ b/include/mapfs/kpa_114_hit.h @@ -1 +1,4 @@ -#define COLLIDER_Root 0x0 +#define COLLIDER_Root 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/kpa_114_shape.h b/include/mapfs/kpa_114_shape.h index 98ef430c86..dee3600cd9 100644 --- a/include/mapfs/kpa_114_shape.h +++ b/include/mapfs/kpa_114_shape.h @@ -1 +1,2 @@ -#define MODEL_Root 0x0 +#define MODEL_Root 0x0 + diff --git a/include/mapfs/kpa_115_hit.h b/include/mapfs/kpa_115_hit.h index 1d8b00e1a3..1004eb5943 100644 --- a/include/mapfs/kpa_115_hit.h +++ b/include/mapfs/kpa_115_hit.h @@ -1,45 +1,60 @@ -#define COLLIDER_Root 0x2C -#define COLLIDER_g1 0x2B -#define COLLIDER_g2 0x2A -#define COLLIDER_g21 0x29 -#define COLLIDER_o157 0x28 -#define COLLIDER_o112 0x27 -#define COLLIDER_deilinet 0x26 -#define COLLIDER_deiline 0x25 -#define COLLIDER_o107 0x24 -#define COLLIDER_deilint 0x23 -#define COLLIDER_deilin 0x22 -#define COLLIDER_o80 0x21 -#define COLLIDER_deiliwt 0x20 -#define COLLIDER_deiliw 0x1F -#define COLLIDER_g28 0x1E -#define COLLIDER_g31 0x1D -#define COLLIDER_kpa_c 0x1C -#define COLLIDER_kpa_r 0x1B -#define COLLIDER_kpa_l 0x1A -#define COLLIDER_g30 0x19 -#define COLLIDER_o145 0x18 -#define COLLIDER_o144 0x17 -#define COLLIDER_o143 0x16 -#define COLLIDER_g29 0x15 -#define COLLIDER_o142 0x14 -#define COLLIDER_o141 0x13 -#define COLLIDER_o140 0x12 -#define COLLIDER_g20 0x11 -#define COLLIDER_o119 0x10 -#define COLLIDER_o118 0xF -#define COLLIDER_o115 0xE -#define COLLIDER_g15 0xD -#define COLLIDER_o139 0xC -#define COLLIDER_o103 0xB -#define COLLIDER_o102 0xA -#define COLLIDER_o60 0x9 -#define COLLIDER_g19 0x8 -#define COLLIDER_o113 0x7 -#define COLLIDER_o110 0x6 -#define COLLIDER_g18 0x5 -#define COLLIDER_o108 0x4 -#define COLLIDER_o105 0x3 -#define COLLIDER_g4 0x2 -#define COLLIDER_o100 0x1 -#define COLLIDER_o11 0x0 +#define COLLIDER_Root 0x2C +#define COLLIDER_g1 0x2B +#define COLLIDER_g2 0x2A +#define COLLIDER_g21 0x29 +#define COLLIDER_o157 0x28 +#define COLLIDER_o112 0x27 +#define COLLIDER_deilinet 0x26 +#define COLLIDER_deiline 0x25 +#define COLLIDER_o107 0x24 +#define COLLIDER_deilint 0x23 +#define COLLIDER_deilin 0x22 +#define COLLIDER_o80 0x21 +#define COLLIDER_deiliwt 0x20 +#define COLLIDER_deiliw 0x1F +#define COLLIDER_g28 0x1E +#define COLLIDER_g31 0x1D +#define COLLIDER_kpa_c 0x1C +#define COLLIDER_kpa_r 0x1B +#define COLLIDER_kpa_l 0x1A +#define COLLIDER_g30 0x19 +#define COLLIDER_o145 0x18 +#define COLLIDER_o144 0x17 +#define COLLIDER_o143 0x16 +#define COLLIDER_g29 0x15 +#define COLLIDER_o142 0x14 +#define COLLIDER_o141 0x13 +#define COLLIDER_o140 0x12 +#define COLLIDER_g20 0x11 +#define COLLIDER_o119 0x10 +#define COLLIDER_o118 0xF +#define COLLIDER_o115 0xE +#define COLLIDER_g15 0xD +#define COLLIDER_o139 0xC +#define COLLIDER_o103 0xB +#define COLLIDER_o102 0xA +#define COLLIDER_o60 0x9 +#define COLLIDER_g19 0x8 +#define COLLIDER_o113 0x7 +#define COLLIDER_o110 0x6 +#define COLLIDER_g18 0x5 +#define COLLIDER_o108 0x4 +#define COLLIDER_o105 0x3 +#define COLLIDER_g4 0x2 +#define COLLIDER_o100 0x1 +#define COLLIDER_o11 0x0 + +#define ZONE_Root 0xC +#define ZONE_g1 0xB +#define ZONE_g2 0xA +#define ZONE_deilie 0x9 +#define ZONE_deiline 0x8 +#define ZONE_deilin 0x7 +#define ZONE_deilinw 0x6 +#define ZONE_deiliw 0x5 +#define ZONE_o115 0x4 +#define ZONE_o60 0x3 +#define ZONE_o110 0x2 +#define ZONE_o105 0x1 +#define ZONE_o11 0x0 + diff --git a/include/mapfs/kpa_115_shape.h b/include/mapfs/kpa_115_shape.h index 80b109808d..2fb99b0798 100644 --- a/include/mapfs/kpa_115_shape.h +++ b/include/mapfs/kpa_115_shape.h @@ -1,52 +1,53 @@ -#define MODEL_Root 0x33 -#define MODEL_g1 0x32 -#define MODEL_g2 0x31 -#define MODEL_o89 0x30 -#define MODEL_o88 0x2F -#define MODEL_o12 0x2E -#define MODEL_o13 0x2D -#define MODEL_g8 0x2C -#define MODEL_g21 0x2B -#define MODEL_o105 0x2A -#define MODEL_o104 0x29 -#define MODEL_g20 0x28 -#define MODEL_o103 0x27 -#define MODEL_o102 0x26 -#define MODEL_g19 0x25 -#define MODEL_o101 0x24 -#define MODEL_o100 0x23 -#define MODEL_g16 0x22 -#define MODEL_o117 0x21 -#define MODEL_o86 0x20 -#define MODEL_o71 0x1F -#define MODEL_o67 0x1E -#define MODEL_o65 0x1D -#define MODEL_g15 0x1C -#define MODEL_o116 0x1B -#define MODEL_o83 0x1A -#define MODEL_o79 0x19 -#define MODEL_o60 0x18 -#define MODEL_o56 0x17 -#define MODEL_o54 0x16 -#define MODEL_o115 0x15 -#define MODEL_g7 0x14 -#define MODEL_o176 0x13 -#define MODEL_o98 0x12 -#define MODEL_o97 0x11 -#define MODEL_o33 0x10 -#define MODEL_o31 0xF -#define MODEL_o30 0xE -#define MODEL_o112 0xD -#define MODEL_g6 0xC -#define MODEL_o177 0xB -#define MODEL_o96 0xA -#define MODEL_o27 0x9 -#define MODEL_o25 0x8 -#define MODEL_o24 0x7 -#define MODEL_o113 0x6 -#define MODEL_g4 0x5 -#define MODEL_o52 0x4 -#define MODEL_o11 0x3 -#define MODEL_o8 0x2 -#define MODEL_o7 0x1 -#define MODEL_o114 0x0 +#define MODEL_Root 0x33 +#define MODEL_g1 0x32 +#define MODEL_g2 0x31 +#define MODEL_o89 0x30 +#define MODEL_o88 0x2F +#define MODEL_o12 0x2E +#define MODEL_o13 0x2D +#define MODEL_g8 0x2C +#define MODEL_g21 0x2B +#define MODEL_o105 0x2A +#define MODEL_o104 0x29 +#define MODEL_g20 0x28 +#define MODEL_o103 0x27 +#define MODEL_o102 0x26 +#define MODEL_g19 0x25 +#define MODEL_o101 0x24 +#define MODEL_o100 0x23 +#define MODEL_g16 0x22 +#define MODEL_o117 0x21 +#define MODEL_o86 0x20 +#define MODEL_o71 0x1F +#define MODEL_o67 0x1E +#define MODEL_o65 0x1D +#define MODEL_g15 0x1C +#define MODEL_o116 0x1B +#define MODEL_o83 0x1A +#define MODEL_o79 0x19 +#define MODEL_o60 0x18 +#define MODEL_o56 0x17 +#define MODEL_o54 0x16 +#define MODEL_o115 0x15 +#define MODEL_g7 0x14 +#define MODEL_o176 0x13 +#define MODEL_o98 0x12 +#define MODEL_o97 0x11 +#define MODEL_o33 0x10 +#define MODEL_o31 0xF +#define MODEL_o30 0xE +#define MODEL_o112 0xD +#define MODEL_g6 0xC +#define MODEL_o177 0xB +#define MODEL_o96 0xA +#define MODEL_o27 0x9 +#define MODEL_o25 0x8 +#define MODEL_o24 0x7 +#define MODEL_o113 0x6 +#define MODEL_g4 0x5 +#define MODEL_o52 0x4 +#define MODEL_o11 0x3 +#define MODEL_o8 0x2 +#define MODEL_o7 0x1 +#define MODEL_o114 0x0 + diff --git a/include/mapfs/kpa_116_hit.h b/include/mapfs/kpa_116_hit.h index 9afbbe4810..4da5abd253 100644 --- a/include/mapfs/kpa_116_hit.h +++ b/include/mapfs/kpa_116_hit.h @@ -1,24 +1,35 @@ -#define COLLIDER_Root 0x17 -#define COLLIDER_g1 0x16 -#define COLLIDER_g2 0x15 -#define COLLIDER_g41 0x14 -#define COLLIDER_o115 0x13 -#define COLLIDER_deilits 0x12 -#define COLLIDER_deilis 0x11 -#define COLLIDER_o144 0x10 -#define COLLIDER_deilite 0xF -#define COLLIDER_deilie 0xE -#define COLLIDER_g40 0xD -#define COLLIDER_o245 0xC -#define COLLIDER_g38 0xB -#define COLLIDER_o243 0xA -#define COLLIDER_o239 0x9 -#define COLLIDER_g36 0x8 -#define COLLIDER_o229 0x7 -#define COLLIDER_o227 0x6 -#define COLLIDER_g35 0x5 -#define COLLIDER_o226 0x4 -#define COLLIDER_o224 0x3 -#define COLLIDER_g6 0x2 -#define COLLIDER_o223 0x1 -#define COLLIDER_o136 0x0 +#define COLLIDER_Root 0x17 +#define COLLIDER_g1 0x16 +#define COLLIDER_g2 0x15 +#define COLLIDER_g41 0x14 +#define COLLIDER_o115 0x13 +#define COLLIDER_deilits 0x12 +#define COLLIDER_deilis 0x11 +#define COLLIDER_o144 0x10 +#define COLLIDER_deilite 0xF +#define COLLIDER_deilie 0xE +#define COLLIDER_g40 0xD +#define COLLIDER_o245 0xC +#define COLLIDER_g38 0xB +#define COLLIDER_o243 0xA +#define COLLIDER_o239 0x9 +#define COLLIDER_g36 0x8 +#define COLLIDER_o229 0x7 +#define COLLIDER_o227 0x6 +#define COLLIDER_g35 0x5 +#define COLLIDER_o226 0x4 +#define COLLIDER_o224 0x3 +#define COLLIDER_g6 0x2 +#define COLLIDER_o223 0x1 +#define COLLIDER_o136 0x0 + +#define ZONE_Root 0x8 +#define ZONE_g1 0x7 +#define ZONE_deilis 0x6 +#define ZONE_deilie 0x5 +#define ZONE_o247 0x4 +#define ZONE_o243 0x3 +#define ZONE_o227 0x2 +#define ZONE_o224 0x1 +#define ZONE_o136 0x0 + diff --git a/include/mapfs/kpa_116_shape.h b/include/mapfs/kpa_116_shape.h index 4fad7c7418..f9d3437ce3 100644 --- a/include/mapfs/kpa_116_shape.h +++ b/include/mapfs/kpa_116_shape.h @@ -1,33 +1,34 @@ -#define MODEL_Root 0x20 -#define MODEL_g1 0x1F -#define MODEL_g2 0x1E -#define MODEL_o247 0x1D -#define MODEL_g40 0x1C -#define MODEL_o246 0x1B -#define MODEL_o245 0x1A -#define MODEL_o244 0x19 -#define MODEL_o242 0x18 -#define MODEL_o144 0x17 -#define MODEL_o115 0x16 -#define MODEL_o202 0x15 -#define MODEL_o221 0x14 -#define MODEL_g39 0x13 -#define MODEL_o241 0x12 -#define MODEL_o240 0x11 -#define MODEL_o239 0x10 -#define MODEL_o238 0xF -#define MODEL_g38 0xE -#define MODEL_o237 0xD -#define MODEL_o236 0xC -#define MODEL_o235 0xB -#define MODEL_o234 0xA -#define MODEL_g6 0x9 -#define MODEL_o251 0x8 -#define MODEL_o249 0x7 -#define MODEL_o147 0x6 -#define MODEL_o146 0x5 -#define MODEL_g32 0x4 -#define MODEL_o207 0x3 -#define MODEL_o203 0x2 -#define MODEL_o196 0x1 -#define MODEL_o194 0x0 +#define MODEL_Root 0x20 +#define MODEL_g1 0x1F +#define MODEL_g2 0x1E +#define MODEL_o247 0x1D +#define MODEL_g40 0x1C +#define MODEL_o246 0x1B +#define MODEL_o245 0x1A +#define MODEL_o244 0x19 +#define MODEL_o242 0x18 +#define MODEL_o144 0x17 +#define MODEL_o115 0x16 +#define MODEL_o202 0x15 +#define MODEL_o221 0x14 +#define MODEL_g39 0x13 +#define MODEL_o241 0x12 +#define MODEL_o240 0x11 +#define MODEL_o239 0x10 +#define MODEL_o238 0xF +#define MODEL_g38 0xE +#define MODEL_o237 0xD +#define MODEL_o236 0xC +#define MODEL_o235 0xB +#define MODEL_o234 0xA +#define MODEL_g6 0x9 +#define MODEL_o251 0x8 +#define MODEL_o249 0x7 +#define MODEL_o147 0x6 +#define MODEL_o146 0x5 +#define MODEL_g32 0x4 +#define MODEL_o207 0x3 +#define MODEL_o203 0x2 +#define MODEL_o196 0x1 +#define MODEL_o194 0x0 + diff --git a/include/mapfs/kpa_117_hit.h b/include/mapfs/kpa_117_hit.h index 49f527878d..497d9079bd 100644 --- a/include/mapfs/kpa_117_hit.h +++ b/include/mapfs/kpa_117_hit.h @@ -1,18 +1,29 @@ -#define COLLIDER_Root 0x11 -#define COLLIDER_g1 0x10 -#define COLLIDER_g2 0xF -#define COLLIDER_g21 0xE -#define COLLIDER_o80 0xD -#define COLLIDER_deiliwt 0xC -#define COLLIDER_deiliw 0xB -#define COLLIDER_g20 0xA -#define COLLIDER_o119 0x9 -#define COLLIDER_o118 0x8 -#define COLLIDER_o115 0x7 -#define COLLIDER_g15 0x6 -#define COLLIDER_o103 0x5 -#define COLLIDER_o102 0x4 -#define COLLIDER_o60 0x3 -#define COLLIDER_g4 0x2 -#define COLLIDER_o100 0x1 -#define COLLIDER_o11 0x0 +#define COLLIDER_Root 0x11 +#define COLLIDER_g1 0x10 +#define COLLIDER_g2 0xF +#define COLLIDER_g21 0xE +#define COLLIDER_o80 0xD +#define COLLIDER_deiliwt 0xC +#define COLLIDER_deiliw 0xB +#define COLLIDER_g20 0xA +#define COLLIDER_o119 0x9 +#define COLLIDER_o118 0x8 +#define COLLIDER_o115 0x7 +#define COLLIDER_g15 0x6 +#define COLLIDER_o103 0x5 +#define COLLIDER_o102 0x4 +#define COLLIDER_o60 0x3 +#define COLLIDER_g4 0x2 +#define COLLIDER_o100 0x1 +#define COLLIDER_o11 0x0 + +#define ZONE_Root 0x8 +#define ZONE_g1 0x7 +#define ZONE_g2 0x6 +#define ZONE_deilie 0x5 +#define ZONE_deilinw 0x4 +#define ZONE_deiliw 0x3 +#define ZONE_o115 0x2 +#define ZONE_o60 0x1 +#define ZONE_o11 0x0 + diff --git a/include/mapfs/kpa_117_shape.h b/include/mapfs/kpa_117_shape.h index f94a2c3219..bcacf6428a 100644 --- a/include/mapfs/kpa_117_shape.h +++ b/include/mapfs/kpa_117_shape.h @@ -1,25 +1,26 @@ -#define MODEL_Root 0x18 -#define MODEL_g1 0x17 -#define MODEL_g2 0x16 -#define MODEL_o101 0x15 -#define MODEL_o100 0x14 -#define MODEL_o12 0x13 -#define MODEL_o13 0x12 -#define MODEL_g16 0x11 -#define MODEL_o86 0x10 -#define MODEL_o71 0xF -#define MODEL_o67 0xE -#define MODEL_o65 0xD -#define MODEL_g15 0xC -#define MODEL_o62 0xB -#define MODEL_o83 0xA -#define MODEL_o80 0x9 -#define MODEL_o79 0x8 -#define MODEL_o60 0x7 -#define MODEL_o56 0x6 -#define MODEL_o54 0x5 -#define MODEL_g4 0x4 -#define MODEL_o52 0x3 -#define MODEL_o11 0x2 -#define MODEL_o8 0x1 -#define MODEL_o7 0x0 +#define MODEL_Root 0x18 +#define MODEL_g1 0x17 +#define MODEL_g2 0x16 +#define MODEL_o101 0x15 +#define MODEL_o100 0x14 +#define MODEL_o12 0x13 +#define MODEL_o13 0x12 +#define MODEL_g16 0x11 +#define MODEL_o86 0x10 +#define MODEL_o71 0xF +#define MODEL_o67 0xE +#define MODEL_o65 0xD +#define MODEL_g15 0xC +#define MODEL_o62 0xB +#define MODEL_o83 0xA +#define MODEL_o80 0x9 +#define MODEL_o79 0x8 +#define MODEL_o60 0x7 +#define MODEL_o56 0x6 +#define MODEL_o54 0x5 +#define MODEL_g4 0x4 +#define MODEL_o52 0x3 +#define MODEL_o11 0x2 +#define MODEL_o8 0x1 +#define MODEL_o7 0x0 + diff --git a/include/mapfs/kpa_118_hit.h b/include/mapfs/kpa_118_hit.h index 9afbbe4810..4da5abd253 100644 --- a/include/mapfs/kpa_118_hit.h +++ b/include/mapfs/kpa_118_hit.h @@ -1,24 +1,35 @@ -#define COLLIDER_Root 0x17 -#define COLLIDER_g1 0x16 -#define COLLIDER_g2 0x15 -#define COLLIDER_g41 0x14 -#define COLLIDER_o115 0x13 -#define COLLIDER_deilits 0x12 -#define COLLIDER_deilis 0x11 -#define COLLIDER_o144 0x10 -#define COLLIDER_deilite 0xF -#define COLLIDER_deilie 0xE -#define COLLIDER_g40 0xD -#define COLLIDER_o245 0xC -#define COLLIDER_g38 0xB -#define COLLIDER_o243 0xA -#define COLLIDER_o239 0x9 -#define COLLIDER_g36 0x8 -#define COLLIDER_o229 0x7 -#define COLLIDER_o227 0x6 -#define COLLIDER_g35 0x5 -#define COLLIDER_o226 0x4 -#define COLLIDER_o224 0x3 -#define COLLIDER_g6 0x2 -#define COLLIDER_o223 0x1 -#define COLLIDER_o136 0x0 +#define COLLIDER_Root 0x17 +#define COLLIDER_g1 0x16 +#define COLLIDER_g2 0x15 +#define COLLIDER_g41 0x14 +#define COLLIDER_o115 0x13 +#define COLLIDER_deilits 0x12 +#define COLLIDER_deilis 0x11 +#define COLLIDER_o144 0x10 +#define COLLIDER_deilite 0xF +#define COLLIDER_deilie 0xE +#define COLLIDER_g40 0xD +#define COLLIDER_o245 0xC +#define COLLIDER_g38 0xB +#define COLLIDER_o243 0xA +#define COLLIDER_o239 0x9 +#define COLLIDER_g36 0x8 +#define COLLIDER_o229 0x7 +#define COLLIDER_o227 0x6 +#define COLLIDER_g35 0x5 +#define COLLIDER_o226 0x4 +#define COLLIDER_o224 0x3 +#define COLLIDER_g6 0x2 +#define COLLIDER_o223 0x1 +#define COLLIDER_o136 0x0 + +#define ZONE_Root 0x8 +#define ZONE_g1 0x7 +#define ZONE_deilis 0x6 +#define ZONE_deilie 0x5 +#define ZONE_o247 0x4 +#define ZONE_o243 0x3 +#define ZONE_o227 0x2 +#define ZONE_o224 0x1 +#define ZONE_o136 0x0 + diff --git a/include/mapfs/kpa_118_shape.h b/include/mapfs/kpa_118_shape.h index 4fad7c7418..f9d3437ce3 100644 --- a/include/mapfs/kpa_118_shape.h +++ b/include/mapfs/kpa_118_shape.h @@ -1,33 +1,34 @@ -#define MODEL_Root 0x20 -#define MODEL_g1 0x1F -#define MODEL_g2 0x1E -#define MODEL_o247 0x1D -#define MODEL_g40 0x1C -#define MODEL_o246 0x1B -#define MODEL_o245 0x1A -#define MODEL_o244 0x19 -#define MODEL_o242 0x18 -#define MODEL_o144 0x17 -#define MODEL_o115 0x16 -#define MODEL_o202 0x15 -#define MODEL_o221 0x14 -#define MODEL_g39 0x13 -#define MODEL_o241 0x12 -#define MODEL_o240 0x11 -#define MODEL_o239 0x10 -#define MODEL_o238 0xF -#define MODEL_g38 0xE -#define MODEL_o237 0xD -#define MODEL_o236 0xC -#define MODEL_o235 0xB -#define MODEL_o234 0xA -#define MODEL_g6 0x9 -#define MODEL_o251 0x8 -#define MODEL_o249 0x7 -#define MODEL_o147 0x6 -#define MODEL_o146 0x5 -#define MODEL_g32 0x4 -#define MODEL_o207 0x3 -#define MODEL_o203 0x2 -#define MODEL_o196 0x1 -#define MODEL_o194 0x0 +#define MODEL_Root 0x20 +#define MODEL_g1 0x1F +#define MODEL_g2 0x1E +#define MODEL_o247 0x1D +#define MODEL_g40 0x1C +#define MODEL_o246 0x1B +#define MODEL_o245 0x1A +#define MODEL_o244 0x19 +#define MODEL_o242 0x18 +#define MODEL_o144 0x17 +#define MODEL_o115 0x16 +#define MODEL_o202 0x15 +#define MODEL_o221 0x14 +#define MODEL_g39 0x13 +#define MODEL_o241 0x12 +#define MODEL_o240 0x11 +#define MODEL_o239 0x10 +#define MODEL_o238 0xF +#define MODEL_g38 0xE +#define MODEL_o237 0xD +#define MODEL_o236 0xC +#define MODEL_o235 0xB +#define MODEL_o234 0xA +#define MODEL_g6 0x9 +#define MODEL_o251 0x8 +#define MODEL_o249 0x7 +#define MODEL_o147 0x6 +#define MODEL_o146 0x5 +#define MODEL_g32 0x4 +#define MODEL_o207 0x3 +#define MODEL_o203 0x2 +#define MODEL_o196 0x1 +#define MODEL_o194 0x0 + diff --git a/include/mapfs/kpa_119_hit.h b/include/mapfs/kpa_119_hit.h index da35a56cb7..36ea04adae 100644 --- a/include/mapfs/kpa_119_hit.h +++ b/include/mapfs/kpa_119_hit.h @@ -1,20 +1,31 @@ -#define COLLIDER_Root 0x13 -#define COLLIDER_g1 0x12 -#define COLLIDER_g2 0x11 -#define COLLIDER_o131 0x10 -#define COLLIDER_g21 0xF -#define COLLIDER_o80 0xE -#define COLLIDER_deiliwtt 0xD -#define COLLIDER_deiliwt 0xC -#define COLLIDER_deiliw 0xB -#define COLLIDER_g20 0xA -#define COLLIDER_o119 0x9 -#define COLLIDER_o118 0x8 -#define COLLIDER_o115 0x7 -#define COLLIDER_g15 0x6 -#define COLLIDER_o103 0x5 -#define COLLIDER_o102 0x4 -#define COLLIDER_o60 0x3 -#define COLLIDER_g4 0x2 -#define COLLIDER_o100 0x1 -#define COLLIDER_o11 0x0 +#define COLLIDER_Root 0x13 +#define COLLIDER_g1 0x12 +#define COLLIDER_g2 0x11 +#define COLLIDER_o131 0x10 +#define COLLIDER_g21 0xF +#define COLLIDER_o80 0xE +#define COLLIDER_deiliwtt 0xD +#define COLLIDER_deiliwt 0xC +#define COLLIDER_deiliw 0xB +#define COLLIDER_g20 0xA +#define COLLIDER_o119 0x9 +#define COLLIDER_o118 0x8 +#define COLLIDER_o115 0x7 +#define COLLIDER_g15 0x6 +#define COLLIDER_o103 0x5 +#define COLLIDER_o102 0x4 +#define COLLIDER_o60 0x3 +#define COLLIDER_g4 0x2 +#define COLLIDER_o100 0x1 +#define COLLIDER_o11 0x0 + +#define ZONE_Root 0x8 +#define ZONE_g1 0x7 +#define ZONE_g2 0x6 +#define ZONE_deilie 0x5 +#define ZONE_deilinw 0x4 +#define ZONE_deiliw 0x3 +#define ZONE_o115 0x2 +#define ZONE_o60 0x1 +#define ZONE_o11 0x0 + diff --git a/include/mapfs/kpa_119_shape.h b/include/mapfs/kpa_119_shape.h index eee9cae1f9..e03c55f61e 100644 --- a/include/mapfs/kpa_119_shape.h +++ b/include/mapfs/kpa_119_shape.h @@ -1,23 +1,24 @@ -#define MODEL_Root 0x16 -#define MODEL_g1 0x15 -#define MODEL_g2 0x14 -#define MODEL_o103 0x13 -#define MODEL_o102 0x12 -#define MODEL_g16 0x11 -#define MODEL_o86 0x10 -#define MODEL_o71 0xF -#define MODEL_o67 0xE -#define MODEL_o65 0xD -#define MODEL_g15 0xC -#define MODEL_o62 0xB -#define MODEL_o83 0xA -#define MODEL_o80 0x9 -#define MODEL_o79 0x8 -#define MODEL_o60 0x7 -#define MODEL_o56 0x6 -#define MODEL_o54 0x5 -#define MODEL_g4 0x4 -#define MODEL_o52 0x3 -#define MODEL_o11 0x2 -#define MODEL_o8 0x1 -#define MODEL_o7 0x0 +#define MODEL_Root 0x16 +#define MODEL_g1 0x15 +#define MODEL_g2 0x14 +#define MODEL_o103 0x13 +#define MODEL_o102 0x12 +#define MODEL_g16 0x11 +#define MODEL_o86 0x10 +#define MODEL_o71 0xF +#define MODEL_o67 0xE +#define MODEL_o65 0xD +#define MODEL_g15 0xC +#define MODEL_o62 0xB +#define MODEL_o83 0xA +#define MODEL_o80 0x9 +#define MODEL_o79 0x8 +#define MODEL_o60 0x7 +#define MODEL_o56 0x6 +#define MODEL_o54 0x5 +#define MODEL_g4 0x4 +#define MODEL_o52 0x3 +#define MODEL_o11 0x2 +#define MODEL_o8 0x1 +#define MODEL_o7 0x0 + diff --git a/include/mapfs/kpa_11_hit.h b/include/mapfs/kpa_11_hit.h index 2a33c070f5..3ad2d3a35d 100644 --- a/include/mapfs/kpa_11_hit.h +++ b/include/mapfs/kpa_11_hit.h @@ -1,113 +1,123 @@ -#define COLLIDER_Root 0x70 -#define COLLIDER_g162 0x6F -#define COLLIDER_g168 0x6E -#define COLLIDER_o1178 0x6D -#define COLLIDER_deilittne 0x6C -#define COLLIDER_deilitne 0x6B -#define COLLIDER_deiline 0x6A -#define COLLIDER_o1176 0x69 -#define COLLIDER_deilittn 0x68 -#define COLLIDER_deilitn 0x67 -#define COLLIDER_deilin 0x66 -#define COLLIDER_o1152 0x65 -#define COLLIDER_deilitsw 0x64 -#define COLLIDER_deilisw 0x63 -#define COLLIDER_o1149 0x62 -#define COLLIDER_deilitw 0x61 -#define COLLIDER_deiliw 0x60 -#define COLLIDER_o1146 0x5F -#define COLLIDER_deilitse 0x5E -#define COLLIDER_deilise 0x5D -#define COLLIDER_o1143 0x5C -#define COLLIDER_deilite 0x5B -#define COLLIDER_deilie 0x5A -#define COLLIDER_g167 0x59 -#define COLLIDER_o1271 0x58 -#define COLLIDER_o1270 0x57 -#define COLLIDER_o1269 0x56 -#define COLLIDER_o1135 0x55 -#define COLLIDER_o1134 0x54 -#define COLLIDER_o1133 0x53 -#define COLLIDER_o1132 0x52 -#define COLLIDER_o1131 0x51 -#define COLLIDER_o1130 0x50 -#define COLLIDER_o1129 0x4F -#define COLLIDER_o1128 0x4E -#define COLLIDER_o1124 0x4D -#define COLLIDER_o1123 0x4C -#define COLLIDER_o1122 0x4B -#define COLLIDER_o1121 0x4A -#define COLLIDER_o1120 0x49 -#define COLLIDER_o1119 0x48 -#define COLLIDER_o1118 0x47 -#define COLLIDER_o1117 0x46 -#define COLLIDER_o1116 0x45 -#define COLLIDER_o1115 0x44 -#define COLLIDER_o1114 0x43 -#define COLLIDER_o1113 0x42 -#define COLLIDER_o1112 0x41 -#define COLLIDER_o1111 0x40 -#define COLLIDER_o1110 0x3F -#define COLLIDER_o1109 0x3E -#define COLLIDER_o1105 0x3D -#define COLLIDER_o1104 0x3C -#define COLLIDER_o1103 0x3B -#define COLLIDER_o1102 0x3A -#define COLLIDER_o1101 0x39 -#define COLLIDER_o1100 0x38 -#define COLLIDER_o1099 0x37 -#define COLLIDER_o1098 0x36 -#define COLLIDER_o1097 0x35 -#define COLLIDER_o1096 0x34 -#define COLLIDER_o1095 0x33 -#define COLLIDER_o1094 0x32 -#define COLLIDER_o1093 0x31 -#define COLLIDER_o1092 0x30 -#define COLLIDER_o1091 0x2F -#define COLLIDER_o1090 0x2E -#define COLLIDER_o1088 0x2D -#define COLLIDER_o1087 0x2C -#define COLLIDER_o1086 0x2B -#define COLLIDER_o1085 0x2A -#define COLLIDER_o1084 0x29 -#define COLLIDER_o1083 0x28 -#define COLLIDER_o1082 0x27 -#define COLLIDER_o1081 0x26 -#define COLLIDER_o1080 0x25 -#define COLLIDER_o1079 0x24 -#define COLLIDER_o1078 0x23 -#define COLLIDER_o1077 0x22 -#define COLLIDER_o1076 0x21 -#define COLLIDER_o1075 0x20 -#define COLLIDER_o1074 0x1F -#define COLLIDER_o1073 0x1E -#define COLLIDER_o1252 0x1D -#define COLLIDER_o1251 0x1C -#define COLLIDER_o1197 0x1B -#define COLLIDER_g163 0x1A -#define COLLIDER_g177 0x19 -#define COLLIDER_o1266 0x18 -#define COLLIDER_o1265 0x17 -#define COLLIDER_o1264 0x16 -#define COLLIDER_o1263 0x15 -#define COLLIDER_o1262 0x14 -#define COLLIDER_o1261 0x13 -#define COLLIDER_o1260 0x12 -#define COLLIDER_o1259 0x11 -#define COLLIDER_o1258 0x10 -#define COLLIDER_o1257 0xF -#define COLLIDER_o1256 0xE -#define COLLIDER_o1255 0xD -#define COLLIDER_o1254 0xC -#define COLLIDER_o1253 0xB -#define COLLIDER_g171 0xA -#define COLLIDER_g175 0x9 -#define COLLIDER_o1234 0x8 -#define COLLIDER_g174 0x7 -#define COLLIDER_o1228 0x6 -#define COLLIDER_o1273 0x5 -#define COLLIDER_g173 0x4 -#define COLLIDER_o1223 0x3 -#define COLLIDER_g170 0x2 -#define COLLIDER_o1194 0x1 -#define COLLIDER_o1191 0x0 +#define COLLIDER_Root 0x70 +#define COLLIDER_g162 0x6F +#define COLLIDER_g168 0x6E +#define COLLIDER_o1178 0x6D +#define COLLIDER_deilittne 0x6C +#define COLLIDER_deilitne 0x6B +#define COLLIDER_deiline 0x6A +#define COLLIDER_o1176 0x69 +#define COLLIDER_deilittn 0x68 +#define COLLIDER_deilitn 0x67 +#define COLLIDER_deilin 0x66 +#define COLLIDER_o1152 0x65 +#define COLLIDER_deilitsw 0x64 +#define COLLIDER_deilisw 0x63 +#define COLLIDER_o1149 0x62 +#define COLLIDER_deilitw 0x61 +#define COLLIDER_deiliw 0x60 +#define COLLIDER_o1146 0x5F +#define COLLIDER_deilitse 0x5E +#define COLLIDER_deilise 0x5D +#define COLLIDER_o1143 0x5C +#define COLLIDER_deilite 0x5B +#define COLLIDER_deilie 0x5A +#define COLLIDER_g167 0x59 +#define COLLIDER_o1271 0x58 +#define COLLIDER_o1270 0x57 +#define COLLIDER_o1269 0x56 +#define COLLIDER_o1135 0x55 +#define COLLIDER_o1134 0x54 +#define COLLIDER_o1133 0x53 +#define COLLIDER_o1132 0x52 +#define COLLIDER_o1131 0x51 +#define COLLIDER_o1130 0x50 +#define COLLIDER_o1129 0x4F +#define COLLIDER_o1128 0x4E +#define COLLIDER_o1124 0x4D +#define COLLIDER_o1123 0x4C +#define COLLIDER_o1122 0x4B +#define COLLIDER_o1121 0x4A +#define COLLIDER_o1120 0x49 +#define COLLIDER_o1119 0x48 +#define COLLIDER_o1118 0x47 +#define COLLIDER_o1117 0x46 +#define COLLIDER_o1116 0x45 +#define COLLIDER_o1115 0x44 +#define COLLIDER_o1114 0x43 +#define COLLIDER_o1113 0x42 +#define COLLIDER_o1112 0x41 +#define COLLIDER_o1111 0x40 +#define COLLIDER_o1110 0x3F +#define COLLIDER_o1109 0x3E +#define COLLIDER_o1105 0x3D +#define COLLIDER_o1104 0x3C +#define COLLIDER_o1103 0x3B +#define COLLIDER_o1102 0x3A +#define COLLIDER_o1101 0x39 +#define COLLIDER_o1100 0x38 +#define COLLIDER_o1099 0x37 +#define COLLIDER_o1098 0x36 +#define COLLIDER_o1097 0x35 +#define COLLIDER_o1096 0x34 +#define COLLIDER_o1095 0x33 +#define COLLIDER_o1094 0x32 +#define COLLIDER_o1093 0x31 +#define COLLIDER_o1092 0x30 +#define COLLIDER_o1091 0x2F +#define COLLIDER_o1090 0x2E +#define COLLIDER_o1088 0x2D +#define COLLIDER_o1087 0x2C +#define COLLIDER_o1086 0x2B +#define COLLIDER_o1085 0x2A +#define COLLIDER_o1084 0x29 +#define COLLIDER_o1083 0x28 +#define COLLIDER_o1082 0x27 +#define COLLIDER_o1081 0x26 +#define COLLIDER_o1080 0x25 +#define COLLIDER_o1079 0x24 +#define COLLIDER_o1078 0x23 +#define COLLIDER_o1077 0x22 +#define COLLIDER_o1076 0x21 +#define COLLIDER_o1075 0x20 +#define COLLIDER_o1074 0x1F +#define COLLIDER_o1073 0x1E +#define COLLIDER_o1252 0x1D +#define COLLIDER_o1251 0x1C +#define COLLIDER_o1197 0x1B +#define COLLIDER_g163 0x1A +#define COLLIDER_g177 0x19 +#define COLLIDER_o1266 0x18 +#define COLLIDER_o1265 0x17 +#define COLLIDER_o1264 0x16 +#define COLLIDER_o1263 0x15 +#define COLLIDER_o1262 0x14 +#define COLLIDER_o1261 0x13 +#define COLLIDER_o1260 0x12 +#define COLLIDER_o1259 0x11 +#define COLLIDER_o1258 0x10 +#define COLLIDER_o1257 0xF +#define COLLIDER_o1256 0xE +#define COLLIDER_o1255 0xD +#define COLLIDER_o1254 0xC +#define COLLIDER_o1253 0xB +#define COLLIDER_g171 0xA +#define COLLIDER_g175 0x9 +#define COLLIDER_o1234 0x8 +#define COLLIDER_g174 0x7 +#define COLLIDER_o1228 0x6 +#define COLLIDER_o1273 0x5 +#define COLLIDER_g173 0x4 +#define COLLIDER_o1223 0x3 +#define COLLIDER_g170 0x2 +#define COLLIDER_o1194 0x1 +#define COLLIDER_o1191 0x0 + +#define ZONE_Root 0x7 +#define ZONE_g162 0x6 +#define ZONE_g168 0x5 +#define ZONE_o1069 0x4 +#define ZONE_g166 0x3 +#define ZONE_o1171 0x2 +#define ZONE_g163 0x1 +#define ZONE_o1062 0x0 + diff --git a/include/mapfs/kpa_11_shape.h b/include/mapfs/kpa_11_shape.h index 6e7ae7588e..a2e8a0cf78 100644 --- a/include/mapfs/kpa_11_shape.h +++ b/include/mapfs/kpa_11_shape.h @@ -1,188 +1,189 @@ -#define MODEL_Root 0xBB -#define MODEL_g307 0xBA -#define MODEL_before 0xB9 -#define MODEL_g16 0xB8 -#define MODEL_o1870 0xB7 -#define MODEL_o1869 0xB6 -#define MODEL_o1868 0xB5 -#define MODEL_o1867 0xB4 -#define MODEL_o1792 0xB3 -#define MODEL_o1791 0xB2 -#define MODEL_g384 0xB1 -#define MODEL_o1893 0xB0 -#define MODEL_o1892 0xAF -#define MODEL_o1882 0xAE -#define MODEL_o1894 0xAD -#define MODEL_o1887 0xAC -#define MODEL_o1900 0xAB -#define MODEL_o2248 0xAA -#define MODEL_Default 0xA9 -#define MODEL_o1862 0xA8 -#define MODEL_o1839 0xA7 -#define MODEL_o1877 0xA6 -#define MODEL_o1890 0xA5 -#define MODEL_o1891 0xA4 -#define MODEL_g261 0xA3 -#define MODEL_g294 0xA2 -#define MODEL_g304 0xA1 -#define MODEL_o1857 0xA0 -#define MODEL_g301 0x9F -#define MODEL_o1859 0x9E -#define MODEL_o1856 0x9D -#define MODEL_o1738 0x9C -#define MODEL_o1735 0x9B -#define MODEL_o1737 0x9A -#define MODEL_o1736 0x99 -#define MODEL_g291 0x98 -#define MODEL_o1722 0x97 -#define MODEL_o1719 0x96 -#define MODEL_o1721 0x95 -#define MODEL_o1720 0x94 -#define MODEL_g286 0x93 -#define MODEL_o1694 0x92 -#define MODEL_o1691 0x91 -#define MODEL_o1693 0x90 -#define MODEL_o1692 0x8F -#define MODEL_g285 0x8E -#define MODEL_o1690 0x8D -#define MODEL_o1687 0x8C -#define MODEL_o1689 0x8B -#define MODEL_o1688 0x8A -#define MODEL_g281 0x89 -#define MODEL_o1672 0x88 -#define MODEL_o1669 0x87 -#define MODEL_o1671 0x86 -#define MODEL_o1670 0x85 -#define MODEL_g277 0x84 -#define MODEL_o1654 0x83 -#define MODEL_o1651 0x82 -#define MODEL_o1653 0x81 -#define MODEL_o1652 0x80 -#define MODEL_g276 0x7F -#define MODEL_o1650 0x7E -#define MODEL_o1647 0x7D -#define MODEL_o1649 0x7C -#define MODEL_o1648 0x7B -#define MODEL_g275 0x7A -#define MODEL_o1646 0x79 -#define MODEL_o1643 0x78 -#define MODEL_o1645 0x77 -#define MODEL_o1644 0x76 -#define MODEL_g267 0x75 -#define MODEL_o1605 0x74 -#define MODEL_o1604 0x73 -#define MODEL_o1603 0x72 -#define MODEL_o1602 0x71 -#define MODEL_o1601 0x70 -#define MODEL_o1600 0x6F -#define MODEL_g264 0x6E -#define MODEL_o1589 0x6D -#define MODEL_o1588 0x6C -#define MODEL_o1587 0x6B -#define MODEL_o1586 0x6A -#define MODEL_o1585 0x69 -#define MODEL_o1584 0x68 -#define MODEL_g263 0x67 -#define MODEL_o1579 0x66 -#define MODEL_g230 0x65 -#define MODEL_o1387 0x64 -#define MODEL_o1606 0x63 -#define MODEL_o1695 0x62 -#define MODEL_g15 0x61 -#define MODEL_o2247 0x60 -#define MODEL_g18 0x5F -#define MODEL_o1829 0x5E -#define MODEL_o1828 0x5D -#define MODEL_o1827 0x5C -#define MODEL_o1826 0x5B -#define MODEL_o1825 0x5A -#define MODEL_o1824 0x59 -#define MODEL_o1823 0x58 -#define MODEL_o1822 0x57 -#define MODEL_o1821 0x56 -#define MODEL_o1820 0x55 -#define MODEL_o1819 0x54 -#define MODEL_o1818 0x53 -#define MODEL_o1817 0x52 -#define MODEL_o1816 0x51 -#define MODEL_o1815 0x50 -#define MODEL_o1871 0x4F -#define MODEL_g303 0x4E -#define MODEL_o1797 0x4D -#define MODEL_o1796 0x4C -#define MODEL_o1772 0x4B -#define MODEL_o1770 0x4A -#define MODEL_o1775 0x49 -#define MODEL_o1793 0x48 -#define MODEL_g302 0x47 -#define MODEL_o649 0x46 -#define MODEL_o650 0x45 -#define MODEL_o648 0x44 -#define MODEL_o651 0x43 -#define MODEL_o646 0x42 -#define MODEL_g17 0x41 -#define MODEL_o341 0x40 -#define MODEL_o339 0x3F -#define MODEL_o338 0x3E -#define MODEL_o336 0x3D -#define MODEL_o335 0x3C -#define MODEL_o334 0x3B -#define MODEL_o333 0x3A -#define MODEL_o176 0x39 -#define MODEL_o659 0x38 -#define MODEL_o658 0x37 -#define MODEL_o331 0x36 -#define MODEL_o330 0x35 -#define MODEL_o329 0x34 -#define MODEL_o328 0x33 -#define MODEL_o175 0x32 -#define MODEL_o1804 0x31 -#define MODEL_o1803 0x30 -#define MODEL_o1802 0x2F -#define MODEL_o1801 0x2E -#define MODEL_o1800 0x2D -#define MODEL_o1798 0x2C -#define MODEL_o1799 0x2B -#define MODEL_g220 0x2A -#define MODEL_g222 0x29 -#define MODEL_o1835 0x28 -#define MODEL_o1834 0x27 -#define MODEL_o1342 0x26 -#define MODEL_o1343 0x25 -#define MODEL_o1341 0x24 -#define MODEL_o1340 0x23 -#define MODEL_g221 0x22 -#define MODEL_o1838 0x21 -#define MODEL_o1837 0x20 -#define MODEL_o1339 0x1F -#define MODEL_o1338 0x1E -#define MODEL_o1337 0x1D -#define MODEL_o1336 0x1C -#define MODEL_o1335 0x1B -#define MODEL_g274 0x1A -#define MODEL_o1758 0x19 -#define MODEL_o1742 0x18 -#define MODEL_o1743 0x17 -#define MODEL_o1757 0x16 -#define MODEL_o1740 0x15 -#define MODEL_o1741 0x14 -#define MODEL_o1756 0x13 -#define MODEL_o1739 0x12 -#define MODEL_o1755 0x11 -#define MODEL_g386 0x10 -#define MODEL_o1583 0xF -#define MODEL_o1642 0xE -#define MODEL_o1615 0xD -#define MODEL_o1386 0xC -#define MODEL_o1614 0xB -#define MODEL_o1640 0xA -#define MODEL_o1578 0x9 -#define MODEL_o1382 0x8 -#define MODEL_o1581 0x7 -#define MODEL_o1580 0x6 -#define MODEL_o1641 0x5 -#define MODEL_o1613 0x4 -#define MODEL_o1570 0x3 -#define MODEL_o1569 0x2 -#define MODEL_o1571 0x1 -#define MODEL_o1582 0x0 +#define MODEL_Root 0xBB +#define MODEL_g307 0xBA +#define MODEL_before 0xB9 +#define MODEL_g16 0xB8 +#define MODEL_o1870 0xB7 +#define MODEL_o1869 0xB6 +#define MODEL_o1868 0xB5 +#define MODEL_o1867 0xB4 +#define MODEL_o1792 0xB3 +#define MODEL_o1791 0xB2 +#define MODEL_g384 0xB1 +#define MODEL_o1893 0xB0 +#define MODEL_o1892 0xAF +#define MODEL_o1882 0xAE +#define MODEL_o1894 0xAD +#define MODEL_o1887 0xAC +#define MODEL_o1900 0xAB +#define MODEL_o2248 0xAA +#define MODEL_Default 0xA9 +#define MODEL_o1862 0xA8 +#define MODEL_o1839 0xA7 +#define MODEL_o1877 0xA6 +#define MODEL_o1890 0xA5 +#define MODEL_o1891 0xA4 +#define MODEL_g261 0xA3 +#define MODEL_g294 0xA2 +#define MODEL_g304 0xA1 +#define MODEL_o1857 0xA0 +#define MODEL_g301 0x9F +#define MODEL_o1859 0x9E +#define MODEL_o1856 0x9D +#define MODEL_o1738 0x9C +#define MODEL_o1735 0x9B +#define MODEL_o1737 0x9A +#define MODEL_o1736 0x99 +#define MODEL_g291 0x98 +#define MODEL_o1722 0x97 +#define MODEL_o1719 0x96 +#define MODEL_o1721 0x95 +#define MODEL_o1720 0x94 +#define MODEL_g286 0x93 +#define MODEL_o1694 0x92 +#define MODEL_o1691 0x91 +#define MODEL_o1693 0x90 +#define MODEL_o1692 0x8F +#define MODEL_g285 0x8E +#define MODEL_o1690 0x8D +#define MODEL_o1687 0x8C +#define MODEL_o1689 0x8B +#define MODEL_o1688 0x8A +#define MODEL_g281 0x89 +#define MODEL_o1672 0x88 +#define MODEL_o1669 0x87 +#define MODEL_o1671 0x86 +#define MODEL_o1670 0x85 +#define MODEL_g277 0x84 +#define MODEL_o1654 0x83 +#define MODEL_o1651 0x82 +#define MODEL_o1653 0x81 +#define MODEL_o1652 0x80 +#define MODEL_g276 0x7F +#define MODEL_o1650 0x7E +#define MODEL_o1647 0x7D +#define MODEL_o1649 0x7C +#define MODEL_o1648 0x7B +#define MODEL_g275 0x7A +#define MODEL_o1646 0x79 +#define MODEL_o1643 0x78 +#define MODEL_o1645 0x77 +#define MODEL_o1644 0x76 +#define MODEL_g267 0x75 +#define MODEL_o1605 0x74 +#define MODEL_o1604 0x73 +#define MODEL_o1603 0x72 +#define MODEL_o1602 0x71 +#define MODEL_o1601 0x70 +#define MODEL_o1600 0x6F +#define MODEL_g264 0x6E +#define MODEL_o1589 0x6D +#define MODEL_o1588 0x6C +#define MODEL_o1587 0x6B +#define MODEL_o1586 0x6A +#define MODEL_o1585 0x69 +#define MODEL_o1584 0x68 +#define MODEL_g263 0x67 +#define MODEL_o1579 0x66 +#define MODEL_g230 0x65 +#define MODEL_o1387 0x64 +#define MODEL_o1606 0x63 +#define MODEL_o1695 0x62 +#define MODEL_g15 0x61 +#define MODEL_o2247 0x60 +#define MODEL_g18 0x5F +#define MODEL_o1829 0x5E +#define MODEL_o1828 0x5D +#define MODEL_o1827 0x5C +#define MODEL_o1826 0x5B +#define MODEL_o1825 0x5A +#define MODEL_o1824 0x59 +#define MODEL_o1823 0x58 +#define MODEL_o1822 0x57 +#define MODEL_o1821 0x56 +#define MODEL_o1820 0x55 +#define MODEL_o1819 0x54 +#define MODEL_o1818 0x53 +#define MODEL_o1817 0x52 +#define MODEL_o1816 0x51 +#define MODEL_o1815 0x50 +#define MODEL_o1871 0x4F +#define MODEL_g303 0x4E +#define MODEL_o1797 0x4D +#define MODEL_o1796 0x4C +#define MODEL_o1772 0x4B +#define MODEL_o1770 0x4A +#define MODEL_o1775 0x49 +#define MODEL_o1793 0x48 +#define MODEL_g302 0x47 +#define MODEL_o649 0x46 +#define MODEL_o650 0x45 +#define MODEL_o648 0x44 +#define MODEL_o651 0x43 +#define MODEL_o646 0x42 +#define MODEL_g17 0x41 +#define MODEL_o341 0x40 +#define MODEL_o339 0x3F +#define MODEL_o338 0x3E +#define MODEL_o336 0x3D +#define MODEL_o335 0x3C +#define MODEL_o334 0x3B +#define MODEL_o333 0x3A +#define MODEL_o176 0x39 +#define MODEL_o659 0x38 +#define MODEL_o658 0x37 +#define MODEL_o331 0x36 +#define MODEL_o330 0x35 +#define MODEL_o329 0x34 +#define MODEL_o328 0x33 +#define MODEL_o175 0x32 +#define MODEL_o1804 0x31 +#define MODEL_o1803 0x30 +#define MODEL_o1802 0x2F +#define MODEL_o1801 0x2E +#define MODEL_o1800 0x2D +#define MODEL_o1798 0x2C +#define MODEL_o1799 0x2B +#define MODEL_g220 0x2A +#define MODEL_g222 0x29 +#define MODEL_o1835 0x28 +#define MODEL_o1834 0x27 +#define MODEL_o1342 0x26 +#define MODEL_o1343 0x25 +#define MODEL_o1341 0x24 +#define MODEL_o1340 0x23 +#define MODEL_g221 0x22 +#define MODEL_o1838 0x21 +#define MODEL_o1837 0x20 +#define MODEL_o1339 0x1F +#define MODEL_o1338 0x1E +#define MODEL_o1337 0x1D +#define MODEL_o1336 0x1C +#define MODEL_o1335 0x1B +#define MODEL_g274 0x1A +#define MODEL_o1758 0x19 +#define MODEL_o1742 0x18 +#define MODEL_o1743 0x17 +#define MODEL_o1757 0x16 +#define MODEL_o1740 0x15 +#define MODEL_o1741 0x14 +#define MODEL_o1756 0x13 +#define MODEL_o1739 0x12 +#define MODEL_o1755 0x11 +#define MODEL_g386 0x10 +#define MODEL_o1583 0xF +#define MODEL_o1642 0xE +#define MODEL_o1615 0xD +#define MODEL_o1386 0xC +#define MODEL_o1614 0xB +#define MODEL_o1640 0xA +#define MODEL_o1578 0x9 +#define MODEL_o1382 0x8 +#define MODEL_o1581 0x7 +#define MODEL_o1580 0x6 +#define MODEL_o1641 0x5 +#define MODEL_o1613 0x4 +#define MODEL_o1570 0x3 +#define MODEL_o1569 0x2 +#define MODEL_o1571 0x1 +#define MODEL_o1582 0x0 + diff --git a/include/mapfs/kpa_121_hit.h b/include/mapfs/kpa_121_hit.h index 3bd07297fc..37820e7230 100644 --- a/include/mapfs/kpa_121_hit.h +++ b/include/mapfs/kpa_121_hit.h @@ -1,22 +1,34 @@ -#define COLLIDER_Root 0x15 -#define COLLIDER_g1 0x14 -#define COLLIDER_g51 0x13 -#define COLLIDER_o293 0x12 -#define COLLIDER_deilittw 0x11 -#define COLLIDER_deilitw 0x10 -#define COLLIDER_deiliw 0xF -#define COLLIDER_o290 0xE -#define COLLIDER_deilitte 0xD -#define COLLIDER_deilite 0xC -#define COLLIDER_deilie 0xB -#define COLLIDER_g46 0xA -#define COLLIDER_o286 0x9 -#define COLLIDER_o285 0x8 -#define COLLIDER_o283 0x7 -#define COLLIDER_o282 0x6 -#define COLLIDER_o280 0x5 -#define COLLIDER_o279 0x4 -#define COLLIDER_o277 0x3 -#define COLLIDER_o276 0x2 -#define COLLIDER_o274 0x1 -#define COLLIDER_o273 0x0 +#define COLLIDER_Root 0x15 +#define COLLIDER_g1 0x14 +#define COLLIDER_g51 0x13 +#define COLLIDER_o293 0x12 +#define COLLIDER_deilittw 0x11 +#define COLLIDER_deilitw 0x10 +#define COLLIDER_deiliw 0xF +#define COLLIDER_o290 0xE +#define COLLIDER_deilitte 0xD +#define COLLIDER_deilite 0xC +#define COLLIDER_deilie 0xB +#define COLLIDER_g46 0xA +#define COLLIDER_o286 0x9 +#define COLLIDER_o285 0x8 +#define COLLIDER_o283 0x7 +#define COLLIDER_o282 0x6 +#define COLLIDER_o280 0x5 +#define COLLIDER_o279 0x4 +#define COLLIDER_o277 0x3 +#define COLLIDER_o276 0x2 +#define COLLIDER_o274 0x1 +#define COLLIDER_o273 0x0 + +#define ZONE_Root 0x9 +#define ZONE_g1 0x8 +#define ZONE_g2 0x7 +#define ZONE_deiliw 0x6 +#define ZONE_deilie 0x5 +#define ZONE_o285 0x4 +#define ZONE_o282 0x3 +#define ZONE_o279 0x2 +#define ZONE_o276 0x1 +#define ZONE_o273 0x0 + diff --git a/include/mapfs/kpa_121_shape.h b/include/mapfs/kpa_121_shape.h index b8cfe9c4ff..b9da302a0e 100644 --- a/include/mapfs/kpa_121_shape.h +++ b/include/mapfs/kpa_121_shape.h @@ -1,52 +1,53 @@ -#define MODEL_Root 0x33 -#define MODEL_g59 0x32 -#define MODEL_g64 0x31 -#define MODEL_o356 0x30 -#define MODEL_g60 0x2F -#define MODEL_o348 0x2E -#define MODEL_g1 0x2D -#define MODEL_g58 0x2C -#define MODEL_o340 0x2B -#define MODEL_g57 0x2A -#define MODEL_o367 0x29 -#define MODEL_o366 0x28 -#define MODEL_o365 0x27 -#define MODEL_o364 0x26 -#define MODEL_o363 0x25 -#define MODEL_o339 0x24 -#define MODEL_o338 0x23 -#define MODEL_o337 0x22 -#define MODEL_o336 0x21 -#define MODEL_o335 0x20 -#define MODEL_o334 0x1F -#define MODEL_o333 0x1E -#define MODEL_g56 0x1D -#define MODEL_o332 0x1C -#define MODEL_o331 0x1B -#define MODEL_o330 0x1A -#define MODEL_o329 0x19 -#define MODEL_o328 0x18 -#define MODEL_g55 0x17 -#define MODEL_o327 0x16 -#define MODEL_o326 0x15 -#define MODEL_o324 0x14 -#define MODEL_o323 0x13 -#define MODEL_g54 0x12 -#define MODEL_o361 0x11 -#define MODEL_o322 0x10 -#define MODEL_o321 0xF -#define MODEL_o320 0xE -#define MODEL_o319 0xD -#define MODEL_o318 0xC -#define MODEL_g53 0xB -#define MODEL_o317 0xA -#define MODEL_o316 0x9 -#define MODEL_o315 0x8 -#define MODEL_o314 0x7 -#define MODEL_o313 0x6 -#define MODEL_g52 0x5 -#define MODEL_o312 0x4 -#define MODEL_o311 0x3 -#define MODEL_o310 0x2 -#define MODEL_o309 0x1 -#define MODEL_o308 0x0 +#define MODEL_Root 0x33 +#define MODEL_g59 0x32 +#define MODEL_g64 0x31 +#define MODEL_o356 0x30 +#define MODEL_g60 0x2F +#define MODEL_o348 0x2E +#define MODEL_g1 0x2D +#define MODEL_g58 0x2C +#define MODEL_o340 0x2B +#define MODEL_g57 0x2A +#define MODEL_o367 0x29 +#define MODEL_o366 0x28 +#define MODEL_o365 0x27 +#define MODEL_o364 0x26 +#define MODEL_o363 0x25 +#define MODEL_o339 0x24 +#define MODEL_o338 0x23 +#define MODEL_o337 0x22 +#define MODEL_o336 0x21 +#define MODEL_o335 0x20 +#define MODEL_o334 0x1F +#define MODEL_o333 0x1E +#define MODEL_g56 0x1D +#define MODEL_o332 0x1C +#define MODEL_o331 0x1B +#define MODEL_o330 0x1A +#define MODEL_o329 0x19 +#define MODEL_o328 0x18 +#define MODEL_g55 0x17 +#define MODEL_o327 0x16 +#define MODEL_o326 0x15 +#define MODEL_o324 0x14 +#define MODEL_o323 0x13 +#define MODEL_g54 0x12 +#define MODEL_o361 0x11 +#define MODEL_o322 0x10 +#define MODEL_o321 0xF +#define MODEL_o320 0xE +#define MODEL_o319 0xD +#define MODEL_o318 0xC +#define MODEL_g53 0xB +#define MODEL_o317 0xA +#define MODEL_o316 0x9 +#define MODEL_o315 0x8 +#define MODEL_o314 0x7 +#define MODEL_o313 0x6 +#define MODEL_g52 0x5 +#define MODEL_o312 0x4 +#define MODEL_o311 0x3 +#define MODEL_o310 0x2 +#define MODEL_o309 0x1 +#define MODEL_o308 0x0 + diff --git a/include/mapfs/kpa_12_hit.h b/include/mapfs/kpa_12_hit.h index 59b8cbcee9..a7ebbcef72 100644 --- a/include/mapfs/kpa_12_hit.h +++ b/include/mapfs/kpa_12_hit.h @@ -1,85 +1,103 @@ -#define COLLIDER_Root 0x54 -#define COLLIDER_g1 0x53 -#define COLLIDER_g66 0x52 -#define COLLIDER_o420 0x51 -#define COLLIDER_o419 0x50 -#define COLLIDER_g50 0x4F -#define COLLIDER_o366 0x4E -#define COLLIDER_deilitsw 0x4D -#define COLLIDER_deilisw 0x4C -#define COLLIDER_o225 0x4B -#define COLLIDER_deilitw 0x4A -#define COLLIDER_deiliw 0x49 -#define COLLIDER_o302 0x48 -#define COLLIDER_deilite 0x47 -#define COLLIDER_deilie 0x46 -#define COLLIDER_g24 0x45 -#define COLLIDER_o355 0x44 -#define COLLIDER_o354 0x43 -#define COLLIDER_o353 0x42 -#define COLLIDER_o352 0x41 -#define COLLIDER_o351 0x40 -#define COLLIDER_o350 0x3F -#define COLLIDER_o349 0x3E -#define COLLIDER_o348 0x3D -#define COLLIDER_o347 0x3C -#define COLLIDER_o346 0x3B -#define COLLIDER_o343 0x3A -#define COLLIDER_o342 0x39 -#define COLLIDER_o341 0x38 -#define COLLIDER_o340 0x37 -#define COLLIDER_o339 0x36 -#define COLLIDER_o338 0x35 -#define COLLIDER_o337 0x34 -#define COLLIDER_o336 0x33 -#define COLLIDER_o334 0x32 -#define COLLIDER_o333 0x31 -#define COLLIDER_o332 0x30 -#define COLLIDER_o331 0x2F -#define COLLIDER_o330 0x2E -#define COLLIDER_o329 0x2D -#define COLLIDER_o328 0x2C -#define COLLIDER_o327 0x2B -#define COLLIDER_o326 0x2A -#define COLLIDER_o325 0x29 -#define COLLIDER_o324 0x28 -#define COLLIDER_o323 0x27 -#define COLLIDER_o322 0x26 -#define COLLIDER_o321 0x25 -#define COLLIDER_o306 0x24 -#define COLLIDER_o232 0x23 -#define COLLIDER_o229 0x22 -#define COLLIDER_o300 0x21 -#define COLLIDER_o223 0x20 -#define COLLIDER_g15 0x1F -#define COLLIDER_dai05 0x1E -#define COLLIDER_o414 0x1D -#define COLLIDER_dai04 0x1C -#define COLLIDER_o411 0x1B -#define COLLIDER_dai03 0x1A -#define COLLIDER_o409 0x19 -#define COLLIDER_dai02 0x18 -#define COLLIDER_o407 0x17 -#define COLLIDER_dai01 0x16 -#define COLLIDER_o405 0x15 -#define COLLIDER_g18 0x14 -#define COLLIDER_o371 0x13 -#define COLLIDER_o370 0x12 -#define COLLIDER_o365 0x11 -#define COLLIDER_o364 0x10 -#define COLLIDER_o363 0xF -#define COLLIDER_o362 0xE -#define COLLIDER_o361 0xD -#define COLLIDER_o360 0xC -#define COLLIDER_o359 0xB -#define COLLIDER_o358 0xA -#define COLLIDER_o356 0x9 -#define COLLIDER_g16 0x8 -#define COLLIDER_o144 0x7 -#define COLLIDER_o175 0x6 -#define COLLIDER_o174 0x5 -#define COLLIDER_o171 0x4 -#define COLLIDER_o179 0x3 -#define COLLIDER_o305 0x2 -#define COLLIDER_o418 0x1 -#define COLLIDER_o417 0x0 +#define COLLIDER_Root 0x54 +#define COLLIDER_g1 0x53 +#define COLLIDER_g66 0x52 +#define COLLIDER_o420 0x51 +#define COLLIDER_o419 0x50 +#define COLLIDER_g50 0x4F +#define COLLIDER_o366 0x4E +#define COLLIDER_deilitsw 0x4D +#define COLLIDER_deilisw 0x4C +#define COLLIDER_o225 0x4B +#define COLLIDER_deilitw 0x4A +#define COLLIDER_deiliw 0x49 +#define COLLIDER_o302 0x48 +#define COLLIDER_deilite 0x47 +#define COLLIDER_deilie 0x46 +#define COLLIDER_g24 0x45 +#define COLLIDER_o355 0x44 +#define COLLIDER_o354 0x43 +#define COLLIDER_o353 0x42 +#define COLLIDER_o352 0x41 +#define COLLIDER_o351 0x40 +#define COLLIDER_o350 0x3F +#define COLLIDER_o349 0x3E +#define COLLIDER_o348 0x3D +#define COLLIDER_o347 0x3C +#define COLLIDER_o346 0x3B +#define COLLIDER_o343 0x3A +#define COLLIDER_o342 0x39 +#define COLLIDER_o341 0x38 +#define COLLIDER_o340 0x37 +#define COLLIDER_o339 0x36 +#define COLLIDER_o338 0x35 +#define COLLIDER_o337 0x34 +#define COLLIDER_o336 0x33 +#define COLLIDER_o334 0x32 +#define COLLIDER_o333 0x31 +#define COLLIDER_o332 0x30 +#define COLLIDER_o331 0x2F +#define COLLIDER_o330 0x2E +#define COLLIDER_o329 0x2D +#define COLLIDER_o328 0x2C +#define COLLIDER_o327 0x2B +#define COLLIDER_o326 0x2A +#define COLLIDER_o325 0x29 +#define COLLIDER_o324 0x28 +#define COLLIDER_o323 0x27 +#define COLLIDER_o322 0x26 +#define COLLIDER_o321 0x25 +#define COLLIDER_o306 0x24 +#define COLLIDER_o232 0x23 +#define COLLIDER_o229 0x22 +#define COLLIDER_o300 0x21 +#define COLLIDER_o223 0x20 +#define COLLIDER_g15 0x1F +#define COLLIDER_dai05 0x1E +#define COLLIDER_o414 0x1D +#define COLLIDER_dai04 0x1C +#define COLLIDER_o411 0x1B +#define COLLIDER_dai03 0x1A +#define COLLIDER_o409 0x19 +#define COLLIDER_dai02 0x18 +#define COLLIDER_o407 0x17 +#define COLLIDER_dai01 0x16 +#define COLLIDER_o405 0x15 +#define COLLIDER_g18 0x14 +#define COLLIDER_o371 0x13 +#define COLLIDER_o370 0x12 +#define COLLIDER_o365 0x11 +#define COLLIDER_o364 0x10 +#define COLLIDER_o363 0xF +#define COLLIDER_o362 0xE +#define COLLIDER_o361 0xD +#define COLLIDER_o360 0xC +#define COLLIDER_o359 0xB +#define COLLIDER_o358 0xA +#define COLLIDER_o356 0x9 +#define COLLIDER_g16 0x8 +#define COLLIDER_o144 0x7 +#define COLLIDER_o175 0x6 +#define COLLIDER_o174 0x5 +#define COLLIDER_o171 0x4 +#define COLLIDER_o179 0x3 +#define COLLIDER_o305 0x2 +#define COLLIDER_o418 0x1 +#define COLLIDER_o417 0x0 + +#define ZONE_Root 0xF +#define ZONE_g1 0xE +#define ZONE_g52 0xD +#define ZONE_deiliw 0xC +#define ZONE_deilie 0xB +#define ZONE_g51 0xA +#define ZONE_o364 0x9 +#define ZONE_o363 0x8 +#define ZONE_o362 0x7 +#define ZONE_o361 0x6 +#define ZONE_o360 0x5 +#define ZONE_o359 0x4 +#define ZONE_o358 0x3 +#define ZONE_o357 0x2 +#define ZONE_o365 0x1 +#define ZONE_o356 0x0 + diff --git a/include/mapfs/kpa_12_shape.h b/include/mapfs/kpa_12_shape.h index 20a38a5622..fdfa27c186 100644 --- a/include/mapfs/kpa_12_shape.h +++ b/include/mapfs/kpa_12_shape.h @@ -1,232 +1,233 @@ -#define MODEL_Root 0xE7 -#define MODEL_g76 0xE6 -#define MODEL_after 0xE5 -#define MODEL_g100 0xE4 -#define MODEL_o672 0xE3 -#define MODEL_o671 0xE2 -#define MODEL_o670 0xE1 -#define MODEL_o669 0xE0 -#define MODEL_o668 0xDF -#define MODEL_o667 0xDE -#define MODEL_o666 0xDD -#define MODEL_o665 0xDC -#define MODEL_g92 0xDB -#define MODEL_g99 0xDA -#define MODEL_o664 0xD9 -#define MODEL_o663 0xD8 -#define MODEL_g98 0xD7 -#define MODEL_o662 0xD6 -#define MODEL_o661 0xD5 -#define MODEL_g97 0xD4 -#define MODEL_o660 0xD3 -#define MODEL_o659 0xD2 -#define MODEL_g96 0xD1 -#define MODEL_o658 0xD0 -#define MODEL_o657 0xCF -#define MODEL_g95 0xCE -#define MODEL_o656 0xCD -#define MODEL_o655 0xCC -#define MODEL_o654 0xCB -#define MODEL_o653 0xCA -#define MODEL_g94 0xC9 -#define MODEL_o652 0xC8 -#define MODEL_o651 0xC7 -#define MODEL_o650 0xC6 -#define MODEL_o649 0xC5 -#define MODEL_o648 0xC4 -#define MODEL_o647 0xC3 -#define MODEL_g93 0xC2 -#define MODEL_o646 0xC1 -#define MODEL_o644 0xC0 -#define MODEL_o643 0xBF -#define MODEL_o642 0xBE -#define MODEL_o641 0xBD -#define MODEL_o640 0xBC -#define MODEL_g78 0xBB -#define MODEL_g91 0xBA -#define MODEL_o639 0xB9 -#define MODEL_o638 0xB8 -#define MODEL_o637 0xB7 -#define MODEL_o636 0xB6 -#define MODEL_o635 0xB5 -#define MODEL_g90 0xB4 -#define MODEL_o634 0xB3 -#define MODEL_o633 0xB2 -#define MODEL_o631 0xB1 -#define MODEL_o630 0xB0 -#define MODEL_o629 0xAF -#define MODEL_g80 0xAE -#define MODEL_o574 0xAD -#define MODEL_g79 0xAC -#define MODEL_o696 0xAB -#define MODEL_o568 0xAA -#define MODEL_o567 0xA9 -#define MODEL_o565 0xA8 -#define MODEL_o564 0xA7 -#define MODEL_o563 0xA6 -#define MODEL_g113 0xA5 -#define MODEL_o627 0xA4 -#define MODEL_o621 0xA3 -#define MODEL_o615 0xA2 -#define MODEL_o609 0xA1 -#define MODEL_o603 0xA0 -#define MODEL_o597 0x9F -#define MODEL_o591 0x9E -#define MODEL_o585 0x9D -#define MODEL_o579 0x9C -#define MODEL_o573 0x9B -#define MODEL_o626 0x9A -#define MODEL_o620 0x99 -#define MODEL_o614 0x98 -#define MODEL_o608 0x97 -#define MODEL_o602 0x96 -#define MODEL_o596 0x95 -#define MODEL_o590 0x94 -#define MODEL_o584 0x93 -#define MODEL_o578 0x92 -#define MODEL_g111 0x91 -#define MODEL_o625 0x90 -#define MODEL_o619 0x8F -#define MODEL_o613 0x8E -#define MODEL_o607 0x8D -#define MODEL_o601 0x8C -#define MODEL_o595 0x8B -#define MODEL_o589 0x8A -#define MODEL_o583 0x89 -#define MODEL_o577 0x88 -#define MODEL_o571 0x87 -#define MODEL_o624 0x86 -#define MODEL_o618 0x85 -#define MODEL_o612 0x84 -#define MODEL_o606 0x83 -#define MODEL_o600 0x82 -#define MODEL_o594 0x81 -#define MODEL_o588 0x80 -#define MODEL_o582 0x7F -#define MODEL_o576 0x7E -#define MODEL_o570 0x7D -#define MODEL_o623 0x7C -#define MODEL_o617 0x7B -#define MODEL_o611 0x7A -#define MODEL_o605 0x79 -#define MODEL_o599 0x78 -#define MODEL_o593 0x77 -#define MODEL_o587 0x76 -#define MODEL_o581 0x75 -#define MODEL_o575 0x74 -#define MODEL_o569 0x73 -#define MODEL_before 0x72 -#define MODEL_g67 0x71 -#define MODEL_o561 0x70 -#define MODEL_o513 0x6F -#define MODEL_o558 0x6E -#define MODEL_o557 0x6D -#define MODEL_o526 0x6C -#define MODEL_o516 0x6B -#define MODEL_o555 0x6A -#define MODEL_o319 0x69 -#define MODEL_g58 0x68 -#define MODEL_dai05 0x67 -#define MODEL_o523 0x66 -#define MODEL_o522 0x65 -#define MODEL_dai04 0x64 -#define MODEL_o453 0x63 -#define MODEL_o452 0x62 -#define MODEL_dai03 0x61 -#define MODEL_o451 0x60 -#define MODEL_o450 0x5F -#define MODEL_dai02 0x5E -#define MODEL_o449 0x5D -#define MODEL_o448 0x5C -#define MODEL_dai01 0x5B -#define MODEL_o447 0x5A -#define MODEL_o446 0x59 -#define MODEL_o469 0x58 -#define MODEL_o444 0x57 -#define MODEL_g60 0x56 -#define MODEL_o471 0x55 -#define MODEL_o440 0x54 -#define MODEL_o436 0x53 -#define MODEL_o475 0x52 -#define MODEL_o461 0x51 -#define MODEL_o458 0x50 -#define MODEL_g59 0x4F -#define MODEL_o473 0x4E -#define MODEL_o427 0x4D -#define MODEL_o424 0x4C -#define MODEL_o468 0x4B -#define MODEL_o460 0x4A -#define MODEL_o459 0x49 -#define MODEL_g41 0x48 -#define MODEL_g57 0x47 -#define MODEL_o423 0x46 -#define MODEL_o422 0x45 -#define MODEL_o421 0x44 -#define MODEL_o420 0x43 -#define MODEL_o417 0x42 -#define MODEL_g56 0x41 -#define MODEL_o413 0x40 -#define MODEL_o412 0x3F -#define MODEL_o410 0x3E -#define MODEL_o409 0x3D -#define MODEL_o408 0x3C -#define MODEL_g44 0x3B -#define MODEL_o341 0x3A -#define MODEL_g43 0x39 -#define MODEL_o695 0x38 -#define MODEL_o562 0x37 -#define MODEL_o335 0x36 -#define MODEL_o332 0x35 -#define MODEL_o331 0x34 -#define MODEL_o330 0x33 -#define MODEL_g54 0x32 -#define MODEL_o400 0x31 -#define MODEL_o394 0x30 -#define MODEL_o388 0x2F -#define MODEL_o382 0x2E -#define MODEL_o376 0x2D -#define MODEL_o370 0x2C -#define MODEL_o358 0x2B -#define MODEL_o352 0x2A -#define MODEL_o346 0x29 -#define MODEL_o340 0x28 -#define MODEL_o399 0x27 -#define MODEL_o393 0x26 -#define MODEL_o387 0x25 -#define MODEL_o381 0x24 -#define MODEL_o375 0x23 -#define MODEL_o369 0x22 -#define MODEL_o357 0x21 -#define MODEL_o351 0x20 -#define MODEL_o345 0x1F -#define MODEL_g112 0x1E -#define MODEL_o398 0x1D -#define MODEL_o392 0x1C -#define MODEL_o386 0x1B -#define MODEL_o380 0x1A -#define MODEL_o374 0x19 -#define MODEL_o368 0x18 -#define MODEL_o356 0x17 -#define MODEL_o350 0x16 -#define MODEL_o344 0x15 -#define MODEL_o338 0x14 -#define MODEL_o397 0x13 -#define MODEL_o391 0x12 -#define MODEL_o385 0x11 -#define MODEL_o379 0x10 -#define MODEL_o373 0xF -#define MODEL_o367 0xE -#define MODEL_o355 0xD -#define MODEL_o349 0xC -#define MODEL_o343 0xB -#define MODEL_o337 0xA -#define MODEL_o396 0x9 -#define MODEL_o390 0x8 -#define MODEL_o384 0x7 -#define MODEL_o378 0x6 -#define MODEL_o372 0x5 -#define MODEL_o366 0x4 -#define MODEL_o354 0x3 -#define MODEL_o348 0x2 -#define MODEL_o342 0x1 -#define MODEL_o336 0x0 +#define MODEL_Root 0xE7 +#define MODEL_g76 0xE6 +#define MODEL_after 0xE5 +#define MODEL_g100 0xE4 +#define MODEL_o672 0xE3 +#define MODEL_o671 0xE2 +#define MODEL_o670 0xE1 +#define MODEL_o669 0xE0 +#define MODEL_o668 0xDF +#define MODEL_o667 0xDE +#define MODEL_o666 0xDD +#define MODEL_o665 0xDC +#define MODEL_g92 0xDB +#define MODEL_g99 0xDA +#define MODEL_o664 0xD9 +#define MODEL_o663 0xD8 +#define MODEL_g98 0xD7 +#define MODEL_o662 0xD6 +#define MODEL_o661 0xD5 +#define MODEL_g97 0xD4 +#define MODEL_o660 0xD3 +#define MODEL_o659 0xD2 +#define MODEL_g96 0xD1 +#define MODEL_o658 0xD0 +#define MODEL_o657 0xCF +#define MODEL_g95 0xCE +#define MODEL_o656 0xCD +#define MODEL_o655 0xCC +#define MODEL_o654 0xCB +#define MODEL_o653 0xCA +#define MODEL_g94 0xC9 +#define MODEL_o652 0xC8 +#define MODEL_o651 0xC7 +#define MODEL_o650 0xC6 +#define MODEL_o649 0xC5 +#define MODEL_o648 0xC4 +#define MODEL_o647 0xC3 +#define MODEL_g93 0xC2 +#define MODEL_o646 0xC1 +#define MODEL_o644 0xC0 +#define MODEL_o643 0xBF +#define MODEL_o642 0xBE +#define MODEL_o641 0xBD +#define MODEL_o640 0xBC +#define MODEL_g78 0xBB +#define MODEL_g91 0xBA +#define MODEL_o639 0xB9 +#define MODEL_o638 0xB8 +#define MODEL_o637 0xB7 +#define MODEL_o636 0xB6 +#define MODEL_o635 0xB5 +#define MODEL_g90 0xB4 +#define MODEL_o634 0xB3 +#define MODEL_o633 0xB2 +#define MODEL_o631 0xB1 +#define MODEL_o630 0xB0 +#define MODEL_o629 0xAF +#define MODEL_g80 0xAE +#define MODEL_o574 0xAD +#define MODEL_g79 0xAC +#define MODEL_o696 0xAB +#define MODEL_o568 0xAA +#define MODEL_o567 0xA9 +#define MODEL_o565 0xA8 +#define MODEL_o564 0xA7 +#define MODEL_o563 0xA6 +#define MODEL_g113 0xA5 +#define MODEL_o627 0xA4 +#define MODEL_o621 0xA3 +#define MODEL_o615 0xA2 +#define MODEL_o609 0xA1 +#define MODEL_o603 0xA0 +#define MODEL_o597 0x9F +#define MODEL_o591 0x9E +#define MODEL_o585 0x9D +#define MODEL_o579 0x9C +#define MODEL_o573 0x9B +#define MODEL_o626 0x9A +#define MODEL_o620 0x99 +#define MODEL_o614 0x98 +#define MODEL_o608 0x97 +#define MODEL_o602 0x96 +#define MODEL_o596 0x95 +#define MODEL_o590 0x94 +#define MODEL_o584 0x93 +#define MODEL_o578 0x92 +#define MODEL_g111 0x91 +#define MODEL_o625 0x90 +#define MODEL_o619 0x8F +#define MODEL_o613 0x8E +#define MODEL_o607 0x8D +#define MODEL_o601 0x8C +#define MODEL_o595 0x8B +#define MODEL_o589 0x8A +#define MODEL_o583 0x89 +#define MODEL_o577 0x88 +#define MODEL_o571 0x87 +#define MODEL_o624 0x86 +#define MODEL_o618 0x85 +#define MODEL_o612 0x84 +#define MODEL_o606 0x83 +#define MODEL_o600 0x82 +#define MODEL_o594 0x81 +#define MODEL_o588 0x80 +#define MODEL_o582 0x7F +#define MODEL_o576 0x7E +#define MODEL_o570 0x7D +#define MODEL_o623 0x7C +#define MODEL_o617 0x7B +#define MODEL_o611 0x7A +#define MODEL_o605 0x79 +#define MODEL_o599 0x78 +#define MODEL_o593 0x77 +#define MODEL_o587 0x76 +#define MODEL_o581 0x75 +#define MODEL_o575 0x74 +#define MODEL_o569 0x73 +#define MODEL_before 0x72 +#define MODEL_g67 0x71 +#define MODEL_o561 0x70 +#define MODEL_o513 0x6F +#define MODEL_o558 0x6E +#define MODEL_o557 0x6D +#define MODEL_o526 0x6C +#define MODEL_o516 0x6B +#define MODEL_o555 0x6A +#define MODEL_o319 0x69 +#define MODEL_g58 0x68 +#define MODEL_dai05 0x67 +#define MODEL_o523 0x66 +#define MODEL_o522 0x65 +#define MODEL_dai04 0x64 +#define MODEL_o453 0x63 +#define MODEL_o452 0x62 +#define MODEL_dai03 0x61 +#define MODEL_o451 0x60 +#define MODEL_o450 0x5F +#define MODEL_dai02 0x5E +#define MODEL_o449 0x5D +#define MODEL_o448 0x5C +#define MODEL_dai01 0x5B +#define MODEL_o447 0x5A +#define MODEL_o446 0x59 +#define MODEL_o469 0x58 +#define MODEL_o444 0x57 +#define MODEL_g60 0x56 +#define MODEL_o471 0x55 +#define MODEL_o440 0x54 +#define MODEL_o436 0x53 +#define MODEL_o475 0x52 +#define MODEL_o461 0x51 +#define MODEL_o458 0x50 +#define MODEL_g59 0x4F +#define MODEL_o473 0x4E +#define MODEL_o427 0x4D +#define MODEL_o424 0x4C +#define MODEL_o468 0x4B +#define MODEL_o460 0x4A +#define MODEL_o459 0x49 +#define MODEL_g41 0x48 +#define MODEL_g57 0x47 +#define MODEL_o423 0x46 +#define MODEL_o422 0x45 +#define MODEL_o421 0x44 +#define MODEL_o420 0x43 +#define MODEL_o417 0x42 +#define MODEL_g56 0x41 +#define MODEL_o413 0x40 +#define MODEL_o412 0x3F +#define MODEL_o410 0x3E +#define MODEL_o409 0x3D +#define MODEL_o408 0x3C +#define MODEL_g44 0x3B +#define MODEL_o341 0x3A +#define MODEL_g43 0x39 +#define MODEL_o695 0x38 +#define MODEL_o562 0x37 +#define MODEL_o335 0x36 +#define MODEL_o332 0x35 +#define MODEL_o331 0x34 +#define MODEL_o330 0x33 +#define MODEL_g54 0x32 +#define MODEL_o400 0x31 +#define MODEL_o394 0x30 +#define MODEL_o388 0x2F +#define MODEL_o382 0x2E +#define MODEL_o376 0x2D +#define MODEL_o370 0x2C +#define MODEL_o358 0x2B +#define MODEL_o352 0x2A +#define MODEL_o346 0x29 +#define MODEL_o340 0x28 +#define MODEL_o399 0x27 +#define MODEL_o393 0x26 +#define MODEL_o387 0x25 +#define MODEL_o381 0x24 +#define MODEL_o375 0x23 +#define MODEL_o369 0x22 +#define MODEL_o357 0x21 +#define MODEL_o351 0x20 +#define MODEL_o345 0x1F +#define MODEL_g112 0x1E +#define MODEL_o398 0x1D +#define MODEL_o392 0x1C +#define MODEL_o386 0x1B +#define MODEL_o380 0x1A +#define MODEL_o374 0x19 +#define MODEL_o368 0x18 +#define MODEL_o356 0x17 +#define MODEL_o350 0x16 +#define MODEL_o344 0x15 +#define MODEL_o338 0x14 +#define MODEL_o397 0x13 +#define MODEL_o391 0x12 +#define MODEL_o385 0x11 +#define MODEL_o379 0x10 +#define MODEL_o373 0xF +#define MODEL_o367 0xE +#define MODEL_o355 0xD +#define MODEL_o349 0xC +#define MODEL_o343 0xB +#define MODEL_o337 0xA +#define MODEL_o396 0x9 +#define MODEL_o390 0x8 +#define MODEL_o384 0x7 +#define MODEL_o378 0x6 +#define MODEL_o372 0x5 +#define MODEL_o366 0x4 +#define MODEL_o354 0x3 +#define MODEL_o348 0x2 +#define MODEL_o342 0x1 +#define MODEL_o336 0x0 + diff --git a/include/mapfs/kpa_130_hit.h b/include/mapfs/kpa_130_hit.h index b34697a447..055e363a7e 100644 --- a/include/mapfs/kpa_130_hit.h +++ b/include/mapfs/kpa_130_hit.h @@ -1,34 +1,46 @@ -#define COLLIDER_Root 0x21 -#define COLLIDER_kaidan1 0x20 -#define COLLIDER_k5_isi 0x1F -#define COLLIDER_yuka 0x1E -#define COLLIDER_k4_isi 0x1D -#define COLLIDER_o246 0x1C -#define COLLIDER_k3_isi 0x1B -#define COLLIDER_o247 0x1A -#define COLLIDER_o248 0x19 -#define COLLIDER_o245 0x18 -#define COLLIDER_k2_isi 0x17 -#define COLLIDER_k1_isi 0x16 -#define COLLIDER_g1 0x15 -#define COLLIDER_o243 0x14 -#define COLLIDER_o237 0x13 -#define COLLIDER_o244 0x12 -#define COLLIDER_o236 0x11 -#define COLLIDER_o252 0x10 -#define COLLIDER_o251 0xF -#define COLLIDER_o250 0xE -#define COLLIDER_o235 0xD -#define COLLIDER_o255 0xC -#define COLLIDER_k6 0xB -#define COLLIDER_exit 0xA -#define COLLIDER_exite 0x9 -#define COLLIDER_tte 0x8 -#define COLLIDER_ne 0x7 -#define COLLIDER_deilie 0x6 -#define COLLIDER_deilite 0x5 -#define COLLIDER_exitw 0x4 -#define COLLIDER_nw 0x3 -#define COLLIDER_ttw 0x2 -#define COLLIDER_deiliw 0x1 -#define COLLIDER_deilitw 0x0 +#define COLLIDER_Root 0x21 +#define COLLIDER_kaidan1 0x20 +#define COLLIDER_k5_isi 0x1F +#define COLLIDER_yuka 0x1E +#define COLLIDER_k4_isi 0x1D +#define COLLIDER_o246 0x1C +#define COLLIDER_k3_isi 0x1B +#define COLLIDER_o247 0x1A +#define COLLIDER_o248 0x19 +#define COLLIDER_o245 0x18 +#define COLLIDER_k2_isi 0x17 +#define COLLIDER_k1_isi 0x16 +#define COLLIDER_g1 0x15 +#define COLLIDER_o243 0x14 +#define COLLIDER_o237 0x13 +#define COLLIDER_o244 0x12 +#define COLLIDER_o236 0x11 +#define COLLIDER_o252 0x10 +#define COLLIDER_o251 0xF +#define COLLIDER_o250 0xE +#define COLLIDER_o235 0xD +#define COLLIDER_o255 0xC +#define COLLIDER_k6 0xB +#define COLLIDER_exit 0xA +#define COLLIDER_exite 0x9 +#define COLLIDER_tte 0x8 +#define COLLIDER_ne 0x7 +#define COLLIDER_deilie 0x6 +#define COLLIDER_deilite 0x5 +#define COLLIDER_exitw 0x4 +#define COLLIDER_nw 0x3 +#define COLLIDER_ttw 0x2 +#define COLLIDER_deiliw 0x1 +#define COLLIDER_deilitw 0x0 + +#define ZONE_Root 0x9 +#define ZONE_g27 0x8 +#define ZONE_o75 0x7 +#define ZONE_o70 0x6 +#define ZONE_o66 0x5 +#define ZONE_o68 0x4 +#define ZONE_g25 0x3 +#define ZONE_o81 0x2 +#define ZONE_o65 0x1 +#define ZONE_o64 0x0 + diff --git a/include/mapfs/kpa_130_shape.h b/include/mapfs/kpa_130_shape.h index 3baa10a9f4..14781abafc 100644 --- a/include/mapfs/kpa_130_shape.h +++ b/include/mapfs/kpa_130_shape.h @@ -1,182 +1,183 @@ -#define MODEL_Root 0xB5 -#define MODEL_g128 0xB4 -#define MODEL_o464 0xB3 -#define MODEL_o463 0xB2 -#define MODEL_saku 0xB1 -#define MODEL_o323 0xB0 -#define MODEL_o354 0xAF -#define MODEL_o413 0xAE -#define MODEL_akari 0xAD -#define MODEL_o503 0xAC -#define MODEL_o502 0xAB -#define MODEL_o501 0xAA -#define MODEL_o500 0xA9 -#define MODEL_hi3 0xA8 -#define MODEL_hi2 0xA7 -#define MODEL_hi1 0xA6 -#define MODEL_tetuwa 0xA5 -#define MODEL_g90 0xA4 -#define MODEL_g113 0xA3 -#define MODEL_o412 0xA2 -#define MODEL_g108 0xA1 -#define MODEL_o409 0xA0 -#define MODEL_o408 0x9F -#define MODEL_o407 0x9E -#define MODEL_o406 0x9D -#define MODEL_g107 0x9C -#define MODEL_o405 0x9B -#define MODEL_o404 0x9A -#define MODEL_o403 0x99 -#define MODEL_o402 0x98 -#define MODEL_g106 0x97 -#define MODEL_o401 0x96 -#define MODEL_o400 0x95 -#define MODEL_o399 0x94 -#define MODEL_o398 0x93 -#define MODEL_g105 0x92 -#define MODEL_o397 0x91 -#define MODEL_o396 0x90 -#define MODEL_o395 0x8F -#define MODEL_o394 0x8E -#define MODEL_g104 0x8D -#define MODEL_o393 0x8C -#define MODEL_o392 0x8B -#define MODEL_o391 0x8A -#define MODEL_o390 0x89 -#define MODEL_g103 0x88 -#define MODEL_o389 0x87 -#define MODEL_o388 0x86 -#define MODEL_o387 0x85 -#define MODEL_o386 0x84 -#define MODEL_g101 0x83 -#define MODEL_o382 0x82 -#define MODEL_o381 0x81 -#define MODEL_o380 0x80 -#define MODEL_o379 0x7F -#define MODEL_g93 0x7E -#define MODEL_o483 0x7D -#define MODEL_o482 0x7C -#define MODEL_o481 0x7B -#define MODEL_o478 0x7A -#define MODEL_o477 0x79 -#define MODEL_o476 0x78 -#define MODEL_g130 0x77 -#define MODEL_o492 0x76 -#define MODEL_o491 0x75 -#define MODEL_o490 0x74 -#define MODEL_o489 0x73 -#define MODEL_o488 0x72 -#define MODEL_o487 0x71 -#define MODEL_o486 0x70 -#define MODEL_o485 0x6F -#define MODEL_o484 0x6E -#define MODEL_o495 0x6D -#define MODEL_o494 0x6C -#define MODEL_o493 0x6B -#define MODEL_g91 0x6A -#define MODEL_o316 0x69 -#define MODEL_o291 0x68 -#define MODEL_o289 0x67 -#define MODEL_o288 0x66 -#define MODEL_g85 0x65 -#define MODEL_o432 0x64 -#define MODEL_o318 0x63 -#define MODEL_o265 0x62 -#define MODEL_o264 0x61 -#define MODEL_g84 0x60 -#define MODEL_ami 0x5F -#define MODEL_o320 0x5E -#define MODEL_o260 0x5D -#define MODEL_g83 0x5C -#define MODEL_o331 0x5B -#define MODEL_o329 0x5A -#define MODEL_o257 0x59 -#define MODEL_o256 0x58 -#define MODEL_g80 0x57 -#define MODEL_o333 0x56 -#define MODEL_o244 0x55 -#define MODEL_o243 0x54 -#define MODEL_g110 0x53 -#define MODEL_o416 0x52 -#define MODEL_o415 0x51 -#define MODEL_o414 0x50 -#define MODEL_g74 0x4F -#define MODEL_o223 0x4E -#define MODEL_o222 0x4D -#define MODEL_o221 0x4C -#define MODEL_o220 0x4B -#define MODEL_g75 0x4A -#define MODEL_o227 0x49 -#define MODEL_o226 0x48 -#define MODEL_o225 0x47 -#define MODEL_o224 0x46 -#define MODEL_g81 0x45 -#define MODEL_o310 0x44 -#define MODEL_o308 0x43 -#define MODEL_o247 0x42 -#define MODEL_o246 0x41 -#define MODEL_g76 0x40 -#define MODEL_o231 0x3F -#define MODEL_o230 0x3E -#define MODEL_o229 0x3D -#define MODEL_o228 0x3C -#define MODEL_g77 0x3B -#define MODEL_o304 0x3A -#define MODEL_o235 0x39 -#define MODEL_o233 0x38 -#define MODEL_o232 0x37 -#define MODEL_g78 0x36 -#define MODEL_o306 0x35 -#define MODEL_o239 0x34 -#define MODEL_o237 0x33 -#define MODEL_o236 0x32 -#define MODEL_g127 0x31 -#define MODEL_o434 0x30 -#define MODEL_o436 0x2F -#define MODEL_o435 0x2E -#define MODEL_o426 0x2D -#define MODEL_yuka 0x2C -#define MODEL_kaidan5 0x2B -#define MODEL_k5_zyu 0x2A -#define MODEL_k5_isi 0x29 -#define MODEL_kaidan4 0x28 -#define MODEL_k4_zyu 0x27 -#define MODEL_k4_isi 0x26 -#define MODEL_kaidan3 0x25 -#define MODEL_k3_zyu 0x24 -#define MODEL_k3_isi 0x23 -#define MODEL_kaidan2 0x22 -#define MODEL_o418 0x21 -#define MODEL_k2_zyu 0x20 -#define MODEL_k2_isi 0x1F -#define MODEL_o480 0x1E -#define MODEL_o372 0x1D -#define MODEL_k1_zyu 0x1C -#define MODEL_k1_isi 0x1B -#define MODEL_isi 0x1A -#define MODEL_zyu 0x19 -#define MODEL_o474 0x18 -#define MODEL_exit 0x17 -#define MODEL_o466 0x16 -#define MODEL_doa_e2 0x15 -#define MODEL_o455 0x14 -#define MODEL_doa_e1 0x13 -#define MODEL_o454 0x12 -#define MODEL_doa_w2 0x11 -#define MODEL_o11 0x10 -#define MODEL_doa_w1 0xF -#define MODEL_o9 0xE -#define MODEL_exite 0xD -#define MODEL_ee_hasi_s 0xC -#define MODEL_ee_hasi 0xB -#define MODEL_ee_oku 0xA -#define MODEL_ee_hisi 0x9 -#define MODEL_ee_yuka 0x8 -#define MODEL_exitw 0x7 -#define MODEL_o425 0x6 -#define MODEL_ew_hasi_s 0x5 -#define MODEL_ew_hasira1 0x4 -#define MODEL_ew_oku 0x3 -#define MODEL_ew_hisi 0x2 -#define MODEL_ew_sai 0x1 -#define MODEL_ew_yuka 0x0 +#define MODEL_Root 0xB5 +#define MODEL_g128 0xB4 +#define MODEL_o464 0xB3 +#define MODEL_o463 0xB2 +#define MODEL_saku 0xB1 +#define MODEL_o323 0xB0 +#define MODEL_o354 0xAF +#define MODEL_o413 0xAE +#define MODEL_akari 0xAD +#define MODEL_o503 0xAC +#define MODEL_o502 0xAB +#define MODEL_o501 0xAA +#define MODEL_o500 0xA9 +#define MODEL_hi3 0xA8 +#define MODEL_hi2 0xA7 +#define MODEL_hi1 0xA6 +#define MODEL_tetuwa 0xA5 +#define MODEL_g90 0xA4 +#define MODEL_g113 0xA3 +#define MODEL_o412 0xA2 +#define MODEL_g108 0xA1 +#define MODEL_o409 0xA0 +#define MODEL_o408 0x9F +#define MODEL_o407 0x9E +#define MODEL_o406 0x9D +#define MODEL_g107 0x9C +#define MODEL_o405 0x9B +#define MODEL_o404 0x9A +#define MODEL_o403 0x99 +#define MODEL_o402 0x98 +#define MODEL_g106 0x97 +#define MODEL_o401 0x96 +#define MODEL_o400 0x95 +#define MODEL_o399 0x94 +#define MODEL_o398 0x93 +#define MODEL_g105 0x92 +#define MODEL_o397 0x91 +#define MODEL_o396 0x90 +#define MODEL_o395 0x8F +#define MODEL_o394 0x8E +#define MODEL_g104 0x8D +#define MODEL_o393 0x8C +#define MODEL_o392 0x8B +#define MODEL_o391 0x8A +#define MODEL_o390 0x89 +#define MODEL_g103 0x88 +#define MODEL_o389 0x87 +#define MODEL_o388 0x86 +#define MODEL_o387 0x85 +#define MODEL_o386 0x84 +#define MODEL_g101 0x83 +#define MODEL_o382 0x82 +#define MODEL_o381 0x81 +#define MODEL_o380 0x80 +#define MODEL_o379 0x7F +#define MODEL_g93 0x7E +#define MODEL_o483 0x7D +#define MODEL_o482 0x7C +#define MODEL_o481 0x7B +#define MODEL_o478 0x7A +#define MODEL_o477 0x79 +#define MODEL_o476 0x78 +#define MODEL_g130 0x77 +#define MODEL_o492 0x76 +#define MODEL_o491 0x75 +#define MODEL_o490 0x74 +#define MODEL_o489 0x73 +#define MODEL_o488 0x72 +#define MODEL_o487 0x71 +#define MODEL_o486 0x70 +#define MODEL_o485 0x6F +#define MODEL_o484 0x6E +#define MODEL_o495 0x6D +#define MODEL_o494 0x6C +#define MODEL_o493 0x6B +#define MODEL_g91 0x6A +#define MODEL_o316 0x69 +#define MODEL_o291 0x68 +#define MODEL_o289 0x67 +#define MODEL_o288 0x66 +#define MODEL_g85 0x65 +#define MODEL_o432 0x64 +#define MODEL_o318 0x63 +#define MODEL_o265 0x62 +#define MODEL_o264 0x61 +#define MODEL_g84 0x60 +#define MODEL_ami 0x5F +#define MODEL_o320 0x5E +#define MODEL_o260 0x5D +#define MODEL_g83 0x5C +#define MODEL_o331 0x5B +#define MODEL_o329 0x5A +#define MODEL_o257 0x59 +#define MODEL_o256 0x58 +#define MODEL_g80 0x57 +#define MODEL_o333 0x56 +#define MODEL_o244 0x55 +#define MODEL_o243 0x54 +#define MODEL_g110 0x53 +#define MODEL_o416 0x52 +#define MODEL_o415 0x51 +#define MODEL_o414 0x50 +#define MODEL_g74 0x4F +#define MODEL_o223 0x4E +#define MODEL_o222 0x4D +#define MODEL_o221 0x4C +#define MODEL_o220 0x4B +#define MODEL_g75 0x4A +#define MODEL_o227 0x49 +#define MODEL_o226 0x48 +#define MODEL_o225 0x47 +#define MODEL_o224 0x46 +#define MODEL_g81 0x45 +#define MODEL_o310 0x44 +#define MODEL_o308 0x43 +#define MODEL_o247 0x42 +#define MODEL_o246 0x41 +#define MODEL_g76 0x40 +#define MODEL_o231 0x3F +#define MODEL_o230 0x3E +#define MODEL_o229 0x3D +#define MODEL_o228 0x3C +#define MODEL_g77 0x3B +#define MODEL_o304 0x3A +#define MODEL_o235 0x39 +#define MODEL_o233 0x38 +#define MODEL_o232 0x37 +#define MODEL_g78 0x36 +#define MODEL_o306 0x35 +#define MODEL_o239 0x34 +#define MODEL_o237 0x33 +#define MODEL_o236 0x32 +#define MODEL_g127 0x31 +#define MODEL_o434 0x30 +#define MODEL_o436 0x2F +#define MODEL_o435 0x2E +#define MODEL_o426 0x2D +#define MODEL_yuka 0x2C +#define MODEL_kaidan5 0x2B +#define MODEL_k5_zyu 0x2A +#define MODEL_k5_isi 0x29 +#define MODEL_kaidan4 0x28 +#define MODEL_k4_zyu 0x27 +#define MODEL_k4_isi 0x26 +#define MODEL_kaidan3 0x25 +#define MODEL_k3_zyu 0x24 +#define MODEL_k3_isi 0x23 +#define MODEL_kaidan2 0x22 +#define MODEL_o418 0x21 +#define MODEL_k2_zyu 0x20 +#define MODEL_k2_isi 0x1F +#define MODEL_o480 0x1E +#define MODEL_o372 0x1D +#define MODEL_k1_zyu 0x1C +#define MODEL_k1_isi 0x1B +#define MODEL_isi 0x1A +#define MODEL_zyu 0x19 +#define MODEL_o474 0x18 +#define MODEL_exit 0x17 +#define MODEL_o466 0x16 +#define MODEL_doa_e2 0x15 +#define MODEL_o455 0x14 +#define MODEL_doa_e1 0x13 +#define MODEL_o454 0x12 +#define MODEL_doa_w2 0x11 +#define MODEL_o11 0x10 +#define MODEL_doa_w1 0xF +#define MODEL_o9 0xE +#define MODEL_exite 0xD +#define MODEL_ee_hasi_s 0xC +#define MODEL_ee_hasi 0xB +#define MODEL_ee_oku 0xA +#define MODEL_ee_hisi 0x9 +#define MODEL_ee_yuka 0x8 +#define MODEL_exitw 0x7 +#define MODEL_o425 0x6 +#define MODEL_ew_hasi_s 0x5 +#define MODEL_ew_hasira1 0x4 +#define MODEL_ew_oku 0x3 +#define MODEL_ew_hisi 0x2 +#define MODEL_ew_sai 0x1 +#define MODEL_ew_yuka 0x0 + diff --git a/include/mapfs/kpa_133_hit.h b/include/mapfs/kpa_133_hit.h index f8c9cac3c9..ea34fb777e 100644 --- a/include/mapfs/kpa_133_hit.h +++ b/include/mapfs/kpa_133_hit.h @@ -1,47 +1,54 @@ -#define COLLIDER_Root 0x2E -#define COLLIDER_g132 0x2D -#define COLLIDER_o451 0x2C -#define COLLIDER_sikake 0x2B -#define COLLIDER_jdai 0x2A -#define COLLIDER_123 0x29 -#define COLLIDER_s_suimen 0x28 -#define COLLIDER_o405 0x27 -#define COLLIDER_o358 0x26 -#define COLLIDER_exit 0x25 -#define COLLIDER_anae 0x24 -#define COLLIDER_ttae 0x23 -#define COLLIDER_nae 0x22 -#define COLLIDER_deiliae 0x21 -#define COLLIDER_deilitae 0x20 -#define COLLIDER_exite 0x1F -#define COLLIDER_tte 0x1E -#define COLLIDER_ne 0x1D -#define COLLIDER_deilie2 0x1C -#define COLLIDER_deilie 0x1B -#define COLLIDER_deilite 0x1A -#define COLLIDER_exitw 0x19 -#define COLLIDER_ttw 0x18 -#define COLLIDER_nw 0x17 -#define COLLIDER_deiliw 0x16 -#define COLLIDER_deilitw 0x15 -#define COLLIDER_noriba3 0x14 -#define COLLIDER_ttn3 0x13 -#define COLLIDER_o440 0x12 -#define COLLIDER_o439 0x11 -#define COLLIDER_noriba2 0x10 -#define COLLIDER_ttn2 0xF -#define COLLIDER_o418 0xE -#define COLLIDER_o417 0xD -#define COLLIDER_noriba1 0xC -#define COLLIDER_ttn1 0xB -#define COLLIDER_o414 0xA -#define COLLIDER_o413 0x9 -#define COLLIDER_g123 0x8 -#define COLLIDER_hasira 0x7 -#define COLLIDER_s_yuka 0x6 -#define COLLIDER_s_kabe 0x5 -#define COLLIDER_kabe_2 0x4 -#define COLLIDER_sita 0x3 -#define COLLIDER_oku 0x2 -#define COLLIDER_migi 0x1 -#define COLLIDER_hidari 0x0 +#define COLLIDER_Root 0x2E +#define COLLIDER_g132 0x2D +#define COLLIDER_o451 0x2C +#define COLLIDER_sikake 0x2B +#define COLLIDER_jdai 0x2A +#define COLLIDER_123 0x29 +#define COLLIDER_s_suimen 0x28 +#define COLLIDER_o405 0x27 +#define COLLIDER_o358 0x26 +#define COLLIDER_exit 0x25 +#define COLLIDER_anae 0x24 +#define COLLIDER_ttae 0x23 +#define COLLIDER_nae 0x22 +#define COLLIDER_deiliae 0x21 +#define COLLIDER_deilitae 0x20 +#define COLLIDER_exite 0x1F +#define COLLIDER_tte 0x1E +#define COLLIDER_ne 0x1D +#define COLLIDER_deilie2 0x1C +#define COLLIDER_deilie 0x1B +#define COLLIDER_deilite 0x1A +#define COLLIDER_exitw 0x19 +#define COLLIDER_ttw 0x18 +#define COLLIDER_nw 0x17 +#define COLLIDER_deiliw 0x16 +#define COLLIDER_deilitw 0x15 +#define COLLIDER_noriba3 0x14 +#define COLLIDER_ttn3 0x13 +#define COLLIDER_o440 0x12 +#define COLLIDER_o439 0x11 +#define COLLIDER_noriba2 0x10 +#define COLLIDER_ttn2 0xF +#define COLLIDER_o418 0xE +#define COLLIDER_o417 0xD +#define COLLIDER_noriba1 0xC +#define COLLIDER_ttn1 0xB +#define COLLIDER_o414 0xA +#define COLLIDER_o413 0x9 +#define COLLIDER_g123 0x8 +#define COLLIDER_hasira 0x7 +#define COLLIDER_s_yuka 0x6 +#define COLLIDER_s_kabe 0x5 +#define COLLIDER_kabe_2 0x4 +#define COLLIDER_sita 0x3 +#define COLLIDER_oku 0x2 +#define COLLIDER_migi 0x1 +#define COLLIDER_hidari 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g32 0x3 +#define ZONE_3 0x2 +#define ZONE_2 0x1 +#define ZONE_1 0x0 + diff --git a/include/mapfs/kpa_133_shape.h b/include/mapfs/kpa_133_shape.h index 0c6f46acb8..3b25479d7f 100644 --- a/include/mapfs/kpa_133_shape.h +++ b/include/mapfs/kpa_133_shape.h @@ -1,73 +1,74 @@ -#define MODEL_Root 0x48 -#define MODEL_sikake 0x47 -#define MODEL_g120 0x46 -#define MODEL_kakusitobira 0x45 -#define MODEL_o407 0x44 -#define MODEL_suimen 0x43 -#define MODEL_nami2 0x42 -#define MODEL_sui 0x41 -#define MODEL_nami1 0x40 -#define MODEL_s_sui 0x3F -#define MODEL_sui1 0x3E -#define MODEL_move 0x3D -#define MODEL_o358 0x3C -#define MODEL_ana 0x3B -#define MODEL_o476 0x3A -#define MODEL_o235 0x39 -#define MODEL_o477 0x38 -#define MODEL_exite 0x37 -#define MODEL_o216 0x36 -#define MODEL_o215 0x35 -#define MODEL_exitw 0x34 -#define MODEL_g162 0x33 -#define MODEL_o486 0x32 -#define MODEL_g161 0x31 -#define MODEL_o485 0x30 -#define MODEL_o432 0x2F -#define MODEL_o431 0x2E -#define MODEL_o430 0x2D -#define MODEL_s_hasira 0x2C -#define MODEL_o474 0x2B -#define MODEL_g156 0x2A -#define MODEL_o469 0x29 -#define MODEL_o467 0x28 -#define MODEL_g152 0x27 -#define MODEL_o460 0x26 -#define MODEL_o459 0x25 -#define MODEL_g151 0x24 -#define MODEL_o458 0x23 -#define MODEL_o457 0x22 -#define MODEL_g148 0x21 -#define MODEL_o454 0x20 -#define MODEL_o453 0x1F -#define MODEL_g147 0x1E -#define MODEL_o452 0x1D -#define MODEL_o451 0x1C -#define MODEL_g145 0x1B -#define MODEL_o446 0x1A -#define MODEL_o445 0x19 -#define MODEL_g144 0x18 -#define MODEL_o444 0x17 -#define MODEL_o443 0x16 -#define MODEL_o473 0x15 -#define MODEL_o448 0x14 -#define MODEL_o447 0x13 -#define MODEL_sita 0x12 -#define MODEL_o491 0x11 -#define MODEL_o475 0x10 -#define MODEL_noriba3 0xF -#define MODEL_noriba2 0xE -#define MODEL_noriba 0xD -#define MODEL_s_saku2 0xC -#define MODEL_s_saku 0xB -#define MODEL_g33 0xA -#define MODEL_o253 0x9 -#define MODEL_o252 0x8 -#define MODEL_haisui2 0x7 -#define MODEL_waku 0x6 -#define MODEL_saku2 0x5 -#define MODEL_saku 0x4 -#define MODEL_s_yuka 0x3 -#define MODEL_s_kabe 0x2 -#define MODEL_u_kabe 0x1 -#define MODEL_u_kabe2 0x0 +#define MODEL_Root 0x48 +#define MODEL_sikake 0x47 +#define MODEL_g120 0x46 +#define MODEL_kakusitobira 0x45 +#define MODEL_o407 0x44 +#define MODEL_suimen 0x43 +#define MODEL_nami2 0x42 +#define MODEL_sui 0x41 +#define MODEL_nami1 0x40 +#define MODEL_s_sui 0x3F +#define MODEL_sui1 0x3E +#define MODEL_move 0x3D +#define MODEL_o358 0x3C +#define MODEL_ana 0x3B +#define MODEL_o476 0x3A +#define MODEL_o235 0x39 +#define MODEL_o477 0x38 +#define MODEL_exite 0x37 +#define MODEL_o216 0x36 +#define MODEL_o215 0x35 +#define MODEL_exitw 0x34 +#define MODEL_g162 0x33 +#define MODEL_o486 0x32 +#define MODEL_g161 0x31 +#define MODEL_o485 0x30 +#define MODEL_o432 0x2F +#define MODEL_o431 0x2E +#define MODEL_o430 0x2D +#define MODEL_s_hasira 0x2C +#define MODEL_o474 0x2B +#define MODEL_g156 0x2A +#define MODEL_o469 0x29 +#define MODEL_o467 0x28 +#define MODEL_g152 0x27 +#define MODEL_o460 0x26 +#define MODEL_o459 0x25 +#define MODEL_g151 0x24 +#define MODEL_o458 0x23 +#define MODEL_o457 0x22 +#define MODEL_g148 0x21 +#define MODEL_o454 0x20 +#define MODEL_o453 0x1F +#define MODEL_g147 0x1E +#define MODEL_o452 0x1D +#define MODEL_o451 0x1C +#define MODEL_g145 0x1B +#define MODEL_o446 0x1A +#define MODEL_o445 0x19 +#define MODEL_g144 0x18 +#define MODEL_o444 0x17 +#define MODEL_o443 0x16 +#define MODEL_o473 0x15 +#define MODEL_o448 0x14 +#define MODEL_o447 0x13 +#define MODEL_sita 0x12 +#define MODEL_o491 0x11 +#define MODEL_o475 0x10 +#define MODEL_noriba3 0xF +#define MODEL_noriba2 0xE +#define MODEL_noriba 0xD +#define MODEL_s_saku2 0xC +#define MODEL_s_saku 0xB +#define MODEL_g33 0xA +#define MODEL_o253 0x9 +#define MODEL_o252 0x8 +#define MODEL_haisui2 0x7 +#define MODEL_waku 0x6 +#define MODEL_saku2 0x5 +#define MODEL_saku 0x4 +#define MODEL_s_yuka 0x3 +#define MODEL_s_kabe 0x2 +#define MODEL_u_kabe 0x1 +#define MODEL_u_kabe2 0x0 + diff --git a/include/mapfs/kpa_134_hit.h b/include/mapfs/kpa_134_hit.h index 8a75676232..8c2131478f 100644 --- a/include/mapfs/kpa_134_hit.h +++ b/include/mapfs/kpa_134_hit.h @@ -1,58 +1,65 @@ -#define COLLIDER_Root 0x39 -#define COLLIDER_g120 0x38 -#define COLLIDER_mae 0x37 -#define COLLIDER_migi 0x36 -#define COLLIDER_oku 0x35 -#define COLLIDER_hidari 0x34 -#define COLLIDER_g119 0x33 -#define COLLIDER_o411 0x32 -#define COLLIDER_s_suimen 0x31 -#define COLLIDER_o358 0x30 -#define COLLIDER_g98 0x2F -#define COLLIDER_anaw 0x2E -#define COLLIDER_naw 0x2D -#define COLLIDER_ttaw 0x2C -#define COLLIDER_deiliaw 0x2B -#define COLLIDER_deilitaw 0x2A -#define COLLIDER_noriba 0x29 -#define COLLIDER_ttno 0x28 -#define COLLIDER_nno 0x27 -#define COLLIDER_deilino 0x26 -#define COLLIDER_exite 0x25 -#define COLLIDER_ne 0x24 -#define COLLIDER_tte 0x23 -#define COLLIDER_deilie 0x22 -#define COLLIDER_deilite 0x21 -#define COLLIDER_exitw 0x20 -#define COLLIDER_ttw 0x1F -#define COLLIDER_nw 0x1E -#define COLLIDER_deiliw2 0x1D -#define COLLIDER_deiliw 0x1C -#define COLLIDER_deilitw 0x1B -#define COLLIDER_g117 0x1A -#define COLLIDER_sikake 0x19 -#define COLLIDER_g114 0x18 -#define COLLIDER_o384 0x17 -#define COLLIDER_g112 0x16 -#define COLLIDER_o383 0x15 -#define COLLIDER_g107 0x14 -#define COLLIDER_o378 0x13 -#define COLLIDER_g101 0x12 -#define COLLIDER_o372 0x11 -#define COLLIDER_kakusi 0x10 -#define COLLIDER_o369 0xF -#define COLLIDER_o368 0xE -#define COLLIDER_k_yuka 0xD -#define COLLIDER_k_kabe1 0xC -#define COLLIDER_u_hasira 0xB -#define COLLIDER_o403 0xA -#define COLLIDER_o402 0x9 -#define COLLIDER_o400 0x8 -#define COLLIDER_o401 0x7 -#define COLLIDER_o309 0x6 -#define COLLIDER_o304 0x5 -#define COLLIDER_o298 0x4 -#define COLLIDER_u_yuka 0x3 -#define COLLIDER_s_saku 0x2 -#define COLLIDER_o397 0x1 -#define COLLIDER_ue 0x0 +#define COLLIDER_Root 0x39 +#define COLLIDER_g120 0x38 +#define COLLIDER_mae 0x37 +#define COLLIDER_migi 0x36 +#define COLLIDER_oku 0x35 +#define COLLIDER_hidari 0x34 +#define COLLIDER_g119 0x33 +#define COLLIDER_o411 0x32 +#define COLLIDER_s_suimen 0x31 +#define COLLIDER_o358 0x30 +#define COLLIDER_g98 0x2F +#define COLLIDER_anaw 0x2E +#define COLLIDER_naw 0x2D +#define COLLIDER_ttaw 0x2C +#define COLLIDER_deiliaw 0x2B +#define COLLIDER_deilitaw 0x2A +#define COLLIDER_noriba 0x29 +#define COLLIDER_ttno 0x28 +#define COLLIDER_nno 0x27 +#define COLLIDER_deilino 0x26 +#define COLLIDER_exite 0x25 +#define COLLIDER_ne 0x24 +#define COLLIDER_tte 0x23 +#define COLLIDER_deilie 0x22 +#define COLLIDER_deilite 0x21 +#define COLLIDER_exitw 0x20 +#define COLLIDER_ttw 0x1F +#define COLLIDER_nw 0x1E +#define COLLIDER_deiliw2 0x1D +#define COLLIDER_deiliw 0x1C +#define COLLIDER_deilitw 0x1B +#define COLLIDER_g117 0x1A +#define COLLIDER_sikake 0x19 +#define COLLIDER_g114 0x18 +#define COLLIDER_o384 0x17 +#define COLLIDER_g112 0x16 +#define COLLIDER_o383 0x15 +#define COLLIDER_g107 0x14 +#define COLLIDER_o378 0x13 +#define COLLIDER_g101 0x12 +#define COLLIDER_o372 0x11 +#define COLLIDER_kakusi 0x10 +#define COLLIDER_o369 0xF +#define COLLIDER_o368 0xE +#define COLLIDER_k_yuka 0xD +#define COLLIDER_k_kabe1 0xC +#define COLLIDER_u_hasira 0xB +#define COLLIDER_o403 0xA +#define COLLIDER_o402 0x9 +#define COLLIDER_o400 0x8 +#define COLLIDER_o401 0x7 +#define COLLIDER_o309 0x6 +#define COLLIDER_o304 0x5 +#define COLLIDER_o298 0x4 +#define COLLIDER_u_yuka 0x3 +#define COLLIDER_s_saku 0x2 +#define COLLIDER_o397 0x1 +#define COLLIDER_ue 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g32 0x3 +#define ZONE_3 0x2 +#define ZONE_2 0x1 +#define ZONE_1 0x0 + diff --git a/include/mapfs/kpa_134_shape.h b/include/mapfs/kpa_134_shape.h index adb30488d5..c44055b81f 100644 --- a/include/mapfs/kpa_134_shape.h +++ b/include/mapfs/kpa_134_shape.h @@ -1,120 +1,121 @@ -#define MODEL_Root 0x77 -#define MODEL_g167 0x76 -#define MODEL_o505 0x75 -#define MODEL_g114 0x74 -#define MODEL_o387 0x73 -#define MODEL_hamon 0x72 -#define MODEL_o389 0x71 -#define MODEL_m_hasi 0x70 -#define MODEL_o388 0x6F -#define MODEL_suimen 0x6E -#define MODEL_nami2 0x6D -#define MODEL_o385 0x6C -#define MODEL_nami1 0x6B -#define MODEL_s_sui 0x6A -#define MODEL_sui1 0x69 -#define MODEL_move 0x68 -#define MODEL_o358 0x67 -#define MODEL_exite 0x66 -#define MODEL_g129 0x65 -#define MODEL_o409 0x64 -#define MODEL_g128 0x63 -#define MODEL_o408 0x62 -#define MODEL_o213 0x61 -#define MODEL_o212 0x60 -#define MODEL_exitw 0x5F -#define MODEL_o404 0x5E -#define MODEL_o403 0x5D -#define MODEL_ana 0x5C -#define MODEL_o502 0x5B -#define MODEL_o400 0x5A -#define MODEL_o503 0x59 -#define MODEL_kakusi 0x58 -#define MODEL_o368 0x57 -#define MODEL_o369 0x56 -#define MODEL_k_yuka 0x55 -#define MODEL_k_kabe1 0x54 -#define MODEL_sikake 0x53 -#define MODEL_g111 0x52 -#define MODEL_o384 0x51 -#define MODEL_g110 0x50 -#define MODEL_o383 0x4F -#define MODEL_g109 0x4E -#define MODEL_o378 0x4D -#define MODEL_g108 0x4C -#define MODEL_o379 0x4B -#define MODEL_g107 0x4A -#define MODEL_o380 0x49 -#define MODEL_g106 0x48 -#define MODEL_o381 0x47 -#define MODEL_g105 0x46 -#define MODEL_o382 0x45 -#define MODEL_g104 0x44 -#define MODEL_o377 0x43 -#define MODEL_g103 0x42 -#define MODEL_o376 0x41 -#define MODEL_g102 0x40 -#define MODEL_o375 0x3F -#define MODEL_g101 0x3E -#define MODEL_o374 0x3D -#define MODEL_g100 0x3C -#define MODEL_o373 0x3B -#define MODEL_g99 0x3A -#define MODEL_o372 0x39 -#define MODEL_g98 0x38 -#define MODEL_o371 0x37 -#define MODEL_hasira 0x36 -#define MODEL_g166 0x35 -#define MODEL_o498 0x34 -#define MODEL_o497 0x33 -#define MODEL_g165 0x32 -#define MODEL_o496 0x31 -#define MODEL_o495 0x30 -#define MODEL_g163 0x2F -#define MODEL_o492 0x2E -#define MODEL_o491 0x2D -#define MODEL_g162 0x2C -#define MODEL_o490 0x2B -#define MODEL_o489 0x2A -#define MODEL_g161 0x29 -#define MODEL_o488 0x28 -#define MODEL_o487 0x27 -#define MODEL_g160 0x26 -#define MODEL_o486 0x25 -#define MODEL_o485 0x24 -#define MODEL_o478 0x23 -#define MODEL_o477 0x22 -#define MODEL_o476 0x21 -#define MODEL_o475 0x20 -#define MODEL_g156 0x1F -#define MODEL_o473 0x1E -#define MODEL_o472 0x1D -#define MODEL_g155 0x1C -#define MODEL_o471 0x1B -#define MODEL_o470 0x1A -#define MODEL_g159 0x19 -#define MODEL_o484 0x18 -#define MODEL_o483 0x17 -#define MODEL_g158 0x16 -#define MODEL_o482 0x15 -#define MODEL_o481 0x14 -#define MODEL_g157 0x13 -#define MODEL_o480 0x12 -#define MODEL_o479 0x11 -#define MODEL_ue 0x10 -#define MODEL_o508 0xF -#define MODEL_s_saku2 0xE -#define MODEL_o501 0xD -#define MODEL_g154 0xC -#define MODEL_o469 0xB -#define MODEL_o468 0xA -#define MODEL_o467 0x9 -#define MODEL_o466 0x8 -#define MODEL_o465 0x7 -#define MODEL_o464 0x6 -#define MODEL_s_saku 0x5 -#define MODEL_noriba 0x4 -#define MODEL_u_yuka 0x3 -#define MODEL_o414 0x2 -#define MODEL_u_kabe2 0x1 -#define MODEL_u_kabe 0x0 +#define MODEL_Root 0x77 +#define MODEL_g167 0x76 +#define MODEL_o505 0x75 +#define MODEL_g114 0x74 +#define MODEL_o387 0x73 +#define MODEL_hamon 0x72 +#define MODEL_o389 0x71 +#define MODEL_m_hasi 0x70 +#define MODEL_o388 0x6F +#define MODEL_suimen 0x6E +#define MODEL_nami2 0x6D +#define MODEL_o385 0x6C +#define MODEL_nami1 0x6B +#define MODEL_s_sui 0x6A +#define MODEL_sui1 0x69 +#define MODEL_move 0x68 +#define MODEL_o358 0x67 +#define MODEL_exite 0x66 +#define MODEL_g129 0x65 +#define MODEL_o409 0x64 +#define MODEL_g128 0x63 +#define MODEL_o408 0x62 +#define MODEL_o213 0x61 +#define MODEL_o212 0x60 +#define MODEL_exitw 0x5F +#define MODEL_o404 0x5E +#define MODEL_o403 0x5D +#define MODEL_ana 0x5C +#define MODEL_o502 0x5B +#define MODEL_o400 0x5A +#define MODEL_o503 0x59 +#define MODEL_kakusi 0x58 +#define MODEL_o368 0x57 +#define MODEL_o369 0x56 +#define MODEL_k_yuka 0x55 +#define MODEL_k_kabe1 0x54 +#define MODEL_sikake 0x53 +#define MODEL_g111 0x52 +#define MODEL_o384 0x51 +#define MODEL_g110 0x50 +#define MODEL_o383 0x4F +#define MODEL_g109 0x4E +#define MODEL_o378 0x4D +#define MODEL_g108 0x4C +#define MODEL_o379 0x4B +#define MODEL_g107 0x4A +#define MODEL_o380 0x49 +#define MODEL_g106 0x48 +#define MODEL_o381 0x47 +#define MODEL_g105 0x46 +#define MODEL_o382 0x45 +#define MODEL_g104 0x44 +#define MODEL_o377 0x43 +#define MODEL_g103 0x42 +#define MODEL_o376 0x41 +#define MODEL_g102 0x40 +#define MODEL_o375 0x3F +#define MODEL_g101 0x3E +#define MODEL_o374 0x3D +#define MODEL_g100 0x3C +#define MODEL_o373 0x3B +#define MODEL_g99 0x3A +#define MODEL_o372 0x39 +#define MODEL_g98 0x38 +#define MODEL_o371 0x37 +#define MODEL_hasira 0x36 +#define MODEL_g166 0x35 +#define MODEL_o498 0x34 +#define MODEL_o497 0x33 +#define MODEL_g165 0x32 +#define MODEL_o496 0x31 +#define MODEL_o495 0x30 +#define MODEL_g163 0x2F +#define MODEL_o492 0x2E +#define MODEL_o491 0x2D +#define MODEL_g162 0x2C +#define MODEL_o490 0x2B +#define MODEL_o489 0x2A +#define MODEL_g161 0x29 +#define MODEL_o488 0x28 +#define MODEL_o487 0x27 +#define MODEL_g160 0x26 +#define MODEL_o486 0x25 +#define MODEL_o485 0x24 +#define MODEL_o478 0x23 +#define MODEL_o477 0x22 +#define MODEL_o476 0x21 +#define MODEL_o475 0x20 +#define MODEL_g156 0x1F +#define MODEL_o473 0x1E +#define MODEL_o472 0x1D +#define MODEL_g155 0x1C +#define MODEL_o471 0x1B +#define MODEL_o470 0x1A +#define MODEL_g159 0x19 +#define MODEL_o484 0x18 +#define MODEL_o483 0x17 +#define MODEL_g158 0x16 +#define MODEL_o482 0x15 +#define MODEL_o481 0x14 +#define MODEL_g157 0x13 +#define MODEL_o480 0x12 +#define MODEL_o479 0x11 +#define MODEL_ue 0x10 +#define MODEL_o508 0xF +#define MODEL_s_saku2 0xE +#define MODEL_o501 0xD +#define MODEL_g154 0xC +#define MODEL_o469 0xB +#define MODEL_o468 0xA +#define MODEL_o467 0x9 +#define MODEL_o466 0x8 +#define MODEL_o465 0x7 +#define MODEL_o464 0x6 +#define MODEL_s_saku 0x5 +#define MODEL_noriba 0x4 +#define MODEL_u_yuka 0x3 +#define MODEL_o414 0x2 +#define MODEL_u_kabe2 0x1 +#define MODEL_u_kabe 0x0 + diff --git a/include/mapfs/kpa_13_hit.h b/include/mapfs/kpa_13_hit.h index 06a237b4e4..169445d0e5 100644 --- a/include/mapfs/kpa_13_hit.h +++ b/include/mapfs/kpa_13_hit.h @@ -1,95 +1,117 @@ -#define COLLIDER_Root 0x5E -#define COLLIDER_g1 0x5D -#define COLLIDER_g186 0x5C -#define COLLIDER_o1075 0x5B -#define COLLIDER_o1074 0x5A -#define COLLIDER_g176 0x59 -#define COLLIDER_o1027 0x58 -#define COLLIDER_deilitn 0x57 -#define COLLIDER_deilin 0x56 -#define COLLIDER_o1024 0x55 -#define COLLIDER_deilite 0x54 -#define COLLIDER_deilie 0x53 -#define COLLIDER_o1021 0x52 -#define COLLIDER_deilitw 0x51 -#define COLLIDER_deiliw 0x50 -#define COLLIDER_g175 0x4F -#define COLLIDER_o1018 0x4E -#define COLLIDER_o1017 0x4D -#define COLLIDER_o1016 0x4C -#define COLLIDER_o1015 0x4B -#define COLLIDER_o1011 0x4A -#define COLLIDER_o1010 0x49 -#define COLLIDER_o1009 0x48 -#define COLLIDER_o1008 0x47 -#define COLLIDER_o1007 0x46 -#define COLLIDER_o1006 0x45 -#define COLLIDER_o1005 0x44 -#define COLLIDER_o1004 0x43 -#define COLLIDER_o1003 0x42 -#define COLLIDER_o1002 0x41 -#define COLLIDER_o1001 0x40 -#define COLLIDER_o998 0x3F -#define COLLIDER_o997 0x3E -#define COLLIDER_o996 0x3D -#define COLLIDER_o995 0x3C -#define COLLIDER_o994 0x3B -#define COLLIDER_o993 0x3A -#define COLLIDER_o992 0x39 -#define COLLIDER_o991 0x38 -#define COLLIDER_o990 0x37 -#define COLLIDER_o989 0x36 -#define COLLIDER_o988 0x35 -#define COLLIDER_o987 0x34 -#define COLLIDER_o986 0x33 -#define COLLIDER_o985 0x32 -#define COLLIDER_o984 0x31 -#define COLLIDER_o983 0x30 -#define COLLIDER_o982 0x2F -#define COLLIDER_o981 0x2E -#define COLLIDER_o980 0x2D -#define COLLIDER_o979 0x2C -#define COLLIDER_o976 0x2B -#define COLLIDER_o975 0x2A -#define COLLIDER_o974 0x29 -#define COLLIDER_o973 0x28 -#define COLLIDER_o970 0x27 -#define COLLIDER_o969 0x26 -#define COLLIDER_g177 0x25 -#define COLLIDER_dai06 0x24 -#define COLLIDER_o1072 0x23 -#define COLLIDER_dai05 0x22 -#define COLLIDER_o1070 0x21 -#define COLLIDER_dai04 0x20 -#define COLLIDER_o1068 0x1F -#define COLLIDER_dai03 0x1E -#define COLLIDER_o1066 0x1D -#define COLLIDER_dai02 0x1C -#define COLLIDER_o1064 0x1B -#define COLLIDER_dai01 0x1A -#define COLLIDER_o1062 0x19 -#define COLLIDER_g178 0x18 -#define COLLIDER_o1061 0x17 -#define COLLIDER_o1060 0x16 -#define COLLIDER_o1051 0x15 -#define COLLIDER_o1050 0x14 -#define COLLIDER_o1048 0x13 -#define COLLIDER_o1047 0x12 -#define COLLIDER_o1043 0x11 -#define COLLIDER_o1042 0x10 -#define COLLIDER_o1041 0xF -#define COLLIDER_o1040 0xE -#define COLLIDER_g153 0xD -#define COLLIDER_o1039 0xC -#define COLLIDER_o1038 0xB -#define COLLIDER_o1037 0xA -#define COLLIDER_o1036 0x9 -#define COLLIDER_o1035 0x8 -#define COLLIDER_o1034 0x7 -#define COLLIDER_o1033 0x6 -#define COLLIDER_o1032 0x5 -#define COLLIDER_o1031 0x4 -#define COLLIDER_o1030 0x3 -#define COLLIDER_o1029 0x2 -#define COLLIDER_o1028 0x1 -#define COLLIDER_o805 0x0 +#define COLLIDER_Root 0x5E +#define COLLIDER_g1 0x5D +#define COLLIDER_g186 0x5C +#define COLLIDER_o1075 0x5B +#define COLLIDER_o1074 0x5A +#define COLLIDER_g176 0x59 +#define COLLIDER_o1027 0x58 +#define COLLIDER_deilitn 0x57 +#define COLLIDER_deilin 0x56 +#define COLLIDER_o1024 0x55 +#define COLLIDER_deilite 0x54 +#define COLLIDER_deilie 0x53 +#define COLLIDER_o1021 0x52 +#define COLLIDER_deilitw 0x51 +#define COLLIDER_deiliw 0x50 +#define COLLIDER_g175 0x4F +#define COLLIDER_o1018 0x4E +#define COLLIDER_o1017 0x4D +#define COLLIDER_o1016 0x4C +#define COLLIDER_o1015 0x4B +#define COLLIDER_o1011 0x4A +#define COLLIDER_o1010 0x49 +#define COLLIDER_o1009 0x48 +#define COLLIDER_o1008 0x47 +#define COLLIDER_o1007 0x46 +#define COLLIDER_o1006 0x45 +#define COLLIDER_o1005 0x44 +#define COLLIDER_o1004 0x43 +#define COLLIDER_o1003 0x42 +#define COLLIDER_o1002 0x41 +#define COLLIDER_o1001 0x40 +#define COLLIDER_o998 0x3F +#define COLLIDER_o997 0x3E +#define COLLIDER_o996 0x3D +#define COLLIDER_o995 0x3C +#define COLLIDER_o994 0x3B +#define COLLIDER_o993 0x3A +#define COLLIDER_o992 0x39 +#define COLLIDER_o991 0x38 +#define COLLIDER_o990 0x37 +#define COLLIDER_o989 0x36 +#define COLLIDER_o988 0x35 +#define COLLIDER_o987 0x34 +#define COLLIDER_o986 0x33 +#define COLLIDER_o985 0x32 +#define COLLIDER_o984 0x31 +#define COLLIDER_o983 0x30 +#define COLLIDER_o982 0x2F +#define COLLIDER_o981 0x2E +#define COLLIDER_o980 0x2D +#define COLLIDER_o979 0x2C +#define COLLIDER_o976 0x2B +#define COLLIDER_o975 0x2A +#define COLLIDER_o974 0x29 +#define COLLIDER_o973 0x28 +#define COLLIDER_o970 0x27 +#define COLLIDER_o969 0x26 +#define COLLIDER_g177 0x25 +#define COLLIDER_dai06 0x24 +#define COLLIDER_o1072 0x23 +#define COLLIDER_dai05 0x22 +#define COLLIDER_o1070 0x21 +#define COLLIDER_dai04 0x20 +#define COLLIDER_o1068 0x1F +#define COLLIDER_dai03 0x1E +#define COLLIDER_o1066 0x1D +#define COLLIDER_dai02 0x1C +#define COLLIDER_o1064 0x1B +#define COLLIDER_dai01 0x1A +#define COLLIDER_o1062 0x19 +#define COLLIDER_g178 0x18 +#define COLLIDER_o1061 0x17 +#define COLLIDER_o1060 0x16 +#define COLLIDER_o1051 0x15 +#define COLLIDER_o1050 0x14 +#define COLLIDER_o1048 0x13 +#define COLLIDER_o1047 0x12 +#define COLLIDER_o1043 0x11 +#define COLLIDER_o1042 0x10 +#define COLLIDER_o1041 0xF +#define COLLIDER_o1040 0xE +#define COLLIDER_g153 0xD +#define COLLIDER_o1039 0xC +#define COLLIDER_o1038 0xB +#define COLLIDER_o1037 0xA +#define COLLIDER_o1036 0x9 +#define COLLIDER_o1035 0x8 +#define COLLIDER_o1034 0x7 +#define COLLIDER_o1033 0x6 +#define COLLIDER_o1032 0x5 +#define COLLIDER_o1031 0x4 +#define COLLIDER_o1030 0x3 +#define COLLIDER_o1029 0x2 +#define COLLIDER_o1028 0x1 +#define COLLIDER_o805 0x0 + +#define ZONE_Root 0x13 +#define ZONE_g1 0x12 +#define ZONE_g176 0x11 +#define ZONE_deilin 0x10 +#define ZONE_deilie 0xF +#define ZONE_deiliw 0xE +#define ZONE_g150 0xD +#define ZONE_o1037 0xC +#define ZONE_o1036 0xB +#define ZONE_o1035 0xA +#define ZONE_o1034 0x9 +#define ZONE_o1033 0x8 +#define ZONE_o1032 0x7 +#define ZONE_o1031 0x6 +#define ZONE_o1030 0x5 +#define ZONE_o1029 0x4 +#define ZONE_o1028 0x3 +#define ZONE_o805 0x2 +#define ZONE_o1038 0x1 +#define ZONE_o1039 0x0 + diff --git a/include/mapfs/kpa_13_shape.h b/include/mapfs/kpa_13_shape.h index bf9fac267e..69f939501c 100644 --- a/include/mapfs/kpa_13_shape.h +++ b/include/mapfs/kpa_13_shape.h @@ -1,242 +1,243 @@ -#define MODEL_Root 0xF1 -#define MODEL_g208 0xF0 -#define MODEL_after 0xEF -#define MODEL_g235 0xEE -#define MODEL_g236 0xED -#define MODEL_o1224 0xEC -#define MODEL_o1223 0xEB -#define MODEL_o1222 0xEA -#define MODEL_o1221 0xE9 -#define MODEL_g226 0xE8 -#define MODEL_g234 0xE7 -#define MODEL_o1220 0xE6 -#define MODEL_o1219 0xE5 -#define MODEL_g233 0xE4 -#define MODEL_o1218 0xE3 -#define MODEL_o1217 0xE2 -#define MODEL_g232 0xE1 -#define MODEL_o1216 0xE0 -#define MODEL_o1215 0xDF -#define MODEL_g231 0xDE -#define MODEL_o1214 0xDD -#define MODEL_o1213 0xDC -#define MODEL_g230 0xDB -#define MODEL_o1212 0xDA -#define MODEL_o1211 0xD9 -#define MODEL_g229 0xD8 -#define MODEL_o1210 0xD7 -#define MODEL_o1209 0xD6 -#define MODEL_o1208 0xD5 -#define MODEL_o1207 0xD4 -#define MODEL_g228 0xD3 -#define MODEL_o1206 0xD2 -#define MODEL_o1205 0xD1 -#define MODEL_o1204 0xD0 -#define MODEL_o1203 0xCF -#define MODEL_o1202 0xCE -#define MODEL_o1201 0xCD -#define MODEL_o1200 0xCC -#define MODEL_o1199 0xCB -#define MODEL_g227 0xCA -#define MODEL_o1198 0xC9 -#define MODEL_o1197 0xC8 -#define MODEL_o1195 0xC7 -#define MODEL_o1194 0xC6 -#define MODEL_o1193 0xC5 -#define MODEL_o1192 0xC4 -#define MODEL_o1191 0xC3 -#define MODEL_o1190 0xC2 -#define MODEL_o1189 0xC1 -#define MODEL_o1188 0xC0 -#define MODEL_g210 0xBF -#define MODEL_o1248 0xBE -#define MODEL_g225 0xBD -#define MODEL_o1187 0xBC -#define MODEL_o1186 0xBB -#define MODEL_o1184 0xBA -#define MODEL_o1183 0xB9 -#define MODEL_o1182 0xB8 -#define MODEL_g212 0xB7 -#define MODEL_o1109 0xB6 -#define MODEL_o1108 0xB5 -#define MODEL_o1106 0xB4 -#define MODEL_o1105 0xB3 -#define MODEL_o1104 0xB2 -#define MODEL_g211 0xB1 -#define MODEL_o1103 0xB0 -#define MODEL_o1102 0xAF -#define MODEL_o1100 0xAE -#define MODEL_o1099 0xAD -#define MODEL_o1098 0xAC -#define MODEL_o1143 0xAB -#define MODEL_o1131 0xAA -#define MODEL_o1097 0xA9 -#define MODEL_o1096 0xA8 -#define MODEL_g213 0xA7 -#define MODEL_o1115 0xA6 -#define MODEL_g216 0xA5 -#define MODEL_o1180 0xA4 -#define MODEL_o1174 0xA3 -#define MODEL_o1168 0xA2 -#define MODEL_o1162 0xA1 -#define MODEL_o1150 0xA0 -#define MODEL_o1144 0x9F -#define MODEL_o1138 0x9E -#define MODEL_o1156 0x9D -#define MODEL_o1132 0x9C -#define MODEL_o1126 0x9B -#define MODEL_o1120 0x9A -#define MODEL_o1114 0x99 -#define MODEL_o1119 0x98 -#define MODEL_g247 0x97 -#define MODEL_o1178 0x96 -#define MODEL_o1136 0x95 -#define MODEL_o1172 0x94 -#define MODEL_o1166 0x93 -#define MODEL_o1160 0x92 -#define MODEL_o1154 0x91 -#define MODEL_o1148 0x90 -#define MODEL_o1142 0x8F -#define MODEL_o1130 0x8E -#define MODEL_o1124 0x8D -#define MODEL_o1118 0x8C -#define MODEL_o1112 0x8B -#define MODEL_o1177 0x8A -#define MODEL_o1135 0x89 -#define MODEL_o1171 0x88 -#define MODEL_o1165 0x87 -#define MODEL_o1159 0x86 -#define MODEL_o1147 0x85 -#define MODEL_o1153 0x84 -#define MODEL_o1141 0x83 -#define MODEL_o1129 0x82 -#define MODEL_o1123 0x81 -#define MODEL_o1117 0x80 -#define MODEL_o1111 0x7F -#define MODEL_o1110 0x7E -#define MODEL_before 0x7D -#define MODEL_g174 0x7C -#define MODEL_g175 0x7B -#define MODEL_o925 0x7A -#define MODEL_o928 0x79 -#define MODEL_o927 0x78 -#define MODEL_o926 0x77 -#define MODEL_g194 0x76 -#define MODEL_dai06 0x75 -#define MODEL_o1088 0x74 -#define MODEL_o1087 0x73 -#define MODEL_dai05 0x72 -#define MODEL_o1084 0x71 -#define MODEL_o1083 0x70 -#define MODEL_dai04 0x6F -#define MODEL_o1078 0x6E -#define MODEL_o1079 0x6D -#define MODEL_dai03 0x6C -#define MODEL_o1077 0x6B -#define MODEL_o1076 0x6A -#define MODEL_dai02 0x69 -#define MODEL_o1074 0x68 -#define MODEL_o1075 0x67 -#define MODEL_dai01 0x66 -#define MODEL_o1048 0x65 -#define MODEL_o1035 0x64 -#define MODEL_o1082 0x63 -#define MODEL_o1053 0x62 -#define MODEL_g196 0x61 -#define MODEL_o1085 0x60 -#define MODEL_o1049 0x5F -#define MODEL_o1081 0x5E -#define MODEL_o1052 0x5D -#define MODEL_o1069 0x5C -#define MODEL_o1066 0x5B -#define MODEL_o1058 0x5A -#define MODEL_o1094 0x59 -#define MODEL_g195 0x58 -#define MODEL_o1086 0x57 -#define MODEL_o1080 0x56 -#define MODEL_o1067 0x55 -#define MODEL_o1061 0x54 -#define MODEL_o1062 0x53 -#define MODEL_o1043 0x52 -#define MODEL_o1037 0x51 -#define MODEL_o1036 0x50 -#define MODEL_o1034 0x4F -#define MODEL_o1095 0x4E -#define MODEL_g176 0x4D -#define MODEL_o1249 0x4C -#define MODEL_g193 0x4B -#define MODEL_o1033 0x4A -#define MODEL_o1032 0x49 -#define MODEL_o1030 0x48 -#define MODEL_o1029 0x47 -#define MODEL_o1028 0x46 -#define MODEL_g182 0x45 -#define MODEL_o1027 0x44 -#define MODEL_o1021 0x43 -#define MODEL_o1015 0x42 -#define MODEL_o1009 0x41 -#define MODEL_o1003 0x40 -#define MODEL_o997 0x3F -#define MODEL_o985 0x3E -#define MODEL_o991 0x3D -#define MODEL_o979 0x3C -#define MODEL_o973 0x3B -#define MODEL_o967 0x3A -#define MODEL_o961 0x39 -#define MODEL_o935 0x38 -#define MODEL_g181 0x37 -#define MODEL_o959 0x36 -#define MODEL_g180 0x35 -#define MODEL_o955 0x34 -#define MODEL_o954 0x33 -#define MODEL_o952 0x32 -#define MODEL_o951 0x31 -#define MODEL_o950 0x30 -#define MODEL_g177 0x2F -#define MODEL_o937 0x2E -#define MODEL_o936 0x2D -#define MODEL_o934 0x2C -#define MODEL_o933 0x2B -#define MODEL_o932 0x2A -#define MODEL_o931 0x29 -#define MODEL_o930 0x28 -#define MODEL_g249 0x27 -#define MODEL_o960 0x26 -#define MODEL_o1026 0x25 -#define MODEL_o1020 0x24 -#define MODEL_o1014 0x23 -#define MODEL_o1008 0x22 -#define MODEL_o1002 0x21 -#define MODEL_o996 0x20 -#define MODEL_o990 0x1F -#define MODEL_o984 0x1E -#define MODEL_o978 0x1D -#define MODEL_o972 0x1C -#define MODEL_o966 0x1B -#define MODEL_o965 0x1A -#define MODEL_g248 0x19 -#define MODEL_o1024 0x18 -#define MODEL_o982 0x17 -#define MODEL_o1018 0x16 -#define MODEL_o1012 0x15 -#define MODEL_o1006 0x14 -#define MODEL_o1000 0x13 -#define MODEL_o994 0x12 -#define MODEL_o988 0x11 -#define MODEL_o976 0x10 -#define MODEL_o970 0xF -#define MODEL_o964 0xE -#define MODEL_o958 0xD -#define MODEL_o1023 0xC -#define MODEL_o981 0xB -#define MODEL_o1017 0xA -#define MODEL_o1011 0x9 -#define MODEL_o1005 0x8 -#define MODEL_o999 0x7 -#define MODEL_o993 0x6 -#define MODEL_o987 0x5 -#define MODEL_o975 0x4 -#define MODEL_o969 0x3 -#define MODEL_o963 0x2 -#define MODEL_o957 0x1 -#define MODEL_o956 0x0 +#define MODEL_Root 0xF1 +#define MODEL_g208 0xF0 +#define MODEL_after 0xEF +#define MODEL_g235 0xEE +#define MODEL_g236 0xED +#define MODEL_o1224 0xEC +#define MODEL_o1223 0xEB +#define MODEL_o1222 0xEA +#define MODEL_o1221 0xE9 +#define MODEL_g226 0xE8 +#define MODEL_g234 0xE7 +#define MODEL_o1220 0xE6 +#define MODEL_o1219 0xE5 +#define MODEL_g233 0xE4 +#define MODEL_o1218 0xE3 +#define MODEL_o1217 0xE2 +#define MODEL_g232 0xE1 +#define MODEL_o1216 0xE0 +#define MODEL_o1215 0xDF +#define MODEL_g231 0xDE +#define MODEL_o1214 0xDD +#define MODEL_o1213 0xDC +#define MODEL_g230 0xDB +#define MODEL_o1212 0xDA +#define MODEL_o1211 0xD9 +#define MODEL_g229 0xD8 +#define MODEL_o1210 0xD7 +#define MODEL_o1209 0xD6 +#define MODEL_o1208 0xD5 +#define MODEL_o1207 0xD4 +#define MODEL_g228 0xD3 +#define MODEL_o1206 0xD2 +#define MODEL_o1205 0xD1 +#define MODEL_o1204 0xD0 +#define MODEL_o1203 0xCF +#define MODEL_o1202 0xCE +#define MODEL_o1201 0xCD +#define MODEL_o1200 0xCC +#define MODEL_o1199 0xCB +#define MODEL_g227 0xCA +#define MODEL_o1198 0xC9 +#define MODEL_o1197 0xC8 +#define MODEL_o1195 0xC7 +#define MODEL_o1194 0xC6 +#define MODEL_o1193 0xC5 +#define MODEL_o1192 0xC4 +#define MODEL_o1191 0xC3 +#define MODEL_o1190 0xC2 +#define MODEL_o1189 0xC1 +#define MODEL_o1188 0xC0 +#define MODEL_g210 0xBF +#define MODEL_o1248 0xBE +#define MODEL_g225 0xBD +#define MODEL_o1187 0xBC +#define MODEL_o1186 0xBB +#define MODEL_o1184 0xBA +#define MODEL_o1183 0xB9 +#define MODEL_o1182 0xB8 +#define MODEL_g212 0xB7 +#define MODEL_o1109 0xB6 +#define MODEL_o1108 0xB5 +#define MODEL_o1106 0xB4 +#define MODEL_o1105 0xB3 +#define MODEL_o1104 0xB2 +#define MODEL_g211 0xB1 +#define MODEL_o1103 0xB0 +#define MODEL_o1102 0xAF +#define MODEL_o1100 0xAE +#define MODEL_o1099 0xAD +#define MODEL_o1098 0xAC +#define MODEL_o1143 0xAB +#define MODEL_o1131 0xAA +#define MODEL_o1097 0xA9 +#define MODEL_o1096 0xA8 +#define MODEL_g213 0xA7 +#define MODEL_o1115 0xA6 +#define MODEL_g216 0xA5 +#define MODEL_o1180 0xA4 +#define MODEL_o1174 0xA3 +#define MODEL_o1168 0xA2 +#define MODEL_o1162 0xA1 +#define MODEL_o1150 0xA0 +#define MODEL_o1144 0x9F +#define MODEL_o1138 0x9E +#define MODEL_o1156 0x9D +#define MODEL_o1132 0x9C +#define MODEL_o1126 0x9B +#define MODEL_o1120 0x9A +#define MODEL_o1114 0x99 +#define MODEL_o1119 0x98 +#define MODEL_g247 0x97 +#define MODEL_o1178 0x96 +#define MODEL_o1136 0x95 +#define MODEL_o1172 0x94 +#define MODEL_o1166 0x93 +#define MODEL_o1160 0x92 +#define MODEL_o1154 0x91 +#define MODEL_o1148 0x90 +#define MODEL_o1142 0x8F +#define MODEL_o1130 0x8E +#define MODEL_o1124 0x8D +#define MODEL_o1118 0x8C +#define MODEL_o1112 0x8B +#define MODEL_o1177 0x8A +#define MODEL_o1135 0x89 +#define MODEL_o1171 0x88 +#define MODEL_o1165 0x87 +#define MODEL_o1159 0x86 +#define MODEL_o1147 0x85 +#define MODEL_o1153 0x84 +#define MODEL_o1141 0x83 +#define MODEL_o1129 0x82 +#define MODEL_o1123 0x81 +#define MODEL_o1117 0x80 +#define MODEL_o1111 0x7F +#define MODEL_o1110 0x7E +#define MODEL_before 0x7D +#define MODEL_g174 0x7C +#define MODEL_g175 0x7B +#define MODEL_o925 0x7A +#define MODEL_o928 0x79 +#define MODEL_o927 0x78 +#define MODEL_o926 0x77 +#define MODEL_g194 0x76 +#define MODEL_dai06 0x75 +#define MODEL_o1088 0x74 +#define MODEL_o1087 0x73 +#define MODEL_dai05 0x72 +#define MODEL_o1084 0x71 +#define MODEL_o1083 0x70 +#define MODEL_dai04 0x6F +#define MODEL_o1078 0x6E +#define MODEL_o1079 0x6D +#define MODEL_dai03 0x6C +#define MODEL_o1077 0x6B +#define MODEL_o1076 0x6A +#define MODEL_dai02 0x69 +#define MODEL_o1074 0x68 +#define MODEL_o1075 0x67 +#define MODEL_dai01 0x66 +#define MODEL_o1048 0x65 +#define MODEL_o1035 0x64 +#define MODEL_o1082 0x63 +#define MODEL_o1053 0x62 +#define MODEL_g196 0x61 +#define MODEL_o1085 0x60 +#define MODEL_o1049 0x5F +#define MODEL_o1081 0x5E +#define MODEL_o1052 0x5D +#define MODEL_o1069 0x5C +#define MODEL_o1066 0x5B +#define MODEL_o1058 0x5A +#define MODEL_o1094 0x59 +#define MODEL_g195 0x58 +#define MODEL_o1086 0x57 +#define MODEL_o1080 0x56 +#define MODEL_o1067 0x55 +#define MODEL_o1061 0x54 +#define MODEL_o1062 0x53 +#define MODEL_o1043 0x52 +#define MODEL_o1037 0x51 +#define MODEL_o1036 0x50 +#define MODEL_o1034 0x4F +#define MODEL_o1095 0x4E +#define MODEL_g176 0x4D +#define MODEL_o1249 0x4C +#define MODEL_g193 0x4B +#define MODEL_o1033 0x4A +#define MODEL_o1032 0x49 +#define MODEL_o1030 0x48 +#define MODEL_o1029 0x47 +#define MODEL_o1028 0x46 +#define MODEL_g182 0x45 +#define MODEL_o1027 0x44 +#define MODEL_o1021 0x43 +#define MODEL_o1015 0x42 +#define MODEL_o1009 0x41 +#define MODEL_o1003 0x40 +#define MODEL_o997 0x3F +#define MODEL_o985 0x3E +#define MODEL_o991 0x3D +#define MODEL_o979 0x3C +#define MODEL_o973 0x3B +#define MODEL_o967 0x3A +#define MODEL_o961 0x39 +#define MODEL_o935 0x38 +#define MODEL_g181 0x37 +#define MODEL_o959 0x36 +#define MODEL_g180 0x35 +#define MODEL_o955 0x34 +#define MODEL_o954 0x33 +#define MODEL_o952 0x32 +#define MODEL_o951 0x31 +#define MODEL_o950 0x30 +#define MODEL_g177 0x2F +#define MODEL_o937 0x2E +#define MODEL_o936 0x2D +#define MODEL_o934 0x2C +#define MODEL_o933 0x2B +#define MODEL_o932 0x2A +#define MODEL_o931 0x29 +#define MODEL_o930 0x28 +#define MODEL_g249 0x27 +#define MODEL_o960 0x26 +#define MODEL_o1026 0x25 +#define MODEL_o1020 0x24 +#define MODEL_o1014 0x23 +#define MODEL_o1008 0x22 +#define MODEL_o1002 0x21 +#define MODEL_o996 0x20 +#define MODEL_o990 0x1F +#define MODEL_o984 0x1E +#define MODEL_o978 0x1D +#define MODEL_o972 0x1C +#define MODEL_o966 0x1B +#define MODEL_o965 0x1A +#define MODEL_g248 0x19 +#define MODEL_o1024 0x18 +#define MODEL_o982 0x17 +#define MODEL_o1018 0x16 +#define MODEL_o1012 0x15 +#define MODEL_o1006 0x14 +#define MODEL_o1000 0x13 +#define MODEL_o994 0x12 +#define MODEL_o988 0x11 +#define MODEL_o976 0x10 +#define MODEL_o970 0xF +#define MODEL_o964 0xE +#define MODEL_o958 0xD +#define MODEL_o1023 0xC +#define MODEL_o981 0xB +#define MODEL_o1017 0xA +#define MODEL_o1011 0x9 +#define MODEL_o1005 0x8 +#define MODEL_o999 0x7 +#define MODEL_o993 0x6 +#define MODEL_o987 0x5 +#define MODEL_o975 0x4 +#define MODEL_o969 0x3 +#define MODEL_o963 0x2 +#define MODEL_o957 0x1 +#define MODEL_o956 0x0 + diff --git a/include/mapfs/kpa_14_hit.h b/include/mapfs/kpa_14_hit.h index 8922e227b3..801e2fe9d9 100644 --- a/include/mapfs/kpa_14_hit.h +++ b/include/mapfs/kpa_14_hit.h @@ -1,104 +1,128 @@ -#define COLLIDER_Root 0x67 -#define COLLIDER_g165 0x66 -#define COLLIDER_o858 0x65 -#define COLLIDER_o857 0x64 -#define COLLIDER_Default 0x63 -#define COLLIDER_o855 0x62 -#define COLLIDER_g1 0x61 -#define COLLIDER_o854 0x60 -#define COLLIDER_dai01 0x5F -#define COLLIDER_o852 0x5E -#define COLLIDER_g162 0x5D -#define COLLIDER_o835 0x5C -#define COLLIDER_deilitn 0x5B -#define COLLIDER_deilin 0x5A -#define COLLIDER_o624 0x59 -#define COLLIDER_deilitte 0x58 -#define COLLIDER_deilite 0x57 -#define COLLIDER_deilie 0x56 -#define COLLIDER_o540 0x55 -#define COLLIDER_deilitw 0x54 -#define COLLIDER_deiliw 0x53 -#define COLLIDER_g55 0x52 -#define COLLIDER_o851 0x51 -#define COLLIDER_o850 0x50 -#define COLLIDER_o849 0x4F -#define COLLIDER_o848 0x4E -#define COLLIDER_o847 0x4D -#define COLLIDER_o846 0x4C -#define COLLIDER_o845 0x4B -#define COLLIDER_o844 0x4A -#define COLLIDER_o843 0x49 -#define COLLIDER_o842 0x48 -#define COLLIDER_o841 0x47 -#define COLLIDER_o840 0x46 -#define COLLIDER_o839 0x45 -#define COLLIDER_o838 0x44 -#define COLLIDER_o837 0x43 -#define COLLIDER_o817 0x42 -#define COLLIDER_o816 0x41 -#define COLLIDER_o813 0x40 -#define COLLIDER_o812 0x3F -#define COLLIDER_o811 0x3E -#define COLLIDER_o810 0x3D -#define COLLIDER_o809 0x3C -#define COLLIDER_o808 0x3B -#define COLLIDER_o807 0x3A -#define COLLIDER_o806 0x39 -#define COLLIDER_o805 0x38 -#define COLLIDER_o804 0x37 -#define COLLIDER_o803 0x36 -#define COLLIDER_o802 0x35 -#define COLLIDER_o801 0x34 -#define COLLIDER_o800 0x33 -#define COLLIDER_o799 0x32 -#define COLLIDER_o798 0x31 -#define COLLIDER_o797 0x30 -#define COLLIDER_o796 0x2F -#define COLLIDER_o795 0x2E -#define COLLIDER_o794 0x2D -#define COLLIDER_o541 0x2C -#define COLLIDER_o206 0x2B -#define COLLIDER_o622 0x2A -#define COLLIDER_o538 0x29 -#define COLLIDER_o781 0x28 -#define COLLIDER_o780 0x27 -#define COLLIDER_o616 0x26 -#define COLLIDER_o522 0x25 -#define COLLIDER_o542 0x24 -#define COLLIDER_o533 0x23 -#define COLLIDER_g35 0x22 -#define COLLIDER_g38 0x21 -#define COLLIDER_o830 0x20 -#define COLLIDER_o829 0x1F -#define COLLIDER_o828 0x1E -#define COLLIDER_o827 0x1D -#define COLLIDER_o826 0x1C -#define COLLIDER_o825 0x1B -#define COLLIDER_o824 0x1A -#define COLLIDER_o823 0x19 -#define COLLIDER_o822 0x18 -#define COLLIDER_o821 0x17 -#define COLLIDER_o820 0x16 -#define COLLIDER_o819 0x15 -#define COLLIDER_o818 0x14 -#define COLLIDER_o776 0x13 -#define COLLIDER_o625 0x12 -#define COLLIDER_g37 0x11 -#define COLLIDER_o202 0x10 -#define COLLIDER_o201 0xF -#define COLLIDER_o200 0xE -#define COLLIDER_o199 0xD -#define COLLIDER_o198 0xC -#define COLLIDER_o197 0xB -#define COLLIDER_o196 0xA -#define COLLIDER_o195 0x9 -#define COLLIDER_g36 0x8 -#define COLLIDER_o191 0x7 -#define COLLIDER_o190 0x6 -#define COLLIDER_o189 0x5 -#define COLLIDER_o188 0x4 -#define COLLIDER_o187 0x3 -#define COLLIDER_o186 0x2 -#define COLLIDER_o185 0x1 -#define COLLIDER_o184 0x0 +#define COLLIDER_Root 0x67 +#define COLLIDER_g165 0x66 +#define COLLIDER_o858 0x65 +#define COLLIDER_o857 0x64 +#define COLLIDER_Default 0x63 +#define COLLIDER_o855 0x62 +#define COLLIDER_g1 0x61 +#define COLLIDER_o854 0x60 +#define COLLIDER_dai01 0x5F +#define COLLIDER_o852 0x5E +#define COLLIDER_g162 0x5D +#define COLLIDER_o835 0x5C +#define COLLIDER_deilitn 0x5B +#define COLLIDER_deilin 0x5A +#define COLLIDER_o624 0x59 +#define COLLIDER_deilitte 0x58 +#define COLLIDER_deilite 0x57 +#define COLLIDER_deilie 0x56 +#define COLLIDER_o540 0x55 +#define COLLIDER_deilitw 0x54 +#define COLLIDER_deiliw 0x53 +#define COLLIDER_g55 0x52 +#define COLLIDER_o851 0x51 +#define COLLIDER_o850 0x50 +#define COLLIDER_o849 0x4F +#define COLLIDER_o848 0x4E +#define COLLIDER_o847 0x4D +#define COLLIDER_o846 0x4C +#define COLLIDER_o845 0x4B +#define COLLIDER_o844 0x4A +#define COLLIDER_o843 0x49 +#define COLLIDER_o842 0x48 +#define COLLIDER_o841 0x47 +#define COLLIDER_o840 0x46 +#define COLLIDER_o839 0x45 +#define COLLIDER_o838 0x44 +#define COLLIDER_o837 0x43 +#define COLLIDER_o817 0x42 +#define COLLIDER_o816 0x41 +#define COLLIDER_o813 0x40 +#define COLLIDER_o812 0x3F +#define COLLIDER_o811 0x3E +#define COLLIDER_o810 0x3D +#define COLLIDER_o809 0x3C +#define COLLIDER_o808 0x3B +#define COLLIDER_o807 0x3A +#define COLLIDER_o806 0x39 +#define COLLIDER_o805 0x38 +#define COLLIDER_o804 0x37 +#define COLLIDER_o803 0x36 +#define COLLIDER_o802 0x35 +#define COLLIDER_o801 0x34 +#define COLLIDER_o800 0x33 +#define COLLIDER_o799 0x32 +#define COLLIDER_o798 0x31 +#define COLLIDER_o797 0x30 +#define COLLIDER_o796 0x2F +#define COLLIDER_o795 0x2E +#define COLLIDER_o794 0x2D +#define COLLIDER_o541 0x2C +#define COLLIDER_o206 0x2B +#define COLLIDER_o622 0x2A +#define COLLIDER_o538 0x29 +#define COLLIDER_o781 0x28 +#define COLLIDER_o780 0x27 +#define COLLIDER_o616 0x26 +#define COLLIDER_o522 0x25 +#define COLLIDER_o542 0x24 +#define COLLIDER_o533 0x23 +#define COLLIDER_g35 0x22 +#define COLLIDER_g38 0x21 +#define COLLIDER_o830 0x20 +#define COLLIDER_o829 0x1F +#define COLLIDER_o828 0x1E +#define COLLIDER_o827 0x1D +#define COLLIDER_o826 0x1C +#define COLLIDER_o825 0x1B +#define COLLIDER_o824 0x1A +#define COLLIDER_o823 0x19 +#define COLLIDER_o822 0x18 +#define COLLIDER_o821 0x17 +#define COLLIDER_o820 0x16 +#define COLLIDER_o819 0x15 +#define COLLIDER_o818 0x14 +#define COLLIDER_o776 0x13 +#define COLLIDER_o625 0x12 +#define COLLIDER_g37 0x11 +#define COLLIDER_o202 0x10 +#define COLLIDER_o201 0xF +#define COLLIDER_o200 0xE +#define COLLIDER_o199 0xD +#define COLLIDER_o198 0xC +#define COLLIDER_o197 0xB +#define COLLIDER_o196 0xA +#define COLLIDER_o195 0x9 +#define COLLIDER_g36 0x8 +#define COLLIDER_o191 0x7 +#define COLLIDER_o190 0x6 +#define COLLIDER_o189 0x5 +#define COLLIDER_o188 0x4 +#define COLLIDER_o187 0x3 +#define COLLIDER_o186 0x2 +#define COLLIDER_o185 0x1 +#define COLLIDER_o184 0x0 + +#define ZONE_Root 0x15 +#define ZONE_g1 0x14 +#define ZONE_g162 0x13 +#define ZONE_deilin 0x12 +#define ZONE_deilie 0x11 +#define ZONE_deiliw 0x10 +#define ZONE_g35 0xF +#define ZONE_o829 0xE +#define ZONE_o828 0xD +#define ZONE_o827 0xC +#define ZONE_o826 0xB +#define ZONE_o825 0xA +#define ZONE_o824 0x9 +#define ZONE_o823 0x8 +#define ZONE_o822 0x7 +#define ZONE_o821 0x6 +#define ZONE_o820 0x5 +#define ZONE_o819 0x4 +#define ZONE_o818 0x3 +#define ZONE_o776 0x2 +#define ZONE_o830 0x1 +#define ZONE_o625 0x0 + diff --git a/include/mapfs/kpa_14_shape.h b/include/mapfs/kpa_14_shape.h index 7f261188e9..537b279704 100644 --- a/include/mapfs/kpa_14_shape.h +++ b/include/mapfs/kpa_14_shape.h @@ -1,208 +1,209 @@ -#define MODEL_Root 0xCF -#define MODEL_g168 0xCE -#define MODEL_after 0xCD -#define MODEL_g205 0xCC -#define MODEL_o1036 0xCB -#define MODEL_g193 0xCA -#define MODEL_o1011 0xC9 -#define MODEL_o1010 0xC8 -#define MODEL_g191 0xC7 -#define MODEL_g192 0xC6 -#define MODEL_o1009 0xC5 -#define MODEL_o1008 0xC4 -#define MODEL_o1007 0xC3 -#define MODEL_o1006 0xC2 -#define MODEL_o1005 0xC1 -#define MODEL_g188 0xC0 -#define MODEL_o1003 0xBF -#define MODEL_g190 0xBE -#define MODEL_o1002 0xBD -#define MODEL_o1001 0xBC -#define MODEL_o1000 0xBB -#define MODEL_o999 0xBA -#define MODEL_o998 0xB9 -#define MODEL_o997 0xB8 -#define MODEL_o996 0xB7 -#define MODEL_o995 0xB6 -#define MODEL_g189 0xB5 -#define MODEL_o994 0xB4 -#define MODEL_o993 0xB3 -#define MODEL_o992 0xB2 -#define MODEL_o991 0xB1 -#define MODEL_o990 0xB0 -#define MODEL_o989 0xAF -#define MODEL_o988 0xAE -#define MODEL_o987 0xAD -#define MODEL_o986 0xAC -#define MODEL_o985 0xAB -#define MODEL_o984 0xAA -#define MODEL_g170 0xA9 -#define MODEL_g175 0xA8 -#define MODEL_o911 0xA7 -#define MODEL_g174 0xA6 -#define MODEL_o905 0xA5 -#define MODEL_o904 0xA4 -#define MODEL_o902 0xA3 -#define MODEL_o901 0xA2 -#define MODEL_o900 0xA1 -#define MODEL_g173 0xA0 -#define MODEL_o1038 0x9F -#define MODEL_o894 0x9E -#define MODEL_o899 0x9D -#define MODEL_g172 0x9C -#define MODEL_o1044 0x9B -#define MODEL_o1043 0x9A -#define MODEL_o1041 0x99 -#define MODEL_o1040 0x98 -#define MODEL_o1039 0x97 -#define MODEL_o893 0x96 -#define MODEL_g171 0x95 -#define MODEL_o887 0x94 -#define MODEL_o886 0x93 -#define MODEL_o884 0x92 -#define MODEL_o881 0x91 -#define MODEL_o882 0x90 -#define MODEL_o883 0x8F -#define MODEL_o880 0x8E -#define MODEL_g176 0x8D -#define MODEL_o916 0x8C -#define MODEL_o909 0x8B -#define MODEL_g206 0x8A -#define MODEL_o890 0x89 -#define MODEL_o974 0x88 -#define MODEL_o968 0x87 -#define MODEL_o962 0x86 -#define MODEL_o956 0x85 -#define MODEL_o950 0x84 -#define MODEL_o944 0x83 -#define MODEL_o938 0x82 -#define MODEL_o926 0x81 -#define MODEL_o932 0x80 -#define MODEL_o920 0x7F -#define MODEL_o914 0x7E -#define MODEL_o896 0x7D -#define MODEL_o908 0x7C -#define MODEL_o889 0x7B -#define MODEL_o973 0x7A -#define MODEL_o967 0x79 -#define MODEL_o961 0x78 -#define MODEL_o955 0x77 -#define MODEL_o949 0x76 -#define MODEL_o943 0x75 -#define MODEL_o937 0x74 -#define MODEL_o931 0x73 -#define MODEL_o925 0x72 -#define MODEL_o919 0x71 -#define MODEL_o913 0x70 -#define MODEL_o907 0x6F -#define MODEL_o895 0x6E -#define MODEL_o972 0x6D -#define MODEL_before 0x6C -#define MODEL_g204 0x6B -#define MODEL_o1035 0x6A -#define MODEL_dai01 0x69 -#define MODEL_o861 0x68 -#define MODEL_o860 0x67 -#define MODEL_g162 0x66 -#define MODEL_g38 0x65 -#define MODEL_o779 0x64 -#define MODEL_o778 0x63 -#define MODEL_o777 0x62 -#define MODEL_o776 0x61 -#define MODEL_o625 0x60 -#define MODEL_o631 0x5F -#define MODEL_g35 0x5E -#define MODEL_o869 0x5D -#define MODEL_g37 0x5C -#define MODEL_o202 0x5B -#define MODEL_o201 0x5A -#define MODEL_o200 0x59 -#define MODEL_o199 0x58 -#define MODEL_o198 0x57 -#define MODEL_o197 0x56 -#define MODEL_o196 0x55 -#define MODEL_o195 0x54 -#define MODEL_g36 0x53 -#define MODEL_o194 0x52 -#define MODEL_o193 0x51 -#define MODEL_o192 0x50 -#define MODEL_o191 0x4F -#define MODEL_o190 0x4E -#define MODEL_o189 0x4D -#define MODEL_o188 0x4C -#define MODEL_o187 0x4B -#define MODEL_o186 0x4A -#define MODEL_o185 0x49 -#define MODEL_o184 0x48 -#define MODEL_g55 0x47 -#define MODEL_g164 0x46 -#define MODEL_o867 0x45 -#define MODEL_o866 0x44 -#define MODEL_o864 0x43 -#define MODEL_o863 0x42 -#define MODEL_o862 0x41 -#define MODEL_g124 0x40 -#define MODEL_o859 0x3F -#define MODEL_o630 0x3E -#define MODEL_o539 0x3D -#define MODEL_o538 0x3C -#define MODEL_o537 0x3B -#define MODEL_g109 0x3A -#define MODEL_o1037 0x39 -#define MODEL_g110 0x38 -#define MODEL_o852 0x37 -#define MODEL_o853 0x36 -#define MODEL_o536 0x35 -#define MODEL_o531 0x34 -#define MODEL_o535 0x33 -#define MODEL_o533 0x32 -#define MODEL_o532 0x31 -#define MODEL_g108 0x30 -#define MODEL_o616 0x2F -#define MODEL_o851 0x2E -#define MODEL_o839 0x2D -#define MODEL_o833 0x2C -#define MODEL_o827 0x2B -#define MODEL_o542 0x2A -#define MODEL_o620 0x29 -#define MODEL_o821 0x28 -#define MODEL_o815 0x27 -#define MODEL_o809 0x26 -#define MODEL_o803 0x25 -#define MODEL_o797 0x24 -#define MODEL_o791 0x23 -#define MODEL_o785 0x22 -#define MODEL_o541 0x21 -#define MODEL_g208 0x20 -#define MODEL_o796 0x1F -#define MODEL_o783 0x1E -#define MODEL_g207 0x1D -#define MODEL_o528 0x1C -#define MODEL_o208 0x1B -#define MODEL_o782 0x1A -#define MODEL_o788 0x19 -#define MODEL_o794 0x18 -#define MODEL_o800 0x17 -#define MODEL_o806 0x16 -#define MODEL_o812 0x15 -#define MODEL_o818 0x14 -#define MODEL_o824 0x13 -#define MODEL_o830 0x12 -#define MODEL_o836 0x11 -#define MODEL_o523 0x10 -#define MODEL_o848 0xF -#define MODEL_o522 0xE -#define MODEL_o847 0xD -#define MODEL_o835 0xC -#define MODEL_o829 0xB -#define MODEL_o823 0xA -#define MODEL_o817 0x9 -#define MODEL_o811 0x8 -#define MODEL_o805 0x7 -#define MODEL_o799 0x6 -#define MODEL_o793 0x5 -#define MODEL_o787 0x4 -#define MODEL_o781 0x3 -#define MODEL_o207 0x2 -#define MODEL_o527 0x1 -#define MODEL_o206 0x0 +#define MODEL_Root 0xCF +#define MODEL_g168 0xCE +#define MODEL_after 0xCD +#define MODEL_g205 0xCC +#define MODEL_o1036 0xCB +#define MODEL_g193 0xCA +#define MODEL_o1011 0xC9 +#define MODEL_o1010 0xC8 +#define MODEL_g191 0xC7 +#define MODEL_g192 0xC6 +#define MODEL_o1009 0xC5 +#define MODEL_o1008 0xC4 +#define MODEL_o1007 0xC3 +#define MODEL_o1006 0xC2 +#define MODEL_o1005 0xC1 +#define MODEL_g188 0xC0 +#define MODEL_o1003 0xBF +#define MODEL_g190 0xBE +#define MODEL_o1002 0xBD +#define MODEL_o1001 0xBC +#define MODEL_o1000 0xBB +#define MODEL_o999 0xBA +#define MODEL_o998 0xB9 +#define MODEL_o997 0xB8 +#define MODEL_o996 0xB7 +#define MODEL_o995 0xB6 +#define MODEL_g189 0xB5 +#define MODEL_o994 0xB4 +#define MODEL_o993 0xB3 +#define MODEL_o992 0xB2 +#define MODEL_o991 0xB1 +#define MODEL_o990 0xB0 +#define MODEL_o989 0xAF +#define MODEL_o988 0xAE +#define MODEL_o987 0xAD +#define MODEL_o986 0xAC +#define MODEL_o985 0xAB +#define MODEL_o984 0xAA +#define MODEL_g170 0xA9 +#define MODEL_g175 0xA8 +#define MODEL_o911 0xA7 +#define MODEL_g174 0xA6 +#define MODEL_o905 0xA5 +#define MODEL_o904 0xA4 +#define MODEL_o902 0xA3 +#define MODEL_o901 0xA2 +#define MODEL_o900 0xA1 +#define MODEL_g173 0xA0 +#define MODEL_o1038 0x9F +#define MODEL_o894 0x9E +#define MODEL_o899 0x9D +#define MODEL_g172 0x9C +#define MODEL_o1044 0x9B +#define MODEL_o1043 0x9A +#define MODEL_o1041 0x99 +#define MODEL_o1040 0x98 +#define MODEL_o1039 0x97 +#define MODEL_o893 0x96 +#define MODEL_g171 0x95 +#define MODEL_o887 0x94 +#define MODEL_o886 0x93 +#define MODEL_o884 0x92 +#define MODEL_o881 0x91 +#define MODEL_o882 0x90 +#define MODEL_o883 0x8F +#define MODEL_o880 0x8E +#define MODEL_g176 0x8D +#define MODEL_o916 0x8C +#define MODEL_o909 0x8B +#define MODEL_g206 0x8A +#define MODEL_o890 0x89 +#define MODEL_o974 0x88 +#define MODEL_o968 0x87 +#define MODEL_o962 0x86 +#define MODEL_o956 0x85 +#define MODEL_o950 0x84 +#define MODEL_o944 0x83 +#define MODEL_o938 0x82 +#define MODEL_o926 0x81 +#define MODEL_o932 0x80 +#define MODEL_o920 0x7F +#define MODEL_o914 0x7E +#define MODEL_o896 0x7D +#define MODEL_o908 0x7C +#define MODEL_o889 0x7B +#define MODEL_o973 0x7A +#define MODEL_o967 0x79 +#define MODEL_o961 0x78 +#define MODEL_o955 0x77 +#define MODEL_o949 0x76 +#define MODEL_o943 0x75 +#define MODEL_o937 0x74 +#define MODEL_o931 0x73 +#define MODEL_o925 0x72 +#define MODEL_o919 0x71 +#define MODEL_o913 0x70 +#define MODEL_o907 0x6F +#define MODEL_o895 0x6E +#define MODEL_o972 0x6D +#define MODEL_before 0x6C +#define MODEL_g204 0x6B +#define MODEL_o1035 0x6A +#define MODEL_dai01 0x69 +#define MODEL_o861 0x68 +#define MODEL_o860 0x67 +#define MODEL_g162 0x66 +#define MODEL_g38 0x65 +#define MODEL_o779 0x64 +#define MODEL_o778 0x63 +#define MODEL_o777 0x62 +#define MODEL_o776 0x61 +#define MODEL_o625 0x60 +#define MODEL_o631 0x5F +#define MODEL_g35 0x5E +#define MODEL_o869 0x5D +#define MODEL_g37 0x5C +#define MODEL_o202 0x5B +#define MODEL_o201 0x5A +#define MODEL_o200 0x59 +#define MODEL_o199 0x58 +#define MODEL_o198 0x57 +#define MODEL_o197 0x56 +#define MODEL_o196 0x55 +#define MODEL_o195 0x54 +#define MODEL_g36 0x53 +#define MODEL_o194 0x52 +#define MODEL_o193 0x51 +#define MODEL_o192 0x50 +#define MODEL_o191 0x4F +#define MODEL_o190 0x4E +#define MODEL_o189 0x4D +#define MODEL_o188 0x4C +#define MODEL_o187 0x4B +#define MODEL_o186 0x4A +#define MODEL_o185 0x49 +#define MODEL_o184 0x48 +#define MODEL_g55 0x47 +#define MODEL_g164 0x46 +#define MODEL_o867 0x45 +#define MODEL_o866 0x44 +#define MODEL_o864 0x43 +#define MODEL_o863 0x42 +#define MODEL_o862 0x41 +#define MODEL_g124 0x40 +#define MODEL_o859 0x3F +#define MODEL_o630 0x3E +#define MODEL_o539 0x3D +#define MODEL_o538 0x3C +#define MODEL_o537 0x3B +#define MODEL_g109 0x3A +#define MODEL_o1037 0x39 +#define MODEL_g110 0x38 +#define MODEL_o852 0x37 +#define MODEL_o853 0x36 +#define MODEL_o536 0x35 +#define MODEL_o531 0x34 +#define MODEL_o535 0x33 +#define MODEL_o533 0x32 +#define MODEL_o532 0x31 +#define MODEL_g108 0x30 +#define MODEL_o616 0x2F +#define MODEL_o851 0x2E +#define MODEL_o839 0x2D +#define MODEL_o833 0x2C +#define MODEL_o827 0x2B +#define MODEL_o542 0x2A +#define MODEL_o620 0x29 +#define MODEL_o821 0x28 +#define MODEL_o815 0x27 +#define MODEL_o809 0x26 +#define MODEL_o803 0x25 +#define MODEL_o797 0x24 +#define MODEL_o791 0x23 +#define MODEL_o785 0x22 +#define MODEL_o541 0x21 +#define MODEL_g208 0x20 +#define MODEL_o796 0x1F +#define MODEL_o783 0x1E +#define MODEL_g207 0x1D +#define MODEL_o528 0x1C +#define MODEL_o208 0x1B +#define MODEL_o782 0x1A +#define MODEL_o788 0x19 +#define MODEL_o794 0x18 +#define MODEL_o800 0x17 +#define MODEL_o806 0x16 +#define MODEL_o812 0x15 +#define MODEL_o818 0x14 +#define MODEL_o824 0x13 +#define MODEL_o830 0x12 +#define MODEL_o836 0x11 +#define MODEL_o523 0x10 +#define MODEL_o848 0xF +#define MODEL_o522 0xE +#define MODEL_o847 0xD +#define MODEL_o835 0xC +#define MODEL_o829 0xB +#define MODEL_o823 0xA +#define MODEL_o817 0x9 +#define MODEL_o811 0x8 +#define MODEL_o805 0x7 +#define MODEL_o799 0x6 +#define MODEL_o793 0x5 +#define MODEL_o787 0x4 +#define MODEL_o781 0x3 +#define MODEL_o207 0x2 +#define MODEL_o527 0x1 +#define MODEL_o206 0x0 + diff --git a/include/mapfs/kpa_15_hit.h b/include/mapfs/kpa_15_hit.h index 629de3d75a..401ca7fdf4 100644 --- a/include/mapfs/kpa_15_hit.h +++ b/include/mapfs/kpa_15_hit.h @@ -1,26 +1,36 @@ -#define COLLIDER_Root 0x19 -#define COLLIDER_g1 0x18 -#define COLLIDER_g153 0x17 -#define COLLIDER_deilitw 0x16 -#define COLLIDER_o540 0x15 -#define COLLIDER_deiliw 0x14 -#define COLLIDER_g55 0x13 -#define COLLIDER_g152 0x12 -#define COLLIDER_o793 0x11 -#define COLLIDER_o792 0x10 -#define COLLIDER_o541 0xF -#define COLLIDER_g151 0xE -#define COLLIDER_o794 0xD -#define COLLIDER_o783 0xC -#define COLLIDER_o709 0xB -#define COLLIDER_g150 0xA -#define COLLIDER_o780 0x9 -#define COLLIDER_g124 0x8 -#define COLLIDER_o538 0x7 -#define COLLIDER_g35 0x6 -#define COLLIDER_g38 0x5 -#define COLLIDER_o781 0x4 -#define COLLIDER_g37 0x3 -#define COLLIDER_o201 0x2 -#define COLLIDER_g36 0x1 -#define COLLIDER_o188 0x0 +#define COLLIDER_Root 0x19 +#define COLLIDER_g1 0x18 +#define COLLIDER_g153 0x17 +#define COLLIDER_deilitw 0x16 +#define COLLIDER_o540 0x15 +#define COLLIDER_deiliw 0x14 +#define COLLIDER_g55 0x13 +#define COLLIDER_g152 0x12 +#define COLLIDER_o793 0x11 +#define COLLIDER_o792 0x10 +#define COLLIDER_o541 0xF +#define COLLIDER_g151 0xE +#define COLLIDER_o794 0xD +#define COLLIDER_o783 0xC +#define COLLIDER_o709 0xB +#define COLLIDER_g150 0xA +#define COLLIDER_o780 0x9 +#define COLLIDER_g124 0x8 +#define COLLIDER_o538 0x7 +#define COLLIDER_g35 0x6 +#define COLLIDER_g38 0x5 +#define COLLIDER_o781 0x4 +#define COLLIDER_g37 0x3 +#define COLLIDER_o201 0x2 +#define COLLIDER_g36 0x1 +#define COLLIDER_o188 0x0 + +#define ZONE_Root 0x7 +#define ZONE_g1 0x6 +#define ZONE_g153 0x5 +#define ZONE_deiliw 0x4 +#define ZONE_g35 0x3 +#define ZONE_o798 0x2 +#define ZONE_o796 0x1 +#define ZONE_o781 0x0 + diff --git a/include/mapfs/kpa_15_shape.h b/include/mapfs/kpa_15_shape.h index 7f55e74c15..b13029e0af 100644 --- a/include/mapfs/kpa_15_shape.h +++ b/include/mapfs/kpa_15_shape.h @@ -1,69 +1,70 @@ -#define MODEL_Root 0x44 -#define MODEL_g167 0x43 -#define MODEL_after 0x42 -#define MODEL_o848 0x41 -#define MODEL_g160 0x40 -#define MODEL_g166 0x3F -#define MODEL_o837 0x3E -#define MODEL_g165 0x3D -#define MODEL_o836 0x3C -#define MODEL_g164 0x3B -#define MODEL_o835 0x3A -#define MODEL_o834 0x39 -#define MODEL_o833 0x38 -#define MODEL_o832 0x37 -#define MODEL_o831 0x36 -#define MODEL_o830 0x35 -#define MODEL_g163 0x34 -#define MODEL_o829 0x33 -#define MODEL_o828 0x32 -#define MODEL_o827 0x31 -#define MODEL_o826 0x30 -#define MODEL_o825 0x2F -#define MODEL_o824 0x2E -#define MODEL_g162 0x2D -#define MODEL_o823 0x2C -#define MODEL_o822 0x2B -#define MODEL_g161 0x2A -#define MODEL_o821 0x29 -#define MODEL_o819 0x28 -#define MODEL_o818 0x27 -#define MODEL_g158 0x26 -#define MODEL_g159 0x25 -#define MODEL_o817 0x24 -#define MODEL_o816 0x23 -#define MODEL_o815 0x22 -#define MODEL_before 0x21 -#define MODEL_o847 0x20 -#define MODEL_g55 0x1F -#define MODEL_g36 0x1E -#define MODEL_o188 0x1D -#define MODEL_g37 0x1C -#define MODEL_o201 0x1B -#define MODEL_g154 0x1A -#define MODEL_o806 0x19 -#define MODEL_o805 0x18 -#define MODEL_o804 0x17 -#define MODEL_o803 0x16 -#define MODEL_o802 0x15 -#define MODEL_o801 0x14 -#define MODEL_g153 0x13 -#define MODEL_o800 0x12 -#define MODEL_o799 0x11 -#define MODEL_o798 0x10 -#define MODEL_o797 0xF -#define MODEL_o796 0xE -#define MODEL_o795 0xD -#define MODEL_g150 0xC -#define MODEL_o792 0xB -#define MODEL_o780 0xA -#define MODEL_g124 0x9 -#define MODEL_o793 0x8 -#define MODEL_o540 0x7 -#define MODEL_o539 0x6 -#define MODEL_o538 0x5 -#define MODEL_g35 0x4 -#define MODEL_g156 0x3 -#define MODEL_o814 0x2 -#define MODEL_o813 0x1 -#define MODEL_o811 0x0 +#define MODEL_Root 0x44 +#define MODEL_g167 0x43 +#define MODEL_after 0x42 +#define MODEL_o848 0x41 +#define MODEL_g160 0x40 +#define MODEL_g166 0x3F +#define MODEL_o837 0x3E +#define MODEL_g165 0x3D +#define MODEL_o836 0x3C +#define MODEL_g164 0x3B +#define MODEL_o835 0x3A +#define MODEL_o834 0x39 +#define MODEL_o833 0x38 +#define MODEL_o832 0x37 +#define MODEL_o831 0x36 +#define MODEL_o830 0x35 +#define MODEL_g163 0x34 +#define MODEL_o829 0x33 +#define MODEL_o828 0x32 +#define MODEL_o827 0x31 +#define MODEL_o826 0x30 +#define MODEL_o825 0x2F +#define MODEL_o824 0x2E +#define MODEL_g162 0x2D +#define MODEL_o823 0x2C +#define MODEL_o822 0x2B +#define MODEL_g161 0x2A +#define MODEL_o821 0x29 +#define MODEL_o819 0x28 +#define MODEL_o818 0x27 +#define MODEL_g158 0x26 +#define MODEL_g159 0x25 +#define MODEL_o817 0x24 +#define MODEL_o816 0x23 +#define MODEL_o815 0x22 +#define MODEL_before 0x21 +#define MODEL_o847 0x20 +#define MODEL_g55 0x1F +#define MODEL_g36 0x1E +#define MODEL_o188 0x1D +#define MODEL_g37 0x1C +#define MODEL_o201 0x1B +#define MODEL_g154 0x1A +#define MODEL_o806 0x19 +#define MODEL_o805 0x18 +#define MODEL_o804 0x17 +#define MODEL_o803 0x16 +#define MODEL_o802 0x15 +#define MODEL_o801 0x14 +#define MODEL_g153 0x13 +#define MODEL_o800 0x12 +#define MODEL_o799 0x11 +#define MODEL_o798 0x10 +#define MODEL_o797 0xF +#define MODEL_o796 0xE +#define MODEL_o795 0xD +#define MODEL_g150 0xC +#define MODEL_o792 0xB +#define MODEL_o780 0xA +#define MODEL_g124 0x9 +#define MODEL_o793 0x8 +#define MODEL_o540 0x7 +#define MODEL_o539 0x6 +#define MODEL_o538 0x5 +#define MODEL_g35 0x4 +#define MODEL_g156 0x3 +#define MODEL_o814 0x2 +#define MODEL_o813 0x1 +#define MODEL_o811 0x0 + diff --git a/include/mapfs/kpa_16_hit.h b/include/mapfs/kpa_16_hit.h index 498a24a931..2ed8db1d19 100644 --- a/include/mapfs/kpa_16_hit.h +++ b/include/mapfs/kpa_16_hit.h @@ -1,58 +1,71 @@ -#define COLLIDER_Root 0x39 -#define COLLIDER_g1 0x38 -#define COLLIDER_o958 0x37 -#define COLLIDER_o952 0x36 -#define COLLIDER_Default 0x35 -#define COLLIDER_o540 0x34 -#define COLLIDER_deilitw 0x33 -#define COLLIDER_deiliw 0x32 -#define COLLIDER_g35 0x31 -#define COLLIDER_g38 0x30 -#define COLLIDER_o954 0x2F -#define COLLIDER_o782 0x2E -#define COLLIDER_o776 0x2D -#define COLLIDER_o930 0x2C -#define COLLIDER_o929 0x2B -#define COLLIDER_g37 0x2A -#define COLLIDER_o202 0x29 -#define COLLIDER_o197 0x28 -#define COLLIDER_o785 0x27 -#define COLLIDER_o953 0x26 -#define COLLIDER_g36 0x25 -#define COLLIDER_o187 0x24 -#define COLLIDER_o784 0x23 -#define COLLIDER_g55 0x22 -#define COLLIDER_o925 0x21 -#define COLLIDER_o924 0x20 -#define COLLIDER_o923 0x1F -#define COLLIDER_o922 0x1E -#define COLLIDER_o921 0x1D -#define COLLIDER_o920 0x1C -#define COLLIDER_o919 0x1B -#define COLLIDER_o918 0x1A -#define COLLIDER_o917 0x19 -#define COLLIDER_o916 0x18 -#define COLLIDER_o915 0x17 -#define COLLIDER_o914 0x16 -#define COLLIDER_o913 0x15 -#define COLLIDER_o912 0x14 -#define COLLIDER_o911 0x13 -#define COLLIDER_o910 0x12 -#define COLLIDER_o909 0x11 -#define COLLIDER_o908 0x10 -#define COLLIDER_o907 0xF -#define COLLIDER_o906 0xE -#define COLLIDER_o905 0xD -#define COLLIDER_o904 0xC -#define COLLIDER_o903 0xB -#define COLLIDER_o902 0xA -#define COLLIDER_o901 0x9 -#define COLLIDER_o900 0x8 -#define COLLIDER_o899 0x7 -#define COLLIDER_o898 0x6 -#define COLLIDER_o897 0x5 -#define COLLIDER_o896 0x4 -#define COLLIDER_o840 0x3 -#define COLLIDER_o839 0x2 -#define COLLIDER_o838 0x1 -#define COLLIDER_o538 0x0 +#define COLLIDER_Root 0x39 +#define COLLIDER_g1 0x38 +#define COLLIDER_o958 0x37 +#define COLLIDER_o952 0x36 +#define COLLIDER_Default 0x35 +#define COLLIDER_o540 0x34 +#define COLLIDER_deilitw 0x33 +#define COLLIDER_deiliw 0x32 +#define COLLIDER_g35 0x31 +#define COLLIDER_g38 0x30 +#define COLLIDER_o954 0x2F +#define COLLIDER_o782 0x2E +#define COLLIDER_o776 0x2D +#define COLLIDER_o930 0x2C +#define COLLIDER_o929 0x2B +#define COLLIDER_g37 0x2A +#define COLLIDER_o202 0x29 +#define COLLIDER_o197 0x28 +#define COLLIDER_o785 0x27 +#define COLLIDER_o953 0x26 +#define COLLIDER_g36 0x25 +#define COLLIDER_o187 0x24 +#define COLLIDER_o784 0x23 +#define COLLIDER_g55 0x22 +#define COLLIDER_o925 0x21 +#define COLLIDER_o924 0x20 +#define COLLIDER_o923 0x1F +#define COLLIDER_o922 0x1E +#define COLLIDER_o921 0x1D +#define COLLIDER_o920 0x1C +#define COLLIDER_o919 0x1B +#define COLLIDER_o918 0x1A +#define COLLIDER_o917 0x19 +#define COLLIDER_o916 0x18 +#define COLLIDER_o915 0x17 +#define COLLIDER_o914 0x16 +#define COLLIDER_o913 0x15 +#define COLLIDER_o912 0x14 +#define COLLIDER_o911 0x13 +#define COLLIDER_o910 0x12 +#define COLLIDER_o909 0x11 +#define COLLIDER_o908 0x10 +#define COLLIDER_o907 0xF +#define COLLIDER_o906 0xE +#define COLLIDER_o905 0xD +#define COLLIDER_o904 0xC +#define COLLIDER_o903 0xB +#define COLLIDER_o902 0xA +#define COLLIDER_o901 0x9 +#define COLLIDER_o900 0x8 +#define COLLIDER_o899 0x7 +#define COLLIDER_o898 0x6 +#define COLLIDER_o897 0x5 +#define COLLIDER_o896 0x4 +#define COLLIDER_o840 0x3 +#define COLLIDER_o839 0x2 +#define COLLIDER_o838 0x1 +#define COLLIDER_o538 0x0 + +#define ZONE_Root 0xA +#define ZONE_g1 0x9 +#define ZONE_Default 0x8 +#define ZONE_o941 0x7 +#define ZONE_g35 0x6 +#define ZONE_o940 0x5 +#define ZONE_o939 0x4 +#define ZONE_o938 0x3 +#define ZONE_o937 0x2 +#define ZONE_o936 0x1 +#define ZONE_o935 0x0 + diff --git a/include/mapfs/kpa_16_shape.h b/include/mapfs/kpa_16_shape.h index a174cea7f0..b03f1158d9 100644 --- a/include/mapfs/kpa_16_shape.h +++ b/include/mapfs/kpa_16_shape.h @@ -1,254 +1,255 @@ -#define MODEL_Root 0xFD -#define MODEL_after 0xFC -#define MODEL_g290 0xFB -#define MODEL_o1451 0xFA -#define MODEL_o1450 0xF9 -#define MODEL_o1449 0xF8 -#define MODEL_o1448 0xF7 -#define MODEL_o1447 0xF6 -#define MODEL_o1446 0xF5 -#define MODEL_o1445 0xF4 -#define MODEL_g279 0xF3 -#define MODEL_g226 0xF2 -#define MODEL_o1163 0xF1 -#define MODEL_o1162 0xF0 -#define MODEL_o1160 0xEF -#define MODEL_o1159 0xEE -#define MODEL_o1158 0xED -#define MODEL_o1157 0xEC -#define MODEL_g282 0xEB -#define MODEL_o1427 0xEA -#define MODEL_o1426 0xE9 -#define MODEL_o1425 0xE8 -#define MODEL_o1424 0xE7 -#define MODEL_o1423 0xE6 -#define MODEL_o1422 0xE5 -#define MODEL_o1421 0xE4 -#define MODEL_g281 0xE3 -#define MODEL_o1420 0xE2 -#define MODEL_o1419 0xE1 -#define MODEL_o1418 0xE0 -#define MODEL_g280 0xDF -#define MODEL_o1437 0xDE -#define MODEL_o1416 0xDD -#define MODEL_o1415 0xDC -#define MODEL_o1414 0xDB -#define MODEL_g197 0xDA -#define MODEL_g247 0xD9 -#define MODEL_g209 0xD8 -#define MODEL_o1142 0xD7 -#define MODEL_o1076 0xD6 -#define MODEL_o1073 0xD5 -#define MODEL_g246 0xD4 -#define MODEL_g210 0xD3 -#define MODEL_o1078 0xD2 -#define MODEL_o1077 0xD1 -#define MODEL_g211 0xD0 -#define MODEL_o1080 0xCF -#define MODEL_o1079 0xCE -#define MODEL_g212 0xCD -#define MODEL_o1082 0xCC -#define MODEL_o1081 0xCB -#define MODEL_g206 0xCA -#define MODEL_o1060 0xC9 -#define MODEL_o1059 0xC8 -#define MODEL_o1058 0xC7 -#define MODEL_o1057 0xC6 -#define MODEL_o1056 0xC5 -#define MODEL_o1055 0xC4 -#define MODEL_g235 0xC3 -#define MODEL_o1209 0xC2 -#define MODEL_o1208 0xC1 -#define MODEL_o1207 0xC0 -#define MODEL_o1206 0xBF -#define MODEL_o1205 0xBE -#define MODEL_o1204 0xBD -#define MODEL_g236 0xBC -#define MODEL_o1215 0xBB -#define MODEL_o1214 0xBA -#define MODEL_o1213 0xB9 -#define MODEL_o1212 0xB8 -#define MODEL_o1211 0xB7 -#define MODEL_o1210 0xB6 -#define MODEL_g237 0xB5 -#define MODEL_o1221 0xB4 -#define MODEL_o1220 0xB3 -#define MODEL_o1219 0xB2 -#define MODEL_o1218 0xB1 -#define MODEL_o1217 0xB0 -#define MODEL_o1216 0xAF -#define MODEL_g238 0xAE -#define MODEL_o1227 0xAD -#define MODEL_o1226 0xAC -#define MODEL_o1225 0xAB -#define MODEL_o1224 0xAA -#define MODEL_o1223 0xA9 -#define MODEL_o1222 0xA8 -#define MODEL_g239 0xA7 -#define MODEL_o1233 0xA6 -#define MODEL_o1232 0xA5 -#define MODEL_o1231 0xA4 -#define MODEL_o1230 0xA3 -#define MODEL_o1229 0xA2 -#define MODEL_o1228 0xA1 -#define MODEL_g240 0xA0 -#define MODEL_o1238 0x9F -#define MODEL_o1237 0x9E -#define MODEL_o1236 0x9D -#define MODEL_o1235 0x9C -#define MODEL_o1234 0x9B -#define MODEL_g241 0x9A -#define MODEL_o1244 0x99 -#define MODEL_o1243 0x98 -#define MODEL_o1242 0x97 -#define MODEL_o1241 0x96 -#define MODEL_o1240 0x95 -#define MODEL_g242 0x94 -#define MODEL_o1249 0x93 -#define MODEL_o1248 0x92 -#define MODEL_o1247 0x91 -#define MODEL_o1246 0x90 -#define MODEL_o1245 0x8F -#define MODEL_g244 0x8E -#define MODEL_o1259 0x8D -#define MODEL_o1258 0x8C -#define MODEL_o1257 0x8B -#define MODEL_o1256 0x8A -#define MODEL_o1255 0x89 -#define MODEL_g245 0x88 -#define MODEL_o1264 0x87 -#define MODEL_o1263 0x86 -#define MODEL_o1262 0x85 -#define MODEL_o1261 0x84 -#define MODEL_o1260 0x83 -#define MODEL_before 0x82 -#define MODEL_g289 0x81 -#define MODEL_o1444 0x80 -#define MODEL_o1443 0x7F -#define MODEL_o1442 0x7E -#define MODEL_o1441 0x7D -#define MODEL_o1440 0x7C -#define MODEL_o1439 0x7B -#define MODEL_o1438 0x7A -#define MODEL_g173 0x79 -#define MODEL_g249 0x78 -#define MODEL_g186 0x77 -#define MODEL_o978 0x76 -#define MODEL_o977 0x75 -#define MODEL_o976 0x74 -#define MODEL_o975 0x73 -#define MODEL_g248 0x72 -#define MODEL_g260 0x71 -#define MODEL_o1342 0x70 -#define MODEL_o1341 0x6F -#define MODEL_o1340 0x6E -#define MODEL_o1339 0x6D -#define MODEL_o1338 0x6C -#define MODEL_o1337 0x6B -#define MODEL_g187 0x6A -#define MODEL_o982 0x69 -#define MODEL_o979 0x68 -#define MODEL_g189 0x67 -#define MODEL_o986 0x66 -#define MODEL_o985 0x65 -#define MODEL_g190 0x64 -#define MODEL_o988 0x63 -#define MODEL_o987 0x62 -#define MODEL_g229 0x61 -#define MODEL_o1179 0x60 -#define MODEL_o1178 0x5F -#define MODEL_o1177 0x5E -#define MODEL_o1176 0x5D -#define MODEL_o1175 0x5C -#define MODEL_o1174 0x5B -#define MODEL_g185 0x5A -#define MODEL_o974 0x59 -#define MODEL_o973 0x58 -#define MODEL_o972 0x57 -#define MODEL_o971 0x56 -#define MODEL_o970 0x55 -#define MODEL_o969 0x54 -#define MODEL_g181 0x53 -#define MODEL_o951 0x52 -#define MODEL_o950 0x51 -#define MODEL_o949 0x50 -#define MODEL_o948 0x4F -#define MODEL_o947 0x4E -#define MODEL_o946 0x4D -#define MODEL_g178 0x4C -#define MODEL_o935 0x4B -#define MODEL_o934 0x4A -#define MODEL_o933 0x49 -#define MODEL_o932 0x48 -#define MODEL_o931 0x47 -#define MODEL_o930 0x46 -#define MODEL_g172 0x45 -#define MODEL_o907 0x44 -#define MODEL_o906 0x43 -#define MODEL_o905 0x42 -#define MODEL_o904 0x41 -#define MODEL_o903 0x40 -#define MODEL_o902 0x3F -#define MODEL_g231 0x3E -#define MODEL_o1190 0x3D -#define MODEL_o1189 0x3C -#define MODEL_o1188 0x3B -#define MODEL_o1187 0x3A -#define MODEL_o1186 0x39 -#define MODEL_g230 0x38 -#define MODEL_o1184 0x37 -#define MODEL_o1183 0x36 -#define MODEL_o1182 0x35 -#define MODEL_o1181 0x34 -#define MODEL_o1180 0x33 -#define MODEL_g176 0x32 -#define MODEL_o923 0x31 -#define MODEL_o922 0x30 -#define MODEL_o921 0x2F -#define MODEL_o920 0x2E -#define MODEL_o919 0x2D -#define MODEL_g175 0x2C -#define MODEL_o918 0x2B -#define MODEL_o917 0x2A -#define MODEL_o916 0x29 -#define MODEL_o915 0x28 -#define MODEL_o914 0x27 -#define MODEL_g171 0x26 -#define MODEL_o900 0x25 -#define MODEL_o899 0x24 -#define MODEL_o898 0x23 -#define MODEL_o897 0x22 -#define MODEL_o896 0x21 -#define MODEL_g35 0x20 -#define MODEL_g38 0x1F -#define MODEL_g259 0x1E -#define MODEL_o1320 0x1D -#define MODEL_o1321 0x1C -#define MODEL_o1316 0x1B -#define MODEL_o1331 0x1A -#define MODEL_g258 0x19 -#define MODEL_o1286 0x18 -#define MODEL_g257 0x17 -#define MODEL_o1285 0x16 -#define MODEL_g256 0x15 -#define MODEL_o1284 0x14 -#define MODEL_g255 0x13 -#define MODEL_o1283 0x12 -#define MODEL_g254 0x11 -#define MODEL_o1282 0x10 -#define MODEL_o892 0xF -#define MODEL_o893 0xE -#define MODEL_o894 0xD -#define MODEL_o895 0xC -#define MODEL_o780 0xB -#define MODEL_o782 0xA -#define MODEL_o776 0x9 -#define MODEL_g37 0x8 -#define MODEL_o202 0x7 -#define MODEL_o197 0x6 -#define MODEL_o785 0x5 -#define MODEL_g36 0x4 -#define MODEL_o1276 0x3 -#define MODEL_o187 0x2 -#define MODEL_o184 0x1 -#define MODEL_o784 0x0 +#define MODEL_Root 0xFD +#define MODEL_after 0xFC +#define MODEL_g290 0xFB +#define MODEL_o1451 0xFA +#define MODEL_o1450 0xF9 +#define MODEL_o1449 0xF8 +#define MODEL_o1448 0xF7 +#define MODEL_o1447 0xF6 +#define MODEL_o1446 0xF5 +#define MODEL_o1445 0xF4 +#define MODEL_g279 0xF3 +#define MODEL_g226 0xF2 +#define MODEL_o1163 0xF1 +#define MODEL_o1162 0xF0 +#define MODEL_o1160 0xEF +#define MODEL_o1159 0xEE +#define MODEL_o1158 0xED +#define MODEL_o1157 0xEC +#define MODEL_g282 0xEB +#define MODEL_o1427 0xEA +#define MODEL_o1426 0xE9 +#define MODEL_o1425 0xE8 +#define MODEL_o1424 0xE7 +#define MODEL_o1423 0xE6 +#define MODEL_o1422 0xE5 +#define MODEL_o1421 0xE4 +#define MODEL_g281 0xE3 +#define MODEL_o1420 0xE2 +#define MODEL_o1419 0xE1 +#define MODEL_o1418 0xE0 +#define MODEL_g280 0xDF +#define MODEL_o1437 0xDE +#define MODEL_o1416 0xDD +#define MODEL_o1415 0xDC +#define MODEL_o1414 0xDB +#define MODEL_g197 0xDA +#define MODEL_g247 0xD9 +#define MODEL_g209 0xD8 +#define MODEL_o1142 0xD7 +#define MODEL_o1076 0xD6 +#define MODEL_o1073 0xD5 +#define MODEL_g246 0xD4 +#define MODEL_g210 0xD3 +#define MODEL_o1078 0xD2 +#define MODEL_o1077 0xD1 +#define MODEL_g211 0xD0 +#define MODEL_o1080 0xCF +#define MODEL_o1079 0xCE +#define MODEL_g212 0xCD +#define MODEL_o1082 0xCC +#define MODEL_o1081 0xCB +#define MODEL_g206 0xCA +#define MODEL_o1060 0xC9 +#define MODEL_o1059 0xC8 +#define MODEL_o1058 0xC7 +#define MODEL_o1057 0xC6 +#define MODEL_o1056 0xC5 +#define MODEL_o1055 0xC4 +#define MODEL_g235 0xC3 +#define MODEL_o1209 0xC2 +#define MODEL_o1208 0xC1 +#define MODEL_o1207 0xC0 +#define MODEL_o1206 0xBF +#define MODEL_o1205 0xBE +#define MODEL_o1204 0xBD +#define MODEL_g236 0xBC +#define MODEL_o1215 0xBB +#define MODEL_o1214 0xBA +#define MODEL_o1213 0xB9 +#define MODEL_o1212 0xB8 +#define MODEL_o1211 0xB7 +#define MODEL_o1210 0xB6 +#define MODEL_g237 0xB5 +#define MODEL_o1221 0xB4 +#define MODEL_o1220 0xB3 +#define MODEL_o1219 0xB2 +#define MODEL_o1218 0xB1 +#define MODEL_o1217 0xB0 +#define MODEL_o1216 0xAF +#define MODEL_g238 0xAE +#define MODEL_o1227 0xAD +#define MODEL_o1226 0xAC +#define MODEL_o1225 0xAB +#define MODEL_o1224 0xAA +#define MODEL_o1223 0xA9 +#define MODEL_o1222 0xA8 +#define MODEL_g239 0xA7 +#define MODEL_o1233 0xA6 +#define MODEL_o1232 0xA5 +#define MODEL_o1231 0xA4 +#define MODEL_o1230 0xA3 +#define MODEL_o1229 0xA2 +#define MODEL_o1228 0xA1 +#define MODEL_g240 0xA0 +#define MODEL_o1238 0x9F +#define MODEL_o1237 0x9E +#define MODEL_o1236 0x9D +#define MODEL_o1235 0x9C +#define MODEL_o1234 0x9B +#define MODEL_g241 0x9A +#define MODEL_o1244 0x99 +#define MODEL_o1243 0x98 +#define MODEL_o1242 0x97 +#define MODEL_o1241 0x96 +#define MODEL_o1240 0x95 +#define MODEL_g242 0x94 +#define MODEL_o1249 0x93 +#define MODEL_o1248 0x92 +#define MODEL_o1247 0x91 +#define MODEL_o1246 0x90 +#define MODEL_o1245 0x8F +#define MODEL_g244 0x8E +#define MODEL_o1259 0x8D +#define MODEL_o1258 0x8C +#define MODEL_o1257 0x8B +#define MODEL_o1256 0x8A +#define MODEL_o1255 0x89 +#define MODEL_g245 0x88 +#define MODEL_o1264 0x87 +#define MODEL_o1263 0x86 +#define MODEL_o1262 0x85 +#define MODEL_o1261 0x84 +#define MODEL_o1260 0x83 +#define MODEL_before 0x82 +#define MODEL_g289 0x81 +#define MODEL_o1444 0x80 +#define MODEL_o1443 0x7F +#define MODEL_o1442 0x7E +#define MODEL_o1441 0x7D +#define MODEL_o1440 0x7C +#define MODEL_o1439 0x7B +#define MODEL_o1438 0x7A +#define MODEL_g173 0x79 +#define MODEL_g249 0x78 +#define MODEL_g186 0x77 +#define MODEL_o978 0x76 +#define MODEL_o977 0x75 +#define MODEL_o976 0x74 +#define MODEL_o975 0x73 +#define MODEL_g248 0x72 +#define MODEL_g260 0x71 +#define MODEL_o1342 0x70 +#define MODEL_o1341 0x6F +#define MODEL_o1340 0x6E +#define MODEL_o1339 0x6D +#define MODEL_o1338 0x6C +#define MODEL_o1337 0x6B +#define MODEL_g187 0x6A +#define MODEL_o982 0x69 +#define MODEL_o979 0x68 +#define MODEL_g189 0x67 +#define MODEL_o986 0x66 +#define MODEL_o985 0x65 +#define MODEL_g190 0x64 +#define MODEL_o988 0x63 +#define MODEL_o987 0x62 +#define MODEL_g229 0x61 +#define MODEL_o1179 0x60 +#define MODEL_o1178 0x5F +#define MODEL_o1177 0x5E +#define MODEL_o1176 0x5D +#define MODEL_o1175 0x5C +#define MODEL_o1174 0x5B +#define MODEL_g185 0x5A +#define MODEL_o974 0x59 +#define MODEL_o973 0x58 +#define MODEL_o972 0x57 +#define MODEL_o971 0x56 +#define MODEL_o970 0x55 +#define MODEL_o969 0x54 +#define MODEL_g181 0x53 +#define MODEL_o951 0x52 +#define MODEL_o950 0x51 +#define MODEL_o949 0x50 +#define MODEL_o948 0x4F +#define MODEL_o947 0x4E +#define MODEL_o946 0x4D +#define MODEL_g178 0x4C +#define MODEL_o935 0x4B +#define MODEL_o934 0x4A +#define MODEL_o933 0x49 +#define MODEL_o932 0x48 +#define MODEL_o931 0x47 +#define MODEL_o930 0x46 +#define MODEL_g172 0x45 +#define MODEL_o907 0x44 +#define MODEL_o906 0x43 +#define MODEL_o905 0x42 +#define MODEL_o904 0x41 +#define MODEL_o903 0x40 +#define MODEL_o902 0x3F +#define MODEL_g231 0x3E +#define MODEL_o1190 0x3D +#define MODEL_o1189 0x3C +#define MODEL_o1188 0x3B +#define MODEL_o1187 0x3A +#define MODEL_o1186 0x39 +#define MODEL_g230 0x38 +#define MODEL_o1184 0x37 +#define MODEL_o1183 0x36 +#define MODEL_o1182 0x35 +#define MODEL_o1181 0x34 +#define MODEL_o1180 0x33 +#define MODEL_g176 0x32 +#define MODEL_o923 0x31 +#define MODEL_o922 0x30 +#define MODEL_o921 0x2F +#define MODEL_o920 0x2E +#define MODEL_o919 0x2D +#define MODEL_g175 0x2C +#define MODEL_o918 0x2B +#define MODEL_o917 0x2A +#define MODEL_o916 0x29 +#define MODEL_o915 0x28 +#define MODEL_o914 0x27 +#define MODEL_g171 0x26 +#define MODEL_o900 0x25 +#define MODEL_o899 0x24 +#define MODEL_o898 0x23 +#define MODEL_o897 0x22 +#define MODEL_o896 0x21 +#define MODEL_g35 0x20 +#define MODEL_g38 0x1F +#define MODEL_g259 0x1E +#define MODEL_o1320 0x1D +#define MODEL_o1321 0x1C +#define MODEL_o1316 0x1B +#define MODEL_o1331 0x1A +#define MODEL_g258 0x19 +#define MODEL_o1286 0x18 +#define MODEL_g257 0x17 +#define MODEL_o1285 0x16 +#define MODEL_g256 0x15 +#define MODEL_o1284 0x14 +#define MODEL_g255 0x13 +#define MODEL_o1283 0x12 +#define MODEL_g254 0x11 +#define MODEL_o1282 0x10 +#define MODEL_o892 0xF +#define MODEL_o893 0xE +#define MODEL_o894 0xD +#define MODEL_o895 0xC +#define MODEL_o780 0xB +#define MODEL_o782 0xA +#define MODEL_o776 0x9 +#define MODEL_g37 0x8 +#define MODEL_o202 0x7 +#define MODEL_o197 0x6 +#define MODEL_o785 0x5 +#define MODEL_g36 0x4 +#define MODEL_o1276 0x3 +#define MODEL_o187 0x2 +#define MODEL_o184 0x1 +#define MODEL_o784 0x0 + diff --git a/include/mapfs/kpa_17_hit.h b/include/mapfs/kpa_17_hit.h index 10048abf5e..b4a228ee67 100644 --- a/include/mapfs/kpa_17_hit.h +++ b/include/mapfs/kpa_17_hit.h @@ -1,25 +1,36 @@ -#define COLLIDER_Root 0x18 -#define COLLIDER_g1 0x17 -#define COLLIDER_g266 0x16 -#define COLLIDER_o1585 0x15 -#define COLLIDER_deilitts 0x14 -#define COLLIDER_deilits 0x13 -#define COLLIDER_deilis 0x12 -#define COLLIDER_o1727 0x11 -#define COLLIDER_deilitte 0x10 -#define COLLIDER_deilite 0xF -#define COLLIDER_deilie 0xE -#define COLLIDER_g276 0xD -#define COLLIDER_o1719 0xC -#define COLLIDER_o1717 0xB -#define COLLIDER_o1712 0xA -#define COLLIDER_o1710 0x9 -#define COLLIDER_o1709 0x8 -#define COLLIDER_o1707 0x7 -#define COLLIDER_o1706 0x6 -#define COLLIDER_o1705 0x5 -#define COLLIDER_o335 0x4 -#define COLLIDER_o1639 0x3 -#define COLLIDER_o1754 0x2 -#define COLLIDER_o1751 0x1 -#define COLLIDER_o1726 0x0 +#define COLLIDER_Root 0x18 +#define COLLIDER_g1 0x17 +#define COLLIDER_g266 0x16 +#define COLLIDER_o1585 0x15 +#define COLLIDER_deilitts 0x14 +#define COLLIDER_deilits 0x13 +#define COLLIDER_deilis 0x12 +#define COLLIDER_o1727 0x11 +#define COLLIDER_deilitte 0x10 +#define COLLIDER_deilite 0xF +#define COLLIDER_deilie 0xE +#define COLLIDER_g276 0xD +#define COLLIDER_o1719 0xC +#define COLLIDER_o1717 0xB +#define COLLIDER_o1712 0xA +#define COLLIDER_o1710 0x9 +#define COLLIDER_o1709 0x8 +#define COLLIDER_o1707 0x7 +#define COLLIDER_o1706 0x6 +#define COLLIDER_o1705 0x5 +#define COLLIDER_o335 0x4 +#define COLLIDER_o1639 0x3 +#define COLLIDER_o1754 0x2 +#define COLLIDER_o1751 0x1 +#define COLLIDER_o1726 0x0 + +#define ZONE_Root 0x8 +#define ZONE_g1 0x7 +#define ZONE_g266 0x6 +#define ZONE_deilis 0x5 +#define ZONE_deilie 0x4 +#define ZONE_g276 0x3 +#define ZONE_o1723 0x2 +#define ZONE_o1725 0x1 +#define ZONE_o1726 0x0 + diff --git a/include/mapfs/kpa_17_shape.h b/include/mapfs/kpa_17_shape.h index 78aad254c2..aa3a2fd524 100644 --- a/include/mapfs/kpa_17_shape.h +++ b/include/mapfs/kpa_17_shape.h @@ -1,43 +1,44 @@ -#define MODEL_Root 0x2A -#define MODEL_g294 0x29 -#define MODEL_o1824 0x28 -#define MODEL_o1827 0x27 -#define MODEL_o1826 0x26 -#define MODEL_o1823 0x25 -#define MODEL_o1822 0x24 -#define MODEL_o1817 0x23 -#define MODEL_g317 0x22 -#define MODEL_o1806 0x21 -#define MODEL_o1805 0x20 -#define MODEL_o1804 0x1F -#define MODEL_o1803 0x1E -#define MODEL_g316 0x1D -#define MODEL_o1802 0x1C -#define MODEL_o1801 0x1B -#define MODEL_o1800 0x1A -#define MODEL_o1799 0x19 -#define MODEL_g314 0x18 -#define MODEL_o1794 0x17 -#define MODEL_o1793 0x16 -#define MODEL_o1792 0x15 -#define MODEL_o1791 0x14 -#define MODEL_g313 0x13 -#define MODEL_o1790 0x12 -#define MODEL_o1789 0x11 -#define MODEL_o1788 0x10 -#define MODEL_o1787 0xF -#define MODEL_g312 0xE -#define MODEL_o1786 0xD -#define MODEL_o1785 0xC -#define MODEL_o1784 0xB -#define MODEL_o1783 0xA -#define MODEL_g295 0x9 -#define MODEL_g296 0x8 -#define MODEL_o1709 0x7 -#define MODEL_o1708 0x6 -#define MODEL_g297 0x5 -#define MODEL_o1710 0x4 -#define MODEL_o1707 0x3 -#define MODEL_o1706 0x2 -#define MODEL_o1705 0x1 -#define MODEL_o1704 0x0 +#define MODEL_Root 0x2A +#define MODEL_g294 0x29 +#define MODEL_o1824 0x28 +#define MODEL_o1827 0x27 +#define MODEL_o1826 0x26 +#define MODEL_o1823 0x25 +#define MODEL_o1822 0x24 +#define MODEL_o1817 0x23 +#define MODEL_g317 0x22 +#define MODEL_o1806 0x21 +#define MODEL_o1805 0x20 +#define MODEL_o1804 0x1F +#define MODEL_o1803 0x1E +#define MODEL_g316 0x1D +#define MODEL_o1802 0x1C +#define MODEL_o1801 0x1B +#define MODEL_o1800 0x1A +#define MODEL_o1799 0x19 +#define MODEL_g314 0x18 +#define MODEL_o1794 0x17 +#define MODEL_o1793 0x16 +#define MODEL_o1792 0x15 +#define MODEL_o1791 0x14 +#define MODEL_g313 0x13 +#define MODEL_o1790 0x12 +#define MODEL_o1789 0x11 +#define MODEL_o1788 0x10 +#define MODEL_o1787 0xF +#define MODEL_g312 0xE +#define MODEL_o1786 0xD +#define MODEL_o1785 0xC +#define MODEL_o1784 0xB +#define MODEL_o1783 0xA +#define MODEL_g295 0x9 +#define MODEL_g296 0x8 +#define MODEL_o1709 0x7 +#define MODEL_o1708 0x6 +#define MODEL_g297 0x5 +#define MODEL_o1710 0x4 +#define MODEL_o1707 0x3 +#define MODEL_o1706 0x2 +#define MODEL_o1705 0x1 +#define MODEL_o1704 0x0 + diff --git a/include/mapfs/kpa_32_hit.h b/include/mapfs/kpa_32_hit.h index c70bb34e7a..695f7886ec 100644 --- a/include/mapfs/kpa_32_hit.h +++ b/include/mapfs/kpa_32_hit.h @@ -1,46 +1,52 @@ -#define COLLIDER_Root 0x2D -#define COLLIDER_hasi 0x2C -#define COLLIDER_o975 0x2B -#define COLLIDER_o974 0x2A -#define COLLIDER_o973 0x29 -#define COLLIDER_o972 0x28 -#define COLLIDER_o971 0x27 -#define COLLIDER_o970 0x26 -#define COLLIDER_exit4 0x25 -#define COLLIDER_o958 0x24 -#define COLLIDER_tt4 0x23 -#define COLLIDER_deili4 0x22 -#define COLLIDER_deilit4 0x21 -#define COLLIDER_exit3 0x20 -#define COLLIDER_o952 0x1F -#define COLLIDER_deili3 0x1E -#define COLLIDER_deilit3 0x1D -#define COLLIDER_exit2 0x1C -#define COLLIDER_o943 0x1B -#define COLLIDER_tte 0x1A -#define COLLIDER_deilie 0x19 -#define COLLIDER_deilite 0x18 -#define COLLIDER_exit 0x17 -#define COLLIDER_o947 0x16 -#define COLLIDER_ttw 0x15 -#define COLLIDER_deiliw 0x14 -#define COLLIDER_deilitw 0x13 -#define COLLIDER_F2 0x12 -#define COLLIDER_F2_5 0x11 -#define COLLIDER_f2_5_kabe 0x10 -#define COLLIDER_f2_5_yuka 0xF -#define COLLIDER_f2_4 0xE -#define COLLIDER_f2_4_yuka 0xD -#define COLLIDER_f2_4_mado 0xC -#define COLLIDER_F2_3 0xB -#define COLLIDER_f2_3_yuka 0xA -#define COLLIDER_f2_3_sai 0x9 -#define COLLIDER_f2_2 0x8 -#define COLLIDER_f2_2_yuka 0x7 -#define COLLIDER_f2_2_mado 0x6 -#define COLLIDER_F2_1 0x5 -#define COLLIDER_f2_1_yuka 0x4 -#define COLLIDER_f2_1_kabe 0x3 -#define COLLIDER_naka 0x2 -#define COLLIDER_o868 0x1 -#define COLLIDER_kaidan 0x0 +#define COLLIDER_Root 0x2D +#define COLLIDER_hasi 0x2C +#define COLLIDER_o975 0x2B +#define COLLIDER_o974 0x2A +#define COLLIDER_o973 0x29 +#define COLLIDER_o972 0x28 +#define COLLIDER_o971 0x27 +#define COLLIDER_o970 0x26 +#define COLLIDER_exit4 0x25 +#define COLLIDER_o958 0x24 +#define COLLIDER_tt4 0x23 +#define COLLIDER_deili4 0x22 +#define COLLIDER_deilit4 0x21 +#define COLLIDER_exit3 0x20 +#define COLLIDER_o952 0x1F +#define COLLIDER_deili3 0x1E +#define COLLIDER_deilit3 0x1D +#define COLLIDER_exit2 0x1C +#define COLLIDER_o943 0x1B +#define COLLIDER_tte 0x1A +#define COLLIDER_deilie 0x19 +#define COLLIDER_deilite 0x18 +#define COLLIDER_exit 0x17 +#define COLLIDER_o947 0x16 +#define COLLIDER_ttw 0x15 +#define COLLIDER_deiliw 0x14 +#define COLLIDER_deilitw 0x13 +#define COLLIDER_F2 0x12 +#define COLLIDER_F2_5 0x11 +#define COLLIDER_f2_5_kabe 0x10 +#define COLLIDER_f2_5_yuka 0xF +#define COLLIDER_f2_4 0xE +#define COLLIDER_f2_4_yuka 0xD +#define COLLIDER_f2_4_mado 0xC +#define COLLIDER_F2_3 0xB +#define COLLIDER_f2_3_yuka 0xA +#define COLLIDER_f2_3_sai 0x9 +#define COLLIDER_f2_2 0x8 +#define COLLIDER_f2_2_yuka 0x7 +#define COLLIDER_f2_2_mado 0x6 +#define COLLIDER_F2_1 0x5 +#define COLLIDER_f2_1_yuka 0x4 +#define COLLIDER_f2_1_kabe 0x3 +#define COLLIDER_naka 0x2 +#define COLLIDER_o868 0x1 +#define COLLIDER_kaidan 0x0 + +#define ZONE_Root 0x3 +#define ZONE_naka 0x2 +#define ZONE_f1_yuka 0x1 +#define ZONE_o970 0x0 + diff --git a/include/mapfs/kpa_32_shape.h b/include/mapfs/kpa_32_shape.h index dbfe258d5e..1b6037569e 100644 --- a/include/mapfs/kpa_32_shape.h +++ b/include/mapfs/kpa_32_shape.h @@ -1,169 +1,170 @@ -#define MODEL_Root 0xA8 -#define MODEL_g336 0xA7 -#define MODEL_hi16 0xA6 -#define MODEL_hi15 0xA5 -#define MODEL_hi14 0xA4 -#define MODEL_hi13 0xA3 -#define MODEL_o1347 0xA2 -#define MODEL_o1346 0xA1 -#define MODEL_o1345 0xA0 -#define MODEL_o1344 0x9F -#define MODEL_g335 0x9E -#define MODEL_hi12 0x9D -#define MODEL_hi11 0x9C -#define MODEL_hi10 0x9B -#define MODEL_hi9 0x9A -#define MODEL_o1339 0x99 -#define MODEL_o1338 0x98 -#define MODEL_o1337 0x97 -#define MODEL_o1336 0x96 -#define MODEL_g334 0x95 -#define MODEL_hi8 0x94 -#define MODEL_hi7 0x93 -#define MODEL_hi6 0x92 -#define MODEL_hi5 0x91 -#define MODEL_o1331 0x90 -#define MODEL_o1330 0x8F -#define MODEL_o1329 0x8E -#define MODEL_o1328 0x8D -#define MODEL_g333 0x8C -#define MODEL_hi4 0x8B -#define MODEL_hi3 0x8A -#define MODEL_hi2 0x89 -#define MODEL_hi1 0x88 -#define MODEL_o1323 0x87 -#define MODEL_o1322 0x86 -#define MODEL_o1321 0x85 -#define MODEL_o1320 0x84 -#define MODEL_bero4 0x83 -#define MODEL_b4_doa2 0x82 -#define MODEL_o1256 0x81 -#define MODEL_b4_doa1 0x80 -#define MODEL_b4_doa 0x7F -#define MODEL_b4_zyuutan 0x7E -#define MODEL_b4_yuka 0x7D -#define MODEL_b4_kabe 0x7C -#define MODEL_bero3 0x7B -#define MODEL_o1269 0x7A -#define MODEL_o1268 0x79 -#define MODEL_o1267 0x78 -#define MODEL_bero2 0x77 -#define MODEL_b2_doa2 0x76 -#define MODEL_o1254 0x75 -#define MODEL_b2_doa1 0x74 -#define MODEL_o1248 0x73 -#define MODEL_o1249 0x72 -#define MODEL_b2_zyuutan 0x71 -#define MODEL_bero 0x70 -#define MODEL_b_doa2 0x6F -#define MODEL_o1258 0x6E -#define MODEL_b_doa1 0x6D -#define MODEL_o1257 0x6C -#define MODEL_b_kabe 0x6B -#define MODEL_b_xyuutan 0x6A -#define MODEL_F2 0x69 -#define MODEL_F2_5 0x68 -#define MODEL_o1212 0x67 -#define MODEL_o1211 0x66 -#define MODEL_f2_5_kabe 0x65 -#define MODEL_f2_5_z 0x64 -#define MODEL_f2_5_yuka 0x63 -#define MODEL_f2_5_hisi 0x62 -#define MODEL_f2_4 0x61 -#define MODEL_o1213 0x60 -#define MODEL_f2_4_yuka 0x5F -#define MODEL_f2_4_hisi 0x5E -#define MODEL_F2_3 0x5D -#define MODEL_f2_3_yuka 0x5C -#define MODEL_f2_2 0x5B -#define MODEL_o1214 0x5A -#define MODEL_f2_2_yuka 0x59 -#define MODEL_f2_2_hisi 0x58 -#define MODEL_f2_1 0x57 -#define MODEL_f2_1_z 0x56 -#define MODEL_o1225 0x55 -#define MODEL_o1223 0x54 -#define MODEL_f2_1_k 0x53 -#define MODEL_f2_1_y 0x52 -#define MODEL_o1219 0x51 -#define MODEL_soto 0x50 -#define MODEL_akr4 0x4F -#define MODEL_g330 0x4E -#define MODEL_o1295 0x4D -#define MODEL_o1294 0x4C -#define MODEL_akr3 0x4B -#define MODEL_o1293 0x4A -#define MODEL_akr2 0x49 -#define MODEL_g324 0x48 -#define MODEL_o1289 0x47 -#define MODEL_o1288 0x46 -#define MODEL_akr1 0x45 -#define MODEL_o1287 0x44 -#define MODEL_tuika 0x43 -#define MODEL_o1238 0x42 -#define MODEL_o1237 0x41 -#define MODEL_o1233 0x40 -#define MODEL_o1232 0x3F -#define MODEL_o1231 0x3E -#define MODEL_o1230 0x3D -#define MODEL_s_yuka 0x3C -#define MODEL_s_y_zyuutan 0x3B -#define MODEL_s_y_yuka 0x3A -#define MODEL_s_sai 0x39 -#define MODEL_o1205 0x38 -#define MODEL_o1203 0x37 -#define MODEL_o1173 0x36 -#define MODEL_o1169 0x35 -#define MODEL_o1207 0x34 -#define MODEL_o1201 0x33 -#define MODEL_naka 0x32 -#define MODEL_o1271 0x31 -#define MODEL_f2_saku 0x30 -#define MODEL_saku 0x2F -#define MODEL_hisi 0x2E -#define MODEL_sai 0x2D -#define MODEL_yuka 0x2C -#define MODEL_zyuutann 0x2B -#define MODEL_hasi2 0x2A -#define MODEL_h2_isi 0x29 -#define MODEL_h2_zyu 0x28 -#define MODEL_o1027 0x27 -#define MODEL_hasi 0x26 -#define MODEL_h_isi 0x25 -#define MODEL_h_zyu 0x24 -#define MODEL_o1021 0x23 -#define MODEL_k_zyu 0x22 -#define MODEL_kaidann 0x21 -#define MODEL_k_saku 0x20 -#define MODEL_o1189 0x1F -#define MODEL_k_yuka 0x1E -#define MODEL_o1228 0x1D -#define MODEL_o1227 0x1C -#define MODEL_o1187 0x1B -#define MODEL_o1185 0x1A -#define MODEL_a_oku 0x19 -#define MODEL_f2_3_hisi 0x18 -#define MODEL_f2_3_oku 0x17 -#define MODEL_o1168 0x16 -#define MODEL_o862 0x15 -#define MODEL_o1172 0x14 -#define MODEL_o1167 0x13 -#define MODEL_o1166 0x12 -#define MODEL_o1165 0x11 -#define MODEL_o1164 0x10 -#define MODEL_o861 0xF -#define MODEL_o1163 0xE -#define MODEL_o1162 0xD -#define MODEL_o1161 0xC -#define MODEL_o1160 0xB -#define MODEL_o1159 0xA -#define MODEL_o1158 0x9 -#define MODEL_o1157 0x8 -#define MODEL_o1156 0x7 -#define MODEL_o1062 0x6 -#define MODEL_o1061 0x5 -#define MODEL_o1319 0x4 -#define MODEL_f2_4_mado 0x3 -#define MODEL_f2_2_mado 0x2 -#define MODEL_f2_3_kabe 0x1 -#define MODEL_o1055 0x0 +#define MODEL_Root 0xA8 +#define MODEL_g336 0xA7 +#define MODEL_hi16 0xA6 +#define MODEL_hi15 0xA5 +#define MODEL_hi14 0xA4 +#define MODEL_hi13 0xA3 +#define MODEL_o1347 0xA2 +#define MODEL_o1346 0xA1 +#define MODEL_o1345 0xA0 +#define MODEL_o1344 0x9F +#define MODEL_g335 0x9E +#define MODEL_hi12 0x9D +#define MODEL_hi11 0x9C +#define MODEL_hi10 0x9B +#define MODEL_hi9 0x9A +#define MODEL_o1339 0x99 +#define MODEL_o1338 0x98 +#define MODEL_o1337 0x97 +#define MODEL_o1336 0x96 +#define MODEL_g334 0x95 +#define MODEL_hi8 0x94 +#define MODEL_hi7 0x93 +#define MODEL_hi6 0x92 +#define MODEL_hi5 0x91 +#define MODEL_o1331 0x90 +#define MODEL_o1330 0x8F +#define MODEL_o1329 0x8E +#define MODEL_o1328 0x8D +#define MODEL_g333 0x8C +#define MODEL_hi4 0x8B +#define MODEL_hi3 0x8A +#define MODEL_hi2 0x89 +#define MODEL_hi1 0x88 +#define MODEL_o1323 0x87 +#define MODEL_o1322 0x86 +#define MODEL_o1321 0x85 +#define MODEL_o1320 0x84 +#define MODEL_bero4 0x83 +#define MODEL_b4_doa2 0x82 +#define MODEL_o1256 0x81 +#define MODEL_b4_doa1 0x80 +#define MODEL_b4_doa 0x7F +#define MODEL_b4_zyuutan 0x7E +#define MODEL_b4_yuka 0x7D +#define MODEL_b4_kabe 0x7C +#define MODEL_bero3 0x7B +#define MODEL_o1269 0x7A +#define MODEL_o1268 0x79 +#define MODEL_o1267 0x78 +#define MODEL_bero2 0x77 +#define MODEL_b2_doa2 0x76 +#define MODEL_o1254 0x75 +#define MODEL_b2_doa1 0x74 +#define MODEL_o1248 0x73 +#define MODEL_o1249 0x72 +#define MODEL_b2_zyuutan 0x71 +#define MODEL_bero 0x70 +#define MODEL_b_doa2 0x6F +#define MODEL_o1258 0x6E +#define MODEL_b_doa1 0x6D +#define MODEL_o1257 0x6C +#define MODEL_b_kabe 0x6B +#define MODEL_b_xyuutan 0x6A +#define MODEL_F2 0x69 +#define MODEL_F2_5 0x68 +#define MODEL_o1212 0x67 +#define MODEL_o1211 0x66 +#define MODEL_f2_5_kabe 0x65 +#define MODEL_f2_5_z 0x64 +#define MODEL_f2_5_yuka 0x63 +#define MODEL_f2_5_hisi 0x62 +#define MODEL_f2_4 0x61 +#define MODEL_o1213 0x60 +#define MODEL_f2_4_yuka 0x5F +#define MODEL_f2_4_hisi 0x5E +#define MODEL_F2_3 0x5D +#define MODEL_f2_3_yuka 0x5C +#define MODEL_f2_2 0x5B +#define MODEL_o1214 0x5A +#define MODEL_f2_2_yuka 0x59 +#define MODEL_f2_2_hisi 0x58 +#define MODEL_f2_1 0x57 +#define MODEL_f2_1_z 0x56 +#define MODEL_o1225 0x55 +#define MODEL_o1223 0x54 +#define MODEL_f2_1_k 0x53 +#define MODEL_f2_1_y 0x52 +#define MODEL_o1219 0x51 +#define MODEL_soto 0x50 +#define MODEL_akr4 0x4F +#define MODEL_g330 0x4E +#define MODEL_o1295 0x4D +#define MODEL_o1294 0x4C +#define MODEL_akr3 0x4B +#define MODEL_o1293 0x4A +#define MODEL_akr2 0x49 +#define MODEL_g324 0x48 +#define MODEL_o1289 0x47 +#define MODEL_o1288 0x46 +#define MODEL_akr1 0x45 +#define MODEL_o1287 0x44 +#define MODEL_tuika 0x43 +#define MODEL_o1238 0x42 +#define MODEL_o1237 0x41 +#define MODEL_o1233 0x40 +#define MODEL_o1232 0x3F +#define MODEL_o1231 0x3E +#define MODEL_o1230 0x3D +#define MODEL_s_yuka 0x3C +#define MODEL_s_y_zyuutan 0x3B +#define MODEL_s_y_yuka 0x3A +#define MODEL_s_sai 0x39 +#define MODEL_o1205 0x38 +#define MODEL_o1203 0x37 +#define MODEL_o1173 0x36 +#define MODEL_o1169 0x35 +#define MODEL_o1207 0x34 +#define MODEL_o1201 0x33 +#define MODEL_naka 0x32 +#define MODEL_o1271 0x31 +#define MODEL_f2_saku 0x30 +#define MODEL_saku 0x2F +#define MODEL_hisi 0x2E +#define MODEL_sai 0x2D +#define MODEL_yuka 0x2C +#define MODEL_zyuutann 0x2B +#define MODEL_hasi2 0x2A +#define MODEL_h2_isi 0x29 +#define MODEL_h2_zyu 0x28 +#define MODEL_o1027 0x27 +#define MODEL_hasi 0x26 +#define MODEL_h_isi 0x25 +#define MODEL_h_zyu 0x24 +#define MODEL_o1021 0x23 +#define MODEL_k_zyu 0x22 +#define MODEL_kaidann 0x21 +#define MODEL_k_saku 0x20 +#define MODEL_o1189 0x1F +#define MODEL_k_yuka 0x1E +#define MODEL_o1228 0x1D +#define MODEL_o1227 0x1C +#define MODEL_o1187 0x1B +#define MODEL_o1185 0x1A +#define MODEL_a_oku 0x19 +#define MODEL_f2_3_hisi 0x18 +#define MODEL_f2_3_oku 0x17 +#define MODEL_o1168 0x16 +#define MODEL_o862 0x15 +#define MODEL_o1172 0x14 +#define MODEL_o1167 0x13 +#define MODEL_o1166 0x12 +#define MODEL_o1165 0x11 +#define MODEL_o1164 0x10 +#define MODEL_o861 0xF +#define MODEL_o1163 0xE +#define MODEL_o1162 0xD +#define MODEL_o1161 0xC +#define MODEL_o1160 0xB +#define MODEL_o1159 0xA +#define MODEL_o1158 0x9 +#define MODEL_o1157 0x8 +#define MODEL_o1156 0x7 +#define MODEL_o1062 0x6 +#define MODEL_o1061 0x5 +#define MODEL_o1319 0x4 +#define MODEL_f2_4_mado 0x3 +#define MODEL_f2_2_mado 0x2 +#define MODEL_f2_3_kabe 0x1 +#define MODEL_o1055 0x0 + diff --git a/include/mapfs/kpa_33_hit.h b/include/mapfs/kpa_33_hit.h index 32769904f0..ecac701e58 100644 --- a/include/mapfs/kpa_33_hit.h +++ b/include/mapfs/kpa_33_hit.h @@ -1,46 +1,52 @@ -#define COLLIDER_Root 0x2D -#define COLLIDER_hasi 0x2C -#define COLLIDER_o974 0x2B -#define COLLIDER_o973 0x2A -#define COLLIDER_o972 0x29 -#define COLLIDER_o971 0x28 -#define COLLIDER_o970 0x27 -#define COLLIDER_o969 0x26 -#define COLLIDER_exit4 0x25 -#define COLLIDER_n4 0x24 -#define COLLIDER_tt4 0x23 -#define COLLIDER_deili4 0x22 -#define COLLIDER_deilit4 0x21 -#define COLLIDER_exit3 0x20 -#define COLLIDER_n3 0x1F -#define COLLIDER_tt3 0x1E -#define COLLIDER_deili3 0x1D -#define COLLIDER_deilit3 0x1C -#define COLLIDER_exit2 0x1B -#define COLLIDER_ne 0x1A -#define COLLIDER_tte 0x19 -#define COLLIDER_deilie 0x18 -#define COLLIDER_deilite 0x17 -#define COLLIDER_exit 0x16 -#define COLLIDER_nw 0x15 -#define COLLIDER_deiliw 0x14 -#define COLLIDER_deilitw 0x13 -#define COLLIDER_F2 0x12 -#define COLLIDER_F2_5 0x11 -#define COLLIDER_f2_5_yuka 0x10 -#define COLLIDER_f2_5_sai 0xF -#define COLLIDER_f2_4 0xE -#define COLLIDER_f2_4_yuka 0xD -#define COLLIDER_f2_4_mado 0xC -#define COLLIDER_F2_3 0xB -#define COLLIDER_f2_3_yuka 0xA -#define COLLIDER_f2_3_sai 0x9 -#define COLLIDER_f2_2 0x8 -#define COLLIDER_f2_2_yuka 0x7 -#define COLLIDER_f2_2_sai 0x6 -#define COLLIDER_F2_1 0x5 -#define COLLIDER_f2_1_yuka 0x4 -#define COLLIDER_f2_1_sai 0x3 -#define COLLIDER_naka 0x2 -#define COLLIDER_kabe 0x1 -#define COLLIDER_kaidan 0x0 +#define COLLIDER_Root 0x2D +#define COLLIDER_hasi 0x2C +#define COLLIDER_o974 0x2B +#define COLLIDER_o973 0x2A +#define COLLIDER_o972 0x29 +#define COLLIDER_o971 0x28 +#define COLLIDER_o970 0x27 +#define COLLIDER_o969 0x26 +#define COLLIDER_exit4 0x25 +#define COLLIDER_n4 0x24 +#define COLLIDER_tt4 0x23 +#define COLLIDER_deili4 0x22 +#define COLLIDER_deilit4 0x21 +#define COLLIDER_exit3 0x20 +#define COLLIDER_n3 0x1F +#define COLLIDER_tt3 0x1E +#define COLLIDER_deili3 0x1D +#define COLLIDER_deilit3 0x1C +#define COLLIDER_exit2 0x1B +#define COLLIDER_ne 0x1A +#define COLLIDER_tte 0x19 +#define COLLIDER_deilie 0x18 +#define COLLIDER_deilite 0x17 +#define COLLIDER_exit 0x16 +#define COLLIDER_nw 0x15 +#define COLLIDER_deiliw 0x14 +#define COLLIDER_deilitw 0x13 +#define COLLIDER_F2 0x12 +#define COLLIDER_F2_5 0x11 +#define COLLIDER_f2_5_yuka 0x10 +#define COLLIDER_f2_5_sai 0xF +#define COLLIDER_f2_4 0xE +#define COLLIDER_f2_4_yuka 0xD +#define COLLIDER_f2_4_mado 0xC +#define COLLIDER_F2_3 0xB +#define COLLIDER_f2_3_yuka 0xA +#define COLLIDER_f2_3_sai 0x9 +#define COLLIDER_f2_2 0x8 +#define COLLIDER_f2_2_yuka 0x7 +#define COLLIDER_f2_2_sai 0x6 +#define COLLIDER_F2_1 0x5 +#define COLLIDER_f2_1_yuka 0x4 +#define COLLIDER_f2_1_sai 0x3 +#define COLLIDER_naka 0x2 +#define COLLIDER_kabe 0x1 +#define COLLIDER_kaidan 0x0 + +#define ZONE_Root 0x3 +#define ZONE_naka 0x2 +#define ZONE_f1_yuka 0x1 +#define ZONE_o970 0x0 + diff --git a/include/mapfs/kpa_33_shape.h b/include/mapfs/kpa_33_shape.h index ba7cdb122d..3e2dfd89b9 100644 --- a/include/mapfs/kpa_33_shape.h +++ b/include/mapfs/kpa_33_shape.h @@ -1,168 +1,169 @@ -#define MODEL_Root 0xA7 -#define MODEL_g338 0xA6 -#define MODEL_hi10 0xA5 -#define MODEL_hi9 0xA4 -#define MODEL_hi11 0xA3 -#define MODEL_hi12 0xA2 -#define MODEL_o1306 0xA1 -#define MODEL_o1315 0xA0 -#define MODEL_o1318 0x9F -#define MODEL_o1317 0x9E -#define MODEL_g335 0x9D -#define MODEL_hi16 0x9C -#define MODEL_hi15 0x9B -#define MODEL_hi14 0x9A -#define MODEL_hi13 0x99 -#define MODEL_o1310 0x98 -#define MODEL_o1313 0x97 -#define MODEL_o1314 0x96 -#define MODEL_o1308 0x95 -#define MODEL_g337 0x94 -#define MODEL_hi6 0x93 -#define MODEL_hii5 0x92 -#define MODEL_hi8 0x91 -#define MODEL_hi7 0x90 -#define MODEL_o1321 0x8F -#define MODEL_o1304 0x8E -#define MODEL_o1307 0x8D -#define MODEL_o1320 0x8C -#define MODEL_g336 0x8B -#define MODEL_hi4 0x8A -#define MODEL_hi3 0x89 -#define MODEL_hi2 0x88 -#define MODEL_hi1 0x87 -#define MODEL_o1322 0x86 -#define MODEL_o1323 0x85 -#define MODEL_o1324 0x84 -#define MODEL_o1325 0x83 -#define MODEL_bero4 0x82 -#define MODEL_o1265 0x81 -#define MODEL_o1264 0x80 -#define MODEL_o1263 0x7F -#define MODEL_bero3 0x7E -#define MODEL_b3_doa2 0x7D -#define MODEL_o1250 0x7C -#define MODEL_b3_doa1 0x7B -#define MODEL_b3_doa 0x7A -#define MODEL_o1199 0x79 -#define MODEL_o1198 0x78 -#define MODEL_o1197 0x77 -#define MODEL_bero2 0x76 -#define MODEL_o1261 0x75 -#define MODEL_o1260 0x74 -#define MODEL_g322 0x73 -#define MODEL_o1259 0x72 -#define MODEL_g321 0x71 -#define MODEL_o1258 0x70 -#define MODEL_bero 0x6F -#define MODEL_b_doa2 0x6E -#define MODEL_o1253 0x6D -#define MODEL_b_doa1 0x6C -#define MODEL_o1252 0x6B -#define MODEL_b_kabe 0x6A -#define MODEL_b_xyuutan 0x69 -#define MODEL_F2 0x68 -#define MODEL_F2_5 0x67 -#define MODEL_o1212 0x66 -#define MODEL_o1211 0x65 -#define MODEL_f2_5_kabe 0x64 -#define MODEL_f2_5_zyuutan 0x63 -#define MODEL_f2_5_yuka 0x62 -#define MODEL_f2_5_hisi 0x61 -#define MODEL_f2_4 0x60 -#define MODEL_o1213 0x5F -#define MODEL_f2_4_yuka 0x5E -#define MODEL_f2_4_hisi 0x5D -#define MODEL_F2_3 0x5C -#define MODEL_f2_3_yuka 0x5B -#define MODEL_f2_2 0x5A -#define MODEL_o1214 0x59 -#define MODEL_f2_2_yuka 0x58 -#define MODEL_f2_2_hisi 0x57 -#define MODEL_f2_1 0x56 -#define MODEL_o1225 0x55 -#define MODEL_o1223 0x54 -#define MODEL_o1222 0x53 -#define MODEL_o1220 0x52 -#define MODEL_o1219 0x51 -#define MODEL_soto 0x50 -#define MODEL_akr4 0x4F -#define MODEL_o1290 0x4E -#define MODEL_akr3 0x4D -#define MODEL_g329 0x4C -#define MODEL_o1289 0x4B -#define MODEL_o1288 0x4A -#define MODEL_akr2 0x49 -#define MODEL_o1287 0x48 -#define MODEL_akr1 0x47 -#define MODEL_g326 0x46 -#define MODEL_o1286 0x45 -#define MODEL_o1285 0x44 -#define MODEL_tuika 0x43 -#define MODEL_o1238 0x42 -#define MODEL_o1237 0x41 -#define MODEL_o1233 0x40 -#define MODEL_o1232 0x3F -#define MODEL_o1231 0x3E -#define MODEL_o1230 0x3D -#define MODEL_s_yuka 0x3C -#define MODEL_s_y_zyuutan 0x3B -#define MODEL_s_y_yuka 0x3A -#define MODEL_s_hisi 0x39 -#define MODEL_o1207 0x38 -#define MODEL_o1201 0x37 -#define MODEL_o1167 0x36 -#define MODEL_o1166 0x35 -#define MODEL_o1228 0x34 -#define MODEL_o1227 0x33 -#define MODEL_o1187 0x32 -#define MODEL_o1185 0x31 -#define MODEL_s_sai 0x30 -#define MODEL_o1205 0x2F -#define MODEL_o1203 0x2E -#define MODEL_o1173 0x2D -#define MODEL_o1169 0x2C -#define MODEL_naka 0x2B -#define MODEL_o1262 0x2A -#define MODEL_f2_saku 0x29 -#define MODEL_saku 0x28 -#define MODEL_hisi 0x27 -#define MODEL_sai 0x26 -#define MODEL_yuka 0x25 -#define MODEL_zyuutann 0x24 -#define MODEL_hasi2 0x23 -#define MODEL_h2_isi 0x22 -#define MODEL_h2_zyu 0x21 -#define MODEL_o1027 0x20 -#define MODEL_hasi 0x1F -#define MODEL_h_isi 0x1E -#define MODEL_h_zyu 0x1D -#define MODEL_o1021 0x1C -#define MODEL_kaidann 0x1B -#define MODEL_k_saku 0x1A -#define MODEL_k_zyu 0x19 -#define MODEL_o1189 0x18 -#define MODEL_k_yuka 0x17 -#define MODEL_a_oku 0x16 -#define MODEL_f2_3_oku 0x15 -#define MODEL_f2_3_hisi 0x14 -#define MODEL_o1172 0x13 -#define MODEL_o862 0x12 -#define MODEL_o1168 0x11 -#define MODEL_o1164 0x10 -#define MODEL_o861 0xF -#define MODEL_o1165 0xE -#define MODEL_o1163 0xD -#define MODEL_o1162 0xC -#define MODEL_o1161 0xB -#define MODEL_o1160 0xA -#define MODEL_o1159 0x9 -#define MODEL_o1158 0x8 -#define MODEL_o1157 0x7 -#define MODEL_o1156 0x6 -#define MODEL_o1062 0x5 -#define MODEL_o1299 0x4 -#define MODEL_f2_4_mado 0x3 -#define MODEL_f2_2_mado 0x2 -#define MODEL_f2_3_kabe 0x1 -#define MODEL_o1055 0x0 +#define MODEL_Root 0xA7 +#define MODEL_g338 0xA6 +#define MODEL_hi10 0xA5 +#define MODEL_hi9 0xA4 +#define MODEL_hi11 0xA3 +#define MODEL_hi12 0xA2 +#define MODEL_o1306 0xA1 +#define MODEL_o1315 0xA0 +#define MODEL_o1318 0x9F +#define MODEL_o1317 0x9E +#define MODEL_g335 0x9D +#define MODEL_hi16 0x9C +#define MODEL_hi15 0x9B +#define MODEL_hi14 0x9A +#define MODEL_hi13 0x99 +#define MODEL_o1310 0x98 +#define MODEL_o1313 0x97 +#define MODEL_o1314 0x96 +#define MODEL_o1308 0x95 +#define MODEL_g337 0x94 +#define MODEL_hi6 0x93 +#define MODEL_hii5 0x92 +#define MODEL_hi8 0x91 +#define MODEL_hi7 0x90 +#define MODEL_o1321 0x8F +#define MODEL_o1304 0x8E +#define MODEL_o1307 0x8D +#define MODEL_o1320 0x8C +#define MODEL_g336 0x8B +#define MODEL_hi4 0x8A +#define MODEL_hi3 0x89 +#define MODEL_hi2 0x88 +#define MODEL_hi1 0x87 +#define MODEL_o1322 0x86 +#define MODEL_o1323 0x85 +#define MODEL_o1324 0x84 +#define MODEL_o1325 0x83 +#define MODEL_bero4 0x82 +#define MODEL_o1265 0x81 +#define MODEL_o1264 0x80 +#define MODEL_o1263 0x7F +#define MODEL_bero3 0x7E +#define MODEL_b3_doa2 0x7D +#define MODEL_o1250 0x7C +#define MODEL_b3_doa1 0x7B +#define MODEL_b3_doa 0x7A +#define MODEL_o1199 0x79 +#define MODEL_o1198 0x78 +#define MODEL_o1197 0x77 +#define MODEL_bero2 0x76 +#define MODEL_o1261 0x75 +#define MODEL_o1260 0x74 +#define MODEL_g322 0x73 +#define MODEL_o1259 0x72 +#define MODEL_g321 0x71 +#define MODEL_o1258 0x70 +#define MODEL_bero 0x6F +#define MODEL_b_doa2 0x6E +#define MODEL_o1253 0x6D +#define MODEL_b_doa1 0x6C +#define MODEL_o1252 0x6B +#define MODEL_b_kabe 0x6A +#define MODEL_b_xyuutan 0x69 +#define MODEL_F2 0x68 +#define MODEL_F2_5 0x67 +#define MODEL_o1212 0x66 +#define MODEL_o1211 0x65 +#define MODEL_f2_5_kabe 0x64 +#define MODEL_f2_5_zyuutan 0x63 +#define MODEL_f2_5_yuka 0x62 +#define MODEL_f2_5_hisi 0x61 +#define MODEL_f2_4 0x60 +#define MODEL_o1213 0x5F +#define MODEL_f2_4_yuka 0x5E +#define MODEL_f2_4_hisi 0x5D +#define MODEL_F2_3 0x5C +#define MODEL_f2_3_yuka 0x5B +#define MODEL_f2_2 0x5A +#define MODEL_o1214 0x59 +#define MODEL_f2_2_yuka 0x58 +#define MODEL_f2_2_hisi 0x57 +#define MODEL_f2_1 0x56 +#define MODEL_o1225 0x55 +#define MODEL_o1223 0x54 +#define MODEL_o1222 0x53 +#define MODEL_o1220 0x52 +#define MODEL_o1219 0x51 +#define MODEL_soto 0x50 +#define MODEL_akr4 0x4F +#define MODEL_o1290 0x4E +#define MODEL_akr3 0x4D +#define MODEL_g329 0x4C +#define MODEL_o1289 0x4B +#define MODEL_o1288 0x4A +#define MODEL_akr2 0x49 +#define MODEL_o1287 0x48 +#define MODEL_akr1 0x47 +#define MODEL_g326 0x46 +#define MODEL_o1286 0x45 +#define MODEL_o1285 0x44 +#define MODEL_tuika 0x43 +#define MODEL_o1238 0x42 +#define MODEL_o1237 0x41 +#define MODEL_o1233 0x40 +#define MODEL_o1232 0x3F +#define MODEL_o1231 0x3E +#define MODEL_o1230 0x3D +#define MODEL_s_yuka 0x3C +#define MODEL_s_y_zyuutan 0x3B +#define MODEL_s_y_yuka 0x3A +#define MODEL_s_hisi 0x39 +#define MODEL_o1207 0x38 +#define MODEL_o1201 0x37 +#define MODEL_o1167 0x36 +#define MODEL_o1166 0x35 +#define MODEL_o1228 0x34 +#define MODEL_o1227 0x33 +#define MODEL_o1187 0x32 +#define MODEL_o1185 0x31 +#define MODEL_s_sai 0x30 +#define MODEL_o1205 0x2F +#define MODEL_o1203 0x2E +#define MODEL_o1173 0x2D +#define MODEL_o1169 0x2C +#define MODEL_naka 0x2B +#define MODEL_o1262 0x2A +#define MODEL_f2_saku 0x29 +#define MODEL_saku 0x28 +#define MODEL_hisi 0x27 +#define MODEL_sai 0x26 +#define MODEL_yuka 0x25 +#define MODEL_zyuutann 0x24 +#define MODEL_hasi2 0x23 +#define MODEL_h2_isi 0x22 +#define MODEL_h2_zyu 0x21 +#define MODEL_o1027 0x20 +#define MODEL_hasi 0x1F +#define MODEL_h_isi 0x1E +#define MODEL_h_zyu 0x1D +#define MODEL_o1021 0x1C +#define MODEL_kaidann 0x1B +#define MODEL_k_saku 0x1A +#define MODEL_k_zyu 0x19 +#define MODEL_o1189 0x18 +#define MODEL_k_yuka 0x17 +#define MODEL_a_oku 0x16 +#define MODEL_f2_3_oku 0x15 +#define MODEL_f2_3_hisi 0x14 +#define MODEL_o1172 0x13 +#define MODEL_o862 0x12 +#define MODEL_o1168 0x11 +#define MODEL_o1164 0x10 +#define MODEL_o861 0xF +#define MODEL_o1165 0xE +#define MODEL_o1163 0xD +#define MODEL_o1162 0xC +#define MODEL_o1161 0xB +#define MODEL_o1160 0xA +#define MODEL_o1159 0x9 +#define MODEL_o1158 0x8 +#define MODEL_o1157 0x7 +#define MODEL_o1156 0x6 +#define MODEL_o1062 0x5 +#define MODEL_o1299 0x4 +#define MODEL_f2_4_mado 0x3 +#define MODEL_f2_2_mado 0x2 +#define MODEL_f2_3_kabe 0x1 +#define MODEL_o1055 0x0 + diff --git a/include/mapfs/kpa_40_hit.h b/include/mapfs/kpa_40_hit.h index b23acead6d..e6178be323 100644 --- a/include/mapfs/kpa_40_hit.h +++ b/include/mapfs/kpa_40_hit.h @@ -1,30 +1,37 @@ -#define COLLIDER_Root 0x1D -#define COLLIDER_kaidann 0x1C -#define COLLIDER_o304 0x1B -#define COLLIDER_k_kaidan 0x1A -#define COLLIDER_yuka 0x19 -#define COLLIDER_isi 0x18 -#define COLLIDER_o416 0x17 -#define COLLIDER_exit4 0x16 -#define COLLIDER_tte2 0x15 -#define COLLIDER_ne2 0x14 -#define COLLIDER_deilie2 0x13 -#define COLLIDER_deilite2 0x12 -#define COLLIDER_exit3 0x11 -#define COLLIDER_tte 0x10 -#define COLLIDER_ne 0xF -#define COLLIDER_deilie 0xE -#define COLLIDER_deilite 0xD -#define COLLIDER_exit2 0xC -#define COLLIDER_o526 0xB -#define COLLIDER_exit1 0xA -#define COLLIDER_ttw 0x9 -#define COLLIDER_nw 0x8 -#define COLLIDER_deiliw 0x7 -#define COLLIDER_deilitw 0x6 -#define COLLIDER_g81 0x5 -#define COLLIDER_o541 0x4 -#define COLLIDER_o540 0x3 -#define COLLIDER_o539 0x2 -#define COLLIDER_o121 0x1 -#define COLLIDER_o525 0x0 +#define COLLIDER_Root 0x1D +#define COLLIDER_kaidann 0x1C +#define COLLIDER_o304 0x1B +#define COLLIDER_k_kaidan 0x1A +#define COLLIDER_yuka 0x19 +#define COLLIDER_isi 0x18 +#define COLLIDER_o416 0x17 +#define COLLIDER_exit4 0x16 +#define COLLIDER_tte2 0x15 +#define COLLIDER_ne2 0x14 +#define COLLIDER_deilie2 0x13 +#define COLLIDER_deilite2 0x12 +#define COLLIDER_exit3 0x11 +#define COLLIDER_tte 0x10 +#define COLLIDER_ne 0xF +#define COLLIDER_deilie 0xE +#define COLLIDER_deilite 0xD +#define COLLIDER_exit2 0xC +#define COLLIDER_o526 0xB +#define COLLIDER_exit1 0xA +#define COLLIDER_ttw 0x9 +#define COLLIDER_nw 0x8 +#define COLLIDER_deiliw 0x7 +#define COLLIDER_deilitw 0x6 +#define COLLIDER_g81 0x5 +#define COLLIDER_o541 0x4 +#define COLLIDER_o540 0x3 +#define COLLIDER_o539 0x2 +#define COLLIDER_o121 0x1 +#define COLLIDER_o525 0x0 + +#define ZONE_Root 0x4 +#define ZONE_yuka 0x3 +#define ZONE_3 0x2 +#define ZONE_2 0x1 +#define ZONE_1 0x0 + diff --git a/include/mapfs/kpa_40_shape.h b/include/mapfs/kpa_40_shape.h index b46c019e44..463d08fd30 100644 --- a/include/mapfs/kpa_40_shape.h +++ b/include/mapfs/kpa_40_shape.h @@ -1,93 +1,94 @@ -#define MODEL_Root 0x5C -#define MODEL_g81 0x5B -#define MODEL_g83 0x5A -#define MODEL_o526 0x59 -#define MODEL_g82 0x58 -#define MODEL_o525 0x57 -#define MODEL_akari 0x56 -#define MODEL_hi8 0x55 -#define MODEL_hi9 0x54 -#define MODEL_hi11 0x53 -#define MODEL_hi10 0x52 -#define MODEL_chandelier 0x51 -#define MODEL_s_kusari 0x50 -#define MODEL_s_tetuwa 0x4F -#define MODEL_unit_1f_left 0x4E -#define MODEL_o257 0x4D -#define MODEL_g57 0x4C -#define MODEL_ami 0x4B -#define MODEL_g59 0x4A -#define MODEL_o468 0x49 -#define MODEL_o461 0x48 -#define MODEL_o423 0x47 -#define MODEL_o422 0x46 -#define MODEL_g78 0x45 -#define MODEL_o514 0x44 -#define MODEL_o513 0x43 -#define MODEL_o512 0x42 -#define MODEL_o511 0x41 -#define MODEL_g73 0x40 -#define MODEL_o491 0x3F -#define MODEL_o490 0x3E -#define MODEL_o489 0x3D -#define MODEL_o488 0x3C -#define MODEL_o437 0x3B -#define MODEL_o436 0x3A -#define MODEL_o435 0x39 -#define MODEL_o434 0x38 -#define MODEL_o433 0x37 -#define MODEL_o432 0x36 -#define MODEL_o430 0x35 -#define MODEL_g84 0x34 -#define MODEL_f1_ami 0x33 -#define MODEL_o529 0x32 -#define MODEL_o256 0x31 -#define MODEL_o255 0x30 -#define MODEL_o253 0x2F -#define MODEL_o518 0x2E -#define MODEL_o530 0x2D -#define MODEL_o517 0x2C -#define MODEL_o295 0x2B -#define MODEL_o293 0x2A -#define MODEL_o292 0x29 -#define MODEL_o291 0x28 -#define MODEL_o431 0x27 -#define MODEL_o297 0x26 -#define MODEL_o429 0x25 -#define MODEL_o428 0x24 -#define MODEL_kaidann 0x23 -#define MODEL_o305 0x22 -#define MODEL_o304 0x21 -#define MODEL_k_kaidan 0x20 -#define MODEL_exit4 0x1F -#define MODEL_o341 0x1E -#define MODEL_e4_isi 0x1D -#define MODEL_e4_hisi 0x1C -#define MODEL_e4_sai 0x1B -#define MODEL_e4_zyuutan 0x1A -#define MODEL_exit3 0x19 -#define MODEL_o368 0x18 -#define MODEL_exit2 0x17 -#define MODEL_o390 0x16 -#define MODEL_o389 0x15 -#define MODEL_o388 0x14 -#define MODEL_o387 0x13 -#define MODEL_o386 0x12 -#define MODEL_exit1 0x11 -#define MODEL_o406 0x10 -#define MODEL_o357 0xF -#define MODEL_o356 0xE -#define MODEL_o355 0xD -#define MODEL_o354 0xC -#define MODEL_o353 0xB -#define MODEL_o352 0xA -#define MODEL_o351 0x9 -#define MODEL_saku 0x8 -#define MODEL_o121 0x7 -#define MODEL_yuka 0x6 -#define MODEL_o417 0x5 -#define MODEL_y2_zyuutan 0x4 -#define MODEL_zyuuan 0x3 -#define MODEL_isi 0x2 -#define MODEL_y2_isi 0x1 -#define MODEL_o416 0x0 +#define MODEL_Root 0x5C +#define MODEL_g81 0x5B +#define MODEL_g83 0x5A +#define MODEL_o526 0x59 +#define MODEL_g82 0x58 +#define MODEL_o525 0x57 +#define MODEL_akari 0x56 +#define MODEL_hi8 0x55 +#define MODEL_hi9 0x54 +#define MODEL_hi11 0x53 +#define MODEL_hi10 0x52 +#define MODEL_chandelier 0x51 +#define MODEL_s_kusari 0x50 +#define MODEL_s_tetuwa 0x4F +#define MODEL_unit_1f_left 0x4E +#define MODEL_o257 0x4D +#define MODEL_g57 0x4C +#define MODEL_ami 0x4B +#define MODEL_g59 0x4A +#define MODEL_o468 0x49 +#define MODEL_o461 0x48 +#define MODEL_o423 0x47 +#define MODEL_o422 0x46 +#define MODEL_g78 0x45 +#define MODEL_o514 0x44 +#define MODEL_o513 0x43 +#define MODEL_o512 0x42 +#define MODEL_o511 0x41 +#define MODEL_g73 0x40 +#define MODEL_o491 0x3F +#define MODEL_o490 0x3E +#define MODEL_o489 0x3D +#define MODEL_o488 0x3C +#define MODEL_o437 0x3B +#define MODEL_o436 0x3A +#define MODEL_o435 0x39 +#define MODEL_o434 0x38 +#define MODEL_o433 0x37 +#define MODEL_o432 0x36 +#define MODEL_o430 0x35 +#define MODEL_g84 0x34 +#define MODEL_f1_ami 0x33 +#define MODEL_o529 0x32 +#define MODEL_o256 0x31 +#define MODEL_o255 0x30 +#define MODEL_o253 0x2F +#define MODEL_o518 0x2E +#define MODEL_o530 0x2D +#define MODEL_o517 0x2C +#define MODEL_o295 0x2B +#define MODEL_o293 0x2A +#define MODEL_o292 0x29 +#define MODEL_o291 0x28 +#define MODEL_o431 0x27 +#define MODEL_o297 0x26 +#define MODEL_o429 0x25 +#define MODEL_o428 0x24 +#define MODEL_kaidann 0x23 +#define MODEL_o305 0x22 +#define MODEL_o304 0x21 +#define MODEL_k_kaidan 0x20 +#define MODEL_exit4 0x1F +#define MODEL_o341 0x1E +#define MODEL_e4_isi 0x1D +#define MODEL_e4_hisi 0x1C +#define MODEL_e4_sai 0x1B +#define MODEL_e4_zyuutan 0x1A +#define MODEL_exit3 0x19 +#define MODEL_o368 0x18 +#define MODEL_exit2 0x17 +#define MODEL_o390 0x16 +#define MODEL_o389 0x15 +#define MODEL_o388 0x14 +#define MODEL_o387 0x13 +#define MODEL_o386 0x12 +#define MODEL_exit1 0x11 +#define MODEL_o406 0x10 +#define MODEL_o357 0xF +#define MODEL_o356 0xE +#define MODEL_o355 0xD +#define MODEL_o354 0xC +#define MODEL_o353 0xB +#define MODEL_o352 0xA +#define MODEL_o351 0x9 +#define MODEL_saku 0x8 +#define MODEL_o121 0x7 +#define MODEL_yuka 0x6 +#define MODEL_o417 0x5 +#define MODEL_y2_zyuutan 0x4 +#define MODEL_zyuuan 0x3 +#define MODEL_isi 0x2 +#define MODEL_y2_isi 0x1 +#define MODEL_o416 0x0 + diff --git a/include/mapfs/kpa_41_hit.h b/include/mapfs/kpa_41_hit.h index 53c87b9576..3728d02512 100644 --- a/include/mapfs/kpa_41_hit.h +++ b/include/mapfs/kpa_41_hit.h @@ -1,32 +1,39 @@ -#define COLLIDER_Root 0x1F -#define COLLIDER_exit4 0x1E -#define COLLIDER_tt4 0x1D -#define COLLIDER_n4 0x1C -#define COLLIDER_deili4 0x1B -#define COLLIDER_deilit4 0x1A -#define COLLIDER_exit3 0x19 -#define COLLIDER_tt3 0x18 -#define COLLIDER_n3 0x17 -#define COLLIDER_deili3 0x16 -#define COLLIDER_deilit3 0x15 -#define COLLIDER_exit2 0x14 -#define COLLIDER_tte 0x13 -#define COLLIDER_ne 0x12 -#define COLLIDER_deilie 0x11 -#define COLLIDER_deilite 0x10 -#define COLLIDER_exit 0xF -#define COLLIDER_ttw 0xE -#define COLLIDER_nw 0xD -#define COLLIDER_deiliw 0xC -#define COLLIDER_deilitw 0xB -#define COLLIDER_1 0xA -#define COLLIDER_kabe 0x9 -#define COLLIDER_migi 0x8 -#define COLLIDER_hidari 0x7 -#define COLLIDER_1_oku 0x6 -#define COLLIDER_yuka 0x5 -#define COLLIDER_y_f2 0x4 -#define COLLIDER_y_f1 0x3 -#define COLLIDER_kaidann 0x2 -#define COLLIDER_k_sokumen2 0x1 -#define COLLIDER_k_sokumen 0x0 +#define COLLIDER_Root 0x1F +#define COLLIDER_exit4 0x1E +#define COLLIDER_tt4 0x1D +#define COLLIDER_n4 0x1C +#define COLLIDER_deili4 0x1B +#define COLLIDER_deilit4 0x1A +#define COLLIDER_exit3 0x19 +#define COLLIDER_tt3 0x18 +#define COLLIDER_n3 0x17 +#define COLLIDER_deili3 0x16 +#define COLLIDER_deilit3 0x15 +#define COLLIDER_exit2 0x14 +#define COLLIDER_tte 0x13 +#define COLLIDER_ne 0x12 +#define COLLIDER_deilie 0x11 +#define COLLIDER_deilite 0x10 +#define COLLIDER_exit 0xF +#define COLLIDER_ttw 0xE +#define COLLIDER_nw 0xD +#define COLLIDER_deiliw 0xC +#define COLLIDER_deilitw 0xB +#define COLLIDER_1 0xA +#define COLLIDER_kabe 0x9 +#define COLLIDER_migi 0x8 +#define COLLIDER_hidari 0x7 +#define COLLIDER_1_oku 0x6 +#define COLLIDER_yuka 0x5 +#define COLLIDER_y_f2 0x4 +#define COLLIDER_y_f1 0x3 +#define COLLIDER_kaidann 0x2 +#define COLLIDER_k_sokumen2 0x1 +#define COLLIDER_k_sokumen 0x0 + +#define ZONE_Root 0x4 +#define ZONE_yuka 0x3 +#define ZONE_3 0x2 +#define ZONE_2 0x1 +#define ZONE_1 0x0 + diff --git a/include/mapfs/kpa_41_shape.h b/include/mapfs/kpa_41_shape.h index 8f50cdf431..44f84e4505 100644 --- a/include/mapfs/kpa_41_shape.h +++ b/include/mapfs/kpa_41_shape.h @@ -1,125 +1,126 @@ -#define MODEL_Root 0x7C -#define MODEL_akari 0x7B -#define MODEL_hi11 0x7A -#define MODEL_hi10 0x79 -#define MODEL_hi9 0x78 -#define MODEL_hi8 0x77 -#define MODEL_hi7 0x76 -#define MODEL_hi6 0x75 -#define MODEL_hi5 0x74 -#define MODEL_hi4 0x73 -#define MODEL_hi3 0x72 -#define MODEL_hi1 0x71 -#define MODEL_hi2 0x70 -#define MODEL_tetuwa 0x6F -#define MODEL_chandelier 0x6E -#define MODEL_s_kusari 0x6D -#define MODEL_s_tetuwa 0x6C -#define MODEL_kaidann 0x6B -#define MODEL_o305 0x6A -#define MODEL_o304 0x69 -#define MODEL_k_sokumen2 0x68 -#define MODEL_k_zyuutan2 0x67 -#define MODEL_k_kaidan2 0x66 -#define MODEL_k_kaidan 0x65 -#define MODEL_center_hall 0x64 -#define MODEL_o396 0x63 -#define MODEL_o395 0x62 -#define MODEL_o394 0x61 -#define MODEL_o393 0x60 -#define MODEL_o392 0x5F -#define MODEL_o345 0x5E -#define MODEL_o302 0x5D -#define MODEL_unit_2f_2 0x5C -#define MODEL_o334 0x5B -#define MODEL_o289 0x5A -#define MODEL_o288 0x59 -#define MODEL_o286 0x58 -#define MODEL_o285 0x57 -#define MODEL_o284 0x56 -#define MODEL_unit_2f_1 0x55 -#define MODEL_o332 0x54 -#define MODEL_o269 0x53 -#define MODEL_o268 0x52 -#define MODEL_o267 0x51 -#define MODEL_o265 0x50 -#define MODEL_o264 0x4F -#define MODEL_o263 0x4E -#define MODEL_unit_1f_left 0x4D -#define MODEL_o262 0x4C -#define MODEL_o261 0x4B -#define MODEL_o259 0x4A -#define MODEL_o257 0x49 -#define MODEL_o255 0x48 -#define MODEL_o253 0x47 -#define MODEL_o231 0x46 -#define MODEL_o229 0x45 -#define MODEL_o228 0x44 -#define MODEL_o227 0x43 -#define MODEL_exit4 0x42 -#define MODEL_o341 0x41 -#define MODEL_e4_isi 0x40 -#define MODEL_e4_hisi 0x3F -#define MODEL_e4_sai 0x3E -#define MODEL_e4_zyuutan 0x3D -#define MODEL_exit3 0x3C -#define MODEL_o350 0x3B -#define MODEL_o349 0x3A -#define MODEL_o348 0x39 -#define MODEL_o347 0x38 -#define MODEL_o346 0x37 -#define MODEL_exit2 0x36 -#define MODEL_o378 0x35 -#define MODEL_o377 0x34 -#define MODEL_o376 0x33 -#define MODEL_o375 0x32 -#define MODEL_b2_zyuutan 0x31 -#define MODEL_exit1 0x30 -#define MODEL_o367 0x2F -#define MODEL_o352 0x2E -#define MODEL_o372 0x2D -#define MODEL_o371 0x2C -#define MODEL_o370 0x2B -#define MODEL_o369 0x2A -#define MODEL_g44 0x29 -#define MODEL_o330 0x28 -#define MODEL_o329 0x27 -#define MODEL_o328 0x26 -#define MODEL_o327 0x25 -#define MODEL_o326 0x24 -#define MODEL_o325 0x23 -#define MODEL_o324 0x22 -#define MODEL_o323 0x21 -#define MODEL_o322 0x20 -#define MODEL_o321 0x1F -#define MODEL_o320 0x1E -#define MODEL_g43 0x1D -#define MODEL_o340 0x1C -#define MODEL_o319 0x1B -#define MODEL_o318 0x1A -#define MODEL_o317 0x19 -#define MODEL_o315 0x18 -#define MODEL_o314 0x17 -#define MODEL_o313 0x16 -#define MODEL_g42 0x15 -#define MODEL_o338 0x14 -#define MODEL_o311 0x13 -#define MODEL_o310 0x12 -#define MODEL_o308 0x11 -#define MODEL_o307 0x10 -#define MODEL_o306 0xF -#define MODEL_g41 0xE -#define MODEL_o336 0xD -#define MODEL_o297 0xC -#define MODEL_o296 0xB -#define MODEL_o295 0xA -#define MODEL_o293 0x9 -#define MODEL_o292 0x8 -#define MODEL_o291 0x7 -#define MODEL_saku 0x6 -#define MODEL_o121 0x5 -#define MODEL_yuka 0x4 -#define MODEL_y2_isi 0x3 -#define MODEL_y2_zyuutan 0x2 -#define MODEL_zyuuan 0x1 -#define MODEL_isi 0x0 +#define MODEL_Root 0x7C +#define MODEL_akari 0x7B +#define MODEL_hi11 0x7A +#define MODEL_hi10 0x79 +#define MODEL_hi9 0x78 +#define MODEL_hi8 0x77 +#define MODEL_hi7 0x76 +#define MODEL_hi6 0x75 +#define MODEL_hi5 0x74 +#define MODEL_hi4 0x73 +#define MODEL_hi3 0x72 +#define MODEL_hi1 0x71 +#define MODEL_hi2 0x70 +#define MODEL_tetuwa 0x6F +#define MODEL_chandelier 0x6E +#define MODEL_s_kusari 0x6D +#define MODEL_s_tetuwa 0x6C +#define MODEL_kaidann 0x6B +#define MODEL_o305 0x6A +#define MODEL_o304 0x69 +#define MODEL_k_sokumen2 0x68 +#define MODEL_k_zyuutan2 0x67 +#define MODEL_k_kaidan2 0x66 +#define MODEL_k_kaidan 0x65 +#define MODEL_center_hall 0x64 +#define MODEL_o396 0x63 +#define MODEL_o395 0x62 +#define MODEL_o394 0x61 +#define MODEL_o393 0x60 +#define MODEL_o392 0x5F +#define MODEL_o345 0x5E +#define MODEL_o302 0x5D +#define MODEL_unit_2f_2 0x5C +#define MODEL_o334 0x5B +#define MODEL_o289 0x5A +#define MODEL_o288 0x59 +#define MODEL_o286 0x58 +#define MODEL_o285 0x57 +#define MODEL_o284 0x56 +#define MODEL_unit_2f_1 0x55 +#define MODEL_o332 0x54 +#define MODEL_o269 0x53 +#define MODEL_o268 0x52 +#define MODEL_o267 0x51 +#define MODEL_o265 0x50 +#define MODEL_o264 0x4F +#define MODEL_o263 0x4E +#define MODEL_unit_1f_left 0x4D +#define MODEL_o262 0x4C +#define MODEL_o261 0x4B +#define MODEL_o259 0x4A +#define MODEL_o257 0x49 +#define MODEL_o255 0x48 +#define MODEL_o253 0x47 +#define MODEL_o231 0x46 +#define MODEL_o229 0x45 +#define MODEL_o228 0x44 +#define MODEL_o227 0x43 +#define MODEL_exit4 0x42 +#define MODEL_o341 0x41 +#define MODEL_e4_isi 0x40 +#define MODEL_e4_hisi 0x3F +#define MODEL_e4_sai 0x3E +#define MODEL_e4_zyuutan 0x3D +#define MODEL_exit3 0x3C +#define MODEL_o350 0x3B +#define MODEL_o349 0x3A +#define MODEL_o348 0x39 +#define MODEL_o347 0x38 +#define MODEL_o346 0x37 +#define MODEL_exit2 0x36 +#define MODEL_o378 0x35 +#define MODEL_o377 0x34 +#define MODEL_o376 0x33 +#define MODEL_o375 0x32 +#define MODEL_b2_zyuutan 0x31 +#define MODEL_exit1 0x30 +#define MODEL_o367 0x2F +#define MODEL_o352 0x2E +#define MODEL_o372 0x2D +#define MODEL_o371 0x2C +#define MODEL_o370 0x2B +#define MODEL_o369 0x2A +#define MODEL_g44 0x29 +#define MODEL_o330 0x28 +#define MODEL_o329 0x27 +#define MODEL_o328 0x26 +#define MODEL_o327 0x25 +#define MODEL_o326 0x24 +#define MODEL_o325 0x23 +#define MODEL_o324 0x22 +#define MODEL_o323 0x21 +#define MODEL_o322 0x20 +#define MODEL_o321 0x1F +#define MODEL_o320 0x1E +#define MODEL_g43 0x1D +#define MODEL_o340 0x1C +#define MODEL_o319 0x1B +#define MODEL_o318 0x1A +#define MODEL_o317 0x19 +#define MODEL_o315 0x18 +#define MODEL_o314 0x17 +#define MODEL_o313 0x16 +#define MODEL_g42 0x15 +#define MODEL_o338 0x14 +#define MODEL_o311 0x13 +#define MODEL_o310 0x12 +#define MODEL_o308 0x11 +#define MODEL_o307 0x10 +#define MODEL_o306 0xF +#define MODEL_g41 0xE +#define MODEL_o336 0xD +#define MODEL_o297 0xC +#define MODEL_o296 0xB +#define MODEL_o295 0xA +#define MODEL_o293 0x9 +#define MODEL_o292 0x8 +#define MODEL_o291 0x7 +#define MODEL_saku 0x6 +#define MODEL_o121 0x5 +#define MODEL_yuka 0x4 +#define MODEL_y2_isi 0x3 +#define MODEL_y2_zyuutan 0x2 +#define MODEL_zyuuan 0x1 +#define MODEL_isi 0x0 + diff --git a/include/mapfs/kpa_50_hit.h b/include/mapfs/kpa_50_hit.h index 56e15cf9dc..6d104022ae 100644 --- a/include/mapfs/kpa_50_hit.h +++ b/include/mapfs/kpa_50_hit.h @@ -1,18 +1,26 @@ -#define COLLIDER_Root 0x11 -#define COLLIDER_exit 0x10 -#define COLLIDER_e2 0xF -#define COLLIDER_tte 0xE -#define COLLIDER_deilie 0xD -#define COLLIDER_deilite 0xC -#define COLLIDER_ne 0xB -#define COLLIDER_e1 0xA -#define COLLIDER_ttw 0x9 -#define COLLIDER_deiliw 0x8 -#define COLLIDER_deilitw 0x7 -#define COLLIDER_nw 0x6 -#define COLLIDER_1 0x5 -#define COLLIDER_o183 0x4 -#define COLLIDER_1_ten 0x3 -#define COLLIDER_1_isi 0x2 -#define COLLIDER_e1_sai 0x1 -#define COLLIDER_e2_sai 0x0 +#define COLLIDER_Root 0x11 +#define COLLIDER_exit 0x10 +#define COLLIDER_e2 0xF +#define COLLIDER_tte 0xE +#define COLLIDER_deilie 0xD +#define COLLIDER_deilite 0xC +#define COLLIDER_ne 0xB +#define COLLIDER_e1 0xA +#define COLLIDER_ttw 0x9 +#define COLLIDER_deiliw 0x8 +#define COLLIDER_deilitw 0x7 +#define COLLIDER_nw 0x6 +#define COLLIDER_1 0x5 +#define COLLIDER_o183 0x4 +#define COLLIDER_1_ten 0x3 +#define COLLIDER_1_isi 0x2 +#define COLLIDER_e1_sai 0x1 +#define COLLIDER_e2_sai 0x0 + +#define ZONE_Root 0x5 +#define ZONE_exit 0x4 +#define ZONE_e 0x3 +#define ZONE_w 0x2 +#define ZONE_1 0x1 +#define ZONE_road 0x0 + diff --git a/include/mapfs/kpa_50_shape.h b/include/mapfs/kpa_50_shape.h index 9b278c3491..e3f3d1e9b5 100644 --- a/include/mapfs/kpa_50_shape.h +++ b/include/mapfs/kpa_50_shape.h @@ -1,139 +1,140 @@ -#define MODEL_Root 0x8A -#define MODEL_doa 0x89 -#define MODEL_de2 0x88 -#define MODEL_o324 0x87 -#define MODEL_de1 0x86 -#define MODEL_o322 0x85 -#define MODEL_dw2 0x84 -#define MODEL_o323 0x83 -#define MODEL_dw1 0x82 -#define MODEL_o321 0x81 -#define MODEL_exit 0x80 -#define MODEL_o342 0x7F -#define MODEL_exite 0x7E -#define MODEL_o281 0x7D -#define MODEL_o280 0x7C -#define MODEL_o279 0x7B -#define MODEL_o278 0x7A -#define MODEL_ee_zyu 0x79 -#define MODEL_exitw 0x78 -#define MODEL_o319 0x77 -#define MODEL_o318 0x76 -#define MODEL_o317 0x75 -#define MODEL_o316 0x74 -#define MODEL_ew_zyu 0x73 -#define MODEL_g35 0x72 -#define MODEL_zyu 0x71 -#define MODEL_isi 0x70 -#define MODEL_9 0x6F -#define MODEL_o253 0x6E -#define MODEL_o252 0x6D -#define MODEL_o251 0x6C -#define MODEL_o250 0x6B -#define MODEL_o249 0x6A -#define MODEL_o248 0x69 -#define MODEL_o247 0x68 -#define MODEL_8 0x67 -#define MODEL_o259 0x66 -#define MODEL_o258 0x65 -#define MODEL_o257 0x64 -#define MODEL_o256 0x63 -#define MODEL_o255 0x62 -#define MODEL_o254 0x61 -#define MODEL_7 0x60 -#define MODEL_o246 0x5F -#define MODEL_o245 0x5E -#define MODEL_o244 0x5D -#define MODEL_o243 0x5C -#define MODEL_o242 0x5B -#define MODEL_o241 0x5A -#define MODEL_o240 0x59 -#define MODEL_6 0x58 -#define MODEL_o239 0x57 -#define MODEL_o238 0x56 -#define MODEL_o237 0x55 -#define MODEL_o236 0x54 -#define MODEL_o235 0x53 -#define MODEL_o234 0x52 -#define MODEL_5 0x51 -#define MODEL_o227 0x50 -#define MODEL_o226 0x4F -#define MODEL_o225 0x4E -#define MODEL_o224 0x4D -#define MODEL_o223 0x4C -#define MODEL_o222 0x4B -#define MODEL_o221 0x4A -#define MODEL_4 0x49 -#define MODEL_o233 0x48 -#define MODEL_o232 0x47 -#define MODEL_o231 0x46 -#define MODEL_o230 0x45 -#define MODEL_o229 0x44 -#define MODEL_o228 0x43 -#define MODEL_3 0x42 -#define MODEL_o208 0x41 -#define MODEL_o207 0x40 -#define MODEL_o206 0x3F -#define MODEL_o205 0x3E -#define MODEL_o204 0x3D -#define MODEL_o203 0x3C -#define MODEL_o202 0x3B -#define MODEL_2 0x3A -#define MODEL_o201 0x39 -#define MODEL_o200 0x38 -#define MODEL_o199 0x37 -#define MODEL_o198 0x36 -#define MODEL_o197 0x35 -#define MODEL_o196 0x34 -#define MODEL_1 0x33 -#define MODEL_o220 0x32 -#define MODEL_o219 0x31 -#define MODEL_o218 0x30 -#define MODEL_o217 0x2F -#define MODEL_o216 0x2E -#define MODEL_o215 0x2D -#define MODEL_o214 0x2C -#define MODEL_hasira 0x2B -#define MODEL_h8 0x2A -#define MODEL_o308 0x29 -#define MODEL_o307 0x28 -#define MODEL_o306 0x27 -#define MODEL_h7 0x26 -#define MODEL_o305 0x25 -#define MODEL_o304 0x24 -#define MODEL_o303 0x23 -#define MODEL_h6 0x22 -#define MODEL_o302 0x21 -#define MODEL_o301 0x20 -#define MODEL_o300 0x1F -#define MODEL_h5 0x1E -#define MODEL_o299 0x1D -#define MODEL_o298 0x1C -#define MODEL_o297 0x1B -#define MODEL_h4 0x1A -#define MODEL_o296 0x19 -#define MODEL_o295 0x18 -#define MODEL_o294 0x17 -#define MODEL_h3 0x16 -#define MODEL_o293 0x15 -#define MODEL_o292 0x14 -#define MODEL_o291 0x13 -#define MODEL_h2 0x12 -#define MODEL_o290 0x11 -#define MODEL_o289 0x10 -#define MODEL_o288 0xF -#define MODEL_h1 0xE -#define MODEL_o314 0xD -#define MODEL_o313 0xC -#define MODEL_o312 0xB -#define MODEL_akari 0xA -#define MODEL_kusari 0x9 -#define MODEL_hi8 0x8 -#define MODEL_hi7 0x7 -#define MODEL_hi6 0x6 -#define MODEL_hi5 0x5 -#define MODEL_hi4 0x4 -#define MODEL_hi3 0x3 -#define MODEL_hi2 0x2 -#define MODEL_hi 0x1 -#define MODEL_tetuwa 0x0 +#define MODEL_Root 0x8A +#define MODEL_doa 0x89 +#define MODEL_de2 0x88 +#define MODEL_o324 0x87 +#define MODEL_de1 0x86 +#define MODEL_o322 0x85 +#define MODEL_dw2 0x84 +#define MODEL_o323 0x83 +#define MODEL_dw1 0x82 +#define MODEL_o321 0x81 +#define MODEL_exit 0x80 +#define MODEL_o342 0x7F +#define MODEL_exite 0x7E +#define MODEL_o281 0x7D +#define MODEL_o280 0x7C +#define MODEL_o279 0x7B +#define MODEL_o278 0x7A +#define MODEL_ee_zyu 0x79 +#define MODEL_exitw 0x78 +#define MODEL_o319 0x77 +#define MODEL_o318 0x76 +#define MODEL_o317 0x75 +#define MODEL_o316 0x74 +#define MODEL_ew_zyu 0x73 +#define MODEL_g35 0x72 +#define MODEL_zyu 0x71 +#define MODEL_isi 0x70 +#define MODEL_9 0x6F +#define MODEL_o253 0x6E +#define MODEL_o252 0x6D +#define MODEL_o251 0x6C +#define MODEL_o250 0x6B +#define MODEL_o249 0x6A +#define MODEL_o248 0x69 +#define MODEL_o247 0x68 +#define MODEL_8 0x67 +#define MODEL_o259 0x66 +#define MODEL_o258 0x65 +#define MODEL_o257 0x64 +#define MODEL_o256 0x63 +#define MODEL_o255 0x62 +#define MODEL_o254 0x61 +#define MODEL_7 0x60 +#define MODEL_o246 0x5F +#define MODEL_o245 0x5E +#define MODEL_o244 0x5D +#define MODEL_o243 0x5C +#define MODEL_o242 0x5B +#define MODEL_o241 0x5A +#define MODEL_o240 0x59 +#define MODEL_6 0x58 +#define MODEL_o239 0x57 +#define MODEL_o238 0x56 +#define MODEL_o237 0x55 +#define MODEL_o236 0x54 +#define MODEL_o235 0x53 +#define MODEL_o234 0x52 +#define MODEL_5 0x51 +#define MODEL_o227 0x50 +#define MODEL_o226 0x4F +#define MODEL_o225 0x4E +#define MODEL_o224 0x4D +#define MODEL_o223 0x4C +#define MODEL_o222 0x4B +#define MODEL_o221 0x4A +#define MODEL_4 0x49 +#define MODEL_o233 0x48 +#define MODEL_o232 0x47 +#define MODEL_o231 0x46 +#define MODEL_o230 0x45 +#define MODEL_o229 0x44 +#define MODEL_o228 0x43 +#define MODEL_3 0x42 +#define MODEL_o208 0x41 +#define MODEL_o207 0x40 +#define MODEL_o206 0x3F +#define MODEL_o205 0x3E +#define MODEL_o204 0x3D +#define MODEL_o203 0x3C +#define MODEL_o202 0x3B +#define MODEL_2 0x3A +#define MODEL_o201 0x39 +#define MODEL_o200 0x38 +#define MODEL_o199 0x37 +#define MODEL_o198 0x36 +#define MODEL_o197 0x35 +#define MODEL_o196 0x34 +#define MODEL_1 0x33 +#define MODEL_o220 0x32 +#define MODEL_o219 0x31 +#define MODEL_o218 0x30 +#define MODEL_o217 0x2F +#define MODEL_o216 0x2E +#define MODEL_o215 0x2D +#define MODEL_o214 0x2C +#define MODEL_hasira 0x2B +#define MODEL_h8 0x2A +#define MODEL_o308 0x29 +#define MODEL_o307 0x28 +#define MODEL_o306 0x27 +#define MODEL_h7 0x26 +#define MODEL_o305 0x25 +#define MODEL_o304 0x24 +#define MODEL_o303 0x23 +#define MODEL_h6 0x22 +#define MODEL_o302 0x21 +#define MODEL_o301 0x20 +#define MODEL_o300 0x1F +#define MODEL_h5 0x1E +#define MODEL_o299 0x1D +#define MODEL_o298 0x1C +#define MODEL_o297 0x1B +#define MODEL_h4 0x1A +#define MODEL_o296 0x19 +#define MODEL_o295 0x18 +#define MODEL_o294 0x17 +#define MODEL_h3 0x16 +#define MODEL_o293 0x15 +#define MODEL_o292 0x14 +#define MODEL_o291 0x13 +#define MODEL_h2 0x12 +#define MODEL_o290 0x11 +#define MODEL_o289 0x10 +#define MODEL_o288 0xF +#define MODEL_h1 0xE +#define MODEL_o314 0xD +#define MODEL_o313 0xC +#define MODEL_o312 0xB +#define MODEL_akari 0xA +#define MODEL_kusari 0x9 +#define MODEL_hi8 0x8 +#define MODEL_hi7 0x7 +#define MODEL_hi6 0x6 +#define MODEL_hi5 0x5 +#define MODEL_hi4 0x4 +#define MODEL_hi3 0x3 +#define MODEL_hi2 0x2 +#define MODEL_hi 0x1 +#define MODEL_tetuwa 0x0 + diff --git a/include/mapfs/kpa_51_hit.h b/include/mapfs/kpa_51_hit.h index b149746b8f..76050b01e8 100644 --- a/include/mapfs/kpa_51_hit.h +++ b/include/mapfs/kpa_51_hit.h @@ -1 +1,4 @@ -#define COLLIDER_Root 0x0 +#define COLLIDER_Root 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/kpa_51_shape.h b/include/mapfs/kpa_51_shape.h index 98ef430c86..dee3600cd9 100644 --- a/include/mapfs/kpa_51_shape.h +++ b/include/mapfs/kpa_51_shape.h @@ -1 +1,2 @@ -#define MODEL_Root 0x0 +#define MODEL_Root 0x0 + diff --git a/include/mapfs/kpa_52_hit.h b/include/mapfs/kpa_52_hit.h index 89e1071a21..1d98a59331 100644 --- a/include/mapfs/kpa_52_hit.h +++ b/include/mapfs/kpa_52_hit.h @@ -1,29 +1,36 @@ -#define COLLIDER_Root 0x1C -#define COLLIDER_exit3 0x1B -#define COLLIDER_ne2 0x1A -#define COLLIDER_tte2 0x19 -#define COLLIDER_deilie2 0x18 -#define COLLIDER_deilite2 0x17 -#define COLLIDER_exit2 0x16 -#define COLLIDER_nw 0x15 -#define COLLIDER_ttw 0x14 -#define COLLIDER_deiliw 0x13 -#define COLLIDER_deilitw 0x12 -#define COLLIDER_exit1 0x11 -#define COLLIDER_ne1 0x10 -#define COLLIDER_tte1 0xF -#define COLLIDER_deilie1 0xE -#define COLLIDER_deilite1 0xD -#define COLLIDER_6 0xC -#define COLLIDER_o146 0xB -#define COLLIDER_e3_isi 0xA -#define COLLIDER_e1_isi 0x9 -#define COLLIDER_e2_sai 0x8 -#define COLLIDER_yuka2 0x7 -#define COLLIDER_y2_isi 0x6 -#define COLLIDER_yuka 0x5 -#define COLLIDER_zyuuan 0x4 -#define COLLIDER_isi 0x3 -#define COLLIDER_kaidann 0x2 -#define COLLIDER_o159 0x1 -#define COLLIDER_o158 0x0 +#define COLLIDER_Root 0x1C +#define COLLIDER_exit3 0x1B +#define COLLIDER_ne2 0x1A +#define COLLIDER_tte2 0x19 +#define COLLIDER_deilie2 0x18 +#define COLLIDER_deilite2 0x17 +#define COLLIDER_exit2 0x16 +#define COLLIDER_nw 0x15 +#define COLLIDER_ttw 0x14 +#define COLLIDER_deiliw 0x13 +#define COLLIDER_deilitw 0x12 +#define COLLIDER_exit1 0x11 +#define COLLIDER_ne1 0x10 +#define COLLIDER_tte1 0xF +#define COLLIDER_deilie1 0xE +#define COLLIDER_deilite1 0xD +#define COLLIDER_6 0xC +#define COLLIDER_o146 0xB +#define COLLIDER_e3_isi 0xA +#define COLLIDER_e1_isi 0x9 +#define COLLIDER_e2_sai 0x8 +#define COLLIDER_yuka2 0x7 +#define COLLIDER_y2_isi 0x6 +#define COLLIDER_yuka 0x5 +#define COLLIDER_zyuuan 0x4 +#define COLLIDER_isi 0x3 +#define COLLIDER_kaidann 0x2 +#define COLLIDER_o159 0x1 +#define COLLIDER_o158 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g9 0x3 +#define ZONE_3 0x2 +#define ZONE_2 0x1 +#define ZONE_1 0x0 + diff --git a/include/mapfs/kpa_52_shape.h b/include/mapfs/kpa_52_shape.h index e912241b0f..23aa07790f 100644 --- a/include/mapfs/kpa_52_shape.h +++ b/include/mapfs/kpa_52_shape.h @@ -1,134 +1,135 @@ -#define MODEL_Root 0x85 -#define MODEL_doa 0x84 -#define MODEL_doa6 0x83 -#define MODEL_o412 0x82 -#define MODEL_doa5 0x81 -#define MODEL_o411 0x80 -#define MODEL_doa4 0x7F -#define MODEL_o410 0x7E -#define MODEL_doa3 0x7D -#define MODEL_o409 0x7C -#define MODEL_doa2 0x7B -#define MODEL_o408 0x7A -#define MODEL_doa1 0x79 -#define MODEL_o407 0x78 -#define MODEL_akari 0x77 -#define MODEL_hi11 0x76 -#define MODEL_hi10 0x75 -#define MODEL_hi9 0x74 -#define MODEL_hi8 0x73 -#define MODEL_hi7 0x72 -#define MODEL_hi6 0x71 -#define MODEL_hi5 0x70 -#define MODEL_hi4 0x6F -#define MODEL_hi3 0x6E -#define MODEL_hi2 0x6D -#define MODEL_hi1 0x6C -#define MODEL_chandelier 0x6B -#define MODEL_s_kusari 0x6A -#define MODEL_s_tetuwa 0x69 -#define MODEL_o439 0x68 -#define MODEL_kusari 0x67 -#define MODEL_o440 0x66 -#define MODEL_tetuwa 0x65 -#define MODEL_kaidann 0x64 -#define MODEL_o305 0x63 -#define MODEL_o304 0x62 -#define MODEL_k_kaidan 0x61 -#define MODEL_exit4 0x60 -#define MODEL_o429 0x5F -#define MODEL_o341 0x5E -#define MODEL_e4_isi 0x5D -#define MODEL_e4_hisi 0x5C -#define MODEL_e4_sai 0x5B -#define MODEL_e4_zyuutan 0x5A -#define MODEL_exit2 0x59 -#define MODEL_o428 0x58 -#define MODEL_o390 0x57 -#define MODEL_o389 0x56 -#define MODEL_o388 0x55 -#define MODEL_o387 0x54 -#define MODEL_o386 0x53 -#define MODEL_exit1 0x52 -#define MODEL_o427 0x51 -#define MODEL_o357 0x50 -#define MODEL_o356 0x4F -#define MODEL_o355 0x4E -#define MODEL_o354 0x4D -#define MODEL_o353 0x4C -#define MODEL_o352 0x4B -#define MODEL_o351 0x4A -#define MODEL_unit_2f_2 0x49 -#define MODEL_o334 0x48 -#define MODEL_o289 0x47 -#define MODEL_o288 0x46 -#define MODEL_o286 0x45 -#define MODEL_o285 0x44 -#define MODEL_o284 0x43 -#define MODEL_unit_2f_1 0x42 -#define MODEL_o332 0x41 -#define MODEL_o269 0x40 -#define MODEL_o268 0x3F -#define MODEL_o267 0x3E -#define MODEL_o265 0x3D -#define MODEL_o264 0x3C -#define MODEL_o263 0x3B -#define MODEL_unit_1f_left 0x3A -#define MODEL_o262 0x39 -#define MODEL_o261 0x38 -#define MODEL_o259 0x37 -#define MODEL_o257 0x36 -#define MODEL_o256 0x35 -#define MODEL_o255 0x34 -#define MODEL_o253 0x33 -#define MODEL_o231 0x32 -#define MODEL_o229 0x31 -#define MODEL_o228 0x30 -#define MODEL_o227 0x2F -#define MODEL_abc 0x2E -#define MODEL_o385 0x2D -#define MODEL_o384 0x2C -#define MODEL_o383 0x2B -#define MODEL_o382 0x2A -#define MODEL_o381 0x29 -#define MODEL_o330 0x28 -#define MODEL_o329 0x27 -#define MODEL_o328 0x26 -#define MODEL_o327 0x25 -#define MODEL_o326 0x24 -#define MODEL_o325 0x23 -#define MODEL_o324 0x22 -#define MODEL_o323 0x21 -#define MODEL_o322 0x20 -#define MODEL_o321 0x1F -#define MODEL_o320 0x1E -#define MODEL_g41 0x1D -#define MODEL_o336 0x1C -#define MODEL_o297 0x1B -#define MODEL_o296 0x1A -#define MODEL_o295 0x19 -#define MODEL_o293 0x18 -#define MODEL_o292 0x17 -#define MODEL_o291 0x16 -#define MODEL_g42 0x15 -#define MODEL_o338 0x14 -#define MODEL_o311 0x13 -#define MODEL_o310 0x12 -#define MODEL_o308 0x11 -#define MODEL_o307 0x10 -#define MODEL_o306 0xF -#define MODEL_g43 0xE -#define MODEL_o340 0xD -#define MODEL_o319 0xC -#define MODEL_o318 0xB -#define MODEL_o317 0xA -#define MODEL_o315 0x9 -#define MODEL_o314 0x8 -#define MODEL_o313 0x7 -#define MODEL_saku 0x6 -#define MODEL_o121 0x5 -#define MODEL_yuka 0x4 -#define MODEL_y2_isi 0x3 -#define MODEL_y2_zyuutan 0x2 -#define MODEL_zyuuan 0x1 -#define MODEL_isi 0x0 +#define MODEL_Root 0x85 +#define MODEL_doa 0x84 +#define MODEL_doa6 0x83 +#define MODEL_o412 0x82 +#define MODEL_doa5 0x81 +#define MODEL_o411 0x80 +#define MODEL_doa4 0x7F +#define MODEL_o410 0x7E +#define MODEL_doa3 0x7D +#define MODEL_o409 0x7C +#define MODEL_doa2 0x7B +#define MODEL_o408 0x7A +#define MODEL_doa1 0x79 +#define MODEL_o407 0x78 +#define MODEL_akari 0x77 +#define MODEL_hi11 0x76 +#define MODEL_hi10 0x75 +#define MODEL_hi9 0x74 +#define MODEL_hi8 0x73 +#define MODEL_hi7 0x72 +#define MODEL_hi6 0x71 +#define MODEL_hi5 0x70 +#define MODEL_hi4 0x6F +#define MODEL_hi3 0x6E +#define MODEL_hi2 0x6D +#define MODEL_hi1 0x6C +#define MODEL_chandelier 0x6B +#define MODEL_s_kusari 0x6A +#define MODEL_s_tetuwa 0x69 +#define MODEL_o439 0x68 +#define MODEL_kusari 0x67 +#define MODEL_o440 0x66 +#define MODEL_tetuwa 0x65 +#define MODEL_kaidann 0x64 +#define MODEL_o305 0x63 +#define MODEL_o304 0x62 +#define MODEL_k_kaidan 0x61 +#define MODEL_exit4 0x60 +#define MODEL_o429 0x5F +#define MODEL_o341 0x5E +#define MODEL_e4_isi 0x5D +#define MODEL_e4_hisi 0x5C +#define MODEL_e4_sai 0x5B +#define MODEL_e4_zyuutan 0x5A +#define MODEL_exit2 0x59 +#define MODEL_o428 0x58 +#define MODEL_o390 0x57 +#define MODEL_o389 0x56 +#define MODEL_o388 0x55 +#define MODEL_o387 0x54 +#define MODEL_o386 0x53 +#define MODEL_exit1 0x52 +#define MODEL_o427 0x51 +#define MODEL_o357 0x50 +#define MODEL_o356 0x4F +#define MODEL_o355 0x4E +#define MODEL_o354 0x4D +#define MODEL_o353 0x4C +#define MODEL_o352 0x4B +#define MODEL_o351 0x4A +#define MODEL_unit_2f_2 0x49 +#define MODEL_o334 0x48 +#define MODEL_o289 0x47 +#define MODEL_o288 0x46 +#define MODEL_o286 0x45 +#define MODEL_o285 0x44 +#define MODEL_o284 0x43 +#define MODEL_unit_2f_1 0x42 +#define MODEL_o332 0x41 +#define MODEL_o269 0x40 +#define MODEL_o268 0x3F +#define MODEL_o267 0x3E +#define MODEL_o265 0x3D +#define MODEL_o264 0x3C +#define MODEL_o263 0x3B +#define MODEL_unit_1f_left 0x3A +#define MODEL_o262 0x39 +#define MODEL_o261 0x38 +#define MODEL_o259 0x37 +#define MODEL_o257 0x36 +#define MODEL_o256 0x35 +#define MODEL_o255 0x34 +#define MODEL_o253 0x33 +#define MODEL_o231 0x32 +#define MODEL_o229 0x31 +#define MODEL_o228 0x30 +#define MODEL_o227 0x2F +#define MODEL_abc 0x2E +#define MODEL_o385 0x2D +#define MODEL_o384 0x2C +#define MODEL_o383 0x2B +#define MODEL_o382 0x2A +#define MODEL_o381 0x29 +#define MODEL_o330 0x28 +#define MODEL_o329 0x27 +#define MODEL_o328 0x26 +#define MODEL_o327 0x25 +#define MODEL_o326 0x24 +#define MODEL_o325 0x23 +#define MODEL_o324 0x22 +#define MODEL_o323 0x21 +#define MODEL_o322 0x20 +#define MODEL_o321 0x1F +#define MODEL_o320 0x1E +#define MODEL_g41 0x1D +#define MODEL_o336 0x1C +#define MODEL_o297 0x1B +#define MODEL_o296 0x1A +#define MODEL_o295 0x19 +#define MODEL_o293 0x18 +#define MODEL_o292 0x17 +#define MODEL_o291 0x16 +#define MODEL_g42 0x15 +#define MODEL_o338 0x14 +#define MODEL_o311 0x13 +#define MODEL_o310 0x12 +#define MODEL_o308 0x11 +#define MODEL_o307 0x10 +#define MODEL_o306 0xF +#define MODEL_g43 0xE +#define MODEL_o340 0xD +#define MODEL_o319 0xC +#define MODEL_o318 0xB +#define MODEL_o317 0xA +#define MODEL_o315 0x9 +#define MODEL_o314 0x8 +#define MODEL_o313 0x7 +#define MODEL_saku 0x6 +#define MODEL_o121 0x5 +#define MODEL_yuka 0x4 +#define MODEL_y2_isi 0x3 +#define MODEL_y2_zyuutan 0x2 +#define MODEL_zyuuan 0x1 +#define MODEL_isi 0x0 + diff --git a/include/mapfs/kpa_53_hit.h b/include/mapfs/kpa_53_hit.h index b149746b8f..76050b01e8 100644 --- a/include/mapfs/kpa_53_hit.h +++ b/include/mapfs/kpa_53_hit.h @@ -1 +1,4 @@ -#define COLLIDER_Root 0x0 +#define COLLIDER_Root 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/kpa_53_shape.h b/include/mapfs/kpa_53_shape.h index 98ef430c86..dee3600cd9 100644 --- a/include/mapfs/kpa_53_shape.h +++ b/include/mapfs/kpa_53_shape.h @@ -1 +1,2 @@ -#define MODEL_Root 0x0 +#define MODEL_Root 0x0 + diff --git a/include/mapfs/kpa_60_hit.h b/include/mapfs/kpa_60_hit.h index 7c38e1b2ef..e5df71e899 100644 --- a/include/mapfs/kpa_60_hit.h +++ b/include/mapfs/kpa_60_hit.h @@ -1,42 +1,49 @@ -#define COLLIDER_Root 0x29 -#define COLLIDER_g411 0x28 -#define COLLIDER_g412 0x27 -#define COLLIDER_o1644 0x26 -#define COLLIDER_deilite 0x25 -#define COLLIDER_deilie 0x24 -#define COLLIDER_o1643 0x23 -#define COLLIDER_deilitse 0x22 -#define COLLIDER_deilise 0x21 -#define COLLIDER_o1645 0x20 -#define COLLIDER_deilittn 0x1F -#define COLLIDER_deilitn 0x1E -#define COLLIDER_deilin 0x1D -#define COLLIDER_o1649 0x1C -#define COLLIDER_deilitts 0x1B -#define COLLIDER_deilits 0x1A -#define COLLIDER_deilis 0x19 -#define COLLIDER_g410 0x18 -#define COLLIDER_o1663 0x17 -#define COLLIDER_o1655 0x16 -#define COLLIDER_o1648 0x15 -#define COLLIDER_o1613 0x14 -#define COLLIDER_o1692 0x13 -#define COLLIDER_o1632 0x12 -#define COLLIDER_o1563 0x11 -#define COLLIDER_o1562 0x10 -#define COLLIDER_o1561 0xF -#define COLLIDER_o1560 0xE -#define COLLIDER_o1559 0xD -#define COLLIDER_o1545 0xC -#define COLLIDER_o1706 0xB -#define COLLIDER_o1705 0xA -#define COLLIDER_o1508 0x9 -#define COLLIDER_o1704 0x8 -#define COLLIDER_o1507 0x7 -#define COLLIDER_o1703 0x6 -#define COLLIDER_o1506 0x5 -#define COLLIDER_o1701 0x4 -#define COLLIDER_o1702 0x3 -#define COLLIDER_o1494 0x2 -#define COLLIDER_o1671 0x1 -#define COLLIDER_o1668 0x0 +#define COLLIDER_Root 0x29 +#define COLLIDER_g411 0x28 +#define COLLIDER_g412 0x27 +#define COLLIDER_o1644 0x26 +#define COLLIDER_deilite 0x25 +#define COLLIDER_deilie 0x24 +#define COLLIDER_o1643 0x23 +#define COLLIDER_deilitse 0x22 +#define COLLIDER_deilise 0x21 +#define COLLIDER_o1645 0x20 +#define COLLIDER_deilittn 0x1F +#define COLLIDER_deilitn 0x1E +#define COLLIDER_deilin 0x1D +#define COLLIDER_o1649 0x1C +#define COLLIDER_deilitts 0x1B +#define COLLIDER_deilits 0x1A +#define COLLIDER_deilis 0x19 +#define COLLIDER_g410 0x18 +#define COLLIDER_o1663 0x17 +#define COLLIDER_o1655 0x16 +#define COLLIDER_o1648 0x15 +#define COLLIDER_o1613 0x14 +#define COLLIDER_o1692 0x13 +#define COLLIDER_o1632 0x12 +#define COLLIDER_o1563 0x11 +#define COLLIDER_o1562 0x10 +#define COLLIDER_o1561 0xF +#define COLLIDER_o1560 0xE +#define COLLIDER_o1559 0xD +#define COLLIDER_o1545 0xC +#define COLLIDER_o1706 0xB +#define COLLIDER_o1705 0xA +#define COLLIDER_o1508 0x9 +#define COLLIDER_o1704 0x8 +#define COLLIDER_o1507 0x7 +#define COLLIDER_o1703 0x6 +#define COLLIDER_o1506 0x5 +#define COLLIDER_o1701 0x4 +#define COLLIDER_o1702 0x3 +#define COLLIDER_o1494 0x2 +#define COLLIDER_o1671 0x1 +#define COLLIDER_o1668 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g383 0x3 +#define ZONE_o1473 0x2 +#define ZONE_Default 0x1 +#define ZONE_o1472 0x0 + diff --git a/include/mapfs/kpa_60_shape.h b/include/mapfs/kpa_60_shape.h index 1f319f018b..073b2d1923 100644 --- a/include/mapfs/kpa_60_shape.h +++ b/include/mapfs/kpa_60_shape.h @@ -1,149 +1,150 @@ -#define MODEL_Root 0x94 -#define MODEL_g411 0x93 -#define MODEL_g405 0x92 -#define MODEL_o1640 0x91 -#define MODEL_o1639 0x90 -#define MODEL_o1638 0x8F -#define MODEL_o1637 0x8E -#define MODEL_g410 0x8D -#define MODEL_after 0x8C -#define MODEL_g437 0x8B -#define MODEL_o1733 0x8A -#define MODEL_o1732 0x89 -#define MODEL_o1731 0x88 -#define MODEL_g434 0x87 -#define MODEL_o1724 0x86 -#define MODEL_o1723 0x85 -#define MODEL_o1722 0x84 -#define MODEL_g433 0x83 -#define MODEL_o1721 0x82 -#define MODEL_o1720 0x81 -#define MODEL_o1719 0x80 -#define MODEL_g432 0x7F -#define MODEL_o1717 0x7E -#define MODEL_o1716 0x7D -#define MODEL_o1715 0x7C -#define MODEL_g431 0x7B -#define MODEL_o1714 0x7A -#define MODEL_o1713 0x79 -#define MODEL_o1712 0x78 -#define MODEL_g430 0x77 -#define MODEL_o1711 0x76 -#define MODEL_o1710 0x75 -#define MODEL_o1709 0x74 -#define MODEL_g429 0x73 -#define MODEL_o1708 0x72 -#define MODEL_o1707 0x71 -#define MODEL_o1706 0x70 -#define MODEL_o1705 0x6F -#define MODEL_o1704 0x6E -#define MODEL_o1703 0x6D -#define MODEL_o1702 0x6C -#define MODEL_o1701 0x6B -#define MODEL_before 0x6A -#define MODEL_g438 0x69 -#define MODEL_o1736 0x68 -#define MODEL_o1735 0x67 -#define MODEL_o1734 0x66 -#define MODEL_g415 0x65 -#define MODEL_o1659 0x64 -#define MODEL_o1658 0x63 -#define MODEL_o1506 0x62 -#define MODEL_g413 0x61 -#define MODEL_o1655 0x60 -#define MODEL_o1656 0x5F -#define MODEL_o1653 0x5E -#define MODEL_g427 0x5D -#define MODEL_o1699 0x5C -#define MODEL_o1698 0x5B -#define MODEL_o1697 0x5A -#define MODEL_g416 0x59 -#define MODEL_o1665 0x58 -#define MODEL_o1666 0x57 -#define MODEL_o1667 0x56 -#define MODEL_g417 0x55 -#define MODEL_o1675 0x54 -#define MODEL_o1674 0x53 -#define MODEL_o1673 0x52 -#define MODEL_g418 0x51 -#define MODEL_o1678 0x50 -#define MODEL_o1677 0x4F -#define MODEL_o1676 0x4E -#define MODEL_o1700 0x4D -#define MODEL_o1545 0x4C -#define MODEL_o1501 0x4B -#define MODEL_o1508 0x4A -#define MODEL_o1644 0x49 -#define MODEL_Default 0x48 -#define MODEL_g403 0x47 -#define MODEL_o1613 0x46 -#define MODEL_o1502 0x45 -#define MODEL_o1484 0x44 -#define MODEL_o1483 0x43 -#define MODEL_o1504 0x42 -#define MODEL_g399 0x41 -#define MODEL_o1650 0x40 -#define MODEL_g412 0x3F -#define MODEL_o1616 0x3E -#define MODEL_o1649 0x3D -#define MODEL_o1596 0x3C -#define MODEL_o1564 0x3B -#define MODEL_g398 0x3A -#define MODEL_g425 0x39 -#define MODEL_o1693 0x38 -#define MODEL_o1692 0x37 -#define MODEL_o1691 0x36 -#define MODEL_g421 0x35 -#define MODEL_o1687 0x34 -#define MODEL_o1686 0x33 -#define MODEL_o1685 0x32 -#define MODEL_g420 0x31 -#define MODEL_o1684 0x30 -#define MODEL_o1683 0x2F -#define MODEL_o1682 0x2E -#define MODEL_g419 0x2D -#define MODEL_o1681 0x2C -#define MODEL_o1680 0x2B -#define MODEL_o1679 0x2A -#define MODEL_g397 0x29 -#define MODEL_o1516 0x28 -#define MODEL_g409 0x27 -#define MODEL_o1648 0x26 -#define MODEL_o1643 0x25 -#define MODEL_o1641 0x24 -#define MODEL_g389 0x23 -#define MODEL_g402 0x22 -#define MODEL_o1619 0x21 -#define MODEL_o1618 0x20 -#define MODEL_o1617 0x1F -#define MODEL_o1624 0x1E -#define MODEL_o1623 0x1D -#define MODEL_o1622 0x1C -#define MODEL_o1621 0x1B -#define MODEL_o1626 0x1A -#define MODEL_o1620 0x19 -#define MODEL_g392 0x18 -#define MODEL_o1652 0x17 -#define MODEL_o1651 0x16 -#define MODEL_o1645 0x15 -#define MODEL_o1634 0x14 -#define MODEL_o1498 0x13 -#define MODEL_o1497 0x12 -#define MODEL_o1496 0x11 -#define MODEL_o1494 0x10 -#define MODEL_g406 0xF -#define MODEL_g408 0xE -#define MODEL_o1647 0xD -#define MODEL_g407 0xC -#define MODEL_o1646 0xB -#define MODEL_g391 0xA -#define MODEL_o1493 0x9 -#define MODEL_o1492 0x8 -#define MODEL_g390 0x7 -#define MODEL_o1491 0x6 -#define MODEL_o1490 0x5 -#define MODEL_o1489 0x4 -#define MODEL_o1488 0x3 -#define MODEL_o1487 0x2 -#define MODEL_o1486 0x1 -#define MODEL_o1485 0x0 +#define MODEL_Root 0x94 +#define MODEL_g411 0x93 +#define MODEL_g405 0x92 +#define MODEL_o1640 0x91 +#define MODEL_o1639 0x90 +#define MODEL_o1638 0x8F +#define MODEL_o1637 0x8E +#define MODEL_g410 0x8D +#define MODEL_after 0x8C +#define MODEL_g437 0x8B +#define MODEL_o1733 0x8A +#define MODEL_o1732 0x89 +#define MODEL_o1731 0x88 +#define MODEL_g434 0x87 +#define MODEL_o1724 0x86 +#define MODEL_o1723 0x85 +#define MODEL_o1722 0x84 +#define MODEL_g433 0x83 +#define MODEL_o1721 0x82 +#define MODEL_o1720 0x81 +#define MODEL_o1719 0x80 +#define MODEL_g432 0x7F +#define MODEL_o1717 0x7E +#define MODEL_o1716 0x7D +#define MODEL_o1715 0x7C +#define MODEL_g431 0x7B +#define MODEL_o1714 0x7A +#define MODEL_o1713 0x79 +#define MODEL_o1712 0x78 +#define MODEL_g430 0x77 +#define MODEL_o1711 0x76 +#define MODEL_o1710 0x75 +#define MODEL_o1709 0x74 +#define MODEL_g429 0x73 +#define MODEL_o1708 0x72 +#define MODEL_o1707 0x71 +#define MODEL_o1706 0x70 +#define MODEL_o1705 0x6F +#define MODEL_o1704 0x6E +#define MODEL_o1703 0x6D +#define MODEL_o1702 0x6C +#define MODEL_o1701 0x6B +#define MODEL_before 0x6A +#define MODEL_g438 0x69 +#define MODEL_o1736 0x68 +#define MODEL_o1735 0x67 +#define MODEL_o1734 0x66 +#define MODEL_g415 0x65 +#define MODEL_o1659 0x64 +#define MODEL_o1658 0x63 +#define MODEL_o1506 0x62 +#define MODEL_g413 0x61 +#define MODEL_o1655 0x60 +#define MODEL_o1656 0x5F +#define MODEL_o1653 0x5E +#define MODEL_g427 0x5D +#define MODEL_o1699 0x5C +#define MODEL_o1698 0x5B +#define MODEL_o1697 0x5A +#define MODEL_g416 0x59 +#define MODEL_o1665 0x58 +#define MODEL_o1666 0x57 +#define MODEL_o1667 0x56 +#define MODEL_g417 0x55 +#define MODEL_o1675 0x54 +#define MODEL_o1674 0x53 +#define MODEL_o1673 0x52 +#define MODEL_g418 0x51 +#define MODEL_o1678 0x50 +#define MODEL_o1677 0x4F +#define MODEL_o1676 0x4E +#define MODEL_o1700 0x4D +#define MODEL_o1545 0x4C +#define MODEL_o1501 0x4B +#define MODEL_o1508 0x4A +#define MODEL_o1644 0x49 +#define MODEL_Default 0x48 +#define MODEL_g403 0x47 +#define MODEL_o1613 0x46 +#define MODEL_o1502 0x45 +#define MODEL_o1484 0x44 +#define MODEL_o1483 0x43 +#define MODEL_o1504 0x42 +#define MODEL_g399 0x41 +#define MODEL_o1650 0x40 +#define MODEL_g412 0x3F +#define MODEL_o1616 0x3E +#define MODEL_o1649 0x3D +#define MODEL_o1596 0x3C +#define MODEL_o1564 0x3B +#define MODEL_g398 0x3A +#define MODEL_g425 0x39 +#define MODEL_o1693 0x38 +#define MODEL_o1692 0x37 +#define MODEL_o1691 0x36 +#define MODEL_g421 0x35 +#define MODEL_o1687 0x34 +#define MODEL_o1686 0x33 +#define MODEL_o1685 0x32 +#define MODEL_g420 0x31 +#define MODEL_o1684 0x30 +#define MODEL_o1683 0x2F +#define MODEL_o1682 0x2E +#define MODEL_g419 0x2D +#define MODEL_o1681 0x2C +#define MODEL_o1680 0x2B +#define MODEL_o1679 0x2A +#define MODEL_g397 0x29 +#define MODEL_o1516 0x28 +#define MODEL_g409 0x27 +#define MODEL_o1648 0x26 +#define MODEL_o1643 0x25 +#define MODEL_o1641 0x24 +#define MODEL_g389 0x23 +#define MODEL_g402 0x22 +#define MODEL_o1619 0x21 +#define MODEL_o1618 0x20 +#define MODEL_o1617 0x1F +#define MODEL_o1624 0x1E +#define MODEL_o1623 0x1D +#define MODEL_o1622 0x1C +#define MODEL_o1621 0x1B +#define MODEL_o1626 0x1A +#define MODEL_o1620 0x19 +#define MODEL_g392 0x18 +#define MODEL_o1652 0x17 +#define MODEL_o1651 0x16 +#define MODEL_o1645 0x15 +#define MODEL_o1634 0x14 +#define MODEL_o1498 0x13 +#define MODEL_o1497 0x12 +#define MODEL_o1496 0x11 +#define MODEL_o1494 0x10 +#define MODEL_g406 0xF +#define MODEL_g408 0xE +#define MODEL_o1647 0xD +#define MODEL_g407 0xC +#define MODEL_o1646 0xB +#define MODEL_g391 0xA +#define MODEL_o1493 0x9 +#define MODEL_o1492 0x8 +#define MODEL_g390 0x7 +#define MODEL_o1491 0x6 +#define MODEL_o1490 0x5 +#define MODEL_o1489 0x4 +#define MODEL_o1488 0x3 +#define MODEL_o1487 0x2 +#define MODEL_o1486 0x1 +#define MODEL_o1485 0x0 + diff --git a/include/mapfs/kpa_61_hit.h b/include/mapfs/kpa_61_hit.h index 92df69b647..923ddf5d9b 100644 --- a/include/mapfs/kpa_61_hit.h +++ b/include/mapfs/kpa_61_hit.h @@ -1,22 +1,35 @@ -#define COLLIDER_Root 0x15 -#define COLLIDER_exit2 0x14 -#define COLLIDER_nsw 0x13 -#define COLLIDER_ttsw 0x12 -#define COLLIDER_deilisw 0x11 -#define COLLIDER_deilitsw 0x10 -#define COLLIDER_exit1 0xF -#define COLLIDER_ns 0xE -#define COLLIDER_tts 0xD -#define COLLIDER_deilis 0xC -#define COLLIDER_deilits 0xB -#define COLLIDER_tou 0xA -#define COLLIDER_o74 0x9 -#define COLLIDER_o65 0x8 -#define COLLIDER_o66 0x7 -#define COLLIDER_4 0x6 -#define COLLIDER_o71 0x5 -#define COLLIDER_3 0x4 -#define COLLIDER_o70 0x3 -#define COLLIDER_2 0x2 -#define COLLIDER_o69 0x1 -#define COLLIDER_1 0x0 +#define COLLIDER_Root 0x15 +#define COLLIDER_exit2 0x14 +#define COLLIDER_nsw 0x13 +#define COLLIDER_ttsw 0x12 +#define COLLIDER_deilisw 0x11 +#define COLLIDER_deilitsw 0x10 +#define COLLIDER_exit1 0xF +#define COLLIDER_ns 0xE +#define COLLIDER_tts 0xD +#define COLLIDER_deilis 0xC +#define COLLIDER_deilits 0xB +#define COLLIDER_tou 0xA +#define COLLIDER_o74 0x9 +#define COLLIDER_o65 0x8 +#define COLLIDER_o66 0x7 +#define COLLIDER_4 0x6 +#define COLLIDER_o71 0x5 +#define COLLIDER_3 0x4 +#define COLLIDER_o70 0x3 +#define COLLIDER_2 0x2 +#define COLLIDER_o69 0x1 +#define COLLIDER_1 0x0 + +#define ZONE_Root 0xA +#define ZONE_exit2 0x9 +#define ZONE_deilisw 0x8 +#define ZONE_tou 0x7 +#define ZONE_4 0x6 +#define ZONE_o50 0x5 +#define ZONE_o47 0x4 +#define ZONE_kai2 0x3 +#define ZONE_kai1 0x2 +#define ZONE_o48 0x1 +#define ZONE_o45 0x0 + diff --git a/include/mapfs/kpa_61_shape.h b/include/mapfs/kpa_61_shape.h index 42d3279732..a7eb69446c 100644 --- a/include/mapfs/kpa_61_shape.h +++ b/include/mapfs/kpa_61_shape.h @@ -1,42 +1,43 @@ -#define MODEL_Root 0x29 -#define MODEL_g15 0x28 -#define MODEL_o47 0x27 -#define MODEL_o46 0x26 -#define MODEL_o44 0x25 -#define MODEL_o43 0x24 -#define MODEL_o42 0x23 -#define MODEL_etc 0x22 -#define MODEL_mado 0x21 -#define MODEL_doa4 0x20 -#define MODEL_o38 0x1F -#define MODEL_doa3 0x1E -#define MODEL_o37 0x1D -#define MODEL_doa2 0x1C -#define MODEL_o34 0x1B -#define MODEL_doa1 0x1A -#define MODEL_o33 0x19 -#define MODEL_kumo 0x18 -#define MODEL_kumo4 0x17 -#define MODEL_kumo3 0x16 -#define MODEL_kumo2 0x15 -#define MODEL_kumo1 0x14 -#define MODEL_dai 0x13 -#define MODEL_doa2_3 0x12 -#define MODEL_doa2_2 0x11 -#define MODEL_dai2 0x10 -#define MODEL_dai1_2 0xF -#define MODEL_dai1 0xE -#define MODEL_g1 0xD -#define MODEL_soko 0xC -#define MODEL_hasi1 0xB -#define MODEL_hasi2 0xA -#define MODEL_yuka 0x9 -#define MODEL_kabe2 0x8 -#define MODEL_kabe1 0x7 -#define MODEL_kaidan 0x6 -#define MODEL_dan2 0x5 -#define MODEL_dan1 0x4 -#define MODEL_sokumen 0x3 -#define MODEL_tou 0x2 -#define MODEL_t_kabe2 0x1 -#define MODEL_t_kabe1 0x0 +#define MODEL_Root 0x29 +#define MODEL_g15 0x28 +#define MODEL_o47 0x27 +#define MODEL_o46 0x26 +#define MODEL_o44 0x25 +#define MODEL_o43 0x24 +#define MODEL_o42 0x23 +#define MODEL_etc 0x22 +#define MODEL_mado 0x21 +#define MODEL_doa4 0x20 +#define MODEL_o38 0x1F +#define MODEL_doa3 0x1E +#define MODEL_o37 0x1D +#define MODEL_doa2 0x1C +#define MODEL_o34 0x1B +#define MODEL_doa1 0x1A +#define MODEL_o33 0x19 +#define MODEL_kumo 0x18 +#define MODEL_kumo4 0x17 +#define MODEL_kumo3 0x16 +#define MODEL_kumo2 0x15 +#define MODEL_kumo1 0x14 +#define MODEL_dai 0x13 +#define MODEL_doa2_3 0x12 +#define MODEL_doa2_2 0x11 +#define MODEL_dai2 0x10 +#define MODEL_dai1_2 0xF +#define MODEL_dai1 0xE +#define MODEL_g1 0xD +#define MODEL_soko 0xC +#define MODEL_hasi1 0xB +#define MODEL_hasi2 0xA +#define MODEL_yuka 0x9 +#define MODEL_kabe2 0x8 +#define MODEL_kabe1 0x7 +#define MODEL_kaidan 0x6 +#define MODEL_dan2 0x5 +#define MODEL_dan1 0x4 +#define MODEL_sokumen 0x3 +#define MODEL_tou 0x2 +#define MODEL_t_kabe2 0x1 +#define MODEL_t_kabe1 0x0 + diff --git a/include/mapfs/kpa_62_hit.h b/include/mapfs/kpa_62_hit.h index 3f3c02e529..ff4605ef6d 100644 --- a/include/mapfs/kpa_62_hit.h +++ b/include/mapfs/kpa_62_hit.h @@ -1,47 +1,54 @@ -#define COLLIDER_Root 0x2E -#define COLLIDER_g411 0x2D -#define COLLIDER_g412 0x2C -#define COLLIDER_o1644 0x2B -#define COLLIDER_deilite 0x2A -#define COLLIDER_deilie 0x29 -#define COLLIDER_o1643 0x28 -#define COLLIDER_deilitse 0x27 -#define COLLIDER_deilise 0x26 -#define COLLIDER_o1645 0x25 -#define COLLIDER_deilittn 0x24 -#define COLLIDER_deilitn 0x23 -#define COLLIDER_deilin 0x22 -#define COLLIDER_o1649 0x21 -#define COLLIDER_deilitts 0x20 -#define COLLIDER_deilits 0x1F -#define COLLIDER_deilis 0x1E -#define COLLIDER_g410 0x1D -#define COLLIDER_o1663 0x1C -#define COLLIDER_o1655 0x1B -#define COLLIDER_o1648 0x1A -#define COLLIDER_o1613 0x19 -#define COLLIDER_o1692 0x18 -#define COLLIDER_o1632 0x17 -#define COLLIDER_o1563 0x16 -#define COLLIDER_o1562 0x15 -#define COLLIDER_o1561 0x14 -#define COLLIDER_o1560 0x13 -#define COLLIDER_o1559 0x12 -#define COLLIDER_o1722 0x11 -#define COLLIDER_o1710 0x10 -#define COLLIDER_o1545 0xF -#define COLLIDER_o1713 0xE -#define COLLIDER_o1712 0xD -#define COLLIDER_o1711 0xC -#define COLLIDER_o1706 0xB -#define COLLIDER_o1705 0xA -#define COLLIDER_o1508 0x9 -#define COLLIDER_o1704 0x8 -#define COLLIDER_o1507 0x7 -#define COLLIDER_o1703 0x6 -#define COLLIDER_o1506 0x5 -#define COLLIDER_o1701 0x4 -#define COLLIDER_o1702 0x3 -#define COLLIDER_o1494 0x2 -#define COLLIDER_o1671 0x1 -#define COLLIDER_o1668 0x0 +#define COLLIDER_Root 0x2E +#define COLLIDER_g411 0x2D +#define COLLIDER_g412 0x2C +#define COLLIDER_o1644 0x2B +#define COLLIDER_deilite 0x2A +#define COLLIDER_deilie 0x29 +#define COLLIDER_o1643 0x28 +#define COLLIDER_deilitse 0x27 +#define COLLIDER_deilise 0x26 +#define COLLIDER_o1645 0x25 +#define COLLIDER_deilittn 0x24 +#define COLLIDER_deilitn 0x23 +#define COLLIDER_deilin 0x22 +#define COLLIDER_o1649 0x21 +#define COLLIDER_deilitts 0x20 +#define COLLIDER_deilits 0x1F +#define COLLIDER_deilis 0x1E +#define COLLIDER_g410 0x1D +#define COLLIDER_o1663 0x1C +#define COLLIDER_o1655 0x1B +#define COLLIDER_o1648 0x1A +#define COLLIDER_o1613 0x19 +#define COLLIDER_o1692 0x18 +#define COLLIDER_o1632 0x17 +#define COLLIDER_o1563 0x16 +#define COLLIDER_o1562 0x15 +#define COLLIDER_o1561 0x14 +#define COLLIDER_o1560 0x13 +#define COLLIDER_o1559 0x12 +#define COLLIDER_o1722 0x11 +#define COLLIDER_o1710 0x10 +#define COLLIDER_o1545 0xF +#define COLLIDER_o1713 0xE +#define COLLIDER_o1712 0xD +#define COLLIDER_o1711 0xC +#define COLLIDER_o1706 0xB +#define COLLIDER_o1705 0xA +#define COLLIDER_o1508 0x9 +#define COLLIDER_o1704 0x8 +#define COLLIDER_o1507 0x7 +#define COLLIDER_o1703 0x6 +#define COLLIDER_o1506 0x5 +#define COLLIDER_o1701 0x4 +#define COLLIDER_o1702 0x3 +#define COLLIDER_o1494 0x2 +#define COLLIDER_o1671 0x1 +#define COLLIDER_o1668 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g383 0x3 +#define ZONE_o1473 0x2 +#define ZONE_Default 0x1 +#define ZONE_o1472 0x0 + diff --git a/include/mapfs/kpa_62_shape.h b/include/mapfs/kpa_62_shape.h index cd4c7015a8..1d86395d1d 100644 --- a/include/mapfs/kpa_62_shape.h +++ b/include/mapfs/kpa_62_shape.h @@ -1,119 +1,120 @@ -#define MODEL_Root 0x76 -#define MODEL_g410 0x75 -#define MODEL_after 0x74 -#define MODEL_g437 0x73 -#define MODEL_o1733 0x72 -#define MODEL_o1732 0x71 -#define MODEL_o1731 0x70 -#define MODEL_g434 0x6F -#define MODEL_o1724 0x6E -#define MODEL_o1723 0x6D -#define MODEL_o1722 0x6C -#define MODEL_g433 0x6B -#define MODEL_o1721 0x6A -#define MODEL_o1720 0x69 -#define MODEL_o1719 0x68 -#define MODEL_g432 0x67 -#define MODEL_o1717 0x66 -#define MODEL_o1716 0x65 -#define MODEL_o1715 0x64 -#define MODEL_g431 0x63 -#define MODEL_o1714 0x62 -#define MODEL_o1713 0x61 -#define MODEL_o1712 0x60 -#define MODEL_g430 0x5F -#define MODEL_o1711 0x5E -#define MODEL_o1710 0x5D -#define MODEL_o1709 0x5C -#define MODEL_g429 0x5B -#define MODEL_o1708 0x5A -#define MODEL_o1707 0x59 -#define MODEL_o1706 0x58 -#define MODEL_o1705 0x57 -#define MODEL_o1704 0x56 -#define MODEL_o1703 0x55 -#define MODEL_o1702 0x54 -#define MODEL_o1701 0x53 -#define MODEL_before 0x52 -#define MODEL_g438 0x51 -#define MODEL_o1736 0x50 -#define MODEL_o1735 0x4F -#define MODEL_o1734 0x4E -#define MODEL_g415 0x4D -#define MODEL_o1659 0x4C -#define MODEL_o1658 0x4B -#define MODEL_o1506 0x4A -#define MODEL_g413 0x49 -#define MODEL_o1655 0x48 -#define MODEL_o1656 0x47 -#define MODEL_o1653 0x46 -#define MODEL_g427 0x45 -#define MODEL_o1699 0x44 -#define MODEL_o1698 0x43 -#define MODEL_o1697 0x42 -#define MODEL_g416 0x41 -#define MODEL_o1665 0x40 -#define MODEL_o1666 0x3F -#define MODEL_o1667 0x3E -#define MODEL_g417 0x3D -#define MODEL_o1675 0x3C -#define MODEL_o1674 0x3B -#define MODEL_o1673 0x3A -#define MODEL_g418 0x39 -#define MODEL_o1678 0x38 -#define MODEL_o1677 0x37 -#define MODEL_o1676 0x36 -#define MODEL_o1700 0x35 -#define MODEL_o1545 0x34 -#define MODEL_o1501 0x33 -#define MODEL_o1508 0x32 -#define MODEL_o1644 0x31 -#define MODEL_Default 0x30 -#define MODEL_g403 0x2F -#define MODEL_o1613 0x2E -#define MODEL_o1502 0x2D -#define MODEL_o1484 0x2C -#define MODEL_o1483 0x2B -#define MODEL_o1504 0x2A -#define MODEL_g399 0x29 -#define MODEL_o1650 0x28 -#define MODEL_g412 0x27 -#define MODEL_o1616 0x26 -#define MODEL_o1649 0x25 -#define MODEL_o1596 0x24 -#define MODEL_o1564 0x23 -#define MODEL_g398 0x22 -#define MODEL_g425 0x21 -#define MODEL_o1693 0x20 -#define MODEL_o1692 0x1F -#define MODEL_o1691 0x1E -#define MODEL_g421 0x1D -#define MODEL_o1687 0x1C -#define MODEL_o1686 0x1B -#define MODEL_o1685 0x1A -#define MODEL_g420 0x19 -#define MODEL_o1684 0x18 -#define MODEL_o1683 0x17 -#define MODEL_o1682 0x16 -#define MODEL_g419 0x15 -#define MODEL_o1681 0x14 -#define MODEL_o1680 0x13 -#define MODEL_o1679 0x12 -#define MODEL_g397 0x11 -#define MODEL_o1516 0x10 -#define MODEL_g409 0xF -#define MODEL_o1648 0xE -#define MODEL_o1643 0xD -#define MODEL_o1641 0xC -#define MODEL_g389 0xB -#define MODEL_g392 0xA -#define MODEL_o1652 0x9 -#define MODEL_o1651 0x8 -#define MODEL_o1645 0x7 -#define MODEL_o1634 0x6 -#define MODEL_o1494 0x5 -#define MODEL_g406 0x4 -#define MODEL_g408 0x3 -#define MODEL_o1647 0x2 -#define MODEL_g407 0x1 -#define MODEL_o1646 0x0 +#define MODEL_Root 0x76 +#define MODEL_g410 0x75 +#define MODEL_after 0x74 +#define MODEL_g437 0x73 +#define MODEL_o1733 0x72 +#define MODEL_o1732 0x71 +#define MODEL_o1731 0x70 +#define MODEL_g434 0x6F +#define MODEL_o1724 0x6E +#define MODEL_o1723 0x6D +#define MODEL_o1722 0x6C +#define MODEL_g433 0x6B +#define MODEL_o1721 0x6A +#define MODEL_o1720 0x69 +#define MODEL_o1719 0x68 +#define MODEL_g432 0x67 +#define MODEL_o1717 0x66 +#define MODEL_o1716 0x65 +#define MODEL_o1715 0x64 +#define MODEL_g431 0x63 +#define MODEL_o1714 0x62 +#define MODEL_o1713 0x61 +#define MODEL_o1712 0x60 +#define MODEL_g430 0x5F +#define MODEL_o1711 0x5E +#define MODEL_o1710 0x5D +#define MODEL_o1709 0x5C +#define MODEL_g429 0x5B +#define MODEL_o1708 0x5A +#define MODEL_o1707 0x59 +#define MODEL_o1706 0x58 +#define MODEL_o1705 0x57 +#define MODEL_o1704 0x56 +#define MODEL_o1703 0x55 +#define MODEL_o1702 0x54 +#define MODEL_o1701 0x53 +#define MODEL_before 0x52 +#define MODEL_g438 0x51 +#define MODEL_o1736 0x50 +#define MODEL_o1735 0x4F +#define MODEL_o1734 0x4E +#define MODEL_g415 0x4D +#define MODEL_o1659 0x4C +#define MODEL_o1658 0x4B +#define MODEL_o1506 0x4A +#define MODEL_g413 0x49 +#define MODEL_o1655 0x48 +#define MODEL_o1656 0x47 +#define MODEL_o1653 0x46 +#define MODEL_g427 0x45 +#define MODEL_o1699 0x44 +#define MODEL_o1698 0x43 +#define MODEL_o1697 0x42 +#define MODEL_g416 0x41 +#define MODEL_o1665 0x40 +#define MODEL_o1666 0x3F +#define MODEL_o1667 0x3E +#define MODEL_g417 0x3D +#define MODEL_o1675 0x3C +#define MODEL_o1674 0x3B +#define MODEL_o1673 0x3A +#define MODEL_g418 0x39 +#define MODEL_o1678 0x38 +#define MODEL_o1677 0x37 +#define MODEL_o1676 0x36 +#define MODEL_o1700 0x35 +#define MODEL_o1545 0x34 +#define MODEL_o1501 0x33 +#define MODEL_o1508 0x32 +#define MODEL_o1644 0x31 +#define MODEL_Default 0x30 +#define MODEL_g403 0x2F +#define MODEL_o1613 0x2E +#define MODEL_o1502 0x2D +#define MODEL_o1484 0x2C +#define MODEL_o1483 0x2B +#define MODEL_o1504 0x2A +#define MODEL_g399 0x29 +#define MODEL_o1650 0x28 +#define MODEL_g412 0x27 +#define MODEL_o1616 0x26 +#define MODEL_o1649 0x25 +#define MODEL_o1596 0x24 +#define MODEL_o1564 0x23 +#define MODEL_g398 0x22 +#define MODEL_g425 0x21 +#define MODEL_o1693 0x20 +#define MODEL_o1692 0x1F +#define MODEL_o1691 0x1E +#define MODEL_g421 0x1D +#define MODEL_o1687 0x1C +#define MODEL_o1686 0x1B +#define MODEL_o1685 0x1A +#define MODEL_g420 0x19 +#define MODEL_o1684 0x18 +#define MODEL_o1683 0x17 +#define MODEL_o1682 0x16 +#define MODEL_g419 0x15 +#define MODEL_o1681 0x14 +#define MODEL_o1680 0x13 +#define MODEL_o1679 0x12 +#define MODEL_g397 0x11 +#define MODEL_o1516 0x10 +#define MODEL_g409 0xF +#define MODEL_o1648 0xE +#define MODEL_o1643 0xD +#define MODEL_o1641 0xC +#define MODEL_g389 0xB +#define MODEL_g392 0xA +#define MODEL_o1652 0x9 +#define MODEL_o1651 0x8 +#define MODEL_o1645 0x7 +#define MODEL_o1634 0x6 +#define MODEL_o1494 0x5 +#define MODEL_g406 0x4 +#define MODEL_g408 0x3 +#define MODEL_o1647 0x2 +#define MODEL_g407 0x1 +#define MODEL_o1646 0x0 + diff --git a/include/mapfs/kpa_63_hit.h b/include/mapfs/kpa_63_hit.h index c17efe2ced..b2cc485a94 100644 --- a/include/mapfs/kpa_63_hit.h +++ b/include/mapfs/kpa_63_hit.h @@ -1,27 +1,36 @@ -#define COLLIDER_Root 0x1A -#define COLLIDER_g57 0x19 -#define COLLIDER_g58 0x18 -#define COLLIDER_o399 0x17 -#define COLLIDER_g56 0x16 -#define COLLIDER_g55 0x15 -#define COLLIDER_o400 0x14 -#define COLLIDER_g47 0x13 -#define COLLIDER_tts 0x12 -#define COLLIDER_o389 0x11 -#define COLLIDER_deilits 0x10 -#define COLLIDER_deilis 0xF -#define COLLIDER_g1 0xE -#define COLLIDER_g62 0xD -#define COLLIDER_o330 0xC -#define COLLIDER_o406 0xB -#define COLLIDER_o405 0xA -#define COLLIDER_g48 0x9 -#define COLLIDER_o362 0x8 -#define COLLIDER_o351 0x7 -#define COLLIDER_o344 0x6 -#define COLLIDER_o343 0x5 -#define COLLIDER_o255 0x4 -#define COLLIDER_o252 0x3 -#define COLLIDER_g6 0x2 -#define COLLIDER_o407 0x1 -#define COLLIDER_o178 0x0 +#define COLLIDER_Root 0x1A +#define COLLIDER_g57 0x19 +#define COLLIDER_g58 0x18 +#define COLLIDER_o399 0x17 +#define COLLIDER_g56 0x16 +#define COLLIDER_g55 0x15 +#define COLLIDER_o400 0x14 +#define COLLIDER_g47 0x13 +#define COLLIDER_tts 0x12 +#define COLLIDER_o389 0x11 +#define COLLIDER_deilits 0x10 +#define COLLIDER_deilis 0xF +#define COLLIDER_g1 0xE +#define COLLIDER_g62 0xD +#define COLLIDER_o330 0xC +#define COLLIDER_o406 0xB +#define COLLIDER_o405 0xA +#define COLLIDER_g48 0x9 +#define COLLIDER_o362 0x8 +#define COLLIDER_o351 0x7 +#define COLLIDER_o344 0x6 +#define COLLIDER_o343 0x5 +#define COLLIDER_o255 0x4 +#define COLLIDER_o252 0x3 +#define COLLIDER_g6 0x2 +#define COLLIDER_o407 0x1 +#define COLLIDER_o178 0x0 + +#define ZONE_Root 0x6 +#define ZONE_g1 0x5 +#define ZONE_o412 0x4 +#define ZONE_o411 0x3 +#define ZONE_o410 0x2 +#define ZONE_o409 0x1 +#define ZONE_o407 0x0 + diff --git a/include/mapfs/kpa_63_shape.h b/include/mapfs/kpa_63_shape.h index 6290fa115d..2ccb00b3fa 100644 --- a/include/mapfs/kpa_63_shape.h +++ b/include/mapfs/kpa_63_shape.h @@ -1,102 +1,103 @@ -#define MODEL_Root 0x65 -#define MODEL_g68 0x64 -#define MODEL_g70 0x63 -#define MODEL_o406 0x62 -#define MODEL_g69 0x61 -#define MODEL_o405 0x60 -#define MODEL_o404 0x5F -#define MODEL_o403 0x5E -#define MODEL_g65 0x5D -#define MODEL_g67 0x5C -#define MODEL_o402 0x5B -#define MODEL_g66 0x5A -#define MODEL_o401 0x59 -#define MODEL_o400 0x58 -#define MODEL_o399 0x57 -#define MODEL_g57 0x56 -#define MODEL_g59 0x55 -#define MODEL_o325 0x54 -#define MODEL_g58 0x53 -#define MODEL_o323 0x52 -#define MODEL_o321 0x51 -#define MODEL_o320 0x50 -#define MODEL_g56 0x4F -#define MODEL_g55 0x4E -#define MODEL_o310 0x4D -#define MODEL_o309 0x4C -#define MODEL_o308 0x4B -#define MODEL_o307 0x4A -#define MODEL_g44 0x49 -#define MODEL_o422 0x48 -#define MODEL_o318 0x47 -#define MODEL_o184 0x46 -#define MODEL_o390 0x45 -#define MODEL_o179 0x44 -#define MODEL_o453 0x43 -#define MODEL_g2 0x42 -#define MODEL_g75 0x41 -#define MODEL_o455 0x40 -#define MODEL_o454 0x3F -#define MODEL_g72 0x3E -#define MODEL_g74 0x3D -#define MODEL_o216 0x3C -#define MODEL_o219 0x3B -#define MODEL_o385 0x3A -#define MODEL_o427 0x39 -#define MODEL_o429 0x38 -#define MODEL_o431 0x37 -#define MODEL_o433 0x36 -#define MODEL_o439 0x35 -#define MODEL_o443 0x34 -#define MODEL_g73 0x33 -#define MODEL_o255 0x32 -#define MODEL_o252 0x31 -#define MODEL_o425 0x30 -#define MODEL_o256 0x2F -#define MODEL_o445 0x2E -#define MODEL_o452 0x2D -#define MODEL_o448 0x2C -#define MODEL_o423 0x2B -#define MODEL_g71 0x2A -#define MODEL_o211 0x29 -#define MODEL_o202 0x28 -#define MODEL_o201 0x27 -#define MODEL_o381 0x26 -#define MODEL_o379 0x25 -#define MODEL_o389 0x24 -#define MODEL_o388 0x23 -#define MODEL_g60 0x22 -#define MODEL_o339 0x21 -#define MODEL_o337 0x20 -#define MODEL_o331 0x1F -#define MODEL_o330 0x1E -#define MODEL_g48 0x1D -#define MODEL_g51 0x1C -#define MODEL_o351 0x1B -#define MODEL_o344 0x1A -#define MODEL_o343 0x19 -#define MODEL_o362 0x18 -#define MODEL_g50 0x17 -#define MODEL_o360 0x16 -#define MODEL_o370 0x15 -#define MODEL_o345 0x14 -#define MODEL_o346 0x13 -#define MODEL_o348 0x12 -#define MODEL_o347 0x11 -#define MODEL_o368 0x10 -#define MODEL_o366 0xF -#define MODEL_o359 0xE -#define MODEL_o357 0xD -#define MODEL_g49 0xC -#define MODEL_o349 0xB -#define MODEL_o350 0xA -#define MODEL_g47 0x9 -#define MODEL_o451 0x8 -#define MODEL_o190 0x7 -#define MODEL_g6 0x6 -#define MODEL_o449 0x5 -#define MODEL_g4 0x4 -#define MODEL_o11 0x3 -#define MODEL_g1 0x2 -#define MODEL_o386 0x1 -#define MODEL_o342 0x0 +#define MODEL_Root 0x65 +#define MODEL_g68 0x64 +#define MODEL_g70 0x63 +#define MODEL_o406 0x62 +#define MODEL_g69 0x61 +#define MODEL_o405 0x60 +#define MODEL_o404 0x5F +#define MODEL_o403 0x5E +#define MODEL_g65 0x5D +#define MODEL_g67 0x5C +#define MODEL_o402 0x5B +#define MODEL_g66 0x5A +#define MODEL_o401 0x59 +#define MODEL_o400 0x58 +#define MODEL_o399 0x57 +#define MODEL_g57 0x56 +#define MODEL_g59 0x55 +#define MODEL_o325 0x54 +#define MODEL_g58 0x53 +#define MODEL_o323 0x52 +#define MODEL_o321 0x51 +#define MODEL_o320 0x50 +#define MODEL_g56 0x4F +#define MODEL_g55 0x4E +#define MODEL_o310 0x4D +#define MODEL_o309 0x4C +#define MODEL_o308 0x4B +#define MODEL_o307 0x4A +#define MODEL_g44 0x49 +#define MODEL_o422 0x48 +#define MODEL_o318 0x47 +#define MODEL_o184 0x46 +#define MODEL_o390 0x45 +#define MODEL_o179 0x44 +#define MODEL_o453 0x43 +#define MODEL_g2 0x42 +#define MODEL_g75 0x41 +#define MODEL_o455 0x40 +#define MODEL_o454 0x3F +#define MODEL_g72 0x3E +#define MODEL_g74 0x3D +#define MODEL_o216 0x3C +#define MODEL_o219 0x3B +#define MODEL_o385 0x3A +#define MODEL_o427 0x39 +#define MODEL_o429 0x38 +#define MODEL_o431 0x37 +#define MODEL_o433 0x36 +#define MODEL_o439 0x35 +#define MODEL_o443 0x34 +#define MODEL_g73 0x33 +#define MODEL_o255 0x32 +#define MODEL_o252 0x31 +#define MODEL_o425 0x30 +#define MODEL_o256 0x2F +#define MODEL_o445 0x2E +#define MODEL_o452 0x2D +#define MODEL_o448 0x2C +#define MODEL_o423 0x2B +#define MODEL_g71 0x2A +#define MODEL_o211 0x29 +#define MODEL_o202 0x28 +#define MODEL_o201 0x27 +#define MODEL_o381 0x26 +#define MODEL_o379 0x25 +#define MODEL_o389 0x24 +#define MODEL_o388 0x23 +#define MODEL_g60 0x22 +#define MODEL_o339 0x21 +#define MODEL_o337 0x20 +#define MODEL_o331 0x1F +#define MODEL_o330 0x1E +#define MODEL_g48 0x1D +#define MODEL_g51 0x1C +#define MODEL_o351 0x1B +#define MODEL_o344 0x1A +#define MODEL_o343 0x19 +#define MODEL_o362 0x18 +#define MODEL_g50 0x17 +#define MODEL_o360 0x16 +#define MODEL_o370 0x15 +#define MODEL_o345 0x14 +#define MODEL_o346 0x13 +#define MODEL_o348 0x12 +#define MODEL_o347 0x11 +#define MODEL_o368 0x10 +#define MODEL_o366 0xF +#define MODEL_o359 0xE +#define MODEL_o357 0xD +#define MODEL_g49 0xC +#define MODEL_o349 0xB +#define MODEL_o350 0xA +#define MODEL_g47 0x9 +#define MODEL_o451 0x8 +#define MODEL_o190 0x7 +#define MODEL_g6 0x6 +#define MODEL_o449 0x5 +#define MODEL_g4 0x4 +#define MODEL_o11 0x3 +#define MODEL_g1 0x2 +#define MODEL_o386 0x1 +#define MODEL_o342 0x0 + diff --git a/include/mapfs/kpa_70_hit.h b/include/mapfs/kpa_70_hit.h index 2a9d662f91..98f284a6b2 100644 --- a/include/mapfs/kpa_70_hit.h +++ b/include/mapfs/kpa_70_hit.h @@ -1,38 +1,47 @@ -#define COLLIDER_Root 0x25 -#define COLLIDER_g290 0x24 -#define COLLIDER_g378 0x23 -#define COLLIDER_o1495 0x22 -#define COLLIDER_o1494 0x21 -#define COLLIDER_o1493 0x20 -#define COLLIDER_g379 0x1F -#define COLLIDER_o1459 0x1E -#define COLLIDER_o1458 0x1D -#define COLLIDER_o1457 0x1C -#define COLLIDER_o1456 0x1B -#define COLLIDER_o1455 0x1A -#define COLLIDER_o1452 0x19 -#define COLLIDER_o1451 0x18 -#define COLLIDER_o1450 0x17 -#define COLLIDER_o1449 0x16 -#define COLLIDER_o1448 0x15 -#define COLLIDER_o1442 0x14 -#define COLLIDER_o1441 0x13 -#define COLLIDER_o1440 0x12 -#define COLLIDER_o1439 0x11 -#define COLLIDER_o1437 0x10 -#define COLLIDER_o1436 0xF -#define COLLIDER_o1492 0xE -#define COLLIDER_o1491 0xD -#define COLLIDER_o1490 0xC -#define COLLIDER_o1489 0xB -#define COLLIDER_g375 0xA -#define COLLIDER_o1429 0x9 -#define COLLIDER_deilittw 0x8 -#define COLLIDER_deilitw 0x7 -#define COLLIDER_deiliw 0x6 -#define COLLIDER_o1428 0x5 -#define COLLIDER_deilite 0x4 -#define COLLIDER_deilie 0x3 -#define COLLIDER_g374 0x2 -#define COLLIDER_o1386 0x1 -#define COLLIDER_o1381 0x0 +#define COLLIDER_Root 0x25 +#define COLLIDER_g290 0x24 +#define COLLIDER_g378 0x23 +#define COLLIDER_o1495 0x22 +#define COLLIDER_o1494 0x21 +#define COLLIDER_o1493 0x20 +#define COLLIDER_g379 0x1F +#define COLLIDER_o1459 0x1E +#define COLLIDER_o1458 0x1D +#define COLLIDER_o1457 0x1C +#define COLLIDER_o1456 0x1B +#define COLLIDER_o1455 0x1A +#define COLLIDER_o1452 0x19 +#define COLLIDER_o1451 0x18 +#define COLLIDER_o1450 0x17 +#define COLLIDER_o1449 0x16 +#define COLLIDER_o1448 0x15 +#define COLLIDER_o1442 0x14 +#define COLLIDER_o1441 0x13 +#define COLLIDER_o1440 0x12 +#define COLLIDER_o1439 0x11 +#define COLLIDER_o1437 0x10 +#define COLLIDER_o1436 0xF +#define COLLIDER_o1492 0xE +#define COLLIDER_o1491 0xD +#define COLLIDER_o1490 0xC +#define COLLIDER_o1489 0xB +#define COLLIDER_g375 0xA +#define COLLIDER_o1429 0x9 +#define COLLIDER_deilittw 0x8 +#define COLLIDER_deilitw 0x7 +#define COLLIDER_deiliw 0x6 +#define COLLIDER_o1428 0x5 +#define COLLIDER_deilite 0x4 +#define COLLIDER_deilie 0x3 +#define COLLIDER_g374 0x2 +#define COLLIDER_o1386 0x1 +#define COLLIDER_o1381 0x0 + +#define ZONE_Root 0x6 +#define ZONE_g290 0x5 +#define ZONE_deiliw 0x4 +#define ZONE_deilie 0x3 +#define ZONE_o1426 0x2 +#define ZONE_o1418 0x1 +#define ZONE_o1416 0x0 + diff --git a/include/mapfs/kpa_70_shape.h b/include/mapfs/kpa_70_shape.h index 439dcad7dd..bca1b3a338 100644 --- a/include/mapfs/kpa_70_shape.h +++ b/include/mapfs/kpa_70_shape.h @@ -1,212 +1,213 @@ -#define MODEL_Root 0xD3 -#define MODEL_g424 0xD2 -#define MODEL_g376 0xD1 -#define MODEL_o1431 0xD0 -#define MODEL_g377 0xCF -#define MODEL_o1432 0xCE -#define MODEL_g419 0xCD -#define MODEL_o1871 0xCC -#define MODEL_o1826 0xCB -#define MODEL_o1825 0xCA -#define MODEL_g418 0xC9 -#define MODEL_g420 0xC8 -#define MODEL_m03 0xC7 -#define MODEL_g432 0xC6 -#define MODEL_m02 0xC5 -#define MODEL_g431 0xC4 -#define MODEL_m01 0xC3 -#define MODEL_b03 0xC2 -#define MODEL_b02 0xC1 -#define MODEL_g430 0xC0 -#define MODEL_b01 0xBF -#define MODEL_k02 0xBE -#define MODEL_k01 0xBD -#define MODEL_g397 0xBC -#define MODEL_g403 0xBB -#define MODEL_o1777 0xBA -#define MODEL_g400 0xB9 -#define MODEL_o1774 0xB8 -#define MODEL_g399 0xB7 -#define MODEL_o1773 0xB6 -#define MODEL_Default 0xB5 -#define MODEL_o1915 0xB4 -#define MODEL_o1762 0xB3 -#define MODEL_o1780 0xB2 -#define MODEL_g391 0xB1 -#define MODEL_o1861 0xB0 -#define MODEL_o1860 0xAF -#define MODEL_o1831 0xAE -#define MODEL_o1830 0xAD -#define MODEL_o1680 0xAC -#define MODEL_o1681 0xAB -#define MODEL_o1689 0xAA -#define MODEL_o1674 0xA9 -#define MODEL_o1677 0xA8 -#define MODEL_o1696 0xA7 -#define MODEL_o1695 0xA6 -#define MODEL_o1694 0xA5 -#define MODEL_o1693 0xA4 -#define MODEL_o1692 0xA3 -#define MODEL_o1859 0xA2 -#define MODEL_o1833 0xA1 -#define MODEL_o1832 0xA0 -#define MODEL_o1556 0x9F -#define MODEL_o1551 0x9E -#define MODEL_o1543 0x9D -#define MODEL_o1542 0x9C -#define MODEL_o1545 0x9B -#define MODEL_o1561 0x9A -#define MODEL_o1869 0x99 -#define MODEL_o1864 0x98 -#define MODEL_g290 0x97 -#define MODEL_g375 0x96 -#define MODEL_o1897 0x95 -#define MODEL_o1895 0x94 -#define MODEL_o1893 0x93 -#define MODEL_o1891 0x92 -#define MODEL_o1889 0x91 -#define MODEL_o1673 0x90 -#define MODEL_o1670 0x8F -#define MODEL_o1663 0x8E -#define MODEL_o1664 0x8D -#define MODEL_o1565 0x8C -#define MODEL_o1559 0x8B -#define MODEL_o1430 0x8A -#define MODEL_o1427 0x89 -#define MODEL_o1428 0x88 -#define MODEL_o1386 0x87 -#define MODEL_o1381 0x86 -#define MODEL_o1912 0x85 -#define MODEL_o1911 0x84 -#define MODEL_g392 0x83 -#define MODEL_o1856 0x82 -#define MODEL_o1855 0x81 -#define MODEL_o1854 0x80 -#define MODEL_o1853 0x7F -#define MODEL_o1706 0x7E -#define MODEL_o1705 0x7D -#define MODEL_o1704 0x7C -#define MODEL_o1703 0x7B -#define MODEL_o1702 0x7A -#define MODEL_o1701 0x79 -#define MODEL_o1700 0x78 -#define MODEL_o1699 0x77 -#define MODEL_o1698 0x76 -#define MODEL_o1697 0x75 -#define MODEL_g354 0x74 -#define MODEL_g388 0x73 -#define MODEL_o1870 0x72 -#define MODEL_o1562 0x71 -#define MODEL_o1868 0x70 -#define MODEL_o1867 0x6F -#define MODEL_o1862 0x6E -#define MODEL_o1564 0x6D -#define MODEL_o1563 0x6C -#define MODEL_g387 0x6B -#define MODEL_o1902 0x6A -#define MODEL_o1829 0x69 -#define MODEL_o1660 0x68 -#define MODEL_o1765 0x67 -#define MODEL_o1658 0x66 -#define MODEL_o1657 0x65 -#define MODEL_o1651 0x64 -#define MODEL_o1866 0x63 -#define MODEL_g379 0x62 -#define MODEL_o1901 0x61 -#define MODEL_o1900 0x60 -#define MODEL_o1899 0x5F -#define MODEL_o1898 0x5E -#define MODEL_o1648 0x5D -#define MODEL_g390 0x5C -#define MODEL_o1604 0x5B -#define MODEL_o1605 0x5A -#define MODEL_o1636 0x59 -#define MODEL_o1643 0x58 -#define MODEL_o1603 0x57 -#define MODEL_o1851 0x56 -#define MODEL_o1635 0x55 -#define MODEL_o1852 0x54 -#define MODEL_o1602 0x53 -#define MODEL_o1850 0x52 -#define MODEL_o1634 0x51 -#define MODEL_o1641 0x50 -#define MODEL_o1645 0x4F -#define MODEL_o1647 0x4E -#define MODEL_o1638 0x4D -#define MODEL_o1639 0x4C -#define MODEL_o1644 0x4B -#define MODEL_o1646 0x4A -#define MODEL_o1637 0x49 -#define MODEL_o1640 0x48 -#define MODEL_o984 0x47 -#define MODEL_o1836 0x46 -#define MODEL_o1587 0x45 -#define MODEL_o1849 0x44 -#define MODEL_o1835 0x43 -#define MODEL_o1437 0x42 -#define MODEL_o1592 0x41 -#define MODEL_o1848 0x40 -#define MODEL_o1596 0x3F -#define MODEL_o1834 0x3E -#define MODEL_o1593 0x3D -#define MODEL_o1847 0x3C -#define MODEL_o1601 0x3B -#define MODEL_o1597 0x3A -#define MODEL_o1594 0x39 -#define MODEL_o1595 0x38 -#define MODEL_o1598 0x37 -#define MODEL_g370 0x36 -#define MODEL_o1625 0x35 -#define MODEL_o1626 0x34 -#define MODEL_o1627 0x33 -#define MODEL_o1628 0x32 -#define MODEL_o1629 0x31 -#define MODEL_o1630 0x30 -#define MODEL_o1631 0x2F -#define MODEL_o1616 0x2E -#define MODEL_o1617 0x2D -#define MODEL_o1618 0x2C -#define MODEL_o1619 0x2B -#define MODEL_o1620 0x2A -#define MODEL_o1621 0x29 -#define MODEL_o1622 0x28 -#define MODEL_o1599 0x27 -#define MODEL_o1600 0x26 -#define MODEL_o1632 0x25 -#define MODEL_o1633 0x24 -#define MODEL_o1436 0x23 -#define MODEL_o1566 0x22 -#define MODEL_o1574 0x21 -#define MODEL_o1575 0x20 -#define MODEL_o1576 0x1F -#define MODEL_o1577 0x1E -#define MODEL_o1578 0x1D -#define MODEL_o1579 0x1C -#define MODEL_o1580 0x1B -#define MODEL_o1581 0x1A -#define MODEL_o1837 0x19 -#define MODEL_o1838 0x18 -#define MODEL_o1839 0x17 -#define MODEL_o1840 0x16 -#define MODEL_o1841 0x15 -#define MODEL_o1842 0x14 -#define MODEL_g374 0x13 -#define MODEL_o1846 0x12 -#define MODEL_o1845 0x11 -#define MODEL_o1844 0x10 -#define MODEL_o1615 0xF -#define MODEL_o1614 0xE -#define MODEL_o1613 0xD -#define MODEL_o1612 0xC -#define MODEL_o1611 0xB -#define MODEL_o1610 0xA -#define MODEL_o1609 0x9 -#define MODEL_o1608 0x8 -#define MODEL_o1570 0x7 -#define MODEL_o1569 0x6 -#define MODEL_o1568 0x5 -#define MODEL_o1567 0x4 -#define MODEL_o1444 0x3 -#define MODEL_o1404 0x2 -#define MODEL_o1383 0x1 -#define MODEL_o1558 0x0 +#define MODEL_Root 0xD3 +#define MODEL_g424 0xD2 +#define MODEL_g376 0xD1 +#define MODEL_o1431 0xD0 +#define MODEL_g377 0xCF +#define MODEL_o1432 0xCE +#define MODEL_g419 0xCD +#define MODEL_o1871 0xCC +#define MODEL_o1826 0xCB +#define MODEL_o1825 0xCA +#define MODEL_g418 0xC9 +#define MODEL_g420 0xC8 +#define MODEL_m03 0xC7 +#define MODEL_g432 0xC6 +#define MODEL_m02 0xC5 +#define MODEL_g431 0xC4 +#define MODEL_m01 0xC3 +#define MODEL_b03 0xC2 +#define MODEL_b02 0xC1 +#define MODEL_g430 0xC0 +#define MODEL_b01 0xBF +#define MODEL_k02 0xBE +#define MODEL_k01 0xBD +#define MODEL_g397 0xBC +#define MODEL_g403 0xBB +#define MODEL_o1777 0xBA +#define MODEL_g400 0xB9 +#define MODEL_o1774 0xB8 +#define MODEL_g399 0xB7 +#define MODEL_o1773 0xB6 +#define MODEL_Default 0xB5 +#define MODEL_o1915 0xB4 +#define MODEL_o1762 0xB3 +#define MODEL_o1780 0xB2 +#define MODEL_g391 0xB1 +#define MODEL_o1861 0xB0 +#define MODEL_o1860 0xAF +#define MODEL_o1831 0xAE +#define MODEL_o1830 0xAD +#define MODEL_o1680 0xAC +#define MODEL_o1681 0xAB +#define MODEL_o1689 0xAA +#define MODEL_o1674 0xA9 +#define MODEL_o1677 0xA8 +#define MODEL_o1696 0xA7 +#define MODEL_o1695 0xA6 +#define MODEL_o1694 0xA5 +#define MODEL_o1693 0xA4 +#define MODEL_o1692 0xA3 +#define MODEL_o1859 0xA2 +#define MODEL_o1833 0xA1 +#define MODEL_o1832 0xA0 +#define MODEL_o1556 0x9F +#define MODEL_o1551 0x9E +#define MODEL_o1543 0x9D +#define MODEL_o1542 0x9C +#define MODEL_o1545 0x9B +#define MODEL_o1561 0x9A +#define MODEL_o1869 0x99 +#define MODEL_o1864 0x98 +#define MODEL_g290 0x97 +#define MODEL_g375 0x96 +#define MODEL_o1897 0x95 +#define MODEL_o1895 0x94 +#define MODEL_o1893 0x93 +#define MODEL_o1891 0x92 +#define MODEL_o1889 0x91 +#define MODEL_o1673 0x90 +#define MODEL_o1670 0x8F +#define MODEL_o1663 0x8E +#define MODEL_o1664 0x8D +#define MODEL_o1565 0x8C +#define MODEL_o1559 0x8B +#define MODEL_o1430 0x8A +#define MODEL_o1427 0x89 +#define MODEL_o1428 0x88 +#define MODEL_o1386 0x87 +#define MODEL_o1381 0x86 +#define MODEL_o1912 0x85 +#define MODEL_o1911 0x84 +#define MODEL_g392 0x83 +#define MODEL_o1856 0x82 +#define MODEL_o1855 0x81 +#define MODEL_o1854 0x80 +#define MODEL_o1853 0x7F +#define MODEL_o1706 0x7E +#define MODEL_o1705 0x7D +#define MODEL_o1704 0x7C +#define MODEL_o1703 0x7B +#define MODEL_o1702 0x7A +#define MODEL_o1701 0x79 +#define MODEL_o1700 0x78 +#define MODEL_o1699 0x77 +#define MODEL_o1698 0x76 +#define MODEL_o1697 0x75 +#define MODEL_g354 0x74 +#define MODEL_g388 0x73 +#define MODEL_o1870 0x72 +#define MODEL_o1562 0x71 +#define MODEL_o1868 0x70 +#define MODEL_o1867 0x6F +#define MODEL_o1862 0x6E +#define MODEL_o1564 0x6D +#define MODEL_o1563 0x6C +#define MODEL_g387 0x6B +#define MODEL_o1902 0x6A +#define MODEL_o1829 0x69 +#define MODEL_o1660 0x68 +#define MODEL_o1765 0x67 +#define MODEL_o1658 0x66 +#define MODEL_o1657 0x65 +#define MODEL_o1651 0x64 +#define MODEL_o1866 0x63 +#define MODEL_g379 0x62 +#define MODEL_o1901 0x61 +#define MODEL_o1900 0x60 +#define MODEL_o1899 0x5F +#define MODEL_o1898 0x5E +#define MODEL_o1648 0x5D +#define MODEL_g390 0x5C +#define MODEL_o1604 0x5B +#define MODEL_o1605 0x5A +#define MODEL_o1636 0x59 +#define MODEL_o1643 0x58 +#define MODEL_o1603 0x57 +#define MODEL_o1851 0x56 +#define MODEL_o1635 0x55 +#define MODEL_o1852 0x54 +#define MODEL_o1602 0x53 +#define MODEL_o1850 0x52 +#define MODEL_o1634 0x51 +#define MODEL_o1641 0x50 +#define MODEL_o1645 0x4F +#define MODEL_o1647 0x4E +#define MODEL_o1638 0x4D +#define MODEL_o1639 0x4C +#define MODEL_o1644 0x4B +#define MODEL_o1646 0x4A +#define MODEL_o1637 0x49 +#define MODEL_o1640 0x48 +#define MODEL_o984 0x47 +#define MODEL_o1836 0x46 +#define MODEL_o1587 0x45 +#define MODEL_o1849 0x44 +#define MODEL_o1835 0x43 +#define MODEL_o1437 0x42 +#define MODEL_o1592 0x41 +#define MODEL_o1848 0x40 +#define MODEL_o1596 0x3F +#define MODEL_o1834 0x3E +#define MODEL_o1593 0x3D +#define MODEL_o1847 0x3C +#define MODEL_o1601 0x3B +#define MODEL_o1597 0x3A +#define MODEL_o1594 0x39 +#define MODEL_o1595 0x38 +#define MODEL_o1598 0x37 +#define MODEL_g370 0x36 +#define MODEL_o1625 0x35 +#define MODEL_o1626 0x34 +#define MODEL_o1627 0x33 +#define MODEL_o1628 0x32 +#define MODEL_o1629 0x31 +#define MODEL_o1630 0x30 +#define MODEL_o1631 0x2F +#define MODEL_o1616 0x2E +#define MODEL_o1617 0x2D +#define MODEL_o1618 0x2C +#define MODEL_o1619 0x2B +#define MODEL_o1620 0x2A +#define MODEL_o1621 0x29 +#define MODEL_o1622 0x28 +#define MODEL_o1599 0x27 +#define MODEL_o1600 0x26 +#define MODEL_o1632 0x25 +#define MODEL_o1633 0x24 +#define MODEL_o1436 0x23 +#define MODEL_o1566 0x22 +#define MODEL_o1574 0x21 +#define MODEL_o1575 0x20 +#define MODEL_o1576 0x1F +#define MODEL_o1577 0x1E +#define MODEL_o1578 0x1D +#define MODEL_o1579 0x1C +#define MODEL_o1580 0x1B +#define MODEL_o1581 0x1A +#define MODEL_o1837 0x19 +#define MODEL_o1838 0x18 +#define MODEL_o1839 0x17 +#define MODEL_o1840 0x16 +#define MODEL_o1841 0x15 +#define MODEL_o1842 0x14 +#define MODEL_g374 0x13 +#define MODEL_o1846 0x12 +#define MODEL_o1845 0x11 +#define MODEL_o1844 0x10 +#define MODEL_o1615 0xF +#define MODEL_o1614 0xE +#define MODEL_o1613 0xD +#define MODEL_o1612 0xC +#define MODEL_o1611 0xB +#define MODEL_o1610 0xA +#define MODEL_o1609 0x9 +#define MODEL_o1608 0x8 +#define MODEL_o1570 0x7 +#define MODEL_o1569 0x6 +#define MODEL_o1568 0x5 +#define MODEL_o1567 0x4 +#define MODEL_o1444 0x3 +#define MODEL_o1404 0x2 +#define MODEL_o1383 0x1 +#define MODEL_o1558 0x0 + diff --git a/include/mapfs/kpa_80_hit.h b/include/mapfs/kpa_80_hit.h index 0cc6118b3f..1f5698ed3b 100644 --- a/include/mapfs/kpa_80_hit.h +++ b/include/mapfs/kpa_80_hit.h @@ -1,33 +1,47 @@ -#define COLLIDER_Root 0x20 -#define COLLIDER_g1 0x1F -#define COLLIDER_g37 0x1E -#define COLLIDER_o176 0x1D -#define COLLIDER_deilitn 0x1C -#define COLLIDER_deilin 0x1B -#define COLLIDER_deilitts 0x1A -#define COLLIDER_deilits 0x19 -#define COLLIDER_deiliee 0x18 -#define COLLIDER_deilite 0x17 -#define COLLIDER_deilie 0x16 -#define COLLIDER_deiliww 0x15 -#define COLLIDER_deilittw 0x14 -#define COLLIDER_deilitw 0x13 -#define COLLIDER_deiliw 0x12 -#define COLLIDER_g36 0x11 -#define COLLIDER_o166 0x10 -#define COLLIDER_g2 0xF -#define COLLIDER_o179 0xE -#define COLLIDER_o173 0xD -#define COLLIDER_o171 0xC -#define COLLIDER_o146 0xB -#define COLLIDER_o103 0xA -#define COLLIDER_o101 0x9 -#define COLLIDER_o86 0x8 -#define COLLIDER_o71 0x7 -#define COLLIDER_o67 0x6 -#define COLLIDER_o79 0x5 -#define COLLIDER_o60 0x4 -#define COLLIDER_o56 0x3 -#define COLLIDER_o160 0x2 -#define COLLIDER_o52 0x1 -#define COLLIDER_o11 0x0 +#define COLLIDER_Root 0x20 +#define COLLIDER_g1 0x1F +#define COLLIDER_g37 0x1E +#define COLLIDER_o176 0x1D +#define COLLIDER_deilitn 0x1C +#define COLLIDER_deilin 0x1B +#define COLLIDER_deilitts 0x1A +#define COLLIDER_deilits 0x19 +#define COLLIDER_deiliee 0x18 +#define COLLIDER_deilite 0x17 +#define COLLIDER_deilie 0x16 +#define COLLIDER_deiliww 0x15 +#define COLLIDER_deilittw 0x14 +#define COLLIDER_deilitw 0x13 +#define COLLIDER_deiliw 0x12 +#define COLLIDER_g36 0x11 +#define COLLIDER_o166 0x10 +#define COLLIDER_g2 0xF +#define COLLIDER_o179 0xE +#define COLLIDER_o173 0xD +#define COLLIDER_o171 0xC +#define COLLIDER_o146 0xB +#define COLLIDER_o103 0xA +#define COLLIDER_o101 0x9 +#define COLLIDER_o86 0x8 +#define COLLIDER_o71 0x7 +#define COLLIDER_o67 0x6 +#define COLLIDER_o79 0x5 +#define COLLIDER_o60 0x4 +#define COLLIDER_o56 0x3 +#define COLLIDER_o160 0x2 +#define COLLIDER_o52 0x1 +#define COLLIDER_o11 0x0 + +#define ZONE_Root 0xB +#define ZONE_g1 0xA +#define ZONE_g22 0x9 +#define ZONE_o166 0x8 +#define ZONE_o165 0x7 +#define ZONE_g2 0x6 +#define ZONE_o71 0x5 +#define ZONE_o60 0x4 +#define ZONE_o27 0x3 +#define ZONE_o11 0x2 +#define ZONE_o83 0x1 +#define ZONE_o163 0x0 + diff --git a/include/mapfs/kpa_80_shape.h b/include/mapfs/kpa_80_shape.h index f11a3dfe4d..a06650f943 100644 --- a/include/mapfs/kpa_80_shape.h +++ b/include/mapfs/kpa_80_shape.h @@ -1,106 +1,107 @@ -#define MODEL_Root 0x69 -#define MODEL_g44 0x68 -#define MODEL_b7 0x67 -#define MODEL_b6 0x66 -#define MODEL_b5 0x65 -#define MODEL_b4 0x64 -#define MODEL_b3 0x63 -#define MODEL_b2 0x62 -#define MODEL_b1 0x61 -#define MODEL_m7 0x60 -#define MODEL_m6 0x5F -#define MODEL_m5 0x5E -#define MODEL_m4 0x5D -#define MODEL_m3 0x5C -#define MODEL_m2 0x5B -#define MODEL_m1 0x5A -#define MODEL_maru 0x59 -#define MODEL_g49 0x58 -#define MODEL_b_ 0x57 -#define MODEL_g47 0x56 -#define MODEL_b_kai 0x55 -#define MODEL_m_kai 0x54 -#define MODEL_g46 0x53 -#define MODEL_m_ 0x52 -#define MODEL_g22 0x51 -#define MODEL_g41 0x50 -#define MODEL_g43 0x4F -#define MODEL_o174 0x4E -#define MODEL_g42 0x4D -#define MODEL_o173 0x4C -#define MODEL_g1 0x4B -#define MODEL_g38 0x4A -#define MODEL_g40 0x49 -#define MODEL_o167 0x48 -#define MODEL_g39 0x47 -#define MODEL_o165 0x46 -#define MODEL_g23 0x45 -#define MODEL_g32 0x44 -#define MODEL_o171 0x43 -#define MODEL_g37 0x42 -#define MODEL_o126 0x41 -#define MODEL_g33 0x40 -#define MODEL_o127 0x3F -#define MODEL_o155 0x3E -#define MODEL_o147 0x3D -#define MODEL_g34 0x3C -#define MODEL_o119 0x3B -#define MODEL_o162 0x3A -#define MODEL_o161 0x39 -#define MODEL_g31 0x38 -#define MODEL_o170 0x37 -#define MODEL_g36 0x36 -#define MODEL_o116 0x35 -#define MODEL_g35 0x34 -#define MODEL_o158 0x33 -#define MODEL_o157 0x32 -#define MODEL_o156 0x31 -#define MODEL_g24 0x30 -#define MODEL_o121 0x2F -#define MODEL_o142 0x2E -#define MODEL_o140 0x2D -#define MODEL_g2 0x2C -#define MODEL_o159 0x2B -#define MODEL_g8 0x2A -#define MODEL_g30 0x29 -#define MODEL_o146 0x28 -#define MODEL_o145 0x27 -#define MODEL_g20 0x26 -#define MODEL_o103 0x25 -#define MODEL_o102 0x24 -#define MODEL_g19 0x23 -#define MODEL_o101 0x22 -#define MODEL_o100 0x21 -#define MODEL_g16 0x20 -#define MODEL_o168 0x1F -#define MODEL_o164 0x1E -#define MODEL_o163 0x1D -#define MODEL_o86 0x1C -#define MODEL_o71 0x1B -#define MODEL_o67 0x1A -#define MODEL_o65 0x19 -#define MODEL_g15 0x18 -#define MODEL_o177 0x17 -#define MODEL_o176 0x16 -#define MODEL_o175 0x15 -#define MODEL_o169 0x14 -#define MODEL_o83 0x13 -#define MODEL_o79 0x12 -#define MODEL_o60 0x11 -#define MODEL_o56 0x10 -#define MODEL_o54 0xF -#define MODEL_o172 0xE -#define MODEL_g6 0xD -#define MODEL_o166 0xC -#define MODEL_o160 0xB -#define MODEL_o27 0xA -#define MODEL_o25 0x9 -#define MODEL_o24 0x8 -#define MODEL_o113 0x7 -#define MODEL_g4 0x6 -#define MODEL_o196 0x5 -#define MODEL_o52 0x4 -#define MODEL_o11 0x3 -#define MODEL_o8 0x2 -#define MODEL_o7 0x1 -#define MODEL_o114 0x0 +#define MODEL_Root 0x69 +#define MODEL_g44 0x68 +#define MODEL_b7 0x67 +#define MODEL_b6 0x66 +#define MODEL_b5 0x65 +#define MODEL_b4 0x64 +#define MODEL_b3 0x63 +#define MODEL_b2 0x62 +#define MODEL_b1 0x61 +#define MODEL_m7 0x60 +#define MODEL_m6 0x5F +#define MODEL_m5 0x5E +#define MODEL_m4 0x5D +#define MODEL_m3 0x5C +#define MODEL_m2 0x5B +#define MODEL_m1 0x5A +#define MODEL_maru 0x59 +#define MODEL_g49 0x58 +#define MODEL_b_ 0x57 +#define MODEL_g47 0x56 +#define MODEL_b_kai 0x55 +#define MODEL_m_kai 0x54 +#define MODEL_g46 0x53 +#define MODEL_m_ 0x52 +#define MODEL_g22 0x51 +#define MODEL_g41 0x50 +#define MODEL_g43 0x4F +#define MODEL_o174 0x4E +#define MODEL_g42 0x4D +#define MODEL_o173 0x4C +#define MODEL_g1 0x4B +#define MODEL_g38 0x4A +#define MODEL_g40 0x49 +#define MODEL_o167 0x48 +#define MODEL_g39 0x47 +#define MODEL_o165 0x46 +#define MODEL_g23 0x45 +#define MODEL_g32 0x44 +#define MODEL_o171 0x43 +#define MODEL_g37 0x42 +#define MODEL_o126 0x41 +#define MODEL_g33 0x40 +#define MODEL_o127 0x3F +#define MODEL_o155 0x3E +#define MODEL_o147 0x3D +#define MODEL_g34 0x3C +#define MODEL_o119 0x3B +#define MODEL_o162 0x3A +#define MODEL_o161 0x39 +#define MODEL_g31 0x38 +#define MODEL_o170 0x37 +#define MODEL_g36 0x36 +#define MODEL_o116 0x35 +#define MODEL_g35 0x34 +#define MODEL_o158 0x33 +#define MODEL_o157 0x32 +#define MODEL_o156 0x31 +#define MODEL_g24 0x30 +#define MODEL_o121 0x2F +#define MODEL_o142 0x2E +#define MODEL_o140 0x2D +#define MODEL_g2 0x2C +#define MODEL_o159 0x2B +#define MODEL_g8 0x2A +#define MODEL_g30 0x29 +#define MODEL_o146 0x28 +#define MODEL_o145 0x27 +#define MODEL_g20 0x26 +#define MODEL_o103 0x25 +#define MODEL_o102 0x24 +#define MODEL_g19 0x23 +#define MODEL_o101 0x22 +#define MODEL_o100 0x21 +#define MODEL_g16 0x20 +#define MODEL_o168 0x1F +#define MODEL_o164 0x1E +#define MODEL_o163 0x1D +#define MODEL_o86 0x1C +#define MODEL_o71 0x1B +#define MODEL_o67 0x1A +#define MODEL_o65 0x19 +#define MODEL_g15 0x18 +#define MODEL_o177 0x17 +#define MODEL_o176 0x16 +#define MODEL_o175 0x15 +#define MODEL_o169 0x14 +#define MODEL_o83 0x13 +#define MODEL_o79 0x12 +#define MODEL_o60 0x11 +#define MODEL_o56 0x10 +#define MODEL_o54 0xF +#define MODEL_o172 0xE +#define MODEL_g6 0xD +#define MODEL_o166 0xC +#define MODEL_o160 0xB +#define MODEL_o27 0xA +#define MODEL_o25 0x9 +#define MODEL_o24 0x8 +#define MODEL_o113 0x7 +#define MODEL_g4 0x6 +#define MODEL_o196 0x5 +#define MODEL_o52 0x4 +#define MODEL_o11 0x3 +#define MODEL_o8 0x2 +#define MODEL_o7 0x1 +#define MODEL_o114 0x0 + diff --git a/include/mapfs/kpa_81_hit.h b/include/mapfs/kpa_81_hit.h index b149746b8f..76050b01e8 100644 --- a/include/mapfs/kpa_81_hit.h +++ b/include/mapfs/kpa_81_hit.h @@ -1 +1,4 @@ -#define COLLIDER_Root 0x0 +#define COLLIDER_Root 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/kpa_81_shape.h b/include/mapfs/kpa_81_shape.h index 98ef430c86..dee3600cd9 100644 --- a/include/mapfs/kpa_81_shape.h +++ b/include/mapfs/kpa_81_shape.h @@ -1 +1,2 @@ -#define MODEL_Root 0x0 +#define MODEL_Root 0x0 + diff --git a/include/mapfs/kpa_82_hit.h b/include/mapfs/kpa_82_hit.h index b149746b8f..76050b01e8 100644 --- a/include/mapfs/kpa_82_hit.h +++ b/include/mapfs/kpa_82_hit.h @@ -1 +1,4 @@ -#define COLLIDER_Root 0x0 +#define COLLIDER_Root 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/kpa_82_shape.h b/include/mapfs/kpa_82_shape.h index 98ef430c86..dee3600cd9 100644 --- a/include/mapfs/kpa_82_shape.h +++ b/include/mapfs/kpa_82_shape.h @@ -1 +1,2 @@ -#define MODEL_Root 0x0 +#define MODEL_Root 0x0 + diff --git a/include/mapfs/kpa_83_hit.h b/include/mapfs/kpa_83_hit.h index b149746b8f..76050b01e8 100644 --- a/include/mapfs/kpa_83_hit.h +++ b/include/mapfs/kpa_83_hit.h @@ -1 +1,4 @@ -#define COLLIDER_Root 0x0 +#define COLLIDER_Root 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/kpa_83_shape.h b/include/mapfs/kpa_83_shape.h index 98ef430c86..dee3600cd9 100644 --- a/include/mapfs/kpa_83_shape.h +++ b/include/mapfs/kpa_83_shape.h @@ -1 +1,2 @@ -#define MODEL_Root 0x0 +#define MODEL_Root 0x0 + diff --git a/include/mapfs/kpa_90_hit.h b/include/mapfs/kpa_90_hit.h index 7aba4c1b8d..79ec993aaf 100644 --- a/include/mapfs/kpa_90_hit.h +++ b/include/mapfs/kpa_90_hit.h @@ -1,20 +1,32 @@ -#define COLLIDER_Root 0x13 -#define COLLIDER_g1 0x12 -#define COLLIDER_g51 0x11 -#define COLLIDER_o293 0x10 -#define COLLIDER_deilitw 0xF -#define COLLIDER_deiliw 0xE -#define COLLIDER_o290 0xD -#define COLLIDER_deilite 0xC -#define COLLIDER_deilie 0xB -#define COLLIDER_g46 0xA -#define COLLIDER_o286 0x9 -#define COLLIDER_o285 0x8 -#define COLLIDER_o283 0x7 -#define COLLIDER_o282 0x6 -#define COLLIDER_o280 0x5 -#define COLLIDER_o279 0x4 -#define COLLIDER_o277 0x3 -#define COLLIDER_o276 0x2 -#define COLLIDER_o274 0x1 -#define COLLIDER_o273 0x0 +#define COLLIDER_Root 0x13 +#define COLLIDER_g1 0x12 +#define COLLIDER_g51 0x11 +#define COLLIDER_o293 0x10 +#define COLLIDER_deilitw 0xF +#define COLLIDER_deiliw 0xE +#define COLLIDER_o290 0xD +#define COLLIDER_deilite 0xC +#define COLLIDER_deilie 0xB +#define COLLIDER_g46 0xA +#define COLLIDER_o286 0x9 +#define COLLIDER_o285 0x8 +#define COLLIDER_o283 0x7 +#define COLLIDER_o282 0x6 +#define COLLIDER_o280 0x5 +#define COLLIDER_o279 0x4 +#define COLLIDER_o277 0x3 +#define COLLIDER_o276 0x2 +#define COLLIDER_o274 0x1 +#define COLLIDER_o273 0x0 + +#define ZONE_Root 0x9 +#define ZONE_g1 0x8 +#define ZONE_g2 0x7 +#define ZONE_deiliw 0x6 +#define ZONE_deilie 0x5 +#define ZONE_o285 0x4 +#define ZONE_o282 0x3 +#define ZONE_o279 0x2 +#define ZONE_o276 0x1 +#define ZONE_o273 0x0 + diff --git a/include/mapfs/kpa_90_shape.h b/include/mapfs/kpa_90_shape.h index e25e2aa649..38eb1001ce 100644 --- a/include/mapfs/kpa_90_shape.h +++ b/include/mapfs/kpa_90_shape.h @@ -1,44 +1,45 @@ -#define MODEL_Root 0x2B -#define MODEL_g1 0x2A -#define MODEL_g2 0x29 -#define MODEL_g45 0x28 -#define MODEL_o284 0x27 -#define MODEL_o283 0x26 -#define MODEL_o282 0x25 -#define MODEL_o281 0x24 -#define MODEL_o280 0x23 -#define MODEL_o279 0x22 -#define MODEL_o144 0x21 -#define MODEL_o272 0x20 -#define MODEL_o202 0x1F -#define MODEL_o221 0x1E -#define MODEL_g44 0x1D -#define MODEL_o271 0x1C -#define MODEL_o270 0x1B -#define MODEL_o269 0x1A -#define MODEL_o268 0x19 -#define MODEL_o267 0x18 -#define MODEL_g40 0x17 -#define MODEL_o278 0x16 -#define MODEL_o275 0x15 -#define MODEL_o251 0x14 -#define MODEL_o248 0x13 -#define MODEL_o194 0x12 -#define MODEL_g42 0x11 -#define MODEL_o261 0x10 -#define MODEL_o277 0xF -#define MODEL_o259 0xE -#define MODEL_o274 0xD -#define MODEL_o257 0xC -#define MODEL_g41 0xB -#define MODEL_o256 0xA -#define MODEL_o276 0x9 -#define MODEL_o254 0x8 -#define MODEL_o273 0x7 -#define MODEL_o252 0x6 -#define MODEL_g6 0x5 -#define MODEL_o229 0x4 -#define MODEL_o147 0x3 -#define MODEL_o146 0x2 -#define MODEL_o136 0x1 -#define MODEL_o96 0x0 +#define MODEL_Root 0x2B +#define MODEL_g1 0x2A +#define MODEL_g2 0x29 +#define MODEL_g45 0x28 +#define MODEL_o284 0x27 +#define MODEL_o283 0x26 +#define MODEL_o282 0x25 +#define MODEL_o281 0x24 +#define MODEL_o280 0x23 +#define MODEL_o279 0x22 +#define MODEL_o144 0x21 +#define MODEL_o272 0x20 +#define MODEL_o202 0x1F +#define MODEL_o221 0x1E +#define MODEL_g44 0x1D +#define MODEL_o271 0x1C +#define MODEL_o270 0x1B +#define MODEL_o269 0x1A +#define MODEL_o268 0x19 +#define MODEL_o267 0x18 +#define MODEL_g40 0x17 +#define MODEL_o278 0x16 +#define MODEL_o275 0x15 +#define MODEL_o251 0x14 +#define MODEL_o248 0x13 +#define MODEL_o194 0x12 +#define MODEL_g42 0x11 +#define MODEL_o261 0x10 +#define MODEL_o277 0xF +#define MODEL_o259 0xE +#define MODEL_o274 0xD +#define MODEL_o257 0xC +#define MODEL_g41 0xB +#define MODEL_o256 0xA +#define MODEL_o276 0x9 +#define MODEL_o254 0x8 +#define MODEL_o273 0x7 +#define MODEL_o252 0x6 +#define MODEL_g6 0x5 +#define MODEL_o229 0x4 +#define MODEL_o147 0x3 +#define MODEL_o146 0x2 +#define MODEL_o136 0x1 +#define MODEL_o96 0x0 + diff --git a/include/mapfs/kpa_91_hit.h b/include/mapfs/kpa_91_hit.h index a23c94452d..43b5fbbaa8 100644 --- a/include/mapfs/kpa_91_hit.h +++ b/include/mapfs/kpa_91_hit.h @@ -1,48 +1,68 @@ -#define COLLIDER_Root 0x2F -#define COLLIDER_g1 0x2E -#define COLLIDER_o297 0x2D -#define COLLIDER_g57 0x2C -#define COLLIDER_o296 0x2B -#define COLLIDER_o295 0x2A -#define COLLIDER_o281 0x29 -#define COLLIDER_o294 0x28 -#define COLLIDER_g39 0x27 -#define COLLIDER_g46 0x26 -#define COLLIDER_deilittn 0x25 -#define COLLIDER_o266 0x24 -#define COLLIDER_o239 0x23 -#define COLLIDER_o238 0x22 -#define COLLIDER_deilitw 0x21 -#define COLLIDER_deiliw 0x20 -#define COLLIDER_g56 0x1F -#define COLLIDER_o280 0x1E -#define COLLIDER_o279 0x1D -#define COLLIDER_g55 0x1C -#define COLLIDER_o278 0x1B -#define COLLIDER_o277 0x1A -#define COLLIDER_g54 0x19 -#define COLLIDER_o276 0x18 -#define COLLIDER_o275 0x17 -#define COLLIDER_o274 0x16 -#define COLLIDER_o273 0x15 -#define COLLIDER_g53 0x14 -#define COLLIDER_o272 0x13 -#define COLLIDER_o271 0x12 -#define COLLIDER_o270 0x11 -#define COLLIDER_o269 0x10 -#define COLLIDER_g44 0xF -#define COLLIDER_o262 0xE -#define COLLIDER_o232 0xD -#define COLLIDER_o231 0xC -#define COLLIDER_o230 0xB -#define COLLIDER_g43 0xA -#define COLLIDER_o261 0x9 -#define COLLIDER_o229 0x8 -#define COLLIDER_o228 0x7 -#define COLLIDER_o227 0x6 -#define COLLIDER_g41 0x5 -#define COLLIDER_o224 0x4 -#define COLLIDER_o223 0x3 -#define COLLIDER_g40 0x2 -#define COLLIDER_o222 0x1 -#define COLLIDER_o221 0x0 +#define COLLIDER_Root 0x2F +#define COLLIDER_g1 0x2E +#define COLLIDER_o297 0x2D +#define COLLIDER_g57 0x2C +#define COLLIDER_o296 0x2B +#define COLLIDER_o295 0x2A +#define COLLIDER_o281 0x29 +#define COLLIDER_o294 0x28 +#define COLLIDER_g39 0x27 +#define COLLIDER_g46 0x26 +#define COLLIDER_deilittn 0x25 +#define COLLIDER_o266 0x24 +#define COLLIDER_o239 0x23 +#define COLLIDER_o238 0x22 +#define COLLIDER_deilitw 0x21 +#define COLLIDER_deiliw 0x20 +#define COLLIDER_g56 0x1F +#define COLLIDER_o280 0x1E +#define COLLIDER_o279 0x1D +#define COLLIDER_g55 0x1C +#define COLLIDER_o278 0x1B +#define COLLIDER_o277 0x1A +#define COLLIDER_g54 0x19 +#define COLLIDER_o276 0x18 +#define COLLIDER_o275 0x17 +#define COLLIDER_o274 0x16 +#define COLLIDER_o273 0x15 +#define COLLIDER_g53 0x14 +#define COLLIDER_o272 0x13 +#define COLLIDER_o271 0x12 +#define COLLIDER_o270 0x11 +#define COLLIDER_o269 0x10 +#define COLLIDER_g44 0xF +#define COLLIDER_o262 0xE +#define COLLIDER_o232 0xD +#define COLLIDER_o231 0xC +#define COLLIDER_o230 0xB +#define COLLIDER_g43 0xA +#define COLLIDER_o261 0x9 +#define COLLIDER_o229 0x8 +#define COLLIDER_o228 0x7 +#define COLLIDER_o227 0x6 +#define COLLIDER_g41 0x5 +#define COLLIDER_o224 0x4 +#define COLLIDER_o223 0x3 +#define COLLIDER_g40 0x2 +#define COLLIDER_o222 0x1 +#define COLLIDER_o221 0x0 + +#define ZONE_Root 0x11 +#define ZONE_g40 0x10 +#define ZONE_o220 0xF +#define ZONE_o214 0xE +#define ZONE_o159 0xD +#define ZONE_o92 0xC +#define ZONE_g39 0xB +#define ZONE_o218 0xA +#define ZONE_o212 0x9 +#define ZONE_o188 0x8 +#define ZONE_o174 0x7 +#define ZONE_g1 0x6 +#define ZONE_o221 0x5 +#define ZONE_o181 0x4 +#define ZONE_o157 0x3 +#define ZONE_o83 0x2 +#define ZONE_o60 0x1 +#define ZONE_o11 0x0 + diff --git a/include/mapfs/kpa_91_shape.h b/include/mapfs/kpa_91_shape.h index f59c10b21c..5b1173a8d0 100644 --- a/include/mapfs/kpa_91_shape.h +++ b/include/mapfs/kpa_91_shape.h @@ -1,73 +1,74 @@ -#define MODEL_Root 0x48 -#define MODEL_g1 0x47 -#define MODEL_Default 0x46 -#define MODEL_g36 0x45 -#define MODEL_g35 0x44 -#define MODEL_o194 0x43 -#define MODEL_o199 0x42 -#define MODEL_o195 0x41 -#define MODEL_o108 0x40 -#define MODEL_g2 0x3F -#define MODEL_g39 0x3E -#define MODEL_g46 0x3D -#define MODEL_o236 0x3C -#define MODEL_g45 0x3B -#define MODEL_o235 0x3A -#define MODEL_g42 0x39 -#define MODEL_o227 0x38 -#define MODEL_g40 0x37 -#define MODEL_o223 0x36 -#define MODEL_g38 0x35 -#define MODEL_o220 0x34 -#define MODEL_o219 0x33 -#define MODEL_o218 0x32 -#define MODEL_o217 0x31 -#define MODEL_o216 0x30 -#define MODEL_o215 0x2F -#define MODEL_g37 0x2E -#define MODEL_o214 0x2D -#define MODEL_o213 0x2C -#define MODEL_o212 0x2B -#define MODEL_o211 0x2A -#define MODEL_o210 0x29 -#define MODEL_o209 0x28 -#define MODEL_g33 0x27 -#define MODEL_o190 0x26 -#define MODEL_o188 0x25 -#define MODEL_o187 0x24 -#define MODEL_o186 0x23 -#define MODEL_o240 0x22 -#define MODEL_g32 0x21 -#define MODEL_o183 0x20 -#define MODEL_o181 0x1F -#define MODEL_o180 0x1E -#define MODEL_o179 0x1D -#define MODEL_o238 0x1C -#define MODEL_g31 0x1B -#define MODEL_o176 0x1A -#define MODEL_o174 0x19 -#define MODEL_o173 0x18 -#define MODEL_o172 0x17 -#define MODEL_o239 0x16 -#define MODEL_g28 0x15 -#define MODEL_o159 0x14 -#define MODEL_o158 0x13 -#define MODEL_o157 0x12 -#define MODEL_o156 0x11 -#define MODEL_o155 0x10 -#define MODEL_o154 0xF -#define MODEL_g15 0xE -#define MODEL_o83 0xD -#define MODEL_o80 0xC -#define MODEL_o79 0xB -#define MODEL_o60 0xA -#define MODEL_o56 0x9 -#define MODEL_o54 0x8 -#define MODEL_o237 0x7 -#define MODEL_g4 0x6 -#define MODEL_o92 0x5 -#define MODEL_o52 0x4 -#define MODEL_o11 0x3 -#define MODEL_o8 0x2 -#define MODEL_o7 0x1 -#define MODEL_o104 0x0 +#define MODEL_Root 0x48 +#define MODEL_g1 0x47 +#define MODEL_Default 0x46 +#define MODEL_g36 0x45 +#define MODEL_g35 0x44 +#define MODEL_o194 0x43 +#define MODEL_o199 0x42 +#define MODEL_o195 0x41 +#define MODEL_o108 0x40 +#define MODEL_g2 0x3F +#define MODEL_g39 0x3E +#define MODEL_g46 0x3D +#define MODEL_o236 0x3C +#define MODEL_g45 0x3B +#define MODEL_o235 0x3A +#define MODEL_g42 0x39 +#define MODEL_o227 0x38 +#define MODEL_g40 0x37 +#define MODEL_o223 0x36 +#define MODEL_g38 0x35 +#define MODEL_o220 0x34 +#define MODEL_o219 0x33 +#define MODEL_o218 0x32 +#define MODEL_o217 0x31 +#define MODEL_o216 0x30 +#define MODEL_o215 0x2F +#define MODEL_g37 0x2E +#define MODEL_o214 0x2D +#define MODEL_o213 0x2C +#define MODEL_o212 0x2B +#define MODEL_o211 0x2A +#define MODEL_o210 0x29 +#define MODEL_o209 0x28 +#define MODEL_g33 0x27 +#define MODEL_o190 0x26 +#define MODEL_o188 0x25 +#define MODEL_o187 0x24 +#define MODEL_o186 0x23 +#define MODEL_o240 0x22 +#define MODEL_g32 0x21 +#define MODEL_o183 0x20 +#define MODEL_o181 0x1F +#define MODEL_o180 0x1E +#define MODEL_o179 0x1D +#define MODEL_o238 0x1C +#define MODEL_g31 0x1B +#define MODEL_o176 0x1A +#define MODEL_o174 0x19 +#define MODEL_o173 0x18 +#define MODEL_o172 0x17 +#define MODEL_o239 0x16 +#define MODEL_g28 0x15 +#define MODEL_o159 0x14 +#define MODEL_o158 0x13 +#define MODEL_o157 0x12 +#define MODEL_o156 0x11 +#define MODEL_o155 0x10 +#define MODEL_o154 0xF +#define MODEL_g15 0xE +#define MODEL_o83 0xD +#define MODEL_o80 0xC +#define MODEL_o79 0xB +#define MODEL_o60 0xA +#define MODEL_o56 0x9 +#define MODEL_o54 0x8 +#define MODEL_o237 0x7 +#define MODEL_g4 0x6 +#define MODEL_o92 0x5 +#define MODEL_o52 0x4 +#define MODEL_o11 0x3 +#define MODEL_o8 0x2 +#define MODEL_o7 0x1 +#define MODEL_o104 0x0 + diff --git a/include/mapfs/kpa_94_hit.h b/include/mapfs/kpa_94_hit.h index 5976cab335..a4fac3ea94 100644 --- a/include/mapfs/kpa_94_hit.h +++ b/include/mapfs/kpa_94_hit.h @@ -1,21 +1,33 @@ -#define COLLIDER_Root 0x14 -#define COLLIDER_g1 0x13 -#define COLLIDER_g51 0x12 -#define COLLIDER_o293 0x11 -#define COLLIDER_deilitw 0x10 -#define COLLIDER_deiliw 0xF -#define COLLIDER_o290 0xE -#define COLLIDER_deilitte 0xD -#define COLLIDER_deilite 0xC -#define COLLIDER_deilie 0xB -#define COLLIDER_g46 0xA -#define COLLIDER_o286 0x9 -#define COLLIDER_o285 0x8 -#define COLLIDER_o283 0x7 -#define COLLIDER_o282 0x6 -#define COLLIDER_o280 0x5 -#define COLLIDER_o279 0x4 -#define COLLIDER_o277 0x3 -#define COLLIDER_o276 0x2 -#define COLLIDER_o274 0x1 -#define COLLIDER_o273 0x0 +#define COLLIDER_Root 0x14 +#define COLLIDER_g1 0x13 +#define COLLIDER_g51 0x12 +#define COLLIDER_o293 0x11 +#define COLLIDER_deilitw 0x10 +#define COLLIDER_deiliw 0xF +#define COLLIDER_o290 0xE +#define COLLIDER_deilitte 0xD +#define COLLIDER_deilite 0xC +#define COLLIDER_deilie 0xB +#define COLLIDER_g46 0xA +#define COLLIDER_o286 0x9 +#define COLLIDER_o285 0x8 +#define COLLIDER_o283 0x7 +#define COLLIDER_o282 0x6 +#define COLLIDER_o280 0x5 +#define COLLIDER_o279 0x4 +#define COLLIDER_o277 0x3 +#define COLLIDER_o276 0x2 +#define COLLIDER_o274 0x1 +#define COLLIDER_o273 0x0 + +#define ZONE_Root 0x9 +#define ZONE_g1 0x8 +#define ZONE_g2 0x7 +#define ZONE_deiliw 0x6 +#define ZONE_deilie 0x5 +#define ZONE_o285 0x4 +#define ZONE_o282 0x3 +#define ZONE_o279 0x2 +#define ZONE_o276 0x1 +#define ZONE_o273 0x0 + diff --git a/include/mapfs/kpa_94_shape.h b/include/mapfs/kpa_94_shape.h index 345b4c6679..e93ed4ff9b 100644 --- a/include/mapfs/kpa_94_shape.h +++ b/include/mapfs/kpa_94_shape.h @@ -1,46 +1,47 @@ -#define MODEL_Root 0x2D -#define MODEL_g1 0x2C -#define MODEL_g51 0x2B -#define MODEL_g58 0x2A -#define MODEL_o340 0x29 -#define MODEL_g57 0x28 -#define MODEL_o343 0x27 -#define MODEL_o342 0x26 -#define MODEL_o341 0x25 -#define MODEL_o339 0x24 -#define MODEL_o338 0x23 -#define MODEL_o337 0x22 -#define MODEL_o336 0x21 -#define MODEL_o335 0x20 -#define MODEL_o334 0x1F -#define MODEL_o333 0x1E -#define MODEL_g56 0x1D -#define MODEL_o332 0x1C -#define MODEL_o331 0x1B -#define MODEL_o330 0x1A -#define MODEL_o329 0x19 -#define MODEL_o328 0x18 -#define MODEL_g55 0x17 -#define MODEL_o327 0x16 -#define MODEL_o326 0x15 -#define MODEL_o325 0x14 -#define MODEL_o324 0x13 -#define MODEL_o323 0x12 -#define MODEL_g54 0x11 -#define MODEL_o322 0x10 -#define MODEL_o321 0xF -#define MODEL_o320 0xE -#define MODEL_o319 0xD -#define MODEL_o318 0xC -#define MODEL_g53 0xB -#define MODEL_o317 0xA -#define MODEL_o316 0x9 -#define MODEL_o315 0x8 -#define MODEL_o314 0x7 -#define MODEL_o313 0x6 -#define MODEL_g52 0x5 -#define MODEL_o312 0x4 -#define MODEL_o311 0x3 -#define MODEL_o310 0x2 -#define MODEL_o309 0x1 -#define MODEL_o308 0x0 +#define MODEL_Root 0x2D +#define MODEL_g1 0x2C +#define MODEL_g51 0x2B +#define MODEL_g58 0x2A +#define MODEL_o340 0x29 +#define MODEL_g57 0x28 +#define MODEL_o343 0x27 +#define MODEL_o342 0x26 +#define MODEL_o341 0x25 +#define MODEL_o339 0x24 +#define MODEL_o338 0x23 +#define MODEL_o337 0x22 +#define MODEL_o336 0x21 +#define MODEL_o335 0x20 +#define MODEL_o334 0x1F +#define MODEL_o333 0x1E +#define MODEL_g56 0x1D +#define MODEL_o332 0x1C +#define MODEL_o331 0x1B +#define MODEL_o330 0x1A +#define MODEL_o329 0x19 +#define MODEL_o328 0x18 +#define MODEL_g55 0x17 +#define MODEL_o327 0x16 +#define MODEL_o326 0x15 +#define MODEL_o325 0x14 +#define MODEL_o324 0x13 +#define MODEL_o323 0x12 +#define MODEL_g54 0x11 +#define MODEL_o322 0x10 +#define MODEL_o321 0xF +#define MODEL_o320 0xE +#define MODEL_o319 0xD +#define MODEL_o318 0xC +#define MODEL_g53 0xB +#define MODEL_o317 0xA +#define MODEL_o316 0x9 +#define MODEL_o315 0x8 +#define MODEL_o314 0x7 +#define MODEL_o313 0x6 +#define MODEL_g52 0x5 +#define MODEL_o312 0x4 +#define MODEL_o311 0x3 +#define MODEL_o310 0x2 +#define MODEL_o309 0x1 +#define MODEL_o308 0x0 + diff --git a/include/mapfs/kpa_95_hit.h b/include/mapfs/kpa_95_hit.h index 576dbe5a7e..cc0f9c1f38 100644 --- a/include/mapfs/kpa_95_hit.h +++ b/include/mapfs/kpa_95_hit.h @@ -1,48 +1,61 @@ -#define COLLIDER_Root 0x2F -#define COLLIDER_g1 0x2E -#define COLLIDER_o297 0x2D -#define COLLIDER_g57 0x2C -#define COLLIDER_o296 0x2B -#define COLLIDER_o295 0x2A -#define COLLIDER_o281 0x29 -#define COLLIDER_o294 0x28 -#define COLLIDER_g39 0x27 -#define COLLIDER_g46 0x26 -#define COLLIDER_deilittn 0x25 -#define COLLIDER_o266 0x24 -#define COLLIDER_o239 0x23 -#define COLLIDER_o238 0x22 -#define COLLIDER_deilite 0x21 -#define COLLIDER_deilie 0x20 -#define COLLIDER_g56 0x1F -#define COLLIDER_o280 0x1E -#define COLLIDER_o279 0x1D -#define COLLIDER_g55 0x1C -#define COLLIDER_o278 0x1B -#define COLLIDER_o277 0x1A -#define COLLIDER_g54 0x19 -#define COLLIDER_o276 0x18 -#define COLLIDER_o275 0x17 -#define COLLIDER_o274 0x16 -#define COLLIDER_o273 0x15 -#define COLLIDER_g53 0x14 -#define COLLIDER_o272 0x13 -#define COLLIDER_o271 0x12 -#define COLLIDER_o270 0x11 -#define COLLIDER_o269 0x10 -#define COLLIDER_g44 0xF -#define COLLIDER_o262 0xE -#define COLLIDER_o232 0xD -#define COLLIDER_o231 0xC -#define COLLIDER_o230 0xB -#define COLLIDER_g43 0xA -#define COLLIDER_o261 0x9 -#define COLLIDER_o229 0x8 -#define COLLIDER_o228 0x7 -#define COLLIDER_o227 0x6 -#define COLLIDER_g41 0x5 -#define COLLIDER_o224 0x4 -#define COLLIDER_o223 0x3 -#define COLLIDER_g40 0x2 -#define COLLIDER_o222 0x1 -#define COLLIDER_o221 0x0 +#define COLLIDER_Root 0x2F +#define COLLIDER_g1 0x2E +#define COLLIDER_o297 0x2D +#define COLLIDER_g57 0x2C +#define COLLIDER_o296 0x2B +#define COLLIDER_o295 0x2A +#define COLLIDER_o281 0x29 +#define COLLIDER_o294 0x28 +#define COLLIDER_g39 0x27 +#define COLLIDER_g46 0x26 +#define COLLIDER_deilittn 0x25 +#define COLLIDER_o266 0x24 +#define COLLIDER_o239 0x23 +#define COLLIDER_o238 0x22 +#define COLLIDER_deilite 0x21 +#define COLLIDER_deilie 0x20 +#define COLLIDER_g56 0x1F +#define COLLIDER_o280 0x1E +#define COLLIDER_o279 0x1D +#define COLLIDER_g55 0x1C +#define COLLIDER_o278 0x1B +#define COLLIDER_o277 0x1A +#define COLLIDER_g54 0x19 +#define COLLIDER_o276 0x18 +#define COLLIDER_o275 0x17 +#define COLLIDER_o274 0x16 +#define COLLIDER_o273 0x15 +#define COLLIDER_g53 0x14 +#define COLLIDER_o272 0x13 +#define COLLIDER_o271 0x12 +#define COLLIDER_o270 0x11 +#define COLLIDER_o269 0x10 +#define COLLIDER_g44 0xF +#define COLLIDER_o262 0xE +#define COLLIDER_o232 0xD +#define COLLIDER_o231 0xC +#define COLLIDER_o230 0xB +#define COLLIDER_g43 0xA +#define COLLIDER_o261 0x9 +#define COLLIDER_o229 0x8 +#define COLLIDER_o228 0x7 +#define COLLIDER_o227 0x6 +#define COLLIDER_g41 0x5 +#define COLLIDER_o224 0x4 +#define COLLIDER_o223 0x3 +#define COLLIDER_g40 0x2 +#define COLLIDER_o222 0x1 +#define COLLIDER_o221 0x0 + +#define ZONE_Root 0xA +#define ZONE_g1 0x9 +#define ZONE_g41 0x8 +#define ZONE_o212 0x7 +#define ZONE_o188 0x6 +#define ZONE_o174 0x5 +#define ZONE_g40 0x4 +#define ZONE_o159 0x3 +#define ZONE_g39 0x2 +#define ZONE_o83 0x1 +#define ZONE_o11 0x0 + diff --git a/include/mapfs/kpa_95_shape.h b/include/mapfs/kpa_95_shape.h index f59c10b21c..5b1173a8d0 100644 --- a/include/mapfs/kpa_95_shape.h +++ b/include/mapfs/kpa_95_shape.h @@ -1,73 +1,74 @@ -#define MODEL_Root 0x48 -#define MODEL_g1 0x47 -#define MODEL_Default 0x46 -#define MODEL_g36 0x45 -#define MODEL_g35 0x44 -#define MODEL_o194 0x43 -#define MODEL_o199 0x42 -#define MODEL_o195 0x41 -#define MODEL_o108 0x40 -#define MODEL_g2 0x3F -#define MODEL_g39 0x3E -#define MODEL_g46 0x3D -#define MODEL_o236 0x3C -#define MODEL_g45 0x3B -#define MODEL_o235 0x3A -#define MODEL_g42 0x39 -#define MODEL_o227 0x38 -#define MODEL_g40 0x37 -#define MODEL_o223 0x36 -#define MODEL_g38 0x35 -#define MODEL_o220 0x34 -#define MODEL_o219 0x33 -#define MODEL_o218 0x32 -#define MODEL_o217 0x31 -#define MODEL_o216 0x30 -#define MODEL_o215 0x2F -#define MODEL_g37 0x2E -#define MODEL_o214 0x2D -#define MODEL_o213 0x2C -#define MODEL_o212 0x2B -#define MODEL_o211 0x2A -#define MODEL_o210 0x29 -#define MODEL_o209 0x28 -#define MODEL_g33 0x27 -#define MODEL_o190 0x26 -#define MODEL_o188 0x25 -#define MODEL_o187 0x24 -#define MODEL_o186 0x23 -#define MODEL_o240 0x22 -#define MODEL_g32 0x21 -#define MODEL_o183 0x20 -#define MODEL_o181 0x1F -#define MODEL_o180 0x1E -#define MODEL_o179 0x1D -#define MODEL_o238 0x1C -#define MODEL_g31 0x1B -#define MODEL_o176 0x1A -#define MODEL_o174 0x19 -#define MODEL_o173 0x18 -#define MODEL_o172 0x17 -#define MODEL_o239 0x16 -#define MODEL_g28 0x15 -#define MODEL_o159 0x14 -#define MODEL_o158 0x13 -#define MODEL_o157 0x12 -#define MODEL_o156 0x11 -#define MODEL_o155 0x10 -#define MODEL_o154 0xF -#define MODEL_g15 0xE -#define MODEL_o83 0xD -#define MODEL_o80 0xC -#define MODEL_o79 0xB -#define MODEL_o60 0xA -#define MODEL_o56 0x9 -#define MODEL_o54 0x8 -#define MODEL_o237 0x7 -#define MODEL_g4 0x6 -#define MODEL_o92 0x5 -#define MODEL_o52 0x4 -#define MODEL_o11 0x3 -#define MODEL_o8 0x2 -#define MODEL_o7 0x1 -#define MODEL_o104 0x0 +#define MODEL_Root 0x48 +#define MODEL_g1 0x47 +#define MODEL_Default 0x46 +#define MODEL_g36 0x45 +#define MODEL_g35 0x44 +#define MODEL_o194 0x43 +#define MODEL_o199 0x42 +#define MODEL_o195 0x41 +#define MODEL_o108 0x40 +#define MODEL_g2 0x3F +#define MODEL_g39 0x3E +#define MODEL_g46 0x3D +#define MODEL_o236 0x3C +#define MODEL_g45 0x3B +#define MODEL_o235 0x3A +#define MODEL_g42 0x39 +#define MODEL_o227 0x38 +#define MODEL_g40 0x37 +#define MODEL_o223 0x36 +#define MODEL_g38 0x35 +#define MODEL_o220 0x34 +#define MODEL_o219 0x33 +#define MODEL_o218 0x32 +#define MODEL_o217 0x31 +#define MODEL_o216 0x30 +#define MODEL_o215 0x2F +#define MODEL_g37 0x2E +#define MODEL_o214 0x2D +#define MODEL_o213 0x2C +#define MODEL_o212 0x2B +#define MODEL_o211 0x2A +#define MODEL_o210 0x29 +#define MODEL_o209 0x28 +#define MODEL_g33 0x27 +#define MODEL_o190 0x26 +#define MODEL_o188 0x25 +#define MODEL_o187 0x24 +#define MODEL_o186 0x23 +#define MODEL_o240 0x22 +#define MODEL_g32 0x21 +#define MODEL_o183 0x20 +#define MODEL_o181 0x1F +#define MODEL_o180 0x1E +#define MODEL_o179 0x1D +#define MODEL_o238 0x1C +#define MODEL_g31 0x1B +#define MODEL_o176 0x1A +#define MODEL_o174 0x19 +#define MODEL_o173 0x18 +#define MODEL_o172 0x17 +#define MODEL_o239 0x16 +#define MODEL_g28 0x15 +#define MODEL_o159 0x14 +#define MODEL_o158 0x13 +#define MODEL_o157 0x12 +#define MODEL_o156 0x11 +#define MODEL_o155 0x10 +#define MODEL_o154 0xF +#define MODEL_g15 0xE +#define MODEL_o83 0xD +#define MODEL_o80 0xC +#define MODEL_o79 0xB +#define MODEL_o60 0xA +#define MODEL_o56 0x9 +#define MODEL_o54 0x8 +#define MODEL_o237 0x7 +#define MODEL_g4 0x6 +#define MODEL_o92 0x5 +#define MODEL_o52 0x4 +#define MODEL_o11 0x3 +#define MODEL_o8 0x2 +#define MODEL_o7 0x1 +#define MODEL_o104 0x0 + diff --git a/include/mapfs/kpa_96_hit.h b/include/mapfs/kpa_96_hit.h index 8ec0227e6a..07b7be0ff7 100644 --- a/include/mapfs/kpa_96_hit.h +++ b/include/mapfs/kpa_96_hit.h @@ -1,44 +1,59 @@ -#define COLLIDER_Root 0x2B -#define COLLIDER_Default 0x2A -#define COLLIDER_o970 0x29 -#define COLLIDER_o969 0x28 -#define COLLIDER_o967 0x27 -#define COLLIDER_g262 0x26 -#define COLLIDER_g277 0x25 -#define COLLIDER_o949 0x24 -#define COLLIDER_o963 0x23 -#define COLLIDER_o961 0x22 -#define COLLIDER_o960 0x21 -#define COLLIDER_g271 0x20 -#define COLLIDER_o908 0x1F -#define COLLIDER_deilittw 0x1E -#define COLLIDER_deilitw 0x1D -#define COLLIDER_deiliw 0x1C -#define COLLIDER_g266 0x1B -#define COLLIDER_o893 0x1A -#define COLLIDER_o892 0x19 -#define COLLIDER_o891 0x18 -#define COLLIDER_o890 0x17 -#define COLLIDER_g265 0x16 -#define COLLIDER_o889 0x15 -#define COLLIDER_o888 0x14 -#define COLLIDER_o887 0x13 -#define COLLIDER_o886 0x12 -#define COLLIDER_g264 0x11 -#define COLLIDER_o885 0x10 -#define COLLIDER_o884 0xF -#define COLLIDER_g263 0xE -#define COLLIDER_o883 0xD -#define COLLIDER_o882 0xC -#define COLLIDER_g254 0xB -#define COLLIDER_o881 0xA -#define COLLIDER_o880 0x9 -#define COLLIDER_g282 0x8 -#define COLLIDER_o964 0x7 -#define COLLIDER_g259 0x6 -#define COLLIDER_o865 0x5 -#define COLLIDER_o864 0x4 -#define COLLIDER_o863 0x3 -#define COLLIDER_o862 0x2 -#define COLLIDER_o861 0x1 -#define COLLIDER_o860 0x0 +#define COLLIDER_Root 0x2B +#define COLLIDER_Default 0x2A +#define COLLIDER_o970 0x29 +#define COLLIDER_o969 0x28 +#define COLLIDER_o967 0x27 +#define COLLIDER_g262 0x26 +#define COLLIDER_g277 0x25 +#define COLLIDER_o949 0x24 +#define COLLIDER_o963 0x23 +#define COLLIDER_o961 0x22 +#define COLLIDER_o960 0x21 +#define COLLIDER_g271 0x20 +#define COLLIDER_o908 0x1F +#define COLLIDER_deilittw 0x1E +#define COLLIDER_deilitw 0x1D +#define COLLIDER_deiliw 0x1C +#define COLLIDER_g266 0x1B +#define COLLIDER_o893 0x1A +#define COLLIDER_o892 0x19 +#define COLLIDER_o891 0x18 +#define COLLIDER_o890 0x17 +#define COLLIDER_g265 0x16 +#define COLLIDER_o889 0x15 +#define COLLIDER_o888 0x14 +#define COLLIDER_o887 0x13 +#define COLLIDER_o886 0x12 +#define COLLIDER_g264 0x11 +#define COLLIDER_o885 0x10 +#define COLLIDER_o884 0xF +#define COLLIDER_g263 0xE +#define COLLIDER_o883 0xD +#define COLLIDER_o882 0xC +#define COLLIDER_g254 0xB +#define COLLIDER_o881 0xA +#define COLLIDER_o880 0x9 +#define COLLIDER_g282 0x8 +#define COLLIDER_o964 0x7 +#define COLLIDER_g259 0x6 +#define COLLIDER_o865 0x5 +#define COLLIDER_o864 0x4 +#define COLLIDER_o863 0x3 +#define COLLIDER_o862 0x2 +#define COLLIDER_o861 0x1 +#define COLLIDER_o860 0x0 + +#define ZONE_Root 0xC +#define ZONE_g262 0xB +#define ZONE_o883 0xA +#define ZONE_o882 0x9 +#define ZONE_o881 0x8 +#define ZONE_o880 0x7 +#define ZONE_o879 0x6 +#define ZONE_g253 0x5 +#define ZONE_o821 0x4 +#define ZONE_o817 0x3 +#define ZONE_o813 0x2 +#define ZONE_o808 0x1 +#define ZONE_o802 0x0 + diff --git a/include/mapfs/kpa_96_shape.h b/include/mapfs/kpa_96_shape.h index befbbfd209..d3a8c2c9ea 100644 --- a/include/mapfs/kpa_96_shape.h +++ b/include/mapfs/kpa_96_shape.h @@ -1,81 +1,82 @@ -#define MODEL_Root 0x50 -#define MODEL_g253 0x4F -#define MODEL_g272 0x4E -#define MODEL_o938 0x4D -#define MODEL_g267 0x4C -#define MODEL_g268 0x4B -#define MODEL_o937 0x4A -#define MODEL_o936 0x49 -#define MODEL_g270 0x48 -#define MODEL_o934 0x47 -#define MODEL_o913 0x46 -#define MODEL_o912 0x45 -#define MODEL_g266 0x44 -#define MODEL_o908 0x43 -#define MODEL_o907 0x42 -#define MODEL_o906 0x41 -#define MODEL_o905 0x40 -#define MODEL_o904 0x3F -#define MODEL_g265 0x3E -#define MODEL_o911 0x3D -#define MODEL_o899 0x3C -#define MODEL_o898 0x3B -#define MODEL_g264 0x3A -#define MODEL_o892 0x39 -#define MODEL_o890 0x38 -#define MODEL_o886 0x37 -#define MODEL_o885 0x36 -#define MODEL_g263 0x35 -#define MODEL_o882 0x34 -#define MODEL_g262 0x33 -#define MODEL_o881 0x32 -#define MODEL_o880 0x31 -#define MODEL_o879 0x30 -#define MODEL_g261 0x2F -#define MODEL_o836 0x2E -#define MODEL_o835 0x2D -#define MODEL_o834 0x2C -#define MODEL_o833 0x2B -#define MODEL_o832 0x2A -#define MODEL_o831 0x29 -#define MODEL_g258 0x28 -#define MODEL_o822 0x27 -#define MODEL_o821 0x26 -#define MODEL_o820 0x25 -#define MODEL_o819 0x24 -#define MODEL_g257 0x23 -#define MODEL_o817 0x22 -#define MODEL_o816 0x21 -#define MODEL_o815 0x20 -#define MODEL_o813 0x1F -#define MODEL_o812 0x1E -#define MODEL_o811 0x1D -#define MODEL_g256 0x1C -#define MODEL_o809 0x1B -#define MODEL_o808 0x1A -#define MODEL_o807 0x19 -#define MODEL_o806 0x18 -#define MODEL_g255 0x17 -#define MODEL_o804 0x16 -#define MODEL_o802 0x15 -#define MODEL_o801 0x14 -#define MODEL_o800 0x13 -#define MODEL_g254 0x12 -#define MODEL_o877 0x11 -#define MODEL_o876 0x10 -#define MODEL_o875 0xF -#define MODEL_o874 0xE -#define MODEL_o873 0xD -#define MODEL_o872 0xC -#define MODEL_o859 0xB -#define MODEL_o857 0xA -#define MODEL_o852 0x9 -#define MODEL_o851 0x8 -#define MODEL_o844 0x7 -#define MODEL_o843 0x6 -#define MODEL_o841 0x5 -#define MODEL_o840 0x4 -#define MODEL_o839 0x3 -#define MODEL_o837 0x2 -#define MODEL_o830 0x1 -#define MODEL_o829 0x0 +#define MODEL_Root 0x50 +#define MODEL_g253 0x4F +#define MODEL_g272 0x4E +#define MODEL_o938 0x4D +#define MODEL_g267 0x4C +#define MODEL_g268 0x4B +#define MODEL_o937 0x4A +#define MODEL_o936 0x49 +#define MODEL_g270 0x48 +#define MODEL_o934 0x47 +#define MODEL_o913 0x46 +#define MODEL_o912 0x45 +#define MODEL_g266 0x44 +#define MODEL_o908 0x43 +#define MODEL_o907 0x42 +#define MODEL_o906 0x41 +#define MODEL_o905 0x40 +#define MODEL_o904 0x3F +#define MODEL_g265 0x3E +#define MODEL_o911 0x3D +#define MODEL_o899 0x3C +#define MODEL_o898 0x3B +#define MODEL_g264 0x3A +#define MODEL_o892 0x39 +#define MODEL_o890 0x38 +#define MODEL_o886 0x37 +#define MODEL_o885 0x36 +#define MODEL_g263 0x35 +#define MODEL_o882 0x34 +#define MODEL_g262 0x33 +#define MODEL_o881 0x32 +#define MODEL_o880 0x31 +#define MODEL_o879 0x30 +#define MODEL_g261 0x2F +#define MODEL_o836 0x2E +#define MODEL_o835 0x2D +#define MODEL_o834 0x2C +#define MODEL_o833 0x2B +#define MODEL_o832 0x2A +#define MODEL_o831 0x29 +#define MODEL_g258 0x28 +#define MODEL_o822 0x27 +#define MODEL_o821 0x26 +#define MODEL_o820 0x25 +#define MODEL_o819 0x24 +#define MODEL_g257 0x23 +#define MODEL_o817 0x22 +#define MODEL_o816 0x21 +#define MODEL_o815 0x20 +#define MODEL_o813 0x1F +#define MODEL_o812 0x1E +#define MODEL_o811 0x1D +#define MODEL_g256 0x1C +#define MODEL_o809 0x1B +#define MODEL_o808 0x1A +#define MODEL_o807 0x19 +#define MODEL_o806 0x18 +#define MODEL_g255 0x17 +#define MODEL_o804 0x16 +#define MODEL_o802 0x15 +#define MODEL_o801 0x14 +#define MODEL_o800 0x13 +#define MODEL_g254 0x12 +#define MODEL_o877 0x11 +#define MODEL_o876 0x10 +#define MODEL_o875 0xF +#define MODEL_o874 0xE +#define MODEL_o873 0xD +#define MODEL_o872 0xC +#define MODEL_o859 0xB +#define MODEL_o857 0xA +#define MODEL_o852 0x9 +#define MODEL_o851 0x8 +#define MODEL_o844 0x7 +#define MODEL_o843 0x6 +#define MODEL_o841 0x5 +#define MODEL_o840 0x4 +#define MODEL_o839 0x3 +#define MODEL_o837 0x2 +#define MODEL_o830 0x1 +#define MODEL_o829 0x0 + diff --git a/include/mapfs/kpa_bt01_hit.h b/include/mapfs/kpa_bt01_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/kpa_bt01_hit.h +++ b/include/mapfs/kpa_bt01_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/kpa_bt01_shape.h b/include/mapfs/kpa_bt01_shape.h index c592c0e675..a95bcaade3 100644 --- a/include/mapfs/kpa_bt01_shape.h +++ b/include/mapfs/kpa_bt01_shape.h @@ -1,42 +1,43 @@ -#define MODEL_Root 0x29 -#define MODEL_g79 0x28 -#define MODEL_o418 0x27 -#define MODEL_g77 0x26 -#define MODEL_o416 0x25 -#define MODEL_switch 0x24 -#define MODEL_1_2 0x23 -#define MODEL_1 0x22 -#define MODEL_1_3 0x21 -#define MODEL_2_2 0x20 -#define MODEL_2 0x1F -#define MODEL_2_3 0x1E -#define MODEL_3_2 0x1D -#define MODEL_3 0x1C -#define MODEL_3_3 0x1B -#define MODEL_ami 0x1A -#define MODEL_hasira 0x19 -#define MODEL_o383 0x18 -#define MODEL_o382 0x17 -#define MODEL_o381 0x16 -#define MODEL_dai 0x15 -#define MODEL_waki1 0x14 -#define MODEL_yuka1_2 0x13 -#define MODEL_yuka1 0x12 -#define MODEL_g72 0x11 -#define MODEL_waku2 0x10 -#define MODEL_yuka2_2 0xF -#define MODEL_yuka2 0xE -#define MODEL_tai2 0xD -#define MODEL_tai1 0xC -#define MODEL_waku 0xB -#define MODEL_mad5 0xA -#define MODEL_mad4 0x9 -#define MODEL_mad3 0x8 -#define MODEL_mad1 0x7 -#define MODEL_mad1_2 0x6 -#define MODEL_mad2 0x5 -#define MODEL_mad2_2 0x4 -#define MODEL_kab4 0x3 -#define MODEL_kab3 0x2 -#define MODEL_kab2 0x1 -#define MODEL_kab1 0x0 +#define MODEL_Root 0x29 +#define MODEL_g79 0x28 +#define MODEL_o418 0x27 +#define MODEL_g77 0x26 +#define MODEL_o416 0x25 +#define MODEL_switch 0x24 +#define MODEL_1_2 0x23 +#define MODEL_1 0x22 +#define MODEL_1_3 0x21 +#define MODEL_2_2 0x20 +#define MODEL_2 0x1F +#define MODEL_2_3 0x1E +#define MODEL_3_2 0x1D +#define MODEL_3 0x1C +#define MODEL_3_3 0x1B +#define MODEL_ami 0x1A +#define MODEL_hasira 0x19 +#define MODEL_o383 0x18 +#define MODEL_o382 0x17 +#define MODEL_o381 0x16 +#define MODEL_dai 0x15 +#define MODEL_waki1 0x14 +#define MODEL_yuka1_2 0x13 +#define MODEL_yuka1 0x12 +#define MODEL_g72 0x11 +#define MODEL_waku2 0x10 +#define MODEL_yuka2_2 0xF +#define MODEL_yuka2 0xE +#define MODEL_tai2 0xD +#define MODEL_tai1 0xC +#define MODEL_waku 0xB +#define MODEL_mad5 0xA +#define MODEL_mad4 0x9 +#define MODEL_mad3 0x8 +#define MODEL_mad1 0x7 +#define MODEL_mad1_2 0x6 +#define MODEL_mad2 0x5 +#define MODEL_mad2_2 0x4 +#define MODEL_kab4 0x3 +#define MODEL_kab3 0x2 +#define MODEL_kab2 0x1 +#define MODEL_kab1 0x0 + diff --git a/include/mapfs/kpa_bt02_hit.h b/include/mapfs/kpa_bt02_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/kpa_bt02_hit.h +++ b/include/mapfs/kpa_bt02_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/kpa_bt02_shape.h b/include/mapfs/kpa_bt02_shape.h index 7528655620..93192dc920 100644 --- a/include/mapfs/kpa_bt02_shape.h +++ b/include/mapfs/kpa_bt02_shape.h @@ -1,22 +1,23 @@ -#define MODEL_Root 0x15 -#define MODEL_yougan 0x14 -#define MODEL_4 0x13 -#define MODEL_3 0x12 -#define MODEL_1 0x11 -#define MODEL_2 0x10 -#define MODEL_dai 0xF -#define MODEL_soku 0xE -#define MODEL_saku 0xD -#define MODEL_waki1 0xC -#define MODEL_yuka1 0xB -#define MODEL_g1 0xA -#define MODEL_waku2 0x9 -#define MODEL_yuka2 0x8 -#define MODEL_ami 0x7 -#define MODEL_kab2 0x6 -#define MODEL_kab1 0x5 -#define MODEL_kab2_2 0x4 -#define MODEL_kab1_2 0x3 -#define MODEL_kabe_k 0x2 -#define MODEL_kab_o 0x1 -#define MODEL_waku 0x0 +#define MODEL_Root 0x15 +#define MODEL_yougan 0x14 +#define MODEL_4 0x13 +#define MODEL_3 0x12 +#define MODEL_1 0x11 +#define MODEL_2 0x10 +#define MODEL_dai 0xF +#define MODEL_soku 0xE +#define MODEL_saku 0xD +#define MODEL_waki1 0xC +#define MODEL_yuka1 0xB +#define MODEL_g1 0xA +#define MODEL_waku2 0x9 +#define MODEL_yuka2 0x8 +#define MODEL_ami 0x7 +#define MODEL_kab2 0x6 +#define MODEL_kab1 0x5 +#define MODEL_kab2_2 0x4 +#define MODEL_kab1_2 0x3 +#define MODEL_kabe_k 0x2 +#define MODEL_kab_o 0x1 +#define MODEL_waku 0x0 + diff --git a/include/mapfs/kpa_bt03_hit.h b/include/mapfs/kpa_bt03_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/kpa_bt03_hit.h +++ b/include/mapfs/kpa_bt03_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/kpa_bt03_shape.h b/include/mapfs/kpa_bt03_shape.h index 09d939c225..da5654be66 100644 --- a/include/mapfs/kpa_bt03_shape.h +++ b/include/mapfs/kpa_bt03_shape.h @@ -1,28 +1,29 @@ -#define MODEL_Root 0x1B -#define MODEL_dai 0x1A -#define MODEL_tar1 0x19 -#define MODEL_waku1 0x18 -#define MODEL_yuka2 0x17 -#define MODEL_yuka1 0x16 -#define MODEL_fut1 0x15 -#define MODEL_g49 0x14 -#define MODEL_waku2 0x13 -#define MODEL_o5 0x12 -#define MODEL_O5_2 0x11 -#define MODEL_o4 0x10 -#define MODEL_o4_2 0xF -#define MODEL_o3 0xE -#define MODEL_o3_2 0xD -#define MODEL_o2 0xC -#define MODEL_o2_2 0xB -#define MODEL_o1 0xA -#define MODEL_o1_2 0x9 -#define MODEL_fut2 0x8 -#define MODEL_fut2_2 0x7 -#define MODEL_kab 0x6 -#define MODEL_kab_k 0x5 -#define MODEL_yuka3 0x4 -#define MODEL_fut3 0x3 -#define MODEL_fut3_2 0x2 -#define MODEL_waku 0x1 -#define MODEL_tar2 0x0 +#define MODEL_Root 0x1B +#define MODEL_dai 0x1A +#define MODEL_tar1 0x19 +#define MODEL_waku1 0x18 +#define MODEL_yuka2 0x17 +#define MODEL_yuka1 0x16 +#define MODEL_fut1 0x15 +#define MODEL_g49 0x14 +#define MODEL_waku2 0x13 +#define MODEL_o5 0x12 +#define MODEL_O5_2 0x11 +#define MODEL_o4 0x10 +#define MODEL_o4_2 0xF +#define MODEL_o3 0xE +#define MODEL_o3_2 0xD +#define MODEL_o2 0xC +#define MODEL_o2_2 0xB +#define MODEL_o1 0xA +#define MODEL_o1_2 0x9 +#define MODEL_fut2 0x8 +#define MODEL_fut2_2 0x7 +#define MODEL_kab 0x6 +#define MODEL_kab_k 0x5 +#define MODEL_yuka3 0x4 +#define MODEL_fut3 0x3 +#define MODEL_fut3_2 0x2 +#define MODEL_waku 0x1 +#define MODEL_tar2 0x0 + diff --git a/include/mapfs/kpa_bt04_hit.h b/include/mapfs/kpa_bt04_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/kpa_bt04_hit.h +++ b/include/mapfs/kpa_bt04_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/kpa_bt04_shape.h b/include/mapfs/kpa_bt04_shape.h index feef537210..ccfa2ca52c 100644 --- a/include/mapfs/kpa_bt04_shape.h +++ b/include/mapfs/kpa_bt04_shape.h @@ -1,42 +1,43 @@ -#define MODEL_Root 0x29 -#define MODEL_g83 0x28 -#define MODEL_o453 0x27 -#define MODEL_o452 0x26 -#define MODEL_g86 0x25 -#define MODEL_o454 0x24 -#define MODEL_g85 0x23 -#define MODEL_o451 0x22 -#define MODEL_g84 0x21 -#define MODEL_o450 0x20 -#define MODEL_dai 0x1F -#define MODEL_o415 0x1E -#define MODEL_waki1 0x1D -#define MODEL_yuka1_2 0x1C -#define MODEL_yuka1 0x1B -#define MODEL_g4 0x1A -#define MODEL_g82 0x19 -#define MODEL_hi4 0x18 -#define MODEL_g81 0x17 -#define MODEL_hi3 0x16 -#define MODEL_g80 0x15 -#define MODEL_hi2 0x14 -#define MODEL_g79 0x13 -#define MODEL_hi1 0x12 -#define MODEL_wa 0x11 -#define MODEL_kusari 0x10 -#define MODEL_g3 0xF -#define MODEL_o437 0xE -#define MODEL_g2 0xD -#define MODEL_ami 0xC -#define MODEL_g1 0xB -#define MODEL_waku2 0xA -#define MODEL_yuka2_2 0x9 -#define MODEL_yuka2 0x8 -#define MODEL_kab2 0x7 -#define MODEL_kab1 0x6 -#define MODEL_kab2_2 0x5 -#define MODEL_kab1_2 0x4 -#define MODEL_kabe_k 0x3 -#define MODEL_waku 0x2 -#define MODEL_ok2 0x1 -#define MODEL_ok1 0x0 +#define MODEL_Root 0x29 +#define MODEL_g83 0x28 +#define MODEL_o453 0x27 +#define MODEL_o452 0x26 +#define MODEL_g86 0x25 +#define MODEL_o454 0x24 +#define MODEL_g85 0x23 +#define MODEL_o451 0x22 +#define MODEL_g84 0x21 +#define MODEL_o450 0x20 +#define MODEL_dai 0x1F +#define MODEL_o415 0x1E +#define MODEL_waki1 0x1D +#define MODEL_yuka1_2 0x1C +#define MODEL_yuka1 0x1B +#define MODEL_g4 0x1A +#define MODEL_g82 0x19 +#define MODEL_hi4 0x18 +#define MODEL_g81 0x17 +#define MODEL_hi3 0x16 +#define MODEL_g80 0x15 +#define MODEL_hi2 0x14 +#define MODEL_g79 0x13 +#define MODEL_hi1 0x12 +#define MODEL_wa 0x11 +#define MODEL_kusari 0x10 +#define MODEL_g3 0xF +#define MODEL_o437 0xE +#define MODEL_g2 0xD +#define MODEL_ami 0xC +#define MODEL_g1 0xB +#define MODEL_waku2 0xA +#define MODEL_yuka2_2 0x9 +#define MODEL_yuka2 0x8 +#define MODEL_kab2 0x7 +#define MODEL_kab1 0x6 +#define MODEL_kab2_2 0x5 +#define MODEL_kab1_2 0x4 +#define MODEL_kabe_k 0x3 +#define MODEL_waku 0x2 +#define MODEL_ok2 0x1 +#define MODEL_ok1 0x0 + diff --git a/include/mapfs/kpa_bt05_hit.h b/include/mapfs/kpa_bt05_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/kpa_bt05_hit.h +++ b/include/mapfs/kpa_bt05_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/kpa_bt05_shape.h b/include/mapfs/kpa_bt05_shape.h index cb23ef859b..602e02db1f 100644 --- a/include/mapfs/kpa_bt05_shape.h +++ b/include/mapfs/kpa_bt05_shape.h @@ -1,21 +1,22 @@ -#define MODEL_Root 0x14 -#define MODEL_dai 0x13 -#define MODEL_waku1 0x12 -#define MODEL_yuka2 0x11 -#define MODEL_saku 0x10 -#define MODEL_g49 0xF -#define MODEL_waku2 0xE -#define MODEL_saku2 0xD -#define MODEL_futi1 0xC -#define MODEL_ok4 0xB -#define MODEL_ok3 0xA -#define MODEL_ok1 0x9 -#define MODEL_oku2 0x8 -#define MODEL_futi2 0x7 -#define MODEL_kabe1 0x6 -#define MODEL_kabe2 0x5 -#define MODEL_ami 0x4 -#define MODEL_yuka1 0x3 -#define MODEL_ok2 0x2 -#define MODEL_oku1 0x1 -#define MODEL_waku 0x0 +#define MODEL_Root 0x14 +#define MODEL_dai 0x13 +#define MODEL_waku1 0x12 +#define MODEL_yuka2 0x11 +#define MODEL_saku 0x10 +#define MODEL_g49 0xF +#define MODEL_waku2 0xE +#define MODEL_saku2 0xD +#define MODEL_futi1 0xC +#define MODEL_ok4 0xB +#define MODEL_ok3 0xA +#define MODEL_ok1 0x9 +#define MODEL_oku2 0x8 +#define MODEL_futi2 0x7 +#define MODEL_kabe1 0x6 +#define MODEL_kabe2 0x5 +#define MODEL_ami 0x4 +#define MODEL_yuka1 0x3 +#define MODEL_ok2 0x2 +#define MODEL_oku1 0x1 +#define MODEL_waku 0x0 + diff --git a/include/mapfs/kpa_bt07_hit.h b/include/mapfs/kpa_bt07_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/kpa_bt07_hit.h +++ b/include/mapfs/kpa_bt07_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/kpa_bt07_shape.h b/include/mapfs/kpa_bt07_shape.h index 5620cd7b0b..ddfb585bb3 100644 --- a/include/mapfs/kpa_bt07_shape.h +++ b/include/mapfs/kpa_bt07_shape.h @@ -1,20 +1,21 @@ -#define MODEL_Root 0x13 -#define MODEL_dai 0x12 -#define MODEL_kemu1 0x11 -#define MODEL_kemu2 0x10 -#define MODEL_waku1 0xF -#define MODEL_yuka 0xE -#define MODEL_g49 0xD -#define MODEL_waku2 0xC -#define MODEL_1_2_2 0xB -#define MODEL_1_2 0xA -#define MODEL_1 0x9 -#define MODEL_1_3 0x8 -#define MODEL_2_2 0x7 -#define MODEL_2 0x6 -#define MODEL_2_3 0x5 -#define MODEL_3 0x4 -#define MODEL_3_3 0x3 -#define MODEL_waku 0x2 -#define MODEL_yuka2 0x1 -#define MODEL_kemu3 0x0 +#define MODEL_Root 0x13 +#define MODEL_dai 0x12 +#define MODEL_kemu1 0x11 +#define MODEL_kemu2 0x10 +#define MODEL_waku1 0xF +#define MODEL_yuka 0xE +#define MODEL_g49 0xD +#define MODEL_waku2 0xC +#define MODEL_1_2_2 0xB +#define MODEL_1_2 0xA +#define MODEL_1 0x9 +#define MODEL_1_3 0x8 +#define MODEL_2_2 0x7 +#define MODEL_2 0x6 +#define MODEL_2_3 0x5 +#define MODEL_3 0x4 +#define MODEL_3_3 0x3 +#define MODEL_waku 0x2 +#define MODEL_yuka2 0x1 +#define MODEL_kemu3 0x0 + diff --git a/include/mapfs/kpa_bt08_hit.h b/include/mapfs/kpa_bt08_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/kpa_bt08_hit.h +++ b/include/mapfs/kpa_bt08_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/kpa_bt08_shape.h b/include/mapfs/kpa_bt08_shape.h index 5af643b02a..c8dd6bbe3e 100644 --- a/include/mapfs/kpa_bt08_shape.h +++ b/include/mapfs/kpa_bt08_shape.h @@ -1,25 +1,26 @@ -#define MODEL_Root 0x18 -#define MODEL_dai 0x17 -#define MODEL_o478 0x16 -#define MODEL_waku1 0x15 -#define MODEL_yuka2 0x14 -#define MODEL_g49 0x13 -#define MODEL_waku2 0x12 -#define MODEL_h3 0x11 -#define MODEL_h2 0x10 -#define MODEL_waku 0xF -#define MODEL_h1 0xE -#define MODEL_h4 0xD -#define MODEL_futi2 0xC -#define MODEL_kabe4 0xB -#define MODEL_yuka3 0xA -#define MODEL_kabe2 0x9 -#define MODEL_futi1 0x8 -#define MODEL_kabe1 0x7 -#define MODEL_kup1 0x6 -#define MODEL_kup2 0x5 -#define MODEL_k2_2 0x4 -#define MODEL_k2 0x3 -#define MODEL_k1_2 0x2 -#define MODEL_k1 0x1 -#define MODEL_yuka1 0x0 +#define MODEL_Root 0x18 +#define MODEL_dai 0x17 +#define MODEL_o478 0x16 +#define MODEL_waku1 0x15 +#define MODEL_yuka2 0x14 +#define MODEL_g49 0x13 +#define MODEL_waku2 0x12 +#define MODEL_h3 0x11 +#define MODEL_h2 0x10 +#define MODEL_waku 0xF +#define MODEL_h1 0xE +#define MODEL_h4 0xD +#define MODEL_futi2 0xC +#define MODEL_kabe4 0xB +#define MODEL_yuka3 0xA +#define MODEL_kabe2 0x9 +#define MODEL_futi1 0x8 +#define MODEL_kabe1 0x7 +#define MODEL_kup1 0x6 +#define MODEL_kup2 0x5 +#define MODEL_k2_2 0x4 +#define MODEL_k2 0x3 +#define MODEL_k1_2 0x2 +#define MODEL_k1 0x1 +#define MODEL_yuka1 0x0 + diff --git a/include/mapfs/kpa_bt09_hit.h b/include/mapfs/kpa_bt09_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/kpa_bt09_hit.h +++ b/include/mapfs/kpa_bt09_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/kpa_bt09_shape.h b/include/mapfs/kpa_bt09_shape.h index a9d72def73..f3ed595ace 100644 --- a/include/mapfs/kpa_bt09_shape.h +++ b/include/mapfs/kpa_bt09_shape.h @@ -1,18 +1,19 @@ -#define MODEL_Root 0x11 -#define MODEL_dai 0x10 -#define MODEL_g76 0xF -#define MODEL_o355 0xE -#define MODEL_o354 0xD -#define MODEL_o353 0xC -#define MODEL_toge 0xB -#define MODEL_waku1 0xA -#define MODEL_yuka2 0x9 -#define MODEL_yuka 0x8 -#define MODEL_g49 0x7 -#define MODEL_waku2 0x6 -#define MODEL_waku 0x5 -#define MODEL_oh4 0x4 -#define MODEL_oh3 0x3 -#define MODEL_oh2 0x2 -#define MODEL_oh1 0x1 -#define MODEL_oku1 0x0 +#define MODEL_Root 0x11 +#define MODEL_dai 0x10 +#define MODEL_g76 0xF +#define MODEL_o355 0xE +#define MODEL_o354 0xD +#define MODEL_o353 0xC +#define MODEL_toge 0xB +#define MODEL_waku1 0xA +#define MODEL_yuka2 0x9 +#define MODEL_yuka 0x8 +#define MODEL_g49 0x7 +#define MODEL_waku2 0x6 +#define MODEL_waku 0x5 +#define MODEL_oh4 0x4 +#define MODEL_oh3 0x3 +#define MODEL_oh2 0x2 +#define MODEL_oh1 0x1 +#define MODEL_oku1 0x0 + diff --git a/include/mapfs/kpa_bt11_hit.h b/include/mapfs/kpa_bt11_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/kpa_bt11_hit.h +++ b/include/mapfs/kpa_bt11_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/kpa_bt11_shape.h b/include/mapfs/kpa_bt11_shape.h index 847f016c91..b0ff58632c 100644 --- a/include/mapfs/kpa_bt11_shape.h +++ b/include/mapfs/kpa_bt11_shape.h @@ -1,15 +1,16 @@ -#define MODEL_Root 0xE -#define MODEL_dai 0xD -#define MODEL_waku1 0xC -#define MODEL_yuka2 0xB -#define MODEL_h2 0xA -#define MODEL_h1 0x9 -#define MODEL_g49 0x8 -#define MODEL_waku2 0x7 -#define MODEL_waku 0x6 -#define MODEL_yuka1 0x5 -#define MODEL_ok4 0x4 -#define MODEL_ok3 0x3 -#define MODEL_ok2 0x2 -#define MODEL_ok1 0x1 -#define MODEL_oku1 0x0 +#define MODEL_Root 0xE +#define MODEL_dai 0xD +#define MODEL_waku1 0xC +#define MODEL_yuka2 0xB +#define MODEL_h2 0xA +#define MODEL_h1 0x9 +#define MODEL_g49 0x8 +#define MODEL_waku2 0x7 +#define MODEL_waku 0x6 +#define MODEL_yuka1 0x5 +#define MODEL_ok4 0x4 +#define MODEL_ok3 0x3 +#define MODEL_ok2 0x2 +#define MODEL_ok1 0x1 +#define MODEL_oku1 0x0 + diff --git a/include/mapfs/kpa_bt13_hit.h b/include/mapfs/kpa_bt13_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/kpa_bt13_hit.h +++ b/include/mapfs/kpa_bt13_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/kpa_bt13_shape.h b/include/mapfs/kpa_bt13_shape.h index 48644caee7..d7a3a9165e 100644 --- a/include/mapfs/kpa_bt13_shape.h +++ b/include/mapfs/kpa_bt13_shape.h @@ -1,18 +1,19 @@ -#define MODEL_Root 0x11 -#define MODEL_g84 0x10 -#define MODEL_waku2 0xF -#define MODEL_waku 0xE -#define MODEL_tai2 0xD -#define MODEL_tai1 0xC -#define MODEL_dai 0xB -#define MODEL_waku1 0xA -#define MODEL_yuka2 0x9 -#define MODEL_g49 0x8 -#define MODEL_yuka1 0x7 -#define MODEL_kup2 0x6 -#define MODEL_kup1 0x5 -#define MODEL_kab3 0x4 -#define MODEL_kab2 0x3 -#define MODEL_kab1 0x2 -#define MODEL_sai 0x1 -#define MODEL_oku 0x0 +#define MODEL_Root 0x11 +#define MODEL_g84 0x10 +#define MODEL_waku2 0xF +#define MODEL_waku 0xE +#define MODEL_tai2 0xD +#define MODEL_tai1 0xC +#define MODEL_dai 0xB +#define MODEL_waku1 0xA +#define MODEL_yuka2 0x9 +#define MODEL_g49 0x8 +#define MODEL_yuka1 0x7 +#define MODEL_kup2 0x6 +#define MODEL_kup1 0x5 +#define MODEL_kab3 0x4 +#define MODEL_kab2 0x3 +#define MODEL_kab1 0x2 +#define MODEL_sai 0x1 +#define MODEL_oku 0x0 + diff --git a/include/mapfs/kpa_bt14_hit.h b/include/mapfs/kpa_bt14_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/kpa_bt14_hit.h +++ b/include/mapfs/kpa_bt14_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/kpa_bt14_shape.h b/include/mapfs/kpa_bt14_shape.h index c4e8db66c4..7918bb18b7 100644 --- a/include/mapfs/kpa_bt14_shape.h +++ b/include/mapfs/kpa_bt14_shape.h @@ -1,24 +1,25 @@ -#define MODEL_Root 0x17 -#define MODEL_dai 0x16 -#define MODEL_waku1 0x15 -#define MODEL_yuka2 0x14 -#define MODEL_g49 0x13 -#define MODEL_o462 0x12 -#define MODEL_o461 0x11 -#define MODEL_o460 0x10 -#define MODEL_o459 0xF -#define MODEL_o463 0xE -#define MODEL_waku2 0xD -#define MODEL_o452 0xC -#define MODEL_o451 0xB -#define MODEL_o449 0xA -#define MODEL_o448 0x9 -#define MODEL_o446 0x8 -#define MODEL_o444 0x7 -#define MODEL_o435 0x6 -#define MODEL_o431 0x5 -#define MODEL_waku 0x4 -#define MODEL_yuka1 0x3 -#define MODEL_o456 0x2 -#define MODEL_o433 0x1 -#define MODEL_o430 0x0 +#define MODEL_Root 0x17 +#define MODEL_dai 0x16 +#define MODEL_waku1 0x15 +#define MODEL_yuka2 0x14 +#define MODEL_g49 0x13 +#define MODEL_o462 0x12 +#define MODEL_o461 0x11 +#define MODEL_o460 0x10 +#define MODEL_o459 0xF +#define MODEL_o463 0xE +#define MODEL_waku2 0xD +#define MODEL_o452 0xC +#define MODEL_o451 0xB +#define MODEL_o449 0xA +#define MODEL_o448 0x9 +#define MODEL_o446 0x8 +#define MODEL_o444 0x7 +#define MODEL_o435 0x6 +#define MODEL_o431 0x5 +#define MODEL_waku 0x4 +#define MODEL_yuka1 0x3 +#define MODEL_o456 0x2 +#define MODEL_o433 0x1 +#define MODEL_o430 0x0 + diff --git a/include/mapfs/kzn_01_hit.h b/include/mapfs/kzn_01_hit.h index 37258fd1ff..6975dbd081 100644 --- a/include/mapfs/kzn_01_hit.h +++ b/include/mapfs/kzn_01_hit.h @@ -1,22 +1,29 @@ -#define COLLIDER_Root 0x15 -#define COLLIDER_g15 0x14 -#define COLLIDER_g14 0x13 -#define COLLIDER_o109 0x12 -#define COLLIDER_o106 0x11 -#define COLLIDER_g9 0x10 -#define COLLIDER_o87 0xF -#define COLLIDER_o86 0xE -#define COLLIDER_o85 0xD -#define COLLIDER_g4 0xC -#define COLLIDER_o74 0xB -#define COLLIDER_deilit2 0xA -#define COLLIDER_deili2 0x9 -#define COLLIDER_o73 0x8 -#define COLLIDER_deilit1 0x7 -#define COLLIDER_deili1 0x6 -#define COLLIDER_Default 0x5 -#define COLLIDER_o75 0x4 -#define COLLIDER_o70 0x3 -#define COLLIDER_o66 0x2 -#define COLLIDER_o19 0x1 -#define COLLIDER_o52 0x0 +#define COLLIDER_Root 0x15 +#define COLLIDER_g15 0x14 +#define COLLIDER_g14 0x13 +#define COLLIDER_o109 0x12 +#define COLLIDER_o106 0x11 +#define COLLIDER_g9 0x10 +#define COLLIDER_o87 0xF +#define COLLIDER_o86 0xE +#define COLLIDER_o85 0xD +#define COLLIDER_g4 0xC +#define COLLIDER_o74 0xB +#define COLLIDER_deilit2 0xA +#define COLLIDER_deili2 0x9 +#define COLLIDER_o73 0x8 +#define COLLIDER_deilit1 0x7 +#define COLLIDER_deili1 0x6 +#define COLLIDER_Default 0x5 +#define COLLIDER_o75 0x4 +#define COLLIDER_o70 0x3 +#define COLLIDER_o66 0x2 +#define COLLIDER_o19 0x1 +#define COLLIDER_o52 0x0 + +#define ZONE_Root 0x4 +#define ZONE_Default 0x3 +#define ZONE_o69 0x2 +#define ZONE_o68 0x1 +#define ZONE_o18 0x0 + diff --git a/include/mapfs/kzn_01_shape.h b/include/mapfs/kzn_01_shape.h index 193dedfd64..7c50a29440 100644 --- a/include/mapfs/kzn_01_shape.h +++ b/include/mapfs/kzn_01_shape.h @@ -1,30 +1,31 @@ -#define MODEL_Root 0x1D -#define MODEL_g17 0x1C -#define MODEL_o105 0x1B -#define MODEL_o103 0x1A -#define MODEL_o18 0x19 -#define MODEL_g15 0x18 -#define MODEL_o113 0x17 -#define MODEL_kemri 0x16 -#define MODEL_kem1 0x15 -#define MODEL_yuka 0x14 -#define MODEL_o94 0x13 -#define MODEL_o73 0x12 -#define MODEL_kuro 0x11 -#define MODEL_o65 0x10 -#define MODEL_o64 0xF -#define MODEL_kabe 0xE -#define MODEL_o89 0xD -#define MODEL_o126 0xC -#define MODEL_o87 0xB -#define MODEL_g5 0xA -#define MODEL_o123 0x9 -#define MODEL_o122 0x8 -#define MODEL_o121 0x7 -#define MODEL_o120 0x6 -#define MODEL_Default 0x5 -#define MODEL_o80 0x4 -#define MODEL_o79 0x3 -#define MODEL_o15 0x2 -#define MODEL_o76 0x1 -#define MODEL_o47 0x0 +#define MODEL_Root 0x1D +#define MODEL_g17 0x1C +#define MODEL_o105 0x1B +#define MODEL_o103 0x1A +#define MODEL_o18 0x19 +#define MODEL_g15 0x18 +#define MODEL_o113 0x17 +#define MODEL_kemri 0x16 +#define MODEL_kem1 0x15 +#define MODEL_yuka 0x14 +#define MODEL_o94 0x13 +#define MODEL_o73 0x12 +#define MODEL_kuro 0x11 +#define MODEL_o65 0x10 +#define MODEL_o64 0xF +#define MODEL_kabe 0xE +#define MODEL_o89 0xD +#define MODEL_o126 0xC +#define MODEL_o87 0xB +#define MODEL_g5 0xA +#define MODEL_o123 0x9 +#define MODEL_o122 0x8 +#define MODEL_o121 0x7 +#define MODEL_o120 0x6 +#define MODEL_Default 0x5 +#define MODEL_o80 0x4 +#define MODEL_o79 0x3 +#define MODEL_o15 0x2 +#define MODEL_o76 0x1 +#define MODEL_o47 0x0 + diff --git a/include/mapfs/kzn_02_hit.h b/include/mapfs/kzn_02_hit.h index 51ae3b696a..833e0d41fd 100644 --- a/include/mapfs/kzn_02_hit.h +++ b/include/mapfs/kzn_02_hit.h @@ -1,89 +1,96 @@ -#define COLLIDER_Root 0x58 -#define COLLIDER_pokop 0x57 -#define COLLIDER_pp2 0x56 -#define COLLIDER_pp1 0x55 -#define COLLIDER_Default 0x54 -#define COLLIDER_o189 0x53 -#define COLLIDER_o187 0x52 -#define COLLIDER_o167 0x51 -#define COLLIDER_o104 0x50 -#define COLLIDER_g40 0x4F -#define COLLIDER_o180 0x4E -#define COLLIDER_o179 0x4D -#define COLLIDER_o184 0x4C -#define COLLIDER_o183 0x4B -#define COLLIDER_g39 0x4A -#define COLLIDER_o165 0x49 -#define COLLIDER_o176 0x48 -#define COLLIDER_o175 0x47 -#define COLLIDER_o174 0x46 -#define COLLIDER_o173 0x45 -#define COLLIDER_o172 0x44 -#define COLLIDER_o171 0x43 -#define COLLIDER_o170 0x42 -#define COLLIDER_o169 0x41 -#define COLLIDER_o168 0x40 -#define COLLIDER_g38 0x3F -#define COLLIDER_o159 0x3E -#define COLLIDER_g31 0x3D -#define COLLIDER_o153 0x3C -#define COLLIDER_o151 0x3B -#define COLLIDER_g27 0x3A -#define COLLIDER_o139 0x39 -#define COLLIDER_o138 0x38 -#define COLLIDER_o137 0x37 -#define COLLIDER_g26 0x36 -#define COLLIDER_o136 0x35 -#define COLLIDER_o135 0x34 -#define COLLIDER_o134 0x33 -#define COLLIDER_g25 0x32 -#define COLLIDER_o133 0x31 -#define COLLIDER_o132 0x30 -#define COLLIDER_o131 0x2F -#define COLLIDER_g24 0x2E -#define COLLIDER_o130 0x2D -#define COLLIDER_o129 0x2C -#define COLLIDER_o128 0x2B -#define COLLIDER_g28 0x2A -#define COLLIDER_o142 0x29 -#define COLLIDER_o141 0x28 -#define COLLIDER_o140 0x27 -#define COLLIDER_g29 0x26 -#define COLLIDER_o145 0x25 -#define COLLIDER_o144 0x24 -#define COLLIDER_o143 0x23 -#define COLLIDER_g30 0x22 -#define COLLIDER_o148 0x21 -#define COLLIDER_o147 0x20 -#define COLLIDER_o146 0x1F -#define COLLIDER_g19 0x1E -#define COLLIDER_o84 0x1D -#define COLLIDER_o83 0x1C -#define COLLIDER_o82 0x1B -#define COLLIDER_g18 0x1A -#define COLLIDER_o81 0x19 -#define COLLIDER_o80 0x18 -#define COLLIDER_o79 0x17 -#define COLLIDER_g17 0x16 -#define COLLIDER_o78 0x15 -#define COLLIDER_o77 0x14 -#define COLLIDER_o76 0x13 -#define COLLIDER_g12 0x12 -#define COLLIDER_o59 0x11 -#define COLLIDER_o58 0x10 -#define COLLIDER_o57 0xF -#define COLLIDER_g22 0xE -#define COLLIDER_deili2 0xD -#define COLLIDER_deilit2 0xC -#define COLLIDER_o123 0xB -#define COLLIDER_deilit1 0xA -#define COLLIDER_deili1 0x9 -#define COLLIDER_o121 0x8 -#define COLLIDER_g1 0x7 -#define COLLIDER_o222 0x6 -#define COLLIDER_o221 0x5 -#define COLLIDER_o220 0x4 -#define COLLIDER_o219 0x3 -#define COLLIDER_o218 0x2 -#define COLLIDER_o217 0x1 -#define COLLIDER_o112 0x0 +#define COLLIDER_Root 0x58 +#define COLLIDER_pokop 0x57 +#define COLLIDER_pp2 0x56 +#define COLLIDER_pp1 0x55 +#define COLLIDER_Default 0x54 +#define COLLIDER_o189 0x53 +#define COLLIDER_o187 0x52 +#define COLLIDER_o167 0x51 +#define COLLIDER_o104 0x50 +#define COLLIDER_g40 0x4F +#define COLLIDER_o180 0x4E +#define COLLIDER_o179 0x4D +#define COLLIDER_o184 0x4C +#define COLLIDER_o183 0x4B +#define COLLIDER_g39 0x4A +#define COLLIDER_o165 0x49 +#define COLLIDER_o176 0x48 +#define COLLIDER_o175 0x47 +#define COLLIDER_o174 0x46 +#define COLLIDER_o173 0x45 +#define COLLIDER_o172 0x44 +#define COLLIDER_o171 0x43 +#define COLLIDER_o170 0x42 +#define COLLIDER_o169 0x41 +#define COLLIDER_o168 0x40 +#define COLLIDER_g38 0x3F +#define COLLIDER_o159 0x3E +#define COLLIDER_g31 0x3D +#define COLLIDER_o153 0x3C +#define COLLIDER_o151 0x3B +#define COLLIDER_g27 0x3A +#define COLLIDER_o139 0x39 +#define COLLIDER_o138 0x38 +#define COLLIDER_o137 0x37 +#define COLLIDER_g26 0x36 +#define COLLIDER_o136 0x35 +#define COLLIDER_o135 0x34 +#define COLLIDER_o134 0x33 +#define COLLIDER_g25 0x32 +#define COLLIDER_o133 0x31 +#define COLLIDER_o132 0x30 +#define COLLIDER_o131 0x2F +#define COLLIDER_g24 0x2E +#define COLLIDER_o130 0x2D +#define COLLIDER_o129 0x2C +#define COLLIDER_o128 0x2B +#define COLLIDER_g28 0x2A +#define COLLIDER_o142 0x29 +#define COLLIDER_o141 0x28 +#define COLLIDER_o140 0x27 +#define COLLIDER_g29 0x26 +#define COLLIDER_o145 0x25 +#define COLLIDER_o144 0x24 +#define COLLIDER_o143 0x23 +#define COLLIDER_g30 0x22 +#define COLLIDER_o148 0x21 +#define COLLIDER_o147 0x20 +#define COLLIDER_o146 0x1F +#define COLLIDER_g19 0x1E +#define COLLIDER_o84 0x1D +#define COLLIDER_o83 0x1C +#define COLLIDER_o82 0x1B +#define COLLIDER_g18 0x1A +#define COLLIDER_o81 0x19 +#define COLLIDER_o80 0x18 +#define COLLIDER_o79 0x17 +#define COLLIDER_g17 0x16 +#define COLLIDER_o78 0x15 +#define COLLIDER_o77 0x14 +#define COLLIDER_o76 0x13 +#define COLLIDER_g12 0x12 +#define COLLIDER_o59 0x11 +#define COLLIDER_o58 0x10 +#define COLLIDER_o57 0xF +#define COLLIDER_g22 0xE +#define COLLIDER_deili2 0xD +#define COLLIDER_deilit2 0xC +#define COLLIDER_o123 0xB +#define COLLIDER_deilit1 0xA +#define COLLIDER_deili1 0x9 +#define COLLIDER_o121 0x8 +#define COLLIDER_g1 0x7 +#define COLLIDER_o222 0x6 +#define COLLIDER_o221 0x5 +#define COLLIDER_o220 0x4 +#define COLLIDER_o219 0x3 +#define COLLIDER_o218 0x2 +#define COLLIDER_o217 0x1 +#define COLLIDER_o112 0x0 + +#define ZONE_Root 0x4 +#define ZONE_Default 0x3 +#define ZONE_o123 0x2 +#define ZONE_g1 0x1 +#define ZONE_o112 0x0 + diff --git a/include/mapfs/kzn_02_shape.h b/include/mapfs/kzn_02_shape.h index ea7dbf9bea..b6fcbe6f19 100644 --- a/include/mapfs/kzn_02_shape.h +++ b/include/mapfs/kzn_02_shape.h @@ -1,78 +1,79 @@ -#define MODEL_Root 0x4D -#define MODEL_g51 0x4C -#define MODEL_kemuri 0x4B -#define MODEL_kem2 0x4A -#define MODEL_kem1 0x49 -#define MODEL_g54 0x48 -#define MODEL_point 0x47 -#define MODEL_you 0x46 -#define MODEL_yougan2_2 0x45 -#define MODEL_yougan1_2 0x44 -#define MODEL_yougan2_1 0x43 -#define MODEL_yougan1_1 0x42 -#define MODEL_potor 0x41 -#define MODEL_poko 0x40 -#define MODEL_toro 0x3F -#define MODEL_toumei 0x3E -#define MODEL_o174 0x3D -#define MODEL_o173 0x3C -#define MODEL_wakabe2 0x3B -#define MODEL_o147 0x3A -#define MODEL_o169 0x39 -#define MODEL_wakabe1 0x38 -#define MODEL_o144 0x37 -#define MODEL_g19 0x36 -#define MODEL_o84 0x35 -#define MODEL_o83 0x34 -#define MODEL_o194 0x33 -#define MODEL_o195 0x32 -#define MODEL_g18 0x31 -#define MODEL_o192 0x30 -#define MODEL_o149 0x2F -#define MODEL_o81 0x2E -#define MODEL_o80 0x2D -#define MODEL_g17 0x2C -#define MODEL_o78 0x2B -#define MODEL_o77 0x2A -#define MODEL_o76 0x29 -#define MODEL_g12 0x28 -#define MODEL_o59 0x27 -#define MODEL_o58 0x26 -#define MODEL_o57 0x25 -#define MODEL_g22 0x24 -#define MODEL_o125 0x23 -#define MODEL_o123 0x22 -#define MODEL_o124 0x21 -#define MODEL_g15 0x20 -#define MODEL_o72 0x1F -#define MODEL_o70 0x1E -#define MODEL_o71 0x1D -#define MODEL_g14 0x1C -#define MODEL_o69 0x1B -#define MODEL_o67 0x1A -#define MODEL_o68 0x19 -#define MODEL_g13 0x18 -#define MODEL_o66 0x17 -#define MODEL_o64 0x16 -#define MODEL_o65 0x15 -#define MODEL_g5 0x14 -#define MODEL_o22 0x13 -#define MODEL_o18 0x12 -#define MODEL_o21 0x11 -#define MODEL_g7 0x10 -#define MODEL_o27 0xF -#define MODEL_o28 0xE -#define MODEL_o26 0xD -#define MODEL_g8 0xC -#define MODEL_o30 0xB -#define MODEL_o31 0xA -#define MODEL_o29 0x9 -#define MODEL_obj 0x8 -#define MODEL_kuro 0x7 -#define MODEL_ue_t_iwa 0x6 -#define MODEL_si_t_iwa 0x5 -#define MODEL_bero 0x4 -#define MODEL_mon2 0x3 -#define MODEL_mon1 0x2 -#define MODEL_o202 0x1 -#define MODEL_o205 0x0 +#define MODEL_Root 0x4D +#define MODEL_g51 0x4C +#define MODEL_kemuri 0x4B +#define MODEL_kem2 0x4A +#define MODEL_kem1 0x49 +#define MODEL_g54 0x48 +#define MODEL_point 0x47 +#define MODEL_you 0x46 +#define MODEL_yougan2_2 0x45 +#define MODEL_yougan1_2 0x44 +#define MODEL_yougan2_1 0x43 +#define MODEL_yougan1_1 0x42 +#define MODEL_potor 0x41 +#define MODEL_poko 0x40 +#define MODEL_toro 0x3F +#define MODEL_toumei 0x3E +#define MODEL_o174 0x3D +#define MODEL_o173 0x3C +#define MODEL_wakabe2 0x3B +#define MODEL_o147 0x3A +#define MODEL_o169 0x39 +#define MODEL_wakabe1 0x38 +#define MODEL_o144 0x37 +#define MODEL_g19 0x36 +#define MODEL_o84 0x35 +#define MODEL_o83 0x34 +#define MODEL_o194 0x33 +#define MODEL_o195 0x32 +#define MODEL_g18 0x31 +#define MODEL_o192 0x30 +#define MODEL_o149 0x2F +#define MODEL_o81 0x2E +#define MODEL_o80 0x2D +#define MODEL_g17 0x2C +#define MODEL_o78 0x2B +#define MODEL_o77 0x2A +#define MODEL_o76 0x29 +#define MODEL_g12 0x28 +#define MODEL_o59 0x27 +#define MODEL_o58 0x26 +#define MODEL_o57 0x25 +#define MODEL_g22 0x24 +#define MODEL_o125 0x23 +#define MODEL_o123 0x22 +#define MODEL_o124 0x21 +#define MODEL_g15 0x20 +#define MODEL_o72 0x1F +#define MODEL_o70 0x1E +#define MODEL_o71 0x1D +#define MODEL_g14 0x1C +#define MODEL_o69 0x1B +#define MODEL_o67 0x1A +#define MODEL_o68 0x19 +#define MODEL_g13 0x18 +#define MODEL_o66 0x17 +#define MODEL_o64 0x16 +#define MODEL_o65 0x15 +#define MODEL_g5 0x14 +#define MODEL_o22 0x13 +#define MODEL_o18 0x12 +#define MODEL_o21 0x11 +#define MODEL_g7 0x10 +#define MODEL_o27 0xF +#define MODEL_o28 0xE +#define MODEL_o26 0xD +#define MODEL_g8 0xC +#define MODEL_o30 0xB +#define MODEL_o31 0xA +#define MODEL_o29 0x9 +#define MODEL_obj 0x8 +#define MODEL_kuro 0x7 +#define MODEL_ue_t_iwa 0x6 +#define MODEL_si_t_iwa 0x5 +#define MODEL_bero 0x4 +#define MODEL_mon2 0x3 +#define MODEL_mon1 0x2 +#define MODEL_o202 0x1 +#define MODEL_o205 0x0 + diff --git a/include/mapfs/kzn_03_hit.h b/include/mapfs/kzn_03_hit.h index 143531e62e..ce4c17f65e 100644 --- a/include/mapfs/kzn_03_hit.h +++ b/include/mapfs/kzn_03_hit.h @@ -1,53 +1,66 @@ -#define COLLIDER_Root 0x34 -#define COLLIDER_g89 0x33 -#define COLLIDER_on_off 0x32 -#define COLLIDER_g22 0x31 -#define COLLIDER_ropeway2 0x30 -#define COLLIDER_ropeway1 0x2F -#define COLLIDER_deili 0x2E -#define COLLIDER_o252 0x2D -#define COLLIDER_deilit5 0x2C -#define COLLIDER_deili5 0x2B -#define COLLIDER_o193 0x2A -#define COLLIDER_deilit4 0x29 -#define COLLIDER_deili4 0x28 -#define COLLIDER_o212 0x27 -#define COLLIDER_deili3 0x26 -#define COLLIDER_deilit3 0x25 -#define COLLIDER_o258 0x24 -#define COLLIDER_deilit2 0x23 -#define COLLIDER_deili2 0x22 -#define COLLIDER_o257 0x21 -#define COLLIDER_deilit1 0x20 -#define COLLIDER_deili1 0x1F -#define COLLIDER_o288 0x1E -#define COLLIDER_o287 0x1D -#define COLLIDER_o281 0x1C -#define COLLIDER_o280 0x1B -#define COLLIDER_o279 0x1A -#define COLLIDER_g73 0x19 -#define COLLIDER_o452 0x18 -#define COLLIDER_o263 0x17 -#define COLLIDER_g60 0x16 -#define COLLIDER_o431 0x15 -#define COLLIDER_noko3 0x14 -#define COLLIDER_o418 0x13 -#define COLLIDER_g86 0x12 -#define COLLIDER_o404 0x11 -#define COLLIDER_o461 0x10 -#define COLLIDER_noko1 0xF -#define COLLIDER_g49 0xE -#define COLLIDER_o459 0xD -#define COLLIDER_o395 0xC -#define COLLIDER_o380 0xB -#define COLLIDER_g76 0xA -#define COLLIDER_o358 0x9 -#define COLLIDER_o155 0x8 -#define COLLIDER_o432 0x7 -#define COLLIDER_g41 0x6 -#define COLLIDER_o398 0x5 -#define COLLIDER_o356 0x4 -#define COLLIDER_o397 0x3 -#define COLLIDER_g56 0x2 -#define COLLIDER_o227 0x1 -#define COLLIDER_o310 0x0 +#define COLLIDER_Root 0x34 +#define COLLIDER_g89 0x33 +#define COLLIDER_on_off 0x32 +#define COLLIDER_g22 0x31 +#define COLLIDER_ropeway2 0x30 +#define COLLIDER_ropeway1 0x2F +#define COLLIDER_deili 0x2E +#define COLLIDER_o252 0x2D +#define COLLIDER_deilit5 0x2C +#define COLLIDER_deili5 0x2B +#define COLLIDER_o193 0x2A +#define COLLIDER_deilit4 0x29 +#define COLLIDER_deili4 0x28 +#define COLLIDER_o212 0x27 +#define COLLIDER_deili3 0x26 +#define COLLIDER_deilit3 0x25 +#define COLLIDER_o258 0x24 +#define COLLIDER_deilit2 0x23 +#define COLLIDER_deili2 0x22 +#define COLLIDER_o257 0x21 +#define COLLIDER_deilit1 0x20 +#define COLLIDER_deili1 0x1F +#define COLLIDER_o288 0x1E +#define COLLIDER_o287 0x1D +#define COLLIDER_o281 0x1C +#define COLLIDER_o280 0x1B +#define COLLIDER_o279 0x1A +#define COLLIDER_g73 0x19 +#define COLLIDER_o452 0x18 +#define COLLIDER_o263 0x17 +#define COLLIDER_g60 0x16 +#define COLLIDER_o431 0x15 +#define COLLIDER_noko3 0x14 +#define COLLIDER_o418 0x13 +#define COLLIDER_g86 0x12 +#define COLLIDER_o404 0x11 +#define COLLIDER_o461 0x10 +#define COLLIDER_noko1 0xF +#define COLLIDER_g49 0xE +#define COLLIDER_o459 0xD +#define COLLIDER_o395 0xC +#define COLLIDER_o380 0xB +#define COLLIDER_g76 0xA +#define COLLIDER_o358 0x9 +#define COLLIDER_o155 0x8 +#define COLLIDER_o432 0x7 +#define COLLIDER_g41 0x6 +#define COLLIDER_o398 0x5 +#define COLLIDER_o356 0x4 +#define COLLIDER_o397 0x3 +#define COLLIDER_g56 0x2 +#define COLLIDER_o227 0x1 +#define COLLIDER_o310 0x0 + +#define ZONE_Root 0xA +#define ZONE_jupm_sopt1 0x9 +#define ZONE_o223 0x8 +#define ZONE_o222 0x7 +#define ZONE_o149 0x6 +#define ZONE_Default 0x5 +#define ZONE_deili5 0x4 +#define ZONE_deili4 0x3 +#define ZONE_deili3 0x2 +#define ZONE_deili2 0x1 +#define ZONE_deili1 0x0 + diff --git a/include/mapfs/kzn_03_shape.h b/include/mapfs/kzn_03_shape.h index d5bf5677c9..4e5d7f1bce 100644 --- a/include/mapfs/kzn_03_shape.h +++ b/include/mapfs/kzn_03_shape.h @@ -1,95 +1,96 @@ -#define MODEL_Root 0x5E -#define MODEL_g176 0x5D -#define MODEL_g204 0x5C -#define MODEL_tou3 0x5B -#define MODEL_kab3 0x5A -#define MODEL_o359 0x59 -#define MODEL_t2 0x58 -#define MODEL_tou2 0x57 -#define MODEL_kab2 0x56 -#define MODEL_o154 0x55 -#define MODEL_o513 0x54 -#define MODEL_t1 0x53 -#define MODEL_tou1 0x52 -#define MODEL_kab1 0x51 -#define MODEL_o394 0x50 -#define MODEL_o517 0x4F -#define MODEL_tou 0x4E -#define MODEL_o265 0x4D -#define MODEL_o362 0x4C -#define MODEL_o317 0x4B -#define MODEL_o365 0x4A -#define MODEL_o327 0x49 -#define MODEL_g121 0x48 -#define MODEL_toro 0x47 -#define MODEL_poko 0x46 -#define MODEL_kemuri 0x45 -#define MODEL_kem2 0x44 -#define MODEL_kem1 0x43 -#define MODEL_hashira2 0x42 -#define MODEL_o153 0x41 -#define MODEL_o152 0x40 -#define MODEL_hashira1 0x3F -#define MODEL_o144 0x3E -#define MODEL_kassya2 0x3D -#define MODEL_kassya2_ue 0x3C -#define MODEL_kssya2_koma 0x3B -#define MODEL_kassya2_shita 0x3A -#define MODEL_kassya2_himo 0x39 -#define MODEL_kassya_shita 0x38 -#define MODEL_kassya_himo 0x37 -#define MODEL_kassya_ue 0x36 -#define MODEL_kassya_koma 0x35 -#define MODEL_rope1 0x34 -#define MODEL_o223 0x33 -#define MODEL_o222 0x32 -#define MODEL_jupm_sopt1 0x31 -#define MODEL_o192 0x30 -#define MODEL_o191 0x2F -#define MODEL_o189 0x2E -#define MODEL_g84 0x2D -#define MODEL_o279 0x2C -#define MODEL_obj1 0x2B -#define MODEL_o118 0x2A -#define MODEL_o98 0x29 -#define MODEL_g156 0x28 -#define MODEL_o414 0x27 -#define MODEL_yuka 0x26 -#define MODEL_kai 0x25 -#define MODEL_o123 0x24 -#define MODEL_obj2 0x23 -#define MODEL_o294 0x22 -#define MODEL_o100 0x21 -#define MODEL_dan_sita 0x20 -#define MODEL_o173 0x1F -#define MODEL_o146 0x1E -#define MODEL_o138 0x1D -#define MODEL_g1 0x1C -#define MODEL_o112 0x1B -#define MODEL_o151 0x1A -#define MODEL_kabe 0x19 -#define MODEL_o243 0x18 -#define MODEL_o246 0x17 -#define MODEL_o245 0x16 -#define MODEL_o208 0x15 -#define MODEL_o205 0x14 -#define MODEL_o215 0x13 -#define MODEL_mon 0x12 -#define MODEL_o487 0x11 -#define MODEL_mo 0x10 -#define MODEL_m5 0xF -#define MODEL_o488 0xE -#define MODEL_m4 0xD -#define MODEL_m3 0xC -#define MODEL_m2 0xB -#define MODEL_m1 0xA -#define MODEL_o485 0x9 -#define MODEL_kakiwari 0x8 -#define MODEL_o515 0x7 -#define MODEL_o145 0x6 -#define MODEL_o162 0x5 -#define MODEL_o161 0x4 -#define MODEL_o109 0x3 -#define MODEL_o163 0x2 -#define MODEL_o164 0x1 -#define MODEL_o165 0x0 +#define MODEL_Root 0x5E +#define MODEL_g176 0x5D +#define MODEL_g204 0x5C +#define MODEL_tou3 0x5B +#define MODEL_kab3 0x5A +#define MODEL_o359 0x59 +#define MODEL_t2 0x58 +#define MODEL_tou2 0x57 +#define MODEL_kab2 0x56 +#define MODEL_o154 0x55 +#define MODEL_o513 0x54 +#define MODEL_t1 0x53 +#define MODEL_tou1 0x52 +#define MODEL_kab1 0x51 +#define MODEL_o394 0x50 +#define MODEL_o517 0x4F +#define MODEL_tou 0x4E +#define MODEL_o265 0x4D +#define MODEL_o362 0x4C +#define MODEL_o317 0x4B +#define MODEL_o365 0x4A +#define MODEL_o327 0x49 +#define MODEL_g121 0x48 +#define MODEL_toro 0x47 +#define MODEL_poko 0x46 +#define MODEL_kemuri 0x45 +#define MODEL_kem2 0x44 +#define MODEL_kem1 0x43 +#define MODEL_hashira2 0x42 +#define MODEL_o153 0x41 +#define MODEL_o152 0x40 +#define MODEL_hashira1 0x3F +#define MODEL_o144 0x3E +#define MODEL_kassya2 0x3D +#define MODEL_kassya2_ue 0x3C +#define MODEL_kssya2_koma 0x3B +#define MODEL_kassya2_shita 0x3A +#define MODEL_kassya2_himo 0x39 +#define MODEL_kassya_shita 0x38 +#define MODEL_kassya_himo 0x37 +#define MODEL_kassya_ue 0x36 +#define MODEL_kassya_koma 0x35 +#define MODEL_rope1 0x34 +#define MODEL_o223 0x33 +#define MODEL_o222 0x32 +#define MODEL_jupm_sopt1 0x31 +#define MODEL_o192 0x30 +#define MODEL_o191 0x2F +#define MODEL_o189 0x2E +#define MODEL_g84 0x2D +#define MODEL_o279 0x2C +#define MODEL_obj1 0x2B +#define MODEL_o118 0x2A +#define MODEL_o98 0x29 +#define MODEL_g156 0x28 +#define MODEL_o414 0x27 +#define MODEL_yuka 0x26 +#define MODEL_kai 0x25 +#define MODEL_o123 0x24 +#define MODEL_obj2 0x23 +#define MODEL_o294 0x22 +#define MODEL_o100 0x21 +#define MODEL_dan_sita 0x20 +#define MODEL_o173 0x1F +#define MODEL_o146 0x1E +#define MODEL_o138 0x1D +#define MODEL_g1 0x1C +#define MODEL_o112 0x1B +#define MODEL_o151 0x1A +#define MODEL_kabe 0x19 +#define MODEL_o243 0x18 +#define MODEL_o246 0x17 +#define MODEL_o245 0x16 +#define MODEL_o208 0x15 +#define MODEL_o205 0x14 +#define MODEL_o215 0x13 +#define MODEL_mon 0x12 +#define MODEL_o487 0x11 +#define MODEL_mo 0x10 +#define MODEL_m5 0xF +#define MODEL_o488 0xE +#define MODEL_m4 0xD +#define MODEL_m3 0xC +#define MODEL_m2 0xB +#define MODEL_m1 0xA +#define MODEL_o485 0x9 +#define MODEL_kakiwari 0x8 +#define MODEL_o515 0x7 +#define MODEL_o145 0x6 +#define MODEL_o162 0x5 +#define MODEL_o161 0x4 +#define MODEL_o109 0x3 +#define MODEL_o163 0x2 +#define MODEL_o164 0x1 +#define MODEL_o165 0x0 + diff --git a/include/mapfs/kzn_04_hit.h b/include/mapfs/kzn_04_hit.h index 5cb1208a59..665d50c9e4 100644 --- a/include/mapfs/kzn_04_hit.h +++ b/include/mapfs/kzn_04_hit.h @@ -1,15 +1,21 @@ -#define COLLIDER_Root 0xE -#define COLLIDER_g31 0xD -#define COLLIDER_o244 0xC -#define COLLIDER_g30 0xB -#define COLLIDER_o241 0xA -#define COLLIDER_deilit1 0x9 -#define COLLIDER_deili1 0x8 -#define COLLIDER_Default 0x7 -#define COLLIDER_o239 0x6 -#define COLLIDER_o238 0x5 -#define COLLIDER_o236 0x4 -#define COLLIDER_g28 0x3 -#define COLLIDER_o233 0x2 -#define COLLIDER_o125 0x1 -#define COLLIDER_o222 0x0 +#define COLLIDER_Root 0xE +#define COLLIDER_g31 0xD +#define COLLIDER_o244 0xC +#define COLLIDER_g30 0xB +#define COLLIDER_o241 0xA +#define COLLIDER_deilit1 0x9 +#define COLLIDER_deili1 0x8 +#define COLLIDER_Default 0x7 +#define COLLIDER_o239 0x6 +#define COLLIDER_o238 0x5 +#define COLLIDER_o236 0x4 +#define COLLIDER_g28 0x3 +#define COLLIDER_o233 0x2 +#define COLLIDER_o125 0x1 +#define COLLIDER_o222 0x0 + +#define ZONE_Root 0x3 +#define ZONE_Default 0x2 +#define ZONE_o237 0x1 +#define ZONE_o125 0x0 + diff --git a/include/mapfs/kzn_04_shape.h b/include/mapfs/kzn_04_shape.h index ffb5be1609..89887b6b77 100644 --- a/include/mapfs/kzn_04_shape.h +++ b/include/mapfs/kzn_04_shape.h @@ -1,32 +1,33 @@ -#define MODEL_Root 0x1F -#define MODEL_g69 0x1E -#define MODEL_Default 0x1D -#define MODEL_o394 0x1C -#define MODEL_o393 0x1B -#define MODEL_kemuri 0x1A -#define MODEL_kem2 0x19 -#define MODEL_kem1 0x18 -#define MODEL_g61 0x17 -#define MODEL_o366 0x16 -#define MODEL_g58 0x15 -#define MODEL_o395 0x14 -#define MODEL_o370 0x13 -#define MODEL_o352 0x12 -#define MODEL_g49 0x11 -#define MODEL_g60 0x10 -#define MODEL_o357 0xF -#define MODEL_o354 0xE -#define MODEL_g50 0xD -#define MODEL_o347 0xC -#define MODEL_o345 0xB -#define MODEL_obj 0xA -#define MODEL_o359 0x9 -#define MODEL_o229 0x8 -#define MODEL_o343 0x7 -#define MODEL_yuka 0x6 -#define MODEL_o125 0x5 -#define MODEL_kakiwari 0x4 -#define MODEL_o109 0x3 -#define MODEL_o163 0x2 -#define MODEL_o164 0x1 -#define MODEL_o165 0x0 +#define MODEL_Root 0x1F +#define MODEL_g69 0x1E +#define MODEL_Default 0x1D +#define MODEL_o394 0x1C +#define MODEL_o393 0x1B +#define MODEL_kemuri 0x1A +#define MODEL_kem2 0x19 +#define MODEL_kem1 0x18 +#define MODEL_g61 0x17 +#define MODEL_o366 0x16 +#define MODEL_g58 0x15 +#define MODEL_o395 0x14 +#define MODEL_o370 0x13 +#define MODEL_o352 0x12 +#define MODEL_g49 0x11 +#define MODEL_g60 0x10 +#define MODEL_o357 0xF +#define MODEL_o354 0xE +#define MODEL_g50 0xD +#define MODEL_o347 0xC +#define MODEL_o345 0xB +#define MODEL_obj 0xA +#define MODEL_o359 0x9 +#define MODEL_o229 0x8 +#define MODEL_o343 0x7 +#define MODEL_yuka 0x6 +#define MODEL_o125 0x5 +#define MODEL_kakiwari 0x4 +#define MODEL_o109 0x3 +#define MODEL_o163 0x2 +#define MODEL_o164 0x1 +#define MODEL_o165 0x0 + diff --git a/include/mapfs/kzn_05_hit.h b/include/mapfs/kzn_05_hit.h index 21de3eeb2a..d445c07baa 100644 --- a/include/mapfs/kzn_05_hit.h +++ b/include/mapfs/kzn_05_hit.h @@ -1,22 +1,30 @@ -#define COLLIDER_Root 0x15 -#define COLLIDER_g13 0x14 -#define COLLIDER_g17 0x13 -#define COLLIDER_o143 0x12 -#define COLLIDER_o142 0x11 -#define COLLIDER_g16 0x10 -#define COLLIDER_o141 0xF -#define COLLIDER_o140 0xE -#define COLLIDER_o139 0xD -#define COLLIDER_g15 0xC -#define COLLIDER_o138 0xB -#define COLLIDER_deilit1 0xA -#define COLLIDER_deili1 0x9 -#define COLLIDER_o135 0x8 -#define COLLIDER_deilit2 0x7 -#define COLLIDER_deili2 0x6 -#define COLLIDER_g14 0x5 -#define COLLIDER_o132 0x4 -#define COLLIDER_o131 0x3 -#define COLLIDER_o130 0x2 -#define COLLIDER_o129 0x1 -#define COLLIDER_o128 0x0 +#define COLLIDER_Root 0x15 +#define COLLIDER_g13 0x14 +#define COLLIDER_g17 0x13 +#define COLLIDER_o143 0x12 +#define COLLIDER_o142 0x11 +#define COLLIDER_g16 0x10 +#define COLLIDER_o141 0xF +#define COLLIDER_o140 0xE +#define COLLIDER_o139 0xD +#define COLLIDER_g15 0xC +#define COLLIDER_o138 0xB +#define COLLIDER_deilit1 0xA +#define COLLIDER_deili1 0x9 +#define COLLIDER_o135 0x8 +#define COLLIDER_deilit2 0x7 +#define COLLIDER_deili2 0x6 +#define COLLIDER_g14 0x5 +#define COLLIDER_o132 0x4 +#define COLLIDER_o131 0x3 +#define COLLIDER_o130 0x2 +#define COLLIDER_o129 0x1 +#define COLLIDER_o128 0x0 + +#define ZONE_Root 0x5 +#define ZONE_Default 0x4 +#define ZONE_o69 0x3 +#define ZONE_o68 0x2 +#define ZONE_o59 0x1 +#define ZONE_o18 0x0 + diff --git a/include/mapfs/kzn_05_shape.h b/include/mapfs/kzn_05_shape.h index f3b450a68f..aad9ca65ec 100644 --- a/include/mapfs/kzn_05_shape.h +++ b/include/mapfs/kzn_05_shape.h @@ -1,26 +1,27 @@ -#define MODEL_Root 0x19 -#define MODEL_g36 0x18 -#define MODEL_kemuri 0x17 -#define MODEL_kem1 0x16 -#define MODEL_yuka 0x15 -#define MODEL_o104 0x14 -#define MODEL_o68 0x13 -#define MODEL_g13 0x12 -#define MODEL_o110 0x11 -#define MODEL_o111 0x10 -#define MODEL_o112 0xF -#define MODEL_o59 0xE -#define MODEL_k1 0xD -#define MODEL_o118 0xC -#define MODEL_o117 0xB -#define MODEL_kabe 0xA -#define MODEL_o182 0x9 -#define MODEL_o181 0x8 -#define MODEL_o180 0x7 -#define MODEL_o179 0x6 -#define MODEL_kuro 0x5 -#define MODEL_o113 0x4 -#define MODEL_Default 0x3 -#define MODEL_o95 0x2 -#define MODEL_o94 0x1 -#define MODEL_o127 0x0 +#define MODEL_Root 0x19 +#define MODEL_g36 0x18 +#define MODEL_kemuri 0x17 +#define MODEL_kem1 0x16 +#define MODEL_yuka 0x15 +#define MODEL_o104 0x14 +#define MODEL_o68 0x13 +#define MODEL_g13 0x12 +#define MODEL_o110 0x11 +#define MODEL_o111 0x10 +#define MODEL_o112 0xF +#define MODEL_o59 0xE +#define MODEL_k1 0xD +#define MODEL_o118 0xC +#define MODEL_o117 0xB +#define MODEL_kabe 0xA +#define MODEL_o182 0x9 +#define MODEL_o181 0x8 +#define MODEL_o180 0x7 +#define MODEL_o179 0x6 +#define MODEL_kuro 0x5 +#define MODEL_o113 0x4 +#define MODEL_Default 0x3 +#define MODEL_o95 0x2 +#define MODEL_o94 0x1 +#define MODEL_o127 0x0 + diff --git a/include/mapfs/kzn_06_hit.h b/include/mapfs/kzn_06_hit.h index 73a967ee77..305ee2761a 100644 --- a/include/mapfs/kzn_06_hit.h +++ b/include/mapfs/kzn_06_hit.h @@ -1,42 +1,55 @@ -#define COLLIDER_Root 0x29 -#define COLLIDER_g76 0x28 -#define COLLIDER_o250 0x27 -#define COLLIDER_o468 0x26 -#define COLLIDER_o394 0x25 -#define COLLIDER_o440 0x24 -#define COLLIDER_o481 0x23 -#define COLLIDER_o438 0x22 -#define COLLIDER_g74 0x21 -#define COLLIDER_o462 0x20 -#define COLLIDER_o461 0x1F -#define COLLIDER_o460 0x1E -#define COLLIDER_g40 0x1D -#define COLLIDER_g45 0x1C -#define COLLIDER_yougan 0x1B -#define COLLIDER_yougan1 0x1A -#define COLLIDER_g37 0x19 -#define COLLIDER_o322 0x18 -#define COLLIDER_o280 0x17 -#define COLLIDER_o341 0x16 -#define COLLIDER_o405 0x15 -#define COLLIDER_g35 0x14 -#define COLLIDER_o251 0x13 -#define COLLIDER_o245 0x12 -#define COLLIDER_o285 0x11 -#define COLLIDER_g30 0x10 -#define COLLIDER_o439 0xF -#define COLLIDER_o316 0xE -#define COLLIDER_o472 0xD -#define COLLIDER_o403 0xC -#define COLLIDER_o410 0xB -#define COLLIDER_o437 0xA -#define COLLIDER_g59 0x9 -#define COLLIDER_o347 0x8 -#define COLLIDER_o351 0x7 -#define COLLIDER_o350 0x6 -#define COLLIDER_deilit3 0x5 -#define COLLIDER_deili3 0x4 -#define COLLIDER_deilit2 0x3 -#define COLLIDER_deili2 0x2 -#define COLLIDER_deilit1 0x1 -#define COLLIDER_deili1 0x0 +#define COLLIDER_Root 0x29 +#define COLLIDER_g76 0x28 +#define COLLIDER_o250 0x27 +#define COLLIDER_o468 0x26 +#define COLLIDER_o394 0x25 +#define COLLIDER_o440 0x24 +#define COLLIDER_o481 0x23 +#define COLLIDER_o438 0x22 +#define COLLIDER_g74 0x21 +#define COLLIDER_o462 0x20 +#define COLLIDER_o461 0x1F +#define COLLIDER_o460 0x1E +#define COLLIDER_g40 0x1D +#define COLLIDER_g45 0x1C +#define COLLIDER_yougan 0x1B +#define COLLIDER_yougan1 0x1A +#define COLLIDER_g37 0x19 +#define COLLIDER_o322 0x18 +#define COLLIDER_o280 0x17 +#define COLLIDER_o341 0x16 +#define COLLIDER_o405 0x15 +#define COLLIDER_g35 0x14 +#define COLLIDER_o251 0x13 +#define COLLIDER_o245 0x12 +#define COLLIDER_o285 0x11 +#define COLLIDER_g30 0x10 +#define COLLIDER_o439 0xF +#define COLLIDER_o316 0xE +#define COLLIDER_o472 0xD +#define COLLIDER_o403 0xC +#define COLLIDER_o410 0xB +#define COLLIDER_o437 0xA +#define COLLIDER_g59 0x9 +#define COLLIDER_o347 0x8 +#define COLLIDER_o351 0x7 +#define COLLIDER_o350 0x6 +#define COLLIDER_deilit3 0x5 +#define COLLIDER_deili3 0x4 +#define COLLIDER_deilit2 0x3 +#define COLLIDER_deili2 0x2 +#define COLLIDER_deilit1 0x1 +#define COLLIDER_deili1 0x0 + +#define ZONE_Root 0xA +#define ZONE_Default 0x9 +#define ZONE_g46 0x8 +#define ZONE_came2 0x7 +#define ZONE_came1 0x6 +#define ZONE_g30 0x5 +#define ZONE_o257 0x4 +#define ZONE_o305 0x3 +#define ZONE_o304 0x2 +#define ZONE_deili2 0x1 +#define ZONE_deili3 0x0 + diff --git a/include/mapfs/kzn_06_shape.h b/include/mapfs/kzn_06_shape.h index 352b54aae1..a68fb7c247 100644 --- a/include/mapfs/kzn_06_shape.h +++ b/include/mapfs/kzn_06_shape.h @@ -1,57 +1,58 @@ -#define MODEL_Root 0x38 -#define MODEL_g109 0x37 -#define MODEL_tou3 0x36 -#define MODEL_ka3 0x35 -#define MODEL_o578 0x34 -#define MODEL_g108 0x33 -#define MODEL_tou2 0x32 -#define MODEL_ka2 0x31 -#define MODEL_o676 0x30 -#define MODEL_o651 0x2F -#define MODEL_g107 0x2E -#define MODEL_tou1 0x2D -#define MODEL_ka1 0x2C -#define MODEL_o316 0x2B -#define MODEL_t3 0x2A -#define MODEL_o581 0x29 -#define MODEL_o677 0x28 -#define MODEL_t2 0x27 -#define MODEL_o580 0x26 -#define MODEL_o680 0x25 -#define MODEL_t1 0x24 -#define MODEL_o582 0x23 -#define MODEL_o678 0x22 -#define MODEL_ivento 0x21 -#define MODEL_i_off 0x20 -#define MODEL_o602 0x1F -#define MODEL_o601 0x1E -#define MODEL_i_on 0x1D -#define MODEL_o642 0x1C -#define MODEL_o641 0x1B -#define MODEL_g97 0x1A -#define MODEL_you 0x19 -#define MODEL_yo_1 0x18 -#define MODEL_yo1 0x17 -#define MODEL_g46 0x16 -#define MODEL_o349 0x15 -#define MODEL_g41 0x14 -#define MODEL_spot 0x13 -#define MODEL_yougan 0x12 -#define MODEL_1_2 0x11 -#define MODEL_o290 0x10 -#define MODEL_o243 0xF -#define MODEL_2 0xE -#define MODEL_o278 0xD -#define MODEL_o238 0xC -#define MODEL_o298 0xB -#define MODEL_o242 0xA -#define MODEL_o268 0x9 -#define MODEL_mon 0x8 -#define MODEL_o629 0x7 -#define MODEL_o626 0x6 -#define MODEL_o628 0x5 -#define MODEL_o633 0x4 -#define MODEL_1 0x3 -#define MODEL_o276 0x2 -#define MODEL_o304 0x1 -#define MODEL_o599 0x0 +#define MODEL_Root 0x38 +#define MODEL_g109 0x37 +#define MODEL_tou3 0x36 +#define MODEL_ka3 0x35 +#define MODEL_o578 0x34 +#define MODEL_g108 0x33 +#define MODEL_tou2 0x32 +#define MODEL_ka2 0x31 +#define MODEL_o676 0x30 +#define MODEL_o651 0x2F +#define MODEL_g107 0x2E +#define MODEL_tou1 0x2D +#define MODEL_ka1 0x2C +#define MODEL_o316 0x2B +#define MODEL_t3 0x2A +#define MODEL_o581 0x29 +#define MODEL_o677 0x28 +#define MODEL_t2 0x27 +#define MODEL_o580 0x26 +#define MODEL_o680 0x25 +#define MODEL_t1 0x24 +#define MODEL_o582 0x23 +#define MODEL_o678 0x22 +#define MODEL_ivento 0x21 +#define MODEL_i_off 0x20 +#define MODEL_o602 0x1F +#define MODEL_o601 0x1E +#define MODEL_i_on 0x1D +#define MODEL_o642 0x1C +#define MODEL_o641 0x1B +#define MODEL_g97 0x1A +#define MODEL_you 0x19 +#define MODEL_yo_1 0x18 +#define MODEL_yo1 0x17 +#define MODEL_g46 0x16 +#define MODEL_o349 0x15 +#define MODEL_g41 0x14 +#define MODEL_spot 0x13 +#define MODEL_yougan 0x12 +#define MODEL_1_2 0x11 +#define MODEL_o290 0x10 +#define MODEL_o243 0xF +#define MODEL_2 0xE +#define MODEL_o278 0xD +#define MODEL_o238 0xC +#define MODEL_o298 0xB +#define MODEL_o242 0xA +#define MODEL_o268 0x9 +#define MODEL_mon 0x8 +#define MODEL_o629 0x7 +#define MODEL_o626 0x6 +#define MODEL_o628 0x5 +#define MODEL_o633 0x4 +#define MODEL_1 0x3 +#define MODEL_o276 0x2 +#define MODEL_o304 0x1 +#define MODEL_o599 0x0 + diff --git a/include/mapfs/kzn_07_hit.h b/include/mapfs/kzn_07_hit.h index 81600cf910..bc245826b0 100644 --- a/include/mapfs/kzn_07_hit.h +++ b/include/mapfs/kzn_07_hit.h @@ -1,34 +1,43 @@ -#define COLLIDER_Root 0x21 -#define COLLIDER_kame 0x20 -#define COLLIDER_o613 0x1F -#define COLLIDER_o612 0x1E -#define COLLIDER_o611 0x1D -#define COLLIDER_g110 0x1C -#define COLLIDER_o606 0x1B -#define COLLIDER_yo 0x1A -#define COLLIDER_doro 0x19 -#define COLLIDER_o414 0x18 -#define COLLIDER_3 0x17 -#define COLLIDER_o276 0x16 -#define COLLIDER_o347 0x15 -#define COLLIDER_u_1 0x14 -#define COLLIDER_o608 0x13 -#define COLLIDER_o585 0x12 -#define COLLIDER_o413 0x11 -#define COLLIDER_s_2 0x10 -#define COLLIDER_o615 0xF -#define COLLIDER_o590 0xE -#define COLLIDER_o412 0xD -#define COLLIDER_o365 0xC -#define COLLIDER_o589 0xB -#define COLLIDER_hashi 0xA -#define COLLIDER_o614 0x9 -#define COLLIDER_o411 0x8 -#define COLLIDER_o594 0x7 -#define COLLIDER_o352 0x6 -#define COLLIDER_o322 0x5 -#define COLLIDER_mon 0x4 -#define COLLIDER_g46 0x3 -#define COLLIDER_o495 0x2 -#define COLLIDER_deilit1 0x1 -#define COLLIDER_deili1 0x0 +#define COLLIDER_Root 0x21 +#define COLLIDER_kame 0x20 +#define COLLIDER_o613 0x1F +#define COLLIDER_o612 0x1E +#define COLLIDER_o611 0x1D +#define COLLIDER_g110 0x1C +#define COLLIDER_o606 0x1B +#define COLLIDER_yo 0x1A +#define COLLIDER_doro 0x19 +#define COLLIDER_o414 0x18 +#define COLLIDER_3 0x17 +#define COLLIDER_o276 0x16 +#define COLLIDER_o347 0x15 +#define COLLIDER_u_1 0x14 +#define COLLIDER_o608 0x13 +#define COLLIDER_o585 0x12 +#define COLLIDER_o413 0x11 +#define COLLIDER_s_2 0x10 +#define COLLIDER_o615 0xF +#define COLLIDER_o590 0xE +#define COLLIDER_o412 0xD +#define COLLIDER_o365 0xC +#define COLLIDER_o589 0xB +#define COLLIDER_hashi 0xA +#define COLLIDER_o614 0x9 +#define COLLIDER_o411 0x8 +#define COLLIDER_o594 0x7 +#define COLLIDER_o352 0x6 +#define COLLIDER_o322 0x5 +#define COLLIDER_mon 0x4 +#define COLLIDER_g46 0x3 +#define COLLIDER_o495 0x2 +#define COLLIDER_deilit1 0x1 +#define COLLIDER_deili1 0x0 + +#define ZONE_Root 0x6 +#define ZONE_g48 0x5 +#define ZONE_o407 0x4 +#define ZONE_o409 0x3 +#define ZONE_o411 0x2 +#define ZONE_g46 0x1 +#define ZONE_deili3 0x0 + diff --git a/include/mapfs/kzn_07_shape.h b/include/mapfs/kzn_07_shape.h index 338666edbf..fe4c78b626 100644 --- a/include/mapfs/kzn_07_shape.h +++ b/include/mapfs/kzn_07_shape.h @@ -1,50 +1,51 @@ -#define MODEL_Root 0x31 -#define MODEL_g83 0x30 -#define MODEL_o535 0x2F -#define MODEL_o577 0x2E -#define MODEL_g81 0x2D -#define MODEL_g80 0x2C -#define MODEL_o560 0x2B -#define MODEL_yo 0x2A -#define MODEL_sara 0x29 -#define MODEL_yougan2 0x28 -#define MODEL_yougan1 0x27 -#define MODEL_yougan 0x26 -#define MODEL_spot 0x25 -#define MODEL_chioro 0x24 -#define MODEL_o568 0x23 -#define MODEL_u_1 0x22 -#define MODEL_o556 0x21 -#define MODEL_o511 0x20 -#define MODEL_o510 0x1F -#define MODEL_o347 0x1E -#define MODEL_o276 0x1D -#define MODEL_o497 0x1C -#define MODEL_o498 0x1B -#define MODEL_s_2 0x1A -#define MODEL_o413 0x19 -#define MODEL_o414 0x18 -#define MODEL_o412 0x17 -#define MODEL_s_1 0x16 -#define MODEL_o502 0x15 -#define MODEL_o399 0x14 -#define MODEL_o365 0x13 -#define MODEL_3 0x12 -#define MODEL_o351 0x11 -#define MODEL_2 0x10 -#define MODEL_o290 0xF -#define MODEL_o541 0xE -#define MODEL_1 0xD -#define MODEL_o417 0xC -#define MODEL_o539 0xB -#define MODEL_hashi 0xA -#define MODEL_o570 0x9 -#define MODEL_o569 0x8 -#define MODEL_o537 0x7 -#define MODEL_o571 0x6 -#define MODEL_o500 0x5 -#define MODEL_o545 0x4 -#define MODEL_o540 0x3 -#define MODEL_g47 0x2 -#define MODEL_o383 0x1 -#define MODEL_deili1 0x0 +#define MODEL_Root 0x31 +#define MODEL_g83 0x30 +#define MODEL_o535 0x2F +#define MODEL_o577 0x2E +#define MODEL_g81 0x2D +#define MODEL_g80 0x2C +#define MODEL_o560 0x2B +#define MODEL_yo 0x2A +#define MODEL_sara 0x29 +#define MODEL_yougan2 0x28 +#define MODEL_yougan1 0x27 +#define MODEL_yougan 0x26 +#define MODEL_spot 0x25 +#define MODEL_chioro 0x24 +#define MODEL_o568 0x23 +#define MODEL_u_1 0x22 +#define MODEL_o556 0x21 +#define MODEL_o511 0x20 +#define MODEL_o510 0x1F +#define MODEL_o347 0x1E +#define MODEL_o276 0x1D +#define MODEL_o497 0x1C +#define MODEL_o498 0x1B +#define MODEL_s_2 0x1A +#define MODEL_o413 0x19 +#define MODEL_o414 0x18 +#define MODEL_o412 0x17 +#define MODEL_s_1 0x16 +#define MODEL_o502 0x15 +#define MODEL_o399 0x14 +#define MODEL_o365 0x13 +#define MODEL_3 0x12 +#define MODEL_o351 0x11 +#define MODEL_2 0x10 +#define MODEL_o290 0xF +#define MODEL_o541 0xE +#define MODEL_1 0xD +#define MODEL_o417 0xC +#define MODEL_o539 0xB +#define MODEL_hashi 0xA +#define MODEL_o570 0x9 +#define MODEL_o569 0x8 +#define MODEL_o537 0x7 +#define MODEL_o571 0x6 +#define MODEL_o500 0x5 +#define MODEL_o545 0x4 +#define MODEL_o540 0x3 +#define MODEL_g47 0x2 +#define MODEL_o383 0x1 +#define MODEL_deili1 0x0 + diff --git a/include/mapfs/kzn_08_hit.h b/include/mapfs/kzn_08_hit.h index 1cb04f2ee3..d65a39ce67 100644 --- a/include/mapfs/kzn_08_hit.h +++ b/include/mapfs/kzn_08_hit.h @@ -1,34 +1,45 @@ -#define COLLIDER_Root 0x21 -#define COLLIDER_g70 0x20 -#define COLLIDER_o476 0x1F -#define COLLIDER_o475 0x1E -#define COLLIDER_g61 0x1D -#define COLLIDER_o450 0x1C -#define COLLIDER_o448 0x1B -#define COLLIDER_o447 0x1A -#define COLLIDER_o446 0x19 -#define COLLIDER_g68 0x18 -#define COLLIDER_o470 0x17 -#define COLLIDER_o468 0x16 -#define COLLIDER_g64 0x15 -#define COLLIDER_o454 0x14 -#define COLLIDER_g57 0x13 -#define COLLIDER_o440 0x12 -#define COLLIDER_g53 0x11 -#define COLLIDER_o401 0x10 -#define COLLIDER_o352 0xF -#define COLLIDER_o322 0xE -#define COLLIDER_o414 0xD -#define COLLIDER_g51 0xC -#define COLLIDER_yougan_atari 0xB -#define COLLIDER_o430 0xA -#define COLLIDER_Default 0x9 -#define COLLIDER_o323 0x8 -#define COLLIDER_o400 0x7 -#define COLLIDER_g46 0x6 -#define COLLIDER_o433 0x5 -#define COLLIDER_o402 0x4 -#define COLLIDER_g47 0x3 -#define COLLIDER_o343 0x2 -#define COLLIDER_deilit1 0x1 -#define COLLIDER_deili1 0x0 +#define COLLIDER_Root 0x21 +#define COLLIDER_g70 0x20 +#define COLLIDER_o476 0x1F +#define COLLIDER_o475 0x1E +#define COLLIDER_g61 0x1D +#define COLLIDER_o450 0x1C +#define COLLIDER_o448 0x1B +#define COLLIDER_o447 0x1A +#define COLLIDER_o446 0x19 +#define COLLIDER_g68 0x18 +#define COLLIDER_o470 0x17 +#define COLLIDER_o468 0x16 +#define COLLIDER_g64 0x15 +#define COLLIDER_o454 0x14 +#define COLLIDER_g57 0x13 +#define COLLIDER_o440 0x12 +#define COLLIDER_g53 0x11 +#define COLLIDER_o401 0x10 +#define COLLIDER_o352 0xF +#define COLLIDER_o322 0xE +#define COLLIDER_o414 0xD +#define COLLIDER_g51 0xC +#define COLLIDER_yougan_atari 0xB +#define COLLIDER_o430 0xA +#define COLLIDER_Default 0x9 +#define COLLIDER_o323 0x8 +#define COLLIDER_o400 0x7 +#define COLLIDER_g46 0x6 +#define COLLIDER_o433 0x5 +#define COLLIDER_o402 0x4 +#define COLLIDER_g47 0x3 +#define COLLIDER_o343 0x2 +#define COLLIDER_deilit1 0x1 +#define COLLIDER_deili1 0x0 + +#define ZONE_Root 0x8 +#define ZONE_g53 0x7 +#define ZONE_g54 0x6 +#define ZONE_o433 0x5 +#define ZONE_o432 0x4 +#define ZONE_o431 0x3 +#define ZONE_o429 0x2 +#define ZONE_Default 0x1 +#define ZONE_o408 0x0 + diff --git a/include/mapfs/kzn_08_shape.h b/include/mapfs/kzn_08_shape.h index b633b8cccc..5d12e26ed0 100644 --- a/include/mapfs/kzn_08_shape.h +++ b/include/mapfs/kzn_08_shape.h @@ -1,37 +1,38 @@ -#define MODEL_Root 0x24 -#define MODEL_g104 0x23 -#define MODEL_Default 0x22 -#define MODEL_o635 0x21 -#define MODEL_o634 0x20 -#define MODEL_o633 0x1F -#define MODEL_g98 0x1E -#define MODEL_kemuri 0x1D -#define MODEL_kem2 0x1C -#define MODEL_kem1 0x1B -#define MODEL_g65 0x1A -#define MODEL_o616 0x19 -#define MODEL_g91 0x18 -#define MODEL_o426 0x17 -#define MODEL_o408 0x16 -#define MODEL_o605 0x15 -#define MODEL_o606 0x14 -#define MODEL_o614 0x13 -#define MODEL_o595 0x12 -#define MODEL_o415 0x11 -#define MODEL_g63 0x10 -#define MODEL_g94 0xF -#define MODEL_o584 0xE -#define MODEL_o612 0xD -#define MODEL_g93 0xC -#define MODEL_o581 0xB -#define MODEL_o580 0xA -#define MODEL_o579 0x9 -#define MODEL_o418 0x8 -#define MODEL_g62 0x7 -#define MODEL_o390 0x6 -#define MODEL_o611 0x5 -#define MODEL_g53 0x4 -#define MODEL_yougan1 0x3 -#define MODEL_g52 0x2 -#define MODEL_yougan 0x1 -#define MODEL_o640 0x0 +#define MODEL_Root 0x24 +#define MODEL_g104 0x23 +#define MODEL_Default 0x22 +#define MODEL_o635 0x21 +#define MODEL_o634 0x20 +#define MODEL_o633 0x1F +#define MODEL_g98 0x1E +#define MODEL_kemuri 0x1D +#define MODEL_kem2 0x1C +#define MODEL_kem1 0x1B +#define MODEL_g65 0x1A +#define MODEL_o616 0x19 +#define MODEL_g91 0x18 +#define MODEL_o426 0x17 +#define MODEL_o408 0x16 +#define MODEL_o605 0x15 +#define MODEL_o606 0x14 +#define MODEL_o614 0x13 +#define MODEL_o595 0x12 +#define MODEL_o415 0x11 +#define MODEL_g63 0x10 +#define MODEL_g94 0xF +#define MODEL_o584 0xE +#define MODEL_o612 0xD +#define MODEL_g93 0xC +#define MODEL_o581 0xB +#define MODEL_o580 0xA +#define MODEL_o579 0x9 +#define MODEL_o418 0x8 +#define MODEL_g62 0x7 +#define MODEL_o390 0x6 +#define MODEL_o611 0x5 +#define MODEL_g53 0x4 +#define MODEL_yougan1 0x3 +#define MODEL_g52 0x2 +#define MODEL_yougan 0x1 +#define MODEL_o640 0x0 + diff --git a/include/mapfs/kzn_09_hit.h b/include/mapfs/kzn_09_hit.h index e83d4d7c4c..7d28820a5e 100644 --- a/include/mapfs/kzn_09_hit.h +++ b/include/mapfs/kzn_09_hit.h @@ -1,28 +1,40 @@ -#define COLLIDER_Root 0x1B -#define COLLIDER_g55 0x1A -#define COLLIDER_o271 0x19 -#define COLLIDER_o237 0x18 -#define COLLIDER_o284 0x17 -#define COLLIDER_g54 0x16 -#define COLLIDER_o242 0x15 -#define COLLIDER_o281 0x14 -#define COLLIDER_o303 0x13 -#define COLLIDER_g53 0x12 -#define COLLIDER_o283 0x11 -#define COLLIDER_o240 0x10 -#define COLLIDER_o311 0xF -#define COLLIDER_o266 0xE -#define COLLIDER_o251 0xD -#define COLLIDER_g48 0xC -#define COLLIDER_o290 0xB -#define COLLIDER_o289 0xA -#define COLLIDER_o288 0x9 -#define COLLIDER_g22 0x8 -#define COLLIDER_ropeway 0x7 -#define COLLIDER_g45 0x6 -#define COLLIDER_deilit3 0x5 -#define COLLIDER_deili3 0x4 -#define COLLIDER_deilit2 0x3 -#define COLLIDER_deili2 0x2 -#define COLLIDER_deilit1 0x1 -#define COLLIDER_deili1 0x0 +#define COLLIDER_Root 0x1B +#define COLLIDER_g55 0x1A +#define COLLIDER_o271 0x19 +#define COLLIDER_o237 0x18 +#define COLLIDER_o284 0x17 +#define COLLIDER_g54 0x16 +#define COLLIDER_o242 0x15 +#define COLLIDER_o281 0x14 +#define COLLIDER_o303 0x13 +#define COLLIDER_g53 0x12 +#define COLLIDER_o283 0x11 +#define COLLIDER_o240 0x10 +#define COLLIDER_o311 0xF +#define COLLIDER_o266 0xE +#define COLLIDER_o251 0xD +#define COLLIDER_g48 0xC +#define COLLIDER_o290 0xB +#define COLLIDER_o289 0xA +#define COLLIDER_o288 0x9 +#define COLLIDER_g22 0x8 +#define COLLIDER_ropeway 0x7 +#define COLLIDER_g45 0x6 +#define COLLIDER_deilit3 0x5 +#define COLLIDER_deili3 0x4 +#define COLLIDER_deilit2 0x3 +#define COLLIDER_deili2 0x2 +#define COLLIDER_deilit1 0x1 +#define COLLIDER_deili1 0x0 + +#define ZONE_Root 0x9 +#define ZONE_g46 0x8 +#define ZONE_o276 0x7 +#define ZONE_o275 0x6 +#define ZONE_o274 0x5 +#define ZONE_g45 0x4 +#define ZONE_o272 0x3 +#define ZONE_o271 0x2 +#define ZONE_o270 0x1 +#define ZONE_o149 0x0 + diff --git a/include/mapfs/kzn_09_shape.h b/include/mapfs/kzn_09_shape.h index 08d27dbc2a..3b5a0447e5 100644 --- a/include/mapfs/kzn_09_shape.h +++ b/include/mapfs/kzn_09_shape.h @@ -1,45 +1,46 @@ -#define MODEL_Root 0x2C -#define MODEL_g58 0x2B -#define MODEL_g71 0x2A -#define MODEL_tou4 0x29 -#define MODEL_kab4 0x28 -#define MODEL_o326 0x27 -#define MODEL_tou1 0x26 -#define MODEL_kab1 0x25 -#define MODEL_o375 0x24 -#define MODEL_o149 0x23 -#define MODEL_o252 0x22 -#define MODEL_g63 0x21 -#define MODEL_tou2 0x20 -#define MODEL_kab2 0x1F -#define MODEL_o351 0x1E -#define MODEL_deili1 0x1D -#define MODEL_g59 0x1C -#define MODEL_tou3 0x1B -#define MODEL_kab3 0x1A -#define MODEL_o342 0x19 -#define MODEL_deili2 0x18 -#define MODEL_Default 0x17 -#define MODEL_kabe 0x16 -#define MODEL_o334 0x15 -#define MODEL_tou 0x14 -#define MODEL_o354 0x13 -#define MODEL_o316 0x12 -#define MODEL_o341 0x11 -#define MODEL_kassya2 0x10 -#define MODEL_kassya_shita 0xF -#define MODEL_kassya_himo 0xE -#define MODEL_kassya_ue 0xD -#define MODEL_kassya_koma 0xC -#define MODEL_rope1 0xB -#define MODEL_o223 0xA -#define MODEL_o222 0x9 -#define MODEL_obj 0x8 -#define MODEL_o363 0x7 -#define MODEL_mon 0x6 -#define MODEL_m123 0x5 -#define MODEL_m3 0x4 -#define MODEL_m2 0x3 -#define MODEL_m1 0x2 -#define MODEL_g22 0x1 -#define MODEL_o237 0x0 +#define MODEL_Root 0x2C +#define MODEL_g58 0x2B +#define MODEL_g71 0x2A +#define MODEL_tou4 0x29 +#define MODEL_kab4 0x28 +#define MODEL_o326 0x27 +#define MODEL_tou1 0x26 +#define MODEL_kab1 0x25 +#define MODEL_o375 0x24 +#define MODEL_o149 0x23 +#define MODEL_o252 0x22 +#define MODEL_g63 0x21 +#define MODEL_tou2 0x20 +#define MODEL_kab2 0x1F +#define MODEL_o351 0x1E +#define MODEL_deili1 0x1D +#define MODEL_g59 0x1C +#define MODEL_tou3 0x1B +#define MODEL_kab3 0x1A +#define MODEL_o342 0x19 +#define MODEL_deili2 0x18 +#define MODEL_Default 0x17 +#define MODEL_kabe 0x16 +#define MODEL_o334 0x15 +#define MODEL_tou 0x14 +#define MODEL_o354 0x13 +#define MODEL_o316 0x12 +#define MODEL_o341 0x11 +#define MODEL_kassya2 0x10 +#define MODEL_kassya_shita 0xF +#define MODEL_kassya_himo 0xE +#define MODEL_kassya_ue 0xD +#define MODEL_kassya_koma 0xC +#define MODEL_rope1 0xB +#define MODEL_o223 0xA +#define MODEL_o222 0x9 +#define MODEL_obj 0x8 +#define MODEL_o363 0x7 +#define MODEL_mon 0x6 +#define MODEL_m123 0x5 +#define MODEL_m3 0x4 +#define MODEL_m2 0x3 +#define MODEL_m1 0x2 +#define MODEL_g22 0x1 +#define MODEL_o237 0x0 + diff --git a/include/mapfs/kzn_10_hit.h b/include/mapfs/kzn_10_hit.h index 6973a66820..7057fea3fc 100644 --- a/include/mapfs/kzn_10_hit.h +++ b/include/mapfs/kzn_10_hit.h @@ -1,13 +1,21 @@ -#define COLLIDER_Root 0xC -#define COLLIDER_kara 0xB -#define COLLIDER_gron 0xA -#define COLLIDER_Default 0x9 -#define COLLIDER_o87 0x8 -#define COLLIDER_o86 0x7 -#define COLLIDER_deilit1 0x6 -#define COLLIDER_deili1 0x5 -#define COLLIDER_o77 0x4 -#define COLLIDER_deilit2 0x3 -#define COLLIDER_deili2 0x2 -#define COLLIDER_o78 0x1 -#define COLLIDER_o75 0x0 +#define COLLIDER_Root 0xC +#define COLLIDER_kara 0xB +#define COLLIDER_gron 0xA +#define COLLIDER_Default 0x9 +#define COLLIDER_o87 0x8 +#define COLLIDER_o86 0x7 +#define COLLIDER_deilit1 0x6 +#define COLLIDER_deili1 0x5 +#define COLLIDER_o77 0x4 +#define COLLIDER_deilit2 0x3 +#define COLLIDER_deili2 0x2 +#define COLLIDER_o78 0x1 +#define COLLIDER_o75 0x0 + +#define ZONE_Root 0x5 +#define ZONE_k 0x4 +#define ZONE_k60 0x3 +#define ZONE_k50 0x2 +#define ZONE_g8 0x1 +#define ZONE_o79 0x0 + diff --git a/include/mapfs/kzn_10_shape.h b/include/mapfs/kzn_10_shape.h index 44c5326fb2..75f09377b0 100644 --- a/include/mapfs/kzn_10_shape.h +++ b/include/mapfs/kzn_10_shape.h @@ -1,48 +1,49 @@ -#define MODEL_Root 0x2F -#define MODEL_g48 0x2E -#define MODEL_kemuri 0x2D -#define MODEL_kem1 0x2C -#define MODEL_g2 0x2B -#define MODEL_me 0x2A -#define MODEL_goron 0x29 -#define MODEL_4 0x28 -#define MODEL_4_4 0x27 -#define MODEL_4_3 0x26 -#define MODEL_4_2 0x25 -#define MODEL_4_1 0x24 -#define MODEL_3 0x23 -#define MODEL_3_4 0x22 -#define MODEL_3_3 0x21 -#define MODEL_3_2 0x20 -#define MODEL_3_1 0x1F -#define MODEL_2 0x1E -#define MODEL_2_4 0x1D -#define MODEL_2_3 0x1C -#define MODEL_2_2 0x1B -#define MODEL_2_1 0x1A -#define MODEL_g6 0x19 -#define MODEL_o73 0x18 -#define MODEL_o74 0x17 -#define MODEL_o72 0x16 -#define MODEL_o70 0x15 -#define MODEL_yuka 0x14 -#define MODEL_o85 0x13 -#define MODEL_mon_m 0x12 -#define MODEL_o155 0x11 -#define MODEL_o151 0x10 -#define MODEL_o93 0xF -#define MODEL_kuro 0xE -#define MODEL_o168 0xD -#define MODEL_o167 0xC -#define MODEL_kabe 0xB -#define MODEL_o166 0xA -#define MODEL_o165 0x9 -#define MODEL_mon 0x8 -#define MODEL_o183 0x7 -#define MODEL_o182 0x6 -#define MODEL_o181 0x5 -#define MODEL_o180 0x4 -#define MODEL_g10 0x3 -#define MODEL_o162 0x2 -#define MODEL_o94 0x1 -#define MODEL_o96 0x0 +#define MODEL_Root 0x2F +#define MODEL_g48 0x2E +#define MODEL_kemuri 0x2D +#define MODEL_kem1 0x2C +#define MODEL_g2 0x2B +#define MODEL_me 0x2A +#define MODEL_goron 0x29 +#define MODEL_4 0x28 +#define MODEL_4_4 0x27 +#define MODEL_4_3 0x26 +#define MODEL_4_2 0x25 +#define MODEL_4_1 0x24 +#define MODEL_3 0x23 +#define MODEL_3_4 0x22 +#define MODEL_3_3 0x21 +#define MODEL_3_2 0x20 +#define MODEL_3_1 0x1F +#define MODEL_2 0x1E +#define MODEL_2_4 0x1D +#define MODEL_2_3 0x1C +#define MODEL_2_2 0x1B +#define MODEL_2_1 0x1A +#define MODEL_g6 0x19 +#define MODEL_o73 0x18 +#define MODEL_o74 0x17 +#define MODEL_o72 0x16 +#define MODEL_o70 0x15 +#define MODEL_yuka 0x14 +#define MODEL_o85 0x13 +#define MODEL_mon_m 0x12 +#define MODEL_o155 0x11 +#define MODEL_o151 0x10 +#define MODEL_o93 0xF +#define MODEL_kuro 0xE +#define MODEL_o168 0xD +#define MODEL_o167 0xC +#define MODEL_kabe 0xB +#define MODEL_o166 0xA +#define MODEL_o165 0x9 +#define MODEL_mon 0x8 +#define MODEL_o183 0x7 +#define MODEL_o182 0x6 +#define MODEL_o181 0x5 +#define MODEL_o180 0x4 +#define MODEL_g10 0x3 +#define MODEL_o162 0x2 +#define MODEL_o94 0x1 +#define MODEL_o96 0x0 + diff --git a/include/mapfs/kzn_11_hit.h b/include/mapfs/kzn_11_hit.h index e7670873df..21f6486787 100644 --- a/include/mapfs/kzn_11_hit.h +++ b/include/mapfs/kzn_11_hit.h @@ -1,66 +1,71 @@ -#define COLLIDER_Root 0x41 -#define COLLIDER_pokop 0x40 -#define COLLIDER_pp2 0x3F -#define COLLIDER_pp1 0x3E -#define COLLIDER_g39 0x3D -#define COLLIDER_o213 0x3C -#define COLLIDER_o214 0x3B -#define COLLIDER_o215 0x3A -#define COLLIDER_o216 0x39 -#define COLLIDER_g38 0x38 -#define COLLIDER_o208 0x37 -#define COLLIDER_g33 0x36 -#define COLLIDER_o207 0x35 -#define COLLIDER_o206 0x34 -#define COLLIDER_o187 0x33 -#define COLLIDER_o186 0x32 -#define COLLIDER_g12 0x31 -#define COLLIDER_o212 0x30 -#define COLLIDER_o211 0x2F -#define COLLIDER_o127 0x2E -#define COLLIDER_o126 0x2D -#define COLLIDER_g30 0x2C -#define COLLIDER_o167 0x2B -#define COLLIDER_o164 0x2A -#define COLLIDER_o160 0x29 -#define COLLIDER_g28 0x28 -#define COLLIDER_o181 0x27 -#define COLLIDER_o180 0x26 -#define COLLIDER_o179 0x25 -#define COLLIDER_o156 0x24 -#define COLLIDER_o178 0x23 -#define COLLIDER_o177 0x22 -#define COLLIDER_o176 0x21 -#define COLLIDER_o175 0x20 -#define COLLIDER_g14 0x1F -#define COLLIDER_o26 0x1E -#define COLLIDER_o27 0x1D -#define COLLIDER_o28 0x1C -#define COLLIDER_g7 0x1B -#define COLLIDER_o67 0x1A -#define COLLIDER_o68 0x19 -#define COLLIDER_o69 0x18 -#define COLLIDER_g19 0x17 -#define COLLIDER_o185 0x16 -#define COLLIDER_o150 0x15 -#define COLLIDER_deilit2 0x14 -#define COLLIDER_deili2 0x13 -#define COLLIDER_o83 0x12 -#define COLLIDER_o82 0x11 -#define COLLIDER_o198 0x10 -#define COLLIDER_g35 0xF -#define COLLIDER_o197 0xE -#define COLLIDER_o196 0xD -#define COLLIDER_g18 0xC -#define COLLIDER_o149 0xB -#define COLLIDER_deilit1 0xA -#define COLLIDER_deili1 0x9 -#define COLLIDER_o80 0x8 -#define COLLIDER_o79 0x7 -#define COLLIDER_g2 0x6 -#define COLLIDER_o141 0x5 -#define COLLIDER_o145 0x4 -#define COLLIDER_o146 0x3 -#define COLLIDER_o143 0x2 -#define COLLIDER_o142 0x1 -#define COLLIDER_o140 0x0 +#define COLLIDER_Root 0x41 +#define COLLIDER_pokop 0x40 +#define COLLIDER_pp2 0x3F +#define COLLIDER_pp1 0x3E +#define COLLIDER_g39 0x3D +#define COLLIDER_o213 0x3C +#define COLLIDER_o214 0x3B +#define COLLIDER_o215 0x3A +#define COLLIDER_o216 0x39 +#define COLLIDER_g38 0x38 +#define COLLIDER_o208 0x37 +#define COLLIDER_g33 0x36 +#define COLLIDER_o207 0x35 +#define COLLIDER_o206 0x34 +#define COLLIDER_o187 0x33 +#define COLLIDER_o186 0x32 +#define COLLIDER_g12 0x31 +#define COLLIDER_o212 0x30 +#define COLLIDER_o211 0x2F +#define COLLIDER_o127 0x2E +#define COLLIDER_o126 0x2D +#define COLLIDER_g30 0x2C +#define COLLIDER_o167 0x2B +#define COLLIDER_o164 0x2A +#define COLLIDER_o160 0x29 +#define COLLIDER_g28 0x28 +#define COLLIDER_o181 0x27 +#define COLLIDER_o180 0x26 +#define COLLIDER_o179 0x25 +#define COLLIDER_o156 0x24 +#define COLLIDER_o178 0x23 +#define COLLIDER_o177 0x22 +#define COLLIDER_o176 0x21 +#define COLLIDER_o175 0x20 +#define COLLIDER_g14 0x1F +#define COLLIDER_o26 0x1E +#define COLLIDER_o27 0x1D +#define COLLIDER_o28 0x1C +#define COLLIDER_g7 0x1B +#define COLLIDER_o67 0x1A +#define COLLIDER_o68 0x19 +#define COLLIDER_o69 0x18 +#define COLLIDER_g19 0x17 +#define COLLIDER_o185 0x16 +#define COLLIDER_o150 0x15 +#define COLLIDER_deilit2 0x14 +#define COLLIDER_deili2 0x13 +#define COLLIDER_o83 0x12 +#define COLLIDER_o82 0x11 +#define COLLIDER_o198 0x10 +#define COLLIDER_g35 0xF +#define COLLIDER_o197 0xE +#define COLLIDER_o196 0xD +#define COLLIDER_g18 0xC +#define COLLIDER_o149 0xB +#define COLLIDER_deilit1 0xA +#define COLLIDER_deili1 0x9 +#define COLLIDER_o80 0x8 +#define COLLIDER_o79 0x7 +#define COLLIDER_g2 0x6 +#define COLLIDER_o141 0x5 +#define COLLIDER_o145 0x4 +#define COLLIDER_o146 0x3 +#define COLLIDER_o143 0x2 +#define COLLIDER_o142 0x1 +#define COLLIDER_o140 0x0 + +#define ZONE_Root 0x2 +#define ZONE_g24 0x1 +#define ZONE_o132 0x0 + diff --git a/include/mapfs/kzn_11_shape.h b/include/mapfs/kzn_11_shape.h index 36241a260b..7a088fcb37 100644 --- a/include/mapfs/kzn_11_shape.h +++ b/include/mapfs/kzn_11_shape.h @@ -1,61 +1,62 @@ -#define MODEL_Root 0x3C -#define MODEL_g125 0x3B -#define MODEL_t2 0x3A -#define MODEL_o569 0x39 -#define MODEL_o489 0x38 -#define MODEL_o488 0x37 -#define MODEL_t1 0x36 -#define MODEL_o568 0x35 -#define MODEL_o483 0x34 -#define MODEL_o482 0x33 -#define MODEL_g124 0x32 -#define MODEL_o571 0x31 -#define MODEL_o572 0x30 -#define MODEL_o563 0x2F -#define MODEL_o564 0x2E -#define MODEL_g87 0x2D -#define MODEL_o451 0x2C -#define MODEL_kemuri 0x2B -#define MODEL_kem2 0x2A -#define MODEL_kem1 0x29 -#define MODEL_potoro 0x28 -#define MODEL_poko 0x27 -#define MODEL_toro 0x26 -#define MODEL_g73 0x25 -#define MODEL_o566 0x24 -#define MODEL_o108 0x23 -#define MODEL_o225 0x22 -#define MODEL_g14 0x21 -#define MODEL_o26 0x20 -#define MODEL_o28 0x1F -#define MODEL_o27 0x1E -#define MODEL_g80 0x1D -#define MODEL_o487 0x1C -#define MODEL_o486 0x1B -#define MODEL_g7 0x1A -#define MODEL_o67 0x19 -#define MODEL_o69 0x18 -#define MODEL_o68 0x17 -#define MODEL_g99 0x16 -#define MODEL_o570 0x15 -#define MODEL_g79 0x14 -#define MODEL_o485 0x13 -#define MODEL_o484 0x12 -#define MODEL_g12 0x11 -#define MODEL_o131 0x10 -#define MODEL_o58 0xF -#define MODEL_o478 0xE -#define MODEL_o57 0xD -#define MODEL_o477 0xC -#define MODEL_o480 0xB -#define MODEL_g128 0xA -#define MODEL_o578 0x9 -#define MODEL_o577 0x8 -#define MODEL_o565 0x7 -#define MODEL_o393 0x6 -#define MODEL_o213 0x5 -#define MODEL_o241 0x4 -#define MODEL_g55 0x3 -#define MODEL_o576 0x2 -#define MODEL_yougan 0x1 -#define MODEL_yougan1_1 0x0 +#define MODEL_Root 0x3C +#define MODEL_g125 0x3B +#define MODEL_t2 0x3A +#define MODEL_o569 0x39 +#define MODEL_o489 0x38 +#define MODEL_o488 0x37 +#define MODEL_t1 0x36 +#define MODEL_o568 0x35 +#define MODEL_o483 0x34 +#define MODEL_o482 0x33 +#define MODEL_g124 0x32 +#define MODEL_o571 0x31 +#define MODEL_o572 0x30 +#define MODEL_o563 0x2F +#define MODEL_o564 0x2E +#define MODEL_g87 0x2D +#define MODEL_o451 0x2C +#define MODEL_kemuri 0x2B +#define MODEL_kem2 0x2A +#define MODEL_kem1 0x29 +#define MODEL_potoro 0x28 +#define MODEL_poko 0x27 +#define MODEL_toro 0x26 +#define MODEL_g73 0x25 +#define MODEL_o566 0x24 +#define MODEL_o108 0x23 +#define MODEL_o225 0x22 +#define MODEL_g14 0x21 +#define MODEL_o26 0x20 +#define MODEL_o28 0x1F +#define MODEL_o27 0x1E +#define MODEL_g80 0x1D +#define MODEL_o487 0x1C +#define MODEL_o486 0x1B +#define MODEL_g7 0x1A +#define MODEL_o67 0x19 +#define MODEL_o69 0x18 +#define MODEL_o68 0x17 +#define MODEL_g99 0x16 +#define MODEL_o570 0x15 +#define MODEL_g79 0x14 +#define MODEL_o485 0x13 +#define MODEL_o484 0x12 +#define MODEL_g12 0x11 +#define MODEL_o131 0x10 +#define MODEL_o58 0xF +#define MODEL_o478 0xE +#define MODEL_o57 0xD +#define MODEL_o477 0xC +#define MODEL_o480 0xB +#define MODEL_g128 0xA +#define MODEL_o578 0x9 +#define MODEL_o577 0x8 +#define MODEL_o565 0x7 +#define MODEL_o393 0x6 +#define MODEL_o213 0x5 +#define MODEL_o241 0x4 +#define MODEL_g55 0x3 +#define MODEL_o576 0x2 +#define MODEL_yougan 0x1 +#define MODEL_yougan1_1 0x0 + diff --git a/include/mapfs/kzn_17_hit.h b/include/mapfs/kzn_17_hit.h index cbeec7e434..623450b82e 100644 --- a/include/mapfs/kzn_17_hit.h +++ b/include/mapfs/kzn_17_hit.h @@ -1,44 +1,53 @@ -#define COLLIDER_Root 0x2B -#define COLLIDER_g127 0x2A -#define COLLIDER_o932 0x29 -#define COLLIDER_g112 0x28 -#define COLLIDER_o896 0x27 -#define COLLIDER_g100 0x26 -#define COLLIDER_o869 0x25 -#define COLLIDER_o893 0x24 -#define COLLIDER_g96 0x23 -#define COLLIDER_o840 0x22 -#define COLLIDER_g89 0x21 -#define COLLIDER_o826 0x20 -#define COLLIDER_kaidan 0x1F -#define COLLIDER_o263 0x1E -#define COLLIDER_o280 0x1D -#define COLLIDER_o273 0x1C -#define COLLIDER_o894 0x1B -#define COLLIDER_g75 0x1A -#define COLLIDER_o389 0x19 -#define COLLIDER_o396 0x18 -#define COLLIDER_o281 0x17 -#define COLLIDER_s2 0x16 -#define COLLIDER_o368 0x15 -#define COLLIDER_o377 0x14 -#define COLLIDER_o408 0x13 -#define COLLIDER_s1 0x12 -#define COLLIDER_o818 0x11 -#define COLLIDER_o418 0x10 -#define COLLIDER_g67 0xF -#define COLLIDER_o286 0xE -#define COLLIDER_o283 0xD -#define COLLIDER_o419 0xC -#define COLLIDER_o816 0xB -#define COLLIDER_o274 0xA -#define COLLIDER_g83 0x9 -#define COLLIDER_o416 0x8 -#define COLLIDER_g84 0x7 -#define COLLIDER_gogo 0x6 -#define COLLIDER_o369 0x5 -#define COLLIDER_o842 0x4 -#define COLLIDER_deilit2 0x3 -#define COLLIDER_deili2 0x2 -#define COLLIDER_deilit1 0x1 -#define COLLIDER_deili1 0x0 +#define COLLIDER_Root 0x2B +#define COLLIDER_g127 0x2A +#define COLLIDER_o932 0x29 +#define COLLIDER_g112 0x28 +#define COLLIDER_o896 0x27 +#define COLLIDER_g100 0x26 +#define COLLIDER_o869 0x25 +#define COLLIDER_o893 0x24 +#define COLLIDER_g96 0x23 +#define COLLIDER_o840 0x22 +#define COLLIDER_g89 0x21 +#define COLLIDER_o826 0x20 +#define COLLIDER_kaidan 0x1F +#define COLLIDER_o263 0x1E +#define COLLIDER_o280 0x1D +#define COLLIDER_o273 0x1C +#define COLLIDER_o894 0x1B +#define COLLIDER_g75 0x1A +#define COLLIDER_o389 0x19 +#define COLLIDER_o396 0x18 +#define COLLIDER_o281 0x17 +#define COLLIDER_s2 0x16 +#define COLLIDER_o368 0x15 +#define COLLIDER_o377 0x14 +#define COLLIDER_o408 0x13 +#define COLLIDER_s1 0x12 +#define COLLIDER_o818 0x11 +#define COLLIDER_o418 0x10 +#define COLLIDER_g67 0xF +#define COLLIDER_o286 0xE +#define COLLIDER_o283 0xD +#define COLLIDER_o419 0xC +#define COLLIDER_o816 0xB +#define COLLIDER_o274 0xA +#define COLLIDER_g83 0x9 +#define COLLIDER_o416 0x8 +#define COLLIDER_g84 0x7 +#define COLLIDER_gogo 0x6 +#define COLLIDER_o369 0x5 +#define COLLIDER_o842 0x4 +#define COLLIDER_deilit2 0x3 +#define COLLIDER_deili2 0x2 +#define COLLIDER_deilit1 0x1 +#define COLLIDER_deili1 0x0 + +#define ZONE_Root 0x6 +#define ZONE_g77 0x5 +#define ZONE_o421 0x4 +#define ZONE_o422 0x3 +#define ZONE_o423 0x2 +#define ZONE_g73 0x1 +#define ZONE_o369 0x0 + diff --git a/include/mapfs/kzn_17_shape.h b/include/mapfs/kzn_17_shape.h index 1f43432971..dd7341674f 100644 --- a/include/mapfs/kzn_17_shape.h +++ b/include/mapfs/kzn_17_shape.h @@ -1,51 +1,52 @@ -#define MODEL_Root 0x32 -#define MODEL_g104 0x31 -#define MODEL_g94 0x30 -#define MODEL_o879 0x2F -#define MODEL_o874 0x2E -#define MODEL_o877 0x2D -#define MODEL_kemuri 0x2C -#define MODEL_kem2 0x2B -#define MODEL_kem1 0x2A -#define MODEL_g91 0x29 -#define MODEL_o866 0x28 -#define MODEL_o865 0x27 -#define MODEL_o867 0x26 -#define MODEL_goro 0x25 -#define MODEL_o916 0x24 -#define MODEL_o915 0x23 -#define MODEL_o909 0x22 -#define MODEL_goro_mae 0x21 -#define MODEL_mae 0x20 -#define MODEL_goro_ato 0x1F -#define MODEL_ato 0x1E -#define MODEL_me1 0x1D -#define MODEL_me 0x1C -#define MODEL_goron 0x1B -#define MODEL_o822 0x1A -#define MODEL_o821 0x19 -#define MODEL_o820 0x18 -#define MODEL_o819 0x17 -#define MODEL_kaidan 0x16 -#define MODEL_o899 0x15 -#define MODEL_o898 0x14 -#define MODEL_o862 0x13 -#define MODEL_o816 0x12 -#define MODEL_o851 0x11 -#define MODEL_s2 0x10 -#define MODEL_o408 0xF -#define MODEL_o410 0xE -#define MODEL_o406 0xD -#define MODEL_o858 0xC -#define MODEL_o857 0xB -#define MODEL_s1 0xA -#define MODEL_o418 0x9 -#define MODEL_o286 0x8 -#define MODEL_o818 0x7 -#define MODEL_o855 0x6 -#define MODEL_o854 0x5 -#define MODEL_o852 0x4 -#define MODEL_g67 0x3 -#define MODEL_o369 0x2 -#define MODEL_g75 0x1 -#define MODEL_o389 0x0 +#define MODEL_Root 0x32 +#define MODEL_g104 0x31 +#define MODEL_g94 0x30 +#define MODEL_o879 0x2F +#define MODEL_o874 0x2E +#define MODEL_o877 0x2D +#define MODEL_kemuri 0x2C +#define MODEL_kem2 0x2B +#define MODEL_kem1 0x2A +#define MODEL_g91 0x29 +#define MODEL_o866 0x28 +#define MODEL_o865 0x27 +#define MODEL_o867 0x26 +#define MODEL_goro 0x25 +#define MODEL_o916 0x24 +#define MODEL_o915 0x23 +#define MODEL_o909 0x22 +#define MODEL_goro_mae 0x21 +#define MODEL_mae 0x20 +#define MODEL_goro_ato 0x1F +#define MODEL_ato 0x1E +#define MODEL_me1 0x1D +#define MODEL_me 0x1C +#define MODEL_goron 0x1B +#define MODEL_o822 0x1A +#define MODEL_o821 0x19 +#define MODEL_o820 0x18 +#define MODEL_o819 0x17 +#define MODEL_kaidan 0x16 +#define MODEL_o899 0x15 +#define MODEL_o898 0x14 +#define MODEL_o862 0x13 +#define MODEL_o816 0x12 +#define MODEL_o851 0x11 +#define MODEL_s2 0x10 +#define MODEL_o408 0xF +#define MODEL_o410 0xE +#define MODEL_o406 0xD +#define MODEL_o858 0xC +#define MODEL_o857 0xB +#define MODEL_s1 0xA +#define MODEL_o418 0x9 +#define MODEL_o286 0x8 +#define MODEL_o818 0x7 +#define MODEL_o855 0x6 +#define MODEL_o854 0x5 +#define MODEL_o852 0x4 +#define MODEL_g67 0x3 +#define MODEL_o369 0x2 +#define MODEL_g75 0x1 +#define MODEL_o389 0x0 + diff --git a/include/mapfs/kzn_18_hit.h b/include/mapfs/kzn_18_hit.h index 6302602639..80d683e8f6 100644 --- a/include/mapfs/kzn_18_hit.h +++ b/include/mapfs/kzn_18_hit.h @@ -1,49 +1,59 @@ -#define COLLIDER_Root 0x30 -#define COLLIDER_kame 0x2F -#define COLLIDER_o488 0x2E -#define COLLIDER_g83 0x2D -#define COLLIDER_o469 0x2C -#define COLLIDER_kai 0x2B -#define COLLIDER_o405 0x2A -#define COLLIDER_o379 0x29 -#define COLLIDER_o383 0x28 -#define COLLIDER_o382 0x27 -#define COLLIDER_o381 0x26 -#define COLLIDER_o378 0x25 -#define COLLIDER_o380 0x24 -#define COLLIDER_dai2 0x23 -#define COLLIDER_o443 0x22 -#define COLLIDER_o391 0x21 -#define COLLIDER_o442 0x20 -#define COLLIDER_o441 0x1F -#define COLLIDER_o362 0x1E -#define COLLIDER_o388 0x1D -#define COLLIDER_stage 0x1C -#define COLLIDER_yougan 0x1B -#define COLLIDER_g79 0x1A -#define COLLIDER_o334 0x19 -#define COLLIDER_o445 0x18 -#define COLLIDER_y_kabe1 0x17 -#define COLLIDER_kabe1 0x16 -#define COLLIDER_o435 0x15 -#define COLLIDER_o434 0x14 -#define COLLIDER_o444 0x13 -#define COLLIDER_o446 0x12 -#define COLLIDER_Default 0x11 -#define COLLIDER_o432 0x10 -#define COLLIDER_mon2 0xF -#define COLLIDER_mon1 0xE -#define COLLIDER_ber_mon 0xD -#define COLLIDER_d3 0xC -#define COLLIDER_deilit3 0xB -#define COLLIDER_deili3 0xA -#define COLLIDER_d2 0x9 -#define COLLIDER_deilit2 0x8 -#define COLLIDER_deili2 0x7 -#define COLLIDER_d1 0x6 -#define COLLIDER_deilit1 0x5 -#define COLLIDER_deili1 0x4 -#define COLLIDER_off 0x3 -#define COLLIDER_o478 0x2 -#define COLLIDER_off2 0x1 -#define COLLIDER_off1 0x0 +#define COLLIDER_Root 0x30 +#define COLLIDER_kame 0x2F +#define COLLIDER_o488 0x2E +#define COLLIDER_g83 0x2D +#define COLLIDER_o469 0x2C +#define COLLIDER_kai 0x2B +#define COLLIDER_o405 0x2A +#define COLLIDER_o379 0x29 +#define COLLIDER_o383 0x28 +#define COLLIDER_o382 0x27 +#define COLLIDER_o381 0x26 +#define COLLIDER_o378 0x25 +#define COLLIDER_o380 0x24 +#define COLLIDER_dai2 0x23 +#define COLLIDER_o443 0x22 +#define COLLIDER_o391 0x21 +#define COLLIDER_o442 0x20 +#define COLLIDER_o441 0x1F +#define COLLIDER_o362 0x1E +#define COLLIDER_o388 0x1D +#define COLLIDER_stage 0x1C +#define COLLIDER_yougan 0x1B +#define COLLIDER_g79 0x1A +#define COLLIDER_o334 0x19 +#define COLLIDER_o445 0x18 +#define COLLIDER_y_kabe1 0x17 +#define COLLIDER_kabe1 0x16 +#define COLLIDER_o435 0x15 +#define COLLIDER_o434 0x14 +#define COLLIDER_o444 0x13 +#define COLLIDER_o446 0x12 +#define COLLIDER_Default 0x11 +#define COLLIDER_o432 0x10 +#define COLLIDER_mon2 0xF +#define COLLIDER_mon1 0xE +#define COLLIDER_ber_mon 0xD +#define COLLIDER_d3 0xC +#define COLLIDER_deilit3 0xB +#define COLLIDER_deili3 0xA +#define COLLIDER_d2 0x9 +#define COLLIDER_deilit2 0x8 +#define COLLIDER_deili2 0x7 +#define COLLIDER_d1 0x6 +#define COLLIDER_deilit1 0x5 +#define COLLIDER_deili1 0x4 +#define COLLIDER_off 0x3 +#define COLLIDER_o478 0x2 +#define COLLIDER_off2 0x1 +#define COLLIDER_off1 0x0 + +#define ZONE_Root 0x7 +#define ZONE_Default 0x6 +#define ZONE_o137 0x5 +#define ZONE_o126 0x4 +#define ZONE_g1 0x3 +#define ZONE_o124 0x2 +#define ZONE_o123 0x1 +#define ZONE_o112 0x0 + diff --git a/include/mapfs/kzn_18_shape.h b/include/mapfs/kzn_18_shape.h index c0d447c474..8744f876b6 100644 --- a/include/mapfs/kzn_18_shape.h +++ b/include/mapfs/kzn_18_shape.h @@ -1,57 +1,58 @@ -#define MODEL_Root 0x38 -#define MODEL_t3 0x37 -#define MODEL_o522 0x36 -#define MODEL_bero 0x35 -#define MODEL_t2 0x34 -#define MODEL_o525 0x33 -#define MODEL_o527 0x32 -#define MODEL_t1 0x31 -#define MODEL_o524 0x30 -#define MODEL_o526 0x2F -#define MODEL_g87 0x2E -#define MODEL_g85 0x2D -#define MODEL_o476 0x2C -#define MODEL_potoro 0x2B -#define MODEL_poko 0x2A -#define MODEL_toro 0x29 -#define MODEL_kemri 0x28 -#define MODEL_kem2 0x27 -#define MODEL_kem1 0x26 -#define MODEL_off 0x25 -#define MODEL_o511 0x24 -#define MODEL_o509 0x23 -#define MODEL_o506 0x22 -#define MODEL_off1 0x21 -#define MODEL_yougan1_1 0x20 -#define MODEL_g55 0x1F -#define MODEL_o401 0x1E -#define MODEL_o405 0x1D -#define MODEL_o406 0x1C -#define MODEL_kai 0x1B -#define MODEL_o383 0x1A -#define MODEL_o381 0x19 -#define MODEL_o378 0x18 -#define MODEL_o380 0x17 -#define MODEL_obj 0x16 -#define MODEL_o393 0x15 -#define MODEL_o334 0x14 -#define MODEL_dai2 0x13 -#define MODEL_o443 0x12 -#define MODEL_dai_1 0x11 -#define MODEL_o425 0x10 -#define MODEL_o290 0xF -#define MODEL_o385 0xE -#define MODEL_stage 0xD -#define MODEL_o408 0xC -#define MODEL_o379 0xB -#define MODEL_o434 0xA -#define MODEL_y_kabe1 0x9 -#define MODEL_kabe1 0x8 -#define MODEL_o391 0x7 -#define MODEL_ber_mon 0x6 -#define MODEL_o495 0x5 -#define MODEL_o453 0x4 -#define MODEL_mon2 0x3 -#define MODEL_mon1 0x2 -#define MODEL_o516 0x1 -#define MODEL_o514 0x0 +#define MODEL_Root 0x38 +#define MODEL_t3 0x37 +#define MODEL_o522 0x36 +#define MODEL_bero 0x35 +#define MODEL_t2 0x34 +#define MODEL_o525 0x33 +#define MODEL_o527 0x32 +#define MODEL_t1 0x31 +#define MODEL_o524 0x30 +#define MODEL_o526 0x2F +#define MODEL_g87 0x2E +#define MODEL_g85 0x2D +#define MODEL_o476 0x2C +#define MODEL_potoro 0x2B +#define MODEL_poko 0x2A +#define MODEL_toro 0x29 +#define MODEL_kemri 0x28 +#define MODEL_kem2 0x27 +#define MODEL_kem1 0x26 +#define MODEL_off 0x25 +#define MODEL_o511 0x24 +#define MODEL_o509 0x23 +#define MODEL_o506 0x22 +#define MODEL_off1 0x21 +#define MODEL_yougan1_1 0x20 +#define MODEL_g55 0x1F +#define MODEL_o401 0x1E +#define MODEL_o405 0x1D +#define MODEL_o406 0x1C +#define MODEL_kai 0x1B +#define MODEL_o383 0x1A +#define MODEL_o381 0x19 +#define MODEL_o378 0x18 +#define MODEL_o380 0x17 +#define MODEL_obj 0x16 +#define MODEL_o393 0x15 +#define MODEL_o334 0x14 +#define MODEL_dai2 0x13 +#define MODEL_o443 0x12 +#define MODEL_dai_1 0x11 +#define MODEL_o425 0x10 +#define MODEL_o290 0xF +#define MODEL_o385 0xE +#define MODEL_stage 0xD +#define MODEL_o408 0xC +#define MODEL_o379 0xB +#define MODEL_o434 0xA +#define MODEL_y_kabe1 0x9 +#define MODEL_kabe1 0x8 +#define MODEL_o391 0x7 +#define MODEL_ber_mon 0x6 +#define MODEL_o495 0x5 +#define MODEL_o453 0x4 +#define MODEL_mon2 0x3 +#define MODEL_mon1 0x2 +#define MODEL_o516 0x1 +#define MODEL_o514 0x0 + diff --git a/include/mapfs/kzn_19_hit.h b/include/mapfs/kzn_19_hit.h index bb027171b6..7c35fb7de2 100644 --- a/include/mapfs/kzn_19_hit.h +++ b/include/mapfs/kzn_19_hit.h @@ -1,57 +1,69 @@ -#define COLLIDER_Root 0x38 -#define COLLIDER_g110 0x37 -#define COLLIDER_o516 0x36 -#define COLLIDER_o515 0x35 -#define COLLIDER_o514 0x34 -#define COLLIDER_o513 0x33 -#define COLLIDER_o508 0x32 -#define COLLIDER_o507 0x31 -#define COLLIDER_ana 0x30 -#define COLLIDER_hoshi 0x2F -#define COLLIDER_hoshi_ato 0x2E -#define COLLIDER_o506 0x2D -#define COLLIDER_ato 0x2C -#define COLLIDER_a2 0x2B -#define COLLIDER_a1 0x2A -#define COLLIDER_mae 0x29 -#define COLLIDER_m2 0x28 -#define COLLIDER_m1 0x27 -#define COLLIDER_o505 0x26 -#define COLLIDER_o504 0x25 -#define COLLIDER_g82 0x24 -#define COLLIDER_o458 0x23 -#define COLLIDER_Default 0x22 -#define COLLIDER_o467 0x21 -#define COLLIDER_o406 0x20 -#define COLLIDER_o405 0x1F -#define COLLIDER_o408 0x1E -#define COLLIDER_dai2 0x1D -#define COLLIDER_o410 0x1C -#define COLLIDER_o409 0x1B -#define COLLIDER_o388 0x1A -#define COLLIDER_dai_1 0x19 -#define COLLIDER_o431 0x18 -#define COLLIDER_o375 0x17 -#define COLLIDER_o374 0x16 -#define COLLIDER_g69 0x15 -#define COLLIDER_mom3 0x14 -#define COLLIDER_mon2 0x13 -#define COLLIDER_mon1 0x12 -#define COLLIDER_g72 0x11 -#define COLLIDER_o290 0x10 -#define COLLIDER_o386 0xF -#define COLLIDER_o289 0xE -#define COLLIDER_stage 0xD -#define COLLIDER_o425 0xC -#define COLLIDER_o385 0xB -#define COLLIDER_o305 0xA -#define COLLIDER_ber_mon 0x9 -#define COLLIDER_d3 0x8 -#define COLLIDER_deilit3 0x7 -#define COLLIDER_deili3 0x6 -#define COLLIDER_d2 0x5 -#define COLLIDER_deilit2 0x4 -#define COLLIDER_deili2 0x3 -#define COLLIDER_d1 0x2 -#define COLLIDER_deilit1 0x1 -#define COLLIDER_deili1 0x0 +#define COLLIDER_Root 0x38 +#define COLLIDER_g110 0x37 +#define COLLIDER_o516 0x36 +#define COLLIDER_o515 0x35 +#define COLLIDER_o514 0x34 +#define COLLIDER_o513 0x33 +#define COLLIDER_o508 0x32 +#define COLLIDER_o507 0x31 +#define COLLIDER_ana 0x30 +#define COLLIDER_hoshi 0x2F +#define COLLIDER_hoshi_ato 0x2E +#define COLLIDER_o506 0x2D +#define COLLIDER_ato 0x2C +#define COLLIDER_a2 0x2B +#define COLLIDER_a1 0x2A +#define COLLIDER_mae 0x29 +#define COLLIDER_m2 0x28 +#define COLLIDER_m1 0x27 +#define COLLIDER_o505 0x26 +#define COLLIDER_o504 0x25 +#define COLLIDER_g82 0x24 +#define COLLIDER_o458 0x23 +#define COLLIDER_Default 0x22 +#define COLLIDER_o467 0x21 +#define COLLIDER_o406 0x20 +#define COLLIDER_o405 0x1F +#define COLLIDER_o408 0x1E +#define COLLIDER_dai2 0x1D +#define COLLIDER_o410 0x1C +#define COLLIDER_o409 0x1B +#define COLLIDER_o388 0x1A +#define COLLIDER_dai_1 0x19 +#define COLLIDER_o431 0x18 +#define COLLIDER_o375 0x17 +#define COLLIDER_o374 0x16 +#define COLLIDER_g69 0x15 +#define COLLIDER_mom3 0x14 +#define COLLIDER_mon2 0x13 +#define COLLIDER_mon1 0x12 +#define COLLIDER_g72 0x11 +#define COLLIDER_o290 0x10 +#define COLLIDER_o386 0xF +#define COLLIDER_o289 0xE +#define COLLIDER_stage 0xD +#define COLLIDER_o425 0xC +#define COLLIDER_o385 0xB +#define COLLIDER_o305 0xA +#define COLLIDER_ber_mon 0x9 +#define COLLIDER_d3 0x8 +#define COLLIDER_deilit3 0x7 +#define COLLIDER_deili3 0x6 +#define COLLIDER_d2 0x5 +#define COLLIDER_deilit2 0x4 +#define COLLIDER_deili2 0x3 +#define COLLIDER_d1 0x2 +#define COLLIDER_deilit1 0x1 +#define COLLIDER_deili1 0x0 + +#define ZONE_Root 0x9 +#define ZONE_g25 0x8 +#define ZONE_o140 0x7 +#define ZONE_o139 0x6 +#define ZONE_o138 0x5 +#define ZONE_g1 0x4 +#define ZONE_o126 0x3 +#define ZONE_o124 0x2 +#define ZONE_o123 0x1 +#define ZONE_o112 0x0 + diff --git a/include/mapfs/kzn_19_shape.h b/include/mapfs/kzn_19_shape.h index f0a32e9ce7..fb8cadc1d5 100644 --- a/include/mapfs/kzn_19_shape.h +++ b/include/mapfs/kzn_19_shape.h @@ -1,76 +1,77 @@ -#define MODEL_Root 0x4B -#define MODEL_t3 0x4A -#define MODEL_o552 0x49 -#define MODEL_o557 0x48 -#define MODEL_t2 0x47 -#define MODEL_o553 0x46 -#define MODEL_bero 0x45 -#define MODEL_t1 0x44 -#define MODEL_o554 0x43 -#define MODEL_o556 0x42 -#define MODEL_g109 0x41 -#define MODEL_g93 0x40 -#define MODEL_6 0x3F -#define MODEL_o6 0x3E -#define MODEL_5 0x3D -#define MODEL_o5 0x3C -#define MODEL_4 0x3B -#define MODEL_o4 0x3A -#define MODEL_3 0x39 -#define MODEL_o3 0x38 -#define MODEL_2 0x37 -#define MODEL_o2 0x36 -#define MODEL_1 0x35 -#define MODEL_o1 0x34 -#define MODEL_y 0x33 -#define MODEL_yougan1_1 0x32 -#define MODEL_ana 0x31 -#define MODEL_naka 0x30 -#define MODEL_o531 0x2F -#define MODEL_ato 0x2E -#define MODEL_a2 0x2D -#define MODEL_a1 0x2C -#define MODEL_mae 0x2B -#define MODEL_m3 0x2A -#define MODEL_m2 0x29 -#define MODEL_m1 0x28 -#define MODEL_potoro 0x27 -#define MODEL_poko1 0x26 -#define MODEL_toro 0x25 -#define MODEL_kemuri 0x24 -#define MODEL_kem2 0x23 -#define MODEL_kem1 0x22 -#define MODEL_g81 0x21 -#define MODEL_o525 0x20 -#define MODEL_o462 0x1F -#define MODEL_o461 0x1E -#define MODEL_o460 0x1D -#define MODEL_o459 0x1C -#define MODEL_po 0x1B -#define MODEL_poko 0x1A -#define MODEL_obj 0x19 -#define MODEL_o393 0x18 -#define MODEL_o334 0x17 -#define MODEL_o468 0x16 -#define MODEL_dai2 0x15 -#define MODEL_o441 0x14 -#define MODEL_o388 0x13 -#define MODEL_dai_1 0x12 -#define MODEL_o431 0x11 -#define MODEL_o386 0x10 -#define MODEL_o385 0xF -#define MODEL_g86 0xE -#define MODEL_o475 0xD -#define MODEL_o472 0xC -#define MODEL_o500 0xB -#define MODEL_stage 0xA -#define MODEL_o434 0x9 -#define MODEL_y_kabe1 0x8 -#define MODEL_kabe1 0x7 -#define MODEL_g108 0x6 -#define MODEL_o542 0x5 -#define MODEL_o541 0x4 -#define MODEL_o540 0x3 -#define MODEL_o539 0x2 -#define MODEL_o538 0x1 -#define MODEL_o537 0x0 +#define MODEL_Root 0x4B +#define MODEL_t3 0x4A +#define MODEL_o552 0x49 +#define MODEL_o557 0x48 +#define MODEL_t2 0x47 +#define MODEL_o553 0x46 +#define MODEL_bero 0x45 +#define MODEL_t1 0x44 +#define MODEL_o554 0x43 +#define MODEL_o556 0x42 +#define MODEL_g109 0x41 +#define MODEL_g93 0x40 +#define MODEL_6 0x3F +#define MODEL_o6 0x3E +#define MODEL_5 0x3D +#define MODEL_o5 0x3C +#define MODEL_4 0x3B +#define MODEL_o4 0x3A +#define MODEL_3 0x39 +#define MODEL_o3 0x38 +#define MODEL_2 0x37 +#define MODEL_o2 0x36 +#define MODEL_1 0x35 +#define MODEL_o1 0x34 +#define MODEL_y 0x33 +#define MODEL_yougan1_1 0x32 +#define MODEL_ana 0x31 +#define MODEL_naka 0x30 +#define MODEL_o531 0x2F +#define MODEL_ato 0x2E +#define MODEL_a2 0x2D +#define MODEL_a1 0x2C +#define MODEL_mae 0x2B +#define MODEL_m3 0x2A +#define MODEL_m2 0x29 +#define MODEL_m1 0x28 +#define MODEL_potoro 0x27 +#define MODEL_poko1 0x26 +#define MODEL_toro 0x25 +#define MODEL_kemuri 0x24 +#define MODEL_kem2 0x23 +#define MODEL_kem1 0x22 +#define MODEL_g81 0x21 +#define MODEL_o525 0x20 +#define MODEL_o462 0x1F +#define MODEL_o461 0x1E +#define MODEL_o460 0x1D +#define MODEL_o459 0x1C +#define MODEL_po 0x1B +#define MODEL_poko 0x1A +#define MODEL_obj 0x19 +#define MODEL_o393 0x18 +#define MODEL_o334 0x17 +#define MODEL_o468 0x16 +#define MODEL_dai2 0x15 +#define MODEL_o441 0x14 +#define MODEL_o388 0x13 +#define MODEL_dai_1 0x12 +#define MODEL_o431 0x11 +#define MODEL_o386 0x10 +#define MODEL_o385 0xF +#define MODEL_g86 0xE +#define MODEL_o475 0xD +#define MODEL_o472 0xC +#define MODEL_o500 0xB +#define MODEL_stage 0xA +#define MODEL_o434 0x9 +#define MODEL_y_kabe1 0x8 +#define MODEL_kabe1 0x7 +#define MODEL_g108 0x6 +#define MODEL_o542 0x5 +#define MODEL_o541 0x4 +#define MODEL_o540 0x3 +#define MODEL_o539 0x2 +#define MODEL_o538 0x1 +#define MODEL_o537 0x0 + diff --git a/include/mapfs/kzn_20_hit.h b/include/mapfs/kzn_20_hit.h index 9f4dfea8c5..33d9622d2d 100644 --- a/include/mapfs/kzn_20_hit.h +++ b/include/mapfs/kzn_20_hit.h @@ -1,31 +1,39 @@ -#define COLLIDER_Root 0x1E -#define COLLIDER_g111 0x1D -#define COLLIDER_yu 0x1C -#define COLLIDER_g96 0x1B -#define COLLIDER_tt1 0x1A -#define COLLIDER_o894 0x19 -#define COLLIDER_g95 0x18 -#define COLLIDER_o919 0x17 -#define COLLIDER_o918 0x16 -#define COLLIDER_o916 0x15 -#define COLLIDER_g92 0x14 -#define COLLIDER_o870 0x13 -#define COLLIDER_o822 0x12 -#define COLLIDER_g90 0x11 -#define COLLIDER_o869 0x10 -#define COLLIDER_Default 0xF -#define COLLIDER_o857 0xE -#define COLLIDER_o856 0xD -#define COLLIDER_o879 0xC -#define COLLIDER_o864 0xB -#define COLLIDER_o868 0xA -#define COLLIDER_o877 0x9 -#define COLLIDER_g93 0x8 -#define COLLIDER_o927 0x7 -#define COLLIDER_o926 0x6 -#define COLLIDER_o876 0x5 -#define COLLIDER_o861 0x4 -#define COLLIDER_deilit2 0x3 -#define COLLIDER_deili2 0x2 -#define COLLIDER_deilit1 0x1 -#define COLLIDER_deili1 0x0 +#define COLLIDER_Root 0x1E +#define COLLIDER_g111 0x1D +#define COLLIDER_yu 0x1C +#define COLLIDER_g96 0x1B +#define COLLIDER_tt1 0x1A +#define COLLIDER_o894 0x19 +#define COLLIDER_g95 0x18 +#define COLLIDER_o919 0x17 +#define COLLIDER_o918 0x16 +#define COLLIDER_o916 0x15 +#define COLLIDER_g92 0x14 +#define COLLIDER_o870 0x13 +#define COLLIDER_o822 0x12 +#define COLLIDER_g90 0x11 +#define COLLIDER_o869 0x10 +#define COLLIDER_Default 0xF +#define COLLIDER_o857 0xE +#define COLLIDER_o856 0xD +#define COLLIDER_o879 0xC +#define COLLIDER_o864 0xB +#define COLLIDER_o868 0xA +#define COLLIDER_o877 0x9 +#define COLLIDER_g93 0x8 +#define COLLIDER_o927 0x7 +#define COLLIDER_o926 0x6 +#define COLLIDER_o876 0x5 +#define COLLIDER_o861 0x4 +#define COLLIDER_deilit2 0x3 +#define COLLIDER_deili2 0x2 +#define COLLIDER_deilit1 0x1 +#define COLLIDER_deili1 0x0 + +#define ZONE_Root 0x5 +#define ZONE_g91 0x4 +#define ZONE_o861 0x3 +#define ZONE_g90 0x2 +#define ZONE_o862 0x1 +#define ZONE_o863 0x0 + diff --git a/include/mapfs/kzn_20_shape.h b/include/mapfs/kzn_20_shape.h index aefd8f1b29..8a32ab2a64 100644 --- a/include/mapfs/kzn_20_shape.h +++ b/include/mapfs/kzn_20_shape.h @@ -1,41 +1,42 @@ -#define MODEL_Root 0x28 -#define MODEL_yougan 0x27 -#define MODEL_yu 0x26 -#define MODEL_g115 0x25 -#define MODEL_tou1 0x24 -#define MODEL_kab1 0x23 -#define MODEL_o953 0x22 -#define MODEL_g114 0x21 -#define MODEL_tou2 0x20 -#define MODEL_kab2 0x1F -#define MODEL_o857 0x1E -#define MODEL_g108 0x1D -#define MODEL_g107 0x1C -#define MODEL_o949 0x1B -#define MODEL_o946 0x1A -#define MODEL_g99 0x19 -#define MODEL_o864 0x18 -#define MODEL_bom 0x17 -#define MODEL_bom_ato 0x16 -#define MODEL_o963 0x15 -#define MODEL_mon2 0x14 -#define MODEL_bom_mae 0x13 -#define MODEL_mon 0x12 -#define MODEL_hibi 0x11 -#define MODEL_ana 0x10 -#define MODEL_g94 0xF -#define MODEL_o874 0xE -#define MODEL_g93 0xD -#define MODEL_o876 0xC -#define MODEL_g87 0xB -#define MODEL_o909 0xA -#define MODEL_o822 0x9 -#define MODEL_o879 0x8 -#define MODEL_o891 0x7 -#define MODEL_Default 0x6 -#define MODEL_o966 0x5 -#define MODEL_o965 0x4 -#define MODEL_o961 0x3 -#define MODEL_o954 0x2 -#define MODEL_o881 0x1 -#define MODEL_o880 0x0 +#define MODEL_Root 0x28 +#define MODEL_yougan 0x27 +#define MODEL_yu 0x26 +#define MODEL_g115 0x25 +#define MODEL_tou1 0x24 +#define MODEL_kab1 0x23 +#define MODEL_o953 0x22 +#define MODEL_g114 0x21 +#define MODEL_tou2 0x20 +#define MODEL_kab2 0x1F +#define MODEL_o857 0x1E +#define MODEL_g108 0x1D +#define MODEL_g107 0x1C +#define MODEL_o949 0x1B +#define MODEL_o946 0x1A +#define MODEL_g99 0x19 +#define MODEL_o864 0x18 +#define MODEL_bom 0x17 +#define MODEL_bom_ato 0x16 +#define MODEL_o963 0x15 +#define MODEL_mon2 0x14 +#define MODEL_bom_mae 0x13 +#define MODEL_mon 0x12 +#define MODEL_hibi 0x11 +#define MODEL_ana 0x10 +#define MODEL_g94 0xF +#define MODEL_o874 0xE +#define MODEL_g93 0xD +#define MODEL_o876 0xC +#define MODEL_g87 0xB +#define MODEL_o909 0xA +#define MODEL_o822 0x9 +#define MODEL_o879 0x8 +#define MODEL_o891 0x7 +#define MODEL_Default 0x6 +#define MODEL_o966 0x5 +#define MODEL_o965 0x4 +#define MODEL_o961 0x3 +#define MODEL_o954 0x2 +#define MODEL_o881 0x1 +#define MODEL_o880 0x0 + diff --git a/include/mapfs/kzn_22_hit.h b/include/mapfs/kzn_22_hit.h index 17ccd5bf5a..220d6386d0 100644 --- a/include/mapfs/kzn_22_hit.h +++ b/include/mapfs/kzn_22_hit.h @@ -1,22 +1,29 @@ -#define COLLIDER_Root 0x15 -#define COLLIDER_g112 0x14 -#define COLLIDER_o591 0x13 -#define COLLIDER_g97 0x12 -#define COLLIDER_o572 0x11 -#define COLLIDER_o542 0x10 -#define COLLIDER_o545 0xF -#define COLLIDER_o544 0xE -#define COLLIDER_mon_bero 0xD -#define COLLIDER_o581 0xC -#define COLLIDER_o277 0xB -#define COLLIDER_o194 0xA -#define COLLIDER_o357 0x9 -#define COLLIDER_g106 0x8 -#define COLLIDER_o582 0x7 -#define COLLIDER_o564 0x6 -#define COLLIDER_o576 0x5 -#define COLLIDER_g79 0x4 -#define COLLIDER_o593 0x3 -#define COLLIDER_o432 0x2 -#define COLLIDER_deilit1 0x1 -#define COLLIDER_deili1 0x0 +#define COLLIDER_Root 0x15 +#define COLLIDER_g112 0x14 +#define COLLIDER_o591 0x13 +#define COLLIDER_g97 0x12 +#define COLLIDER_o572 0x11 +#define COLLIDER_o542 0x10 +#define COLLIDER_o545 0xF +#define COLLIDER_o544 0xE +#define COLLIDER_mon_bero 0xD +#define COLLIDER_o581 0xC +#define COLLIDER_o277 0xB +#define COLLIDER_o194 0xA +#define COLLIDER_o357 0x9 +#define COLLIDER_g106 0x8 +#define COLLIDER_o582 0x7 +#define COLLIDER_o564 0x6 +#define COLLIDER_o576 0x5 +#define COLLIDER_g79 0x4 +#define COLLIDER_o593 0x3 +#define COLLIDER_o432 0x2 +#define COLLIDER_deilit1 0x1 +#define COLLIDER_deili1 0x0 + +#define ZONE_Root 0x4 +#define ZONE_jupm_sopt1 0x3 +#define ZONE_o223 0x2 +#define ZONE_o222 0x1 +#define ZONE_o149 0x0 + diff --git a/include/mapfs/kzn_22_shape.h b/include/mapfs/kzn_22_shape.h index 542921210d..44c852d9a1 100644 --- a/include/mapfs/kzn_22_shape.h +++ b/include/mapfs/kzn_22_shape.h @@ -1,54 +1,55 @@ -#define MODEL_Root 0x35 -#define MODEL_g116 0x34 -#define MODEL_g79 0x33 -#define MODEL_yougan2_2 0x32 -#define MODEL_yougan1_1 0x31 -#define MODEL_kemuri 0x30 -#define MODEL_kem2 0x2F -#define MODEL_kem1 0x2E -#define MODEL_yougan 0x2D -#define MODEL_yo_ue1 0x2C -#define MODEL_yu1 0x2B -#define MODEL_yo_ue 0x2A -#define MODEL_yu 0x29 -#define MODEL_g110 0x28 -#define MODEL_o589 0x27 -#define MODEL_o588 0x26 -#define MODEL_o587 0x25 -#define MODEL_o586 0x24 -#define MODEL_g94 0x23 -#define MODEL_g97 0x22 -#define MODEL_o542 0x21 -#define MODEL_o545 0x20 -#define MODEL_o544 0x1F -#define MODEL_g108 0x1E -#define MODEL_o576 0x1D -#define MODEL_o574 0x1C -#define MODEL_o580 0x1B -#define MODEL_o578 0x1A -#define MODEL_o572 0x19 -#define MODEL_o570 0x18 -#define MODEL_mon_bero 0x17 -#define MODEL_o604 0x16 -#define MODEL_o603 0x15 -#define MODEL_o357 0x14 -#define MODEL_g88 0x13 -#define MODEL_o612 0x12 -#define MODEL_o539 0x11 -#define MODEL_g80 0x10 -#define MODEL_o592 0xF -#define MODEL_o531 0xE -#define MODEL_Default 0xD -#define MODEL_o610 0xC -#define MODEL_o609 0xB -#define MODEL_o267 0xA -#define MODEL_o285 0x9 -#define MODEL_o264 0x8 -#define MODEL_o529 0x7 -#define MODEL_o581 0x6 -#define MODEL_g75 0x5 -#define MODEL_o399 0x4 -#define MODEL_o534 0x3 -#define MODEL_o532 0x2 -#define MODEL_g66 0x1 -#define MODEL_o527 0x0 +#define MODEL_Root 0x35 +#define MODEL_g116 0x34 +#define MODEL_g79 0x33 +#define MODEL_yougan2_2 0x32 +#define MODEL_yougan1_1 0x31 +#define MODEL_kemuri 0x30 +#define MODEL_kem2 0x2F +#define MODEL_kem1 0x2E +#define MODEL_yougan 0x2D +#define MODEL_yo_ue1 0x2C +#define MODEL_yu1 0x2B +#define MODEL_yo_ue 0x2A +#define MODEL_yu 0x29 +#define MODEL_g110 0x28 +#define MODEL_o589 0x27 +#define MODEL_o588 0x26 +#define MODEL_o587 0x25 +#define MODEL_o586 0x24 +#define MODEL_g94 0x23 +#define MODEL_g97 0x22 +#define MODEL_o542 0x21 +#define MODEL_o545 0x20 +#define MODEL_o544 0x1F +#define MODEL_g108 0x1E +#define MODEL_o576 0x1D +#define MODEL_o574 0x1C +#define MODEL_o580 0x1B +#define MODEL_o578 0x1A +#define MODEL_o572 0x19 +#define MODEL_o570 0x18 +#define MODEL_mon_bero 0x17 +#define MODEL_o604 0x16 +#define MODEL_o603 0x15 +#define MODEL_o357 0x14 +#define MODEL_g88 0x13 +#define MODEL_o612 0x12 +#define MODEL_o539 0x11 +#define MODEL_g80 0x10 +#define MODEL_o592 0xF +#define MODEL_o531 0xE +#define MODEL_Default 0xD +#define MODEL_o610 0xC +#define MODEL_o609 0xB +#define MODEL_o267 0xA +#define MODEL_o285 0x9 +#define MODEL_o264 0x8 +#define MODEL_o529 0x7 +#define MODEL_o581 0x6 +#define MODEL_g75 0x5 +#define MODEL_o399 0x4 +#define MODEL_o534 0x3 +#define MODEL_o532 0x2 +#define MODEL_g66 0x1 +#define MODEL_o527 0x0 + diff --git a/include/mapfs/kzn_23_hit.h b/include/mapfs/kzn_23_hit.h index 4f068e7f80..6c57fb1afa 100644 --- a/include/mapfs/kzn_23_hit.h +++ b/include/mapfs/kzn_23_hit.h @@ -1,10 +1,16 @@ -#define COLLIDER_Root 0x9 -#define COLLIDER_g92 0x8 -#define COLLIDER_o824 0x7 -#define COLLIDER_g91 0x6 -#define COLLIDER_o830 0x5 -#define COLLIDER_Default 0x4 -#define COLLIDER_o868 0x3 -#define COLLIDER_o867 0x2 -#define COLLIDER_o866 0x1 -#define COLLIDER_o833 0x0 +#define COLLIDER_Root 0x9 +#define COLLIDER_g92 0x8 +#define COLLIDER_o824 0x7 +#define COLLIDER_g91 0x6 +#define COLLIDER_o830 0x5 +#define COLLIDER_Default 0x4 +#define COLLIDER_o868 0x3 +#define COLLIDER_o867 0x2 +#define COLLIDER_o866 0x1 +#define COLLIDER_o833 0x0 + +#define ZONE_Root 0x3 +#define ZONE_Default 0x2 +#define ZONE_o844 0x1 +#define ZONE_o835 0x0 + diff --git a/include/mapfs/kzn_23_shape.h b/include/mapfs/kzn_23_shape.h index b565a878ae..a1ef1fe5af 100644 --- a/include/mapfs/kzn_23_shape.h +++ b/include/mapfs/kzn_23_shape.h @@ -1,24 +1,25 @@ -#define MODEL_Root 0x17 -#define MODEL_g99 0x16 -#define MODEL_yougan 0x15 -#define MODEL_yo_ue 0x14 -#define MODEL_yu 0x13 -#define MODEL_kemri 0x12 -#define MODEL_kem2 0x11 -#define MODEL_kem1 0x10 -#define MODEL_g92 0xF -#define MODEL_o865 0xE -#define MODEL_o871 0xD -#define MODEL_o870 0xC -#define MODEL_g91 0xB -#define MODEL_o887 0xA -#define MODEL_o869 0x9 -#define MODEL_o872 0x8 -#define MODEL_Default 0x7 -#define MODEL_o888 0x6 -#define MODEL_3 0x5 -#define MODEL_2 0x4 -#define MODEL_1 0x3 -#define MODEL_o868 0x2 -#define MODEL_o867 0x1 -#define MODEL_o866 0x0 +#define MODEL_Root 0x17 +#define MODEL_g99 0x16 +#define MODEL_yougan 0x15 +#define MODEL_yo_ue 0x14 +#define MODEL_yu 0x13 +#define MODEL_kemri 0x12 +#define MODEL_kem2 0x11 +#define MODEL_kem1 0x10 +#define MODEL_g92 0xF +#define MODEL_o865 0xE +#define MODEL_o871 0xD +#define MODEL_o870 0xC +#define MODEL_g91 0xB +#define MODEL_o887 0xA +#define MODEL_o869 0x9 +#define MODEL_o872 0x8 +#define MODEL_Default 0x7 +#define MODEL_o888 0x6 +#define MODEL_3 0x5 +#define MODEL_2 0x4 +#define MODEL_1 0x3 +#define MODEL_o868 0x2 +#define MODEL_o867 0x1 +#define MODEL_o866 0x0 + diff --git a/include/mapfs/kzn_bt01_hit.h b/include/mapfs/kzn_bt01_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/kzn_bt01_hit.h +++ b/include/mapfs/kzn_bt01_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/kzn_bt01_shape.h b/include/mapfs/kzn_bt01_shape.h index d754b855c6..4f80ec49f7 100644 --- a/include/mapfs/kzn_bt01_shape.h +++ b/include/mapfs/kzn_bt01_shape.h @@ -1,30 +1,31 @@ -#define MODEL_Root 0x1D -#define MODEL_dai 0x1C -#define MODEL_hasira 0x1B -#define MODEL_ue3 0x1A -#define MODEL_sita1 0x19 -#define MODEL_iwa3 0x18 -#define MODEL_g79 0x17 -#define MODEL_yuka2 0x16 -#define MODEL_waku1 0x15 -#define MODEL_yuka 0x14 -#define MODEL_yuka3 0x13 -#define MODEL_03 0x12 -#define MODEL_o363 0x11 -#define MODEL_05 0x10 -#define MODEL_ue1 0xF -#define MODEL_ue2 0xE -#define MODEL_iwa2 0xD -#define MODEL_iwa1 0xC -#define MODEL_kabe1 0xB -#define MODEL_kabe2 0xA -#define MODEL_g49 0x9 -#define MODEL_yuka4 0x8 -#define MODEL_waku 0x7 -#define MODEL_waku2 0x6 -#define MODEL_o364 0x5 -#define MODEL_o365 0x4 -#define MODEL_o366 0x3 -#define MODEL_o367 0x2 -#define MODEL_o368 0x1 -#define MODEL_o369 0x0 +#define MODEL_Root 0x1D +#define MODEL_dai 0x1C +#define MODEL_hasira 0x1B +#define MODEL_ue3 0x1A +#define MODEL_sita1 0x19 +#define MODEL_iwa3 0x18 +#define MODEL_g79 0x17 +#define MODEL_yuka2 0x16 +#define MODEL_waku1 0x15 +#define MODEL_yuka 0x14 +#define MODEL_yuka3 0x13 +#define MODEL_03 0x12 +#define MODEL_o363 0x11 +#define MODEL_05 0x10 +#define MODEL_ue1 0xF +#define MODEL_ue2 0xE +#define MODEL_iwa2 0xD +#define MODEL_iwa1 0xC +#define MODEL_kabe1 0xB +#define MODEL_kabe2 0xA +#define MODEL_g49 0x9 +#define MODEL_yuka4 0x8 +#define MODEL_waku 0x7 +#define MODEL_waku2 0x6 +#define MODEL_o364 0x5 +#define MODEL_o365 0x4 +#define MODEL_o366 0x3 +#define MODEL_o367 0x2 +#define MODEL_o368 0x1 +#define MODEL_o369 0x0 + diff --git a/include/mapfs/kzn_bt02_hit.h b/include/mapfs/kzn_bt02_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/kzn_bt02_hit.h +++ b/include/mapfs/kzn_bt02_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/kzn_bt02_shape.h b/include/mapfs/kzn_bt02_shape.h index 542edeec6e..a4bd804212 100644 --- a/include/mapfs/kzn_bt02_shape.h +++ b/include/mapfs/kzn_bt02_shape.h @@ -1,35 +1,36 @@ -#define MODEL_Root 0x22 -#define MODEL_dai 0x21 -#define MODEL_ue3 0x20 -#define MODEL_sita1 0x1F -#define MODEL_iwa3 0x1E -#define MODEL_sima 0x1D -#define MODEL_o368 0x1C -#define MODEL_o367 0x1B -#define MODEL_o366 0x1A -#define MODEL_yougan 0x19 -#define MODEL_move 0x18 -#define MODEL_o371 0x17 -#define MODEL_o370 0x16 -#define MODEL_o369 0x15 -#define MODEL_awa2 0x14 -#define MODEL_awa1 0x13 -#define MODEL_g79 0x12 -#define MODEL_waku1 0x11 -#define MODEL_g97 0x10 -#define MODEL_ue1 0xF -#define MODEL_ue2 0xE -#define MODEL_y3_2 0xD -#define MODEL_y3_1 0xC -#define MODEL_iwa4 0xB -#define MODEL_y2_2 0xA -#define MODEL_y2_1 0x9 -#define MODEL_iwa2 0x8 -#define MODEL_y1_2 0x7 -#define MODEL_y1_1 0x6 -#define MODEL_g49 0x5 -#define MODEL_kabe2 0x4 -#define MODEL_kabe1 0x3 -#define MODEL_kabe3 0x2 -#define MODEL_waku 0x1 -#define MODEL_waku2 0x0 +#define MODEL_Root 0x22 +#define MODEL_dai 0x21 +#define MODEL_ue3 0x20 +#define MODEL_sita1 0x1F +#define MODEL_iwa3 0x1E +#define MODEL_sima 0x1D +#define MODEL_o368 0x1C +#define MODEL_o367 0x1B +#define MODEL_o366 0x1A +#define MODEL_yougan 0x19 +#define MODEL_move 0x18 +#define MODEL_o371 0x17 +#define MODEL_o370 0x16 +#define MODEL_o369 0x15 +#define MODEL_awa2 0x14 +#define MODEL_awa1 0x13 +#define MODEL_g79 0x12 +#define MODEL_waku1 0x11 +#define MODEL_g97 0x10 +#define MODEL_ue1 0xF +#define MODEL_ue2 0xE +#define MODEL_y3_2 0xD +#define MODEL_y3_1 0xC +#define MODEL_iwa4 0xB +#define MODEL_y2_2 0xA +#define MODEL_y2_1 0x9 +#define MODEL_iwa2 0x8 +#define MODEL_y1_2 0x7 +#define MODEL_y1_1 0x6 +#define MODEL_g49 0x5 +#define MODEL_kabe2 0x4 +#define MODEL_kabe1 0x3 +#define MODEL_kabe3 0x2 +#define MODEL_waku 0x1 +#define MODEL_waku2 0x0 + diff --git a/include/mapfs/kzn_bt04_hit.h b/include/mapfs/kzn_bt04_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/kzn_bt04_hit.h +++ b/include/mapfs/kzn_bt04_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/kzn_bt04_shape.h b/include/mapfs/kzn_bt04_shape.h index 08c6734ff9..3e6b5e4882 100644 --- a/include/mapfs/kzn_bt04_shape.h +++ b/include/mapfs/kzn_bt04_shape.h @@ -1,46 +1,47 @@ -#define MODEL_Root 0x2D -#define MODEL_16 0x2C -#define MODEL_tri 0x2B -#define MODEL_o429 0x2A -#define MODEL_o427 0x29 -#define MODEL_o426 0x28 -#define MODEL_06 0x27 -#define MODEL_o423 0x26 -#define MODEL_o418 0x25 -#define MODEL_o416 0x24 -#define MODEL_o414 0x23 -#define MODEL_o412 0x22 -#define MODEL_6_you2 0x21 -#define MODEL_6_you1 0x20 -#define MODEL_o409 0x1F -#define MODEL_08 0x1E -#define MODEL_o403 0x1D -#define MODEL_o402 0x1C -#define MODEL_o398 0x1B -#define MODEL_o397 0x1A -#define MODEL_y1_2 0x19 -#define MODEL_y1_1 0x18 -#define MODEL_dai 0x17 -#define MODEL_ue3 0x16 -#define MODEL_sita1 0x15 -#define MODEL_iwa3 0x14 -#define MODEL_sima 0x13 -#define MODEL_o368 0x12 -#define MODEL_o367 0x11 -#define MODEL_o366 0x10 -#define MODEL_yougan 0xF -#define MODEL_awa2 0xE -#define MODEL_awa1 0xD -#define MODEL_g79 0xC -#define MODEL_waku1 0xB -#define MODEL_o48 0xA -#define MODEL_ue1 0x9 -#define MODEL_ue2 0x8 -#define MODEL_y3_2 0x7 -#define MODEL_y3_1 0x6 -#define MODEL_y2_2 0x5 -#define MODEL_y2_1 0x4 -#define MODEL_g49 0x3 -#define MODEL_kabe3 0x2 -#define MODEL_waku 0x1 -#define MODEL_waku2 0x0 +#define MODEL_Root 0x2D +#define MODEL_16 0x2C +#define MODEL_tri 0x2B +#define MODEL_o429 0x2A +#define MODEL_o427 0x29 +#define MODEL_o426 0x28 +#define MODEL_06 0x27 +#define MODEL_o423 0x26 +#define MODEL_o418 0x25 +#define MODEL_o416 0x24 +#define MODEL_o414 0x23 +#define MODEL_o412 0x22 +#define MODEL_6_you2 0x21 +#define MODEL_6_you1 0x20 +#define MODEL_o409 0x1F +#define MODEL_08 0x1E +#define MODEL_o403 0x1D +#define MODEL_o402 0x1C +#define MODEL_o398 0x1B +#define MODEL_o397 0x1A +#define MODEL_y1_2 0x19 +#define MODEL_y1_1 0x18 +#define MODEL_dai 0x17 +#define MODEL_ue3 0x16 +#define MODEL_sita1 0x15 +#define MODEL_iwa3 0x14 +#define MODEL_sima 0x13 +#define MODEL_o368 0x12 +#define MODEL_o367 0x11 +#define MODEL_o366 0x10 +#define MODEL_yougan 0xF +#define MODEL_awa2 0xE +#define MODEL_awa1 0xD +#define MODEL_g79 0xC +#define MODEL_waku1 0xB +#define MODEL_o48 0xA +#define MODEL_ue1 0x9 +#define MODEL_ue2 0x8 +#define MODEL_y3_2 0x7 +#define MODEL_y3_1 0x6 +#define MODEL_y2_2 0x5 +#define MODEL_y2_1 0x4 +#define MODEL_g49 0x3 +#define MODEL_kabe3 0x2 +#define MODEL_waku 0x1 +#define MODEL_waku2 0x0 + diff --git a/include/mapfs/kzn_bt05_hit.h b/include/mapfs/kzn_bt05_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/kzn_bt05_hit.h +++ b/include/mapfs/kzn_bt05_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/kzn_bt05_shape.h b/include/mapfs/kzn_bt05_shape.h index 2a1e5c81e7..5096f2609a 100644 --- a/include/mapfs/kzn_bt05_shape.h +++ b/include/mapfs/kzn_bt05_shape.h @@ -1,91 +1,92 @@ -#define MODEL_Root 0x5A -#define MODEL_hahen 0x59 -#define MODEL_h11 0x58 -#define MODEL_h10 0x57 -#define MODEL_h09 0x56 -#define MODEL_h08 0x55 -#define MODEL_h07 0x54 -#define MODEL_h06 0x53 -#define MODEL_h05 0x52 -#define MODEL_h04 0x51 -#define MODEL_h03 0x50 -#define MODEL_h02 0x4F -#define MODEL_h01 0x4E -#define MODEL_pack 0x4D -#define MODEL_s09 0x4C -#define MODEL_s08 0x4B -#define MODEL_s07 0x4A -#define MODEL_s06 0x49 -#define MODEL_s05 0x48 -#define MODEL_s04 0x47 -#define MODEL_s03 0x46 -#define MODEL_s02 0x45 -#define MODEL_s01 0x44 -#define MODEL_r12 0x43 -#define MODEL_r11 0x42 -#define MODEL_r10 0x41 -#define MODEL_r09 0x40 -#define MODEL_r08 0x3F -#define MODEL_r07 0x3E -#define MODEL_r06 0x3D -#define MODEL_r05 0x3C -#define MODEL_r04 0x3B -#define MODEL_r03 0x3A -#define MODEL_r02 0x39 -#define MODEL_r01 0x38 -#define MODEL_r00 0x37 -#define MODEL_q12 0x36 -#define MODEL_q11 0x35 -#define MODEL_q10 0x34 -#define MODEL_q09 0x33 -#define MODEL_q08 0x32 -#define MODEL_q07 0x31 -#define MODEL_q06 0x30 -#define MODEL_q05 0x2F -#define MODEL_q04 0x2E -#define MODEL_q03 0x2D -#define MODEL_q02 0x2C -#define MODEL_q01 0x2B -#define MODEL_q00 0x2A -#define MODEL_p12 0x29 -#define MODEL_p11 0x28 -#define MODEL_p10 0x27 -#define MODEL_p09 0x26 -#define MODEL_p08 0x25 -#define MODEL_p07 0x24 -#define MODEL_p06 0x23 -#define MODEL_p05 0x22 -#define MODEL_p04 0x21 -#define MODEL_p03 0x20 -#define MODEL_p02 0x1F -#define MODEL_p01 0x1E -#define MODEL_p00 0x1D -#define MODEL_ato 0x1C -#define MODEL_awa4 0x1B -#define MODEL_awa3 0x1A -#define MODEL_yuka3 0x19 -#define MODEL_soku 0x18 -#define MODEL_mae 0x17 -#define MODEL_futi4 0x16 -#define MODEL_futi3 0x15 -#define MODEL_yuka2 0x14 -#define MODEL_dai 0x13 -#define MODEL_o529 0x12 -#define MODEL_yougan2 0x11 -#define MODEL_iwa1 0x10 -#define MODEL_yougan 0xF -#define MODEL_futi2 0xE -#define MODEL_futi1 0xD -#define MODEL_yuka1 0xC -#define MODEL_awa2 0xB -#define MODEL_awa1 0xA -#define MODEL_g49 0x9 -#define MODEL_waku1 0x8 -#define MODEL_ue2 0x7 -#define MODEL_ue1 0x6 -#define MODEL_hasi 0x5 -#define MODEL_kabe3 0x4 -#define MODEL_kabe2 0x3 -#define MODEL_waku2 0x2 -#define MODEL_kabe1 0x1 -#define MODEL_waku 0x0 +#define MODEL_Root 0x5A +#define MODEL_hahen 0x59 +#define MODEL_h11 0x58 +#define MODEL_h10 0x57 +#define MODEL_h09 0x56 +#define MODEL_h08 0x55 +#define MODEL_h07 0x54 +#define MODEL_h06 0x53 +#define MODEL_h05 0x52 +#define MODEL_h04 0x51 +#define MODEL_h03 0x50 +#define MODEL_h02 0x4F +#define MODEL_h01 0x4E +#define MODEL_pack 0x4D +#define MODEL_s09 0x4C +#define MODEL_s08 0x4B +#define MODEL_s07 0x4A +#define MODEL_s06 0x49 +#define MODEL_s05 0x48 +#define MODEL_s04 0x47 +#define MODEL_s03 0x46 +#define MODEL_s02 0x45 +#define MODEL_s01 0x44 +#define MODEL_r12 0x43 +#define MODEL_r11 0x42 +#define MODEL_r10 0x41 +#define MODEL_r09 0x40 +#define MODEL_r08 0x3F +#define MODEL_r07 0x3E +#define MODEL_r06 0x3D +#define MODEL_r05 0x3C +#define MODEL_r04 0x3B +#define MODEL_r03 0x3A +#define MODEL_r02 0x39 +#define MODEL_r01 0x38 +#define MODEL_r00 0x37 +#define MODEL_q12 0x36 +#define MODEL_q11 0x35 +#define MODEL_q10 0x34 +#define MODEL_q09 0x33 +#define MODEL_q08 0x32 +#define MODEL_q07 0x31 +#define MODEL_q06 0x30 +#define MODEL_q05 0x2F +#define MODEL_q04 0x2E +#define MODEL_q03 0x2D +#define MODEL_q02 0x2C +#define MODEL_q01 0x2B +#define MODEL_q00 0x2A +#define MODEL_p12 0x29 +#define MODEL_p11 0x28 +#define MODEL_p10 0x27 +#define MODEL_p09 0x26 +#define MODEL_p08 0x25 +#define MODEL_p07 0x24 +#define MODEL_p06 0x23 +#define MODEL_p05 0x22 +#define MODEL_p04 0x21 +#define MODEL_p03 0x20 +#define MODEL_p02 0x1F +#define MODEL_p01 0x1E +#define MODEL_p00 0x1D +#define MODEL_ato 0x1C +#define MODEL_awa4 0x1B +#define MODEL_awa3 0x1A +#define MODEL_yuka3 0x19 +#define MODEL_soku 0x18 +#define MODEL_mae 0x17 +#define MODEL_futi4 0x16 +#define MODEL_futi3 0x15 +#define MODEL_yuka2 0x14 +#define MODEL_dai 0x13 +#define MODEL_o529 0x12 +#define MODEL_yougan2 0x11 +#define MODEL_iwa1 0x10 +#define MODEL_yougan 0xF +#define MODEL_futi2 0xE +#define MODEL_futi1 0xD +#define MODEL_yuka1 0xC +#define MODEL_awa2 0xB +#define MODEL_awa1 0xA +#define MODEL_g49 0x9 +#define MODEL_waku1 0x8 +#define MODEL_ue2 0x7 +#define MODEL_ue1 0x6 +#define MODEL_hasi 0x5 +#define MODEL_kabe3 0x4 +#define MODEL_kabe2 0x3 +#define MODEL_waku2 0x2 +#define MODEL_kabe1 0x1 +#define MODEL_waku 0x0 + diff --git a/include/mapfs/mac_00_hit.h b/include/mapfs/mac_00_hit.h index a02bf604f3..4df7a78ab5 100644 --- a/include/mapfs/mac_00_hit.h +++ b/include/mapfs/mac_00_hit.h @@ -1,111 +1,132 @@ -#define COLLIDER_Root 0x6E -#define COLLIDER_g74 0x6D -#define COLLIDER_tt 0x6C -#define COLLIDER_deilim 0x6B -#define COLLIDER_o623 0x6A -#define COLLIDER_kame 0x69 -#define COLLIDER_o707 0x68 -#define COLLIDER_o706 0x67 -#define COLLIDER_o705 0x66 -#define COLLIDER_o664 0x65 -#define COLLIDER_o616 0x64 -#define COLLIDER_op3 0x63 -#define COLLIDER_op2 0x62 -#define COLLIDER_op_1 0x61 -#define COLLIDER_o546 0x60 -#define COLLIDER_deilite 0x5F -#define COLLIDER_o500 0x5E -#define COLLIDER_deilitnw 0x5D -#define COLLIDER_g66 0x5C -#define COLLIDER_o261 0x5B -#define COLLIDER_o262 0x5A -#define COLLIDER_step 0x59 -#define COLLIDER_o328 0x58 -#define COLLIDER_o333 0x57 -#define COLLIDER_o331 0x56 -#define COLLIDER_shop 0x55 -#define COLLIDER_misedeili 0x54 -#define COLLIDER_deilit5u 0x53 -#define COLLIDER_deilit5 0x52 -#define COLLIDER_deili5 0x51 -#define COLLIDER_misemawari 0x50 -#define COLLIDER_o789 0x4F -#define COLLIDER_o787 0x4E -#define COLLIDER_o503 0x4D -#define COLLIDER_o501 0x4C -#define COLLIDER_counter 0x4B -#define COLLIDER_shouhin6 0x4A -#define COLLIDER_shouhin5 0x49 -#define COLLIDER_shouhin4 0x48 -#define COLLIDER_shouhin3 0x47 -#define COLLIDER_syouhin2 0x46 -#define COLLIDER_syouhin1 0x45 -#define COLLIDER_o409 0x44 -#define COLLIDER_dai 0x43 -#define COLLIDER_omise 0x42 -#define COLLIDER_o390 0x41 -#define COLLIDER_o496 0x40 -#define COLLIDER_o495 0x3F -#define COLLIDER_mono_atari 0x3E -#define COLLIDER_dummy 0x3D -#define COLLIDER_mono6 0x3C -#define COLLIDER_mono5 0x3B -#define COLLIDER_mono4 0x3A -#define COLLIDER_mono3 0x39 -#define COLLIDER_mono2 0x38 -#define COLLIDER_mono1 0x37 -#define COLLIDER_g64 0x36 -#define COLLIDER_deilinw 0x35 -#define COLLIDER_o400 0x34 -#define COLLIDER_o285 0x33 -#define COLLIDER_o473 0x32 -#define COLLIDER_o487 0x31 -#define COLLIDER_o485 0x30 -#define COLLIDER_o484 0x2F -#define COLLIDER_sign 0x2E -#define COLLIDER_intel 0x2D -#define COLLIDER_o38 0x2C -#define COLLIDER_o271 0x2B -#define COLLIDER_deili3 0x2A -#define COLLIDER_deilit3u 0x29 -#define COLLIDER_deilit3 0x28 -#define COLLIDER_o478 0x27 -#define COLLIDER_minka_1 0x26 -#define COLLIDER_shop_tou 0x25 -#define COLLIDER_o780 0x24 -#define COLLIDER_o511 0x23 -#define COLLIDER_o516 0x22 -#define COLLIDER_deili6 0x21 -#define COLLIDER_deilit6u 0x20 -#define COLLIDER_deilit6 0x1F -#define COLLIDER_o774 0x1E -#define COLLIDER_o156 0x1D -#define COLLIDER_shima 0x1C -#define COLLIDER_deilit 0x1B -#define COLLIDER_o584 0x1A -#define COLLIDER_o548 0x19 -#define COLLIDER_Default 0x18 -#define COLLIDER_o711 0x17 -#define COLLIDER_o710 0x16 -#define COLLIDER_o709 0x15 -#define COLLIDER_o539 0x14 -#define COLLIDER_o538 0x13 -#define COLLIDER_o537 0x12 -#define COLLIDER_o502 0x11 -#define COLLIDER_water 0x10 -#define COLLIDER_o323 0xF -#define COLLIDER_g1 0xE -#define COLLIDER_deilie 0xD -#define COLLIDER_g63 0xC -#define COLLIDER_o636 0xB -#define COLLIDER_o604 0xA -#define COLLIDER_deili4 0x9 -#define COLLIDER_deilit4u 0x8 -#define COLLIDER_deilit4 0x7 -#define COLLIDER_o477 0x6 -#define COLLIDER_o795 0x5 -#define COLLIDER_o476 0x4 -#define COLLIDER_o451 0x3 -#define COLLIDER_min2mawari 0x2 -#define COLLIDER_o259 0x1 -#define COLLIDER_o258 0x0 +#define COLLIDER_Root 0x6E +#define COLLIDER_g74 0x6D +#define COLLIDER_tt 0x6C +#define COLLIDER_deilim 0x6B +#define COLLIDER_o623 0x6A +#define COLLIDER_kame 0x69 +#define COLLIDER_o707 0x68 +#define COLLIDER_o706 0x67 +#define COLLIDER_o705 0x66 +#define COLLIDER_o664 0x65 +#define COLLIDER_o616 0x64 +#define COLLIDER_op3 0x63 +#define COLLIDER_op2 0x62 +#define COLLIDER_op_1 0x61 +#define COLLIDER_o546 0x60 +#define COLLIDER_deilite 0x5F +#define COLLIDER_o500 0x5E +#define COLLIDER_deilitnw 0x5D +#define COLLIDER_g66 0x5C +#define COLLIDER_o261 0x5B +#define COLLIDER_o262 0x5A +#define COLLIDER_step 0x59 +#define COLLIDER_o328 0x58 +#define COLLIDER_o333 0x57 +#define COLLIDER_o331 0x56 +#define COLLIDER_shop 0x55 +#define COLLIDER_misedeili 0x54 +#define COLLIDER_deilit5u 0x53 +#define COLLIDER_deilit5 0x52 +#define COLLIDER_deili5 0x51 +#define COLLIDER_misemawari 0x50 +#define COLLIDER_o789 0x4F +#define COLLIDER_o787 0x4E +#define COLLIDER_o503 0x4D +#define COLLIDER_o501 0x4C +#define COLLIDER_counter 0x4B +#define COLLIDER_shouhin6 0x4A +#define COLLIDER_shouhin5 0x49 +#define COLLIDER_shouhin4 0x48 +#define COLLIDER_shouhin3 0x47 +#define COLLIDER_syouhin2 0x46 +#define COLLIDER_syouhin1 0x45 +#define COLLIDER_o409 0x44 +#define COLLIDER_dai 0x43 +#define COLLIDER_omise 0x42 +#define COLLIDER_o390 0x41 +#define COLLIDER_o496 0x40 +#define COLLIDER_o495 0x3F +#define COLLIDER_mono_atari 0x3E +#define COLLIDER_dummy 0x3D +#define COLLIDER_mono6 0x3C +#define COLLIDER_mono5 0x3B +#define COLLIDER_mono4 0x3A +#define COLLIDER_mono3 0x39 +#define COLLIDER_mono2 0x38 +#define COLLIDER_mono1 0x37 +#define COLLIDER_g64 0x36 +#define COLLIDER_deilinw 0x35 +#define COLLIDER_o400 0x34 +#define COLLIDER_o285 0x33 +#define COLLIDER_o473 0x32 +#define COLLIDER_o487 0x31 +#define COLLIDER_o485 0x30 +#define COLLIDER_o484 0x2F +#define COLLIDER_sign 0x2E +#define COLLIDER_intel 0x2D +#define COLLIDER_o38 0x2C +#define COLLIDER_o271 0x2B +#define COLLIDER_deili3 0x2A +#define COLLIDER_deilit3u 0x29 +#define COLLIDER_deilit3 0x28 +#define COLLIDER_o478 0x27 +#define COLLIDER_minka_1 0x26 +#define COLLIDER_shop_tou 0x25 +#define COLLIDER_o780 0x24 +#define COLLIDER_o511 0x23 +#define COLLIDER_o516 0x22 +#define COLLIDER_deili6 0x21 +#define COLLIDER_deilit6u 0x20 +#define COLLIDER_deilit6 0x1F +#define COLLIDER_o774 0x1E +#define COLLIDER_o156 0x1D +#define COLLIDER_shima 0x1C +#define COLLIDER_deilit 0x1B +#define COLLIDER_o584 0x1A +#define COLLIDER_o548 0x19 +#define COLLIDER_Default 0x18 +#define COLLIDER_o711 0x17 +#define COLLIDER_o710 0x16 +#define COLLIDER_o709 0x15 +#define COLLIDER_o539 0x14 +#define COLLIDER_o538 0x13 +#define COLLIDER_o537 0x12 +#define COLLIDER_o502 0x11 +#define COLLIDER_water 0x10 +#define COLLIDER_o323 0xF +#define COLLIDER_g1 0xE +#define COLLIDER_deilie 0xD +#define COLLIDER_g63 0xC +#define COLLIDER_o636 0xB +#define COLLIDER_o604 0xA +#define COLLIDER_deili4 0x9 +#define COLLIDER_deilit4u 0x8 +#define COLLIDER_deilit4 0x7 +#define COLLIDER_o477 0x6 +#define COLLIDER_o795 0x5 +#define COLLIDER_o476 0x4 +#define COLLIDER_o451 0x3 +#define COLLIDER_min2mawari 0x2 +#define COLLIDER_o259 0x1 +#define COLLIDER_o258 0x0 + +#define ZONE_Root 0x12 +#define ZONE_g64 0x11 +#define ZONE_o480 0x10 +#define ZONE_minka2 0xF +#define ZONE_minka2yuka 0xE +#define ZONE_intel_house 0xD +#define ZONE_intel_yuka 0xC +#define ZONE_minka_1 0xB +#define ZONE_o482 0xA +#define ZONE_minka1_yuka 0x9 +#define ZONE_omise 0x8 +#define ZONE_o390 0x7 +#define ZONE_Default 0x6 +#define ZONE_uraniwa 0x5 +#define ZONE_jimen 0x4 +#define ZONE_o284 0x3 +#define ZONE_kaidan 0x2 +#define ZONE_g1 0x1 +#define ZONE_deili1 0x0 + diff --git a/include/mapfs/mac_00_shape.h b/include/mapfs/mac_00_shape.h index de8aca683b..59ca4ef8d5 100644 --- a/include/mapfs/mac_00_shape.h +++ b/include/mapfs/mac_00_shape.h @@ -1,223 +1,224 @@ -#define MODEL_Root 0xDE -#define MODEL_g66 0xDD -#define MODEL_o528 0xDC -#define MODEL_o527 0xDB -#define MODEL_o526 0xDA -#define MODEL_2mario 0xD9 -#define MODEL_o515 0xD8 -#define MODEL_g63 0xD7 -#define MODEL_water 0xD6 -#define MODEL_tree 0xD5 -#define MODEL_o318 0xD4 -#define MODEL_minka2 0xD3 -#define MODEL_minka2_mtx 0xD2 -#define MODEL_minka2_door 0xD1 -#define MODEL_o228 0xD0 -#define MODEL_minka2_yane 0xCF -#define MODEL_o245 0xCE -#define MODEL_o243 0xCD -#define MODEL_o239 0xCC -#define MODEL_o242 0xCB -#define MODEL_minka_kabe1 0xCA -#define MODEL_o437 0xC9 -#define MODEL_o454 0xC8 -#define MODEL_o453 0xC7 -#define MODEL_minka2_inn 0xC6 -#define MODEL_minka2_komono 0xC5 -#define MODEL_o434 0xC4 -#define MODEL_o508 0xC3 -#define MODEL_o440 0xC2 -#define MODEL_tana 0xC1 -#define MODEL_o432 0xC0 -#define MODEL_o426 0xBF -#define MODEL_o425 0xBE -#define MODEL_minka2yuka 0xBD -#define MODEL_o446 0xBC -#define MODEL_g16 0xBB -#define MODEL_o238 0xBA -#define MODEL_o237 0xB9 -#define MODEL_o233 0xB8 -#define MODEL_o232 0xB7 -#define MODEL_o231 0xB6 -#define MODEL_o230 0xB5 -#define MODEL_o225 0xB4 -#define MODEL_o227 0xB3 -#define MODEL_o226 0xB2 -#define MODEL_intel_house 0xB1 -#define MODEL_intel_inn 0xB0 -#define MODEL_o530 0xAF -#define MODEL_o366 0xAE -#define MODEL_o365 0xAD -#define MODEL_o362 0xAC -#define MODEL_o359 0xAB -#define MODEL_o358 0xAA -#define MODEL_o355 0xA9 -#define MODEL_o356 0xA8 -#define MODEL_o357 0xA7 -#define MODEL_o353 0xA6 -#define MODEL_o350 0xA5 -#define MODEL_o338 0xA4 -#define MODEL_o336 0xA3 -#define MODEL_intel_yuka 0xA2 -#define MODEL_int_mtx 0xA1 -#define MODEL_int_yane 0xA0 -#define MODEL_o213 0x9F -#define MODEL_o215 0x9E -#define MODEL_int_kabe3 0x9D -#define MODEL_o461 0x9C -#define MODEL_o460 0x9B -#define MODEL_o198 0x9A -#define MODEL_int_kabe2 0x99 -#define MODEL_o335 0x98 -#define MODEL_o469 0x97 -#define MODEL_o463 0x96 -#define MODEL_o194 0x95 -#define MODEL_int_kabe1 0x94 -#define MODEL_o466 0x93 -#define MODEL_o467 0x92 -#define MODEL_o201 0x91 -#define MODEL_int_door 0x90 -#define MODEL_o210 0x8F -#define MODEL_intel_out 0x8E -#define MODEL_o206 0x8D -#define MODEL_o216 0x8C -#define MODEL_o172 0x8B -#define MODEL_minka_1 0x8A -#define MODEL_shop_tou 0x89 -#define MODEL_o163 0x88 -#define MODEL_o161 0x87 -#define MODEL_minka_inn 0x86 -#define MODEL_minka1_yuka 0x85 -#define MODEL_o498 0x84 -#define MODEL_o496 0x83 -#define MODEL_o414 0x82 -#define MODEL_o412 0x81 -#define MODEL_o411 0x80 -#define MODEL_minka_mtx 0x7F -#define MODEL_minka1_kabe1 0x7E -#define MODEL_o164 0x7D -#define MODEL_o169 0x7C -#define MODEL_o159 0x7B -#define MODEL_o162 0x7A -#define MODEL_minka1_door 0x79 -#define MODEL_o168 0x78 -#define MODEL_step 0x77 -#define MODEL_o328 0x76 -#define MODEL_o334 0x75 -#define MODEL_o333 0x74 -#define MODEL_o332 0x73 -#define MODEL_o331 0x72 -#define MODEL_k1be4 0x71 -#define MODEL_o382 0x70 -#define MODEL_o381 0x6F -#define MODEL_o380 0x6E -#define MODEL_kabe3 0x6D -#define MODEL_o471 0x6C -#define MODEL_o379 0x6B -#define MODEL_o378 0x6A -#define MODEL_o377 0x69 -#define MODEL_omise 0x68 -#define MODEL_counter 0x67 -#define MODEL_shouhin6 0x66 -#define MODEL_shouhin5 0x65 -#define MODEL_shouhin4 0x64 -#define MODEL_shouhin3 0x63 -#define MODEL_syouhin2 0x62 -#define MODEL_syouhin1 0x61 -#define MODEL_shop_in 0x60 -#define MODEL_o409 0x5F -#define MODEL_dai 0x5E -#define MODEL_o405 0x5D -#define MODEL_o406 0x5C -#define MODEL_o404 0x5B -#define MODEL_o151 0x5A -#define MODEL_o395 0x59 -#define MODEL_o407 0x58 -#define MODEL_o393 0x57 -#define MODEL_o392 0x56 -#define MODEL_o153 0x55 -#define MODEL_o154 0x54 -#define MODEL_o368 0x53 -#define MODEL_o367 0x52 -#define MODEL_o391 0x51 -#define MODEL_o390 0x50 -#define MODEL_g36 0x4F -#define MODEL_o148 0x4E -#define MODEL_o147 0x4D -#define MODEL_o122 0x4C -#define MODEL_o136 0x4B -#define MODEL_o135 0x4A -#define MODEL_o134 0x49 -#define MODEL_o95 0x48 -#define MODEL_o87 0x47 -#define MODEL_o107 0x46 -#define MODEL_shop_mtx 0x45 -#define MODEL_kabe2 0x44 -#define MODEL_o375 0x43 -#define MODEL_kanban 0x42 -#define MODEL_o139 0x41 -#define MODEL_shop_yane 0x40 -#define MODEL_o397 0x3F -#define MODEL_o155 0x3E -#define MODEL_o146 0x3D -#define MODEL_o398 0x3C -#define MODEL_o396 0x3B -#define MODEL_door 0x3A -#define MODEL_o121 0x39 -#define MODEL_kabe1 0x38 -#define MODEL_o373 0x37 -#define MODEL_o371 0x36 -#define MODEL_o370 0x35 -#define MODEL_2tik 0x34 -#define MODEL_dokan 0x33 -#define MODEL_shima 0x32 -#define MODEL_o292 0x31 -#define MODEL_o296 0x30 -#define MODEL_o295 0x2F -#define MODEL_o479 0x2E -#define MODEL_o480 0x2D -#define MODEL_o481 0x2C -#define MODEL_Default 0x2B -#define MODEL_o531 0x2A -#define MODEL_o510 0x29 -#define MODEL_o509 0x28 -#define MODEL_o323 0x27 -#define MODEL_o400 0x26 -#define MODEL_o271 0x25 -#define MODEL_o263 0x24 -#define MODEL_o262 0x23 -#define MODEL_o261 0x22 -#define MODEL_o260 0x21 -#define MODEL_o259 0x20 -#define MODEL_uraniwa 0x1F -#define MODEL_o258 0x1E -#define MODEL_o39 0x1D -#define MODEL_o38 0x1C -#define MODEL_jimen 0x1B -#define MODEL_o284 0x1A -#define MODEL_o285 0x19 -#define MODEL_kaidan 0x18 -#define MODEL_g1 0x17 -#define MODEL_o13 0x16 -#define MODEL_o12 0x15 -#define MODEL_o1 0x14 -#define MODEL_o4 0x13 -#define MODEL_o3 0x12 -#define MODEL_welcome_star 0x11 -#define MODEL_star_circle 0x10 -#define MODEL_star_eye 0xF -#define MODEL_star 0xE -#define MODEL_star_aroun 0xD -#define MODEL_gate 0xC -#define MODEL_gate_shita 0xB -#define MODEL_mushroom_kingdom 0xA -#define MODEL_o309 0x9 -#define MODEL_kinoko_mark 0x8 -#define MODEL_o306 0x7 -#define MODEL_o280 0x6 -#define MODEL_yane 0x5 -#define MODEL_ashi 0x4 -#define MODEL_g24 0x3 -#define MODEL_tou_omado 0x2 -#define MODEL_o 0x1 -#define MODEL_o303 0x0 +#define MODEL_Root 0xDE +#define MODEL_g66 0xDD +#define MODEL_o528 0xDC +#define MODEL_o527 0xDB +#define MODEL_o526 0xDA +#define MODEL_2mario 0xD9 +#define MODEL_o515 0xD8 +#define MODEL_g63 0xD7 +#define MODEL_water 0xD6 +#define MODEL_tree 0xD5 +#define MODEL_o318 0xD4 +#define MODEL_minka2 0xD3 +#define MODEL_minka2_mtx 0xD2 +#define MODEL_minka2_door 0xD1 +#define MODEL_o228 0xD0 +#define MODEL_minka2_yane 0xCF +#define MODEL_o245 0xCE +#define MODEL_o243 0xCD +#define MODEL_o239 0xCC +#define MODEL_o242 0xCB +#define MODEL_minka_kabe1 0xCA +#define MODEL_o437 0xC9 +#define MODEL_o454 0xC8 +#define MODEL_o453 0xC7 +#define MODEL_minka2_inn 0xC6 +#define MODEL_minka2_komono 0xC5 +#define MODEL_o434 0xC4 +#define MODEL_o508 0xC3 +#define MODEL_o440 0xC2 +#define MODEL_tana 0xC1 +#define MODEL_o432 0xC0 +#define MODEL_o426 0xBF +#define MODEL_o425 0xBE +#define MODEL_minka2yuka 0xBD +#define MODEL_o446 0xBC +#define MODEL_g16 0xBB +#define MODEL_o238 0xBA +#define MODEL_o237 0xB9 +#define MODEL_o233 0xB8 +#define MODEL_o232 0xB7 +#define MODEL_o231 0xB6 +#define MODEL_o230 0xB5 +#define MODEL_o225 0xB4 +#define MODEL_o227 0xB3 +#define MODEL_o226 0xB2 +#define MODEL_intel_house 0xB1 +#define MODEL_intel_inn 0xB0 +#define MODEL_o530 0xAF +#define MODEL_o366 0xAE +#define MODEL_o365 0xAD +#define MODEL_o362 0xAC +#define MODEL_o359 0xAB +#define MODEL_o358 0xAA +#define MODEL_o355 0xA9 +#define MODEL_o356 0xA8 +#define MODEL_o357 0xA7 +#define MODEL_o353 0xA6 +#define MODEL_o350 0xA5 +#define MODEL_o338 0xA4 +#define MODEL_o336 0xA3 +#define MODEL_intel_yuka 0xA2 +#define MODEL_int_mtx 0xA1 +#define MODEL_int_yane 0xA0 +#define MODEL_o213 0x9F +#define MODEL_o215 0x9E +#define MODEL_int_kabe3 0x9D +#define MODEL_o461 0x9C +#define MODEL_o460 0x9B +#define MODEL_o198 0x9A +#define MODEL_int_kabe2 0x99 +#define MODEL_o335 0x98 +#define MODEL_o469 0x97 +#define MODEL_o463 0x96 +#define MODEL_o194 0x95 +#define MODEL_int_kabe1 0x94 +#define MODEL_o466 0x93 +#define MODEL_o467 0x92 +#define MODEL_o201 0x91 +#define MODEL_int_door 0x90 +#define MODEL_o210 0x8F +#define MODEL_intel_out 0x8E +#define MODEL_o206 0x8D +#define MODEL_o216 0x8C +#define MODEL_o172 0x8B +#define MODEL_minka_1 0x8A +#define MODEL_shop_tou 0x89 +#define MODEL_o163 0x88 +#define MODEL_o161 0x87 +#define MODEL_minka_inn 0x86 +#define MODEL_minka1_yuka 0x85 +#define MODEL_o498 0x84 +#define MODEL_o496 0x83 +#define MODEL_o414 0x82 +#define MODEL_o412 0x81 +#define MODEL_o411 0x80 +#define MODEL_minka_mtx 0x7F +#define MODEL_minka1_kabe1 0x7E +#define MODEL_o164 0x7D +#define MODEL_o169 0x7C +#define MODEL_o159 0x7B +#define MODEL_o162 0x7A +#define MODEL_minka1_door 0x79 +#define MODEL_o168 0x78 +#define MODEL_step 0x77 +#define MODEL_o328 0x76 +#define MODEL_o334 0x75 +#define MODEL_o333 0x74 +#define MODEL_o332 0x73 +#define MODEL_o331 0x72 +#define MODEL_k1be4 0x71 +#define MODEL_o382 0x70 +#define MODEL_o381 0x6F +#define MODEL_o380 0x6E +#define MODEL_kabe3 0x6D +#define MODEL_o471 0x6C +#define MODEL_o379 0x6B +#define MODEL_o378 0x6A +#define MODEL_o377 0x69 +#define MODEL_omise 0x68 +#define MODEL_counter 0x67 +#define MODEL_shouhin6 0x66 +#define MODEL_shouhin5 0x65 +#define MODEL_shouhin4 0x64 +#define MODEL_shouhin3 0x63 +#define MODEL_syouhin2 0x62 +#define MODEL_syouhin1 0x61 +#define MODEL_shop_in 0x60 +#define MODEL_o409 0x5F +#define MODEL_dai 0x5E +#define MODEL_o405 0x5D +#define MODEL_o406 0x5C +#define MODEL_o404 0x5B +#define MODEL_o151 0x5A +#define MODEL_o395 0x59 +#define MODEL_o407 0x58 +#define MODEL_o393 0x57 +#define MODEL_o392 0x56 +#define MODEL_o153 0x55 +#define MODEL_o154 0x54 +#define MODEL_o368 0x53 +#define MODEL_o367 0x52 +#define MODEL_o391 0x51 +#define MODEL_o390 0x50 +#define MODEL_g36 0x4F +#define MODEL_o148 0x4E +#define MODEL_o147 0x4D +#define MODEL_o122 0x4C +#define MODEL_o136 0x4B +#define MODEL_o135 0x4A +#define MODEL_o134 0x49 +#define MODEL_o95 0x48 +#define MODEL_o87 0x47 +#define MODEL_o107 0x46 +#define MODEL_shop_mtx 0x45 +#define MODEL_kabe2 0x44 +#define MODEL_o375 0x43 +#define MODEL_kanban 0x42 +#define MODEL_o139 0x41 +#define MODEL_shop_yane 0x40 +#define MODEL_o397 0x3F +#define MODEL_o155 0x3E +#define MODEL_o146 0x3D +#define MODEL_o398 0x3C +#define MODEL_o396 0x3B +#define MODEL_door 0x3A +#define MODEL_o121 0x39 +#define MODEL_kabe1 0x38 +#define MODEL_o373 0x37 +#define MODEL_o371 0x36 +#define MODEL_o370 0x35 +#define MODEL_2tik 0x34 +#define MODEL_dokan 0x33 +#define MODEL_shima 0x32 +#define MODEL_o292 0x31 +#define MODEL_o296 0x30 +#define MODEL_o295 0x2F +#define MODEL_o479 0x2E +#define MODEL_o480 0x2D +#define MODEL_o481 0x2C +#define MODEL_Default 0x2B +#define MODEL_o531 0x2A +#define MODEL_o510 0x29 +#define MODEL_o509 0x28 +#define MODEL_o323 0x27 +#define MODEL_o400 0x26 +#define MODEL_o271 0x25 +#define MODEL_o263 0x24 +#define MODEL_o262 0x23 +#define MODEL_o261 0x22 +#define MODEL_o260 0x21 +#define MODEL_o259 0x20 +#define MODEL_uraniwa 0x1F +#define MODEL_o258 0x1E +#define MODEL_o39 0x1D +#define MODEL_o38 0x1C +#define MODEL_jimen 0x1B +#define MODEL_o284 0x1A +#define MODEL_o285 0x19 +#define MODEL_kaidan 0x18 +#define MODEL_g1 0x17 +#define MODEL_o13 0x16 +#define MODEL_o12 0x15 +#define MODEL_o1 0x14 +#define MODEL_o4 0x13 +#define MODEL_o3 0x12 +#define MODEL_welcome_star 0x11 +#define MODEL_star_circle 0x10 +#define MODEL_star_eye 0xF +#define MODEL_star 0xE +#define MODEL_star_aroun 0xD +#define MODEL_gate 0xC +#define MODEL_gate_shita 0xB +#define MODEL_mushroom_kingdom 0xA +#define MODEL_o309 0x9 +#define MODEL_kinoko_mark 0x8 +#define MODEL_o306 0x7 +#define MODEL_o280 0x6 +#define MODEL_yane 0x5 +#define MODEL_ashi 0x4 +#define MODEL_g24 0x3 +#define MODEL_tou_omado 0x2 +#define MODEL_o 0x1 +#define MODEL_o303 0x0 + diff --git a/include/mapfs/mac_01_hit.h b/include/mapfs/mac_01_hit.h index 1b62ebfc4f..ed7a100208 100644 --- a/include/mapfs/mac_01_hit.h +++ b/include/mapfs/mac_01_hit.h @@ -1,99 +1,117 @@ -#define COLLIDER_Root 0x62 -#define COLLIDER_g40 0x61 -#define COLLIDER_o12 0x60 -#define COLLIDER_deilite 0x5F -#define COLLIDER_g49 0x5E -#define COLLIDER_stopper 0x5D -#define COLLIDER_o370 0x5C -#define COLLIDER_o369 0x5B -#define COLLIDER_door_ura 0x5A -#define COLLIDER_deilitf 0x59 -#define COLLIDER_o351 0x58 -#define COLLIDER_o361 0x57 -#define COLLIDER_o350 0x56 -#define COLLIDER_g42 0x55 -#define COLLIDER_deilitud 0x54 -#define COLLIDER_deilid 0x53 -#define COLLIDER_deilitd 0x52 -#define COLLIDER_o382 0x51 -#define COLLIDER_o394 0x50 -#define COLLIDER_o336 0x4F -#define COLLIDER_o335 0x4E -#define COLLIDER_o327 0x4D -#define COLLIDER_dr_yuka 0x4C -#define COLLIDER_o334 0x4B -#define COLLIDER_o316 0x4A -#define COLLIDER_g41 0x49 -#define COLLIDER_o393 0x48 -#define COLLIDER_o338 0x47 -#define COLLIDER_o337 0x46 -#define COLLIDER_ro 0x45 -#define COLLIDER_rote 0x44 -#define COLLIDER_o295 0x43 -#define COLLIDER_roten 0x42 -#define COLLIDER_badge 0x41 -#define COLLIDER_b3 0x40 -#define COLLIDER_b2 0x3F -#define COLLIDER_b1 0x3E -#define COLLIDER_se 0x3D -#define COLLIDER_kame1 0x3C -#define COLLIDER_o246 0x3B -#define COLLIDER_o245 0x3A -#define COLLIDER_sw 0x39 -#define COLLIDER_o2 0x38 -#define COLLIDER_o69 0x37 -#define COLLIDER_o211 0x36 -#define COLLIDER_ne 0x35 -#define COLLIDER_o487 0x34 -#define COLLIDER_o406 0x33 -#define COLLIDER_o256 0x32 -#define COLLIDER_o253 0x31 -#define COLLIDER_o242 0x30 -#define COLLIDER_o241 0x2F -#define COLLIDER_o236 0x2E -#define COLLIDER_g31 0x2D -#define COLLIDER_o282 0x2C -#define COLLIDER_o275 0x2B -#define COLLIDER_o237 0x2A -#define COLLIDER_g14 0x29 -#define COLLIDER_o397 0x28 -#define COLLIDER_konopi 0x27 -#define COLLIDER_o448 0x26 -#define COLLIDER_o431 0x25 -#define COLLIDER_o430 0x24 -#define COLLIDER_o415 0x23 -#define COLLIDER_deilit2u 0x22 -#define COLLIDER_deilit2 0x21 -#define COLLIDER_deili2 0x20 -#define COLLIDER_o248 0x1F -#define COLLIDER_o251 0x1E -#define COLLIDER_post_office 0x1D -#define COLLIDER_deilit1u 0x1C -#define COLLIDER_o232 0x1B -#define COLLIDER_keep_out 0x1A -#define COLLIDER_uketsuke 0x19 -#define COLLIDER_deili1 0x18 -#define COLLIDER_o228 0x17 -#define COLLIDER_deilit1 0x16 -#define COLLIDER_po_soto 0x15 -#define COLLIDER_kanban 0x14 -#define COLLIDER_tt 0x13 -#define COLLIDER_o306 0x12 -#define COLLIDER_yoko_ushiro 0x11 -#define COLLIDER_syoumen 0x10 -#define COLLIDER_g1 0xF -#define COLLIDER_o444 0xE -#define COLLIDER_o36 0xD -#define COLLIDER_o445 0xC -#define COLLIDER_o11 0xB -#define COLLIDER_o35 0xA -#define COLLIDER_g7 0x9 -#define COLLIDER_deilits 0x8 -#define COLLIDER_o42 0x7 -#define COLLIDER_deilis 0x6 -#define COLLIDER_deilitn 0x5 -#define COLLIDER_deilin 0x4 -#define COLLIDER_o1 0x3 -#define COLLIDER_deilitw 0x2 -#define COLLIDER_deiliw 0x1 -#define COLLIDER_deilie 0x0 +#define COLLIDER_Root 0x62 +#define COLLIDER_g40 0x61 +#define COLLIDER_o12 0x60 +#define COLLIDER_deilite 0x5F +#define COLLIDER_g49 0x5E +#define COLLIDER_stopper 0x5D +#define COLLIDER_o370 0x5C +#define COLLIDER_o369 0x5B +#define COLLIDER_door_ura 0x5A +#define COLLIDER_deilitf 0x59 +#define COLLIDER_o351 0x58 +#define COLLIDER_o361 0x57 +#define COLLIDER_o350 0x56 +#define COLLIDER_g42 0x55 +#define COLLIDER_deilitud 0x54 +#define COLLIDER_deilid 0x53 +#define COLLIDER_deilitd 0x52 +#define COLLIDER_o382 0x51 +#define COLLIDER_o394 0x50 +#define COLLIDER_o336 0x4F +#define COLLIDER_o335 0x4E +#define COLLIDER_o327 0x4D +#define COLLIDER_dr_yuka 0x4C +#define COLLIDER_o334 0x4B +#define COLLIDER_o316 0x4A +#define COLLIDER_g41 0x49 +#define COLLIDER_o393 0x48 +#define COLLIDER_o338 0x47 +#define COLLIDER_o337 0x46 +#define COLLIDER_ro 0x45 +#define COLLIDER_rote 0x44 +#define COLLIDER_o295 0x43 +#define COLLIDER_roten 0x42 +#define COLLIDER_badge 0x41 +#define COLLIDER_b3 0x40 +#define COLLIDER_b2 0x3F +#define COLLIDER_b1 0x3E +#define COLLIDER_se 0x3D +#define COLLIDER_kame1 0x3C +#define COLLIDER_o246 0x3B +#define COLLIDER_o245 0x3A +#define COLLIDER_sw 0x39 +#define COLLIDER_o2 0x38 +#define COLLIDER_o69 0x37 +#define COLLIDER_o211 0x36 +#define COLLIDER_ne 0x35 +#define COLLIDER_o487 0x34 +#define COLLIDER_o406 0x33 +#define COLLIDER_o256 0x32 +#define COLLIDER_o253 0x31 +#define COLLIDER_o242 0x30 +#define COLLIDER_o241 0x2F +#define COLLIDER_o236 0x2E +#define COLLIDER_g31 0x2D +#define COLLIDER_o282 0x2C +#define COLLIDER_o275 0x2B +#define COLLIDER_o237 0x2A +#define COLLIDER_g14 0x29 +#define COLLIDER_o397 0x28 +#define COLLIDER_konopi 0x27 +#define COLLIDER_o448 0x26 +#define COLLIDER_o431 0x25 +#define COLLIDER_o430 0x24 +#define COLLIDER_o415 0x23 +#define COLLIDER_deilit2u 0x22 +#define COLLIDER_deilit2 0x21 +#define COLLIDER_deili2 0x20 +#define COLLIDER_o248 0x1F +#define COLLIDER_o251 0x1E +#define COLLIDER_post_office 0x1D +#define COLLIDER_deilit1u 0x1C +#define COLLIDER_o232 0x1B +#define COLLIDER_keep_out 0x1A +#define COLLIDER_uketsuke 0x19 +#define COLLIDER_deili1 0x18 +#define COLLIDER_o228 0x17 +#define COLLIDER_deilit1 0x16 +#define COLLIDER_po_soto 0x15 +#define COLLIDER_kanban 0x14 +#define COLLIDER_tt 0x13 +#define COLLIDER_o306 0x12 +#define COLLIDER_yoko_ushiro 0x11 +#define COLLIDER_syoumen 0x10 +#define COLLIDER_g1 0xF +#define COLLIDER_o444 0xE +#define COLLIDER_o36 0xD +#define COLLIDER_o445 0xC +#define COLLIDER_o11 0xB +#define COLLIDER_o35 0xA +#define COLLIDER_g7 0x9 +#define COLLIDER_deilits 0x8 +#define COLLIDER_o42 0x7 +#define COLLIDER_deilis 0x6 +#define COLLIDER_deilitn 0x5 +#define COLLIDER_deilin 0x4 +#define COLLIDER_o1 0x3 +#define COLLIDER_deilitw 0x2 +#define COLLIDER_deiliw 0x1 +#define COLLIDER_deilie 0x0 + +#define ZONE_Root 0xF +#define ZONE_g32 0xE +#define ZONE_o230 0xD +#define ZONE_o229 0xC +#define ZONE_konopi 0xB +#define ZONE_o231 0xA +#define ZONE_post_office 0x9 +#define ZONE_o232 0x8 +#define ZONE_g1 0x7 +#define ZONE_o35 0x6 +#define ZONE_g7 0x5 +#define ZONE_deilis 0x4 +#define ZONE_deilin 0x3 +#define ZONE_roten 0x2 +#define ZONE_o233 0x1 +#define ZONE_o227 0x0 + diff --git a/include/mapfs/mac_01_shape.h b/include/mapfs/mac_01_shape.h index 58270d3d09..a375e026a6 100644 --- a/include/mapfs/mac_01_shape.h +++ b/include/mapfs/mac_01_shape.h @@ -1,206 +1,207 @@ -#define MODEL_Root 0xCD -#define MODEL_g82 0xCC -#define MODEL_flo_yellow2 0xCB -#define MODEL_o373 0xCA -#define MODEL_flo_yellow1 0xC9 -#define MODEL_o378 0xC8 -#define MODEL_flo_red2 0xC7 -#define MODEL_o370 0xC6 -#define MODEL_flo_red1 0xC5 -#define MODEL_o375 0xC4 -#define MODEL_g85 0xC3 -#define MODEL_o380 0xC2 -#define MODEL_o381 0xC1 -#define MODEL_flo_green2 0xC0 -#define MODEL_o371 0xBF -#define MODEL_flo_green1 0xBE -#define MODEL_o376 0xBD -#define MODEL_flo_blue2 0xBC -#define MODEL_o372 0xBB -#define MODEL_flo_blue1 0xBA -#define MODEL_o377 0xB9 -#define MODEL_road_sign 0xB8 -#define MODEL_sign3 0xB7 -#define MODEL_sign2 0xB6 -#define MODEL_sign1 0xB5 -#define MODEL_g66 0xB4 -#define MODEL_pica 0xB3 -#define MODEL_rotate_door 0xB2 -#define MODEL_r_door 0xB1 -#define MODEL_rotate_gate 0xB0 -#define MODEL_r_gate 0xAF -#define MODEL_to_flo 0xAE -#define MODEL_door_f2 0xAD -#define MODEL_door_f 0xAC -#define MODEL_kadan 0xAB -#define MODEL_o299 0xAA -#define MODEL_o300 0xA9 -#define MODEL_o297 0xA8 -#define MODEL_o292 0xA7 -#define MODEL_o296 0xA6 -#define MODEL_o305 0xA5 -#define MODEL_castle_gate 0xA4 -#define MODEL_east_gate 0xA3 -#define MODEL_o309 0xA2 -#define MODEL_o308 0xA1 -#define MODEL_west_gate 0xA0 -#define MODEL_o307 0x9F -#define MODEL_o306 0x9E -#define MODEL_roten 0x9D -#define MODEL_g33 0x9C -#define MODEL_ju_3 0x9B -#define MODEL_box 0x9A -#define MODEL_naka 0x99 -#define MODEL_ura 0x98 -#define MODEL_mado2 0x97 -#define MODEL_omote2 0x96 -#define MODEL_mado 0x95 -#define MODEL_omote 0x94 -#define MODEL_jutan2 0x93 -#define MODEL_ju_2 0x92 -#define MODEL_jutan1 0x91 -#define MODEL_b3 0x90 -#define MODEL_b2 0x8F -#define MODEL_b1 0x8E -#define MODEL_ju_1 0x8D -#define MODEL_g14 0x8C -#define MODEL_o364 0x8B -#define MODEL_o148 0x8A -#define MODEL_o365 0x89 -#define MODEL_o116 0x88 -#define MODEL_o363 0x87 -#define MODEL_o362 0x86 -#define MODEL_o115 0x85 -#define MODEL_kinopi 0x84 -#define MODEL_kino_in 0x83 -#define MODEL_o369 0x82 -#define MODEL_o177 0x81 -#define MODEL_o202 0x80 -#define MODEL_o182 0x7F -#define MODEL_o205 0x7E -#define MODEL_o204 0x7D -#define MODEL_o203 0x7C -#define MODEL_o200 0x7B -#define MODEL_o197 0x7A -#define MODEL_o196 0x79 -#define MODEL_o152 0x78 -#define MODEL_kino_mtx 0x77 -#define MODEL_kino_out 0x76 -#define MODEL_o194 0x75 -#define MODEL_o188 0x74 -#define MODEL_o187 0x73 -#define MODEL_o185 0x72 -#define MODEL_o183 0x71 -#define MODEL_o191 0x70 -#define MODEL_o193 0x6F -#define MODEL_kino_door 0x6E -#define MODEL_door_k 0x6D -#define MODEL_kino_kabe2 0x6C -#define MODEL_kk23 0x6B -#define MODEL_kk22 0x6A -#define MODEL_kk21 0x69 -#define MODEL_kino_kabe1 0x68 -#define MODEL_kk14 0x67 -#define MODEL_kk13 0x66 -#define MODEL_kk12 0x65 -#define MODEL_kk11 0x64 -#define MODEL_post_office 0x63 -#define MODEL_yubin_in 0x62 -#define MODEL_o317 0x61 -#define MODEL_o96 0x60 -#define MODEL_o117 0x5F -#define MODEL_o123 0x5E -#define MODEL_o125 0x5D -#define MODEL_o127 0x5C -#define MODEL_o114 0x5B -#define MODEL_o113 0x5A -#define MODEL_o94 0x59 -#define MODEL_o101 0x58 -#define MODEL_o83 0x57 -#define MODEL_o111 0x56 -#define MODEL_po_kabe 0x55 -#define MODEL_o131 0x54 -#define MODEL_o130 0x53 -#define MODEL_o150 0x52 -#define MODEL_po_door 0x51 -#define MODEL_o189 0x50 -#define MODEL_po_mtx 0x4F -#define MODEL_po_yane 0x4E -#define MODEL_y3 0x4D -#define MODEL_y2 0x4C -#define MODEL_y1 0x4B -#define MODEL_po_kabe2 0x4A -#define MODEL_k23 0x49 -#define MODEL_k22 0x48 -#define MODEL_k24 0x47 -#define MODEL_k21 0x46 -#define MODEL_po_kabe1 0x45 -#define MODEL_k11 0x44 -#define MODEL_k18 0x43 -#define MODEL_k17 0x42 -#define MODEL_k16 0x41 -#define MODEL_k15 0x40 -#define MODEL_k14 0x3F -#define MODEL_k13 0x3E -#define MODEL_k12 0x3D -#define MODEL_off_yane 0x3C -#define MODEL_dy5 0x3B -#define MODEL_dy4 0x3A -#define MODEL_yane 0x39 -#define MODEL_dy3 0x38 -#define MODEL_dy2 0x37 -#define MODEL_dy1 0x36 -#define MODEL_de_aru 0x35 -#define MODEL_ls3 0x34 -#define MODEL_ball 0x33 -#define MODEL_mirrorball 0x32 -#define MODEL_dr_in 0x31 -#define MODEL_g49 0x30 -#define MODEL_tama 0x2F -#define MODEL_ohosi 0x2E -#define MODEL_hikari 0x2D -#define MODEL_o284 0x2C -#define MODEL_o283 0x2B -#define MODEL_o279 0x2A -#define MODEL_dr_yuka 0x29 -#define MODEL_dr_door 0x28 -#define MODEL_door 0x27 -#define MODEL_off_kabe 0x26 -#define MODEL_dk2 0x25 -#define MODEL_dk1 0x24 -#define MODEL_g43 0x23 -#define MODEL_o259 0x22 -#define MODEL_o256 0x21 -#define MODEL_o251 0x20 -#define MODEL_kanban 0x1F -#define MODEL_o72 0x1E -#define MODEL_o70 0x1D -#define MODEL_o71 0x1C -#define MODEL_g1 0x1B -#define MODEL_o247 0x1A -#define MODEL_o218 0x19 -#define MODEL_o195 0x18 -#define MODEL_o69 0x17 -#define MODEL_o2 0x16 -#define MODEL_o3 0x15 -#define MODEL_o35 0x14 -#define MODEL_rotenpoint 0x13 -#define MODEL_o211 0x12 -#define MODEL_o269 0x11 -#define MODEL_g7 0x10 -#define MODEL_o42 0xF -#define MODEL_deilis 0xE -#define MODEL_o1 0xD -#define MODEL_deiliw 0xC -#define MODEL_deilie 0xB -#define MODEL_o12 0xA -#define MODEL_g63 0x9 -#define MODEL_o340 0x8 -#define MODEL_o332 0x7 -#define MODEL_group_zcut 0x6 -#define MODEL_deilin 0x5 -#define MODEL_o339 0x4 -#define MODEL_o338 0x3 -#define MODEL_o228 0x2 -#define MODEL_o230 0x1 -#define MODEL_o226 0x0 +#define MODEL_Root 0xCD +#define MODEL_g82 0xCC +#define MODEL_flo_yellow2 0xCB +#define MODEL_o373 0xCA +#define MODEL_flo_yellow1 0xC9 +#define MODEL_o378 0xC8 +#define MODEL_flo_red2 0xC7 +#define MODEL_o370 0xC6 +#define MODEL_flo_red1 0xC5 +#define MODEL_o375 0xC4 +#define MODEL_g85 0xC3 +#define MODEL_o380 0xC2 +#define MODEL_o381 0xC1 +#define MODEL_flo_green2 0xC0 +#define MODEL_o371 0xBF +#define MODEL_flo_green1 0xBE +#define MODEL_o376 0xBD +#define MODEL_flo_blue2 0xBC +#define MODEL_o372 0xBB +#define MODEL_flo_blue1 0xBA +#define MODEL_o377 0xB9 +#define MODEL_road_sign 0xB8 +#define MODEL_sign3 0xB7 +#define MODEL_sign2 0xB6 +#define MODEL_sign1 0xB5 +#define MODEL_g66 0xB4 +#define MODEL_pica 0xB3 +#define MODEL_rotate_door 0xB2 +#define MODEL_r_door 0xB1 +#define MODEL_rotate_gate 0xB0 +#define MODEL_r_gate 0xAF +#define MODEL_to_flo 0xAE +#define MODEL_door_f2 0xAD +#define MODEL_door_f 0xAC +#define MODEL_kadan 0xAB +#define MODEL_o299 0xAA +#define MODEL_o300 0xA9 +#define MODEL_o297 0xA8 +#define MODEL_o292 0xA7 +#define MODEL_o296 0xA6 +#define MODEL_o305 0xA5 +#define MODEL_castle_gate 0xA4 +#define MODEL_east_gate 0xA3 +#define MODEL_o309 0xA2 +#define MODEL_o308 0xA1 +#define MODEL_west_gate 0xA0 +#define MODEL_o307 0x9F +#define MODEL_o306 0x9E +#define MODEL_roten 0x9D +#define MODEL_g33 0x9C +#define MODEL_ju_3 0x9B +#define MODEL_box 0x9A +#define MODEL_naka 0x99 +#define MODEL_ura 0x98 +#define MODEL_mado2 0x97 +#define MODEL_omote2 0x96 +#define MODEL_mado 0x95 +#define MODEL_omote 0x94 +#define MODEL_jutan2 0x93 +#define MODEL_ju_2 0x92 +#define MODEL_jutan1 0x91 +#define MODEL_b3 0x90 +#define MODEL_b2 0x8F +#define MODEL_b1 0x8E +#define MODEL_ju_1 0x8D +#define MODEL_g14 0x8C +#define MODEL_o364 0x8B +#define MODEL_o148 0x8A +#define MODEL_o365 0x89 +#define MODEL_o116 0x88 +#define MODEL_o363 0x87 +#define MODEL_o362 0x86 +#define MODEL_o115 0x85 +#define MODEL_kinopi 0x84 +#define MODEL_kino_in 0x83 +#define MODEL_o369 0x82 +#define MODEL_o177 0x81 +#define MODEL_o202 0x80 +#define MODEL_o182 0x7F +#define MODEL_o205 0x7E +#define MODEL_o204 0x7D +#define MODEL_o203 0x7C +#define MODEL_o200 0x7B +#define MODEL_o197 0x7A +#define MODEL_o196 0x79 +#define MODEL_o152 0x78 +#define MODEL_kino_mtx 0x77 +#define MODEL_kino_out 0x76 +#define MODEL_o194 0x75 +#define MODEL_o188 0x74 +#define MODEL_o187 0x73 +#define MODEL_o185 0x72 +#define MODEL_o183 0x71 +#define MODEL_o191 0x70 +#define MODEL_o193 0x6F +#define MODEL_kino_door 0x6E +#define MODEL_door_k 0x6D +#define MODEL_kino_kabe2 0x6C +#define MODEL_kk23 0x6B +#define MODEL_kk22 0x6A +#define MODEL_kk21 0x69 +#define MODEL_kino_kabe1 0x68 +#define MODEL_kk14 0x67 +#define MODEL_kk13 0x66 +#define MODEL_kk12 0x65 +#define MODEL_kk11 0x64 +#define MODEL_post_office 0x63 +#define MODEL_yubin_in 0x62 +#define MODEL_o317 0x61 +#define MODEL_o96 0x60 +#define MODEL_o117 0x5F +#define MODEL_o123 0x5E +#define MODEL_o125 0x5D +#define MODEL_o127 0x5C +#define MODEL_o114 0x5B +#define MODEL_o113 0x5A +#define MODEL_o94 0x59 +#define MODEL_o101 0x58 +#define MODEL_o83 0x57 +#define MODEL_o111 0x56 +#define MODEL_po_kabe 0x55 +#define MODEL_o131 0x54 +#define MODEL_o130 0x53 +#define MODEL_o150 0x52 +#define MODEL_po_door 0x51 +#define MODEL_o189 0x50 +#define MODEL_po_mtx 0x4F +#define MODEL_po_yane 0x4E +#define MODEL_y3 0x4D +#define MODEL_y2 0x4C +#define MODEL_y1 0x4B +#define MODEL_po_kabe2 0x4A +#define MODEL_k23 0x49 +#define MODEL_k22 0x48 +#define MODEL_k24 0x47 +#define MODEL_k21 0x46 +#define MODEL_po_kabe1 0x45 +#define MODEL_k11 0x44 +#define MODEL_k18 0x43 +#define MODEL_k17 0x42 +#define MODEL_k16 0x41 +#define MODEL_k15 0x40 +#define MODEL_k14 0x3F +#define MODEL_k13 0x3E +#define MODEL_k12 0x3D +#define MODEL_off_yane 0x3C +#define MODEL_dy5 0x3B +#define MODEL_dy4 0x3A +#define MODEL_yane 0x39 +#define MODEL_dy3 0x38 +#define MODEL_dy2 0x37 +#define MODEL_dy1 0x36 +#define MODEL_de_aru 0x35 +#define MODEL_ls3 0x34 +#define MODEL_ball 0x33 +#define MODEL_mirrorball 0x32 +#define MODEL_dr_in 0x31 +#define MODEL_g49 0x30 +#define MODEL_tama 0x2F +#define MODEL_ohosi 0x2E +#define MODEL_hikari 0x2D +#define MODEL_o284 0x2C +#define MODEL_o283 0x2B +#define MODEL_o279 0x2A +#define MODEL_dr_yuka 0x29 +#define MODEL_dr_door 0x28 +#define MODEL_door 0x27 +#define MODEL_off_kabe 0x26 +#define MODEL_dk2 0x25 +#define MODEL_dk1 0x24 +#define MODEL_g43 0x23 +#define MODEL_o259 0x22 +#define MODEL_o256 0x21 +#define MODEL_o251 0x20 +#define MODEL_kanban 0x1F +#define MODEL_o72 0x1E +#define MODEL_o70 0x1D +#define MODEL_o71 0x1C +#define MODEL_g1 0x1B +#define MODEL_o247 0x1A +#define MODEL_o218 0x19 +#define MODEL_o195 0x18 +#define MODEL_o69 0x17 +#define MODEL_o2 0x16 +#define MODEL_o3 0x15 +#define MODEL_o35 0x14 +#define MODEL_rotenpoint 0x13 +#define MODEL_o211 0x12 +#define MODEL_o269 0x11 +#define MODEL_g7 0x10 +#define MODEL_o42 0xF +#define MODEL_deilis 0xE +#define MODEL_o1 0xD +#define MODEL_deiliw 0xC +#define MODEL_deilie 0xB +#define MODEL_o12 0xA +#define MODEL_g63 0x9 +#define MODEL_o340 0x8 +#define MODEL_o332 0x7 +#define MODEL_group_zcut 0x6 +#define MODEL_deilin 0x5 +#define MODEL_o339 0x4 +#define MODEL_o338 0x3 +#define MODEL_o228 0x2 +#define MODEL_o230 0x1 +#define MODEL_o226 0x0 + diff --git a/include/mapfs/mac_02_hit.h b/include/mapfs/mac_02_hit.h index cd2233b24b..4bb23c685a 100644 --- a/include/mapfs/mac_02_hit.h +++ b/include/mapfs/mac_02_hit.h @@ -1,74 +1,84 @@ -#define COLLIDER_Root 0x49 -#define COLLIDER_g47 0x48 -#define COLLIDER_st2 0x47 -#define COLLIDER_st1 0x46 -#define COLLIDER_kame 0x45 -#define COLLIDER_o1 0x44 -#define COLLIDER_o249 0x43 -#define COLLIDER_o388 0x42 -#define COLLIDER_cook 0x41 -#define COLLIDER_o457 0x40 -#define COLLIDER_deili1 0x3F -#define COLLIDER_o377 0x3E -#define COLLIDER_o376 0x3D -#define COLLIDER_deilit1u 0x3C -#define COLLIDER_deilit1 0x3B -#define COLLIDER_o373 0x3A -#define COLLIDER_o372 0x39 -#define COLLIDER_o336 0x38 -#define COLLIDER_o323 0x37 -#define COLLIDER_souko_naka 0x36 -#define COLLIDER_o401 0x35 -#define COLLIDER_deilit2u 0x34 -#define COLLIDER_deilit2 0x33 -#define COLLIDER_deili2 0x32 -#define COLLIDER_deilid 0x31 -#define COLLIDER_o403 0x30 -#define COLLIDER_souko_yuka 0x2F -#define COLLIDER_o448 0x2E -#define COLLIDER_o287 0x2D -#define COLLIDER_mihari 0x2C -#define COLLIDER_deilite 0x2B -#define COLLIDER_deilie 0x2A -#define COLLIDER_o236 0x29 -#define COLLIDER_o369 0x28 -#define COLLIDER_o368 0x27 -#define COLLIDER_o264 0x26 -#define COLLIDER_o261 0x25 -#define COLLIDER_hashi 0x24 -#define COLLIDER_o238 0x23 -#define COLLIDER_o226 0x22 -#define COLLIDER_tik_enter 0x21 -#define COLLIDER_o402 0x20 -#define COLLIDER_deilip 0x1F -#define COLLIDER_o218 0x1E -#define COLLIDER_o348 0x1D -#define COLLIDER_o350 0x1C -#define COLLIDER_o349 0x1B -#define COLLIDER_kanban 0x1A -#define COLLIDER_o471 0x19 -#define COLLIDER_o456 0x18 -#define COLLIDER_o423 0x17 -#define COLLIDER_o409 0x16 -#define COLLIDER_o381 0x15 -#define COLLIDER_o380 0x14 -#define COLLIDER_o378 0x13 -#define COLLIDER_o370 0x12 -#define COLLIDER_o367 0x11 -#define COLLIDER_o361 0x10 -#define COLLIDER_o237 0xF -#define COLLIDER_o233 0xE -#define COLLIDER_g1 0xD -#define COLLIDER_sign 0xC -#define COLLIDER_o292 0xB -#define COLLIDER_o2 0xA -#define COLLIDER_o36 0x9 -#define COLLIDER_o11 0x8 -#define COLLIDER_o35 0x7 -#define COLLIDER_g7 0x6 -#define COLLIDER_deilits 0x5 -#define COLLIDER_deilitn 0x4 -#define COLLIDER_deilis 0x3 -#define COLLIDER_deilitw 0x2 -#define COLLIDER_deilin 0x1 -#define COLLIDER_deiliw 0x0 +#define COLLIDER_Root 0x49 +#define COLLIDER_g47 0x48 +#define COLLIDER_st2 0x47 +#define COLLIDER_st1 0x46 +#define COLLIDER_kame 0x45 +#define COLLIDER_o1 0x44 +#define COLLIDER_o249 0x43 +#define COLLIDER_o388 0x42 +#define COLLIDER_cook 0x41 +#define COLLIDER_o457 0x40 +#define COLLIDER_deili1 0x3F +#define COLLIDER_o377 0x3E +#define COLLIDER_o376 0x3D +#define COLLIDER_deilit1u 0x3C +#define COLLIDER_deilit1 0x3B +#define COLLIDER_o373 0x3A +#define COLLIDER_o372 0x39 +#define COLLIDER_o336 0x38 +#define COLLIDER_o323 0x37 +#define COLLIDER_souko_naka 0x36 +#define COLLIDER_o401 0x35 +#define COLLIDER_deilit2u 0x34 +#define COLLIDER_deilit2 0x33 +#define COLLIDER_deili2 0x32 +#define COLLIDER_deilid 0x31 +#define COLLIDER_o403 0x30 +#define COLLIDER_souko_yuka 0x2F +#define COLLIDER_o448 0x2E +#define COLLIDER_o287 0x2D +#define COLLIDER_mihari 0x2C +#define COLLIDER_deilite 0x2B +#define COLLIDER_deilie 0x2A +#define COLLIDER_o236 0x29 +#define COLLIDER_o369 0x28 +#define COLLIDER_o368 0x27 +#define COLLIDER_o264 0x26 +#define COLLIDER_o261 0x25 +#define COLLIDER_hashi 0x24 +#define COLLIDER_o238 0x23 +#define COLLIDER_o226 0x22 +#define COLLIDER_tik_enter 0x21 +#define COLLIDER_o402 0x20 +#define COLLIDER_deilip 0x1F +#define COLLIDER_o218 0x1E +#define COLLIDER_o348 0x1D +#define COLLIDER_o350 0x1C +#define COLLIDER_o349 0x1B +#define COLLIDER_kanban 0x1A +#define COLLIDER_o471 0x19 +#define COLLIDER_o456 0x18 +#define COLLIDER_o423 0x17 +#define COLLIDER_o409 0x16 +#define COLLIDER_o381 0x15 +#define COLLIDER_o380 0x14 +#define COLLIDER_o378 0x13 +#define COLLIDER_o370 0x12 +#define COLLIDER_o367 0x11 +#define COLLIDER_o361 0x10 +#define COLLIDER_o237 0xF +#define COLLIDER_o233 0xE +#define COLLIDER_g1 0xD +#define COLLIDER_sign 0xC +#define COLLIDER_o292 0xB +#define COLLIDER_o2 0xA +#define COLLIDER_o36 0x9 +#define COLLIDER_o11 0x8 +#define COLLIDER_o35 0x7 +#define COLLIDER_g7 0x6 +#define COLLIDER_deilits 0x5 +#define COLLIDER_deilitn 0x4 +#define COLLIDER_deilis 0x3 +#define COLLIDER_deilitw 0x2 +#define COLLIDER_deilin 0x1 +#define COLLIDER_deiliw 0x0 + +#define ZONE_Root 0x7 +#define ZONE_g46 0x6 +#define ZONE_o370 0x5 +#define ZONE_o369 0x4 +#define ZONE_g45 0x3 +#define ZONE_o371 0x2 +#define ZONE_o372 0x1 +#define ZONE_o361 0x0 + diff --git a/include/mapfs/mac_02_shape.h b/include/mapfs/mac_02_shape.h index 198dee5d22..d1c1769676 100644 --- a/include/mapfs/mac_02_shape.h +++ b/include/mapfs/mac_02_shape.h @@ -1,141 +1,142 @@ -#define MODEL_Root 0x8C -#define MODEL_g57 0x8B -#define MODEL_o413 0x8A -#define MODEL_o412 0x89 -#define MODEL_o411 0x88 -#define MODEL_g48 0x87 -#define MODEL_st3 0x86 -#define MODEL_st3_b 0x85 -#define MODEL_st3_a 0x84 -#define MODEL_st2 0x83 -#define MODEL_kage2 0x82 -#define MODEL_st2_b 0x81 -#define MODEL_st2_a 0x80 -#define MODEL_st1 0x7F -#define MODEL_kage1 0x7E -#define MODEL_st1_b 0x7D -#define MODEL_st1_a 0x7C -#define MODEL_g51 0x7B -#define MODEL_o382 0x7A -#define MODEL_g14 0x79 -#define MODEL_o418 0x78 -#define MODEL_o417 0x77 -#define MODEL_o416 0x76 -#define MODEL_o415 0x75 -#define MODEL_o414 0x74 -#define MODEL_o419 0x73 -#define MODEL_o115 0x72 -#define MODEL_o116 0x71 -#define MODEL_o423 0x70 -#define MODEL_o213 0x6F -#define MODEL_o422 0x6E -#define MODEL_o421 0x6D -#define MODEL_o420 0x6C -#define MODEL_cooking 0x6B -#define MODEL_g38 0x6A -#define MODEL_o315 0x69 -#define MODEL_o311 0x68 -#define MODEL_o307 0x67 -#define MODEL_o306 0x66 -#define MODEL_cook_mtx 0x65 -#define MODEL_ck_door 0x64 -#define MODEL_c_door 0x63 -#define MODEL_ck_yane 0x62 -#define MODEL_cy3 0x61 -#define MODEL_cy2 0x60 -#define MODEL_cy1 0x5F -#define MODEL_ck_kabe 0x5E -#define MODEL_ck1 0x5D -#define MODEL_ck3 0x5C -#define MODEL_ck2 0x5B -#define MODEL_cook_in 0x5A -#define MODEL_o426 0x59 -#define MODEL_o370 0x58 -#define MODEL_o369 0x57 -#define MODEL_o340 0x56 -#define MODEL_o342 0x55 -#define MODEL_o341 0x54 -#define MODEL_conro 0x53 -#define MODEL_o337 0x52 -#define MODEL_o326 0x51 -#define MODEL_o325 0x50 -#define MODEL_o360 0x4F -#define MODEL_o323 0x4E -#define MODEL_o322 0x4D -#define MODEL_o321 0x4C -#define MODEL_o320 0x4B -#define MODEL_o319 0x4A -#define MODEL_o318 0x49 -#define MODEL_o317 0x48 -#define MODEL_souko 0x47 -#define MODEL_g46 0x46 -#define MODEL_ramp 0x45 -#define MODEL_souko_kabe 0x44 -#define MODEL_sk2 0x43 -#define MODEL_sk1 0x42 -#define MODEL_souko_door 0x41 -#define MODEL_sk_door 0x40 -#define MODEL_souko_soto 0x3F -#define MODEL_o357 0x3E -#define MODEL_o303 0x3D -#define MODEL_o280 0x3C -#define MODEL_o279 0x3B -#define MODEL_o269 0x3A -#define MODEL_souko_in 0x39 -#define MODEL_o302 0x38 -#define MODEL_o288 0x37 -#define MODEL_dokan 0x36 -#define MODEL_o281 0x35 -#define MODEL_o276 0x34 -#define MODEL_souko_yuka 0x33 -#define MODEL_o287 0x32 -#define MODEL_mihari 0x31 -#define MODEL_o262 0x30 -#define MODEL_o264 0x2F -#define MODEL_o263 0x2E -#define MODEL_o259 0x2D -#define MODEL_o260 0x2C -#define MODEL_o253 0x2B -#define MODEL_o252 0x2A -#define MODEL_o261 0x29 -#define MODEL_o251 0x28 -#define MODEL_hashi 0x27 -#define MODEL_o268 0x26 -#define MODEL_o267 0x25 -#define MODEL_o256 0x24 -#define MODEL_o255 0x23 -#define MODEL_o240 0x22 -#define MODEL_o238 0x21 -#define MODEL_o232 0x20 -#define MODEL_g47 0x1F -#define MODEL_hori 0x1E -#define MODEL_o379 0x1D -#define MODEL_o378 0x1C -#define MODEL_kanban 0x1B -#define MODEL_o410 0x1A -#define MODEL_o368 0x19 -#define MODEL_o366 0x18 -#define MODEL_o249 0x17 -#define MODEL_o248 0x16 -#define MODEL_o237 0x15 -#define MODEL_o236 0x14 -#define MODEL_o233 0x13 -#define MODEL_g1 0x12 -#define MODEL_o428 0x11 -#define MODEL_o381 0x10 -#define MODEL_o350 0xF -#define MODEL_o348 0xE -#define MODEL_o292 0xD -#define MODEL_o218 0xC -#define MODEL_o2 0xB -#define MODEL_o11 0xA -#define MODEL_o35 0x9 -#define MODEL_o3 0x8 -#define MODEL_g7 0x7 -#define MODEL_o42 0x6 -#define MODEL_deilis 0x5 -#define MODEL_deilin 0x4 -#define MODEL_o1 0x3 -#define MODEL_deiliw 0x2 -#define MODEL_deilie 0x1 -#define MODEL_o12 0x0 +#define MODEL_Root 0x8C +#define MODEL_g57 0x8B +#define MODEL_o413 0x8A +#define MODEL_o412 0x89 +#define MODEL_o411 0x88 +#define MODEL_g48 0x87 +#define MODEL_st3 0x86 +#define MODEL_st3_b 0x85 +#define MODEL_st3_a 0x84 +#define MODEL_st2 0x83 +#define MODEL_kage2 0x82 +#define MODEL_st2_b 0x81 +#define MODEL_st2_a 0x80 +#define MODEL_st1 0x7F +#define MODEL_kage1 0x7E +#define MODEL_st1_b 0x7D +#define MODEL_st1_a 0x7C +#define MODEL_g51 0x7B +#define MODEL_o382 0x7A +#define MODEL_g14 0x79 +#define MODEL_o418 0x78 +#define MODEL_o417 0x77 +#define MODEL_o416 0x76 +#define MODEL_o415 0x75 +#define MODEL_o414 0x74 +#define MODEL_o419 0x73 +#define MODEL_o115 0x72 +#define MODEL_o116 0x71 +#define MODEL_o423 0x70 +#define MODEL_o213 0x6F +#define MODEL_o422 0x6E +#define MODEL_o421 0x6D +#define MODEL_o420 0x6C +#define MODEL_cooking 0x6B +#define MODEL_g38 0x6A +#define MODEL_o315 0x69 +#define MODEL_o311 0x68 +#define MODEL_o307 0x67 +#define MODEL_o306 0x66 +#define MODEL_cook_mtx 0x65 +#define MODEL_ck_door 0x64 +#define MODEL_c_door 0x63 +#define MODEL_ck_yane 0x62 +#define MODEL_cy3 0x61 +#define MODEL_cy2 0x60 +#define MODEL_cy1 0x5F +#define MODEL_ck_kabe 0x5E +#define MODEL_ck1 0x5D +#define MODEL_ck3 0x5C +#define MODEL_ck2 0x5B +#define MODEL_cook_in 0x5A +#define MODEL_o426 0x59 +#define MODEL_o370 0x58 +#define MODEL_o369 0x57 +#define MODEL_o340 0x56 +#define MODEL_o342 0x55 +#define MODEL_o341 0x54 +#define MODEL_conro 0x53 +#define MODEL_o337 0x52 +#define MODEL_o326 0x51 +#define MODEL_o325 0x50 +#define MODEL_o360 0x4F +#define MODEL_o323 0x4E +#define MODEL_o322 0x4D +#define MODEL_o321 0x4C +#define MODEL_o320 0x4B +#define MODEL_o319 0x4A +#define MODEL_o318 0x49 +#define MODEL_o317 0x48 +#define MODEL_souko 0x47 +#define MODEL_g46 0x46 +#define MODEL_ramp 0x45 +#define MODEL_souko_kabe 0x44 +#define MODEL_sk2 0x43 +#define MODEL_sk1 0x42 +#define MODEL_souko_door 0x41 +#define MODEL_sk_door 0x40 +#define MODEL_souko_soto 0x3F +#define MODEL_o357 0x3E +#define MODEL_o303 0x3D +#define MODEL_o280 0x3C +#define MODEL_o279 0x3B +#define MODEL_o269 0x3A +#define MODEL_souko_in 0x39 +#define MODEL_o302 0x38 +#define MODEL_o288 0x37 +#define MODEL_dokan 0x36 +#define MODEL_o281 0x35 +#define MODEL_o276 0x34 +#define MODEL_souko_yuka 0x33 +#define MODEL_o287 0x32 +#define MODEL_mihari 0x31 +#define MODEL_o262 0x30 +#define MODEL_o264 0x2F +#define MODEL_o263 0x2E +#define MODEL_o259 0x2D +#define MODEL_o260 0x2C +#define MODEL_o253 0x2B +#define MODEL_o252 0x2A +#define MODEL_o261 0x29 +#define MODEL_o251 0x28 +#define MODEL_hashi 0x27 +#define MODEL_o268 0x26 +#define MODEL_o267 0x25 +#define MODEL_o256 0x24 +#define MODEL_o255 0x23 +#define MODEL_o240 0x22 +#define MODEL_o238 0x21 +#define MODEL_o232 0x20 +#define MODEL_g47 0x1F +#define MODEL_hori 0x1E +#define MODEL_o379 0x1D +#define MODEL_o378 0x1C +#define MODEL_kanban 0x1B +#define MODEL_o410 0x1A +#define MODEL_o368 0x19 +#define MODEL_o366 0x18 +#define MODEL_o249 0x17 +#define MODEL_o248 0x16 +#define MODEL_o237 0x15 +#define MODEL_o236 0x14 +#define MODEL_o233 0x13 +#define MODEL_g1 0x12 +#define MODEL_o428 0x11 +#define MODEL_o381 0x10 +#define MODEL_o350 0xF +#define MODEL_o348 0xE +#define MODEL_o292 0xD +#define MODEL_o218 0xC +#define MODEL_o2 0xB +#define MODEL_o11 0xA +#define MODEL_o35 0x9 +#define MODEL_o3 0x8 +#define MODEL_g7 0x7 +#define MODEL_o42 0x6 +#define MODEL_deilis 0x5 +#define MODEL_deilin 0x4 +#define MODEL_o1 0x3 +#define MODEL_deiliw 0x2 +#define MODEL_deilie 0x1 +#define MODEL_o12 0x0 + diff --git a/include/mapfs/mac_03_hit.h b/include/mapfs/mac_03_hit.h index 5a75b0757d..d5fea331be 100644 --- a/include/mapfs/mac_03_hit.h +++ b/include/mapfs/mac_03_hit.h @@ -1,76 +1,90 @@ -#define COLLIDER_Root 0x4B -#define COLLIDER_g58 0x4A -#define COLLIDER_deili 0x49 -#define COLLIDER_deiliu 0x48 -#define COLLIDER_egg 0x47 -#define COLLIDER_through 0x46 -#define COLLIDER_capsule 0x45 -#define COLLIDER_g56 0x44 -#define COLLIDER_o270 0x43 -#define COLLIDER_toi 0x42 -#define COLLIDER_o259 0x41 -#define COLLIDER_o253 0x40 -#define COLLIDER_o251 0x3F -#define COLLIDER_o248 0x3E -#define COLLIDER_o256 0x3D -#define COLLIDER_hummer 0x3C -#define COLLIDER_step 0x3B -#define COLLIDER_jump 0x3A -#define COLLIDER_g55 0x39 -#define COLLIDER_o215k 0x38 -#define COLLIDER_o235 0x37 -#define COLLIDER_poppo 0x36 -#define COLLIDER_deilitk 0x35 -#define COLLIDER_kisya3 0x34 -#define COLLIDER_kisya2 0x33 -#define COLLIDER_kisya1 0x32 -#define COLLIDER_fumikiri 0x31 -#define COLLIDER_humikiri 0x30 -#define COLLIDER_o220 0x2F -#define COLLIDER_o218 0x2E -#define COLLIDER_o217 0x2D -#define COLLIDER_g51 0x2C -#define COLLIDER_mgm_tree 0x2B -#define COLLIDER_o213 0x2A -#define COLLIDER_o212 0x29 -#define COLLIDER_o211 0x28 -#define COLLIDER_station 0x27 -#define COLLIDER_eki_saku 0x26 -#define COLLIDER_o84 0x25 -#define COLLIDER_o86 0x24 -#define COLLIDER_Default 0x23 -#define COLLIDER_o278 0x22 -#define COLLIDER_o277 0x21 -#define COLLIDER_o276 0x20 -#define COLLIDER_o275 0x1F -#define COLLIDER_o274 0x1E -#define COLLIDER_danger 0x1D -#define COLLIDER_o262 0x1C -#define COLLIDER_o244 0x1B -#define COLLIDER_o242 0x1A -#define COLLIDER_o273 0x19 -#define COLLIDER_o229 0x18 -#define COLLIDER_o227 0x17 -#define COLLIDER_o214 0x16 -#define COLLIDER_senro_saku 0x15 -#define COLLIDER_o195 0x14 -#define COLLIDER_o194 0x13 -#define COLLIDER_o157 0x12 -#define COLLIDER_o89 0x11 -#define COLLIDER_o88 0x10 -#define COLLIDER_o64 0xF -#define COLLIDER_o234 0xE -#define COLLIDER_o233 0xD -#define COLLIDER_o232 0xC -#define COLLIDER_o48 0xB -#define COLLIDER_o11 0xA -#define COLLIDER_deilie 0x9 -#define COLLIDER_o238 0x8 -#define COLLIDER_o237 0x7 -#define COLLIDER_sign 0x6 -#define COLLIDER_deilim 0x5 -#define COLLIDER_dokan 0x4 -#define COLLIDER_g1 0x3 -#define COLLIDER_deilin 0x2 -#define COLLIDER_deilitn 0x1 -#define COLLIDER_o53 0x0 +#define COLLIDER_Root 0x4B +#define COLLIDER_g58 0x4A +#define COLLIDER_deili 0x49 +#define COLLIDER_deiliu 0x48 +#define COLLIDER_egg 0x47 +#define COLLIDER_through 0x46 +#define COLLIDER_capsule 0x45 +#define COLLIDER_g56 0x44 +#define COLLIDER_o270 0x43 +#define COLLIDER_toi 0x42 +#define COLLIDER_o259 0x41 +#define COLLIDER_o253 0x40 +#define COLLIDER_o251 0x3F +#define COLLIDER_o248 0x3E +#define COLLIDER_o256 0x3D +#define COLLIDER_hummer 0x3C +#define COLLIDER_step 0x3B +#define COLLIDER_jump 0x3A +#define COLLIDER_g55 0x39 +#define COLLIDER_o215k 0x38 +#define COLLIDER_o235 0x37 +#define COLLIDER_poppo 0x36 +#define COLLIDER_deilitk 0x35 +#define COLLIDER_kisya3 0x34 +#define COLLIDER_kisya2 0x33 +#define COLLIDER_kisya1 0x32 +#define COLLIDER_fumikiri 0x31 +#define COLLIDER_humikiri 0x30 +#define COLLIDER_o220 0x2F +#define COLLIDER_o218 0x2E +#define COLLIDER_o217 0x2D +#define COLLIDER_g51 0x2C +#define COLLIDER_mgm_tree 0x2B +#define COLLIDER_o213 0x2A +#define COLLIDER_o212 0x29 +#define COLLIDER_o211 0x28 +#define COLLIDER_station 0x27 +#define COLLIDER_eki_saku 0x26 +#define COLLIDER_o84 0x25 +#define COLLIDER_o86 0x24 +#define COLLIDER_Default 0x23 +#define COLLIDER_o278 0x22 +#define COLLIDER_o277 0x21 +#define COLLIDER_o276 0x20 +#define COLLIDER_o275 0x1F +#define COLLIDER_o274 0x1E +#define COLLIDER_danger 0x1D +#define COLLIDER_o262 0x1C +#define COLLIDER_o244 0x1B +#define COLLIDER_o242 0x1A +#define COLLIDER_o273 0x19 +#define COLLIDER_o229 0x18 +#define COLLIDER_o227 0x17 +#define COLLIDER_o214 0x16 +#define COLLIDER_senro_saku 0x15 +#define COLLIDER_o195 0x14 +#define COLLIDER_o194 0x13 +#define COLLIDER_o157 0x12 +#define COLLIDER_o89 0x11 +#define COLLIDER_o88 0x10 +#define COLLIDER_o64 0xF +#define COLLIDER_o234 0xE +#define COLLIDER_o233 0xD +#define COLLIDER_o232 0xC +#define COLLIDER_o48 0xB +#define COLLIDER_o11 0xA +#define COLLIDER_deilie 0x9 +#define COLLIDER_o238 0x8 +#define COLLIDER_o237 0x7 +#define COLLIDER_sign 0x6 +#define COLLIDER_deilim 0x5 +#define COLLIDER_dokan 0x4 +#define COLLIDER_g1 0x3 +#define COLLIDER_deilin 0x2 +#define COLLIDER_deilitn 0x1 +#define COLLIDER_o53 0x0 + +#define ZONE_Root 0xB +#define ZONE_Default 0xA +#define ZONE_boo_road 0x9 +#define ZONE_g54 0x8 +#define ZONE_o222 0x7 +#define ZONE_o221 0x6 +#define ZONE_g51 0x5 +#define ZONE_higashi 0x4 +#define ZONE_kita 0x3 +#define ZONE_minami 0x2 +#define ZONE_eki 0x1 +#define ZONE_bero 0x0 + diff --git a/include/mapfs/mac_03_shape.h b/include/mapfs/mac_03_shape.h index 935e112af9..ca4f5d9002 100644 --- a/include/mapfs/mac_03_shape.h +++ b/include/mapfs/mac_03_shape.h @@ -1,135 +1,136 @@ -#define MODEL_Root 0x86 -#define MODEL_boo_door 0x85 -#define MODEL_door 0x84 -#define MODEL_egg 0x83 -#define MODEL_capsule 0x82 -#define MODEL_bou 0x81 -#define MODEL_boo 0x80 -#define MODEL_handle 0x7F -#define MODEL_handle1 0x7E -#define MODEL_g53 0x7D -#define MODEL_o231 0x7C -#define MODEL_o230 0x7B -#define MODEL_o227 0x7A -#define MODEL_o225 0x79 -#define MODEL_o223 0x78 -#define MODEL_o222 0x77 -#define MODEL_o219 0x76 -#define MODEL_g52 0x75 -#define MODEL_ls1 0x74 -#define MODEL_iwa 0x73 -#define MODEL_kemuri 0x72 -#define MODEL_km 0x71 -#define MODEL_poppo 0x70 -#define MODEL_piston 0x6F -#define MODEL_p3 0x6E -#define MODEL_16 0x6D -#define MODEL_p2 0x6C -#define MODEL_15 0x6B -#define MODEL_p1 0x6A -#define MODEL_14 0x69 -#define MODEL_syarin 0x68 -#define MODEL_s4 0x67 -#define MODEL_13 0x66 -#define MODEL_s3 0x65 -#define MODEL_12 0x64 -#define MODEL_s2 0x63 -#define MODEL_11 0x62 -#define MODEL_s1 0x61 -#define MODEL_10 0x60 -#define MODEL_bell 0x5F -#define MODEL_09 0x5E -#define MODEL_entotsu 0x5D -#define MODEL_07 0x5C -#define MODEL_08 0x5B -#define MODEL_kisya_door2 0x5A -#define MODEL_omote2 0x59 -#define MODEL_ura2 0x58 -#define MODEL_kisya_door 0x57 -#define MODEL_omote 0x56 -#define MODEL_ura 0x55 -#define MODEL_hontai 0x54 -#define MODEL_06 0x53 -#define MODEL_05 0x52 -#define MODEL_04 0x51 -#define MODEL_03 0x50 -#define MODEL_02 0x4F -#define MODEL_01 0x4E -#define MODEL_fumikiri2 0x4D -#define MODEL_o192 0x4C -#define MODEL_o188 0x4B -#define MODEL_o187 0x4A -#define MODEL_fumikiri1 0x49 -#define MODEL_o191 0x48 -#define MODEL_o184 0x47 -#define MODEL_o183 0x46 -#define MODEL_g15 0x45 -#define MODEL_o240 0x44 -#define MODEL_o239 0x43 -#define MODEL_o238 0x42 -#define MODEL_o129 0x41 -#define MODEL_o130 0x40 -#define MODEL_o128 0x3F -#define MODEL_o126 0x3E -#define MODEL_o115 0x3D -#define MODEL_o106 0x3C -#define MODEL_o107 0x3B -#define MODEL_station 0x3A -#define MODEL_o110 0x39 -#define MODEL_eki_saku 0x38 -#define MODEL_o111 0x37 -#define MODEL_o112 0x36 -#define MODEL_o109 0x35 -#define MODEL_o103 0x34 -#define MODEL_o101 0x33 -#define MODEL_o100 0x32 -#define MODEL_o94 0x31 -#define MODEL_o82 0x30 -#define MODEL_o80 0x2F -#define MODEL_o79 0x2E -#define MODEL_o78 0x2D -#define MODEL_o77 0x2C -#define MODEL_o92 0x2B -#define MODEL_o84 0x2A -#define MODEL_o86 0x29 -#define MODEL_tokei 0x28 -#define MODEL_g42 0x27 -#define MODEL_o150 0x26 -#define MODEL_o105 0x25 -#define MODEL_o108 0x24 -#define MODEL_g57 0x23 -#define MODEL_o236 0x22 -#define MODEL_o235 0x21 -#define MODEL_short 0x20 -#define MODEL_o147 0x1F -#define MODEL_long 0x1E -#define MODEL_o148 0x1D -#define MODEL_Default 0x1C -#define MODEL_o249 0x1B -#define MODEL_o248 0x1A -#define MODEL_o247 0x19 -#define MODEL_o246 0x18 -#define MODEL_o245 0x17 -#define MODEL_o241 0x16 -#define MODEL_o156 0x15 -#define MODEL_senro_saku 0x14 -#define MODEL_o244 0x13 -#define MODEL_o196 0x12 -#define MODEL_o195 0x11 -#define MODEL_o194 0x10 -#define MODEL_o157 0xF -#define MODEL_o89 0xE -#define MODEL_o88 0xD -#define MODEL_o74 0xC -#define MODEL_o64 0xB -#define MODEL_o49 0xA -#define MODEL_g1 0x9 -#define MODEL_o242 0x8 -#define MODEL_o68 0x7 -#define MODEL_o90 0x6 -#define MODEL_o48 0x5 -#define MODEL_o3 0x4 -#define MODEL_o11 0x3 -#define MODEL_o13 0x2 -#define MODEL_o12 0x1 -#define MODEL_o54 0x0 +#define MODEL_Root 0x86 +#define MODEL_boo_door 0x85 +#define MODEL_door 0x84 +#define MODEL_egg 0x83 +#define MODEL_capsule 0x82 +#define MODEL_bou 0x81 +#define MODEL_boo 0x80 +#define MODEL_handle 0x7F +#define MODEL_handle1 0x7E +#define MODEL_g53 0x7D +#define MODEL_o231 0x7C +#define MODEL_o230 0x7B +#define MODEL_o227 0x7A +#define MODEL_o225 0x79 +#define MODEL_o223 0x78 +#define MODEL_o222 0x77 +#define MODEL_o219 0x76 +#define MODEL_g52 0x75 +#define MODEL_ls1 0x74 +#define MODEL_iwa 0x73 +#define MODEL_kemuri 0x72 +#define MODEL_km 0x71 +#define MODEL_poppo 0x70 +#define MODEL_piston 0x6F +#define MODEL_p3 0x6E +#define MODEL_16 0x6D +#define MODEL_p2 0x6C +#define MODEL_15 0x6B +#define MODEL_p1 0x6A +#define MODEL_14 0x69 +#define MODEL_syarin 0x68 +#define MODEL_s4 0x67 +#define MODEL_13 0x66 +#define MODEL_s3 0x65 +#define MODEL_12 0x64 +#define MODEL_s2 0x63 +#define MODEL_11 0x62 +#define MODEL_s1 0x61 +#define MODEL_10 0x60 +#define MODEL_bell 0x5F +#define MODEL_09 0x5E +#define MODEL_entotsu 0x5D +#define MODEL_07 0x5C +#define MODEL_08 0x5B +#define MODEL_kisya_door2 0x5A +#define MODEL_omote2 0x59 +#define MODEL_ura2 0x58 +#define MODEL_kisya_door 0x57 +#define MODEL_omote 0x56 +#define MODEL_ura 0x55 +#define MODEL_hontai 0x54 +#define MODEL_06 0x53 +#define MODEL_05 0x52 +#define MODEL_04 0x51 +#define MODEL_03 0x50 +#define MODEL_02 0x4F +#define MODEL_01 0x4E +#define MODEL_fumikiri2 0x4D +#define MODEL_o192 0x4C +#define MODEL_o188 0x4B +#define MODEL_o187 0x4A +#define MODEL_fumikiri1 0x49 +#define MODEL_o191 0x48 +#define MODEL_o184 0x47 +#define MODEL_o183 0x46 +#define MODEL_g15 0x45 +#define MODEL_o240 0x44 +#define MODEL_o239 0x43 +#define MODEL_o238 0x42 +#define MODEL_o129 0x41 +#define MODEL_o130 0x40 +#define MODEL_o128 0x3F +#define MODEL_o126 0x3E +#define MODEL_o115 0x3D +#define MODEL_o106 0x3C +#define MODEL_o107 0x3B +#define MODEL_station 0x3A +#define MODEL_o110 0x39 +#define MODEL_eki_saku 0x38 +#define MODEL_o111 0x37 +#define MODEL_o112 0x36 +#define MODEL_o109 0x35 +#define MODEL_o103 0x34 +#define MODEL_o101 0x33 +#define MODEL_o100 0x32 +#define MODEL_o94 0x31 +#define MODEL_o82 0x30 +#define MODEL_o80 0x2F +#define MODEL_o79 0x2E +#define MODEL_o78 0x2D +#define MODEL_o77 0x2C +#define MODEL_o92 0x2B +#define MODEL_o84 0x2A +#define MODEL_o86 0x29 +#define MODEL_tokei 0x28 +#define MODEL_g42 0x27 +#define MODEL_o150 0x26 +#define MODEL_o105 0x25 +#define MODEL_o108 0x24 +#define MODEL_g57 0x23 +#define MODEL_o236 0x22 +#define MODEL_o235 0x21 +#define MODEL_short 0x20 +#define MODEL_o147 0x1F +#define MODEL_long 0x1E +#define MODEL_o148 0x1D +#define MODEL_Default 0x1C +#define MODEL_o249 0x1B +#define MODEL_o248 0x1A +#define MODEL_o247 0x19 +#define MODEL_o246 0x18 +#define MODEL_o245 0x17 +#define MODEL_o241 0x16 +#define MODEL_o156 0x15 +#define MODEL_senro_saku 0x14 +#define MODEL_o244 0x13 +#define MODEL_o196 0x12 +#define MODEL_o195 0x11 +#define MODEL_o194 0x10 +#define MODEL_o157 0xF +#define MODEL_o89 0xE +#define MODEL_o88 0xD +#define MODEL_o74 0xC +#define MODEL_o64 0xB +#define MODEL_o49 0xA +#define MODEL_g1 0x9 +#define MODEL_o242 0x8 +#define MODEL_o68 0x7 +#define MODEL_o90 0x6 +#define MODEL_o48 0x5 +#define MODEL_o3 0x4 +#define MODEL_o11 0x3 +#define MODEL_o13 0x2 +#define MODEL_o12 0x1 +#define MODEL_o54 0x0 + diff --git a/include/mapfs/mac_04_hit.h b/include/mapfs/mac_04_hit.h index 8bcc125387..1fb76954dd 100644 --- a/include/mapfs/mac_04_hit.h +++ b/include/mapfs/mac_04_hit.h @@ -1,80 +1,93 @@ -#define COLLIDER_Root 0x4F -#define COLLIDER_kame 0x4E -#define COLLIDER_deilite 0x4D -#define COLLIDER_o422 0x4C -#define COLLIDER_souko 0x4B -#define COLLIDER_deili_sk 0x4A -#define COLLIDER_deilit_sku 0x49 -#define COLLIDER_deilit_sk 0x48 -#define COLLIDER_souko_yuka 0x47 -#define COLLIDER_o470 0x46 -#define COLLIDER_o469 0x45 -#define COLLIDER_Default 0x44 -#define COLLIDER_sign 0x43 -#define COLLIDER_deilie 0x42 -#define COLLIDER_deilisw 0x41 -#define COLLIDER_deilitsw 0x40 -#define COLLIDER_omise 0x3F -#define COLLIDER_o495 0x3E -#define COLLIDER_o477 0x3D -#define COLLIDER_o476 0x3C -#define COLLIDER_o452 0x3B -#define COLLIDER_deili_m 0x3A -#define COLLIDER_deilit_mu 0x39 -#define COLLIDER_deilit_m 0x38 -#define COLLIDER_o254 0x37 -#define COLLIDER_o448 0x36 -#define COLLIDER_o447 0x35 -#define COLLIDER_o281 0x34 -#define COLLIDER_o296 0x33 -#define COLLIDER_mono 0x32 -#define COLLIDER_mono6 0x31 -#define COLLIDER_mono5 0x30 -#define COLLIDER_mono4 0x2F -#define COLLIDER_mono3 0x2E -#define COLLIDER_mono2 0x2D -#define COLLIDER_mono1 0x2C -#define COLLIDER_rinjin_mawari 0x2B -#define COLLIDER_o473 0x2A -#define COLLIDER_o472 0x29 -#define COLLIDER_o467 0x28 -#define COLLIDER_o435 0x27 -#define COLLIDER_o446 0x26 -#define COLLIDER_o445 0x25 -#define COLLIDER_deili_r 0x24 -#define COLLIDER_deilit_ru 0x23 -#define COLLIDER_deilit_r 0x22 -#define COLLIDER_o439 0x21 -#define COLLIDER_o436 0x20 -#define COLLIDER_o437 0x1F -#define COLLIDER_o403 0x1E -#define COLLIDER_heiho 0x1D -#define COLLIDER_o496 0x1C -#define COLLIDER_o485 0x1B -#define COLLIDER_o475 0x1A -#define COLLIDER_o474 0x19 -#define COLLIDER_o471 0x18 -#define COLLIDER_o468 0x17 -#define COLLIDER_resa 0x16 -#define COLLIDER_omo_ent 0x15 -#define COLLIDER_o423 0x14 -#define COLLIDER_deilit_hu 0x13 -#define COLLIDER_deilit_h 0x12 -#define COLLIDER_deili_h 0x11 -#define COLLIDER_o432 0x10 -#define COLLIDER_deili_hku 0xF -#define COLLIDER_deilit_hku 0xE -#define COLLIDER_deilit_hk 0xD -#define COLLIDER_deili_hk 0xC -#define COLLIDER_o428 0xB -#define COLLIDER_g1 0xA -#define COLLIDER_o426 0x9 -#define COLLIDER_o425 0x8 -#define COLLIDER_o418 0x7 -#define COLLIDER_o285 0x6 -#define COLLIDER_o262 0x5 -#define COLLIDER_o11 0x4 -#define COLLIDER_o36 0x3 -#define COLLIDER_o497 0x2 -#define COLLIDER_o2 0x1 -#define COLLIDER_o37 0x0 +#define COLLIDER_Root 0x4F +#define COLLIDER_kame 0x4E +#define COLLIDER_deilite 0x4D +#define COLLIDER_o422 0x4C +#define COLLIDER_souko 0x4B +#define COLLIDER_deili_sk 0x4A +#define COLLIDER_deilit_sku 0x49 +#define COLLIDER_deilit_sk 0x48 +#define COLLIDER_souko_yuka 0x47 +#define COLLIDER_o470 0x46 +#define COLLIDER_o469 0x45 +#define COLLIDER_Default 0x44 +#define COLLIDER_sign 0x43 +#define COLLIDER_deilie 0x42 +#define COLLIDER_deilisw 0x41 +#define COLLIDER_deilitsw 0x40 +#define COLLIDER_omise 0x3F +#define COLLIDER_o495 0x3E +#define COLLIDER_o477 0x3D +#define COLLIDER_o476 0x3C +#define COLLIDER_o452 0x3B +#define COLLIDER_deili_m 0x3A +#define COLLIDER_deilit_mu 0x39 +#define COLLIDER_deilit_m 0x38 +#define COLLIDER_o254 0x37 +#define COLLIDER_o448 0x36 +#define COLLIDER_o447 0x35 +#define COLLIDER_o281 0x34 +#define COLLIDER_o296 0x33 +#define COLLIDER_mono 0x32 +#define COLLIDER_mono6 0x31 +#define COLLIDER_mono5 0x30 +#define COLLIDER_mono4 0x2F +#define COLLIDER_mono3 0x2E +#define COLLIDER_mono2 0x2D +#define COLLIDER_mono1 0x2C +#define COLLIDER_rinjin_mawari 0x2B +#define COLLIDER_o473 0x2A +#define COLLIDER_o472 0x29 +#define COLLIDER_o467 0x28 +#define COLLIDER_o435 0x27 +#define COLLIDER_o446 0x26 +#define COLLIDER_o445 0x25 +#define COLLIDER_deili_r 0x24 +#define COLLIDER_deilit_ru 0x23 +#define COLLIDER_deilit_r 0x22 +#define COLLIDER_o439 0x21 +#define COLLIDER_o436 0x20 +#define COLLIDER_o437 0x1F +#define COLLIDER_o403 0x1E +#define COLLIDER_heiho 0x1D +#define COLLIDER_o496 0x1C +#define COLLIDER_o485 0x1B +#define COLLIDER_o475 0x1A +#define COLLIDER_o474 0x19 +#define COLLIDER_o471 0x18 +#define COLLIDER_o468 0x17 +#define COLLIDER_resa 0x16 +#define COLLIDER_omo_ent 0x15 +#define COLLIDER_o423 0x14 +#define COLLIDER_deilit_hu 0x13 +#define COLLIDER_deilit_h 0x12 +#define COLLIDER_deili_h 0x11 +#define COLLIDER_o432 0x10 +#define COLLIDER_deili_hku 0xF +#define COLLIDER_deilit_hku 0xE +#define COLLIDER_deilit_hk 0xD +#define COLLIDER_deili_hk 0xC +#define COLLIDER_o428 0xB +#define COLLIDER_g1 0xA +#define COLLIDER_o426 0x9 +#define COLLIDER_o425 0x8 +#define COLLIDER_o418 0x7 +#define COLLIDER_o285 0x6 +#define COLLIDER_o262 0x5 +#define COLLIDER_o11 0x4 +#define COLLIDER_o36 0x3 +#define COLLIDER_o497 0x2 +#define COLLIDER_o2 0x1 +#define COLLIDER_o37 0x0 + +#define ZONE_Root 0xA +#define ZONE_g92 0x9 +#define ZONE_o428 0x8 +#define ZONE_o426 0x7 +#define ZONE_g1 0x6 +#define ZONE_o430 0x5 +#define ZONE_o424 0x4 +#define ZONE_omose 0x3 +#define ZONE_hh2_y 0x2 +#define ZONE_hh1_y 0x1 +#define ZONE_jimen 0x0 + diff --git a/include/mapfs/mac_04_shape.h b/include/mapfs/mac_04_shape.h index ee9b5ff226..a83bd3987a 100644 --- a/include/mapfs/mac_04_shape.h +++ b/include/mapfs/mac_04_shape.h @@ -1,172 +1,173 @@ -#define MODEL_Root 0xAB -#define MODEL_g95 0xAA -#define MODEL_o461 0xA9 -#define MODEL_o460 0xA8 -#define MODEL_o459 0xA7 -#define MODEL_trees 0xA6 -#define MODEL_o288 0xA5 -#define MODEL_o292 0xA4 -#define MODEL_o291 0xA3 -#define MODEL_o290 0xA2 -#define MODEL_o289 0xA1 -#define MODEL_o287 0xA0 -#define MODEL_o286 0x9F -#define MODEL_heiho_house 0x9E -#define MODEL_hi_mtx 0x9D -#define MODEL_g69 0x9C -#define MODEL_o377 0x9B -#define MODEL_o376 0x9A -#define MODEL_o375 0x99 -#define MODEL_o327 0x98 -#define MODEL_o326 0x97 -#define MODEL_hkai 0x96 -#define MODEL_hkai2 0x95 -#define MODEL_hkai1 0x94 -#define MODEL_h_door 0x93 -#define MODEL_hh_door 0x92 -#define MODEL_hh2_k 0x91 -#define MODEL_hk4 0x90 -#define MODEL_hk6 0x8F -#define MODEL_hk5 0x8E -#define MODEL_hh1_k 0x8D -#define MODEL_hk2 0x8C -#define MODEL_hk1 0x8B -#define MODEL_hk3 0x8A -#define MODEL_heiho_in 0x89 -#define MODEL_o458 0x88 -#define MODEL_o447 0x87 -#define MODEL_o446 0x86 -#define MODEL_rakugaki 0x85 -#define MODEL_box_top 0x84 -#define MODEL_o425 0x83 -#define MODEL_o426 0x82 -#define MODEL_o450 0x81 -#define MODEL_o332 0x80 -#define MODEL_o368 0x7F -#define MODEL_o366 0x7E -#define MODEL_o463 0x7D -#define MODEL_heiho_ent 0x7C -#define MODEL_o365 0x7B -#define MODEL_o364 0x7A -#define MODEL_o363 0x79 -#define MODEL_o305 0x78 -#define MODEL_hh2_y 0x77 -#define MODEL_hi_soto 0x76 -#define MODEL_o382 0x75 -#define MODEL_o423 0x74 -#define MODEL_o331 0x73 -#define MODEL_o330 0x72 -#define MODEL_o329 0x71 -#define MODEL_mise 0x70 -#define MODEL_souko 0x6F -#define MODEL_suk_mtx 0x6E -#define MODEL_sk_kabe 0x6D -#define MODEL_skk7 0x6C -#define MODEL_skk6 0x6B -#define MODEL_skk5 0x6A -#define MODEL_skk4 0x69 -#define MODEL_skk3 0x68 -#define MODEL_skk2 0x67 -#define MODEL_skk1 0x66 -#define MODEL_sk_door 0x65 -#define MODEL_skd 0x64 -#define MODEL_souko_out 0x63 -#define MODEL_o284 0x62 -#define MODEL_o282 0x61 -#define MODEL_o283 0x60 -#define MODEL_mise_mtx 0x5F -#define MODEL_mise_kabe 0x5E -#define MODEL_mk3 0x5D -#define MODEL_mk2 0x5C -#define MODEL_mk1 0x5B -#define MODEL_mise_yane 0x5A -#define MODEL_my5 0x59 -#define MODEL_my4 0x58 -#define MODEL_my3 0x57 -#define MODEL_my2 0x56 -#define MODEL_my1 0x55 -#define MODEL_mise_door 0x54 -#define MODEL_msdoor 0x53 -#define MODEL_mise_out 0x52 -#define MODEL_o238 0x51 -#define MODEL_o237 0x50 -#define MODEL_o236 0x4F -#define MODEL_o235 0x4E -#define MODEL_o233 0x4D -#define MODEL_o232 0x4C -#define MODEL_o231 0x4B -#define MODEL_o230 0x4A -#define MODEL_o225 0x49 -#define MODEL_mise_in 0x48 -#define MODEL_o442 0x47 -#define MODEL_o276 0x46 -#define MODEL_o441 0x45 -#define MODEL_o279 0x44 -#define MODEL_o278 0x43 -#define MODEL_o271 0x42 -#define MODEL_o300 0x41 -#define MODEL_o246 0x40 -#define MODEL_o250 0x3F -#define MODEL_o266 0x3E -#define MODEL_o248 0x3D -#define MODEL_o245 0x3C -#define MODEL_o244 0x3B -#define MODEL_o241 0x3A -#define MODEL_mono6 0x39 -#define MODEL_mono5 0x38 -#define MODEL_mono4 0x37 -#define MODEL_mono3 0x36 -#define MODEL_mono2 0x35 -#define MODEL_mono1 0x34 -#define MODEL_o254 0x33 -#define MODEL_o253 0x32 -#define MODEL_souko_yuka 0x31 -#define MODEL_o239 0x30 -#define MODEL_rinjin 0x2F -#define MODEL_rin_out 0x2E -#define MODEL_o408 0x2D -#define MODEL_rn_door 0x2C -#define MODEL_rndoor 0x2B -#define MODEL_rn_kabe2 0x2A -#define MODEL_rnk6 0x29 -#define MODEL_rnk5 0x28 -#define MODEL_rn_kabe1 0x27 -#define MODEL_rnk4 0x26 -#define MODEL_rnk3 0x25 -#define MODEL_rnk2 0x24 -#define MODEL_rnk1 0x23 -#define MODEL_rin_in 0x22 -#define MODEL_o465 0x21 -#define MODEL_o452 0x20 -#define MODEL_o455 0x1F -#define MODEL_o449 0x1E -#define MODEL_o448 0x1D -#define MODEL_o412 0x1C -#define MODEL_o410 0x1B -#define MODEL_o399 0x1A -#define MODEL_o404 0x19 -#define MODEL_o403 0x18 -#define MODEL_o402 0x17 -#define MODEL_o400 0x16 -#define MODEL_o388 0x15 -#define MODEL_o387 0x14 -#define MODEL_Default 0x13 -#define MODEL_o421 0x12 -#define MODEL_o420 0x11 -#define MODEL_o419 0x10 -#define MODEL_o261 0xF -#define MODEL_o294 0xE -#define MODEL_g1 0xD -#define MODEL_o468 0xC -#define MODEL_o467 0xB -#define MODEL_o466 0xA -#define MODEL_o418 0x9 -#define MODEL_o296 0x8 -#define MODEL_o285 0x7 -#define MODEL_o281 0x6 -#define MODEL_o262 0x5 -#define MODEL_o37 0x4 -#define MODEL_o36 0x3 -#define MODEL_o11 0x2 -#define MODEL_o2 0x1 -#define MODEL_o13 0x0 +#define MODEL_Root 0xAB +#define MODEL_g95 0xAA +#define MODEL_o461 0xA9 +#define MODEL_o460 0xA8 +#define MODEL_o459 0xA7 +#define MODEL_trees 0xA6 +#define MODEL_o288 0xA5 +#define MODEL_o292 0xA4 +#define MODEL_o291 0xA3 +#define MODEL_o290 0xA2 +#define MODEL_o289 0xA1 +#define MODEL_o287 0xA0 +#define MODEL_o286 0x9F +#define MODEL_heiho_house 0x9E +#define MODEL_hi_mtx 0x9D +#define MODEL_g69 0x9C +#define MODEL_o377 0x9B +#define MODEL_o376 0x9A +#define MODEL_o375 0x99 +#define MODEL_o327 0x98 +#define MODEL_o326 0x97 +#define MODEL_hkai 0x96 +#define MODEL_hkai2 0x95 +#define MODEL_hkai1 0x94 +#define MODEL_h_door 0x93 +#define MODEL_hh_door 0x92 +#define MODEL_hh2_k 0x91 +#define MODEL_hk4 0x90 +#define MODEL_hk6 0x8F +#define MODEL_hk5 0x8E +#define MODEL_hh1_k 0x8D +#define MODEL_hk2 0x8C +#define MODEL_hk1 0x8B +#define MODEL_hk3 0x8A +#define MODEL_heiho_in 0x89 +#define MODEL_o458 0x88 +#define MODEL_o447 0x87 +#define MODEL_o446 0x86 +#define MODEL_rakugaki 0x85 +#define MODEL_box_top 0x84 +#define MODEL_o425 0x83 +#define MODEL_o426 0x82 +#define MODEL_o450 0x81 +#define MODEL_o332 0x80 +#define MODEL_o368 0x7F +#define MODEL_o366 0x7E +#define MODEL_o463 0x7D +#define MODEL_heiho_ent 0x7C +#define MODEL_o365 0x7B +#define MODEL_o364 0x7A +#define MODEL_o363 0x79 +#define MODEL_o305 0x78 +#define MODEL_hh2_y 0x77 +#define MODEL_hi_soto 0x76 +#define MODEL_o382 0x75 +#define MODEL_o423 0x74 +#define MODEL_o331 0x73 +#define MODEL_o330 0x72 +#define MODEL_o329 0x71 +#define MODEL_mise 0x70 +#define MODEL_souko 0x6F +#define MODEL_suk_mtx 0x6E +#define MODEL_sk_kabe 0x6D +#define MODEL_skk7 0x6C +#define MODEL_skk6 0x6B +#define MODEL_skk5 0x6A +#define MODEL_skk4 0x69 +#define MODEL_skk3 0x68 +#define MODEL_skk2 0x67 +#define MODEL_skk1 0x66 +#define MODEL_sk_door 0x65 +#define MODEL_skd 0x64 +#define MODEL_souko_out 0x63 +#define MODEL_o284 0x62 +#define MODEL_o282 0x61 +#define MODEL_o283 0x60 +#define MODEL_mise_mtx 0x5F +#define MODEL_mise_kabe 0x5E +#define MODEL_mk3 0x5D +#define MODEL_mk2 0x5C +#define MODEL_mk1 0x5B +#define MODEL_mise_yane 0x5A +#define MODEL_my5 0x59 +#define MODEL_my4 0x58 +#define MODEL_my3 0x57 +#define MODEL_my2 0x56 +#define MODEL_my1 0x55 +#define MODEL_mise_door 0x54 +#define MODEL_msdoor 0x53 +#define MODEL_mise_out 0x52 +#define MODEL_o238 0x51 +#define MODEL_o237 0x50 +#define MODEL_o236 0x4F +#define MODEL_o235 0x4E +#define MODEL_o233 0x4D +#define MODEL_o232 0x4C +#define MODEL_o231 0x4B +#define MODEL_o230 0x4A +#define MODEL_o225 0x49 +#define MODEL_mise_in 0x48 +#define MODEL_o442 0x47 +#define MODEL_o276 0x46 +#define MODEL_o441 0x45 +#define MODEL_o279 0x44 +#define MODEL_o278 0x43 +#define MODEL_o271 0x42 +#define MODEL_o300 0x41 +#define MODEL_o246 0x40 +#define MODEL_o250 0x3F +#define MODEL_o266 0x3E +#define MODEL_o248 0x3D +#define MODEL_o245 0x3C +#define MODEL_o244 0x3B +#define MODEL_o241 0x3A +#define MODEL_mono6 0x39 +#define MODEL_mono5 0x38 +#define MODEL_mono4 0x37 +#define MODEL_mono3 0x36 +#define MODEL_mono2 0x35 +#define MODEL_mono1 0x34 +#define MODEL_o254 0x33 +#define MODEL_o253 0x32 +#define MODEL_souko_yuka 0x31 +#define MODEL_o239 0x30 +#define MODEL_rinjin 0x2F +#define MODEL_rin_out 0x2E +#define MODEL_o408 0x2D +#define MODEL_rn_door 0x2C +#define MODEL_rndoor 0x2B +#define MODEL_rn_kabe2 0x2A +#define MODEL_rnk6 0x29 +#define MODEL_rnk5 0x28 +#define MODEL_rn_kabe1 0x27 +#define MODEL_rnk4 0x26 +#define MODEL_rnk3 0x25 +#define MODEL_rnk2 0x24 +#define MODEL_rnk1 0x23 +#define MODEL_rin_in 0x22 +#define MODEL_o465 0x21 +#define MODEL_o452 0x20 +#define MODEL_o455 0x1F +#define MODEL_o449 0x1E +#define MODEL_o448 0x1D +#define MODEL_o412 0x1C +#define MODEL_o410 0x1B +#define MODEL_o399 0x1A +#define MODEL_o404 0x19 +#define MODEL_o403 0x18 +#define MODEL_o402 0x17 +#define MODEL_o400 0x16 +#define MODEL_o388 0x15 +#define MODEL_o387 0x14 +#define MODEL_Default 0x13 +#define MODEL_o421 0x12 +#define MODEL_o420 0x11 +#define MODEL_o419 0x10 +#define MODEL_o261 0xF +#define MODEL_o294 0xE +#define MODEL_g1 0xD +#define MODEL_o468 0xC +#define MODEL_o467 0xB +#define MODEL_o466 0xA +#define MODEL_o418 0x9 +#define MODEL_o296 0x8 +#define MODEL_o285 0x7 +#define MODEL_o281 0x6 +#define MODEL_o262 0x5 +#define MODEL_o37 0x4 +#define MODEL_o36 0x3 +#define MODEL_o11 0x2 +#define MODEL_o2 0x1 +#define MODEL_o13 0x0 + diff --git a/include/mapfs/mac_05_hit.h b/include/mapfs/mac_05_hit.h index 7531c13d40..b9744c2f4a 100644 --- a/include/mapfs/mac_05_hit.h +++ b/include/mapfs/mac_05_hit.h @@ -1,53 +1,70 @@ -#define COLLIDER_Root 0x34 -#define COLLIDER_g58 0x33 -#define COLLIDER_o240 0x32 -#define COLLIDER_o239 0x31 -#define COLLIDER_kanban 0x30 -#define COLLIDER_o270 0x2F -#define COLLIDER_o154 0x2E -#define COLLIDER_bar_inn 0x2D -#define COLLIDER_o244 0x2C -#define COLLIDER_o110 0x2B -#define COLLIDER_o126 0x2A -#define COLLIDER_table 0x29 -#define COLLIDER_o92 0x28 -#define COLLIDER_o90 0x27 -#define COLLIDER_o185 0x26 -#define COLLIDER_deilit1u 0x25 -#define COLLIDER_harbour_club 0x24 -#define COLLIDER_o291 0x23 -#define COLLIDER_deili1 0x22 -#define COLLIDER_o48 0x21 -#define COLLIDER_deilit1 0x20 -#define COLLIDER_g56 0x1F -#define COLLIDER_o256k 0x1E -#define COLLIDER_o236 0x1D -#define COLLIDER_kameki 0x1C -#define COLLIDER_o184 0x1B -#define COLLIDER_o183 0x1A -#define COLLIDER_o193k 0x19 -#define COLLIDER_o13 0x18 -#define COLLIDER_o190k 0x17 -#define COLLIDER_o189k 0x16 -#define COLLIDER_tt9 0x15 -#define COLLIDER_kujira 0x14 -#define COLLIDER_o186 0x13 -#define COLLIDER_o50 0x12 -#define COLLIDER_Default 0x11 -#define COLLIDER_kujira_atari 0x10 -#define COLLIDER_o264 0xF -#define COLLIDER_sign 0xE -#define COLLIDER_o212 0xD -#define COLLIDER_deilit9 0xC -#define COLLIDER_o187 0xB -#define COLLIDER_o182 0xA -#define COLLIDER_o181 0x9 -#define COLLIDER_kaimen 0x8 -#define COLLIDER_o206 0x7 -#define COLLIDER_o36 0x6 -#define COLLIDER_g1 0x5 -#define COLLIDER_deilitne 0x4 -#define COLLIDER_deiline 0x3 -#define COLLIDER_o115 0x2 -#define COLLIDER_o107 0x1 -#define COLLIDER_o106 0x0 +#define COLLIDER_Root 0x34 +#define COLLIDER_g58 0x33 +#define COLLIDER_o240 0x32 +#define COLLIDER_o239 0x31 +#define COLLIDER_kanban 0x30 +#define COLLIDER_o270 0x2F +#define COLLIDER_o154 0x2E +#define COLLIDER_bar_inn 0x2D +#define COLLIDER_o244 0x2C +#define COLLIDER_o110 0x2B +#define COLLIDER_o126 0x2A +#define COLLIDER_table 0x29 +#define COLLIDER_o92 0x28 +#define COLLIDER_o90 0x27 +#define COLLIDER_o185 0x26 +#define COLLIDER_deilit1u 0x25 +#define COLLIDER_harbour_club 0x24 +#define COLLIDER_o291 0x23 +#define COLLIDER_deili1 0x22 +#define COLLIDER_o48 0x21 +#define COLLIDER_deilit1 0x20 +#define COLLIDER_g56 0x1F +#define COLLIDER_o256k 0x1E +#define COLLIDER_o236 0x1D +#define COLLIDER_kameki 0x1C +#define COLLIDER_o184 0x1B +#define COLLIDER_o183 0x1A +#define COLLIDER_o193k 0x19 +#define COLLIDER_o13 0x18 +#define COLLIDER_o190k 0x17 +#define COLLIDER_o189k 0x16 +#define COLLIDER_tt9 0x15 +#define COLLIDER_kujira 0x14 +#define COLLIDER_o186 0x13 +#define COLLIDER_o50 0x12 +#define COLLIDER_Default 0x11 +#define COLLIDER_kujira_atari 0x10 +#define COLLIDER_o264 0xF +#define COLLIDER_sign 0xE +#define COLLIDER_o212 0xD +#define COLLIDER_deilit9 0xC +#define COLLIDER_o187 0xB +#define COLLIDER_o182 0xA +#define COLLIDER_o181 0x9 +#define COLLIDER_kaimen 0x8 +#define COLLIDER_o206 0x7 +#define COLLIDER_o36 0x6 +#define COLLIDER_g1 0x5 +#define COLLIDER_deilitne 0x4 +#define COLLIDER_deiline 0x3 +#define COLLIDER_o115 0x2 +#define COLLIDER_o107 0x1 +#define COLLIDER_o106 0x0 + +#define ZONE_Root 0xE +#define ZONE_g34 0xD +#define ZONE_o186 0xC +#define ZONE_g33 0xB +#define ZONE_west 0xA +#define ZONE_harbour_club 0x9 +#define ZONE_bar_inn 0x8 +#define ZONE_o85 0x7 +#define ZONE_Default 0x6 +#define ZONE_kaimen 0x5 +#define ZONE_o50 0x4 +#define ZONE_o48 0x3 +#define ZONE_g1 0x2 +#define ZONE_o106 0x1 +#define ZONE_bero 0x0 + diff --git a/include/mapfs/mac_05_shape.h b/include/mapfs/mac_05_shape.h index c4e48c5f3e..12e5fcbe31 100644 --- a/include/mapfs/mac_05_shape.h +++ b/include/mapfs/mac_05_shape.h @@ -1,110 +1,111 @@ -#define MODEL_Root 0x6D -#define MODEL_g37 0x6C -#define MODEL_o200 0x6B -#define MODEL_o199 0x6A -#define MODEL_o198 0x69 -#define MODEL_g36 0x68 -#define MODEL_o196 0x67 -#define MODEL_o195 0x66 -#define MODEL_ls1 0x65 -#define MODEL_g34 0x64 -#define MODEL_kaimen 0x63 -#define MODEL_sakana 0x62 -#define MODEL_o177 0x61 -#define MODEL_kujira 0x60 -#define MODEL_shita 0x5F -#define MODEL_bero 0x5E -#define MODEL_dou 0x5D -#define MODEL_hoppe 0x5C -#define MODEL_onaka 0x5B -#define MODEL_karada 0x5A -#define MODEL_kuchi 0x59 -#define MODEL_o173 0x58 -#define MODEL_hire_hidari 0x57 -#define MODEL_o167 0x56 -#define MODEL_hire_migi 0x55 -#define MODEL_o168 0x54 -#define MODEL_me2 0x53 -#define MODEL_o183 0x52 -#define MODEL_me 0x51 -#define MODEL_o170 0x50 -#define MODEL_to 0x4F -#define MODEL_o152 0x4E -#define MODEL_o151 0x4D -#define MODEL_o148 0x4C -#define MODEL_o147 0x4B -#define MODEL_o150 0x4A -#define MODEL_o149 0x49 -#define MODEL_o142 0x48 -#define MODEL_o143 0x47 -#define MODEL_kanban 0x46 -#define MODEL_o155 0x45 -#define MODEL_o154 0x44 -#define MODEL_harbour_club 0x43 -#define MODEL_kabe4 0x42 -#define MODEL_o157 0x41 -#define MODEL_o156 0x40 -#define MODEL_kabe3 0x3F -#define MODEL_o140 0x3E -#define MODEL_o139 0x3D -#define MODEL_bar_out 0x3C -#define MODEL_kabe2 0x3B -#define MODEL_o137 0x3A -#define MODEL_o134 0x39 -#define MODEL_o133 0x38 -#define MODEL_kabe1 0x37 -#define MODEL_o187 0x36 -#define MODEL_o104 0x35 -#define MODEL_o102 0x34 -#define MODEL_o101 0x33 -#define MODEL_o100 0x32 -#define MODEL_o99 0x31 -#define MODEL_o98 0x30 -#define MODEL_o95 0x2F -#define MODEL_o96 0x2E -#define MODEL_yane 0x2D -#define MODEL_o135 0x2C -#define MODEL_o81 0x2B -#define MODEL_o136 0x2A -#define MODEL_o84 0x29 -#define MODEL_o83 0x28 -#define MODEL_o82 0x27 -#define MODEL_door 0x26 -#define MODEL_o80 0x25 -#define MODEL_bar_inn 0x24 -#define MODEL_o94 0x23 -#define MODEL_o188 0x22 -#define MODEL_o130 0x21 -#define MODEL_o132 0x20 -#define MODEL_o93 0x1F -#define MODEL_o110 0x1E -#define MODEL_o126 0x1D -#define MODEL_table 0x1C -#define MODEL_o92 0x1B -#define MODEL_o91 0x1A -#define MODEL_o90 0x19 -#define MODEL_o88 0x18 -#define MODEL_o87 0x17 -#define MODEL_o86 0x16 -#define MODEL_o85 0x15 -#define MODEL_o190 0x14 -#define MODEL_o131 0x13 -#define MODEL_Default 0x12 -#define MODEL_o193 0x11 -#define MODEL_o192 0x10 -#define MODEL_o191 0xF -#define MODEL_o158 0xE -#define MODEL_o108 0xD -#define MODEL_o35 0xC -#define MODEL_o53 0xB -#define MODEL_g1 0xA -#define MODEL_o178 0x9 -#define MODEL_o121 0x8 -#define MODEL_o122 0x7 -#define MODEL_o116 0x6 -#define MODEL_o115 0x5 -#define MODEL_o107 0x4 -#define MODEL_o106 0x3 -#define MODEL_o3 0x2 -#define MODEL_o13 0x1 -#define MODEL_o12 0x0 +#define MODEL_Root 0x6D +#define MODEL_g37 0x6C +#define MODEL_o200 0x6B +#define MODEL_o199 0x6A +#define MODEL_o198 0x69 +#define MODEL_g36 0x68 +#define MODEL_o196 0x67 +#define MODEL_o195 0x66 +#define MODEL_ls1 0x65 +#define MODEL_g34 0x64 +#define MODEL_kaimen 0x63 +#define MODEL_sakana 0x62 +#define MODEL_o177 0x61 +#define MODEL_kujira 0x60 +#define MODEL_shita 0x5F +#define MODEL_bero 0x5E +#define MODEL_dou 0x5D +#define MODEL_hoppe 0x5C +#define MODEL_onaka 0x5B +#define MODEL_karada 0x5A +#define MODEL_kuchi 0x59 +#define MODEL_o173 0x58 +#define MODEL_hire_hidari 0x57 +#define MODEL_o167 0x56 +#define MODEL_hire_migi 0x55 +#define MODEL_o168 0x54 +#define MODEL_me2 0x53 +#define MODEL_o183 0x52 +#define MODEL_me 0x51 +#define MODEL_o170 0x50 +#define MODEL_to 0x4F +#define MODEL_o152 0x4E +#define MODEL_o151 0x4D +#define MODEL_o148 0x4C +#define MODEL_o147 0x4B +#define MODEL_o150 0x4A +#define MODEL_o149 0x49 +#define MODEL_o142 0x48 +#define MODEL_o143 0x47 +#define MODEL_kanban 0x46 +#define MODEL_o155 0x45 +#define MODEL_o154 0x44 +#define MODEL_harbour_club 0x43 +#define MODEL_kabe4 0x42 +#define MODEL_o157 0x41 +#define MODEL_o156 0x40 +#define MODEL_kabe3 0x3F +#define MODEL_o140 0x3E +#define MODEL_o139 0x3D +#define MODEL_bar_out 0x3C +#define MODEL_kabe2 0x3B +#define MODEL_o137 0x3A +#define MODEL_o134 0x39 +#define MODEL_o133 0x38 +#define MODEL_kabe1 0x37 +#define MODEL_o187 0x36 +#define MODEL_o104 0x35 +#define MODEL_o102 0x34 +#define MODEL_o101 0x33 +#define MODEL_o100 0x32 +#define MODEL_o99 0x31 +#define MODEL_o98 0x30 +#define MODEL_o95 0x2F +#define MODEL_o96 0x2E +#define MODEL_yane 0x2D +#define MODEL_o135 0x2C +#define MODEL_o81 0x2B +#define MODEL_o136 0x2A +#define MODEL_o84 0x29 +#define MODEL_o83 0x28 +#define MODEL_o82 0x27 +#define MODEL_door 0x26 +#define MODEL_o80 0x25 +#define MODEL_bar_inn 0x24 +#define MODEL_o94 0x23 +#define MODEL_o188 0x22 +#define MODEL_o130 0x21 +#define MODEL_o132 0x20 +#define MODEL_o93 0x1F +#define MODEL_o110 0x1E +#define MODEL_o126 0x1D +#define MODEL_table 0x1C +#define MODEL_o92 0x1B +#define MODEL_o91 0x1A +#define MODEL_o90 0x19 +#define MODEL_o88 0x18 +#define MODEL_o87 0x17 +#define MODEL_o86 0x16 +#define MODEL_o85 0x15 +#define MODEL_o190 0x14 +#define MODEL_o131 0x13 +#define MODEL_Default 0x12 +#define MODEL_o193 0x11 +#define MODEL_o192 0x10 +#define MODEL_o191 0xF +#define MODEL_o158 0xE +#define MODEL_o108 0xD +#define MODEL_o35 0xC +#define MODEL_o53 0xB +#define MODEL_g1 0xA +#define MODEL_o178 0x9 +#define MODEL_o121 0x8 +#define MODEL_o122 0x7 +#define MODEL_o116 0x6 +#define MODEL_o115 0x5 +#define MODEL_o107 0x4 +#define MODEL_o106 0x3 +#define MODEL_o3 0x2 +#define MODEL_o13 0x1 +#define MODEL_o12 0x0 + diff --git a/include/mapfs/mac_06_hit.h b/include/mapfs/mac_06_hit.h index e21638b855..4adcb50646 100644 --- a/include/mapfs/mac_06_hit.h +++ b/include/mapfs/mac_06_hit.h @@ -1,3 +1,8 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_Default 0x1 -#define COLLIDER_o217 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_Default 0x1 +#define COLLIDER_o217 0x0 + +#define ZONE_Root 0x2 +#define ZONE_Default 0x1 +#define ZONE_o218 0x0 + diff --git a/include/mapfs/mac_06_shape.h b/include/mapfs/mac_06_shape.h index 8066432429..01dfe4a377 100644 --- a/include/mapfs/mac_06_shape.h +++ b/include/mapfs/mac_06_shape.h @@ -1,25 +1,26 @@ -#define MODEL_Root 0x18 -#define MODEL_ahou 0x17 -#define MODEL_hontai 0x16 -#define MODEL_ls1 0x15 -#define MODEL_g34 0x14 -#define MODEL_o214 0x13 -#define MODEL_g36 0x12 -#define MODEL_o215 0x11 -#define MODEL_kujira 0x10 -#define MODEL_shita 0xF -#define MODEL_bero 0xE -#define MODEL_dou 0xD -#define MODEL_hoppe 0xC -#define MODEL_onaka 0xB -#define MODEL_karada 0xA -#define MODEL_kuchi 0x9 -#define MODEL_o173 0x8 -#define MODEL_hire_hidari 0x7 -#define MODEL_o167 0x6 -#define MODEL_hire_migi 0x5 -#define MODEL_o168 0x4 -#define MODEL_me2 0x3 -#define MODEL_o183 0x2 -#define MODEL_me 0x1 -#define MODEL_o170 0x0 +#define MODEL_Root 0x18 +#define MODEL_ahou 0x17 +#define MODEL_hontai 0x16 +#define MODEL_ls1 0x15 +#define MODEL_g34 0x14 +#define MODEL_o214 0x13 +#define MODEL_g36 0x12 +#define MODEL_o215 0x11 +#define MODEL_kujira 0x10 +#define MODEL_shita 0xF +#define MODEL_bero 0xE +#define MODEL_dou 0xD +#define MODEL_hoppe 0xC +#define MODEL_onaka 0xB +#define MODEL_karada 0xA +#define MODEL_kuchi 0x9 +#define MODEL_o173 0x8 +#define MODEL_hire_hidari 0x7 +#define MODEL_o167 0x6 +#define MODEL_hire_migi 0x5 +#define MODEL_o168 0x4 +#define MODEL_me2 0x3 +#define MODEL_o183 0x2 +#define MODEL_me 0x1 +#define MODEL_o170 0x0 + diff --git a/include/mapfs/mac_bt01_hit.h b/include/mapfs/mac_bt01_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/mac_bt01_hit.h +++ b/include/mapfs/mac_bt01_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/mac_bt01_shape.h b/include/mapfs/mac_bt01_shape.h index af59778a31..eecc32f16c 100644 --- a/include/mapfs/mac_bt01_shape.h +++ b/include/mapfs/mac_bt01_shape.h @@ -1,50 +1,51 @@ -#define MODEL_Root 0x31 -#define MODEL_g77 0x30 -#define MODEL_nami3 0x2F -#define MODEL_nami2 0x2E -#define MODEL_nami1 0x2D -#define MODEL_nami4 0x2C -#define MODEL_hasi 0x2B -#define MODEL_yuka1_2 0x2A -#define MODEL_g78 0x29 -#define MODEL_o391 0x28 -#define MODEL_g72 0x27 -#define MODEL_waku4 0x26 -#define MODEL_waku3 0x25 -#define MODEL_waku2 0x24 -#define MODEL_hk7_1 0x23 -#define MODEL_hk7_2 0x22 -#define MODEL_hk6_1 0x21 -#define MODEL_hk6_2 0x20 -#define MODEL_hk5_1 0x1F -#define MODEL_hk5_2 0x1E -#define MODEL_hk4_1 0x1D -#define MODEL_hk4_2 0x1C -#define MODEL_hk3_1 0x1B -#define MODEL_hk3_2 0x1A -#define MODEL_hk2_1 0x19 -#define MODEL_hk2_2 0x18 -#define MODEL_tou1 0x17 -#define MODEL_tou2 0x16 -#define MODEL_uki 0x15 -#define MODEL_yuka1_2b 0x14 -#define MODEL_uki2 0x13 -#define MODEL_yuka3 0x12 -#define MODEL_yuka1 0x11 -#define MODEL_kabe2 0x10 -#define MODEL_h6 0xF -#define MODEL_h5 0xE -#define MODEL_h4 0xD -#define MODEL_h3 0xC -#define MODEL_h2 0xB -#define MODEL_h1 0xA -#define MODEL_saku2 0x9 -#define MODEL_saku1 0x8 -#define MODEL_ha 0x7 -#define MODEL_miki 0x6 -#define MODEL_waku 0x5 -#define MODEL_dai 0x4 -#define MODEL_waku1 0x3 -#define MODEL_yuka 0x2 -#define MODEL_hako1 0x1 -#define MODEL_o382 0x0 +#define MODEL_Root 0x31 +#define MODEL_g77 0x30 +#define MODEL_nami3 0x2F +#define MODEL_nami2 0x2E +#define MODEL_nami1 0x2D +#define MODEL_nami4 0x2C +#define MODEL_hasi 0x2B +#define MODEL_yuka1_2 0x2A +#define MODEL_g78 0x29 +#define MODEL_o391 0x28 +#define MODEL_g72 0x27 +#define MODEL_waku4 0x26 +#define MODEL_waku3 0x25 +#define MODEL_waku2 0x24 +#define MODEL_hk7_1 0x23 +#define MODEL_hk7_2 0x22 +#define MODEL_hk6_1 0x21 +#define MODEL_hk6_2 0x20 +#define MODEL_hk5_1 0x1F +#define MODEL_hk5_2 0x1E +#define MODEL_hk4_1 0x1D +#define MODEL_hk4_2 0x1C +#define MODEL_hk3_1 0x1B +#define MODEL_hk3_2 0x1A +#define MODEL_hk2_1 0x19 +#define MODEL_hk2_2 0x18 +#define MODEL_tou1 0x17 +#define MODEL_tou2 0x16 +#define MODEL_uki 0x15 +#define MODEL_yuka1_2b 0x14 +#define MODEL_uki2 0x13 +#define MODEL_yuka3 0x12 +#define MODEL_yuka1 0x11 +#define MODEL_kabe2 0x10 +#define MODEL_h6 0xF +#define MODEL_h5 0xE +#define MODEL_h4 0xD +#define MODEL_h3 0xC +#define MODEL_h2 0xB +#define MODEL_h1 0xA +#define MODEL_saku2 0x9 +#define MODEL_saku1 0x8 +#define MODEL_ha 0x7 +#define MODEL_miki 0x6 +#define MODEL_waku 0x5 +#define MODEL_dai 0x4 +#define MODEL_waku1 0x3 +#define MODEL_yuka 0x2 +#define MODEL_hako1 0x1 +#define MODEL_o382 0x0 + diff --git a/include/mapfs/mac_bt02_hit.h b/include/mapfs/mac_bt02_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/mac_bt02_hit.h +++ b/include/mapfs/mac_bt02_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/mac_bt02_shape.h b/include/mapfs/mac_bt02_shape.h index 65cf340d18..1cb59dd4a0 100644 --- a/include/mapfs/mac_bt02_shape.h +++ b/include/mapfs/mac_bt02_shape.h @@ -1,12 +1,13 @@ -#define MODEL_Root 0xB -#define MODEL_g76 0xA -#define MODEL_syo 0x9 -#define MODEL_yuka 0x8 -#define MODEL_o341 0x7 -#define MODEL_o339 0x6 -#define MODEL_o338 0x5 -#define MODEL_o337 0x4 -#define MODEL_dai 0x3 -#define MODEL_waku1 0x2 -#define MODEL_g49 0x1 -#define MODEL_waku2 0x0 +#define MODEL_Root 0xB +#define MODEL_g76 0xA +#define MODEL_syo 0x9 +#define MODEL_yuka 0x8 +#define MODEL_o341 0x7 +#define MODEL_o339 0x6 +#define MODEL_o338 0x5 +#define MODEL_o337 0x4 +#define MODEL_dai 0x3 +#define MODEL_waku1 0x2 +#define MODEL_g49 0x1 +#define MODEL_waku2 0x0 + diff --git a/include/mapfs/machi_hit.h b/include/mapfs/machi_hit.h index 1691e743e7..a48dd444f5 100644 --- a/include/mapfs/machi_hit.h +++ b/include/mapfs/machi_hit.h @@ -1,27 +1,34 @@ -#define COLLIDER_Root 0x1A -#define COLLIDER_nw 0x19 -#define COLLIDER_deilitnw 0x18 -#define COLLIDER_deilinw 0x17 -#define COLLIDER_w 0x16 -#define COLLIDER_deilitw 0x15 -#define COLLIDER_deiliw 0x14 -#define COLLIDER_sw 0x13 -#define COLLIDER_deilitsw 0x12 -#define COLLIDER_deilisw 0x11 -#define COLLIDER_s 0x10 -#define COLLIDER_deilits 0xF -#define COLLIDER_deilis 0xE -#define COLLIDER_se 0xD -#define COLLIDER_deilitse 0xC -#define COLLIDER_deilise 0xB -#define COLLIDER_e 0xA -#define COLLIDER_deilite 0x9 -#define COLLIDER_deilie 0x8 -#define COLLIDER_ne 0x7 -#define COLLIDER_deilitne 0x6 -#define COLLIDER_deiline 0x5 -#define COLLIDER_0 0x4 -#define COLLIDER_deilitn 0x3 -#define COLLIDER_deilin 0x2 -#define COLLIDER_g1 0x1 -#define COLLIDER_stage 0x0 +#define COLLIDER_Root 0x1A +#define COLLIDER_nw 0x19 +#define COLLIDER_deilitnw 0x18 +#define COLLIDER_deilinw 0x17 +#define COLLIDER_w 0x16 +#define COLLIDER_deilitw 0x15 +#define COLLIDER_deiliw 0x14 +#define COLLIDER_sw 0x13 +#define COLLIDER_deilitsw 0x12 +#define COLLIDER_deilisw 0x11 +#define COLLIDER_s 0x10 +#define COLLIDER_deilits 0xF +#define COLLIDER_deilis 0xE +#define COLLIDER_se 0xD +#define COLLIDER_deilitse 0xC +#define COLLIDER_deilise 0xB +#define COLLIDER_e 0xA +#define COLLIDER_deilite 0x9 +#define COLLIDER_deilie 0x8 +#define COLLIDER_ne 0x7 +#define COLLIDER_deilitne 0x6 +#define COLLIDER_deiline 0x5 +#define COLLIDER_0 0x4 +#define COLLIDER_deilitn 0x3 +#define COLLIDER_deilin 0x2 +#define COLLIDER_g1 0x1 +#define COLLIDER_stage 0x0 + +#define ZONE_Root 0x4 +#define ZONE_Default 0x3 +#define ZONE_o174 0x2 +#define ZONE_g1 0x1 +#define ZONE_stage 0x0 + diff --git a/include/mapfs/machi_shape.h b/include/mapfs/machi_shape.h index 0f52700ff2..df829badd7 100644 --- a/include/mapfs/machi_shape.h +++ b/include/mapfs/machi_shape.h @@ -1,52 +1,53 @@ -#define MODEL_Root 0x33 -#define MODEL_7 0x32 -#define MODEL_o146 0x31 -#define MODEL_deili7 0x30 -#define MODEL_o134 0x2F -#define MODEL_6 0x2E -#define MODEL_o143 0x2D -#define MODEL_deili6 0x2C -#define MODEL_o111 0x2B -#define MODEL_5 0x2A -#define MODEL_o148 0x29 -#define MODEL_deili5 0x28 -#define MODEL_o138 0x27 -#define MODEL_4 0x26 -#define MODEL_o140 0x25 -#define MODEL_deili4 0x24 -#define MODEL_o128 0x23 -#define MODEL_3 0x22 -#define MODEL_o145 0x21 -#define MODEL_deili3 0x20 -#define MODEL_o132 0x1F -#define MODEL_2 0x1E -#define MODEL_o144 0x1D -#define MODEL_deili2 0x1C -#define MODEL_o113 0x1B -#define MODEL_1 0x1A -#define MODEL_o147 0x19 -#define MODEL_deili1 0x18 -#define MODEL_o136 0x17 -#define MODEL_0 0x16 -#define MODEL_o142 0x15 -#define MODEL_deili0 0x14 -#define MODEL_o130 0x13 -#define MODEL_g1 0x12 -#define MODEL_o173 0x11 -#define MODEL_o172 0x10 -#define MODEL_o170 0xF -#define MODEL_o169 0xE -#define MODEL_o167 0xD -#define MODEL_o166 0xC -#define MODEL_o164 0xB -#define MODEL_o163 0xA -#define MODEL_o161 0x9 -#define MODEL_o160 0x8 -#define MODEL_o158 0x7 -#define MODEL_o157 0x6 -#define MODEL_o155 0x5 -#define MODEL_o154 0x4 -#define MODEL_o152 0x3 -#define MODEL_o151 0x2 -#define MODEL_stage 0x1 -#define MODEL_frame 0x0 +#define MODEL_Root 0x33 +#define MODEL_7 0x32 +#define MODEL_o146 0x31 +#define MODEL_deili7 0x30 +#define MODEL_o134 0x2F +#define MODEL_6 0x2E +#define MODEL_o143 0x2D +#define MODEL_deili6 0x2C +#define MODEL_o111 0x2B +#define MODEL_5 0x2A +#define MODEL_o148 0x29 +#define MODEL_deili5 0x28 +#define MODEL_o138 0x27 +#define MODEL_4 0x26 +#define MODEL_o140 0x25 +#define MODEL_deili4 0x24 +#define MODEL_o128 0x23 +#define MODEL_3 0x22 +#define MODEL_o145 0x21 +#define MODEL_deili3 0x20 +#define MODEL_o132 0x1F +#define MODEL_2 0x1E +#define MODEL_o144 0x1D +#define MODEL_deili2 0x1C +#define MODEL_o113 0x1B +#define MODEL_1 0x1A +#define MODEL_o147 0x19 +#define MODEL_deili1 0x18 +#define MODEL_o136 0x17 +#define MODEL_0 0x16 +#define MODEL_o142 0x15 +#define MODEL_deili0 0x14 +#define MODEL_o130 0x13 +#define MODEL_g1 0x12 +#define MODEL_o173 0x11 +#define MODEL_o172 0x10 +#define MODEL_o170 0xF +#define MODEL_o169 0xE +#define MODEL_o167 0xD +#define MODEL_o166 0xC +#define MODEL_o164 0xB +#define MODEL_o163 0xA +#define MODEL_o161 0x9 +#define MODEL_o160 0x8 +#define MODEL_o158 0x7 +#define MODEL_o157 0x6 +#define MODEL_o155 0x5 +#define MODEL_o154 0x4 +#define MODEL_o152 0x3 +#define MODEL_o151 0x2 +#define MODEL_stage 0x1 +#define MODEL_frame 0x0 + diff --git a/include/mapfs/mgm_00_hit.h b/include/mapfs/mgm_00_hit.h index 1544cc6989..bce3cab50f 100644 --- a/include/mapfs/mgm_00_hit.h +++ b/include/mapfs/mgm_00_hit.h @@ -1,16 +1,22 @@ -#define COLLIDER_Root 0xF -#define COLLIDER_Default 0xE -#define COLLIDER_o14 0xD -#define COLLIDER_o9 0xC -#define COLLIDER_o5 0xB -#define COLLIDER_o2 0xA -#define COLLIDER_o13 0x9 -#define COLLIDER_g1 0x8 -#define COLLIDER_g2 0x7 -#define COLLIDER_score2 0x6 -#define COLLIDER_score1 0x5 -#define COLLIDER_counter 0x4 -#define COLLIDER_deili3 0x3 -#define COLLIDER_deili2 0x2 -#define COLLIDER_deili1 0x1 -#define COLLIDER_o1 0x0 +#define COLLIDER_Root 0xF +#define COLLIDER_Default 0xE +#define COLLIDER_o14 0xD +#define COLLIDER_o9 0xC +#define COLLIDER_o5 0xB +#define COLLIDER_o2 0xA +#define COLLIDER_o13 0x9 +#define COLLIDER_g1 0x8 +#define COLLIDER_g2 0x7 +#define COLLIDER_score2 0x6 +#define COLLIDER_score1 0x5 +#define COLLIDER_counter 0x4 +#define COLLIDER_deili3 0x3 +#define COLLIDER_deili2 0x2 +#define COLLIDER_deili1 0x1 +#define COLLIDER_o1 0x0 + +#define ZONE_Root 0x3 +#define ZONE_g1 0x2 +#define ZONE_g2 0x1 +#define ZONE_o1 0x0 + diff --git a/include/mapfs/mgm_00_shape.h b/include/mapfs/mgm_00_shape.h index 06dcbdf31e..629d25ae4d 100644 --- a/include/mapfs/mgm_00_shape.h +++ b/include/mapfs/mgm_00_shape.h @@ -1,14 +1,15 @@ -#define MODEL_Root 0xD -#define MODEL_Default 0xC -#define MODEL_o18 0xB -#define MODEL_o16 0xA -#define MODEL_o12 0x9 -#define MODEL_o17 0x8 -#define MODEL_o9 0x7 -#define MODEL_o7 0x6 -#define MODEL_o5 0x5 -#define MODEL_o2 0x4 -#define MODEL_g1 0x3 -#define MODEL_g2 0x2 -#define MODEL_o15 0x1 -#define MODEL_o13 0x0 +#define MODEL_Root 0xD +#define MODEL_Default 0xC +#define MODEL_o18 0xB +#define MODEL_o16 0xA +#define MODEL_o12 0x9 +#define MODEL_o17 0x8 +#define MODEL_o9 0x7 +#define MODEL_o7 0x6 +#define MODEL_o5 0x5 +#define MODEL_o2 0x4 +#define MODEL_g1 0x3 +#define MODEL_g2 0x2 +#define MODEL_o15 0x1 +#define MODEL_o13 0x0 + diff --git a/include/mapfs/mgm_01_hit.h b/include/mapfs/mgm_01_hit.h index 2065c8b13c..769ff8b01b 100644 --- a/include/mapfs/mgm_01_hit.h +++ b/include/mapfs/mgm_01_hit.h @@ -1,3 +1,8 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_Default 0x1 -#define COLLIDER_o49 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_Default 0x1 +#define COLLIDER_o49 0x0 + +#define ZONE_Root 0x2 +#define ZONE_g1 0x1 +#define ZONE_o36 0x0 + diff --git a/include/mapfs/mgm_01_shape.h b/include/mapfs/mgm_01_shape.h index 78dffda39d..481be6fee2 100644 --- a/include/mapfs/mgm_01_shape.h +++ b/include/mapfs/mgm_01_shape.h @@ -1,40 +1,41 @@ -#define MODEL_Root 0x27 -#define MODEL_ls5 0x26 -#define MODEL_suka_2 0x25 -#define MODEL_o72 0x24 -#define MODEL_suka 0x23 -#define MODEL_o55 0x22 -#define MODEL_ls4 0x21 -#define MODEL_3times_2 0x20 -#define MODEL_o69 0x1F -#define MODEL_3times_1 0x1E -#define MODEL_o54 0x1D -#define MODEL_ls3 0x1C -#define MODEL_3coins_3 0x1B -#define MODEL_o73 0x1A -#define MODEL_3coins_2 0x19 -#define MODEL_o68 0x18 -#define MODEL_3coins_1 0x17 -#define MODEL_o53 0x16 -#define MODEL_ls1 0x15 -#define MODEL_1coin_4 0x14 -#define MODEL_o64 0x13 -#define MODEL_1coin_3 0x12 -#define MODEL_o65 0x11 -#define MODEL_1coin_2 0x10 -#define MODEL_o66 0xF -#define MODEL_1coin_1 0xE -#define MODEL_o67 0xD -#define MODEL_Default 0xC -#define MODEL_o49 0xB -#define MODEL_g1 0xA -#define MODEL_g2 0x9 -#define MODEL_o48 0x8 -#define MODEL_o43 0x7 -#define MODEL_o17 0x6 -#define MODEL_g8 0x5 -#define MODEL_o38 0x4 -#define MODEL_g12 0x3 -#define MODEL_o37 0x2 -#define MODEL_g5 0x1 -#define MODEL_o36 0x0 +#define MODEL_Root 0x27 +#define MODEL_ls5 0x26 +#define MODEL_suka_2 0x25 +#define MODEL_o72 0x24 +#define MODEL_suka 0x23 +#define MODEL_o55 0x22 +#define MODEL_ls4 0x21 +#define MODEL_3times_2 0x20 +#define MODEL_o69 0x1F +#define MODEL_3times_1 0x1E +#define MODEL_o54 0x1D +#define MODEL_ls3 0x1C +#define MODEL_3coins_3 0x1B +#define MODEL_o73 0x1A +#define MODEL_3coins_2 0x19 +#define MODEL_o68 0x18 +#define MODEL_3coins_1 0x17 +#define MODEL_o53 0x16 +#define MODEL_ls1 0x15 +#define MODEL_1coin_4 0x14 +#define MODEL_o64 0x13 +#define MODEL_1coin_3 0x12 +#define MODEL_o65 0x11 +#define MODEL_1coin_2 0x10 +#define MODEL_o66 0xF +#define MODEL_1coin_1 0xE +#define MODEL_o67 0xD +#define MODEL_Default 0xC +#define MODEL_o49 0xB +#define MODEL_g1 0xA +#define MODEL_g2 0x9 +#define MODEL_o48 0x8 +#define MODEL_o43 0x7 +#define MODEL_o17 0x6 +#define MODEL_g8 0x5 +#define MODEL_o38 0x4 +#define MODEL_g12 0x3 +#define MODEL_o37 0x2 +#define MODEL_g5 0x1 +#define MODEL_o36 0x0 + diff --git a/include/mapfs/mgm_02_hit.h b/include/mapfs/mgm_02_hit.h index 9cc375d564..add4505a04 100644 --- a/include/mapfs/mgm_02_hit.h +++ b/include/mapfs/mgm_02_hit.h @@ -1,53 +1,62 @@ -#define COLLIDER_Root 0x34 -#define COLLIDER_blocks 0x33 -#define COLLIDER_g 0x32 -#define COLLIDER_g5 0x31 -#define COLLIDER_g4 0x30 -#define COLLIDER_g3 0x2F -#define COLLIDER_g2 0x2E -#define COLLIDER_g1 0x2D -#define COLLIDER_f 0x2C -#define COLLIDER_f5 0x2B -#define COLLIDER_f4 0x2A -#define COLLIDER_f3 0x29 -#define COLLIDER_f2 0x28 -#define COLLIDER_f1 0x27 -#define COLLIDER_e 0x26 -#define COLLIDER_e5 0x25 -#define COLLIDER_e4 0x24 -#define COLLIDER_e3 0x23 -#define COLLIDER_e2 0x22 -#define COLLIDER_e1 0x21 -#define COLLIDER_d 0x20 -#define COLLIDER_d5 0x1F -#define COLLIDER_d4 0x1E -#define COLLIDER_d3 0x1D -#define COLLIDER_d2 0x1C -#define COLLIDER_d1 0x1B -#define COLLIDER_c 0x1A -#define COLLIDER_c5 0x19 -#define COLLIDER_c4 0x18 -#define COLLIDER_c3 0x17 -#define COLLIDER_c2 0x16 -#define COLLIDER_c1 0x15 -#define COLLIDER_b 0x14 -#define COLLIDER_b5 0x13 -#define COLLIDER_b4 0x12 -#define COLLIDER_b3 0x11 -#define COLLIDER_b2 0x10 -#define COLLIDER_b1 0xF -#define COLLIDER_a 0xE -#define COLLIDER_a5 0xD -#define COLLIDER_a4 0xC -#define COLLIDER_a3 0xB -#define COLLIDER_a2 0xA -#define COLLIDER_a1 0x9 -#define COLLIDER_Default 0x8 -#define COLLIDER_o49 0x7 -#define COLLIDER_o47 0x6 -#define COLLIDER_o12 0x5 -#define COLLIDER_o6 0x4 -#define COLLIDER_o5 0x3 -#define COLLIDER_o4 0x2 -#define COLLIDER_o3 0x1 -#define COLLIDER_o2 0x0 +#define COLLIDER_Root 0x34 +#define COLLIDER_blocks 0x33 +#define COLLIDER_g 0x32 +#define COLLIDER_g5 0x31 +#define COLLIDER_g4 0x30 +#define COLLIDER_g3 0x2F +#define COLLIDER_g2 0x2E +#define COLLIDER_g1 0x2D +#define COLLIDER_f 0x2C +#define COLLIDER_f5 0x2B +#define COLLIDER_f4 0x2A +#define COLLIDER_f3 0x29 +#define COLLIDER_f2 0x28 +#define COLLIDER_f1 0x27 +#define COLLIDER_e 0x26 +#define COLLIDER_e5 0x25 +#define COLLIDER_e4 0x24 +#define COLLIDER_e3 0x23 +#define COLLIDER_e2 0x22 +#define COLLIDER_e1 0x21 +#define COLLIDER_d 0x20 +#define COLLIDER_d5 0x1F +#define COLLIDER_d4 0x1E +#define COLLIDER_d3 0x1D +#define COLLIDER_d2 0x1C +#define COLLIDER_d1 0x1B +#define COLLIDER_c 0x1A +#define COLLIDER_c5 0x19 +#define COLLIDER_c4 0x18 +#define COLLIDER_c3 0x17 +#define COLLIDER_c2 0x16 +#define COLLIDER_c1 0x15 +#define COLLIDER_b 0x14 +#define COLLIDER_b5 0x13 +#define COLLIDER_b4 0x12 +#define COLLIDER_b3 0x11 +#define COLLIDER_b2 0x10 +#define COLLIDER_b1 0xF +#define COLLIDER_a 0xE +#define COLLIDER_a5 0xD +#define COLLIDER_a4 0xC +#define COLLIDER_a3 0xB +#define COLLIDER_a2 0xA +#define COLLIDER_a1 0x9 +#define COLLIDER_Default 0x8 +#define COLLIDER_o49 0x7 +#define COLLIDER_o47 0x6 +#define COLLIDER_o12 0x5 +#define COLLIDER_o6 0x4 +#define COLLIDER_o5 0x3 +#define COLLIDER_o4 0x2 +#define COLLIDER_o3 0x1 +#define COLLIDER_o2 0x0 + +#define ZONE_Root 0x6 +#define ZONE_Default 0x5 +#define ZONE_o6 0x4 +#define ZONE_o5 0x3 +#define ZONE_o4 0x2 +#define ZONE_o3 0x1 +#define ZONE_o2 0x0 + diff --git a/include/mapfs/mgm_02_shape.h b/include/mapfs/mgm_02_shape.h index 3aa84ac1b3..2964c3a577 100644 --- a/include/mapfs/mgm_02_shape.h +++ b/include/mapfs/mgm_02_shape.h @@ -1,74 +1,75 @@ -#define MODEL_Root 0x49 -#define MODEL_ls1 0x48 -#define MODEL_peach0 0x47 -#define MODEL_o59 0x46 -#define MODEL_peach9 0x45 -#define MODEL_o58 0x44 -#define MODEL_peach8 0x43 -#define MODEL_o57 0x42 -#define MODEL_peach7 0x41 -#define MODEL_o56 0x40 -#define MODEL_peach6 0x3F -#define MODEL_o55 0x3E -#define MODEL_peach5 0x3D -#define MODEL_o54 0x3C -#define MODEL_peach4 0x3B -#define MODEL_o53 0x3A -#define MODEL_peach3 0x39 -#define MODEL_o52 0x38 -#define MODEL_peach2 0x37 -#define MODEL_o51 0x36 -#define MODEL_peach1 0x35 -#define MODEL_o50 0x34 -#define MODEL_blocks 0x33 -#define MODEL_g 0x32 -#define MODEL_g5 0x31 -#define MODEL_g4 0x30 -#define MODEL_g3 0x2F -#define MODEL_g2 0x2E -#define MODEL_g1 0x2D -#define MODEL_f 0x2C -#define MODEL_f5 0x2B -#define MODEL_f4 0x2A -#define MODEL_f3 0x29 -#define MODEL_f2 0x28 -#define MODEL_f1 0x27 -#define MODEL_e 0x26 -#define MODEL_e5 0x25 -#define MODEL_e4 0x24 -#define MODEL_e3 0x23 -#define MODEL_e2 0x22 -#define MODEL_e1 0x21 -#define MODEL_d 0x20 -#define MODEL_d5 0x1F -#define MODEL_d4 0x1E -#define MODEL_d3 0x1D -#define MODEL_d2 0x1C -#define MODEL_d1 0x1B -#define MODEL_c 0x1A -#define MODEL_c5 0x19 -#define MODEL_c4 0x18 -#define MODEL_c3 0x17 -#define MODEL_c2 0x16 -#define MODEL_c1 0x15 -#define MODEL_b 0x14 -#define MODEL_b5 0x13 -#define MODEL_b4 0x12 -#define MODEL_b3 0x11 -#define MODEL_b2 0x10 -#define MODEL_b1 0xF -#define MODEL_a 0xE -#define MODEL_a5 0xD -#define MODEL_a4 0xC -#define MODEL_a3 0xB -#define MODEL_a2 0xA -#define MODEL_a1 0x9 -#define MODEL_Default 0x8 -#define MODEL_o49 0x7 -#define MODEL_o12 0x6 -#define MODEL_o6 0x5 -#define MODEL_o5 0x4 -#define MODEL_o4 0x3 -#define MODEL_o3 0x2 -#define MODEL_o2 0x1 -#define MODEL_o47 0x0 +#define MODEL_Root 0x49 +#define MODEL_ls1 0x48 +#define MODEL_peach0 0x47 +#define MODEL_o59 0x46 +#define MODEL_peach9 0x45 +#define MODEL_o58 0x44 +#define MODEL_peach8 0x43 +#define MODEL_o57 0x42 +#define MODEL_peach7 0x41 +#define MODEL_o56 0x40 +#define MODEL_peach6 0x3F +#define MODEL_o55 0x3E +#define MODEL_peach5 0x3D +#define MODEL_o54 0x3C +#define MODEL_peach4 0x3B +#define MODEL_o53 0x3A +#define MODEL_peach3 0x39 +#define MODEL_o52 0x38 +#define MODEL_peach2 0x37 +#define MODEL_o51 0x36 +#define MODEL_peach1 0x35 +#define MODEL_o50 0x34 +#define MODEL_blocks 0x33 +#define MODEL_g 0x32 +#define MODEL_g5 0x31 +#define MODEL_g4 0x30 +#define MODEL_g3 0x2F +#define MODEL_g2 0x2E +#define MODEL_g1 0x2D +#define MODEL_f 0x2C +#define MODEL_f5 0x2B +#define MODEL_f4 0x2A +#define MODEL_f3 0x29 +#define MODEL_f2 0x28 +#define MODEL_f1 0x27 +#define MODEL_e 0x26 +#define MODEL_e5 0x25 +#define MODEL_e4 0x24 +#define MODEL_e3 0x23 +#define MODEL_e2 0x22 +#define MODEL_e1 0x21 +#define MODEL_d 0x20 +#define MODEL_d5 0x1F +#define MODEL_d4 0x1E +#define MODEL_d3 0x1D +#define MODEL_d2 0x1C +#define MODEL_d1 0x1B +#define MODEL_c 0x1A +#define MODEL_c5 0x19 +#define MODEL_c4 0x18 +#define MODEL_c3 0x17 +#define MODEL_c2 0x16 +#define MODEL_c1 0x15 +#define MODEL_b 0x14 +#define MODEL_b5 0x13 +#define MODEL_b4 0x12 +#define MODEL_b3 0x11 +#define MODEL_b2 0x10 +#define MODEL_b1 0xF +#define MODEL_a 0xE +#define MODEL_a5 0xD +#define MODEL_a4 0xC +#define MODEL_a3 0xB +#define MODEL_a2 0xA +#define MODEL_a1 0x9 +#define MODEL_Default 0x8 +#define MODEL_o49 0x7 +#define MODEL_o12 0x6 +#define MODEL_o6 0x5 +#define MODEL_o5 0x4 +#define MODEL_o4 0x3 +#define MODEL_o3 0x2 +#define MODEL_o2 0x1 +#define MODEL_o47 0x0 + diff --git a/include/mapfs/mgm_03_hit.h b/include/mapfs/mgm_03_hit.h index 782c8f74bb..f71921d48b 100644 --- a/include/mapfs/mgm_03_hit.h +++ b/include/mapfs/mgm_03_hit.h @@ -1,9 +1,14 @@ -#define COLLIDER_Root 0x8 -#define COLLIDER_Default 0x7 -#define COLLIDER_o93 0x6 -#define COLLIDER_o92 0x5 -#define COLLIDER_24kaku 0x4 -#define COLLIDER_18kaku 0x3 -#define COLLIDER_16kaku 0x2 -#define COLLIDER_12kaku 0x1 -#define COLLIDER_o82 0x0 +#define COLLIDER_Root 0x8 +#define COLLIDER_Default 0x7 +#define COLLIDER_o93 0x6 +#define COLLIDER_o92 0x5 +#define COLLIDER_24kaku 0x4 +#define COLLIDER_18kaku 0x3 +#define COLLIDER_16kaku 0x2 +#define COLLIDER_12kaku 0x1 +#define COLLIDER_o82 0x0 + +#define ZONE_Root 0x2 +#define ZONE_Default 0x1 +#define ZONE_o82 0x0 + diff --git a/include/mapfs/mgm_03_shape.h b/include/mapfs/mgm_03_shape.h index f083ae60fa..74bf24ee50 100644 --- a/include/mapfs/mgm_03_shape.h +++ b/include/mapfs/mgm_03_shape.h @@ -1,9 +1,10 @@ -#define MODEL_Root 0x8 -#define MODEL_Default 0x7 -#define MODEL_o93 0x6 -#define MODEL_o92 0x5 -#define MODEL_24kaku 0x4 -#define MODEL_18kaku 0x3 -#define MODEL_16kaku 0x2 -#define MODEL_12kaku 0x1 -#define MODEL_o82 0x0 +#define MODEL_Root 0x8 +#define MODEL_Default 0x7 +#define MODEL_o93 0x6 +#define MODEL_o92 0x5 +#define MODEL_24kaku 0x4 +#define MODEL_18kaku 0x3 +#define MODEL_16kaku 0x2 +#define MODEL_12kaku 0x1 +#define MODEL_o82 0x0 + diff --git a/include/mapfs/mim_01_hit.h b/include/mapfs/mim_01_hit.h index a97f61c915..e7e13a6f8a 100644 --- a/include/mapfs/mim_01_hit.h +++ b/include/mapfs/mim_01_hit.h @@ -1,35 +1,50 @@ -#define COLLIDER_Root 0x22 -#define COLLIDER_g128 0x21 -#define COLLIDER_monw 0x20 -#define COLLIDER_g127 0x1F -#define COLLIDER_mons 0x1E -#define COLLIDER_g130 0x1D -#define COLLIDER_mone 0x1C -#define COLLIDER_g129 0x1B -#define COLLIDER_monn 0x1A -#define COLLIDER_atari 0x19 -#define COLLIDER_atari_kusa 0x18 -#define COLLIDER_road 0x17 -#define COLLIDER_maru 0x16 -#define COLLIDER_o434 0x15 -#define COLLIDER_exit 0x14 -#define COLLIDER_exitw 0x13 -#define COLLIDER_ttw 0x12 -#define COLLIDER_nw 0x11 -#define COLLIDER_deiliw 0x10 -#define COLLIDER_deilitw 0xF -#define COLLIDER_exits 0xE -#define COLLIDER_tts 0xD -#define COLLIDER_ns 0xC -#define COLLIDER_deilis 0xB -#define COLLIDER_deilits 0xA -#define COLLIDER_exite 0x9 -#define COLLIDER_tte 0x8 -#define COLLIDER_ne 0x7 -#define COLLIDER_deilie 0x6 -#define COLLIDER_deilite 0x5 -#define COLLIDER_exitn 0x4 -#define COLLIDER_ttn 0x3 -#define COLLIDER_nn 0x2 -#define COLLIDER_deilin 0x1 -#define COLLIDER_deilitn 0x0 +#define COLLIDER_Root 0x22 +#define COLLIDER_g128 0x21 +#define COLLIDER_monw 0x20 +#define COLLIDER_g127 0x1F +#define COLLIDER_mons 0x1E +#define COLLIDER_g130 0x1D +#define COLLIDER_mone 0x1C +#define COLLIDER_g129 0x1B +#define COLLIDER_monn 0x1A +#define COLLIDER_atari 0x19 +#define COLLIDER_atari_kusa 0x18 +#define COLLIDER_road 0x17 +#define COLLIDER_maru 0x16 +#define COLLIDER_o434 0x15 +#define COLLIDER_exit 0x14 +#define COLLIDER_exitw 0x13 +#define COLLIDER_ttw 0x12 +#define COLLIDER_nw 0x11 +#define COLLIDER_deiliw 0x10 +#define COLLIDER_deilitw 0xF +#define COLLIDER_exits 0xE +#define COLLIDER_tts 0xD +#define COLLIDER_ns 0xC +#define COLLIDER_deilis 0xB +#define COLLIDER_deilits 0xA +#define COLLIDER_exite 0x9 +#define COLLIDER_tte 0x8 +#define COLLIDER_ne 0x7 +#define COLLIDER_deilie 0x6 +#define COLLIDER_deilite 0x5 +#define COLLIDER_exitn 0x4 +#define COLLIDER_ttn 0x3 +#define COLLIDER_nn 0x2 +#define COLLIDER_deilin 0x1 +#define COLLIDER_deilitn 0x0 + +#define ZONE_Root 0xC +#define ZONE_enter 0xB +#define ZONE_north 0xA +#define ZONE_south 0x9 +#define ZONE_west 0x8 +#define ZONE_east 0x7 +#define ZONE_out 0x6 +#define ZONE_kita 0x5 +#define ZONE_minami 0x4 +#define ZONE_nishi 0x3 +#define ZONE_higashi 0x2 +#define ZONE_kaiten 0x1 +#define ZONE_stage 0x0 + diff --git a/include/mapfs/mim_01_shape.h b/include/mapfs/mim_01_shape.h index bff90c9e35..b0bafe26f0 100644 --- a/include/mapfs/mim_01_shape.h +++ b/include/mapfs/mim_01_shape.h @@ -1,167 +1,168 @@ -#define MODEL_Root 0xA6 -#define MODEL_mon 0xA5 -#define MODEL_monw 0xA4 -#define MODEL_w2 0xA3 -#define MODEL_w1 0xA2 -#define MODEL_mons 0xA1 -#define MODEL_s2 0xA0 -#define MODEL_s1 0x9F -#define MODEL_mone 0x9E -#define MODEL_e2 0x9D -#define MODEL_e1 0x9C -#define MODEL_monn 0x9B -#define MODEL_n2 0x9A -#define MODEL_n1 0x99 -#define MODEL_g130 0x98 -#define MODEL_o474 0x97 -#define MODEL_o473 0x96 -#define MODEL_o472 0x95 -#define MODEL_o471 0x94 -#define MODEL_kirikabu 0x93 -#define MODEL_o312 0x92 -#define MODEL_o311 0x91 -#define MODEL_ki_soto 0x90 -#define MODEL_g34 0x8F -#define MODEL_o187 0x8E -#define MODEL_o188 0x8D -#define MODEL_o186 0x8C -#define MODEL_o184 0x8B -#define MODEL_o182 0x8A -#define MODEL_g53 0x89 -#define MODEL_o273 0x88 -#define MODEL_o272 0x87 -#define MODEL_o271 0x86 -#define MODEL_o270 0x85 -#define MODEL_o269 0x84 -#define MODEL_g52 0x83 -#define MODEL_o268 0x82 -#define MODEL_o267 0x81 -#define MODEL_o266 0x80 -#define MODEL_o265 0x7F -#define MODEL_o264 0x7E -#define MODEL_g51 0x7D -#define MODEL_o263 0x7C -#define MODEL_o262 0x7B -#define MODEL_o261 0x7A -#define MODEL_o260 0x79 -#define MODEL_o259 0x78 -#define MODEL_g69 0x77 -#define MODEL_o470 0x76 -#define MODEL_o469 0x75 -#define MODEL_o468 0x74 -#define MODEL_o467 0x73 -#define MODEL_o466 0x72 -#define MODEL_o465 0x71 -#define MODEL_o464 0x70 -#define MODEL_o463 0x6F -#define MODEL_o462 0x6E -#define MODEL_o461 0x6D -#define MODEL_o460 0x6C -#define MODEL_o459 0x6B -#define MODEL_o458 0x6A -#define MODEL_o457 0x69 -#define MODEL_o456 0x68 -#define MODEL_o455 0x67 -#define MODEL_o454 0x66 -#define MODEL_hana 0x65 -#define MODEL_hana_s 0x64 -#define MODEL_hs_c 0x63 -#define MODEL_sc_2 0x62 -#define MODEL_sc_1 0x61 -#define MODEL_hs_b 0x60 -#define MODEL_sb_2 0x5F -#define MODEL_sb_1 0x5E -#define MODEL_hs_a 0x5D -#define MODEL_sa_2 0x5C -#define MODEL_sa_1 0x5B -#define MODEL_hana_w 0x5A -#define MODEL_hw_c 0x59 -#define MODEL_wc_2 0x58 -#define MODEL_wc_1 0x57 -#define MODEL_hw_b 0x56 -#define MODEL_wb_2 0x55 -#define MODEL_wb_1 0x54 -#define MODEL_hw_a 0x53 -#define MODEL_wa_2 0x52 -#define MODEL_wa_1 0x51 -#define MODEL_hana_n 0x50 -#define MODEL_hn_c 0x4F -#define MODEL_nc_2 0x4E -#define MODEL_nc_1 0x4D -#define MODEL_hn_b 0x4C -#define MODEL_na_b 0x4B -#define MODEL_nb_1 0x4A -#define MODEL_hn_a 0x49 -#define MODEL_na_2 0x48 -#define MODEL_na_1 0x47 -#define MODEL_hana_e 0x46 -#define MODEL_he_c 0x45 -#define MODEL_ec_2 0x44 -#define MODEL_ec_1 0x43 -#define MODEL_he_b 0x42 -#define MODEL_eb_2 0x41 -#define MODEL_eb_1 0x40 -#define MODEL_he_a 0x3F -#define MODEL_ea_2 0x3E -#define MODEL_ea_1 0x3D -#define MODEL_atari 0x3C -#define MODEL_atari_kusa 0x3B -#define MODEL_kusa 0x3A -#define MODEL_o506 0x39 -#define MODEL_o505 0x38 -#define MODEL_o504 0x37 -#define MODEL_iwa 0x36 -#define MODEL_o300 0x35 -#define MODEL_o299 0x34 -#define MODEL_o302 0x33 -#define MODEL_o301 0x32 -#define MODEL_o295 0x31 -#define MODEL_o289 0x30 -#define MODEL_o304 0x2F -#define MODEL_o303 0x2E -#define MODEL_center 0x2D -#define MODEL_kusa1 0x2C -#define MODEL_o337 0x2B -#define MODEL_gake 0x2A -#define MODEL_o425 0x29 -#define MODEL_o424 0x28 -#define MODEL_o423 0x27 -#define MODEL_g127 0x26 -#define MODEL_o433 0x25 -#define MODEL_o432 0x24 -#define MODEL_g126 0x23 -#define MODEL_o431 0x22 -#define MODEL_o430 0x21 -#define MODEL_g125 0x20 -#define MODEL_o429 0x1F -#define MODEL_o428 0x1E -#define MODEL_g124 0x1D -#define MODEL_o427 0x1C -#define MODEL_o426 0x1B -#define MODEL_okaue_tree 0x1A -#define MODEL_o336 0x19 -#define MODEL_o335 0x18 -#define MODEL_o334 0x17 -#define MODEL_o332 0x16 -#define MODEL_road 0x15 -#define MODEL_road_e 0x14 -#define MODEL_road_w 0x13 -#define MODEL_road_n 0x12 -#define MODEL_road_s 0x11 -#define MODEL_maru 0x10 -#define MODEL_exit 0xF -#define MODEL_exit_w 0xE -#define MODEL_o135 0xD -#define MODEL_o134 0xC -#define MODEL_exit_s 0xB -#define MODEL_o139 0xA -#define MODEL_o138 0x9 -#define MODEL_exit_e 0x8 -#define MODEL_o133 0x7 -#define MODEL_o132 0x6 -#define MODEL_exit_n 0x5 -#define MODEL_o137 0x4 -#define MODEL_o136 0x3 -#define MODEL_g1 0x2 -#define MODEL_o401 0x1 -#define MODEL_frame 0x0 +#define MODEL_Root 0xA6 +#define MODEL_mon 0xA5 +#define MODEL_monw 0xA4 +#define MODEL_w2 0xA3 +#define MODEL_w1 0xA2 +#define MODEL_mons 0xA1 +#define MODEL_s2 0xA0 +#define MODEL_s1 0x9F +#define MODEL_mone 0x9E +#define MODEL_e2 0x9D +#define MODEL_e1 0x9C +#define MODEL_monn 0x9B +#define MODEL_n2 0x9A +#define MODEL_n1 0x99 +#define MODEL_g130 0x98 +#define MODEL_o474 0x97 +#define MODEL_o473 0x96 +#define MODEL_o472 0x95 +#define MODEL_o471 0x94 +#define MODEL_kirikabu 0x93 +#define MODEL_o312 0x92 +#define MODEL_o311 0x91 +#define MODEL_ki_soto 0x90 +#define MODEL_g34 0x8F +#define MODEL_o187 0x8E +#define MODEL_o188 0x8D +#define MODEL_o186 0x8C +#define MODEL_o184 0x8B +#define MODEL_o182 0x8A +#define MODEL_g53 0x89 +#define MODEL_o273 0x88 +#define MODEL_o272 0x87 +#define MODEL_o271 0x86 +#define MODEL_o270 0x85 +#define MODEL_o269 0x84 +#define MODEL_g52 0x83 +#define MODEL_o268 0x82 +#define MODEL_o267 0x81 +#define MODEL_o266 0x80 +#define MODEL_o265 0x7F +#define MODEL_o264 0x7E +#define MODEL_g51 0x7D +#define MODEL_o263 0x7C +#define MODEL_o262 0x7B +#define MODEL_o261 0x7A +#define MODEL_o260 0x79 +#define MODEL_o259 0x78 +#define MODEL_g69 0x77 +#define MODEL_o470 0x76 +#define MODEL_o469 0x75 +#define MODEL_o468 0x74 +#define MODEL_o467 0x73 +#define MODEL_o466 0x72 +#define MODEL_o465 0x71 +#define MODEL_o464 0x70 +#define MODEL_o463 0x6F +#define MODEL_o462 0x6E +#define MODEL_o461 0x6D +#define MODEL_o460 0x6C +#define MODEL_o459 0x6B +#define MODEL_o458 0x6A +#define MODEL_o457 0x69 +#define MODEL_o456 0x68 +#define MODEL_o455 0x67 +#define MODEL_o454 0x66 +#define MODEL_hana 0x65 +#define MODEL_hana_s 0x64 +#define MODEL_hs_c 0x63 +#define MODEL_sc_2 0x62 +#define MODEL_sc_1 0x61 +#define MODEL_hs_b 0x60 +#define MODEL_sb_2 0x5F +#define MODEL_sb_1 0x5E +#define MODEL_hs_a 0x5D +#define MODEL_sa_2 0x5C +#define MODEL_sa_1 0x5B +#define MODEL_hana_w 0x5A +#define MODEL_hw_c 0x59 +#define MODEL_wc_2 0x58 +#define MODEL_wc_1 0x57 +#define MODEL_hw_b 0x56 +#define MODEL_wb_2 0x55 +#define MODEL_wb_1 0x54 +#define MODEL_hw_a 0x53 +#define MODEL_wa_2 0x52 +#define MODEL_wa_1 0x51 +#define MODEL_hana_n 0x50 +#define MODEL_hn_c 0x4F +#define MODEL_nc_2 0x4E +#define MODEL_nc_1 0x4D +#define MODEL_hn_b 0x4C +#define MODEL_na_b 0x4B +#define MODEL_nb_1 0x4A +#define MODEL_hn_a 0x49 +#define MODEL_na_2 0x48 +#define MODEL_na_1 0x47 +#define MODEL_hana_e 0x46 +#define MODEL_he_c 0x45 +#define MODEL_ec_2 0x44 +#define MODEL_ec_1 0x43 +#define MODEL_he_b 0x42 +#define MODEL_eb_2 0x41 +#define MODEL_eb_1 0x40 +#define MODEL_he_a 0x3F +#define MODEL_ea_2 0x3E +#define MODEL_ea_1 0x3D +#define MODEL_atari 0x3C +#define MODEL_atari_kusa 0x3B +#define MODEL_kusa 0x3A +#define MODEL_o506 0x39 +#define MODEL_o505 0x38 +#define MODEL_o504 0x37 +#define MODEL_iwa 0x36 +#define MODEL_o300 0x35 +#define MODEL_o299 0x34 +#define MODEL_o302 0x33 +#define MODEL_o301 0x32 +#define MODEL_o295 0x31 +#define MODEL_o289 0x30 +#define MODEL_o304 0x2F +#define MODEL_o303 0x2E +#define MODEL_center 0x2D +#define MODEL_kusa1 0x2C +#define MODEL_o337 0x2B +#define MODEL_gake 0x2A +#define MODEL_o425 0x29 +#define MODEL_o424 0x28 +#define MODEL_o423 0x27 +#define MODEL_g127 0x26 +#define MODEL_o433 0x25 +#define MODEL_o432 0x24 +#define MODEL_g126 0x23 +#define MODEL_o431 0x22 +#define MODEL_o430 0x21 +#define MODEL_g125 0x20 +#define MODEL_o429 0x1F +#define MODEL_o428 0x1E +#define MODEL_g124 0x1D +#define MODEL_o427 0x1C +#define MODEL_o426 0x1B +#define MODEL_okaue_tree 0x1A +#define MODEL_o336 0x19 +#define MODEL_o335 0x18 +#define MODEL_o334 0x17 +#define MODEL_o332 0x16 +#define MODEL_road 0x15 +#define MODEL_road_e 0x14 +#define MODEL_road_w 0x13 +#define MODEL_road_n 0x12 +#define MODEL_road_s 0x11 +#define MODEL_maru 0x10 +#define MODEL_exit 0xF +#define MODEL_exit_w 0xE +#define MODEL_o135 0xD +#define MODEL_o134 0xC +#define MODEL_exit_s 0xB +#define MODEL_o139 0xA +#define MODEL_o138 0x9 +#define MODEL_exit_e 0x8 +#define MODEL_o133 0x7 +#define MODEL_o132 0x6 +#define MODEL_exit_n 0x5 +#define MODEL_o137 0x4 +#define MODEL_o136 0x3 +#define MODEL_g1 0x2 +#define MODEL_o401 0x1 +#define MODEL_frame 0x0 + diff --git a/include/mapfs/mim_02_hit.h b/include/mapfs/mim_02_hit.h index 869cd470b4..be6aa5cc0c 100644 --- a/include/mapfs/mim_02_hit.h +++ b/include/mapfs/mim_02_hit.h @@ -1,36 +1,51 @@ -#define COLLIDER_Root 0x23 -#define COLLIDER_g129 0x22 -#define COLLIDER_monw 0x21 -#define COLLIDER_g130 0x20 -#define COLLIDER_mons 0x1F -#define COLLIDER_g127 0x1E -#define COLLIDER_mone 0x1D -#define COLLIDER_g128 0x1C -#define COLLIDER_monn 0x1B -#define COLLIDER_g121 0x1A -#define COLLIDER_o447 0x19 -#define COLLIDER_o446 0x18 -#define COLLIDER_exit 0x17 -#define COLLIDER_exit_w 0x16 -#define COLLIDER_tte 0x15 -#define COLLIDER_ne 0x14 -#define COLLIDER_deilie 0x13 -#define COLLIDER_deilite 0x12 -#define COLLIDER_exit_s 0x11 -#define COLLIDER_ttn 0x10 -#define COLLIDER_nn 0xF -#define COLLIDER_deilin 0xE -#define COLLIDER_deilitn 0xD -#define COLLIDER_exit_e 0xC -#define COLLIDER_ttw 0xB -#define COLLIDER_nw 0xA -#define COLLIDER_deiliw 0x9 -#define COLLIDER_deilitw 0x8 -#define COLLIDER_exit_n 0x7 -#define COLLIDER_tts 0x6 -#define COLLIDER_ns 0x5 -#define COLLIDER_deilis 0x4 -#define COLLIDER_deilits 0x3 -#define COLLIDER_atari 0x2 -#define COLLIDER_hidari 0x1 -#define COLLIDER_migi 0x0 +#define COLLIDER_Root 0x23 +#define COLLIDER_g129 0x22 +#define COLLIDER_monw 0x21 +#define COLLIDER_g130 0x20 +#define COLLIDER_mons 0x1F +#define COLLIDER_g127 0x1E +#define COLLIDER_mone 0x1D +#define COLLIDER_g128 0x1C +#define COLLIDER_monn 0x1B +#define COLLIDER_g121 0x1A +#define COLLIDER_o447 0x19 +#define COLLIDER_o446 0x18 +#define COLLIDER_exit 0x17 +#define COLLIDER_exit_w 0x16 +#define COLLIDER_tte 0x15 +#define COLLIDER_ne 0x14 +#define COLLIDER_deilie 0x13 +#define COLLIDER_deilite 0x12 +#define COLLIDER_exit_s 0x11 +#define COLLIDER_ttn 0x10 +#define COLLIDER_nn 0xF +#define COLLIDER_deilin 0xE +#define COLLIDER_deilitn 0xD +#define COLLIDER_exit_e 0xC +#define COLLIDER_ttw 0xB +#define COLLIDER_nw 0xA +#define COLLIDER_deiliw 0x9 +#define COLLIDER_deilitw 0x8 +#define COLLIDER_exit_n 0x7 +#define COLLIDER_tts 0x6 +#define COLLIDER_ns 0x5 +#define COLLIDER_deilis 0x4 +#define COLLIDER_deilits 0x3 +#define COLLIDER_atari 0x2 +#define COLLIDER_hidari 0x1 +#define COLLIDER_migi 0x0 + +#define ZONE_Root 0xC +#define ZONE_enter 0xB +#define ZONE_north 0xA +#define ZONE_south 0x9 +#define ZONE_west 0x8 +#define ZONE_east 0x7 +#define ZONE_out 0x6 +#define ZONE_kita 0x5 +#define ZONE_minami 0x4 +#define ZONE_nishi 0x3 +#define ZONE_higashi 0x2 +#define ZONE_kaiten 0x1 +#define ZONE_stage 0x0 + diff --git a/include/mapfs/mim_02_shape.h b/include/mapfs/mim_02_shape.h index 3a87705e76..9781e62a11 100644 --- a/include/mapfs/mim_02_shape.h +++ b/include/mapfs/mim_02_shape.h @@ -1,163 +1,164 @@ -#define MODEL_Root 0xA2 -#define MODEL_mon 0xA1 -#define MODEL_monw 0xA0 -#define MODEL_w2 0x9F -#define MODEL_w1 0x9E -#define MODEL_mons 0x9D -#define MODEL_s2 0x9C -#define MODEL_s1 0x9B -#define MODEL_mone 0x9A -#define MODEL_e2 0x99 -#define MODEL_e1 0x98 -#define MODEL_monn 0x97 -#define MODEL_n2 0x96 -#define MODEL_n1 0x95 -#define MODEL_g130 0x94 -#define MODEL_o517 0x93 -#define MODEL_o516 0x92 -#define MODEL_o515 0x91 -#define MODEL_o514 0x90 -#define MODEL_black3 0x8F -#define MODEL_o422 0x8E -#define MODEL_o421 0x8D -#define MODEL_o420 0x8C -#define MODEL_o419 0x8B -#define MODEL_o418 0x8A -#define MODEL_o417 0x89 -#define MODEL_black2 0x88 -#define MODEL_o413 0x87 -#define MODEL_o412 0x86 -#define MODEL_o411 0x85 -#define MODEL_o410 0x84 -#define MODEL_o409 0x83 -#define MODEL_o408 0x82 -#define MODEL_black1 0x81 -#define MODEL_o429 0x80 -#define MODEL_o427 0x7F -#define MODEL_o426 0x7E -#define MODEL_o425 0x7D -#define MODEL_o424 0x7C -#define MODEL_b1_ 0x7B -#define MODEL_redeye 0x7A -#define MODEL_g112 0x79 -#define MODEL_o414 0x78 -#define MODEL_me 0x77 -#define MODEL_o406 0x76 -#define MODEL_o405 0x75 -#define MODEL_o404 0x74 -#define MODEL_o403 0x73 -#define MODEL_o402 0x72 -#define MODEL_g117 0x71 -#define MODEL_o505 0x70 -#define MODEL_o504 0x6F -#define MODEL_o503 0x6E -#define MODEL_o502 0x6D -#define MODEL_o491 0x6C -#define MODEL_o490 0x6B -#define MODEL_o489 0x6A -#define MODEL_o437 0x69 -#define MODEL_o488 0x68 -#define MODEL_o487 0x67 -#define MODEL_o486 0x66 -#define MODEL_o436 0x65 -#define MODEL_o440 0x64 -#define MODEL_o482 0x63 -#define MODEL_o481 0x62 -#define MODEL_o480 0x61 -#define MODEL_o479 0x60 -#define MODEL_o466 0x5F -#define MODEL_ki_soto 0x5E -#define MODEL_g122 0x5D -#define MODEL_o461 0x5C -#define MODEL_o460 0x5B -#define MODEL_o459 0x5A -#define MODEL_o458 0x59 -#define MODEL_o457 0x58 -#define MODEL_g121 0x57 -#define MODEL_o456 0x56 -#define MODEL_o455 0x55 -#define MODEL_o454 0x54 -#define MODEL_o453 0x53 -#define MODEL_o452 0x52 -#define MODEL_g120 0x51 -#define MODEL_o451 0x50 -#define MODEL_o450 0x4F -#define MODEL_o449 0x4E -#define MODEL_o448 0x4D -#define MODEL_o447 0x4C -#define MODEL_g119 0x4B -#define MODEL_o446 0x4A -#define MODEL_o445 0x49 -#define MODEL_o444 0x48 -#define MODEL_o443 0x47 -#define MODEL_o442 0x46 -#define MODEL_hana 0x45 -#define MODEL_hana_s 0x44 -#define MODEL_o394 0x43 -#define MODEL_o392 0x42 -#define MODEL_hana_w 0x41 -#define MODEL_o385 0x40 -#define MODEL_o383 0x3F -#define MODEL_hana_N 0x3E -#define MODEL_o376 0x3D -#define MODEL_o374 0x3C -#define MODEL_hana1 0x3B -#define MODEL_h1_kuti 0x3A -#define MODEL_hanabira 0x39 -#define MODEL_kusa 0x38 -#define MODEL_atari 0x37 -#define MODEL_atari_kusa 0x36 -#define MODEL_o286 0x35 -#define MODEL_o308 0x34 -#define MODEL_o307 0x33 -#define MODEL_iwa 0x32 -#define MODEL_o299 0x31 -#define MODEL_o301 0x30 -#define MODEL_o289 0x2F -#define MODEL_o303 0x2E -#define MODEL_center 0x2D -#define MODEL_g127 0x2C -#define MODEL_o478 0x2B -#define MODEL_o477 0x2A -#define MODEL_g126 0x29 -#define MODEL_o476 0x28 -#define MODEL_o475 0x27 -#define MODEL_g125 0x26 -#define MODEL_o474 0x25 -#define MODEL_o473 0x24 -#define MODEL_g124 0x23 -#define MODEL_o472 0x22 -#define MODEL_o471 0x21 -#define MODEL_kusa1 0x20 -#define MODEL_o337 0x1F -#define MODEL_gake 0x1E -#define MODEL_o470 0x1D -#define MODEL_o469 0x1C -#define MODEL_o468 0x1B -#define MODEL_okaue_tree 0x1A -#define MODEL_o336 0x19 -#define MODEL_o335 0x18 -#define MODEL_o334 0x17 -#define MODEL_o332 0x16 -#define MODEL_road 0x15 -#define MODEL_road_e 0x14 -#define MODEL_road_w 0x13 -#define MODEL_road_n 0x12 -#define MODEL_road_s 0x11 -#define MODEL_maru 0x10 -#define MODEL_exit 0xF -#define MODEL_exit_w 0xE -#define MODEL_o465 0xD -#define MODEL_o134 0xC -#define MODEL_exit_s 0xB -#define MODEL_o464 0xA -#define MODEL_o138 0x9 -#define MODEL_exit_e 0x8 -#define MODEL_o463 0x7 -#define MODEL_o132 0x6 -#define MODEL_exit_n 0x5 -#define MODEL_o462 0x4 -#define MODEL_o136 0x3 -#define MODEL_g1 0x2 -#define MODEL_o430 0x1 -#define MODEL_frame 0x0 +#define MODEL_Root 0xA2 +#define MODEL_mon 0xA1 +#define MODEL_monw 0xA0 +#define MODEL_w2 0x9F +#define MODEL_w1 0x9E +#define MODEL_mons 0x9D +#define MODEL_s2 0x9C +#define MODEL_s1 0x9B +#define MODEL_mone 0x9A +#define MODEL_e2 0x99 +#define MODEL_e1 0x98 +#define MODEL_monn 0x97 +#define MODEL_n2 0x96 +#define MODEL_n1 0x95 +#define MODEL_g130 0x94 +#define MODEL_o517 0x93 +#define MODEL_o516 0x92 +#define MODEL_o515 0x91 +#define MODEL_o514 0x90 +#define MODEL_black3 0x8F +#define MODEL_o422 0x8E +#define MODEL_o421 0x8D +#define MODEL_o420 0x8C +#define MODEL_o419 0x8B +#define MODEL_o418 0x8A +#define MODEL_o417 0x89 +#define MODEL_black2 0x88 +#define MODEL_o413 0x87 +#define MODEL_o412 0x86 +#define MODEL_o411 0x85 +#define MODEL_o410 0x84 +#define MODEL_o409 0x83 +#define MODEL_o408 0x82 +#define MODEL_black1 0x81 +#define MODEL_o429 0x80 +#define MODEL_o427 0x7F +#define MODEL_o426 0x7E +#define MODEL_o425 0x7D +#define MODEL_o424 0x7C +#define MODEL_b1_ 0x7B +#define MODEL_redeye 0x7A +#define MODEL_g112 0x79 +#define MODEL_o414 0x78 +#define MODEL_me 0x77 +#define MODEL_o406 0x76 +#define MODEL_o405 0x75 +#define MODEL_o404 0x74 +#define MODEL_o403 0x73 +#define MODEL_o402 0x72 +#define MODEL_g117 0x71 +#define MODEL_o505 0x70 +#define MODEL_o504 0x6F +#define MODEL_o503 0x6E +#define MODEL_o502 0x6D +#define MODEL_o491 0x6C +#define MODEL_o490 0x6B +#define MODEL_o489 0x6A +#define MODEL_o437 0x69 +#define MODEL_o488 0x68 +#define MODEL_o487 0x67 +#define MODEL_o486 0x66 +#define MODEL_o436 0x65 +#define MODEL_o440 0x64 +#define MODEL_o482 0x63 +#define MODEL_o481 0x62 +#define MODEL_o480 0x61 +#define MODEL_o479 0x60 +#define MODEL_o466 0x5F +#define MODEL_ki_soto 0x5E +#define MODEL_g122 0x5D +#define MODEL_o461 0x5C +#define MODEL_o460 0x5B +#define MODEL_o459 0x5A +#define MODEL_o458 0x59 +#define MODEL_o457 0x58 +#define MODEL_g121 0x57 +#define MODEL_o456 0x56 +#define MODEL_o455 0x55 +#define MODEL_o454 0x54 +#define MODEL_o453 0x53 +#define MODEL_o452 0x52 +#define MODEL_g120 0x51 +#define MODEL_o451 0x50 +#define MODEL_o450 0x4F +#define MODEL_o449 0x4E +#define MODEL_o448 0x4D +#define MODEL_o447 0x4C +#define MODEL_g119 0x4B +#define MODEL_o446 0x4A +#define MODEL_o445 0x49 +#define MODEL_o444 0x48 +#define MODEL_o443 0x47 +#define MODEL_o442 0x46 +#define MODEL_hana 0x45 +#define MODEL_hana_s 0x44 +#define MODEL_o394 0x43 +#define MODEL_o392 0x42 +#define MODEL_hana_w 0x41 +#define MODEL_o385 0x40 +#define MODEL_o383 0x3F +#define MODEL_hana_N 0x3E +#define MODEL_o376 0x3D +#define MODEL_o374 0x3C +#define MODEL_hana1 0x3B +#define MODEL_h1_kuti 0x3A +#define MODEL_hanabira 0x39 +#define MODEL_kusa 0x38 +#define MODEL_atari 0x37 +#define MODEL_atari_kusa 0x36 +#define MODEL_o286 0x35 +#define MODEL_o308 0x34 +#define MODEL_o307 0x33 +#define MODEL_iwa 0x32 +#define MODEL_o299 0x31 +#define MODEL_o301 0x30 +#define MODEL_o289 0x2F +#define MODEL_o303 0x2E +#define MODEL_center 0x2D +#define MODEL_g127 0x2C +#define MODEL_o478 0x2B +#define MODEL_o477 0x2A +#define MODEL_g126 0x29 +#define MODEL_o476 0x28 +#define MODEL_o475 0x27 +#define MODEL_g125 0x26 +#define MODEL_o474 0x25 +#define MODEL_o473 0x24 +#define MODEL_g124 0x23 +#define MODEL_o472 0x22 +#define MODEL_o471 0x21 +#define MODEL_kusa1 0x20 +#define MODEL_o337 0x1F +#define MODEL_gake 0x1E +#define MODEL_o470 0x1D +#define MODEL_o469 0x1C +#define MODEL_o468 0x1B +#define MODEL_okaue_tree 0x1A +#define MODEL_o336 0x19 +#define MODEL_o335 0x18 +#define MODEL_o334 0x17 +#define MODEL_o332 0x16 +#define MODEL_road 0x15 +#define MODEL_road_e 0x14 +#define MODEL_road_w 0x13 +#define MODEL_road_n 0x12 +#define MODEL_road_s 0x11 +#define MODEL_maru 0x10 +#define MODEL_exit 0xF +#define MODEL_exit_w 0xE +#define MODEL_o465 0xD +#define MODEL_o134 0xC +#define MODEL_exit_s 0xB +#define MODEL_o464 0xA +#define MODEL_o138 0x9 +#define MODEL_exit_e 0x8 +#define MODEL_o463 0x7 +#define MODEL_o132 0x6 +#define MODEL_exit_n 0x5 +#define MODEL_o462 0x4 +#define MODEL_o136 0x3 +#define MODEL_g1 0x2 +#define MODEL_o430 0x1 +#define MODEL_frame 0x0 + diff --git a/include/mapfs/mim_03_hit.h b/include/mapfs/mim_03_hit.h index cb3d5c26b5..3e2a68e91c 100644 --- a/include/mapfs/mim_03_hit.h +++ b/include/mapfs/mim_03_hit.h @@ -1,44 +1,60 @@ -#define COLLIDER_Root 0x2B -#define COLLIDER_g60 0x2A -#define COLLIDER_monw 0x29 -#define COLLIDER_g59 0x28 -#define COLLIDER_mons 0x27 -#define COLLIDER_g62 0x26 -#define COLLIDER_mone 0x25 -#define COLLIDER_g61 0x24 -#define COLLIDER_monn 0x23 -#define COLLIDER_g53 0x22 -#define COLLIDER_o134 0x21 -#define COLLIDER_o133 0x20 -#define COLLIDER_atari 0x1F -#define COLLIDER_o151 0x1E -#define COLLIDER_o150 0x1D -#define COLLIDER_o149 0x1C -#define COLLIDER_o132 0x1B -#define COLLIDER_center 0x1A -#define COLLIDER_gake 0x19 -#define COLLIDER_o136 0x18 -#define COLLIDER_o135 0x17 -#define COLLIDER_g31 0x16 -#define COLLIDER_o70 0x15 -#define COLLIDER_exit 0x14 -#define COLLIDER_exit_w 0x13 -#define COLLIDER_ttw 0x12 -#define COLLIDER_nw 0x11 -#define COLLIDER_deiliw 0x10 -#define COLLIDER_deilitw 0xF -#define COLLIDER_exit_s 0xE -#define COLLIDER_tts 0xD -#define COLLIDER_ns 0xC -#define COLLIDER_deilis 0xB -#define COLLIDER_deilits 0xA -#define COLLIDER_exit_e 0x9 -#define COLLIDER_tte 0x8 -#define COLLIDER_ne 0x7 -#define COLLIDER_deilie 0x6 -#define COLLIDER_deilite 0x5 -#define COLLIDER_exit_n 0x4 -#define COLLIDER_ttn 0x3 -#define COLLIDER_nn 0x2 -#define COLLIDER_deilin 0x1 -#define COLLIDER_deilitn 0x0 +#define COLLIDER_Root 0x2B +#define COLLIDER_g60 0x2A +#define COLLIDER_monw 0x29 +#define COLLIDER_g59 0x28 +#define COLLIDER_mons 0x27 +#define COLLIDER_g62 0x26 +#define COLLIDER_mone 0x25 +#define COLLIDER_g61 0x24 +#define COLLIDER_monn 0x23 +#define COLLIDER_g53 0x22 +#define COLLIDER_o134 0x21 +#define COLLIDER_o133 0x20 +#define COLLIDER_atari 0x1F +#define COLLIDER_o151 0x1E +#define COLLIDER_o150 0x1D +#define COLLIDER_o149 0x1C +#define COLLIDER_o132 0x1B +#define COLLIDER_center 0x1A +#define COLLIDER_gake 0x19 +#define COLLIDER_o136 0x18 +#define COLLIDER_o135 0x17 +#define COLLIDER_g31 0x16 +#define COLLIDER_o70 0x15 +#define COLLIDER_exit 0x14 +#define COLLIDER_exit_w 0x13 +#define COLLIDER_ttw 0x12 +#define COLLIDER_nw 0x11 +#define COLLIDER_deiliw 0x10 +#define COLLIDER_deilitw 0xF +#define COLLIDER_exit_s 0xE +#define COLLIDER_tts 0xD +#define COLLIDER_ns 0xC +#define COLLIDER_deilis 0xB +#define COLLIDER_deilits 0xA +#define COLLIDER_exit_e 0x9 +#define COLLIDER_tte 0x8 +#define COLLIDER_ne 0x7 +#define COLLIDER_deilie 0x6 +#define COLLIDER_deilite 0x5 +#define COLLIDER_exit_n 0x4 +#define COLLIDER_ttn 0x3 +#define COLLIDER_nn 0x2 +#define COLLIDER_deilin 0x1 +#define COLLIDER_deilitn 0x0 + +#define ZONE_Root 0xD +#define ZONE_enter 0xC +#define ZONE_north 0xB +#define ZONE_south 0xA +#define ZONE_west 0x9 +#define ZONE_east 0x8 +#define ZONE_out 0x7 +#define ZONE_kita 0x6 +#define ZONE_minami 0x5 +#define ZONE_nishi 0x4 +#define ZONE_higashi 0x3 +#define ZONE_kaiten 0x2 +#define ZONE_center 0x1 +#define ZONE_stage 0x0 + diff --git a/include/mapfs/mim_03_shape.h b/include/mapfs/mim_03_shape.h index 70e330f77d..32f2e95930 100644 --- a/include/mapfs/mim_03_shape.h +++ b/include/mapfs/mim_03_shape.h @@ -1,177 +1,178 @@ -#define MODEL_Root 0xB0 -#define MODEL_kinoko 0xAF -#define MODEL_o232 0xAE -#define MODEL_o231 0xAD -#define MODEL_o230 0xAC -#define MODEL_o228 0xAB -#define MODEL_o227 0xAA -#define MODEL_o226 0xA9 -#define MODEL_o225 0xA8 -#define MODEL_o224 0xA7 -#define MODEL_o223 0xA6 -#define MODEL_o222 0xA5 -#define MODEL_mon 0xA4 -#define MODEL_monw 0xA3 -#define MODEL_w2 0xA2 -#define MODEL_w1 0xA1 -#define MODEL_mons 0xA0 -#define MODEL_s2 0x9F -#define MODEL_s1 0x9E -#define MODEL_mone 0x9D -#define MODEL_e2 0x9C -#define MODEL_e1 0x9B -#define MODEL_monn 0x9A -#define MODEL_n2 0x99 -#define MODEL_n1 0x98 -#define MODEL_g63 0x97 -#define MODEL_o182 0x96 -#define MODEL_o181 0x95 -#define MODEL_o180 0x94 -#define MODEL_o179 0x93 -#define MODEL_g44 0x92 -#define MODEL_o174 0x91 -#define MODEL_o173 0x90 -#define MODEL_o172 0x8F -#define MODEL_o171 0x8E -#define MODEL_o170 0x8D -#define MODEL_o169 0x8C -#define MODEL_o168 0x8B -#define MODEL_o167 0x8A -#define MODEL_o166 0x89 -#define MODEL_o165 0x88 -#define MODEL_o164 0x87 -#define MODEL_o163 0x86 -#define MODEL_o162 0x85 -#define MODEL_o161 0x84 -#define MODEL_o160 0x83 -#define MODEL_o159 0x82 -#define MODEL_o233 0x81 -#define MODEL_o191 0x80 -#define MODEL_ki_soto 0x7F -#define MODEL_g52 0x7E -#define MODEL_o136 0x7D -#define MODEL_o135 0x7C -#define MODEL_o134 0x7B -#define MODEL_o133 0x7A -#define MODEL_o132 0x79 -#define MODEL_g51 0x78 -#define MODEL_o131 0x77 -#define MODEL_o130 0x76 -#define MODEL_o129 0x75 -#define MODEL_o128 0x74 -#define MODEL_o127 0x73 -#define MODEL_g50 0x72 -#define MODEL_o126 0x71 -#define MODEL_o125 0x70 -#define MODEL_o124 0x6F -#define MODEL_o123 0x6E -#define MODEL_o122 0x6D -#define MODEL_g49 0x6C -#define MODEL_o121 0x6B -#define MODEL_o120 0x6A -#define MODEL_o119 0x69 -#define MODEL_o118 0x68 -#define MODEL_o117 0x67 -#define MODEL_hana 0x66 -#define MODEL_hana_w 0x65 -#define MODEL_hw_d 0x64 -#define MODEL_o26 0x63 -#define MODEL_o25 0x62 -#define MODEL_hw_c 0x61 -#define MODEL_o24 0x60 -#define MODEL_o23 0x5F -#define MODEL_hw_b 0x5E -#define MODEL_o22 0x5D -#define MODEL_o21 0x5C -#define MODEL_hw_a 0x5B -#define MODEL_o20 0x5A -#define MODEL_o19 0x59 -#define MODEL_hana_s 0x58 -#define MODEL_hs_c 0x57 -#define MODEL_o18 0x56 -#define MODEL_o17 0x55 -#define MODEL_hs_b 0x54 -#define MODEL_o16 0x53 -#define MODEL_o15 0x52 -#define MODEL_hs_a 0x51 -#define MODEL_o14 0x50 -#define MODEL_o13 0x4F -#define MODEL_hana_e 0x4E -#define MODEL_he_c 0x4D -#define MODEL_o12 0x4C -#define MODEL_o11 0x4B -#define MODEL_he_b 0x4A -#define MODEL_o10 0x49 -#define MODEL_o9 0x48 -#define MODEL_he_a 0x47 -#define MODEL_o8 0x46 -#define MODEL_o7 0x45 -#define MODEL_hana_n 0x44 -#define MODEL_hn_c 0x43 -#define MODEL_o6 0x42 -#define MODEL_o5 0x41 -#define MODEL_hn_b 0x40 -#define MODEL_o4 0x3F -#define MODEL_o3 0x3E -#define MODEL_hn_a 0x3D -#define MODEL_o2 0x3C -#define MODEL_o1 0x3B -#define MODEL_kusa 0x3A -#define MODEL_o195 0x39 -#define MODEL_o194 0x38 -#define MODEL_o193 0x37 -#define MODEL_o192 0x36 -#define MODEL_iwa 0x35 -#define MODEL_o65 0x34 -#define MODEL_o64 0x33 -#define MODEL_o63 0x32 -#define MODEL_o62 0x31 -#define MODEL_o61 0x30 -#define MODEL_o60 0x2F -#define MODEL_o59 0x2E -#define MODEL_o58 0x2D -#define MODEL_okaue_t 0x2C -#define MODEL_o144 0x2B -#define MODEL_o143 0x2A -#define MODEL_o142 0x29 -#define MODEL_center 0x28 -#define MODEL_kusa1 0x27 -#define MODEL_o156 0x26 -#define MODEL_gake 0x25 -#define MODEL_o155 0x24 -#define MODEL_o154 0x23 -#define MODEL_o153 0x22 -#define MODEL_g58 0x21 -#define MODEL_o152 0x20 -#define MODEL_o151 0x1F -#define MODEL_g57 0x1E -#define MODEL_o150 0x1D -#define MODEL_o149 0x1C -#define MODEL_g56 0x1B -#define MODEL_o148 0x1A -#define MODEL_o147 0x19 -#define MODEL_g55 0x18 -#define MODEL_o146 0x17 -#define MODEL_o145 0x16 -#define MODEL_road 0x15 -#define MODEL_road_e 0x14 -#define MODEL_road_w 0x13 -#define MODEL_road_n 0x12 -#define MODEL_road_s 0x11 -#define MODEL_maru 0x10 -#define MODEL_exit 0xF -#define MODEL_exit_w 0xE -#define MODEL_o140 0xD -#define MODEL_o101 0xC -#define MODEL_exit_s 0xB -#define MODEL_o139 0xA -#define MODEL_o99 0x9 -#define MODEL_exit_e 0x8 -#define MODEL_o138 0x7 -#define MODEL_o97 0x6 -#define MODEL_exit_n 0x5 -#define MODEL_o137 0x4 -#define MODEL_o95 0x3 -#define MODEL_g43 0x2 -#define MODEL_stage 0x1 -#define MODEL_waku 0x0 +#define MODEL_Root 0xB0 +#define MODEL_kinoko 0xAF +#define MODEL_o232 0xAE +#define MODEL_o231 0xAD +#define MODEL_o230 0xAC +#define MODEL_o228 0xAB +#define MODEL_o227 0xAA +#define MODEL_o226 0xA9 +#define MODEL_o225 0xA8 +#define MODEL_o224 0xA7 +#define MODEL_o223 0xA6 +#define MODEL_o222 0xA5 +#define MODEL_mon 0xA4 +#define MODEL_monw 0xA3 +#define MODEL_w2 0xA2 +#define MODEL_w1 0xA1 +#define MODEL_mons 0xA0 +#define MODEL_s2 0x9F +#define MODEL_s1 0x9E +#define MODEL_mone 0x9D +#define MODEL_e2 0x9C +#define MODEL_e1 0x9B +#define MODEL_monn 0x9A +#define MODEL_n2 0x99 +#define MODEL_n1 0x98 +#define MODEL_g63 0x97 +#define MODEL_o182 0x96 +#define MODEL_o181 0x95 +#define MODEL_o180 0x94 +#define MODEL_o179 0x93 +#define MODEL_g44 0x92 +#define MODEL_o174 0x91 +#define MODEL_o173 0x90 +#define MODEL_o172 0x8F +#define MODEL_o171 0x8E +#define MODEL_o170 0x8D +#define MODEL_o169 0x8C +#define MODEL_o168 0x8B +#define MODEL_o167 0x8A +#define MODEL_o166 0x89 +#define MODEL_o165 0x88 +#define MODEL_o164 0x87 +#define MODEL_o163 0x86 +#define MODEL_o162 0x85 +#define MODEL_o161 0x84 +#define MODEL_o160 0x83 +#define MODEL_o159 0x82 +#define MODEL_o233 0x81 +#define MODEL_o191 0x80 +#define MODEL_ki_soto 0x7F +#define MODEL_g52 0x7E +#define MODEL_o136 0x7D +#define MODEL_o135 0x7C +#define MODEL_o134 0x7B +#define MODEL_o133 0x7A +#define MODEL_o132 0x79 +#define MODEL_g51 0x78 +#define MODEL_o131 0x77 +#define MODEL_o130 0x76 +#define MODEL_o129 0x75 +#define MODEL_o128 0x74 +#define MODEL_o127 0x73 +#define MODEL_g50 0x72 +#define MODEL_o126 0x71 +#define MODEL_o125 0x70 +#define MODEL_o124 0x6F +#define MODEL_o123 0x6E +#define MODEL_o122 0x6D +#define MODEL_g49 0x6C +#define MODEL_o121 0x6B +#define MODEL_o120 0x6A +#define MODEL_o119 0x69 +#define MODEL_o118 0x68 +#define MODEL_o117 0x67 +#define MODEL_hana 0x66 +#define MODEL_hana_w 0x65 +#define MODEL_hw_d 0x64 +#define MODEL_o26 0x63 +#define MODEL_o25 0x62 +#define MODEL_hw_c 0x61 +#define MODEL_o24 0x60 +#define MODEL_o23 0x5F +#define MODEL_hw_b 0x5E +#define MODEL_o22 0x5D +#define MODEL_o21 0x5C +#define MODEL_hw_a 0x5B +#define MODEL_o20 0x5A +#define MODEL_o19 0x59 +#define MODEL_hana_s 0x58 +#define MODEL_hs_c 0x57 +#define MODEL_o18 0x56 +#define MODEL_o17 0x55 +#define MODEL_hs_b 0x54 +#define MODEL_o16 0x53 +#define MODEL_o15 0x52 +#define MODEL_hs_a 0x51 +#define MODEL_o14 0x50 +#define MODEL_o13 0x4F +#define MODEL_hana_e 0x4E +#define MODEL_he_c 0x4D +#define MODEL_o12 0x4C +#define MODEL_o11 0x4B +#define MODEL_he_b 0x4A +#define MODEL_o10 0x49 +#define MODEL_o9 0x48 +#define MODEL_he_a 0x47 +#define MODEL_o8 0x46 +#define MODEL_o7 0x45 +#define MODEL_hana_n 0x44 +#define MODEL_hn_c 0x43 +#define MODEL_o6 0x42 +#define MODEL_o5 0x41 +#define MODEL_hn_b 0x40 +#define MODEL_o4 0x3F +#define MODEL_o3 0x3E +#define MODEL_hn_a 0x3D +#define MODEL_o2 0x3C +#define MODEL_o1 0x3B +#define MODEL_kusa 0x3A +#define MODEL_o195 0x39 +#define MODEL_o194 0x38 +#define MODEL_o193 0x37 +#define MODEL_o192 0x36 +#define MODEL_iwa 0x35 +#define MODEL_o65 0x34 +#define MODEL_o64 0x33 +#define MODEL_o63 0x32 +#define MODEL_o62 0x31 +#define MODEL_o61 0x30 +#define MODEL_o60 0x2F +#define MODEL_o59 0x2E +#define MODEL_o58 0x2D +#define MODEL_okaue_t 0x2C +#define MODEL_o144 0x2B +#define MODEL_o143 0x2A +#define MODEL_o142 0x29 +#define MODEL_center 0x28 +#define MODEL_kusa1 0x27 +#define MODEL_o156 0x26 +#define MODEL_gake 0x25 +#define MODEL_o155 0x24 +#define MODEL_o154 0x23 +#define MODEL_o153 0x22 +#define MODEL_g58 0x21 +#define MODEL_o152 0x20 +#define MODEL_o151 0x1F +#define MODEL_g57 0x1E +#define MODEL_o150 0x1D +#define MODEL_o149 0x1C +#define MODEL_g56 0x1B +#define MODEL_o148 0x1A +#define MODEL_o147 0x19 +#define MODEL_g55 0x18 +#define MODEL_o146 0x17 +#define MODEL_o145 0x16 +#define MODEL_road 0x15 +#define MODEL_road_e 0x14 +#define MODEL_road_w 0x13 +#define MODEL_road_n 0x12 +#define MODEL_road_s 0x11 +#define MODEL_maru 0x10 +#define MODEL_exit 0xF +#define MODEL_exit_w 0xE +#define MODEL_o140 0xD +#define MODEL_o101 0xC +#define MODEL_exit_s 0xB +#define MODEL_o139 0xA +#define MODEL_o99 0x9 +#define MODEL_exit_e 0x8 +#define MODEL_o138 0x7 +#define MODEL_o97 0x6 +#define MODEL_exit_n 0x5 +#define MODEL_o137 0x4 +#define MODEL_o95 0x3 +#define MODEL_g43 0x2 +#define MODEL_stage 0x1 +#define MODEL_waku 0x0 + diff --git a/include/mapfs/mim_04_hit.h b/include/mapfs/mim_04_hit.h index 54549989a2..c114bc937d 100644 --- a/include/mapfs/mim_04_hit.h +++ b/include/mapfs/mim_04_hit.h @@ -1,39 +1,55 @@ -#define COLLIDER_Root 0x26 -#define COLLIDER_g132 0x25 -#define COLLIDER_o466 0x24 -#define COLLIDER_g130 0x23 -#define COLLIDER_monw 0x22 -#define COLLIDER_g129 0x21 -#define COLLIDER_mons 0x20 -#define COLLIDER_g128 0x1F -#define COLLIDER_mone 0x1E -#define COLLIDER_g127 0x1D -#define COLLIDER_monn 0x1C -#define COLLIDER_g125 0x1B -#define COLLIDER_o455 0x1A -#define COLLIDER_o454 0x19 -#define COLLIDER_exit 0x18 -#define COLLIDER_exit_w 0x17 -#define COLLIDER_ttw 0x16 -#define COLLIDER_nw 0x15 -#define COLLIDER_deiliw 0x14 -#define COLLIDER_deilitw 0x13 -#define COLLIDER_exit_s 0x12 -#define COLLIDER_tts 0x11 -#define COLLIDER_ns 0x10 -#define COLLIDER_deilis 0xF -#define COLLIDER_deilits 0xE -#define COLLIDER_exit_e 0xD -#define COLLIDER_tte 0xC -#define COLLIDER_ne 0xB -#define COLLIDER_deilie 0xA -#define COLLIDER_deilite 0x9 -#define COLLIDER_exit_n 0x8 -#define COLLIDER_ttn 0x7 -#define COLLIDER_nn 0x6 -#define COLLIDER_deilin 0x5 -#define COLLIDER_deilitn 0x4 -#define COLLIDER_g1 0x3 -#define COLLIDER_hidari 0x2 -#define COLLIDER_naka 0x1 -#define COLLIDER_migi 0x0 +#define COLLIDER_Root 0x26 +#define COLLIDER_g132 0x25 +#define COLLIDER_o466 0x24 +#define COLLIDER_g130 0x23 +#define COLLIDER_monw 0x22 +#define COLLIDER_g129 0x21 +#define COLLIDER_mons 0x20 +#define COLLIDER_g128 0x1F +#define COLLIDER_mone 0x1E +#define COLLIDER_g127 0x1D +#define COLLIDER_monn 0x1C +#define COLLIDER_g125 0x1B +#define COLLIDER_o455 0x1A +#define COLLIDER_o454 0x19 +#define COLLIDER_exit 0x18 +#define COLLIDER_exit_w 0x17 +#define COLLIDER_ttw 0x16 +#define COLLIDER_nw 0x15 +#define COLLIDER_deiliw 0x14 +#define COLLIDER_deilitw 0x13 +#define COLLIDER_exit_s 0x12 +#define COLLIDER_tts 0x11 +#define COLLIDER_ns 0x10 +#define COLLIDER_deilis 0xF +#define COLLIDER_deilits 0xE +#define COLLIDER_exit_e 0xD +#define COLLIDER_tte 0xC +#define COLLIDER_ne 0xB +#define COLLIDER_deilie 0xA +#define COLLIDER_deilite 0x9 +#define COLLIDER_exit_n 0x8 +#define COLLIDER_ttn 0x7 +#define COLLIDER_nn 0x6 +#define COLLIDER_deilin 0x5 +#define COLLIDER_deilitn 0x4 +#define COLLIDER_g1 0x3 +#define COLLIDER_hidari 0x2 +#define COLLIDER_naka 0x1 +#define COLLIDER_migi 0x0 + +#define ZONE_Root 0xD +#define ZONE_enter 0xC +#define ZONE_north 0xB +#define ZONE_south 0xA +#define ZONE_west 0x9 +#define ZONE_east 0x8 +#define ZONE_out 0x7 +#define ZONE_kita 0x6 +#define ZONE_minami 0x5 +#define ZONE_nishi 0x4 +#define ZONE_higashi 0x3 +#define ZONE_kaiten 0x2 +#define ZONE_o209 0x1 +#define ZONE_stage 0x0 + diff --git a/include/mapfs/mim_04_shape.h b/include/mapfs/mim_04_shape.h index cb19ae9567..3a2d202cb6 100644 --- a/include/mapfs/mim_04_shape.h +++ b/include/mapfs/mim_04_shape.h @@ -1,125 +1,126 @@ -#define MODEL_Root 0x7C -#define MODEL_mon 0x7B -#define MODEL_monw 0x7A -#define MODEL_w2 0x79 -#define MODEL_w1 0x78 -#define MODEL_mons 0x77 -#define MODEL_s2 0x76 -#define MODEL_s1 0x75 -#define MODEL_mone 0x74 -#define MODEL_e2 0x73 -#define MODEL_e1 0x72 -#define MODEL_monn 0x71 -#define MODEL_n2 0x70 -#define MODEL_n1 0x6F -#define MODEL_g133 0x6E -#define MODEL_o505 0x6D -#define MODEL_o504 0x6C -#define MODEL_o503 0x6B -#define MODEL_o502 0x6A -#define MODEL_g69 0x69 -#define MODEL_o497 0x68 -#define MODEL_o496 0x67 -#define MODEL_o495 0x66 -#define MODEL_o494 0x65 -#define MODEL_o493 0x64 -#define MODEL_o492 0x63 -#define MODEL_o491 0x62 -#define MODEL_o490 0x61 -#define MODEL_o489 0x60 -#define MODEL_o488 0x5F -#define MODEL_o487 0x5E -#define MODEL_o486 0x5D -#define MODEL_o485 0x5C -#define MODEL_o484 0x5B -#define MODEL_o483 0x5A -#define MODEL_o482 0x59 -#define MODEL_o481 0x58 -#define MODEL_o480 0x57 -#define MODEL_ki_soto 0x56 -#define MODEL_g125 0x55 -#define MODEL_o464 0x54 -#define MODEL_o463 0x53 -#define MODEL_o462 0x52 -#define MODEL_o461 0x51 -#define MODEL_o460 0x50 -#define MODEL_g124 0x4F -#define MODEL_o459 0x4E -#define MODEL_o458 0x4D -#define MODEL_o457 0x4C -#define MODEL_o456 0x4B -#define MODEL_o455 0x4A -#define MODEL_g123 0x49 -#define MODEL_o454 0x48 -#define MODEL_o453 0x47 -#define MODEL_o452 0x46 -#define MODEL_o451 0x45 -#define MODEL_o450 0x44 -#define MODEL_g122 0x43 -#define MODEL_o449 0x42 -#define MODEL_o448 0x41 -#define MODEL_o447 0x40 -#define MODEL_o446 0x3F -#define MODEL_o445 0x3E -#define MODEL_kusa 0x3D -#define MODEL_o286 0x3C -#define MODEL_o308 0x3B -#define MODEL_o307 0x3A -#define MODEL_atari_kusa 0x39 -#define MODEL_iwa 0x38 -#define MODEL_o299 0x37 -#define MODEL_o301 0x36 -#define MODEL_o289 0x35 -#define MODEL_o303 0x34 -#define MODEL_o533 0x33 -#define MODEL_o530 0x32 -#define MODEL_kinoko 0x31 -#define MODEL_o431 0x30 -#define MODEL_center 0x2F -#define MODEL_kusa1 0x2E -#define MODEL_o525 0x2D -#define MODEL_o337 0x2C -#define MODEL_gake 0x2B -#define MODEL_o471 0x2A -#define MODEL_o470 0x29 -#define MODEL_o469 0x28 -#define MODEL_g117 0x27 -#define MODEL_kao 0x26 -#define MODEL_cn 0x25 -#define MODEL_o253 0x24 -#define MODEL_o479 0x23 -#define MODEL_g129 0x22 -#define MODEL_o477 0x21 -#define MODEL_o476 0x20 -#define MODEL_g128 0x1F -#define MODEL_o475 0x1E -#define MODEL_o474 0x1D -#define MODEL_g127 0x1C -#define MODEL_o473 0x1B -#define MODEL_o472 0x1A -#define MODEL_okaue_tree 0x19 -#define MODEL_o335 0x18 -#define MODEL_o334 0x17 -#define MODEL_o332 0x16 -#define MODEL_road 0x15 -#define MODEL_road_e 0x14 -#define MODEL_road_w 0x13 -#define MODEL_road_n 0x12 -#define MODEL_road_s 0x11 -#define MODEL_maru 0x10 -#define MODEL_exit 0xF -#define MODEL_exit_w 0xE -#define MODEL_o468 0xD -#define MODEL_o134 0xC -#define MODEL_exit_s 0xB -#define MODEL_o467 0xA -#define MODEL_o138 0x9 -#define MODEL_exit_e 0x8 -#define MODEL_o466 0x7 -#define MODEL_o132 0x6 -#define MODEL_exit_n 0x5 -#define MODEL_o465 0x4 -#define MODEL_o136 0x3 -#define MODEL_g1 0x2 -#define MODEL_stege 0x1 -#define MODEL_frame 0x0 +#define MODEL_Root 0x7C +#define MODEL_mon 0x7B +#define MODEL_monw 0x7A +#define MODEL_w2 0x79 +#define MODEL_w1 0x78 +#define MODEL_mons 0x77 +#define MODEL_s2 0x76 +#define MODEL_s1 0x75 +#define MODEL_mone 0x74 +#define MODEL_e2 0x73 +#define MODEL_e1 0x72 +#define MODEL_monn 0x71 +#define MODEL_n2 0x70 +#define MODEL_n1 0x6F +#define MODEL_g133 0x6E +#define MODEL_o505 0x6D +#define MODEL_o504 0x6C +#define MODEL_o503 0x6B +#define MODEL_o502 0x6A +#define MODEL_g69 0x69 +#define MODEL_o497 0x68 +#define MODEL_o496 0x67 +#define MODEL_o495 0x66 +#define MODEL_o494 0x65 +#define MODEL_o493 0x64 +#define MODEL_o492 0x63 +#define MODEL_o491 0x62 +#define MODEL_o490 0x61 +#define MODEL_o489 0x60 +#define MODEL_o488 0x5F +#define MODEL_o487 0x5E +#define MODEL_o486 0x5D +#define MODEL_o485 0x5C +#define MODEL_o484 0x5B +#define MODEL_o483 0x5A +#define MODEL_o482 0x59 +#define MODEL_o481 0x58 +#define MODEL_o480 0x57 +#define MODEL_ki_soto 0x56 +#define MODEL_g125 0x55 +#define MODEL_o464 0x54 +#define MODEL_o463 0x53 +#define MODEL_o462 0x52 +#define MODEL_o461 0x51 +#define MODEL_o460 0x50 +#define MODEL_g124 0x4F +#define MODEL_o459 0x4E +#define MODEL_o458 0x4D +#define MODEL_o457 0x4C +#define MODEL_o456 0x4B +#define MODEL_o455 0x4A +#define MODEL_g123 0x49 +#define MODEL_o454 0x48 +#define MODEL_o453 0x47 +#define MODEL_o452 0x46 +#define MODEL_o451 0x45 +#define MODEL_o450 0x44 +#define MODEL_g122 0x43 +#define MODEL_o449 0x42 +#define MODEL_o448 0x41 +#define MODEL_o447 0x40 +#define MODEL_o446 0x3F +#define MODEL_o445 0x3E +#define MODEL_kusa 0x3D +#define MODEL_o286 0x3C +#define MODEL_o308 0x3B +#define MODEL_o307 0x3A +#define MODEL_atari_kusa 0x39 +#define MODEL_iwa 0x38 +#define MODEL_o299 0x37 +#define MODEL_o301 0x36 +#define MODEL_o289 0x35 +#define MODEL_o303 0x34 +#define MODEL_o533 0x33 +#define MODEL_o530 0x32 +#define MODEL_kinoko 0x31 +#define MODEL_o431 0x30 +#define MODEL_center 0x2F +#define MODEL_kusa1 0x2E +#define MODEL_o525 0x2D +#define MODEL_o337 0x2C +#define MODEL_gake 0x2B +#define MODEL_o471 0x2A +#define MODEL_o470 0x29 +#define MODEL_o469 0x28 +#define MODEL_g117 0x27 +#define MODEL_kao 0x26 +#define MODEL_cn 0x25 +#define MODEL_o253 0x24 +#define MODEL_o479 0x23 +#define MODEL_g129 0x22 +#define MODEL_o477 0x21 +#define MODEL_o476 0x20 +#define MODEL_g128 0x1F +#define MODEL_o475 0x1E +#define MODEL_o474 0x1D +#define MODEL_g127 0x1C +#define MODEL_o473 0x1B +#define MODEL_o472 0x1A +#define MODEL_okaue_tree 0x19 +#define MODEL_o335 0x18 +#define MODEL_o334 0x17 +#define MODEL_o332 0x16 +#define MODEL_road 0x15 +#define MODEL_road_e 0x14 +#define MODEL_road_w 0x13 +#define MODEL_road_n 0x12 +#define MODEL_road_s 0x11 +#define MODEL_maru 0x10 +#define MODEL_exit 0xF +#define MODEL_exit_w 0xE +#define MODEL_o468 0xD +#define MODEL_o134 0xC +#define MODEL_exit_s 0xB +#define MODEL_o467 0xA +#define MODEL_o138 0x9 +#define MODEL_exit_e 0x8 +#define MODEL_o466 0x7 +#define MODEL_o132 0x6 +#define MODEL_exit_n 0x5 +#define MODEL_o465 0x4 +#define MODEL_o136 0x3 +#define MODEL_g1 0x2 +#define MODEL_stege 0x1 +#define MODEL_frame 0x0 + diff --git a/include/mapfs/mim_05_hit.h b/include/mapfs/mim_05_hit.h index a22af4cea0..a826c5aedd 100644 --- a/include/mapfs/mim_05_hit.h +++ b/include/mapfs/mim_05_hit.h @@ -1,42 +1,57 @@ -#define COLLIDER_Root 0x29 -#define COLLIDER_g123 0x28 -#define COLLIDER_monw 0x27 -#define COLLIDER_g122 0x26 -#define COLLIDER_mons 0x25 -#define COLLIDER_g121 0x24 -#define COLLIDER_mone 0x23 -#define COLLIDER_g120 0x22 -#define COLLIDER_monn 0x21 -#define COLLIDER_g116 0x20 -#define COLLIDER_o430 0x1F -#define COLLIDER_o429 0x1E -#define COLLIDER_kinoko 0x1D -#define COLLIDER_kino_s 0x1C -#define COLLIDER_o402 0x1B -#define COLLIDER_kino_w 0x1A -#define COLLIDER_o405 0x19 -#define COLLIDER_kino_n 0x18 -#define COLLIDER_o403 0x17 -#define COLLIDER_kino_e 0x16 -#define COLLIDER_o404 0x15 -#define COLLIDER_exit 0x14 -#define COLLIDER_exit_w 0x13 -#define COLLIDER_ttw 0x12 -#define COLLIDER_nw 0x11 -#define COLLIDER_deiliw 0x10 -#define COLLIDER_deilitw 0xF -#define COLLIDER_exit_s 0xE -#define COLLIDER_tts 0xD -#define COLLIDER_ns 0xC -#define COLLIDER_deilis 0xB -#define COLLIDER_deilits 0xA -#define COLLIDER_exit_e 0x9 -#define COLLIDER_tte 0x8 -#define COLLIDER_ne 0x7 -#define COLLIDER_deilie 0x6 -#define COLLIDER_deilite 0x5 -#define COLLIDER_exit_n 0x4 -#define COLLIDER_ttn 0x3 -#define COLLIDER_nn 0x2 -#define COLLIDER_deilin 0x1 -#define COLLIDER_deilitn 0x0 +#define COLLIDER_Root 0x29 +#define COLLIDER_g123 0x28 +#define COLLIDER_monw 0x27 +#define COLLIDER_g122 0x26 +#define COLLIDER_mons 0x25 +#define COLLIDER_g121 0x24 +#define COLLIDER_mone 0x23 +#define COLLIDER_g120 0x22 +#define COLLIDER_monn 0x21 +#define COLLIDER_g116 0x20 +#define COLLIDER_o430 0x1F +#define COLLIDER_o429 0x1E +#define COLLIDER_kinoko 0x1D +#define COLLIDER_kino_s 0x1C +#define COLLIDER_o402 0x1B +#define COLLIDER_kino_w 0x1A +#define COLLIDER_o405 0x19 +#define COLLIDER_kino_n 0x18 +#define COLLIDER_o403 0x17 +#define COLLIDER_kino_e 0x16 +#define COLLIDER_o404 0x15 +#define COLLIDER_exit 0x14 +#define COLLIDER_exit_w 0x13 +#define COLLIDER_ttw 0x12 +#define COLLIDER_nw 0x11 +#define COLLIDER_deiliw 0x10 +#define COLLIDER_deilitw 0xF +#define COLLIDER_exit_s 0xE +#define COLLIDER_tts 0xD +#define COLLIDER_ns 0xC +#define COLLIDER_deilis 0xB +#define COLLIDER_deilits 0xA +#define COLLIDER_exit_e 0x9 +#define COLLIDER_tte 0x8 +#define COLLIDER_ne 0x7 +#define COLLIDER_deilie 0x6 +#define COLLIDER_deilite 0x5 +#define COLLIDER_exit_n 0x4 +#define COLLIDER_ttn 0x3 +#define COLLIDER_nn 0x2 +#define COLLIDER_deilin 0x1 +#define COLLIDER_deilitn 0x0 + +#define ZONE_Root 0xC +#define ZONE_enter 0xB +#define ZONE_north 0xA +#define ZONE_south 0x9 +#define ZONE_west 0x8 +#define ZONE_east 0x7 +#define ZONE_out 0x6 +#define ZONE_kita 0x5 +#define ZONE_minami 0x4 +#define ZONE_nishi 0x3 +#define ZONE_higashi 0x2 +#define ZONE_kaiten 0x1 +#define ZONE_stage 0x0 + diff --git a/include/mapfs/mim_05_shape.h b/include/mapfs/mim_05_shape.h index 6dd0887ff1..6d399ff5da 100644 --- a/include/mapfs/mim_05_shape.h +++ b/include/mapfs/mim_05_shape.h @@ -1,145 +1,146 @@ -#define MODEL_Root 0x90 -#define MODEL_mon 0x8F -#define MODEL_monw 0x8E -#define MODEL_w2 0x8D -#define MODEL_w1 0x8C -#define MODEL_mons 0x8B -#define MODEL_s2 0x8A -#define MODEL_s1 0x89 -#define MODEL_mone 0x88 -#define MODEL_e2 0x87 -#define MODEL_e1 0x86 -#define MODEL_monn 0x85 -#define MODEL_n2 0x84 -#define MODEL_n1 0x83 -#define MODEL_g124 0x82 -#define MODEL_o489 0x81 -#define MODEL_o488 0x80 -#define MODEL_o487 0x7F -#define MODEL_o486 0x7E -#define MODEL_g109 0x7D -#define MODEL_o479 0x7C -#define MODEL_o478 0x7B -#define MODEL_o477 0x7A -#define MODEL_o476 0x79 -#define MODEL_o475 0x78 -#define MODEL_o474 0x77 -#define MODEL_o473 0x76 -#define MODEL_o472 0x75 -#define MODEL_o471 0x74 -#define MODEL_o470 0x73 -#define MODEL_o469 0x72 -#define MODEL_o468 0x71 -#define MODEL_o467 0x70 -#define MODEL_o466 0x6F -#define MODEL_o465 0x6E -#define MODEL_o464 0x6D -#define MODEL_o463 0x6C -#define MODEL_o462 0x6B -#define MODEL_ki_soto 0x6A -#define MODEL_g116 0x69 -#define MODEL_o446 0x68 -#define MODEL_o445 0x67 -#define MODEL_o444 0x66 -#define MODEL_o443 0x65 -#define MODEL_o442 0x64 -#define MODEL_g115 0x63 -#define MODEL_o441 0x62 -#define MODEL_o440 0x61 -#define MODEL_o439 0x60 -#define MODEL_o438 0x5F -#define MODEL_o437 0x5E -#define MODEL_g114 0x5D -#define MODEL_o436 0x5C -#define MODEL_o435 0x5B -#define MODEL_o434 0x5A -#define MODEL_o433 0x59 -#define MODEL_o432 0x58 -#define MODEL_g113 0x57 -#define MODEL_o431 0x56 -#define MODEL_o430 0x55 -#define MODEL_o429 0x54 -#define MODEL_o428 0x53 -#define MODEL_o427 0x52 -#define MODEL_kinoko 0x51 -#define MODEL_kino_s 0x50 -#define MODEL_o511 0x4F -#define MODEL_o510 0x4E -#define MODEL_o402 0x4D -#define MODEL_kino_w 0x4C -#define MODEL_o509 0x4B -#define MODEL_o508 0x4A -#define MODEL_o507 0x49 -#define MODEL_o505 0x48 -#define MODEL_o504 0x47 -#define MODEL_o503 0x46 -#define MODEL_o502 0x45 -#define MODEL_o405 0x44 -#define MODEL_kino_n 0x43 -#define MODEL_o501 0x42 -#define MODEL_o500 0x41 -#define MODEL_o403 0x40 -#define MODEL_kino_e 0x3F -#define MODEL_o499 0x3E -#define MODEL_o498 0x3D -#define MODEL_o404 0x3C -#define MODEL_kusa 0x3B -#define MODEL_o286 0x3A -#define MODEL_o308 0x39 -#define MODEL_o307 0x38 -#define MODEL_atari_kusa 0x37 -#define MODEL_iwa 0x36 -#define MODEL_o300 0x35 -#define MODEL_o299 0x34 -#define MODEL_o302 0x33 -#define MODEL_o301 0x32 -#define MODEL_o295 0x31 -#define MODEL_o289 0x30 -#define MODEL_o304 0x2F -#define MODEL_o303 0x2E -#define MODEL_center 0x2D -#define MODEL_kusa1 0x2C -#define MODEL_o337 0x2B -#define MODEL_gake 0x2A -#define MODEL_o453 0x29 -#define MODEL_o452 0x28 -#define MODEL_o451 0x27 -#define MODEL_g121 0x26 -#define MODEL_o461 0x25 -#define MODEL_o460 0x24 -#define MODEL_g120 0x23 -#define MODEL_o459 0x22 -#define MODEL_o458 0x21 -#define MODEL_g119 0x20 -#define MODEL_o457 0x1F -#define MODEL_o456 0x1E -#define MODEL_g118 0x1D -#define MODEL_o455 0x1C -#define MODEL_o454 0x1B -#define MODEL_okaue_tree 0x1A -#define MODEL_o336 0x19 -#define MODEL_o335 0x18 -#define MODEL_o334 0x17 -#define MODEL_o332 0x16 -#define MODEL_road 0x15 -#define MODEL_road_e 0x14 -#define MODEL_road_w 0x13 -#define MODEL_road_n 0x12 -#define MODEL_road_s 0x11 -#define MODEL_maru 0x10 -#define MODEL_exit 0xF -#define MODEL_exit_w 0xE -#define MODEL_o450 0xD -#define MODEL_o134 0xC -#define MODEL_exit_s 0xB -#define MODEL_o449 0xA -#define MODEL_o138 0x9 -#define MODEL_exit_e 0x8 -#define MODEL_o448 0x7 -#define MODEL_o132 0x6 -#define MODEL_exit_n 0x5 -#define MODEL_o447 0x4 -#define MODEL_o136 0x3 -#define MODEL_g1 0x2 -#define MODEL_o401 0x1 -#define MODEL_frame 0x0 +#define MODEL_Root 0x90 +#define MODEL_mon 0x8F +#define MODEL_monw 0x8E +#define MODEL_w2 0x8D +#define MODEL_w1 0x8C +#define MODEL_mons 0x8B +#define MODEL_s2 0x8A +#define MODEL_s1 0x89 +#define MODEL_mone 0x88 +#define MODEL_e2 0x87 +#define MODEL_e1 0x86 +#define MODEL_monn 0x85 +#define MODEL_n2 0x84 +#define MODEL_n1 0x83 +#define MODEL_g124 0x82 +#define MODEL_o489 0x81 +#define MODEL_o488 0x80 +#define MODEL_o487 0x7F +#define MODEL_o486 0x7E +#define MODEL_g109 0x7D +#define MODEL_o479 0x7C +#define MODEL_o478 0x7B +#define MODEL_o477 0x7A +#define MODEL_o476 0x79 +#define MODEL_o475 0x78 +#define MODEL_o474 0x77 +#define MODEL_o473 0x76 +#define MODEL_o472 0x75 +#define MODEL_o471 0x74 +#define MODEL_o470 0x73 +#define MODEL_o469 0x72 +#define MODEL_o468 0x71 +#define MODEL_o467 0x70 +#define MODEL_o466 0x6F +#define MODEL_o465 0x6E +#define MODEL_o464 0x6D +#define MODEL_o463 0x6C +#define MODEL_o462 0x6B +#define MODEL_ki_soto 0x6A +#define MODEL_g116 0x69 +#define MODEL_o446 0x68 +#define MODEL_o445 0x67 +#define MODEL_o444 0x66 +#define MODEL_o443 0x65 +#define MODEL_o442 0x64 +#define MODEL_g115 0x63 +#define MODEL_o441 0x62 +#define MODEL_o440 0x61 +#define MODEL_o439 0x60 +#define MODEL_o438 0x5F +#define MODEL_o437 0x5E +#define MODEL_g114 0x5D +#define MODEL_o436 0x5C +#define MODEL_o435 0x5B +#define MODEL_o434 0x5A +#define MODEL_o433 0x59 +#define MODEL_o432 0x58 +#define MODEL_g113 0x57 +#define MODEL_o431 0x56 +#define MODEL_o430 0x55 +#define MODEL_o429 0x54 +#define MODEL_o428 0x53 +#define MODEL_o427 0x52 +#define MODEL_kinoko 0x51 +#define MODEL_kino_s 0x50 +#define MODEL_o511 0x4F +#define MODEL_o510 0x4E +#define MODEL_o402 0x4D +#define MODEL_kino_w 0x4C +#define MODEL_o509 0x4B +#define MODEL_o508 0x4A +#define MODEL_o507 0x49 +#define MODEL_o505 0x48 +#define MODEL_o504 0x47 +#define MODEL_o503 0x46 +#define MODEL_o502 0x45 +#define MODEL_o405 0x44 +#define MODEL_kino_n 0x43 +#define MODEL_o501 0x42 +#define MODEL_o500 0x41 +#define MODEL_o403 0x40 +#define MODEL_kino_e 0x3F +#define MODEL_o499 0x3E +#define MODEL_o498 0x3D +#define MODEL_o404 0x3C +#define MODEL_kusa 0x3B +#define MODEL_o286 0x3A +#define MODEL_o308 0x39 +#define MODEL_o307 0x38 +#define MODEL_atari_kusa 0x37 +#define MODEL_iwa 0x36 +#define MODEL_o300 0x35 +#define MODEL_o299 0x34 +#define MODEL_o302 0x33 +#define MODEL_o301 0x32 +#define MODEL_o295 0x31 +#define MODEL_o289 0x30 +#define MODEL_o304 0x2F +#define MODEL_o303 0x2E +#define MODEL_center 0x2D +#define MODEL_kusa1 0x2C +#define MODEL_o337 0x2B +#define MODEL_gake 0x2A +#define MODEL_o453 0x29 +#define MODEL_o452 0x28 +#define MODEL_o451 0x27 +#define MODEL_g121 0x26 +#define MODEL_o461 0x25 +#define MODEL_o460 0x24 +#define MODEL_g120 0x23 +#define MODEL_o459 0x22 +#define MODEL_o458 0x21 +#define MODEL_g119 0x20 +#define MODEL_o457 0x1F +#define MODEL_o456 0x1E +#define MODEL_g118 0x1D +#define MODEL_o455 0x1C +#define MODEL_o454 0x1B +#define MODEL_okaue_tree 0x1A +#define MODEL_o336 0x19 +#define MODEL_o335 0x18 +#define MODEL_o334 0x17 +#define MODEL_o332 0x16 +#define MODEL_road 0x15 +#define MODEL_road_e 0x14 +#define MODEL_road_w 0x13 +#define MODEL_road_n 0x12 +#define MODEL_road_s 0x11 +#define MODEL_maru 0x10 +#define MODEL_exit 0xF +#define MODEL_exit_w 0xE +#define MODEL_o450 0xD +#define MODEL_o134 0xC +#define MODEL_exit_s 0xB +#define MODEL_o449 0xA +#define MODEL_o138 0x9 +#define MODEL_exit_e 0x8 +#define MODEL_o448 0x7 +#define MODEL_o132 0x6 +#define MODEL_exit_n 0x5 +#define MODEL_o447 0x4 +#define MODEL_o136 0x3 +#define MODEL_g1 0x2 +#define MODEL_o401 0x1 +#define MODEL_frame 0x0 + diff --git a/include/mapfs/mim_06_hit.h b/include/mapfs/mim_06_hit.h index acdab08d81..88c82b427b 100644 --- a/include/mapfs/mim_06_hit.h +++ b/include/mapfs/mim_06_hit.h @@ -1,42 +1,57 @@ -#define COLLIDER_Root 0x29 -#define COLLIDER_g141 0x28 -#define COLLIDER_monw 0x27 -#define COLLIDER_g140 0x26 -#define COLLIDER_mons 0x25 -#define COLLIDER_g139 0x24 -#define COLLIDER_mone 0x23 -#define COLLIDER_g138 0x22 -#define COLLIDER_monn 0x21 -#define COLLIDER_g119 0x20 -#define COLLIDER_o420 0x1F -#define COLLIDER_o419 0x1E -#define COLLIDER_atari 0x1D -#define COLLIDER_atari_w 0x1C -#define COLLIDER_o418 0x1B -#define COLLIDER_atari_s 0x1A -#define COLLIDER_o417 0x19 -#define COLLIDER_atari_e 0x18 -#define COLLIDER_o331 0x17 -#define COLLIDER_atari_n 0x16 -#define COLLIDER_o416 0x15 -#define COLLIDER_exit 0x14 -#define COLLIDER_exit_w 0x13 -#define COLLIDER_ttw 0x12 -#define COLLIDER_nw 0x11 -#define COLLIDER_deiliw 0x10 -#define COLLIDER_deilitw 0xF -#define COLLIDER_exit_s 0xE -#define COLLIDER_tts 0xD -#define COLLIDER_ns 0xC -#define COLLIDER_deilis 0xB -#define COLLIDER_deilits 0xA -#define COLLIDER_exit_e 0x9 -#define COLLIDER_tte 0x8 -#define COLLIDER_ne 0x7 -#define COLLIDER_deilie 0x6 -#define COLLIDER_deilite 0x5 -#define COLLIDER_exit_n 0x4 -#define COLLIDER_ttn 0x3 -#define COLLIDER_nn 0x2 -#define COLLIDER_deilin 0x1 -#define COLLIDER_deilitn 0x0 +#define COLLIDER_Root 0x29 +#define COLLIDER_g141 0x28 +#define COLLIDER_monw 0x27 +#define COLLIDER_g140 0x26 +#define COLLIDER_mons 0x25 +#define COLLIDER_g139 0x24 +#define COLLIDER_mone 0x23 +#define COLLIDER_g138 0x22 +#define COLLIDER_monn 0x21 +#define COLLIDER_g119 0x20 +#define COLLIDER_o420 0x1F +#define COLLIDER_o419 0x1E +#define COLLIDER_atari 0x1D +#define COLLIDER_atari_w 0x1C +#define COLLIDER_o418 0x1B +#define COLLIDER_atari_s 0x1A +#define COLLIDER_o417 0x19 +#define COLLIDER_atari_e 0x18 +#define COLLIDER_o331 0x17 +#define COLLIDER_atari_n 0x16 +#define COLLIDER_o416 0x15 +#define COLLIDER_exit 0x14 +#define COLLIDER_exit_w 0x13 +#define COLLIDER_ttw 0x12 +#define COLLIDER_nw 0x11 +#define COLLIDER_deiliw 0x10 +#define COLLIDER_deilitw 0xF +#define COLLIDER_exit_s 0xE +#define COLLIDER_tts 0xD +#define COLLIDER_ns 0xC +#define COLLIDER_deilis 0xB +#define COLLIDER_deilits 0xA +#define COLLIDER_exit_e 0x9 +#define COLLIDER_tte 0x8 +#define COLLIDER_ne 0x7 +#define COLLIDER_deilie 0x6 +#define COLLIDER_deilite 0x5 +#define COLLIDER_exit_n 0x4 +#define COLLIDER_ttn 0x3 +#define COLLIDER_nn 0x2 +#define COLLIDER_deilin 0x1 +#define COLLIDER_deilitn 0x0 + +#define ZONE_Root 0xC +#define ZONE_enter 0xB +#define ZONE_north 0xA +#define ZONE_south 0x9 +#define ZONE_west 0x8 +#define ZONE_east 0x7 +#define ZONE_out 0x6 +#define ZONE_kita 0x5 +#define ZONE_minami 0x4 +#define ZONE_nishi 0x3 +#define ZONE_higashi 0x2 +#define ZONE_kaiten 0x1 +#define ZONE_stage 0x0 + diff --git a/include/mapfs/mim_06_shape.h b/include/mapfs/mim_06_shape.h index 1972672dd5..7cedeae096 100644 --- a/include/mapfs/mim_06_shape.h +++ b/include/mapfs/mim_06_shape.h @@ -1,166 +1,167 @@ -#define MODEL_Root 0xA5 -#define MODEL_mon 0xA4 -#define MODEL_monw 0xA3 -#define MODEL_w2 0xA2 -#define MODEL_w1 0xA1 -#define MODEL_mons 0xA0 -#define MODEL_s2 0x9F -#define MODEL_s1 0x9E -#define MODEL_mone 0x9D -#define MODEL_e2 0x9C -#define MODEL_e1 0x9B -#define MODEL_monn 0x9A -#define MODEL_n2 0x99 -#define MODEL_n1 0x98 -#define MODEL_g135 0x97 -#define MODEL_o490 0x96 -#define MODEL_o489 0x95 -#define MODEL_o488 0x94 -#define MODEL_o487 0x93 -#define MODEL_kirikabu 0x92 -#define MODEL_o312 0x91 -#define MODEL_o311 0x90 -#define MODEL_g69 0x8F -#define MODEL_o482 0x8E -#define MODEL_o481 0x8D -#define MODEL_o480 0x8C -#define MODEL_o479 0x8B -#define MODEL_o478 0x8A -#define MODEL_o477 0x89 -#define MODEL_o476 0x88 -#define MODEL_o475 0x87 -#define MODEL_o474 0x86 -#define MODEL_o473 0x85 -#define MODEL_o472 0x84 -#define MODEL_o471 0x83 -#define MODEL_o470 0x82 -#define MODEL_o469 0x81 -#define MODEL_o468 0x80 -#define MODEL_o467 0x7F -#define MODEL_o503 0x7E -#define MODEL_ki_soto 0x7D -#define MODEL_g127 0x7C -#define MODEL_o448 0x7B -#define MODEL_o447 0x7A -#define MODEL_o446 0x79 -#define MODEL_o445 0x78 -#define MODEL_o444 0x77 -#define MODEL_g126 0x76 -#define MODEL_o443 0x75 -#define MODEL_o442 0x74 -#define MODEL_o441 0x73 -#define MODEL_o440 0x72 -#define MODEL_o439 0x71 -#define MODEL_g125 0x70 -#define MODEL_o438 0x6F -#define MODEL_o437 0x6E -#define MODEL_o436 0x6D -#define MODEL_o435 0x6C -#define MODEL_o434 0x6B -#define MODEL_g124 0x6A -#define MODEL_o433 0x69 -#define MODEL_o432 0x68 -#define MODEL_o431 0x67 -#define MODEL_o430 0x66 -#define MODEL_o429 0x65 -#define MODEL_hana 0x64 -#define MODEL_hana_s 0x63 -#define MODEL_hs_c 0x62 -#define MODEL_sc_2 0x61 -#define MODEL_sc_1 0x60 -#define MODEL_hs_b 0x5F -#define MODEL_sb_2 0x5E -#define MODEL_sb_1 0x5D -#define MODEL_hs_a 0x5C -#define MODEL_sa_2 0x5B -#define MODEL_sa_1 0x5A -#define MODEL_hana_w 0x59 -#define MODEL_hw_c 0x58 -#define MODEL_wc_2 0x57 -#define MODEL_wc_1 0x56 -#define MODEL_hw_b 0x55 -#define MODEL_wb_2 0x54 -#define MODEL_wb_1 0x53 -#define MODEL_hw_a 0x52 -#define MODEL_wa_2 0x51 -#define MODEL_wa_1 0x50 -#define MODEL_hana_n 0x4F -#define MODEL_hn_c 0x4E -#define MODEL_nc_2 0x4D -#define MODEL_nc_1 0x4C -#define MODEL_hn_b 0x4B -#define MODEL_nb_2 0x4A -#define MODEL_nb_1 0x49 -#define MODEL_hn_a 0x48 -#define MODEL_na_2 0x47 -#define MODEL_na_1 0x46 -#define MODEL_hana_e 0x45 -#define MODEL_he_c 0x44 -#define MODEL_ec_2 0x43 -#define MODEL_ec_1 0x42 -#define MODEL_he_b 0x41 -#define MODEL_eb_2 0x40 -#define MODEL_eb_1 0x3F -#define MODEL_he_a 0x3E -#define MODEL_ea_2 0x3D -#define MODEL_ea_1 0x3C -#define MODEL_kusa 0x3B -#define MODEL_o502 0x3A -#define MODEL_o501 0x39 -#define MODEL_o500 0x38 -#define MODEL_o499 0x37 -#define MODEL_iwa 0x36 -#define MODEL_o300 0x35 -#define MODEL_o299 0x34 -#define MODEL_o302 0x33 -#define MODEL_o301 0x32 -#define MODEL_o295 0x31 -#define MODEL_o289 0x30 -#define MODEL_o304 0x2F -#define MODEL_o303 0x2E -#define MODEL_center 0x2D -#define MODEL_kusa1 0x2C -#define MODEL_o337 0x2B -#define MODEL_gake 0x2A -#define MODEL_o455 0x29 -#define MODEL_o454 0x28 -#define MODEL_o453 0x27 -#define MODEL_g132 0x26 -#define MODEL_o463 0x25 -#define MODEL_o462 0x24 -#define MODEL_g131 0x23 -#define MODEL_o461 0x22 -#define MODEL_o460 0x21 -#define MODEL_g130 0x20 -#define MODEL_o459 0x1F -#define MODEL_o458 0x1E -#define MODEL_g129 0x1D -#define MODEL_o457 0x1C -#define MODEL_o456 0x1B -#define MODEL_okaue_tree 0x1A -#define MODEL_o336 0x19 -#define MODEL_o335 0x18 -#define MODEL_o334 0x17 -#define MODEL_o332 0x16 -#define MODEL_road 0x15 -#define MODEL_road_e 0x14 -#define MODEL_road_w 0x13 -#define MODEL_road_n 0x12 -#define MODEL_road_s 0x11 -#define MODEL_maru 0x10 -#define MODEL_exit 0xF -#define MODEL_exit_w 0xE -#define MODEL_o452 0xD -#define MODEL_o134 0xC -#define MODEL_exit_s 0xB -#define MODEL_o451 0xA -#define MODEL_o138 0x9 -#define MODEL_exit_e 0x8 -#define MODEL_o450 0x7 -#define MODEL_o132 0x6 -#define MODEL_exit_n 0x5 -#define MODEL_o449 0x4 -#define MODEL_o136 0x3 -#define MODEL_g1 0x2 -#define MODEL_o401 0x1 -#define MODEL_frame 0x0 +#define MODEL_Root 0xA5 +#define MODEL_mon 0xA4 +#define MODEL_monw 0xA3 +#define MODEL_w2 0xA2 +#define MODEL_w1 0xA1 +#define MODEL_mons 0xA0 +#define MODEL_s2 0x9F +#define MODEL_s1 0x9E +#define MODEL_mone 0x9D +#define MODEL_e2 0x9C +#define MODEL_e1 0x9B +#define MODEL_monn 0x9A +#define MODEL_n2 0x99 +#define MODEL_n1 0x98 +#define MODEL_g135 0x97 +#define MODEL_o490 0x96 +#define MODEL_o489 0x95 +#define MODEL_o488 0x94 +#define MODEL_o487 0x93 +#define MODEL_kirikabu 0x92 +#define MODEL_o312 0x91 +#define MODEL_o311 0x90 +#define MODEL_g69 0x8F +#define MODEL_o482 0x8E +#define MODEL_o481 0x8D +#define MODEL_o480 0x8C +#define MODEL_o479 0x8B +#define MODEL_o478 0x8A +#define MODEL_o477 0x89 +#define MODEL_o476 0x88 +#define MODEL_o475 0x87 +#define MODEL_o474 0x86 +#define MODEL_o473 0x85 +#define MODEL_o472 0x84 +#define MODEL_o471 0x83 +#define MODEL_o470 0x82 +#define MODEL_o469 0x81 +#define MODEL_o468 0x80 +#define MODEL_o467 0x7F +#define MODEL_o503 0x7E +#define MODEL_ki_soto 0x7D +#define MODEL_g127 0x7C +#define MODEL_o448 0x7B +#define MODEL_o447 0x7A +#define MODEL_o446 0x79 +#define MODEL_o445 0x78 +#define MODEL_o444 0x77 +#define MODEL_g126 0x76 +#define MODEL_o443 0x75 +#define MODEL_o442 0x74 +#define MODEL_o441 0x73 +#define MODEL_o440 0x72 +#define MODEL_o439 0x71 +#define MODEL_g125 0x70 +#define MODEL_o438 0x6F +#define MODEL_o437 0x6E +#define MODEL_o436 0x6D +#define MODEL_o435 0x6C +#define MODEL_o434 0x6B +#define MODEL_g124 0x6A +#define MODEL_o433 0x69 +#define MODEL_o432 0x68 +#define MODEL_o431 0x67 +#define MODEL_o430 0x66 +#define MODEL_o429 0x65 +#define MODEL_hana 0x64 +#define MODEL_hana_s 0x63 +#define MODEL_hs_c 0x62 +#define MODEL_sc_2 0x61 +#define MODEL_sc_1 0x60 +#define MODEL_hs_b 0x5F +#define MODEL_sb_2 0x5E +#define MODEL_sb_1 0x5D +#define MODEL_hs_a 0x5C +#define MODEL_sa_2 0x5B +#define MODEL_sa_1 0x5A +#define MODEL_hana_w 0x59 +#define MODEL_hw_c 0x58 +#define MODEL_wc_2 0x57 +#define MODEL_wc_1 0x56 +#define MODEL_hw_b 0x55 +#define MODEL_wb_2 0x54 +#define MODEL_wb_1 0x53 +#define MODEL_hw_a 0x52 +#define MODEL_wa_2 0x51 +#define MODEL_wa_1 0x50 +#define MODEL_hana_n 0x4F +#define MODEL_hn_c 0x4E +#define MODEL_nc_2 0x4D +#define MODEL_nc_1 0x4C +#define MODEL_hn_b 0x4B +#define MODEL_nb_2 0x4A +#define MODEL_nb_1 0x49 +#define MODEL_hn_a 0x48 +#define MODEL_na_2 0x47 +#define MODEL_na_1 0x46 +#define MODEL_hana_e 0x45 +#define MODEL_he_c 0x44 +#define MODEL_ec_2 0x43 +#define MODEL_ec_1 0x42 +#define MODEL_he_b 0x41 +#define MODEL_eb_2 0x40 +#define MODEL_eb_1 0x3F +#define MODEL_he_a 0x3E +#define MODEL_ea_2 0x3D +#define MODEL_ea_1 0x3C +#define MODEL_kusa 0x3B +#define MODEL_o502 0x3A +#define MODEL_o501 0x39 +#define MODEL_o500 0x38 +#define MODEL_o499 0x37 +#define MODEL_iwa 0x36 +#define MODEL_o300 0x35 +#define MODEL_o299 0x34 +#define MODEL_o302 0x33 +#define MODEL_o301 0x32 +#define MODEL_o295 0x31 +#define MODEL_o289 0x30 +#define MODEL_o304 0x2F +#define MODEL_o303 0x2E +#define MODEL_center 0x2D +#define MODEL_kusa1 0x2C +#define MODEL_o337 0x2B +#define MODEL_gake 0x2A +#define MODEL_o455 0x29 +#define MODEL_o454 0x28 +#define MODEL_o453 0x27 +#define MODEL_g132 0x26 +#define MODEL_o463 0x25 +#define MODEL_o462 0x24 +#define MODEL_g131 0x23 +#define MODEL_o461 0x22 +#define MODEL_o460 0x21 +#define MODEL_g130 0x20 +#define MODEL_o459 0x1F +#define MODEL_o458 0x1E +#define MODEL_g129 0x1D +#define MODEL_o457 0x1C +#define MODEL_o456 0x1B +#define MODEL_okaue_tree 0x1A +#define MODEL_o336 0x19 +#define MODEL_o335 0x18 +#define MODEL_o334 0x17 +#define MODEL_o332 0x16 +#define MODEL_road 0x15 +#define MODEL_road_e 0x14 +#define MODEL_road_w 0x13 +#define MODEL_road_n 0x12 +#define MODEL_road_s 0x11 +#define MODEL_maru 0x10 +#define MODEL_exit 0xF +#define MODEL_exit_w 0xE +#define MODEL_o452 0xD +#define MODEL_o134 0xC +#define MODEL_exit_s 0xB +#define MODEL_o451 0xA +#define MODEL_o138 0x9 +#define MODEL_exit_e 0x8 +#define MODEL_o450 0x7 +#define MODEL_o132 0x6 +#define MODEL_exit_n 0x5 +#define MODEL_o449 0x4 +#define MODEL_o136 0x3 +#define MODEL_g1 0x2 +#define MODEL_o401 0x1 +#define MODEL_frame 0x0 + diff --git a/include/mapfs/mim_07_hit.h b/include/mapfs/mim_07_hit.h index a6f87901cb..844ecfa6f5 100644 --- a/include/mapfs/mim_07_hit.h +++ b/include/mapfs/mim_07_hit.h @@ -1,37 +1,52 @@ -#define COLLIDER_Root 0x24 -#define COLLIDER_g151 0x23 -#define COLLIDER_monw 0x22 -#define COLLIDER_g150 0x21 -#define COLLIDER_mons 0x20 -#define COLLIDER_g149 0x1F -#define COLLIDER_mone 0x1E -#define COLLIDER_g148 0x1D -#define COLLIDER_monn 0x1C -#define COLLIDER_g145 0x1B -#define COLLIDER_o482 0x1A -#define COLLIDER_o481 0x19 -#define COLLIDER_iwa 0x18 -#define COLLIDER_o491 0x17 -#define COLLIDER_kinoko 0x16 -#define COLLIDER_o484 0x15 -#define COLLIDER_exit 0x14 -#define COLLIDER_exit_w 0x13 -#define COLLIDER_ttw 0x12 -#define COLLIDER_nw 0x11 -#define COLLIDER_deiliw 0x10 -#define COLLIDER_deilitw 0xF -#define COLLIDER_exit_s 0xE -#define COLLIDER_tts 0xD -#define COLLIDER_ns 0xC -#define COLLIDER_deilis 0xB -#define COLLIDER_deilits 0xA -#define COLLIDER_exit_e 0x9 -#define COLLIDER_tte 0x8 -#define COLLIDER_ne 0x7 -#define COLLIDER_deilie 0x6 -#define COLLIDER_deilite 0x5 -#define COLLIDER_exit_n 0x4 -#define COLLIDER_ttn 0x3 -#define COLLIDER_nn 0x2 -#define COLLIDER_deilin 0x1 -#define COLLIDER_deilitn 0x0 +#define COLLIDER_Root 0x24 +#define COLLIDER_g151 0x23 +#define COLLIDER_monw 0x22 +#define COLLIDER_g150 0x21 +#define COLLIDER_mons 0x20 +#define COLLIDER_g149 0x1F +#define COLLIDER_mone 0x1E +#define COLLIDER_g148 0x1D +#define COLLIDER_monn 0x1C +#define COLLIDER_g145 0x1B +#define COLLIDER_o482 0x1A +#define COLLIDER_o481 0x19 +#define COLLIDER_iwa 0x18 +#define COLLIDER_o491 0x17 +#define COLLIDER_kinoko 0x16 +#define COLLIDER_o484 0x15 +#define COLLIDER_exit 0x14 +#define COLLIDER_exit_w 0x13 +#define COLLIDER_ttw 0x12 +#define COLLIDER_nw 0x11 +#define COLLIDER_deiliw 0x10 +#define COLLIDER_deilitw 0xF +#define COLLIDER_exit_s 0xE +#define COLLIDER_tts 0xD +#define COLLIDER_ns 0xC +#define COLLIDER_deilis 0xB +#define COLLIDER_deilits 0xA +#define COLLIDER_exit_e 0x9 +#define COLLIDER_tte 0x8 +#define COLLIDER_ne 0x7 +#define COLLIDER_deilie 0x6 +#define COLLIDER_deilite 0x5 +#define COLLIDER_exit_n 0x4 +#define COLLIDER_ttn 0x3 +#define COLLIDER_nn 0x2 +#define COLLIDER_deilin 0x1 +#define COLLIDER_deilitn 0x0 + +#define ZONE_Root 0xC +#define ZONE_enter 0xB +#define ZONE_north 0xA +#define ZONE_south 0x9 +#define ZONE_west 0x8 +#define ZONE_east 0x7 +#define ZONE_out 0x6 +#define ZONE_kita 0x5 +#define ZONE_minami 0x4 +#define ZONE_nishi 0x3 +#define ZONE_higashi 0x2 +#define ZONE_kaiten 0x1 +#define ZONE_stage 0x0 + diff --git a/include/mapfs/mim_07_shape.h b/include/mapfs/mim_07_shape.h index 61e823ab60..f2f135d95e 100644 --- a/include/mapfs/mim_07_shape.h +++ b/include/mapfs/mim_07_shape.h @@ -1,132 +1,133 @@ -#define MODEL_Root 0x83 -#define MODEL_mon 0x82 -#define MODEL_monw 0x81 -#define MODEL_w2 0x80 -#define MODEL_w1 0x7F -#define MODEL_mons 0x7E -#define MODEL_s2 0x7D -#define MODEL_s1 0x7C -#define MODEL_mone 0x7B -#define MODEL_e2 0x7A -#define MODEL_e1 0x79 -#define MODEL_monn 0x78 -#define MODEL_n2 0x77 -#define MODEL_n1 0x76 -#define MODEL_g136 0x75 -#define MODEL_o512 0x74 -#define MODEL_o511 0x73 -#define MODEL_o510 0x72 -#define MODEL_o509 0x71 -#define MODEL_g121 0x70 -#define MODEL_o504 0x6F -#define MODEL_o503 0x6E -#define MODEL_o502 0x6D -#define MODEL_o501 0x6C -#define MODEL_o500 0x6B -#define MODEL_o499 0x6A -#define MODEL_o498 0x69 -#define MODEL_o497 0x68 -#define MODEL_o496 0x67 -#define MODEL_o495 0x66 -#define MODEL_o494 0x65 -#define MODEL_o493 0x64 -#define MODEL_o492 0x63 -#define MODEL_o491 0x62 -#define MODEL_o490 0x61 -#define MODEL_o489 0x60 -#define MODEL_g134 0x5F -#define MODEL_o488 0x5E -#define MODEL_o487 0x5D -#define MODEL_kirikabu 0x5C -#define MODEL_o435 0x5B -#define MODEL_o434 0x5A -#define MODEL_ki_soto 0x59 -#define MODEL_g128 0x58 -#define MODEL_o471 0x57 -#define MODEL_o470 0x56 -#define MODEL_o469 0x55 -#define MODEL_o468 0x54 -#define MODEL_o467 0x53 -#define MODEL_g127 0x52 -#define MODEL_o466 0x51 -#define MODEL_o465 0x50 -#define MODEL_o464 0x4F -#define MODEL_o463 0x4E -#define MODEL_o462 0x4D -#define MODEL_g126 0x4C -#define MODEL_o461 0x4B -#define MODEL_o460 0x4A -#define MODEL_o459 0x49 -#define MODEL_o458 0x48 -#define MODEL_o457 0x47 -#define MODEL_g125 0x46 -#define MODEL_o456 0x45 -#define MODEL_o455 0x44 -#define MODEL_o454 0x43 -#define MODEL_o453 0x42 -#define MODEL_o452 0x41 -#define MODEL_kusa 0x40 -#define MODEL_o286 0x3F -#define MODEL_o308 0x3E -#define MODEL_o307 0x3D -#define MODEL_atari_kusa 0x3C -#define MODEL_iwa 0x3B -#define MODEL_o439 0x3A -#define MODEL_o438 0x39 -#define MODEL_o437 0x38 -#define MODEL_o436 0x37 -#define MODEL_o299 0x36 -#define MODEL_o301 0x35 -#define MODEL_o303 0x34 -#define MODEL_kao 0x33 -#define MODEL_o440 0x32 -#define MODEL_g120 0x31 -#define MODEL_o289 0x30 -#define MODEL_kinoko 0x2F -#define MODEL_o431 0x2E -#define MODEL_center 0x2D -#define MODEL_kusa1 0x2C -#define MODEL_o337 0x2B -#define MODEL_gake 0x2A -#define MODEL_o478 0x29 -#define MODEL_o477 0x28 -#define MODEL_o476 0x27 -#define MODEL_g133 0x26 -#define MODEL_o486 0x25 -#define MODEL_o485 0x24 -#define MODEL_g132 0x23 -#define MODEL_o484 0x22 -#define MODEL_o483 0x21 -#define MODEL_g131 0x20 -#define MODEL_o482 0x1F -#define MODEL_o481 0x1E -#define MODEL_g130 0x1D -#define MODEL_o480 0x1C -#define MODEL_o479 0x1B -#define MODEL_okaue_tree 0x1A -#define MODEL_o336 0x19 -#define MODEL_o335 0x18 -#define MODEL_o334 0x17 -#define MODEL_o332 0x16 -#define MODEL_road 0x15 -#define MODEL_road_e 0x14 -#define MODEL_road_w 0x13 -#define MODEL_road_n 0x12 -#define MODEL_road_s 0x11 -#define MODEL_maru 0x10 -#define MODEL_exit 0xF -#define MODEL_exit_w 0xE -#define MODEL_o475 0xD -#define MODEL_o134 0xC -#define MODEL_exit_s 0xB -#define MODEL_o474 0xA -#define MODEL_o138 0x9 -#define MODEL_exit_e 0x8 -#define MODEL_o473 0x7 -#define MODEL_o132 0x6 -#define MODEL_exit_n 0x5 -#define MODEL_o472 0x4 -#define MODEL_o136 0x3 -#define MODEL_g1 0x2 -#define MODEL_stege 0x1 -#define MODEL_frame 0x0 +#define MODEL_Root 0x83 +#define MODEL_mon 0x82 +#define MODEL_monw 0x81 +#define MODEL_w2 0x80 +#define MODEL_w1 0x7F +#define MODEL_mons 0x7E +#define MODEL_s2 0x7D +#define MODEL_s1 0x7C +#define MODEL_mone 0x7B +#define MODEL_e2 0x7A +#define MODEL_e1 0x79 +#define MODEL_monn 0x78 +#define MODEL_n2 0x77 +#define MODEL_n1 0x76 +#define MODEL_g136 0x75 +#define MODEL_o512 0x74 +#define MODEL_o511 0x73 +#define MODEL_o510 0x72 +#define MODEL_o509 0x71 +#define MODEL_g121 0x70 +#define MODEL_o504 0x6F +#define MODEL_o503 0x6E +#define MODEL_o502 0x6D +#define MODEL_o501 0x6C +#define MODEL_o500 0x6B +#define MODEL_o499 0x6A +#define MODEL_o498 0x69 +#define MODEL_o497 0x68 +#define MODEL_o496 0x67 +#define MODEL_o495 0x66 +#define MODEL_o494 0x65 +#define MODEL_o493 0x64 +#define MODEL_o492 0x63 +#define MODEL_o491 0x62 +#define MODEL_o490 0x61 +#define MODEL_o489 0x60 +#define MODEL_g134 0x5F +#define MODEL_o488 0x5E +#define MODEL_o487 0x5D +#define MODEL_kirikabu 0x5C +#define MODEL_o435 0x5B +#define MODEL_o434 0x5A +#define MODEL_ki_soto 0x59 +#define MODEL_g128 0x58 +#define MODEL_o471 0x57 +#define MODEL_o470 0x56 +#define MODEL_o469 0x55 +#define MODEL_o468 0x54 +#define MODEL_o467 0x53 +#define MODEL_g127 0x52 +#define MODEL_o466 0x51 +#define MODEL_o465 0x50 +#define MODEL_o464 0x4F +#define MODEL_o463 0x4E +#define MODEL_o462 0x4D +#define MODEL_g126 0x4C +#define MODEL_o461 0x4B +#define MODEL_o460 0x4A +#define MODEL_o459 0x49 +#define MODEL_o458 0x48 +#define MODEL_o457 0x47 +#define MODEL_g125 0x46 +#define MODEL_o456 0x45 +#define MODEL_o455 0x44 +#define MODEL_o454 0x43 +#define MODEL_o453 0x42 +#define MODEL_o452 0x41 +#define MODEL_kusa 0x40 +#define MODEL_o286 0x3F +#define MODEL_o308 0x3E +#define MODEL_o307 0x3D +#define MODEL_atari_kusa 0x3C +#define MODEL_iwa 0x3B +#define MODEL_o439 0x3A +#define MODEL_o438 0x39 +#define MODEL_o437 0x38 +#define MODEL_o436 0x37 +#define MODEL_o299 0x36 +#define MODEL_o301 0x35 +#define MODEL_o303 0x34 +#define MODEL_kao 0x33 +#define MODEL_o440 0x32 +#define MODEL_g120 0x31 +#define MODEL_o289 0x30 +#define MODEL_kinoko 0x2F +#define MODEL_o431 0x2E +#define MODEL_center 0x2D +#define MODEL_kusa1 0x2C +#define MODEL_o337 0x2B +#define MODEL_gake 0x2A +#define MODEL_o478 0x29 +#define MODEL_o477 0x28 +#define MODEL_o476 0x27 +#define MODEL_g133 0x26 +#define MODEL_o486 0x25 +#define MODEL_o485 0x24 +#define MODEL_g132 0x23 +#define MODEL_o484 0x22 +#define MODEL_o483 0x21 +#define MODEL_g131 0x20 +#define MODEL_o482 0x1F +#define MODEL_o481 0x1E +#define MODEL_g130 0x1D +#define MODEL_o480 0x1C +#define MODEL_o479 0x1B +#define MODEL_okaue_tree 0x1A +#define MODEL_o336 0x19 +#define MODEL_o335 0x18 +#define MODEL_o334 0x17 +#define MODEL_o332 0x16 +#define MODEL_road 0x15 +#define MODEL_road_e 0x14 +#define MODEL_road_w 0x13 +#define MODEL_road_n 0x12 +#define MODEL_road_s 0x11 +#define MODEL_maru 0x10 +#define MODEL_exit 0xF +#define MODEL_exit_w 0xE +#define MODEL_o475 0xD +#define MODEL_o134 0xC +#define MODEL_exit_s 0xB +#define MODEL_o474 0xA +#define MODEL_o138 0x9 +#define MODEL_exit_e 0x8 +#define MODEL_o473 0x7 +#define MODEL_o132 0x6 +#define MODEL_exit_n 0x5 +#define MODEL_o472 0x4 +#define MODEL_o136 0x3 +#define MODEL_g1 0x2 +#define MODEL_stege 0x1 +#define MODEL_frame 0x0 + diff --git a/include/mapfs/mim_08_hit.h b/include/mapfs/mim_08_hit.h index 55be2cef01..12aa2d24a3 100644 --- a/include/mapfs/mim_08_hit.h +++ b/include/mapfs/mim_08_hit.h @@ -1,40 +1,56 @@ -#define COLLIDER_Root 0x27 -#define COLLIDER_g145 0x26 -#define COLLIDER_monw 0x25 -#define COLLIDER_g144 0x24 -#define COLLIDER_mons 0x23 -#define COLLIDER_g143 0x22 -#define COLLIDER_mone 0x21 -#define COLLIDER_g142 0x20 -#define COLLIDER_monn 0x1F -#define COLLIDER_Default 0x1E -#define COLLIDER_o480 0x1D -#define COLLIDER_o472 0x1C -#define COLLIDER_o471 0x1B -#define COLLIDER_atari 0x1A -#define COLLIDER_o473 0x19 -#define COLLIDER_o469 0x18 -#define COLLIDER_exit 0x17 -#define COLLIDER_exit_w 0x16 -#define COLLIDER_ttw 0x15 -#define COLLIDER_nw 0x14 -#define COLLIDER_deiliw 0x13 -#define COLLIDER_deilitw 0x12 -#define COLLIDER_exit_s 0x11 -#define COLLIDER_tts 0x10 -#define COLLIDER_ns 0xF -#define COLLIDER_deilis 0xE -#define COLLIDER_deilits 0xD -#define COLLIDER_exit_e 0xC -#define COLLIDER_tte 0xB -#define COLLIDER_ne 0xA -#define COLLIDER_deilie 0x9 -#define COLLIDER_deilite 0x8 -#define COLLIDER_exit_n 0x7 -#define COLLIDER_ttn 0x6 -#define COLLIDER_nn 0x5 -#define COLLIDER_deilin 0x4 -#define COLLIDER_deilitn 0x3 -#define COLLIDER_g1 0x2 -#define COLLIDER_o493 0x1 -#define COLLIDER_o474 0x0 +#define COLLIDER_Root 0x27 +#define COLLIDER_g145 0x26 +#define COLLIDER_monw 0x25 +#define COLLIDER_g144 0x24 +#define COLLIDER_mons 0x23 +#define COLLIDER_g143 0x22 +#define COLLIDER_mone 0x21 +#define COLLIDER_g142 0x20 +#define COLLIDER_monn 0x1F +#define COLLIDER_Default 0x1E +#define COLLIDER_o480 0x1D +#define COLLIDER_o472 0x1C +#define COLLIDER_o471 0x1B +#define COLLIDER_atari 0x1A +#define COLLIDER_o473 0x19 +#define COLLIDER_o469 0x18 +#define COLLIDER_exit 0x17 +#define COLLIDER_exit_w 0x16 +#define COLLIDER_ttw 0x15 +#define COLLIDER_nw 0x14 +#define COLLIDER_deiliw 0x13 +#define COLLIDER_deilitw 0x12 +#define COLLIDER_exit_s 0x11 +#define COLLIDER_tts 0x10 +#define COLLIDER_ns 0xF +#define COLLIDER_deilis 0xE +#define COLLIDER_deilits 0xD +#define COLLIDER_exit_e 0xC +#define COLLIDER_tte 0xB +#define COLLIDER_ne 0xA +#define COLLIDER_deilie 0x9 +#define COLLIDER_deilite 0x8 +#define COLLIDER_exit_n 0x7 +#define COLLIDER_ttn 0x6 +#define COLLIDER_nn 0x5 +#define COLLIDER_deilin 0x4 +#define COLLIDER_deilitn 0x3 +#define COLLIDER_g1 0x2 +#define COLLIDER_o493 0x1 +#define COLLIDER_o474 0x0 + +#define ZONE_Root 0xD +#define ZONE_enter 0xC +#define ZONE_north 0xB +#define ZONE_south 0xA +#define ZONE_west 0x9 +#define ZONE_east 0x8 +#define ZONE_out 0x7 +#define ZONE_o204 0x6 +#define ZONE_kita 0x5 +#define ZONE_minami 0x4 +#define ZONE_nishi 0x3 +#define ZONE_higashi 0x2 +#define ZONE_kaiten 0x1 +#define ZONE_stage 0x0 + diff --git a/include/mapfs/mim_08_shape.h b/include/mapfs/mim_08_shape.h index 79f2880e08..d8f902c097 100644 --- a/include/mapfs/mim_08_shape.h +++ b/include/mapfs/mim_08_shape.h @@ -1,127 +1,128 @@ -#define MODEL_Root 0x7E -#define MODEL_mon 0x7D -#define MODEL_monw 0x7C -#define MODEL_w2 0x7B -#define MODEL_w1 0x7A -#define MODEL_mons 0x79 -#define MODEL_s2 0x78 -#define MODEL_s1 0x77 -#define MODEL_mone 0x76 -#define MODEL_e2 0x75 -#define MODEL_e1 0x74 -#define MODEL_monn 0x73 -#define MODEL_n2 0x72 -#define MODEL_n1 0x71 -#define MODEL_g154 0x70 -#define MODEL_o561 0x6F -#define MODEL_o560 0x6E -#define MODEL_o559 0x6D -#define MODEL_o558 0x6C -#define MODEL_g128 0x6B -#define MODEL_g153 0x6A -#define MODEL_o551 0x69 -#define MODEL_o550 0x68 -#define MODEL_o549 0x67 -#define MODEL_o548 0x66 -#define MODEL_o547 0x65 -#define MODEL_o546 0x64 -#define MODEL_o545 0x63 -#define MODEL_o544 0x62 -#define MODEL_o543 0x61 -#define MODEL_o542 0x60 -#define MODEL_o541 0x5F -#define MODEL_o540 0x5E -#define MODEL_o539 0x5D -#define MODEL_o538 0x5C -#define MODEL_o537 0x5B -#define MODEL_o536 0x5A -#define MODEL_o456 0x59 -#define MODEL_o552 0x58 -#define MODEL_o534 0x57 -#define MODEL_hatinosu 0x56 -#define MODEL_o442 0x55 -#define MODEL_o443 0x54 -#define MODEL_ki_soto 0x53 -#define MODEL_g135 0x52 -#define MODEL_o476 0x51 -#define MODEL_o475 0x50 -#define MODEL_o474 0x4F -#define MODEL_o473 0x4E -#define MODEL_o472 0x4D -#define MODEL_g134 0x4C -#define MODEL_o471 0x4B -#define MODEL_o470 0x4A -#define MODEL_o469 0x49 -#define MODEL_o468 0x48 -#define MODEL_o467 0x47 -#define MODEL_g133 0x46 -#define MODEL_o466 0x45 -#define MODEL_o465 0x44 -#define MODEL_o464 0x43 -#define MODEL_o463 0x42 -#define MODEL_o462 0x41 -#define MODEL_g132 0x40 -#define MODEL_o461 0x3F -#define MODEL_o460 0x3E -#define MODEL_o459 0x3D -#define MODEL_o458 0x3C -#define MODEL_o457 0x3B -#define MODEL_kusa 0x3A -#define MODEL_o445 0x39 -#define MODEL_o308 0x38 -#define MODEL_o307 0x37 -#define MODEL_atari_kusa 0x36 -#define MODEL_iwa 0x35 -#define MODEL_o300 0x34 -#define MODEL_o299 0x33 -#define MODEL_o302 0x32 -#define MODEL_o301 0x31 -#define MODEL_o295 0x30 -#define MODEL_o289 0x2F -#define MODEL_o304 0x2E -#define MODEL_o303 0x2D -#define MODEL_okaue_tree 0x2C -#define MODEL_o500 0x2B -#define MODEL_o499 0x2A -#define MODEL_o498 0x29 -#define MODEL_center 0x28 -#define MODEL_kusa1 0x27 -#define MODEL_o512 0x26 -#define MODEL_gake 0x25 -#define MODEL_o511 0x24 -#define MODEL_o510 0x23 -#define MODEL_o509 0x22 -#define MODEL_g149 0x21 -#define MODEL_o508 0x20 -#define MODEL_o507 0x1F -#define MODEL_g148 0x1E -#define MODEL_o506 0x1D -#define MODEL_o505 0x1C -#define MODEL_g147 0x1B -#define MODEL_o504 0x1A -#define MODEL_o503 0x19 -#define MODEL_g146 0x18 -#define MODEL_o502 0x17 -#define MODEL_o501 0x16 -#define MODEL_road 0x15 -#define MODEL_road_e 0x14 -#define MODEL_road_w 0x13 -#define MODEL_road_n 0x12 -#define MODEL_road_s 0x11 -#define MODEL_maru 0x10 -#define MODEL_exit 0xF -#define MODEL_exit_w 0xE -#define MODEL_o480 0xD -#define MODEL_o134 0xC -#define MODEL_exit_s 0xB -#define MODEL_o479 0xA -#define MODEL_o138 0x9 -#define MODEL_exit_e 0x8 -#define MODEL_o478 0x7 -#define MODEL_o132 0x6 -#define MODEL_exit_n 0x5 -#define MODEL_o477 0x4 -#define MODEL_o136 0x3 -#define MODEL_g1 0x2 -#define MODEL_o401 0x1 -#define MODEL_frame 0x0 +#define MODEL_Root 0x7E +#define MODEL_mon 0x7D +#define MODEL_monw 0x7C +#define MODEL_w2 0x7B +#define MODEL_w1 0x7A +#define MODEL_mons 0x79 +#define MODEL_s2 0x78 +#define MODEL_s1 0x77 +#define MODEL_mone 0x76 +#define MODEL_e2 0x75 +#define MODEL_e1 0x74 +#define MODEL_monn 0x73 +#define MODEL_n2 0x72 +#define MODEL_n1 0x71 +#define MODEL_g154 0x70 +#define MODEL_o561 0x6F +#define MODEL_o560 0x6E +#define MODEL_o559 0x6D +#define MODEL_o558 0x6C +#define MODEL_g128 0x6B +#define MODEL_g153 0x6A +#define MODEL_o551 0x69 +#define MODEL_o550 0x68 +#define MODEL_o549 0x67 +#define MODEL_o548 0x66 +#define MODEL_o547 0x65 +#define MODEL_o546 0x64 +#define MODEL_o545 0x63 +#define MODEL_o544 0x62 +#define MODEL_o543 0x61 +#define MODEL_o542 0x60 +#define MODEL_o541 0x5F +#define MODEL_o540 0x5E +#define MODEL_o539 0x5D +#define MODEL_o538 0x5C +#define MODEL_o537 0x5B +#define MODEL_o536 0x5A +#define MODEL_o456 0x59 +#define MODEL_o552 0x58 +#define MODEL_o534 0x57 +#define MODEL_hatinosu 0x56 +#define MODEL_o442 0x55 +#define MODEL_o443 0x54 +#define MODEL_ki_soto 0x53 +#define MODEL_g135 0x52 +#define MODEL_o476 0x51 +#define MODEL_o475 0x50 +#define MODEL_o474 0x4F +#define MODEL_o473 0x4E +#define MODEL_o472 0x4D +#define MODEL_g134 0x4C +#define MODEL_o471 0x4B +#define MODEL_o470 0x4A +#define MODEL_o469 0x49 +#define MODEL_o468 0x48 +#define MODEL_o467 0x47 +#define MODEL_g133 0x46 +#define MODEL_o466 0x45 +#define MODEL_o465 0x44 +#define MODEL_o464 0x43 +#define MODEL_o463 0x42 +#define MODEL_o462 0x41 +#define MODEL_g132 0x40 +#define MODEL_o461 0x3F +#define MODEL_o460 0x3E +#define MODEL_o459 0x3D +#define MODEL_o458 0x3C +#define MODEL_o457 0x3B +#define MODEL_kusa 0x3A +#define MODEL_o445 0x39 +#define MODEL_o308 0x38 +#define MODEL_o307 0x37 +#define MODEL_atari_kusa 0x36 +#define MODEL_iwa 0x35 +#define MODEL_o300 0x34 +#define MODEL_o299 0x33 +#define MODEL_o302 0x32 +#define MODEL_o301 0x31 +#define MODEL_o295 0x30 +#define MODEL_o289 0x2F +#define MODEL_o304 0x2E +#define MODEL_o303 0x2D +#define MODEL_okaue_tree 0x2C +#define MODEL_o500 0x2B +#define MODEL_o499 0x2A +#define MODEL_o498 0x29 +#define MODEL_center 0x28 +#define MODEL_kusa1 0x27 +#define MODEL_o512 0x26 +#define MODEL_gake 0x25 +#define MODEL_o511 0x24 +#define MODEL_o510 0x23 +#define MODEL_o509 0x22 +#define MODEL_g149 0x21 +#define MODEL_o508 0x20 +#define MODEL_o507 0x1F +#define MODEL_g148 0x1E +#define MODEL_o506 0x1D +#define MODEL_o505 0x1C +#define MODEL_g147 0x1B +#define MODEL_o504 0x1A +#define MODEL_o503 0x19 +#define MODEL_g146 0x18 +#define MODEL_o502 0x17 +#define MODEL_o501 0x16 +#define MODEL_road 0x15 +#define MODEL_road_e 0x14 +#define MODEL_road_w 0x13 +#define MODEL_road_n 0x12 +#define MODEL_road_s 0x11 +#define MODEL_maru 0x10 +#define MODEL_exit 0xF +#define MODEL_exit_w 0xE +#define MODEL_o480 0xD +#define MODEL_o134 0xC +#define MODEL_exit_s 0xB +#define MODEL_o479 0xA +#define MODEL_o138 0x9 +#define MODEL_exit_e 0x8 +#define MODEL_o478 0x7 +#define MODEL_o132 0x6 +#define MODEL_exit_n 0x5 +#define MODEL_o477 0x4 +#define MODEL_o136 0x3 +#define MODEL_g1 0x2 +#define MODEL_o401 0x1 +#define MODEL_frame 0x0 + diff --git a/include/mapfs/mim_09_hit.h b/include/mapfs/mim_09_hit.h index f61ad01076..74c94c8a28 100644 --- a/include/mapfs/mim_09_hit.h +++ b/include/mapfs/mim_09_hit.h @@ -1,41 +1,57 @@ -#define COLLIDER_Root 0x28 -#define COLLIDER_g178 0x27 -#define COLLIDER_monw 0x26 -#define COLLIDER_g177 0x25 -#define COLLIDER_mons 0x24 -#define COLLIDER_g176 0x23 -#define COLLIDER_mone 0x22 -#define COLLIDER_g175 0x21 -#define COLLIDER_monn 0x20 -#define COLLIDER_Default 0x1F -#define COLLIDER_o561 0x1E -#define COLLIDER_o560 0x1D -#define COLLIDER_atari 0x1C -#define COLLIDER_atari_kusa 0x1B -#define COLLIDER_exit 0x1A -#define COLLIDER_exit_w 0x19 -#define COLLIDER_ttw 0x18 -#define COLLIDER_nw 0x17 -#define COLLIDER_deiliw 0x16 -#define COLLIDER_deilitw 0x15 -#define COLLIDER_exit_s 0x14 -#define COLLIDER_tts 0x13 -#define COLLIDER_ns 0x12 -#define COLLIDER_deilis 0x11 -#define COLLIDER_deilits 0x10 -#define COLLIDER_exit_e 0xF -#define COLLIDER_tte 0xE -#define COLLIDER_ne 0xD -#define COLLIDER_deilie 0xC -#define COLLIDER_deilite 0xB -#define COLLIDER_exit_n 0xA -#define COLLIDER_ttn 0x9 -#define COLLIDER_nn 0x8 -#define COLLIDER_deilin 0x7 -#define COLLIDER_deilitn 0x6 -#define COLLIDER_g1 0x5 -#define COLLIDER_o565 0x4 -#define COLLIDER_center 0x3 -#define COLLIDER_tree 0x2 -#define COLLIDER_o470 0x1 -#define COLLIDER_o513 0x0 +#define COLLIDER_Root 0x28 +#define COLLIDER_g178 0x27 +#define COLLIDER_monw 0x26 +#define COLLIDER_g177 0x25 +#define COLLIDER_mons 0x24 +#define COLLIDER_g176 0x23 +#define COLLIDER_mone 0x22 +#define COLLIDER_g175 0x21 +#define COLLIDER_monn 0x20 +#define COLLIDER_Default 0x1F +#define COLLIDER_o561 0x1E +#define COLLIDER_o560 0x1D +#define COLLIDER_atari 0x1C +#define COLLIDER_atari_kusa 0x1B +#define COLLIDER_exit 0x1A +#define COLLIDER_exit_w 0x19 +#define COLLIDER_ttw 0x18 +#define COLLIDER_nw 0x17 +#define COLLIDER_deiliw 0x16 +#define COLLIDER_deilitw 0x15 +#define COLLIDER_exit_s 0x14 +#define COLLIDER_tts 0x13 +#define COLLIDER_ns 0x12 +#define COLLIDER_deilis 0x11 +#define COLLIDER_deilits 0x10 +#define COLLIDER_exit_e 0xF +#define COLLIDER_tte 0xE +#define COLLIDER_ne 0xD +#define COLLIDER_deilie 0xC +#define COLLIDER_deilite 0xB +#define COLLIDER_exit_n 0xA +#define COLLIDER_ttn 0x9 +#define COLLIDER_nn 0x8 +#define COLLIDER_deilin 0x7 +#define COLLIDER_deilitn 0x6 +#define COLLIDER_g1 0x5 +#define COLLIDER_o565 0x4 +#define COLLIDER_center 0x3 +#define COLLIDER_tree 0x2 +#define COLLIDER_o470 0x1 +#define COLLIDER_o513 0x0 + +#define ZONE_Root 0xD +#define ZONE_enter 0xC +#define ZONE_north 0xB +#define ZONE_south 0xA +#define ZONE_west 0x9 +#define ZONE_east 0x8 +#define ZONE_out 0x7 +#define ZONE_o205 0x6 +#define ZONE_kita 0x5 +#define ZONE_minami 0x4 +#define ZONE_nishi 0x3 +#define ZONE_higashi 0x2 +#define ZONE_kaiten 0x1 +#define ZONE_stage 0x0 + diff --git a/include/mapfs/mim_09_shape.h b/include/mapfs/mim_09_shape.h index 421511e325..1382620db0 100644 --- a/include/mapfs/mim_09_shape.h +++ b/include/mapfs/mim_09_shape.h @@ -1,134 +1,135 @@ -#define MODEL_Root 0x85 -#define MODEL_mon 0x84 -#define MODEL_monw 0x83 -#define MODEL_w2 0x82 -#define MODEL_w1 0x81 -#define MODEL_mons 0x80 -#define MODEL_s2 0x7F -#define MODEL_s1 0x7E -#define MODEL_mone 0x7D -#define MODEL_e2 0x7C -#define MODEL_e1 0x7B -#define MODEL_monn 0x7A -#define MODEL_n2 0x79 -#define MODEL_n1 0x78 -#define MODEL_g155 0x77 -#define MODEL_o536 0x76 -#define MODEL_o535 0x75 -#define MODEL_o534 0x74 -#define MODEL_o533 0x73 -#define MODEL_g145 0x72 -#define MODEL_g153 0x71 -#define MODEL_o526 0x70 -#define MODEL_o525 0x6F -#define MODEL_o524 0x6E -#define MODEL_o523 0x6D -#define MODEL_o522 0x6C -#define MODEL_o521 0x6B -#define MODEL_o520 0x6A -#define MODEL_o519 0x69 -#define MODEL_o518 0x68 -#define MODEL_o517 0x67 -#define MODEL_o516 0x66 -#define MODEL_o515 0x65 -#define MODEL_o514 0x64 -#define MODEL_o513 0x63 -#define MODEL_o512 0x62 -#define MODEL_o511 0x61 -#define MODEL_o508 0x60 -#define MODEL_o480 0x5F -#define MODEL_o528 0x5E -#define MODEL_ki_soto 0x5D -#define MODEL_g152 0x5C -#define MODEL_o500 0x5B -#define MODEL_o499 0x5A -#define MODEL_o498 0x59 -#define MODEL_o497 0x58 -#define MODEL_o496 0x57 -#define MODEL_g151 0x56 -#define MODEL_o495 0x55 -#define MODEL_o494 0x54 -#define MODEL_o493 0x53 -#define MODEL_o492 0x52 -#define MODEL_o491 0x51 -#define MODEL_g150 0x50 -#define MODEL_o490 0x4F -#define MODEL_o489 0x4E -#define MODEL_o488 0x4D -#define MODEL_o487 0x4C -#define MODEL_o486 0x4B -#define MODEL_g149 0x4A -#define MODEL_o485 0x49 -#define MODEL_o484 0x48 -#define MODEL_o483 0x47 -#define MODEL_o482 0x46 -#define MODEL_o481 0x45 -#define MODEL_hana 0x44 -#define MODEL_g144 0x43 -#define MODEL_o469 0x42 -#define MODEL_o468 0x41 -#define MODEL_g143 0x40 -#define MODEL_o467 0x3F -#define MODEL_o466 0x3E -#define MODEL_g142 0x3D -#define MODEL_o465 0x3C -#define MODEL_o464 0x3B -#define MODEL_kusa 0x3A -#define MODEL_o445 0x39 -#define MODEL_o308 0x38 -#define MODEL_o307 0x37 -#define MODEL_atari_kusa 0x36 -#define MODEL_iwa 0x35 -#define MODEL_o300 0x34 -#define MODEL_o299 0x33 -#define MODEL_o302 0x32 -#define MODEL_o301 0x31 -#define MODEL_o295 0x30 -#define MODEL_o289 0x2F -#define MODEL_o304 0x2E -#define MODEL_o303 0x2D -#define MODEL_okaue_tree 0x2C -#define MODEL_o336 0x2B -#define MODEL_o335 0x2A -#define MODEL_o332 0x29 -#define MODEL_center 0x28 -#define MODEL_kusa1 0x27 -#define MODEL_o337 0x26 -#define MODEL_gake 0x25 -#define MODEL_ue 0x24 -#define MODEL_soku 0x23 -#define MODEL_o255 0x22 -#define MODEL_g49 0x21 -#define MODEL_o254 0x20 -#define MODEL_o253 0x1F -#define MODEL_g48 0x1E -#define MODEL_o251 0x1D -#define MODEL_o250 0x1C -#define MODEL_g44 0x1B -#define MODEL_o242 0x1A -#define MODEL_o241 0x19 -#define MODEL_g43 0x18 -#define MODEL_o238 0x17 -#define MODEL_o239 0x16 -#define MODEL_road 0x15 -#define MODEL_road_e 0x14 -#define MODEL_road_w 0x13 -#define MODEL_road_n 0x12 -#define MODEL_road_s 0x11 -#define MODEL_maru 0x10 -#define MODEL_exit 0xF -#define MODEL_exit_w 0xE -#define MODEL_o504 0xD -#define MODEL_o134 0xC -#define MODEL_exit_s 0xB -#define MODEL_o503 0xA -#define MODEL_o138 0x9 -#define MODEL_exit_e 0x8 -#define MODEL_o502 0x7 -#define MODEL_o132 0x6 -#define MODEL_exit_n 0x5 -#define MODEL_o501 0x4 -#define MODEL_o136 0x3 -#define MODEL_g1 0x2 -#define MODEL_o401 0x1 -#define MODEL_frame 0x0 +#define MODEL_Root 0x85 +#define MODEL_mon 0x84 +#define MODEL_monw 0x83 +#define MODEL_w2 0x82 +#define MODEL_w1 0x81 +#define MODEL_mons 0x80 +#define MODEL_s2 0x7F +#define MODEL_s1 0x7E +#define MODEL_mone 0x7D +#define MODEL_e2 0x7C +#define MODEL_e1 0x7B +#define MODEL_monn 0x7A +#define MODEL_n2 0x79 +#define MODEL_n1 0x78 +#define MODEL_g155 0x77 +#define MODEL_o536 0x76 +#define MODEL_o535 0x75 +#define MODEL_o534 0x74 +#define MODEL_o533 0x73 +#define MODEL_g145 0x72 +#define MODEL_g153 0x71 +#define MODEL_o526 0x70 +#define MODEL_o525 0x6F +#define MODEL_o524 0x6E +#define MODEL_o523 0x6D +#define MODEL_o522 0x6C +#define MODEL_o521 0x6B +#define MODEL_o520 0x6A +#define MODEL_o519 0x69 +#define MODEL_o518 0x68 +#define MODEL_o517 0x67 +#define MODEL_o516 0x66 +#define MODEL_o515 0x65 +#define MODEL_o514 0x64 +#define MODEL_o513 0x63 +#define MODEL_o512 0x62 +#define MODEL_o511 0x61 +#define MODEL_o508 0x60 +#define MODEL_o480 0x5F +#define MODEL_o528 0x5E +#define MODEL_ki_soto 0x5D +#define MODEL_g152 0x5C +#define MODEL_o500 0x5B +#define MODEL_o499 0x5A +#define MODEL_o498 0x59 +#define MODEL_o497 0x58 +#define MODEL_o496 0x57 +#define MODEL_g151 0x56 +#define MODEL_o495 0x55 +#define MODEL_o494 0x54 +#define MODEL_o493 0x53 +#define MODEL_o492 0x52 +#define MODEL_o491 0x51 +#define MODEL_g150 0x50 +#define MODEL_o490 0x4F +#define MODEL_o489 0x4E +#define MODEL_o488 0x4D +#define MODEL_o487 0x4C +#define MODEL_o486 0x4B +#define MODEL_g149 0x4A +#define MODEL_o485 0x49 +#define MODEL_o484 0x48 +#define MODEL_o483 0x47 +#define MODEL_o482 0x46 +#define MODEL_o481 0x45 +#define MODEL_hana 0x44 +#define MODEL_g144 0x43 +#define MODEL_o469 0x42 +#define MODEL_o468 0x41 +#define MODEL_g143 0x40 +#define MODEL_o467 0x3F +#define MODEL_o466 0x3E +#define MODEL_g142 0x3D +#define MODEL_o465 0x3C +#define MODEL_o464 0x3B +#define MODEL_kusa 0x3A +#define MODEL_o445 0x39 +#define MODEL_o308 0x38 +#define MODEL_o307 0x37 +#define MODEL_atari_kusa 0x36 +#define MODEL_iwa 0x35 +#define MODEL_o300 0x34 +#define MODEL_o299 0x33 +#define MODEL_o302 0x32 +#define MODEL_o301 0x31 +#define MODEL_o295 0x30 +#define MODEL_o289 0x2F +#define MODEL_o304 0x2E +#define MODEL_o303 0x2D +#define MODEL_okaue_tree 0x2C +#define MODEL_o336 0x2B +#define MODEL_o335 0x2A +#define MODEL_o332 0x29 +#define MODEL_center 0x28 +#define MODEL_kusa1 0x27 +#define MODEL_o337 0x26 +#define MODEL_gake 0x25 +#define MODEL_ue 0x24 +#define MODEL_soku 0x23 +#define MODEL_o255 0x22 +#define MODEL_g49 0x21 +#define MODEL_o254 0x20 +#define MODEL_o253 0x1F +#define MODEL_g48 0x1E +#define MODEL_o251 0x1D +#define MODEL_o250 0x1C +#define MODEL_g44 0x1B +#define MODEL_o242 0x1A +#define MODEL_o241 0x19 +#define MODEL_g43 0x18 +#define MODEL_o238 0x17 +#define MODEL_o239 0x16 +#define MODEL_road 0x15 +#define MODEL_road_e 0x14 +#define MODEL_road_w 0x13 +#define MODEL_road_n 0x12 +#define MODEL_road_s 0x11 +#define MODEL_maru 0x10 +#define MODEL_exit 0xF +#define MODEL_exit_w 0xE +#define MODEL_o504 0xD +#define MODEL_o134 0xC +#define MODEL_exit_s 0xB +#define MODEL_o503 0xA +#define MODEL_o138 0x9 +#define MODEL_exit_e 0x8 +#define MODEL_o502 0x7 +#define MODEL_o132 0x6 +#define MODEL_exit_n 0x5 +#define MODEL_o501 0x4 +#define MODEL_o136 0x3 +#define MODEL_g1 0x2 +#define MODEL_o401 0x1 +#define MODEL_frame 0x0 + diff --git a/include/mapfs/mim_10_hit.h b/include/mapfs/mim_10_hit.h index 95e894fc3b..afaf6ccecf 100644 --- a/include/mapfs/mim_10_hit.h +++ b/include/mapfs/mim_10_hit.h @@ -1,16 +1,22 @@ -#define COLLIDER_Root 0xF -#define COLLIDER_g2 0xE -#define COLLIDER_o58 0xD -#define COLLIDER_o28 0xC -#define COLLIDER_g1 0xB -#define COLLIDER_o57 0xA -#define COLLIDER_o50 0x9 -#define COLLIDER_exit 0x8 -#define COLLIDER_exitw 0x7 -#define COLLIDER_nw 0x6 -#define COLLIDER_deiliw 0x5 -#define COLLIDER_deilitw 0x4 -#define COLLIDER_exite 0x3 -#define COLLIDER_ne 0x2 -#define COLLIDER_deilie 0x1 -#define COLLIDER_deilite 0x0 +#define COLLIDER_Root 0xF +#define COLLIDER_g2 0xE +#define COLLIDER_o58 0xD +#define COLLIDER_o28 0xC +#define COLLIDER_g1 0xB +#define COLLIDER_o57 0xA +#define COLLIDER_o50 0x9 +#define COLLIDER_exit 0x8 +#define COLLIDER_exitw 0x7 +#define COLLIDER_nw 0x6 +#define COLLIDER_deiliw 0x5 +#define COLLIDER_deilitw 0x4 +#define COLLIDER_exite 0x3 +#define COLLIDER_ne 0x2 +#define COLLIDER_deilie 0x1 +#define COLLIDER_deilite 0x0 + +#define ZONE_Root 0x3 +#define ZONE_g1 0x2 +#define ZONE_g2 0x1 +#define ZONE_o1 0x0 + diff --git a/include/mapfs/mim_10_shape.h b/include/mapfs/mim_10_shape.h index 4690b2af67..cca873f5f0 100644 --- a/include/mapfs/mim_10_shape.h +++ b/include/mapfs/mim_10_shape.h @@ -1,51 +1,52 @@ -#define MODEL_Root 0x32 -#define MODEL_g19 0x31 -#define MODEL_flo1 0x30 -#define MODEL_flo2 0x2F -#define MODEL_o69 0x2E -#define MODEL_o68 0x2D -#define MODEL_o67 0x2C -#define MODEL_o66 0x2B -#define MODEL_o65 0x2A -#define MODEL_g2 0x29 -#define MODEL_g14 0x28 -#define MODEL_o38 0x27 -#define MODEL_o37 0x26 -#define MODEL_o36 0x25 -#define MODEL_o35 0x24 -#define MODEL_o32 0x23 -#define MODEL_g13 0x22 -#define MODEL_o44 0x21 -#define MODEL_o43 0x20 -#define MODEL_o30 0x1F -#define MODEL_o28 0x1E -#define MODEL_ki2 0x1D -#define MODEL_o27 0x1C -#define MODEL_o26 0x1B -#define MODEL_o25 0x1A -#define MODEL_o24 0x19 -#define MODEL_o23 0x18 -#define MODEL_ki1 0x17 -#define MODEL_o64 0x16 -#define MODEL_o42 0x15 -#define MODEL_o41 0x14 -#define MODEL_o40 0x13 -#define MODEL_eda 0x12 -#define MODEL_o22 0x11 -#define MODEL_o21 0x10 -#define MODEL_o20 0xF -#define MODEL_g1 0xE -#define MODEL_g10 0xD -#define MODEL_o19 0xC -#define MODEL_o13 0xB -#define MODEL_o14 0xA -#define MODEL_g9 0x9 -#define MODEL_o12 0x8 -#define MODEL_o11 0x7 -#define MODEL_g3 0x6 -#define MODEL_g7 0x5 -#define MODEL_o8 0x4 -#define MODEL_o7 0x3 -#define MODEL_g5 0x2 -#define MODEL_o4 0x1 -#define MODEL_o3 0x0 +#define MODEL_Root 0x32 +#define MODEL_g19 0x31 +#define MODEL_flo1 0x30 +#define MODEL_flo2 0x2F +#define MODEL_o69 0x2E +#define MODEL_o68 0x2D +#define MODEL_o67 0x2C +#define MODEL_o66 0x2B +#define MODEL_o65 0x2A +#define MODEL_g2 0x29 +#define MODEL_g14 0x28 +#define MODEL_o38 0x27 +#define MODEL_o37 0x26 +#define MODEL_o36 0x25 +#define MODEL_o35 0x24 +#define MODEL_o32 0x23 +#define MODEL_g13 0x22 +#define MODEL_o44 0x21 +#define MODEL_o43 0x20 +#define MODEL_o30 0x1F +#define MODEL_o28 0x1E +#define MODEL_ki2 0x1D +#define MODEL_o27 0x1C +#define MODEL_o26 0x1B +#define MODEL_o25 0x1A +#define MODEL_o24 0x19 +#define MODEL_o23 0x18 +#define MODEL_ki1 0x17 +#define MODEL_o64 0x16 +#define MODEL_o42 0x15 +#define MODEL_o41 0x14 +#define MODEL_o40 0x13 +#define MODEL_eda 0x12 +#define MODEL_o22 0x11 +#define MODEL_o21 0x10 +#define MODEL_o20 0xF +#define MODEL_g1 0xE +#define MODEL_g10 0xD +#define MODEL_o19 0xC +#define MODEL_o13 0xB +#define MODEL_o14 0xA +#define MODEL_g9 0x9 +#define MODEL_o12 0x8 +#define MODEL_o11 0x7 +#define MODEL_g3 0x6 +#define MODEL_g7 0x5 +#define MODEL_o8 0x4 +#define MODEL_o7 0x3 +#define MODEL_g5 0x2 +#define MODEL_o4 0x1 +#define MODEL_o3 0x0 + diff --git a/include/mapfs/mim_11_hit.h b/include/mapfs/mim_11_hit.h index 52073fc936..7c6b703e28 100644 --- a/include/mapfs/mim_11_hit.h +++ b/include/mapfs/mim_11_hit.h @@ -1,37 +1,46 @@ -#define COLLIDER_Root 0x24 -#define COLLIDER_g74 0x23 -#define COLLIDER_o210 0x22 -#define COLLIDER_o209 0x21 -#define COLLIDER_o208 0x20 -#define COLLIDER_o207 0x1F -#define COLLIDER_hei 0x1E -#define COLLIDER_o215 0x1D -#define COLLIDER_o206 0x1C -#define COLLIDER_o205 0x1B -#define COLLIDER_h_dai 0x1A -#define COLLIDER_ie 0x19 -#define COLLIDER_kabe2 0x18 -#define COLLIDER_stage 0x17 -#define COLLIDER_iwa 0x16 -#define COLLIDER_o153 0x15 -#define COLLIDER_kusa 0x14 -#define COLLIDER_o148 0x13 -#define COLLIDER_o214 0x12 -#define COLLIDER_o213 0x11 -#define COLLIDER_o212 0x10 -#define COLLIDER_road 0xF -#define COLLIDER_exit 0xE -#define COLLIDER_mon 0xD -#define COLLIDER_doa 0xC -#define COLLIDER_nd 0xB -#define COLLIDER_ttd 0xA -#define COLLIDER_deilid 0x9 -#define COLLIDER_odeilitd 0x8 -#define COLLIDER_exitw 0x7 -#define COLLIDER_nw 0x6 -#define COLLIDER_deiliw 0x5 -#define COLLIDER_deilitw 0x4 -#define COLLIDER_exite 0x3 -#define COLLIDER_ne 0x2 -#define COLLIDER_deilie 0x1 -#define COLLIDER_deilite 0x0 +#define COLLIDER_Root 0x24 +#define COLLIDER_g74 0x23 +#define COLLIDER_o210 0x22 +#define COLLIDER_o209 0x21 +#define COLLIDER_o208 0x20 +#define COLLIDER_o207 0x1F +#define COLLIDER_hei 0x1E +#define COLLIDER_o215 0x1D +#define COLLIDER_o206 0x1C +#define COLLIDER_o205 0x1B +#define COLLIDER_h_dai 0x1A +#define COLLIDER_ie 0x19 +#define COLLIDER_kabe2 0x18 +#define COLLIDER_stage 0x17 +#define COLLIDER_iwa 0x16 +#define COLLIDER_o153 0x15 +#define COLLIDER_kusa 0x14 +#define COLLIDER_o148 0x13 +#define COLLIDER_o214 0x12 +#define COLLIDER_o213 0x11 +#define COLLIDER_o212 0x10 +#define COLLIDER_road 0xF +#define COLLIDER_exit 0xE +#define COLLIDER_mon 0xD +#define COLLIDER_doa 0xC +#define COLLIDER_nd 0xB +#define COLLIDER_ttd 0xA +#define COLLIDER_deilid 0x9 +#define COLLIDER_odeilitd 0x8 +#define COLLIDER_exitw 0x7 +#define COLLIDER_nw 0x6 +#define COLLIDER_deiliw 0x5 +#define COLLIDER_deilitw 0x4 +#define COLLIDER_exite 0x3 +#define COLLIDER_ne 0x2 +#define COLLIDER_deilie 0x1 +#define COLLIDER_deilite 0x0 + +#define ZONE_Root 0x6 +#define ZONE_Default 0x5 +#define ZONE_out2 0x4 +#define ZONE_out 0x3 +#define ZONE_girden 0x2 +#define ZONE_deilie 0x1 +#define ZONE_deiliw 0x0 + diff --git a/include/mapfs/mim_11_shape.h b/include/mapfs/mim_11_shape.h index 48cb10d290..d9d6666eb1 100644 --- a/include/mapfs/mim_11_shape.h +++ b/include/mapfs/mim_11_shape.h @@ -1,123 +1,124 @@ -#define MODEL_Root 0x7A -#define MODEL_a_kusa 0x79 -#define MODEL_o185 0x78 -#define MODEL_o184 0x77 -#define MODEL_o183 0x76 -#define MODEL_o182 0x75 -#define MODEL_g62 0x74 -#define MODEL_o181 0x73 -#define MODEL_o180 0x72 -#define MODEL_o179 0x71 -#define MODEL_o178 0x70 -#define MODEL_o177 0x6F -#define MODEL_o176 0x6E -#define MODEL_mon1 0x6D -#define MODEL_h_mon1 0x6C -#define MODEL_mon2 0x6B -#define MODEL_h_mon2 0x6A -#define MODEL_doa2 0x69 -#define MODEL_o166 0x68 -#define MODEL_doa1 0x67 -#define MODEL_doa 0x66 -#define MODEL_etc 0x65 -#define MODEL_ki 0x64 -#define MODEL_o162 0x63 -#define MODEL_iwa 0x62 -#define MODEL_o161 0x61 -#define MODEL_o153 0x60 -#define MODEL_o164 0x5F -#define MODEL_o163 0x5E -#define MODEL_kusa 0x5D -#define MODEL_o151 0x5C -#define MODEL_o148 0x5B -#define MODEL_ie 0x5A -#define MODEL_g72 0x59 -#define MODEL_hasi2 0x58 -#define MODEL_en 0x57 -#define MODEL_e_waku2 0x56 -#define MODEL_e_kabe 0x55 -#define MODEL_demado 0x54 -#define MODEL_g28 0x53 -#define MODEL_o74 0x52 -#define MODEL_o73 0x51 -#define MODEL_o72 0x50 -#define MODEL_g27 0x4F -#define MODEL_o71 0x4E -#define MODEL_o70 0x4D -#define MODEL_o69 0x4C -#define MODEL_g26 0x4B -#define MODEL_o68 0x4A -#define MODEL_o67 0x49 -#define MODEL_o66 0x48 -#define MODEL_g13 0x47 -#define MODEL_o30 0x46 -#define MODEL_o29 0x45 -#define MODEL_o28 0x44 -#define MODEL_yane 0x43 -#define MODEL_g2 0x42 -#define MODEL_o103 0x41 -#define MODEL_kaza1 0x40 -#define MODEL_hasi 0x3F -#define MODEL_waku2 0x3E -#define MODEL_koyane 0x3D -#define MODEL_o16 0x3C -#define MODEL_mado 0x3B -#define MODEL_kabe2 0x3A -#define MODEL_kabe 0x39 -#define MODEL_waku1 0x38 -#define MODEL_dan 0x37 -#define MODEL_exit 0x36 -#define MODEL_exitw 0x35 -#define MODEL_o7 0x34 -#define MODEL_o8 0x33 -#define MODEL_exite 0x32 -#define MODEL_o3 0x31 -#define MODEL_o4 0x30 -#define MODEL_fream 0x2F -#define MODEL_hei 0x2E -#define MODEL_saku 0x2D -#define MODEL_h_kabe 0x2C -#define MODEL_h_dai 0x2B -#define MODEL_stage 0x2A -#define MODEL_o154 0x29 -#define MODEL_o191 0x28 -#define MODEL_o201 0x27 -#define MODEL_o159 0x26 -#define MODEL_o156 0x25 -#define MODEL_o152 0x24 -#define MODEL_o199 0x23 -#define MODEL_o155 0x22 -#define MODEL_o198 0x21 -#define MODEL_o197 0x20 -#define MODEL_eda1 0x1F -#define MODEL_ki1 0x1E -#define MODEL_o192 0x1D -#define MODEL_o142 0x1C -#define MODEL_o200 0x1B -#define MODEL_o140 0x1A -#define MODEL_o189 0x19 -#define MODEL_o193 0x18 -#define MODEL_eda2 0x17 -#define MODEL_ki2 0x16 -#define MODEL_o194 0x15 -#define MODEL_o190 0x14 -#define MODEL_o187 0x13 -#define MODEL_g65 0x12 -#define MODEL_tou 0x11 -#define MODEL_t_mado 0x10 -#define MODEL_t_yane 0xF -#define MODEL_t_kabe 0xE -#define MODEL_t_waku2 0xD -#define MODEL_t_waku1 0xC -#define MODEL_g66 0xB -#define MODEL_o210 0xA -#define MODEL_o208 0x9 -#define MODEL_o207 0x8 -#define MODEL_o202 0x7 -#define MODEL_o195 0x6 -#define MODEL_o186 0x5 -#define MODEL_o150 0x4 -#define MODEL_o196 0x3 -#define MODEL_road2 0x2 -#define MODEL_road 0x1 -#define MODEL_o236 0x0 +#define MODEL_Root 0x7A +#define MODEL_a_kusa 0x79 +#define MODEL_o185 0x78 +#define MODEL_o184 0x77 +#define MODEL_o183 0x76 +#define MODEL_o182 0x75 +#define MODEL_g62 0x74 +#define MODEL_o181 0x73 +#define MODEL_o180 0x72 +#define MODEL_o179 0x71 +#define MODEL_o178 0x70 +#define MODEL_o177 0x6F +#define MODEL_o176 0x6E +#define MODEL_mon1 0x6D +#define MODEL_h_mon1 0x6C +#define MODEL_mon2 0x6B +#define MODEL_h_mon2 0x6A +#define MODEL_doa2 0x69 +#define MODEL_o166 0x68 +#define MODEL_doa1 0x67 +#define MODEL_doa 0x66 +#define MODEL_etc 0x65 +#define MODEL_ki 0x64 +#define MODEL_o162 0x63 +#define MODEL_iwa 0x62 +#define MODEL_o161 0x61 +#define MODEL_o153 0x60 +#define MODEL_o164 0x5F +#define MODEL_o163 0x5E +#define MODEL_kusa 0x5D +#define MODEL_o151 0x5C +#define MODEL_o148 0x5B +#define MODEL_ie 0x5A +#define MODEL_g72 0x59 +#define MODEL_hasi2 0x58 +#define MODEL_en 0x57 +#define MODEL_e_waku2 0x56 +#define MODEL_e_kabe 0x55 +#define MODEL_demado 0x54 +#define MODEL_g28 0x53 +#define MODEL_o74 0x52 +#define MODEL_o73 0x51 +#define MODEL_o72 0x50 +#define MODEL_g27 0x4F +#define MODEL_o71 0x4E +#define MODEL_o70 0x4D +#define MODEL_o69 0x4C +#define MODEL_g26 0x4B +#define MODEL_o68 0x4A +#define MODEL_o67 0x49 +#define MODEL_o66 0x48 +#define MODEL_g13 0x47 +#define MODEL_o30 0x46 +#define MODEL_o29 0x45 +#define MODEL_o28 0x44 +#define MODEL_yane 0x43 +#define MODEL_g2 0x42 +#define MODEL_o103 0x41 +#define MODEL_kaza1 0x40 +#define MODEL_hasi 0x3F +#define MODEL_waku2 0x3E +#define MODEL_koyane 0x3D +#define MODEL_o16 0x3C +#define MODEL_mado 0x3B +#define MODEL_kabe2 0x3A +#define MODEL_kabe 0x39 +#define MODEL_waku1 0x38 +#define MODEL_dan 0x37 +#define MODEL_exit 0x36 +#define MODEL_exitw 0x35 +#define MODEL_o7 0x34 +#define MODEL_o8 0x33 +#define MODEL_exite 0x32 +#define MODEL_o3 0x31 +#define MODEL_o4 0x30 +#define MODEL_fream 0x2F +#define MODEL_hei 0x2E +#define MODEL_saku 0x2D +#define MODEL_h_kabe 0x2C +#define MODEL_h_dai 0x2B +#define MODEL_stage 0x2A +#define MODEL_o154 0x29 +#define MODEL_o191 0x28 +#define MODEL_o201 0x27 +#define MODEL_o159 0x26 +#define MODEL_o156 0x25 +#define MODEL_o152 0x24 +#define MODEL_o199 0x23 +#define MODEL_o155 0x22 +#define MODEL_o198 0x21 +#define MODEL_o197 0x20 +#define MODEL_eda1 0x1F +#define MODEL_ki1 0x1E +#define MODEL_o192 0x1D +#define MODEL_o142 0x1C +#define MODEL_o200 0x1B +#define MODEL_o140 0x1A +#define MODEL_o189 0x19 +#define MODEL_o193 0x18 +#define MODEL_eda2 0x17 +#define MODEL_ki2 0x16 +#define MODEL_o194 0x15 +#define MODEL_o190 0x14 +#define MODEL_o187 0x13 +#define MODEL_g65 0x12 +#define MODEL_tou 0x11 +#define MODEL_t_mado 0x10 +#define MODEL_t_yane 0xF +#define MODEL_t_kabe 0xE +#define MODEL_t_waku2 0xD +#define MODEL_t_waku1 0xC +#define MODEL_g66 0xB +#define MODEL_o210 0xA +#define MODEL_o208 0x9 +#define MODEL_o207 0x8 +#define MODEL_o202 0x7 +#define MODEL_o195 0x6 +#define MODEL_o186 0x5 +#define MODEL_o150 0x4 +#define MODEL_o196 0x3 +#define MODEL_road2 0x2 +#define MODEL_road 0x1 +#define MODEL_o236 0x0 + diff --git a/include/mapfs/mim_12_hit.h b/include/mapfs/mim_12_hit.h index 773e4d66be..d4043bdbf5 100644 --- a/include/mapfs/mim_12_hit.h +++ b/include/mapfs/mim_12_hit.h @@ -1,18 +1,24 @@ -#define COLLIDER_Root 0x11 -#define COLLIDER_g21 0x10 -#define COLLIDER_o67 0xF -#define COLLIDER_g23 0xE -#define COLLIDER_o82 0xD -#define COLLIDER_o73 0xC -#define COLLIDER_etc 0xB -#define COLLIDER_o81 0xA -#define COLLIDER_m_kusa1 0x9 -#define COLLIDER_exit 0x8 -#define COLLIDER_exite 0x7 -#define COLLIDER_ne 0x6 -#define COLLIDER_deilie 0x5 -#define COLLIDER_deilite 0x4 -#define COLLIDER_exitw 0x3 -#define COLLIDER_nw 0x2 -#define COLLIDER_deiliw 0x1 -#define COLLIDER_deilitw 0x0 +#define COLLIDER_Root 0x11 +#define COLLIDER_g21 0x10 +#define COLLIDER_o67 0xF +#define COLLIDER_g23 0xE +#define COLLIDER_o82 0xD +#define COLLIDER_o73 0xC +#define COLLIDER_etc 0xB +#define COLLIDER_o81 0xA +#define COLLIDER_m_kusa1 0x9 +#define COLLIDER_exit 0x8 +#define COLLIDER_exite 0x7 +#define COLLIDER_ne 0x6 +#define COLLIDER_deilie 0x5 +#define COLLIDER_deilite 0x4 +#define COLLIDER_exitw 0x3 +#define COLLIDER_nw 0x2 +#define COLLIDER_deiliw 0x1 +#define COLLIDER_deilitw 0x0 + +#define ZONE_Root 0x3 +#define ZONE_g1 0x2 +#define ZONE_g2 0x1 +#define ZONE_o1 0x0 + diff --git a/include/mapfs/mim_12_shape.h b/include/mapfs/mim_12_shape.h index 557119ca77..d98cd2ab2c 100644 --- a/include/mapfs/mim_12_shape.h +++ b/include/mapfs/mim_12_shape.h @@ -1,45 +1,46 @@ -#define MODEL_Root 0x2C -#define MODEL_g19 0x2B -#define MODEL_g22 0x2A -#define MODEL_o68 0x29 -#define MODEL_g21 0x28 -#define MODEL_o67 0x27 -#define MODEL_g20 0x26 -#define MODEL_o66 0x25 -#define MODEL_o65 0x24 -#define MODEL_o64 0x23 -#define MODEL_g2 0x22 -#define MODEL_iwa 0x21 -#define MODEL_o72 0x20 -#define MODEL_a_iwa1 0x1F -#define MODEL_m_iwa3 0x1E -#define MODEL_m_iwa2 0x1D -#define MODEL_m_iwa1 0x1C -#define MODEL_kusa 0x1B -#define MODEL_a_kusa1 0x1A -#define MODEL_m_kusa4 0x19 -#define MODEL_m_kusa3 0x18 -#define MODEL_m_kusa1 0x17 -#define MODEL_ki1 0x16 -#define MODEL_o42 0x15 -#define MODEL_o41 0x14 -#define MODEL_o40 0x13 -#define MODEL_eda 0x12 -#define MODEL_o22 0x11 -#define MODEL_o21 0x10 -#define MODEL_o20 0xF -#define MODEL_g1 0xE -#define MODEL_g10 0xD -#define MODEL_o19 0xC -#define MODEL_o13 0xB -#define MODEL_o14 0xA -#define MODEL_g9 0x9 -#define MODEL_o12 0x8 -#define MODEL_o11 0x7 -#define MODEL_g3 0x6 -#define MODEL_g7 0x5 -#define MODEL_o8 0x4 -#define MODEL_o7 0x3 -#define MODEL_g5 0x2 -#define MODEL_o4 0x1 -#define MODEL_o3 0x0 +#define MODEL_Root 0x2C +#define MODEL_g19 0x2B +#define MODEL_g22 0x2A +#define MODEL_o68 0x29 +#define MODEL_g21 0x28 +#define MODEL_o67 0x27 +#define MODEL_g20 0x26 +#define MODEL_o66 0x25 +#define MODEL_o65 0x24 +#define MODEL_o64 0x23 +#define MODEL_g2 0x22 +#define MODEL_iwa 0x21 +#define MODEL_o72 0x20 +#define MODEL_a_iwa1 0x1F +#define MODEL_m_iwa3 0x1E +#define MODEL_m_iwa2 0x1D +#define MODEL_m_iwa1 0x1C +#define MODEL_kusa 0x1B +#define MODEL_a_kusa1 0x1A +#define MODEL_m_kusa4 0x19 +#define MODEL_m_kusa3 0x18 +#define MODEL_m_kusa1 0x17 +#define MODEL_ki1 0x16 +#define MODEL_o42 0x15 +#define MODEL_o41 0x14 +#define MODEL_o40 0x13 +#define MODEL_eda 0x12 +#define MODEL_o22 0x11 +#define MODEL_o21 0x10 +#define MODEL_o20 0xF +#define MODEL_g1 0xE +#define MODEL_g10 0xD +#define MODEL_o19 0xC +#define MODEL_o13 0xB +#define MODEL_o14 0xA +#define MODEL_g9 0x9 +#define MODEL_o12 0x8 +#define MODEL_o11 0x7 +#define MODEL_g3 0x6 +#define MODEL_g7 0x5 +#define MODEL_o8 0x4 +#define MODEL_o7 0x3 +#define MODEL_g5 0x2 +#define MODEL_o4 0x1 +#define MODEL_o3 0x0 + diff --git a/include/mapfs/mim_bt01_hit.h b/include/mapfs/mim_bt01_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/mim_bt01_hit.h +++ b/include/mapfs/mim_bt01_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/mim_bt01_shape.h b/include/mapfs/mim_bt01_shape.h index 7470da3f3d..bd42fcc217 100644 --- a/include/mapfs/mim_bt01_shape.h +++ b/include/mapfs/mim_bt01_shape.h @@ -1,34 +1,35 @@ -#define MODEL_Root 0x21 -#define MODEL_dai 0x20 -#define MODEL_waku1 0x1F -#define MODEL_y 0x1E -#define MODEL_y3 0x1D -#define MODEL_y2 0x1C -#define MODEL_y1 0x1B -#define MODEL_z 0x1A -#define MODEL_z1 0x19 -#define MODEL_n 0x18 -#define MODEL_n2 0x17 -#define MODEL_n1 0x16 -#define MODEL_m 0x15 -#define MODEL_m1 0x14 -#define MODEL_iwa 0x13 -#define MODEL_o225 0x12 -#define MODEL_o217 0x11 -#define MODEL_yuka 0x10 -#define MODEL_kusa 0xF -#define MODEL_g55 0xE -#define MODEL_waku2 0xD -#define MODEL_kusa4_2 0xC -#define MODEL_kusa4 0xB -#define MODEL_iwa1 0xA -#define MODEL_ki1 0x9 -#define MODEL_gake 0x8 -#define MODEL_ki3 0x7 -#define MODEL_ki2 0x6 -#define MODEL_iwa2 0x5 -#define MODEL_kusa3 0x4 -#define MODEL_kusa2 0x3 -#define MODEL_ki4 0x2 -#define MODEL_yuka2 0x1 -#define MODEL_waku 0x0 +#define MODEL_Root 0x21 +#define MODEL_dai 0x20 +#define MODEL_waku1 0x1F +#define MODEL_y 0x1E +#define MODEL_y3 0x1D +#define MODEL_y2 0x1C +#define MODEL_y1 0x1B +#define MODEL_z 0x1A +#define MODEL_z1 0x19 +#define MODEL_n 0x18 +#define MODEL_n2 0x17 +#define MODEL_n1 0x16 +#define MODEL_m 0x15 +#define MODEL_m1 0x14 +#define MODEL_iwa 0x13 +#define MODEL_o225 0x12 +#define MODEL_o217 0x11 +#define MODEL_yuka 0x10 +#define MODEL_kusa 0xF +#define MODEL_g55 0xE +#define MODEL_waku2 0xD +#define MODEL_kusa4_2 0xC +#define MODEL_kusa4 0xB +#define MODEL_iwa1 0xA +#define MODEL_ki1 0x9 +#define MODEL_gake 0x8 +#define MODEL_ki3 0x7 +#define MODEL_ki2 0x6 +#define MODEL_iwa2 0x5 +#define MODEL_kusa3 0x4 +#define MODEL_kusa2 0x3 +#define MODEL_ki4 0x2 +#define MODEL_yuka2 0x1 +#define MODEL_waku 0x0 + diff --git a/include/mapfs/nok_01_hit.h b/include/mapfs/nok_01_hit.h index f3db8999f3..c44ae924df 100644 --- a/include/mapfs/nok_01_hit.h +++ b/include/mapfs/nok_01_hit.h @@ -1,79 +1,90 @@ -#define COLLIDER_Root 0x4E -#define COLLIDER_g90 0x4D -#define COLLIDER_o423 0x4C -#define COLLIDER_o422 0x4B -#define COLLIDER_o421 0x4A -#define COLLIDER_o420 0x49 -#define COLLIDER_o419 0x48 -#define COLLIDER_o313 0x47 -#define COLLIDER_o312 0x46 -#define COLLIDER_o323 0x45 -#define COLLIDER_g85 0x44 -#define COLLIDER_o311 0x43 -#define COLLIDER_o290 0x42 -#define COLLIDER_o289 0x41 -#define COLLIDER_o310 0x40 -#define COLLIDER_g1 0x3F -#define COLLIDER_ao 0x3E -#define COLLIDER_g80 0x3D -#define COLLIDER_o242 0x3C -#define COLLIDER_o236 0x3B -#define COLLIDER_g79 0x3A -#define COLLIDER_o411 0x39 -#define COLLIDER_o414 0x38 -#define COLLIDER_o235 0x37 -#define COLLIDER_g82 0x36 -#define COLLIDER_o292 0x35 -#define COLLIDER_o293 0x34 -#define COLLIDER_o291 0x33 -#define COLLIDER_o246 0x32 -#define COLLIDER_ki 0x31 -#define COLLIDER_g99 0x30 -#define COLLIDER_o348 0x2F -#define COLLIDER_o347 0x2E -#define COLLIDER_o346 0x2D -#define COLLIDER_o345 0x2C -#define COLLIDER_o344 0x2B -#define COLLIDER_o343 0x2A -#define COLLIDER_g72 0x29 -#define COLLIDER_o202 0x28 -#define COLLIDER_o349 0x27 -#define COLLIDER_o211 0x26 -#define COLLIDER_o212 0x25 -#define COLLIDER_g77 0x24 -#define COLLIDER_o288 0x23 -#define COLLIDER_o287 0x22 -#define COLLIDER_o286 0x21 -#define COLLIDER_o226 0x20 -#define COLLIDER_aka 0x1F -#define COLLIDER_g60 0x1E -#define COLLIDER_o195 0x1D -#define COLLIDER_o188 0x1C -#define COLLIDER_g59 0x1B -#define COLLIDER_o181 0x1A -#define COLLIDER_o179 0x19 -#define COLLIDER_o177 0x18 -#define COLLIDER_g89 0x17 -#define COLLIDER_o285 0x16 -#define COLLIDER_o176 0x15 -#define COLLIDER_o284 0x14 -#define COLLIDER_o200 0x13 -#define COLLIDER_g114 0x12 -#define COLLIDER_o435 0x11 -#define COLLIDER_o434 0x10 -#define COLLIDER_o433 0xF -#define COLLIDER_o432 0xE -#define COLLIDER_g3 0xD -#define COLLIDER_o325 0xC -#define COLLIDER_o400 0xB -#define COLLIDER_o396 0xA -#define COLLIDER_o397 0x9 -#define COLLIDER_g95 0x8 -#define COLLIDER_g97 0x7 -#define COLLIDER_o335 0x6 -#define COLLIDER_deilite 0x5 -#define COLLIDER_deilie 0x4 -#define COLLIDER_g96 0x3 -#define COLLIDER_o334 0x2 -#define COLLIDER_deilitsw 0x1 -#define COLLIDER_deilisw 0x0 +#define COLLIDER_Root 0x4E +#define COLLIDER_g90 0x4D +#define COLLIDER_o423 0x4C +#define COLLIDER_o422 0x4B +#define COLLIDER_o421 0x4A +#define COLLIDER_o420 0x49 +#define COLLIDER_o419 0x48 +#define COLLIDER_o313 0x47 +#define COLLIDER_o312 0x46 +#define COLLIDER_o323 0x45 +#define COLLIDER_g85 0x44 +#define COLLIDER_o311 0x43 +#define COLLIDER_o290 0x42 +#define COLLIDER_o289 0x41 +#define COLLIDER_o310 0x40 +#define COLLIDER_g1 0x3F +#define COLLIDER_ao 0x3E +#define COLLIDER_g80 0x3D +#define COLLIDER_o242 0x3C +#define COLLIDER_o236 0x3B +#define COLLIDER_g79 0x3A +#define COLLIDER_o411 0x39 +#define COLLIDER_o414 0x38 +#define COLLIDER_o235 0x37 +#define COLLIDER_g82 0x36 +#define COLLIDER_o292 0x35 +#define COLLIDER_o293 0x34 +#define COLLIDER_o291 0x33 +#define COLLIDER_o246 0x32 +#define COLLIDER_ki 0x31 +#define COLLIDER_g99 0x30 +#define COLLIDER_o348 0x2F +#define COLLIDER_o347 0x2E +#define COLLIDER_o346 0x2D +#define COLLIDER_o345 0x2C +#define COLLIDER_o344 0x2B +#define COLLIDER_o343 0x2A +#define COLLIDER_g72 0x29 +#define COLLIDER_o202 0x28 +#define COLLIDER_o349 0x27 +#define COLLIDER_o211 0x26 +#define COLLIDER_o212 0x25 +#define COLLIDER_g77 0x24 +#define COLLIDER_o288 0x23 +#define COLLIDER_o287 0x22 +#define COLLIDER_o286 0x21 +#define COLLIDER_o226 0x20 +#define COLLIDER_aka 0x1F +#define COLLIDER_g60 0x1E +#define COLLIDER_o195 0x1D +#define COLLIDER_o188 0x1C +#define COLLIDER_g59 0x1B +#define COLLIDER_o181 0x1A +#define COLLIDER_o179 0x19 +#define COLLIDER_o177 0x18 +#define COLLIDER_g89 0x17 +#define COLLIDER_o285 0x16 +#define COLLIDER_o176 0x15 +#define COLLIDER_o284 0x14 +#define COLLIDER_o200 0x13 +#define COLLIDER_g114 0x12 +#define COLLIDER_o435 0x11 +#define COLLIDER_o434 0x10 +#define COLLIDER_o433 0xF +#define COLLIDER_o432 0xE +#define COLLIDER_g3 0xD +#define COLLIDER_o325 0xC +#define COLLIDER_o400 0xB +#define COLLIDER_o396 0xA +#define COLLIDER_o397 0x9 +#define COLLIDER_g95 0x8 +#define COLLIDER_g97 0x7 +#define COLLIDER_o335 0x6 +#define COLLIDER_deilite 0x5 +#define COLLIDER_deilie 0x4 +#define COLLIDER_g96 0x3 +#define COLLIDER_o334 0x2 +#define COLLIDER_deilitsw 0x1 +#define COLLIDER_deilisw 0x0 + +#define ZONE_Root 0x8 +#define ZONE_g1 0x7 +#define ZONE_o184 0x6 +#define ZONE_o205 0x5 +#define ZONE_o239 0x4 +#define ZONE_g3 0x3 +#define ZONE_o3 0x2 +#define ZONE_o275 0x1 +#define ZONE_o264 0x0 + diff --git a/include/mapfs/nok_01_shape.h b/include/mapfs/nok_01_shape.h index 8a60983a71..6097644d9d 100644 --- a/include/mapfs/nok_01_shape.h +++ b/include/mapfs/nok_01_shape.h @@ -1,213 +1,214 @@ -#define MODEL_Root 0xD4 -#define MODEL_g100 0xD3 -#define MODEL_o325 0xD2 -#define MODEL_o289 0xD1 -#define MODEL_g85 0xD0 -#define MODEL_g99 0xCF -#define MODEL_g134 0xCE -#define MODEL_o394 0xCD -#define MODEL_g133 0xCC -#define MODEL_o393 0xCB -#define MODEL_g132 0xCA -#define MODEL_o392 0xC9 -#define MODEL_g131 0xC8 -#define MODEL_o391 0xC7 -#define MODEL_g130 0xC6 -#define MODEL_o390 0xC5 -#define MODEL_g129 0xC4 -#define MODEL_o322 0xC3 -#define MODEL_g128 0xC2 -#define MODEL_o315 0xC1 -#define MODEL_g98 0xC0 -#define MODEL_g137 0xBF -#define MODEL_o401 0xBE -#define MODEL_o400 0xBD -#define MODEL_o399 0xBC -#define MODEL_g136 0xBB -#define MODEL_o398 0xBA -#define MODEL_o397 0xB9 -#define MODEL_o396 0xB8 -#define MODEL_o402 0xB7 -#define MODEL_o320 0xB6 -#define MODEL_o298 0xB5 -#define MODEL_g97 0xB4 -#define MODEL_o313 0xB3 -#define MODEL_o308 0xB2 -#define MODEL_g89 0xB1 -#define MODEL_o286 0xB0 -#define MODEL_o283 0xAF -#define MODEL_o274 0xAE -#define MODEL_g86 0xAD -#define MODEL_o267 0xAC -#define MODEL_o265 0xAB -#define MODEL_o285 0xAA -#define MODEL_o284 0xA9 -#define MODEL_o273 0xA8 -#define MODEL_o270 0xA7 -#define MODEL_o269 0xA6 -#define MODEL_o268 0xA5 -#define MODEL_o266 0xA4 -#define MODEL_o272 0xA3 -#define MODEL_g96 0xA2 -#define MODEL_o305 0xA1 -#define MODEL_o304 0xA0 -#define MODEL_o303 0x9F -#define MODEL_o307 0x9E -#define MODEL_o306 0x9D -#define MODEL_o297 0x9C -#define MODEL_g94 0x9B -#define MODEL_o300 0x9A -#define MODEL_o299 0x99 -#define MODEL_g106 0x98 -#define MODEL_o343 0x97 -#define MODEL_o340 0x96 -#define MODEL_o338 0x95 -#define MODEL_g1 0x94 -#define MODEL_ao 0x93 -#define MODEL_g115 0x92 -#define MODEL_g82 0x91 -#define MODEL_o246 0x90 -#define MODEL_g81 0x8F -#define MODEL_o245 0x8E -#define MODEL_o244 0x8D -#define MODEL_o242 0x8C -#define MODEL_o243 0x8B -#define MODEL_g80 0x8A -#define MODEL_g135 0x89 -#define MODEL_o241 0x88 -#define MODEL_o395 0x87 -#define MODEL_o236 0x86 -#define MODEL_o237 0x85 -#define MODEL_o238 0x84 -#define MODEL_g79 0x83 -#define MODEL_g122 0x82 -#define MODEL_o388 0x81 -#define MODEL_o387 0x80 -#define MODEL_o386 0x7F -#define MODEL_g121 0x7E -#define MODEL_o247 0x7D -#define MODEL_g120 0x7C -#define MODEL_o384 0x7B -#define MODEL_o383 0x7A -#define MODEL_o382 0x79 -#define MODEL_g119 0x78 -#define MODEL_o381 0x77 -#define MODEL_o380 0x76 -#define MODEL_g127 0x75 -#define MODEL_o389 0x74 -#define MODEL_o240 0x73 -#define MODEL_o239 0x72 -#define MODEL_ki 0x71 -#define MODEL_g113 0x70 -#define MODEL_g90 0x6F -#define MODEL_o287 0x6E -#define MODEL_g77 0x6D -#define MODEL_o226 0x6C -#define MODEL_g76 0x6B -#define MODEL_o225 0x6A -#define MODEL_g75 0x69 -#define MODEL_o224 0x68 -#define MODEL_o223 0x67 -#define MODEL_g74 0x66 -#define MODEL_o222 0x65 -#define MODEL_o221 0x64 -#define MODEL_o220 0x63 -#define MODEL_o219 0x62 -#define MODEL_g70 0x61 -#define MODEL_o209 0x60 -#define MODEL_o210 0x5F -#define MODEL_o202 0x5E -#define MODEL_g69 0x5D -#define MODEL_o211 0x5C -#define MODEL_o323 0x5B -#define MODEL_o288 0x5A -#define MODEL_g114 0x59 -#define MODEL_g126 0x58 -#define MODEL_o370 0x57 -#define MODEL_o362 0x56 -#define MODEL_o205 0x55 -#define MODEL_o204 0x54 -#define MODEL_o203 0x53 -#define MODEL_g138 0x52 -#define MODEL_o410 0x51 -#define MODEL_g125 0x50 -#define MODEL_o369 0x4F -#define MODEL_o368 0x4E -#define MODEL_o363 0x4D -#define MODEL_o364 0x4C -#define MODEL_o361 0x4B -#define MODEL_o360 0x4A -#define MODEL_o359 0x49 -#define MODEL_g118 0x48 -#define MODEL_o379 0x47 -#define MODEL_o378 0x46 -#define MODEL_g73 0x45 -#define MODEL_o218 0x44 -#define MODEL_o217 0x43 -#define MODEL_o216 0x42 -#define MODEL_o215 0x41 -#define MODEL_o214 0x40 -#define MODEL_o213 0x3F -#define MODEL_o212 0x3E -#define MODEL_aka 0x3D -#define MODEL_g62 0x3C -#define MODEL_g66 0x3B -#define MODEL_o201 0x3A -#define MODEL_g65 0x39 -#define MODEL_o200 0x38 -#define MODEL_g64 0x37 -#define MODEL_o199 0x36 -#define MODEL_o197 0x35 -#define MODEL_o196 0x34 -#define MODEL_o195 0x33 -#define MODEL_o366 0x32 -#define MODEL_g63 0x31 -#define MODEL_o194 0x30 -#define MODEL_o193 0x2F -#define MODEL_o192 0x2E -#define MODEL_o190 0x2D -#define MODEL_o367 0x2C -#define MODEL_g61 0x2B -#define MODEL_o189 0x2A -#define MODEL_o183 0x29 -#define MODEL_g60 0x28 -#define MODEL_o188 0x27 -#define MODEL_o182 0x26 -#define MODEL_o175 0x25 -#define MODEL_o174 0x24 -#define MODEL_g111 0x23 -#define MODEL_g117 0x22 -#define MODEL_o377 0x21 -#define MODEL_o376 0x20 -#define MODEL_o375 0x1F -#define MODEL_g108 0x1E -#define MODEL_o409 0x1D -#define MODEL_o352 0x1C -#define MODEL_o355 0x1B -#define MODEL_o353 0x1A -#define MODEL_o354 0x19 -#define MODEL_o351 0x18 -#define MODEL_o350 0x17 -#define MODEL_g104 0x16 -#define MODEL_o333 0x15 -#define MODEL_g124 0x14 -#define MODEL_o358 0x13 -#define MODEL_o177 0x12 -#define MODEL_o415 0x11 -#define MODEL_o180 0x10 -#define MODEL_g123 0xF -#define MODEL_o176 0xE -#define MODEL_o185 0xD -#define MODEL_o187 0xC -#define MODEL_o357 0xB -#define MODEL_o184 0xA -#define MODEL_o365 0x9 -#define MODEL_g3 0x8 -#define MODEL_o4 0x7 -#define MODEL_o279 0x6 -#define MODEL_o3 0x5 -#define MODEL_o263 0x4 -#define MODEL_o276 0x3 -#define MODEL_o275 0x2 -#define MODEL_o264 0x1 -#define MODEL_o1 0x0 +#define MODEL_Root 0xD4 +#define MODEL_g100 0xD3 +#define MODEL_o325 0xD2 +#define MODEL_o289 0xD1 +#define MODEL_g85 0xD0 +#define MODEL_g99 0xCF +#define MODEL_g134 0xCE +#define MODEL_o394 0xCD +#define MODEL_g133 0xCC +#define MODEL_o393 0xCB +#define MODEL_g132 0xCA +#define MODEL_o392 0xC9 +#define MODEL_g131 0xC8 +#define MODEL_o391 0xC7 +#define MODEL_g130 0xC6 +#define MODEL_o390 0xC5 +#define MODEL_g129 0xC4 +#define MODEL_o322 0xC3 +#define MODEL_g128 0xC2 +#define MODEL_o315 0xC1 +#define MODEL_g98 0xC0 +#define MODEL_g137 0xBF +#define MODEL_o401 0xBE +#define MODEL_o400 0xBD +#define MODEL_o399 0xBC +#define MODEL_g136 0xBB +#define MODEL_o398 0xBA +#define MODEL_o397 0xB9 +#define MODEL_o396 0xB8 +#define MODEL_o402 0xB7 +#define MODEL_o320 0xB6 +#define MODEL_o298 0xB5 +#define MODEL_g97 0xB4 +#define MODEL_o313 0xB3 +#define MODEL_o308 0xB2 +#define MODEL_g89 0xB1 +#define MODEL_o286 0xB0 +#define MODEL_o283 0xAF +#define MODEL_o274 0xAE +#define MODEL_g86 0xAD +#define MODEL_o267 0xAC +#define MODEL_o265 0xAB +#define MODEL_o285 0xAA +#define MODEL_o284 0xA9 +#define MODEL_o273 0xA8 +#define MODEL_o270 0xA7 +#define MODEL_o269 0xA6 +#define MODEL_o268 0xA5 +#define MODEL_o266 0xA4 +#define MODEL_o272 0xA3 +#define MODEL_g96 0xA2 +#define MODEL_o305 0xA1 +#define MODEL_o304 0xA0 +#define MODEL_o303 0x9F +#define MODEL_o307 0x9E +#define MODEL_o306 0x9D +#define MODEL_o297 0x9C +#define MODEL_g94 0x9B +#define MODEL_o300 0x9A +#define MODEL_o299 0x99 +#define MODEL_g106 0x98 +#define MODEL_o343 0x97 +#define MODEL_o340 0x96 +#define MODEL_o338 0x95 +#define MODEL_g1 0x94 +#define MODEL_ao 0x93 +#define MODEL_g115 0x92 +#define MODEL_g82 0x91 +#define MODEL_o246 0x90 +#define MODEL_g81 0x8F +#define MODEL_o245 0x8E +#define MODEL_o244 0x8D +#define MODEL_o242 0x8C +#define MODEL_o243 0x8B +#define MODEL_g80 0x8A +#define MODEL_g135 0x89 +#define MODEL_o241 0x88 +#define MODEL_o395 0x87 +#define MODEL_o236 0x86 +#define MODEL_o237 0x85 +#define MODEL_o238 0x84 +#define MODEL_g79 0x83 +#define MODEL_g122 0x82 +#define MODEL_o388 0x81 +#define MODEL_o387 0x80 +#define MODEL_o386 0x7F +#define MODEL_g121 0x7E +#define MODEL_o247 0x7D +#define MODEL_g120 0x7C +#define MODEL_o384 0x7B +#define MODEL_o383 0x7A +#define MODEL_o382 0x79 +#define MODEL_g119 0x78 +#define MODEL_o381 0x77 +#define MODEL_o380 0x76 +#define MODEL_g127 0x75 +#define MODEL_o389 0x74 +#define MODEL_o240 0x73 +#define MODEL_o239 0x72 +#define MODEL_ki 0x71 +#define MODEL_g113 0x70 +#define MODEL_g90 0x6F +#define MODEL_o287 0x6E +#define MODEL_g77 0x6D +#define MODEL_o226 0x6C +#define MODEL_g76 0x6B +#define MODEL_o225 0x6A +#define MODEL_g75 0x69 +#define MODEL_o224 0x68 +#define MODEL_o223 0x67 +#define MODEL_g74 0x66 +#define MODEL_o222 0x65 +#define MODEL_o221 0x64 +#define MODEL_o220 0x63 +#define MODEL_o219 0x62 +#define MODEL_g70 0x61 +#define MODEL_o209 0x60 +#define MODEL_o210 0x5F +#define MODEL_o202 0x5E +#define MODEL_g69 0x5D +#define MODEL_o211 0x5C +#define MODEL_o323 0x5B +#define MODEL_o288 0x5A +#define MODEL_g114 0x59 +#define MODEL_g126 0x58 +#define MODEL_o370 0x57 +#define MODEL_o362 0x56 +#define MODEL_o205 0x55 +#define MODEL_o204 0x54 +#define MODEL_o203 0x53 +#define MODEL_g138 0x52 +#define MODEL_o410 0x51 +#define MODEL_g125 0x50 +#define MODEL_o369 0x4F +#define MODEL_o368 0x4E +#define MODEL_o363 0x4D +#define MODEL_o364 0x4C +#define MODEL_o361 0x4B +#define MODEL_o360 0x4A +#define MODEL_o359 0x49 +#define MODEL_g118 0x48 +#define MODEL_o379 0x47 +#define MODEL_o378 0x46 +#define MODEL_g73 0x45 +#define MODEL_o218 0x44 +#define MODEL_o217 0x43 +#define MODEL_o216 0x42 +#define MODEL_o215 0x41 +#define MODEL_o214 0x40 +#define MODEL_o213 0x3F +#define MODEL_o212 0x3E +#define MODEL_aka 0x3D +#define MODEL_g62 0x3C +#define MODEL_g66 0x3B +#define MODEL_o201 0x3A +#define MODEL_g65 0x39 +#define MODEL_o200 0x38 +#define MODEL_g64 0x37 +#define MODEL_o199 0x36 +#define MODEL_o197 0x35 +#define MODEL_o196 0x34 +#define MODEL_o195 0x33 +#define MODEL_o366 0x32 +#define MODEL_g63 0x31 +#define MODEL_o194 0x30 +#define MODEL_o193 0x2F +#define MODEL_o192 0x2E +#define MODEL_o190 0x2D +#define MODEL_o367 0x2C +#define MODEL_g61 0x2B +#define MODEL_o189 0x2A +#define MODEL_o183 0x29 +#define MODEL_g60 0x28 +#define MODEL_o188 0x27 +#define MODEL_o182 0x26 +#define MODEL_o175 0x25 +#define MODEL_o174 0x24 +#define MODEL_g111 0x23 +#define MODEL_g117 0x22 +#define MODEL_o377 0x21 +#define MODEL_o376 0x20 +#define MODEL_o375 0x1F +#define MODEL_g108 0x1E +#define MODEL_o409 0x1D +#define MODEL_o352 0x1C +#define MODEL_o355 0x1B +#define MODEL_o353 0x1A +#define MODEL_o354 0x19 +#define MODEL_o351 0x18 +#define MODEL_o350 0x17 +#define MODEL_g104 0x16 +#define MODEL_o333 0x15 +#define MODEL_g124 0x14 +#define MODEL_o358 0x13 +#define MODEL_o177 0x12 +#define MODEL_o415 0x11 +#define MODEL_o180 0x10 +#define MODEL_g123 0xF +#define MODEL_o176 0xE +#define MODEL_o185 0xD +#define MODEL_o187 0xC +#define MODEL_o357 0xB +#define MODEL_o184 0xA +#define MODEL_o365 0x9 +#define MODEL_g3 0x8 +#define MODEL_o4 0x7 +#define MODEL_o279 0x6 +#define MODEL_o3 0x5 +#define MODEL_o263 0x4 +#define MODEL_o276 0x3 +#define MODEL_o275 0x2 +#define MODEL_o264 0x1 +#define MODEL_o1 0x0 + diff --git a/include/mapfs/nok_02_hit.h b/include/mapfs/nok_02_hit.h index f2d3bb4135..b213066fb4 100644 --- a/include/mapfs/nok_02_hit.h +++ b/include/mapfs/nok_02_hit.h @@ -1,87 +1,104 @@ -#define COLLIDER_Root 0x56 -#define COLLIDER_g75 0x55 -#define COLLIDER_o461 0x54 -#define COLLIDER_o460 0x53 -#define COLLIDER_o459 0x52 -#define COLLIDER_o458 0x51 -#define COLLIDER_o427 0x50 -#define COLLIDER_o332 0x4F -#define COLLIDER_o346 0x4E -#define COLLIDER_g1 0x4D -#define COLLIDER_mura 0x4C -#define COLLIDER_g65 0x4B -#define COLLIDER_o282 0x4A -#define COLLIDER_o281 0x49 -#define COLLIDER_o226 0x48 -#define COLLIDER_o283 0x47 -#define COLLIDER_g62 0x46 -#define COLLIDER_o381 0x45 -#define COLLIDER_o364 0x44 -#define COLLIDER_o280 0x43 -#define COLLIDER_o210 0x42 -#define COLLIDER_kameki 0x41 -#define COLLIDER_g69 0x40 -#define COLLIDER_o301 0x3F -#define COLLIDER_o300 0x3E -#define COLLIDER_o302 0x3D -#define COLLIDER_o299 0x3C -#define COLLIDER_o286 0x3B -#define COLLIDER_o285 0x3A -#define COLLIDER_o284 0x39 -#define COLLIDER_o287 0x38 -#define COLLIDER_g70 0x37 -#define COLLIDER_o298 0x36 -#define COLLIDER_o292 0x35 -#define COLLIDER_o291 0x34 -#define COLLIDER_g50 0x33 -#define COLLIDER_o518 0x32 -#define COLLIDER_o252 0x31 -#define COLLIDER_o362 0x30 -#define COLLIDER_sakuji 0x2F -#define COLLIDER_g72 0x2E -#define COLLIDER_o316 0x2D -#define COLLIDER_o315 0x2C -#define COLLIDER_o317 0x2B -#define COLLIDER_o314 0x2A -#define COLLIDER_o312 0x29 -#define COLLIDER_o311 0x28 -#define COLLIDER_o310 0x27 -#define COLLIDER_o313 0x26 -#define COLLIDER_g71 0x25 -#define COLLIDER_o368 0x24 -#define COLLIDER_o367 0x23 -#define COLLIDER_o308 0x22 -#define COLLIDER_o307 0x21 -#define COLLIDER_g45 0x20 -#define COLLIDER_o479 0x1F -#define COLLIDER_o480 0x1E -#define COLLIDER_o462 0x1D -#define COLLIDER_o390 0x1C -#define COLLIDER_o408 0x1B -#define COLLIDER_o236 0x1A -#define COLLIDER_g89 0x19 -#define COLLIDER_g87 0x18 -#define COLLIDER_o426 0x17 -#define COLLIDER_o425 0x16 -#define COLLIDER_o424 0x15 -#define COLLIDER_o423 0x14 -#define COLLIDER_o422 0x13 -#define COLLIDER_o421 0x12 -#define COLLIDER_g88 0x11 -#define COLLIDER_o474 0x10 -#define COLLIDER_o473 0xF -#define COLLIDER_o472 0xE -#define COLLIDER_o471 0xD -#define COLLIDER_o348 0xC -#define COLLIDER_o279 0xB -#define COLLIDER_o419 0xA -#define COLLIDER_o417 0x9 -#define COLLIDER_g3 0x8 -#define COLLIDER_g86 0x7 -#define COLLIDER_o258 0x6 -#define COLLIDER_deilitw 0x5 -#define COLLIDER_deiliw 0x4 -#define COLLIDER_g74 0x3 -#define COLLIDER_o270 0x2 -#define COLLIDER_deilitn 0x1 -#define COLLIDER_deilin 0x0 +#define COLLIDER_Root 0x56 +#define COLLIDER_g75 0x55 +#define COLLIDER_o461 0x54 +#define COLLIDER_o460 0x53 +#define COLLIDER_o459 0x52 +#define COLLIDER_o458 0x51 +#define COLLIDER_o427 0x50 +#define COLLIDER_o332 0x4F +#define COLLIDER_o346 0x4E +#define COLLIDER_g1 0x4D +#define COLLIDER_mura 0x4C +#define COLLIDER_g65 0x4B +#define COLLIDER_o282 0x4A +#define COLLIDER_o281 0x49 +#define COLLIDER_o226 0x48 +#define COLLIDER_o283 0x47 +#define COLLIDER_g62 0x46 +#define COLLIDER_o381 0x45 +#define COLLIDER_o364 0x44 +#define COLLIDER_o280 0x43 +#define COLLIDER_o210 0x42 +#define COLLIDER_kameki 0x41 +#define COLLIDER_g69 0x40 +#define COLLIDER_o301 0x3F +#define COLLIDER_o300 0x3E +#define COLLIDER_o302 0x3D +#define COLLIDER_o299 0x3C +#define COLLIDER_o286 0x3B +#define COLLIDER_o285 0x3A +#define COLLIDER_o284 0x39 +#define COLLIDER_o287 0x38 +#define COLLIDER_g70 0x37 +#define COLLIDER_o298 0x36 +#define COLLIDER_o292 0x35 +#define COLLIDER_o291 0x34 +#define COLLIDER_g50 0x33 +#define COLLIDER_o518 0x32 +#define COLLIDER_o252 0x31 +#define COLLIDER_o362 0x30 +#define COLLIDER_sakuji 0x2F +#define COLLIDER_g72 0x2E +#define COLLIDER_o316 0x2D +#define COLLIDER_o315 0x2C +#define COLLIDER_o317 0x2B +#define COLLIDER_o314 0x2A +#define COLLIDER_o312 0x29 +#define COLLIDER_o311 0x28 +#define COLLIDER_o310 0x27 +#define COLLIDER_o313 0x26 +#define COLLIDER_g71 0x25 +#define COLLIDER_o368 0x24 +#define COLLIDER_o367 0x23 +#define COLLIDER_o308 0x22 +#define COLLIDER_o307 0x21 +#define COLLIDER_g45 0x20 +#define COLLIDER_o479 0x1F +#define COLLIDER_o480 0x1E +#define COLLIDER_o462 0x1D +#define COLLIDER_o390 0x1C +#define COLLIDER_o408 0x1B +#define COLLIDER_o236 0x1A +#define COLLIDER_g89 0x19 +#define COLLIDER_g87 0x18 +#define COLLIDER_o426 0x17 +#define COLLIDER_o425 0x16 +#define COLLIDER_o424 0x15 +#define COLLIDER_o423 0x14 +#define COLLIDER_o422 0x13 +#define COLLIDER_o421 0x12 +#define COLLIDER_g88 0x11 +#define COLLIDER_o474 0x10 +#define COLLIDER_o473 0xF +#define COLLIDER_o472 0xE +#define COLLIDER_o471 0xD +#define COLLIDER_o348 0xC +#define COLLIDER_o279 0xB +#define COLLIDER_o419 0xA +#define COLLIDER_o417 0x9 +#define COLLIDER_g3 0x8 +#define COLLIDER_g86 0x7 +#define COLLIDER_o258 0x6 +#define COLLIDER_deilitw 0x5 +#define COLLIDER_deiliw 0x4 +#define COLLIDER_g74 0x3 +#define COLLIDER_o270 0x2 +#define COLLIDER_deilitn 0x1 +#define COLLIDER_deilin 0x0 + +#define ZONE_Root 0xE +#define ZONE_g1 0xD +#define ZONE_mura 0xC +#define ZONE_o210 0xB +#define ZONE_kameki 0xA +#define ZONE_o169 0x9 +#define ZONE_sakuji 0x8 +#define ZONE_o278 0x7 +#define ZONE_o163 0x6 +#define ZONE_g3 0x5 +#define ZONE_o271 0x4 +#define ZONE_o277 0x3 +#define ZONE_o316 0x2 +#define ZONE_o315 0x1 +#define ZONE_o4 0x0 + diff --git a/include/mapfs/nok_02_shape.h b/include/mapfs/nok_02_shape.h index 852f884543..a587ed5b82 100644 --- a/include/mapfs/nok_02_shape.h +++ b/include/mapfs/nok_02_shape.h @@ -1,209 +1,210 @@ -#define MODEL_Root 0xD0 -#define MODEL_g67 0xCF -#define MODEL_g82 0xCE -#define MODEL_g138 0xCD -#define MODEL_o448 0xCC -#define MODEL_g137 0xCB -#define MODEL_o447 0xCA -#define MODEL_g136 0xC9 -#define MODEL_o446 0xC8 -#define MODEL_g135 0xC7 -#define MODEL_o445 0xC6 -#define MODEL_g134 0xC5 -#define MODEL_o444 0xC4 -#define MODEL_g133 0xC3 -#define MODEL_o443 0xC2 -#define MODEL_g81 0xC1 -#define MODEL_o314 0xC0 -#define MODEL_g143 0xBF -#define MODEL_o459 0xBE -#define MODEL_o458 0xBD -#define MODEL_o457 0xBC -#define MODEL_g142 0xBB -#define MODEL_o456 0xBA -#define MODEL_o455 0xB9 -#define MODEL_o454 0xB8 -#define MODEL_o462 0xB7 -#define MODEL_o461 0xB6 -#define MODEL_o460 0xB5 -#define MODEL_o312 0xB4 -#define MODEL_g86 0xB3 -#define MODEL_o311 0xB2 -#define MODEL_g85 0xB1 -#define MODEL_o310 0xB0 -#define MODEL_g84 0xAF -#define MODEL_o318 0xAE -#define MODEL_o267 0xAD -#define MODEL_o266 0xAC -#define MODEL_o265 0xAB -#define MODEL_o264 0xAA -#define MODEL_o263 0xA9 -#define MODEL_o261 0xA8 -#define MODEL_o260 0xA7 -#define MODEL_g83 0xA6 -#define MODEL_o269 0xA5 -#define MODEL_o280 0xA4 -#define MODEL_o281 0xA3 -#define MODEL_g68 0xA2 -#define MODEL_g70 0xA1 -#define MODEL_o284 0xA0 -#define MODEL_o283 0x9F -#define MODEL_g80 0x9E -#define MODEL_o308 0x9D -#define MODEL_o307 0x9C -#define MODEL_g72 0x9B -#define MODEL_o291 0x9A -#define MODEL_o289 0x99 -#define MODEL_o288 0x98 -#define MODEL_o287 0x97 -#define MODEL_o282 0x96 -#define MODEL_g1 0x95 -#define MODEL_mura 0x94 -#define MODEL_g115 0x93 -#define MODEL_g65 0x92 -#define MODEL_o226 0x91 -#define MODEL_g64 0x90 -#define MODEL_o224 0x8F -#define MODEL_o223 0x8E -#define MODEL_o222 0x8D -#define MODEL_o225 0x8C -#define MODEL_g62 0x8B -#define MODEL_g141 0x8A -#define MODEL_o212 0x89 -#define MODEL_o453 0x88 -#define MODEL_o209 0x87 -#define MODEL_o208 0x86 -#define MODEL_o207 0x85 -#define MODEL_g63 0x84 -#define MODEL_g118 0x83 -#define MODEL_o356 0x82 -#define MODEL_o355 0x81 -#define MODEL_o210 0x80 -#define MODEL_o465 0x7F -#define MODEL_o211 0x7E -#define MODEL_g116 0x7D -#define MODEL_g145 0x7C -#define MODEL_o478 0x7B -#define MODEL_o477 0x7A -#define MODEL_o476 0x79 -#define MODEL_o475 0x78 -#define MODEL_o474 0x77 -#define MODEL_o473 0x76 -#define MODEL_g144 0x75 -#define MODEL_o472 0x74 -#define MODEL_o469 0x73 -#define MODEL_o471 0x72 -#define MODEL_o468 0x71 -#define MODEL_g131 0x70 -#define MODEL_o434 0x6F -#define MODEL_o433 0x6E -#define MODEL_o442 0x6D -#define MODEL_o441 0x6C -#define MODEL_kameki 0x6B -#define MODEL_g110 0x6A -#define MODEL_g54 0x69 -#define MODEL_o185 0x68 -#define MODEL_g52 0x67 -#define MODEL_o183 0x66 -#define MODEL_g51 0x65 -#define MODEL_o182 0x64 -#define MODEL_o180 0x63 -#define MODEL_o171 0x62 -#define MODEL_o181 0x61 -#define MODEL_g49 0x60 -#define MODEL_o168 0x5F -#define MODEL_o167 0x5E -#define MODEL_o166 0x5D -#define MODEL_o165 0x5C -#define MODEL_o179 0x5B -#define MODEL_g130 0x5A -#define MODEL_o432 0x59 -#define MODEL_o431 0x58 -#define MODEL_o430 0x57 -#define MODEL_g111 0x56 -#define MODEL_g53 0x55 -#define MODEL_o184 0x54 -#define MODEL_g112 0x53 -#define MODEL_o420 0x52 -#define MODEL_g146 0x51 -#define MODEL_o486 0x50 -#define MODEL_o487 0x4F -#define MODEL_g114 0x4E -#define MODEL_o480 0x4D -#define MODEL_o479 0x4C -#define MODEL_o169 0x4B -#define MODEL_o170 0x4A -#define MODEL_g126 0x49 -#define MODEL_o423 0x48 -#define MODEL_o422 0x47 -#define MODEL_o421 0x46 -#define MODEL_g113 0x45 -#define MODEL_o489 0x44 -#define MODEL_o483 0x43 -#define MODEL_o482 0x42 -#define MODEL_g128 0x41 -#define MODEL_o426 0x40 -#define MODEL_o425 0x3F -#define MODEL_sakuji 0x3E -#define MODEL_g108 0x3D -#define MODEL_g42 0x3C -#define MODEL_o149 0x3B -#define MODEL_g41 0x3A -#define MODEL_o371 0x39 -#define MODEL_o148 0x38 -#define MODEL_g44 0x37 -#define MODEL_o155 0x36 -#define MODEL_o154 0x35 -#define MODEL_o156 0x34 -#define MODEL_g43 0x33 -#define MODEL_o153 0x32 -#define MODEL_o152 0x31 -#define MODEL_o150 0x30 -#define MODEL_o151 0x2F -#define MODEL_g40 0x2E -#define MODEL_g140 0x2D -#define MODEL_o238 0x2C -#define MODEL_o452 0x2B -#define MODEL_o147 0x2A -#define MODEL_o146 0x29 -#define MODEL_o145 0x28 -#define MODEL_g45 0x27 -#define MODEL_g47 0x26 -#define MODEL_o239 0x25 -#define MODEL_o164 0x24 -#define MODEL_o370 0x23 -#define MODEL_o163 0x22 -#define MODEL_hon 0x21 -#define MODEL_o390 0x20 -#define MODEL_o377 0x1F -#define MODEL_o374 0x1E -#define MODEL_o393 0x1D -#define MODEL_g106 0x1C -#define MODEL_o373 0x1B -#define MODEL_g109 0x1A -#define MODEL_o494 0x19 -#define MODEL_o492 0x18 -#define MODEL_o161 0x17 -#define MODEL_o236 0x16 -#define MODEL_o158 0x15 -#define MODEL_g98 0x14 -#define MODEL_o240 0x13 -#define MODEL_o162 0x12 -#define MODEL_o160 0x11 -#define MODEL_g3 0x10 -#define MODEL_g124 0xF -#define MODEL_o501 0xE -#define MODEL_o418 0xD -#define MODEL_g103 0xC -#define MODEL_o353 0xB -#define MODEL_o351 0xA -#define MODEL_o500 0x9 -#define MODEL_o4 0x8 -#define MODEL_o274 0x7 -#define MODEL_o234 0x6 -#define MODEL_o3 0x5 -#define MODEL_o1 0x4 -#define MODEL_o258 0x3 -#define MODEL_o270 0x2 -#define MODEL_o259 0x1 -#define MODEL_o271 0x0 +#define MODEL_Root 0xD0 +#define MODEL_g67 0xCF +#define MODEL_g82 0xCE +#define MODEL_g138 0xCD +#define MODEL_o448 0xCC +#define MODEL_g137 0xCB +#define MODEL_o447 0xCA +#define MODEL_g136 0xC9 +#define MODEL_o446 0xC8 +#define MODEL_g135 0xC7 +#define MODEL_o445 0xC6 +#define MODEL_g134 0xC5 +#define MODEL_o444 0xC4 +#define MODEL_g133 0xC3 +#define MODEL_o443 0xC2 +#define MODEL_g81 0xC1 +#define MODEL_o314 0xC0 +#define MODEL_g143 0xBF +#define MODEL_o459 0xBE +#define MODEL_o458 0xBD +#define MODEL_o457 0xBC +#define MODEL_g142 0xBB +#define MODEL_o456 0xBA +#define MODEL_o455 0xB9 +#define MODEL_o454 0xB8 +#define MODEL_o462 0xB7 +#define MODEL_o461 0xB6 +#define MODEL_o460 0xB5 +#define MODEL_o312 0xB4 +#define MODEL_g86 0xB3 +#define MODEL_o311 0xB2 +#define MODEL_g85 0xB1 +#define MODEL_o310 0xB0 +#define MODEL_g84 0xAF +#define MODEL_o318 0xAE +#define MODEL_o267 0xAD +#define MODEL_o266 0xAC +#define MODEL_o265 0xAB +#define MODEL_o264 0xAA +#define MODEL_o263 0xA9 +#define MODEL_o261 0xA8 +#define MODEL_o260 0xA7 +#define MODEL_g83 0xA6 +#define MODEL_o269 0xA5 +#define MODEL_o280 0xA4 +#define MODEL_o281 0xA3 +#define MODEL_g68 0xA2 +#define MODEL_g70 0xA1 +#define MODEL_o284 0xA0 +#define MODEL_o283 0x9F +#define MODEL_g80 0x9E +#define MODEL_o308 0x9D +#define MODEL_o307 0x9C +#define MODEL_g72 0x9B +#define MODEL_o291 0x9A +#define MODEL_o289 0x99 +#define MODEL_o288 0x98 +#define MODEL_o287 0x97 +#define MODEL_o282 0x96 +#define MODEL_g1 0x95 +#define MODEL_mura 0x94 +#define MODEL_g115 0x93 +#define MODEL_g65 0x92 +#define MODEL_o226 0x91 +#define MODEL_g64 0x90 +#define MODEL_o224 0x8F +#define MODEL_o223 0x8E +#define MODEL_o222 0x8D +#define MODEL_o225 0x8C +#define MODEL_g62 0x8B +#define MODEL_g141 0x8A +#define MODEL_o212 0x89 +#define MODEL_o453 0x88 +#define MODEL_o209 0x87 +#define MODEL_o208 0x86 +#define MODEL_o207 0x85 +#define MODEL_g63 0x84 +#define MODEL_g118 0x83 +#define MODEL_o356 0x82 +#define MODEL_o355 0x81 +#define MODEL_o210 0x80 +#define MODEL_o465 0x7F +#define MODEL_o211 0x7E +#define MODEL_g116 0x7D +#define MODEL_g145 0x7C +#define MODEL_o478 0x7B +#define MODEL_o477 0x7A +#define MODEL_o476 0x79 +#define MODEL_o475 0x78 +#define MODEL_o474 0x77 +#define MODEL_o473 0x76 +#define MODEL_g144 0x75 +#define MODEL_o472 0x74 +#define MODEL_o469 0x73 +#define MODEL_o471 0x72 +#define MODEL_o468 0x71 +#define MODEL_g131 0x70 +#define MODEL_o434 0x6F +#define MODEL_o433 0x6E +#define MODEL_o442 0x6D +#define MODEL_o441 0x6C +#define MODEL_kameki 0x6B +#define MODEL_g110 0x6A +#define MODEL_g54 0x69 +#define MODEL_o185 0x68 +#define MODEL_g52 0x67 +#define MODEL_o183 0x66 +#define MODEL_g51 0x65 +#define MODEL_o182 0x64 +#define MODEL_o180 0x63 +#define MODEL_o171 0x62 +#define MODEL_o181 0x61 +#define MODEL_g49 0x60 +#define MODEL_o168 0x5F +#define MODEL_o167 0x5E +#define MODEL_o166 0x5D +#define MODEL_o165 0x5C +#define MODEL_o179 0x5B +#define MODEL_g130 0x5A +#define MODEL_o432 0x59 +#define MODEL_o431 0x58 +#define MODEL_o430 0x57 +#define MODEL_g111 0x56 +#define MODEL_g53 0x55 +#define MODEL_o184 0x54 +#define MODEL_g112 0x53 +#define MODEL_o420 0x52 +#define MODEL_g146 0x51 +#define MODEL_o486 0x50 +#define MODEL_o487 0x4F +#define MODEL_g114 0x4E +#define MODEL_o480 0x4D +#define MODEL_o479 0x4C +#define MODEL_o169 0x4B +#define MODEL_o170 0x4A +#define MODEL_g126 0x49 +#define MODEL_o423 0x48 +#define MODEL_o422 0x47 +#define MODEL_o421 0x46 +#define MODEL_g113 0x45 +#define MODEL_o489 0x44 +#define MODEL_o483 0x43 +#define MODEL_o482 0x42 +#define MODEL_g128 0x41 +#define MODEL_o426 0x40 +#define MODEL_o425 0x3F +#define MODEL_sakuji 0x3E +#define MODEL_g108 0x3D +#define MODEL_g42 0x3C +#define MODEL_o149 0x3B +#define MODEL_g41 0x3A +#define MODEL_o371 0x39 +#define MODEL_o148 0x38 +#define MODEL_g44 0x37 +#define MODEL_o155 0x36 +#define MODEL_o154 0x35 +#define MODEL_o156 0x34 +#define MODEL_g43 0x33 +#define MODEL_o153 0x32 +#define MODEL_o152 0x31 +#define MODEL_o150 0x30 +#define MODEL_o151 0x2F +#define MODEL_g40 0x2E +#define MODEL_g140 0x2D +#define MODEL_o238 0x2C +#define MODEL_o452 0x2B +#define MODEL_o147 0x2A +#define MODEL_o146 0x29 +#define MODEL_o145 0x28 +#define MODEL_g45 0x27 +#define MODEL_g47 0x26 +#define MODEL_o239 0x25 +#define MODEL_o164 0x24 +#define MODEL_o370 0x23 +#define MODEL_o163 0x22 +#define MODEL_hon 0x21 +#define MODEL_o390 0x20 +#define MODEL_o377 0x1F +#define MODEL_o374 0x1E +#define MODEL_o393 0x1D +#define MODEL_g106 0x1C +#define MODEL_o373 0x1B +#define MODEL_g109 0x1A +#define MODEL_o494 0x19 +#define MODEL_o492 0x18 +#define MODEL_o161 0x17 +#define MODEL_o236 0x16 +#define MODEL_o158 0x15 +#define MODEL_g98 0x14 +#define MODEL_o240 0x13 +#define MODEL_o162 0x12 +#define MODEL_o160 0x11 +#define MODEL_g3 0x10 +#define MODEL_g124 0xF +#define MODEL_o501 0xE +#define MODEL_o418 0xD +#define MODEL_g103 0xC +#define MODEL_o353 0xB +#define MODEL_o351 0xA +#define MODEL_o500 0x9 +#define MODEL_o4 0x8 +#define MODEL_o274 0x7 +#define MODEL_o234 0x6 +#define MODEL_o3 0x5 +#define MODEL_o1 0x4 +#define MODEL_o258 0x3 +#define MODEL_o270 0x2 +#define MODEL_o259 0x1 +#define MODEL_o271 0x0 + diff --git a/include/mapfs/nok_03_hit.h b/include/mapfs/nok_03_hit.h index 61b6bfafd2..de72e72759 100644 --- a/include/mapfs/nok_03_hit.h +++ b/include/mapfs/nok_03_hit.h @@ -1,24 +1,31 @@ -#define COLLIDER_Root 0x17 -#define COLLIDER_g259 0x16 -#define COLLIDER_o834 0x15 -#define COLLIDER_o830 0x14 -#define COLLIDER_o829 0x13 -#define COLLIDER_o828 0x12 -#define COLLIDER_g261 0x11 -#define COLLIDER_o825 0x10 -#define COLLIDER_o783 0xF -#define COLLIDER_g20 0xE -#define COLLIDER_o891 0xD -#define COLLIDER_g277 0xC -#define COLLIDER_o827 0xB -#define COLLIDER_o826 0xA -#define COLLIDER_deilite 0x9 -#define COLLIDER_deilie 0x8 -#define COLLIDER_deilitw 0x7 -#define COLLIDER_deiliw 0x6 -#define COLLIDER_g25 0x5 -#define COLLIDER_o360 0x4 -#define COLLIDER_o261 0x3 -#define COLLIDER_jimen 0x2 -#define COLLIDER_o824 0x1 -#define COLLIDER_o47 0x0 +#define COLLIDER_Root 0x17 +#define COLLIDER_g259 0x16 +#define COLLIDER_o834 0x15 +#define COLLIDER_o830 0x14 +#define COLLIDER_o829 0x13 +#define COLLIDER_o828 0x12 +#define COLLIDER_g261 0x11 +#define COLLIDER_o825 0x10 +#define COLLIDER_o783 0xF +#define COLLIDER_g20 0xE +#define COLLIDER_o891 0xD +#define COLLIDER_g277 0xC +#define COLLIDER_o827 0xB +#define COLLIDER_o826 0xA +#define COLLIDER_deilite 0x9 +#define COLLIDER_deilie 0x8 +#define COLLIDER_deilitw 0x7 +#define COLLIDER_deiliw 0x6 +#define COLLIDER_g25 0x5 +#define COLLIDER_o360 0x4 +#define COLLIDER_o261 0x3 +#define COLLIDER_jimen 0x2 +#define COLLIDER_o824 0x1 +#define COLLIDER_o47 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g278 0x3 +#define ZONE_o830 0x2 +#define ZONE_o829 0x1 +#define ZONE_o828 0x0 + diff --git a/include/mapfs/nok_03_shape.h b/include/mapfs/nok_03_shape.h index 6181737fca..953a99eb94 100644 --- a/include/mapfs/nok_03_shape.h +++ b/include/mapfs/nok_03_shape.h @@ -1,67 +1,68 @@ -#define MODEL_Root 0x42 -#define MODEL_g145 0x41 -#define MODEL_o840 0x40 -#define MODEL_o428 0x3F -#define MODEL_o427 0x3E -#define MODEL_o429 0x3D -#define MODEL_o430 0x3C -#define MODEL_o431 0x3B -#define MODEL_o432 0x3A -#define MODEL_o434 0x39 -#define MODEL_o433 0x38 -#define MODEL_ugo 0x37 -#define MODEL_suimen1 0x36 -#define MODEL_kabemizu 0x35 -#define MODEL_hanahana 0x34 -#define MODEL_g259 0x33 -#define MODEL_g270 0x32 -#define MODEL_o809 0x31 -#define MODEL_o806 0x30 -#define MODEL_o802 0x2F -#define MODEL_o801 0x2E -#define MODEL_o800 0x2D -#define MODEL_g269 0x2C -#define MODEL_o799 0x2B -#define MODEL_o798 0x2A -#define MODEL_g261 0x29 -#define MODEL_o783 0x28 -#define MODEL_o782 0x27 -#define MODEL_g69 0x26 -#define MODEL_o829 0x25 -#define MODEL_o828 0x24 -#define MODEL_g278 0x23 -#define MODEL_o833 0x22 -#define MODEL_o832 0x21 -#define MODEL_o831 0x20 -#define MODEL_o830 0x1F -#define MODEL_o827 0x1E -#define MODEL_o826 0x1D -#define MODEL_o825 0x1C -#define MODEL_o824 0x1B -#define MODEL_g279 0x1A -#define MODEL_g142 0x19 -#define MODEL_o420 0x18 -#define MODEL_o424 0x17 -#define MODEL_g141 0x16 -#define MODEL_o419 0x15 -#define MODEL_o423 0x14 -#define MODEL_ki 0x13 -#define MODEL_o425 0x12 -#define MODEL_o330 0x11 -#define MODEL_g277 0x10 -#define MODEL_o822 0xF -#define MODEL_o821 0xE -#define MODEL_o820 0xD -#define MODEL_o819 0xC -#define MODEL_g25 0xB -#define MODEL_o38 0xA -#define MODEL_o360 0x9 -#define MODEL_o353 0x8 -#define MODEL_o324 0x7 -#define MODEL_o308 0x6 -#define MODEL_o261 0x5 -#define MODEL_kabe 0x4 -#define MODEL_o71 0x3 -#define MODEL_o48 0x2 -#define MODEL_o47 0x1 -#define MODEL_o44 0x0 +#define MODEL_Root 0x42 +#define MODEL_g145 0x41 +#define MODEL_o840 0x40 +#define MODEL_o428 0x3F +#define MODEL_o427 0x3E +#define MODEL_o429 0x3D +#define MODEL_o430 0x3C +#define MODEL_o431 0x3B +#define MODEL_o432 0x3A +#define MODEL_o434 0x39 +#define MODEL_o433 0x38 +#define MODEL_ugo 0x37 +#define MODEL_suimen1 0x36 +#define MODEL_kabemizu 0x35 +#define MODEL_hanahana 0x34 +#define MODEL_g259 0x33 +#define MODEL_g270 0x32 +#define MODEL_o809 0x31 +#define MODEL_o806 0x30 +#define MODEL_o802 0x2F +#define MODEL_o801 0x2E +#define MODEL_o800 0x2D +#define MODEL_g269 0x2C +#define MODEL_o799 0x2B +#define MODEL_o798 0x2A +#define MODEL_g261 0x29 +#define MODEL_o783 0x28 +#define MODEL_o782 0x27 +#define MODEL_g69 0x26 +#define MODEL_o829 0x25 +#define MODEL_o828 0x24 +#define MODEL_g278 0x23 +#define MODEL_o833 0x22 +#define MODEL_o832 0x21 +#define MODEL_o831 0x20 +#define MODEL_o830 0x1F +#define MODEL_o827 0x1E +#define MODEL_o826 0x1D +#define MODEL_o825 0x1C +#define MODEL_o824 0x1B +#define MODEL_g279 0x1A +#define MODEL_g142 0x19 +#define MODEL_o420 0x18 +#define MODEL_o424 0x17 +#define MODEL_g141 0x16 +#define MODEL_o419 0x15 +#define MODEL_o423 0x14 +#define MODEL_ki 0x13 +#define MODEL_o425 0x12 +#define MODEL_o330 0x11 +#define MODEL_g277 0x10 +#define MODEL_o822 0xF +#define MODEL_o821 0xE +#define MODEL_o820 0xD +#define MODEL_o819 0xC +#define MODEL_g25 0xB +#define MODEL_o38 0xA +#define MODEL_o360 0x9 +#define MODEL_o353 0x8 +#define MODEL_o324 0x7 +#define MODEL_o308 0x6 +#define MODEL_o261 0x5 +#define MODEL_kabe 0x4 +#define MODEL_o71 0x3 +#define MODEL_o48 0x2 +#define MODEL_o47 0x1 +#define MODEL_o44 0x0 + diff --git a/include/mapfs/nok_04_hit.h b/include/mapfs/nok_04_hit.h index 5045ba9ef8..452a4cfd0f 100644 --- a/include/mapfs/nok_04_hit.h +++ b/include/mapfs/nok_04_hit.h @@ -1,31 +1,39 @@ -#define COLLIDER_Root 0x1E -#define COLLIDER_g1 0x1D -#define COLLIDER_g26 0x1C -#define COLLIDER_g28 0x1B -#define COLLIDER_o156 0x1A -#define COLLIDER_o155 0x19 -#define COLLIDER_o154 0x18 -#define COLLIDER_o153 0x17 -#define COLLIDER_o152 0x16 -#define COLLIDER_o150 0x15 -#define COLLIDER_o147 0x14 -#define COLLIDER_g27 0x13 -#define COLLIDER_o146 0x12 -#define COLLIDER_o145 0x11 -#define COLLIDER_o144 0x10 -#define COLLIDER_o143 0xF -#define COLLIDER_g12 0xE -#define COLLIDER_deilitsw 0xD -#define COLLIDER_deilisw 0xC -#define COLLIDER_g25 0xB -#define COLLIDER_o181 0xA -#define COLLIDER_g22 0x9 -#define COLLIDER_o56 0x8 -#define COLLIDER_o57 0x7 -#define COLLIDER_o58 0x6 -#define COLLIDER_o59 0x5 -#define COLLIDER_g3 0x4 -#define COLLIDER_o45 0x3 -#define COLLIDER_o77 0x2 -#define COLLIDER_o76 0x1 -#define COLLIDER_o75 0x0 +#define COLLIDER_Root 0x1E +#define COLLIDER_g1 0x1D +#define COLLIDER_g26 0x1C +#define COLLIDER_g28 0x1B +#define COLLIDER_o156 0x1A +#define COLLIDER_o155 0x19 +#define COLLIDER_o154 0x18 +#define COLLIDER_o153 0x17 +#define COLLIDER_o152 0x16 +#define COLLIDER_o150 0x15 +#define COLLIDER_o147 0x14 +#define COLLIDER_g27 0x13 +#define COLLIDER_o146 0x12 +#define COLLIDER_o145 0x11 +#define COLLIDER_o144 0x10 +#define COLLIDER_o143 0xF +#define COLLIDER_g12 0xE +#define COLLIDER_deilitsw 0xD +#define COLLIDER_deilisw 0xC +#define COLLIDER_g25 0xB +#define COLLIDER_o181 0xA +#define COLLIDER_g22 0x9 +#define COLLIDER_o56 0x8 +#define COLLIDER_o57 0x7 +#define COLLIDER_o58 0x6 +#define COLLIDER_o59 0x5 +#define COLLIDER_g3 0x4 +#define COLLIDER_o45 0x3 +#define COLLIDER_o77 0x2 +#define COLLIDER_o76 0x1 +#define COLLIDER_o75 0x0 + +#define ZONE_Root 0x5 +#define ZONE_g1 0x4 +#define ZONE_o39 0x3 +#define ZONE_o54 0x2 +#define ZONE_o55 0x1 +#define ZONE_o4 0x0 + diff --git a/include/mapfs/nok_04_shape.h b/include/mapfs/nok_04_shape.h index 013fedd24e..685d0cdd8b 100644 --- a/include/mapfs/nok_04_shape.h +++ b/include/mapfs/nok_04_shape.h @@ -1,121 +1,122 @@ -#define MODEL_Root 0x78 -#define MODEL_g1 0x77 -#define MODEL_g28 0x76 -#define MODEL_g35 0x75 -#define MODEL_o256 0x74 -#define MODEL_o255 0x73 -#define MODEL_o254 0x72 -#define MODEL_o253 0x71 -#define MODEL_o252 0x70 -#define MODEL_o251 0x6F -#define MODEL_o250 0x6E -#define MODEL_o249 0x6D -#define MODEL_o248 0x6C -#define MODEL_o247 0x6B -#define MODEL_o246 0x6A -#define MODEL_o245 0x69 -#define MODEL_o244 0x68 -#define MODEL_o243 0x67 -#define MODEL_o241 0x66 -#define MODEL_o240 0x65 -#define MODEL_o239 0x64 -#define MODEL_o238 0x63 -#define MODEL_o237 0x62 -#define MODEL_o236 0x61 -#define MODEL_o235 0x60 -#define MODEL_o234 0x5F -#define MODEL_o233 0x5E -#define MODEL_o232 0x5D -#define MODEL_g33 0x5C -#define MODEL_o227 0x5B -#define MODEL_o226 0x5A -#define MODEL_o225 0x59 -#define MODEL_o224 0x58 -#define MODEL_o223 0x57 -#define MODEL_o221 0x56 -#define MODEL_g30 0x55 -#define MODEL_o196 0x54 -#define MODEL_o195 0x53 -#define MODEL_o194 0x52 -#define MODEL_o192 0x51 -#define MODEL_g26 0x50 -#define MODEL_o180 0x4F -#define MODEL_o181 0x4E -#define MODEL_o178 0x4D -#define MODEL_o177 0x4C -#define MODEL_g27 0x4B -#define MODEL_g19 0x4A -#define MODEL_o105 0x49 -#define MODEL_o102 0x48 -#define MODEL_o103 0x47 -#define MODEL_o211 0x46 -#define MODEL_o210 0x45 -#define MODEL_o209 0x44 -#define MODEL_g12 0x43 -#define MODEL_o55 0x42 -#define MODEL_o54 0x41 -#define MODEL_o53 0x40 -#define MODEL_o40 0x3F -#define MODEL_g32 0x3E -#define MODEL_o207 0x3D -#define MODEL_o206 0x3C -#define MODEL_o205 0x3B -#define MODEL_o204 0x3A -#define MODEL_o203 0x39 -#define MODEL_o202 0x38 -#define MODEL_o201 0x37 -#define MODEL_g25 0x36 -#define MODEL_o171 0x35 -#define MODEL_o170 0x34 -#define MODEL_o167 0x33 -#define MODEL_o173 0x32 -#define MODEL_o172 0x31 -#define MODEL_o169 0x30 -#define MODEL_o168 0x2F -#define MODEL_o166 0x2E -#define MODEL_g17 0x2D -#define MODEL_o215 0x2C -#define MODEL_o214 0x2B -#define MODEL_o213 0x2A -#define MODEL_o115 0x29 -#define MODEL_o114 0x28 -#define MODEL_o113 0x27 -#define MODEL_o112 0x26 -#define MODEL_o111 0x25 -#define MODEL_o110 0x24 -#define MODEL_o109 0x23 -#define MODEL_o108 0x22 -#define MODEL_o107 0x21 -#define MODEL_o106 0x20 -#define MODEL_g20 0x1F -#define MODEL_o122 0x1E -#define MODEL_o120 0x1D -#define MODEL_o118 0x1C -#define MODEL_o175 0x1B -#define MODEL_o121 0x1A -#define MODEL_o119 0x19 -#define MODEL_o117 0x18 -#define MODEL_g22 0x17 -#define MODEL_o155 0x16 -#define MODEL_o154 0x15 -#define MODEL_o153 0x14 -#define MODEL_o152 0x13 -#define MODEL_o151 0x12 -#define MODEL_o150 0x11 -#define MODEL_o149 0x10 -#define MODEL_o132 0xF -#define MODEL_g24 0xE -#define MODEL_o161 0xD -#define MODEL_o159 0xC -#define MODEL_o158 0xB -#define MODEL_o157 0xA -#define MODEL_o156 0x9 -#define MODEL_g34 0x8 -#define MODEL_o217 0x7 -#define MODEL_g3 0x6 -#define MODEL_o230 0x5 -#define MODEL_o228 0x4 -#define MODEL_o98 0x3 -#define MODEL_o96 0x2 -#define MODEL_o97 0x1 -#define MODEL_o1 0x0 +#define MODEL_Root 0x78 +#define MODEL_g1 0x77 +#define MODEL_g28 0x76 +#define MODEL_g35 0x75 +#define MODEL_o256 0x74 +#define MODEL_o255 0x73 +#define MODEL_o254 0x72 +#define MODEL_o253 0x71 +#define MODEL_o252 0x70 +#define MODEL_o251 0x6F +#define MODEL_o250 0x6E +#define MODEL_o249 0x6D +#define MODEL_o248 0x6C +#define MODEL_o247 0x6B +#define MODEL_o246 0x6A +#define MODEL_o245 0x69 +#define MODEL_o244 0x68 +#define MODEL_o243 0x67 +#define MODEL_o241 0x66 +#define MODEL_o240 0x65 +#define MODEL_o239 0x64 +#define MODEL_o238 0x63 +#define MODEL_o237 0x62 +#define MODEL_o236 0x61 +#define MODEL_o235 0x60 +#define MODEL_o234 0x5F +#define MODEL_o233 0x5E +#define MODEL_o232 0x5D +#define MODEL_g33 0x5C +#define MODEL_o227 0x5B +#define MODEL_o226 0x5A +#define MODEL_o225 0x59 +#define MODEL_o224 0x58 +#define MODEL_o223 0x57 +#define MODEL_o221 0x56 +#define MODEL_g30 0x55 +#define MODEL_o196 0x54 +#define MODEL_o195 0x53 +#define MODEL_o194 0x52 +#define MODEL_o192 0x51 +#define MODEL_g26 0x50 +#define MODEL_o180 0x4F +#define MODEL_o181 0x4E +#define MODEL_o178 0x4D +#define MODEL_o177 0x4C +#define MODEL_g27 0x4B +#define MODEL_g19 0x4A +#define MODEL_o105 0x49 +#define MODEL_o102 0x48 +#define MODEL_o103 0x47 +#define MODEL_o211 0x46 +#define MODEL_o210 0x45 +#define MODEL_o209 0x44 +#define MODEL_g12 0x43 +#define MODEL_o55 0x42 +#define MODEL_o54 0x41 +#define MODEL_o53 0x40 +#define MODEL_o40 0x3F +#define MODEL_g32 0x3E +#define MODEL_o207 0x3D +#define MODEL_o206 0x3C +#define MODEL_o205 0x3B +#define MODEL_o204 0x3A +#define MODEL_o203 0x39 +#define MODEL_o202 0x38 +#define MODEL_o201 0x37 +#define MODEL_g25 0x36 +#define MODEL_o171 0x35 +#define MODEL_o170 0x34 +#define MODEL_o167 0x33 +#define MODEL_o173 0x32 +#define MODEL_o172 0x31 +#define MODEL_o169 0x30 +#define MODEL_o168 0x2F +#define MODEL_o166 0x2E +#define MODEL_g17 0x2D +#define MODEL_o215 0x2C +#define MODEL_o214 0x2B +#define MODEL_o213 0x2A +#define MODEL_o115 0x29 +#define MODEL_o114 0x28 +#define MODEL_o113 0x27 +#define MODEL_o112 0x26 +#define MODEL_o111 0x25 +#define MODEL_o110 0x24 +#define MODEL_o109 0x23 +#define MODEL_o108 0x22 +#define MODEL_o107 0x21 +#define MODEL_o106 0x20 +#define MODEL_g20 0x1F +#define MODEL_o122 0x1E +#define MODEL_o120 0x1D +#define MODEL_o118 0x1C +#define MODEL_o175 0x1B +#define MODEL_o121 0x1A +#define MODEL_o119 0x19 +#define MODEL_o117 0x18 +#define MODEL_g22 0x17 +#define MODEL_o155 0x16 +#define MODEL_o154 0x15 +#define MODEL_o153 0x14 +#define MODEL_o152 0x13 +#define MODEL_o151 0x12 +#define MODEL_o150 0x11 +#define MODEL_o149 0x10 +#define MODEL_o132 0xF +#define MODEL_g24 0xE +#define MODEL_o161 0xD +#define MODEL_o159 0xC +#define MODEL_o158 0xB +#define MODEL_o157 0xA +#define MODEL_o156 0x9 +#define MODEL_g34 0x8 +#define MODEL_o217 0x7 +#define MODEL_g3 0x6 +#define MODEL_o230 0x5 +#define MODEL_o228 0x4 +#define MODEL_o98 0x3 +#define MODEL_o96 0x2 +#define MODEL_o97 0x1 +#define MODEL_o1 0x0 + diff --git a/include/mapfs/nok_11_hit.h b/include/mapfs/nok_11_hit.h index ceb3141272..9001d58efe 100644 --- a/include/mapfs/nok_11_hit.h +++ b/include/mapfs/nok_11_hit.h @@ -1,21 +1,32 @@ -#define COLLIDER_Root 0x14 -#define COLLIDER_g78 0x13 -#define COLLIDER_o158 0x12 -#define COLLIDER_o157 0x11 -#define COLLIDER_Default 0x10 -#define COLLIDER_o156 0xF -#define COLLIDER_t2 0xE -#define COLLIDER_t1 0xD -#define COLLIDER_s_2 0xC -#define COLLIDER_o105 0xB -#define COLLIDER_o142 0xA -#define COLLIDER_o141 0x9 -#define COLLIDER_s_1 0x8 -#define COLLIDER_o143 0x7 -#define COLLIDER_saku 0x6 -#define COLLIDER_o140 0x5 -#define COLLIDER_o139 0x4 -#define COLLIDER_deilit2 0x3 -#define COLLIDER_deili2 0x2 -#define COLLIDER_deilit1 0x1 -#define COLLIDER_deiri1 0x0 +#define COLLIDER_Root 0x14 +#define COLLIDER_g78 0x13 +#define COLLIDER_o158 0x12 +#define COLLIDER_o157 0x11 +#define COLLIDER_Default 0x10 +#define COLLIDER_o156 0xF +#define COLLIDER_t2 0xE +#define COLLIDER_t1 0xD +#define COLLIDER_s_2 0xC +#define COLLIDER_o105 0xB +#define COLLIDER_o142 0xA +#define COLLIDER_o141 0x9 +#define COLLIDER_s_1 0x8 +#define COLLIDER_o143 0x7 +#define COLLIDER_saku 0x6 +#define COLLIDER_o140 0x5 +#define COLLIDER_o139 0x4 +#define COLLIDER_deilit2 0x3 +#define COLLIDER_deili2 0x2 +#define COLLIDER_deilit1 0x1 +#define COLLIDER_deiri1 0x0 + +#define ZONE_Root 0x8 +#define ZONE_g72 0x7 +#define ZONE_o139 0x6 +#define ZONE_o138 0x5 +#define ZONE_Default 0x4 +#define ZONE_o143 0x3 +#define ZONE_o142 0x2 +#define ZONE_o141 0x1 +#define ZONE_o100 0x0 + diff --git a/include/mapfs/nok_11_shape.h b/include/mapfs/nok_11_shape.h index 080c38d6a6..018eebc02e 100644 --- a/include/mapfs/nok_11_shape.h +++ b/include/mapfs/nok_11_shape.h @@ -1,100 +1,101 @@ -#define MODEL_Root 0x63 -#define MODEL_suimen 0x62 -#define MODEL_suimen1 0x61 -#define MODEL_su1 0x60 -#define MODEL_g81 0x5F -#define MODEL_o176 0x5E -#define MODEL_o175 0x5D -#define MODEL_o179 0x5C -#define MODEL_o182 0x5B -#define MODEL_o177 0x5A -#define MODEL_o184 0x59 -#define MODEL_o183 0x58 -#define MODEL_o180 0x57 -#define MODEL_o178 0x56 -#define MODEL_mizu 0x55 -#define MODEL_kabemizu 0x54 -#define MODEL_g78 0x53 -#define MODEL_o170 0x52 -#define MODEL_o169 0x51 -#define MODEL_o168 0x50 -#define MODEL_Default 0x4F -#define MODEL_o151 0x4E -#define MODEL_o161 0x4D -#define MODEL_o156 0x4C -#define MODEL_o154 0x4B -#define MODEL_o152 0x4A -#define MODEL_o149 0x49 -#define MODEL_o145 0x48 -#define MODEL_o146 0x47 -#define MODEL_shima 0x46 -#define MODEL_hana 0x45 -#define MODEL_hanahana 0x44 -#define MODEL_hana10 0x43 -#define MODEL_hana9 0x42 -#define MODEL_hana8 0x41 -#define MODEL_hana7 0x40 -#define MODEL_hana6 0x3F -#define MODEL_hana5 0x3E -#define MODEL_hana4 0x3D -#define MODEL_hana3 0x3C -#define MODEL_hana2 0x3B -#define MODEL_shig_3 0x3A -#define MODEL_o116 0x39 -#define MODEL_o126 0x38 -#define MODEL_o125 0x37 -#define MODEL_kusa 0x36 -#define MODEL_o172 0x35 -#define MODEL_mizuzoko 0x34 -#define MODEL_o191 0x33 -#define MODEL_temae_ki 0x32 -#define MODEL_o122 0x31 -#define MODEL_michi 0x30 -#define MODEL_o162 0x2F -#define MODEL_o100 0x2E -#define MODEL_ki 0x2D -#define MODEL_ki2 0x2C -#define MODEL_o119 0x2B -#define MODEL_o118 0x2A -#define MODEL_ki1 0x29 -#define MODEL_o104 0x28 -#define MODEL_o103 0x27 -#define MODEL_c_b 0x26 -#define MODEL_c_b_4 0x25 -#define MODEL_o33 0x24 -#define MODEL_o32 0x23 -#define MODEL_c_b_3 0x22 -#define MODEL_o35 0x21 -#define MODEL_o34 0x20 -#define MODEL_c_b_2 0x1F -#define MODEL_o31 0x1E -#define MODEL_o30 0x1D -#define MODEL_c_b_1 0x1C -#define MODEL_o29 0x1B -#define MODEL_o28 0x1A -#define MODEL_jimn 0x19 -#define MODEL_jimenushiro 0x18 -#define MODEL_jimenmae 0x17 -#define MODEL_o158 0x16 -#define MODEL_kabe 0x15 -#define MODEL_kabe1 0x14 -#define MODEL_temae 0x13 -#define MODEL_tmae2 0x12 -#define MODEL_tmae1 0x11 -#define MODEL_hrat 0x10 -#define MODEL_hart3 0xF -#define MODEL_o26 0xE -#define MODEL_o25 0xD -#define MODEL_o24 0xC -#define MODEL_o23 0xB -#define MODEL_o22 0xA -#define MODEL_hart1 0x9 -#define MODEL_o42 0x8 -#define MODEL_o41 0x7 -#define MODEL_o40 0x6 -#define MODEL_bero2 0x5 -#define MODEL_o84 0x4 -#define MODEL_o82 0x3 -#define MODEL_bero1 0x2 -#define MODEL_o80 0x1 -#define MODEL_o78 0x0 +#define MODEL_Root 0x63 +#define MODEL_suimen 0x62 +#define MODEL_suimen1 0x61 +#define MODEL_su1 0x60 +#define MODEL_g81 0x5F +#define MODEL_o176 0x5E +#define MODEL_o175 0x5D +#define MODEL_o179 0x5C +#define MODEL_o182 0x5B +#define MODEL_o177 0x5A +#define MODEL_o184 0x59 +#define MODEL_o183 0x58 +#define MODEL_o180 0x57 +#define MODEL_o178 0x56 +#define MODEL_mizu 0x55 +#define MODEL_kabemizu 0x54 +#define MODEL_g78 0x53 +#define MODEL_o170 0x52 +#define MODEL_o169 0x51 +#define MODEL_o168 0x50 +#define MODEL_Default 0x4F +#define MODEL_o151 0x4E +#define MODEL_o161 0x4D +#define MODEL_o156 0x4C +#define MODEL_o154 0x4B +#define MODEL_o152 0x4A +#define MODEL_o149 0x49 +#define MODEL_o145 0x48 +#define MODEL_o146 0x47 +#define MODEL_shima 0x46 +#define MODEL_hana 0x45 +#define MODEL_hanahana 0x44 +#define MODEL_hana10 0x43 +#define MODEL_hana9 0x42 +#define MODEL_hana8 0x41 +#define MODEL_hana7 0x40 +#define MODEL_hana6 0x3F +#define MODEL_hana5 0x3E +#define MODEL_hana4 0x3D +#define MODEL_hana3 0x3C +#define MODEL_hana2 0x3B +#define MODEL_shig_3 0x3A +#define MODEL_o116 0x39 +#define MODEL_o126 0x38 +#define MODEL_o125 0x37 +#define MODEL_kusa 0x36 +#define MODEL_o172 0x35 +#define MODEL_mizuzoko 0x34 +#define MODEL_o191 0x33 +#define MODEL_temae_ki 0x32 +#define MODEL_o122 0x31 +#define MODEL_michi 0x30 +#define MODEL_o162 0x2F +#define MODEL_o100 0x2E +#define MODEL_ki 0x2D +#define MODEL_ki2 0x2C +#define MODEL_o119 0x2B +#define MODEL_o118 0x2A +#define MODEL_ki1 0x29 +#define MODEL_o104 0x28 +#define MODEL_o103 0x27 +#define MODEL_c_b 0x26 +#define MODEL_c_b_4 0x25 +#define MODEL_o33 0x24 +#define MODEL_o32 0x23 +#define MODEL_c_b_3 0x22 +#define MODEL_o35 0x21 +#define MODEL_o34 0x20 +#define MODEL_c_b_2 0x1F +#define MODEL_o31 0x1E +#define MODEL_o30 0x1D +#define MODEL_c_b_1 0x1C +#define MODEL_o29 0x1B +#define MODEL_o28 0x1A +#define MODEL_jimn 0x19 +#define MODEL_jimenushiro 0x18 +#define MODEL_jimenmae 0x17 +#define MODEL_o158 0x16 +#define MODEL_kabe 0x15 +#define MODEL_kabe1 0x14 +#define MODEL_temae 0x13 +#define MODEL_tmae2 0x12 +#define MODEL_tmae1 0x11 +#define MODEL_hrat 0x10 +#define MODEL_hart3 0xF +#define MODEL_o26 0xE +#define MODEL_o25 0xD +#define MODEL_o24 0xC +#define MODEL_o23 0xB +#define MODEL_o22 0xA +#define MODEL_hart1 0x9 +#define MODEL_o42 0x8 +#define MODEL_o41 0x7 +#define MODEL_o40 0x6 +#define MODEL_bero2 0x5 +#define MODEL_o84 0x4 +#define MODEL_o82 0x3 +#define MODEL_bero1 0x2 +#define MODEL_o80 0x1 +#define MODEL_o78 0x0 + diff --git a/include/mapfs/nok_12_hit.h b/include/mapfs/nok_12_hit.h index 94e3e10b43..9071954fc7 100644 --- a/include/mapfs/nok_12_hit.h +++ b/include/mapfs/nok_12_hit.h @@ -1,40 +1,50 @@ -#define COLLIDER_Root 0x27 -#define COLLIDER_g157 0x26 -#define COLLIDER_t2 0x25 -#define COLLIDER_t1 0x24 -#define COLLIDER_s_8 0x23 -#define COLLIDER_o355 0x22 -#define COLLIDER_s_7 0x21 -#define COLLIDER_s7_n 0x20 -#define COLLIDER_o91 0x1F -#define COLLIDER_o47 0x1E -#define COLLIDER_s_6 0x1D -#define COLLIDER_deilit2 0x1C -#define COLLIDER_deili2 0x1B -#define COLLIDER_s6_n 0x1A -#define COLLIDER_o223 0x19 -#define COLLIDER_o209 0x18 -#define COLLIDER_s_5 0x17 -#define COLLIDER_s5_n 0x16 -#define COLLIDER_o221 0x15 -#define COLLIDER_o207 0x14 -#define COLLIDER_s_4 0x13 -#define COLLIDER_o399 0x12 -#define COLLIDER_s4_n 0x11 -#define COLLIDER_o212 0x10 -#define COLLIDER_o211 0xF -#define COLLIDER_s_3 0xE -#define COLLIDER_s3_n 0xD -#define COLLIDER_o80 0xC -#define COLLIDER_o385 0xB -#define COLLIDER_s_2 0xA -#define COLLIDER_o204 0x9 -#define COLLIDER_o68 0x8 -#define COLLIDER_s_1 0x7 -#define COLLIDER_s1_n 0x6 -#define COLLIDER_o173 0x5 -#define COLLIDER_o165 0x4 -#define COLLIDER_o397 0x3 -#define COLLIDER_tt1 0x2 -#define COLLIDER_deilit1 0x1 -#define COLLIDER_deili1 0x0 +#define COLLIDER_Root 0x27 +#define COLLIDER_g157 0x26 +#define COLLIDER_t2 0x25 +#define COLLIDER_t1 0x24 +#define COLLIDER_s_8 0x23 +#define COLLIDER_o355 0x22 +#define COLLIDER_s_7 0x21 +#define COLLIDER_s7_n 0x20 +#define COLLIDER_o91 0x1F +#define COLLIDER_o47 0x1E +#define COLLIDER_s_6 0x1D +#define COLLIDER_deilit2 0x1C +#define COLLIDER_deili2 0x1B +#define COLLIDER_s6_n 0x1A +#define COLLIDER_o223 0x19 +#define COLLIDER_o209 0x18 +#define COLLIDER_s_5 0x17 +#define COLLIDER_s5_n 0x16 +#define COLLIDER_o221 0x15 +#define COLLIDER_o207 0x14 +#define COLLIDER_s_4 0x13 +#define COLLIDER_o399 0x12 +#define COLLIDER_s4_n 0x11 +#define COLLIDER_o212 0x10 +#define COLLIDER_o211 0xF +#define COLLIDER_s_3 0xE +#define COLLIDER_s3_n 0xD +#define COLLIDER_o80 0xC +#define COLLIDER_o385 0xB +#define COLLIDER_s_2 0xA +#define COLLIDER_o204 0x9 +#define COLLIDER_o68 0x8 +#define COLLIDER_s_1 0x7 +#define COLLIDER_s1_n 0x6 +#define COLLIDER_o173 0x5 +#define COLLIDER_o165 0x4 +#define COLLIDER_o397 0x3 +#define COLLIDER_tt1 0x2 +#define COLLIDER_deilit1 0x1 +#define COLLIDER_deili1 0x0 + +#define ZONE_Root 0x7 +#define ZONE_Default 0x6 +#define ZONE_o212 0x5 +#define ZONE_o211 0x4 +#define ZONE_g68 0x3 +#define ZONE_o214 0x2 +#define ZONE_o213 0x1 +#define ZONE_o226 0x0 + diff --git a/include/mapfs/nok_12_shape.h b/include/mapfs/nok_12_shape.h index 1e8dabf3fa..7e6d89e3c6 100644 --- a/include/mapfs/nok_12_shape.h +++ b/include/mapfs/nok_12_shape.h @@ -1,208 +1,209 @@ -#define MODEL_Root 0xCF -#define MODEL_off 0xCE -#define MODEL_o267 0xCD -#define MODEL_o263 0xCC -#define MODEL_o261 0xCB -#define MODEL_o266 0xCA -#define MODEL_o264 0xC9 -#define MODEL_o265 0xC8 -#define MODEL_suimen 0xC7 -#define MODEL_su1 0xC6 -#define MODEL_suimen1 0xC5 -#define MODEL_hana 0xC4 -#define MODEL_hanahna 0xC3 -#define MODEL_hana7 0xC2 -#define MODEL_hana6 0xC1 -#define MODEL_hana5 0xC0 -#define MODEL_hana4 0xBF -#define MODEL_hana3 0xBE -#define MODEL_hana2 0xBD -#define MODEL_hana1 0xBC -#define MODEL_g163 0xBB -#define MODEL_o332 0xBA -#define MODEL_o328 0xB9 -#define MODEL_o326 0xB8 -#define MODEL_o325 0xB7 -#define MODEL_o322 0xB6 -#define MODEL_o320 0xB5 -#define MODEL_ukijima 0xB4 -#define MODEL_g35 0xB3 -#define MODEL_o117 0xB2 -#define MODEL_o116 0xB1 -#define MODEL_o115 0xB0 -#define MODEL_g77 0xAF -#define MODEL_o311 0xAE -#define MODEL_uki_jimen 0xAD -#define MODEL_m_owari 0xAC -#define MODEL_o301 0xAB -#define MODEL_o300 0xAA -#define MODEL_o225 0xA9 -#define MODEL_o228 0xA8 -#define MODEL_o230 0xA7 -#define MODEL_o192 0xA6 -#define MODEL_u_kabe 0xA5 -#define MODEL_o281 0xA4 -#define MODEL_o280 0xA3 -#define MODEL_g147 0xA2 -#define MODEL_o274 0xA1 -#define MODEL_o273 0xA0 -#define MODEL_o185 0x9F -#define MODEL_Default 0x9E -#define MODEL_o336 0x9D -#define MODEL_kaidan1 0x9C -#define MODEL_k1_kabe 0x9B -#define MODEL_k1kabe 0x9A -#define MODEL_k1kusa 0x99 -#define MODEL_o199 0x98 -#define MODEL_k1temae 0x97 -#define MODEL_o252 0x96 -#define MODEL_o164 0x95 -#define MODEL_k1jimen 0x94 -#define MODEL_o238 0x93 -#define MODEL_hashi 0x92 -#define MODEL_hashi3 0x91 -#define MODEL_o100 0x90 -#define MODEL_o99 0x8F -#define MODEL_o92 0x8E -#define MODEL_o101 0x8D -#define MODEL_o91 0x8C -#define MODEL_hashi2 0x8B -#define MODEL_o93 0x8A -#define MODEL_o96 0x89 -#define MODEL_o94 0x88 -#define MODEL_o95 0x87 -#define MODEL_o97 0x86 -#define MODEL_hashi1 0x85 -#define MODEL_o88 0x84 -#define MODEL_o80 0x83 -#define MODEL_o79 0x82 -#define MODEL_o90 0x81 -#define MODEL_o89 0x80 -#define MODEL_kaidan 0x7F -#define MODEL_g136 0x7E -#define MODEL_o251 0x7D -#define MODEL_kaidan7 0x7C -#define MODEL_k7temae 0x7B -#define MODEL_o172 0x7A -#define MODEL_moko4 0x79 -#define MODEL_moko4_1 0x78 -#define MODEL_k7ki 0x77 -#define MODEL_o153 0x76 -#define MODEL_o152 0x75 -#define MODEL_k7saku 0x74 -#define MODEL_o44 0x73 -#define MODEL_k7_kabe 0x72 -#define MODEL_o73 0x71 -#define MODEL_k7jimen 0x70 -#define MODEL_o69 0x6F -#define MODEL_bero2 0x6E -#define MODEL_deili2 0x6D -#define MODEL_o8 0x6C -#define MODEL_kaidan6 0x6B -#define MODEL_k6temae 0x6A -#define MODEL_o173 0x69 -#define MODEL_moko3 0x68 -#define MODEL_moko3_1 0x67 -#define MODEL_c_b_4 0x66 -#define MODEL_o138 0x65 -#define MODEL_o137 0x64 -#define MODEL_k6saku 0x63 -#define MODEL_o232 0x62 -#define MODEL_k6jimen 0x61 -#define MODEL_o68 0x60 -#define MODEL_o231 0x5F -#define MODEL_k6_kabe 0x5E -#define MODEL_k6kabe 0x5D -#define MODEL_kaidan5 0x5C -#define MODEL_k5temae 0x5B -#define MODEL_o174 0x5A -#define MODEL_hrat_2 0x59 -#define MODEL_o114 0x58 -#define MODEL_o113 0x57 -#define MODEL_o112 0x56 -#define MODEL_k5saku 0x55 -#define MODEL_o234 0x54 -#define MODEL_k5_kabe 0x53 -#define MODEL_k5kabe 0x52 -#define MODEL_k5jimen 0x51 -#define MODEL_o229 0x50 -#define MODEL_kaidan4 0x4F -#define MODEL_k4jimen 0x4E -#define MODEL_o241 0x4D -#define MODEL_k4_kabe 0x4C -#define MODEL_4kkabe 0x4B -#define MODEL_kaidan3 0x4A -#define MODEL_k3temae 0x49 -#define MODEL_o179 0x48 -#define MODEL_k3_kabe 0x47 -#define MODEL_k3kabe 0x46 -#define MODEL_k3jimen 0x45 -#define MODEL_o236 0x44 -#define MODEL_kaidan2 0x43 -#define MODEL_k2temae 0x42 -#define MODEL_o176 0x41 -#define MODEL_k2_kabe 0x40 -#define MODEL_k2kabe 0x3F -#define MODEL_k2jimen 0x3E -#define MODEL_o237 0x3D -#define MODEL_shima_2 0x3C -#define MODEL_g160 0x3B -#define MODEL_o310 0x3A -#define MODEL_kabe_2 0x39 -#define MODEL_kabe2 0x38 -#define MODEL_jimen_2 0x37 -#define MODEL_jimen22 0x36 -#define MODEL_jimen2 0x35 -#define MODEL_o318 0x34 -#define MODEL_shima_1 0x33 -#define MODEL_temae_1 0x32 -#define MODEL_o171 0x31 -#define MODEL_ki_ha 0x30 -#define MODEL_o140 0x2F -#define MODEL_kakushimichi 0x2E -#define MODEL_o182 0x2D -#define MODEL_kabe_1 0x2C -#define MODEL_kabe1 0x2B -#define MODEL_jimen_1 0x2A -#define MODEL_o350 0x29 -#define MODEL_o187 0x28 -#define MODEL_bero1 0x27 -#define MODEL_deili1 0x26 -#define MODEL_o6 0x25 -#define MODEL_mizu 0x24 -#define MODEL_kabemizu3 0x23 -#define MODEL_kabemizu2 0x22 -#define MODEL_kabemizu1 0x21 -#define MODEL_kabemizu5 0x20 -#define MODEL_kabemizu4 0x1F -#define MODEL_mizuzoko 0x1E -#define MODEL_o50 0x1D -#define MODEL_g167 0x1C -#define MODEL_o343 0x1B -#define MODEL_o342 0x1A -#define MODEL_z2 0x19 -#define MODEL_o299 0x18 -#define MODEL_o361 0x17 -#define MODEL_o133 0x16 -#define MODEL_o327 0x15 -#define MODEL_o250 0x14 -#define MODEL_o360 0x13 -#define MODEL_o136 0x12 -#define MODEL_moko2_1 0x11 -#define MODEL_ha 0x10 -#define MODEL_o154 0xF -#define MODEL_o355 0xE -#define MODEL_o235 0xD -#define MODEL_o297 0xC -#define MODEL_z1 0xB -#define MODEL_o139 0xA -#define MODEL_o358 0x9 -#define MODEL_o131 0x8 -#define MODEL_moko_2 0x7 -#define MODEL_o317 0x6 -#define MODEL_o359 0x5 -#define MODEL_o255 0x4 -#define MODEL_o357 0x3 -#define MODEL_o356 0x2 -#define MODEL_moko_3 0x1 -#define MODEL_o352 0x0 +#define MODEL_Root 0xCF +#define MODEL_off 0xCE +#define MODEL_o267 0xCD +#define MODEL_o263 0xCC +#define MODEL_o261 0xCB +#define MODEL_o266 0xCA +#define MODEL_o264 0xC9 +#define MODEL_o265 0xC8 +#define MODEL_suimen 0xC7 +#define MODEL_su1 0xC6 +#define MODEL_suimen1 0xC5 +#define MODEL_hana 0xC4 +#define MODEL_hanahna 0xC3 +#define MODEL_hana7 0xC2 +#define MODEL_hana6 0xC1 +#define MODEL_hana5 0xC0 +#define MODEL_hana4 0xBF +#define MODEL_hana3 0xBE +#define MODEL_hana2 0xBD +#define MODEL_hana1 0xBC +#define MODEL_g163 0xBB +#define MODEL_o332 0xBA +#define MODEL_o328 0xB9 +#define MODEL_o326 0xB8 +#define MODEL_o325 0xB7 +#define MODEL_o322 0xB6 +#define MODEL_o320 0xB5 +#define MODEL_ukijima 0xB4 +#define MODEL_g35 0xB3 +#define MODEL_o117 0xB2 +#define MODEL_o116 0xB1 +#define MODEL_o115 0xB0 +#define MODEL_g77 0xAF +#define MODEL_o311 0xAE +#define MODEL_uki_jimen 0xAD +#define MODEL_m_owari 0xAC +#define MODEL_o301 0xAB +#define MODEL_o300 0xAA +#define MODEL_o225 0xA9 +#define MODEL_o228 0xA8 +#define MODEL_o230 0xA7 +#define MODEL_o192 0xA6 +#define MODEL_u_kabe 0xA5 +#define MODEL_o281 0xA4 +#define MODEL_o280 0xA3 +#define MODEL_g147 0xA2 +#define MODEL_o274 0xA1 +#define MODEL_o273 0xA0 +#define MODEL_o185 0x9F +#define MODEL_Default 0x9E +#define MODEL_o336 0x9D +#define MODEL_kaidan1 0x9C +#define MODEL_k1_kabe 0x9B +#define MODEL_k1kabe 0x9A +#define MODEL_k1kusa 0x99 +#define MODEL_o199 0x98 +#define MODEL_k1temae 0x97 +#define MODEL_o252 0x96 +#define MODEL_o164 0x95 +#define MODEL_k1jimen 0x94 +#define MODEL_o238 0x93 +#define MODEL_hashi 0x92 +#define MODEL_hashi3 0x91 +#define MODEL_o100 0x90 +#define MODEL_o99 0x8F +#define MODEL_o92 0x8E +#define MODEL_o101 0x8D +#define MODEL_o91 0x8C +#define MODEL_hashi2 0x8B +#define MODEL_o93 0x8A +#define MODEL_o96 0x89 +#define MODEL_o94 0x88 +#define MODEL_o95 0x87 +#define MODEL_o97 0x86 +#define MODEL_hashi1 0x85 +#define MODEL_o88 0x84 +#define MODEL_o80 0x83 +#define MODEL_o79 0x82 +#define MODEL_o90 0x81 +#define MODEL_o89 0x80 +#define MODEL_kaidan 0x7F +#define MODEL_g136 0x7E +#define MODEL_o251 0x7D +#define MODEL_kaidan7 0x7C +#define MODEL_k7temae 0x7B +#define MODEL_o172 0x7A +#define MODEL_moko4 0x79 +#define MODEL_moko4_1 0x78 +#define MODEL_k7ki 0x77 +#define MODEL_o153 0x76 +#define MODEL_o152 0x75 +#define MODEL_k7saku 0x74 +#define MODEL_o44 0x73 +#define MODEL_k7_kabe 0x72 +#define MODEL_o73 0x71 +#define MODEL_k7jimen 0x70 +#define MODEL_o69 0x6F +#define MODEL_bero2 0x6E +#define MODEL_deili2 0x6D +#define MODEL_o8 0x6C +#define MODEL_kaidan6 0x6B +#define MODEL_k6temae 0x6A +#define MODEL_o173 0x69 +#define MODEL_moko3 0x68 +#define MODEL_moko3_1 0x67 +#define MODEL_c_b_4 0x66 +#define MODEL_o138 0x65 +#define MODEL_o137 0x64 +#define MODEL_k6saku 0x63 +#define MODEL_o232 0x62 +#define MODEL_k6jimen 0x61 +#define MODEL_o68 0x60 +#define MODEL_o231 0x5F +#define MODEL_k6_kabe 0x5E +#define MODEL_k6kabe 0x5D +#define MODEL_kaidan5 0x5C +#define MODEL_k5temae 0x5B +#define MODEL_o174 0x5A +#define MODEL_hrat_2 0x59 +#define MODEL_o114 0x58 +#define MODEL_o113 0x57 +#define MODEL_o112 0x56 +#define MODEL_k5saku 0x55 +#define MODEL_o234 0x54 +#define MODEL_k5_kabe 0x53 +#define MODEL_k5kabe 0x52 +#define MODEL_k5jimen 0x51 +#define MODEL_o229 0x50 +#define MODEL_kaidan4 0x4F +#define MODEL_k4jimen 0x4E +#define MODEL_o241 0x4D +#define MODEL_k4_kabe 0x4C +#define MODEL_4kkabe 0x4B +#define MODEL_kaidan3 0x4A +#define MODEL_k3temae 0x49 +#define MODEL_o179 0x48 +#define MODEL_k3_kabe 0x47 +#define MODEL_k3kabe 0x46 +#define MODEL_k3jimen 0x45 +#define MODEL_o236 0x44 +#define MODEL_kaidan2 0x43 +#define MODEL_k2temae 0x42 +#define MODEL_o176 0x41 +#define MODEL_k2_kabe 0x40 +#define MODEL_k2kabe 0x3F +#define MODEL_k2jimen 0x3E +#define MODEL_o237 0x3D +#define MODEL_shima_2 0x3C +#define MODEL_g160 0x3B +#define MODEL_o310 0x3A +#define MODEL_kabe_2 0x39 +#define MODEL_kabe2 0x38 +#define MODEL_jimen_2 0x37 +#define MODEL_jimen22 0x36 +#define MODEL_jimen2 0x35 +#define MODEL_o318 0x34 +#define MODEL_shima_1 0x33 +#define MODEL_temae_1 0x32 +#define MODEL_o171 0x31 +#define MODEL_ki_ha 0x30 +#define MODEL_o140 0x2F +#define MODEL_kakushimichi 0x2E +#define MODEL_o182 0x2D +#define MODEL_kabe_1 0x2C +#define MODEL_kabe1 0x2B +#define MODEL_jimen_1 0x2A +#define MODEL_o350 0x29 +#define MODEL_o187 0x28 +#define MODEL_bero1 0x27 +#define MODEL_deili1 0x26 +#define MODEL_o6 0x25 +#define MODEL_mizu 0x24 +#define MODEL_kabemizu3 0x23 +#define MODEL_kabemizu2 0x22 +#define MODEL_kabemizu1 0x21 +#define MODEL_kabemizu5 0x20 +#define MODEL_kabemizu4 0x1F +#define MODEL_mizuzoko 0x1E +#define MODEL_o50 0x1D +#define MODEL_g167 0x1C +#define MODEL_o343 0x1B +#define MODEL_o342 0x1A +#define MODEL_z2 0x19 +#define MODEL_o299 0x18 +#define MODEL_o361 0x17 +#define MODEL_o133 0x16 +#define MODEL_o327 0x15 +#define MODEL_o250 0x14 +#define MODEL_o360 0x13 +#define MODEL_o136 0x12 +#define MODEL_moko2_1 0x11 +#define MODEL_ha 0x10 +#define MODEL_o154 0xF +#define MODEL_o355 0xE +#define MODEL_o235 0xD +#define MODEL_o297 0xC +#define MODEL_z1 0xB +#define MODEL_o139 0xA +#define MODEL_o358 0x9 +#define MODEL_o131 0x8 +#define MODEL_moko_2 0x7 +#define MODEL_o317 0x6 +#define MODEL_o359 0x5 +#define MODEL_o255 0x4 +#define MODEL_o357 0x3 +#define MODEL_o356 0x2 +#define MODEL_moko_3 0x1 +#define MODEL_o352 0x0 + diff --git a/include/mapfs/nok_13_hit.h b/include/mapfs/nok_13_hit.h index 75017c1a2b..7d7015643c 100644 --- a/include/mapfs/nok_13_hit.h +++ b/include/mapfs/nok_13_hit.h @@ -1,70 +1,82 @@ -#define COLLIDER_Root 0x45 -#define COLLIDER_g119 0x44 -#define COLLIDER_o406 0x43 -#define COLLIDER_g118 0x42 -#define COLLIDER_o401 0x41 -#define COLLIDER_o130 0x40 -#define COLLIDER_o219 0x3F -#define COLLIDER_Default 0x3E -#define COLLIDER_t3 0x3D -#define COLLIDER_t2 0x3C -#define COLLIDER_t1 0x3B -#define COLLIDER_g113 0x3A -#define COLLIDER_o391 0x39 -#define COLLIDER_o388 0x38 -#define COLLIDER_o387 0x37 -#define COLLIDER_s_5 0x36 -#define COLLIDER_g123 0x35 -#define COLLIDER_o444 0x34 -#define COLLIDER_o435 0x33 -#define COLLIDER_g120 0x32 -#define COLLIDER_o443 0x31 -#define COLLIDER_o432 0x30 -#define COLLIDER_o436 0x2F -#define COLLIDER_g121 0x2E -#define COLLIDER_o431 0x2D -#define COLLIDER_o437 0x2C -#define COLLIDER_g122 0x2B -#define COLLIDER_o438 0x2A -#define COLLIDER_o400 0x29 -#define COLLIDER_g124 0x28 -#define COLLIDER_o446 0x27 -#define COLLIDER_o439 0x26 -#define COLLIDER_o429 0x25 -#define COLLIDER_g125 0x24 -#define COLLIDER_o447 0x23 -#define COLLIDER_o428 0x22 -#define COLLIDER_o440 0x21 -#define COLLIDER_g126 0x20 -#define COLLIDER_o367 0x1F -#define COLLIDER_o441 0x1E -#define COLLIDER_n5 0x1D -#define COLLIDER_o426 0x1C -#define COLLIDER_s_3 0x1B -#define COLLIDER_o424 0x1A -#define COLLIDER_o423 0x19 -#define COLLIDER_o422 0x18 -#define COLLIDER_o421 0x17 -#define COLLIDER_o420 0x16 -#define COLLIDER_deilit3 0x15 -#define COLLIDER_deili3 0x14 -#define COLLIDER_o306 0x13 -#define COLLIDER_s_2 0x12 -#define COLLIDER_o305 0x11 -#define COLLIDER_o419 0x10 -#define COLLIDER_o418 0xF -#define COLLIDER_o417 0xE -#define COLLIDER_o416 0xD -#define COLLIDER_o415 0xC -#define COLLIDER_deilit2 0xB -#define COLLIDER_deili2 0xA -#define COLLIDER_s_1 0x9 -#define COLLIDER_deilit1 0x8 -#define COLLIDER_deili1 0x7 -#define COLLIDER_o57 0x6 -#define COLLIDER_o413 0x5 -#define COLLIDER_o307 0x4 -#define COLLIDER_o122 0x3 -#define COLLIDER_o69 0x2 -#define COLLIDER_s_sakus 0x1 -#define COLLIDER_o445 0x0 +#define COLLIDER_Root 0x45 +#define COLLIDER_g119 0x44 +#define COLLIDER_o406 0x43 +#define COLLIDER_g118 0x42 +#define COLLIDER_o401 0x41 +#define COLLIDER_o130 0x40 +#define COLLIDER_o219 0x3F +#define COLLIDER_Default 0x3E +#define COLLIDER_t3 0x3D +#define COLLIDER_t2 0x3C +#define COLLIDER_t1 0x3B +#define COLLIDER_g113 0x3A +#define COLLIDER_o391 0x39 +#define COLLIDER_o388 0x38 +#define COLLIDER_o387 0x37 +#define COLLIDER_s_5 0x36 +#define COLLIDER_g123 0x35 +#define COLLIDER_o444 0x34 +#define COLLIDER_o435 0x33 +#define COLLIDER_g120 0x32 +#define COLLIDER_o443 0x31 +#define COLLIDER_o432 0x30 +#define COLLIDER_o436 0x2F +#define COLLIDER_g121 0x2E +#define COLLIDER_o431 0x2D +#define COLLIDER_o437 0x2C +#define COLLIDER_g122 0x2B +#define COLLIDER_o438 0x2A +#define COLLIDER_o400 0x29 +#define COLLIDER_g124 0x28 +#define COLLIDER_o446 0x27 +#define COLLIDER_o439 0x26 +#define COLLIDER_o429 0x25 +#define COLLIDER_g125 0x24 +#define COLLIDER_o447 0x23 +#define COLLIDER_o428 0x22 +#define COLLIDER_o440 0x21 +#define COLLIDER_g126 0x20 +#define COLLIDER_o367 0x1F +#define COLLIDER_o441 0x1E +#define COLLIDER_n5 0x1D +#define COLLIDER_o426 0x1C +#define COLLIDER_s_3 0x1B +#define COLLIDER_o424 0x1A +#define COLLIDER_o423 0x19 +#define COLLIDER_o422 0x18 +#define COLLIDER_o421 0x17 +#define COLLIDER_o420 0x16 +#define COLLIDER_deilit3 0x15 +#define COLLIDER_deili3 0x14 +#define COLLIDER_o306 0x13 +#define COLLIDER_s_2 0x12 +#define COLLIDER_o305 0x11 +#define COLLIDER_o419 0x10 +#define COLLIDER_o418 0xF +#define COLLIDER_o417 0xE +#define COLLIDER_o416 0xD +#define COLLIDER_o415 0xC +#define COLLIDER_deilit2 0xB +#define COLLIDER_deili2 0xA +#define COLLIDER_s_1 0x9 +#define COLLIDER_deilit1 0x8 +#define COLLIDER_deili1 0x7 +#define COLLIDER_o57 0x6 +#define COLLIDER_o413 0x5 +#define COLLIDER_o307 0x4 +#define COLLIDER_o122 0x3 +#define COLLIDER_o69 0x2 +#define COLLIDER_s_sakus 0x1 +#define COLLIDER_o445 0x0 + +#define ZONE_Root 0x9 +#define ZONE_g18 0x8 +#define ZONE_o88 0x7 +#define ZONE_Default 0x6 +#define ZONE_o91 0x5 +#define ZONE_o90 0x4 +#define ZONE_4 0x3 +#define ZONE_3 0x2 +#define ZONE_2 0x1 +#define ZONE_1 0x0 + diff --git a/include/mapfs/nok_13_shape.h b/include/mapfs/nok_13_shape.h index b07e4b4bb4..4460510286 100644 --- a/include/mapfs/nok_13_shape.h +++ b/include/mapfs/nok_13_shape.h @@ -1,151 +1,152 @@ -#define MODEL_Root 0x96 -#define MODEL_g190 0x95 -#define MODEL_kabemizu1 0x94 -#define MODEL_suimen 0x93 -#define MODEL_suimen1 0x92 -#define MODEL_mizu 0x91 -#define MODEL_o517 0x90 -#define MODEL_o516 0x8F -#define MODEL_o515 0x8E -#define MODEL_o514 0x8D -#define MODEL_o513 0x8C -#define MODEL_o512 0x8B -#define MODEL_o493 0x8A -#define MODEL_o465 0x89 -#define MODEL_g187 0x88 -#define MODEL_o511 0x87 -#define MODEL_g186 0x86 -#define MODEL_dai 0x85 -#define MODEL_o503 0x84 -#define MODEL_g179 0x83 -#define MODEL_o499 0x82 -#define MODEL_o498 0x81 -#define MODEL_o319 0x80 -#define MODEL_o308 0x7F -#define MODEL_c_k_1 0x7E -#define MODEL_ck 0x7D -#define MODEL_o362 0x7C -#define MODEL_c_k_e 0x7B -#define MODEL_o363 0x7A -#define MODEL_c_k 0x79 -#define MODEL_o368 0x78 -#define MODEL_o367 0x77 -#define MODEL_o366 0x76 -#define MODEL_o365 0x75 -#define MODEL_hana 0x74 -#define MODEL_hanahana 0x73 -#define MODEL_hana2 0x72 -#define MODEL_hana1 0x71 -#define MODEL_ue 0x70 -#define MODEL_saku_2 0x6F -#define MODEL_saku_u 0x6E -#define MODEL_ueki 0x6D -#define MODEL_o145 0x6C -#define MODEL_michi_2 0x6B -#define MODEL_michi_u 0x6A -#define MODEL_jimen_2 0x69 -#define MODEL_jimen_u 0x68 -#define MODEL_bero_2 0x67 -#define MODEL_deiliw 0x66 -#define MODEL_o45 0x65 -#define MODEL_k_k_k 0x64 -#define MODEL_o344 0x63 -#define MODEL_o343 0x62 -#define MODEL_o342 0x61 -#define MODEL_o341 0x60 -#define MODEL_o340 0x5F -#define MODEL_o339 0x5E -#define MODEL_hashi 0x5D -#define MODEL_g104 0x5C -#define MODEL_o271 0x5B -#define MODEL_o270 0x5A -#define MODEL_o269 0x59 -#define MODEL_o268 0x58 -#define MODEL_o266 0x57 -#define MODEL_o265 0x56 -#define MODEL_o264 0x55 -#define MODEL_geta 0x54 -#define MODEL_o338 0x53 -#define MODEL_o337 0x52 -#define MODEL_o336 0x51 -#define MODEL_o335 0x50 -#define MODEL_o334 0x4F -#define MODEL_tesuri_2 0x4E -#define MODEL_o66 0x4D -#define MODEL_o67 0x4C -#define MODEL_o166 0x4B -#define MODEL_tesuri_1 0x4A -#define MODEL_o68 0x49 -#define MODEL_o69 0x48 -#define MODEL_o168 0x47 -#define MODEL_bero_3 0x46 -#define MODEL_deilise 0x45 -#define MODEL_o41 0x44 -#define MODEL_kaidan 0x43 -#define MODEL_g175 0x42 -#define MODEL_o507 0x41 -#define MODEL_6 0x40 -#define MODEL_o320 0x3F -#define MODEL_5 0x3E -#define MODEL_o221 0x3D -#define MODEL_o321 0x3C -#define MODEL_g105 0x3B -#define MODEL_o330 0x3A -#define MODEL_o329 0x39 -#define MODEL_4 0x38 -#define MODEL_o223 0x37 -#define MODEL_o317 0x36 -#define MODEL_3 0x35 -#define MODEL_o307 0x34 -#define MODEL_o315 0x33 -#define MODEL_2 0x32 -#define MODEL_o357 0x31 -#define MODEL_o306 0x30 -#define MODEL_o314 0x2F -#define MODEL_1 0x2E -#define MODEL_o359 0x2D -#define MODEL_o305 0x2C -#define MODEL_kusa_ki 0x2B -#define MODEL_o129 0x2A -#define MODEL_shita 0x29 -#define MODEL_saku_1 0x28 -#define MODEL_o326 0x27 -#define MODEL_bero_1 0x26 -#define MODEL_deilin 0x25 -#define MODEL_o43 0x24 -#define MODEL_ki_2 0x23 -#define MODEL_o275 0x22 -#define MODEL_o277 0x21 -#define MODEL_ki_1 0x20 -#define MODEL_o285 0x1F -#define MODEL_o284 0x1E -#define MODEL_o283 0x1D -#define MODEL_o282 0x1C -#define MODEL_o281 0x1B -#define MODEL_hart_3 0x1A -#define MODEL_o289 0x19 -#define MODEL_o288 0x18 -#define MODEL_o287 0x17 -#define MODEL_hart_2 0x16 -#define MODEL_o291 0x15 -#define MODEL_o290 0x14 -#define MODEL_g185 0x13 -#define MODEL_o371 0x12 -#define MODEL_kusa_u2 0x11 -#define MODEL_o323 0x10 -#define MODEL_kusa_u 0xF -#define MODEL_o116 0xE -#define MODEL_o324 0xD -#define MODEL_b_c 0xC -#define MODEL_g45 0xB -#define MODEL_o123 0xA -#define MODEL_o122 0x9 -#define MODEL_g47 0x8 -#define MODEL_o127 0x7 -#define MODEL_o126 0x6 -#define MODEL_temae_1 0x5 -#define MODEL_o304 0x4 -#define MODEL_jimen 0x3 -#define MODEL_o492 0x2 -#define MODEL_s_michi 0x1 -#define MODEL_jimen_1 0x0 +#define MODEL_Root 0x96 +#define MODEL_g190 0x95 +#define MODEL_kabemizu1 0x94 +#define MODEL_suimen 0x93 +#define MODEL_suimen1 0x92 +#define MODEL_mizu 0x91 +#define MODEL_o517 0x90 +#define MODEL_o516 0x8F +#define MODEL_o515 0x8E +#define MODEL_o514 0x8D +#define MODEL_o513 0x8C +#define MODEL_o512 0x8B +#define MODEL_o493 0x8A +#define MODEL_o465 0x89 +#define MODEL_g187 0x88 +#define MODEL_o511 0x87 +#define MODEL_g186 0x86 +#define MODEL_dai 0x85 +#define MODEL_o503 0x84 +#define MODEL_g179 0x83 +#define MODEL_o499 0x82 +#define MODEL_o498 0x81 +#define MODEL_o319 0x80 +#define MODEL_o308 0x7F +#define MODEL_c_k_1 0x7E +#define MODEL_ck 0x7D +#define MODEL_o362 0x7C +#define MODEL_c_k_e 0x7B +#define MODEL_o363 0x7A +#define MODEL_c_k 0x79 +#define MODEL_o368 0x78 +#define MODEL_o367 0x77 +#define MODEL_o366 0x76 +#define MODEL_o365 0x75 +#define MODEL_hana 0x74 +#define MODEL_hanahana 0x73 +#define MODEL_hana2 0x72 +#define MODEL_hana1 0x71 +#define MODEL_ue 0x70 +#define MODEL_saku_2 0x6F +#define MODEL_saku_u 0x6E +#define MODEL_ueki 0x6D +#define MODEL_o145 0x6C +#define MODEL_michi_2 0x6B +#define MODEL_michi_u 0x6A +#define MODEL_jimen_2 0x69 +#define MODEL_jimen_u 0x68 +#define MODEL_bero_2 0x67 +#define MODEL_deiliw 0x66 +#define MODEL_o45 0x65 +#define MODEL_k_k_k 0x64 +#define MODEL_o344 0x63 +#define MODEL_o343 0x62 +#define MODEL_o342 0x61 +#define MODEL_o341 0x60 +#define MODEL_o340 0x5F +#define MODEL_o339 0x5E +#define MODEL_hashi 0x5D +#define MODEL_g104 0x5C +#define MODEL_o271 0x5B +#define MODEL_o270 0x5A +#define MODEL_o269 0x59 +#define MODEL_o268 0x58 +#define MODEL_o266 0x57 +#define MODEL_o265 0x56 +#define MODEL_o264 0x55 +#define MODEL_geta 0x54 +#define MODEL_o338 0x53 +#define MODEL_o337 0x52 +#define MODEL_o336 0x51 +#define MODEL_o335 0x50 +#define MODEL_o334 0x4F +#define MODEL_tesuri_2 0x4E +#define MODEL_o66 0x4D +#define MODEL_o67 0x4C +#define MODEL_o166 0x4B +#define MODEL_tesuri_1 0x4A +#define MODEL_o68 0x49 +#define MODEL_o69 0x48 +#define MODEL_o168 0x47 +#define MODEL_bero_3 0x46 +#define MODEL_deilise 0x45 +#define MODEL_o41 0x44 +#define MODEL_kaidan 0x43 +#define MODEL_g175 0x42 +#define MODEL_o507 0x41 +#define MODEL_6 0x40 +#define MODEL_o320 0x3F +#define MODEL_5 0x3E +#define MODEL_o221 0x3D +#define MODEL_o321 0x3C +#define MODEL_g105 0x3B +#define MODEL_o330 0x3A +#define MODEL_o329 0x39 +#define MODEL_4 0x38 +#define MODEL_o223 0x37 +#define MODEL_o317 0x36 +#define MODEL_3 0x35 +#define MODEL_o307 0x34 +#define MODEL_o315 0x33 +#define MODEL_2 0x32 +#define MODEL_o357 0x31 +#define MODEL_o306 0x30 +#define MODEL_o314 0x2F +#define MODEL_1 0x2E +#define MODEL_o359 0x2D +#define MODEL_o305 0x2C +#define MODEL_kusa_ki 0x2B +#define MODEL_o129 0x2A +#define MODEL_shita 0x29 +#define MODEL_saku_1 0x28 +#define MODEL_o326 0x27 +#define MODEL_bero_1 0x26 +#define MODEL_deilin 0x25 +#define MODEL_o43 0x24 +#define MODEL_ki_2 0x23 +#define MODEL_o275 0x22 +#define MODEL_o277 0x21 +#define MODEL_ki_1 0x20 +#define MODEL_o285 0x1F +#define MODEL_o284 0x1E +#define MODEL_o283 0x1D +#define MODEL_o282 0x1C +#define MODEL_o281 0x1B +#define MODEL_hart_3 0x1A +#define MODEL_o289 0x19 +#define MODEL_o288 0x18 +#define MODEL_o287 0x17 +#define MODEL_hart_2 0x16 +#define MODEL_o291 0x15 +#define MODEL_o290 0x14 +#define MODEL_g185 0x13 +#define MODEL_o371 0x12 +#define MODEL_kusa_u2 0x11 +#define MODEL_o323 0x10 +#define MODEL_kusa_u 0xF +#define MODEL_o116 0xE +#define MODEL_o324 0xD +#define MODEL_b_c 0xC +#define MODEL_g45 0xB +#define MODEL_o123 0xA +#define MODEL_o122 0x9 +#define MODEL_g47 0x8 +#define MODEL_o127 0x7 +#define MODEL_o126 0x6 +#define MODEL_temae_1 0x5 +#define MODEL_o304 0x4 +#define MODEL_jimen 0x3 +#define MODEL_o492 0x2 +#define MODEL_s_michi 0x1 +#define MODEL_jimen_1 0x0 + diff --git a/include/mapfs/nok_14_hit.h b/include/mapfs/nok_14_hit.h index 6851a0e726..1eb8dffcba 100644 --- a/include/mapfs/nok_14_hit.h +++ b/include/mapfs/nok_14_hit.h @@ -1,28 +1,44 @@ -#define COLLIDER_Root 0x1B -#define COLLIDER_g137 0x1A -#define COLLIDER_t2 0x19 -#define COLLIDER_t1 0x18 -#define COLLIDER_s_4 0x17 -#define COLLIDER_s2_n1 0x16 -#define COLLIDER_deili2 0x15 -#define COLLIDER_deilit2 0x14 -#define COLLIDER_s5_n 0x13 -#define COLLIDER_o107 0x12 -#define COLLIDER_o291 0x11 -#define COLLIDER_s_3 0x10 -#define COLLIDER_o255 0xF -#define COLLIDER_o272 0xE -#define COLLIDER_s_2 0xD -#define COLLIDER_tt1 0xC -#define COLLIDER_o295 0xB -#define COLLIDER_o119 0xA -#define COLLIDER_s2_n2 0x9 -#define COLLIDER_o327 0x8 -#define COLLIDER_s_1 0x7 -#define COLLIDER_o304 0x6 -#define COLLIDER_deili1 0x5 -#define COLLIDER_deilit 0x4 -#define COLLIDER_o288 0x3 -#define COLLIDER_o27 0x2 -#define COLLIDER_o89 0x1 -#define COLLIDER_s2_n3 0x0 +#define COLLIDER_Root 0x1B +#define COLLIDER_g137 0x1A +#define COLLIDER_t2 0x19 +#define COLLIDER_t1 0x18 +#define COLLIDER_s_4 0x17 +#define COLLIDER_s2_n1 0x16 +#define COLLIDER_deili2 0x15 +#define COLLIDER_deilit2 0x14 +#define COLLIDER_s5_n 0x13 +#define COLLIDER_o107 0x12 +#define COLLIDER_o291 0x11 +#define COLLIDER_s_3 0x10 +#define COLLIDER_o255 0xF +#define COLLIDER_o272 0xE +#define COLLIDER_s_2 0xD +#define COLLIDER_tt1 0xC +#define COLLIDER_o295 0xB +#define COLLIDER_o119 0xA +#define COLLIDER_s2_n2 0x9 +#define COLLIDER_o327 0x8 +#define COLLIDER_s_1 0x7 +#define COLLIDER_o304 0x6 +#define COLLIDER_deili1 0x5 +#define COLLIDER_deilit 0x4 +#define COLLIDER_o288 0x3 +#define COLLIDER_o27 0x2 +#define COLLIDER_o89 0x1 +#define COLLIDER_s2_n3 0x0 + +#define ZONE_Root 0xD +#define ZONE_g142 0xC +#define ZONE_o298 0xB +#define ZONE_o297 0xA +#define ZONE_g144 0x9 +#define ZONE_o307 0x8 +#define ZONE_o306 0x7 +#define ZONE_g137 0x6 +#define ZONE_o305 0x5 +#define ZONE_o304 0x4 +#define ZONE_Default 0x3 +#define ZONE_o309 0x2 +#define ZONE_off 0x1 +#define ZONE_on 0x0 + diff --git a/include/mapfs/nok_14_shape.h b/include/mapfs/nok_14_shape.h index e886e376a3..e62b301d06 100644 --- a/include/mapfs/nok_14_shape.h +++ b/include/mapfs/nok_14_shape.h @@ -1,153 +1,154 @@ -#define MODEL_Root 0x98 -#define MODEL_g250 0x97 -#define MODEL_o506 0x96 -#define MODEL_o505 0x95 -#define MODEL_o504 0x94 -#define MODEL_g246 0x93 -#define MODEL_o468 0x92 -#define MODEL_o466 0x91 -#define MODEL_o481 0x90 -#define MODEL_o478 0x8F -#define MODEL_g245 0x8E -#define MODEL_o483 0x8D -#define MODEL_o482 0x8C -#define MODEL_o461 0x8B -#define MODEL_o463 0x8A -#define MODEL_suimen 0x89 -#define MODEL_su1 0x88 -#define MODEL_suimen2 0x87 -#define MODEL_suimen1 0x86 -#define MODEL_mizu 0x85 -#define MODEL_kabemizu2 0x84 -#define MODEL_kabemizu1 0x83 -#define MODEL_taki 0x82 -#define MODEL_taki1 0x81 -#define MODEL_hana 0x80 -#define MODEL_hana4 0x7F -#define MODEL_hana3 0x7E -#define MODEL_hana1 0x7D -#define MODEL_misuzoko 0x7C -#define MODEL_sui_2 0x7B -#define MODEL_shima_2 0x7A -#define MODEL_g158 0x79 -#define MODEL_o195 0x78 -#define MODEL_jimen_2 0x77 -#define MODEL_o198 0x76 -#define MODEL_o180 0x75 -#define MODEL_temae_2 0x74 -#define MODEL_o173 0x73 -#define MODEL_kabe_2 0x72 -#define MODEL_o174 0x71 -#define MODEL_michi 0x70 -#define MODEL_o183 0x6F -#define MODEL_moko_4 0x6E -#define MODEL_moko4 0x6D -#define MODEL_moko_3 0x6C -#define MODEL_moko3 0x6B -#define MODEL_saku 0x6A -#define MODEL_o480 0x69 -#define MODEL_o479 0x68 -#define MODEL_o191 0x67 -#define MODEL_bero_2 0x66 -#define MODEL_deili2 0x65 -#define MODEL_o8 0x64 -#define MODEL_hashi 0x63 -#define MODEL_hashi7 0x62 -#define MODEL_ita7 0x61 -#define MODEL_ita77 0x60 -#define MODEL_geta7 0x5F -#define MODEL_o110 0x5E -#define MODEL_o212 0x5D -#define MODEL_hashi6 0x5C -#define MODEL_ita6 0x5B -#define MODEL_ita66 0x5A -#define MODEL_geta6 0x59 -#define MODEL_o292 0x58 -#define MODEL_o280 0x57 -#define MODEL_o217 0x56 -#define MODEL_hashi5 0x55 -#define MODEL_ita5 0x54 -#define MODEL_ita55 0x53 -#define MODEL_geta5 0x52 -#define MODEL_o291 0x51 -#define MODEL_o275 0x50 -#define MODEL_o209 0x4F -#define MODEL_hashi4 0x4E -#define MODEL_ita4 0x4D -#define MODEL_ita44 0x4C -#define MODEL_geta4 0x4B -#define MODEL_o286 0x4A -#define MODEL_o281 0x49 -#define MODEL_o215 0x48 -#define MODEL_hashi3 0x47 -#define MODEL_ita3 0x46 -#define MODEL_ita33 0x45 -#define MODEL_geta3 0x44 -#define MODEL_o290 0x43 -#define MODEL_o274 0x42 -#define MODEL_o203 0x41 -#define MODEL_hashi2 0x40 -#define MODEL_ita2 0x3F -#define MODEL_ita22 0x3E -#define MODEL_geta2 0x3D -#define MODEL_o119 0x3C -#define MODEL_o282 0x3B -#define MODEL_o213 0x3A -#define MODEL_hashi1 0x39 -#define MODEL_ita1 0x38 -#define MODEL_ita11 0x37 -#define MODEL_geta1 0x36 -#define MODEL_o287 0x35 -#define MODEL_o273 0x34 -#define MODEL_o107 0x33 -#define MODEL_mae_shigemi 0x32 -#define MODEL_o20 0x31 -#define MODEL_shima_1 0x30 -#define MODEL_renga_edge 0x2F -#define MODEL_o514 0x2E -#define MODEL_temae_1 0x2D -#define MODEL_o27 0x2C -#define MODEL_kabe 0x2B -#define MODEL_o31 0x2A -#define MODEL_jimen_1 0x29 -#define MODEL_o250 0x28 -#define MODEL_kaidan 0x27 -#define MODEL_kaidan3 0x26 -#define MODEL_o330 0x25 -#define MODEL_o329 0x24 -#define MODEL_kt3 0x23 -#define MODEL_kj3 0x22 -#define MODEL_kaidan2 0x21 -#define MODEL_o328 0x20 -#define MODEL_o327 0x1F -#define MODEL_kt2 0x1E -#define MODEL_kj2 0x1D -#define MODEL_kaidan1 0x1C -#define MODEL_o326 0x1B -#define MODEL_o325 0x1A -#define MODEL_o318 0x19 -#define MODEL_kt1 0x18 -#define MODEL_kj1 0x17 -#define MODEL_shima_ue 0x16 -#define MODEL_shigemi 0x15 -#define MODEL_o248 0x14 -#define MODEL_o122 0x13 -#define MODEL_o249 0x12 -#define MODEL_ki 0x11 -#define MODEL_o277 0x10 -#define MODEL_o278 0xF -#define MODEL_kabe_ue 0xE -#define MODEL_o320 0xD -#define MODEL_temae_u 0xC -#define MODEL_o510 0xB -#define MODEL_o252 0xA -#define MODEL_jimen_ue 0x9 -#define MODEL_o251 0x8 -#define MODEL_bero_1 0x7 -#define MODEL_deili1 0x6 -#define MODEL_o6 0x5 -#define MODEL_g174 0x4 -#define MODEL_o511 0x3 -#define MODEL_moko1 0x2 -#define MODEL_o544 0x1 -#define MODEL_o543 0x0 +#define MODEL_Root 0x98 +#define MODEL_g250 0x97 +#define MODEL_o506 0x96 +#define MODEL_o505 0x95 +#define MODEL_o504 0x94 +#define MODEL_g246 0x93 +#define MODEL_o468 0x92 +#define MODEL_o466 0x91 +#define MODEL_o481 0x90 +#define MODEL_o478 0x8F +#define MODEL_g245 0x8E +#define MODEL_o483 0x8D +#define MODEL_o482 0x8C +#define MODEL_o461 0x8B +#define MODEL_o463 0x8A +#define MODEL_suimen 0x89 +#define MODEL_su1 0x88 +#define MODEL_suimen2 0x87 +#define MODEL_suimen1 0x86 +#define MODEL_mizu 0x85 +#define MODEL_kabemizu2 0x84 +#define MODEL_kabemizu1 0x83 +#define MODEL_taki 0x82 +#define MODEL_taki1 0x81 +#define MODEL_hana 0x80 +#define MODEL_hana4 0x7F +#define MODEL_hana3 0x7E +#define MODEL_hana1 0x7D +#define MODEL_misuzoko 0x7C +#define MODEL_sui_2 0x7B +#define MODEL_shima_2 0x7A +#define MODEL_g158 0x79 +#define MODEL_o195 0x78 +#define MODEL_jimen_2 0x77 +#define MODEL_o198 0x76 +#define MODEL_o180 0x75 +#define MODEL_temae_2 0x74 +#define MODEL_o173 0x73 +#define MODEL_kabe_2 0x72 +#define MODEL_o174 0x71 +#define MODEL_michi 0x70 +#define MODEL_o183 0x6F +#define MODEL_moko_4 0x6E +#define MODEL_moko4 0x6D +#define MODEL_moko_3 0x6C +#define MODEL_moko3 0x6B +#define MODEL_saku 0x6A +#define MODEL_o480 0x69 +#define MODEL_o479 0x68 +#define MODEL_o191 0x67 +#define MODEL_bero_2 0x66 +#define MODEL_deili2 0x65 +#define MODEL_o8 0x64 +#define MODEL_hashi 0x63 +#define MODEL_hashi7 0x62 +#define MODEL_ita7 0x61 +#define MODEL_ita77 0x60 +#define MODEL_geta7 0x5F +#define MODEL_o110 0x5E +#define MODEL_o212 0x5D +#define MODEL_hashi6 0x5C +#define MODEL_ita6 0x5B +#define MODEL_ita66 0x5A +#define MODEL_geta6 0x59 +#define MODEL_o292 0x58 +#define MODEL_o280 0x57 +#define MODEL_o217 0x56 +#define MODEL_hashi5 0x55 +#define MODEL_ita5 0x54 +#define MODEL_ita55 0x53 +#define MODEL_geta5 0x52 +#define MODEL_o291 0x51 +#define MODEL_o275 0x50 +#define MODEL_o209 0x4F +#define MODEL_hashi4 0x4E +#define MODEL_ita4 0x4D +#define MODEL_ita44 0x4C +#define MODEL_geta4 0x4B +#define MODEL_o286 0x4A +#define MODEL_o281 0x49 +#define MODEL_o215 0x48 +#define MODEL_hashi3 0x47 +#define MODEL_ita3 0x46 +#define MODEL_ita33 0x45 +#define MODEL_geta3 0x44 +#define MODEL_o290 0x43 +#define MODEL_o274 0x42 +#define MODEL_o203 0x41 +#define MODEL_hashi2 0x40 +#define MODEL_ita2 0x3F +#define MODEL_ita22 0x3E +#define MODEL_geta2 0x3D +#define MODEL_o119 0x3C +#define MODEL_o282 0x3B +#define MODEL_o213 0x3A +#define MODEL_hashi1 0x39 +#define MODEL_ita1 0x38 +#define MODEL_ita11 0x37 +#define MODEL_geta1 0x36 +#define MODEL_o287 0x35 +#define MODEL_o273 0x34 +#define MODEL_o107 0x33 +#define MODEL_mae_shigemi 0x32 +#define MODEL_o20 0x31 +#define MODEL_shima_1 0x30 +#define MODEL_renga_edge 0x2F +#define MODEL_o514 0x2E +#define MODEL_temae_1 0x2D +#define MODEL_o27 0x2C +#define MODEL_kabe 0x2B +#define MODEL_o31 0x2A +#define MODEL_jimen_1 0x29 +#define MODEL_o250 0x28 +#define MODEL_kaidan 0x27 +#define MODEL_kaidan3 0x26 +#define MODEL_o330 0x25 +#define MODEL_o329 0x24 +#define MODEL_kt3 0x23 +#define MODEL_kj3 0x22 +#define MODEL_kaidan2 0x21 +#define MODEL_o328 0x20 +#define MODEL_o327 0x1F +#define MODEL_kt2 0x1E +#define MODEL_kj2 0x1D +#define MODEL_kaidan1 0x1C +#define MODEL_o326 0x1B +#define MODEL_o325 0x1A +#define MODEL_o318 0x19 +#define MODEL_kt1 0x18 +#define MODEL_kj1 0x17 +#define MODEL_shima_ue 0x16 +#define MODEL_shigemi 0x15 +#define MODEL_o248 0x14 +#define MODEL_o122 0x13 +#define MODEL_o249 0x12 +#define MODEL_ki 0x11 +#define MODEL_o277 0x10 +#define MODEL_o278 0xF +#define MODEL_kabe_ue 0xE +#define MODEL_o320 0xD +#define MODEL_temae_u 0xC +#define MODEL_o510 0xB +#define MODEL_o252 0xA +#define MODEL_jimen_ue 0x9 +#define MODEL_o251 0x8 +#define MODEL_bero_1 0x7 +#define MODEL_deili1 0x6 +#define MODEL_o6 0x5 +#define MODEL_g174 0x4 +#define MODEL_o511 0x3 +#define MODEL_moko1 0x2 +#define MODEL_o544 0x1 +#define MODEL_o543 0x0 + diff --git a/include/mapfs/nok_15_hit.h b/include/mapfs/nok_15_hit.h index 11e64c8611..a374773303 100644 --- a/include/mapfs/nok_15_hit.h +++ b/include/mapfs/nok_15_hit.h @@ -1,73 +1,89 @@ -#define COLLIDER_Root 0x48 -#define COLLIDER_g195 0x47 -#define COLLIDER_o759 0x46 -#define COLLIDER_o758 0x45 -#define COLLIDER_o757 0x44 -#define COLLIDER_g197 0x43 -#define COLLIDER_o613 0x42 -#define COLLIDER_g194 0x41 -#define COLLIDER_o756 0x40 -#define COLLIDER_g192 0x3F -#define COLLIDER_t3 0x3E -#define COLLIDER_t2 0x3D -#define COLLIDER_t1 0x3C -#define COLLIDER_g161 0x3B -#define COLLIDER_o680 0x3A -#define COLLIDER_g160 0x39 -#define COLLIDER_o679 0x38 -#define COLLIDER_g159 0x37 -#define COLLIDER_o677 0x36 -#define COLLIDER_g119 0x35 -#define COLLIDER_o616 0x34 -#define COLLIDER_o601 0x33 -#define COLLIDER_rif 0x32 -#define COLLIDER_r2 0x31 -#define COLLIDER_r1 0x30 -#define COLLIDER_g97 0x2F -#define COLLIDER_o503 0x2E -#define COLLIDER_o551 0x2D -#define COLLIDER_o490 0x2C -#define COLLIDER_o506 0x2B -#define COLLIDER_o505 0x2A -#define COLLIDER_g98 0x29 -#define COLLIDER_o572 0x28 -#define COLLIDER_s6_n 0x27 -#define COLLIDER_o496 0x26 -#define COLLIDER_o489 0x25 -#define COLLIDER_g96 0x24 -#define COLLIDER_o521 0x23 -#define COLLIDER_g95 0x22 -#define COLLIDER_o454 0x21 -#define COLLIDER_g94 0x20 -#define COLLIDER_o763 0x1F -#define COLLIDER_o762 0x1E -#define COLLIDER_s4_n 0x1D -#define COLLIDER_s2_n 0x1C -#define COLLIDER_g70 0x1B -#define COLLIDER_o478 0x1A -#define COLLIDER_o473 0x19 -#define COLLIDER_o479 0x18 -#define COLLIDER_s_5 0x17 -#define COLLIDER_o755 0x16 -#define COLLIDER_o550 0x15 -#define COLLIDER_o471 0x14 -#define COLLIDER_s_4 0x13 -#define COLLIDER_o477 0x12 -#define COLLIDER_s_3 0x11 -#define COLLIDER_o474 0x10 -#define COLLIDER_o389 0xF -#define COLLIDER_s_2 0xE -#define COLLIDER_o468 0xD -#define COLLIDER_o467 0xC -#define COLLIDER_s_1 0xB -#define COLLIDER_o554 0xA -#define COLLIDER_o553 0x9 -#define COLLIDER_o552 0x8 -#define COLLIDER_g93 0x7 -#define COLLIDER_tt1 0x6 -#define COLLIDER_deilit3 0x5 -#define COLLIDER_deili3 0x4 -#define COLLIDER_deilit2 0x3 -#define COLLIDER_deili2 0x2 -#define COLLIDER_deilit1 0x1 -#define COLLIDER_deili1 0x0 +#define COLLIDER_Root 0x48 +#define COLLIDER_g195 0x47 +#define COLLIDER_o759 0x46 +#define COLLIDER_o758 0x45 +#define COLLIDER_o757 0x44 +#define COLLIDER_g197 0x43 +#define COLLIDER_o613 0x42 +#define COLLIDER_g194 0x41 +#define COLLIDER_o756 0x40 +#define COLLIDER_g192 0x3F +#define COLLIDER_t3 0x3E +#define COLLIDER_t2 0x3D +#define COLLIDER_t1 0x3C +#define COLLIDER_g161 0x3B +#define COLLIDER_o680 0x3A +#define COLLIDER_g160 0x39 +#define COLLIDER_o679 0x38 +#define COLLIDER_g159 0x37 +#define COLLIDER_o677 0x36 +#define COLLIDER_g119 0x35 +#define COLLIDER_o616 0x34 +#define COLLIDER_o601 0x33 +#define COLLIDER_rif 0x32 +#define COLLIDER_r2 0x31 +#define COLLIDER_r1 0x30 +#define COLLIDER_g97 0x2F +#define COLLIDER_o503 0x2E +#define COLLIDER_o551 0x2D +#define COLLIDER_o490 0x2C +#define COLLIDER_o506 0x2B +#define COLLIDER_o505 0x2A +#define COLLIDER_g98 0x29 +#define COLLIDER_o572 0x28 +#define COLLIDER_s6_n 0x27 +#define COLLIDER_o496 0x26 +#define COLLIDER_o489 0x25 +#define COLLIDER_g96 0x24 +#define COLLIDER_o521 0x23 +#define COLLIDER_g95 0x22 +#define COLLIDER_o454 0x21 +#define COLLIDER_g94 0x20 +#define COLLIDER_o763 0x1F +#define COLLIDER_o762 0x1E +#define COLLIDER_s4_n 0x1D +#define COLLIDER_s2_n 0x1C +#define COLLIDER_g70 0x1B +#define COLLIDER_o478 0x1A +#define COLLIDER_o473 0x19 +#define COLLIDER_o479 0x18 +#define COLLIDER_s_5 0x17 +#define COLLIDER_o755 0x16 +#define COLLIDER_o550 0x15 +#define COLLIDER_o471 0x14 +#define COLLIDER_s_4 0x13 +#define COLLIDER_o477 0x12 +#define COLLIDER_s_3 0x11 +#define COLLIDER_o474 0x10 +#define COLLIDER_o389 0xF +#define COLLIDER_s_2 0xE +#define COLLIDER_o468 0xD +#define COLLIDER_o467 0xC +#define COLLIDER_s_1 0xB +#define COLLIDER_o554 0xA +#define COLLIDER_o553 0x9 +#define COLLIDER_o552 0x8 +#define COLLIDER_g93 0x7 +#define COLLIDER_tt1 0x6 +#define COLLIDER_deilit3 0x5 +#define COLLIDER_deili3 0x4 +#define COLLIDER_deilit2 0x3 +#define COLLIDER_deili2 0x2 +#define COLLIDER_deilit1 0x1 +#define COLLIDER_deili1 0x0 + +#define ZONE_Root 0xD +#define ZONE_g45 0xC +#define ZONE_o421 0xB +#define ZONE_o422 0xA +#define ZONE_o417 0x9 +#define ZONE_s1 0x8 +#define ZONE_o403 0x7 +#define ZONE_o416 0x6 +#define ZONE_g46 0x5 +#define ZONE_o418 0x4 +#define ZONE_o402 0x3 +#define ZONE_Default 0x2 +#define ZONE_o420 0x1 +#define ZONE_o395 0x0 + diff --git a/include/mapfs/nok_15_shape.h b/include/mapfs/nok_15_shape.h index 20fad097dd..9a0bd6aaae 100644 --- a/include/mapfs/nok_15_shape.h +++ b/include/mapfs/nok_15_shape.h @@ -1,104 +1,105 @@ -#define MODEL_Root 0x67 -#define MODEL_g117 0x66 -#define MODEL_o603 0x65 -#define MODEL_o602 0x64 -#define MODEL_g116 0x63 -#define MODEL_o594 0x62 -#define MODEL_o593 0x61 -#define MODEL_o592 0x60 -#define MODEL_o591 0x5F -#define MODEL_o589 0x5E -#define MODEL_o587 0x5D -#define MODEL_o585 0x5C -#define MODEL_g115 0x5B -#define MODEL_o597 0x5A -#define MODEL_o596 0x59 -#define MODEL_o595 0x58 -#define MODEL_o584 0x57 -#define MODEL_o583 0x56 -#define MODEL_o582 0x55 -#define MODEL_g111 0x54 -#define MODEL_o579 0x53 -#define MODEL_g107 0x52 -#define MODEL_o566 0x51 -#define MODEL_g106 0x50 -#define MODEL_o565 0x4F -#define MODEL_g105 0x4E -#define MODEL_o564 0x4D -#define MODEL_t1 0x4C -#define MODEL_o581 0x4B -#define MODEL_o628 0x4A -#define MODEL_tou 0x49 -#define MODEL_o507 0x48 -#define MODEL_o526 0x47 -#define MODEL_o512 0x46 -#define MODEL_o511 0x45 -#define MODEL_o510 0x44 -#define MODEL_o509 0x43 -#define MODEL_o508 0x42 -#define MODEL_o506 0x41 -#define MODEL_suimen 0x40 -#define MODEL_suimen1 0x3F -#define MODEL_bomb_2 0x3E -#define MODEL_bomb_ato 0x3D -#define MODEL_bomb_1 0x3C -#define MODEL_hibi 0x3B -#define MODEL_bomb_mae 0x3A -#define MODEL_hashi 0x39 -#define MODEL_h_temae 0x38 -#define MODEL_h_kabe 0x37 -#define MODEL_shima_2 0x36 -#define MODEL_g87 0x35 -#define MODEL_o558 0x34 -#define MODEL_jimen_2 0x33 -#define MODEL_jimen2 0x32 -#define MODEL_renga_kabe 0x31 -#define MODEL_o468 0x30 -#define MODEL_tema_2 0x2F -#define MODEL_o626 0x2E -#define MODEL_temae2 0x2D -#define MODEL_kabe_2 0x2C -#define MODEL_kabe_m2 0x2B -#define MODEL_kabe2 0x2A -#define MODEL_brock 0x29 -#define MODEL_ue 0x28 -#define MODEL_yoko 0x27 -#define MODEL_shikaku2 0x26 -#define MODEL_o104 0x25 -#define MODEL_bero2 0x24 -#define MODEL_o190 0x23 -#define MODEL_o557 0x22 -#define MODEL_shima_1 0x21 -#define MODEL_jimen_1 0x20 -#define MODEL_jimen 0x1F -#define MODEL_michi_1 0x1E -#define MODEL_o559 0x1D -#define MODEL_mizu1 0x1C -#define MODEL_kabemizu1 0x1B -#define MODEL_kabe1 0x1A -#define MODEL_temae_1 0x19 -#define MODEL_temae1 0x18 -#define MODEL_noko 0x17 -#define MODEL_r4_2_noko 0x16 -#define MODEL_shikaku1 0x15 -#define MODEL_o470 0x14 -#define MODEL_kusa 0x13 -#define MODEL_o475 0x12 -#define MODEL_o467 0x11 -#define MODEL_kusa_oku 0x10 -#define MODEL_o621 0xF -#define MODEL_mokumoku 0xE -#define MODEL_ki 0xD -#define MODEL_ha 0xC -#define MODEL_moku 0xB -#define MODEL_mon_2 0xA -#define MODEL_o422 0x9 -#define MODEL_turu2 0x8 -#define MODEL_mon_1 0x7 -#define MODEL_turu 0x6 -#define MODEL_o389 0x5 -#define MODEL_bero1 0x4 -#define MODEL_o548 0x3 -#define MODEL_o547 0x2 -#define MODEL_mizu 0x1 -#define MODEL_o452 0x0 +#define MODEL_Root 0x67 +#define MODEL_g117 0x66 +#define MODEL_o603 0x65 +#define MODEL_o602 0x64 +#define MODEL_g116 0x63 +#define MODEL_o594 0x62 +#define MODEL_o593 0x61 +#define MODEL_o592 0x60 +#define MODEL_o591 0x5F +#define MODEL_o589 0x5E +#define MODEL_o587 0x5D +#define MODEL_o585 0x5C +#define MODEL_g115 0x5B +#define MODEL_o597 0x5A +#define MODEL_o596 0x59 +#define MODEL_o595 0x58 +#define MODEL_o584 0x57 +#define MODEL_o583 0x56 +#define MODEL_o582 0x55 +#define MODEL_g111 0x54 +#define MODEL_o579 0x53 +#define MODEL_g107 0x52 +#define MODEL_o566 0x51 +#define MODEL_g106 0x50 +#define MODEL_o565 0x4F +#define MODEL_g105 0x4E +#define MODEL_o564 0x4D +#define MODEL_t1 0x4C +#define MODEL_o581 0x4B +#define MODEL_o628 0x4A +#define MODEL_tou 0x49 +#define MODEL_o507 0x48 +#define MODEL_o526 0x47 +#define MODEL_o512 0x46 +#define MODEL_o511 0x45 +#define MODEL_o510 0x44 +#define MODEL_o509 0x43 +#define MODEL_o508 0x42 +#define MODEL_o506 0x41 +#define MODEL_suimen 0x40 +#define MODEL_suimen1 0x3F +#define MODEL_bomb_2 0x3E +#define MODEL_bomb_ato 0x3D +#define MODEL_bomb_1 0x3C +#define MODEL_hibi 0x3B +#define MODEL_bomb_mae 0x3A +#define MODEL_hashi 0x39 +#define MODEL_h_temae 0x38 +#define MODEL_h_kabe 0x37 +#define MODEL_shima_2 0x36 +#define MODEL_g87 0x35 +#define MODEL_o558 0x34 +#define MODEL_jimen_2 0x33 +#define MODEL_jimen2 0x32 +#define MODEL_renga_kabe 0x31 +#define MODEL_o468 0x30 +#define MODEL_tema_2 0x2F +#define MODEL_o626 0x2E +#define MODEL_temae2 0x2D +#define MODEL_kabe_2 0x2C +#define MODEL_kabe_m2 0x2B +#define MODEL_kabe2 0x2A +#define MODEL_brock 0x29 +#define MODEL_ue 0x28 +#define MODEL_yoko 0x27 +#define MODEL_shikaku2 0x26 +#define MODEL_o104 0x25 +#define MODEL_bero2 0x24 +#define MODEL_o190 0x23 +#define MODEL_o557 0x22 +#define MODEL_shima_1 0x21 +#define MODEL_jimen_1 0x20 +#define MODEL_jimen 0x1F +#define MODEL_michi_1 0x1E +#define MODEL_o559 0x1D +#define MODEL_mizu1 0x1C +#define MODEL_kabemizu1 0x1B +#define MODEL_kabe1 0x1A +#define MODEL_temae_1 0x19 +#define MODEL_temae1 0x18 +#define MODEL_noko 0x17 +#define MODEL_r4_2_noko 0x16 +#define MODEL_shikaku1 0x15 +#define MODEL_o470 0x14 +#define MODEL_kusa 0x13 +#define MODEL_o475 0x12 +#define MODEL_o467 0x11 +#define MODEL_kusa_oku 0x10 +#define MODEL_o621 0xF +#define MODEL_mokumoku 0xE +#define MODEL_ki 0xD +#define MODEL_ha 0xC +#define MODEL_moku 0xB +#define MODEL_mon_2 0xA +#define MODEL_o422 0x9 +#define MODEL_turu2 0x8 +#define MODEL_mon_1 0x7 +#define MODEL_turu 0x6 +#define MODEL_o389 0x5 +#define MODEL_bero1 0x4 +#define MODEL_o548 0x3 +#define MODEL_o547 0x2 +#define MODEL_mizu 0x1 +#define MODEL_o452 0x0 + diff --git a/include/mapfs/nok_bt01_hit.h b/include/mapfs/nok_bt01_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/nok_bt01_hit.h +++ b/include/mapfs/nok_bt01_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/nok_bt01_shape.h b/include/mapfs/nok_bt01_shape.h index 253d6be300..eed215cc10 100644 --- a/include/mapfs/nok_bt01_shape.h +++ b/include/mapfs/nok_bt01_shape.h @@ -1,34 +1,35 @@ -#define MODEL_Root 0x21 -#define MODEL_dai 0x20 -#define MODEL_waku1 0x1F -#define MODEL_ha3 0x1E -#define MODEL_hap 0x1D -#define MODEL_kusa3 0x1C -#define MODEL_o306 0x1B -#define MODEL_yuka 0x1A -#define MODEL_hana 0x19 -#define MODEL_h8 0x18 -#define MODEL_h7 0x17 -#define MODEL_h5 0x16 -#define MODEL_h3 0x15 -#define MODEL_h2 0x14 -#define MODEL_h1 0x13 -#define MODEL_g49 0x12 -#define MODEL_waku2 0x11 -#define MODEL_o356 0x10 -#define MODEL_saku 0xF -#define MODEL_kusa2 0xE -#define MODEL_nyo 0xD -#define MODEL_o298 0xC -#define MODEL_o299 0xB -#define MODEL_ha1 0xA -#define MODEL_ha1_2 0x9 -#define MODEL_miki 0x8 -#define MODEL_ha2 0x7 -#define MODEL_ha2_2 0x6 -#define MODEL_kusa1 0x5 -#define MODEL_kusa5 0x4 -#define MODEL_waku 0x3 -#define MODEL_yuka2 0x2 -#define MODEL_futi 0x1 -#define MODEL_gake 0x0 +#define MODEL_Root 0x21 +#define MODEL_dai 0x20 +#define MODEL_waku1 0x1F +#define MODEL_ha3 0x1E +#define MODEL_hap 0x1D +#define MODEL_kusa3 0x1C +#define MODEL_o306 0x1B +#define MODEL_yuka 0x1A +#define MODEL_hana 0x19 +#define MODEL_h8 0x18 +#define MODEL_h7 0x17 +#define MODEL_h5 0x16 +#define MODEL_h3 0x15 +#define MODEL_h2 0x14 +#define MODEL_h1 0x13 +#define MODEL_g49 0x12 +#define MODEL_waku2 0x11 +#define MODEL_o356 0x10 +#define MODEL_saku 0xF +#define MODEL_kusa2 0xE +#define MODEL_nyo 0xD +#define MODEL_o298 0xC +#define MODEL_o299 0xB +#define MODEL_ha1 0xA +#define MODEL_ha1_2 0x9 +#define MODEL_miki 0x8 +#define MODEL_ha2 0x7 +#define MODEL_ha2_2 0x6 +#define MODEL_kusa1 0x5 +#define MODEL_kusa5 0x4 +#define MODEL_waku 0x3 +#define MODEL_yuka2 0x2 +#define MODEL_futi 0x1 +#define MODEL_gake 0x0 + diff --git a/include/mapfs/nok_bt02_hit.h b/include/mapfs/nok_bt02_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/nok_bt02_hit.h +++ b/include/mapfs/nok_bt02_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/nok_bt02_shape.h b/include/mapfs/nok_bt02_shape.h index aa83c8e56a..0241474fa4 100644 --- a/include/mapfs/nok_bt02_shape.h +++ b/include/mapfs/nok_bt02_shape.h @@ -1,38 +1,39 @@ -#define MODEL_Root 0x25 -#define MODEL_dai 0x24 -#define MODEL_waku1 0x23 -#define MODEL_yuka 0x22 -#define MODEL_o306 0x21 -#define MODEL_hap 0x20 -#define MODEL_ha3 0x1F -#define MODEL_kusa3 0x1E -#define MODEL_hana 0x1D -#define MODEL_h12 0x1C -#define MODEL_h11 0x1B -#define MODEL_h10 0x1A -#define MODEL_h9 0x19 -#define MODEL_h7 0x18 -#define MODEL_h6 0x17 -#define MODEL_h5 0x16 -#define MODEL_h4 0x15 -#define MODEL_h3 0x14 -#define MODEL_h1 0x13 -#define MODEL_g49 0x12 -#define MODEL_waku2 0x11 -#define MODEL_kusa2 0x10 -#define MODEL_myo 0xF -#define MODEL_o339 0xE -#define MODEL_o337 0xD -#define MODEL_o336 0xC -#define MODEL_kusa4 0xB -#define MODEL_kusa5 0xA -#define MODEL_ha1_2 0x9 -#define MODEL_ha1 0x8 -#define MODEL_miki 0x7 -#define MODEL_ha2_2 0x6 -#define MODEL_ha2 0x5 -#define MODEL_kusa1 0x4 -#define MODEL_waku 0x3 -#define MODEL_kusa7 0x2 -#define MODEL_kusa6 0x1 -#define MODEL_yuka2 0x0 +#define MODEL_Root 0x25 +#define MODEL_dai 0x24 +#define MODEL_waku1 0x23 +#define MODEL_yuka 0x22 +#define MODEL_o306 0x21 +#define MODEL_hap 0x20 +#define MODEL_ha3 0x1F +#define MODEL_kusa3 0x1E +#define MODEL_hana 0x1D +#define MODEL_h12 0x1C +#define MODEL_h11 0x1B +#define MODEL_h10 0x1A +#define MODEL_h9 0x19 +#define MODEL_h7 0x18 +#define MODEL_h6 0x17 +#define MODEL_h5 0x16 +#define MODEL_h4 0x15 +#define MODEL_h3 0x14 +#define MODEL_h1 0x13 +#define MODEL_g49 0x12 +#define MODEL_waku2 0x11 +#define MODEL_kusa2 0x10 +#define MODEL_myo 0xF +#define MODEL_o339 0xE +#define MODEL_o337 0xD +#define MODEL_o336 0xC +#define MODEL_kusa4 0xB +#define MODEL_kusa5 0xA +#define MODEL_ha1_2 0x9 +#define MODEL_ha1 0x8 +#define MODEL_miki 0x7 +#define MODEL_ha2_2 0x6 +#define MODEL_ha2 0x5 +#define MODEL_kusa1 0x4 +#define MODEL_waku 0x3 +#define MODEL_kusa7 0x2 +#define MODEL_kusa6 0x1 +#define MODEL_yuka2 0x0 + diff --git a/include/mapfs/nok_bt03_hit.h b/include/mapfs/nok_bt03_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/nok_bt03_hit.h +++ b/include/mapfs/nok_bt03_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/nok_bt03_shape.h b/include/mapfs/nok_bt03_shape.h index b5b697cac9..f6d5e678db 100644 --- a/include/mapfs/nok_bt03_shape.h +++ b/include/mapfs/nok_bt03_shape.h @@ -1,27 +1,28 @@ -#define MODEL_Root 0x1A -#define MODEL_dai 0x19 -#define MODEL_waku1 0x18 -#define MODEL_g73 0x17 -#define MODEL_o360 0x16 -#define MODEL_o359 0x15 -#define MODEL_o357 0x14 -#define MODEL_futi3 0x13 -#define MODEL_yuka1 0x12 -#define MODEL_yuka 0x11 -#define MODEL_futi2 0x10 -#define MODEL_hap 0xF -#define MODEL_ha3 0xE -#define MODEL_g49 0xD -#define MODEL_waku2 0xC -#define MODEL_g76 0xB -#define MODEL_o364 0xA -#define MODEL_o362 0x9 -#define MODEL_futi 0x8 -#define MODEL_gake 0x7 -#define MODEL_kusa2 0x6 -#define MODEL_kusa1 0x5 -#define MODEL_ha1 0x4 -#define MODEL_miki 0x3 -#define MODEL_ha2 0x2 -#define MODEL_waku 0x1 -#define MODEL_yuka2 0x0 +#define MODEL_Root 0x1A +#define MODEL_dai 0x19 +#define MODEL_waku1 0x18 +#define MODEL_g73 0x17 +#define MODEL_o360 0x16 +#define MODEL_o359 0x15 +#define MODEL_o357 0x14 +#define MODEL_futi3 0x13 +#define MODEL_yuka1 0x12 +#define MODEL_yuka 0x11 +#define MODEL_futi2 0x10 +#define MODEL_hap 0xF +#define MODEL_ha3 0xE +#define MODEL_g49 0xD +#define MODEL_waku2 0xC +#define MODEL_g76 0xB +#define MODEL_o364 0xA +#define MODEL_o362 0x9 +#define MODEL_futi 0x8 +#define MODEL_gake 0x7 +#define MODEL_kusa2 0x6 +#define MODEL_kusa1 0x5 +#define MODEL_ha1 0x4 +#define MODEL_miki 0x3 +#define MODEL_ha2 0x2 +#define MODEL_waku 0x1 +#define MODEL_yuka2 0x0 + diff --git a/include/mapfs/nok_bt04_hit.h b/include/mapfs/nok_bt04_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/nok_bt04_hit.h +++ b/include/mapfs/nok_bt04_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/nok_bt04_shape.h b/include/mapfs/nok_bt04_shape.h index ca2b85aa9c..ff399bc290 100644 --- a/include/mapfs/nok_bt04_shape.h +++ b/include/mapfs/nok_bt04_shape.h @@ -1,33 +1,34 @@ -#define MODEL_Root 0x20 -#define MODEL_dai 0x1F -#define MODEL_waku1 0x1E -#define MODEL_kabu2 0x1D -#define MODEL_kabu1 0x1C -#define MODEL_ueki2 0x1B -#define MODEL_ueki1 0x1A -#define MODEL_kusa3 0x19 -#define MODEL_futi 0x18 -#define MODEL_miti 0x17 -#define MODEL_yuka 0x16 -#define MODEL_g49 0x15 -#define MODEL_waku2 0x14 -#define MODEL_ha2 0x13 -#define MODEL_ha2_2 0x12 -#define MODEL_ha1 0x11 -#define MODEL_ha1_2 0x10 -#define MODEL_miti2 0xF -#define MODEL_miki 0xE -#define MODEL_kusa2 0xD -#define MODEL_ha4 0xC -#define MODEL_ha3 0xB -#define MODEL_ki4 0xA -#define MODEL_ki3 0x9 -#define MODEL_ki7 0x8 -#define MODEL_ki6 0x7 -#define MODEL_ki5 0x6 -#define MODEL_ki1 0x5 -#define MODEL_ha5 0x4 -#define MODEL_kisa3 0x3 -#define MODEL_ki2 0x2 -#define MODEL_waku 0x1 -#define MODEL_yuka2 0x0 +#define MODEL_Root 0x20 +#define MODEL_dai 0x1F +#define MODEL_waku1 0x1E +#define MODEL_kabu2 0x1D +#define MODEL_kabu1 0x1C +#define MODEL_ueki2 0x1B +#define MODEL_ueki1 0x1A +#define MODEL_kusa3 0x19 +#define MODEL_futi 0x18 +#define MODEL_miti 0x17 +#define MODEL_yuka 0x16 +#define MODEL_g49 0x15 +#define MODEL_waku2 0x14 +#define MODEL_ha2 0x13 +#define MODEL_ha2_2 0x12 +#define MODEL_ha1 0x11 +#define MODEL_ha1_2 0x10 +#define MODEL_miti2 0xF +#define MODEL_miki 0xE +#define MODEL_kusa2 0xD +#define MODEL_ha4 0xC +#define MODEL_ha3 0xB +#define MODEL_ki4 0xA +#define MODEL_ki3 0x9 +#define MODEL_ki7 0x8 +#define MODEL_ki6 0x7 +#define MODEL_ki5 0x6 +#define MODEL_ki1 0x5 +#define MODEL_ha5 0x4 +#define MODEL_kisa3 0x3 +#define MODEL_ki2 0x2 +#define MODEL_waku 0x1 +#define MODEL_yuka2 0x0 + diff --git a/include/mapfs/obk_01_hit.h b/include/mapfs/obk_01_hit.h index 2ff4cda221..5f978a20d5 100644 --- a/include/mapfs/obk_01_hit.h +++ b/include/mapfs/obk_01_hit.h @@ -1,133 +1,144 @@ -#define COLLIDER_Root 0x84 -#define COLLIDER_g264 0x83 -#define COLLIDER_o621 0x82 -#define COLLIDER_o618 0x81 -#define COLLIDER_o615 0x80 -#define COLLIDER_g262 0x7F -#define COLLIDER_aa2 0x7E -#define COLLIDER_aa1 0x7D -#define COLLIDER_g223 0x7C -#define COLLIDER_sofa_3 0x7B -#define COLLIDER_tabu_3_1 0x7A -#define COLLIDER_sofa_1 0x79 -#define COLLIDER_tobu_1_1 0x78 -#define COLLIDER_g224 0x77 -#define COLLIDER_o567 0x76 -#define COLLIDER_g236 0x75 -#define COLLIDER_g241 0x74 -#define COLLIDER_o599 0x73 -#define COLLIDER_g237 0x72 -#define COLLIDER_o592 0x71 -#define COLLIDER_g215 0x70 -#define COLLIDER_g216 0x6F -#define COLLIDER_o557 0x6E -#define COLLIDER_o556 0x6D -#define COLLIDER_g202 0x6C -#define COLLIDER_o629 0x6B -#define COLLIDER_o555 0x6A -#define COLLIDER_o554 0x69 -#define COLLIDER_o628 0x68 -#define COLLIDER_o539 0x67 -#define COLLIDER_o538 0x66 -#define COLLIDER_g200 0x65 -#define COLLIDER_g201 0x64 -#define COLLIDER_o506 0x63 -#define COLLIDER_o530 0x62 -#define COLLIDER_o529 0x61 -#define COLLIDER_o528 0x60 -#define COLLIDER_o527 0x5F -#define COLLIDER_door 0x5E -#define COLLIDER_tt8 0x5D -#define COLLIDER_tt7 0x5C -#define COLLIDER_tt6_1 0x5B -#define COLLIDER_tt6 0x5A -#define COLLIDER_tt5 0x59 -#define COLLIDER_tt4 0x58 -#define COLLIDER_tt3 0x57 -#define COLLIDER_tt2 0x56 -#define COLLIDER_tt1 0x55 -#define COLLIDER_bero 0x54 -#define COLLIDER_deilit7 0x53 -#define COLLIDER_deili7 0x52 -#define COLLIDER_deilit6 0x51 -#define COLLIDER_deili6 0x50 -#define COLLIDER_deilit5 0x4F -#define COLLIDER_deili5 0x4E -#define COLLIDER_deilit4 0x4D -#define COLLIDER_deili4 0x4C -#define COLLIDER_deilit3 0x4B -#define COLLIDER_deili3 0x4A -#define COLLIDER_deilit2 0x49 -#define COLLIDER_deili2 0x48 -#define COLLIDER_deilit1 0x47 -#define COLLIDER_deili1 0x46 -#define COLLIDER_g164 0x45 -#define COLLIDER_o470 0x44 -#define COLLIDER_o469 0x43 -#define COLLIDER_o468 0x42 -#define COLLIDER_o467 0x41 -#define COLLIDER_o414 0x40 -#define COLLIDER_g118 0x3F -#define COLLIDER_o456 0x3E -#define COLLIDER_o455 0x3D -#define COLLIDER_o453 0x3C -#define COLLIDER_o452 0x3B -#define COLLIDER_o451 0x3A -#define COLLIDER_g163 0x39 -#define COLLIDER_o442 0x38 -#define COLLIDER_o441 0x37 -#define COLLIDER_o440 0x36 -#define COLLIDER_o448 0x35 -#define COLLIDER_o447 0x34 -#define COLLIDER_o439 0x33 -#define COLLIDER_g160 0x32 -#define COLLIDER_o278 0x31 -#define COLLIDER_o444 0x30 -#define COLLIDER_o443 0x2F -#define COLLIDER_g159 0x2E -#define COLLIDER_o402 0x2D -#define COLLIDER_o438 0x2C -#define COLLIDER_o437 0x2B -#define COLLIDER_o436 0x2A -#define COLLIDER_o435 0x29 -#define COLLIDER_o434 0x28 -#define COLLIDER_g158 0x27 -#define COLLIDER_o408 0x26 -#define COLLIDER_o433 0x25 -#define COLLIDER_o432 0x24 -#define COLLIDER_o431 0x23 -#define COLLIDER_o430 0x22 -#define COLLIDER_g157 0x21 -#define COLLIDER_o429 0x20 -#define COLLIDER_o427 0x1F -#define COLLIDER_o426 0x1E -#define COLLIDER_o425 0x1D -#define COLLIDER_o424 0x1C -#define COLLIDER_o423 0x1B -#define COLLIDER_o284 0x1A -#define COLLIDER_g107 0x19 -#define COLLIDER_o421 0x18 -#define COLLIDER_o420 0x17 -#define COLLIDER_o419 0x16 -#define COLLIDER_o418 0x15 -#define COLLIDER_o417 0x14 -#define COLLIDER_o416 0x13 -#define COLLIDER_o415 0x12 -#define COLLIDER_g156 0x11 -#define COLLIDER_o410 0x10 -#define COLLIDER_g126 0xF -#define COLLIDER_o296 0xE -#define COLLIDER_o411 0xD -#define COLLIDER_o195 0xC -#define COLLIDER_hashira 0xB -#define COLLIDER_o487 0xA -#define COLLIDER_o486 0x9 -#define COLLIDER_o294 0x8 -#define COLLIDER_o465 0x7 -#define COLLIDER_o464 0x6 -#define COLLIDER_o462 0x5 -#define COLLIDER_o463 0x4 -#define COLLIDER_o458 0x3 -#define COLLIDER_o459 0x2 -#define COLLIDER_o460 0x1 -#define COLLIDER_o461 0x0 +#define COLLIDER_Root 0x84 +#define COLLIDER_g264 0x83 +#define COLLIDER_o621 0x82 +#define COLLIDER_o618 0x81 +#define COLLIDER_o615 0x80 +#define COLLIDER_g262 0x7F +#define COLLIDER_aa2 0x7E +#define COLLIDER_aa1 0x7D +#define COLLIDER_g223 0x7C +#define COLLIDER_sofa_3 0x7B +#define COLLIDER_tabu_3_1 0x7A +#define COLLIDER_sofa_1 0x79 +#define COLLIDER_tobu_1_1 0x78 +#define COLLIDER_g224 0x77 +#define COLLIDER_o567 0x76 +#define COLLIDER_g236 0x75 +#define COLLIDER_g241 0x74 +#define COLLIDER_o599 0x73 +#define COLLIDER_g237 0x72 +#define COLLIDER_o592 0x71 +#define COLLIDER_g215 0x70 +#define COLLIDER_g216 0x6F +#define COLLIDER_o557 0x6E +#define COLLIDER_o556 0x6D +#define COLLIDER_g202 0x6C +#define COLLIDER_o629 0x6B +#define COLLIDER_o555 0x6A +#define COLLIDER_o554 0x69 +#define COLLIDER_o628 0x68 +#define COLLIDER_o539 0x67 +#define COLLIDER_o538 0x66 +#define COLLIDER_g200 0x65 +#define COLLIDER_g201 0x64 +#define COLLIDER_o506 0x63 +#define COLLIDER_o530 0x62 +#define COLLIDER_o529 0x61 +#define COLLIDER_o528 0x60 +#define COLLIDER_o527 0x5F +#define COLLIDER_door 0x5E +#define COLLIDER_tt8 0x5D +#define COLLIDER_tt7 0x5C +#define COLLIDER_tt6_1 0x5B +#define COLLIDER_tt6 0x5A +#define COLLIDER_tt5 0x59 +#define COLLIDER_tt4 0x58 +#define COLLIDER_tt3 0x57 +#define COLLIDER_tt2 0x56 +#define COLLIDER_tt1 0x55 +#define COLLIDER_bero 0x54 +#define COLLIDER_deilit7 0x53 +#define COLLIDER_deili7 0x52 +#define COLLIDER_deilit6 0x51 +#define COLLIDER_deili6 0x50 +#define COLLIDER_deilit5 0x4F +#define COLLIDER_deili5 0x4E +#define COLLIDER_deilit4 0x4D +#define COLLIDER_deili4 0x4C +#define COLLIDER_deilit3 0x4B +#define COLLIDER_deili3 0x4A +#define COLLIDER_deilit2 0x49 +#define COLLIDER_deili2 0x48 +#define COLLIDER_deilit1 0x47 +#define COLLIDER_deili1 0x46 +#define COLLIDER_g164 0x45 +#define COLLIDER_o470 0x44 +#define COLLIDER_o469 0x43 +#define COLLIDER_o468 0x42 +#define COLLIDER_o467 0x41 +#define COLLIDER_o414 0x40 +#define COLLIDER_g118 0x3F +#define COLLIDER_o456 0x3E +#define COLLIDER_o455 0x3D +#define COLLIDER_o453 0x3C +#define COLLIDER_o452 0x3B +#define COLLIDER_o451 0x3A +#define COLLIDER_g163 0x39 +#define COLLIDER_o442 0x38 +#define COLLIDER_o441 0x37 +#define COLLIDER_o440 0x36 +#define COLLIDER_o448 0x35 +#define COLLIDER_o447 0x34 +#define COLLIDER_o439 0x33 +#define COLLIDER_g160 0x32 +#define COLLIDER_o278 0x31 +#define COLLIDER_o444 0x30 +#define COLLIDER_o443 0x2F +#define COLLIDER_g159 0x2E +#define COLLIDER_o402 0x2D +#define COLLIDER_o438 0x2C +#define COLLIDER_o437 0x2B +#define COLLIDER_o436 0x2A +#define COLLIDER_o435 0x29 +#define COLLIDER_o434 0x28 +#define COLLIDER_g158 0x27 +#define COLLIDER_o408 0x26 +#define COLLIDER_o433 0x25 +#define COLLIDER_o432 0x24 +#define COLLIDER_o431 0x23 +#define COLLIDER_o430 0x22 +#define COLLIDER_g157 0x21 +#define COLLIDER_o429 0x20 +#define COLLIDER_o427 0x1F +#define COLLIDER_o426 0x1E +#define COLLIDER_o425 0x1D +#define COLLIDER_o424 0x1C +#define COLLIDER_o423 0x1B +#define COLLIDER_o284 0x1A +#define COLLIDER_g107 0x19 +#define COLLIDER_o421 0x18 +#define COLLIDER_o420 0x17 +#define COLLIDER_o419 0x16 +#define COLLIDER_o418 0x15 +#define COLLIDER_o417 0x14 +#define COLLIDER_o416 0x13 +#define COLLIDER_o415 0x12 +#define COLLIDER_g156 0x11 +#define COLLIDER_o410 0x10 +#define COLLIDER_g126 0xF +#define COLLIDER_o296 0xE +#define COLLIDER_o411 0xD +#define COLLIDER_o195 0xC +#define COLLIDER_hashira 0xB +#define COLLIDER_o487 0xA +#define COLLIDER_o486 0x9 +#define COLLIDER_o294 0x8 +#define COLLIDER_o465 0x7 +#define COLLIDER_o464 0x6 +#define COLLIDER_o462 0x5 +#define COLLIDER_o463 0x4 +#define COLLIDER_o458 0x3 +#define COLLIDER_o459 0x2 +#define COLLIDER_o460 0x1 +#define COLLIDER_o461 0x0 + +#define ZONE_Root 0x8 +#define ZONE_g138 0x7 +#define ZONE_o1 0x6 +#define ZONE_g137 0x5 +#define ZONE_0 0x4 +#define ZONE_g135 0x3 +#define ZONE_1 0x2 +#define ZONE_g125 0x1 +#define ZONE_o297 0x0 + diff --git a/include/mapfs/obk_01_shape.h b/include/mapfs/obk_01_shape.h index ef499732c2..d216cafb47 100644 --- a/include/mapfs/obk_01_shape.h +++ b/include/mapfs/obk_01_shape.h @@ -1,180 +1,181 @@ -#define MODEL_Root 0xB3 -#define MODEL_g956 0xB2 -#define MODEL_o1374 0xB1 -#define MODEL_o1373 0xB0 -#define MODEL_o1306 0xAF -#define MODEL_o1304 0xAE -#define MODEL_o1303 0xAD -#define MODEL_o1301 0xAC -#define MODEL_o1293 0xAB -#define MODEL_o1279 0xAA -#define MODEL_o1298 0xA9 -#define MODEL_g945 0xA8 -#define MODEL_o1378 0xA7 -#define MODEL_o1250 0xA6 -#define MODEL_o1249 0xA5 -#define MODEL_o1248 0xA4 -#define MODEL_o1247 0xA3 -#define MODEL_o1246 0xA2 -#define MODEL_o1245 0xA1 -#define MODEL_o1377 0xA0 -#define MODEL_h 0x9F -#define MODEL_hi12 0x9E -#define MODEL_hi11 0x9D -#define MODEL_hi10 0x9C -#define MODEL_hi9 0x9B -#define MODEL_hi8 0x9A -#define MODEL_hi7 0x99 -#define MODEL_hi6 0x98 -#define MODEL_hi5 0x97 -#define MODEL_hi4 0x96 -#define MODEL_hi3 0x95 -#define MODEL_hi2 0x94 -#define MODEL_hi1 0x93 -#define MODEL_m 0x92 -#define MODEL_sita_2 0x91 -#define MODEL_si2 0x90 -#define MODEL_sita_1 0x8F -#define MODEL_si1 0x8E -#define MODEL_ue_2 0x8D -#define MODEL_u2 0x8C -#define MODEL_ue_1 0x8B -#define MODEL_u1 0x8A -#define MODEL_nasi_2 0x89 -#define MODEL_n2 0x88 -#define MODEL_nasi_1 0x87 -#define MODEL_n1 0x86 -#define MODEL_e 0x85 -#define MODEL_e2 0x84 -#define MODEL_e_2 0x83 -#define MODEL_e1 0x82 -#define MODEL_e_1 0x81 -#define MODEL_ana 0x80 -#define MODEL_ana_4 0x7F -#define MODEL_ana4 0x7E -#define MODEL_ana_3 0x7D -#define MODEL_ana3 0x7C -#define MODEL_ana_2 0x7B -#define MODEL_ana2 0x7A -#define MODEL_ana_1 0x79 -#define MODEL_ana1 0x78 -#define MODEL_s 0x77 -#define MODEL_sofa_3 0x76 -#define MODEL_tobu3_1 0x75 -#define MODEL_tobu_3_1 0x74 -#define MODEL_sofa_1 0x73 -#define MODEL_tobu1_1 0x72 -#define MODEL_tobu_1_1 0x71 -#define MODEL_sofa_2 0x70 -#define MODEL_bane 0x6F -#define MODEL_bane1 0x6E -#define MODEL_tobu 0x6D -#define MODEL_tobu1 0x6C -#define MODEL_sofa 0x6B -#define MODEL_g219 0x6A -#define MODEL_o486 0x69 -#define MODEL_g216 0x68 -#define MODEL_o476 0x67 -#define MODEL_o475 0x66 -#define MODEL_g215 0x65 -#define MODEL_o481 0x64 -#define MODEL_o474 0x63 -#define MODEL_g214 0x62 -#define MODEL_o482 0x61 -#define MODEL_o473 0x60 -#define MODEL_g213 0x5F -#define MODEL_o483 0x5E -#define MODEL_o470 0x5D -#define MODEL_denki 0x5C -#define MODEL_denki_1 0x5B -#define MODEL_kusari_2 0x5A -#define MODEL_hi 0x59 -#define MODEL_kusari_1 0x58 -#define MODEL_wa 0x57 -#define MODEL_hondana 0x56 -#define MODEL_hon_1 0x55 -#define MODEL_hon2 0x54 -#define MODEL_hon1 0x53 -#define MODEL_door 0x52 -#define MODEL_door_1_2 0x51 -#define MODEL_door1_2 0x50 -#define MODEL_door_1_1 0x4F -#define MODEL_door1_1 0x4E -#define MODEL_door_7_2 0x4D -#define MODEL_door7_2 0x4C -#define MODEL_door_7_1 0x4B -#define MODEL_door7_1 0x4A -#define MODEL_door_6_2 0x49 -#define MODEL_door6_2 0x48 -#define MODEL_door_6_1 0x47 -#define MODEL_door6_1 0x46 -#define MODEL_door_5 0x45 -#define MODEL_door5 0x44 -#define MODEL_door_4 0x43 -#define MODEL_door4 0x42 -#define MODEL_door_3 0x41 -#define MODEL_door3 0x40 -#define MODEL_door_2 0x3F -#define MODEL_door2 0x3E -#define MODEL_hashira 0x3D -#define MODEL_g943 0x3C -#define MODEL_o1241 0x3B -#define MODEL_o1231 0x3A -#define MODEL_o1236 0x39 -#define MODEL_g942 0x38 -#define MODEL_o1242 0x37 -#define MODEL_o1228 0x36 -#define MODEL_o1234 0x35 -#define MODEL_o1365 0x34 -#define MODEL_o1364 0x33 -#define MODEL_o1368 0x32 -#define MODEL_hako 0x31 -#define MODEL_mat 0x30 -#define MODEL_o317 0x2F -#define MODEL_yuka 0x2E -#define MODEL_o409 0x2D -#define MODEL_o279 0x2C -#define MODEL_o278 0x2B -#define MODEL_bero 0x2A -#define MODEL_o445 0x29 -#define MODEL_kaidan 0x28 -#define MODEL_k_4 0x27 -#define MODEL_o453 0x26 -#define MODEL_k_3 0x25 -#define MODEL_t 0x24 -#define MODEL_o261 0x23 -#define MODEL_o256 0x22 -#define MODEL_o1336 0x21 -#define MODEL_k_2 0x20 -#define MODEL_o1355 0x1F -#define MODEL_o1354 0x1E -#define MODEL_o1353 0x1D -#define MODEL_o255 0x1C -#define MODEL_o254 0x1B -#define MODEL_o452 0x1A -#define MODEL_o302 0x19 -#define MODEL_o304 0x18 -#define MODEL_o1326 0x17 -#define MODEL_o1325 0x16 -#define MODEL_k_1 0x15 -#define MODEL_o1352 0x14 -#define MODEL_o1351 0x13 -#define MODEL_o1350 0x12 -#define MODEL_o1346 0x11 -#define MODEL_o1345 0x10 -#define MODEL_o1344 0xF -#define MODEL_d_k_1 0xE -#define MODEL_d_y_1 0xD -#define MODEL_k1_2 0xC -#define MODEL_tesuri1_1 0xB -#define MODEL_o1329 0xA -#define MODEL_o1320 0x9 -#define MODEL_o1317 0x8 -#define MODEL_g940 0x7 -#define MODEL_o407 0x6 -#define MODEL_o284 0x5 -#define MODEL_o526 0x4 -#define MODEL_o1220 0x3 -#define MODEL_o1217 0x2 -#define MODEL_o429 0x1 -#define MODEL_o435 0x0 +#define MODEL_Root 0xB3 +#define MODEL_g956 0xB2 +#define MODEL_o1374 0xB1 +#define MODEL_o1373 0xB0 +#define MODEL_o1306 0xAF +#define MODEL_o1304 0xAE +#define MODEL_o1303 0xAD +#define MODEL_o1301 0xAC +#define MODEL_o1293 0xAB +#define MODEL_o1279 0xAA +#define MODEL_o1298 0xA9 +#define MODEL_g945 0xA8 +#define MODEL_o1378 0xA7 +#define MODEL_o1250 0xA6 +#define MODEL_o1249 0xA5 +#define MODEL_o1248 0xA4 +#define MODEL_o1247 0xA3 +#define MODEL_o1246 0xA2 +#define MODEL_o1245 0xA1 +#define MODEL_o1377 0xA0 +#define MODEL_h 0x9F +#define MODEL_hi12 0x9E +#define MODEL_hi11 0x9D +#define MODEL_hi10 0x9C +#define MODEL_hi9 0x9B +#define MODEL_hi8 0x9A +#define MODEL_hi7 0x99 +#define MODEL_hi6 0x98 +#define MODEL_hi5 0x97 +#define MODEL_hi4 0x96 +#define MODEL_hi3 0x95 +#define MODEL_hi2 0x94 +#define MODEL_hi1 0x93 +#define MODEL_m 0x92 +#define MODEL_sita_2 0x91 +#define MODEL_si2 0x90 +#define MODEL_sita_1 0x8F +#define MODEL_si1 0x8E +#define MODEL_ue_2 0x8D +#define MODEL_u2 0x8C +#define MODEL_ue_1 0x8B +#define MODEL_u1 0x8A +#define MODEL_nasi_2 0x89 +#define MODEL_n2 0x88 +#define MODEL_nasi_1 0x87 +#define MODEL_n1 0x86 +#define MODEL_e 0x85 +#define MODEL_e2 0x84 +#define MODEL_e_2 0x83 +#define MODEL_e1 0x82 +#define MODEL_e_1 0x81 +#define MODEL_ana 0x80 +#define MODEL_ana_4 0x7F +#define MODEL_ana4 0x7E +#define MODEL_ana_3 0x7D +#define MODEL_ana3 0x7C +#define MODEL_ana_2 0x7B +#define MODEL_ana2 0x7A +#define MODEL_ana_1 0x79 +#define MODEL_ana1 0x78 +#define MODEL_s 0x77 +#define MODEL_sofa_3 0x76 +#define MODEL_tobu3_1 0x75 +#define MODEL_tobu_3_1 0x74 +#define MODEL_sofa_1 0x73 +#define MODEL_tobu1_1 0x72 +#define MODEL_tobu_1_1 0x71 +#define MODEL_sofa_2 0x70 +#define MODEL_bane 0x6F +#define MODEL_bane1 0x6E +#define MODEL_tobu 0x6D +#define MODEL_tobu1 0x6C +#define MODEL_sofa 0x6B +#define MODEL_g219 0x6A +#define MODEL_o486 0x69 +#define MODEL_g216 0x68 +#define MODEL_o476 0x67 +#define MODEL_o475 0x66 +#define MODEL_g215 0x65 +#define MODEL_o481 0x64 +#define MODEL_o474 0x63 +#define MODEL_g214 0x62 +#define MODEL_o482 0x61 +#define MODEL_o473 0x60 +#define MODEL_g213 0x5F +#define MODEL_o483 0x5E +#define MODEL_o470 0x5D +#define MODEL_denki 0x5C +#define MODEL_denki_1 0x5B +#define MODEL_kusari_2 0x5A +#define MODEL_hi 0x59 +#define MODEL_kusari_1 0x58 +#define MODEL_wa 0x57 +#define MODEL_hondana 0x56 +#define MODEL_hon_1 0x55 +#define MODEL_hon2 0x54 +#define MODEL_hon1 0x53 +#define MODEL_door 0x52 +#define MODEL_door_1_2 0x51 +#define MODEL_door1_2 0x50 +#define MODEL_door_1_1 0x4F +#define MODEL_door1_1 0x4E +#define MODEL_door_7_2 0x4D +#define MODEL_door7_2 0x4C +#define MODEL_door_7_1 0x4B +#define MODEL_door7_1 0x4A +#define MODEL_door_6_2 0x49 +#define MODEL_door6_2 0x48 +#define MODEL_door_6_1 0x47 +#define MODEL_door6_1 0x46 +#define MODEL_door_5 0x45 +#define MODEL_door5 0x44 +#define MODEL_door_4 0x43 +#define MODEL_door4 0x42 +#define MODEL_door_3 0x41 +#define MODEL_door3 0x40 +#define MODEL_door_2 0x3F +#define MODEL_door2 0x3E +#define MODEL_hashira 0x3D +#define MODEL_g943 0x3C +#define MODEL_o1241 0x3B +#define MODEL_o1231 0x3A +#define MODEL_o1236 0x39 +#define MODEL_g942 0x38 +#define MODEL_o1242 0x37 +#define MODEL_o1228 0x36 +#define MODEL_o1234 0x35 +#define MODEL_o1365 0x34 +#define MODEL_o1364 0x33 +#define MODEL_o1368 0x32 +#define MODEL_hako 0x31 +#define MODEL_mat 0x30 +#define MODEL_o317 0x2F +#define MODEL_yuka 0x2E +#define MODEL_o409 0x2D +#define MODEL_o279 0x2C +#define MODEL_o278 0x2B +#define MODEL_bero 0x2A +#define MODEL_o445 0x29 +#define MODEL_kaidan 0x28 +#define MODEL_k_4 0x27 +#define MODEL_o453 0x26 +#define MODEL_k_3 0x25 +#define MODEL_t 0x24 +#define MODEL_o261 0x23 +#define MODEL_o256 0x22 +#define MODEL_o1336 0x21 +#define MODEL_k_2 0x20 +#define MODEL_o1355 0x1F +#define MODEL_o1354 0x1E +#define MODEL_o1353 0x1D +#define MODEL_o255 0x1C +#define MODEL_o254 0x1B +#define MODEL_o452 0x1A +#define MODEL_o302 0x19 +#define MODEL_o304 0x18 +#define MODEL_o1326 0x17 +#define MODEL_o1325 0x16 +#define MODEL_k_1 0x15 +#define MODEL_o1352 0x14 +#define MODEL_o1351 0x13 +#define MODEL_o1350 0x12 +#define MODEL_o1346 0x11 +#define MODEL_o1345 0x10 +#define MODEL_o1344 0xF +#define MODEL_d_k_1 0xE +#define MODEL_d_y_1 0xD +#define MODEL_k1_2 0xC +#define MODEL_tesuri1_1 0xB +#define MODEL_o1329 0xA +#define MODEL_o1320 0x9 +#define MODEL_o1317 0x8 +#define MODEL_g940 0x7 +#define MODEL_o407 0x6 +#define MODEL_o284 0x5 +#define MODEL_o526 0x4 +#define MODEL_o1220 0x3 +#define MODEL_o1217 0x2 +#define MODEL_o429 0x1 +#define MODEL_o435 0x0 + diff --git a/include/mapfs/obk_02_hit.h b/include/mapfs/obk_02_hit.h index 66bc45194d..551ae761e5 100644 --- a/include/mapfs/obk_02_hit.h +++ b/include/mapfs/obk_02_hit.h @@ -1,38 +1,51 @@ -#define COLLIDER_Root 0x25 -#define COLLIDER_g182 0x24 -#define COLLIDER_o451 0x23 -#define COLLIDER_g165 0x22 -#define COLLIDER_o525 0x21 -#define COLLIDER_o424 0x20 -#define COLLIDER_o392 0x1F -#define COLLIDER_o391 0x1E -#define COLLIDER_o390 0x1D -#define COLLIDER_shiyan 0x1C -#define COLLIDER_si 0x1B -#define COLLIDER_tt 0x1A -#define COLLIDER_tt3 0x19 -#define COLLIDER_tt2 0x18 -#define COLLIDER_tt1 0x17 -#define COLLIDER_bero 0x16 -#define COLLIDER_deilit3 0x15 -#define COLLIDER_deili3 0x14 -#define COLLIDER_deilit2 0x13 -#define COLLIDER_deili2 0x12 -#define COLLIDER_deilit1 0x11 -#define COLLIDER_deili1 0x10 -#define COLLIDER_g118 0xF -#define COLLIDER_o359 0xE -#define COLLIDER_o320 0xD -#define COLLIDER_o292 0xC -#define COLLIDER_o291 0xB -#define COLLIDER_g120 0xA -#define COLLIDER_o282 0x9 -#define COLLIDER_o296 0x8 -#define COLLIDER_o358 0x7 -#define COLLIDER_kaidan 0x6 -#define COLLIDER_o361 0x5 -#define COLLIDER_o360 0x4 -#define COLLIDER_o260 0x3 -#define COLLIDER_o309 0x2 -#define COLLIDER_o362 0x1 -#define COLLIDER_o261 0x0 +#define COLLIDER_Root 0x25 +#define COLLIDER_g182 0x24 +#define COLLIDER_o451 0x23 +#define COLLIDER_g165 0x22 +#define COLLIDER_o525 0x21 +#define COLLIDER_o424 0x20 +#define COLLIDER_o392 0x1F +#define COLLIDER_o391 0x1E +#define COLLIDER_o390 0x1D +#define COLLIDER_shiyan 0x1C +#define COLLIDER_si 0x1B +#define COLLIDER_tt 0x1A +#define COLLIDER_tt3 0x19 +#define COLLIDER_tt2 0x18 +#define COLLIDER_tt1 0x17 +#define COLLIDER_bero 0x16 +#define COLLIDER_deilit3 0x15 +#define COLLIDER_deili3 0x14 +#define COLLIDER_deilit2 0x13 +#define COLLIDER_deili2 0x12 +#define COLLIDER_deilit1 0x11 +#define COLLIDER_deili1 0x10 +#define COLLIDER_g118 0xF +#define COLLIDER_o359 0xE +#define COLLIDER_o320 0xD +#define COLLIDER_o292 0xC +#define COLLIDER_o291 0xB +#define COLLIDER_g120 0xA +#define COLLIDER_o282 0x9 +#define COLLIDER_o296 0x8 +#define COLLIDER_o358 0x7 +#define COLLIDER_kaidan 0x6 +#define COLLIDER_o361 0x5 +#define COLLIDER_o360 0x4 +#define COLLIDER_o260 0x3 +#define COLLIDER_o309 0x2 +#define COLLIDER_o362 0x1 +#define COLLIDER_o261 0x0 + +#define ZONE_Root 0xA +#define ZONE_g152 0x9 +#define ZONE_o373 0x8 +#define ZONE_o372 0x7 +#define ZONE_o371 0x6 +#define ZONE_g150 0x5 +#define ZONE_o369 0x4 +#define ZONE_o368 0x3 +#define ZONE_o367 0x2 +#define ZONE_bero 0x1 +#define ZONE_deili1 0x0 + diff --git a/include/mapfs/obk_02_shape.h b/include/mapfs/obk_02_shape.h index 1780e703b6..9e09b005b0 100644 --- a/include/mapfs/obk_02_shape.h +++ b/include/mapfs/obk_02_shape.h @@ -1,97 +1,98 @@ -#define MODEL_Root 0x60 -#define MODEL_on 0x5F -#define MODEL_moku 0x5E -#define MODEL_m3 0x5D -#define MODEL_m2 0x5C -#define MODEL_g272 0x5B -#define MODEL_kabe_k 0x5A -#define MODEL_o351 0x59 -#define MODEL_kaidan 0x58 -#define MODEL_o564 0x57 -#define MODEL_o640 0x56 -#define MODEL_o261 0x55 -#define MODEL_o309 0x54 -#define MODEL_o260 0x53 -#define MODEL_bo3k 0x52 -#define MODEL_bo2k 0x51 -#define MODEL_bo1k 0x50 -#define MODEL_door 0x4F -#define MODEL_hikido 0x4E -#define MODEL_door2 0x4D -#define MODEL_door_1 0x4C -#define MODEL_door1b 0x4B -#define MODEL_hh 0x4A -#define MODEL_hi18 0x49 -#define MODEL_hi17 0x48 -#define MODEL_hi16 0x47 -#define MODEL_hi15 0x46 -#define MODEL_hi14 0x45 -#define MODEL_hi13 0x44 -#define MODEL_hi12 0x43 -#define MODEL_hi11 0x42 -#define MODEL_hi10 0x41 -#define MODEL_hi9 0x40 -#define MODEL_hi7 0x3F -#define MODEL_tokei 0x3E -#define MODEL_to 0x3D -#define MODEL_g 0x3C -#define MODEL_h 0x3B -#define MODEL_t 0x3A -#define MODEL_tto 0x39 -#define MODEL_furifuri 0x38 -#define MODEL_fu 0x37 -#define MODEL_miji 0x36 -#define MODEL_mi 0x35 -#define MODEL_naga 0x34 -#define MODEL_na 0x33 -#define MODEL_shiyan 0x32 -#define MODEL_denki 0x31 -#define MODEL_o376 0x30 -#define MODEL_a 0x2F -#define MODEL_r6 0x2E -#define MODEL_r5 0x2D -#define MODEL_r4 0x2C -#define MODEL_r3 0x2B -#define MODEL_r2 0x2A -#define MODEL_r1 0x29 -#define MODEL_kusari 0x28 -#define MODEL_o405 0x27 -#define MODEL_o406 0x26 -#define MODEL_bom 0x25 -#define MODEL_bom_2 0x24 -#define MODEL_bomu_ato 0x23 -#define MODEL_bom_1 0x22 -#define MODEL_bom_mae 0x21 -#define MODEL_off_2 0x20 -#define MODEL_kumo_2 0x1F -#define MODEL_hikari_2 0x1E -#define MODEL_rou_2 0x1D -#define MODEL_ten_3 0x1C -#define MODEL_ten_1 0x1B -#define MODEL_ten_2 0x1A -#define MODEL_mado 0x19 -#define MODEL_mado_kabe 0x18 -#define MODEL_ha3 0x17 -#define MODEL_ha2 0x16 -#define MODEL_ha1 0x15 -#define MODEL_yuka_1f 0x14 -#define MODEL_kabe_1f_ue 0x13 -#define MODEL_kabe_1f 0x12 -#define MODEL_kabe_1f_ki 0x11 -#define MODEL_tana1 0x10 -#define MODEL_tubo 0xF -#define MODEL_tate_2 0xE -#define MODEL_ushiro 0xD -#define MODEL_off_1 0xC -#define MODEL_kumo_1 0xB -#define MODEL_hikari_1 0xA -#define MODEL_rou_1 0x9 -#define MODEL_tukue 0x8 -#define MODEL_obk_06_bero 0x7 -#define MODEL_yuka_b1 0x6 -#define MODEL_kabe_b 0x5 -#define MODEL_kabe_b1 0x4 -#define MODEL_ki 0x3 -#define MODEL_tate 0x2 -#define MODEL_hako_l 0x1 -#define MODEL_hako_s 0x0 +#define MODEL_Root 0x60 +#define MODEL_on 0x5F +#define MODEL_moku 0x5E +#define MODEL_m3 0x5D +#define MODEL_m2 0x5C +#define MODEL_g272 0x5B +#define MODEL_kabe_k 0x5A +#define MODEL_o351 0x59 +#define MODEL_kaidan 0x58 +#define MODEL_o564 0x57 +#define MODEL_o640 0x56 +#define MODEL_o261 0x55 +#define MODEL_o309 0x54 +#define MODEL_o260 0x53 +#define MODEL_bo3k 0x52 +#define MODEL_bo2k 0x51 +#define MODEL_bo1k 0x50 +#define MODEL_door 0x4F +#define MODEL_hikido 0x4E +#define MODEL_door2 0x4D +#define MODEL_door_1 0x4C +#define MODEL_door1b 0x4B +#define MODEL_hh 0x4A +#define MODEL_hi18 0x49 +#define MODEL_hi17 0x48 +#define MODEL_hi16 0x47 +#define MODEL_hi15 0x46 +#define MODEL_hi14 0x45 +#define MODEL_hi13 0x44 +#define MODEL_hi12 0x43 +#define MODEL_hi11 0x42 +#define MODEL_hi10 0x41 +#define MODEL_hi9 0x40 +#define MODEL_hi7 0x3F +#define MODEL_tokei 0x3E +#define MODEL_to 0x3D +#define MODEL_g 0x3C +#define MODEL_h 0x3B +#define MODEL_t 0x3A +#define MODEL_tto 0x39 +#define MODEL_furifuri 0x38 +#define MODEL_fu 0x37 +#define MODEL_miji 0x36 +#define MODEL_mi 0x35 +#define MODEL_naga 0x34 +#define MODEL_na 0x33 +#define MODEL_shiyan 0x32 +#define MODEL_denki 0x31 +#define MODEL_o376 0x30 +#define MODEL_a 0x2F +#define MODEL_r6 0x2E +#define MODEL_r5 0x2D +#define MODEL_r4 0x2C +#define MODEL_r3 0x2B +#define MODEL_r2 0x2A +#define MODEL_r1 0x29 +#define MODEL_kusari 0x28 +#define MODEL_o405 0x27 +#define MODEL_o406 0x26 +#define MODEL_bom 0x25 +#define MODEL_bom_2 0x24 +#define MODEL_bomu_ato 0x23 +#define MODEL_bom_1 0x22 +#define MODEL_bom_mae 0x21 +#define MODEL_off_2 0x20 +#define MODEL_kumo_2 0x1F +#define MODEL_hikari_2 0x1E +#define MODEL_rou_2 0x1D +#define MODEL_ten_3 0x1C +#define MODEL_ten_1 0x1B +#define MODEL_ten_2 0x1A +#define MODEL_mado 0x19 +#define MODEL_mado_kabe 0x18 +#define MODEL_ha3 0x17 +#define MODEL_ha2 0x16 +#define MODEL_ha1 0x15 +#define MODEL_yuka_1f 0x14 +#define MODEL_kabe_1f_ue 0x13 +#define MODEL_kabe_1f 0x12 +#define MODEL_kabe_1f_ki 0x11 +#define MODEL_tana1 0x10 +#define MODEL_tubo 0xF +#define MODEL_tate_2 0xE +#define MODEL_ushiro 0xD +#define MODEL_off_1 0xC +#define MODEL_kumo_1 0xB +#define MODEL_hikari_1 0xA +#define MODEL_rou_1 0x9 +#define MODEL_tukue 0x8 +#define MODEL_obk_06_bero 0x7 +#define MODEL_yuka_b1 0x6 +#define MODEL_kabe_b 0x5 +#define MODEL_kabe_b1 0x4 +#define MODEL_ki 0x3 +#define MODEL_tate 0x2 +#define MODEL_hako_l 0x1 +#define MODEL_hako_s 0x0 + diff --git a/include/mapfs/obk_03_hit.h b/include/mapfs/obk_03_hit.h index c3a0774ede..66858e96be 100644 --- a/include/mapfs/obk_03_hit.h +++ b/include/mapfs/obk_03_hit.h @@ -1,63 +1,76 @@ -#define COLLIDER_Root 0x3E -#define COLLIDER_isu 0x3D -#define COLLIDER_i3 0x3C -#define COLLIDER_i2 0x3B -#define COLLIDER_i1 0x3A -#define COLLIDER_g170 0x39 -#define COLLIDER_o410 0x38 -#define COLLIDER_o528 0x37 -#define COLLIDER_o336 0x36 -#define COLLIDER_o341 0x35 -#define COLLIDER_g190 0x34 -#define COLLIDER_o413 0x33 -#define COLLIDER_o493 0x32 -#define COLLIDER_g218 0x31 -#define COLLIDER_dummy 0x30 -#define COLLIDER_o490 0x2F -#define COLLIDER_o489 0x2E -#define COLLIDER_o488 0x2D -#define COLLIDER_o487 0x2C -#define COLLIDER_o486 0x2B -#define COLLIDER_o485 0x2A -#define COLLIDER_g171 0x29 -#define COLLIDER_o415 0x28 -#define COLLIDER_o478 0x27 -#define COLLIDER_o381 0x26 -#define COLLIDER_o339 0x25 -#define COLLIDER_o350 0x24 -#define COLLIDER_g168 0x23 -#define COLLIDER_o368 0x22 -#define COLLIDER_o367 0x21 -#define COLLIDER_o527 0x20 -#define COLLIDER_o380 0x1F -#define COLLIDER_o457 0x1E -#define COLLIDER_o470 0x1D -#define COLLIDER_o474 0x1C -#define COLLIDER_o364 0x1B -#define COLLIDER_o361 0x1A -#define COLLIDER_kaidan 0x19 -#define COLLIDER_k_8 0x18 -#define COLLIDER_k8 0x17 -#define COLLIDER_k_7 0x16 -#define COLLIDER_k7 0x15 -#define COLLIDER_k_6 0x14 -#define COLLIDER_k6 0x13 -#define COLLIDER_k_5 0x12 -#define COLLIDER_k5 0x11 -#define COLLIDER_k_4 0x10 -#define COLLIDER_k4 0xF -#define COLLIDER_k_3 0xE -#define COLLIDER_k3 0xD -#define COLLIDER_k_2 0xC -#define COLLIDER_k2 0xB -#define COLLIDER_k_1 0xA -#define COLLIDER_k1 0x9 -#define COLLIDER_tt 0x8 -#define COLLIDER_tt3 0x7 -#define COLLIDER_tt2 0x6 -#define COLLIDER_tt1 0x5 -#define COLLIDER_bero 0x4 -#define COLLIDER_deilit2 0x3 -#define COLLIDER_deili2 0x2 -#define COLLIDER_deilit1 0x1 -#define COLLIDER_deili1 0x0 +#define COLLIDER_Root 0x3E +#define COLLIDER_isu 0x3D +#define COLLIDER_i3 0x3C +#define COLLIDER_i2 0x3B +#define COLLIDER_i1 0x3A +#define COLLIDER_g170 0x39 +#define COLLIDER_o410 0x38 +#define COLLIDER_o528 0x37 +#define COLLIDER_o336 0x36 +#define COLLIDER_o341 0x35 +#define COLLIDER_g190 0x34 +#define COLLIDER_o413 0x33 +#define COLLIDER_o493 0x32 +#define COLLIDER_g218 0x31 +#define COLLIDER_dummy 0x30 +#define COLLIDER_o490 0x2F +#define COLLIDER_o489 0x2E +#define COLLIDER_o488 0x2D +#define COLLIDER_o487 0x2C +#define COLLIDER_o486 0x2B +#define COLLIDER_o485 0x2A +#define COLLIDER_g171 0x29 +#define COLLIDER_o415 0x28 +#define COLLIDER_o478 0x27 +#define COLLIDER_o381 0x26 +#define COLLIDER_o339 0x25 +#define COLLIDER_o350 0x24 +#define COLLIDER_g168 0x23 +#define COLLIDER_o368 0x22 +#define COLLIDER_o367 0x21 +#define COLLIDER_o527 0x20 +#define COLLIDER_o380 0x1F +#define COLLIDER_o457 0x1E +#define COLLIDER_o470 0x1D +#define COLLIDER_o474 0x1C +#define COLLIDER_o364 0x1B +#define COLLIDER_o361 0x1A +#define COLLIDER_kaidan 0x19 +#define COLLIDER_k_8 0x18 +#define COLLIDER_k8 0x17 +#define COLLIDER_k_7 0x16 +#define COLLIDER_k7 0x15 +#define COLLIDER_k_6 0x14 +#define COLLIDER_k6 0x13 +#define COLLIDER_k_5 0x12 +#define COLLIDER_k5 0x11 +#define COLLIDER_k_4 0x10 +#define COLLIDER_k4 0xF +#define COLLIDER_k_3 0xE +#define COLLIDER_k3 0xD +#define COLLIDER_k_2 0xC +#define COLLIDER_k2 0xB +#define COLLIDER_k_1 0xA +#define COLLIDER_k1 0x9 +#define COLLIDER_tt 0x8 +#define COLLIDER_tt3 0x7 +#define COLLIDER_tt2 0x6 +#define COLLIDER_tt1 0x5 +#define COLLIDER_bero 0x4 +#define COLLIDER_deilit2 0x3 +#define COLLIDER_deili2 0x2 +#define COLLIDER_deilit1 0x1 +#define COLLIDER_deili1 0x0 + +#define ZONE_Root 0xA +#define ZONE_bero 0x9 +#define ZONE_bero_1 0x8 +#define ZONE_yuka2 0x7 +#define ZONE_o330 0x6 +#define ZONE_o329 0x5 +#define ZONE_o328 0x4 +#define ZONE_yuka1 0x3 +#define ZONE_o334 0x2 +#define ZONE_o333 0x1 +#define ZONE_o332 0x0 + diff --git a/include/mapfs/obk_03_shape.h b/include/mapfs/obk_03_shape.h index b9e3fdcf18..bc577a7dc7 100644 --- a/include/mapfs/obk_03_shape.h +++ b/include/mapfs/obk_03_shape.h @@ -1,137 +1,138 @@ -#define MODEL_Root 0x88 -#define MODEL_g270 0x87 -#define MODEL_o654 0x86 -#define MODEL_o653 0x85 -#define MODEL_o652 0x84 -#define MODEL_o651 0x83 -#define MODEL_isu 0x82 -#define MODEL_i3 0x81 -#define MODEL_i2 0x80 -#define MODEL_i1 0x7F -#define MODEL_kuro 0x7E -#define MODEL_o504 0x7D -#define MODEL_h 0x7C -#define MODEL_hi18 0x7B -#define MODEL_hi17 0x7A -#define MODEL_hi16 0x79 -#define MODEL_hi15 0x78 -#define MODEL_hi14 0x77 -#define MODEL_hi13 0x76 -#define MODEL_hi12 0x75 -#define MODEL_hi11 0x74 -#define MODEL_hi10 0x73 -#define MODEL_hi9 0x72 -#define MODEL_hi8 0x71 -#define MODEL_hi7 0x70 -#define MODEL_hi6 0x6F -#define MODEL_hi5 0x6E -#define MODEL_hi4 0x6D -#define MODEL_hi3 0x6C -#define MODEL_hi2 0x6B -#define MODEL_hi1 0x6A -#define MODEL_g256 0x69 -#define MODEL_o642 0x68 -#define MODEL_o404 0x67 -#define MODEL_o506 0x66 -#define MODEL_moku 0x65 -#define MODEL_m4 0x64 -#define MODEL_m2 0x63 -#define MODEL_hikari 0x62 -#define MODEL_o630 0x61 -#define MODEL_o628 0x60 -#define MODEL_o339 0x5F -#define MODEL_o337 0x5E -#define MODEL_door 0x5D -#define MODEL_door2 0x5C -#define MODEL_door_2_2 0x5B -#define MODEL_door_2_1 0x5A -#define MODEL_door1 0x59 -#define MODEL_o494 0x58 -#define MODEL_door_1 0x57 -#define MODEL_kaidan 0x56 -#define MODEL_k_8 0x55 -#define MODEL_k8 0x54 -#define MODEL_k_7 0x53 -#define MODEL_k7 0x52 -#define MODEL_k_6 0x51 -#define MODEL_k6 0x50 -#define MODEL_k_5 0x4F -#define MODEL_k5 0x4E -#define MODEL_k_4 0x4D -#define MODEL_k4 0x4C -#define MODEL_k_3 0x4B -#define MODEL_k3 0x4A -#define MODEL_k_2 0x49 -#define MODEL_k2 0x48 -#define MODEL_k_1 0x47 -#define MODEL_k1 0x46 -#define MODEL_y_k 0x45 -#define MODEL_y_k_1 0x44 -#define MODEL_yk1 0x43 -#define MODEL_1f 0x42 -#define MODEL_g264 0x41 -#define MODEL_o610 0x40 -#define MODEL_yuka2 0x3F -#define MODEL_o639 0x3E -#define MODEL_o364 0x3D -#define MODEL_yuka2_2 0x3C -#define MODEL_kabe2 0x3B -#define MODEL_o609 0x3A -#define MODEL_kabe2_1 0x39 -#define MODEL_o348 0x38 -#define MODEL_o554 0x37 -#define MODEL_hashira 0x36 -#define MODEL_o551 0x35 -#define MODEL_o550 0x34 -#define MODEL_g175 0x33 -#define MODEL_g178 0x32 -#define MODEL_o362 0x31 -#define MODEL_g176 0x30 -#define MODEL_o359 0x2F -#define MODEL_o358 0x2E -#define MODEL_o357 0x2D -#define MODEL_o356 0x2C -#define MODEL_o355 0x2B -#define MODEL_o354 0x2A -#define MODEL_o353 0x29 -#define MODEL_botan 0x28 -#define MODEL_o605 0x27 -#define MODEL_o604 0x26 -#define MODEL_o292 0x25 -#define MODEL_door_kabe 0x24 -#define MODEL_door_kage 0x23 -#define MODEL_o545 0x22 -#define MODEL_g269 0x21 -#define MODEL_o644 0x20 -#define MODEL_kage_no 0x1F -#define MODEL_kage 0x1E -#define MODEL_g211 0x1D -#define MODEL_o507 0x1C -#define MODEL_o403 0x1B -#define MODEL_o601 0x1A -#define MODEL_o570 0x19 -#define MODEL_o569 0x18 -#define MODEL_o472 0x17 -#define MODEL_o607 0x16 -#define MODEL_o374 0x15 -#define MODEL_o602 0x14 -#define MODEL_o657 0x13 -#define MODEL_o571 0x12 -#define MODEL_o567 0x11 -#define MODEL_o658 0x10 -#define MODEL_o627 0xF -#define MODEL_o371 0xE -#define MODEL_o600 0xD -#define MODEL_o430 0xC -#define MODEL_o434 0xB -#define MODEL_o432 0xA -#define MODEL_o431 0x9 -#define MODEL_o485 0x8 -#define MODEL_o474 0x7 -#define MODEL_o552 0x6 -#define MODEL_o655 0x5 -#define MODEL_o492 0x4 -#define MODEL_kabe_1 0x3 -#define MODEL_o608 0x2 -#define MODEL_o650 0x1 -#define MODEL_o643 0x0 +#define MODEL_Root 0x88 +#define MODEL_g270 0x87 +#define MODEL_o654 0x86 +#define MODEL_o653 0x85 +#define MODEL_o652 0x84 +#define MODEL_o651 0x83 +#define MODEL_isu 0x82 +#define MODEL_i3 0x81 +#define MODEL_i2 0x80 +#define MODEL_i1 0x7F +#define MODEL_kuro 0x7E +#define MODEL_o504 0x7D +#define MODEL_h 0x7C +#define MODEL_hi18 0x7B +#define MODEL_hi17 0x7A +#define MODEL_hi16 0x79 +#define MODEL_hi15 0x78 +#define MODEL_hi14 0x77 +#define MODEL_hi13 0x76 +#define MODEL_hi12 0x75 +#define MODEL_hi11 0x74 +#define MODEL_hi10 0x73 +#define MODEL_hi9 0x72 +#define MODEL_hi8 0x71 +#define MODEL_hi7 0x70 +#define MODEL_hi6 0x6F +#define MODEL_hi5 0x6E +#define MODEL_hi4 0x6D +#define MODEL_hi3 0x6C +#define MODEL_hi2 0x6B +#define MODEL_hi1 0x6A +#define MODEL_g256 0x69 +#define MODEL_o642 0x68 +#define MODEL_o404 0x67 +#define MODEL_o506 0x66 +#define MODEL_moku 0x65 +#define MODEL_m4 0x64 +#define MODEL_m2 0x63 +#define MODEL_hikari 0x62 +#define MODEL_o630 0x61 +#define MODEL_o628 0x60 +#define MODEL_o339 0x5F +#define MODEL_o337 0x5E +#define MODEL_door 0x5D +#define MODEL_door2 0x5C +#define MODEL_door_2_2 0x5B +#define MODEL_door_2_1 0x5A +#define MODEL_door1 0x59 +#define MODEL_o494 0x58 +#define MODEL_door_1 0x57 +#define MODEL_kaidan 0x56 +#define MODEL_k_8 0x55 +#define MODEL_k8 0x54 +#define MODEL_k_7 0x53 +#define MODEL_k7 0x52 +#define MODEL_k_6 0x51 +#define MODEL_k6 0x50 +#define MODEL_k_5 0x4F +#define MODEL_k5 0x4E +#define MODEL_k_4 0x4D +#define MODEL_k4 0x4C +#define MODEL_k_3 0x4B +#define MODEL_k3 0x4A +#define MODEL_k_2 0x49 +#define MODEL_k2 0x48 +#define MODEL_k_1 0x47 +#define MODEL_k1 0x46 +#define MODEL_y_k 0x45 +#define MODEL_y_k_1 0x44 +#define MODEL_yk1 0x43 +#define MODEL_1f 0x42 +#define MODEL_g264 0x41 +#define MODEL_o610 0x40 +#define MODEL_yuka2 0x3F +#define MODEL_o639 0x3E +#define MODEL_o364 0x3D +#define MODEL_yuka2_2 0x3C +#define MODEL_kabe2 0x3B +#define MODEL_o609 0x3A +#define MODEL_kabe2_1 0x39 +#define MODEL_o348 0x38 +#define MODEL_o554 0x37 +#define MODEL_hashira 0x36 +#define MODEL_o551 0x35 +#define MODEL_o550 0x34 +#define MODEL_g175 0x33 +#define MODEL_g178 0x32 +#define MODEL_o362 0x31 +#define MODEL_g176 0x30 +#define MODEL_o359 0x2F +#define MODEL_o358 0x2E +#define MODEL_o357 0x2D +#define MODEL_o356 0x2C +#define MODEL_o355 0x2B +#define MODEL_o354 0x2A +#define MODEL_o353 0x29 +#define MODEL_botan 0x28 +#define MODEL_o605 0x27 +#define MODEL_o604 0x26 +#define MODEL_o292 0x25 +#define MODEL_door_kabe 0x24 +#define MODEL_door_kage 0x23 +#define MODEL_o545 0x22 +#define MODEL_g269 0x21 +#define MODEL_o644 0x20 +#define MODEL_kage_no 0x1F +#define MODEL_kage 0x1E +#define MODEL_g211 0x1D +#define MODEL_o507 0x1C +#define MODEL_o403 0x1B +#define MODEL_o601 0x1A +#define MODEL_o570 0x19 +#define MODEL_o569 0x18 +#define MODEL_o472 0x17 +#define MODEL_o607 0x16 +#define MODEL_o374 0x15 +#define MODEL_o602 0x14 +#define MODEL_o657 0x13 +#define MODEL_o571 0x12 +#define MODEL_o567 0x11 +#define MODEL_o658 0x10 +#define MODEL_o627 0xF +#define MODEL_o371 0xE +#define MODEL_o600 0xD +#define MODEL_o430 0xC +#define MODEL_o434 0xB +#define MODEL_o432 0xA +#define MODEL_o431 0x9 +#define MODEL_o485 0x8 +#define MODEL_o474 0x7 +#define MODEL_o552 0x6 +#define MODEL_o655 0x5 +#define MODEL_o492 0x4 +#define MODEL_kabe_1 0x3 +#define MODEL_o608 0x2 +#define MODEL_o650 0x1 +#define MODEL_o643 0x0 + diff --git a/include/mapfs/obk_04_hit.h b/include/mapfs/obk_04_hit.h index d0286f60a4..2fbaad25b1 100644 --- a/include/mapfs/obk_04_hit.h +++ b/include/mapfs/obk_04_hit.h @@ -1,21 +1,30 @@ -#define COLLIDER_Root 0x14 -#define COLLIDER_hip 0x13 -#define COLLIDER_hip1 0x12 -#define COLLIDER_g146 0x11 -#define COLLIDER_o335 0x10 -#define COLLIDER_o334 0xF -#define COLLIDER_k3 0xE -#define COLLIDER_o332 0xD -#define COLLIDER_o318 0xC -#define COLLIDER_k2 0xB -#define COLLIDER_o350 0xA -#define COLLIDER_o349 0x9 -#define COLLIDER_o347 0x8 -#define COLLIDER_k1 0x7 -#define COLLIDER_o326 0x6 -#define COLLIDER_kabe_1 0x5 -#define COLLIDER_tt 0x4 -#define COLLIDER_tt1 0x3 -#define COLLIDER_bero 0x2 -#define COLLIDER_deilit 0x1 -#define COLLIDER_deili 0x0 +#define COLLIDER_Root 0x14 +#define COLLIDER_hip 0x13 +#define COLLIDER_hip1 0x12 +#define COLLIDER_g146 0x11 +#define COLLIDER_o335 0x10 +#define COLLIDER_o334 0xF +#define COLLIDER_k3 0xE +#define COLLIDER_o332 0xD +#define COLLIDER_o318 0xC +#define COLLIDER_k2 0xB +#define COLLIDER_o350 0xA +#define COLLIDER_o349 0x9 +#define COLLIDER_o347 0x8 +#define COLLIDER_k1 0x7 +#define COLLIDER_o326 0x6 +#define COLLIDER_kabe_1 0x5 +#define COLLIDER_tt 0x4 +#define COLLIDER_tt1 0x3 +#define COLLIDER_bero 0x2 +#define COLLIDER_deilit 0x1 +#define COLLIDER_deili 0x0 + +#define ZONE_Root 0x6 +#define ZONE_g127 0x5 +#define ZONE_o297 0x4 +#define ZONE_o296 0x3 +#define ZONE_o295 0x2 +#define ZONE_g124 0x1 +#define ZONE_o291 0x0 + diff --git a/include/mapfs/obk_04_shape.h b/include/mapfs/obk_04_shape.h index d812395c05..75ad208b23 100644 --- a/include/mapfs/obk_04_shape.h +++ b/include/mapfs/obk_04_shape.h @@ -1,34 +1,35 @@ -#define MODEL_Root 0x21 -#define MODEL_moku 0x20 -#define MODEL_m2 0x1F -#define MODEL_m1 0x1E -#define MODEL_o400 0x1D -#define MODEL_h 0x1C -#define MODEL_hi6 0x1B -#define MODEL_hi5 0x1A -#define MODEL_hi4 0x19 -#define MODEL_hi3 0x18 -#define MODEL_hi2 0x17 -#define MODEL_hi1 0x16 -#define MODEL_Default 0x15 -#define MODEL_o378 0x14 -#define MODEL_g151 0x13 -#define MODEL_o358 0x12 -#define MODEL_door 0x11 -#define MODEL_door_off3 0x10 -#define MODEL_door_off2 0xF -#define MODEL_g154 0xE -#define MODEL_door_off1 0xD -#define MODEL_door_1 0xC -#define MODEL_door1 0xB -#define MODEL_kabe 0xA -#define MODEL_o371 0x9 -#define MODEL_o372 0x8 -#define MODEL_o370 0x7 -#define MODEL_o373 0x6 -#define MODEL_o368 0x5 -#define MODEL_kabe_1 0x4 -#define MODEL_kuro 0x3 -#define MODEL_yuka 0x2 -#define MODEL_o401 0x1 -#define MODEL_o318 0x0 +#define MODEL_Root 0x21 +#define MODEL_moku 0x20 +#define MODEL_m2 0x1F +#define MODEL_m1 0x1E +#define MODEL_o400 0x1D +#define MODEL_h 0x1C +#define MODEL_hi6 0x1B +#define MODEL_hi5 0x1A +#define MODEL_hi4 0x19 +#define MODEL_hi3 0x18 +#define MODEL_hi2 0x17 +#define MODEL_hi1 0x16 +#define MODEL_Default 0x15 +#define MODEL_o378 0x14 +#define MODEL_g151 0x13 +#define MODEL_o358 0x12 +#define MODEL_door 0x11 +#define MODEL_door_off3 0x10 +#define MODEL_door_off2 0xF +#define MODEL_g154 0xE +#define MODEL_door_off1 0xD +#define MODEL_door_1 0xC +#define MODEL_door1 0xB +#define MODEL_kabe 0xA +#define MODEL_o371 0x9 +#define MODEL_o372 0x8 +#define MODEL_o370 0x7 +#define MODEL_o373 0x6 +#define MODEL_o368 0x5 +#define MODEL_kabe_1 0x4 +#define MODEL_kuro 0x3 +#define MODEL_yuka 0x2 +#define MODEL_o401 0x1 +#define MODEL_o318 0x0 + diff --git a/include/mapfs/obk_05_hit.h b/include/mapfs/obk_05_hit.h index 6ebf8847a8..802c4ae793 100644 --- a/include/mapfs/obk_05_hit.h +++ b/include/mapfs/obk_05_hit.h @@ -1,23 +1,32 @@ -#define COLLIDER_Root 0x16 -#define COLLIDER_g160 0x15 -#define COLLIDER_o420 0x14 -#define COLLIDER_o415 0x13 -#define COLLIDER_hip 0x12 -#define COLLIDER_hip1 0x11 -#define COLLIDER_bero 0x10 -#define COLLIDER_deirit1 0xF -#define COLLIDER_deili1 0xE -#define COLLIDER_tt 0xD -#define COLLIDER_tt1 0xC -#define COLLIDER_isu 0xB -#define COLLIDER_i3 0xA -#define COLLIDER_i2 0x9 -#define COLLIDER_i1 0x8 -#define COLLIDER_hako_2 0x7 -#define COLLIDER_o339 0x6 -#define COLLIDER_o308 0x5 -#define COLLIDER_kabe 0x4 -#define COLLIDER_o280 0x3 -#define COLLIDER_o325 0x2 -#define COLLIDER_o324 0x1 -#define COLLIDER_o323 0x0 +#define COLLIDER_Root 0x16 +#define COLLIDER_g160 0x15 +#define COLLIDER_o420 0x14 +#define COLLIDER_o415 0x13 +#define COLLIDER_hip 0x12 +#define COLLIDER_hip1 0x11 +#define COLLIDER_bero 0x10 +#define COLLIDER_deirit1 0xF +#define COLLIDER_deili1 0xE +#define COLLIDER_tt 0xD +#define COLLIDER_tt1 0xC +#define COLLIDER_isu 0xB +#define COLLIDER_i3 0xA +#define COLLIDER_i2 0x9 +#define COLLIDER_i1 0x8 +#define COLLIDER_hako_2 0x7 +#define COLLIDER_o339 0x6 +#define COLLIDER_o308 0x5 +#define COLLIDER_kabe 0x4 +#define COLLIDER_o280 0x3 +#define COLLIDER_o325 0x2 +#define COLLIDER_o324 0x1 +#define COLLIDER_o323 0x0 + +#define ZONE_Root 0x6 +#define ZONE_g128 0x5 +#define ZONE_o297 0x4 +#define ZONE_o296 0x3 +#define ZONE_o295 0x2 +#define ZONE_g127 0x1 +#define ZONE_o294 0x0 + diff --git a/include/mapfs/obk_05_shape.h b/include/mapfs/obk_05_shape.h index 9a15fa1c84..fe5368fff7 100644 --- a/include/mapfs/obk_05_shape.h +++ b/include/mapfs/obk_05_shape.h @@ -1,55 +1,56 @@ -#define MODEL_Root 0x36 -#define MODEL_g168 0x35 -#define MODEL_door 0x34 -#define MODEL_door_1 0x33 -#define MODEL_door1b 0x32 -#define MODEL_door1 0x31 -#define MODEL_h 0x30 -#define MODEL_o394 0x2F -#define MODEL_o393 0x2E -#define MODEL_o392 0x2D -#define MODEL_o391 0x2C -#define MODEL_o390 0x2B -#define MODEL_o389 0x2A -#define MODEL_hi6 0x29 -#define MODEL_hi5 0x28 -#define MODEL_hi4 0x27 -#define MODEL_hi3 0x26 -#define MODEL_hi2 0x25 -#define MODEL_hi1 0x24 -#define MODEL_moku 0x23 -#define MODEL_m2 0x22 -#define MODEL_m1 0x21 -#define MODEL_denki 0x20 -#define MODEL_r1 0x1F -#define MODEL_hikari 0x1E -#define MODEL_o345 0x1D -#define MODEL_isu 0x1C -#define MODEL_i3 0x1B -#define MODEL_i2 0x1A -#define MODEL_i1 0x19 -#define MODEL_tubo 0x18 -#define MODEL_o305 0x17 -#define MODEL_z 0x16 -#define MODEL_kuro 0x15 -#define MODEL_o425 0x14 -#define MODEL_o401 0x13 -#define MODEL_o428 0x12 -#define MODEL_o404 0x11 -#define MODEL_o403 0x10 -#define MODEL_o402 0xF -#define MODEL_mado 0xE -#define MODEL_o466 0xD -#define MODEL_kabe_ue 0xC -#define MODEL_kabe 0xB -#define MODEL_kabe_ki 0xA -#define MODEL_yuka 0x9 -#define MODEL_ana 0x8 -#define MODEL_yuka_2 0x7 -#define MODEL_yuka_1 0x6 -#define MODEL_ue 0x5 -#define MODEL_o341 0x4 -#define MODEL_o342 0x3 -#define MODEL_o340 0x2 -#define MODEL_g166 0x1 -#define MODEL_o467 0x0 +#define MODEL_Root 0x36 +#define MODEL_g168 0x35 +#define MODEL_door 0x34 +#define MODEL_door_1 0x33 +#define MODEL_door1b 0x32 +#define MODEL_door1 0x31 +#define MODEL_h 0x30 +#define MODEL_o394 0x2F +#define MODEL_o393 0x2E +#define MODEL_o392 0x2D +#define MODEL_o391 0x2C +#define MODEL_o390 0x2B +#define MODEL_o389 0x2A +#define MODEL_hi6 0x29 +#define MODEL_hi5 0x28 +#define MODEL_hi4 0x27 +#define MODEL_hi3 0x26 +#define MODEL_hi2 0x25 +#define MODEL_hi1 0x24 +#define MODEL_moku 0x23 +#define MODEL_m2 0x22 +#define MODEL_m1 0x21 +#define MODEL_denki 0x20 +#define MODEL_r1 0x1F +#define MODEL_hikari 0x1E +#define MODEL_o345 0x1D +#define MODEL_isu 0x1C +#define MODEL_i3 0x1B +#define MODEL_i2 0x1A +#define MODEL_i1 0x19 +#define MODEL_tubo 0x18 +#define MODEL_o305 0x17 +#define MODEL_z 0x16 +#define MODEL_kuro 0x15 +#define MODEL_o425 0x14 +#define MODEL_o401 0x13 +#define MODEL_o428 0x12 +#define MODEL_o404 0x11 +#define MODEL_o403 0x10 +#define MODEL_o402 0xF +#define MODEL_mado 0xE +#define MODEL_o466 0xD +#define MODEL_kabe_ue 0xC +#define MODEL_kabe 0xB +#define MODEL_kabe_ki 0xA +#define MODEL_yuka 0x9 +#define MODEL_ana 0x8 +#define MODEL_yuka_2 0x7 +#define MODEL_yuka_1 0x6 +#define MODEL_ue 0x5 +#define MODEL_o341 0x4 +#define MODEL_o342 0x3 +#define MODEL_o340 0x2 +#define MODEL_g166 0x1 +#define MODEL_o467 0x0 + diff --git a/include/mapfs/obk_06_hit.h b/include/mapfs/obk_06_hit.h index 66f7b29204..3fe830d1a1 100644 --- a/include/mapfs/obk_06_hit.h +++ b/include/mapfs/obk_06_hit.h @@ -1,24 +1,36 @@ -#define COLLIDER_Root 0x17 -#define COLLIDER_g130 0x16 -#define COLLIDER_o323 0x15 -#define COLLIDER_tt 0x14 -#define COLLIDER_tt1 0x13 -#define COLLIDER_kabe2 0x12 -#define COLLIDER_kabe_2 0x11 -#define COLLIDER_o282 0x10 -#define COLLIDER_o287 0xF -#define COLLIDER_o303 0xE -#define COLLIDER_o312 0xD -#define COLLIDER_hon 0xC -#define COLLIDER_o368 0xB -#define COLLIDER_o285 0xA -#define COLLIDER_o290 0x9 -#define COLLIDER_o322 0x8 -#define COLLIDER_kagu 0x7 -#define COLLIDER_tukue 0x6 -#define COLLIDER_o270 0x5 -#define COLLIDER_isu 0x4 -#define COLLIDER_o212 0x3 -#define COLLIDER_bero 0x2 -#define COLLIDER_deirit 0x1 -#define COLLIDER__deili 0x0 +#define COLLIDER_Root 0x17 +#define COLLIDER_g130 0x16 +#define COLLIDER_o323 0x15 +#define COLLIDER_tt 0x14 +#define COLLIDER_tt1 0x13 +#define COLLIDER_kabe2 0x12 +#define COLLIDER_kabe_2 0x11 +#define COLLIDER_o282 0x10 +#define COLLIDER_o287 0xF +#define COLLIDER_o303 0xE +#define COLLIDER_o312 0xD +#define COLLIDER_hon 0xC +#define COLLIDER_o368 0xB +#define COLLIDER_o285 0xA +#define COLLIDER_o290 0x9 +#define COLLIDER_o322 0x8 +#define COLLIDER_kagu 0x7 +#define COLLIDER_tukue 0x6 +#define COLLIDER_o270 0x5 +#define COLLIDER_isu 0x4 +#define COLLIDER_o212 0x3 +#define COLLIDER_bero 0x2 +#define COLLIDER_deirit 0x1 +#define COLLIDER__deili 0x0 + +#define ZONE_Root 0x9 +#define ZONE_Default 0x8 +#define ZONE_o319 0x7 +#define ZONE_o320 0x6 +#define ZONE_g132 0x5 +#define ZONE_o317 0x4 +#define ZONE_o316 0x3 +#define ZONE_o315 0x2 +#define ZONE_g131 0x1 +#define ZONE_o314 0x0 + diff --git a/include/mapfs/obk_06_shape.h b/include/mapfs/obk_06_shape.h index d4387682ba..8d7f2c9d21 100644 --- a/include/mapfs/obk_06_shape.h +++ b/include/mapfs/obk_06_shape.h @@ -1,102 +1,103 @@ -#define MODEL_Root 0x65 -#define MODEL_g177 0x64 -#define MODEL_o528 0x63 -#define MODEL_o527 0x62 -#define MODEL_o526 0x61 -#define MODEL_g166 0x60 -#define MODEL_o479 0x5F -#define MODEL_g133 0x5E -#define MODEL_o323 0x5D -#define MODEL_h 0x5C -#define MODEL_hi6 0x5B -#define MODEL_hi5 0x5A -#define MODEL_hi4 0x59 -#define MODEL_hi3 0x58 -#define MODEL_hi2 0x57 -#define MODEL_hi1 0x56 -#define MODEL_g136 0x55 -#define MODEL_g164 0x54 -#define MODEL_o384 0x53 -#define MODEL_o354 0x52 -#define MODEL_o472 0x51 -#define MODEL_o467 0x50 -#define MODEL_o385 0x4F -#define MODEL_o388 0x4E -#define MODEL_o396 0x4D -#define MODEL_o395 0x4C -#define MODEL_o397 0x4B -#define MODEL_g167 0x4A -#define MODEL_o482 0x49 -#define MODEL_o481 0x48 -#define MODEL_o480 0x47 -#define MODEL_o517 0x46 -#define MODEL_g168 0x45 -#define MODEL_o485 0x44 -#define MODEL_o484 0x43 -#define MODEL_o483 0x42 -#define MODEL_g169 0x41 -#define MODEL_o488 0x40 -#define MODEL_o487 0x3F -#define MODEL_o486 0x3E -#define MODEL_g170 0x3D -#define MODEL_o491 0x3C -#define MODEL_o490 0x3B -#define MODEL_o489 0x3A -#define MODEL_g172 0x39 -#define MODEL_o498 0x38 -#define MODEL_o497 0x37 -#define MODEL_o496 0x36 -#define MODEL_g171 0x35 -#define MODEL_o516 0x34 -#define MODEL_o495 0x33 -#define MODEL_o493 0x32 -#define MODEL_o492 0x31 -#define MODEL_g173 0x30 -#define MODEL_o501 0x2F -#define MODEL_g175 0x2E -#define MODEL_o515 0x2D -#define MODEL_o508 0x2C -#define MODEL_o507 0x2B -#define MODEL_o506 0x2A -#define MODEL_o505 0x29 -#define MODEL_o504 0x28 -#define MODEL_g176 0x27 -#define MODEL_o512 0x26 -#define MODEL_o511 0x25 -#define MODEL_o510 0x24 -#define MODEL_o509 0x23 -#define MODEL_o513 0x22 -#define MODEL_hondana 0x21 -#define MODEL_o548 0x20 -#define MODEL_o546 0x1F -#define MODEL_o290 0x1E -#define MODEL_bom 0x1D -#define MODEL_bom_nashi 0x1C -#define MODEL_o282 0x1B -#define MODEL_o287 0x1A -#define MODEL_bom2 0x19 -#define MODEL_bom_ato 0x18 -#define MODEL_bom1 0x17 -#define MODEL_bom_maehibi 0x16 -#define MODEL_bom_mae2 0x15 -#define MODEL_bom_mae1 0x14 -#define MODEL_g135 0x13 -#define MODEL_o327 0x12 -#define MODEL_o326 0x11 -#define MODEL_o325 0x10 -#define MODEL_yuka 0xF -#define MODEL_o286 0xE -#define MODEL_o223 0xD -#define MODEL_o285 0xC -#define MODEL_o309 0xB -#define MODEL_kagu 0xA -#define MODEL_tukue 0x9 -#define MODEL_o531 0x8 -#define MODEL_o270 0x7 -#define MODEL_isu 0x6 -#define MODEL_o211 0x5 -#define MODEL_o212 0x4 -#define MODEL_kabe2 0x3 -#define MODEL_o304 0x2 -#define MODEL_kabe_2 0x1 -#define MODEL_kuro 0x0 +#define MODEL_Root 0x65 +#define MODEL_g177 0x64 +#define MODEL_o528 0x63 +#define MODEL_o527 0x62 +#define MODEL_o526 0x61 +#define MODEL_g166 0x60 +#define MODEL_o479 0x5F +#define MODEL_g133 0x5E +#define MODEL_o323 0x5D +#define MODEL_h 0x5C +#define MODEL_hi6 0x5B +#define MODEL_hi5 0x5A +#define MODEL_hi4 0x59 +#define MODEL_hi3 0x58 +#define MODEL_hi2 0x57 +#define MODEL_hi1 0x56 +#define MODEL_g136 0x55 +#define MODEL_g164 0x54 +#define MODEL_o384 0x53 +#define MODEL_o354 0x52 +#define MODEL_o472 0x51 +#define MODEL_o467 0x50 +#define MODEL_o385 0x4F +#define MODEL_o388 0x4E +#define MODEL_o396 0x4D +#define MODEL_o395 0x4C +#define MODEL_o397 0x4B +#define MODEL_g167 0x4A +#define MODEL_o482 0x49 +#define MODEL_o481 0x48 +#define MODEL_o480 0x47 +#define MODEL_o517 0x46 +#define MODEL_g168 0x45 +#define MODEL_o485 0x44 +#define MODEL_o484 0x43 +#define MODEL_o483 0x42 +#define MODEL_g169 0x41 +#define MODEL_o488 0x40 +#define MODEL_o487 0x3F +#define MODEL_o486 0x3E +#define MODEL_g170 0x3D +#define MODEL_o491 0x3C +#define MODEL_o490 0x3B +#define MODEL_o489 0x3A +#define MODEL_g172 0x39 +#define MODEL_o498 0x38 +#define MODEL_o497 0x37 +#define MODEL_o496 0x36 +#define MODEL_g171 0x35 +#define MODEL_o516 0x34 +#define MODEL_o495 0x33 +#define MODEL_o493 0x32 +#define MODEL_o492 0x31 +#define MODEL_g173 0x30 +#define MODEL_o501 0x2F +#define MODEL_g175 0x2E +#define MODEL_o515 0x2D +#define MODEL_o508 0x2C +#define MODEL_o507 0x2B +#define MODEL_o506 0x2A +#define MODEL_o505 0x29 +#define MODEL_o504 0x28 +#define MODEL_g176 0x27 +#define MODEL_o512 0x26 +#define MODEL_o511 0x25 +#define MODEL_o510 0x24 +#define MODEL_o509 0x23 +#define MODEL_o513 0x22 +#define MODEL_hondana 0x21 +#define MODEL_o548 0x20 +#define MODEL_o546 0x1F +#define MODEL_o290 0x1E +#define MODEL_bom 0x1D +#define MODEL_bom_nashi 0x1C +#define MODEL_o282 0x1B +#define MODEL_o287 0x1A +#define MODEL_bom2 0x19 +#define MODEL_bom_ato 0x18 +#define MODEL_bom1 0x17 +#define MODEL_bom_maehibi 0x16 +#define MODEL_bom_mae2 0x15 +#define MODEL_bom_mae1 0x14 +#define MODEL_g135 0x13 +#define MODEL_o327 0x12 +#define MODEL_o326 0x11 +#define MODEL_o325 0x10 +#define MODEL_yuka 0xF +#define MODEL_o286 0xE +#define MODEL_o223 0xD +#define MODEL_o285 0xC +#define MODEL_o309 0xB +#define MODEL_kagu 0xA +#define MODEL_tukue 0x9 +#define MODEL_o531 0x8 +#define MODEL_o270 0x7 +#define MODEL_isu 0x6 +#define MODEL_o211 0x5 +#define MODEL_o212 0x4 +#define MODEL_kabe2 0x3 +#define MODEL_o304 0x2 +#define MODEL_kabe_2 0x1 +#define MODEL_kuro 0x0 + diff --git a/include/mapfs/obk_07_hit.h b/include/mapfs/obk_07_hit.h index d46ee56218..1919cafea6 100644 --- a/include/mapfs/obk_07_hit.h +++ b/include/mapfs/obk_07_hit.h @@ -1,28 +1,37 @@ -#define COLLIDER_Root 0x1B -#define COLLIDER_g150 0x1A -#define COLLIDER_ti 0x19 -#define COLLIDER_t 0x18 -#define COLLIDER_g137 0x17 -#define COLLIDER_mu 0x16 -#define COLLIDER_o344 0x15 -#define COLLIDER_g131 0x14 -#define COLLIDER_o345 0x13 -#define COLLIDER_o303 0x12 -#define COLLIDER_o332 0x11 -#define COLLIDER_o330 0x10 -#define COLLIDER_o329 0xF -#define COLLIDER_g122 0xE -#define COLLIDER_o324 0xD -#define COLLIDER_o327 0xC -#define COLLIDER_o305 0xB -#define COLLIDER_o290 0xA -#define COLLIDER_o333 0x9 -#define COLLIDER_o336 0x8 -#define COLLIDER_g120 0x7 -#define COLLIDER_o283 0x6 -#define COLLIDER_o358 0x5 -#define COLLIDER_tt 0x4 -#define COLLIDER_tt1 0x3 -#define COLLIDER_bero 0x2 -#define COLLIDER_deilit 0x1 -#define COLLIDER_deili 0x0 +#define COLLIDER_Root 0x1B +#define COLLIDER_g150 0x1A +#define COLLIDER_ti 0x19 +#define COLLIDER_t 0x18 +#define COLLIDER_g137 0x17 +#define COLLIDER_mu 0x16 +#define COLLIDER_o344 0x15 +#define COLLIDER_g131 0x14 +#define COLLIDER_o345 0x13 +#define COLLIDER_o303 0x12 +#define COLLIDER_o332 0x11 +#define COLLIDER_o330 0x10 +#define COLLIDER_o329 0xF +#define COLLIDER_g122 0xE +#define COLLIDER_o324 0xD +#define COLLIDER_o327 0xC +#define COLLIDER_o305 0xB +#define COLLIDER_o290 0xA +#define COLLIDER_o333 0x9 +#define COLLIDER_o336 0x8 +#define COLLIDER_g120 0x7 +#define COLLIDER_o283 0x6 +#define COLLIDER_o358 0x5 +#define COLLIDER_tt 0x4 +#define COLLIDER_tt1 0x3 +#define COLLIDER_bero 0x2 +#define COLLIDER_deilit 0x1 +#define COLLIDER_deili 0x0 + +#define ZONE_Root 0x6 +#define ZONE_g135 0x5 +#define ZONE_o335 0x4 +#define ZONE_g134 0x3 +#define ZONE_o334 0x2 +#define ZONE_o333 0x1 +#define ZONE_o332 0x0 + diff --git a/include/mapfs/obk_07_shape.h b/include/mapfs/obk_07_shape.h index 61c7c67076..9dee33b798 100644 --- a/include/mapfs/obk_07_shape.h +++ b/include/mapfs/obk_07_shape.h @@ -1,75 +1,76 @@ -#define MODEL_Root 0x4A -#define MODEL_g159 0x49 -#define MODEL_o416 0x48 -#define MODEL_moku 0x47 -#define MODEL_m2 0x46 -#define MODEL_m1 0x45 -#define MODEL_maki 0x44 -#define MODEL_ma 0x43 -#define MODEL_h 0x42 -#define MODEL_hi6 0x41 -#define MODEL_hi5 0x40 -#define MODEL_hi4 0x3F -#define MODEL_hi3 0x3E -#define MODEL_hi2 0x3D -#define MODEL_hi1 0x3C -#define MODEL_chiku 0x3B -#define MODEL_g150 0x3A -#define MODEL_o359 0x39 -#define MODEL_o368 0x38 -#define MODEL_hako 0x37 -#define MODEL_bo 0x36 -#define MODEL_o370 0x35 -#define MODEL_bou 0x34 -#define MODEL_ra 0x33 -#define MODEL_rap 0x32 -#define MODEL_rec 0x31 -#define MODEL_reco 0x30 -#define MODEL_door 0x2F -#define MODEL_door1b 0x2E -#define MODEL_door_1 0x2D -#define MODEL_obj 0x2C -#define MODEL_i3 0x2B -#define MODEL_o285 0x2A -#define MODEL_o284 0x29 -#define MODEL_i2 0x28 -#define MODEL_o320 0x27 -#define MODEL_o319 0x26 -#define MODEL_i1 0x25 -#define MODEL_o318 0x24 -#define MODEL_o317 0x23 -#define MODEL_t_nuno 0x22 -#define MODEL_tukue 0x21 -#define MODEL_tubo 0x20 -#define MODEL_gaku 0x1F -#define MODEL_danro 0x1E -#define MODEL_o404 0x1D -#define MODEL_o403 0x1C -#define MODEL_o402 0x1B -#define MODEL_o400 0x1A -#define MODEL_o398 0x19 -#define MODEL_o395 0x18 -#define MODEL_hashira 0x17 -#define MODEL_o383 0x16 -#define MODEL_hikari 0x15 -#define MODEL_rou 0x14 -#define MODEL_ha3 0x13 -#define MODEL_ha2 0x12 -#define MODEL_ha1 0x11 -#define MODEL_ten 0x10 -#define MODEL_o341 0xF -#define MODEL_o340 0xE -#define MODEL_o339 0xD -#define MODEL_kabe_07 0xC -#define MODEL_mado 0xB -#define MODEL_kabe_mado 0xA -#define MODEL_kabe_ue 0x9 -#define MODEL_kabe 0x8 -#define MODEL_kabe_ki 0x7 -#define MODEL_kuro 0x6 -#define MODEL_yuka_07 0x5 -#define MODEL_o316 0x4 -#define MODEL_o315 0x3 -#define MODEL_o324 0x2 -#define MODEL_g158 0x1 -#define MODEL_o405 0x0 +#define MODEL_Root 0x4A +#define MODEL_g159 0x49 +#define MODEL_o416 0x48 +#define MODEL_moku 0x47 +#define MODEL_m2 0x46 +#define MODEL_m1 0x45 +#define MODEL_maki 0x44 +#define MODEL_ma 0x43 +#define MODEL_h 0x42 +#define MODEL_hi6 0x41 +#define MODEL_hi5 0x40 +#define MODEL_hi4 0x3F +#define MODEL_hi3 0x3E +#define MODEL_hi2 0x3D +#define MODEL_hi1 0x3C +#define MODEL_chiku 0x3B +#define MODEL_g150 0x3A +#define MODEL_o359 0x39 +#define MODEL_o368 0x38 +#define MODEL_hako 0x37 +#define MODEL_bo 0x36 +#define MODEL_o370 0x35 +#define MODEL_bou 0x34 +#define MODEL_ra 0x33 +#define MODEL_rap 0x32 +#define MODEL_rec 0x31 +#define MODEL_reco 0x30 +#define MODEL_door 0x2F +#define MODEL_door1b 0x2E +#define MODEL_door_1 0x2D +#define MODEL_obj 0x2C +#define MODEL_i3 0x2B +#define MODEL_o285 0x2A +#define MODEL_o284 0x29 +#define MODEL_i2 0x28 +#define MODEL_o320 0x27 +#define MODEL_o319 0x26 +#define MODEL_i1 0x25 +#define MODEL_o318 0x24 +#define MODEL_o317 0x23 +#define MODEL_t_nuno 0x22 +#define MODEL_tukue 0x21 +#define MODEL_tubo 0x20 +#define MODEL_gaku 0x1F +#define MODEL_danro 0x1E +#define MODEL_o404 0x1D +#define MODEL_o403 0x1C +#define MODEL_o402 0x1B +#define MODEL_o400 0x1A +#define MODEL_o398 0x19 +#define MODEL_o395 0x18 +#define MODEL_hashira 0x17 +#define MODEL_o383 0x16 +#define MODEL_hikari 0x15 +#define MODEL_rou 0x14 +#define MODEL_ha3 0x13 +#define MODEL_ha2 0x12 +#define MODEL_ha1 0x11 +#define MODEL_ten 0x10 +#define MODEL_o341 0xF +#define MODEL_o340 0xE +#define MODEL_o339 0xD +#define MODEL_kabe_07 0xC +#define MODEL_mado 0xB +#define MODEL_kabe_mado 0xA +#define MODEL_kabe_ue 0x9 +#define MODEL_kabe 0x8 +#define MODEL_kabe_ki 0x7 +#define MODEL_kuro 0x6 +#define MODEL_yuka_07 0x5 +#define MODEL_o316 0x4 +#define MODEL_o315 0x3 +#define MODEL_o324 0x2 +#define MODEL_g158 0x1 +#define MODEL_o405 0x0 + diff --git a/include/mapfs/obk_08_hit.h b/include/mapfs/obk_08_hit.h index 1a237e0e84..ee85e76cb8 100644 --- a/include/mapfs/obk_08_hit.h +++ b/include/mapfs/obk_08_hit.h @@ -1,23 +1,32 @@ -#define COLLIDER_Root 0x16 -#define COLLIDER_tansu 0x15 -#define COLLIDER_tansu_2 0x14 -#define COLLIDER_tansu2 0x13 -#define COLLIDER_tansu_3 0x12 -#define COLLIDER_o373 0x11 -#define COLLIDER_tansu3 0x10 -#define COLLIDER_tansu_1 0xF -#define COLLIDER_o372 0xE -#define COLLIDER_tansu1 0xD -#define COLLIDER_kabe 0xC -#define COLLIDER_o360 0xB -#define COLLIDER_o343 0xA -#define COLLIDER_o355 0x9 -#define COLLIDER_o354 0x8 -#define COLLIDER_o353 0x7 -#define COLLIDER_o352 0x6 -#define COLLIDER_o313 0x5 -#define COLLIDER_tt 0x4 -#define COLLIDER_tt1 0x3 -#define COLLIDER_bero 0x2 -#define COLLIDER_deilit1 0x1 -#define COLLIDER_deili1 0x0 +#define COLLIDER_Root 0x16 +#define COLLIDER_tansu 0x15 +#define COLLIDER_tansu_2 0x14 +#define COLLIDER_tansu2 0x13 +#define COLLIDER_tansu_3 0x12 +#define COLLIDER_o373 0x11 +#define COLLIDER_tansu3 0x10 +#define COLLIDER_tansu_1 0xF +#define COLLIDER_o372 0xE +#define COLLIDER_tansu1 0xD +#define COLLIDER_kabe 0xC +#define COLLIDER_o360 0xB +#define COLLIDER_o343 0xA +#define COLLIDER_o355 0x9 +#define COLLIDER_o354 0x8 +#define COLLIDER_o353 0x7 +#define COLLIDER_o352 0x6 +#define COLLIDER_o313 0x5 +#define COLLIDER_tt 0x4 +#define COLLIDER_tt1 0x3 +#define COLLIDER_bero 0x2 +#define COLLIDER_deilit1 0x1 +#define COLLIDER_deili1 0x0 + +#define ZONE_Root 0x6 +#define ZONE_g126 0x5 +#define ZONE_o294 0x4 +#define ZONE_o293 0x3 +#define ZONE_o298 0x2 +#define ZONE_g125 0x1 +#define ZONE_o292 0x0 + diff --git a/include/mapfs/obk_08_shape.h b/include/mapfs/obk_08_shape.h index 94e02d5aa3..bbe494e021 100644 --- a/include/mapfs/obk_08_shape.h +++ b/include/mapfs/obk_08_shape.h @@ -1,91 +1,92 @@ -#define MODEL_Root 0x5A -#define MODEL_obj 0x59 -#define MODEL_tokei 0x58 -#define MODEL_kumo 0x57 -#define MODEL_o441 0x56 -#define MODEL_moku 0x55 -#define MODEL_moku2 0x54 -#define MODEL_moku1 0x53 -#define MODEL_hashira 0x52 -#define MODEL_hikari 0x51 -#define MODEL_ha3 0x50 -#define MODEL_ha2 0x4F -#define MODEL_ha1 0x4E -#define MODEL_o437 0x4D -#define MODEL_h 0x4C -#define MODEL_hi12 0x4B -#define MODEL_hi11 0x4A -#define MODEL_hi10 0x49 -#define MODEL_hi9 0x48 -#define MODEL_hi8 0x47 -#define MODEL_hi7 0x46 -#define MODEL_hi6 0x45 -#define MODEL_hi5 0x44 -#define MODEL_hi4 0x43 -#define MODEL_hi3 0x42 -#define MODEL_hi2 0x41 -#define MODEL_hi1 0x40 -#define MODEL_a 0x3F -#define MODEL_r1 0x3E -#define MODEL_o402 0x3D -#define MODEL_door 0x3C -#define MODEL_door_1 0x3B -#define MODEL_door1b 0x3A -#define MODEL_door1 0x39 -#define MODEL_mado_h 0x38 -#define MODEL_m4 0x37 -#define MODEL_m4_2 0x36 -#define MODEL_m42 0x35 -#define MODEL_m4_1 0x34 -#define MODEL_m41 0x33 -#define MODEL_m3 0x32 -#define MODEL_m3_2 0x31 -#define MODEL_m32 0x30 -#define MODEL_m3_1 0x2F -#define MODEL_m31 0x2E -#define MODEL_m2 0x2D -#define MODEL_m2_2 0x2C -#define MODEL_m22 0x2B -#define MODEL_m2_1 0x2A -#define MODEL_m21 0x29 -#define MODEL_m1 0x28 -#define MODEL_m1_2 0x27 -#define MODEL_m12 0x26 -#define MODEL_m1_1 0x25 -#define MODEL_m11 0x24 -#define MODEL_mado 0x23 -#define MODEL_mad 0x22 -#define MODEL_o375 0x21 -#define MODEL_bed 0x20 -#define MODEL_o308 0x1F -#define MODEL_o309 0x1E -#define MODEL_o312 0x1D -#define MODEL_tansu 0x1C -#define MODEL_tansu_3 0x1B -#define MODEL_tansu3 0x1A -#define MODEL_tansu_2 0x19 -#define MODEL_tansu_2_1 0x18 -#define MODEL_t2 0x17 -#define MODEL_t_2 0x16 -#define MODEL_t1 0x15 -#define MODEL_t_1 0x14 -#define MODEL_tansu2 0x13 -#define MODEL_n1 0x12 -#define MODEL_tansu_1 0x11 -#define MODEL_tansu1 0x10 -#define MODEL_kabe_08 0xF -#define MODEL_kabe_ue 0xE -#define MODEL_kabe 0xD -#define MODEL_kabe_ki 0xC -#define MODEL_kuro 0xB -#define MODEL_ten_08 0xA -#define MODEL_o351 0x9 -#define MODEL_o350 0x8 -#define MODEL_o349 0x7 -#define MODEL_yuka_08 0x6 -#define MODEL_yuka_jyu 0x5 -#define MODEL_yuka_2 0x4 -#define MODEL_yuka_1 0x3 -#define MODEL_yuka 0x2 -#define MODEL_Default 0x1 -#define MODEL_o438 0x0 +#define MODEL_Root 0x5A +#define MODEL_obj 0x59 +#define MODEL_tokei 0x58 +#define MODEL_kumo 0x57 +#define MODEL_o441 0x56 +#define MODEL_moku 0x55 +#define MODEL_moku2 0x54 +#define MODEL_moku1 0x53 +#define MODEL_hashira 0x52 +#define MODEL_hikari 0x51 +#define MODEL_ha3 0x50 +#define MODEL_ha2 0x4F +#define MODEL_ha1 0x4E +#define MODEL_o437 0x4D +#define MODEL_h 0x4C +#define MODEL_hi12 0x4B +#define MODEL_hi11 0x4A +#define MODEL_hi10 0x49 +#define MODEL_hi9 0x48 +#define MODEL_hi8 0x47 +#define MODEL_hi7 0x46 +#define MODEL_hi6 0x45 +#define MODEL_hi5 0x44 +#define MODEL_hi4 0x43 +#define MODEL_hi3 0x42 +#define MODEL_hi2 0x41 +#define MODEL_hi1 0x40 +#define MODEL_a 0x3F +#define MODEL_r1 0x3E +#define MODEL_o402 0x3D +#define MODEL_door 0x3C +#define MODEL_door_1 0x3B +#define MODEL_door1b 0x3A +#define MODEL_door1 0x39 +#define MODEL_mado_h 0x38 +#define MODEL_m4 0x37 +#define MODEL_m4_2 0x36 +#define MODEL_m42 0x35 +#define MODEL_m4_1 0x34 +#define MODEL_m41 0x33 +#define MODEL_m3 0x32 +#define MODEL_m3_2 0x31 +#define MODEL_m32 0x30 +#define MODEL_m3_1 0x2F +#define MODEL_m31 0x2E +#define MODEL_m2 0x2D +#define MODEL_m2_2 0x2C +#define MODEL_m22 0x2B +#define MODEL_m2_1 0x2A +#define MODEL_m21 0x29 +#define MODEL_m1 0x28 +#define MODEL_m1_2 0x27 +#define MODEL_m12 0x26 +#define MODEL_m1_1 0x25 +#define MODEL_m11 0x24 +#define MODEL_mado 0x23 +#define MODEL_mad 0x22 +#define MODEL_o375 0x21 +#define MODEL_bed 0x20 +#define MODEL_o308 0x1F +#define MODEL_o309 0x1E +#define MODEL_o312 0x1D +#define MODEL_tansu 0x1C +#define MODEL_tansu_3 0x1B +#define MODEL_tansu3 0x1A +#define MODEL_tansu_2 0x19 +#define MODEL_tansu_2_1 0x18 +#define MODEL_t2 0x17 +#define MODEL_t_2 0x16 +#define MODEL_t1 0x15 +#define MODEL_t_1 0x14 +#define MODEL_tansu2 0x13 +#define MODEL_n1 0x12 +#define MODEL_tansu_1 0x11 +#define MODEL_tansu1 0x10 +#define MODEL_kabe_08 0xF +#define MODEL_kabe_ue 0xE +#define MODEL_kabe 0xD +#define MODEL_kabe_ki 0xC +#define MODEL_kuro 0xB +#define MODEL_ten_08 0xA +#define MODEL_o351 0x9 +#define MODEL_o350 0x8 +#define MODEL_o349 0x7 +#define MODEL_yuka_08 0x6 +#define MODEL_yuka_jyu 0x5 +#define MODEL_yuka_2 0x4 +#define MODEL_yuka_1 0x3 +#define MODEL_yuka 0x2 +#define MODEL_Default 0x1 +#define MODEL_o438 0x0 + diff --git a/include/mapfs/obk_09_hit.h b/include/mapfs/obk_09_hit.h index b751416a7f..60504885b3 100644 --- a/include/mapfs/obk_09_hit.h +++ b/include/mapfs/obk_09_hit.h @@ -1,49 +1,60 @@ -#define COLLIDER_Root 0x30 -#define COLLIDER_bero 0x2F -#define COLLIDER_o315 0x2E -#define COLLIDER_o328 0x2D -#define COLLIDER_door 0x2C -#define COLLIDER_deilit2 0x2B -#define COLLIDER_deili2 0x2A -#define COLLIDER_deirit1 0x29 -#define COLLIDER_deili1 0x28 -#define COLLIDER_tt2 0x27 -#define COLLIDER_tt1 0x26 -#define COLLIDER_ori 0x25 -#define COLLIDER_he 0x24 -#define COLLIDER_te 0x23 -#define COLLIDER_ya 0x22 -#define COLLIDER_s 0x21 -#define COLLIDER_g152 0x20 -#define COLLIDER_o282 0x1F -#define COLLIDER_o290 0x1E -#define COLLIDER_o570 0x1D -#define COLLIDER_g127 0x1C -#define COLLIDER_o293 0x1B -#define COLLIDER_o565 0x1A -#define COLLIDER_o564 0x19 -#define COLLIDER_o563 0x18 -#define COLLIDER_g119 0x17 -#define COLLIDER_o283 0x16 -#define COLLIDER_o562 0x15 -#define COLLIDER_o373 0x14 -#define COLLIDER_Default 0x13 -#define COLLIDER_o557 0x12 -#define COLLIDER_o379 0x11 -#define COLLIDER_o281 0x10 -#define COLLIDER_g126 0xF -#define COLLIDER_o555 0xE -#define COLLIDER_o553 0xD -#define COLLIDER_o311 0xC -#define COLLIDER_g184 0xB -#define COLLIDER_o374 0xA -#define COLLIDER_o284 0x9 -#define COLLIDER_o540 0x8 -#define COLLIDER_yuka 0x7 -#define COLLIDER_o559 0x6 -#define COLLIDER_o558 0x5 -#define COLLIDER_o278 0x4 -#define COLLIDER_kabe 0x3 -#define COLLIDER_o544 0x2 -#define COLLIDER_o542 0x1 -#define COLLIDER_o549 0x0 +#define COLLIDER_Root 0x30 +#define COLLIDER_bero 0x2F +#define COLLIDER_o315 0x2E +#define COLLIDER_o328 0x2D +#define COLLIDER_door 0x2C +#define COLLIDER_deilit2 0x2B +#define COLLIDER_deili2 0x2A +#define COLLIDER_deirit1 0x29 +#define COLLIDER_deili1 0x28 +#define COLLIDER_tt2 0x27 +#define COLLIDER_tt1 0x26 +#define COLLIDER_ori 0x25 +#define COLLIDER_he 0x24 +#define COLLIDER_te 0x23 +#define COLLIDER_ya 0x22 +#define COLLIDER_s 0x21 +#define COLLIDER_g152 0x20 +#define COLLIDER_o282 0x1F +#define COLLIDER_o290 0x1E +#define COLLIDER_o570 0x1D +#define COLLIDER_g127 0x1C +#define COLLIDER_o293 0x1B +#define COLLIDER_o565 0x1A +#define COLLIDER_o564 0x19 +#define COLLIDER_o563 0x18 +#define COLLIDER_g119 0x17 +#define COLLIDER_o283 0x16 +#define COLLIDER_o562 0x15 +#define COLLIDER_o373 0x14 +#define COLLIDER_Default 0x13 +#define COLLIDER_o557 0x12 +#define COLLIDER_o379 0x11 +#define COLLIDER_o281 0x10 +#define COLLIDER_g126 0xF +#define COLLIDER_o555 0xE +#define COLLIDER_o553 0xD +#define COLLIDER_o311 0xC +#define COLLIDER_g184 0xB +#define COLLIDER_o374 0xA +#define COLLIDER_o284 0x9 +#define COLLIDER_o540 0x8 +#define COLLIDER_yuka 0x7 +#define COLLIDER_o559 0x6 +#define COLLIDER_o558 0x5 +#define COLLIDER_o278 0x4 +#define COLLIDER_kabe 0x3 +#define COLLIDER_o544 0x2 +#define COLLIDER_o542 0x1 +#define COLLIDER_o549 0x0 + +#define ZONE_Root 0x8 +#define ZONE_g135 0x7 +#define ZONE_o320 0x6 +#define ZONE_g134 0x5 +#define ZONE_o319 0x4 +#define ZONE_g133 0x3 +#define ZONE_o318 0x2 +#define ZONE_g131 0x1 +#define ZONE_o315 0x0 + diff --git a/include/mapfs/obk_09_shape.h b/include/mapfs/obk_09_shape.h index faf50b76b8..c448a92dab 100644 --- a/include/mapfs/obk_09_shape.h +++ b/include/mapfs/obk_09_shape.h @@ -1,65 +1,66 @@ -#define MODEL_Root 0x40 -#define MODEL_door 0x3F -#define MODEL_door2_2 0x3E -#define MODEL_d2_2 0x3D -#define MODEL_door2_1 0x3C -#define MODEL_d2_1 0x3B -#define MODEL_door1_2 0x3A -#define MODEL_d1_2 0x39 -#define MODEL_door1_1 0x38 -#define MODEL_d1_1 0x37 -#define MODEL_g127 0x36 -#define MODEL_g187 0x35 -#define MODEL_o282 0x34 -#define MODEL_g188 0x33 -#define MODEL_o563 0x32 -#define MODEL_g186 0x31 -#define MODEL_o557 0x30 -#define MODEL_o555 0x2F -#define MODEL_o553 0x2E -#define MODEL_o551 0x2D -#define MODEL_bero 0x2C -#define MODEL_o328 0x2B -#define MODEL_o315 0x2A -#define MODEL_ori 0x29 -#define MODEL_k 0x28 -#define MODEL_he 0x27 -#define MODEL_te 0x26 -#define MODEL_ya 0x25 -#define MODEL_y 0x24 -#define MODEL_s 0x23 -#define MODEL_g152 0x22 -#define MODEL_o379 0x21 -#define MODEL_g119 0x20 -#define MODEL_o559 0x1F -#define MODEL_o558 0x1E -#define MODEL_o293 0x1D -#define MODEL_o290 0x1C -#define MODEL_denki 0x1B -#define MODEL_g144 0x1A -#define MODEL_o561 0x19 -#define MODEL_o331 0x18 -#define MODEL_o330 0x17 -#define MODEL_o329 0x16 -#define MODEL_g133 0x15 -#define MODEL_o560 0x14 -#define MODEL_o295 0x13 -#define MODEL_o294 0x12 -#define MODEL_o300 0x11 -#define MODEL_Default 0x10 -#define MODEL_o374 0xF -#define MODEL_o373 0xE -#define MODEL_o284 0xD -#define MODEL_o283 0xC -#define MODEL_g126 0xB -#define MODEL_o311 0xA -#define MODEL_g184 0x9 -#define MODEL_o544 0x8 -#define MODEL_o542 0x7 -#define MODEL_o540 0x6 -#define MODEL_yuka 0x5 -#define MODEL_o281 0x4 -#define MODEL_kabe 0x3 -#define MODEL_o562 0x2 -#define MODEL_o549 0x1 -#define MODEL_o278 0x0 +#define MODEL_Root 0x40 +#define MODEL_door 0x3F +#define MODEL_door2_2 0x3E +#define MODEL_d2_2 0x3D +#define MODEL_door2_1 0x3C +#define MODEL_d2_1 0x3B +#define MODEL_door1_2 0x3A +#define MODEL_d1_2 0x39 +#define MODEL_door1_1 0x38 +#define MODEL_d1_1 0x37 +#define MODEL_g127 0x36 +#define MODEL_g187 0x35 +#define MODEL_o282 0x34 +#define MODEL_g188 0x33 +#define MODEL_o563 0x32 +#define MODEL_g186 0x31 +#define MODEL_o557 0x30 +#define MODEL_o555 0x2F +#define MODEL_o553 0x2E +#define MODEL_o551 0x2D +#define MODEL_bero 0x2C +#define MODEL_o328 0x2B +#define MODEL_o315 0x2A +#define MODEL_ori 0x29 +#define MODEL_k 0x28 +#define MODEL_he 0x27 +#define MODEL_te 0x26 +#define MODEL_ya 0x25 +#define MODEL_y 0x24 +#define MODEL_s 0x23 +#define MODEL_g152 0x22 +#define MODEL_o379 0x21 +#define MODEL_g119 0x20 +#define MODEL_o559 0x1F +#define MODEL_o558 0x1E +#define MODEL_o293 0x1D +#define MODEL_o290 0x1C +#define MODEL_denki 0x1B +#define MODEL_g144 0x1A +#define MODEL_o561 0x19 +#define MODEL_o331 0x18 +#define MODEL_o330 0x17 +#define MODEL_o329 0x16 +#define MODEL_g133 0x15 +#define MODEL_o560 0x14 +#define MODEL_o295 0x13 +#define MODEL_o294 0x12 +#define MODEL_o300 0x11 +#define MODEL_Default 0x10 +#define MODEL_o374 0xF +#define MODEL_o373 0xE +#define MODEL_o284 0xD +#define MODEL_o283 0xC +#define MODEL_g126 0xB +#define MODEL_o311 0xA +#define MODEL_g184 0x9 +#define MODEL_o544 0x8 +#define MODEL_o542 0x7 +#define MODEL_o540 0x6 +#define MODEL_yuka 0x5 +#define MODEL_o281 0x4 +#define MODEL_kabe 0x3 +#define MODEL_o562 0x2 +#define MODEL_o549 0x1 +#define MODEL_o278 0x0 + diff --git a/include/mapfs/omo_01_hit.h b/include/mapfs/omo_01_hit.h index 24e7c7767a..3b72a141a8 100644 --- a/include/mapfs/omo_01_hit.h +++ b/include/mapfs/omo_01_hit.h @@ -1,53 +1,60 @@ -#define COLLIDER_Root 0x34 -#define COLLIDER_Default 0x33 -#define COLLIDER_o706 0x32 -#define COLLIDER_o702 0x31 -#define COLLIDER_t_2 0x30 -#define COLLIDER_o477 0x2F -#define COLLIDER_o586 0x2E -#define COLLIDER_o437 0x2D -#define COLLIDER_g133 0x2C -#define COLLIDER_o422 0x2B -#define COLLIDER_o421 0x2A -#define COLLIDER_o353 0x29 -#define COLLIDER_t_1 0x28 -#define COLLIDER_o298 0x27 -#define COLLIDER_o305 0x26 -#define COLLIDER_o307 0x25 -#define COLLIDER_o443 0x24 -#define COLLIDER_o297 0x23 -#define COLLIDER_o442 0x22 -#define COLLIDER_g179 0x21 -#define COLLIDER_o373 0x20 -#define COLLIDER_o450 0x1F -#define COLLIDER_o707 0x1E -#define COLLIDER_o444 0x1D -#define COLLIDER_o438 0x1C -#define COLLIDER_tu_2 0x1B -#define COLLIDER_o379 0x1A -#define COLLIDER_dai 0x19 -#define COLLIDER_o43 0x18 -#define COLLIDER_o426 0x17 -#define COLLIDER_g135 0x16 -#define COLLIDER_o432 0x15 -#define COLLIDER_o338 0x14 -#define COLLIDER_o709 0x13 -#define COLLIDER_o708 0x12 -#define COLLIDER_o197 0x11 -#define COLLIDER_o497 0x10 -#define COLLIDER_o344 0xF -#define COLLIDER_o343 0xE -#define COLLIDER_o342 0xD -#define COLLIDER_g134 0xC -#define COLLIDER_o337 0xB -#define COLLIDER_o339 0xA -#define COLLIDER_o178 0x9 -#define COLLIDER_tu_1 0x8 -#define COLLIDER_o703 0x7 -#define COLLIDER_o371 0x6 -#define COLLIDER_o306 0x5 -#define COLLIDER_bero 0x4 -#define COLLIDER_o705 0x3 -#define COLLIDER_o341 0x2 -#define COLLIDER_deilit1 0x1 -#define COLLIDER_deili1 0x0 +#define COLLIDER_Root 0x34 +#define COLLIDER_Default 0x33 +#define COLLIDER_o706 0x32 +#define COLLIDER_o702 0x31 +#define COLLIDER_t_2 0x30 +#define COLLIDER_o477 0x2F +#define COLLIDER_o586 0x2E +#define COLLIDER_o437 0x2D +#define COLLIDER_g133 0x2C +#define COLLIDER_o422 0x2B +#define COLLIDER_o421 0x2A +#define COLLIDER_o353 0x29 +#define COLLIDER_t_1 0x28 +#define COLLIDER_o298 0x27 +#define COLLIDER_o305 0x26 +#define COLLIDER_o307 0x25 +#define COLLIDER_o443 0x24 +#define COLLIDER_o297 0x23 +#define COLLIDER_o442 0x22 +#define COLLIDER_g179 0x21 +#define COLLIDER_o373 0x20 +#define COLLIDER_o450 0x1F +#define COLLIDER_o707 0x1E +#define COLLIDER_o444 0x1D +#define COLLIDER_o438 0x1C +#define COLLIDER_tu_2 0x1B +#define COLLIDER_o379 0x1A +#define COLLIDER_dai 0x19 +#define COLLIDER_o43 0x18 +#define COLLIDER_o426 0x17 +#define COLLIDER_g135 0x16 +#define COLLIDER_o432 0x15 +#define COLLIDER_o338 0x14 +#define COLLIDER_o709 0x13 +#define COLLIDER_o708 0x12 +#define COLLIDER_o197 0x11 +#define COLLIDER_o497 0x10 +#define COLLIDER_o344 0xF +#define COLLIDER_o343 0xE +#define COLLIDER_o342 0xD +#define COLLIDER_g134 0xC +#define COLLIDER_o337 0xB +#define COLLIDER_o339 0xA +#define COLLIDER_o178 0x9 +#define COLLIDER_tu_1 0x8 +#define COLLIDER_o703 0x7 +#define COLLIDER_o371 0x6 +#define COLLIDER_o306 0x5 +#define COLLIDER_bero 0x4 +#define COLLIDER_o705 0x3 +#define COLLIDER_o341 0x2 +#define COLLIDER_deilit1 0x1 +#define COLLIDER_deili1 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g187 0x3 +#define ZONE_o526 0x2 +#define ZONE_o519 0x1 +#define ZONE_o518 0x0 + diff --git a/include/mapfs/omo_01_shape.h b/include/mapfs/omo_01_shape.h index a7ef26a701..92727f348c 100644 --- a/include/mapfs/omo_01_shape.h +++ b/include/mapfs/omo_01_shape.h @@ -1,145 +1,146 @@ -#define MODEL_Root 0x90 -#define MODEL_uma 0x8F -#define MODEL_o355 0x8E -#define MODEL_o353 0x8D -#define MODEL_tokei 0x8C -#define MODEL_tokei_2 0x8B -#define MODEL_maru_2 0x8A -#define MODEL_maru2 0x89 -#define MODEL_hari_2 0x88 -#define MODEL_hari2 0x87 -#define MODEL_tokei_1 0x86 -#define MODEL_maru_1 0x85 -#define MODEL_maru1 0x84 -#define MODEL_hari_1 0x83 -#define MODEL_hari1 0x82 -#define MODEL_mado 0x81 -#define MODEL_mado4_2 0x80 -#define MODEL_m4_2 0x7F -#define MODEL_mado4_1 0x7E -#define MODEL_m4_1 0x7D -#define MODEL_mado2_2 0x7C -#define MODEL_m2_2 0x7B -#define MODEL_mado2_1 0x7A -#define MODEL_m2_1 0x79 -#define MODEL_mado1_2 0x78 -#define MODEL_m1_2 0x77 -#define MODEL_mado1_1 0x76 -#define MODEL_m1_1 0x75 -#define MODEL_m 0x74 -#define MODEL_o699 0x73 -#define MODEL_o694 0x72 -#define MODEL_o690 0x71 -#define MODEL_o687 0x70 -#define MODEL_o682 0x6F -#define MODEL_o679 0x6E -#define MODEL_o674 0x6D -#define MODEL_o672 0x6C -#define MODEL_o670 0x6B -#define MODEL_o668 0x6A -#define MODEL_o666 0x69 -#define MODEL_o664 0x68 -#define MODEL_hana 0x67 -#define MODEL_hana_4 0x66 -#define MODEL_ha4 0x65 -#define MODEL_hana_3 0x64 -#define MODEL_ha3 0x63 -#define MODEL_hana_2 0x62 -#define MODEL_ha2 0x61 -#define MODEL_hana_1 0x60 -#define MODEL_ha1 0x5F -#define MODEL_omo 0x5E -#define MODEL_taiko 0x5D -#define MODEL_o298 0x5C -#define MODEL_o297 0x5B -#define MODEL_hako 0x5A -#define MODEL_o295 0x59 -#define MODEL_h_2 0x58 -#define MODEL_o192 0x57 -#define MODEL_o342 0x56 -#define MODEL_o340 0x55 -#define MODEL_o339 0x54 -#define MODEL_o335 0x53 -#define MODEL_h_1 0x52 -#define MODEL_g137 0x51 -#define MODEL_o702 0x50 -#define MODEL_o449 0x4F -#define MODEL_o448 0x4E -#define MODEL_o446 0x4D -#define MODEL_o445 0x4C -#define MODEL_g222 0x4B -#define MODEL_o437 0x4A -#define MODEL_o652 0x49 -#define MODEL_o651 0x48 -#define MODEL_o650 0x47 -#define MODEL_o648 0x46 -#define MODEL_tu_4 0x45 -#define MODEL_o374 0x44 -#define MODEL_o373 0x43 -#define MODEL_o372 0x42 -#define MODEL_o371 0x41 -#define MODEL_tu_3 0x40 -#define MODEL_o637 0x3F -#define MODEL_o370 0x3E -#define MODEL_o369 0x3D -#define MODEL_o368 0x3C -#define MODEL_o367 0x3B -#define MODEL_tu_1 0x3A -#define MODEL_o378 0x39 -#define MODEL_o377 0x38 -#define MODEL_o376 0x37 -#define MODEL_o375 0x36 -#define MODEL_o_1 0x35 -#define MODEL_o324 0x34 -#define MODEL_t_2 0x33 -#define MODEL_o479 0x32 -#define MODEL_o478 0x31 -#define MODEL_o476 0x30 -#define MODEL_t_1 0x2F -#define MODEL_o308 0x2E -#define MODEL_o307 0x2D -#define MODEL_o306 0x2C -#define MODEL_o305 0x2B -#define MODEL_dai 0x2A -#define MODEL_o139 0x29 -#define MODEL_o358 0x28 -#define MODEL_o636 0x27 -#define MODEL_o663 0x26 -#define MODEL_g194 0x25 -#define MODEL_o538 0x24 -#define MODEL_o536 0x23 -#define MODEL_o535 0x22 -#define MODEL_g178 0x21 -#define MODEL_o492 0x20 -#define MODEL_o491 0x1F -#define MODEL_o490 0x1E -#define MODEL_o489 0x1D -#define MODEL_k5 0x1C -#define MODEL_o240 0x1B -#define MODEL_o243 0x1A -#define MODEL_o241 0x19 -#define MODEL_k4 0x18 -#define MODEL_o191 0x17 -#define MODEL_o206 0x16 -#define MODEL_o188 0x15 -#define MODEL_o639 0x14 -#define MODEL_o178 0x13 -#define MODEL_k1 0x12 -#define MODEL_o141 0x11 -#define MODEL_o162 0x10 -#define MODEL_o142 0xF -#define MODEL_k2 0xE -#define MODEL_o169 0xD -#define MODEL_o163 0xC -#define MODEL_o253 0xB -#define MODEL_o221 0xA -#define MODEL_o220 0x9 -#define MODEL_o255 0x8 -#define MODEL_k3 0x7 -#define MODEL_o158 0x6 -#define MODEL_o155 0x5 -#define MODEL_o154 0x4 -#define MODEL_o232 0x3 -#define MODEL_o227 0x2 -#define MODEL_o226 0x1 -#define MODEL_o222 0x0 +#define MODEL_Root 0x90 +#define MODEL_uma 0x8F +#define MODEL_o355 0x8E +#define MODEL_o353 0x8D +#define MODEL_tokei 0x8C +#define MODEL_tokei_2 0x8B +#define MODEL_maru_2 0x8A +#define MODEL_maru2 0x89 +#define MODEL_hari_2 0x88 +#define MODEL_hari2 0x87 +#define MODEL_tokei_1 0x86 +#define MODEL_maru_1 0x85 +#define MODEL_maru1 0x84 +#define MODEL_hari_1 0x83 +#define MODEL_hari1 0x82 +#define MODEL_mado 0x81 +#define MODEL_mado4_2 0x80 +#define MODEL_m4_2 0x7F +#define MODEL_mado4_1 0x7E +#define MODEL_m4_1 0x7D +#define MODEL_mado2_2 0x7C +#define MODEL_m2_2 0x7B +#define MODEL_mado2_1 0x7A +#define MODEL_m2_1 0x79 +#define MODEL_mado1_2 0x78 +#define MODEL_m1_2 0x77 +#define MODEL_mado1_1 0x76 +#define MODEL_m1_1 0x75 +#define MODEL_m 0x74 +#define MODEL_o699 0x73 +#define MODEL_o694 0x72 +#define MODEL_o690 0x71 +#define MODEL_o687 0x70 +#define MODEL_o682 0x6F +#define MODEL_o679 0x6E +#define MODEL_o674 0x6D +#define MODEL_o672 0x6C +#define MODEL_o670 0x6B +#define MODEL_o668 0x6A +#define MODEL_o666 0x69 +#define MODEL_o664 0x68 +#define MODEL_hana 0x67 +#define MODEL_hana_4 0x66 +#define MODEL_ha4 0x65 +#define MODEL_hana_3 0x64 +#define MODEL_ha3 0x63 +#define MODEL_hana_2 0x62 +#define MODEL_ha2 0x61 +#define MODEL_hana_1 0x60 +#define MODEL_ha1 0x5F +#define MODEL_omo 0x5E +#define MODEL_taiko 0x5D +#define MODEL_o298 0x5C +#define MODEL_o297 0x5B +#define MODEL_hako 0x5A +#define MODEL_o295 0x59 +#define MODEL_h_2 0x58 +#define MODEL_o192 0x57 +#define MODEL_o342 0x56 +#define MODEL_o340 0x55 +#define MODEL_o339 0x54 +#define MODEL_o335 0x53 +#define MODEL_h_1 0x52 +#define MODEL_g137 0x51 +#define MODEL_o702 0x50 +#define MODEL_o449 0x4F +#define MODEL_o448 0x4E +#define MODEL_o446 0x4D +#define MODEL_o445 0x4C +#define MODEL_g222 0x4B +#define MODEL_o437 0x4A +#define MODEL_o652 0x49 +#define MODEL_o651 0x48 +#define MODEL_o650 0x47 +#define MODEL_o648 0x46 +#define MODEL_tu_4 0x45 +#define MODEL_o374 0x44 +#define MODEL_o373 0x43 +#define MODEL_o372 0x42 +#define MODEL_o371 0x41 +#define MODEL_tu_3 0x40 +#define MODEL_o637 0x3F +#define MODEL_o370 0x3E +#define MODEL_o369 0x3D +#define MODEL_o368 0x3C +#define MODEL_o367 0x3B +#define MODEL_tu_1 0x3A +#define MODEL_o378 0x39 +#define MODEL_o377 0x38 +#define MODEL_o376 0x37 +#define MODEL_o375 0x36 +#define MODEL_o_1 0x35 +#define MODEL_o324 0x34 +#define MODEL_t_2 0x33 +#define MODEL_o479 0x32 +#define MODEL_o478 0x31 +#define MODEL_o476 0x30 +#define MODEL_t_1 0x2F +#define MODEL_o308 0x2E +#define MODEL_o307 0x2D +#define MODEL_o306 0x2C +#define MODEL_o305 0x2B +#define MODEL_dai 0x2A +#define MODEL_o139 0x29 +#define MODEL_o358 0x28 +#define MODEL_o636 0x27 +#define MODEL_o663 0x26 +#define MODEL_g194 0x25 +#define MODEL_o538 0x24 +#define MODEL_o536 0x23 +#define MODEL_o535 0x22 +#define MODEL_g178 0x21 +#define MODEL_o492 0x20 +#define MODEL_o491 0x1F +#define MODEL_o490 0x1E +#define MODEL_o489 0x1D +#define MODEL_k5 0x1C +#define MODEL_o240 0x1B +#define MODEL_o243 0x1A +#define MODEL_o241 0x19 +#define MODEL_k4 0x18 +#define MODEL_o191 0x17 +#define MODEL_o206 0x16 +#define MODEL_o188 0x15 +#define MODEL_o639 0x14 +#define MODEL_o178 0x13 +#define MODEL_k1 0x12 +#define MODEL_o141 0x11 +#define MODEL_o162 0x10 +#define MODEL_o142 0xF +#define MODEL_k2 0xE +#define MODEL_o169 0xD +#define MODEL_o163 0xC +#define MODEL_o253 0xB +#define MODEL_o221 0xA +#define MODEL_o220 0x9 +#define MODEL_o255 0x8 +#define MODEL_k3 0x7 +#define MODEL_o158 0x6 +#define MODEL_o155 0x5 +#define MODEL_o154 0x4 +#define MODEL_o232 0x3 +#define MODEL_o227 0x2 +#define MODEL_o226 0x1 +#define MODEL_o222 0x0 + diff --git a/include/mapfs/omo_02_hit.h b/include/mapfs/omo_02_hit.h index 23f7a57d3f..bb92311e4d 100644 --- a/include/mapfs/omo_02_hit.h +++ b/include/mapfs/omo_02_hit.h @@ -1,80 +1,89 @@ -#define COLLIDER_Root 0x4F -#define COLLIDER_g277 0x4E -#define COLLIDER_o685 0x4D -#define COLLIDER_o670 0x4C -#define COLLIDER_tumiki 0x4B -#define COLLIDER_tu3 0x4A -#define COLLIDER_tu3_5 0x49 -#define COLLIDER_t3_5 0x48 -#define COLLIDER_tu3_4 0x47 -#define COLLIDER_t3_4 0x46 -#define COLLIDER_tu3_3 0x45 -#define COLLIDER_t3_3 0x44 -#define COLLIDER_tu3_2 0x43 -#define COLLIDER_t3_2 0x42 -#define COLLIDER_tu3_1 0x41 -#define COLLIDER_t3_1 0x40 -#define COLLIDER_tu2 0x3F -#define COLLIDER_tu2_5 0x3E -#define COLLIDER_t2_5 0x3D -#define COLLIDER_tu2_4 0x3C -#define COLLIDER_t2_4 0x3B -#define COLLIDER_tu2_3 0x3A -#define COLLIDER_t2_3 0x39 -#define COLLIDER_tu2_2 0x38 -#define COLLIDER_t2_2 0x37 -#define COLLIDER_tu2_1 0x36 -#define COLLIDER_t2_1 0x35 -#define COLLIDER_tu1 0x34 -#define COLLIDER_tu_5 0x33 -#define COLLIDER_t5 0x32 -#define COLLIDER_tu_4 0x31 -#define COLLIDER_t4 0x30 -#define COLLIDER_tu_3 0x2F -#define COLLIDER_t3 0x2E -#define COLLIDER_tu_2 0x2D -#define COLLIDER_t2 0x2C -#define COLLIDER_tu_1 0x2B -#define COLLIDER_t1 0x2A -#define COLLIDER_g198 0x29 -#define COLLIDER_o242 0x28 -#define COLLIDER_o680 0x27 -#define COLLIDER_o674 0x26 -#define COLLIDER_o154 0x25 -#define COLLIDER_o673 0x24 -#define COLLIDER_o679 0x23 -#define COLLIDER_k_3 0x22 -#define COLLIDER_o399 0x21 -#define COLLIDER_o480 0x20 -#define COLLIDER_o637 0x1F -#define COLLIDER_o590 0x1E -#define COLLIDER_o639 0x1D -#define COLLIDER_o683 0x1C -#define COLLIDER_o489 0x1B -#define COLLIDER_kabe_u 0x1A -#define COLLIDER_o682 0x19 -#define COLLIDER_o520 0x18 -#define COLLIDER_o362 0x17 -#define COLLIDER_o527 0x16 -#define COLLIDER_o163 0x15 -#define COLLIDER_o329 0x14 -#define COLLIDER_o331 0x13 -#define COLLIDER_o684 0x12 -#define COLLIDER_g177 0x11 -#define COLLIDER_o669 0x10 -#define COLLIDER_o143 0xF -#define COLLIDER_o232 0xE -#define COLLIDER_o661 0xD -#define COLLIDER_o258 0xC -#define COLLIDER_o158 0xB -#define COLLIDER_o153 0xA -#define COLLIDER_o196 0x9 -#define COLLIDER_bero 0x8 -#define COLLIDER_o672 0x7 -#define COLLIDER_o671 0x6 -#define COLLIDER_o338 0x5 -#define COLLIDER_deilit2 0x4 -#define COLLIDER_deili2 0x3 -#define COLLIDER_o658 0x2 -#define COLLIDER_deilit1 0x1 -#define COLLIDER_deili1 0x0 +#define COLLIDER_Root 0x4F +#define COLLIDER_g277 0x4E +#define COLLIDER_o685 0x4D +#define COLLIDER_o670 0x4C +#define COLLIDER_tumiki 0x4B +#define COLLIDER_tu3 0x4A +#define COLLIDER_tu3_5 0x49 +#define COLLIDER_t3_5 0x48 +#define COLLIDER_tu3_4 0x47 +#define COLLIDER_t3_4 0x46 +#define COLLIDER_tu3_3 0x45 +#define COLLIDER_t3_3 0x44 +#define COLLIDER_tu3_2 0x43 +#define COLLIDER_t3_2 0x42 +#define COLLIDER_tu3_1 0x41 +#define COLLIDER_t3_1 0x40 +#define COLLIDER_tu2 0x3F +#define COLLIDER_tu2_5 0x3E +#define COLLIDER_t2_5 0x3D +#define COLLIDER_tu2_4 0x3C +#define COLLIDER_t2_4 0x3B +#define COLLIDER_tu2_3 0x3A +#define COLLIDER_t2_3 0x39 +#define COLLIDER_tu2_2 0x38 +#define COLLIDER_t2_2 0x37 +#define COLLIDER_tu2_1 0x36 +#define COLLIDER_t2_1 0x35 +#define COLLIDER_tu1 0x34 +#define COLLIDER_tu_5 0x33 +#define COLLIDER_t5 0x32 +#define COLLIDER_tu_4 0x31 +#define COLLIDER_t4 0x30 +#define COLLIDER_tu_3 0x2F +#define COLLIDER_t3 0x2E +#define COLLIDER_tu_2 0x2D +#define COLLIDER_t2 0x2C +#define COLLIDER_tu_1 0x2B +#define COLLIDER_t1 0x2A +#define COLLIDER_g198 0x29 +#define COLLIDER_o242 0x28 +#define COLLIDER_o680 0x27 +#define COLLIDER_o674 0x26 +#define COLLIDER_o154 0x25 +#define COLLIDER_o673 0x24 +#define COLLIDER_o679 0x23 +#define COLLIDER_k_3 0x22 +#define COLLIDER_o399 0x21 +#define COLLIDER_o480 0x20 +#define COLLIDER_o637 0x1F +#define COLLIDER_o590 0x1E +#define COLLIDER_o639 0x1D +#define COLLIDER_o683 0x1C +#define COLLIDER_o489 0x1B +#define COLLIDER_kabe_u 0x1A +#define COLLIDER_o682 0x19 +#define COLLIDER_o520 0x18 +#define COLLIDER_o362 0x17 +#define COLLIDER_o527 0x16 +#define COLLIDER_o163 0x15 +#define COLLIDER_o329 0x14 +#define COLLIDER_o331 0x13 +#define COLLIDER_o684 0x12 +#define COLLIDER_g177 0x11 +#define COLLIDER_o669 0x10 +#define COLLIDER_o143 0xF +#define COLLIDER_o232 0xE +#define COLLIDER_o661 0xD +#define COLLIDER_o258 0xC +#define COLLIDER_o158 0xB +#define COLLIDER_o153 0xA +#define COLLIDER_o196 0x9 +#define COLLIDER_bero 0x8 +#define COLLIDER_o672 0x7 +#define COLLIDER_o671 0x6 +#define COLLIDER_o338 0x5 +#define COLLIDER_deilit2 0x4 +#define COLLIDER_deili2 0x3 +#define COLLIDER_o658 0x2 +#define COLLIDER_deilit1 0x1 +#define COLLIDER_deili1 0x0 + +#define ZONE_Root 0x6 +#define ZONE_g277 0x5 +#define ZONE_o670 0x4 +#define ZONE_o669 0x3 +#define ZONE_o668 0x2 +#define ZONE_g272 0x1 +#define ZONE_o659 0x0 + diff --git a/include/mapfs/omo_02_shape.h b/include/mapfs/omo_02_shape.h index 3b333ef2b7..23506c22d8 100644 --- a/include/mapfs/omo_02_shape.h +++ b/include/mapfs/omo_02_shape.h @@ -1,169 +1,170 @@ -#define MODEL_Root 0xA8 -#define MODEL_g321 0xA7 -#define MODEL_o768 0xA6 -#define MODEL_g283 0xA5 -#define MODEL_o705 0xA4 -#define MODEL_o704 0xA3 -#define MODEL_o703 0xA2 -#define MODEL_o702 0xA1 -#define MODEL_o701 0xA0 -#define MODEL_o700 0x9F -#define MODEL_g277 0x9E -#define MODEL_o670 0x9D -#define MODEL_o668 0x9C -#define MODEL_o667 0x9B -#define MODEL_o666 0x9A -#define MODEL_o665 0x99 -#define MODEL_o664 0x98 -#define MODEL_hana 0x97 -#define MODEL_hana_7 0x96 -#define MODEL_ha7 0x95 -#define MODEL_hana_6 0x94 -#define MODEL_ha6 0x93 -#define MODEL_hana_5 0x92 -#define MODEL_ha5 0x91 -#define MODEL_hana_4 0x90 -#define MODEL_ha4 0x8F -#define MODEL_hana_3 0x8E -#define MODEL_ha3 0x8D -#define MODEL_hana_2 0x8C -#define MODEL_ha2 0x8B -#define MODEL_hana_1 0x8A -#define MODEL_ha1 0x89 -#define MODEL_tokei 0x88 -#define MODEL_tokei_1 0x87 -#define MODEL_maru_1 0x86 -#define MODEL_maru1 0x85 -#define MODEL_hari_1 0x84 -#define MODEL_hari1 0x83 -#define MODEL_mado 0x82 -#define MODEL_mado4_2 0x81 -#define MODEL_m4_2 0x80 -#define MODEL_mado4_1 0x7F -#define MODEL_m4_1 0x7E -#define MODEL_mado3_2 0x7D -#define MODEL_m3_2 0x7C -#define MODEL_mado3_1 0x7B -#define MODEL_m3_1 0x7A -#define MODEL_mado2_2 0x79 -#define MODEL_m2_2 0x78 -#define MODEL_mado2_1 0x77 -#define MODEL_m2_1 0x76 -#define MODEL_tumiki 0x75 -#define MODEL_hibi 0x74 -#define MODEL_o708 0x73 -#define MODEL_tu3 0x72 -#define MODEL_tu3_5 0x71 -#define MODEL_t3_5 0x70 -#define MODEL_tu3_4 0x6F -#define MODEL_t3_4 0x6E -#define MODEL_tu3_3 0x6D -#define MODEL_t3_3 0x6C -#define MODEL_tu3_2 0x6B -#define MODEL_t3_2 0x6A -#define MODEL_tu3_1 0x69 -#define MODEL_t3_1 0x68 -#define MODEL_tu2 0x67 -#define MODEL_tu2_5 0x66 -#define MODEL_t2_5 0x65 -#define MODEL_tu2_4 0x64 -#define MODEL_t2_4 0x63 -#define MODEL_tu2_3 0x62 -#define MODEL_t2_3 0x61 -#define MODEL_tu2_2 0x60 -#define MODEL_t2_2 0x5F -#define MODEL_tu2_1 0x5E -#define MODEL_t2_1 0x5D -#define MODEL_tu1 0x5C -#define MODEL_tu_5 0x5B -#define MODEL_t5 0x5A -#define MODEL_tu_4 0x59 -#define MODEL_t4 0x58 -#define MODEL_tu_3 0x57 -#define MODEL_t3 0x56 -#define MODEL_tu_2 0x55 -#define MODEL_t2 0x54 -#define MODEL_tu_1 0x53 -#define MODEL_t1 0x52 -#define MODEL_g178 0x51 -#define MODEL_o520 0x50 -#define MODEL_o362 0x4F -#define MODEL_o527 0x4E -#define MODEL_omo 0x4D -#define MODEL_g177 0x4C -#define MODEL_o569 0x4B -#define MODEL_o568 0x4A -#define MODEL_saikoro 0x49 -#define MODEL_g135 0x48 -#define MODEL_o402 0x47 -#define MODEL_o400 0x46 -#define MODEL_o399 0x45 -#define MODEL_g58 0x44 -#define MODEL_o196 0x43 -#define MODEL_o193 0x42 -#define MODEL_o192 0x41 -#define MODEL_g71 0x40 -#define MODEL_o236 0x3F -#define MODEL_o235 0x3E -#define MODEL_o234 0x3D -#define MODEL_t 0x3C -#define MODEL_g155 0x3B -#define MODEL_o491 0x3A -#define MODEL_o490 0x39 -#define MODEL_o489 0x38 -#define MODEL_o488 0x37 -#define MODEL_g152 0x36 -#define MODEL_o480 0x35 -#define MODEL_o478 0x34 -#define MODEL_g147 0x33 -#define MODEL_o773 0x32 -#define MODEL_o772 0x31 -#define MODEL_dai 0x30 -#define MODEL_yu_kabe 0x2F -#define MODEL_o466 0x2E -#define MODEL_o538 0x2D -#define MODEL_o331 0x2C -#define MODEL_yuka 0x2B -#define MODEL_o326 0x2A -#define MODEL_in_1 0x29 -#define MODEL_o330 0x28 -#define MODEL_o329 0x27 -#define MODEL_bero 0x26 -#define MODEL_o657 0x25 -#define MODEL_o660 0x24 -#define MODEL_o659 0x23 -#define MODEL_k_4 0x22 -#define MODEL_o694 0x21 -#define MODEL_o232 0x20 -#define MODEL_o227 0x1F -#define MODEL_o226 0x1E -#define MODEL_o258 0x1D -#define MODEL_k_3 0x1C -#define MODEL_o692 0x1B -#define MODEL_o689 0x1A -#define MODEL_o688 0x19 -#define MODEL_o338 0x18 -#define MODEL_o336 0x17 -#define MODEL_o339 0x16 -#define MODEL_o335 0x15 -#define MODEL_o337 0x14 -#define MODEL_k_2 0x13 -#define MODEL_o685 0x12 -#define MODEL_o684 0x11 -#define MODEL_o683 0x10 -#define MODEL_o167 0xF -#define MODEL_o168 0xE -#define MODEL_o163 0xD -#define MODEL_o253 0xC -#define MODEL_o220 0xB -#define MODEL_o255 0xA -#define MODEL_k_1 0x9 -#define MODEL_o682 0x8 -#define MODEL_o681 0x7 -#define MODEL_o679 0x6 -#define MODEL_o678 0x5 -#define MODEL_o141 0x4 -#define MODEL_o144 0x3 -#define MODEL_o143 0x2 -#define MODEL_o142 0x1 -#define MODEL_o327 0x0 +#define MODEL_Root 0xA8 +#define MODEL_g321 0xA7 +#define MODEL_o768 0xA6 +#define MODEL_g283 0xA5 +#define MODEL_o705 0xA4 +#define MODEL_o704 0xA3 +#define MODEL_o703 0xA2 +#define MODEL_o702 0xA1 +#define MODEL_o701 0xA0 +#define MODEL_o700 0x9F +#define MODEL_g277 0x9E +#define MODEL_o670 0x9D +#define MODEL_o668 0x9C +#define MODEL_o667 0x9B +#define MODEL_o666 0x9A +#define MODEL_o665 0x99 +#define MODEL_o664 0x98 +#define MODEL_hana 0x97 +#define MODEL_hana_7 0x96 +#define MODEL_ha7 0x95 +#define MODEL_hana_6 0x94 +#define MODEL_ha6 0x93 +#define MODEL_hana_5 0x92 +#define MODEL_ha5 0x91 +#define MODEL_hana_4 0x90 +#define MODEL_ha4 0x8F +#define MODEL_hana_3 0x8E +#define MODEL_ha3 0x8D +#define MODEL_hana_2 0x8C +#define MODEL_ha2 0x8B +#define MODEL_hana_1 0x8A +#define MODEL_ha1 0x89 +#define MODEL_tokei 0x88 +#define MODEL_tokei_1 0x87 +#define MODEL_maru_1 0x86 +#define MODEL_maru1 0x85 +#define MODEL_hari_1 0x84 +#define MODEL_hari1 0x83 +#define MODEL_mado 0x82 +#define MODEL_mado4_2 0x81 +#define MODEL_m4_2 0x80 +#define MODEL_mado4_1 0x7F +#define MODEL_m4_1 0x7E +#define MODEL_mado3_2 0x7D +#define MODEL_m3_2 0x7C +#define MODEL_mado3_1 0x7B +#define MODEL_m3_1 0x7A +#define MODEL_mado2_2 0x79 +#define MODEL_m2_2 0x78 +#define MODEL_mado2_1 0x77 +#define MODEL_m2_1 0x76 +#define MODEL_tumiki 0x75 +#define MODEL_hibi 0x74 +#define MODEL_o708 0x73 +#define MODEL_tu3 0x72 +#define MODEL_tu3_5 0x71 +#define MODEL_t3_5 0x70 +#define MODEL_tu3_4 0x6F +#define MODEL_t3_4 0x6E +#define MODEL_tu3_3 0x6D +#define MODEL_t3_3 0x6C +#define MODEL_tu3_2 0x6B +#define MODEL_t3_2 0x6A +#define MODEL_tu3_1 0x69 +#define MODEL_t3_1 0x68 +#define MODEL_tu2 0x67 +#define MODEL_tu2_5 0x66 +#define MODEL_t2_5 0x65 +#define MODEL_tu2_4 0x64 +#define MODEL_t2_4 0x63 +#define MODEL_tu2_3 0x62 +#define MODEL_t2_3 0x61 +#define MODEL_tu2_2 0x60 +#define MODEL_t2_2 0x5F +#define MODEL_tu2_1 0x5E +#define MODEL_t2_1 0x5D +#define MODEL_tu1 0x5C +#define MODEL_tu_5 0x5B +#define MODEL_t5 0x5A +#define MODEL_tu_4 0x59 +#define MODEL_t4 0x58 +#define MODEL_tu_3 0x57 +#define MODEL_t3 0x56 +#define MODEL_tu_2 0x55 +#define MODEL_t2 0x54 +#define MODEL_tu_1 0x53 +#define MODEL_t1 0x52 +#define MODEL_g178 0x51 +#define MODEL_o520 0x50 +#define MODEL_o362 0x4F +#define MODEL_o527 0x4E +#define MODEL_omo 0x4D +#define MODEL_g177 0x4C +#define MODEL_o569 0x4B +#define MODEL_o568 0x4A +#define MODEL_saikoro 0x49 +#define MODEL_g135 0x48 +#define MODEL_o402 0x47 +#define MODEL_o400 0x46 +#define MODEL_o399 0x45 +#define MODEL_g58 0x44 +#define MODEL_o196 0x43 +#define MODEL_o193 0x42 +#define MODEL_o192 0x41 +#define MODEL_g71 0x40 +#define MODEL_o236 0x3F +#define MODEL_o235 0x3E +#define MODEL_o234 0x3D +#define MODEL_t 0x3C +#define MODEL_g155 0x3B +#define MODEL_o491 0x3A +#define MODEL_o490 0x39 +#define MODEL_o489 0x38 +#define MODEL_o488 0x37 +#define MODEL_g152 0x36 +#define MODEL_o480 0x35 +#define MODEL_o478 0x34 +#define MODEL_g147 0x33 +#define MODEL_o773 0x32 +#define MODEL_o772 0x31 +#define MODEL_dai 0x30 +#define MODEL_yu_kabe 0x2F +#define MODEL_o466 0x2E +#define MODEL_o538 0x2D +#define MODEL_o331 0x2C +#define MODEL_yuka 0x2B +#define MODEL_o326 0x2A +#define MODEL_in_1 0x29 +#define MODEL_o330 0x28 +#define MODEL_o329 0x27 +#define MODEL_bero 0x26 +#define MODEL_o657 0x25 +#define MODEL_o660 0x24 +#define MODEL_o659 0x23 +#define MODEL_k_4 0x22 +#define MODEL_o694 0x21 +#define MODEL_o232 0x20 +#define MODEL_o227 0x1F +#define MODEL_o226 0x1E +#define MODEL_o258 0x1D +#define MODEL_k_3 0x1C +#define MODEL_o692 0x1B +#define MODEL_o689 0x1A +#define MODEL_o688 0x19 +#define MODEL_o338 0x18 +#define MODEL_o336 0x17 +#define MODEL_o339 0x16 +#define MODEL_o335 0x15 +#define MODEL_o337 0x14 +#define MODEL_k_2 0x13 +#define MODEL_o685 0x12 +#define MODEL_o684 0x11 +#define MODEL_o683 0x10 +#define MODEL_o167 0xF +#define MODEL_o168 0xE +#define MODEL_o163 0xD +#define MODEL_o253 0xC +#define MODEL_o220 0xB +#define MODEL_o255 0xA +#define MODEL_k_1 0x9 +#define MODEL_o682 0x8 +#define MODEL_o681 0x7 +#define MODEL_o679 0x6 +#define MODEL_o678 0x5 +#define MODEL_o141 0x4 +#define MODEL_o144 0x3 +#define MODEL_o143 0x2 +#define MODEL_o142 0x1 +#define MODEL_o327 0x0 + diff --git a/include/mapfs/omo_03_hit.h b/include/mapfs/omo_03_hit.h index 36128814bb..ceff697d62 100644 --- a/include/mapfs/omo_03_hit.h +++ b/include/mapfs/omo_03_hit.h @@ -1,76 +1,89 @@ -#define COLLIDER_Root 0x4B -#define COLLIDER_kanba 0x4A -#define COLLIDER_kan 0x49 -#define COLLIDER_g304 0x48 -#define COLLIDER_o945 0x47 -#define COLLIDER_g303 0x46 -#define COLLIDER_o941 0x45 -#define COLLIDER_o939 0x44 -#define COLLIDER_g294 0x43 -#define COLLIDER_o925 0x42 -#define COLLIDER_g286 0x41 -#define COLLIDER_g291 0x40 -#define COLLIDER_g293 0x3F -#define COLLIDER_o924 0x3E -#define COLLIDER_o923 0x3D -#define COLLIDER_g292 0x3C -#define COLLIDER_o922 0x3B -#define COLLIDER_g288 0x3A -#define COLLIDER_g290 0x39 -#define COLLIDER_o921 0x38 -#define COLLIDER_o920 0x37 -#define COLLIDER_g289 0x36 -#define COLLIDER_o919 0x35 -#define COLLIDER_g277 0x34 -#define COLLIDER_o894 0x33 -#define COLLIDER_o890 0x32 -#define COLLIDER_o883 0x31 -#define COLLIDER_g276 0x30 -#define COLLIDER_o980 0x2F -#define COLLIDER_o884 0x2E -#define COLLIDER_g255 0x2D -#define COLLIDER_o833 0x2C -#define COLLIDER_o832 0x2B -#define COLLIDER_o831 0x2A -#define COLLIDER_o830 0x29 -#define COLLIDER_o829 0x28 -#define COLLIDER_o977 0x27 -#define COLLIDER_o971 0x26 -#define COLLIDER_senro 0x25 -#define COLLIDER_o881 0x24 -#define COLLIDER_o737 0x23 -#define COLLIDER_o827 0x22 -#define COLLIDER_point 0x21 -#define COLLIDER_bou 0x20 -#define COLLIDER_bou1 0x1F -#define COLLIDER_g252 0x1E -#define COLLIDER_o979 0x1D -#define COLLIDER_o978 0x1C -#define COLLIDER_o801 0x1B -#define COLLIDER_dai 0x1A -#define COLLIDER_o788 0x19 -#define COLLIDER_soto 0x18 -#define COLLIDER_senro_naka 0x17 -#define COLLIDER_o902 0x16 -#define COLLIDER_g167 0x15 -#define COLLIDER_o759 0x14 -#define COLLIDER_o758 0x13 -#define COLLIDER_o789 0x12 -#define COLLIDER_o783 0x11 -#define COLLIDER_g249 0x10 -#define COLLIDER_o607 0xF -#define COLLIDER_o596 0xE -#define COLLIDER_bero 0xD -#define COLLIDER_o948 0xC -#define COLLIDER_o947 0xB -#define COLLIDER_o943 0xA -#define COLLIDER_o942 0x9 -#define COLLIDER_eki1 0x8 -#define COLLIDER_deilit4 0x7 -#define COLLIDER_deili4 0x6 -#define COLLIDER_deilit3 0x5 -#define COLLIDER_deili3 0x4 -#define COLLIDER_deilit2 0x3 -#define COLLIDER_deili2 0x2 -#define COLLIDER_deilit1 0x1 -#define COLLIDER_deili1 0x0 +#define COLLIDER_Root 0x4B +#define COLLIDER_kanba 0x4A +#define COLLIDER_kan 0x49 +#define COLLIDER_g304 0x48 +#define COLLIDER_o945 0x47 +#define COLLIDER_g303 0x46 +#define COLLIDER_o941 0x45 +#define COLLIDER_o939 0x44 +#define COLLIDER_g294 0x43 +#define COLLIDER_o925 0x42 +#define COLLIDER_g286 0x41 +#define COLLIDER_g291 0x40 +#define COLLIDER_g293 0x3F +#define COLLIDER_o924 0x3E +#define COLLIDER_o923 0x3D +#define COLLIDER_g292 0x3C +#define COLLIDER_o922 0x3B +#define COLLIDER_g288 0x3A +#define COLLIDER_g290 0x39 +#define COLLIDER_o921 0x38 +#define COLLIDER_o920 0x37 +#define COLLIDER_g289 0x36 +#define COLLIDER_o919 0x35 +#define COLLIDER_g277 0x34 +#define COLLIDER_o894 0x33 +#define COLLIDER_o890 0x32 +#define COLLIDER_o883 0x31 +#define COLLIDER_g276 0x30 +#define COLLIDER_o980 0x2F +#define COLLIDER_o884 0x2E +#define COLLIDER_g255 0x2D +#define COLLIDER_o833 0x2C +#define COLLIDER_o832 0x2B +#define COLLIDER_o831 0x2A +#define COLLIDER_o830 0x29 +#define COLLIDER_o829 0x28 +#define COLLIDER_o977 0x27 +#define COLLIDER_o971 0x26 +#define COLLIDER_senro 0x25 +#define COLLIDER_o881 0x24 +#define COLLIDER_o737 0x23 +#define COLLIDER_o827 0x22 +#define COLLIDER_point 0x21 +#define COLLIDER_bou 0x20 +#define COLLIDER_bou1 0x1F +#define COLLIDER_g252 0x1E +#define COLLIDER_o979 0x1D +#define COLLIDER_o978 0x1C +#define COLLIDER_o801 0x1B +#define COLLIDER_dai 0x1A +#define COLLIDER_o788 0x19 +#define COLLIDER_soto 0x18 +#define COLLIDER_senro_naka 0x17 +#define COLLIDER_o902 0x16 +#define COLLIDER_g167 0x15 +#define COLLIDER_o759 0x14 +#define COLLIDER_o758 0x13 +#define COLLIDER_o789 0x12 +#define COLLIDER_o783 0x11 +#define COLLIDER_g249 0x10 +#define COLLIDER_o607 0xF +#define COLLIDER_o596 0xE +#define COLLIDER_bero 0xD +#define COLLIDER_o948 0xC +#define COLLIDER_o947 0xB +#define COLLIDER_o943 0xA +#define COLLIDER_o942 0x9 +#define COLLIDER_eki1 0x8 +#define COLLIDER_deilit4 0x7 +#define COLLIDER_deili4 0x6 +#define COLLIDER_deilit3 0x5 +#define COLLIDER_deili3 0x4 +#define COLLIDER_deilit2 0x3 +#define COLLIDER_deili2 0x2 +#define COLLIDER_deilit1 0x1 +#define COLLIDER_deili1 0x0 + +#define ZONE_Root 0xA +#define ZONE_Default 0x9 +#define ZONE_2 0x8 +#define ZONE_1 0x7 +#define ZONE_senro 0x6 +#define ZONE_o397 0x5 +#define ZONE_dai 0x4 +#define ZONE_o826 0x3 +#define ZONE_senro_naka 0x2 +#define ZONE_bero 0x1 +#define ZONE_o792 0x0 + diff --git a/include/mapfs/omo_03_shape.h b/include/mapfs/omo_03_shape.h index 1689bbdafe..a9c8604140 100644 --- a/include/mapfs/omo_03_shape.h +++ b/include/mapfs/omo_03_shape.h @@ -1,174 +1,175 @@ -#define MODEL_Root 0xAD -#define MODEL_po 0xAC -#define MODEL_p_8 0xAB -#define MODEL_p_7 0xAA -#define MODEL_p_6 0xA9 -#define MODEL_p_5 0xA8 -#define MODEL_p_4 0xA7 -#define MODEL_p_3 0xA6 -#define MODEL_p_2 0xA5 -#define MODEL_p_1 0xA4 -#define MODEL_g296 0xA3 -#define MODEL_o1065 0xA2 -#define MODEL_o1064 0xA1 -#define MODEL_o1063 0xA0 -#define MODEL_o1062 0x9F -#define MODEL_o1060 0x9E -#define MODEL_o1059 0x9D -#define MODEL_ya 0x9C -#define MODEL_ya_c 0x9B -#define MODEL_y_c 0x9A -#define MODEL_y_c2 0x99 -#define MODEL_y_c1 0x98 -#define MODEL_g275 0x97 -#define MODEL_o926 0x96 -#define MODEL_ya_b 0x95 -#define MODEL_y_b 0x94 -#define MODEL_y_b2 0x93 -#define MODEL_y_b1 0x92 -#define MODEL_g271 0x91 -#define MODEL_o925 0x90 -#define MODEL_ya_a 0x8F -#define MODEL_y_a 0x8E -#define MODEL_popo 0x8D -#define MODEL_p6 0x8C -#define MODEL_o11 0x8B -#define MODEL_p5 0x8A -#define MODEL_o10 0x89 -#define MODEL_p4 0x88 -#define MODEL_o9 0x87 -#define MODEL_p3 0x86 -#define MODEL_o8 0x85 -#define MODEL_o7 0x84 -#define MODEL_p2 0x83 -#define MODEL_o6 0x82 -#define MODEL_o5 0x81 -#define MODEL_p1 0x80 -#define MODEL_o4 0x7F -#define MODEL_o3 0x7E -#define MODEL_o2 0x7D -#define MODEL_o1 0x7C -#define MODEL_eki 0x7B -#define MODEL_g283 0x7A -#define MODEL_o940 0x79 -#define MODEL_o938 0x78 -#define MODEL_g282 0x77 -#define MODEL_o939 0x76 -#define MODEL_o937 0x75 -#define MODEL_g279 0x74 -#define MODEL_o864 0x73 -#define MODEL_g264 0x72 -#define MODEL_o957 0x71 -#define MODEL_o877 0x70 -#define MODEL_o876 0x6F -#define MODEL_station 0x6E -#define MODEL_n 0x6D -#define MODEL_o 0x6C -#define MODEL_i 0x6B -#define MODEL_t 0x6A -#define MODEL_a 0x69 -#define MODEL_s 0x68 -#define MODEL_g168 0x67 -#define MODEL_o588 0x66 -#define MODEL_g170 0x65 -#define MODEL_o1084 0x64 -#define MODEL_o1083 0x63 -#define MODEL_o571 0x62 -#define MODEL_o608 0x61 -#define MODEL_o609 0x60 -#define MODEL_o1087 0x5F -#define MODEL_kaiten 0x5E -#define MODEL_k 0x5D -#define MODEL_o818 0x5C -#define MODEL_o933 0x5B -#define MODEL_o817 0x5A -#define MODEL_point 0x59 -#define MODEL_bou 0x58 -#define MODEL_bou1 0x57 -#define MODEL_g252 0x56 -#define MODEL_o801 0x55 -#define MODEL_m 0x54 -#define MODEL_o631 0x53 -#define MODEL_o630 0x52 -#define MODEL_o625 0x51 -#define MODEL_mado 0x50 -#define MODEL_mado1_2 0x4F -#define MODEL_m1_2 0x4E -#define MODEL_mado1_1 0x4D -#define MODEL_m1_1 0x4C -#define MODEL_tokei 0x4B -#define MODEL_tokei1 0x4A -#define MODEL_maru_1 0x49 -#define MODEL_maru1 0x48 -#define MODEL_hari_1 0x47 -#define MODEL_hari1 0x46 -#define MODEL_hana 0x45 -#define MODEL_hana_4 0x44 -#define MODEL_ha4 0x43 -#define MODEL_hana_3 0x42 -#define MODEL_ha3 0x41 -#define MODEL_hana_2 0x40 -#define MODEL_ha2 0x3F -#define MODEL_hana_1 0x3E -#define MODEL_ha1 0x3D -#define MODEL_kaidan 0x3C -#define MODEL_o936 0x3B -#define MODEL_mon2 0x3A -#define MODEL_o759 0x39 -#define MODEL_o758 0x38 -#define MODEL_o757 0x37 -#define MODEL_mon1 0x36 -#define MODEL_o766 0x35 -#define MODEL_o765 0x34 -#define MODEL_o764 0x33 -#define MODEL_g240 0x32 -#define MODEL_o781 0x31 -#define MODEL_o780 0x30 -#define MODEL_o779 0x2F -#define MODEL_senro 0x2E -#define MODEL_o860 0x2D -#define MODEL_o397 0x2C -#define MODEL_saku 0x2B -#define MODEL_o1082 0x2A -#define MODEL_o1081 0x29 -#define MODEL_o1080 0x28 -#define MODEL_o1079 0x27 -#define MODEL_o1078 0x26 -#define MODEL_pu2 0x25 -#define MODEL_pu1 0x24 -#define MODEL_s2 0x23 -#define MODEL_s1_2 0x22 -#define MODEL_s1_1 0x21 -#define MODEL_b2 0x20 -#define MODEL_b1 0x1F -#define MODEL_dai 0x1E -#define MODEL_o777 0x1D -#define MODEL_o782 0x1C -#define MODEL_o767 0x1B -#define MODEL_soto 0x1A -#define MODEL_o930 0x19 -#define MODEL_o931 0x18 -#define MODEL_o932 0x17 -#define MODEL_o934 0x16 -#define MODEL_bero 0x15 -#define MODEL_o793 0x14 -#define MODEL_o792 0x13 -#define MODEL_o819 0x12 -#define MODEL_k3 0x11 -#define MODEL_o784 0x10 -#define MODEL_o788 0xF -#define MODEL_o786 0xE -#define MODEL_k2 0xD -#define MODEL_o775 0xC -#define MODEL_o774 0xB -#define MODEL_o773 0xA -#define MODEL_o740 0x9 -#define MODEL_o736 0x8 -#define MODEL_o737 0x7 -#define MODEL_o734 0x6 -#define MODEL_o735 0x5 -#define MODEL_o739 0x4 -#define MODEL_k1 0x3 -#define MODEL_o789 0x2 -#define MODEL_o787 0x1 -#define MODEL_o783 0x0 +#define MODEL_Root 0xAD +#define MODEL_po 0xAC +#define MODEL_p_8 0xAB +#define MODEL_p_7 0xAA +#define MODEL_p_6 0xA9 +#define MODEL_p_5 0xA8 +#define MODEL_p_4 0xA7 +#define MODEL_p_3 0xA6 +#define MODEL_p_2 0xA5 +#define MODEL_p_1 0xA4 +#define MODEL_g296 0xA3 +#define MODEL_o1065 0xA2 +#define MODEL_o1064 0xA1 +#define MODEL_o1063 0xA0 +#define MODEL_o1062 0x9F +#define MODEL_o1060 0x9E +#define MODEL_o1059 0x9D +#define MODEL_ya 0x9C +#define MODEL_ya_c 0x9B +#define MODEL_y_c 0x9A +#define MODEL_y_c2 0x99 +#define MODEL_y_c1 0x98 +#define MODEL_g275 0x97 +#define MODEL_o926 0x96 +#define MODEL_ya_b 0x95 +#define MODEL_y_b 0x94 +#define MODEL_y_b2 0x93 +#define MODEL_y_b1 0x92 +#define MODEL_g271 0x91 +#define MODEL_o925 0x90 +#define MODEL_ya_a 0x8F +#define MODEL_y_a 0x8E +#define MODEL_popo 0x8D +#define MODEL_p6 0x8C +#define MODEL_o11 0x8B +#define MODEL_p5 0x8A +#define MODEL_o10 0x89 +#define MODEL_p4 0x88 +#define MODEL_o9 0x87 +#define MODEL_p3 0x86 +#define MODEL_o8 0x85 +#define MODEL_o7 0x84 +#define MODEL_p2 0x83 +#define MODEL_o6 0x82 +#define MODEL_o5 0x81 +#define MODEL_p1 0x80 +#define MODEL_o4 0x7F +#define MODEL_o3 0x7E +#define MODEL_o2 0x7D +#define MODEL_o1 0x7C +#define MODEL_eki 0x7B +#define MODEL_g283 0x7A +#define MODEL_o940 0x79 +#define MODEL_o938 0x78 +#define MODEL_g282 0x77 +#define MODEL_o939 0x76 +#define MODEL_o937 0x75 +#define MODEL_g279 0x74 +#define MODEL_o864 0x73 +#define MODEL_g264 0x72 +#define MODEL_o957 0x71 +#define MODEL_o877 0x70 +#define MODEL_o876 0x6F +#define MODEL_station 0x6E +#define MODEL_n 0x6D +#define MODEL_o 0x6C +#define MODEL_i 0x6B +#define MODEL_t 0x6A +#define MODEL_a 0x69 +#define MODEL_s 0x68 +#define MODEL_g168 0x67 +#define MODEL_o588 0x66 +#define MODEL_g170 0x65 +#define MODEL_o1084 0x64 +#define MODEL_o1083 0x63 +#define MODEL_o571 0x62 +#define MODEL_o608 0x61 +#define MODEL_o609 0x60 +#define MODEL_o1087 0x5F +#define MODEL_kaiten 0x5E +#define MODEL_k 0x5D +#define MODEL_o818 0x5C +#define MODEL_o933 0x5B +#define MODEL_o817 0x5A +#define MODEL_point 0x59 +#define MODEL_bou 0x58 +#define MODEL_bou1 0x57 +#define MODEL_g252 0x56 +#define MODEL_o801 0x55 +#define MODEL_m 0x54 +#define MODEL_o631 0x53 +#define MODEL_o630 0x52 +#define MODEL_o625 0x51 +#define MODEL_mado 0x50 +#define MODEL_mado1_2 0x4F +#define MODEL_m1_2 0x4E +#define MODEL_mado1_1 0x4D +#define MODEL_m1_1 0x4C +#define MODEL_tokei 0x4B +#define MODEL_tokei1 0x4A +#define MODEL_maru_1 0x49 +#define MODEL_maru1 0x48 +#define MODEL_hari_1 0x47 +#define MODEL_hari1 0x46 +#define MODEL_hana 0x45 +#define MODEL_hana_4 0x44 +#define MODEL_ha4 0x43 +#define MODEL_hana_3 0x42 +#define MODEL_ha3 0x41 +#define MODEL_hana_2 0x40 +#define MODEL_ha2 0x3F +#define MODEL_hana_1 0x3E +#define MODEL_ha1 0x3D +#define MODEL_kaidan 0x3C +#define MODEL_o936 0x3B +#define MODEL_mon2 0x3A +#define MODEL_o759 0x39 +#define MODEL_o758 0x38 +#define MODEL_o757 0x37 +#define MODEL_mon1 0x36 +#define MODEL_o766 0x35 +#define MODEL_o765 0x34 +#define MODEL_o764 0x33 +#define MODEL_g240 0x32 +#define MODEL_o781 0x31 +#define MODEL_o780 0x30 +#define MODEL_o779 0x2F +#define MODEL_senro 0x2E +#define MODEL_o860 0x2D +#define MODEL_o397 0x2C +#define MODEL_saku 0x2B +#define MODEL_o1082 0x2A +#define MODEL_o1081 0x29 +#define MODEL_o1080 0x28 +#define MODEL_o1079 0x27 +#define MODEL_o1078 0x26 +#define MODEL_pu2 0x25 +#define MODEL_pu1 0x24 +#define MODEL_s2 0x23 +#define MODEL_s1_2 0x22 +#define MODEL_s1_1 0x21 +#define MODEL_b2 0x20 +#define MODEL_b1 0x1F +#define MODEL_dai 0x1E +#define MODEL_o777 0x1D +#define MODEL_o782 0x1C +#define MODEL_o767 0x1B +#define MODEL_soto 0x1A +#define MODEL_o930 0x19 +#define MODEL_o931 0x18 +#define MODEL_o932 0x17 +#define MODEL_o934 0x16 +#define MODEL_bero 0x15 +#define MODEL_o793 0x14 +#define MODEL_o792 0x13 +#define MODEL_o819 0x12 +#define MODEL_k3 0x11 +#define MODEL_o784 0x10 +#define MODEL_o788 0xF +#define MODEL_o786 0xE +#define MODEL_k2 0xD +#define MODEL_o775 0xC +#define MODEL_o774 0xB +#define MODEL_o773 0xA +#define MODEL_o740 0x9 +#define MODEL_o736 0x8 +#define MODEL_o737 0x7 +#define MODEL_o734 0x6 +#define MODEL_o735 0x5 +#define MODEL_o739 0x4 +#define MODEL_k1 0x3 +#define MODEL_o789 0x2 +#define MODEL_o787 0x1 +#define MODEL_o783 0x0 + diff --git a/include/mapfs/omo_04_hit.h b/include/mapfs/omo_04_hit.h index b124123b4c..7e70178efb 100644 --- a/include/mapfs/omo_04_hit.h +++ b/include/mapfs/omo_04_hit.h @@ -1,47 +1,56 @@ -#define COLLIDER_Root 0x2E -#define COLLIDER_Default 0x2D -#define COLLIDER_o784 0x2C -#define COLLIDER_o781 0x2B -#define COLLIDER_g159 0x2A -#define COLLIDER_o796 0x29 -#define COLLIDER_o326 0x28 -#define COLLIDER_o381 0x27 -#define COLLIDER_o514 0x26 -#define COLLIDER_o642 0x25 -#define COLLIDER_o608 0x24 -#define COLLIDER_in_2 0x23 -#define COLLIDER_o515 0x22 -#define COLLIDER_o766 0x21 -#define COLLIDER_o644 0x20 -#define COLLIDER_o769 0x1F -#define COLLIDER_g115 0x1E -#define COLLIDER_o797 0x1D -#define COLLIDER_o645 0x1C -#define COLLIDER_o750 0x1B -#define COLLIDER_o762 0x1A -#define COLLIDER_o767 0x19 -#define COLLIDER_o330 0x18 -#define COLLIDER_o646 0x17 -#define COLLIDER_g132 0x16 -#define COLLIDER_o479 0x15 -#define COLLIDER_o478 0x14 -#define COLLIDER_o477 0x13 -#define COLLIDER_o355 0x12 -#define COLLIDER_o354 0x11 -#define COLLIDER_g147 0x10 -#define COLLIDER_o459 0xF -#define COLLIDER_o490 0xE -#define COLLIDER_o489 0xD -#define COLLIDER_o480 0xC -#define COLLIDER_g248 0xB -#define COLLIDER_o460 0xA -#define COLLIDER_o353 0x9 -#define COLLIDER_o593 0x8 -#define COLLIDER_dai 0x7 -#define COLLIDER_o236 0x6 -#define COLLIDER_o382 0x5 -#define COLLIDER_bero 0x4 -#define COLLIDER_o793 0x3 -#define COLLIDER_o234 0x2 -#define COLLIDER_deilit1 0x1 -#define COLLIDER_deili1 0x0 +#define COLLIDER_Root 0x2E +#define COLLIDER_Default 0x2D +#define COLLIDER_o784 0x2C +#define COLLIDER_o781 0x2B +#define COLLIDER_g159 0x2A +#define COLLIDER_o796 0x29 +#define COLLIDER_o326 0x28 +#define COLLIDER_o381 0x27 +#define COLLIDER_o514 0x26 +#define COLLIDER_o642 0x25 +#define COLLIDER_o608 0x24 +#define COLLIDER_in_2 0x23 +#define COLLIDER_o515 0x22 +#define COLLIDER_o766 0x21 +#define COLLIDER_o644 0x20 +#define COLLIDER_o769 0x1F +#define COLLIDER_g115 0x1E +#define COLLIDER_o797 0x1D +#define COLLIDER_o645 0x1C +#define COLLIDER_o750 0x1B +#define COLLIDER_o762 0x1A +#define COLLIDER_o767 0x19 +#define COLLIDER_o330 0x18 +#define COLLIDER_o646 0x17 +#define COLLIDER_g132 0x16 +#define COLLIDER_o479 0x15 +#define COLLIDER_o478 0x14 +#define COLLIDER_o477 0x13 +#define COLLIDER_o355 0x12 +#define COLLIDER_o354 0x11 +#define COLLIDER_g147 0x10 +#define COLLIDER_o459 0xF +#define COLLIDER_o490 0xE +#define COLLIDER_o489 0xD +#define COLLIDER_o480 0xC +#define COLLIDER_g248 0xB +#define COLLIDER_o460 0xA +#define COLLIDER_o353 0x9 +#define COLLIDER_o593 0x8 +#define COLLIDER_dai 0x7 +#define COLLIDER_o236 0x6 +#define COLLIDER_o382 0x5 +#define COLLIDER_bero 0x4 +#define COLLIDER_o793 0x3 +#define COLLIDER_o234 0x2 +#define COLLIDER_deilit1 0x1 +#define COLLIDER_deili1 0x0 + +#define ZONE_Root 0x6 +#define ZONE_g255 0x5 +#define ZONE_o781 0x4 +#define ZONE_g254 0x3 +#define ZONE_o782 0x2 +#define ZONE_o779 0x1 +#define ZONE_o780 0x0 + diff --git a/include/mapfs/omo_04_shape.h b/include/mapfs/omo_04_shape.h index 2505018e20..7897d1aabd 100644 --- a/include/mapfs/omo_04_shape.h +++ b/include/mapfs/omo_04_shape.h @@ -1,147 +1,148 @@ -#define MODEL_Root 0x92 -#define MODEL_m 0x91 -#define MODEL_o856 0x90 -#define MODEL_o855 0x8F -#define MODEL_o854 0x8E -#define MODEL_o853 0x8D -#define MODEL_o852 0x8C -#define MODEL_mado 0x8B -#define MODEL_mado3_2 0x8A -#define MODEL_m3_2 0x89 -#define MODEL_mado3_1 0x88 -#define MODEL_m3_1 0x87 -#define MODEL_mado2_2 0x86 -#define MODEL_m2_2 0x85 -#define MODEL_mado2_1 0x84 -#define MODEL_m2_1 0x83 -#define MODEL_mado1_2 0x82 -#define MODEL_m1_2 0x81 -#define MODEL_mado1_1 0x80 -#define MODEL_m1_1 0x7F -#define MODEL_hana 0x7E -#define MODEL_hana_5 0x7D -#define MODEL_ha5 0x7C -#define MODEL_hana_4 0x7B -#define MODEL_ha4 0x7A -#define MODEL_hana_3 0x79 -#define MODEL_ha3 0x78 -#define MODEL_hana_2 0x77 -#define MODEL_ha2 0x76 -#define MODEL_hana_1 0x75 -#define MODEL_ha1 0x74 -#define MODEL_g253 0x73 -#define MODEL_o892 0x72 -#define MODEL_o774 0x71 -#define MODEL_o773 0x70 -#define MODEL_o772 0x6F -#define MODEL_o770 0x6E -#define MODEL_o890 0x6D -#define MODEL_o891 0x6C -#define MODEL_o889 0x6B -#define MODEL_biru 0x6A -#define MODEL_biru3 0x69 -#define MODEL_o771 0x68 -#define MODEL_o605 0x67 -#define MODEL_o604 0x66 -#define MODEL_o761 0x65 -#define MODEL_o760 0x64 -#define MODEL_o759 0x63 -#define MODEL_biru2 0x62 -#define MODEL_o766 0x61 -#define MODEL_o646 0x60 -#define MODEL_o645 0x5F -#define MODEL_o644 0x5E -#define MODEL_o643 0x5D -#define MODEL_o750 0x5C -#define MODEL_biru1 0x5B -#define MODEL_o642 0x5A -#define MODEL_o640 0x59 -#define MODEL_o598 0x58 -#define MODEL_o597 0x57 -#define MODEL_g248 0x56 -#define MODEL_o778 0x55 -#define MODEL_o777 0x54 -#define MODEL_h3 0x53 -#define MODEL_g203 0x52 -#define MODEL_o621 0x51 -#define MODEL_o619 0x50 -#define MODEL_o617 0x4F -#define MODEL_o615 0x4E -#define MODEL_o613 0x4D -#define MODEL_o611 0x4C -#define MODEL_o609 0x4B -#define MODEL_g202 0x4A -#define MODEL_o616 0x49 -#define MODEL_o614 0x48 -#define MODEL_o608 0x47 -#define MODEL_h1_2 0x46 -#define MODEL_o626 0x45 -#define MODEL_o625 0x44 -#define MODEL_o624 0x43 -#define MODEL_o623 0x42 -#define MODEL_o622 0x41 -#define MODEL_o593 0x40 -#define MODEL_omo 0x3F -#define MODEL_saikoro 0x3E -#define MODEL_g132 0x3D -#define MODEL_o385 0x3C -#define MODEL_o383 0x3B -#define MODEL_o382 0x3A -#define MODEL_o381 0x39 -#define MODEL_t 0x38 -#define MODEL_o477 0x37 -#define MODEL_g151 0x36 -#define MODEL_o475 0x35 -#define MODEL_g147 0x34 -#define MODEL_o459 0x33 -#define MODEL_dai 0x32 -#define MODEL_yu_kabe 0x31 -#define MODEL_o802 0x30 -#define MODEL_o790 0x2F -#define MODEL_o331 0x2E -#define MODEL_yuka 0x2D -#define MODEL_o326 0x2C -#define MODEL_o789 0x2B -#define MODEL_in_1 0x2A -#define MODEL_o330 0x29 -#define MODEL_o329 0x28 -#define MODEL_k_4 0x27 -#define MODEL_o562 0x26 -#define MODEL_o244 0x25 -#define MODEL_o798 0x24 -#define MODEL_o242 0x23 -#define MODEL_o240 0x22 -#define MODEL_o792 0x21 -#define MODEL_o241 0x20 -#define MODEL_o867 0x1F -#define MODEL_k_3 0x1E -#define MODEL_o572 0x1D -#define MODEL_o559 0x1C -#define MODEL_o338 0x1B -#define MODEL_o725 0x1A -#define MODEL_o888 0x19 -#define MODEL_o723 0x18 -#define MODEL_o722 0x17 -#define MODEL_o335 0x16 -#define MODEL_o859 0x15 -#define MODEL_o337 0x14 -#define MODEL_k_2 0x13 -#define MODEL_o883 0x12 -#define MODEL_o882 0x11 -#define MODEL_o878 0x10 -#define MODEL_o874 0xF -#define MODEL_o872 0xE -#define MODEL_o870 0xD -#define MODEL_o868 0xC -#define MODEL_o876 0xB -#define MODEL_o880 0xA -#define MODEL_k_1 0x9 -#define MODEL_o865 0x8 -#define MODEL_o863 0x7 -#define MODEL_o862 0x6 -#define MODEL_o141 0x5 -#define MODEL_o144 0x4 -#define MODEL_o143 0x3 -#define MODEL_o142 0x2 -#define MODEL_o861 0x1 -#define MODEL_o327 0x0 +#define MODEL_Root 0x92 +#define MODEL_m 0x91 +#define MODEL_o856 0x90 +#define MODEL_o855 0x8F +#define MODEL_o854 0x8E +#define MODEL_o853 0x8D +#define MODEL_o852 0x8C +#define MODEL_mado 0x8B +#define MODEL_mado3_2 0x8A +#define MODEL_m3_2 0x89 +#define MODEL_mado3_1 0x88 +#define MODEL_m3_1 0x87 +#define MODEL_mado2_2 0x86 +#define MODEL_m2_2 0x85 +#define MODEL_mado2_1 0x84 +#define MODEL_m2_1 0x83 +#define MODEL_mado1_2 0x82 +#define MODEL_m1_2 0x81 +#define MODEL_mado1_1 0x80 +#define MODEL_m1_1 0x7F +#define MODEL_hana 0x7E +#define MODEL_hana_5 0x7D +#define MODEL_ha5 0x7C +#define MODEL_hana_4 0x7B +#define MODEL_ha4 0x7A +#define MODEL_hana_3 0x79 +#define MODEL_ha3 0x78 +#define MODEL_hana_2 0x77 +#define MODEL_ha2 0x76 +#define MODEL_hana_1 0x75 +#define MODEL_ha1 0x74 +#define MODEL_g253 0x73 +#define MODEL_o892 0x72 +#define MODEL_o774 0x71 +#define MODEL_o773 0x70 +#define MODEL_o772 0x6F +#define MODEL_o770 0x6E +#define MODEL_o890 0x6D +#define MODEL_o891 0x6C +#define MODEL_o889 0x6B +#define MODEL_biru 0x6A +#define MODEL_biru3 0x69 +#define MODEL_o771 0x68 +#define MODEL_o605 0x67 +#define MODEL_o604 0x66 +#define MODEL_o761 0x65 +#define MODEL_o760 0x64 +#define MODEL_o759 0x63 +#define MODEL_biru2 0x62 +#define MODEL_o766 0x61 +#define MODEL_o646 0x60 +#define MODEL_o645 0x5F +#define MODEL_o644 0x5E +#define MODEL_o643 0x5D +#define MODEL_o750 0x5C +#define MODEL_biru1 0x5B +#define MODEL_o642 0x5A +#define MODEL_o640 0x59 +#define MODEL_o598 0x58 +#define MODEL_o597 0x57 +#define MODEL_g248 0x56 +#define MODEL_o778 0x55 +#define MODEL_o777 0x54 +#define MODEL_h3 0x53 +#define MODEL_g203 0x52 +#define MODEL_o621 0x51 +#define MODEL_o619 0x50 +#define MODEL_o617 0x4F +#define MODEL_o615 0x4E +#define MODEL_o613 0x4D +#define MODEL_o611 0x4C +#define MODEL_o609 0x4B +#define MODEL_g202 0x4A +#define MODEL_o616 0x49 +#define MODEL_o614 0x48 +#define MODEL_o608 0x47 +#define MODEL_h1_2 0x46 +#define MODEL_o626 0x45 +#define MODEL_o625 0x44 +#define MODEL_o624 0x43 +#define MODEL_o623 0x42 +#define MODEL_o622 0x41 +#define MODEL_o593 0x40 +#define MODEL_omo 0x3F +#define MODEL_saikoro 0x3E +#define MODEL_g132 0x3D +#define MODEL_o385 0x3C +#define MODEL_o383 0x3B +#define MODEL_o382 0x3A +#define MODEL_o381 0x39 +#define MODEL_t 0x38 +#define MODEL_o477 0x37 +#define MODEL_g151 0x36 +#define MODEL_o475 0x35 +#define MODEL_g147 0x34 +#define MODEL_o459 0x33 +#define MODEL_dai 0x32 +#define MODEL_yu_kabe 0x31 +#define MODEL_o802 0x30 +#define MODEL_o790 0x2F +#define MODEL_o331 0x2E +#define MODEL_yuka 0x2D +#define MODEL_o326 0x2C +#define MODEL_o789 0x2B +#define MODEL_in_1 0x2A +#define MODEL_o330 0x29 +#define MODEL_o329 0x28 +#define MODEL_k_4 0x27 +#define MODEL_o562 0x26 +#define MODEL_o244 0x25 +#define MODEL_o798 0x24 +#define MODEL_o242 0x23 +#define MODEL_o240 0x22 +#define MODEL_o792 0x21 +#define MODEL_o241 0x20 +#define MODEL_o867 0x1F +#define MODEL_k_3 0x1E +#define MODEL_o572 0x1D +#define MODEL_o559 0x1C +#define MODEL_o338 0x1B +#define MODEL_o725 0x1A +#define MODEL_o888 0x19 +#define MODEL_o723 0x18 +#define MODEL_o722 0x17 +#define MODEL_o335 0x16 +#define MODEL_o859 0x15 +#define MODEL_o337 0x14 +#define MODEL_k_2 0x13 +#define MODEL_o883 0x12 +#define MODEL_o882 0x11 +#define MODEL_o878 0x10 +#define MODEL_o874 0xF +#define MODEL_o872 0xE +#define MODEL_o870 0xD +#define MODEL_o868 0xC +#define MODEL_o876 0xB +#define MODEL_o880 0xA +#define MODEL_k_1 0x9 +#define MODEL_o865 0x8 +#define MODEL_o863 0x7 +#define MODEL_o862 0x6 +#define MODEL_o141 0x5 +#define MODEL_o144 0x4 +#define MODEL_o143 0x3 +#define MODEL_o142 0x2 +#define MODEL_o861 0x1 +#define MODEL_o327 0x0 + diff --git a/include/mapfs/omo_05_hit.h b/include/mapfs/omo_05_hit.h index 4aa0763696..ded57aa379 100644 --- a/include/mapfs/omo_05_hit.h +++ b/include/mapfs/omo_05_hit.h @@ -1,84 +1,93 @@ -#define COLLIDER_Root 0x53 -#define COLLIDER_popo 0x52 -#define COLLIDER_pp1 0x51 -#define COLLIDER_p1 0x50 -#define COLLIDER_g139 0x4F -#define COLLIDER_o477 0x4E -#define COLLIDER_o476 0x4D -#define COLLIDER_o475 0x4C -#define COLLIDER_o474 0x4B -#define COLLIDER_o472 0x4A -#define COLLIDER_o462 0x49 -#define COLLIDER_g132 0x48 -#define COLLIDER_o442 0x47 -#define COLLIDER_o441 0x46 -#define COLLIDER_o440 0x45 -#define COLLIDER_o461 0x44 -#define COLLIDER_g131 0x43 -#define COLLIDER_o439 0x42 -#define COLLIDER_o438 0x41 -#define COLLIDER_senro 0x40 -#define COLLIDER_g130 0x3F -#define COLLIDER_3 0x3E -#define COLLIDER_o437 0x3D -#define COLLIDER_o374 0x3C -#define COLLIDER_o484 0x3B -#define COLLIDER_taiko 0x3A -#define COLLIDER_o436 0x39 -#define COLLIDER_o435 0x38 -#define COLLIDER_tumi2 0x37 -#define COLLIDER_o425 0x36 -#define COLLIDER_o424 0x35 -#define COLLIDER_o423 0x34 -#define COLLIDER_obj 0x33 -#define COLLIDER_o456 0x32 -#define COLLIDER_o455 0x31 -#define COLLIDER_yuka 0x30 -#define COLLIDER_stage 0x2F -#define COLLIDER_o434 0x2E -#define COLLIDER_o433 0x2D -#define COLLIDER_o432 0x2C -#define COLLIDER_o431 0x2B -#define COLLIDER_mon_p2 0x2A -#define COLLIDER_fumi1 0x29 -#define COLLIDER_o331 0x28 -#define COLLIDER_o328 0x27 -#define COLLIDER_fumi2 0x26 -#define COLLIDER_o362 0x25 -#define COLLIDER_o430 0x24 -#define COLLIDER_o429 0x23 -#define COLLIDER_fumi 0x22 -#define COLLIDER_o359 0x21 -#define COLLIDER_o373 0x20 -#define COLLIDER_tumi1 0x1F -#define COLLIDER_o366 0x1E -#define COLLIDER_o364 0x1D -#define COLLIDER_o363 0x1C -#define COLLIDER_2 0x1B -#define COLLIDER_1 0x1A -#define COLLIDER_mon 0x19 -#define COLLIDER_mon1 0x18 -#define COLLIDER_mon_p1 0x17 -#define COLLIDER_saku 0x16 -#define COLLIDER_mon_k2 0x15 -#define COLLIDER_waku 0x14 -#define COLLIDER_sai 0x13 -#define COLLIDER_o428 0x12 -#define COLLIDER_o427 0x11 -#define COLLIDER_4 0x10 -#define COLLIDER_g135 0xF -#define COLLIDER_deilit4 0xE -#define COLLIDER_deili4 0xD -#define COLLIDER_deilit3 0xC -#define COLLIDER_deili3 0xB -#define COLLIDER_deilit2 0xA -#define COLLIDER_deili2 0x9 -#define COLLIDER_deilit1 0x8 -#define COLLIDER_deili1 0x7 -#define COLLIDER_g134 0x6 -#define COLLIDER_o483 0x5 -#define COLLIDER_o481 0x4 -#define COLLIDER_tt4 0x3 -#define COLLIDER_tt3 0x2 -#define COLLIDER_tt2 0x1 -#define COLLIDER_tt1 0x0 +#define COLLIDER_Root 0x53 +#define COLLIDER_popo 0x52 +#define COLLIDER_pp1 0x51 +#define COLLIDER_p1 0x50 +#define COLLIDER_g139 0x4F +#define COLLIDER_o477 0x4E +#define COLLIDER_o476 0x4D +#define COLLIDER_o475 0x4C +#define COLLIDER_o474 0x4B +#define COLLIDER_o472 0x4A +#define COLLIDER_o462 0x49 +#define COLLIDER_g132 0x48 +#define COLLIDER_o442 0x47 +#define COLLIDER_o441 0x46 +#define COLLIDER_o440 0x45 +#define COLLIDER_o461 0x44 +#define COLLIDER_g131 0x43 +#define COLLIDER_o439 0x42 +#define COLLIDER_o438 0x41 +#define COLLIDER_senro 0x40 +#define COLLIDER_g130 0x3F +#define COLLIDER_3 0x3E +#define COLLIDER_o437 0x3D +#define COLLIDER_o374 0x3C +#define COLLIDER_o484 0x3B +#define COLLIDER_taiko 0x3A +#define COLLIDER_o436 0x39 +#define COLLIDER_o435 0x38 +#define COLLIDER_tumi2 0x37 +#define COLLIDER_o425 0x36 +#define COLLIDER_o424 0x35 +#define COLLIDER_o423 0x34 +#define COLLIDER_obj 0x33 +#define COLLIDER_o456 0x32 +#define COLLIDER_o455 0x31 +#define COLLIDER_yuka 0x30 +#define COLLIDER_stage 0x2F +#define COLLIDER_o434 0x2E +#define COLLIDER_o433 0x2D +#define COLLIDER_o432 0x2C +#define COLLIDER_o431 0x2B +#define COLLIDER_mon_p2 0x2A +#define COLLIDER_fumi1 0x29 +#define COLLIDER_o331 0x28 +#define COLLIDER_o328 0x27 +#define COLLIDER_fumi2 0x26 +#define COLLIDER_o362 0x25 +#define COLLIDER_o430 0x24 +#define COLLIDER_o429 0x23 +#define COLLIDER_fumi 0x22 +#define COLLIDER_o359 0x21 +#define COLLIDER_o373 0x20 +#define COLLIDER_tumi1 0x1F +#define COLLIDER_o366 0x1E +#define COLLIDER_o364 0x1D +#define COLLIDER_o363 0x1C +#define COLLIDER_2 0x1B +#define COLLIDER_1 0x1A +#define COLLIDER_mon 0x19 +#define COLLIDER_mon1 0x18 +#define COLLIDER_mon_p1 0x17 +#define COLLIDER_saku 0x16 +#define COLLIDER_mon_k2 0x15 +#define COLLIDER_waku 0x14 +#define COLLIDER_sai 0x13 +#define COLLIDER_o428 0x12 +#define COLLIDER_o427 0x11 +#define COLLIDER_4 0x10 +#define COLLIDER_g135 0xF +#define COLLIDER_deilit4 0xE +#define COLLIDER_deili4 0xD +#define COLLIDER_deilit3 0xC +#define COLLIDER_deili3 0xB +#define COLLIDER_deilit2 0xA +#define COLLIDER_deili2 0x9 +#define COLLIDER_deilit1 0x8 +#define COLLIDER_deili1 0x7 +#define COLLIDER_g134 0x6 +#define COLLIDER_o483 0x5 +#define COLLIDER_o481 0x4 +#define COLLIDER_tt4 0x3 +#define COLLIDER_tt3 0x2 +#define COLLIDER_tt2 0x1 +#define COLLIDER_tt1 0x0 + +#define ZONE_Root 0x6 +#define ZONE_g120 0x5 +#define ZONE_o405 0x4 +#define ZONE_g119 0x3 +#define ZONE_o417 0x2 +#define ZONE_o416 0x1 +#define ZONE_o415 0x0 + diff --git a/include/mapfs/omo_05_shape.h b/include/mapfs/omo_05_shape.h index 1ea934348c..a078e94f90 100644 --- a/include/mapfs/omo_05_shape.h +++ b/include/mapfs/omo_05_shape.h @@ -1,138 +1,139 @@ -#define MODEL_Root 0x89 -#define MODEL_popo 0x88 -#define MODEL_p6 0x87 -#define MODEL_o11 0x86 -#define MODEL_p5 0x85 -#define MODEL_o10 0x84 -#define MODEL_p4 0x83 -#define MODEL_o9 0x82 -#define MODEL_p3 0x81 -#define MODEL_o8 0x80 -#define MODEL_o7 0x7F -#define MODEL_p2 0x7E -#define MODEL_o6 0x7D -#define MODEL_o5 0x7C -#define MODEL_p1 0x7B -#define MODEL_o4 0x7A -#define MODEL_o3 0x79 -#define MODEL_o2 0x78 -#define MODEL_o1 0x77 -#define MODEL_g169 0x76 -#define MODEL_o490 0x75 -#define MODEL_o487 0x74 -#define MODEL_o486 0x73 -#define MODEL_o485 0x72 -#define MODEL_o489 0x71 -#define MODEL_o488 0x70 -#define MODEL_g168 0x6F -#define MODEL_o480 0x6E -#define MODEL_o473 0x6D -#define MODEL_o484 0x6C -#define MODEL_o482 0x6B -#define MODEL_o503 0x6A -#define MODEL_o502 0x69 -#define MODEL_hana 0x68 -#define MODEL_hana_13 0x67 -#define MODEL_ha13 0x66 -#define MODEL_hana_12 0x65 -#define MODEL_ha12 0x64 -#define MODEL_hana_11 0x63 -#define MODEL_ha11 0x62 -#define MODEL_hana_10 0x61 -#define MODEL_ha10 0x60 -#define MODEL_hana_9 0x5F -#define MODEL_ha9 0x5E -#define MODEL_hana_8 0x5D -#define MODEL_ha8 0x5C -#define MODEL_hana_7 0x5B -#define MODEL_ha7 0x5A -#define MODEL_hana_6 0x59 -#define MODEL_ha6 0x58 -#define MODEL_hana_5 0x57 -#define MODEL_ha5 0x56 -#define MODEL_hana_4 0x55 -#define MODEL_ha4 0x54 -#define MODEL_hana_3 0x53 -#define MODEL_ha3 0x52 -#define MODEL_hana_2 0x51 -#define MODEL_ha2 0x50 -#define MODEL_hana_1 0x4F -#define MODEL_ha1 0x4E -#define MODEL_g130 0x4D -#define MODEL_o425 0x4C -#define MODEL_o424 0x4B -#define MODEL_o423 0x4A -#define MODEL_mon 0x49 -#define MODEL_mon2 0x48 -#define MODEL_mon1 0x47 -#define MODEL_mon_k2 0x46 -#define MODEL_mon_p2 0x45 -#define MODEL_mon_p1 0x44 -#define MODEL_obj 0x43 -#define MODEL_sai 0x42 -#define MODEL_3 0x41 -#define MODEL_2 0x40 -#define MODEL_1 0x3F -#define MODEL_tumi2 0x3E -#define MODEL_o362 0x3D -#define MODEL_o361 0x3C -#define MODEL_o359 0x3B -#define MODEL_tumi1 0x3A -#define MODEL_o366 0x39 -#define MODEL_o364 0x38 -#define MODEL_o363 0x37 -#define MODEL_fumi 0x36 -#define MODEL_fumi2 0x35 -#define MODEL_o330 0x34 -#define MODEL_o329 0x33 -#define MODEL_o328 0x32 -#define MODEL_fumi1 0x31 -#define MODEL_o333 0x30 -#define MODEL_o332 0x2F -#define MODEL_o331 0x2E -#define MODEL_mado 0x2D -#define MODEL_mado7_2 0x2C -#define MODEL_m7_2 0x2B -#define MODEL_mado7_1 0x2A -#define MODEL_m7_1 0x29 -#define MODEL_mado6_2 0x28 -#define MODEL_m6_2 0x27 -#define MODEL_mado6_1 0x26 -#define MODEL_m6_1 0x25 -#define MODEL_mado5_2 0x24 -#define MODEL_m5_2 0x23 -#define MODEL_mado5_1 0x22 -#define MODEL_m5_1 0x21 -#define MODEL_mado4_2 0x20 -#define MODEL_m4_2 0x1F -#define MODEL_mado4_1 0x1E -#define MODEL_m4_1 0x1D -#define MODEL_mado3_2 0x1C -#define MODEL_m3_2 0x1B -#define MODEL_mado3_11 0x1A -#define MODEL_m3_1 0x19 -#define MODEL_mado2_2 0x18 -#define MODEL_m2_2 0x17 -#define MODEL_mad2_1 0x16 -#define MODEL_m2_1 0x15 -#define MODEL_mado1_2 0x14 -#define MODEL_m1_2 0x13 -#define MODEL_mado1_1 0x12 -#define MODEL_m1_1 0x11 -#define MODEL_stage 0x10 -#define MODEL_waku_k 0xF -#define MODEL_waku 0xE -#define MODEL_senro 0xD -#define MODEL_yuka 0xC -#define MODEL_kabe 0xB -#define MODEL_o407 0xA -#define MODEL_o417 0x9 -#define MODEL_o419 0x8 -#define MODEL_o413 0x7 -#define MODEL_o411 0x6 -#define MODEL_o421 0x5 -#define MODEL_o405 0x4 -#define MODEL_o403 0x3 -#define MODEL_o401 0x2 -#define MODEL_o415 0x1 -#define MODEL_o409 0x0 +#define MODEL_Root 0x89 +#define MODEL_popo 0x88 +#define MODEL_p6 0x87 +#define MODEL_o11 0x86 +#define MODEL_p5 0x85 +#define MODEL_o10 0x84 +#define MODEL_p4 0x83 +#define MODEL_o9 0x82 +#define MODEL_p3 0x81 +#define MODEL_o8 0x80 +#define MODEL_o7 0x7F +#define MODEL_p2 0x7E +#define MODEL_o6 0x7D +#define MODEL_o5 0x7C +#define MODEL_p1 0x7B +#define MODEL_o4 0x7A +#define MODEL_o3 0x79 +#define MODEL_o2 0x78 +#define MODEL_o1 0x77 +#define MODEL_g169 0x76 +#define MODEL_o490 0x75 +#define MODEL_o487 0x74 +#define MODEL_o486 0x73 +#define MODEL_o485 0x72 +#define MODEL_o489 0x71 +#define MODEL_o488 0x70 +#define MODEL_g168 0x6F +#define MODEL_o480 0x6E +#define MODEL_o473 0x6D +#define MODEL_o484 0x6C +#define MODEL_o482 0x6B +#define MODEL_o503 0x6A +#define MODEL_o502 0x69 +#define MODEL_hana 0x68 +#define MODEL_hana_13 0x67 +#define MODEL_ha13 0x66 +#define MODEL_hana_12 0x65 +#define MODEL_ha12 0x64 +#define MODEL_hana_11 0x63 +#define MODEL_ha11 0x62 +#define MODEL_hana_10 0x61 +#define MODEL_ha10 0x60 +#define MODEL_hana_9 0x5F +#define MODEL_ha9 0x5E +#define MODEL_hana_8 0x5D +#define MODEL_ha8 0x5C +#define MODEL_hana_7 0x5B +#define MODEL_ha7 0x5A +#define MODEL_hana_6 0x59 +#define MODEL_ha6 0x58 +#define MODEL_hana_5 0x57 +#define MODEL_ha5 0x56 +#define MODEL_hana_4 0x55 +#define MODEL_ha4 0x54 +#define MODEL_hana_3 0x53 +#define MODEL_ha3 0x52 +#define MODEL_hana_2 0x51 +#define MODEL_ha2 0x50 +#define MODEL_hana_1 0x4F +#define MODEL_ha1 0x4E +#define MODEL_g130 0x4D +#define MODEL_o425 0x4C +#define MODEL_o424 0x4B +#define MODEL_o423 0x4A +#define MODEL_mon 0x49 +#define MODEL_mon2 0x48 +#define MODEL_mon1 0x47 +#define MODEL_mon_k2 0x46 +#define MODEL_mon_p2 0x45 +#define MODEL_mon_p1 0x44 +#define MODEL_obj 0x43 +#define MODEL_sai 0x42 +#define MODEL_3 0x41 +#define MODEL_2 0x40 +#define MODEL_1 0x3F +#define MODEL_tumi2 0x3E +#define MODEL_o362 0x3D +#define MODEL_o361 0x3C +#define MODEL_o359 0x3B +#define MODEL_tumi1 0x3A +#define MODEL_o366 0x39 +#define MODEL_o364 0x38 +#define MODEL_o363 0x37 +#define MODEL_fumi 0x36 +#define MODEL_fumi2 0x35 +#define MODEL_o330 0x34 +#define MODEL_o329 0x33 +#define MODEL_o328 0x32 +#define MODEL_fumi1 0x31 +#define MODEL_o333 0x30 +#define MODEL_o332 0x2F +#define MODEL_o331 0x2E +#define MODEL_mado 0x2D +#define MODEL_mado7_2 0x2C +#define MODEL_m7_2 0x2B +#define MODEL_mado7_1 0x2A +#define MODEL_m7_1 0x29 +#define MODEL_mado6_2 0x28 +#define MODEL_m6_2 0x27 +#define MODEL_mado6_1 0x26 +#define MODEL_m6_1 0x25 +#define MODEL_mado5_2 0x24 +#define MODEL_m5_2 0x23 +#define MODEL_mado5_1 0x22 +#define MODEL_m5_1 0x21 +#define MODEL_mado4_2 0x20 +#define MODEL_m4_2 0x1F +#define MODEL_mado4_1 0x1E +#define MODEL_m4_1 0x1D +#define MODEL_mado3_2 0x1C +#define MODEL_m3_2 0x1B +#define MODEL_mado3_11 0x1A +#define MODEL_m3_1 0x19 +#define MODEL_mado2_2 0x18 +#define MODEL_m2_2 0x17 +#define MODEL_mad2_1 0x16 +#define MODEL_m2_1 0x15 +#define MODEL_mado1_2 0x14 +#define MODEL_m1_2 0x13 +#define MODEL_mado1_1 0x12 +#define MODEL_m1_1 0x11 +#define MODEL_stage 0x10 +#define MODEL_waku_k 0xF +#define MODEL_waku 0xE +#define MODEL_senro 0xD +#define MODEL_yuka 0xC +#define MODEL_kabe 0xB +#define MODEL_o407 0xA +#define MODEL_o417 0x9 +#define MODEL_o419 0x8 +#define MODEL_o413 0x7 +#define MODEL_o411 0x6 +#define MODEL_o421 0x5 +#define MODEL_o405 0x4 +#define MODEL_o403 0x3 +#define MODEL_o401 0x2 +#define MODEL_o415 0x1 +#define MODEL_o409 0x0 + diff --git a/include/mapfs/omo_06_hit.h b/include/mapfs/omo_06_hit.h index e4873aaea0..2c90b9c47f 100644 --- a/include/mapfs/omo_06_hit.h +++ b/include/mapfs/omo_06_hit.h @@ -1,79 +1,95 @@ -#define COLLIDER_Root 0x4E -#define COLLIDER_point 0x4D -#define COLLIDER_bou 0x4C -#define COLLIDER_bou1 0x4B -#define COLLIDER_g211 0x4A -#define COLLIDER_o930 0x49 -#define COLLIDER_o929 0x48 -#define COLLIDER_o664 0x47 -#define COLLIDER_g288 0x46 -#define COLLIDER_o900 0x45 -#define COLLIDER_o898 0x44 -#define COLLIDER_g281 0x43 -#define COLLIDER_g285 0x42 -#define COLLIDER_g287 0x41 -#define COLLIDER_o924 0x40 -#define COLLIDER_o923 0x3F -#define COLLIDER_g286 0x3E -#define COLLIDER_o895 0x3D -#define COLLIDER_g282 0x3C -#define COLLIDER_g284 0x3B -#define COLLIDER_o921 0x3A -#define COLLIDER_o920 0x39 -#define COLLIDER_g283 0x38 -#define COLLIDER_o892 0x37 -#define COLLIDER_g226 0x36 -#define COLLIDER_o928 0x35 -#define COLLIDER_o774 0x34 -#define COLLIDER_o773 0x33 -#define COLLIDER_o775 0x32 -#define COLLIDER_o779 0x31 -#define COLLIDER_g86 0x30 -#define COLLIDER_o241 0x2F -#define COLLIDER_bero_sita 0x2E -#define COLLIDER_kanba 0x2D -#define COLLIDER_kan 0x2C -#define COLLIDER_o809 0x2B -#define COLLIDER_o808 0x2A -#define COLLIDER_o740 0x29 -#define COLLIDER_o741 0x28 -#define COLLIDER_o919 0x27 -#define COLLIDER_o739 0x26 -#define COLLIDER_o240 0x25 -#define COLLIDER_g206 0x24 -#define COLLIDER_o931 0x23 -#define COLLIDER_o244 0x22 -#define COLLIDER_b 0x21 -#define COLLIDER_o243 0x20 -#define COLLIDER_o143 0x1F -#define COLLIDER_o66 0x1E -#define COLLIDER_o254 0x1D -#define COLLIDER_o905 0x1C -#define COLLIDER_o221 0x1B -#define COLLIDER_o723 0x1A -#define COLLIDER_o163 0x19 -#define COLLIDER_o810 0x18 -#define COLLIDER_g200 0x17 -#define COLLIDER_o168 0x16 -#define COLLIDER_o722 0x15 -#define COLLIDER_o171 0x14 -#define COLLIDER_sennro 0x13 -#define COLLIDER_o141 0x12 -#define COLLIDER_o144 0x11 -#define COLLIDER_bero 0x10 -#define COLLIDER_o910 0xF -#define COLLIDER_o908 0xE -#define COLLIDER_o907 0xD -#define COLLIDER_o902 0xC -#define COLLIDER_deilit5 0xB -#define COLLIDER_deili5 0xA -#define COLLIDER_deilit4 0x9 -#define COLLIDER_deili4 0x8 -#define COLLIDER_o903 0x7 -#define COLLIDER_deilit3 0x6 -#define COLLIDER_deili3 0x5 -#define COLLIDER_deilit2 0x4 -#define COLLIDER_deili2 0x3 -#define COLLIDER_o242 0x2 -#define COLLIDER_deilit1 0x1 -#define COLLIDER_deili1 0x0 +#define COLLIDER_Root 0x4E +#define COLLIDER_point 0x4D +#define COLLIDER_bou 0x4C +#define COLLIDER_bou1 0x4B +#define COLLIDER_g211 0x4A +#define COLLIDER_o930 0x49 +#define COLLIDER_o929 0x48 +#define COLLIDER_o664 0x47 +#define COLLIDER_g288 0x46 +#define COLLIDER_o900 0x45 +#define COLLIDER_o898 0x44 +#define COLLIDER_g281 0x43 +#define COLLIDER_g285 0x42 +#define COLLIDER_g287 0x41 +#define COLLIDER_o924 0x40 +#define COLLIDER_o923 0x3F +#define COLLIDER_g286 0x3E +#define COLLIDER_o895 0x3D +#define COLLIDER_g282 0x3C +#define COLLIDER_g284 0x3B +#define COLLIDER_o921 0x3A +#define COLLIDER_o920 0x39 +#define COLLIDER_g283 0x38 +#define COLLIDER_o892 0x37 +#define COLLIDER_g226 0x36 +#define COLLIDER_o928 0x35 +#define COLLIDER_o774 0x34 +#define COLLIDER_o773 0x33 +#define COLLIDER_o775 0x32 +#define COLLIDER_o779 0x31 +#define COLLIDER_g86 0x30 +#define COLLIDER_o241 0x2F +#define COLLIDER_bero_sita 0x2E +#define COLLIDER_kanba 0x2D +#define COLLIDER_kan 0x2C +#define COLLIDER_o809 0x2B +#define COLLIDER_o808 0x2A +#define COLLIDER_o740 0x29 +#define COLLIDER_o741 0x28 +#define COLLIDER_o919 0x27 +#define COLLIDER_o739 0x26 +#define COLLIDER_o240 0x25 +#define COLLIDER_g206 0x24 +#define COLLIDER_o931 0x23 +#define COLLIDER_o244 0x22 +#define COLLIDER_b 0x21 +#define COLLIDER_o243 0x20 +#define COLLIDER_o143 0x1F +#define COLLIDER_o66 0x1E +#define COLLIDER_o254 0x1D +#define COLLIDER_o905 0x1C +#define COLLIDER_o221 0x1B +#define COLLIDER_o723 0x1A +#define COLLIDER_o163 0x19 +#define COLLIDER_o810 0x18 +#define COLLIDER_g200 0x17 +#define COLLIDER_o168 0x16 +#define COLLIDER_o722 0x15 +#define COLLIDER_o171 0x14 +#define COLLIDER_sennro 0x13 +#define COLLIDER_o141 0x12 +#define COLLIDER_o144 0x11 +#define COLLIDER_bero 0x10 +#define COLLIDER_o910 0xF +#define COLLIDER_o908 0xE +#define COLLIDER_o907 0xD +#define COLLIDER_o902 0xC +#define COLLIDER_deilit5 0xB +#define COLLIDER_deili5 0xA +#define COLLIDER_deilit4 0x9 +#define COLLIDER_deili4 0x8 +#define COLLIDER_o903 0x7 +#define COLLIDER_deilit3 0x6 +#define COLLIDER_deili3 0x5 +#define COLLIDER_deilit2 0x4 +#define COLLIDER_deili2 0x3 +#define COLLIDER_o242 0x2 +#define COLLIDER_deilit1 0x1 +#define COLLIDER_deili1 0x0 + +#define ZONE_Root 0xD +#define ZONE_bero 0xC +#define ZONE_2 0xB +#define ZONE_1 0xA +#define ZONE_sennro 0x9 +#define ZONE_boro1 0x8 +#define ZONE_Default 0x7 +#define ZONE_o746 0x6 +#define ZONE_o747 0x5 +#define ZONE_o742 0x4 +#define ZONE_o740 0x3 +#define ZONE_o738 0x2 +#define ZONE_o737 0x1 +#define ZONE_o736 0x0 + diff --git a/include/mapfs/omo_06_shape.h b/include/mapfs/omo_06_shape.h index 63cae9867a..516aa908c0 100644 --- a/include/mapfs/omo_06_shape.h +++ b/include/mapfs/omo_06_shape.h @@ -1,156 +1,157 @@ -#define MODEL_Root 0x9B -#define MODEL_g261 0x9A -#define MODEL_o933 0x99 -#define MODEL_o932 0x98 -#define MODEL_o931 0x97 -#define MODEL_o930 0x96 -#define MODEL_o904 0x95 -#define MODEL_o903 0x94 -#define MODEL_hana 0x93 -#define MODEL_hana_4 0x92 -#define MODEL_ha4 0x91 -#define MODEL_hana_3 0x90 -#define MODEL_ha3 0x8F -#define MODEL_hana_2 0x8E -#define MODEL_ha2 0x8D -#define MODEL_hana_1 0x8C -#define MODEL_ha1 0x8B -#define MODEL_mado 0x8A -#define MODEL_mado2_2 0x89 -#define MODEL_m2_2 0x88 -#define MODEL_mado2_1 0x87 -#define MODEL_m2_1 0x86 -#define MODEL_mado1_2 0x85 -#define MODEL_m1_2 0x84 -#define MODEL_mado1_1 0x83 -#define MODEL_m1_1 0x82 -#define MODEL_ya 0x81 -#define MODEL_ya_c 0x80 -#define MODEL_y_c 0x7F -#define MODEL_y_c2 0x7E -#define MODEL_y_c1 0x7D -#define MODEL_g275 0x7C -#define MODEL_o926 0x7B -#define MODEL_ya_b 0x7A -#define MODEL_y_b 0x79 -#define MODEL_y_b2 0x78 -#define MODEL_y_b1 0x77 -#define MODEL_g271 0x76 -#define MODEL_o925 0x75 -#define MODEL_ya_a 0x74 -#define MODEL_y_a 0x73 -#define MODEL_popo 0x72 -#define MODEL_p6 0x71 -#define MODEL_o11 0x70 -#define MODEL_p5 0x6F -#define MODEL_o10 0x6E -#define MODEL_p4 0x6D -#define MODEL_o9 0x6C -#define MODEL_p3 0x6B -#define MODEL_o8 0x6A -#define MODEL_o7 0x69 -#define MODEL_p2 0x68 -#define MODEL_o6 0x67 -#define MODEL_o5 0x66 -#define MODEL_p1 0x65 -#define MODEL_o4 0x64 -#define MODEL_o3 0x63 -#define MODEL_o2 0x62 -#define MODEL_o1 0x61 -#define MODEL_g216 0x60 -#define MODEL_o896 0x5F -#define MODEL_o934 0x5E -#define MODEL_o895 0x5D -#define MODEL_o786 0x5C -#define MODEL_o785 0x5B -#define MODEL_o782 0x5A -#define MODEL_o781 0x59 -#define MODEL_o792 0x58 -#define MODEL_eki 0x57 -#define MODEL_g227 0x56 -#define MODEL_o798 0x55 -#define MODEL_o797 0x54 -#define MODEL_o796 0x53 -#define MODEL_g236 0x52 -#define MODEL_n 0x51 -#define MODEL_o 0x50 -#define MODEL_i 0x4F -#define MODEL_t 0x4E -#define MODEL_a 0x4D -#define MODEL_s 0x4C -#define MODEL_g213 0x4B -#define MODEL_o761 0x4A -#define MODEL_g182 0x49 -#define MODEL_o669 0x48 -#define MODEL_g181 0x47 -#define MODEL_o940 0x46 -#define MODEL_o937 0x45 -#define MODEL_o939 0x44 -#define MODEL_o936 0x43 -#define MODEL_o935 0x42 -#define MODEL_g224 0x41 -#define MODEL_o900 0x40 -#define MODEL_o811 0x3F -#define MODEL_o810 0x3E -#define MODEL_point 0x3D -#define MODEL_bou 0x3C -#define MODEL_bou1 0x3B -#define MODEL_g211 0x3A -#define MODEL_o664 0x39 -#define MODEL_kaiten 0x38 -#define MODEL_k 0x37 -#define MODEL_o899 0x36 -#define MODEL_o898 0x35 -#define MODEL_o897 0x34 -#define MODEL_senro 0x33 -#define MODEL_o757 0x32 -#define MODEL_o747 0x31 -#define MODEL_g204 0x30 -#define MODEL_o708 0x2F -#define MODEL_o707 0x2E -#define MODEL_obj 0x2D -#define MODEL_o916 0x2C -#define MODEL_o830 0x2B -#define MODEL_o831 0x2A -#define MODEL_o826 0x29 -#define MODEL_o817 0x28 -#define MODEL_o723 0x27 -#define MODEL_o755 0x26 -#define MODEL_o859 0x25 -#define MODEL_o914 0x24 -#define MODEL_m 0x23 -#define MODEL_o886 0x22 -#define MODEL_o854 0x21 -#define MODEL_o853 0x20 -#define MODEL_bero 0x1F -#define MODEL_bero_sita 0x1E -#define MODEL_vero2 0x1D -#define MODEL_boro1 0x1C -#define MODEL_mon 0x1B -#define MODEL_mon2 0x1A -#define MODEL_o622 0x19 -#define MODEL_o621 0x18 -#define MODEL_o616 0x17 -#define MODEL_o619 0x16 -#define MODEL_mon1 0x15 -#define MODEL_o338 0x14 -#define MODEL_o188 0x13 -#define MODEL_o337 0x12 -#define MODEL_k3 0x11 -#define MODEL_o240 0x10 -#define MODEL_o241 0xF -#define MODEL_o720 0xE -#define MODEL_k2 0xD -#define MODEL_o860 0xC -#define MODEL_o862 0xB -#define MODEL_o861 0xA -#define MODEL_o773 0x9 -#define MODEL_o169 0x8 -#define MODEL_o163 0x7 -#define MODEL_o774 0x6 -#define MODEL_k1 0x5 -#define MODEL_o144 0x4 -#define MODEL_o141 0x3 -#define MODEL_o162 0x2 -#define MODEL_o142 0x1 -#define MODEL_o875 0x0 +#define MODEL_Root 0x9B +#define MODEL_g261 0x9A +#define MODEL_o933 0x99 +#define MODEL_o932 0x98 +#define MODEL_o931 0x97 +#define MODEL_o930 0x96 +#define MODEL_o904 0x95 +#define MODEL_o903 0x94 +#define MODEL_hana 0x93 +#define MODEL_hana_4 0x92 +#define MODEL_ha4 0x91 +#define MODEL_hana_3 0x90 +#define MODEL_ha3 0x8F +#define MODEL_hana_2 0x8E +#define MODEL_ha2 0x8D +#define MODEL_hana_1 0x8C +#define MODEL_ha1 0x8B +#define MODEL_mado 0x8A +#define MODEL_mado2_2 0x89 +#define MODEL_m2_2 0x88 +#define MODEL_mado2_1 0x87 +#define MODEL_m2_1 0x86 +#define MODEL_mado1_2 0x85 +#define MODEL_m1_2 0x84 +#define MODEL_mado1_1 0x83 +#define MODEL_m1_1 0x82 +#define MODEL_ya 0x81 +#define MODEL_ya_c 0x80 +#define MODEL_y_c 0x7F +#define MODEL_y_c2 0x7E +#define MODEL_y_c1 0x7D +#define MODEL_g275 0x7C +#define MODEL_o926 0x7B +#define MODEL_ya_b 0x7A +#define MODEL_y_b 0x79 +#define MODEL_y_b2 0x78 +#define MODEL_y_b1 0x77 +#define MODEL_g271 0x76 +#define MODEL_o925 0x75 +#define MODEL_ya_a 0x74 +#define MODEL_y_a 0x73 +#define MODEL_popo 0x72 +#define MODEL_p6 0x71 +#define MODEL_o11 0x70 +#define MODEL_p5 0x6F +#define MODEL_o10 0x6E +#define MODEL_p4 0x6D +#define MODEL_o9 0x6C +#define MODEL_p3 0x6B +#define MODEL_o8 0x6A +#define MODEL_o7 0x69 +#define MODEL_p2 0x68 +#define MODEL_o6 0x67 +#define MODEL_o5 0x66 +#define MODEL_p1 0x65 +#define MODEL_o4 0x64 +#define MODEL_o3 0x63 +#define MODEL_o2 0x62 +#define MODEL_o1 0x61 +#define MODEL_g216 0x60 +#define MODEL_o896 0x5F +#define MODEL_o934 0x5E +#define MODEL_o895 0x5D +#define MODEL_o786 0x5C +#define MODEL_o785 0x5B +#define MODEL_o782 0x5A +#define MODEL_o781 0x59 +#define MODEL_o792 0x58 +#define MODEL_eki 0x57 +#define MODEL_g227 0x56 +#define MODEL_o798 0x55 +#define MODEL_o797 0x54 +#define MODEL_o796 0x53 +#define MODEL_g236 0x52 +#define MODEL_n 0x51 +#define MODEL_o 0x50 +#define MODEL_i 0x4F +#define MODEL_t 0x4E +#define MODEL_a 0x4D +#define MODEL_s 0x4C +#define MODEL_g213 0x4B +#define MODEL_o761 0x4A +#define MODEL_g182 0x49 +#define MODEL_o669 0x48 +#define MODEL_g181 0x47 +#define MODEL_o940 0x46 +#define MODEL_o937 0x45 +#define MODEL_o939 0x44 +#define MODEL_o936 0x43 +#define MODEL_o935 0x42 +#define MODEL_g224 0x41 +#define MODEL_o900 0x40 +#define MODEL_o811 0x3F +#define MODEL_o810 0x3E +#define MODEL_point 0x3D +#define MODEL_bou 0x3C +#define MODEL_bou1 0x3B +#define MODEL_g211 0x3A +#define MODEL_o664 0x39 +#define MODEL_kaiten 0x38 +#define MODEL_k 0x37 +#define MODEL_o899 0x36 +#define MODEL_o898 0x35 +#define MODEL_o897 0x34 +#define MODEL_senro 0x33 +#define MODEL_o757 0x32 +#define MODEL_o747 0x31 +#define MODEL_g204 0x30 +#define MODEL_o708 0x2F +#define MODEL_o707 0x2E +#define MODEL_obj 0x2D +#define MODEL_o916 0x2C +#define MODEL_o830 0x2B +#define MODEL_o831 0x2A +#define MODEL_o826 0x29 +#define MODEL_o817 0x28 +#define MODEL_o723 0x27 +#define MODEL_o755 0x26 +#define MODEL_o859 0x25 +#define MODEL_o914 0x24 +#define MODEL_m 0x23 +#define MODEL_o886 0x22 +#define MODEL_o854 0x21 +#define MODEL_o853 0x20 +#define MODEL_bero 0x1F +#define MODEL_bero_sita 0x1E +#define MODEL_vero2 0x1D +#define MODEL_boro1 0x1C +#define MODEL_mon 0x1B +#define MODEL_mon2 0x1A +#define MODEL_o622 0x19 +#define MODEL_o621 0x18 +#define MODEL_o616 0x17 +#define MODEL_o619 0x16 +#define MODEL_mon1 0x15 +#define MODEL_o338 0x14 +#define MODEL_o188 0x13 +#define MODEL_o337 0x12 +#define MODEL_k3 0x11 +#define MODEL_o240 0x10 +#define MODEL_o241 0xF +#define MODEL_o720 0xE +#define MODEL_k2 0xD +#define MODEL_o860 0xC +#define MODEL_o862 0xB +#define MODEL_o861 0xA +#define MODEL_o773 0x9 +#define MODEL_o169 0x8 +#define MODEL_o163 0x7 +#define MODEL_o774 0x6 +#define MODEL_k1 0x5 +#define MODEL_o144 0x4 +#define MODEL_o141 0x3 +#define MODEL_o162 0x2 +#define MODEL_o142 0x1 +#define MODEL_o875 0x0 + diff --git a/include/mapfs/omo_07_hit.h b/include/mapfs/omo_07_hit.h index 80b993bda0..7ef9d0845b 100644 --- a/include/mapfs/omo_07_hit.h +++ b/include/mapfs/omo_07_hit.h @@ -1,27 +1,36 @@ -#define COLLIDER_Root 0x1A -#define COLLIDER_g298 0x19 -#define COLLIDER_o774 0x18 -#define COLLIDER_g293 0x17 -#define COLLIDER_g294 0x16 -#define COLLIDER_tt1 0x15 -#define COLLIDER_g125 0x14 -#define COLLIDER_o669 0x13 -#define COLLIDER_o675 0x12 -#define COLLIDER_o670 0x11 -#define COLLIDER_o353 0x10 -#define COLLIDER_o352 0xF -#define COLLIDER_o466 0xE -#define COLLIDER_o480 0xD -#define COLLIDER_dai 0xC -#define COLLIDER_o141 0xB -#define COLLIDER_o662 0xA -#define COLLIDER_g115 0x9 -#define COLLIDER_o717 0x8 -#define COLLIDER_o330 0x7 -#define COLLIDER_o637 0x6 -#define COLLIDER_o399 0x5 -#define COLLIDER_bero 0x4 -#define COLLIDER_o771 0x3 -#define COLLIDER_o630 0x2 -#define COLLIDER_deilit1 0x1 -#define COLLIDER_deili1 0x0 +#define COLLIDER_Root 0x1A +#define COLLIDER_g298 0x19 +#define COLLIDER_o774 0x18 +#define COLLIDER_g293 0x17 +#define COLLIDER_g294 0x16 +#define COLLIDER_tt1 0x15 +#define COLLIDER_g125 0x14 +#define COLLIDER_o669 0x13 +#define COLLIDER_o675 0x12 +#define COLLIDER_o670 0x11 +#define COLLIDER_o353 0x10 +#define COLLIDER_o352 0xF +#define COLLIDER_o466 0xE +#define COLLIDER_o480 0xD +#define COLLIDER_dai 0xC +#define COLLIDER_o141 0xB +#define COLLIDER_o662 0xA +#define COLLIDER_g115 0x9 +#define COLLIDER_o717 0x8 +#define COLLIDER_o330 0x7 +#define COLLIDER_o637 0x6 +#define COLLIDER_o399 0x5 +#define COLLIDER_bero 0x4 +#define COLLIDER_o771 0x3 +#define COLLIDER_o630 0x2 +#define COLLIDER_deilit1 0x1 +#define COLLIDER_deili1 0x0 + +#define ZONE_Root 0x6 +#define ZONE_g290 0x5 +#define ZONE_o736 0x4 +#define ZONE_o735 0x3 +#define ZONE_o734 0x2 +#define ZONE_g289 0x1 +#define ZONE_o733 0x0 + diff --git a/include/mapfs/omo_07_shape.h b/include/mapfs/omo_07_shape.h index c9c012ff24..d8a710c02e 100644 --- a/include/mapfs/omo_07_shape.h +++ b/include/mapfs/omo_07_shape.h @@ -1,121 +1,122 @@ -#define MODEL_Root 0x78 -#define MODEL_g305 0x77 -#define MODEL_o819 0x76 -#define MODEL_o818 0x75 -#define MODEL_o817 0x74 -#define MODEL_o816 0x73 -#define MODEL_o815 0x72 -#define MODEL_o814 0x71 -#define MODEL_g302 0x70 -#define MODEL_o846 0x6F -#define MODEL_o845 0x6E -#define MODEL_o802 0x6D -#define MODEL_o804 0x6C -#define MODEL_o842 0x6B -#define MODEL_o841 0x6A -#define MODEL_o844 0x69 -#define MODEL_o843 0x68 -#define MODEL_o772 0x67 -#define MODEL_o771 0x66 -#define MODEL_o778 0x65 -#define MODEL_o777 0x64 -#define MODEL_o797 0x63 -#define MODEL_o783 0x62 -#define MODEL_o773 0x61 -#define MODEL_o780 0x60 -#define MODEL_kaiten 0x5F -#define MODEL_kai 0x5E -#define MODEL_k 0x5D -#define MODEL_g287 0x5C -#define MODEL_o735 0x5B -#define MODEL_o733 0x5A -#define MODEL_g285 0x59 -#define MODEL_o717 0x58 -#define MODEL_o716 0x57 -#define MODEL_o715 0x56 -#define MODEL_g274 0x55 -#define MODEL_g278 0x54 -#define MODEL_o669 0x53 -#define MODEL_o658 0x52 -#define MODEL_o664 0x51 -#define MODEL_o675 0x50 -#define MODEL_o673 0x4F -#define MODEL_g277 0x4E -#define MODEL_o665 0x4D -#define MODEL_o666 0x4C -#define MODEL_o667 0x4B -#define MODEL_o668 0x4A -#define MODEL_g276 0x49 -#define MODEL_o663 0x48 -#define MODEL_o676 0x47 -#define MODEL_o670 0x46 -#define MODEL_tokei 0x45 -#define MODEL_tokei_2 0x44 -#define MODEL_maru_2 0x43 -#define MODEL_maru2 0x42 -#define MODEL_hari_2 0x41 -#define MODEL_hari2 0x40 -#define MODEL_tokei_1 0x3F -#define MODEL_maru_1 0x3E -#define MODEL_maru1 0x3D -#define MODEL_hari_1 0x3C -#define MODEL_hari1 0x3B -#define MODEL_mado 0x3A -#define MODEL_mado1_2 0x39 -#define MODEL_m1_2 0x38 -#define MODEL_mado1_1 0x37 -#define MODEL_m1_1 0x36 -#define MODEL_omo 0x35 -#define MODEL_saikoro 0x34 -#define MODEL_o402 0x33 -#define MODEL_o400 0x32 -#define MODEL_o399 0x31 -#define MODEL_t 0x30 -#define MODEL_o355 0x2F -#define MODEL_o354 0x2E -#define MODEL_o353 0x2D -#define MODEL_o352 0x2C -#define MODEL_dai 0x2B -#define MODEL_k_1 0x2A -#define MODEL_o727 0x29 -#define MODEL_o726 0x28 -#define MODEL_o661 0x27 -#define MODEL_o813 0x26 -#define MODEL_yu_kabe 0x25 -#define MODEL_o466 0x24 -#define MODEL_o538 0x23 -#define MODEL_o331 0x22 -#define MODEL_g286 0x21 -#define MODEL_o327 0x20 -#define MODEL_o141 0x1F -#define MODEL_o662 0x1E -#define MODEL_o704 0x1D -#define MODEL_g115 0x1C -#define MODEL_o330 0x1B -#define MODEL_o329 0x1A -#define MODEL_bero 0x19 -#define MODEL_o660 0x18 -#define MODEL_o659 0x17 -#define MODEL_k_6 0x16 -#define MODEL_o750 0x15 -#define MODEL_o749 0x14 -#define MODEL_o747 0x13 -#define MODEL_k_5 0x12 -#define MODEL_o572 0x11 -#define MODEL_o570 0x10 -#define MODEL_o827 0xF -#define MODEL_o748 0xE -#define MODEL_k_4 0xD -#define MODEL_o559 0xC -#define MODEL_o244 0xB -#define MODEL_o240 0xA -#define MODEL_o241 0x9 -#define MODEL_o158 0x8 -#define MODEL_o154 0x7 -#define MODEL_o242 0x6 -#define MODEL_o153 0x5 -#define MODEL_o258 0x4 -#define MODEL_k_3 0x3 -#define MODEL_o232 0x2 -#define MODEL_o336 0x1 -#define MODEL_o339 0x0 +#define MODEL_Root 0x78 +#define MODEL_g305 0x77 +#define MODEL_o819 0x76 +#define MODEL_o818 0x75 +#define MODEL_o817 0x74 +#define MODEL_o816 0x73 +#define MODEL_o815 0x72 +#define MODEL_o814 0x71 +#define MODEL_g302 0x70 +#define MODEL_o846 0x6F +#define MODEL_o845 0x6E +#define MODEL_o802 0x6D +#define MODEL_o804 0x6C +#define MODEL_o842 0x6B +#define MODEL_o841 0x6A +#define MODEL_o844 0x69 +#define MODEL_o843 0x68 +#define MODEL_o772 0x67 +#define MODEL_o771 0x66 +#define MODEL_o778 0x65 +#define MODEL_o777 0x64 +#define MODEL_o797 0x63 +#define MODEL_o783 0x62 +#define MODEL_o773 0x61 +#define MODEL_o780 0x60 +#define MODEL_kaiten 0x5F +#define MODEL_kai 0x5E +#define MODEL_k 0x5D +#define MODEL_g287 0x5C +#define MODEL_o735 0x5B +#define MODEL_o733 0x5A +#define MODEL_g285 0x59 +#define MODEL_o717 0x58 +#define MODEL_o716 0x57 +#define MODEL_o715 0x56 +#define MODEL_g274 0x55 +#define MODEL_g278 0x54 +#define MODEL_o669 0x53 +#define MODEL_o658 0x52 +#define MODEL_o664 0x51 +#define MODEL_o675 0x50 +#define MODEL_o673 0x4F +#define MODEL_g277 0x4E +#define MODEL_o665 0x4D +#define MODEL_o666 0x4C +#define MODEL_o667 0x4B +#define MODEL_o668 0x4A +#define MODEL_g276 0x49 +#define MODEL_o663 0x48 +#define MODEL_o676 0x47 +#define MODEL_o670 0x46 +#define MODEL_tokei 0x45 +#define MODEL_tokei_2 0x44 +#define MODEL_maru_2 0x43 +#define MODEL_maru2 0x42 +#define MODEL_hari_2 0x41 +#define MODEL_hari2 0x40 +#define MODEL_tokei_1 0x3F +#define MODEL_maru_1 0x3E +#define MODEL_maru1 0x3D +#define MODEL_hari_1 0x3C +#define MODEL_hari1 0x3B +#define MODEL_mado 0x3A +#define MODEL_mado1_2 0x39 +#define MODEL_m1_2 0x38 +#define MODEL_mado1_1 0x37 +#define MODEL_m1_1 0x36 +#define MODEL_omo 0x35 +#define MODEL_saikoro 0x34 +#define MODEL_o402 0x33 +#define MODEL_o400 0x32 +#define MODEL_o399 0x31 +#define MODEL_t 0x30 +#define MODEL_o355 0x2F +#define MODEL_o354 0x2E +#define MODEL_o353 0x2D +#define MODEL_o352 0x2C +#define MODEL_dai 0x2B +#define MODEL_k_1 0x2A +#define MODEL_o727 0x29 +#define MODEL_o726 0x28 +#define MODEL_o661 0x27 +#define MODEL_o813 0x26 +#define MODEL_yu_kabe 0x25 +#define MODEL_o466 0x24 +#define MODEL_o538 0x23 +#define MODEL_o331 0x22 +#define MODEL_g286 0x21 +#define MODEL_o327 0x20 +#define MODEL_o141 0x1F +#define MODEL_o662 0x1E +#define MODEL_o704 0x1D +#define MODEL_g115 0x1C +#define MODEL_o330 0x1B +#define MODEL_o329 0x1A +#define MODEL_bero 0x19 +#define MODEL_o660 0x18 +#define MODEL_o659 0x17 +#define MODEL_k_6 0x16 +#define MODEL_o750 0x15 +#define MODEL_o749 0x14 +#define MODEL_o747 0x13 +#define MODEL_k_5 0x12 +#define MODEL_o572 0x11 +#define MODEL_o570 0x10 +#define MODEL_o827 0xF +#define MODEL_o748 0xE +#define MODEL_k_4 0xD +#define MODEL_o559 0xC +#define MODEL_o244 0xB +#define MODEL_o240 0xA +#define MODEL_o241 0x9 +#define MODEL_o158 0x8 +#define MODEL_o154 0x7 +#define MODEL_o242 0x6 +#define MODEL_o153 0x5 +#define MODEL_o258 0x4 +#define MODEL_k_3 0x3 +#define MODEL_o232 0x2 +#define MODEL_o336 0x1 +#define MODEL_o339 0x0 + diff --git a/include/mapfs/omo_08_hit.h b/include/mapfs/omo_08_hit.h index f4f10f3e74..f8c619bf15 100644 --- a/include/mapfs/omo_08_hit.h +++ b/include/mapfs/omo_08_hit.h @@ -1,69 +1,82 @@ -#define COLLIDER_Root 0x44 -#define COLLIDER_kanba 0x43 -#define COLLIDER_kan 0x42 -#define COLLIDER_g376 0x41 -#define COLLIDER_o1075 0x40 -#define COLLIDER_o1074 0x3F -#define COLLIDER_g368 0x3E -#define COLLIDER_g373 0x3D -#define COLLIDER_g375 0x3C -#define COLLIDER_o923 0x3B -#define COLLIDER_o924 0x3A -#define COLLIDER_g374 0x39 -#define COLLIDER_o1070 0x38 -#define COLLIDER_g370 0x37 -#define COLLIDER_g372 0x36 -#define COLLIDER_o921 0x35 -#define COLLIDER_o920 0x34 -#define COLLIDER_g371 0x33 -#define COLLIDER_o1067 0x32 -#define COLLIDER_g269 0x31 -#define COLLIDER_g279 0x30 -#define COLLIDER_o918 0x2F -#define COLLIDER_g276 0x2E -#define COLLIDER_o915 0x2D -#define COLLIDER_g273 0x2C -#define COLLIDER_o911 0x2B -#define COLLIDER_g270 0x2A -#define COLLIDER_o907 0x29 -#define COLLIDER_ra 0x28 -#define COLLIDER_o1124 0x27 -#define COLLIDER_o772 0x26 -#define COLLIDER_g268 0x25 -#define COLLIDER_o905 0x24 -#define COLLIDER_o904 0x23 -#define COLLIDER_o903 0x22 -#define COLLIDER_o902 0x21 -#define COLLIDER_o901 0x20 -#define COLLIDER_o1123 0x1F -#define COLLIDER_o1122 0x1E -#define COLLIDER_saku 0x1D -#define COLLIDER_o599 0x1C -#define COLLIDER_o600 0x1B -#define COLLIDER_o601 0x1A -#define COLLIDER_maru1 0x19 -#define COLLIDER_o773 0x18 -#define COLLIDER_g204 0x17 -#define COLLIDER_o766 0x16 -#define COLLIDER_o775 0x15 -#define COLLIDER_komono 0x14 -#define COLLIDER_o610 0x13 -#define COLLIDER_g224 0x12 -#define COLLIDER_o782 0x11 -#define COLLIDER_o729 0x10 -#define COLLIDER_dai 0xF -#define COLLIDER_o597 0xE -#define COLLIDER_o598 0xD -#define COLLIDER_o596 0xC -#define COLLIDER_o397 0xB -#define COLLIDER_saku_1 0xA -#define COLLIDER_bero 0x9 -#define COLLIDER_o1083 0x8 -#define COLLIDER_sen2 0x7 -#define COLLIDER_sen1 0x6 -#define COLLIDER_deilit3 0x5 -#define COLLIDER_deili3 0x4 -#define COLLIDER_deilit2 0x3 -#define COLLIDER_deili2 0x2 -#define COLLIDER_deilit1 0x1 -#define COLLIDER_deili1 0x0 +#define COLLIDER_Root 0x44 +#define COLLIDER_kanba 0x43 +#define COLLIDER_kan 0x42 +#define COLLIDER_g376 0x41 +#define COLLIDER_o1075 0x40 +#define COLLIDER_o1074 0x3F +#define COLLIDER_g368 0x3E +#define COLLIDER_g373 0x3D +#define COLLIDER_g375 0x3C +#define COLLIDER_o923 0x3B +#define COLLIDER_o924 0x3A +#define COLLIDER_g374 0x39 +#define COLLIDER_o1070 0x38 +#define COLLIDER_g370 0x37 +#define COLLIDER_g372 0x36 +#define COLLIDER_o921 0x35 +#define COLLIDER_o920 0x34 +#define COLLIDER_g371 0x33 +#define COLLIDER_o1067 0x32 +#define COLLIDER_g269 0x31 +#define COLLIDER_g279 0x30 +#define COLLIDER_o918 0x2F +#define COLLIDER_g276 0x2E +#define COLLIDER_o915 0x2D +#define COLLIDER_g273 0x2C +#define COLLIDER_o911 0x2B +#define COLLIDER_g270 0x2A +#define COLLIDER_o907 0x29 +#define COLLIDER_ra 0x28 +#define COLLIDER_o1124 0x27 +#define COLLIDER_o772 0x26 +#define COLLIDER_g268 0x25 +#define COLLIDER_o905 0x24 +#define COLLIDER_o904 0x23 +#define COLLIDER_o903 0x22 +#define COLLIDER_o902 0x21 +#define COLLIDER_o901 0x20 +#define COLLIDER_o1123 0x1F +#define COLLIDER_o1122 0x1E +#define COLLIDER_saku 0x1D +#define COLLIDER_o599 0x1C +#define COLLIDER_o600 0x1B +#define COLLIDER_o601 0x1A +#define COLLIDER_maru1 0x19 +#define COLLIDER_o773 0x18 +#define COLLIDER_g204 0x17 +#define COLLIDER_o766 0x16 +#define COLLIDER_o775 0x15 +#define COLLIDER_komono 0x14 +#define COLLIDER_o610 0x13 +#define COLLIDER_g224 0x12 +#define COLLIDER_o782 0x11 +#define COLLIDER_o729 0x10 +#define COLLIDER_dai 0xF +#define COLLIDER_o597 0xE +#define COLLIDER_o598 0xD +#define COLLIDER_o596 0xC +#define COLLIDER_o397 0xB +#define COLLIDER_saku_1 0xA +#define COLLIDER_bero 0x9 +#define COLLIDER_o1083 0x8 +#define COLLIDER_sen2 0x7 +#define COLLIDER_sen1 0x6 +#define COLLIDER_deilit3 0x5 +#define COLLIDER_deili3 0x4 +#define COLLIDER_deilit2 0x3 +#define COLLIDER_deili2 0x2 +#define COLLIDER_deilit1 0x1 +#define COLLIDER_deili1 0x0 + +#define ZONE_Root 0xA +#define ZONE_g255 0x9 +#define ZONE_o821 0x8 +#define ZONE_o820 0x7 +#define ZONE_g256 0x6 +#define ZONE_o822 0x5 +#define ZONE_g257 0x4 +#define ZONE_o834 0x3 +#define ZONE_o823 0x2 +#define ZONE_g258 0x1 +#define ZONE_o824 0x0 + diff --git a/include/mapfs/omo_08_shape.h b/include/mapfs/omo_08_shape.h index c631c5eed3..1715eb77c5 100644 --- a/include/mapfs/omo_08_shape.h +++ b/include/mapfs/omo_08_shape.h @@ -1,166 +1,167 @@ -#define MODEL_Root 0xA5 -#define MODEL_g359 0xA4 -#define MODEL_o1091 0xA3 -#define MODEL_o1090 0xA2 -#define MODEL_o1089 0xA1 -#define MODEL_o1088 0xA0 -#define MODEL_o1083 0x9F -#define MODEL_o1082 0x9E -#define MODEL_ya 0x9D -#define MODEL_ya_c 0x9C -#define MODEL_y_c 0x9B -#define MODEL_y_c2 0x9A -#define MODEL_y_c1 0x99 -#define MODEL_g275 0x98 -#define MODEL_o926 0x97 -#define MODEL_ya_b 0x96 -#define MODEL_y_b 0x95 -#define MODEL_y_b2 0x94 -#define MODEL_y_b1 0x93 -#define MODEL_g271 0x92 -#define MODEL_o925 0x91 -#define MODEL_ya_a 0x90 -#define MODEL_y_a 0x8F -#define MODEL_popo 0x8E -#define MODEL_p6 0x8D -#define MODEL_o11 0x8C -#define MODEL_p5 0x8B -#define MODEL_o10 0x8A -#define MODEL_p4 0x89 -#define MODEL_o9 0x88 -#define MODEL_p3 0x87 -#define MODEL_o8 0x86 -#define MODEL_o7 0x85 -#define MODEL_p2 0x84 -#define MODEL_o6 0x83 -#define MODEL_o5 0x82 -#define MODEL_p1 0x81 -#define MODEL_o4 0x80 -#define MODEL_o3 0x7F -#define MODEL_o2 0x7E -#define MODEL_o1 0x7D -#define MODEL_g307 0x7C -#define MODEL_o972 0x7B -#define MODEL_o967 0x7A -#define MODEL_o964 0x79 -#define MODEL_o965 0x78 -#define MODEL_o951 0x77 -#define MODEL_o952 0x76 -#define MODEL_box 0x75 -#define MODEL_b4 0x74 -#define MODEL_4_2 0x73 -#define MODEL_bm4_2 0x72 -#define MODEL_bm4_1 0x71 -#define MODEL_4_1 0x70 -#define MODEL_b4_2 0x6F -#define MODEL_b4_1 0x6E -#define MODEL_b3 0x6D -#define MODEL_3_2 0x6C -#define MODEL_bm3_2 0x6B -#define MODEL_bm3_1 0x6A -#define MODEL_3_1 0x69 -#define MODEL_b3_2 0x68 -#define MODEL_b3_1 0x67 -#define MODEL_b2 0x66 -#define MODEL_2_2 0x65 -#define MODEL_bm2_2 0x64 -#define MODEL_bm2_1 0x63 -#define MODEL_2_1 0x62 -#define MODEL_b2_2 0x61 -#define MODEL_b2_1 0x60 -#define MODEL_b1 0x5F -#define MODEL_1_2 0x5E -#define MODEL_bm1_2 0x5D -#define MODEL_bm1_1 0x5C -#define MODEL_1_1 0x5B -#define MODEL_b1_2 0x5A -#define MODEL_b1_1 0x59 -#define MODEL_k_senro 0x58 -#define MODEL_t4 0x57 -#define MODEL_o867 0x56 -#define MODEL_o981 0x55 -#define MODEL_o882 0x54 -#define MODEL_o881 0x53 -#define MODEL_t3 0x52 -#define MODEL_o880 0x51 -#define MODEL_o980 0x50 -#define MODEL_o861 0x4F -#define MODEL_o879 0x4E -#define MODEL_t2 0x4D -#define MODEL_o878 0x4C -#define MODEL_o863 0x4B -#define MODEL_o979 0x4A -#define MODEL_o877 0x49 -#define MODEL_t1 0x48 -#define MODEL_o876 0x47 -#define MODEL_o978 0x46 -#define MODEL_o865 0x45 -#define MODEL_o875 0x44 -#define MODEL_m 0x43 -#define MODEL_o1021 0x42 -#define MODEL_o1017 0x41 -#define MODEL_eki 0x40 -#define MODEL_g356 0x3F -#define MODEL_o974 0x3E -#define MODEL_o973 0x3D -#define MODEL_o975 0x3C -#define MODEL_station 0x3B -#define MODEL_n 0x3A -#define MODEL_o 0x39 -#define MODEL_i 0x38 -#define MODEL_t 0x37 -#define MODEL_a 0x36 -#define MODEL_s 0x35 -#define MODEL_g316 0x34 -#define MODEL_o1080 0x33 -#define MODEL_o997 0x32 -#define MODEL_o996 0x31 -#define MODEL_g304 0x30 -#define MODEL_o588 0x2F -#define MODEL_g361 0x2E -#define MODEL_o1092 0x2D -#define MODEL_o1094 0x2C -#define MODEL_o1093 0x2B -#define MODEL_o1095 0x2A -#define MODEL_o1096 0x29 -#define MODEL_g303 0x28 -#define MODEL_o571 0x27 -#define MODEL_mon 0x26 -#define MODEL_mon2 0x25 -#define MODEL_o759 0x24 -#define MODEL_o765 0x23 -#define MODEL_o764 0x22 -#define MODEL_mon1 0x21 -#define MODEL_o766 0x20 -#define MODEL_o758 0x1F -#define MODEL_o757 0x1E -#define MODEL_ma_kabe 0x1D -#define MODEL_o779 0x1C -#define MODEL_o780 0x1B -#define MODEL_o778 0x1A -#define MODEL_senro 0x19 -#define MODEL_o397 0x18 -#define MODEL_o976 0x17 -#define MODEL_dai 0x16 -#define MODEL_o777 0x15 -#define MODEL_soto 0x14 -#define MODEL_o983 0x13 -#define MODEL_bero 0x12 -#define MODEL_o793 0x11 -#define MODEL_o792 0x10 -#define MODEL_o819 0xF -#define MODEL_g355 0xE -#define MODEL_o784 0xD -#define MODEL_o788 0xC -#define MODEL_o786 0xB -#define MODEL_g352 0xA -#define MODEL_o1057 0x9 -#define MODEL_o1024 0x8 -#define MODEL_g351 0x7 -#define MODEL_o1087 0x6 -#define MODEL_o1035 0x5 -#define MODEL_o767 0x4 -#define MODEL_g363 0x3 -#define MODEL_o1102 0x2 -#define MODEL_o1101 0x1 -#define MODEL_o1100 0x0 +#define MODEL_Root 0xA5 +#define MODEL_g359 0xA4 +#define MODEL_o1091 0xA3 +#define MODEL_o1090 0xA2 +#define MODEL_o1089 0xA1 +#define MODEL_o1088 0xA0 +#define MODEL_o1083 0x9F +#define MODEL_o1082 0x9E +#define MODEL_ya 0x9D +#define MODEL_ya_c 0x9C +#define MODEL_y_c 0x9B +#define MODEL_y_c2 0x9A +#define MODEL_y_c1 0x99 +#define MODEL_g275 0x98 +#define MODEL_o926 0x97 +#define MODEL_ya_b 0x96 +#define MODEL_y_b 0x95 +#define MODEL_y_b2 0x94 +#define MODEL_y_b1 0x93 +#define MODEL_g271 0x92 +#define MODEL_o925 0x91 +#define MODEL_ya_a 0x90 +#define MODEL_y_a 0x8F +#define MODEL_popo 0x8E +#define MODEL_p6 0x8D +#define MODEL_o11 0x8C +#define MODEL_p5 0x8B +#define MODEL_o10 0x8A +#define MODEL_p4 0x89 +#define MODEL_o9 0x88 +#define MODEL_p3 0x87 +#define MODEL_o8 0x86 +#define MODEL_o7 0x85 +#define MODEL_p2 0x84 +#define MODEL_o6 0x83 +#define MODEL_o5 0x82 +#define MODEL_p1 0x81 +#define MODEL_o4 0x80 +#define MODEL_o3 0x7F +#define MODEL_o2 0x7E +#define MODEL_o1 0x7D +#define MODEL_g307 0x7C +#define MODEL_o972 0x7B +#define MODEL_o967 0x7A +#define MODEL_o964 0x79 +#define MODEL_o965 0x78 +#define MODEL_o951 0x77 +#define MODEL_o952 0x76 +#define MODEL_box 0x75 +#define MODEL_b4 0x74 +#define MODEL_4_2 0x73 +#define MODEL_bm4_2 0x72 +#define MODEL_bm4_1 0x71 +#define MODEL_4_1 0x70 +#define MODEL_b4_2 0x6F +#define MODEL_b4_1 0x6E +#define MODEL_b3 0x6D +#define MODEL_3_2 0x6C +#define MODEL_bm3_2 0x6B +#define MODEL_bm3_1 0x6A +#define MODEL_3_1 0x69 +#define MODEL_b3_2 0x68 +#define MODEL_b3_1 0x67 +#define MODEL_b2 0x66 +#define MODEL_2_2 0x65 +#define MODEL_bm2_2 0x64 +#define MODEL_bm2_1 0x63 +#define MODEL_2_1 0x62 +#define MODEL_b2_2 0x61 +#define MODEL_b2_1 0x60 +#define MODEL_b1 0x5F +#define MODEL_1_2 0x5E +#define MODEL_bm1_2 0x5D +#define MODEL_bm1_1 0x5C +#define MODEL_1_1 0x5B +#define MODEL_b1_2 0x5A +#define MODEL_b1_1 0x59 +#define MODEL_k_senro 0x58 +#define MODEL_t4 0x57 +#define MODEL_o867 0x56 +#define MODEL_o981 0x55 +#define MODEL_o882 0x54 +#define MODEL_o881 0x53 +#define MODEL_t3 0x52 +#define MODEL_o880 0x51 +#define MODEL_o980 0x50 +#define MODEL_o861 0x4F +#define MODEL_o879 0x4E +#define MODEL_t2 0x4D +#define MODEL_o878 0x4C +#define MODEL_o863 0x4B +#define MODEL_o979 0x4A +#define MODEL_o877 0x49 +#define MODEL_t1 0x48 +#define MODEL_o876 0x47 +#define MODEL_o978 0x46 +#define MODEL_o865 0x45 +#define MODEL_o875 0x44 +#define MODEL_m 0x43 +#define MODEL_o1021 0x42 +#define MODEL_o1017 0x41 +#define MODEL_eki 0x40 +#define MODEL_g356 0x3F +#define MODEL_o974 0x3E +#define MODEL_o973 0x3D +#define MODEL_o975 0x3C +#define MODEL_station 0x3B +#define MODEL_n 0x3A +#define MODEL_o 0x39 +#define MODEL_i 0x38 +#define MODEL_t 0x37 +#define MODEL_a 0x36 +#define MODEL_s 0x35 +#define MODEL_g316 0x34 +#define MODEL_o1080 0x33 +#define MODEL_o997 0x32 +#define MODEL_o996 0x31 +#define MODEL_g304 0x30 +#define MODEL_o588 0x2F +#define MODEL_g361 0x2E +#define MODEL_o1092 0x2D +#define MODEL_o1094 0x2C +#define MODEL_o1093 0x2B +#define MODEL_o1095 0x2A +#define MODEL_o1096 0x29 +#define MODEL_g303 0x28 +#define MODEL_o571 0x27 +#define MODEL_mon 0x26 +#define MODEL_mon2 0x25 +#define MODEL_o759 0x24 +#define MODEL_o765 0x23 +#define MODEL_o764 0x22 +#define MODEL_mon1 0x21 +#define MODEL_o766 0x20 +#define MODEL_o758 0x1F +#define MODEL_o757 0x1E +#define MODEL_ma_kabe 0x1D +#define MODEL_o779 0x1C +#define MODEL_o780 0x1B +#define MODEL_o778 0x1A +#define MODEL_senro 0x19 +#define MODEL_o397 0x18 +#define MODEL_o976 0x17 +#define MODEL_dai 0x16 +#define MODEL_o777 0x15 +#define MODEL_soto 0x14 +#define MODEL_o983 0x13 +#define MODEL_bero 0x12 +#define MODEL_o793 0x11 +#define MODEL_o792 0x10 +#define MODEL_o819 0xF +#define MODEL_g355 0xE +#define MODEL_o784 0xD +#define MODEL_o788 0xC +#define MODEL_o786 0xB +#define MODEL_g352 0xA +#define MODEL_o1057 0x9 +#define MODEL_o1024 0x8 +#define MODEL_g351 0x7 +#define MODEL_o1087 0x6 +#define MODEL_o1035 0x5 +#define MODEL_o767 0x4 +#define MODEL_g363 0x3 +#define MODEL_o1102 0x2 +#define MODEL_o1101 0x1 +#define MODEL_o1100 0x0 + diff --git a/include/mapfs/omo_09_hit.h b/include/mapfs/omo_09_hit.h index bd7c36735d..0a626d34f7 100644 --- a/include/mapfs/omo_09_hit.h +++ b/include/mapfs/omo_09_hit.h @@ -1,52 +1,64 @@ -#define COLLIDER_Root 0x33 -#define COLLIDER_g330 0x32 -#define COLLIDER_hako 0x31 -#define COLLIDER_h_3 0x30 -#define COLLIDER_h3 0x2F -#define COLLIDER_h_2 0x2E -#define COLLIDER_h2 0x2D -#define COLLIDER_h_1 0x2C -#define COLLIDER_h1 0x2B -#define COLLIDER_start 0x2A -#define COLLIDER_s1 0x29 -#define COLLIDER_g327 0x28 -#define COLLIDER_hontai 0x27 -#define COLLIDER_o882 0x26 -#define COLLIDER_o881 0x25 -#define COLLIDER_o863 0x24 -#define COLLIDER_g324 0x23 -#define COLLIDER_o933 0x22 -#define COLLIDER_o935 0x21 -#define COLLIDER_o939 0x20 -#define COLLIDER_o477 0x1F -#define COLLIDER_u 0x1E -#define COLLIDER_u6 0x1D -#define COLLIDER_u5 0x1C -#define COLLIDER_u4 0x1B -#define COLLIDER_u3 0x1A -#define COLLIDER_u2 0x19 -#define COLLIDER_u1 0x18 -#define COLLIDER_stop 0x17 -#define COLLIDER_dai 0x16 -#define COLLIDER_o329 0x15 -#define COLLIDER_o622 0x14 -#define COLLIDER_yuka 0x13 -#define COLLIDER_o821 0x12 -#define COLLIDER_o478 0x11 -#define COLLIDER_o488 0x10 -#define COLLIDER_g321 0xF -#define COLLIDER_o911 0xE -#define COLLIDER_o907 0xD -#define COLLIDER_o906 0xC -#define COLLIDER_o904 0xB -#define COLLIDER_o538 0xA -#define COLLIDER_o858 0x9 -#define COLLIDER_o914 0x8 -#define COLLIDER_g289 0x7 -#define COLLIDER_o326 0x6 -#define COLLIDER_o893 0x5 -#define COLLIDER_o777 0x4 -#define COLLIDER_bero 0x3 -#define COLLIDER_o940 0x2 -#define COLLIDER_deilit1 0x1 -#define COLLIDER_deili1 0x0 +#define COLLIDER_Root 0x33 +#define COLLIDER_g330 0x32 +#define COLLIDER_hako 0x31 +#define COLLIDER_h_3 0x30 +#define COLLIDER_h3 0x2F +#define COLLIDER_h_2 0x2E +#define COLLIDER_h2 0x2D +#define COLLIDER_h_1 0x2C +#define COLLIDER_h1 0x2B +#define COLLIDER_start 0x2A +#define COLLIDER_s1 0x29 +#define COLLIDER_g327 0x28 +#define COLLIDER_hontai 0x27 +#define COLLIDER_o882 0x26 +#define COLLIDER_o881 0x25 +#define COLLIDER_o863 0x24 +#define COLLIDER_g324 0x23 +#define COLLIDER_o933 0x22 +#define COLLIDER_o935 0x21 +#define COLLIDER_o939 0x20 +#define COLLIDER_o477 0x1F +#define COLLIDER_u 0x1E +#define COLLIDER_u6 0x1D +#define COLLIDER_u5 0x1C +#define COLLIDER_u4 0x1B +#define COLLIDER_u3 0x1A +#define COLLIDER_u2 0x19 +#define COLLIDER_u1 0x18 +#define COLLIDER_stop 0x17 +#define COLLIDER_dai 0x16 +#define COLLIDER_o329 0x15 +#define COLLIDER_o622 0x14 +#define COLLIDER_yuka 0x13 +#define COLLIDER_o821 0x12 +#define COLLIDER_o478 0x11 +#define COLLIDER_o488 0x10 +#define COLLIDER_g321 0xF +#define COLLIDER_o911 0xE +#define COLLIDER_o907 0xD +#define COLLIDER_o906 0xC +#define COLLIDER_o904 0xB +#define COLLIDER_o538 0xA +#define COLLIDER_o858 0x9 +#define COLLIDER_o914 0x8 +#define COLLIDER_g289 0x7 +#define COLLIDER_o326 0x6 +#define COLLIDER_o893 0x5 +#define COLLIDER_o777 0x4 +#define COLLIDER_bero 0x3 +#define COLLIDER_o940 0x2 +#define COLLIDER_deilit1 0x1 +#define COLLIDER_deili1 0x0 + +#define ZONE_Root 0x9 +#define ZONE_g328 0x8 +#define ZONE_o925 0x7 +#define ZONE_o924 0x6 +#define ZONE_o923 0x5 +#define ZONE_g323 0x4 +#define ZONE_o917 0x3 +#define ZONE_g322 0x2 +#define ZONE_o916 0x1 +#define ZONE_o915 0x0 + diff --git a/include/mapfs/omo_09_shape.h b/include/mapfs/omo_09_shape.h index 9beef6e970..9d949709cc 100644 --- a/include/mapfs/omo_09_shape.h +++ b/include/mapfs/omo_09_shape.h @@ -1,156 +1,157 @@ -#define MODEL_Root 0x9B -#define MODEL_tokei 0x9A -#define MODEL_tokei_2 0x99 -#define MODEL_mari_2 0x98 -#define MODEL_maru2 0x97 -#define MODEL_hari_2 0x96 -#define MODEL_hari2 0x95 -#define MODEL_tokei_1 0x94 -#define MODEL_maru_1 0x93 -#define MODEL_maru1 0x92 -#define MODEL_hari_1 0x91 -#define MODEL_hari1 0x90 -#define MODEL_g322 0x8F -#define MODEL_o938 0x8E -#define MODEL_o917 0x8D -#define MODEL_o916 0x8C -#define MODEL_o914 0x8B -#define MODEL_o913 0x8A -#define MODEL_u 0x89 -#define MODEL_u6 0x88 -#define MODEL_u5 0x87 -#define MODEL_u4 0x86 -#define MODEL_u3 0x85 -#define MODEL_u2 0x84 -#define MODEL_u1 0x83 -#define MODEL_stop 0x82 -#define MODEL_slot 0x81 -#define MODEL_denki 0x80 -#define MODEL_o887 0x7F -#define MODEL_o890 0x7E -#define MODEL_o889 0x7D -#define MODEL_o884 0x7C -#define MODEL_o876 0x7B -#define MODEL_o888 0x7A -#define MODEL_kaiten 0x79 -#define MODEL_k3 0x78 -#define MODEL_o875 0x77 -#define MODEL_o874 0x76 -#define MODEL_o873 0x75 -#define MODEL_o872 0x74 -#define MODEL_k2 0x73 -#define MODEL_o871 0x72 -#define MODEL_o870 0x71 -#define MODEL_o869 0x70 -#define MODEL_o868 0x6F -#define MODEL_k1 0x6E -#define MODEL_o867 0x6D -#define MODEL_o866 0x6C -#define MODEL_o865 0x6B -#define MODEL_o864 0x6A -#define MODEL_hako 0x69 -#define MODEL_g321 0x68 -#define MODEL_h3_a 0x67 -#define MODEL_h2_a 0x66 -#define MODEL_h1_a 0x65 -#define MODEL_h_3 0x64 -#define MODEL_h3 0x63 -#define MODEL_h_2 0x62 -#define MODEL_h2 0x61 -#define MODEL_h_1 0x60 -#define MODEL_h1 0x5F -#define MODEL_start 0x5E -#define MODEL_s2 0x5D -#define MODEL_s1 0x5C -#define MODEL_hontai 0x5B -#define MODEL_o885 0x5A -#define MODEL_o883 0x59 -#define MODEL_o882 0x58 -#define MODEL_o881 0x57 -#define MODEL_o863 0x56 -#define MODEL_o862 0x55 -#define MODEL_beruto 0x54 -#define MODEL_8 0x53 -#define MODEL_4 0x52 -#define MODEL_3 0x51 -#define MODEL_1 0x50 -#define MODEL_mado 0x4F -#define MODEL_mado4_2 0x4E -#define MODEL_m4_2 0x4D -#define MODEL_mado4_1 0x4C -#define MODEL_m4_1 0x4B -#define MODEL_mado3_2 0x4A -#define MODEL_m3_2 0x49 -#define MODEL_mado3_1 0x48 -#define MODEL_m3_1 0x47 -#define MODEL_mado2_2 0x46 -#define MODEL_m2_2 0x45 -#define MODEL_mado2_1 0x44 -#define MODEL_m2_1 0x43 -#define MODEL_mado1_2 0x42 -#define MODEL_m1_2 0x41 -#define MODEL_mado1_1 0x40 -#define MODEL_m1_1 0x3F -#define MODEL_hana 0x3E -#define MODEL_hana_5 0x3D -#define MODEL_ha5 0x3C -#define MODEL_hana_4 0x3B -#define MODEL_ha4 0x3A -#define MODEL_hana_3 0x39 -#define MODEL_ha3 0x38 -#define MODEL_hana_2 0x37 -#define MODEL_ha2 0x36 -#define MODEL_hana_1 0x35 -#define MODEL_ha1 0x34 -#define MODEL_g273 0x33 -#define MODEL_o853 0x32 -#define MODEL_o852 0x31 -#define MODEL_o927 0x30 -#define MODEL_o860 0x2F -#define MODEL_o858 0x2E -#define MODEL_o903 0x2D -#define MODEL_o924 0x2C -#define MODEL_h1_2 0x2B -#define MODEL_o626 0x2A -#define MODEL_o625 0x29 -#define MODEL_o623 0x28 -#define MODEL_o622 0x27 -#define MODEL_omo 0x26 -#define MODEL_t 0x25 -#define MODEL_o477 0x24 -#define MODEL_dai 0x23 -#define MODEL_yuka 0x22 -#define MODEL_o326 0x21 -#define MODEL_in_1 0x20 -#define MODEL_o330 0x1F -#define MODEL_o329 0x1E -#define MODEL_bero 0x1D -#define MODEL_o778 0x1C -#define MODEL_o777 0x1B -#define MODEL_saku 0x1A -#define MODEL_o849 0x19 -#define MODEL_o851 0x18 -#define MODEL_o850 0x17 -#define MODEL_o820 0x16 -#define MODEL_o845 0x15 -#define MODEL_o821 0x14 -#define MODEL_g289 0x13 -#define MODEL_o895 0x12 -#define MODEL_o894 0x11 -#define MODEL_o893 0x10 -#define MODEL_g352 0xF -#define MODEL_o905 0xE -#define MODEL_o907 0xD -#define MODEL_o906 0xC -#define MODEL_o331 0xB -#define MODEL_kabe_u 0xA -#define MODEL_o570 0x9 -#define MODEL_o559 0x8 -#define MODEL_o562 0x7 -#define MODEL_o538 0x6 -#define MODEL_o855 0x5 -#define MODEL_o338 0x4 -#define MODEL_o163 0x3 -#define MODEL_o723 0x2 -#define MODEL_o722 0x1 -#define MODEL_o337 0x0 +#define MODEL_Root 0x9B +#define MODEL_tokei 0x9A +#define MODEL_tokei_2 0x99 +#define MODEL_mari_2 0x98 +#define MODEL_maru2 0x97 +#define MODEL_hari_2 0x96 +#define MODEL_hari2 0x95 +#define MODEL_tokei_1 0x94 +#define MODEL_maru_1 0x93 +#define MODEL_maru1 0x92 +#define MODEL_hari_1 0x91 +#define MODEL_hari1 0x90 +#define MODEL_g322 0x8F +#define MODEL_o938 0x8E +#define MODEL_o917 0x8D +#define MODEL_o916 0x8C +#define MODEL_o914 0x8B +#define MODEL_o913 0x8A +#define MODEL_u 0x89 +#define MODEL_u6 0x88 +#define MODEL_u5 0x87 +#define MODEL_u4 0x86 +#define MODEL_u3 0x85 +#define MODEL_u2 0x84 +#define MODEL_u1 0x83 +#define MODEL_stop 0x82 +#define MODEL_slot 0x81 +#define MODEL_denki 0x80 +#define MODEL_o887 0x7F +#define MODEL_o890 0x7E +#define MODEL_o889 0x7D +#define MODEL_o884 0x7C +#define MODEL_o876 0x7B +#define MODEL_o888 0x7A +#define MODEL_kaiten 0x79 +#define MODEL_k3 0x78 +#define MODEL_o875 0x77 +#define MODEL_o874 0x76 +#define MODEL_o873 0x75 +#define MODEL_o872 0x74 +#define MODEL_k2 0x73 +#define MODEL_o871 0x72 +#define MODEL_o870 0x71 +#define MODEL_o869 0x70 +#define MODEL_o868 0x6F +#define MODEL_k1 0x6E +#define MODEL_o867 0x6D +#define MODEL_o866 0x6C +#define MODEL_o865 0x6B +#define MODEL_o864 0x6A +#define MODEL_hako 0x69 +#define MODEL_g321 0x68 +#define MODEL_h3_a 0x67 +#define MODEL_h2_a 0x66 +#define MODEL_h1_a 0x65 +#define MODEL_h_3 0x64 +#define MODEL_h3 0x63 +#define MODEL_h_2 0x62 +#define MODEL_h2 0x61 +#define MODEL_h_1 0x60 +#define MODEL_h1 0x5F +#define MODEL_start 0x5E +#define MODEL_s2 0x5D +#define MODEL_s1 0x5C +#define MODEL_hontai 0x5B +#define MODEL_o885 0x5A +#define MODEL_o883 0x59 +#define MODEL_o882 0x58 +#define MODEL_o881 0x57 +#define MODEL_o863 0x56 +#define MODEL_o862 0x55 +#define MODEL_beruto 0x54 +#define MODEL_8 0x53 +#define MODEL_4 0x52 +#define MODEL_3 0x51 +#define MODEL_1 0x50 +#define MODEL_mado 0x4F +#define MODEL_mado4_2 0x4E +#define MODEL_m4_2 0x4D +#define MODEL_mado4_1 0x4C +#define MODEL_m4_1 0x4B +#define MODEL_mado3_2 0x4A +#define MODEL_m3_2 0x49 +#define MODEL_mado3_1 0x48 +#define MODEL_m3_1 0x47 +#define MODEL_mado2_2 0x46 +#define MODEL_m2_2 0x45 +#define MODEL_mado2_1 0x44 +#define MODEL_m2_1 0x43 +#define MODEL_mado1_2 0x42 +#define MODEL_m1_2 0x41 +#define MODEL_mado1_1 0x40 +#define MODEL_m1_1 0x3F +#define MODEL_hana 0x3E +#define MODEL_hana_5 0x3D +#define MODEL_ha5 0x3C +#define MODEL_hana_4 0x3B +#define MODEL_ha4 0x3A +#define MODEL_hana_3 0x39 +#define MODEL_ha3 0x38 +#define MODEL_hana_2 0x37 +#define MODEL_ha2 0x36 +#define MODEL_hana_1 0x35 +#define MODEL_ha1 0x34 +#define MODEL_g273 0x33 +#define MODEL_o853 0x32 +#define MODEL_o852 0x31 +#define MODEL_o927 0x30 +#define MODEL_o860 0x2F +#define MODEL_o858 0x2E +#define MODEL_o903 0x2D +#define MODEL_o924 0x2C +#define MODEL_h1_2 0x2B +#define MODEL_o626 0x2A +#define MODEL_o625 0x29 +#define MODEL_o623 0x28 +#define MODEL_o622 0x27 +#define MODEL_omo 0x26 +#define MODEL_t 0x25 +#define MODEL_o477 0x24 +#define MODEL_dai 0x23 +#define MODEL_yuka 0x22 +#define MODEL_o326 0x21 +#define MODEL_in_1 0x20 +#define MODEL_o330 0x1F +#define MODEL_o329 0x1E +#define MODEL_bero 0x1D +#define MODEL_o778 0x1C +#define MODEL_o777 0x1B +#define MODEL_saku 0x1A +#define MODEL_o849 0x19 +#define MODEL_o851 0x18 +#define MODEL_o850 0x17 +#define MODEL_o820 0x16 +#define MODEL_o845 0x15 +#define MODEL_o821 0x14 +#define MODEL_g289 0x13 +#define MODEL_o895 0x12 +#define MODEL_o894 0x11 +#define MODEL_o893 0x10 +#define MODEL_g352 0xF +#define MODEL_o905 0xE +#define MODEL_o907 0xD +#define MODEL_o906 0xC +#define MODEL_o331 0xB +#define MODEL_kabe_u 0xA +#define MODEL_o570 0x9 +#define MODEL_o559 0x8 +#define MODEL_o562 0x7 +#define MODEL_o538 0x6 +#define MODEL_o855 0x5 +#define MODEL_o338 0x4 +#define MODEL_o163 0x3 +#define MODEL_o723 0x2 +#define MODEL_o722 0x1 +#define MODEL_o337 0x0 + diff --git a/include/mapfs/omo_10_hit.h b/include/mapfs/omo_10_hit.h index c8f9999281..3171ae2ed3 100644 --- a/include/mapfs/omo_10_hit.h +++ b/include/mapfs/omo_10_hit.h @@ -1,68 +1,81 @@ -#define COLLIDER_Root 0x43 -#define COLLIDER_kanba 0x42 -#define COLLIDER_kan 0x41 -#define COLLIDER_g309 0x40 -#define COLLIDER_o962 0x3F -#define COLLIDER_o961 0x3E -#define COLLIDER_g301 0x3D -#define COLLIDER_g306 0x3C -#define COLLIDER_g308 0x3B -#define COLLIDER_o924 0x3A -#define COLLIDER_o923 0x39 -#define COLLIDER_g307 0x38 -#define COLLIDER_o957 0x37 -#define COLLIDER_g303 0x36 -#define COLLIDER_g305 0x35 -#define COLLIDER_o921 0x34 -#define COLLIDER_o920 0x33 -#define COLLIDER_g304 0x32 -#define COLLIDER_o954 0x31 -#define COLLIDER_g255 0x30 -#define COLLIDER_o846 0x2F -#define COLLIDER_o845 0x2E -#define COLLIDER_o844 0x2D -#define COLLIDER_o843 0x2C -#define COLLIDER_o842 0x2B -#define COLLIDER_o984 0x2A -#define COLLIDER_o983 0x29 -#define COLLIDER_ra 0x28 -#define COLLIDER_o777 0x27 -#define COLLIDER_o767 0x26 -#define COLLIDER_saku 0x25 -#define COLLIDER_o946 0x24 -#define COLLIDER_saku_1 0x23 -#define COLLIDER_g226 0x22 -#define COLLIDER_o397 0x21 -#define COLLIDER_o735 0x20 -#define COLLIDER_o734 0x1F -#define COLLIDER_o789 0x1E -#define COLLIDER_o787 0x1D -#define COLLIDER_o783 0x1C -#define COLLIDER_o781 0x1B -#define COLLIDER_o780 0x1A -#define COLLIDER_o779 0x19 -#define COLLIDER_o778 0x18 -#define COLLIDER_g237 0x17 -#define COLLIDER_o964 0x16 -#define COLLIDER_o835 0x15 -#define COLLIDER_o819 0x14 -#define COLLIDER_o766 0x13 -#define COLLIDER_o765 0x12 -#define COLLIDER_o764 0x11 -#define COLLIDER_o757 0x10 -#define COLLIDER_dai 0xF -#define COLLIDER_o860 0xE -#define COLLIDER_o859 0xD -#define COLLIDER_bero 0xC -#define COLLIDER_o968 0xB -#define COLLIDER_o967 0xA -#define COLLIDER_o858 0x9 -#define COLLIDER_deilit4 0x8 -#define COLLIDER_deili4 0x7 -#define COLLIDER_deilit3 0x6 -#define COLLIDER_deili3 0x5 -#define COLLIDER_deilit2 0x4 -#define COLLIDER_deili2 0x3 -#define COLLIDER_o857 0x2 -#define COLLIDER_deilit1 0x1 -#define COLLIDER_deili1 0x0 +#define COLLIDER_Root 0x43 +#define COLLIDER_kanba 0x42 +#define COLLIDER_kan 0x41 +#define COLLIDER_g309 0x40 +#define COLLIDER_o962 0x3F +#define COLLIDER_o961 0x3E +#define COLLIDER_g301 0x3D +#define COLLIDER_g306 0x3C +#define COLLIDER_g308 0x3B +#define COLLIDER_o924 0x3A +#define COLLIDER_o923 0x39 +#define COLLIDER_g307 0x38 +#define COLLIDER_o957 0x37 +#define COLLIDER_g303 0x36 +#define COLLIDER_g305 0x35 +#define COLLIDER_o921 0x34 +#define COLLIDER_o920 0x33 +#define COLLIDER_g304 0x32 +#define COLLIDER_o954 0x31 +#define COLLIDER_g255 0x30 +#define COLLIDER_o846 0x2F +#define COLLIDER_o845 0x2E +#define COLLIDER_o844 0x2D +#define COLLIDER_o843 0x2C +#define COLLIDER_o842 0x2B +#define COLLIDER_o984 0x2A +#define COLLIDER_o983 0x29 +#define COLLIDER_ra 0x28 +#define COLLIDER_o777 0x27 +#define COLLIDER_o767 0x26 +#define COLLIDER_saku 0x25 +#define COLLIDER_o946 0x24 +#define COLLIDER_saku_1 0x23 +#define COLLIDER_g226 0x22 +#define COLLIDER_o397 0x21 +#define COLLIDER_o735 0x20 +#define COLLIDER_o734 0x1F +#define COLLIDER_o789 0x1E +#define COLLIDER_o787 0x1D +#define COLLIDER_o783 0x1C +#define COLLIDER_o781 0x1B +#define COLLIDER_o780 0x1A +#define COLLIDER_o779 0x19 +#define COLLIDER_o778 0x18 +#define COLLIDER_g237 0x17 +#define COLLIDER_o964 0x16 +#define COLLIDER_o835 0x15 +#define COLLIDER_o819 0x14 +#define COLLIDER_o766 0x13 +#define COLLIDER_o765 0x12 +#define COLLIDER_o764 0x11 +#define COLLIDER_o757 0x10 +#define COLLIDER_dai 0xF +#define COLLIDER_o860 0xE +#define COLLIDER_o859 0xD +#define COLLIDER_bero 0xC +#define COLLIDER_o968 0xB +#define COLLIDER_o967 0xA +#define COLLIDER_o858 0x9 +#define COLLIDER_deilit4 0x8 +#define COLLIDER_deili4 0x7 +#define COLLIDER_deilit3 0x6 +#define COLLIDER_deili3 0x5 +#define COLLIDER_deilit2 0x4 +#define COLLIDER_deili2 0x3 +#define COLLIDER_o857 0x2 +#define COLLIDER_deilit1 0x1 +#define COLLIDER_deili1 0x0 + +#define ZONE_Root 0xA +#define ZONE_g259 0x9 +#define ZONE_o825 0x8 +#define ZONE_o824 0x7 +#define ZONE_bero 0x6 +#define ZONE_o792 0x5 +#define ZONE_g260 0x4 +#define ZONE_o826 0x3 +#define ZONE_g261 0x2 +#define ZONE_o832 0x1 +#define ZONE_o827 0x0 + diff --git a/include/mapfs/omo_10_shape.h b/include/mapfs/omo_10_shape.h index be6a7fb0a2..44160c7d30 100644 --- a/include/mapfs/omo_10_shape.h +++ b/include/mapfs/omo_10_shape.h @@ -1,154 +1,155 @@ -#define MODEL_Root 0x99 -#define MODEL_g308 0x98 -#define MODEL_o970 0x97 -#define MODEL_o969 0x96 -#define MODEL_o968 0x95 -#define MODEL_o967 0x94 -#define MODEL_o964 0x93 -#define MODEL_o963 0x92 -#define MODEL_o962 0x91 -#define MODEL_ya 0x90 -#define MODEL_ya_c 0x8F -#define MODEL_y_c 0x8E -#define MODEL_y_c2 0x8D -#define MODEL_y_c1 0x8C -#define MODEL_g275 0x8B -#define MODEL_o926 0x8A -#define MODEL_ya_b 0x89 -#define MODEL_y_b 0x88 -#define MODEL_y_b2 0x87 -#define MODEL_y_b1 0x86 -#define MODEL_g271 0x85 -#define MODEL_o925 0x84 -#define MODEL_ya_a 0x83 -#define MODEL_y_a 0x82 -#define MODEL_popo 0x81 -#define MODEL_p6 0x80 -#define MODEL_o11 0x7F -#define MODEL_p5 0x7E -#define MODEL_o10 0x7D -#define MODEL_p4 0x7C -#define MODEL_o9 0x7B -#define MODEL_p3 0x7A -#define MODEL_o8 0x79 -#define MODEL_o7 0x78 -#define MODEL_p2 0x77 -#define MODEL_o6 0x76 -#define MODEL_o5 0x75 -#define MODEL_p1 0x74 -#define MODEL_o4 0x73 -#define MODEL_o3 0x72 -#define MODEL_o2 0x71 -#define MODEL_o1 0x70 -#define MODEL_g254 0x6F -#define MODEL_g310 0x6E -#define MODEL_o975 0x6D -#define MODEL_o974 0x6C -#define MODEL_o973 0x6B -#define MODEL_o972 0x6A -#define MODEL_o971 0x69 -#define MODEL_g263 0x68 -#define MODEL_o821 0x67 -#define MODEL_g261 0x66 -#define MODEL_o822 0x65 -#define MODEL_g260 0x64 -#define MODEL_o876 0x63 -#define MODEL_o875 0x62 -#define MODEL_o874 0x61 -#define MODEL_g259 0x60 -#define MODEL_o894 0x5F -#define MODEL_o832 0x5E -#define MODEL_o960 0x5D -#define MODEL_station 0x5C -#define MODEL_n 0x5B -#define MODEL_o 0x5A -#define MODEL_i 0x59 -#define MODEL_t 0x58 -#define MODEL_a 0x57 -#define MODEL_s 0x56 -#define MODEL_hana 0x55 -#define MODEL_hana_5 0x54 -#define MODEL_ha5 0x53 -#define MODEL_hana_4 0x52 -#define MODEL_ha4 0x51 -#define MODEL_hana_3 0x50 -#define MODEL_ha3 0x4F -#define MODEL_hana_2 0x4E -#define MODEL_ha2 0x4D -#define MODEL_hana_1 0x4C -#define MODEL_ha1 0x4B -#define MODEL_m 0x4A -#define MODEL_o920 0x49 -#define MODEL_o919 0x48 -#define MODEL_o918 0x47 -#define MODEL_o917 0x46 -#define MODEL_o916 0x45 -#define MODEL_mado 0x44 -#define MODEL_mado2_2 0x43 -#define MODEL_m2_2 0x42 -#define MODEL_mado2_1 0x41 -#define MODEL_m2_1 0x40 -#define MODEL_mado1_2 0x3F -#define MODEL_m1_2 0x3E -#define MODEL_mado1_1 0x3D -#define MODEL_m1_1 0x3C -#define MODEL_tokei 0x3B -#define MODEL_tokei_2 0x3A -#define MODEL_maru_2 0x39 -#define MODEL_maru2 0x38 -#define MODEL_hari_2 0x37 -#define MODEL_hari2 0x36 -#define MODEL_tokei_1 0x35 -#define MODEL_maru_1 0x34 -#define MODEL_maru1 0x33 -#define MODEL_hari_1 0x32 -#define MODEL_hari1 0x31 -#define MODEL_saku 0x30 -#define MODEL_o880 0x2F -#define MODEL_o879 0x2E -#define MODEL_o878 0x2D -#define MODEL_o877 0x2C -#define MODEL_o852 0x2B -#define MODEL_o870 0x2A -#define MODEL_g240 0x29 -#define MODEL_o781 0x28 -#define MODEL_o780 0x27 -#define MODEL_o779 0x26 -#define MODEL_senro 0x25 -#define MODEL_o907 0x24 -#define MODEL_o397 0x23 -#define MODEL_dai 0x22 -#define MODEL_o777 0x21 -#define MODEL_soto 0x20 -#define MODEL_o923 0x1F -#define MODEL_bero 0x1E -#define MODEL_o793 0x1D -#define MODEL_o792 0x1C -#define MODEL_o819 0x1B -#define MODEL_mon2 0x1A -#define MODEL_o759 0x19 -#define MODEL_o953 0x18 -#define MODEL_o758 0x17 -#define MODEL_o757 0x16 -#define MODEL_mon1 0x15 -#define MODEL_o766 0x14 -#define MODEL_o954 0x13 -#define MODEL_o765 0x12 -#define MODEL_o764 0x11 -#define MODEL_k3 0x10 -#define MODEL_o784 0xF -#define MODEL_o788 0xE -#define MODEL_o786 0xD -#define MODEL_o767 0xC -#define MODEL_k2 0xB -#define MODEL_o783 0xA -#define MODEL_o956 0x9 -#define MODEL_o789 0x8 -#define MODEL_o787 0x7 -#define MODEL_k1 0x6 -#define MODEL_o744 0x5 -#define MODEL_o955 0x4 -#define MODEL_o938 0x3 -#define MODEL_o736 0x2 -#define MODEL_o734 0x1 -#define MODEL_o745 0x0 +#define MODEL_Root 0x99 +#define MODEL_g308 0x98 +#define MODEL_o970 0x97 +#define MODEL_o969 0x96 +#define MODEL_o968 0x95 +#define MODEL_o967 0x94 +#define MODEL_o964 0x93 +#define MODEL_o963 0x92 +#define MODEL_o962 0x91 +#define MODEL_ya 0x90 +#define MODEL_ya_c 0x8F +#define MODEL_y_c 0x8E +#define MODEL_y_c2 0x8D +#define MODEL_y_c1 0x8C +#define MODEL_g275 0x8B +#define MODEL_o926 0x8A +#define MODEL_ya_b 0x89 +#define MODEL_y_b 0x88 +#define MODEL_y_b2 0x87 +#define MODEL_y_b1 0x86 +#define MODEL_g271 0x85 +#define MODEL_o925 0x84 +#define MODEL_ya_a 0x83 +#define MODEL_y_a 0x82 +#define MODEL_popo 0x81 +#define MODEL_p6 0x80 +#define MODEL_o11 0x7F +#define MODEL_p5 0x7E +#define MODEL_o10 0x7D +#define MODEL_p4 0x7C +#define MODEL_o9 0x7B +#define MODEL_p3 0x7A +#define MODEL_o8 0x79 +#define MODEL_o7 0x78 +#define MODEL_p2 0x77 +#define MODEL_o6 0x76 +#define MODEL_o5 0x75 +#define MODEL_p1 0x74 +#define MODEL_o4 0x73 +#define MODEL_o3 0x72 +#define MODEL_o2 0x71 +#define MODEL_o1 0x70 +#define MODEL_g254 0x6F +#define MODEL_g310 0x6E +#define MODEL_o975 0x6D +#define MODEL_o974 0x6C +#define MODEL_o973 0x6B +#define MODEL_o972 0x6A +#define MODEL_o971 0x69 +#define MODEL_g263 0x68 +#define MODEL_o821 0x67 +#define MODEL_g261 0x66 +#define MODEL_o822 0x65 +#define MODEL_g260 0x64 +#define MODEL_o876 0x63 +#define MODEL_o875 0x62 +#define MODEL_o874 0x61 +#define MODEL_g259 0x60 +#define MODEL_o894 0x5F +#define MODEL_o832 0x5E +#define MODEL_o960 0x5D +#define MODEL_station 0x5C +#define MODEL_n 0x5B +#define MODEL_o 0x5A +#define MODEL_i 0x59 +#define MODEL_t 0x58 +#define MODEL_a 0x57 +#define MODEL_s 0x56 +#define MODEL_hana 0x55 +#define MODEL_hana_5 0x54 +#define MODEL_ha5 0x53 +#define MODEL_hana_4 0x52 +#define MODEL_ha4 0x51 +#define MODEL_hana_3 0x50 +#define MODEL_ha3 0x4F +#define MODEL_hana_2 0x4E +#define MODEL_ha2 0x4D +#define MODEL_hana_1 0x4C +#define MODEL_ha1 0x4B +#define MODEL_m 0x4A +#define MODEL_o920 0x49 +#define MODEL_o919 0x48 +#define MODEL_o918 0x47 +#define MODEL_o917 0x46 +#define MODEL_o916 0x45 +#define MODEL_mado 0x44 +#define MODEL_mado2_2 0x43 +#define MODEL_m2_2 0x42 +#define MODEL_mado2_1 0x41 +#define MODEL_m2_1 0x40 +#define MODEL_mado1_2 0x3F +#define MODEL_m1_2 0x3E +#define MODEL_mado1_1 0x3D +#define MODEL_m1_1 0x3C +#define MODEL_tokei 0x3B +#define MODEL_tokei_2 0x3A +#define MODEL_maru_2 0x39 +#define MODEL_maru2 0x38 +#define MODEL_hari_2 0x37 +#define MODEL_hari2 0x36 +#define MODEL_tokei_1 0x35 +#define MODEL_maru_1 0x34 +#define MODEL_maru1 0x33 +#define MODEL_hari_1 0x32 +#define MODEL_hari1 0x31 +#define MODEL_saku 0x30 +#define MODEL_o880 0x2F +#define MODEL_o879 0x2E +#define MODEL_o878 0x2D +#define MODEL_o877 0x2C +#define MODEL_o852 0x2B +#define MODEL_o870 0x2A +#define MODEL_g240 0x29 +#define MODEL_o781 0x28 +#define MODEL_o780 0x27 +#define MODEL_o779 0x26 +#define MODEL_senro 0x25 +#define MODEL_o907 0x24 +#define MODEL_o397 0x23 +#define MODEL_dai 0x22 +#define MODEL_o777 0x21 +#define MODEL_soto 0x20 +#define MODEL_o923 0x1F +#define MODEL_bero 0x1E +#define MODEL_o793 0x1D +#define MODEL_o792 0x1C +#define MODEL_o819 0x1B +#define MODEL_mon2 0x1A +#define MODEL_o759 0x19 +#define MODEL_o953 0x18 +#define MODEL_o758 0x17 +#define MODEL_o757 0x16 +#define MODEL_mon1 0x15 +#define MODEL_o766 0x14 +#define MODEL_o954 0x13 +#define MODEL_o765 0x12 +#define MODEL_o764 0x11 +#define MODEL_k3 0x10 +#define MODEL_o784 0xF +#define MODEL_o788 0xE +#define MODEL_o786 0xD +#define MODEL_o767 0xC +#define MODEL_k2 0xB +#define MODEL_o783 0xA +#define MODEL_o956 0x9 +#define MODEL_o789 0x8 +#define MODEL_o787 0x7 +#define MODEL_k1 0x6 +#define MODEL_o744 0x5 +#define MODEL_o955 0x4 +#define MODEL_o938 0x3 +#define MODEL_o736 0x2 +#define MODEL_o734 0x1 +#define MODEL_o745 0x0 + diff --git a/include/mapfs/omo_11_hit.h b/include/mapfs/omo_11_hit.h index f29049b90c..09b6993b78 100644 --- a/include/mapfs/omo_11_hit.h +++ b/include/mapfs/omo_11_hit.h @@ -1,70 +1,77 @@ -#define COLLIDER_Root 0x45 -#define COLLIDER_r2 0x44 -#define COLLIDER_r2_5 0x43 -#define COLLIDER_f2_5 0x42 -#define COLLIDER_2_5 0x41 -#define COLLIDER_r2_4 0x40 -#define COLLIDER_f2_4 0x3F -#define COLLIDER_2_4 0x3E -#define COLLIDER_r2_3 0x3D -#define COLLIDER_f2_3 0x3C -#define COLLIDER_2_3 0x3B -#define COLLIDER_r2_2 0x3A -#define COLLIDER_f2_2 0x39 -#define COLLIDER_2_2 0x38 -#define COLLIDER_r2_1 0x37 -#define COLLIDER_f2_1 0x36 -#define COLLIDER_2_1 0x35 -#define COLLIDER_r1 0x34 -#define COLLIDER_f 0x33 -#define COLLIDER_fl 0x32 -#define COLLIDER_r1_3 0x31 -#define COLLIDER_f1_3 0x30 -#define COLLIDER_1_3 0x2F -#define COLLIDER_r1_2 0x2E -#define COLLIDER_f1_2 0x2D -#define COLLIDER_1_2 0x2C -#define COLLIDER_r1_1 0x2B -#define COLLIDER_f1_1 0x2A -#define COLLIDER_1_1 0x29 -#define COLLIDER_r1_0 0x28 -#define COLLIDER_1_0 0x27 -#define COLLIDER_4 0x26 -#define COLLIDER_o949 0x25 -#define COLLIDER_o923 0x24 -#define COLLIDER_o825 0x23 -#define COLLIDER_o400 0x22 -#define COLLIDER_o921 0x21 -#define COLLIDER_o993 0x20 -#define COLLIDER_o937 0x1F -#define COLLIDER_o896 0x1E -#define COLLIDER_o559 0x1D -#define COLLIDER_3 0x1C -#define COLLIDER_o950 0x1B -#define COLLIDER_o948 0x1A -#define COLLIDER_o913 0x19 -#define COLLIDER_o912 0x18 -#define COLLIDER_o911 0x17 -#define COLLIDER_o885 0x16 -#define COLLIDER_2 0x15 -#define COLLIDER_o918 0x14 -#define COLLIDER_o833 0x13 -#define COLLIDER_o141 0x12 -#define COLLIDER_o800 0x11 -#define COLLIDER_1 0x10 -#define COLLIDER_o891 0xF -#define COLLIDER_o951 0xE -#define COLLIDER_o514 0xD -#define COLLIDER_o515 0xC -#define COLLIDER_o466 0xB -#define COLLIDER_o538 0xA -#define COLLIDER_o331 0x9 -#define COLLIDER_bero 0x8 -#define COLLIDER_o961 0x7 -#define COLLIDER_o960 0x6 -#define COLLIDER_b_k2 0x5 -#define COLLIDER_b_k1 0x4 -#define COLLIDER_deilit2 0x3 -#define COLLIDER_deili2 0x2 -#define COLLIDER_deilit1 0x1 -#define COLLIDER_deili1 0x0 +#define COLLIDER_Root 0x45 +#define COLLIDER_r2 0x44 +#define COLLIDER_r2_5 0x43 +#define COLLIDER_f2_5 0x42 +#define COLLIDER_2_5 0x41 +#define COLLIDER_r2_4 0x40 +#define COLLIDER_f2_4 0x3F +#define COLLIDER_2_4 0x3E +#define COLLIDER_r2_3 0x3D +#define COLLIDER_f2_3 0x3C +#define COLLIDER_2_3 0x3B +#define COLLIDER_r2_2 0x3A +#define COLLIDER_f2_2 0x39 +#define COLLIDER_2_2 0x38 +#define COLLIDER_r2_1 0x37 +#define COLLIDER_f2_1 0x36 +#define COLLIDER_2_1 0x35 +#define COLLIDER_r1 0x34 +#define COLLIDER_f 0x33 +#define COLLIDER_fl 0x32 +#define COLLIDER_r1_3 0x31 +#define COLLIDER_f1_3 0x30 +#define COLLIDER_1_3 0x2F +#define COLLIDER_r1_2 0x2E +#define COLLIDER_f1_2 0x2D +#define COLLIDER_1_2 0x2C +#define COLLIDER_r1_1 0x2B +#define COLLIDER_f1_1 0x2A +#define COLLIDER_1_1 0x29 +#define COLLIDER_r1_0 0x28 +#define COLLIDER_1_0 0x27 +#define COLLIDER_4 0x26 +#define COLLIDER_o949 0x25 +#define COLLIDER_o923 0x24 +#define COLLIDER_o825 0x23 +#define COLLIDER_o400 0x22 +#define COLLIDER_o921 0x21 +#define COLLIDER_o993 0x20 +#define COLLIDER_o937 0x1F +#define COLLIDER_o896 0x1E +#define COLLIDER_o559 0x1D +#define COLLIDER_3 0x1C +#define COLLIDER_o950 0x1B +#define COLLIDER_o948 0x1A +#define COLLIDER_o913 0x19 +#define COLLIDER_o912 0x18 +#define COLLIDER_o911 0x17 +#define COLLIDER_o885 0x16 +#define COLLIDER_2 0x15 +#define COLLIDER_o918 0x14 +#define COLLIDER_o833 0x13 +#define COLLIDER_o141 0x12 +#define COLLIDER_o800 0x11 +#define COLLIDER_1 0x10 +#define COLLIDER_o891 0xF +#define COLLIDER_o951 0xE +#define COLLIDER_o514 0xD +#define COLLIDER_o515 0xC +#define COLLIDER_o466 0xB +#define COLLIDER_o538 0xA +#define COLLIDER_o331 0x9 +#define COLLIDER_bero 0x8 +#define COLLIDER_o961 0x7 +#define COLLIDER_o960 0x6 +#define COLLIDER_b_k2 0x5 +#define COLLIDER_b_k1 0x4 +#define COLLIDER_deilit2 0x3 +#define COLLIDER_deili2 0x2 +#define COLLIDER_deilit1 0x1 +#define COLLIDER_deili1 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g305 0x3 +#define ZONE_o936 0x2 +#define ZONE_o928 0x1 +#define ZONE_o929 0x0 + diff --git a/include/mapfs/omo_11_shape.h b/include/mapfs/omo_11_shape.h index ce5c4bab25..5815e9be04 100644 --- a/include/mapfs/omo_11_shape.h +++ b/include/mapfs/omo_11_shape.h @@ -1,107 +1,108 @@ -#define MODEL_Root 0x6A -#define MODEL_Default 0x69 -#define MODEL_o955 0x68 -#define MODEL_o954 0x67 -#define MODEL_g308 0x66 -#define MODEL_g309 0x65 -#define MODEL_o960 0x64 -#define MODEL_o951 0x63 -#define MODEL_o950 0x62 -#define MODEL_o945 0x61 -#define MODEL_g306 0x60 -#define MODEL_o939 0x5F -#define MODEL_o937 0x5E -#define MODEL_o936 0x5D -#define MODEL_r2 0x5C -#define MODEL_r2_5 0x5B -#define MODEL_f2_5 0x5A -#define MODEL_2_5 0x59 -#define MODEL_r2_4 0x58 -#define MODEL_f2_4 0x57 -#define MODEL_2_4 0x56 -#define MODEL_r2_3 0x55 -#define MODEL_f2_3 0x54 -#define MODEL_2_3 0x53 -#define MODEL_r2_2 0x52 -#define MODEL_f2_2 0x51 -#define MODEL_2_2 0x50 -#define MODEL_r2_1 0x4F -#define MODEL_f2_1 0x4E -#define MODEL_2_1 0x4D -#define MODEL_r1 0x4C -#define MODEL_f 0x4B -#define MODEL_fl 0x4A -#define MODEL_r1_3 0x49 -#define MODEL_f1_3 0x48 -#define MODEL_1_3 0x47 -#define MODEL_r1_2 0x46 -#define MODEL_f1_2 0x45 -#define MODEL_1_2 0x44 -#define MODEL_r1_1 0x43 -#define MODEL_f1_1 0x42 -#define MODEL_1_1 0x41 -#define MODEL_r1_0 0x40 -#define MODEL_1_0 0x3F -#define MODEL_hei 0x3E -#define MODEL_g281 0x3D -#define MODEL_o933 0x3C -#define MODEL_o932 0x3B -#define MODEL_o931 0x3A -#define MODEL_o896 0x39 -#define MODEL_o897 0x38 -#define MODEL_o886 0x37 -#define MODEL_o834 0x36 -#define MODEL_o894 0x35 -#define MODEL_o893 0x34 -#define MODEL_o892 0x33 -#define MODEL_o887 0x32 -#define MODEL_o888 0x31 -#define MODEL_o890 0x30 -#define MODEL_o889 0x2F -#define MODEL_o885 0x2E -#define MODEL_dai 0x2D -#define MODEL_yu_kabe 0x2C -#define MODEL_o331 0x2B -#define MODEL_o928 0x2A -#define MODEL_yuka 0x29 -#define MODEL_o326 0x28 -#define MODEL_in_2 0x27 -#define MODEL_o515 0x26 -#define MODEL_o514 0x25 -#define MODEL_in_1 0x24 -#define MODEL_o833 0x23 -#define MODEL_o825 0x22 -#define MODEL_o823 0x21 -#define MODEL_o822 0x20 -#define MODEL_o821 0x1F -#define MODEL_bero 0x1E -#define MODEL_o775 0x1D -#define MODEL_o776 0x1C -#define MODEL_kabe2 0x1B -#define MODEL_o923 0x1A -#define MODEL_o921 0x19 -#define MODEL_o572 0x18 -#define MODEL_o559 0x17 -#define MODEL_o915 0x16 -#define MODEL_o914 0x15 -#define MODEL_o913 0x14 -#define MODEL_o912 0x13 -#define MODEL_o911 0x12 -#define MODEL_o910 0x11 -#define MODEL_o909 0x10 -#define MODEL_o908 0xF -#define MODEL_o919 0xE -#define MODEL_o917 0xD -#define MODEL_o916 0xC -#define MODEL_kabe1 0xB -#define MODEL_o944 0xA -#define MODEL_o941 0x9 -#define MODEL_o538 0x8 -#define MODEL_o141 0x7 -#define MODEL_o800 0x6 -#define MODEL_kabe_u 0x5 -#define MODEL_o843 0x4 -#define MODEL_o841 0x3 -#define MODEL_o849 0x2 -#define MODEL_o853 0x1 -#define MODEL_o844 0x0 +#define MODEL_Root 0x6A +#define MODEL_Default 0x69 +#define MODEL_o955 0x68 +#define MODEL_o954 0x67 +#define MODEL_g308 0x66 +#define MODEL_g309 0x65 +#define MODEL_o960 0x64 +#define MODEL_o951 0x63 +#define MODEL_o950 0x62 +#define MODEL_o945 0x61 +#define MODEL_g306 0x60 +#define MODEL_o939 0x5F +#define MODEL_o937 0x5E +#define MODEL_o936 0x5D +#define MODEL_r2 0x5C +#define MODEL_r2_5 0x5B +#define MODEL_f2_5 0x5A +#define MODEL_2_5 0x59 +#define MODEL_r2_4 0x58 +#define MODEL_f2_4 0x57 +#define MODEL_2_4 0x56 +#define MODEL_r2_3 0x55 +#define MODEL_f2_3 0x54 +#define MODEL_2_3 0x53 +#define MODEL_r2_2 0x52 +#define MODEL_f2_2 0x51 +#define MODEL_2_2 0x50 +#define MODEL_r2_1 0x4F +#define MODEL_f2_1 0x4E +#define MODEL_2_1 0x4D +#define MODEL_r1 0x4C +#define MODEL_f 0x4B +#define MODEL_fl 0x4A +#define MODEL_r1_3 0x49 +#define MODEL_f1_3 0x48 +#define MODEL_1_3 0x47 +#define MODEL_r1_2 0x46 +#define MODEL_f1_2 0x45 +#define MODEL_1_2 0x44 +#define MODEL_r1_1 0x43 +#define MODEL_f1_1 0x42 +#define MODEL_1_1 0x41 +#define MODEL_r1_0 0x40 +#define MODEL_1_0 0x3F +#define MODEL_hei 0x3E +#define MODEL_g281 0x3D +#define MODEL_o933 0x3C +#define MODEL_o932 0x3B +#define MODEL_o931 0x3A +#define MODEL_o896 0x39 +#define MODEL_o897 0x38 +#define MODEL_o886 0x37 +#define MODEL_o834 0x36 +#define MODEL_o894 0x35 +#define MODEL_o893 0x34 +#define MODEL_o892 0x33 +#define MODEL_o887 0x32 +#define MODEL_o888 0x31 +#define MODEL_o890 0x30 +#define MODEL_o889 0x2F +#define MODEL_o885 0x2E +#define MODEL_dai 0x2D +#define MODEL_yu_kabe 0x2C +#define MODEL_o331 0x2B +#define MODEL_o928 0x2A +#define MODEL_yuka 0x29 +#define MODEL_o326 0x28 +#define MODEL_in_2 0x27 +#define MODEL_o515 0x26 +#define MODEL_o514 0x25 +#define MODEL_in_1 0x24 +#define MODEL_o833 0x23 +#define MODEL_o825 0x22 +#define MODEL_o823 0x21 +#define MODEL_o822 0x20 +#define MODEL_o821 0x1F +#define MODEL_bero 0x1E +#define MODEL_o775 0x1D +#define MODEL_o776 0x1C +#define MODEL_kabe2 0x1B +#define MODEL_o923 0x1A +#define MODEL_o921 0x19 +#define MODEL_o572 0x18 +#define MODEL_o559 0x17 +#define MODEL_o915 0x16 +#define MODEL_o914 0x15 +#define MODEL_o913 0x14 +#define MODEL_o912 0x13 +#define MODEL_o911 0x12 +#define MODEL_o910 0x11 +#define MODEL_o909 0x10 +#define MODEL_o908 0xF +#define MODEL_o919 0xE +#define MODEL_o917 0xD +#define MODEL_o916 0xC +#define MODEL_kabe1 0xB +#define MODEL_o944 0xA +#define MODEL_o941 0x9 +#define MODEL_o538 0x8 +#define MODEL_o141 0x7 +#define MODEL_o800 0x6 +#define MODEL_kabe_u 0x5 +#define MODEL_o843 0x4 +#define MODEL_o841 0x3 +#define MODEL_o849 0x2 +#define MODEL_o853 0x1 +#define MODEL_o844 0x0 + diff --git a/include/mapfs/omo_12_hit.h b/include/mapfs/omo_12_hit.h index e3adb6c8af..39eb3ca58d 100644 --- a/include/mapfs/omo_12_hit.h +++ b/include/mapfs/omo_12_hit.h @@ -1,20 +1,27 @@ -#define COLLIDER_Root 0x13 -#define COLLIDER_Default 0x12 -#define COLLIDER_o831 0x11 -#define COLLIDER_o830 0x10 -#define COLLIDER_omo 0xF -#define COLLIDER_o478 0xE -#define COLLIDER_o381 0xD -#define COLLIDER_o479 0xC -#define COLLIDER_g248 0xB -#define COLLIDER_o821 0xA -#define COLLIDER_deilit1 0x9 -#define COLLIDER_deili1 0x8 -#define COLLIDER_dai 0x7 -#define COLLIDER_o725 0x6 -#define COLLIDER_o814 0x5 -#define COLLIDER_o331 0x4 -#define COLLIDER_o330 0x3 -#define COLLIDER_o326 0x2 -#define COLLIDER_o819 0x1 -#define COLLIDER_o817 0x0 +#define COLLIDER_Root 0x13 +#define COLLIDER_Default 0x12 +#define COLLIDER_o831 0x11 +#define COLLIDER_o830 0x10 +#define COLLIDER_omo 0xF +#define COLLIDER_o478 0xE +#define COLLIDER_o381 0xD +#define COLLIDER_o479 0xC +#define COLLIDER_g248 0xB +#define COLLIDER_o821 0xA +#define COLLIDER_deilit1 0x9 +#define COLLIDER_deili1 0x8 +#define COLLIDER_dai 0x7 +#define COLLIDER_o725 0x6 +#define COLLIDER_o814 0x5 +#define COLLIDER_o331 0x4 +#define COLLIDER_o330 0x3 +#define COLLIDER_o326 0x2 +#define COLLIDER_o819 0x1 +#define COLLIDER_o817 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g259 0x3 +#define ZONE_o823 0x2 +#define ZONE_o822 0x1 +#define ZONE_o821 0x0 + diff --git a/include/mapfs/omo_12_shape.h b/include/mapfs/omo_12_shape.h index 49c27146af..d5d7f46f01 100644 --- a/include/mapfs/omo_12_shape.h +++ b/include/mapfs/omo_12_shape.h @@ -1,28 +1,29 @@ -#define MODEL_Root 0x1B -#define MODEL_omo 0x1A -#define MODEL_saikoro 0x19 -#define MODEL_o385 0x18 -#define MODEL_o382 0x17 -#define MODEL_o381 0x16 -#define MODEL_g152 0x15 -#define MODEL_o480 0x14 -#define MODEL_o479 0x13 -#define MODEL_dai 0x12 -#define MODEL_yu_kabe 0x11 -#define MODEL_o466 0x10 -#define MODEL_o725 0xF -#define MODEL_o331 0xE -#define MODEL_in_1 0xD -#define MODEL_o330 0xC -#define MODEL_o813 0xB -#define MODEL_kabe_u 0xA -#define MODEL_o821 0x9 -#define MODEL_o819 0x8 -#define MODEL_o326 0x7 -#define MODEL_bero 0x6 -#define MODEL_o778 0x5 -#define MODEL_rakugaki 0x4 -#define MODEL_o572 0x3 -#define MODEL_o570 0x2 -#define MODEL_o559 0x1 -#define MODEL_o820 0x0 +#define MODEL_Root 0x1B +#define MODEL_omo 0x1A +#define MODEL_saikoro 0x19 +#define MODEL_o385 0x18 +#define MODEL_o382 0x17 +#define MODEL_o381 0x16 +#define MODEL_g152 0x15 +#define MODEL_o480 0x14 +#define MODEL_o479 0x13 +#define MODEL_dai 0x12 +#define MODEL_yu_kabe 0x11 +#define MODEL_o466 0x10 +#define MODEL_o725 0xF +#define MODEL_o331 0xE +#define MODEL_in_1 0xD +#define MODEL_o330 0xC +#define MODEL_o813 0xB +#define MODEL_kabe_u 0xA +#define MODEL_o821 0x9 +#define MODEL_o819 0x8 +#define MODEL_o326 0x7 +#define MODEL_bero 0x6 +#define MODEL_o778 0x5 +#define MODEL_rakugaki 0x4 +#define MODEL_o572 0x3 +#define MODEL_o570 0x2 +#define MODEL_o559 0x1 +#define MODEL_o820 0x0 + diff --git a/include/mapfs/omo_13_hit.h b/include/mapfs/omo_13_hit.h index c43bf2c6cb..cd61f134cc 100644 --- a/include/mapfs/omo_13_hit.h +++ b/include/mapfs/omo_13_hit.h @@ -1,34 +1,47 @@ -#define COLLIDER_Root 0x21 -#define COLLIDER_hey 0x20 -#define COLLIDER_he 0x1F -#define COLLIDER_g262 0x1E -#define COLLIDER_o830 0x1D -#define COLLIDER_kabe_u 0x1C -#define COLLIDER_o852 0x1B -#define COLLIDER_o851 0x1A -#define COLLIDER_o403 0x19 -#define COLLIDER_omo 0x18 -#define COLLIDER_o816 0x17 -#define COLLIDER_o479 0x16 -#define COLLIDER_g155 0x15 -#define COLLIDER_o353 0x14 -#define COLLIDER_o352 0x13 -#define COLLIDER_o466 0x12 -#define COLLIDER_in_2 0x11 -#define COLLIDER_o850 0x10 -#define COLLIDER_o849 0xF -#define COLLIDER_o354 0xE -#define COLLIDER_o854 0xD -#define COLLIDER_o514 0xC -#define COLLIDER_o818 0xB -#define COLLIDER_o538 0xA -#define COLLIDER_o515 0x9 -#define COLLIDER_bero 0x8 -#define COLLIDER_o836 0x7 -#define COLLIDER_o835 0x6 -#define COLLIDER_o833 0x5 -#define COLLIDER_deilit2 0x4 -#define COLLIDER_deili2 0x3 -#define COLLIDER_o832 0x2 -#define COLLIDER_deilit1 0x1 -#define COLLIDER_deili1 0x0 +#define COLLIDER_Root 0x21 +#define COLLIDER_hey 0x20 +#define COLLIDER_he 0x1F +#define COLLIDER_g262 0x1E +#define COLLIDER_o830 0x1D +#define COLLIDER_kabe_u 0x1C +#define COLLIDER_o852 0x1B +#define COLLIDER_o851 0x1A +#define COLLIDER_o403 0x19 +#define COLLIDER_omo 0x18 +#define COLLIDER_o816 0x17 +#define COLLIDER_o479 0x16 +#define COLLIDER_g155 0x15 +#define COLLIDER_o353 0x14 +#define COLLIDER_o352 0x13 +#define COLLIDER_o466 0x12 +#define COLLIDER_in_2 0x11 +#define COLLIDER_o850 0x10 +#define COLLIDER_o849 0xF +#define COLLIDER_o354 0xE +#define COLLIDER_o854 0xD +#define COLLIDER_o514 0xC +#define COLLIDER_o818 0xB +#define COLLIDER_o538 0xA +#define COLLIDER_o515 0x9 +#define COLLIDER_bero 0x8 +#define COLLIDER_o836 0x7 +#define COLLIDER_o835 0x6 +#define COLLIDER_o833 0x5 +#define COLLIDER_deilit2 0x4 +#define COLLIDER_deili2 0x3 +#define COLLIDER_o832 0x2 +#define COLLIDER_deilit1 0x1 +#define COLLIDER_deili1 0x0 + +#define ZONE_Root 0xA +#define ZONE_g263 0x9 +#define ZONE_o836 0x8 +#define ZONE_o825 0x7 +#define ZONE_g262 0x6 +#define ZONE_o839 0x5 +#define ZONE_o830 0x4 +#define ZONE_o838 0x3 +#define ZONE_o823 0x2 +#define ZONE_o837 0x1 +#define ZONE_o824 0x0 + diff --git a/include/mapfs/omo_13_shape.h b/include/mapfs/omo_13_shape.h index 5ab0781c08..15d33d89f8 100644 --- a/include/mapfs/omo_13_shape.h +++ b/include/mapfs/omo_13_shape.h @@ -1,66 +1,67 @@ -#define MODEL_Root 0x41 -#define MODEL_mado 0x40 -#define MODEL_mado1_2 0x3F -#define MODEL_m1_2 0x3E -#define MODEL_mado1_1 0x3D -#define MODEL_m1_1 0x3C -#define MODEL_hana 0x3B -#define MODEL_hana_2 0x3A -#define MODEL_ha2 0x39 -#define MODEL_hana_1 0x38 -#define MODEL_ha1 0x37 -#define MODEL_tokei 0x36 -#define MODEL_tokei_1 0x35 -#define MODEL_maru_1 0x34 -#define MODEL_maru1 0x33 -#define MODEL_hari_1 0x32 -#define MODEL_hari1 0x31 -#define MODEL_m 0x30 -#define MODEL_o827 0x2F -#define MODEL_o826 0x2E -#define MODEL_o825 0x2D -#define MODEL_o824 0x2C -#define MODEL_o823 0x2B -#define MODEL_omo 0x2A -#define MODEL_saikoro 0x29 -#define MODEL_g264 0x28 -#define MODEL_o833 0x27 -#define MODEL_o832 0x26 -#define MODEL_o831 0x25 -#define MODEL_t 0x24 -#define MODEL_g152 0x23 -#define MODEL_o479 0x22 -#define MODEL_g125 0x21 -#define MODEL_o355 0x20 -#define MODEL_o354 0x1F -#define MODEL_o353 0x1E -#define MODEL_o352 0x1D -#define MODEL_g263 0x1C -#define MODEL_o829 0x1B -#define MODEL_dai 0x1A -#define MODEL_g279 0x19 -#define MODEL_o845 0x18 -#define MODEL_o844 0x17 -#define MODEL_yu_kabe 0x16 -#define MODEL_o466 0x15 -#define MODEL_o818 0x14 -#define MODEL_yuka 0x13 -#define MODEL_o326 0x12 -#define MODEL_in_2 0x11 -#define MODEL_o515 0x10 -#define MODEL_o514 0xF -#define MODEL_bero 0xE -#define MODEL_o847 0xD -#define MODEL_o776 0xC -#define MODEL_o775 0xB -#define MODEL_o778 0xA -#define MODEL_kabe_u 0x9 -#define MODEL_o572 0x8 -#define MODEL_o559 0x7 -#define MODEL_o725 0x6 -#define MODEL_o724 0x5 -#define MODEL_o335 0x4 -#define MODEL_o253 0x3 -#define MODEL_o220 0x2 -#define MODEL_o538 0x1 -#define MODEL_o337 0x0 +#define MODEL_Root 0x41 +#define MODEL_mado 0x40 +#define MODEL_mado1_2 0x3F +#define MODEL_m1_2 0x3E +#define MODEL_mado1_1 0x3D +#define MODEL_m1_1 0x3C +#define MODEL_hana 0x3B +#define MODEL_hana_2 0x3A +#define MODEL_ha2 0x39 +#define MODEL_hana_1 0x38 +#define MODEL_ha1 0x37 +#define MODEL_tokei 0x36 +#define MODEL_tokei_1 0x35 +#define MODEL_maru_1 0x34 +#define MODEL_maru1 0x33 +#define MODEL_hari_1 0x32 +#define MODEL_hari1 0x31 +#define MODEL_m 0x30 +#define MODEL_o827 0x2F +#define MODEL_o826 0x2E +#define MODEL_o825 0x2D +#define MODEL_o824 0x2C +#define MODEL_o823 0x2B +#define MODEL_omo 0x2A +#define MODEL_saikoro 0x29 +#define MODEL_g264 0x28 +#define MODEL_o833 0x27 +#define MODEL_o832 0x26 +#define MODEL_o831 0x25 +#define MODEL_t 0x24 +#define MODEL_g152 0x23 +#define MODEL_o479 0x22 +#define MODEL_g125 0x21 +#define MODEL_o355 0x20 +#define MODEL_o354 0x1F +#define MODEL_o353 0x1E +#define MODEL_o352 0x1D +#define MODEL_g263 0x1C +#define MODEL_o829 0x1B +#define MODEL_dai 0x1A +#define MODEL_g279 0x19 +#define MODEL_o845 0x18 +#define MODEL_o844 0x17 +#define MODEL_yu_kabe 0x16 +#define MODEL_o466 0x15 +#define MODEL_o818 0x14 +#define MODEL_yuka 0x13 +#define MODEL_o326 0x12 +#define MODEL_in_2 0x11 +#define MODEL_o515 0x10 +#define MODEL_o514 0xF +#define MODEL_bero 0xE +#define MODEL_o847 0xD +#define MODEL_o776 0xC +#define MODEL_o775 0xB +#define MODEL_o778 0xA +#define MODEL_kabe_u 0x9 +#define MODEL_o572 0x8 +#define MODEL_o559 0x7 +#define MODEL_o725 0x6 +#define MODEL_o724 0x5 +#define MODEL_o335 0x4 +#define MODEL_o253 0x3 +#define MODEL_o220 0x2 +#define MODEL_o538 0x1 +#define MODEL_o337 0x0 + diff --git a/include/mapfs/omo_14_hit.h b/include/mapfs/omo_14_hit.h index 17f022fc24..ea0bdae83b 100644 --- a/include/mapfs/omo_14_hit.h +++ b/include/mapfs/omo_14_hit.h @@ -1,30 +1,38 @@ -#define COLLIDER_Root 0x1D -#define COLLIDER_omo 0x1C -#define COLLIDER_o830 0x1B -#define COLLIDER_o353 0x1A -#define COLLIDER_o845 0x19 -#define COLLIDER_o479 0x18 -#define COLLIDER_o478 0x17 -#define COLLIDER_o475 0x16 -#define COLLIDER_g265 0x15 -#define COLLIDER_o843 0x14 -#define COLLIDER_o840 0x13 -#define COLLIDER_o844 0x12 -#define COLLIDER_kabe_u 0x11 -#define COLLIDER_o559 0x10 -#define COLLIDER_o829 0xF -#define COLLIDER_o819 0xE -#define COLLIDER_o330 0xD -#define COLLIDER_o827 0xC -#define COLLIDER_yuka 0xB -#define COLLIDER_o326 0xA -#define COLLIDER_o572 0x9 -#define COLLIDER_bero 0x8 -#define COLLIDER_o834 0x7 -#define COLLIDER_tt1 0x6 -#define COLLIDER_o582 0x5 -#define COLLIDER_deilit2 0x4 -#define COLLIDER_deili2 0x3 -#define COLLIDER_o813 0x2 -#define COLLIDER_deilit1 0x1 -#define COLLIDER_deili1 0x0 +#define COLLIDER_Root 0x1D +#define COLLIDER_omo 0x1C +#define COLLIDER_o830 0x1B +#define COLLIDER_o353 0x1A +#define COLLIDER_o845 0x19 +#define COLLIDER_o479 0x18 +#define COLLIDER_o478 0x17 +#define COLLIDER_o475 0x16 +#define COLLIDER_g265 0x15 +#define COLLIDER_o843 0x14 +#define COLLIDER_o840 0x13 +#define COLLIDER_o844 0x12 +#define COLLIDER_kabe_u 0x11 +#define COLLIDER_o559 0x10 +#define COLLIDER_o829 0xF +#define COLLIDER_o819 0xE +#define COLLIDER_o330 0xD +#define COLLIDER_o827 0xC +#define COLLIDER_yuka 0xB +#define COLLIDER_o326 0xA +#define COLLIDER_o572 0x9 +#define COLLIDER_bero 0x8 +#define COLLIDER_o834 0x7 +#define COLLIDER_tt1 0x6 +#define COLLIDER_o582 0x5 +#define COLLIDER_deilit2 0x4 +#define COLLIDER_deili2 0x3 +#define COLLIDER_o813 0x2 +#define COLLIDER_deilit1 0x1 +#define COLLIDER_deili1 0x0 + +#define ZONE_Root 0x5 +#define ZONE_g268 0x4 +#define ZONE_o837 0x3 +#define ZONE_o836 0x2 +#define ZONE_o835 0x1 +#define ZONE_o778 0x0 + diff --git a/include/mapfs/omo_14_shape.h b/include/mapfs/omo_14_shape.h index ee1bdb1266..9881c8bcc4 100644 --- a/include/mapfs/omo_14_shape.h +++ b/include/mapfs/omo_14_shape.h @@ -1,51 +1,52 @@ -#define MODEL_Root 0x32 -#define MODEL_g266 0x31 -#define MODEL_o838 0x30 -#define MODEL_o837 0x2F -#define MODEL_o835 0x2E -#define MODEL_o834 0x2D -#define MODEL_bom 0x2C -#define MODEL_bom_no 0x2B -#define MODEL_o827 0x2A -#define MODEL_bom_ato 0x29 -#define MODEL_o821 0x28 -#define MODEL_bom_mae 0x27 -#define MODEL_o828 0x26 -#define MODEL_o823 0x25 -#define MODEL_omo 0x24 -#define MODEL_g265 0x23 -#define MODEL_o832 0x22 -#define MODEL_o831 0x21 -#define MODEL_o830 0x20 -#define MODEL_o829 0x1F -#define MODEL_g125 0x1E -#define MODEL_o355 0x1D -#define MODEL_o354 0x1C -#define MODEL_o353 0x1B -#define MODEL_o352 0x1A -#define MODEL_g152 0x19 -#define MODEL_o480 0x18 -#define MODEL_o479 0x17 -#define MODEL_g151 0x16 -#define MODEL_o475 0x15 -#define MODEL_dai 0x14 -#define MODEL_yu_kabe 0x13 -#define MODEL_o840 0x12 -#define MODEL_o466 0x11 -#define MODEL_o725 0x10 -#define MODEL_o331 0xF -#define MODEL_in_1 0xE -#define MODEL_o330 0xD -#define MODEL_o813 0xC -#define MODEL_kabe_u 0xB -#define MODEL_o819 0xA -#define MODEL_yuka 0x9 -#define MODEL_o326 0x8 -#define MODEL_bero 0x7 -#define MODEL_o822 0x6 -#define MODEL_o778 0x5 -#define MODEL_rakugaki 0x4 -#define MODEL_o572 0x3 -#define MODEL_o570 0x2 -#define MODEL_o559 0x1 -#define MODEL_o833 0x0 +#define MODEL_Root 0x32 +#define MODEL_g266 0x31 +#define MODEL_o838 0x30 +#define MODEL_o837 0x2F +#define MODEL_o835 0x2E +#define MODEL_o834 0x2D +#define MODEL_bom 0x2C +#define MODEL_bom_no 0x2B +#define MODEL_o827 0x2A +#define MODEL_bom_ato 0x29 +#define MODEL_o821 0x28 +#define MODEL_bom_mae 0x27 +#define MODEL_o828 0x26 +#define MODEL_o823 0x25 +#define MODEL_omo 0x24 +#define MODEL_g265 0x23 +#define MODEL_o832 0x22 +#define MODEL_o831 0x21 +#define MODEL_o830 0x20 +#define MODEL_o829 0x1F +#define MODEL_g125 0x1E +#define MODEL_o355 0x1D +#define MODEL_o354 0x1C +#define MODEL_o353 0x1B +#define MODEL_o352 0x1A +#define MODEL_g152 0x19 +#define MODEL_o480 0x18 +#define MODEL_o479 0x17 +#define MODEL_g151 0x16 +#define MODEL_o475 0x15 +#define MODEL_dai 0x14 +#define MODEL_yu_kabe 0x13 +#define MODEL_o840 0x12 +#define MODEL_o466 0x11 +#define MODEL_o725 0x10 +#define MODEL_o331 0xF +#define MODEL_in_1 0xE +#define MODEL_o330 0xD +#define MODEL_o813 0xC +#define MODEL_kabe_u 0xB +#define MODEL_o819 0xA +#define MODEL_yuka 0x9 +#define MODEL_o326 0x8 +#define MODEL_bero 0x7 +#define MODEL_o822 0x6 +#define MODEL_o778 0x5 +#define MODEL_rakugaki 0x4 +#define MODEL_o572 0x3 +#define MODEL_o570 0x2 +#define MODEL_o559 0x1 +#define MODEL_o833 0x0 + diff --git a/include/mapfs/omo_15_hit.h b/include/mapfs/omo_15_hit.h index a07bce6e59..09f60c1bcf 100644 --- a/include/mapfs/omo_15_hit.h +++ b/include/mapfs/omo_15_hit.h @@ -1,43 +1,53 @@ -#define COLLIDER_Root 0x2A -#define COLLIDER_rou 0x29 -#define COLLIDER_o421 0x28 -#define COLLIDER_o382 0x27 -#define COLLIDER_o381 0x26 -#define COLLIDER_o415 0x25 -#define COLLIDER_9 0x24 -#define COLLIDER_o436 0x23 -#define COLLIDER_o303 0x22 -#define COLLIDER_8 0x21 -#define COLLIDER_o302 0x20 -#define COLLIDER_o294 0x1F -#define COLLIDER_o234 0x1E -#define COLLIDER_7 0x1D -#define COLLIDER_o293 0x1C -#define COLLIDER_o292 0x1B -#define COLLIDER_6 0x1A -#define COLLIDER_o373 0x19 -#define COLLIDER_o443 0x18 -#define COLLIDER_o335 0x17 -#define COLLIDER_o140 0x16 -#define COLLIDER_5 0x15 -#define COLLIDER_o43 0x14 -#define COLLIDER_o362 0x13 -#define COLLIDER_4 0x12 -#define COLLIDER_o355 0x11 -#define COLLIDER_o354 0x10 -#define COLLIDER_o437 0xF -#define COLLIDER_3 0xE -#define COLLIDER_o442 0xD -#define COLLIDER_o441 0xC -#define COLLIDER_o353 0xB -#define COLLIDER_o357 0xA -#define COLLIDER_o371 0x9 -#define COLLIDER_2 0x8 -#define COLLIDER_o347 0x7 -#define COLLIDER_o348 0x6 -#define COLLIDER_1 0x5 -#define COLLIDER_o434 0x4 -#define COLLIDER_bero 0x3 -#define COLLIDER_o439 0x2 -#define COLLIDER_deilit1 0x1 -#define COLLIDER_deili1 0x0 +#define COLLIDER_Root 0x2A +#define COLLIDER_rou 0x29 +#define COLLIDER_o421 0x28 +#define COLLIDER_o382 0x27 +#define COLLIDER_o381 0x26 +#define COLLIDER_o415 0x25 +#define COLLIDER_9 0x24 +#define COLLIDER_o436 0x23 +#define COLLIDER_o303 0x22 +#define COLLIDER_8 0x21 +#define COLLIDER_o302 0x20 +#define COLLIDER_o294 0x1F +#define COLLIDER_o234 0x1E +#define COLLIDER_7 0x1D +#define COLLIDER_o293 0x1C +#define COLLIDER_o292 0x1B +#define COLLIDER_6 0x1A +#define COLLIDER_o373 0x19 +#define COLLIDER_o443 0x18 +#define COLLIDER_o335 0x17 +#define COLLIDER_o140 0x16 +#define COLLIDER_5 0x15 +#define COLLIDER_o43 0x14 +#define COLLIDER_o362 0x13 +#define COLLIDER_4 0x12 +#define COLLIDER_o355 0x11 +#define COLLIDER_o354 0x10 +#define COLLIDER_o437 0xF +#define COLLIDER_3 0xE +#define COLLIDER_o442 0xD +#define COLLIDER_o441 0xC +#define COLLIDER_o353 0xB +#define COLLIDER_o357 0xA +#define COLLIDER_o371 0x9 +#define COLLIDER_2 0x8 +#define COLLIDER_o347 0x7 +#define COLLIDER_o348 0x6 +#define COLLIDER_1 0x5 +#define COLLIDER_o434 0x4 +#define COLLIDER_bero 0x3 +#define COLLIDER_o439 0x2 +#define COLLIDER_deilit1 0x1 +#define COLLIDER_deili1 0x0 + +#define ZONE_Root 0x7 +#define ZONE_kabe 0x6 +#define ZONE_o444 0x5 +#define ZONE_camera 0x4 +#define ZONE_o435 0x3 +#define ZONE_dai 0x2 +#define ZONE_o439 0x1 +#define ZONE_o43 0x0 + diff --git a/include/mapfs/omo_15_shape.h b/include/mapfs/omo_15_shape.h index 90662ecf95..7f3aad1903 100644 --- a/include/mapfs/omo_15_shape.h +++ b/include/mapfs/omo_15_shape.h @@ -1,52 +1,53 @@ -#define MODEL_Root 0x33 -#define MODEL_m 0x32 -#define MODEL_o448 0x31 -#define MODEL_o447 0x30 -#define MODEL_o446 0x2F -#define MODEL_o444 0x2E -#define MODEL_o443 0x2D -#define MODEL_g144 0x2C -#define MODEL_o433 0x2B -#define MODEL_o432 0x2A -#define MODEL_o457 0x29 -#define MODEL_rou 0x28 -#define MODEL_g134 0x27 -#define MODEL_o415 0x26 -#define MODEL_g132 0x25 -#define MODEL_o421 0x24 -#define MODEL_o382 0x23 -#define MODEL_o381 0x22 -#define MODEL_g143 0x21 -#define MODEL_o420 0x20 -#define MODEL_o416 0x1F -#define MODEL_o383 0x1E -#define MODEL_omo 0x1D -#define MODEL_g129 0x1C -#define MODEL_o376 0x1B -#define MODEL_o375 0x1A -#define MODEL_o374 0x19 -#define MODEL_o373 0x18 -#define MODEL_g128 0x17 -#define MODEL_o372 0x16 -#define MODEL_o371 0x15 -#define MODEL_o370 0x14 -#define MODEL_g71 0x13 -#define MODEL_o236 0x12 -#define MODEL_o235 0x11 -#define MODEL_o234 0x10 -#define MODEL_kabe 0xF -#define MODEL_o460 0xE -#define MODEL_o458 0xD -#define MODEL_o362 0xC -#define MODEL_o354 0xB -#define MODEL_o353 0xA -#define MODEL_o357 0x9 -#define MODEL_o347 0x8 -#define MODEL_o348 0x7 -#define MODEL_o355 0x6 -#define MODEL_o335 0x5 -#define MODEL_dai 0x4 -#define MODEL_o140 0x3 -#define MODEL_o43 0x2 -#define MODEL_o434 0x1 -#define MODEL_o435 0x0 +#define MODEL_Root 0x33 +#define MODEL_m 0x32 +#define MODEL_o448 0x31 +#define MODEL_o447 0x30 +#define MODEL_o446 0x2F +#define MODEL_o444 0x2E +#define MODEL_o443 0x2D +#define MODEL_g144 0x2C +#define MODEL_o433 0x2B +#define MODEL_o432 0x2A +#define MODEL_o457 0x29 +#define MODEL_rou 0x28 +#define MODEL_g134 0x27 +#define MODEL_o415 0x26 +#define MODEL_g132 0x25 +#define MODEL_o421 0x24 +#define MODEL_o382 0x23 +#define MODEL_o381 0x22 +#define MODEL_g143 0x21 +#define MODEL_o420 0x20 +#define MODEL_o416 0x1F +#define MODEL_o383 0x1E +#define MODEL_omo 0x1D +#define MODEL_g129 0x1C +#define MODEL_o376 0x1B +#define MODEL_o375 0x1A +#define MODEL_o374 0x19 +#define MODEL_o373 0x18 +#define MODEL_g128 0x17 +#define MODEL_o372 0x16 +#define MODEL_o371 0x15 +#define MODEL_o370 0x14 +#define MODEL_g71 0x13 +#define MODEL_o236 0x12 +#define MODEL_o235 0x11 +#define MODEL_o234 0x10 +#define MODEL_kabe 0xF +#define MODEL_o460 0xE +#define MODEL_o458 0xD +#define MODEL_o362 0xC +#define MODEL_o354 0xB +#define MODEL_o353 0xA +#define MODEL_o357 0x9 +#define MODEL_o347 0x8 +#define MODEL_o348 0x7 +#define MODEL_o355 0x6 +#define MODEL_o335 0x5 +#define MODEL_dai 0x4 +#define MODEL_o140 0x3 +#define MODEL_o43 0x2 +#define MODEL_o434 0x1 +#define MODEL_o435 0x0 + diff --git a/include/mapfs/omo_16_hit.h b/include/mapfs/omo_16_hit.h index 9cf11b0a8e..b062b40214 100644 --- a/include/mapfs/omo_16_hit.h +++ b/include/mapfs/omo_16_hit.h @@ -1,24 +1,31 @@ -#define COLLIDER_Root 0x17 -#define COLLIDER_a5 0x16 -#define COLLIDER_o797 0x15 -#define COLLIDER_o796 0x14 -#define COLLIDER_5 0x13 -#define COLLIDER_a4 0x12 -#define COLLIDER_o795 0x11 -#define COLLIDER_o794 0x10 -#define COLLIDER_4 0xF -#define COLLIDER_a3 0xE -#define COLLIDER_o793 0xD -#define COLLIDER_o792 0xC -#define COLLIDER_3 0xB -#define COLLIDER_a2 0xA -#define COLLIDER_2 0x9 -#define COLLIDER_o807 0x8 -#define COLLIDER_o806 0x7 -#define COLLIDER_bero 0x6 -#define COLLIDER_o811 0x5 -#define COLLIDER_o809 0x4 -#define COLLIDER_deilit2 0x3 -#define COLLIDER_deili2 0x2 -#define COLLIDER_deilit1 0x1 -#define COLLIDER_deili1 0x0 +#define COLLIDER_Root 0x17 +#define COLLIDER_a5 0x16 +#define COLLIDER_o797 0x15 +#define COLLIDER_o796 0x14 +#define COLLIDER_5 0x13 +#define COLLIDER_a4 0x12 +#define COLLIDER_o795 0x11 +#define COLLIDER_o794 0x10 +#define COLLIDER_4 0xF +#define COLLIDER_a3 0xE +#define COLLIDER_o793 0xD +#define COLLIDER_o792 0xC +#define COLLIDER_3 0xB +#define COLLIDER_a2 0xA +#define COLLIDER_2 0x9 +#define COLLIDER_o807 0x8 +#define COLLIDER_o806 0x7 +#define COLLIDER_bero 0x6 +#define COLLIDER_o811 0x5 +#define COLLIDER_o809 0x4 +#define COLLIDER_deilit2 0x3 +#define COLLIDER_deili2 0x2 +#define COLLIDER_deilit1 0x1 +#define COLLIDER_deili1 0x0 + +#define ZONE_Root 0x4 +#define ZONE_bero 0x3 +#define ZONE_o778 0x2 +#define ZONE_stage 0x1 +#define ZONE_o611 0x0 + diff --git a/include/mapfs/omo_16_shape.h b/include/mapfs/omo_16_shape.h index aa875c699e..dd51819d5d 100644 --- a/include/mapfs/omo_16_shape.h +++ b/include/mapfs/omo_16_shape.h @@ -1,121 +1,122 @@ -#define MODEL_Root 0x78 -#define MODEL_g274 0x77 -#define MODEL_g244 0x76 -#define MODEL_o682 0x75 -#define MODEL_o681 0x74 -#define MODEL_g240 0x73 -#define MODEL_o672 0x72 -#define MODEL_o671 0x71 -#define MODEL_g236 0x70 -#define MODEL_o662 0x6F -#define MODEL_o661 0x6E -#define MODEL_g231 0x6D -#define MODEL_o652 0x6C -#define MODEL_o651 0x6B -#define MODEL_popo 0x6A -#define MODEL_p6 0x69 -#define MODEL_o11 0x68 -#define MODEL_p5 0x67 -#define MODEL_o10 0x66 -#define MODEL_p4 0x65 -#define MODEL_o9 0x64 -#define MODEL_p3 0x63 -#define MODEL_o8 0x62 -#define MODEL_o7 0x61 -#define MODEL_p2 0x60 -#define MODEL_o6 0x5F -#define MODEL_o5 0x5E -#define MODEL_p1 0x5D -#define MODEL_o4 0x5C -#define MODEL_o3 0x5B -#define MODEL_o2 0x5A -#define MODEL_o1 0x59 -#define MODEL_bero 0x58 -#define MODEL_o780 0x57 -#define MODEL_o779 0x56 -#define MODEL_o778 0x55 -#define MODEL_o777 0x54 -#define MODEL_g142 0x53 -#define MODEL_g316 0x52 -#define MODEL_o927 0x51 -#define MODEL_o926 0x50 -#define MODEL_o925 0x4F -#define MODEL_g317 0x4E -#define MODEL_o408 0x4D -#define MODEL_o409 0x4C -#define MODEL_o407 0x4B -#define MODEL_g283 0x4A -#define MODEL_g286 0x49 -#define MODEL_o871 0x48 -#define MODEL_o866 0x47 -#define MODEL_o868 0x46 -#define MODEL_o814 0x45 -#define MODEL_o819 0x44 -#define MODEL_o817 0x43 -#define MODEL_g285 0x42 -#define MODEL_o877 0x41 -#define MODEL_o872 0x40 -#define MODEL_o874 0x3F -#define MODEL_o808 0x3E -#define MODEL_o807 0x3D -#define MODEL_o805 0x3C -#define MODEL_g303 0x3B -#define MODEL_o883 0x3A -#define MODEL_o884 0x39 -#define MODEL_o880 0x38 -#define MODEL_o796 0x37 -#define MODEL_o795 0x36 -#define MODEL_o793 0x35 -#define MODEL_stage 0x34 -#define MODEL_o611 0x33 -#define MODEL_o304 0x32 -#define MODEL_o203 0x31 -#define MODEL_s1 0x30 -#define MODEL_o680 0x2F -#define MODEL_o678 0x2E -#define MODEL_o670 0x2D -#define MODEL_o668 0x2C -#define MODEL_o660 0x2B -#define MODEL_o658 0x2A -#define MODEL_o650 0x29 -#define MODEL_o648 0x28 -#define MODEL_o924 0x27 -#define MODEL_o922 0x26 -#define MODEL_o914 0x25 -#define MODEL_o912 0x24 -#define MODEL_o910 0x23 -#define MODEL_o906 0x22 -#define MODEL_o908 0x21 -#define MODEL_o904 0x20 -#define MODEL_o902 0x1F -#define MODEL_o900 0x1E -#define MODEL_o896 0x1D -#define MODEL_o898 0x1C -#define MODEL_o894 0x1B -#define MODEL_o892 0x1A -#define MODEL_o750 0x19 -#define MODEL_o749 0x18 -#define MODEL_o755 0x17 -#define MODEL_o748 0x16 -#define MODEL_o747 0x15 -#define MODEL_o751 0x14 -#define MODEL_o713 0x13 -#define MODEL_o715 0x12 -#define MODEL_o711 0x11 -#define MODEL_o712 0x10 -#define MODEL_o710 0xF -#define MODEL_o706 0xE -#define MODEL_o714 0xD -#define MODEL_o702 0xC -#define MODEL_o701 0xB -#define MODEL_o700 0xA -#define MODEL_o698 0x9 -#define MODEL_o696 0x8 -#define MODEL_o694 0x7 -#define MODEL_o697 0x6 -#define MODEL_o738 0x5 -#define MODEL_o740 0x4 -#define MODEL_o742 0x3 -#define MODEL_o739 0x2 -#define MODEL_o737 0x1 -#define MODEL_o741 0x0 +#define MODEL_Root 0x78 +#define MODEL_g274 0x77 +#define MODEL_g244 0x76 +#define MODEL_o682 0x75 +#define MODEL_o681 0x74 +#define MODEL_g240 0x73 +#define MODEL_o672 0x72 +#define MODEL_o671 0x71 +#define MODEL_g236 0x70 +#define MODEL_o662 0x6F +#define MODEL_o661 0x6E +#define MODEL_g231 0x6D +#define MODEL_o652 0x6C +#define MODEL_o651 0x6B +#define MODEL_popo 0x6A +#define MODEL_p6 0x69 +#define MODEL_o11 0x68 +#define MODEL_p5 0x67 +#define MODEL_o10 0x66 +#define MODEL_p4 0x65 +#define MODEL_o9 0x64 +#define MODEL_p3 0x63 +#define MODEL_o8 0x62 +#define MODEL_o7 0x61 +#define MODEL_p2 0x60 +#define MODEL_o6 0x5F +#define MODEL_o5 0x5E +#define MODEL_p1 0x5D +#define MODEL_o4 0x5C +#define MODEL_o3 0x5B +#define MODEL_o2 0x5A +#define MODEL_o1 0x59 +#define MODEL_bero 0x58 +#define MODEL_o780 0x57 +#define MODEL_o779 0x56 +#define MODEL_o778 0x55 +#define MODEL_o777 0x54 +#define MODEL_g142 0x53 +#define MODEL_g316 0x52 +#define MODEL_o927 0x51 +#define MODEL_o926 0x50 +#define MODEL_o925 0x4F +#define MODEL_g317 0x4E +#define MODEL_o408 0x4D +#define MODEL_o409 0x4C +#define MODEL_o407 0x4B +#define MODEL_g283 0x4A +#define MODEL_g286 0x49 +#define MODEL_o871 0x48 +#define MODEL_o866 0x47 +#define MODEL_o868 0x46 +#define MODEL_o814 0x45 +#define MODEL_o819 0x44 +#define MODEL_o817 0x43 +#define MODEL_g285 0x42 +#define MODEL_o877 0x41 +#define MODEL_o872 0x40 +#define MODEL_o874 0x3F +#define MODEL_o808 0x3E +#define MODEL_o807 0x3D +#define MODEL_o805 0x3C +#define MODEL_g303 0x3B +#define MODEL_o883 0x3A +#define MODEL_o884 0x39 +#define MODEL_o880 0x38 +#define MODEL_o796 0x37 +#define MODEL_o795 0x36 +#define MODEL_o793 0x35 +#define MODEL_stage 0x34 +#define MODEL_o611 0x33 +#define MODEL_o304 0x32 +#define MODEL_o203 0x31 +#define MODEL_s1 0x30 +#define MODEL_o680 0x2F +#define MODEL_o678 0x2E +#define MODEL_o670 0x2D +#define MODEL_o668 0x2C +#define MODEL_o660 0x2B +#define MODEL_o658 0x2A +#define MODEL_o650 0x29 +#define MODEL_o648 0x28 +#define MODEL_o924 0x27 +#define MODEL_o922 0x26 +#define MODEL_o914 0x25 +#define MODEL_o912 0x24 +#define MODEL_o910 0x23 +#define MODEL_o906 0x22 +#define MODEL_o908 0x21 +#define MODEL_o904 0x20 +#define MODEL_o902 0x1F +#define MODEL_o900 0x1E +#define MODEL_o896 0x1D +#define MODEL_o898 0x1C +#define MODEL_o894 0x1B +#define MODEL_o892 0x1A +#define MODEL_o750 0x19 +#define MODEL_o749 0x18 +#define MODEL_o755 0x17 +#define MODEL_o748 0x16 +#define MODEL_o747 0x15 +#define MODEL_o751 0x14 +#define MODEL_o713 0x13 +#define MODEL_o715 0x12 +#define MODEL_o711 0x11 +#define MODEL_o712 0x10 +#define MODEL_o710 0xF +#define MODEL_o706 0xE +#define MODEL_o714 0xD +#define MODEL_o702 0xC +#define MODEL_o701 0xB +#define MODEL_o700 0xA +#define MODEL_o698 0x9 +#define MODEL_o696 0x8 +#define MODEL_o694 0x7 +#define MODEL_o697 0x6 +#define MODEL_o738 0x5 +#define MODEL_o740 0x4 +#define MODEL_o742 0x3 +#define MODEL_o739 0x2 +#define MODEL_o737 0x1 +#define MODEL_o741 0x0 + diff --git a/include/mapfs/omo_17_hit.h b/include/mapfs/omo_17_hit.h index a7f5e1a1d8..755313b1c0 100644 --- a/include/mapfs/omo_17_hit.h +++ b/include/mapfs/omo_17_hit.h @@ -1,56 +1,63 @@ -#define COLLIDER_Root 0x37 -#define COLLIDER_popo 0x36 -#define COLLIDER_pp1 0x35 -#define COLLIDER_p1 0x34 -#define COLLIDER_6 0x33 -#define COLLIDER_o357 0x32 -#define COLLIDER_o333 0x31 -#define COLLIDER_o410 0x30 -#define COLLIDER_5 0x2F -#define COLLIDER_o370 0x2E -#define COLLIDER_o408 0x2D -#define COLLIDER_o404 0x2C -#define COLLIDER_o418 0x2B -#define COLLIDER_o397 0x2A -#define COLLIDER_4 0x29 -#define COLLIDER_o317 0x28 -#define COLLIDER_o229 0x27 -#define COLLIDER_o409 0x26 -#define COLLIDER_3 0x25 -#define COLLIDER_o382 0x24 -#define COLLIDER_o339 0x23 -#define COLLIDER_o384 0x22 -#define COLLIDER_2 0x21 -#define COLLIDER_o368 0x20 -#define COLLIDER_o364 0x1F -#define COLLIDER_o337 0x1E -#define COLLIDER_o363 0x1D -#define COLLIDER_1 0x1C -#define COLLIDER_o393 0x1B -#define COLLIDER_o371 0x1A -#define COLLIDER_o387 0x19 -#define COLLIDER_o219 0x18 -#define COLLIDER_o394 0x17 -#define COLLIDER_bero 0x16 -#define COLLIDER_o417 0x15 -#define COLLIDER_o416 0x14 -#define COLLIDER_o415 0x13 -#define COLLIDER_o414 0x12 -#define COLLIDER_o411 0x11 -#define COLLIDER_o406 0x10 -#define COLLIDER_o338 0xF -#define COLLIDER_o405 0xE -#define COLLIDER_o401 0xD -#define COLLIDER_o400 0xC -#define COLLIDER_deilit6 0xB -#define COLLIDER_deili6 0xA -#define COLLIDER_deilit5 0x9 -#define COLLIDER_deili5 0x8 -#define COLLIDER_deilit4 0x7 -#define COLLIDER_deili4 0x6 -#define COLLIDER_deilit3 0x5 -#define COLLIDER_deili3 0x4 -#define COLLIDER_deilit2 0x3 -#define COLLIDER_deili2 0x2 -#define COLLIDER_deilit1 0x1 -#define COLLIDER_deili1 0x0 +#define COLLIDER_Root 0x37 +#define COLLIDER_popo 0x36 +#define COLLIDER_pp1 0x35 +#define COLLIDER_p1 0x34 +#define COLLIDER_6 0x33 +#define COLLIDER_o357 0x32 +#define COLLIDER_o333 0x31 +#define COLLIDER_o410 0x30 +#define COLLIDER_5 0x2F +#define COLLIDER_o370 0x2E +#define COLLIDER_o408 0x2D +#define COLLIDER_o404 0x2C +#define COLLIDER_o418 0x2B +#define COLLIDER_o397 0x2A +#define COLLIDER_4 0x29 +#define COLLIDER_o317 0x28 +#define COLLIDER_o229 0x27 +#define COLLIDER_o409 0x26 +#define COLLIDER_3 0x25 +#define COLLIDER_o382 0x24 +#define COLLIDER_o339 0x23 +#define COLLIDER_o384 0x22 +#define COLLIDER_2 0x21 +#define COLLIDER_o368 0x20 +#define COLLIDER_o364 0x1F +#define COLLIDER_o337 0x1E +#define COLLIDER_o363 0x1D +#define COLLIDER_1 0x1C +#define COLLIDER_o393 0x1B +#define COLLIDER_o371 0x1A +#define COLLIDER_o387 0x19 +#define COLLIDER_o219 0x18 +#define COLLIDER_o394 0x17 +#define COLLIDER_bero 0x16 +#define COLLIDER_o417 0x15 +#define COLLIDER_o416 0x14 +#define COLLIDER_o415 0x13 +#define COLLIDER_o414 0x12 +#define COLLIDER_o411 0x11 +#define COLLIDER_o406 0x10 +#define COLLIDER_o338 0xF +#define COLLIDER_o405 0xE +#define COLLIDER_o401 0xD +#define COLLIDER_o400 0xC +#define COLLIDER_deilit6 0xB +#define COLLIDER_deili6 0xA +#define COLLIDER_deilit5 0x9 +#define COLLIDER_deili5 0x8 +#define COLLIDER_deilit4 0x7 +#define COLLIDER_deili4 0x6 +#define COLLIDER_deilit3 0x5 +#define COLLIDER_deili3 0x4 +#define COLLIDER_deilit2 0x3 +#define COLLIDER_deili2 0x2 +#define COLLIDER_deilit1 0x1 +#define COLLIDER_deili1 0x0 + +#define ZONE_Root 0x4 +#define ZONE_z 0x3 +#define ZONE_on1 0x2 +#define ZONE_off1 0x1 +#define ZONE_off2 0x0 + diff --git a/include/mapfs/omo_17_shape.h b/include/mapfs/omo_17_shape.h index 641de0ed4c..a91e49f370 100644 --- a/include/mapfs/omo_17_shape.h +++ b/include/mapfs/omo_17_shape.h @@ -1,106 +1,107 @@ -#define MODEL_Root 0x69 -#define MODEL_g172 0x68 -#define MODEL_o493 0x67 -#define MODEL_o492 0x66 -#define MODEL_o491 0x65 -#define MODEL_o490 0x64 -#define MODEL_g144 0x63 -#define MODEL_o499 0x62 -#define MODEL_o443 0x61 -#define MODEL_o442 0x60 -#define MODEL_o434 0x5F -#define MODEL_o444 0x5E -#define MODEL_o436 0x5D -#define MODEL_o495 0x5C -#define MODEL_z 0x5B -#define MODEL_o505 0x5A -#define MODEL_o502 0x59 -#define MODEL_o500 0x58 -#define MODEL_on1 0x57 -#define MODEL_off1 0x56 -#define MODEL_g127 0x55 -#define MODEL_o406 0x54 -#define MODEL_o405 0x53 -#define MODEL_o404 0x52 -#define MODEL_o403 0x51 -#define MODEL_g122 0x50 -#define MODEL_o496 0x4F -#define MODEL_o408 0x4E -#define MODEL_hana 0x4D -#define MODEL_hana_18 0x4C -#define MODEL_ha18 0x4B -#define MODEL_hana_17 0x4A -#define MODEL_ha17 0x49 -#define MODEL_hana_16 0x48 -#define MODEL_ha16 0x47 -#define MODEL_hana_15 0x46 -#define MODEL_ha15 0x45 -#define MODEL_hana_14 0x44 -#define MODEL_ha14 0x43 -#define MODEL_hana_13 0x42 -#define MODEL_ha13 0x41 -#define MODEL_hana_12 0x40 -#define MODEL_ha12 0x3F -#define MODEL_hana_11 0x3E -#define MODEL_ha11 0x3D -#define MODEL_hana_10 0x3C -#define MODEL_ha10 0x3B -#define MODEL_hana_9 0x3A -#define MODEL_ha9 0x39 -#define MODEL_hana_8 0x38 -#define MODEL_ha8 0x37 -#define MODEL_hana_7 0x36 -#define MODEL_ha7 0x35 -#define MODEL_hana_6 0x34 -#define MODEL_ha6 0x33 -#define MODEL_hana_5 0x32 -#define MODEL_ha5 0x31 -#define MODEL_hana_4 0x30 -#define MODEL_ha4 0x2F -#define MODEL_hana_3 0x2E -#define MODEL_ha3 0x2D -#define MODEL_hana_2 0x2C -#define MODEL_ha2 0x2B -#define MODEL_hana_1 0x2A -#define MODEL_ha1 0x29 -#define MODEL_k_m 0x28 -#define MODEL_o370 0x27 -#define MODEL_o368 0x26 -#define MODEL_g108 0x25 -#define MODEL_o364 0x24 -#define MODEL_o363 0x23 -#define MODEL_popo 0x22 -#define MODEL_p6 0x21 -#define MODEL_o11 0x20 -#define MODEL_p5 0x1F -#define MODEL_o10 0x1E -#define MODEL_p4 0x1D -#define MODEL_o9 0x1C -#define MODEL_p3 0x1B -#define MODEL_o8 0x1A -#define MODEL_o7 0x19 -#define MODEL_p2 0x18 -#define MODEL_o6 0x17 -#define MODEL_o5 0x16 -#define MODEL_p1 0x15 -#define MODEL_o4 0x14 -#define MODEL_o3 0x13 -#define MODEL_o2 0x12 -#define MODEL_o1 0x11 -#define MODEL_bero 0x10 -#define MODEL_o508 0xF -#define MODEL_o507 0xE -#define MODEL_o339 0xD -#define MODEL_o338 0xC -#define MODEL_stage 0xB -#define MODEL_o337 0xA -#define MODEL_o219 0x9 -#define MODEL_k_b 0x8 -#define MODEL_o387 0x7 -#define MODEL_o383 0x6 -#define MODEL_o384 0x5 -#define MODEL_o362 0x4 -#define MODEL_o361 0x3 -#define MODEL_o357 0x2 -#define MODEL_o360 0x1 -#define MODEL_o359 0x0 +#define MODEL_Root 0x69 +#define MODEL_g172 0x68 +#define MODEL_o493 0x67 +#define MODEL_o492 0x66 +#define MODEL_o491 0x65 +#define MODEL_o490 0x64 +#define MODEL_g144 0x63 +#define MODEL_o499 0x62 +#define MODEL_o443 0x61 +#define MODEL_o442 0x60 +#define MODEL_o434 0x5F +#define MODEL_o444 0x5E +#define MODEL_o436 0x5D +#define MODEL_o495 0x5C +#define MODEL_z 0x5B +#define MODEL_o505 0x5A +#define MODEL_o502 0x59 +#define MODEL_o500 0x58 +#define MODEL_on1 0x57 +#define MODEL_off1 0x56 +#define MODEL_g127 0x55 +#define MODEL_o406 0x54 +#define MODEL_o405 0x53 +#define MODEL_o404 0x52 +#define MODEL_o403 0x51 +#define MODEL_g122 0x50 +#define MODEL_o496 0x4F +#define MODEL_o408 0x4E +#define MODEL_hana 0x4D +#define MODEL_hana_18 0x4C +#define MODEL_ha18 0x4B +#define MODEL_hana_17 0x4A +#define MODEL_ha17 0x49 +#define MODEL_hana_16 0x48 +#define MODEL_ha16 0x47 +#define MODEL_hana_15 0x46 +#define MODEL_ha15 0x45 +#define MODEL_hana_14 0x44 +#define MODEL_ha14 0x43 +#define MODEL_hana_13 0x42 +#define MODEL_ha13 0x41 +#define MODEL_hana_12 0x40 +#define MODEL_ha12 0x3F +#define MODEL_hana_11 0x3E +#define MODEL_ha11 0x3D +#define MODEL_hana_10 0x3C +#define MODEL_ha10 0x3B +#define MODEL_hana_9 0x3A +#define MODEL_ha9 0x39 +#define MODEL_hana_8 0x38 +#define MODEL_ha8 0x37 +#define MODEL_hana_7 0x36 +#define MODEL_ha7 0x35 +#define MODEL_hana_6 0x34 +#define MODEL_ha6 0x33 +#define MODEL_hana_5 0x32 +#define MODEL_ha5 0x31 +#define MODEL_hana_4 0x30 +#define MODEL_ha4 0x2F +#define MODEL_hana_3 0x2E +#define MODEL_ha3 0x2D +#define MODEL_hana_2 0x2C +#define MODEL_ha2 0x2B +#define MODEL_hana_1 0x2A +#define MODEL_ha1 0x29 +#define MODEL_k_m 0x28 +#define MODEL_o370 0x27 +#define MODEL_o368 0x26 +#define MODEL_g108 0x25 +#define MODEL_o364 0x24 +#define MODEL_o363 0x23 +#define MODEL_popo 0x22 +#define MODEL_p6 0x21 +#define MODEL_o11 0x20 +#define MODEL_p5 0x1F +#define MODEL_o10 0x1E +#define MODEL_p4 0x1D +#define MODEL_o9 0x1C +#define MODEL_p3 0x1B +#define MODEL_o8 0x1A +#define MODEL_o7 0x19 +#define MODEL_p2 0x18 +#define MODEL_o6 0x17 +#define MODEL_o5 0x16 +#define MODEL_p1 0x15 +#define MODEL_o4 0x14 +#define MODEL_o3 0x13 +#define MODEL_o2 0x12 +#define MODEL_o1 0x11 +#define MODEL_bero 0x10 +#define MODEL_o508 0xF +#define MODEL_o507 0xE +#define MODEL_o339 0xD +#define MODEL_o338 0xC +#define MODEL_stage 0xB +#define MODEL_o337 0xA +#define MODEL_o219 0x9 +#define MODEL_k_b 0x8 +#define MODEL_o387 0x7 +#define MODEL_o383 0x6 +#define MODEL_o384 0x5 +#define MODEL_o362 0x4 +#define MODEL_o361 0x3 +#define MODEL_o357 0x2 +#define MODEL_o360 0x1 +#define MODEL_o359 0x0 + diff --git a/include/mapfs/omo_bt01_hit.h b/include/mapfs/omo_bt01_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/omo_bt01_hit.h +++ b/include/mapfs/omo_bt01_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/omo_bt01_shape.h b/include/mapfs/omo_bt01_shape.h index 774a07c52d..2ce725ae1d 100644 --- a/include/mapfs/omo_bt01_shape.h +++ b/include/mapfs/omo_bt01_shape.h @@ -1,36 +1,37 @@ -#define MODEL_Root 0x23 -#define MODEL_dai 0x22 -#define MODEL_waku1 0x21 -#define MODEL_kuruma 0x20 -#define MODEL_hosi 0x1F -#define MODEL_futi1 0x1E -#define MODEL_kazari2 0x1D -#define MODEL_yuka 0x1C -#define MODEL_g76 0x1B -#define MODEL_mokuba 0x1A -#define MODEL_uma 0x19 -#define MODEL_hari2 0x18 -#define MODEL_o367 0x17 -#define MODEL_hari1 0x16 -#define MODEL_hari 0x15 -#define MODEL_hako 0x14 -#define MODEL_g49 0x13 -#define MODEL_waku2 0x12 -#define MODEL_sai3 0x11 -#define MODEL_sai2 0x10 -#define MODEL_sai1 0xF -#define MODEL_tu4 0xE -#define MODEL_tu3 0xD -#define MODEL_tu2 0xC -#define MODEL_tu1 0xB -#define MODEL_raku3 0xA -#define MODEL_raku1 0x9 -#define MODEL_kabe6 0x8 -#define MODEL_kabe5 0x7 -#define MODEL_kabe4 0x6 -#define MODEL_tokeiban 0x5 -#define MODEL_kabe3 0x4 -#define MODEL_kabe2 0x3 -#define MODEL_kabe1 0x2 -#define MODEL_yuka2 0x1 -#define MODEL_waku 0x0 +#define MODEL_Root 0x23 +#define MODEL_dai 0x22 +#define MODEL_waku1 0x21 +#define MODEL_kuruma 0x20 +#define MODEL_hosi 0x1F +#define MODEL_futi1 0x1E +#define MODEL_kazari2 0x1D +#define MODEL_yuka 0x1C +#define MODEL_g76 0x1B +#define MODEL_mokuba 0x1A +#define MODEL_uma 0x19 +#define MODEL_hari2 0x18 +#define MODEL_o367 0x17 +#define MODEL_hari1 0x16 +#define MODEL_hari 0x15 +#define MODEL_hako 0x14 +#define MODEL_g49 0x13 +#define MODEL_waku2 0x12 +#define MODEL_sai3 0x11 +#define MODEL_sai2 0x10 +#define MODEL_sai1 0xF +#define MODEL_tu4 0xE +#define MODEL_tu3 0xD +#define MODEL_tu2 0xC +#define MODEL_tu1 0xB +#define MODEL_raku3 0xA +#define MODEL_raku1 0x9 +#define MODEL_kabe6 0x8 +#define MODEL_kabe5 0x7 +#define MODEL_kabe4 0x6 +#define MODEL_tokeiban 0x5 +#define MODEL_kabe3 0x4 +#define MODEL_kabe2 0x3 +#define MODEL_kabe1 0x2 +#define MODEL_yuka2 0x1 +#define MODEL_waku 0x0 + diff --git a/include/mapfs/omo_bt02_hit.h b/include/mapfs/omo_bt02_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/omo_bt02_hit.h +++ b/include/mapfs/omo_bt02_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/omo_bt02_shape.h b/include/mapfs/omo_bt02_shape.h index 5c70205792..5a249b5c04 100644 --- a/include/mapfs/omo_bt02_shape.h +++ b/include/mapfs/omo_bt02_shape.h @@ -1,25 +1,26 @@ -#define MODEL_Root 0x18 -#define MODEL_dai 0x17 -#define MODEL_o396 0x16 -#define MODEL_o395 0x15 -#define MODEL_o394 0x14 -#define MODEL_o393 0x13 -#define MODEL_waku1 0x12 -#define MODEL_futi1 0x11 -#define MODEL_kazari2 0x10 -#define MODEL_yuka3 0xF -#define MODEL_yuka 0xE -#define MODEL_g49 0xD -#define MODEL_waku2 0xC -#define MODEL_sai3 0xB -#define MODEL_sai2 0xA -#define MODEL_sai1 0x9 -#define MODEL_siro 0x8 -#define MODEL_ao 0x7 -#define MODEL_aka 0x6 -#define MODEL_b_ao 0x5 -#define MODEL_kabe3 0x4 -#define MODEL_kabe2 0x3 -#define MODEL_kabe1 0x2 -#define MODEL_yuka2 0x1 -#define MODEL_waku 0x0 +#define MODEL_Root 0x18 +#define MODEL_dai 0x17 +#define MODEL_o396 0x16 +#define MODEL_o395 0x15 +#define MODEL_o394 0x14 +#define MODEL_o393 0x13 +#define MODEL_waku1 0x12 +#define MODEL_futi1 0x11 +#define MODEL_kazari2 0x10 +#define MODEL_yuka3 0xF +#define MODEL_yuka 0xE +#define MODEL_g49 0xD +#define MODEL_waku2 0xC +#define MODEL_sai3 0xB +#define MODEL_sai2 0xA +#define MODEL_sai1 0x9 +#define MODEL_siro 0x8 +#define MODEL_ao 0x7 +#define MODEL_aka 0x6 +#define MODEL_b_ao 0x5 +#define MODEL_kabe3 0x4 +#define MODEL_kabe2 0x3 +#define MODEL_kabe1 0x2 +#define MODEL_yuka2 0x1 +#define MODEL_waku 0x0 + diff --git a/include/mapfs/omo_bt03_hit.h b/include/mapfs/omo_bt03_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/omo_bt03_hit.h +++ b/include/mapfs/omo_bt03_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/omo_bt03_shape.h b/include/mapfs/omo_bt03_shape.h index 8391937606..1fd78bfd85 100644 --- a/include/mapfs/omo_bt03_shape.h +++ b/include/mapfs/omo_bt03_shape.h @@ -1,25 +1,26 @@ -#define MODEL_Root 0x18 -#define MODEL_dai 0x17 -#define MODEL_kazari2 0x16 -#define MODEL_futi1 0x15 -#define MODEL_waku1 0x14 -#define MODEL_yuka 0x13 -#define MODEL_g97 0x12 -#define MODEL_o479 0x11 -#define MODEL_o478 0x10 -#define MODEL_o477 0xF -#define MODEL_o476 0xE -#define MODEL_3 0xD -#define MODEL_r_hosi 0xC -#define MODEL_r_uzu 0xB -#define MODEL_r_neko 0xA -#define MODEL_g 0x9 -#define MODEL_hako2 0x8 -#define MODEL_hako1 0x7 -#define MODEL_sai3 0x6 -#define MODEL_sai2 0x5 -#define MODEL_sai1 0x4 -#define MODEL_waku2 0x3 -#define MODEL_yuka2 0x2 -#define MODEL_waku 0x1 -#define MODEL_kabe 0x0 +#define MODEL_Root 0x18 +#define MODEL_dai 0x17 +#define MODEL_kazari2 0x16 +#define MODEL_futi1 0x15 +#define MODEL_waku1 0x14 +#define MODEL_yuka 0x13 +#define MODEL_g97 0x12 +#define MODEL_o479 0x11 +#define MODEL_o478 0x10 +#define MODEL_o477 0xF +#define MODEL_o476 0xE +#define MODEL_3 0xD +#define MODEL_r_hosi 0xC +#define MODEL_r_uzu 0xB +#define MODEL_r_neko 0xA +#define MODEL_g 0x9 +#define MODEL_hako2 0x8 +#define MODEL_hako1 0x7 +#define MODEL_sai3 0x6 +#define MODEL_sai2 0x5 +#define MODEL_sai1 0x4 +#define MODEL_waku2 0x3 +#define MODEL_yuka2 0x2 +#define MODEL_waku 0x1 +#define MODEL_kabe 0x0 + diff --git a/include/mapfs/omo_bt04_hit.h b/include/mapfs/omo_bt04_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/omo_bt04_hit.h +++ b/include/mapfs/omo_bt04_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/omo_bt04_shape.h b/include/mapfs/omo_bt04_shape.h index 8934844162..b5a2711ed9 100644 --- a/include/mapfs/omo_bt04_shape.h +++ b/include/mapfs/omo_bt04_shape.h @@ -1,54 +1,55 @@ -#define MODEL_Root 0x35 -#define MODEL_g75 0x34 -#define MODEL_g86 0x33 -#define MODEL_o426 0x32 -#define MODEL_o425 0x31 -#define MODEL_o429 0x30 -#define MODEL_o428 0x2F -#define MODEL_o427 0x2E -#define MODEL_o424 0x2D -#define MODEL_g82 0x2C -#define MODEL_g85 0x2B -#define MODEL_o423 0x2A -#define MODEL_o422 0x29 -#define MODEL_o421 0x28 -#define MODEL_g84 0x27 -#define MODEL_o419 0x26 -#define MODEL_o418 0x25 -#define MODEL_o417 0x24 -#define MODEL_g83 0x23 -#define MODEL_o414 0x22 -#define MODEL_o413 0x21 -#define MODEL_o412 0x20 -#define MODEL_g77 0x1F -#define MODEL_g78 0x1E -#define MODEL_o409 0x1D -#define MODEL_o408 0x1C -#define MODEL_g76 0x1B -#define MODEL_o447 0x1A -#define MODEL_o445 0x19 -#define MODEL_o403 0x18 -#define MODEL_o402 0x17 -#define MODEL_dai 0x16 -#define MODEL_t_yon 0x15 -#define MODEL_t_san 0x14 -#define MODEL_waku1 0x13 -#define MODEL_itigo 0x12 -#define MODEL_kisya 0x11 -#define MODEL_futi1 0x10 -#define MODEL_kazari2 0xF -#define MODEL_yuka 0xE -#define MODEL_kusari 0xD -#define MODEL_g49 0xC -#define MODEL_waku2 0xB -#define MODEL_sai3 0xA -#define MODEL_sai2 0x9 -#define MODEL_sai1 0x8 -#define MODEL_kabe6 0x7 -#define MODEL_kabe5 0x6 -#define MODEL_kabe4 0x5 -#define MODEL_kabe3 0x4 -#define MODEL_kabe2 0x3 -#define MODEL_kabe1 0x2 -#define MODEL_yuka2 0x1 -#define MODEL_waku 0x0 +#define MODEL_Root 0x35 +#define MODEL_g75 0x34 +#define MODEL_g86 0x33 +#define MODEL_o426 0x32 +#define MODEL_o425 0x31 +#define MODEL_o429 0x30 +#define MODEL_o428 0x2F +#define MODEL_o427 0x2E +#define MODEL_o424 0x2D +#define MODEL_g82 0x2C +#define MODEL_g85 0x2B +#define MODEL_o423 0x2A +#define MODEL_o422 0x29 +#define MODEL_o421 0x28 +#define MODEL_g84 0x27 +#define MODEL_o419 0x26 +#define MODEL_o418 0x25 +#define MODEL_o417 0x24 +#define MODEL_g83 0x23 +#define MODEL_o414 0x22 +#define MODEL_o413 0x21 +#define MODEL_o412 0x20 +#define MODEL_g77 0x1F +#define MODEL_g78 0x1E +#define MODEL_o409 0x1D +#define MODEL_o408 0x1C +#define MODEL_g76 0x1B +#define MODEL_o447 0x1A +#define MODEL_o445 0x19 +#define MODEL_o403 0x18 +#define MODEL_o402 0x17 +#define MODEL_dai 0x16 +#define MODEL_t_yon 0x15 +#define MODEL_t_san 0x14 +#define MODEL_waku1 0x13 +#define MODEL_itigo 0x12 +#define MODEL_kisya 0x11 +#define MODEL_futi1 0x10 +#define MODEL_kazari2 0xF +#define MODEL_yuka 0xE +#define MODEL_kusari 0xD +#define MODEL_g49 0xC +#define MODEL_waku2 0xB +#define MODEL_sai3 0xA +#define MODEL_sai2 0x9 +#define MODEL_sai1 0x8 +#define MODEL_kabe6 0x7 +#define MODEL_kabe5 0x6 +#define MODEL_kabe4 0x5 +#define MODEL_kabe3 0x4 +#define MODEL_kabe2 0x3 +#define MODEL_kabe1 0x2 +#define MODEL_yuka2 0x1 +#define MODEL_waku 0x0 + diff --git a/include/mapfs/omo_bt05_hit.h b/include/mapfs/omo_bt05_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/omo_bt05_hit.h +++ b/include/mapfs/omo_bt05_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/omo_bt05_shape.h b/include/mapfs/omo_bt05_shape.h index 06d05e608c..828270ec6f 100644 --- a/include/mapfs/omo_bt05_shape.h +++ b/include/mapfs/omo_bt05_shape.h @@ -1,47 +1,48 @@ -#define MODEL_Root 0x2E -#define MODEL_dai2 0x2D -#define MODEL_mae6 0x2C -#define MODEL_mae5 0x2B -#define MODEL_mae4 0x2A -#define MODEL_t_yon 0x29 -#define MODEL_t_san 0x28 -#define MODEL_itigo 0x27 -#define MODEL_kisya 0x26 -#define MODEL_yuka6 0x25 -#define MODEL_yuka5 0x24 -#define MODEL_g2 0x23 -#define MODEL_tare 0x22 -#define MODEL_kabe2 0x21 -#define MODEL_kui3 0x20 -#define MODEL_saku3 0x1F -#define MODEL_yuka3 0x1E -#define MODEL_kabe4 0x1D -#define MODEL_dai1 0x1C -#define MODEL_mae2 0x1B -#define MODEL_mae1 0x1A -#define MODEL_yuka 0x19 -#define MODEL_g1 0x18 -#define MODEL_kui2 0x17 -#define MODEL_saku 0x16 -#define MODEL_senro 0x15 -#define MODEL_kui 0x14 -#define MODEL_saku2 0x13 -#define MODEL_dan5 0x12 -#define MODEL_dan4 0x11 -#define MODEL_dan3 0x10 -#define MODEL_dan2 0xF -#define MODEL_dan1 0xE -#define MODEL_2_kabe3 0xD -#define MODEL_2_kabe2 0xC -#define MODEL_2_kabe1 0xB -#define MODEL_dai 0xA -#define MODEL_kazari2 0x9 -#define MODEL_futi1 0x8 -#define MODEL_waku1 0x7 -#define MODEL_g 0x6 -#define MODEL_sai3 0x5 -#define MODEL_sai2 0x4 -#define MODEL_sai1 0x3 -#define MODEL_waku2 0x2 -#define MODEL_yuka2 0x1 -#define MODEL_waku 0x0 +#define MODEL_Root 0x2E +#define MODEL_dai2 0x2D +#define MODEL_mae6 0x2C +#define MODEL_mae5 0x2B +#define MODEL_mae4 0x2A +#define MODEL_t_yon 0x29 +#define MODEL_t_san 0x28 +#define MODEL_itigo 0x27 +#define MODEL_kisya 0x26 +#define MODEL_yuka6 0x25 +#define MODEL_yuka5 0x24 +#define MODEL_g2 0x23 +#define MODEL_tare 0x22 +#define MODEL_kabe2 0x21 +#define MODEL_kui3 0x20 +#define MODEL_saku3 0x1F +#define MODEL_yuka3 0x1E +#define MODEL_kabe4 0x1D +#define MODEL_dai1 0x1C +#define MODEL_mae2 0x1B +#define MODEL_mae1 0x1A +#define MODEL_yuka 0x19 +#define MODEL_g1 0x18 +#define MODEL_kui2 0x17 +#define MODEL_saku 0x16 +#define MODEL_senro 0x15 +#define MODEL_kui 0x14 +#define MODEL_saku2 0x13 +#define MODEL_dan5 0x12 +#define MODEL_dan4 0x11 +#define MODEL_dan3 0x10 +#define MODEL_dan2 0xF +#define MODEL_dan1 0xE +#define MODEL_2_kabe3 0xD +#define MODEL_2_kabe2 0xC +#define MODEL_2_kabe1 0xB +#define MODEL_dai 0xA +#define MODEL_kazari2 0x9 +#define MODEL_futi1 0x8 +#define MODEL_waku1 0x7 +#define MODEL_g 0x6 +#define MODEL_sai3 0x5 +#define MODEL_sai2 0x4 +#define MODEL_sai1 0x3 +#define MODEL_waku2 0x2 +#define MODEL_yuka2 0x1 +#define MODEL_waku 0x0 + diff --git a/include/mapfs/omo_bt06_hit.h b/include/mapfs/omo_bt06_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/omo_bt06_hit.h +++ b/include/mapfs/omo_bt06_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/omo_bt06_shape.h b/include/mapfs/omo_bt06_shape.h index 43643bca52..a52f1d800e 100644 --- a/include/mapfs/omo_bt06_shape.h +++ b/include/mapfs/omo_bt06_shape.h @@ -1,43 +1,44 @@ -#define MODEL_Root 0x2A -#define MODEL_dai 0x29 -#define MODEL_waku1 0x28 -#define MODEL_kuruma 0x27 -#define MODEL_hosi 0x26 -#define MODEL_futi1 0x25 -#define MODEL_kazari2 0x24 -#define MODEL_yuka 0x23 -#define MODEL_g74 0x22 -#define MODEL_sai3 0x21 -#define MODEL_sai2 0x20 -#define MODEL_sai1 0x1F -#define MODEL_ere2 0x1E -#define MODEL_ere2_3 0x1D -#define MODEL_ere2_2 0x1C -#define MODEL_ere2_1 0x1B -#define MODEL_ere1 0x1A -#define MODEL_ere1_3 0x19 -#define MODEL_ere1_2 0x18 -#define MODEL_ere1_1 0x17 -#define MODEL_waku2 0x16 -#define MODEL_g49 0x15 -#define MODEL_4_2 0x14 -#define MODEL_ao_2 0x13 -#define MODEL_midori_2 0x12 -#define MODEL_mzu_2 0x11 -#define MODEL_3_2 0x10 -#define MODEL_raku3 0xF -#define MODEL_raku2 0xE -#define MODEL_raku1 0xD -#define MODEL_midori 0xC -#define MODEL_misuiro 0xB -#define MODEL_ao 0xA -#define MODEL_4 0x9 -#define MODEL_1 0x8 -#define MODEL_2 0x7 -#define MODEL_aka 0x6 -#define MODEL_ki 0x5 -#define MODEL_d 0x4 -#define MODEL_kabe2 0x3 -#define MODEL_kabe1 0x2 -#define MODEL_yuka2 0x1 -#define MODEL_waku 0x0 +#define MODEL_Root 0x2A +#define MODEL_dai 0x29 +#define MODEL_waku1 0x28 +#define MODEL_kuruma 0x27 +#define MODEL_hosi 0x26 +#define MODEL_futi1 0x25 +#define MODEL_kazari2 0x24 +#define MODEL_yuka 0x23 +#define MODEL_g74 0x22 +#define MODEL_sai3 0x21 +#define MODEL_sai2 0x20 +#define MODEL_sai1 0x1F +#define MODEL_ere2 0x1E +#define MODEL_ere2_3 0x1D +#define MODEL_ere2_2 0x1C +#define MODEL_ere2_1 0x1B +#define MODEL_ere1 0x1A +#define MODEL_ere1_3 0x19 +#define MODEL_ere1_2 0x18 +#define MODEL_ere1_1 0x17 +#define MODEL_waku2 0x16 +#define MODEL_g49 0x15 +#define MODEL_4_2 0x14 +#define MODEL_ao_2 0x13 +#define MODEL_midori_2 0x12 +#define MODEL_mzu_2 0x11 +#define MODEL_3_2 0x10 +#define MODEL_raku3 0xF +#define MODEL_raku2 0xE +#define MODEL_raku1 0xD +#define MODEL_midori 0xC +#define MODEL_misuiro 0xB +#define MODEL_ao 0xA +#define MODEL_4 0x9 +#define MODEL_1 0x8 +#define MODEL_2 0x7 +#define MODEL_aka 0x6 +#define MODEL_ki 0x5 +#define MODEL_d 0x4 +#define MODEL_kabe2 0x3 +#define MODEL_kabe1 0x2 +#define MODEL_yuka2 0x1 +#define MODEL_waku 0x0 + diff --git a/include/mapfs/omo_bt07_hit.h b/include/mapfs/omo_bt07_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/omo_bt07_hit.h +++ b/include/mapfs/omo_bt07_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/omo_bt07_shape.h b/include/mapfs/omo_bt07_shape.h index bf58487ca6..e85dfd24c3 100644 --- a/include/mapfs/omo_bt07_shape.h +++ b/include/mapfs/omo_bt07_shape.h @@ -1,66 +1,67 @@ -#define MODEL_Root 0x41 -#define MODEL_sensya 0x40 -#define MODEL_g106 0x3F -#define MODEL_shy 0x3E -#define MODEL_a4 0x3D -#define MODEL_n6 0x3C -#define MODEL_wa4 0x3B -#define MODEL_a3 0x3A -#define MODEL_n5 0x39 -#define MODEL_wa3 0x38 -#define MODEL_a2 0x37 -#define MODEL_n4 0x36 -#define MODEL_wa2 0x35 -#define MODEL_a1 0x34 -#define MODEL_n3 0x33 -#define MODEL_wa1 0x32 -#define MODEL_futa 0x31 -#define MODEL_fyta1 0x30 -#define MODEL_nob 0x2F -#define MODEL_nob1 0x2E -#define MODEL_en 0x2D -#define MODEL_en2 0x2C -#define MODEL_en1 0x2B -#define MODEL_kyu 0x2A -#define MODEL_kyu1 0x29 -#define MODEL_kyu2 0x28 -#define MODEL_kyu3 0x27 -#define MODEL_h4 0x26 -#define MODEL_n2 0x25 -#define MODEL_sya3 0x24 -#define MODEL_h3 0x23 -#define MODEL_sya2 0x22 -#define MODEL_n1 0x21 -#define MODEL_h2 0x20 -#define MODEL_sya1 0x1F -#define MODEL_h1 0x1E -#define MODEL_tanp 0x1D -#define MODEL_exit 0x1C -#define MODEL_dai 0x1B -#define MODEL_o468 0x1A -#define MODEL_o467 0x19 -#define MODEL_kazari2 0x18 -#define MODEL_futi1 0x17 -#define MODEL_waku1 0x16 -#define MODEL_yuka 0x15 -#define MODEL_g 0x14 -#define MODEL_hosi 0x13 -#define MODEL_kino 0x12 -#define MODEL_kuruma 0x11 -#define MODEL_15_tu4 0x10 -#define MODEL_15_tu3 0xF -#define MODEL_15_tu2 0xE -#define MODEL_15_tu1 0xD -#define MODEL_15_sai3 0xC -#define MODEL_15_sai2 0xB -#define MODEL_15_sai 0xA -#define MODEL_kabe6 0x9 -#define MODEL_kabe5 0x8 -#define MODEL_kabe4 0x7 -#define MODEL_kabe2 0x6 -#define MODEL_kabe1 0x5 -#define MODEL_kabe3 0x4 -#define MODEL_waku2 0x3 -#define MODEL_yuka2 0x2 -#define MODEL_waku 0x1 -#define MODEL_kabe 0x0 +#define MODEL_Root 0x41 +#define MODEL_sensya 0x40 +#define MODEL_g106 0x3F +#define MODEL_shy 0x3E +#define MODEL_a4 0x3D +#define MODEL_n6 0x3C +#define MODEL_wa4 0x3B +#define MODEL_a3 0x3A +#define MODEL_n5 0x39 +#define MODEL_wa3 0x38 +#define MODEL_a2 0x37 +#define MODEL_n4 0x36 +#define MODEL_wa2 0x35 +#define MODEL_a1 0x34 +#define MODEL_n3 0x33 +#define MODEL_wa1 0x32 +#define MODEL_futa 0x31 +#define MODEL_fyta1 0x30 +#define MODEL_nob 0x2F +#define MODEL_nob1 0x2E +#define MODEL_en 0x2D +#define MODEL_en2 0x2C +#define MODEL_en1 0x2B +#define MODEL_kyu 0x2A +#define MODEL_kyu1 0x29 +#define MODEL_kyu2 0x28 +#define MODEL_kyu3 0x27 +#define MODEL_h4 0x26 +#define MODEL_n2 0x25 +#define MODEL_sya3 0x24 +#define MODEL_h3 0x23 +#define MODEL_sya2 0x22 +#define MODEL_n1 0x21 +#define MODEL_h2 0x20 +#define MODEL_sya1 0x1F +#define MODEL_h1 0x1E +#define MODEL_tanp 0x1D +#define MODEL_exit 0x1C +#define MODEL_dai 0x1B +#define MODEL_o468 0x1A +#define MODEL_o467 0x19 +#define MODEL_kazari2 0x18 +#define MODEL_futi1 0x17 +#define MODEL_waku1 0x16 +#define MODEL_yuka 0x15 +#define MODEL_g 0x14 +#define MODEL_hosi 0x13 +#define MODEL_kino 0x12 +#define MODEL_kuruma 0x11 +#define MODEL_15_tu4 0x10 +#define MODEL_15_tu3 0xF +#define MODEL_15_tu2 0xE +#define MODEL_15_tu1 0xD +#define MODEL_15_sai3 0xC +#define MODEL_15_sai2 0xB +#define MODEL_15_sai 0xA +#define MODEL_kabe6 0x9 +#define MODEL_kabe5 0x8 +#define MODEL_kabe4 0x7 +#define MODEL_kabe2 0x6 +#define MODEL_kabe1 0x5 +#define MODEL_kabe3 0x4 +#define MODEL_waku2 0x3 +#define MODEL_yuka2 0x2 +#define MODEL_waku 0x1 +#define MODEL_kabe 0x0 + diff --git a/include/mapfs/osr_00_hit.h b/include/mapfs/osr_00_hit.h index 3c554e2caa..c8af4a6052 100644 --- a/include/mapfs/osr_00_hit.h +++ b/include/mapfs/osr_00_hit.h @@ -1,18 +1,29 @@ -#define COLLIDER_Root 0x11 -#define COLLIDER_g97 0x10 -#define COLLIDER_o473 0xF -#define COLLIDER_Default 0xE -#define COLLIDER_o494 0xD -#define COLLIDER_o493 0xC -#define COLLIDER_o492 0xB -#define COLLIDER_o486 0xA -#define COLLIDER_o484 0x9 -#define COLLIDER_o476 0x8 -#define COLLIDER_o485 0x7 -#define COLLIDER_deilitn 0x6 -#define COLLIDER_o462 0x5 -#define COLLIDER_deilin 0x4 -#define COLLIDER_deilite 0x3 -#define COLLIDER_deilie 0x2 -#define COLLIDER_deilits 0x1 -#define COLLIDER_deilis 0x0 +#define COLLIDER_Root 0x11 +#define COLLIDER_g97 0x10 +#define COLLIDER_o473 0xF +#define COLLIDER_Default 0xE +#define COLLIDER_o494 0xD +#define COLLIDER_o493 0xC +#define COLLIDER_o492 0xB +#define COLLIDER_o486 0xA +#define COLLIDER_o484 0x9 +#define COLLIDER_o476 0x8 +#define COLLIDER_o485 0x7 +#define COLLIDER_deilitn 0x6 +#define COLLIDER_o462 0x5 +#define COLLIDER_deilin 0x4 +#define COLLIDER_deilite 0x3 +#define COLLIDER_deilie 0x2 +#define COLLIDER_deilits 0x1 +#define COLLIDER_deilis 0x0 + +#define ZONE_Root 0x8 +#define ZONE_g32 0x7 +#define ZONE_o230 0x6 +#define ZONE_o229 0x5 +#define ZONE_g1 0x4 +#define ZONE_o35 0x3 +#define ZONE_g7 0x2 +#define ZONE_deilis 0x1 +#define ZONE_deilin 0x0 + diff --git a/include/mapfs/osr_00_shape.h b/include/mapfs/osr_00_shape.h index 073121edbe..cf32fbb676 100644 --- a/include/mapfs/osr_00_shape.h +++ b/include/mapfs/osr_00_shape.h @@ -1,94 +1,95 @@ -#define MODEL_Root 0x5D -#define MODEL_ls4 0x5C -#define MODEL_f4 0x5B -#define MODEL_ff4 0x5A -#define MODEL_f3 0x59 -#define MODEL_ff3 0x58 -#define MODEL_f2 0x57 -#define MODEL_ff2 0x56 -#define MODEL_f1 0x55 -#define MODEL_ff1 0x54 -#define MODEL_door2 0x53 -#define MODEL_d2 0x52 -#define MODEL_door1 0x51 -#define MODEL_d1 0x50 -#define MODEL_castle 0x4F -#define MODEL_g73 0x4E -#define MODEL_o370 0x4D -#define MODEL_o379 0x4C -#define MODEL_g78 0x4B -#define MODEL_o450 0x4A -#define MODEL_saku 0x49 -#define MODEL_o382 0x48 -#define MODEL_o369 0x47 -#define MODEL_o354 0x46 -#define MODEL_o353 0x45 -#define MODEL_o348 0x44 -#define MODEL_g68 0x43 -#define MODEL_o381 0x42 -#define MODEL_o368 0x41 -#define MODEL_o375 0x40 -#define MODEL_o367 0x3F -#define MODEL_g77 0x3E -#define MODEL_o409 0x3D -#define MODEL_o408 0x3C -#define MODEL_o407 0x3B -#define MODEL_o406 0x3A -#define MODEL_o405 0x39 -#define MODEL_g76 0x38 -#define MODEL_o404 0x37 -#define MODEL_o403 0x36 -#define MODEL_o402 0x35 -#define MODEL_o401 0x34 -#define MODEL_o400 0x33 -#define MODEL_g75 0x32 -#define MODEL_o399 0x31 -#define MODEL_o398 0x30 -#define MODEL_o397 0x2F -#define MODEL_o396 0x2E -#define MODEL_o395 0x2D -#define MODEL_g74 0x2C -#define MODEL_o378 0x2B -#define MODEL_o371 0x2A -#define MODEL_o347 0x29 -#define MODEL_o346 0x28 -#define MODEL_o345 0x27 -#define MODEL_g7 0x26 -#define MODEL_o42 0x25 -#define MODEL_deilis 0x24 -#define MODEL_deilin 0x23 -#define MODEL_deilie 0x22 -#define MODEL_o12 0x21 -#define MODEL_o3 0x20 -#define MODEL_g79 0x1F -#define MODEL_o448 0x1E -#define MODEL_o447 0x1D -#define MODEL_o446 0x1C -#define MODEL_o445 0x1B -#define MODEL_o444 0x1A -#define MODEL_o443 0x19 -#define MODEL_o441 0x18 -#define MODEL_funsui 0x17 -#define MODEL_w2 0x16 -#define MODEL_fw1 0x15 -#define MODEL_o456 0x14 -#define MODEL_o452 0x13 -#define MODEL_g1 0x12 -#define MODEL_o462 0x11 -#define MODEL_o461 0x10 -#define MODEL_o428 0xF -#define MODEL_o429 0xE -#define MODEL_o437 0xD -#define MODEL_o439 0xC -#define MODEL_o436 0xB -#define MODEL_o432 0xA -#define MODEL_o414 0x9 -#define MODEL_o413 0x8 -#define MODEL_o2 0x7 -#define MODEL_o35 0x6 -#define MODEL_o412 0x5 -#define MODEL_o269 0x4 -#define MODEL_o420 0x3 -#define MODEL_g84 0x2 -#define MODEL_o433 0x1 -#define MODEL_o449 0x0 +#define MODEL_Root 0x5D +#define MODEL_ls4 0x5C +#define MODEL_f4 0x5B +#define MODEL_ff4 0x5A +#define MODEL_f3 0x59 +#define MODEL_ff3 0x58 +#define MODEL_f2 0x57 +#define MODEL_ff2 0x56 +#define MODEL_f1 0x55 +#define MODEL_ff1 0x54 +#define MODEL_door2 0x53 +#define MODEL_d2 0x52 +#define MODEL_door1 0x51 +#define MODEL_d1 0x50 +#define MODEL_castle 0x4F +#define MODEL_g73 0x4E +#define MODEL_o370 0x4D +#define MODEL_o379 0x4C +#define MODEL_g78 0x4B +#define MODEL_o450 0x4A +#define MODEL_saku 0x49 +#define MODEL_o382 0x48 +#define MODEL_o369 0x47 +#define MODEL_o354 0x46 +#define MODEL_o353 0x45 +#define MODEL_o348 0x44 +#define MODEL_g68 0x43 +#define MODEL_o381 0x42 +#define MODEL_o368 0x41 +#define MODEL_o375 0x40 +#define MODEL_o367 0x3F +#define MODEL_g77 0x3E +#define MODEL_o409 0x3D +#define MODEL_o408 0x3C +#define MODEL_o407 0x3B +#define MODEL_o406 0x3A +#define MODEL_o405 0x39 +#define MODEL_g76 0x38 +#define MODEL_o404 0x37 +#define MODEL_o403 0x36 +#define MODEL_o402 0x35 +#define MODEL_o401 0x34 +#define MODEL_o400 0x33 +#define MODEL_g75 0x32 +#define MODEL_o399 0x31 +#define MODEL_o398 0x30 +#define MODEL_o397 0x2F +#define MODEL_o396 0x2E +#define MODEL_o395 0x2D +#define MODEL_g74 0x2C +#define MODEL_o378 0x2B +#define MODEL_o371 0x2A +#define MODEL_o347 0x29 +#define MODEL_o346 0x28 +#define MODEL_o345 0x27 +#define MODEL_g7 0x26 +#define MODEL_o42 0x25 +#define MODEL_deilis 0x24 +#define MODEL_deilin 0x23 +#define MODEL_deilie 0x22 +#define MODEL_o12 0x21 +#define MODEL_o3 0x20 +#define MODEL_g79 0x1F +#define MODEL_o448 0x1E +#define MODEL_o447 0x1D +#define MODEL_o446 0x1C +#define MODEL_o445 0x1B +#define MODEL_o444 0x1A +#define MODEL_o443 0x19 +#define MODEL_o441 0x18 +#define MODEL_funsui 0x17 +#define MODEL_w2 0x16 +#define MODEL_fw1 0x15 +#define MODEL_o456 0x14 +#define MODEL_o452 0x13 +#define MODEL_g1 0x12 +#define MODEL_o462 0x11 +#define MODEL_o461 0x10 +#define MODEL_o428 0xF +#define MODEL_o429 0xE +#define MODEL_o437 0xD +#define MODEL_o439 0xC +#define MODEL_o436 0xB +#define MODEL_o432 0xA +#define MODEL_o414 0x9 +#define MODEL_o413 0x8 +#define MODEL_o2 0x7 +#define MODEL_o35 0x6 +#define MODEL_o412 0x5 +#define MODEL_o269 0x4 +#define MODEL_o420 0x3 +#define MODEL_g84 0x2 +#define MODEL_o433 0x1 +#define MODEL_o449 0x0 + diff --git a/include/mapfs/osr_01_hit.h b/include/mapfs/osr_01_hit.h index 843864dbf7..2a769c3562 100644 --- a/include/mapfs/osr_01_hit.h +++ b/include/mapfs/osr_01_hit.h @@ -1,34 +1,45 @@ -#define COLLIDER_Root 0x21 -#define COLLIDER_g109 0x20 -#define COLLIDER_o484 0x1F -#define COLLIDER_o526 0x1E -#define COLLIDER_o525 0x1D -#define COLLIDER_o509 0x1C -#define COLLIDER_o506 0x1B -#define COLLIDER_o492 0x1A -#define COLLIDER_g108 0x19 -#define COLLIDER_o553 0x18 -#define COLLIDER_o527 0x17 -#define COLLIDER_noko 0x16 -#define COLLIDER_o542 0x15 -#define COLLIDER_o555 0x14 -#define COLLIDER_o556 0x13 -#define COLLIDER_g101 0x12 -#define COLLIDER_o561 0x11 -#define COLLIDER_o544 0x10 -#define COLLIDER_o543 0xF -#define COLLIDER_o545 0xE -#define COLLIDER_g100 0xD -#define COLLIDER_o486 0xC -#define COLLIDER_o491 0xB -#define COLLIDER_o522 0xA -#define COLLIDER_g99 0x9 -#define COLLIDER_o521 0x8 -#define COLLIDER_o489 0x7 -#define COLLIDER_Default 0x6 -#define COLLIDER_o562 0x5 -#define COLLIDER_o462 0x4 -#define COLLIDER_deilite 0x3 -#define COLLIDER_deilie 0x2 -#define COLLIDER_deilits 0x1 -#define COLLIDER_deilis 0x0 +#define COLLIDER_Root 0x21 +#define COLLIDER_g109 0x20 +#define COLLIDER_o484 0x1F +#define COLLIDER_o526 0x1E +#define COLLIDER_o525 0x1D +#define COLLIDER_o509 0x1C +#define COLLIDER_o506 0x1B +#define COLLIDER_o492 0x1A +#define COLLIDER_g108 0x19 +#define COLLIDER_o553 0x18 +#define COLLIDER_o527 0x17 +#define COLLIDER_noko 0x16 +#define COLLIDER_o542 0x15 +#define COLLIDER_o555 0x14 +#define COLLIDER_o556 0x13 +#define COLLIDER_g101 0x12 +#define COLLIDER_o561 0x11 +#define COLLIDER_o544 0x10 +#define COLLIDER_o543 0xF +#define COLLIDER_o545 0xE +#define COLLIDER_g100 0xD +#define COLLIDER_o486 0xC +#define COLLIDER_o491 0xB +#define COLLIDER_o522 0xA +#define COLLIDER_g99 0x9 +#define COLLIDER_o521 0x8 +#define COLLIDER_o489 0x7 +#define COLLIDER_Default 0x6 +#define COLLIDER_o562 0x5 +#define COLLIDER_o462 0x4 +#define COLLIDER_deilite 0x3 +#define COLLIDER_deilie 0x2 +#define COLLIDER_deilits 0x1 +#define COLLIDER_deilis 0x0 + +#define ZONE_Root 0x8 +#define ZONE_g32 0x7 +#define ZONE_o230 0x6 +#define ZONE_o229 0x5 +#define ZONE_g1 0x4 +#define ZONE_o35 0x3 +#define ZONE_g7 0x2 +#define ZONE_deilis 0x1 +#define ZONE_deilin 0x0 + diff --git a/include/mapfs/osr_01_shape.h b/include/mapfs/osr_01_shape.h index 1106d337ba..ff46cf5258 100644 --- a/include/mapfs/osr_01_shape.h +++ b/include/mapfs/osr_01_shape.h @@ -1,71 +1,72 @@ -#define MODEL_Root 0x46 -#define MODEL_g100 0x45 -#define MODEL_o555 0x44 -#define MODEL_o498 0x43 -#define MODEL_o550 0x42 -#define MODEL_o447 0x41 -#define MODEL_g96 0x40 -#define MODEL_o530 0x3F -#define MODEL_o529 0x3E -#define MODEL_o481 0x3D -#define MODEL_g90 0x3C -#define MODEL_o511 0x3B -#define MODEL_o513 0x3A -#define MODEL_o514 0x39 -#define MODEL_g89 0x38 -#define MODEL_o509 0x37 -#define MODEL_o507 0x36 -#define MODEL_castle 0x35 -#define MODEL_o551 0x34 -#define MODEL_ls4 0x33 -#define MODEL_f2 0x32 -#define MODEL_ff2 0x31 -#define MODEL_g77 0x30 -#define MODEL_o408 0x2F -#define MODEL_g88 0x2E -#define MODEL_o464 0x2D -#define MODEL_o532 0x2C -#define MODEL_g87 0x2B -#define MODEL_o537 0x2A -#define MODEL_o536 0x29 -#define MODEL_o492 0x28 -#define MODEL_tai 0x27 -#define MODEL_o496 0x26 -#define MODEL_o495 0x25 -#define MODEL_o494 0x24 -#define MODEL_o493 0x23 -#define MODEL_o489 0x22 -#define MODEL_o477 0x21 -#define MODEL_o474 0x20 -#define MODEL_o486 0x1F -#define MODEL_g85 0x1E -#define MODEL_o480 0x1D -#define MODEL_o469 0x1C -#define MODEL_o463 0x1B -#define MODEL_g7 0x1A -#define MODEL_o42 0x19 -#define MODEL_deilis 0x18 -#define MODEL_o12 0x17 -#define MODEL_o3 0x16 -#define MODEL_g79 0x15 -#define MODEL_o502 0x14 -#define MODEL_o443 0x13 -#define MODEL_o441 0x12 -#define MODEL_funsui 0x11 -#define MODEL_o500 0x10 -#define MODEL_w2 0xF -#define MODEL_o501 0xE -#define MODEL_o456 0xD -#define MODEL_o452 0xC -#define MODEL_o508 0xB -#define MODEL_g1 0xA -#define MODEL_o439 0x9 -#define MODEL_o437 0x8 -#define MODEL_o478 0x7 -#define MODEL_o428 0x6 -#define MODEL_o429 0x5 -#define MODEL_o436 0x4 -#define MODEL_g84 0x3 -#define MODEL_o519 0x2 -#define MODEL_o518 0x1 -#define MODEL_o475 0x0 +#define MODEL_Root 0x46 +#define MODEL_g100 0x45 +#define MODEL_o555 0x44 +#define MODEL_o498 0x43 +#define MODEL_o550 0x42 +#define MODEL_o447 0x41 +#define MODEL_g96 0x40 +#define MODEL_o530 0x3F +#define MODEL_o529 0x3E +#define MODEL_o481 0x3D +#define MODEL_g90 0x3C +#define MODEL_o511 0x3B +#define MODEL_o513 0x3A +#define MODEL_o514 0x39 +#define MODEL_g89 0x38 +#define MODEL_o509 0x37 +#define MODEL_o507 0x36 +#define MODEL_castle 0x35 +#define MODEL_o551 0x34 +#define MODEL_ls4 0x33 +#define MODEL_f2 0x32 +#define MODEL_ff2 0x31 +#define MODEL_g77 0x30 +#define MODEL_o408 0x2F +#define MODEL_g88 0x2E +#define MODEL_o464 0x2D +#define MODEL_o532 0x2C +#define MODEL_g87 0x2B +#define MODEL_o537 0x2A +#define MODEL_o536 0x29 +#define MODEL_o492 0x28 +#define MODEL_tai 0x27 +#define MODEL_o496 0x26 +#define MODEL_o495 0x25 +#define MODEL_o494 0x24 +#define MODEL_o493 0x23 +#define MODEL_o489 0x22 +#define MODEL_o477 0x21 +#define MODEL_o474 0x20 +#define MODEL_o486 0x1F +#define MODEL_g85 0x1E +#define MODEL_o480 0x1D +#define MODEL_o469 0x1C +#define MODEL_o463 0x1B +#define MODEL_g7 0x1A +#define MODEL_o42 0x19 +#define MODEL_deilis 0x18 +#define MODEL_o12 0x17 +#define MODEL_o3 0x16 +#define MODEL_g79 0x15 +#define MODEL_o502 0x14 +#define MODEL_o443 0x13 +#define MODEL_o441 0x12 +#define MODEL_funsui 0x11 +#define MODEL_o500 0x10 +#define MODEL_w2 0xF +#define MODEL_o501 0xE +#define MODEL_o456 0xD +#define MODEL_o452 0xC +#define MODEL_o508 0xB +#define MODEL_g1 0xA +#define MODEL_o439 0x9 +#define MODEL_o437 0x8 +#define MODEL_o478 0x7 +#define MODEL_o428 0x6 +#define MODEL_o429 0x5 +#define MODEL_o436 0x4 +#define MODEL_g84 0x3 +#define MODEL_o519 0x2 +#define MODEL_o518 0x1 +#define MODEL_o475 0x0 + diff --git a/include/mapfs/osr_02_hit.h b/include/mapfs/osr_02_hit.h index 926859bd95..fc0e2b51e6 100644 --- a/include/mapfs/osr_02_hit.h +++ b/include/mapfs/osr_02_hit.h @@ -1,46 +1,51 @@ -#define COLLIDER_Root 0x2D -#define COLLIDER_hono 0x2C -#define COLLIDER_o554 0x2B -#define COLLIDER_o550 0x2A -#define COLLIDER_yuka 0x29 -#define COLLIDER_hi9 0x28 -#define COLLIDER_hi7 0x27 -#define COLLIDER_hi6 0x26 -#define COLLIDER_hi5 0x25 -#define COLLIDER_hi4 0x24 -#define COLLIDER_hi3 0x23 -#define COLLIDER_hi2 0x22 -#define COLLIDER_hi1 0x21 -#define COLLIDER_kaidan 0x20 -#define COLLIDER_o680 0x1F -#define COLLIDER_o710 0x1E -#define COLLIDER_stage 0x1D -#define COLLIDER_saku 0x1C -#define COLLIDER_o658 0x1B -#define COLLIDER_o600 0x1A -#define COLLIDER_ki 0x19 -#define COLLIDER_o692 0x18 -#define COLLIDER_o558 0x17 -#define COLLIDER_o553 0x16 -#define COLLIDER_o551 0x15 -#define COLLIDER_ue 0x14 -#define COLLIDER_bou 0x13 -#define COLLIDER_kabe3 0x12 -#define COLLIDER_kabe2 0x11 -#define COLLIDER_kabe1 0x10 -#define COLLIDER_mado 0xF -#define COLLIDER_yane 0xE -#define COLLIDER_o581 0xD -#define COLLIDER_o580 0xC -#define COLLIDER_midoli 0xB -#define COLLIDER_dai 0xA -#define COLLIDER_sikaku 0x9 -#define COLLIDER_g149 0x8 -#define COLLIDER_o652 0x7 -#define COLLIDER_deilit2 0x6 -#define COLLIDER_deili2 0x5 -#define COLLIDER_o664 0x4 -#define COLLIDER_deilit1 0x3 -#define COLLIDER_deili1 0x2 -#define COLLIDER_tt2 0x1 -#define COLLIDER_tt1 0x0 +#define COLLIDER_Root 0x2D +#define COLLIDER_hono 0x2C +#define COLLIDER_o554 0x2B +#define COLLIDER_o550 0x2A +#define COLLIDER_yuka 0x29 +#define COLLIDER_hi9 0x28 +#define COLLIDER_hi7 0x27 +#define COLLIDER_hi6 0x26 +#define COLLIDER_hi5 0x25 +#define COLLIDER_hi4 0x24 +#define COLLIDER_hi3 0x23 +#define COLLIDER_hi2 0x22 +#define COLLIDER_hi1 0x21 +#define COLLIDER_kaidan 0x20 +#define COLLIDER_o680 0x1F +#define COLLIDER_o710 0x1E +#define COLLIDER_stage 0x1D +#define COLLIDER_saku 0x1C +#define COLLIDER_o658 0x1B +#define COLLIDER_o600 0x1A +#define COLLIDER_ki 0x19 +#define COLLIDER_o692 0x18 +#define COLLIDER_o558 0x17 +#define COLLIDER_o553 0x16 +#define COLLIDER_o551 0x15 +#define COLLIDER_ue 0x14 +#define COLLIDER_bou 0x13 +#define COLLIDER_kabe3 0x12 +#define COLLIDER_kabe2 0x11 +#define COLLIDER_kabe1 0x10 +#define COLLIDER_mado 0xF +#define COLLIDER_yane 0xE +#define COLLIDER_o581 0xD +#define COLLIDER_o580 0xC +#define COLLIDER_midoli 0xB +#define COLLIDER_dai 0xA +#define COLLIDER_sikaku 0x9 +#define COLLIDER_g149 0x8 +#define COLLIDER_o652 0x7 +#define COLLIDER_deilit2 0x6 +#define COLLIDER_deili2 0x5 +#define COLLIDER_o664 0x4 +#define COLLIDER_deilit1 0x3 +#define COLLIDER_deili1 0x2 +#define COLLIDER_tt2 0x1 +#define COLLIDER_tt1 0x0 + +#define ZONE_Root 0x2 +#define ZONE_g1 0x1 +#define ZONE_o35 0x0 + diff --git a/include/mapfs/osr_02_shape.h b/include/mapfs/osr_02_shape.h index c4281a0eeb..d20dd2a488 100644 --- a/include/mapfs/osr_02_shape.h +++ b/include/mapfs/osr_02_shape.h @@ -1,52 +1,53 @@ -#define MODEL_Root 0x33 -#define MODEL_door_2 0x32 -#define MODEL_o570 0x31 -#define MODEL_door_1 0x30 -#define MODEL_door2 0x2F -#define MODEL_d2 0x2E -#define MODEL_door1 0x2D -#define MODEL_d1 0x2C -#define MODEL_g144 0x2B -#define MODEL_g116 0x2A -#define MODEL_o658 0x29 -#define MODEL_o643 0x28 -#define MODEL_o600 0x27 -#define MODEL_kaidan 0x26 -#define MODEL_o681 0x25 -#define MODEL_o680 0x24 -#define MODEL_o693 0x23 -#define MODEL_o692 0x22 -#define MODEL_michi 0x21 -#define MODEL_o699 0x20 -#define MODEL_o700 0x1F -#define MODEL_ishi 0x1E -#define MODEL_o712 0x1D -#define MODEL_o710 0x1C -#define MODEL_o709 0x1B -#define MODEL_o707 0x1A -#define MODEL_o706 0x19 -#define MODEL_ki 0x18 -#define MODEL_o581 0x17 -#define MODEL_o580 0x16 -#define MODEL_stage 0x15 -#define MODEL_jimen 0x14 -#define MODEL_midoli 0x13 -#define MODEL_saku 0x12 -#define MODEL_dai 0x11 -#define MODEL_sikaku 0x10 -#define MODEL_koopa 0xF -#define MODEL_o569 0xE -#define MODEL_kinoko 0xD -#define MODEL_o714 0xC -#define MODEL_o554 0xB -#define MODEL_o553 0xA -#define MODEL_o551 0x9 -#define MODEL_o550 0x8 -#define MODEL_ue 0x7 -#define MODEL_yuka 0x6 -#define MODEL_bou 0x5 -#define MODEL_kabe3 0x4 -#define MODEL_kabe2 0x3 -#define MODEL_kabe1 0x2 -#define MODEL_mado 0x1 -#define MODEL_yane 0x0 +#define MODEL_Root 0x33 +#define MODEL_door_2 0x32 +#define MODEL_o570 0x31 +#define MODEL_door_1 0x30 +#define MODEL_door2 0x2F +#define MODEL_d2 0x2E +#define MODEL_door1 0x2D +#define MODEL_d1 0x2C +#define MODEL_g144 0x2B +#define MODEL_g116 0x2A +#define MODEL_o658 0x29 +#define MODEL_o643 0x28 +#define MODEL_o600 0x27 +#define MODEL_kaidan 0x26 +#define MODEL_o681 0x25 +#define MODEL_o680 0x24 +#define MODEL_o693 0x23 +#define MODEL_o692 0x22 +#define MODEL_michi 0x21 +#define MODEL_o699 0x20 +#define MODEL_o700 0x1F +#define MODEL_ishi 0x1E +#define MODEL_o712 0x1D +#define MODEL_o710 0x1C +#define MODEL_o709 0x1B +#define MODEL_o707 0x1A +#define MODEL_o706 0x19 +#define MODEL_ki 0x18 +#define MODEL_o581 0x17 +#define MODEL_o580 0x16 +#define MODEL_stage 0x15 +#define MODEL_jimen 0x14 +#define MODEL_midoli 0x13 +#define MODEL_saku 0x12 +#define MODEL_dai 0x11 +#define MODEL_sikaku 0x10 +#define MODEL_koopa 0xF +#define MODEL_o569 0xE +#define MODEL_kinoko 0xD +#define MODEL_o714 0xC +#define MODEL_o554 0xB +#define MODEL_o553 0xA +#define MODEL_o551 0x9 +#define MODEL_o550 0x8 +#define MODEL_ue 0x7 +#define MODEL_yuka 0x6 +#define MODEL_bou 0x5 +#define MODEL_kabe3 0x4 +#define MODEL_kabe2 0x3 +#define MODEL_kabe1 0x2 +#define MODEL_mado 0x1 +#define MODEL_yane 0x0 + diff --git a/include/mapfs/osr_03_hit.h b/include/mapfs/osr_03_hit.h index e9b4c76078..aea3b6ae8b 100644 --- a/include/mapfs/osr_03_hit.h +++ b/include/mapfs/osr_03_hit.h @@ -1,18 +1,25 @@ -#define COLLIDER_Root 0x11 -#define COLLIDER_niwa 0x10 -#define COLLIDER_o1520 0xF -#define COLLIDER_o1538 0xE -#define COLLIDER_o1524 0xD -#define COLLIDER_o1537 0xC -#define COLLIDER_o1519 0xB -#define COLLIDER_o1536 0xA -#define COLLIDER_o1523 0x9 -#define COLLIDER_o1535 0x8 -#define COLLIDER_o1515 0x7 -#define COLLIDER_o1534 0x6 -#define COLLIDER_o1511 0x5 -#define COLLIDER_o1533 0x4 -#define COLLIDER_o1507 0x3 -#define COLLIDER_o1532 0x2 -#define COLLIDER_o1509 0x1 -#define COLLIDER_o1531 0x0 +#define COLLIDER_Root 0x11 +#define COLLIDER_niwa 0x10 +#define COLLIDER_o1520 0xF +#define COLLIDER_o1538 0xE +#define COLLIDER_o1524 0xD +#define COLLIDER_o1537 0xC +#define COLLIDER_o1519 0xB +#define COLLIDER_o1536 0xA +#define COLLIDER_o1523 0x9 +#define COLLIDER_o1535 0x8 +#define COLLIDER_o1515 0x7 +#define COLLIDER_o1534 0x6 +#define COLLIDER_o1511 0x5 +#define COLLIDER_o1533 0x4 +#define COLLIDER_o1507 0x3 +#define COLLIDER_o1532 0x2 +#define COLLIDER_o1509 0x1 +#define COLLIDER_o1531 0x0 + +#define ZONE_Root 0x4 +#define ZONE_Default 0x3 +#define ZONE_o1505 0x2 +#define ZONE_niwa 0x1 +#define ZONE_o1073 0x0 + diff --git a/include/mapfs/osr_03_shape.h b/include/mapfs/osr_03_shape.h index 4a7ee13aef..252efb91b5 100644 --- a/include/mapfs/osr_03_shape.h +++ b/include/mapfs/osr_03_shape.h @@ -1,137 +1,138 @@ -#define MODEL_Root 0x88 -#define MODEL_g244 0x87 -#define MODEL_g277 0x86 -#define MODEL_o639 0x85 -#define MODEL_o638 0x84 -#define MODEL_o637 0x83 -#define MODEL_o636 0x82 -#define MODEL_obj 0x81 -#define MODEL_o6 0x80 -#define MODEL_o6_1 0x7F -#define MODEL_o5 0x7E -#define MODEL_o5_1 0x7D -#define MODEL_o4 0x7C -#define MODEL_o4_1 0x7B -#define MODEL_o3 0x7A -#define MODEL_o3_2 0x79 -#define MODEL_o3_1 0x78 -#define MODEL_o2 0x77 -#define MODEL_o2_1 0x76 -#define MODEL_o1 0x75 -#define MODEL_o1_1 0x74 -#define MODEL_kemuri 0x73 -#define MODEL_kem3 0x72 -#define MODEL_ke3 0x71 -#define MODEL_kem2 0x70 -#define MODEL_ke2 0x6F -#define MODEL_kem1 0x6E -#define MODEL_ke1 0x6D -#define MODEL_jimen 0x6C -#define MODEL_jime 0x6B -#define MODEL_ji 0x6A -#define MODEL_ki2 0x69 -#define MODEL_ha2 0x68 -#define MODEL_moku2 0x67 -#define MODEL_ki1 0x66 -#define MODEL_ha1 0x65 -#define MODEL_moku1 0x64 -#define MODEL_kumo 0x63 -#define MODEL_o1503 0x62 -#define MODEL_o1465 0x61 -#define MODEL_o1502 0x60 -#define MODEL_o1464 0x5F -#define MODEL_jimidori 0x5E -#define MODEL_6 0x5D -#define MODEL_j10 0x5C -#define MODEL_5 0x5B -#define MODEL_j9 0x5A -#define MODEL_4 0x59 -#define MODEL_j8 0x58 -#define MODEL_j7 0x57 -#define MODEL_3 0x56 -#define MODEL_j6 0x55 -#define MODEL_j5 0x54 -#define MODEL_j4 0x53 -#define MODEL_2 0x52 -#define MODEL_j3 0x51 -#define MODEL_1 0x50 -#define MODEL_j2 0x4F -#define MODEL_j1 0x4E -#define MODEL_niwa 0x4D -#define MODEL_o1042 0x4C -#define MODEL_o1039 0x4B -#define MODEL_o1073 0x4A -#define MODEL_o1035 0x49 -#define MODEL_o1033 0x48 -#define MODEL_o1032 0x47 -#define MODEL_o1491 0x46 -#define MODEL_hiru 0x45 -#define MODEL_shiro1 0x44 -#define MODEL_o934 0x43 -#define MODEL_o933 0x42 -#define MODEL_o961 0x41 -#define MODEL_o1025 0x40 -#define MODEL_o948 0x3F -#define MODEL_o1012 0x3E -#define MODEL_o971 0x3D -#define MODEL_midori1 0x3C -#define MODEL_o1221 0x3B -#define MODEL_o1222 0x3A -#define MODEL_kinoko1 0x39 -#define MODEL_fuci_b1 0x38 -#define MODEL_fuci_a1 0x37 -#define MODEL_kabe_b1 0x36 -#define MODEL_kabe_a1 0x35 -#define MODEL_yane1 0x34 -#define MODEL_kino1 0x33 -#define MODEL_mado1 0x32 -#define MODEL_door1 0x31 -#define MODEL_koopa 0x30 -#define MODEL_yoru 0x2F -#define MODEL_shiro2 0x2E -#define MODEL_o1258 0x2D -#define MODEL_o1253 0x2C -#define MODEL_o1250 0x2B -#define MODEL_o1224 0x2A -#define MODEL_o1256 0x29 -#define MODEL_midori2 0x28 -#define MODEL_o1030 0x27 -#define MODEL_o1029 0x26 -#define MODEL_kinoko2 0x25 -#define MODEL_fuci_b2 0x24 -#define MODEL_fuci_a2 0x23 -#define MODEL_kabe_b2 0x22 -#define MODEL_kabe_a2 0x21 -#define MODEL_yane2 0x20 -#define MODEL_modo2 0x1F -#define MODEL_door2 0x1E -#define MODEL_kao 0x1D -#define MODEL_me 0x1C -#define MODEL_ma 0x1B -#define MODEL_o1501 0x1A -#define MODEL_ku_ta 0x19 -#define MODEL_k_t_2 0x18 -#define MODEL_kusaue2 0x17 -#define MODEL_kusa2 0x16 -#define MODEL_tama2 0x15 -#define MODEL_tam2 0x14 -#define MODEL_toge2 0x13 -#define MODEL_k_t_1 0x12 -#define MODEL_kusaue1 0x11 -#define MODEL_kusa1 0x10 -#define MODEL_tama1 0xF -#define MODEL_tam1 0xE -#define MODEL_toge1 0xD -#define MODEL_wa 0xC -#define MODEL_wa3 0xB -#define MODEL_wa2 0xA -#define MODEL_wa1 0x9 -#define MODEL_g439 0x8 -#define MODEL_o1276 0x7 -#define MODEL_o1273 0x6 -#define MODEL_o1270 0x5 -#define MODEL_o1264 0x4 -#define MODEL_o1260 0x3 -#define MODEL_kubi 0x2 -#define MODEL_kusari 0x1 -#define MODEL_o1275 0x0 +#define MODEL_Root 0x88 +#define MODEL_g244 0x87 +#define MODEL_g277 0x86 +#define MODEL_o639 0x85 +#define MODEL_o638 0x84 +#define MODEL_o637 0x83 +#define MODEL_o636 0x82 +#define MODEL_obj 0x81 +#define MODEL_o6 0x80 +#define MODEL_o6_1 0x7F +#define MODEL_o5 0x7E +#define MODEL_o5_1 0x7D +#define MODEL_o4 0x7C +#define MODEL_o4_1 0x7B +#define MODEL_o3 0x7A +#define MODEL_o3_2 0x79 +#define MODEL_o3_1 0x78 +#define MODEL_o2 0x77 +#define MODEL_o2_1 0x76 +#define MODEL_o1 0x75 +#define MODEL_o1_1 0x74 +#define MODEL_kemuri 0x73 +#define MODEL_kem3 0x72 +#define MODEL_ke3 0x71 +#define MODEL_kem2 0x70 +#define MODEL_ke2 0x6F +#define MODEL_kem1 0x6E +#define MODEL_ke1 0x6D +#define MODEL_jimen 0x6C +#define MODEL_jime 0x6B +#define MODEL_ji 0x6A +#define MODEL_ki2 0x69 +#define MODEL_ha2 0x68 +#define MODEL_moku2 0x67 +#define MODEL_ki1 0x66 +#define MODEL_ha1 0x65 +#define MODEL_moku1 0x64 +#define MODEL_kumo 0x63 +#define MODEL_o1503 0x62 +#define MODEL_o1465 0x61 +#define MODEL_o1502 0x60 +#define MODEL_o1464 0x5F +#define MODEL_jimidori 0x5E +#define MODEL_6 0x5D +#define MODEL_j10 0x5C +#define MODEL_5 0x5B +#define MODEL_j9 0x5A +#define MODEL_4 0x59 +#define MODEL_j8 0x58 +#define MODEL_j7 0x57 +#define MODEL_3 0x56 +#define MODEL_j6 0x55 +#define MODEL_j5 0x54 +#define MODEL_j4 0x53 +#define MODEL_2 0x52 +#define MODEL_j3 0x51 +#define MODEL_1 0x50 +#define MODEL_j2 0x4F +#define MODEL_j1 0x4E +#define MODEL_niwa 0x4D +#define MODEL_o1042 0x4C +#define MODEL_o1039 0x4B +#define MODEL_o1073 0x4A +#define MODEL_o1035 0x49 +#define MODEL_o1033 0x48 +#define MODEL_o1032 0x47 +#define MODEL_o1491 0x46 +#define MODEL_hiru 0x45 +#define MODEL_shiro1 0x44 +#define MODEL_o934 0x43 +#define MODEL_o933 0x42 +#define MODEL_o961 0x41 +#define MODEL_o1025 0x40 +#define MODEL_o948 0x3F +#define MODEL_o1012 0x3E +#define MODEL_o971 0x3D +#define MODEL_midori1 0x3C +#define MODEL_o1221 0x3B +#define MODEL_o1222 0x3A +#define MODEL_kinoko1 0x39 +#define MODEL_fuci_b1 0x38 +#define MODEL_fuci_a1 0x37 +#define MODEL_kabe_b1 0x36 +#define MODEL_kabe_a1 0x35 +#define MODEL_yane1 0x34 +#define MODEL_kino1 0x33 +#define MODEL_mado1 0x32 +#define MODEL_door1 0x31 +#define MODEL_koopa 0x30 +#define MODEL_yoru 0x2F +#define MODEL_shiro2 0x2E +#define MODEL_o1258 0x2D +#define MODEL_o1253 0x2C +#define MODEL_o1250 0x2B +#define MODEL_o1224 0x2A +#define MODEL_o1256 0x29 +#define MODEL_midori2 0x28 +#define MODEL_o1030 0x27 +#define MODEL_o1029 0x26 +#define MODEL_kinoko2 0x25 +#define MODEL_fuci_b2 0x24 +#define MODEL_fuci_a2 0x23 +#define MODEL_kabe_b2 0x22 +#define MODEL_kabe_a2 0x21 +#define MODEL_yane2 0x20 +#define MODEL_modo2 0x1F +#define MODEL_door2 0x1E +#define MODEL_kao 0x1D +#define MODEL_me 0x1C +#define MODEL_ma 0x1B +#define MODEL_o1501 0x1A +#define MODEL_ku_ta 0x19 +#define MODEL_k_t_2 0x18 +#define MODEL_kusaue2 0x17 +#define MODEL_kusa2 0x16 +#define MODEL_tama2 0x15 +#define MODEL_tam2 0x14 +#define MODEL_toge2 0x13 +#define MODEL_k_t_1 0x12 +#define MODEL_kusaue1 0x11 +#define MODEL_kusa1 0x10 +#define MODEL_tama1 0xF +#define MODEL_tam1 0xE +#define MODEL_toge1 0xD +#define MODEL_wa 0xC +#define MODEL_wa3 0xB +#define MODEL_wa2 0xA +#define MODEL_wa1 0x9 +#define MODEL_g439 0x8 +#define MODEL_o1276 0x7 +#define MODEL_o1273 0x6 +#define MODEL_o1270 0x5 +#define MODEL_o1264 0x4 +#define MODEL_o1260 0x3 +#define MODEL_kubi 0x2 +#define MODEL_kusari 0x1 +#define MODEL_o1275 0x0 + diff --git a/include/mapfs/osr_04_hit.h b/include/mapfs/osr_04_hit.h index b149746b8f..76050b01e8 100644 --- a/include/mapfs/osr_04_hit.h +++ b/include/mapfs/osr_04_hit.h @@ -1 +1,4 @@ -#define COLLIDER_Root 0x0 +#define COLLIDER_Root 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/osr_04_shape.h b/include/mapfs/osr_04_shape.h index 98ef430c86..dee3600cd9 100644 --- a/include/mapfs/osr_04_shape.h +++ b/include/mapfs/osr_04_shape.h @@ -1 +1,2 @@ -#define MODEL_Root 0x0 +#define MODEL_Root 0x0 + diff --git a/include/mapfs/pra_01_hit.h b/include/mapfs/pra_01_hit.h index 0c121a94dd..aa4f159944 100644 --- a/include/mapfs/pra_01_hit.h +++ b/include/mapfs/pra_01_hit.h @@ -1,46 +1,54 @@ -#define COLLIDER_Root 0x2D -#define COLLIDER_g369 0x2C -#define COLLIDER_o1398 0x2B -#define COLLIDER_o1396 0x2A -#define COLLIDER_o1393 0x29 -#define COLLIDER_o1390 0x28 -#define COLLIDER_g341 0x27 -#define COLLIDER_g366 0x26 -#define COLLIDER_o1359 0x25 -#define COLLIDER_o1373 0x24 -#define COLLIDER_o1372 0x23 -#define COLLIDER_o1369 0x22 -#define COLLIDER_o1368 0x21 -#define COLLIDER_g367 0x20 -#define COLLIDER_o1386 0x1F -#define COLLIDER_o1384 0x1E -#define COLLIDER_o1389 0x1D -#define COLLIDER_o1383 0x1C -#define COLLIDER_g345 0x1B -#define COLLIDER_o1338 0x1A -#define COLLIDER_o1337 0x19 -#define COLLIDER_o1328 0x18 -#define COLLIDER_o1327 0x17 -#define COLLIDER_g253 0x16 -#define COLLIDER_o1378 0x15 -#define COLLIDER_deilitnw 0x14 -#define COLLIDER_deilinw 0x13 -#define COLLIDER_o1379 0x12 -#define COLLIDER_deilitsw 0x11 -#define COLLIDER_deilisw 0x10 -#define COLLIDER_o975 0xF -#define COLLIDER_deilittne 0xE -#define COLLIDER_deilitne 0xD -#define COLLIDER_deiline 0xC -#define COLLIDER_o979 0xB -#define COLLIDER_deilittse 0xA -#define COLLIDER_deilitse 0x9 -#define COLLIDER_deilise 0x8 -#define COLLIDER_g229 0x7 -#define COLLIDER_o1310 0x6 -#define COLLIDER_o1309 0x5 -#define COLLIDER_o956 0x4 -#define COLLIDER_o955 0x3 -#define COLLIDER_o954 0x2 -#define COLLIDER_o949 0x1 -#define COLLIDER_o945 0x0 +#define COLLIDER_Root 0x2D +#define COLLIDER_g369 0x2C +#define COLLIDER_o1398 0x2B +#define COLLIDER_o1396 0x2A +#define COLLIDER_o1393 0x29 +#define COLLIDER_o1390 0x28 +#define COLLIDER_g341 0x27 +#define COLLIDER_g366 0x26 +#define COLLIDER_o1359 0x25 +#define COLLIDER_o1373 0x24 +#define COLLIDER_o1372 0x23 +#define COLLIDER_o1369 0x22 +#define COLLIDER_o1368 0x21 +#define COLLIDER_g367 0x20 +#define COLLIDER_o1386 0x1F +#define COLLIDER_o1384 0x1E +#define COLLIDER_o1389 0x1D +#define COLLIDER_o1383 0x1C +#define COLLIDER_g345 0x1B +#define COLLIDER_o1338 0x1A +#define COLLIDER_o1337 0x19 +#define COLLIDER_o1328 0x18 +#define COLLIDER_o1327 0x17 +#define COLLIDER_g253 0x16 +#define COLLIDER_o1378 0x15 +#define COLLIDER_deilitnw 0x14 +#define COLLIDER_deilinw 0x13 +#define COLLIDER_o1379 0x12 +#define COLLIDER_deilitsw 0x11 +#define COLLIDER_deilisw 0x10 +#define COLLIDER_o975 0xF +#define COLLIDER_deilittne 0xE +#define COLLIDER_deilitne 0xD +#define COLLIDER_deiline 0xC +#define COLLIDER_o979 0xB +#define COLLIDER_deilittse 0xA +#define COLLIDER_deilitse 0x9 +#define COLLIDER_deilise 0x8 +#define COLLIDER_g229 0x7 +#define COLLIDER_o1310 0x6 +#define COLLIDER_o1309 0x5 +#define COLLIDER_o956 0x4 +#define COLLIDER_o955 0x3 +#define COLLIDER_o954 0x2 +#define COLLIDER_o949 0x1 +#define COLLIDER_o945 0x0 + +#define ZONE_Root 0x5 +#define ZONE_g144 0x4 +#define ZONE_o1020 0x3 +#define ZONE_o1019 0x2 +#define ZONE_o1017 0x1 +#define ZONE_o1016 0x0 + diff --git a/include/mapfs/pra_01_shape.h b/include/mapfs/pra_01_shape.h index 9e9f72bcd1..a36836f050 100644 --- a/include/mapfs/pra_01_shape.h +++ b/include/mapfs/pra_01_shape.h @@ -1,64 +1,65 @@ -#define MODEL_Root 0x3F -#define MODEL_g252 0x3E -#define MODEL_o1192 0x3D -#define MODEL_o1191 0x3C -#define MODEL_o1242 0x3B -#define MODEL_o1244 0x3A -#define MODEL_g240 0x39 -#define MODEL_o1076 0x38 -#define MODEL_o943 0x37 -#define MODEL_g261 0x36 -#define MODEL_o948 0x35 -#define MODEL_g260 0x34 -#define MODEL_o946 0x33 -#define MODEL_o1221 0x32 -#define MODEL_o1222 0x31 -#define MODEL_o973 0x30 -#define MODEL_o971 0x2F -#define MODEL_o1217 0x2E -#define MODEL_o1219 0x2D -#define MODEL_o1234 0x2C -#define MODEL_o1253 0x2B -#define MODEL_o1270 0x2A -#define MODEL_o1229 0x29 -#define MODEL_o1215 0x28 -#define MODEL_o1245 0x27 -#define MODEL_o1257 0x26 -#define MODEL_o965 0x25 -#define MODEL_o1261 0x24 -#define MODEL_o1231 0x23 -#define MODEL_o1251 0x22 -#define MODEL_o892 0x21 -#define MODEL_o914 0x20 -#define MODEL_g218 0x1F -#define MODEL_o549 0x1E -#define MODEL_tou 0x1D -#define MODEL_o1207 0x1C -#define MODEL_o1064 0x1B -#define MODEL_g253 0x1A -#define MODEL_o1224 0x19 -#define MODEL_o940 0x18 -#define MODEL_o1223 0x17 -#define MODEL_o1226 0x16 -#define MODEL_o1225 0x15 -#define MODEL_g263 0x14 -#define MODEL_o952 0x13 -#define MODEL_g262 0x12 -#define MODEL_o950 0x11 -#define MODEL_o974 0x10 -#define MODEL_o968 0xF -#define MODEL_o1235 0xE -#define MODEL_o1269 0xD -#define MODEL_o1268 0xC -#define MODEL_o1263 0xB -#define MODEL_o1227 0xA -#define MODEL_o1256 0x9 -#define MODEL_o964 0x8 -#define MODEL_o913 0x7 -#define MODEL_o1255 0x6 -#define MODEL_o1237 0x5 -#define MODEL_o1254 0x4 -#define MODEL_o1230 0x3 -#define MODEL_o1262 0x2 -#define MODEL_o1080 0x1 -#define MODEL_o891 0x0 +#define MODEL_Root 0x3F +#define MODEL_g252 0x3E +#define MODEL_o1192 0x3D +#define MODEL_o1191 0x3C +#define MODEL_o1242 0x3B +#define MODEL_o1244 0x3A +#define MODEL_g240 0x39 +#define MODEL_o1076 0x38 +#define MODEL_o943 0x37 +#define MODEL_g261 0x36 +#define MODEL_o948 0x35 +#define MODEL_g260 0x34 +#define MODEL_o946 0x33 +#define MODEL_o1221 0x32 +#define MODEL_o1222 0x31 +#define MODEL_o973 0x30 +#define MODEL_o971 0x2F +#define MODEL_o1217 0x2E +#define MODEL_o1219 0x2D +#define MODEL_o1234 0x2C +#define MODEL_o1253 0x2B +#define MODEL_o1270 0x2A +#define MODEL_o1229 0x29 +#define MODEL_o1215 0x28 +#define MODEL_o1245 0x27 +#define MODEL_o1257 0x26 +#define MODEL_o965 0x25 +#define MODEL_o1261 0x24 +#define MODEL_o1231 0x23 +#define MODEL_o1251 0x22 +#define MODEL_o892 0x21 +#define MODEL_o914 0x20 +#define MODEL_g218 0x1F +#define MODEL_o549 0x1E +#define MODEL_tou 0x1D +#define MODEL_o1207 0x1C +#define MODEL_o1064 0x1B +#define MODEL_g253 0x1A +#define MODEL_o1224 0x19 +#define MODEL_o940 0x18 +#define MODEL_o1223 0x17 +#define MODEL_o1226 0x16 +#define MODEL_o1225 0x15 +#define MODEL_g263 0x14 +#define MODEL_o952 0x13 +#define MODEL_g262 0x12 +#define MODEL_o950 0x11 +#define MODEL_o974 0x10 +#define MODEL_o968 0xF +#define MODEL_o1235 0xE +#define MODEL_o1269 0xD +#define MODEL_o1268 0xC +#define MODEL_o1263 0xB +#define MODEL_o1227 0xA +#define MODEL_o1256 0x9 +#define MODEL_o964 0x8 +#define MODEL_o913 0x7 +#define MODEL_o1255 0x6 +#define MODEL_o1237 0x5 +#define MODEL_o1254 0x4 +#define MODEL_o1230 0x3 +#define MODEL_o1262 0x2 +#define MODEL_o1080 0x1 +#define MODEL_o891 0x0 + diff --git a/include/mapfs/pra_02_hit.h b/include/mapfs/pra_02_hit.h index 881dfebd5a..82c343537b 100644 --- a/include/mapfs/pra_02_hit.h +++ b/include/mapfs/pra_02_hit.h @@ -1,71 +1,77 @@ -#define COLLIDER_Root 0x46 -#define COLLIDER_Default 0x45 -#define COLLIDER_o1357 0x44 -#define COLLIDER_o1356 0x43 -#define COLLIDER_o1355 0x42 -#define COLLIDER_o1354 0x41 -#define COLLIDER_g144 0x40 -#define COLLIDER_g345 0x3F -#define COLLIDER_o1344 0x3E -#define COLLIDER_o1342 0x3D -#define COLLIDER_g183 0x3C -#define COLLIDER_g259 0x3B -#define COLLIDER_deilittsse 0x3A -#define COLLIDER_o1015 0x39 -#define COLLIDER_deilittssw 0x38 -#define COLLIDER_deilitssw 0x37 -#define COLLIDER_deilissw 0x36 -#define COLLIDER_deilittnne 0x35 -#define COLLIDER_o983 0x34 -#define COLLIDER_deilittnnw 0x33 -#define COLLIDER_deilitnnw 0x32 -#define COLLIDER_deilinnw 0x31 -#define COLLIDER_g253 0x30 -#define COLLIDER_g344 0x2F -#define COLLIDER_o1339 0x2E -#define COLLIDER_deilittse2 0x2D -#define COLLIDER_deilitse2 0x2C -#define COLLIDER_deilise2 0x2B -#define COLLIDER_o1335 0x2A -#define COLLIDER_deilittne2 0x29 -#define COLLIDER_deilitne2 0x28 -#define COLLIDER_deiline2 0x27 -#define COLLIDER_g341 0x26 -#define COLLIDER_o979 0x25 -#define COLLIDER_deilittse 0x24 -#define COLLIDER_deilitse 0x23 -#define COLLIDER_deilise 0x22 -#define COLLIDER_o975 0x21 -#define COLLIDER_deilittne 0x20 -#define COLLIDER_deilitne 0x1F -#define COLLIDER_deiline 0x1E -#define COLLIDER_o960 0x1D -#define COLLIDER_deilittnw 0x1C -#define COLLIDER_deilitnw 0x1B -#define COLLIDER_deilinw 0x1A -#define COLLIDER_o903 0x19 -#define COLLIDER_deilittsw 0x18 -#define COLLIDER_deilitsw 0x17 -#define COLLIDER_deilisw 0x16 -#define COLLIDER_g257 0x15 -#define COLLIDER_o1294 0x14 -#define COLLIDER_o945 0x13 -#define COLLIDER_g229 0x12 -#define COLLIDER_o1314 0x11 -#define COLLIDER_o1313 0x10 -#define COLLIDER_o1304 0xF -#define COLLIDER_o1303 0xE -#define COLLIDER_o1300 0xD -#define COLLIDER_o1296 0xC -#define COLLIDER_o1292 0xB -#define COLLIDER_o688 0xA -#define COLLIDER_o686 0x9 -#define COLLIDER_o892 0x8 -#define COLLIDER_o891 0x7 -#define COLLIDER_o957 0x6 -#define COLLIDER_o955 0x5 -#define COLLIDER_o954 0x4 -#define COLLIDER_o953 0x3 -#define COLLIDER_o952 0x2 -#define COLLIDER_o950 0x1 -#define COLLIDER_o662 0x0 +#define COLLIDER_Root 0x46 +#define COLLIDER_Default 0x45 +#define COLLIDER_o1357 0x44 +#define COLLIDER_o1356 0x43 +#define COLLIDER_o1355 0x42 +#define COLLIDER_o1354 0x41 +#define COLLIDER_g144 0x40 +#define COLLIDER_g345 0x3F +#define COLLIDER_o1344 0x3E +#define COLLIDER_o1342 0x3D +#define COLLIDER_g183 0x3C +#define COLLIDER_g259 0x3B +#define COLLIDER_deilittsse 0x3A +#define COLLIDER_o1015 0x39 +#define COLLIDER_deilittssw 0x38 +#define COLLIDER_deilitssw 0x37 +#define COLLIDER_deilissw 0x36 +#define COLLIDER_deilittnne 0x35 +#define COLLIDER_o983 0x34 +#define COLLIDER_deilittnnw 0x33 +#define COLLIDER_deilitnnw 0x32 +#define COLLIDER_deilinnw 0x31 +#define COLLIDER_g253 0x30 +#define COLLIDER_g344 0x2F +#define COLLIDER_o1339 0x2E +#define COLLIDER_deilittse2 0x2D +#define COLLIDER_deilitse2 0x2C +#define COLLIDER_deilise2 0x2B +#define COLLIDER_o1335 0x2A +#define COLLIDER_deilittne2 0x29 +#define COLLIDER_deilitne2 0x28 +#define COLLIDER_deiline2 0x27 +#define COLLIDER_g341 0x26 +#define COLLIDER_o979 0x25 +#define COLLIDER_deilittse 0x24 +#define COLLIDER_deilitse 0x23 +#define COLLIDER_deilise 0x22 +#define COLLIDER_o975 0x21 +#define COLLIDER_deilittne 0x20 +#define COLLIDER_deilitne 0x1F +#define COLLIDER_deiline 0x1E +#define COLLIDER_o960 0x1D +#define COLLIDER_deilittnw 0x1C +#define COLLIDER_deilitnw 0x1B +#define COLLIDER_deilinw 0x1A +#define COLLIDER_o903 0x19 +#define COLLIDER_deilittsw 0x18 +#define COLLIDER_deilitsw 0x17 +#define COLLIDER_deilisw 0x16 +#define COLLIDER_g257 0x15 +#define COLLIDER_o1294 0x14 +#define COLLIDER_o945 0x13 +#define COLLIDER_g229 0x12 +#define COLLIDER_o1314 0x11 +#define COLLIDER_o1313 0x10 +#define COLLIDER_o1304 0xF +#define COLLIDER_o1303 0xE +#define COLLIDER_o1300 0xD +#define COLLIDER_o1296 0xC +#define COLLIDER_o1292 0xB +#define COLLIDER_o688 0xA +#define COLLIDER_o686 0x9 +#define COLLIDER_o892 0x8 +#define COLLIDER_o891 0x7 +#define COLLIDER_o957 0x6 +#define COLLIDER_o955 0x5 +#define COLLIDER_o954 0x4 +#define COLLIDER_o953 0x3 +#define COLLIDER_o952 0x2 +#define COLLIDER_o950 0x1 +#define COLLIDER_o662 0x0 + +#define ZONE_Root 0x3 +#define ZONE_g144 0x2 +#define ZONE_o1019 0x1 +#define ZONE_o1016 0x0 + diff --git a/include/mapfs/pra_02_shape.h b/include/mapfs/pra_02_shape.h index ba0ec47ac4..3c370f0c8a 100644 --- a/include/mapfs/pra_02_shape.h +++ b/include/mapfs/pra_02_shape.h @@ -1,118 +1,119 @@ -#define MODEL_Root 0x75 -#define MODEL_g238 0x74 -#define MODEL_g234 0x73 -#define MODEL_o847 0x72 -#define MODEL_g219 0x71 -#define MODEL_o846 0x70 -#define MODEL_o768 0x6F -#define MODEL_g220 0x6E -#define MODEL_o844 0x6D -#define MODEL_o772 0x6C -#define MODEL_g291 0x6B -#define MODEL_g306 0x6A -#define MODEL_o1215 0x69 -#define MODEL_o1214 0x68 -#define MODEL_o1213 0x67 -#define MODEL_g300 0x66 -#define MODEL_o1177 0x65 -#define MODEL_o1176 0x64 -#define MODEL_g293 0x63 -#define MODEL_g297 0x62 -#define MODEL_o1162 0x61 -#define MODEL_g296 0x60 -#define MODEL_o1160 0x5F -#define MODEL_g295 0x5E -#define MODEL_o1158 0x5D -#define MODEL_g294 0x5C -#define MODEL_o1156 0x5B -#define MODEL_g292 0x5A -#define MODEL_o1154 0x59 -#define MODEL_o1150 0x58 -#define MODEL_o1149 0x57 -#define MODEL_o1148 0x56 -#define MODEL_o1145 0x55 -#define MODEL_o1144 0x54 -#define MODEL_g270 0x53 -#define MODEL_o974 0x52 -#define MODEL_o973 0x51 -#define MODEL_g305 0x50 -#define MODEL_o1194 0x4F -#define MODEL_o1204 0x4E -#define MODEL_o1198 0x4D -#define MODEL_o1205 0x4C -#define MODEL_o1202 0x4B -#define MODEL_g259 0x4A -#define MODEL_g263 0x49 -#define MODEL_o952 0x48 -#define MODEL_g262 0x47 -#define MODEL_o950 0x46 -#define MODEL_g261 0x45 -#define MODEL_o948 0x44 -#define MODEL_g260 0x43 -#define MODEL_o946 0x42 -#define MODEL_g258 0x41 -#define MODEL_o1080 0x40 -#define MODEL_o1076 0x3F -#define MODEL_o944 0x3E -#define MODEL_o943 0x3D -#define MODEL_o942 0x3C -#define MODEL_o940 0x3B -#define MODEL_o939 0x3A -#define MODEL_g144 0x39 -#define MODEL_g308 0x38 -#define MODEL_o1233 0x37 -#define MODEL_o1232 0x36 -#define MODEL_o1231 0x35 -#define MODEL_o1230 0x34 -#define MODEL_o1229 0x33 -#define MODEL_o1228 0x32 -#define MODEL_g307 0x31 -#define MODEL_o1225 0x30 -#define MODEL_o1226 0x2F -#define MODEL_o1227 0x2E -#define MODEL_o1224 0x2D -#define MODEL_o1223 0x2C -#define MODEL_o1222 0x2B -#define MODEL_g323 0x2A -#define MODEL_g315 0x29 -#define MODEL_o1280 0x28 -#define MODEL_o1279 0x27 -#define MODEL_o1278 0x26 -#define MODEL_g318 0x25 -#define MODEL_o1311 0x24 -#define MODEL_o1312 0x23 -#define MODEL_g253 0x22 -#define MODEL_o1290 0x21 -#define MODEL_o1289 0x20 -#define MODEL_o1288 0x1F -#define MODEL_g228 0x1E -#define MODEL_o795 0x1D -#define MODEL_o794 0x1C -#define MODEL_g317 0x1B -#define MODEL_g252 0x1A -#define MODEL_o1298 0x19 -#define MODEL_o1294 0x18 -#define MODEL_o1297 0x17 -#define MODEL_o1304 0x16 -#define MODEL_g218 0x15 -#define MODEL_o549 0x14 -#define MODEL_g322 0x13 -#define MODEL_g221 0x12 -#define MODEL_o774 0x11 -#define MODEL_g237 0x10 -#define MODEL_o861 0xF -#define MODEL_g236 0xE -#define MODEL_o859 0xD -#define MODEL_g324 0xC -#define MODEL_o1310 0xB -#define MODEL_g320 0xA -#define MODEL_o1317 0x9 -#define MODEL_o1316 0x8 -#define MODEL_o1315 0x7 -#define MODEL_g185 0x6 -#define MODEL_o1254 0x5 -#define MODEL_o1253 0x4 -#define MODEL_o1250 0x3 -#define MODEL_o636 0x2 -#define MODEL_o634 0x1 -#define MODEL_o1238 0x0 +#define MODEL_Root 0x75 +#define MODEL_g238 0x74 +#define MODEL_g234 0x73 +#define MODEL_o847 0x72 +#define MODEL_g219 0x71 +#define MODEL_o846 0x70 +#define MODEL_o768 0x6F +#define MODEL_g220 0x6E +#define MODEL_o844 0x6D +#define MODEL_o772 0x6C +#define MODEL_g291 0x6B +#define MODEL_g306 0x6A +#define MODEL_o1215 0x69 +#define MODEL_o1214 0x68 +#define MODEL_o1213 0x67 +#define MODEL_g300 0x66 +#define MODEL_o1177 0x65 +#define MODEL_o1176 0x64 +#define MODEL_g293 0x63 +#define MODEL_g297 0x62 +#define MODEL_o1162 0x61 +#define MODEL_g296 0x60 +#define MODEL_o1160 0x5F +#define MODEL_g295 0x5E +#define MODEL_o1158 0x5D +#define MODEL_g294 0x5C +#define MODEL_o1156 0x5B +#define MODEL_g292 0x5A +#define MODEL_o1154 0x59 +#define MODEL_o1150 0x58 +#define MODEL_o1149 0x57 +#define MODEL_o1148 0x56 +#define MODEL_o1145 0x55 +#define MODEL_o1144 0x54 +#define MODEL_g270 0x53 +#define MODEL_o974 0x52 +#define MODEL_o973 0x51 +#define MODEL_g305 0x50 +#define MODEL_o1194 0x4F +#define MODEL_o1204 0x4E +#define MODEL_o1198 0x4D +#define MODEL_o1205 0x4C +#define MODEL_o1202 0x4B +#define MODEL_g259 0x4A +#define MODEL_g263 0x49 +#define MODEL_o952 0x48 +#define MODEL_g262 0x47 +#define MODEL_o950 0x46 +#define MODEL_g261 0x45 +#define MODEL_o948 0x44 +#define MODEL_g260 0x43 +#define MODEL_o946 0x42 +#define MODEL_g258 0x41 +#define MODEL_o1080 0x40 +#define MODEL_o1076 0x3F +#define MODEL_o944 0x3E +#define MODEL_o943 0x3D +#define MODEL_o942 0x3C +#define MODEL_o940 0x3B +#define MODEL_o939 0x3A +#define MODEL_g144 0x39 +#define MODEL_g308 0x38 +#define MODEL_o1233 0x37 +#define MODEL_o1232 0x36 +#define MODEL_o1231 0x35 +#define MODEL_o1230 0x34 +#define MODEL_o1229 0x33 +#define MODEL_o1228 0x32 +#define MODEL_g307 0x31 +#define MODEL_o1225 0x30 +#define MODEL_o1226 0x2F +#define MODEL_o1227 0x2E +#define MODEL_o1224 0x2D +#define MODEL_o1223 0x2C +#define MODEL_o1222 0x2B +#define MODEL_g323 0x2A +#define MODEL_g315 0x29 +#define MODEL_o1280 0x28 +#define MODEL_o1279 0x27 +#define MODEL_o1278 0x26 +#define MODEL_g318 0x25 +#define MODEL_o1311 0x24 +#define MODEL_o1312 0x23 +#define MODEL_g253 0x22 +#define MODEL_o1290 0x21 +#define MODEL_o1289 0x20 +#define MODEL_o1288 0x1F +#define MODEL_g228 0x1E +#define MODEL_o795 0x1D +#define MODEL_o794 0x1C +#define MODEL_g317 0x1B +#define MODEL_g252 0x1A +#define MODEL_o1298 0x19 +#define MODEL_o1294 0x18 +#define MODEL_o1297 0x17 +#define MODEL_o1304 0x16 +#define MODEL_g218 0x15 +#define MODEL_o549 0x14 +#define MODEL_g322 0x13 +#define MODEL_g221 0x12 +#define MODEL_o774 0x11 +#define MODEL_g237 0x10 +#define MODEL_o861 0xF +#define MODEL_g236 0xE +#define MODEL_o859 0xD +#define MODEL_g324 0xC +#define MODEL_o1310 0xB +#define MODEL_g320 0xA +#define MODEL_o1317 0x9 +#define MODEL_o1316 0x8 +#define MODEL_o1315 0x7 +#define MODEL_g185 0x6 +#define MODEL_o1254 0x5 +#define MODEL_o1253 0x4 +#define MODEL_o1250 0x3 +#define MODEL_o636 0x2 +#define MODEL_o634 0x1 +#define MODEL_o1238 0x0 + diff --git a/include/mapfs/pra_03_hit.h b/include/mapfs/pra_03_hit.h index 2b87927b02..a2a97af004 100644 --- a/include/mapfs/pra_03_hit.h +++ b/include/mapfs/pra_03_hit.h @@ -1,44 +1,51 @@ -#define COLLIDER_Root 0x2B -#define COLLIDER_g144 0x2A -#define COLLIDER_g262 0x29 -#define COLLIDER_g264 0x28 -#define COLLIDER_o1036 0x27 -#define COLLIDER_g263 0x26 -#define COLLIDER_o1033 0x25 -#define COLLIDER_deilittnne 0x24 -#define COLLIDER_deilitnne 0x23 -#define COLLIDER_deilinne 0x22 -#define COLLIDER_o1025 0x21 -#define COLLIDER_g267 0x20 -#define COLLIDER_o1045 0x1F -#define COLLIDER_o1055 0x1E -#define COLLIDER_o1052 0x1D -#define COLLIDER_o1049 0x1C -#define COLLIDER_o1048 0x1B -#define COLLIDER_o1047 0x1A -#define COLLIDER_g183 0x19 -#define COLLIDER_g261 0x18 -#define COLLIDER_o1022 0x17 -#define COLLIDER_deilittn 0x16 -#define COLLIDER_g259 0x15 -#define COLLIDER_o983 0x14 -#define COLLIDER_deilittnnw 0x13 -#define COLLIDER_deilitnnw 0x12 -#define COLLIDER_deilinnw 0x11 -#define COLLIDER_g253 0x10 -#define COLLIDER_o975 0xF -#define COLLIDER_deilittne 0xE -#define COLLIDER_deilitne 0xD -#define COLLIDER_deiline 0xC -#define COLLIDER_deilittnw 0xB -#define COLLIDER_g229 0xA -#define COLLIDER_o1060 0x9 -#define COLLIDER_o1059 0x8 -#define COLLIDER_o1058 0x7 -#define COLLIDER_o1057 0x6 -#define COLLIDER_o1056 0x5 -#define COLLIDER_o682 0x4 -#define COLLIDER_o955 0x3 -#define COLLIDER_o952 0x2 -#define COLLIDER_o662 0x1 -#define COLLIDER_o1023 0x0 +#define COLLIDER_Root 0x2B +#define COLLIDER_g144 0x2A +#define COLLIDER_g262 0x29 +#define COLLIDER_g264 0x28 +#define COLLIDER_o1036 0x27 +#define COLLIDER_g263 0x26 +#define COLLIDER_o1033 0x25 +#define COLLIDER_deilittnne 0x24 +#define COLLIDER_deilitnne 0x23 +#define COLLIDER_deilinne 0x22 +#define COLLIDER_o1025 0x21 +#define COLLIDER_g267 0x20 +#define COLLIDER_o1045 0x1F +#define COLLIDER_o1055 0x1E +#define COLLIDER_o1052 0x1D +#define COLLIDER_o1049 0x1C +#define COLLIDER_o1048 0x1B +#define COLLIDER_o1047 0x1A +#define COLLIDER_g183 0x19 +#define COLLIDER_g261 0x18 +#define COLLIDER_o1022 0x17 +#define COLLIDER_deilittn 0x16 +#define COLLIDER_g259 0x15 +#define COLLIDER_o983 0x14 +#define COLLIDER_deilittnnw 0x13 +#define COLLIDER_deilitnnw 0x12 +#define COLLIDER_deilinnw 0x11 +#define COLLIDER_g253 0x10 +#define COLLIDER_o975 0xF +#define COLLIDER_deilittne 0xE +#define COLLIDER_deilitne 0xD +#define COLLIDER_deiline 0xC +#define COLLIDER_deilittnw 0xB +#define COLLIDER_g229 0xA +#define COLLIDER_o1060 0x9 +#define COLLIDER_o1059 0x8 +#define COLLIDER_o1058 0x7 +#define COLLIDER_o1057 0x6 +#define COLLIDER_o1056 0x5 +#define COLLIDER_o682 0x4 +#define COLLIDER_o955 0x3 +#define COLLIDER_o952 0x2 +#define COLLIDER_o662 0x1 +#define COLLIDER_o1023 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g270 0x3 +#define ZONE_o1062 0x2 +#define ZONE_g269 0x1 +#define ZONE_o1060 0x0 + diff --git a/include/mapfs/pra_03_shape.h b/include/mapfs/pra_03_shape.h index d9c09cdb21..2d4b7d467c 100644 --- a/include/mapfs/pra_03_shape.h +++ b/include/mapfs/pra_03_shape.h @@ -1,64 +1,65 @@ -#define MODEL_Root 0x3F -#define MODEL_g261 0x3E -#define MODEL_g273 0x3D -#define MODEL_g280 0x3C -#define MODEL_o993 0x3B -#define MODEL_o990 0x3A -#define MODEL_g275 0x39 -#define MODEL_g279 0x38 -#define MODEL_o989 0x37 -#define MODEL_g278 0x36 -#define MODEL_o988 0x35 -#define MODEL_g274 0x34 -#define MODEL_o982 0x33 -#define MODEL_o981 0x32 -#define MODEL_o980 0x31 -#define MODEL_g265 0x30 -#define MODEL_g271 0x2F -#define MODEL_o1005 0x2E -#define MODEL_o975 0x2D -#define MODEL_g270 0x2C -#define MODEL_o1003 0x2B -#define MODEL_g266 0x2A -#define MODEL_o969 0x29 -#define MODEL_o968 0x28 -#define MODEL_o967 0x27 -#define MODEL_g263 0x26 -#define MODEL_o960 0x25 -#define MODEL_o959 0x24 -#define MODEL_o958 0x23 -#define MODEL_g144 0x22 -#define MODEL_g255 0x21 -#define MODEL_o915 0x20 -#define MODEL_g183 0x1F -#define MODEL_g286 0x1E -#define MODEL_o1012 0x1D -#define MODEL_o1000 0x1C -#define MODEL_g281 0x1B -#define MODEL_o999 0x1A -#define MODEL_o998 0x19 -#define MODEL_g242 0x18 -#define MODEL_g221 0x17 -#define MODEL_o774 0x16 -#define MODEL_g246 0x15 -#define MODEL_o880 0x14 -#define MODEL_g245 0x13 -#define MODEL_o878 0x12 -#define MODEL_g253 0x11 -#define MODEL_o923 0x10 -#define MODEL_g199 0xF -#define MODEL_o1010 0xE -#define MODEL_g197 0xD -#define MODEL_o1011 0xC -#define MODEL_g284 0xB -#define MODEL_o682 0xA -#define MODEL_g185 0x9 -#define MODEL_o938 0x8 -#define MODEL_o856 0x7 -#define MODEL_o870 0x6 -#define MODEL_o869 0x5 -#define MODEL_g229 0x4 -#define MODEL_o1007 0x3 -#define MODEL_o895 0x2 -#define MODEL_o662 0x1 -#define MODEL_o911 0x0 +#define MODEL_Root 0x3F +#define MODEL_g261 0x3E +#define MODEL_g273 0x3D +#define MODEL_g280 0x3C +#define MODEL_o993 0x3B +#define MODEL_o990 0x3A +#define MODEL_g275 0x39 +#define MODEL_g279 0x38 +#define MODEL_o989 0x37 +#define MODEL_g278 0x36 +#define MODEL_o988 0x35 +#define MODEL_g274 0x34 +#define MODEL_o982 0x33 +#define MODEL_o981 0x32 +#define MODEL_o980 0x31 +#define MODEL_g265 0x30 +#define MODEL_g271 0x2F +#define MODEL_o1005 0x2E +#define MODEL_o975 0x2D +#define MODEL_g270 0x2C +#define MODEL_o1003 0x2B +#define MODEL_g266 0x2A +#define MODEL_o969 0x29 +#define MODEL_o968 0x28 +#define MODEL_o967 0x27 +#define MODEL_g263 0x26 +#define MODEL_o960 0x25 +#define MODEL_o959 0x24 +#define MODEL_o958 0x23 +#define MODEL_g144 0x22 +#define MODEL_g255 0x21 +#define MODEL_o915 0x20 +#define MODEL_g183 0x1F +#define MODEL_g286 0x1E +#define MODEL_o1012 0x1D +#define MODEL_o1000 0x1C +#define MODEL_g281 0x1B +#define MODEL_o999 0x1A +#define MODEL_o998 0x19 +#define MODEL_g242 0x18 +#define MODEL_g221 0x17 +#define MODEL_o774 0x16 +#define MODEL_g246 0x15 +#define MODEL_o880 0x14 +#define MODEL_g245 0x13 +#define MODEL_o878 0x12 +#define MODEL_g253 0x11 +#define MODEL_o923 0x10 +#define MODEL_g199 0xF +#define MODEL_o1010 0xE +#define MODEL_g197 0xD +#define MODEL_o1011 0xC +#define MODEL_g284 0xB +#define MODEL_o682 0xA +#define MODEL_g185 0x9 +#define MODEL_o938 0x8 +#define MODEL_o856 0x7 +#define MODEL_o870 0x6 +#define MODEL_o869 0x5 +#define MODEL_g229 0x4 +#define MODEL_o1007 0x3 +#define MODEL_o895 0x2 +#define MODEL_o662 0x1 +#define MODEL_o911 0x0 + diff --git a/include/mapfs/pra_04_hit.h b/include/mapfs/pra_04_hit.h index 36062c79f9..e35725f009 100644 --- a/include/mapfs/pra_04_hit.h +++ b/include/mapfs/pra_04_hit.h @@ -1,42 +1,50 @@ -#define COLLIDER_Root 0x29 -#define COLLIDER_g144 0x28 -#define COLLIDER_g262 0x27 -#define COLLIDER_g264 0x26 -#define COLLIDER_o1040 0x25 -#define COLLIDER_g263 0x24 -#define COLLIDER_o1029 0x23 -#define COLLIDER_deilittsse 0x22 -#define COLLIDER_deilitsse 0x21 -#define COLLIDER_deilisse 0x20 -#define COLLIDER_o1024 0x1F -#define COLLIDER_g267 0x1E -#define COLLIDER_o1042 0x1D -#define COLLIDER_o1054 0x1C -#define COLLIDER_o1053 0x1B -#define COLLIDER_o1051 0x1A -#define COLLIDER_o1050 0x19 -#define COLLIDER_o1046 0x18 -#define COLLIDER_g183 0x17 -#define COLLIDER_g261 0x16 -#define COLLIDER_o1019 0x15 -#define COLLIDER_deilitts 0x14 -#define COLLIDER_g259 0x13 -#define COLLIDER_o1015 0x12 -#define COLLIDER_deilittssw 0x11 -#define COLLIDER_deilitssw 0x10 -#define COLLIDER_deilissw 0xF -#define COLLIDER_g253 0xE -#define COLLIDER_o1060 0xD -#define COLLIDER_o979 0xC -#define COLLIDER_deilittse 0xB -#define COLLIDER_deilitse 0xA -#define COLLIDER_deilise 0x9 -#define COLLIDER_deilittsw 0x8 -#define COLLIDER_g229 0x7 -#define COLLIDER_o1059 0x6 -#define COLLIDER_o1058 0x5 -#define COLLIDER_o1056 0x4 -#define COLLIDER_o957 0x3 -#define COLLIDER_o954 0x2 -#define COLLIDER_o953 0x1 -#define COLLIDER_o945 0x0 +#define COLLIDER_Root 0x29 +#define COLLIDER_g144 0x28 +#define COLLIDER_g262 0x27 +#define COLLIDER_g264 0x26 +#define COLLIDER_o1040 0x25 +#define COLLIDER_g263 0x24 +#define COLLIDER_o1029 0x23 +#define COLLIDER_deilittsse 0x22 +#define COLLIDER_deilitsse 0x21 +#define COLLIDER_deilisse 0x20 +#define COLLIDER_o1024 0x1F +#define COLLIDER_g267 0x1E +#define COLLIDER_o1042 0x1D +#define COLLIDER_o1054 0x1C +#define COLLIDER_o1053 0x1B +#define COLLIDER_o1051 0x1A +#define COLLIDER_o1050 0x19 +#define COLLIDER_o1046 0x18 +#define COLLIDER_g183 0x17 +#define COLLIDER_g261 0x16 +#define COLLIDER_o1019 0x15 +#define COLLIDER_deilitts 0x14 +#define COLLIDER_g259 0x13 +#define COLLIDER_o1015 0x12 +#define COLLIDER_deilittssw 0x11 +#define COLLIDER_deilitssw 0x10 +#define COLLIDER_deilissw 0xF +#define COLLIDER_g253 0xE +#define COLLIDER_o1060 0xD +#define COLLIDER_o979 0xC +#define COLLIDER_deilittse 0xB +#define COLLIDER_deilitse 0xA +#define COLLIDER_deilise 0x9 +#define COLLIDER_deilittsw 0x8 +#define COLLIDER_g229 0x7 +#define COLLIDER_o1059 0x6 +#define COLLIDER_o1058 0x5 +#define COLLIDER_o1056 0x4 +#define COLLIDER_o957 0x3 +#define COLLIDER_o954 0x2 +#define COLLIDER_o953 0x1 +#define COLLIDER_o945 0x0 + +#define ZONE_Root 0x5 +#define ZONE_g144 0x4 +#define ZONE_g270 0x3 +#define ZONE_o1056 0x2 +#define ZONE_g268 0x1 +#define ZONE_o1054 0x0 + diff --git a/include/mapfs/pra_04_shape.h b/include/mapfs/pra_04_shape.h index e7aae15b1a..c7a3e4481f 100644 --- a/include/mapfs/pra_04_shape.h +++ b/include/mapfs/pra_04_shape.h @@ -1,51 +1,52 @@ -#define MODEL_Root 0x32 -#define MODEL_g144 0x31 -#define MODEL_g275 0x30 -#define MODEL_g277 0x2F -#define MODEL_o987 0x2E -#define MODEL_g276 0x2D -#define MODEL_o986 0x2C -#define MODEL_g280 0x2B -#define MODEL_o992 0x2A -#define MODEL_o991 0x29 -#define MODEL_g271 0x28 -#define MODEL_o976 0x27 -#define MODEL_g270 0x26 -#define MODEL_o1004 0x25 -#define MODEL_g266 0x24 -#define MODEL_o984 0x23 -#define MODEL_o1024 0x22 -#define MODEL_o966 0x21 -#define MODEL_o965 0x20 -#define MODEL_g264 0x1F -#define MODEL_o962 0x1E -#define MODEL_o1023 0x1D -#define MODEL_o1022 0x1C -#define MODEL_g240 0x1B -#define MODEL_o1014 0x1A -#define MODEL_Default 0x19 -#define MODEL_o1011 0x18 -#define MODEL_g183 0x17 -#define MODEL_g242 0x16 -#define MODEL_g244 0x15 -#define MODEL_o876 0x14 -#define MODEL_g243 0x13 -#define MODEL_o874 0x12 -#define MODEL_g234 0x11 -#define MODEL_o847 0x10 -#define MODEL_g255 0xF -#define MODEL_o918 0xE -#define MODEL_g281 0xD -#define MODEL_o996 0xC -#define MODEL_o995 0xB -#define MODEL_o994 0xA -#define MODEL_g197 0x9 -#define MODEL_o680 0x8 -#define MODEL_g185 0x7 -#define MODEL_o638 0x6 -#define MODEL_o636 0x5 -#define MODEL_o1021 0x4 -#define MODEL_g286 0x3 -#define MODEL_o1019 0x2 -#define MODEL_o1018 0x1 -#define MODEL_o1017 0x0 +#define MODEL_Root 0x32 +#define MODEL_g144 0x31 +#define MODEL_g275 0x30 +#define MODEL_g277 0x2F +#define MODEL_o987 0x2E +#define MODEL_g276 0x2D +#define MODEL_o986 0x2C +#define MODEL_g280 0x2B +#define MODEL_o992 0x2A +#define MODEL_o991 0x29 +#define MODEL_g271 0x28 +#define MODEL_o976 0x27 +#define MODEL_g270 0x26 +#define MODEL_o1004 0x25 +#define MODEL_g266 0x24 +#define MODEL_o984 0x23 +#define MODEL_o1024 0x22 +#define MODEL_o966 0x21 +#define MODEL_o965 0x20 +#define MODEL_g264 0x1F +#define MODEL_o962 0x1E +#define MODEL_o1023 0x1D +#define MODEL_o1022 0x1C +#define MODEL_g240 0x1B +#define MODEL_o1014 0x1A +#define MODEL_Default 0x19 +#define MODEL_o1011 0x18 +#define MODEL_g183 0x17 +#define MODEL_g242 0x16 +#define MODEL_g244 0x15 +#define MODEL_o876 0x14 +#define MODEL_g243 0x13 +#define MODEL_o874 0x12 +#define MODEL_g234 0x11 +#define MODEL_o847 0x10 +#define MODEL_g255 0xF +#define MODEL_o918 0xE +#define MODEL_g281 0xD +#define MODEL_o996 0xC +#define MODEL_o995 0xB +#define MODEL_o994 0xA +#define MODEL_g197 0x9 +#define MODEL_o680 0x8 +#define MODEL_g185 0x7 +#define MODEL_o638 0x6 +#define MODEL_o636 0x5 +#define MODEL_o1021 0x4 +#define MODEL_g286 0x3 +#define MODEL_o1019 0x2 +#define MODEL_o1018 0x1 +#define MODEL_o1017 0x0 + diff --git a/include/mapfs/pra_05_hit.h b/include/mapfs/pra_05_hit.h index 87edcdb6d1..6070b2e463 100644 --- a/include/mapfs/pra_05_hit.h +++ b/include/mapfs/pra_05_hit.h @@ -1,14 +1,20 @@ -#define COLLIDER_Root 0xD -#define COLLIDER_g253 0xC -#define COLLIDER_o903 0xB -#define COLLIDER_deilittsw 0xA -#define COLLIDER_deilitsw 0x9 -#define COLLIDER_deilisw 0x8 -#define COLLIDER_g229 0x7 -#define COLLIDER_o1017 0x6 -#define COLLIDER_o1016 0x5 -#define COLLIDER_o688 0x4 -#define COLLIDER_o957 0x3 -#define COLLIDER_o954 0x2 -#define COLLIDER_o953 0x1 -#define COLLIDER_o662 0x0 +#define COLLIDER_Root 0xD +#define COLLIDER_g253 0xC +#define COLLIDER_o903 0xB +#define COLLIDER_deilittsw 0xA +#define COLLIDER_deilitsw 0x9 +#define COLLIDER_deilisw 0x8 +#define COLLIDER_g229 0x7 +#define COLLIDER_o1017 0x6 +#define COLLIDER_o1016 0x5 +#define COLLIDER_o688 0x4 +#define COLLIDER_o957 0x3 +#define COLLIDER_o954 0x2 +#define COLLIDER_o953 0x1 +#define COLLIDER_o662 0x0 + +#define ZONE_Root 0x3 +#define ZONE_g144 0x2 +#define ZONE_o1024 0x1 +#define ZONE_o1023 0x0 + diff --git a/include/mapfs/pra_05_shape.h b/include/mapfs/pra_05_shape.h index f9d9375349..c718e6ba4c 100644 --- a/include/mapfs/pra_05_shape.h +++ b/include/mapfs/pra_05_shape.h @@ -1,31 +1,32 @@ -#define MODEL_Root 0x1E -#define MODEL_g268 0x1D -#define MODEL_o968 0x1C -#define MODEL_o969 0x1B -#define MODEL_o966 0x1A -#define MODEL_g238 0x19 -#define MODEL_g220 0x18 -#define MODEL_o844 0x17 -#define MODEL_o772 0x16 -#define MODEL_g219 0x15 -#define MODEL_o846 0x14 -#define MODEL_o768 0x13 -#define MODEL_g253 0x12 -#define MODEL_o914 0x11 -#define MODEL_o903 0x10 -#define MODEL_g144 0xF -#define MODEL_o646 0xE -#define MODEL_o638 0xD -#define MODEL_o636 0xC -#define MODEL_o634 0xB -#define MODEL_g270 0xA -#define MODEL_o978 0x9 -#define MODEL_o977 0x8 -#define MODEL_o976 0x7 -#define MODEL_o975 0x6 -#define MODEL_o974 0x5 -#define MODEL_g269 0x4 -#define MODEL_o973 0x3 -#define MODEL_o972 0x2 -#define MODEL_o971 0x1 -#define MODEL_o970 0x0 +#define MODEL_Root 0x1E +#define MODEL_g268 0x1D +#define MODEL_o968 0x1C +#define MODEL_o969 0x1B +#define MODEL_o966 0x1A +#define MODEL_g238 0x19 +#define MODEL_g220 0x18 +#define MODEL_o844 0x17 +#define MODEL_o772 0x16 +#define MODEL_g219 0x15 +#define MODEL_o846 0x14 +#define MODEL_o768 0x13 +#define MODEL_g253 0x12 +#define MODEL_o914 0x11 +#define MODEL_o903 0x10 +#define MODEL_g144 0xF +#define MODEL_o646 0xE +#define MODEL_o638 0xD +#define MODEL_o636 0xC +#define MODEL_o634 0xB +#define MODEL_g270 0xA +#define MODEL_o978 0x9 +#define MODEL_o977 0x8 +#define MODEL_o976 0x7 +#define MODEL_o975 0x6 +#define MODEL_o974 0x5 +#define MODEL_g269 0x4 +#define MODEL_o973 0x3 +#define MODEL_o972 0x2 +#define MODEL_o971 0x1 +#define MODEL_o970 0x0 + diff --git a/include/mapfs/pra_06_hit.h b/include/mapfs/pra_06_hit.h index b149746b8f..76050b01e8 100644 --- a/include/mapfs/pra_06_hit.h +++ b/include/mapfs/pra_06_hit.h @@ -1 +1,4 @@ -#define COLLIDER_Root 0x0 +#define COLLIDER_Root 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/pra_06_shape.h b/include/mapfs/pra_06_shape.h index 98ef430c86..dee3600cd9 100644 --- a/include/mapfs/pra_06_shape.h +++ b/include/mapfs/pra_06_shape.h @@ -1 +1,2 @@ -#define MODEL_Root 0x0 +#define MODEL_Root 0x0 + diff --git a/include/mapfs/pra_09_hit.h b/include/mapfs/pra_09_hit.h index 583d575471..d3b34e3dc6 100644 --- a/include/mapfs/pra_09_hit.h +++ b/include/mapfs/pra_09_hit.h @@ -1,23 +1,28 @@ -#define COLLIDER_Root 0x16 -#define COLLIDER_g144 0x15 -#define COLLIDER_g263 0x14 -#define COLLIDER_o1048 0x13 -#define COLLIDER_deilittse 0x12 -#define COLLIDER_g183 0x11 -#define COLLIDER_g253 0x10 -#define COLLIDER_deilitse 0xF -#define COLLIDER_deilise 0xE -#define COLLIDER_o903 0xD -#define COLLIDER_deilittsw 0xC -#define COLLIDER_deilitsw 0xB -#define COLLIDER_deilisw 0xA -#define COLLIDER_g260 0x9 -#define COLLIDER_o1056 0x8 -#define COLLIDER_o1034 0x7 -#define COLLIDER_o1030 0x6 -#define COLLIDER_o1026 0x5 -#define COLLIDER_o1025 0x4 -#define COLLIDER_o1023 0x3 -#define COLLIDER_o1022 0x2 -#define COLLIDER_o1020 0x1 -#define COLLIDER_o1038 0x0 +#define COLLIDER_Root 0x16 +#define COLLIDER_g144 0x15 +#define COLLIDER_g263 0x14 +#define COLLIDER_o1048 0x13 +#define COLLIDER_deilittse 0x12 +#define COLLIDER_g183 0x11 +#define COLLIDER_g253 0x10 +#define COLLIDER_deilitse 0xF +#define COLLIDER_deilise 0xE +#define COLLIDER_o903 0xD +#define COLLIDER_deilittsw 0xC +#define COLLIDER_deilitsw 0xB +#define COLLIDER_deilisw 0xA +#define COLLIDER_g260 0x9 +#define COLLIDER_o1056 0x8 +#define COLLIDER_o1034 0x7 +#define COLLIDER_o1030 0x6 +#define COLLIDER_o1026 0x5 +#define COLLIDER_o1025 0x4 +#define COLLIDER_o1023 0x3 +#define COLLIDER_o1022 0x2 +#define COLLIDER_o1020 0x1 +#define COLLIDER_o1038 0x0 + +#define ZONE_Root 0x2 +#define ZONE_g144 0x1 +#define ZONE_o1016 0x0 + diff --git a/include/mapfs/pra_09_shape.h b/include/mapfs/pra_09_shape.h index 192123e537..8b7050de4f 100644 --- a/include/mapfs/pra_09_shape.h +++ b/include/mapfs/pra_09_shape.h @@ -1,55 +1,56 @@ -#define MODEL_Root 0x36 -#define MODEL_g199 0x35 -#define MODEL_o943 0x34 -#define MODEL_o892 0x33 -#define MODEL_g259 0x32 -#define MODEL_g278 0x31 -#define MODEL_g266 0x30 -#define MODEL_o968 0x2F -#define MODEL_g261 0x2E -#define MODEL_o992 0x2D -#define MODEL_o991 0x2C -#define MODEL_o952 0x2B -#define MODEL_g277 0x2A -#define MODEL_g265 0x29 -#define MODEL_o964 0x28 -#define MODEL_o962 0x27 -#define MODEL_g260 0x26 -#define MODEL_o958 0x25 -#define MODEL_o994 0x24 -#define MODEL_o950 0x23 -#define MODEL_g241 0x22 -#define MODEL_o888 0x21 -#define MODEL_o922 0x20 -#define MODEL_o873 0x1F -#define MODEL_o872 0x1E -#define MODEL_o871 0x1D -#define MODEL_g183 0x1C -#define MODEL_g238 0x1B -#define MODEL_g220 0x1A -#define MODEL_o844 0x19 -#define MODEL_o772 0x18 -#define MODEL_g219 0x17 -#define MODEL_o846 0x16 -#define MODEL_o768 0x15 -#define MODEL_g253 0x14 -#define MODEL_o914 0x13 -#define MODEL_o903 0x12 -#define MODEL_g185 0x11 -#define MODEL_o646 0x10 -#define MODEL_o638 0xF -#define MODEL_o636 0xE -#define MODEL_o634 0xD -#define MODEL_g197 0xC -#define MODEL_o680 0xB -#define MODEL_g228 0xA -#define MODEL_o949 0x9 -#define MODEL_o1025 0x8 -#define MODEL_o1024 0x7 -#define MODEL_g229 0x6 -#define MODEL_o1026 0x5 -#define MODEL_o1027 0x4 -#define MODEL_o676 0x3 -#define MODEL_o1023 0x2 -#define MODEL_o1020 0x1 -#define MODEL_o1019 0x0 +#define MODEL_Root 0x36 +#define MODEL_g199 0x35 +#define MODEL_o943 0x34 +#define MODEL_o892 0x33 +#define MODEL_g259 0x32 +#define MODEL_g278 0x31 +#define MODEL_g266 0x30 +#define MODEL_o968 0x2F +#define MODEL_g261 0x2E +#define MODEL_o992 0x2D +#define MODEL_o991 0x2C +#define MODEL_o952 0x2B +#define MODEL_g277 0x2A +#define MODEL_g265 0x29 +#define MODEL_o964 0x28 +#define MODEL_o962 0x27 +#define MODEL_g260 0x26 +#define MODEL_o958 0x25 +#define MODEL_o994 0x24 +#define MODEL_o950 0x23 +#define MODEL_g241 0x22 +#define MODEL_o888 0x21 +#define MODEL_o922 0x20 +#define MODEL_o873 0x1F +#define MODEL_o872 0x1E +#define MODEL_o871 0x1D +#define MODEL_g183 0x1C +#define MODEL_g238 0x1B +#define MODEL_g220 0x1A +#define MODEL_o844 0x19 +#define MODEL_o772 0x18 +#define MODEL_g219 0x17 +#define MODEL_o846 0x16 +#define MODEL_o768 0x15 +#define MODEL_g253 0x14 +#define MODEL_o914 0x13 +#define MODEL_o903 0x12 +#define MODEL_g185 0x11 +#define MODEL_o646 0x10 +#define MODEL_o638 0xF +#define MODEL_o636 0xE +#define MODEL_o634 0xD +#define MODEL_g197 0xC +#define MODEL_o680 0xB +#define MODEL_g228 0xA +#define MODEL_o949 0x9 +#define MODEL_o1025 0x8 +#define MODEL_o1024 0x7 +#define MODEL_g229 0x6 +#define MODEL_o1026 0x5 +#define MODEL_o1027 0x4 +#define MODEL_o676 0x3 +#define MODEL_o1023 0x2 +#define MODEL_o1020 0x1 +#define MODEL_o1019 0x0 + diff --git a/include/mapfs/pra_10_hit.h b/include/mapfs/pra_10_hit.h index c8cd259bfb..a35612f335 100644 --- a/include/mapfs/pra_10_hit.h +++ b/include/mapfs/pra_10_hit.h @@ -1,22 +1,27 @@ -#define COLLIDER_Root 0x15 -#define COLLIDER_g144 0x14 -#define COLLIDER_g253 0x13 -#define COLLIDER_o1057 0x12 -#define COLLIDER_deilittse 0x11 -#define COLLIDER_deilitse 0x10 -#define COLLIDER_deilise 0xF -#define COLLIDER_o903 0xE -#define COLLIDER_deilittsw 0xD -#define COLLIDER_deilitsw 0xC -#define COLLIDER_deilisw 0xB -#define COLLIDER_g261 0xA -#define COLLIDER_o1038 0x9 -#define COLLIDER_g260 0x8 -#define COLLIDER_o1056 0x7 -#define COLLIDER_o1034 0x6 -#define COLLIDER_o1030 0x5 -#define COLLIDER_o1026 0x4 -#define COLLIDER_o1025 0x3 -#define COLLIDER_o1023 0x2 -#define COLLIDER_o1022 0x1 -#define COLLIDER_o1020 0x0 +#define COLLIDER_Root 0x15 +#define COLLIDER_g144 0x14 +#define COLLIDER_g253 0x13 +#define COLLIDER_o1057 0x12 +#define COLLIDER_deilittse 0x11 +#define COLLIDER_deilitse 0x10 +#define COLLIDER_deilise 0xF +#define COLLIDER_o903 0xE +#define COLLIDER_deilittsw 0xD +#define COLLIDER_deilitsw 0xC +#define COLLIDER_deilisw 0xB +#define COLLIDER_g261 0xA +#define COLLIDER_o1038 0x9 +#define COLLIDER_g260 0x8 +#define COLLIDER_o1056 0x7 +#define COLLIDER_o1034 0x6 +#define COLLIDER_o1030 0x5 +#define COLLIDER_o1026 0x4 +#define COLLIDER_o1025 0x3 +#define COLLIDER_o1023 0x2 +#define COLLIDER_o1022 0x1 +#define COLLIDER_o1020 0x0 + +#define ZONE_Root 0x2 +#define ZONE_g144 0x1 +#define ZONE_o1016 0x0 + diff --git a/include/mapfs/pra_10_shape.h b/include/mapfs/pra_10_shape.h index 5bb72dbddf..f442ffbc76 100644 --- a/include/mapfs/pra_10_shape.h +++ b/include/mapfs/pra_10_shape.h @@ -1,44 +1,45 @@ -#define MODEL_Root 0x2B -#define MODEL_g251 0x2A -#define MODEL_o1026 0x29 -#define MODEL_o688 0x28 -#define MODEL_g250 0x27 -#define MODEL_o680 0x26 -#define MODEL_g228 0x25 -#define MODEL_o949 0x24 -#define MODEL_o816 0x23 -#define MODEL_o1034 0x22 -#define MODEL_g291 0x21 -#define MODEL_g293 0x20 -#define MODEL_o1022 0x1F -#define MODEL_o1021 0x1E -#define MODEL_g292 0x1D -#define MODEL_o1020 0x1C -#define MODEL_o1019 0x1B -#define MODEL_g238 0x1A -#define MODEL_g220 0x19 -#define MODEL_o844 0x18 -#define MODEL_o772 0x17 -#define MODEL_g219 0x16 -#define MODEL_o846 0x15 -#define MODEL_o768 0x14 -#define MODEL_g240 0x13 -#define MODEL_o922 0x12 -#define MODEL_o1024 0x11 -#define MODEL_o873 0x10 -#define MODEL_o1023 0xF -#define MODEL_o871 0xE -#define MODEL_g183 0xD -#define MODEL_o646 0xC -#define MODEL_o914 0xB -#define MODEL_o638 0xA -#define MODEL_o636 0x9 -#define MODEL_o634 0x8 -#define MODEL_g230 0x7 -#define MODEL_o1032 0x6 -#define MODEL_o1031 0x5 -#define MODEL_g298 0x4 -#define MODEL_o1035 0x3 -#define MODEL_o1033 0x2 -#define MODEL_o1028 0x1 -#define MODEL_o1027 0x0 +#define MODEL_Root 0x2B +#define MODEL_g251 0x2A +#define MODEL_o1026 0x29 +#define MODEL_o688 0x28 +#define MODEL_g250 0x27 +#define MODEL_o680 0x26 +#define MODEL_g228 0x25 +#define MODEL_o949 0x24 +#define MODEL_o816 0x23 +#define MODEL_o1034 0x22 +#define MODEL_g291 0x21 +#define MODEL_g293 0x20 +#define MODEL_o1022 0x1F +#define MODEL_o1021 0x1E +#define MODEL_g292 0x1D +#define MODEL_o1020 0x1C +#define MODEL_o1019 0x1B +#define MODEL_g238 0x1A +#define MODEL_g220 0x19 +#define MODEL_o844 0x18 +#define MODEL_o772 0x17 +#define MODEL_g219 0x16 +#define MODEL_o846 0x15 +#define MODEL_o768 0x14 +#define MODEL_g240 0x13 +#define MODEL_o922 0x12 +#define MODEL_o1024 0x11 +#define MODEL_o873 0x10 +#define MODEL_o1023 0xF +#define MODEL_o871 0xE +#define MODEL_g183 0xD +#define MODEL_o646 0xC +#define MODEL_o914 0xB +#define MODEL_o638 0xA +#define MODEL_o636 0x9 +#define MODEL_o634 0x8 +#define MODEL_g230 0x7 +#define MODEL_o1032 0x6 +#define MODEL_o1031 0x5 +#define MODEL_g298 0x4 +#define MODEL_o1035 0x3 +#define MODEL_o1033 0x2 +#define MODEL_o1028 0x1 +#define MODEL_o1027 0x0 + diff --git a/include/mapfs/pra_11_hit.h b/include/mapfs/pra_11_hit.h index 822772e852..dc95b01b1c 100644 --- a/include/mapfs/pra_11_hit.h +++ b/include/mapfs/pra_11_hit.h @@ -1,20 +1,26 @@ -#define COLLIDER_Root 0x13 -#define COLLIDER_g144 0x12 -#define COLLIDER_g183 0x11 -#define COLLIDER_g259 0x10 -#define COLLIDER_deilittssw 0xF -#define COLLIDER_deilittnnw 0xE -#define COLLIDER_g253 0xD -#define COLLIDER_deilittse 0xC -#define COLLIDER_o1018 0xB -#define COLLIDER_deilittsw 0xA -#define COLLIDER_deilitsw 0x9 -#define COLLIDER_deilisw 0x8 -#define COLLIDER_g229 0x7 -#define COLLIDER_o1017 0x6 -#define COLLIDER_o1016 0x5 -#define COLLIDER_o688 0x4 -#define COLLIDER_o957 0x3 -#define COLLIDER_o954 0x2 -#define COLLIDER_o953 0x1 -#define COLLIDER_o662 0x0 +#define COLLIDER_Root 0x13 +#define COLLIDER_g144 0x12 +#define COLLIDER_g183 0x11 +#define COLLIDER_g259 0x10 +#define COLLIDER_deilittssw 0xF +#define COLLIDER_deilittnnw 0xE +#define COLLIDER_g253 0xD +#define COLLIDER_deilittse 0xC +#define COLLIDER_o1018 0xB +#define COLLIDER_deilittsw 0xA +#define COLLIDER_deilitsw 0x9 +#define COLLIDER_deilisw 0x8 +#define COLLIDER_g229 0x7 +#define COLLIDER_o1017 0x6 +#define COLLIDER_o1016 0x5 +#define COLLIDER_o688 0x4 +#define COLLIDER_o957 0x3 +#define COLLIDER_o954 0x2 +#define COLLIDER_o953 0x1 +#define COLLIDER_o662 0x0 + +#define ZONE_Root 0x3 +#define ZONE_g144 0x2 +#define ZONE_o1024 0x1 +#define ZONE_o1023 0x0 + diff --git a/include/mapfs/pra_11_shape.h b/include/mapfs/pra_11_shape.h index c938fc975a..b5522b909e 100644 --- a/include/mapfs/pra_11_shape.h +++ b/include/mapfs/pra_11_shape.h @@ -1,39 +1,40 @@ -#define MODEL_Root 0x26 -#define MODEL_g144 0x25 -#define MODEL_g199 0x24 -#define MODEL_o943 0x23 -#define MODEL_o688 0x22 -#define MODEL_o966 0x21 -#define MODEL_g268 0x20 -#define MODEL_g272 0x1F -#define MODEL_g274 0x1E -#define MODEL_o976 0x1D -#define MODEL_g273 0x1C -#define MODEL_o974 0x1B -#define MODEL_o973 0x1A -#define MODEL_o972 0x19 -#define MODEL_g269 0x18 -#define MODEL_g271 0x17 -#define MODEL_o971 0x16 -#define MODEL_o970 0x15 -#define MODEL_g270 0x14 -#define MODEL_o969 0x13 -#define MODEL_o968 0x12 -#define MODEL_o967 0x11 -#define MODEL_g181 0x10 -#define MODEL_o914 0xF -#define MODEL_o646 0xE -#define MODEL_o638 0xD -#define MODEL_o636 0xC -#define MODEL_o634 0xB -#define MODEL_g241 0xA -#define MODEL_o962 0x9 -#define MODEL_o963 0x8 -#define MODEL_o872 0x7 -#define MODEL_o871 0x6 -#define MODEL_o680 0x5 -#define MODEL_g266 0x4 -#define MODEL_o956 0x3 -#define MODEL_o959 0x2 -#define MODEL_o958 0x1 -#define MODEL_o957 0x0 +#define MODEL_Root 0x26 +#define MODEL_g144 0x25 +#define MODEL_g199 0x24 +#define MODEL_o943 0x23 +#define MODEL_o688 0x22 +#define MODEL_o966 0x21 +#define MODEL_g268 0x20 +#define MODEL_g272 0x1F +#define MODEL_g274 0x1E +#define MODEL_o976 0x1D +#define MODEL_g273 0x1C +#define MODEL_o974 0x1B +#define MODEL_o973 0x1A +#define MODEL_o972 0x19 +#define MODEL_g269 0x18 +#define MODEL_g271 0x17 +#define MODEL_o971 0x16 +#define MODEL_o970 0x15 +#define MODEL_g270 0x14 +#define MODEL_o969 0x13 +#define MODEL_o968 0x12 +#define MODEL_o967 0x11 +#define MODEL_g181 0x10 +#define MODEL_o914 0xF +#define MODEL_o646 0xE +#define MODEL_o638 0xD +#define MODEL_o636 0xC +#define MODEL_o634 0xB +#define MODEL_g241 0xA +#define MODEL_o962 0x9 +#define MODEL_o963 0x8 +#define MODEL_o872 0x7 +#define MODEL_o871 0x6 +#define MODEL_o680 0x5 +#define MODEL_g266 0x4 +#define MODEL_o956 0x3 +#define MODEL_o959 0x2 +#define MODEL_o958 0x1 +#define MODEL_o957 0x0 + diff --git a/include/mapfs/pra_12_hit.h b/include/mapfs/pra_12_hit.h index b149746b8f..76050b01e8 100644 --- a/include/mapfs/pra_12_hit.h +++ b/include/mapfs/pra_12_hit.h @@ -1 +1,4 @@ -#define COLLIDER_Root 0x0 +#define COLLIDER_Root 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/pra_12_shape.h b/include/mapfs/pra_12_shape.h index 98ef430c86..dee3600cd9 100644 --- a/include/mapfs/pra_12_shape.h +++ b/include/mapfs/pra_12_shape.h @@ -1 +1,2 @@ -#define MODEL_Root 0x0 +#define MODEL_Root 0x0 + diff --git a/include/mapfs/pra_13_hit.h b/include/mapfs/pra_13_hit.h index dbc4d71e8a..4d96bae0d1 100644 --- a/include/mapfs/pra_13_hit.h +++ b/include/mapfs/pra_13_hit.h @@ -1,44 +1,52 @@ -#define COLLIDER_Root 0x2B -#define COLLIDER_g144 0x2A -#define COLLIDER_g263 0x29 -#define COLLIDER_o1054 0x28 -#define COLLIDER_deilittne 0x27 -#define COLLIDER_o1048 0x26 -#define COLLIDER_deilittse 0x25 -#define COLLIDER_g183 0x24 -#define COLLIDER_g259 0x23 -#define COLLIDER_deilittsse 0x22 -#define COLLIDER_deilittssw 0x21 -#define COLLIDER_deilittnne 0x20 -#define COLLIDER_deilittnnw 0x1F -#define COLLIDER_g253 0x1E -#define COLLIDER_deilitne 0x1D -#define COLLIDER_deiline 0x1C -#define COLLIDER_deilitse 0x1B -#define COLLIDER_deilise 0x1A -#define COLLIDER_o960 0x19 -#define COLLIDER_deilittnw 0x18 -#define COLLIDER_deilitnw 0x17 -#define COLLIDER_deilinw 0x16 -#define COLLIDER_o903 0x15 -#define COLLIDER_deilittsw 0x14 -#define COLLIDER_deilitsw 0x13 -#define COLLIDER_deilisw 0x12 -#define COLLIDER_g261 0x11 -#define COLLIDER_o1038 0x10 -#define COLLIDER_g260 0xF -#define COLLIDER_o1056 0xE -#define COLLIDER_o1034 0xD -#define COLLIDER_o1033 0xC -#define COLLIDER_o1030 0xB -#define COLLIDER_o1029 0xA -#define COLLIDER_o1026 0x9 -#define COLLIDER_o1025 0x8 -#define COLLIDER_o1024 0x7 -#define COLLIDER_o1023 0x6 -#define COLLIDER_o1022 0x5 -#define COLLIDER_o1021 0x4 -#define COLLIDER_o1018 0x3 -#define COLLIDER_o1016 0x2 -#define COLLIDER_o1020 0x1 -#define COLLIDER_o1017 0x0 +#define COLLIDER_Root 0x2B +#define COLLIDER_g144 0x2A +#define COLLIDER_g263 0x29 +#define COLLIDER_o1054 0x28 +#define COLLIDER_deilittne 0x27 +#define COLLIDER_o1048 0x26 +#define COLLIDER_deilittse 0x25 +#define COLLIDER_g183 0x24 +#define COLLIDER_g259 0x23 +#define COLLIDER_deilittsse 0x22 +#define COLLIDER_deilittssw 0x21 +#define COLLIDER_deilittnne 0x20 +#define COLLIDER_deilittnnw 0x1F +#define COLLIDER_g253 0x1E +#define COLLIDER_deilitne 0x1D +#define COLLIDER_deiline 0x1C +#define COLLIDER_deilitse 0x1B +#define COLLIDER_deilise 0x1A +#define COLLIDER_o960 0x19 +#define COLLIDER_deilittnw 0x18 +#define COLLIDER_deilitnw 0x17 +#define COLLIDER_deilinw 0x16 +#define COLLIDER_o903 0x15 +#define COLLIDER_deilittsw 0x14 +#define COLLIDER_deilitsw 0x13 +#define COLLIDER_deilisw 0x12 +#define COLLIDER_g261 0x11 +#define COLLIDER_o1038 0x10 +#define COLLIDER_g260 0xF +#define COLLIDER_o1056 0xE +#define COLLIDER_o1034 0xD +#define COLLIDER_o1033 0xC +#define COLLIDER_o1030 0xB +#define COLLIDER_o1029 0xA +#define COLLIDER_o1026 0x9 +#define COLLIDER_o1025 0x8 +#define COLLIDER_o1024 0x7 +#define COLLIDER_o1023 0x6 +#define COLLIDER_o1022 0x5 +#define COLLIDER_o1021 0x4 +#define COLLIDER_o1018 0x3 +#define COLLIDER_o1016 0x2 +#define COLLIDER_o1020 0x1 +#define COLLIDER_o1017 0x0 + +#define ZONE_Root 0x5 +#define ZONE_g144 0x4 +#define ZONE_o1020 0x3 +#define ZONE_o1019 0x2 +#define ZONE_o1017 0x1 +#define ZONE_o1016 0x0 + diff --git a/include/mapfs/pra_13_shape.h b/include/mapfs/pra_13_shape.h index c747da8626..f8010f7637 100644 --- a/include/mapfs/pra_13_shape.h +++ b/include/mapfs/pra_13_shape.h @@ -1,98 +1,99 @@ -#define MODEL_Root 0x61 -#define MODEL_Default 0x60 -#define MODEL_o1051 0x5F -#define MODEL_o686 0x5E -#define MODEL_g302 0x5D -#define MODEL_g300 0x5C -#define MODEL_o1045 0x5B -#define MODEL_g252 0x5A -#define MODEL_o947 0x59 -#define MODEL_o945 0x58 -#define MODEL_g304 0x57 -#define MODEL_g237 0x56 -#define MODEL_o862 0x55 -#define MODEL_o861 0x54 -#define MODEL_g236 0x53 -#define MODEL_o860 0x52 -#define MODEL_o859 0x51 -#define MODEL_g251 0x50 -#define MODEL_o1031 0x4F -#define MODEL_o1049 0x4E -#define MODEL_g259 0x4D -#define MODEL_g285 0x4C -#define MODEL_g287 0x4B -#define MODEL_o1013 0x4A -#define MODEL_g286 0x49 -#define MODEL_o1011 0x48 -#define MODEL_o1010 0x47 -#define MODEL_o1009 0x46 -#define MODEL_g288 0x45 -#define MODEL_g290 0x44 -#define MODEL_o1018 0x43 -#define MODEL_o1017 0x42 -#define MODEL_g289 0x41 -#define MODEL_o1016 0x40 -#define MODEL_o1015 0x3F -#define MODEL_o1014 0x3E -#define MODEL_g278 0x3D -#define MODEL_g266 0x3C -#define MODEL_o968 0x3B -#define MODEL_g261 0x3A -#define MODEL_o992 0x39 -#define MODEL_o991 0x38 -#define MODEL_o952 0x37 -#define MODEL_g277 0x36 -#define MODEL_g265 0x35 -#define MODEL_o964 0x34 -#define MODEL_o962 0x33 -#define MODEL_g260 0x32 -#define MODEL_o958 0x31 -#define MODEL_o994 0x30 -#define MODEL_o950 0x2F -#define MODEL_g231 0x2E -#define MODEL_o949 0x2D -#define MODEL_o805 0x2C -#define MODEL_o816 0x2B -#define MODEL_o815 0x2A -#define MODEL_o795 0x29 -#define MODEL_o794 0x28 -#define MODEL_g255 0x27 -#define MODEL_o922 0x26 -#define MODEL_g241 0x25 -#define MODEL_o888 0x24 -#define MODEL_o873 0x23 -#define MODEL_o872 0x22 -#define MODEL_o871 0x21 -#define MODEL_g238 0x20 -#define MODEL_g220 0x1F -#define MODEL_o844 0x1E -#define MODEL_o772 0x1D -#define MODEL_g219 0x1C -#define MODEL_o846 0x1B -#define MODEL_o768 0x1A -#define MODEL_g253 0x19 -#define MODEL_o903 0x18 -#define MODEL_o914 0x17 -#define MODEL_g185 0x16 -#define MODEL_o646 0x15 -#define MODEL_o634 0x14 -#define MODEL_o636 0x13 -#define MODEL_o638 0x12 -#define MODEL_g199 0x11 -#define MODEL_o995 0x10 -#define MODEL_o998 0xF -#define MODEL_o996 0xE -#define MODEL_o997 0xD -#define MODEL_o858 0xC -#define MODEL_o856 0xB -#define MODEL_o855 0xA -#define MODEL_o854 0x9 -#define MODEL_g197 0x8 -#define MODEL_o680 0x7 -#define MODEL_g229 0x6 -#define MODEL_o676 0x5 -#define MODEL_o1030 0x4 -#define MODEL_o658 0x3 -#define MODEL_o1029 0x2 -#define MODEL_o1028 0x1 -#define MODEL_o1027 0x0 +#define MODEL_Root 0x61 +#define MODEL_Default 0x60 +#define MODEL_o1051 0x5F +#define MODEL_o686 0x5E +#define MODEL_g302 0x5D +#define MODEL_g300 0x5C +#define MODEL_o1045 0x5B +#define MODEL_g252 0x5A +#define MODEL_o947 0x59 +#define MODEL_o945 0x58 +#define MODEL_g304 0x57 +#define MODEL_g237 0x56 +#define MODEL_o862 0x55 +#define MODEL_o861 0x54 +#define MODEL_g236 0x53 +#define MODEL_o860 0x52 +#define MODEL_o859 0x51 +#define MODEL_g251 0x50 +#define MODEL_o1031 0x4F +#define MODEL_o1049 0x4E +#define MODEL_g259 0x4D +#define MODEL_g285 0x4C +#define MODEL_g287 0x4B +#define MODEL_o1013 0x4A +#define MODEL_g286 0x49 +#define MODEL_o1011 0x48 +#define MODEL_o1010 0x47 +#define MODEL_o1009 0x46 +#define MODEL_g288 0x45 +#define MODEL_g290 0x44 +#define MODEL_o1018 0x43 +#define MODEL_o1017 0x42 +#define MODEL_g289 0x41 +#define MODEL_o1016 0x40 +#define MODEL_o1015 0x3F +#define MODEL_o1014 0x3E +#define MODEL_g278 0x3D +#define MODEL_g266 0x3C +#define MODEL_o968 0x3B +#define MODEL_g261 0x3A +#define MODEL_o992 0x39 +#define MODEL_o991 0x38 +#define MODEL_o952 0x37 +#define MODEL_g277 0x36 +#define MODEL_g265 0x35 +#define MODEL_o964 0x34 +#define MODEL_o962 0x33 +#define MODEL_g260 0x32 +#define MODEL_o958 0x31 +#define MODEL_o994 0x30 +#define MODEL_o950 0x2F +#define MODEL_g231 0x2E +#define MODEL_o949 0x2D +#define MODEL_o805 0x2C +#define MODEL_o816 0x2B +#define MODEL_o815 0x2A +#define MODEL_o795 0x29 +#define MODEL_o794 0x28 +#define MODEL_g255 0x27 +#define MODEL_o922 0x26 +#define MODEL_g241 0x25 +#define MODEL_o888 0x24 +#define MODEL_o873 0x23 +#define MODEL_o872 0x22 +#define MODEL_o871 0x21 +#define MODEL_g238 0x20 +#define MODEL_g220 0x1F +#define MODEL_o844 0x1E +#define MODEL_o772 0x1D +#define MODEL_g219 0x1C +#define MODEL_o846 0x1B +#define MODEL_o768 0x1A +#define MODEL_g253 0x19 +#define MODEL_o903 0x18 +#define MODEL_o914 0x17 +#define MODEL_g185 0x16 +#define MODEL_o646 0x15 +#define MODEL_o634 0x14 +#define MODEL_o636 0x13 +#define MODEL_o638 0x12 +#define MODEL_g199 0x11 +#define MODEL_o995 0x10 +#define MODEL_o998 0xF +#define MODEL_o996 0xE +#define MODEL_o997 0xD +#define MODEL_o858 0xC +#define MODEL_o856 0xB +#define MODEL_o855 0xA +#define MODEL_o854 0x9 +#define MODEL_g197 0x8 +#define MODEL_o680 0x7 +#define MODEL_g229 0x6 +#define MODEL_o676 0x5 +#define MODEL_o1030 0x4 +#define MODEL_o658 0x3 +#define MODEL_o1029 0x2 +#define MODEL_o1028 0x1 +#define MODEL_o1027 0x0 + diff --git a/include/mapfs/pra_14_hit.h b/include/mapfs/pra_14_hit.h index 36875c49fe..565163cca5 100644 --- a/include/mapfs/pra_14_hit.h +++ b/include/mapfs/pra_14_hit.h @@ -1,38 +1,46 @@ -#define COLLIDER_Root 0x25 -#define COLLIDER_g144 0x24 -#define COLLIDER_g263 0x23 -#define COLLIDER_o1054 0x22 -#define COLLIDER_deilittnw 0x21 -#define COLLIDER_o1048 0x20 -#define COLLIDER_deilittsw 0x1F -#define COLLIDER_g183 0x1E -#define COLLIDER_g259 0x1D -#define COLLIDER_deilittsse 0x1C -#define COLLIDER_deilittssw 0x1B -#define COLLIDER_deilittnne 0x1A -#define COLLIDER_deilittnnw 0x19 -#define COLLIDER_g253 0x18 -#define COLLIDER_deilittne 0x17 -#define COLLIDER_deilitnw 0x16 -#define COLLIDER_deilinw 0x15 -#define COLLIDER_deilittse 0x14 -#define COLLIDER_deilitsw 0x13 -#define COLLIDER_deilisw 0x12 -#define COLLIDER_g261 0x11 -#define COLLIDER_o1038 0x10 -#define COLLIDER_g260 0xF -#define COLLIDER_o1060 0xE -#define COLLIDER_o1059 0xD -#define COLLIDER_o1058 0xC -#define COLLIDER_o1057 0xB -#define COLLIDER_o1056 0xA -#define COLLIDER_o1034 0x9 -#define COLLIDER_o1033 0x8 -#define COLLIDER_o1030 0x7 -#define COLLIDER_o1029 0x6 -#define COLLIDER_o1024 0x5 -#define COLLIDER_o1023 0x4 -#define COLLIDER_o1022 0x3 -#define COLLIDER_o1021 0x2 -#define COLLIDER_o1020 0x1 -#define COLLIDER_o1017 0x0 +#define COLLIDER_Root 0x25 +#define COLLIDER_g144 0x24 +#define COLLIDER_g263 0x23 +#define COLLIDER_o1054 0x22 +#define COLLIDER_deilittnw 0x21 +#define COLLIDER_o1048 0x20 +#define COLLIDER_deilittsw 0x1F +#define COLLIDER_g183 0x1E +#define COLLIDER_g259 0x1D +#define COLLIDER_deilittsse 0x1C +#define COLLIDER_deilittssw 0x1B +#define COLLIDER_deilittnne 0x1A +#define COLLIDER_deilittnnw 0x19 +#define COLLIDER_g253 0x18 +#define COLLIDER_deilittne 0x17 +#define COLLIDER_deilitnw 0x16 +#define COLLIDER_deilinw 0x15 +#define COLLIDER_deilittse 0x14 +#define COLLIDER_deilitsw 0x13 +#define COLLIDER_deilisw 0x12 +#define COLLIDER_g261 0x11 +#define COLLIDER_o1038 0x10 +#define COLLIDER_g260 0xF +#define COLLIDER_o1060 0xE +#define COLLIDER_o1059 0xD +#define COLLIDER_o1058 0xC +#define COLLIDER_o1057 0xB +#define COLLIDER_o1056 0xA +#define COLLIDER_o1034 0x9 +#define COLLIDER_o1033 0x8 +#define COLLIDER_o1030 0x7 +#define COLLIDER_o1029 0x6 +#define COLLIDER_o1024 0x5 +#define COLLIDER_o1023 0x4 +#define COLLIDER_o1022 0x3 +#define COLLIDER_o1021 0x2 +#define COLLIDER_o1020 0x1 +#define COLLIDER_o1017 0x0 + +#define ZONE_Root 0x5 +#define ZONE_g144 0x4 +#define ZONE_o1020 0x3 +#define ZONE_o1019 0x2 +#define ZONE_o1017 0x1 +#define ZONE_o1016 0x0 + diff --git a/include/mapfs/pra_14_shape.h b/include/mapfs/pra_14_shape.h index d5f8c35385..7d39469c93 100644 --- a/include/mapfs/pra_14_shape.h +++ b/include/mapfs/pra_14_shape.h @@ -1,77 +1,78 @@ -#define MODEL_Root 0x4C -#define MODEL_g199 0x4B -#define MODEL_o1091 0x4A -#define MODEL_g251 0x49 -#define MODEL_o1049 0x48 -#define MODEL_g302 0x47 -#define MODEL_g228 0x46 -#define MODEL_o816 0x45 -#define MODEL_o1059 0x44 -#define MODEL_o1061 0x43 -#define MODEL_o1060 0x42 -#define MODEL_o1058 0x41 -#define MODEL_o1057 0x40 -#define MODEL_o1025 0x3F -#define MODEL_o1024 0x3E -#define MODEL_o1022 0x3D -#define MODEL_o1021 0x3C -#define MODEL_o1020 0x3B -#define MODEL_o794 0x3A -#define MODEL_g307 0x39 -#define MODEL_o1089 0x38 -#define MODEL_g185 0x37 -#define MODEL_o997 0x36 -#define MODEL_o873 0x35 -#define MODEL_o871 0x34 -#define MODEL_o638 0x33 -#define MODEL_o636 0x32 -#define MODEL_o634 0x31 -#define MODEL_g301 0x30 -#define MODEL_g252 0x2F -#define MODEL_o1066 0x2E -#define MODEL_o1063 0x2D -#define MODEL_o1054 0x2C -#define MODEL_o1053 0x2B -#define MODEL_o1051 0x2A -#define MODEL_g297 0x29 -#define MODEL_o945 0x28 -#define MODEL_g300 0x27 -#define MODEL_g304 0x26 -#define MODEL_o1092 0x25 -#define MODEL_g305 0x24 -#define MODEL_o1086 0x23 -#define MODEL_o1085 0x22 -#define MODEL_o1084 0x21 -#define MODEL_o1082 0x20 -#define MODEL_o1081 0x1F -#define MODEL_o1080 0x1E -#define MODEL_g229 0x1D -#define MODEL_o658 0x1C -#define MODEL_o895 0x1B -#define MODEL_o664 0x1A -#define MODEL_o864 0x19 -#define MODEL_g197 0x18 -#define MODEL_o889 0x17 -#define MODEL_g259 0x16 -#define MODEL_g277 0x15 -#define MODEL_g260 0x14 -#define MODEL_o958 0x13 -#define MODEL_o994 0x12 -#define MODEL_o950 0x11 -#define MODEL_g288 0x10 -#define MODEL_g289 0xF -#define MODEL_o1016 0xE -#define MODEL_o1015 0xD -#define MODEL_o1014 0xC -#define MODEL_g285 0xB -#define MODEL_g286 0xA -#define MODEL_o1011 0x9 -#define MODEL_o1010 0x8 -#define MODEL_o1009 0x7 -#define MODEL_g278 0x6 -#define MODEL_g261 0x5 -#define MODEL_o992 0x4 -#define MODEL_o991 0x3 -#define MODEL_o952 0x2 -#define MODEL_g306 0x1 -#define MODEL_o1093 0x0 +#define MODEL_Root 0x4C +#define MODEL_g199 0x4B +#define MODEL_o1091 0x4A +#define MODEL_g251 0x49 +#define MODEL_o1049 0x48 +#define MODEL_g302 0x47 +#define MODEL_g228 0x46 +#define MODEL_o816 0x45 +#define MODEL_o1059 0x44 +#define MODEL_o1061 0x43 +#define MODEL_o1060 0x42 +#define MODEL_o1058 0x41 +#define MODEL_o1057 0x40 +#define MODEL_o1025 0x3F +#define MODEL_o1024 0x3E +#define MODEL_o1022 0x3D +#define MODEL_o1021 0x3C +#define MODEL_o1020 0x3B +#define MODEL_o794 0x3A +#define MODEL_g307 0x39 +#define MODEL_o1089 0x38 +#define MODEL_g185 0x37 +#define MODEL_o997 0x36 +#define MODEL_o873 0x35 +#define MODEL_o871 0x34 +#define MODEL_o638 0x33 +#define MODEL_o636 0x32 +#define MODEL_o634 0x31 +#define MODEL_g301 0x30 +#define MODEL_g252 0x2F +#define MODEL_o1066 0x2E +#define MODEL_o1063 0x2D +#define MODEL_o1054 0x2C +#define MODEL_o1053 0x2B +#define MODEL_o1051 0x2A +#define MODEL_g297 0x29 +#define MODEL_o945 0x28 +#define MODEL_g300 0x27 +#define MODEL_g304 0x26 +#define MODEL_o1092 0x25 +#define MODEL_g305 0x24 +#define MODEL_o1086 0x23 +#define MODEL_o1085 0x22 +#define MODEL_o1084 0x21 +#define MODEL_o1082 0x20 +#define MODEL_o1081 0x1F +#define MODEL_o1080 0x1E +#define MODEL_g229 0x1D +#define MODEL_o658 0x1C +#define MODEL_o895 0x1B +#define MODEL_o664 0x1A +#define MODEL_o864 0x19 +#define MODEL_g197 0x18 +#define MODEL_o889 0x17 +#define MODEL_g259 0x16 +#define MODEL_g277 0x15 +#define MODEL_g260 0x14 +#define MODEL_o958 0x13 +#define MODEL_o994 0x12 +#define MODEL_o950 0x11 +#define MODEL_g288 0x10 +#define MODEL_g289 0xF +#define MODEL_o1016 0xE +#define MODEL_o1015 0xD +#define MODEL_o1014 0xC +#define MODEL_g285 0xB +#define MODEL_g286 0xA +#define MODEL_o1011 0x9 +#define MODEL_o1010 0x8 +#define MODEL_o1009 0x7 +#define MODEL_g278 0x6 +#define MODEL_g261 0x5 +#define MODEL_o992 0x4 +#define MODEL_o991 0x3 +#define MODEL_o952 0x2 +#define MODEL_g306 0x1 +#define MODEL_o1093 0x0 + diff --git a/include/mapfs/pra_15_hit.h b/include/mapfs/pra_15_hit.h index c1b99e0beb..b309c361b3 100644 --- a/include/mapfs/pra_15_hit.h +++ b/include/mapfs/pra_15_hit.h @@ -1,13 +1,22 @@ -#define COLLIDER_Root 0xC -#define COLLIDER_Default 0xB -#define COLLIDER_o1300 0xA -#define COLLIDER_o1299 0x9 -#define COLLIDER_o1298 0x8 -#define COLLIDER_o1297 0x7 -#define COLLIDER_g144 0x6 -#define COLLIDER_g181 0x5 -#define COLLIDER_o1203 0x4 -#define COLLIDER_deilite 0x3 -#define COLLIDER_deilie 0x2 -#define COLLIDER_g315 0x1 -#define COLLIDER_o1296 0x0 +#define COLLIDER_Root 0xC +#define COLLIDER_Default 0xB +#define COLLIDER_o1300 0xA +#define COLLIDER_o1299 0x9 +#define COLLIDER_o1298 0x8 +#define COLLIDER_o1297 0x7 +#define COLLIDER_g144 0x6 +#define COLLIDER_g181 0x5 +#define COLLIDER_o1203 0x4 +#define COLLIDER_deilite 0x3 +#define COLLIDER_deilie 0x2 +#define COLLIDER_g315 0x1 +#define COLLIDER_o1296 0x0 + +#define ZONE_Root 0x6 +#define ZONE_g144 0x5 +#define ZONE_g318 0x4 +#define ZONE_o1301 0x3 +#define ZONE_o1300 0x2 +#define ZONE_o1298 0x1 +#define ZONE_o1297 0x0 + diff --git a/include/mapfs/pra_15_shape.h b/include/mapfs/pra_15_shape.h index cf994ac634..058ebcb021 100644 --- a/include/mapfs/pra_15_shape.h +++ b/include/mapfs/pra_15_shape.h @@ -1,16 +1,17 @@ -#define MODEL_Root 0xF -#define MODEL_g144 0xE -#define MODEL_g315 0xD -#define MODEL_o1337 0xC -#define MODEL_o1336 0xB -#define MODEL_o1335 0xA -#define MODEL_o1334 0x9 -#define MODEL_g183 0x8 -#define MODEL_o1234 0x7 -#define MODEL_o1231 0x6 -#define MODEL_g218 0x5 -#define MODEL_o1229 0x4 -#define MODEL_g181 0x3 -#define MODEL_o1332 0x2 -#define MODEL_o914 0x1 -#define MODEL_o1331 0x0 +#define MODEL_Root 0xF +#define MODEL_g144 0xE +#define MODEL_g315 0xD +#define MODEL_o1337 0xC +#define MODEL_o1336 0xB +#define MODEL_o1335 0xA +#define MODEL_o1334 0x9 +#define MODEL_g183 0x8 +#define MODEL_o1234 0x7 +#define MODEL_o1231 0x6 +#define MODEL_g218 0x5 +#define MODEL_o1229 0x4 +#define MODEL_g181 0x3 +#define MODEL_o1332 0x2 +#define MODEL_o914 0x1 +#define MODEL_o1331 0x0 + diff --git a/include/mapfs/pra_16_hit.h b/include/mapfs/pra_16_hit.h index 72704eafa6..35be523453 100644 --- a/include/mapfs/pra_16_hit.h +++ b/include/mapfs/pra_16_hit.h @@ -1,39 +1,47 @@ -#define COLLIDER_Root 0x26 -#define COLLIDER_g144 0x25 -#define COLLIDER_g183 0x24 -#define COLLIDER_g253 0x23 -#define COLLIDER_o975 0x22 -#define COLLIDER_deilittne 0x21 -#define COLLIDER_deilitne 0x20 -#define COLLIDER_deiline 0x1F -#define COLLIDER_o979 0x1E -#define COLLIDER_deilittse 0x1D -#define COLLIDER_deilitse 0x1C -#define COLLIDER_deilise 0x1B -#define COLLIDER_o960 0x1A -#define COLLIDER_deilittnw 0x19 -#define COLLIDER_deilitnw 0x18 -#define COLLIDER_deilinw 0x17 -#define COLLIDER_o903 0x16 -#define COLLIDER_deilittsw 0x15 -#define COLLIDER_deilitsw 0x14 -#define COLLIDER_deilisw 0x13 -#define COLLIDER_g261 0x12 -#define COLLIDER_o1038 0x11 -#define COLLIDER_g260 0x10 -#define COLLIDER_o1037 0xF -#define COLLIDER_o1035 0xE -#define COLLIDER_o1034 0xD -#define COLLIDER_o1033 0xC -#define COLLIDER_o1030 0xB -#define COLLIDER_o1029 0xA -#define COLLIDER_o1026 0x9 -#define COLLIDER_o1025 0x8 -#define COLLIDER_o1024 0x7 -#define COLLIDER_o1023 0x6 -#define COLLIDER_o1022 0x5 -#define COLLIDER_o1021 0x4 -#define COLLIDER_o1020 0x3 -#define COLLIDER_o1018 0x2 -#define COLLIDER_o1017 0x1 -#define COLLIDER_o1016 0x0 +#define COLLIDER_Root 0x26 +#define COLLIDER_g144 0x25 +#define COLLIDER_g183 0x24 +#define COLLIDER_g253 0x23 +#define COLLIDER_o975 0x22 +#define COLLIDER_deilittne 0x21 +#define COLLIDER_deilitne 0x20 +#define COLLIDER_deiline 0x1F +#define COLLIDER_o979 0x1E +#define COLLIDER_deilittse 0x1D +#define COLLIDER_deilitse 0x1C +#define COLLIDER_deilise 0x1B +#define COLLIDER_o960 0x1A +#define COLLIDER_deilittnw 0x19 +#define COLLIDER_deilitnw 0x18 +#define COLLIDER_deilinw 0x17 +#define COLLIDER_o903 0x16 +#define COLLIDER_deilittsw 0x15 +#define COLLIDER_deilitsw 0x14 +#define COLLIDER_deilisw 0x13 +#define COLLIDER_g261 0x12 +#define COLLIDER_o1038 0x11 +#define COLLIDER_g260 0x10 +#define COLLIDER_o1037 0xF +#define COLLIDER_o1035 0xE +#define COLLIDER_o1034 0xD +#define COLLIDER_o1033 0xC +#define COLLIDER_o1030 0xB +#define COLLIDER_o1029 0xA +#define COLLIDER_o1026 0x9 +#define COLLIDER_o1025 0x8 +#define COLLIDER_o1024 0x7 +#define COLLIDER_o1023 0x6 +#define COLLIDER_o1022 0x5 +#define COLLIDER_o1021 0x4 +#define COLLIDER_o1020 0x3 +#define COLLIDER_o1018 0x2 +#define COLLIDER_o1017 0x1 +#define COLLIDER_o1016 0x0 + +#define ZONE_Root 0x5 +#define ZONE_g144 0x4 +#define ZONE_o1020 0x3 +#define ZONE_o1019 0x2 +#define ZONE_o1017 0x1 +#define ZONE_o1016 0x0 + diff --git a/include/mapfs/pra_16_shape.h b/include/mapfs/pra_16_shape.h index 8a8ce900c6..3900a928fe 100644 --- a/include/mapfs/pra_16_shape.h +++ b/include/mapfs/pra_16_shape.h @@ -1,66 +1,67 @@ -#define MODEL_Root 0x41 -#define MODEL_g199 0x40 -#define MODEL_o686 0x3F -#define MODEL_o965 0x3E -#define MODEL_g257 0x3D -#define MODEL_o947 0x3C -#define MODEL_o945 0x3B -#define MODEL_g252 0x3A -#define MODEL_o893 0x39 -#define MODEL_o690 0x38 -#define MODEL_g242 0x37 -#define MODEL_g246 0x36 -#define MODEL_o881 0x35 -#define MODEL_o880 0x34 -#define MODEL_g245 0x33 -#define MODEL_o879 0x32 -#define MODEL_o878 0x31 -#define MODEL_g244 0x30 -#define MODEL_o877 0x2F -#define MODEL_o876 0x2E -#define MODEL_g243 0x2D -#define MODEL_o875 0x2C -#define MODEL_o874 0x2B -#define MODEL_g238 0x2A -#define MODEL_g237 0x29 -#define MODEL_o862 0x28 -#define MODEL_o861 0x27 -#define MODEL_g236 0x26 -#define MODEL_o860 0x25 -#define MODEL_o859 0x24 -#define MODEL_g220 0x23 -#define MODEL_o844 0x22 -#define MODEL_o772 0x21 -#define MODEL_g219 0x20 -#define MODEL_o846 0x1F -#define MODEL_o768 0x1E -#define MODEL_g240 0x1D -#define MODEL_o922 0x1C -#define MODEL_o885 0x1B -#define MODEL_o872 0x1A -#define MODEL_o870 0x19 -#define MODEL_o868 0x18 -#define MODEL_g185 0x17 -#define MODEL_o982 0x16 -#define MODEL_o646 0x15 -#define MODEL_o856 0x14 -#define MODEL_o638 0x13 -#define MODEL_o636 0x12 -#define MODEL_o914 0x11 -#define MODEL_g197 0x10 -#define MODEL_o680 0xF -#define MODEL_g228 0xE -#define MODEL_o955 0xD -#define MODEL_o950 0xC -#define MODEL_o949 0xB -#define MODEL_g230 0xA -#define MODEL_o951 0x9 -#define MODEL_o676 0x8 -#define MODEL_o981 0x7 -#define MODEL_g229 0x6 -#define MODEL_g265 0x5 -#define MODEL_o980 0x4 -#define MODEL_o979 0x3 -#define MODEL_o978 0x2 -#define MODEL_o953 0x1 -#define MODEL_o658 0x0 +#define MODEL_Root 0x41 +#define MODEL_g199 0x40 +#define MODEL_o686 0x3F +#define MODEL_o965 0x3E +#define MODEL_g257 0x3D +#define MODEL_o947 0x3C +#define MODEL_o945 0x3B +#define MODEL_g252 0x3A +#define MODEL_o893 0x39 +#define MODEL_o690 0x38 +#define MODEL_g242 0x37 +#define MODEL_g246 0x36 +#define MODEL_o881 0x35 +#define MODEL_o880 0x34 +#define MODEL_g245 0x33 +#define MODEL_o879 0x32 +#define MODEL_o878 0x31 +#define MODEL_g244 0x30 +#define MODEL_o877 0x2F +#define MODEL_o876 0x2E +#define MODEL_g243 0x2D +#define MODEL_o875 0x2C +#define MODEL_o874 0x2B +#define MODEL_g238 0x2A +#define MODEL_g237 0x29 +#define MODEL_o862 0x28 +#define MODEL_o861 0x27 +#define MODEL_g236 0x26 +#define MODEL_o860 0x25 +#define MODEL_o859 0x24 +#define MODEL_g220 0x23 +#define MODEL_o844 0x22 +#define MODEL_o772 0x21 +#define MODEL_g219 0x20 +#define MODEL_o846 0x1F +#define MODEL_o768 0x1E +#define MODEL_g240 0x1D +#define MODEL_o922 0x1C +#define MODEL_o885 0x1B +#define MODEL_o872 0x1A +#define MODEL_o870 0x19 +#define MODEL_o868 0x18 +#define MODEL_g185 0x17 +#define MODEL_o982 0x16 +#define MODEL_o646 0x15 +#define MODEL_o856 0x14 +#define MODEL_o638 0x13 +#define MODEL_o636 0x12 +#define MODEL_o914 0x11 +#define MODEL_g197 0x10 +#define MODEL_o680 0xF +#define MODEL_g228 0xE +#define MODEL_o955 0xD +#define MODEL_o950 0xC +#define MODEL_o949 0xB +#define MODEL_g230 0xA +#define MODEL_o951 0x9 +#define MODEL_o676 0x8 +#define MODEL_o981 0x7 +#define MODEL_g229 0x6 +#define MODEL_g265 0x5 +#define MODEL_o980 0x4 +#define MODEL_o979 0x3 +#define MODEL_o978 0x2 +#define MODEL_o953 0x1 +#define MODEL_o658 0x0 + diff --git a/include/mapfs/pra_18_hit.h b/include/mapfs/pra_18_hit.h index b48e99d183..bdf9dc8c9f 100644 --- a/include/mapfs/pra_18_hit.h +++ b/include/mapfs/pra_18_hit.h @@ -1,45 +1,52 @@ -#define COLLIDER_Root 0x2C -#define COLLIDER_g144 0x2B -#define COLLIDER_g299 0x2A -#define COLLIDER_o1176 0x29 -#define COLLIDER_o1175 0x28 -#define COLLIDER_o1174 0x27 -#define COLLIDER_g183 0x26 -#define COLLIDER_g253 0x25 -#define COLLIDER_o979 0x24 -#define COLLIDER_deilittne 0x23 -#define COLLIDER_deilitne 0x22 -#define COLLIDER_deiline 0x21 -#define COLLIDER_o960 0x20 -#define COLLIDER_deilittnw 0x1F -#define COLLIDER_deilitnw 0x1E -#define COLLIDER_deilinw 0x1D -#define COLLIDER_o903 0x1C -#define COLLIDER_deilittsw 0x1B -#define COLLIDER_deilitsw 0x1A -#define COLLIDER_deilisw 0x19 -#define COLLIDER_g298 0x18 -#define COLLIDER_o1118 0x17 -#define COLLIDER_o1117 0x16 -#define COLLIDER_o1147 0x15 -#define COLLIDER_g261 0x14 -#define COLLIDER_o1038 0x13 -#define COLLIDER_g260 0x12 -#define COLLIDER_o1037 0x11 -#define COLLIDER_o1036 0x10 -#define COLLIDER_o1035 0xF -#define COLLIDER_o1034 0xE -#define COLLIDER_o1033 0xD -#define COLLIDER_o1030 0xC -#define COLLIDER_o1029 0xB -#define COLLIDER_o1026 0xA -#define COLLIDER_o1025 0x9 -#define COLLIDER_o1024 0x8 -#define COLLIDER_o1023 0x7 -#define COLLIDER_o1022 0x6 -#define COLLIDER_o1021 0x5 -#define COLLIDER_o1020 0x4 -#define COLLIDER_o1019 0x3 -#define COLLIDER_o1018 0x2 -#define COLLIDER_o1017 0x1 -#define COLLIDER_o1016 0x0 +#define COLLIDER_Root 0x2C +#define COLLIDER_g144 0x2B +#define COLLIDER_g299 0x2A +#define COLLIDER_o1176 0x29 +#define COLLIDER_o1175 0x28 +#define COLLIDER_o1174 0x27 +#define COLLIDER_g183 0x26 +#define COLLIDER_g253 0x25 +#define COLLIDER_o979 0x24 +#define COLLIDER_deilittne 0x23 +#define COLLIDER_deilitne 0x22 +#define COLLIDER_deiline 0x21 +#define COLLIDER_o960 0x20 +#define COLLIDER_deilittnw 0x1F +#define COLLIDER_deilitnw 0x1E +#define COLLIDER_deilinw 0x1D +#define COLLIDER_o903 0x1C +#define COLLIDER_deilittsw 0x1B +#define COLLIDER_deilitsw 0x1A +#define COLLIDER_deilisw 0x19 +#define COLLIDER_g298 0x18 +#define COLLIDER_o1118 0x17 +#define COLLIDER_o1117 0x16 +#define COLLIDER_o1147 0x15 +#define COLLIDER_g261 0x14 +#define COLLIDER_o1038 0x13 +#define COLLIDER_g260 0x12 +#define COLLIDER_o1037 0x11 +#define COLLIDER_o1036 0x10 +#define COLLIDER_o1035 0xF +#define COLLIDER_o1034 0xE +#define COLLIDER_o1033 0xD +#define COLLIDER_o1030 0xC +#define COLLIDER_o1029 0xB +#define COLLIDER_o1026 0xA +#define COLLIDER_o1025 0x9 +#define COLLIDER_o1024 0x8 +#define COLLIDER_o1023 0x7 +#define COLLIDER_o1022 0x6 +#define COLLIDER_o1021 0x5 +#define COLLIDER_o1020 0x4 +#define COLLIDER_o1019 0x3 +#define COLLIDER_o1018 0x2 +#define COLLIDER_o1017 0x1 +#define COLLIDER_o1016 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g144 0x3 +#define ZONE_o1020 0x2 +#define ZONE_o1019 0x1 +#define ZONE_o1016 0x0 + diff --git a/include/mapfs/pra_18_shape.h b/include/mapfs/pra_18_shape.h index 0789b46985..bd02af7b62 100644 --- a/include/mapfs/pra_18_shape.h +++ b/include/mapfs/pra_18_shape.h @@ -1,92 +1,93 @@ -#define MODEL_Root 0x5B -#define MODEL_Default 0x5A -#define MODEL_o1144 0x59 -#define MODEL_g275 0x58 -#define MODEL_g277 0x57 -#define MODEL_o998 0x56 -#define MODEL_o997 0x55 -#define MODEL_g276 0x54 -#define MODEL_o996 0x53 -#define MODEL_o995 0x52 -#define MODEL_g238 0x51 -#define MODEL_g237 0x50 -#define MODEL_o861 0x4F -#define MODEL_g236 0x4E -#define MODEL_o859 0x4D -#define MODEL_g220 0x4C -#define MODEL_o772 0x4B -#define MODEL_g219 0x4A -#define MODEL_o768 0x49 -#define MODEL_g290 0x48 -#define MODEL_g298 0x47 -#define MODEL_o1127 0x46 -#define MODEL_o1126 0x45 -#define MODEL_o1125 0x44 -#define MODEL_o1122 0x43 -#define MODEL_g297 0x42 -#define MODEL_o1121 0x41 -#define MODEL_o1120 0x40 -#define MODEL_o1119 0x3F -#define MODEL_g296 0x3E -#define MODEL_o1115 0x3D -#define MODEL_o1114 0x3C -#define MODEL_o1113 0x3B -#define MODEL_g240 0x3A -#define MODEL_o1011 0x39 -#define MODEL_o890 0x38 -#define MODEL_g305 0x37 -#define MODEL_g228 0x36 -#define MODEL_o1176 0x35 -#define MODEL_o816 0x34 -#define MODEL_o1167 0x33 -#define MODEL_g308 0x32 -#define MODEL_o1162 0x31 -#define MODEL_o1160 0x30 -#define MODEL_o1169 0x2F -#define MODEL_o1161 0x2E -#define MODEL_g284 0x2D -#define MODEL_o1193 0x2C -#define MODEL_g274 0x2B -#define MODEL_o638 0x2A -#define MODEL_o634 0x29 -#define MODEL_o636 0x28 -#define MODEL_o990 0x27 -#define MODEL_o989 0x26 -#define MODEL_o988 0x25 -#define MODEL_o903 0x24 -#define MODEL_g307 0x23 -#define MODEL_g302 0x22 -#define MODEL_o1149 0x21 -#define MODEL_o1191 0x20 -#define MODEL_g257 0x1F -#define MODEL_o1150 0x1E -#define MODEL_g304 0x1D -#define MODEL_g185 0x1C -#define MODEL_o856 0x1B -#define MODEL_o855 0x1A -#define MODEL_o854 0x19 -#define MODEL_o993 0x18 -#define MODEL_o992 0x17 -#define MODEL_o991 0x16 -#define MODEL_o908 0x15 -#define MODEL_o1021 0x14 -#define MODEL_g229 0x13 -#define MODEL_o1190 0x12 -#define MODEL_o1188 0x11 -#define MODEL_o1186 0x10 -#define MODEL_o1184 0xF -#define MODEL_o1182 0xE -#define MODEL_o1180 0xD -#define MODEL_o1048 0xC -#define MODEL_o1175 0xB -#define MODEL_g273 0xA -#define MODEL_o1192 0x9 -#define MODEL_g287 0x8 -#define MODEL_o1067 0x7 -#define MODEL_o1066 0x6 -#define MODEL_o1065 0x5 -#define MODEL_o1064 0x4 -#define MODEL_o1063 0x3 -#define MODEL_o1062 0x2 -#define MODEL_o1054 0x1 -#define MODEL_o1051 0x0 +#define MODEL_Root 0x5B +#define MODEL_Default 0x5A +#define MODEL_o1144 0x59 +#define MODEL_g275 0x58 +#define MODEL_g277 0x57 +#define MODEL_o998 0x56 +#define MODEL_o997 0x55 +#define MODEL_g276 0x54 +#define MODEL_o996 0x53 +#define MODEL_o995 0x52 +#define MODEL_g238 0x51 +#define MODEL_g237 0x50 +#define MODEL_o861 0x4F +#define MODEL_g236 0x4E +#define MODEL_o859 0x4D +#define MODEL_g220 0x4C +#define MODEL_o772 0x4B +#define MODEL_g219 0x4A +#define MODEL_o768 0x49 +#define MODEL_g290 0x48 +#define MODEL_g298 0x47 +#define MODEL_o1127 0x46 +#define MODEL_o1126 0x45 +#define MODEL_o1125 0x44 +#define MODEL_o1122 0x43 +#define MODEL_g297 0x42 +#define MODEL_o1121 0x41 +#define MODEL_o1120 0x40 +#define MODEL_o1119 0x3F +#define MODEL_g296 0x3E +#define MODEL_o1115 0x3D +#define MODEL_o1114 0x3C +#define MODEL_o1113 0x3B +#define MODEL_g240 0x3A +#define MODEL_o1011 0x39 +#define MODEL_o890 0x38 +#define MODEL_g305 0x37 +#define MODEL_g228 0x36 +#define MODEL_o1176 0x35 +#define MODEL_o816 0x34 +#define MODEL_o1167 0x33 +#define MODEL_g308 0x32 +#define MODEL_o1162 0x31 +#define MODEL_o1160 0x30 +#define MODEL_o1169 0x2F +#define MODEL_o1161 0x2E +#define MODEL_g284 0x2D +#define MODEL_o1193 0x2C +#define MODEL_g274 0x2B +#define MODEL_o638 0x2A +#define MODEL_o634 0x29 +#define MODEL_o636 0x28 +#define MODEL_o990 0x27 +#define MODEL_o989 0x26 +#define MODEL_o988 0x25 +#define MODEL_o903 0x24 +#define MODEL_g307 0x23 +#define MODEL_g302 0x22 +#define MODEL_o1149 0x21 +#define MODEL_o1191 0x20 +#define MODEL_g257 0x1F +#define MODEL_o1150 0x1E +#define MODEL_g304 0x1D +#define MODEL_g185 0x1C +#define MODEL_o856 0x1B +#define MODEL_o855 0x1A +#define MODEL_o854 0x19 +#define MODEL_o993 0x18 +#define MODEL_o992 0x17 +#define MODEL_o991 0x16 +#define MODEL_o908 0x15 +#define MODEL_o1021 0x14 +#define MODEL_g229 0x13 +#define MODEL_o1190 0x12 +#define MODEL_o1188 0x11 +#define MODEL_o1186 0x10 +#define MODEL_o1184 0xF +#define MODEL_o1182 0xE +#define MODEL_o1180 0xD +#define MODEL_o1048 0xC +#define MODEL_o1175 0xB +#define MODEL_g273 0xA +#define MODEL_o1192 0x9 +#define MODEL_g287 0x8 +#define MODEL_o1067 0x7 +#define MODEL_o1066 0x6 +#define MODEL_o1065 0x5 +#define MODEL_o1064 0x4 +#define MODEL_o1063 0x3 +#define MODEL_o1062 0x2 +#define MODEL_o1054 0x1 +#define MODEL_o1051 0x0 + diff --git a/include/mapfs/pra_19_hit.h b/include/mapfs/pra_19_hit.h index 5ef36abda9..17c913e2a7 100644 --- a/include/mapfs/pra_19_hit.h +++ b/include/mapfs/pra_19_hit.h @@ -1,41 +1,49 @@ -#define COLLIDER_Root 0x28 -#define COLLIDER_g144 0x27 -#define COLLIDER_g263 0x26 -#define COLLIDER_g268 0x25 -#define COLLIDER_o1055 0x24 -#define COLLIDER_o1056 0x23 -#define COLLIDER_g267 0x22 -#define COLLIDER_o1054 0x21 -#define COLLIDER_o1053 0x20 -#define COLLIDER_o1048 0x1F -#define COLLIDER_g183 0x1E -#define COLLIDER_g253 0x1D -#define COLLIDER_deilitne 0x1C -#define COLLIDER_deiline 0x1B -#define COLLIDER_deilitse 0x1A -#define COLLIDER_deilise 0x19 -#define COLLIDER_o960 0x18 -#define COLLIDER_deilittnw 0x17 -#define COLLIDER_deilitnw 0x16 -#define COLLIDER_deilinw 0x15 -#define COLLIDER_o903 0x14 -#define COLLIDER_deilittsw 0x13 -#define COLLIDER_deilitsw 0x12 -#define COLLIDER_deilisw 0x11 -#define COLLIDER_g261 0x10 -#define COLLIDER_o1038 0xF -#define COLLIDER_g260 0xE -#define COLLIDER_o1034 0xD -#define COLLIDER_o1033 0xC -#define COLLIDER_o1030 0xB -#define COLLIDER_o1029 0xA -#define COLLIDER_o1026 0x9 -#define COLLIDER_o1025 0x8 -#define COLLIDER_o1024 0x7 -#define COLLIDER_o1023 0x6 -#define COLLIDER_o1022 0x5 -#define COLLIDER_o1021 0x4 -#define COLLIDER_o1018 0x3 -#define COLLIDER_o1016 0x2 -#define COLLIDER_o1020 0x1 -#define COLLIDER_o1017 0x0 +#define COLLIDER_Root 0x28 +#define COLLIDER_g144 0x27 +#define COLLIDER_g263 0x26 +#define COLLIDER_g268 0x25 +#define COLLIDER_o1055 0x24 +#define COLLIDER_o1056 0x23 +#define COLLIDER_g267 0x22 +#define COLLIDER_o1054 0x21 +#define COLLIDER_o1053 0x20 +#define COLLIDER_o1048 0x1F +#define COLLIDER_g183 0x1E +#define COLLIDER_g253 0x1D +#define COLLIDER_deilitne 0x1C +#define COLLIDER_deiline 0x1B +#define COLLIDER_deilitse 0x1A +#define COLLIDER_deilise 0x19 +#define COLLIDER_o960 0x18 +#define COLLIDER_deilittnw 0x17 +#define COLLIDER_deilitnw 0x16 +#define COLLIDER_deilinw 0x15 +#define COLLIDER_o903 0x14 +#define COLLIDER_deilittsw 0x13 +#define COLLIDER_deilitsw 0x12 +#define COLLIDER_deilisw 0x11 +#define COLLIDER_g261 0x10 +#define COLLIDER_o1038 0xF +#define COLLIDER_g260 0xE +#define COLLIDER_o1034 0xD +#define COLLIDER_o1033 0xC +#define COLLIDER_o1030 0xB +#define COLLIDER_o1029 0xA +#define COLLIDER_o1026 0x9 +#define COLLIDER_o1025 0x8 +#define COLLIDER_o1024 0x7 +#define COLLIDER_o1023 0x6 +#define COLLIDER_o1022 0x5 +#define COLLIDER_o1021 0x4 +#define COLLIDER_o1018 0x3 +#define COLLIDER_o1016 0x2 +#define COLLIDER_o1020 0x1 +#define COLLIDER_o1017 0x0 + +#define ZONE_Root 0x5 +#define ZONE_g144 0x4 +#define ZONE_o1020 0x3 +#define ZONE_o1019 0x2 +#define ZONE_o1017 0x1 +#define ZONE_o1016 0x0 + diff --git a/include/mapfs/pra_19_shape.h b/include/mapfs/pra_19_shape.h index 06a7ee3059..46969341e4 100644 --- a/include/mapfs/pra_19_shape.h +++ b/include/mapfs/pra_19_shape.h @@ -1,70 +1,71 @@ -#define MODEL_Root 0x45 -#define MODEL_g199 0x44 -#define MODEL_o1077 0x43 -#define MODEL_o1092 0x42 -#define MODEL_g291 0x41 -#define MODEL_g290 0x40 -#define MODEL_o1099 0x3F -#define MODEL_o1088 0x3E -#define MODEL_g254 0x3D -#define MODEL_o947 0x3C -#define MODEL_o945 0x3B -#define MODEL_g292 0x3A -#define MODEL_o688 0x39 -#define MODEL_g144 0x38 -#define MODEL_g197 0x37 -#define MODEL_o680 0x36 -#define MODEL_g228 0x35 -#define MODEL_o955 0x34 -#define MODEL_o816 0x33 -#define MODEL_o815 0x32 -#define MODEL_g238 0x31 -#define MODEL_g220 0x30 -#define MODEL_o844 0x2F -#define MODEL_o772 0x2E -#define MODEL_g219 0x2D -#define MODEL_o846 0x2C -#define MODEL_o768 0x2B -#define MODEL_g263 0x2A -#define MODEL_g277 0x29 -#define MODEL_g285 0x28 -#define MODEL_o1065 0x27 -#define MODEL_g279 0x26 -#define MODEL_o1027 0x25 -#define MODEL_o1026 0x24 -#define MODEL_g278 0x23 -#define MODEL_o1024 0x22 -#define MODEL_g276 0x21 -#define MODEL_o1021 0x20 -#define MODEL_o1020 0x1F -#define MODEL_o1015 0x1E -#define MODEL_g272 0x1D -#define MODEL_o1067 0x1C -#define MODEL_o1007 0x1B -#define MODEL_g264 0x1A -#define MODEL_o1033 0x19 -#define MODEL_o1032 0x18 -#define MODEL_o990 0x17 -#define MODEL_o989 0x16 -#define MODEL_o988 0x15 -#define MODEL_o987 0x14 -#define MODEL_g185 0x13 -#define MODEL_o914 0x12 -#define MODEL_o903 0x11 -#define MODEL_o646 0x10 -#define MODEL_o638 0xF -#define MODEL_o636 0xE -#define MODEL_o634 0xD -#define MODEL_g262 0xC -#define MODEL_o1075 0xB -#define MODEL_o1070 0xA -#define MODEL_o1069 0x9 -#define MODEL_g230 0x8 -#define MODEL_o1072 0x7 -#define MODEL_o1084 0x6 -#define MODEL_o1083 0x5 -#define MODEL_g288 0x4 -#define MODEL_o1082 0x3 -#define MODEL_o1081 0x2 -#define MODEL_o1080 0x1 -#define MODEL_o1079 0x0 +#define MODEL_Root 0x45 +#define MODEL_g199 0x44 +#define MODEL_o1077 0x43 +#define MODEL_o1092 0x42 +#define MODEL_g291 0x41 +#define MODEL_g290 0x40 +#define MODEL_o1099 0x3F +#define MODEL_o1088 0x3E +#define MODEL_g254 0x3D +#define MODEL_o947 0x3C +#define MODEL_o945 0x3B +#define MODEL_g292 0x3A +#define MODEL_o688 0x39 +#define MODEL_g144 0x38 +#define MODEL_g197 0x37 +#define MODEL_o680 0x36 +#define MODEL_g228 0x35 +#define MODEL_o955 0x34 +#define MODEL_o816 0x33 +#define MODEL_o815 0x32 +#define MODEL_g238 0x31 +#define MODEL_g220 0x30 +#define MODEL_o844 0x2F +#define MODEL_o772 0x2E +#define MODEL_g219 0x2D +#define MODEL_o846 0x2C +#define MODEL_o768 0x2B +#define MODEL_g263 0x2A +#define MODEL_g277 0x29 +#define MODEL_g285 0x28 +#define MODEL_o1065 0x27 +#define MODEL_g279 0x26 +#define MODEL_o1027 0x25 +#define MODEL_o1026 0x24 +#define MODEL_g278 0x23 +#define MODEL_o1024 0x22 +#define MODEL_g276 0x21 +#define MODEL_o1021 0x20 +#define MODEL_o1020 0x1F +#define MODEL_o1015 0x1E +#define MODEL_g272 0x1D +#define MODEL_o1067 0x1C +#define MODEL_o1007 0x1B +#define MODEL_g264 0x1A +#define MODEL_o1033 0x19 +#define MODEL_o1032 0x18 +#define MODEL_o990 0x17 +#define MODEL_o989 0x16 +#define MODEL_o988 0x15 +#define MODEL_o987 0x14 +#define MODEL_g185 0x13 +#define MODEL_o914 0x12 +#define MODEL_o903 0x11 +#define MODEL_o646 0x10 +#define MODEL_o638 0xF +#define MODEL_o636 0xE +#define MODEL_o634 0xD +#define MODEL_g262 0xC +#define MODEL_o1075 0xB +#define MODEL_o1070 0xA +#define MODEL_o1069 0x9 +#define MODEL_g230 0x8 +#define MODEL_o1072 0x7 +#define MODEL_o1084 0x6 +#define MODEL_o1083 0x5 +#define MODEL_g288 0x4 +#define MODEL_o1082 0x3 +#define MODEL_o1081 0x2 +#define MODEL_o1080 0x1 +#define MODEL_o1079 0x0 + diff --git a/include/mapfs/pra_20_hit.h b/include/mapfs/pra_20_hit.h index 7f9ecff349..d0bbe12570 100644 --- a/include/mapfs/pra_20_hit.h +++ b/include/mapfs/pra_20_hit.h @@ -1,42 +1,50 @@ -#define COLLIDER_Root 0x29 -#define COLLIDER_g260 0x28 -#define COLLIDER_o1020 0x27 -#define COLLIDER_o1019 0x26 -#define COLLIDER_o1018 0x25 -#define COLLIDER_o1017 0x24 -#define COLLIDER_o1016 0x23 -#define COLLIDER_g259 0x22 -#define COLLIDER_o1015 0x21 -#define COLLIDER_deilittssw 0x20 -#define COLLIDER_deilitssw 0x1F -#define COLLIDER_deilissw 0x1E -#define COLLIDER_o983 0x1D -#define COLLIDER_deilittnnw 0x1C -#define COLLIDER_deilitnnw 0x1B -#define COLLIDER_deilinnw 0x1A -#define COLLIDER_g253 0x19 -#define COLLIDER_o975 0x18 -#define COLLIDER_deilittne 0x17 -#define COLLIDER_deilitne 0x16 -#define COLLIDER_deiline 0x15 -#define COLLIDER_o979 0x14 -#define COLLIDER_deilittse 0x13 -#define COLLIDER_deilitse 0x12 -#define COLLIDER_deilise 0x11 -#define COLLIDER_o960 0x10 -#define COLLIDER_deilitnw 0xF -#define COLLIDER_deilinw 0xE -#define COLLIDER_o903 0xD -#define COLLIDER_deilitsw 0xC -#define COLLIDER_deilisw 0xB -#define COLLIDER_g257 0xA -#define COLLIDER_o945 0x9 -#define COLLIDER_g229 0x8 -#define COLLIDER_o688 0x7 -#define COLLIDER_o686 0x6 -#define COLLIDER_o957 0x5 -#define COLLIDER_o955 0x4 -#define COLLIDER_o954 0x3 -#define COLLIDER_o953 0x2 -#define COLLIDER_o952 0x1 -#define COLLIDER_o662 0x0 +#define COLLIDER_Root 0x29 +#define COLLIDER_g260 0x28 +#define COLLIDER_o1020 0x27 +#define COLLIDER_o1019 0x26 +#define COLLIDER_o1018 0x25 +#define COLLIDER_o1017 0x24 +#define COLLIDER_o1016 0x23 +#define COLLIDER_g259 0x22 +#define COLLIDER_o1015 0x21 +#define COLLIDER_deilittssw 0x20 +#define COLLIDER_deilitssw 0x1F +#define COLLIDER_deilissw 0x1E +#define COLLIDER_o983 0x1D +#define COLLIDER_deilittnnw 0x1C +#define COLLIDER_deilitnnw 0x1B +#define COLLIDER_deilinnw 0x1A +#define COLLIDER_g253 0x19 +#define COLLIDER_o975 0x18 +#define COLLIDER_deilittne 0x17 +#define COLLIDER_deilitne 0x16 +#define COLLIDER_deiline 0x15 +#define COLLIDER_o979 0x14 +#define COLLIDER_deilittse 0x13 +#define COLLIDER_deilitse 0x12 +#define COLLIDER_deilise 0x11 +#define COLLIDER_o960 0x10 +#define COLLIDER_deilitnw 0xF +#define COLLIDER_deilinw 0xE +#define COLLIDER_o903 0xD +#define COLLIDER_deilitsw 0xC +#define COLLIDER_deilisw 0xB +#define COLLIDER_g257 0xA +#define COLLIDER_o945 0x9 +#define COLLIDER_g229 0x8 +#define COLLIDER_o688 0x7 +#define COLLIDER_o686 0x6 +#define COLLIDER_o957 0x5 +#define COLLIDER_o955 0x4 +#define COLLIDER_o954 0x3 +#define COLLIDER_o953 0x2 +#define COLLIDER_o952 0x1 +#define COLLIDER_o662 0x0 + +#define ZONE_Root 0x5 +#define ZONE_g144 0x4 +#define ZONE_o1020 0x3 +#define ZONE_o1019 0x2 +#define ZONE_o1017 0x1 +#define ZONE_o1016 0x0 + diff --git a/include/mapfs/pra_20_shape.h b/include/mapfs/pra_20_shape.h index 99b397dedd..72d54bca59 100644 --- a/include/mapfs/pra_20_shape.h +++ b/include/mapfs/pra_20_shape.h @@ -1,66 +1,67 @@ -#define MODEL_Root 0x41 -#define MODEL_Default 0x40 -#define MODEL_o943 0x3F -#define MODEL_g280 0x3E -#define MODEL_o1000 0x3D -#define MODEL_o999 0x3C -#define MODEL_g270 0x3B -#define MODEL_g273 0x3A -#define MODEL_o987 0x39 -#define MODEL_g272 0x38 -#define MODEL_o984 0x37 -#define MODEL_o983 0x36 -#define MODEL_g271 0x35 -#define MODEL_o981 0x34 -#define MODEL_g181 0x33 -#define MODEL_g249 0x32 -#define MODEL_o885 0x31 -#define MODEL_g242 0x30 -#define MODEL_g244 0x2F -#define MODEL_o877 0x2E -#define MODEL_o876 0x2D -#define MODEL_g243 0x2C -#define MODEL_o875 0x2B -#define MODEL_o874 0x2A -#define MODEL_g241 0x29 -#define MODEL_o873 0x28 -#define MODEL_g286 0x27 -#define MODEL_g264 0x26 -#define MODEL_o964 0x25 -#define MODEL_o963 0x24 -#define MODEL_o961 0x23 -#define MODEL_o958 0x22 -#define MODEL_o1016 0x21 -#define MODEL_g290 0x20 -#define MODEL_o973 0x1F -#define MODEL_g289 0x1E -#define MODEL_g252 0x1D -#define MODEL_o690 0x1C -#define MODEL_g257 0x1B -#define MODEL_o947 0x1A -#define MODEL_o945 0x19 -#define MODEL_g285 0x18 -#define MODEL_o1015 0x17 -#define MODEL_g246 0x16 -#define MODEL_o881 0x15 -#define MODEL_o880 0x14 -#define MODEL_g245 0x13 -#define MODEL_o879 0x12 -#define MODEL_o878 0x11 -#define MODEL_g288 0x10 -#define MODEL_o1005 0xF -#define MODEL_g287 0xE -#define MODEL_o1014 0xD -#define MODEL_o872 0xC -#define MODEL_o1011 0xB -#define MODEL_o1013 0xA -#define MODEL_g229 0x9 -#define MODEL_o666 0x8 -#define MODEL_o895 0x7 -#define MODEL_o664 0x6 -#define MODEL_o662 0x5 -#define MODEL_o1002 0x4 -#define MODEL_g274 0x3 -#define MODEL_g279 0x2 -#define MODEL_o998 0x1 -#define MODEL_o997 0x0 +#define MODEL_Root 0x41 +#define MODEL_Default 0x40 +#define MODEL_o943 0x3F +#define MODEL_g280 0x3E +#define MODEL_o1000 0x3D +#define MODEL_o999 0x3C +#define MODEL_g270 0x3B +#define MODEL_g273 0x3A +#define MODEL_o987 0x39 +#define MODEL_g272 0x38 +#define MODEL_o984 0x37 +#define MODEL_o983 0x36 +#define MODEL_g271 0x35 +#define MODEL_o981 0x34 +#define MODEL_g181 0x33 +#define MODEL_g249 0x32 +#define MODEL_o885 0x31 +#define MODEL_g242 0x30 +#define MODEL_g244 0x2F +#define MODEL_o877 0x2E +#define MODEL_o876 0x2D +#define MODEL_g243 0x2C +#define MODEL_o875 0x2B +#define MODEL_o874 0x2A +#define MODEL_g241 0x29 +#define MODEL_o873 0x28 +#define MODEL_g286 0x27 +#define MODEL_g264 0x26 +#define MODEL_o964 0x25 +#define MODEL_o963 0x24 +#define MODEL_o961 0x23 +#define MODEL_o958 0x22 +#define MODEL_o1016 0x21 +#define MODEL_g290 0x20 +#define MODEL_o973 0x1F +#define MODEL_g289 0x1E +#define MODEL_g252 0x1D +#define MODEL_o690 0x1C +#define MODEL_g257 0x1B +#define MODEL_o947 0x1A +#define MODEL_o945 0x19 +#define MODEL_g285 0x18 +#define MODEL_o1015 0x17 +#define MODEL_g246 0x16 +#define MODEL_o881 0x15 +#define MODEL_o880 0x14 +#define MODEL_g245 0x13 +#define MODEL_o879 0x12 +#define MODEL_o878 0x11 +#define MODEL_g288 0x10 +#define MODEL_o1005 0xF +#define MODEL_g287 0xE +#define MODEL_o1014 0xD +#define MODEL_o872 0xC +#define MODEL_o1011 0xB +#define MODEL_o1013 0xA +#define MODEL_g229 0x9 +#define MODEL_o666 0x8 +#define MODEL_o895 0x7 +#define MODEL_o664 0x6 +#define MODEL_o662 0x5 +#define MODEL_o1002 0x4 +#define MODEL_g274 0x3 +#define MODEL_g279 0x2 +#define MODEL_o998 0x1 +#define MODEL_o997 0x0 + diff --git a/include/mapfs/pra_21_hit.h b/include/mapfs/pra_21_hit.h index 74403649ec..09f0a5df4e 100644 --- a/include/mapfs/pra_21_hit.h +++ b/include/mapfs/pra_21_hit.h @@ -1,42 +1,51 @@ -#define COLLIDER_Root 0x29 -#define COLLIDER_g144 0x28 -#define COLLIDER_g269 0x27 -#define COLLIDER_o1063 0x26 -#define COLLIDER_g262 0x25 -#define COLLIDER_g264 0x24 -#define COLLIDER_o1036 0x23 -#define COLLIDER_g263 0x22 -#define COLLIDER_o1033 0x21 -#define COLLIDER_deilittnne 0x20 -#define COLLIDER_deilitnne 0x1F -#define COLLIDER_deilinne 0x1E -#define COLLIDER_o1025 0x1D -#define COLLIDER_g267 0x1C -#define COLLIDER_o1045 0x1B -#define COLLIDER_o1055 0x1A -#define COLLIDER_o1052 0x19 -#define COLLIDER_o1049 0x18 -#define COLLIDER_o1048 0x17 -#define COLLIDER_o1047 0x16 -#define COLLIDER_g183 0x15 -#define COLLIDER_g261 0x14 -#define COLLIDER_o1022 0x13 -#define COLLIDER_g259 0x12 -#define COLLIDER_o983 0x11 -#define COLLIDER_deilittnnw 0x10 -#define COLLIDER_deilitnnw 0xF -#define COLLIDER_deilinnw 0xE -#define COLLIDER_g253 0xD -#define COLLIDER_deilittne 0xC -#define COLLIDER_deilittnw 0xB -#define COLLIDER_g229 0xA -#define COLLIDER_o1062 0x9 -#define COLLIDER_o1061 0x8 -#define COLLIDER_o1060 0x7 -#define COLLIDER_o1059 0x6 -#define COLLIDER_o1057 0x5 -#define COLLIDER_o1056 0x4 -#define COLLIDER_o955 0x3 -#define COLLIDER_o952 0x2 -#define COLLIDER_o662 0x1 -#define COLLIDER_o1023 0x0 +#define COLLIDER_Root 0x29 +#define COLLIDER_g144 0x28 +#define COLLIDER_g269 0x27 +#define COLLIDER_o1063 0x26 +#define COLLIDER_g262 0x25 +#define COLLIDER_g264 0x24 +#define COLLIDER_o1036 0x23 +#define COLLIDER_g263 0x22 +#define COLLIDER_o1033 0x21 +#define COLLIDER_deilittnne 0x20 +#define COLLIDER_deilitnne 0x1F +#define COLLIDER_deilinne 0x1E +#define COLLIDER_o1025 0x1D +#define COLLIDER_g267 0x1C +#define COLLIDER_o1045 0x1B +#define COLLIDER_o1055 0x1A +#define COLLIDER_o1052 0x19 +#define COLLIDER_o1049 0x18 +#define COLLIDER_o1048 0x17 +#define COLLIDER_o1047 0x16 +#define COLLIDER_g183 0x15 +#define COLLIDER_g261 0x14 +#define COLLIDER_o1022 0x13 +#define COLLIDER_g259 0x12 +#define COLLIDER_o983 0x11 +#define COLLIDER_deilittnnw 0x10 +#define COLLIDER_deilitnnw 0xF +#define COLLIDER_deilinnw 0xE +#define COLLIDER_g253 0xD +#define COLLIDER_deilittne 0xC +#define COLLIDER_deilittnw 0xB +#define COLLIDER_g229 0xA +#define COLLIDER_o1062 0x9 +#define COLLIDER_o1061 0x8 +#define COLLIDER_o1060 0x7 +#define COLLIDER_o1059 0x6 +#define COLLIDER_o1057 0x5 +#define COLLIDER_o1056 0x4 +#define COLLIDER_o955 0x3 +#define COLLIDER_o952 0x2 +#define COLLIDER_o662 0x1 +#define COLLIDER_o1023 0x0 + +#define ZONE_Root 0x6 +#define ZONE_g270 0x5 +#define ZONE_o1063 0x4 +#define ZONE_o1062 0x3 +#define ZONE_g269 0x2 +#define ZONE_o1061 0x1 +#define ZONE_o1060 0x0 + diff --git a/include/mapfs/pra_21_shape.h b/include/mapfs/pra_21_shape.h index 8f0e2704b6..b8393a2eaf 100644 --- a/include/mapfs/pra_21_shape.h +++ b/include/mapfs/pra_21_shape.h @@ -1,55 +1,56 @@ -#define MODEL_Root 0x36 -#define MODEL_g239 0x35 -#define MODEL_o1101 0x34 -#define MODEL_g283 0x33 -#define MODEL_g285 0x32 -#define MODEL_o977 0x31 -#define MODEL_g284 0x30 -#define MODEL_o976 0x2F -#define MODEL_g238 0x2E -#define MODEL_g221 0x2D -#define MODEL_o774 0x2C -#define MODEL_g144 0x2B -#define MODEL_g260 0x2A -#define MODEL_g287 0x29 -#define MODEL_g289 0x28 -#define MODEL_o984 0x27 -#define MODEL_g288 0x26 -#define MODEL_o983 0x25 -#define MODEL_o982 0x24 -#define MODEL_o981 0x23 -#define MODEL_o980 0x22 -#define MODEL_g274 0x21 -#define MODEL_o978 0x20 -#define MODEL_g280 0x1F -#define MODEL_o971 0x1E -#define MODEL_g278 0x1D -#define MODEL_o970 0x1C -#define MODEL_o969 0x1B -#define MODEL_o967 0x1A -#define MODEL_o974 0x19 -#define MODEL_g276 0x18 -#define MODEL_o966 0x17 -#define MODEL_o965 0x16 -#define MODEL_o964 0x15 -#define MODEL_g181 0x14 -#define MODEL_g199 0x13 -#define MODEL_o963 0x12 -#define MODEL_o961 0x11 -#define MODEL_g197 0x10 -#define MODEL_o890 0xF -#define MODEL_o682 0xE -#define MODEL_g185 0xD -#define MODEL_o938 0xC -#define MODEL_o856 0xB -#define MODEL_o855 0xA -#define MODEL_o854 0x9 -#define MODEL_g228 0x8 -#define MODEL_o1115 0x7 -#define MODEL_o1114 0x6 -#define MODEL_g229 0x5 -#define MODEL_o1111 0x4 -#define MODEL_o864 0x3 -#define MODEL_o863 0x2 -#define MODEL_o895 0x1 -#define MODEL_o911 0x0 +#define MODEL_Root 0x36 +#define MODEL_g239 0x35 +#define MODEL_o1101 0x34 +#define MODEL_g283 0x33 +#define MODEL_g285 0x32 +#define MODEL_o977 0x31 +#define MODEL_g284 0x30 +#define MODEL_o976 0x2F +#define MODEL_g238 0x2E +#define MODEL_g221 0x2D +#define MODEL_o774 0x2C +#define MODEL_g144 0x2B +#define MODEL_g260 0x2A +#define MODEL_g287 0x29 +#define MODEL_g289 0x28 +#define MODEL_o984 0x27 +#define MODEL_g288 0x26 +#define MODEL_o983 0x25 +#define MODEL_o982 0x24 +#define MODEL_o981 0x23 +#define MODEL_o980 0x22 +#define MODEL_g274 0x21 +#define MODEL_o978 0x20 +#define MODEL_g280 0x1F +#define MODEL_o971 0x1E +#define MODEL_g278 0x1D +#define MODEL_o970 0x1C +#define MODEL_o969 0x1B +#define MODEL_o967 0x1A +#define MODEL_o974 0x19 +#define MODEL_g276 0x18 +#define MODEL_o966 0x17 +#define MODEL_o965 0x16 +#define MODEL_o964 0x15 +#define MODEL_g181 0x14 +#define MODEL_g199 0x13 +#define MODEL_o963 0x12 +#define MODEL_o961 0x11 +#define MODEL_g197 0x10 +#define MODEL_o890 0xF +#define MODEL_o682 0xE +#define MODEL_g185 0xD +#define MODEL_o938 0xC +#define MODEL_o856 0xB +#define MODEL_o855 0xA +#define MODEL_o854 0x9 +#define MODEL_g228 0x8 +#define MODEL_o1115 0x7 +#define MODEL_o1114 0x6 +#define MODEL_g229 0x5 +#define MODEL_o1111 0x4 +#define MODEL_o864 0x3 +#define MODEL_o863 0x2 +#define MODEL_o895 0x1 +#define MODEL_o911 0x0 + diff --git a/include/mapfs/pra_22_hit.h b/include/mapfs/pra_22_hit.h index 6ff888a1b5..c55800acd0 100644 --- a/include/mapfs/pra_22_hit.h +++ b/include/mapfs/pra_22_hit.h @@ -1,31 +1,38 @@ -#define COLLIDER_Root 0x1E -#define COLLIDER_g269 0x1D -#define COLLIDER_o1064 0x1C -#define COLLIDER_g262 0x1B -#define COLLIDER_o1029 0x1A -#define COLLIDER_deilittsse 0x19 -#define COLLIDER_deilitsse 0x18 -#define COLLIDER_deilisse 0x17 -#define COLLIDER_g267 0x16 -#define COLLIDER_o1042 0x15 -#define COLLIDER_o1054 0x14 -#define COLLIDER_o1053 0x13 -#define COLLIDER_o1051 0x12 -#define COLLIDER_o1050 0x11 -#define COLLIDER_o1046 0x10 -#define COLLIDER_g183 0xF -#define COLLIDER_o1019 0xE -#define COLLIDER_o1015 0xD -#define COLLIDER_deilittssw 0xC -#define COLLIDER_deilitssw 0xB -#define COLLIDER_deilissw 0xA -#define COLLIDER_g229 0x9 -#define COLLIDER_o1063 0x8 -#define COLLIDER_o1062 0x7 -#define COLLIDER_o1059 0x6 -#define COLLIDER_o1058 0x5 -#define COLLIDER_o1056 0x4 -#define COLLIDER_o957 0x3 -#define COLLIDER_o954 0x2 -#define COLLIDER_o953 0x1 -#define COLLIDER_o945 0x0 +#define COLLIDER_Root 0x1E +#define COLLIDER_g269 0x1D +#define COLLIDER_o1064 0x1C +#define COLLIDER_g262 0x1B +#define COLLIDER_o1029 0x1A +#define COLLIDER_deilittsse 0x19 +#define COLLIDER_deilitsse 0x18 +#define COLLIDER_deilisse 0x17 +#define COLLIDER_g267 0x16 +#define COLLIDER_o1042 0x15 +#define COLLIDER_o1054 0x14 +#define COLLIDER_o1053 0x13 +#define COLLIDER_o1051 0x12 +#define COLLIDER_o1050 0x11 +#define COLLIDER_o1046 0x10 +#define COLLIDER_g183 0xF +#define COLLIDER_o1019 0xE +#define COLLIDER_o1015 0xD +#define COLLIDER_deilittssw 0xC +#define COLLIDER_deilitssw 0xB +#define COLLIDER_deilissw 0xA +#define COLLIDER_g229 0x9 +#define COLLIDER_o1063 0x8 +#define COLLIDER_o1062 0x7 +#define COLLIDER_o1059 0x6 +#define COLLIDER_o1058 0x5 +#define COLLIDER_o1056 0x4 +#define COLLIDER_o957 0x3 +#define COLLIDER_o954 0x2 +#define COLLIDER_o953 0x1 +#define COLLIDER_o945 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g270 0x3 +#define ZONE_o1062 0x2 +#define ZONE_g269 0x1 +#define ZONE_o1060 0x0 + diff --git a/include/mapfs/pra_22_shape.h b/include/mapfs/pra_22_shape.h index f6509d85ee..f79da618f7 100644 --- a/include/mapfs/pra_22_shape.h +++ b/include/mapfs/pra_22_shape.h @@ -1,59 +1,60 @@ -#define MODEL_Root 0x3A -#define MODEL_g340 0x39 -#define MODEL_o1004 0x38 -#define MODEL_o1088 0x37 -#define MODEL_g350 0x36 -#define MODEL_o1107 0x35 -#define MODEL_g337 0x34 -#define MODEL_o1116 0x33 -#define MODEL_o1115 0x32 -#define MODEL_g313 0x31 -#define MODEL_g315 0x30 -#define MODEL_o1002 0x2F -#define MODEL_g314 0x2E -#define MODEL_o1001 0x2D -#define MODEL_g342 0x2C -#define MODEL_g344 0x2B -#define MODEL_o1085 0x2A -#define MODEL_g294 0x29 -#define MODEL_g317 0x28 -#define MODEL_g319 0x27 -#define MODEL_o1009 0x26 -#define MODEL_g318 0x25 -#define MODEL_o1008 0x24 -#define MODEL_o1007 0x23 -#define MODEL_o1006 0x22 -#define MODEL_o1005 0x21 -#define MODEL_g301 0x20 -#define MODEL_o988 0x1F -#define MODEL_g351 0x1E -#define MODEL_o1103 0x1D -#define MODEL_o1102 0x1C -#define MODEL_o986 0x1B -#define MODEL_g316 0x1A -#define MODEL_o1003 0x19 -#define MODEL_g309 0x18 -#define MODEL_o995 0x17 -#define MODEL_g354 0x16 -#define MODEL_o1110 0x15 -#define MODEL_o1109 0x14 -#define MODEL_o1108 0x13 -#define MODEL_g312 0x12 -#define MODEL_o1000 0x11 -#define MODEL_o999 0x10 -#define MODEL_o998 0xF -#define MODEL_g341 0xE -#define MODEL_o1079 0xD -#define MODEL_o1077 0xC -#define MODEL_o1078 0xB -#define MODEL_g345 0xA -#define MODEL_o1086 0x9 -#define MODEL_g355 0x8 -#define MODEL_o1113 0x7 -#define MODEL_o1112 0x6 -#define MODEL_o1111 0x5 -#define MODEL_g352 0x4 -#define MODEL_o1105 0x3 -#define MODEL_o1104 0x2 -#define MODEL_o1118 0x1 -#define MODEL_o1117 0x0 +#define MODEL_Root 0x3A +#define MODEL_g340 0x39 +#define MODEL_o1004 0x38 +#define MODEL_o1088 0x37 +#define MODEL_g350 0x36 +#define MODEL_o1107 0x35 +#define MODEL_g337 0x34 +#define MODEL_o1116 0x33 +#define MODEL_o1115 0x32 +#define MODEL_g313 0x31 +#define MODEL_g315 0x30 +#define MODEL_o1002 0x2F +#define MODEL_g314 0x2E +#define MODEL_o1001 0x2D +#define MODEL_g342 0x2C +#define MODEL_g344 0x2B +#define MODEL_o1085 0x2A +#define MODEL_g294 0x29 +#define MODEL_g317 0x28 +#define MODEL_g319 0x27 +#define MODEL_o1009 0x26 +#define MODEL_g318 0x25 +#define MODEL_o1008 0x24 +#define MODEL_o1007 0x23 +#define MODEL_o1006 0x22 +#define MODEL_o1005 0x21 +#define MODEL_g301 0x20 +#define MODEL_o988 0x1F +#define MODEL_g351 0x1E +#define MODEL_o1103 0x1D +#define MODEL_o1102 0x1C +#define MODEL_o986 0x1B +#define MODEL_g316 0x1A +#define MODEL_o1003 0x19 +#define MODEL_g309 0x18 +#define MODEL_o995 0x17 +#define MODEL_g354 0x16 +#define MODEL_o1110 0x15 +#define MODEL_o1109 0x14 +#define MODEL_o1108 0x13 +#define MODEL_g312 0x12 +#define MODEL_o1000 0x11 +#define MODEL_o999 0x10 +#define MODEL_o998 0xF +#define MODEL_g341 0xE +#define MODEL_o1079 0xD +#define MODEL_o1077 0xC +#define MODEL_o1078 0xB +#define MODEL_g345 0xA +#define MODEL_o1086 0x9 +#define MODEL_g355 0x8 +#define MODEL_o1113 0x7 +#define MODEL_o1112 0x6 +#define MODEL_o1111 0x5 +#define MODEL_g352 0x4 +#define MODEL_o1105 0x3 +#define MODEL_o1104 0x2 +#define MODEL_o1118 0x1 +#define MODEL_o1117 0x0 + diff --git a/include/mapfs/pra_27_hit.h b/include/mapfs/pra_27_hit.h index b149746b8f..76050b01e8 100644 --- a/include/mapfs/pra_27_hit.h +++ b/include/mapfs/pra_27_hit.h @@ -1 +1,4 @@ -#define COLLIDER_Root 0x0 +#define COLLIDER_Root 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/pra_27_shape.h b/include/mapfs/pra_27_shape.h index 98ef430c86..dee3600cd9 100644 --- a/include/mapfs/pra_27_shape.h +++ b/include/mapfs/pra_27_shape.h @@ -1 +1,2 @@ -#define MODEL_Root 0x0 +#define MODEL_Root 0x0 + diff --git a/include/mapfs/pra_28_hit.h b/include/mapfs/pra_28_hit.h index b149746b8f..76050b01e8 100644 --- a/include/mapfs/pra_28_hit.h +++ b/include/mapfs/pra_28_hit.h @@ -1 +1,4 @@ -#define COLLIDER_Root 0x0 +#define COLLIDER_Root 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/pra_28_shape.h b/include/mapfs/pra_28_shape.h index 98ef430c86..dee3600cd9 100644 --- a/include/mapfs/pra_28_shape.h +++ b/include/mapfs/pra_28_shape.h @@ -1 +1,2 @@ -#define MODEL_Root 0x0 +#define MODEL_Root 0x0 + diff --git a/include/mapfs/pra_29_hit.h b/include/mapfs/pra_29_hit.h index 82506d0e5d..df788221ee 100644 --- a/include/mapfs/pra_29_hit.h +++ b/include/mapfs/pra_29_hit.h @@ -1,49 +1,57 @@ -#define COLLIDER_Root 0x30 -#define COLLIDER_g144 0x2F -#define COLLIDER_g266 0x2E -#define COLLIDER_o1041 0x2D -#define COLLIDER_o1040 0x2C -#define COLLIDER_g263 0x2B -#define COLLIDER_o1039 0x2A -#define COLLIDER_o1033 0x29 -#define COLLIDER_o1024 0x28 -#define COLLIDER_g183 0x27 -#define COLLIDER_g259 0x26 -#define COLLIDER_deilittsse 0x25 -#define COLLIDER_deilittssw 0x24 -#define COLLIDER_deilittnne 0x23 -#define COLLIDER_deilittnnw 0x22 -#define COLLIDER_g253 0x21 -#define COLLIDER_o975 0x20 -#define COLLIDER_deilittne 0x1F -#define COLLIDER_deilitne 0x1E -#define COLLIDER_deiline 0x1D -#define COLLIDER_o979 0x1C -#define COLLIDER_deilittse 0x1B -#define COLLIDER_deilitse 0x1A -#define COLLIDER_deilise 0x19 -#define COLLIDER_o960 0x18 -#define COLLIDER_deilittnw 0x17 -#define COLLIDER_deilitnw 0x16 -#define COLLIDER_deilinw 0x15 -#define COLLIDER_o903 0x14 -#define COLLIDER_deilittsw 0x13 -#define COLLIDER_deilitsw 0x12 -#define COLLIDER_deilisw 0x11 -#define COLLIDER_g229 0x10 -#define COLLIDER_o688 0xF -#define COLLIDER_o686 0xE -#define COLLIDER_o682 0xD -#define COLLIDER_o680 0xC -#define COLLIDER_o892 0xB -#define COLLIDER_o891 0xA -#define COLLIDER_o890 0x9 -#define COLLIDER_o889 0x8 -#define COLLIDER_o957 0x7 -#define COLLIDER_o956 0x6 -#define COLLIDER_o955 0x5 -#define COLLIDER_o954 0x4 -#define COLLIDER_o953 0x3 -#define COLLIDER_o952 0x2 -#define COLLIDER_o949 0x1 -#define COLLIDER_o662 0x0 +#define COLLIDER_Root 0x30 +#define COLLIDER_g144 0x2F +#define COLLIDER_g266 0x2E +#define COLLIDER_o1041 0x2D +#define COLLIDER_o1040 0x2C +#define COLLIDER_g263 0x2B +#define COLLIDER_o1039 0x2A +#define COLLIDER_o1033 0x29 +#define COLLIDER_o1024 0x28 +#define COLLIDER_g183 0x27 +#define COLLIDER_g259 0x26 +#define COLLIDER_deilittsse 0x25 +#define COLLIDER_deilittssw 0x24 +#define COLLIDER_deilittnne 0x23 +#define COLLIDER_deilittnnw 0x22 +#define COLLIDER_g253 0x21 +#define COLLIDER_o975 0x20 +#define COLLIDER_deilittne 0x1F +#define COLLIDER_deilitne 0x1E +#define COLLIDER_deiline 0x1D +#define COLLIDER_o979 0x1C +#define COLLIDER_deilittse 0x1B +#define COLLIDER_deilitse 0x1A +#define COLLIDER_deilise 0x19 +#define COLLIDER_o960 0x18 +#define COLLIDER_deilittnw 0x17 +#define COLLIDER_deilitnw 0x16 +#define COLLIDER_deilinw 0x15 +#define COLLIDER_o903 0x14 +#define COLLIDER_deilittsw 0x13 +#define COLLIDER_deilitsw 0x12 +#define COLLIDER_deilisw 0x11 +#define COLLIDER_g229 0x10 +#define COLLIDER_o688 0xF +#define COLLIDER_o686 0xE +#define COLLIDER_o682 0xD +#define COLLIDER_o680 0xC +#define COLLIDER_o892 0xB +#define COLLIDER_o891 0xA +#define COLLIDER_o890 0x9 +#define COLLIDER_o889 0x8 +#define COLLIDER_o957 0x7 +#define COLLIDER_o956 0x6 +#define COLLIDER_o955 0x5 +#define COLLIDER_o954 0x4 +#define COLLIDER_o953 0x3 +#define COLLIDER_o952 0x2 +#define COLLIDER_o949 0x1 +#define COLLIDER_o662 0x0 + +#define ZONE_Root 0x5 +#define ZONE_g144 0x4 +#define ZONE_o1020 0x3 +#define ZONE_o1019 0x2 +#define ZONE_o1017 0x1 +#define ZONE_o1016 0x0 + diff --git a/include/mapfs/pra_29_shape.h b/include/mapfs/pra_29_shape.h index 870c6bdb3f..cc9b501730 100644 --- a/include/mapfs/pra_29_shape.h +++ b/include/mapfs/pra_29_shape.h @@ -1,66 +1,67 @@ -#define MODEL_Root 0x41 -#define MODEL_g284 0x40 -#define MODEL_o1017 0x3F -#define MODEL_o1131 0x3E -#define MODEL_bridge 0x3D -#define MODEL_side 0x3C -#define MODEL_s03 0x3B -#define MODEL_s02 0x3A -#define MODEL_s01 0x39 -#define MODEL_s00 0x38 -#define MODEL_up 0x37 -#define MODEL_u03 0x36 -#define MODEL_u02 0x35 -#define MODEL_u01 0x34 -#define MODEL_u00 0x33 -#define MODEL_g257 0x32 -#define MODEL_o945 0x31 -#define MODEL_g254 0x30 -#define MODEL_o1132 0x2F -#define MODEL_g283 0x2E -#define MODEL_o1011 0x2D -#define MODEL_g287 0x2C -#define MODEL_o1118 0x2B -#define MODEL_o1112 0x2A -#define MODEL_o1106 0x29 -#define MODEL_o1067 0x28 -#define MODEL_o1066 0x27 -#define MODEL_o1065 0x26 -#define MODEL_o1064 0x25 -#define MODEL_o1063 0x24 -#define MODEL_g275 0x23 -#define MODEL_g294 0x22 -#define MODEL_o1096 0x21 -#define MODEL_g293 0x20 -#define MODEL_o1094 0x1F -#define MODEL_g277 0x1E -#define MODEL_o997 0x1D -#define MODEL_g276 0x1C -#define MODEL_o995 0x1B -#define MODEL_g286 0x1A -#define MODEL_o1133 0x19 -#define MODEL_o1021 0x18 -#define MODEL_g274 0x17 -#define MODEL_o992 0x16 -#define MODEL_o990 0x15 -#define MODEL_o988 0x14 -#define MODEL_g238 0x13 -#define MODEL_g237 0x12 -#define MODEL_o861 0x11 -#define MODEL_g236 0x10 -#define MODEL_o859 0xF -#define MODEL_g220 0xE -#define MODEL_o772 0xD -#define MODEL_g219 0xC -#define MODEL_o768 0xB -#define MODEL_g253 0xA -#define MODEL_o1134 0x9 -#define MODEL_o903 0x8 -#define MODEL_g185 0x7 -#define MODEL_o638 0x6 -#define MODEL_o636 0x5 -#define MODEL_o634 0x4 -#define MODEL_g230 0x3 -#define MODEL_o895 0x2 -#define MODEL_o664 0x1 -#define MODEL_o662 0x0 +#define MODEL_Root 0x41 +#define MODEL_g284 0x40 +#define MODEL_o1017 0x3F +#define MODEL_o1131 0x3E +#define MODEL_bridge 0x3D +#define MODEL_side 0x3C +#define MODEL_s03 0x3B +#define MODEL_s02 0x3A +#define MODEL_s01 0x39 +#define MODEL_s00 0x38 +#define MODEL_up 0x37 +#define MODEL_u03 0x36 +#define MODEL_u02 0x35 +#define MODEL_u01 0x34 +#define MODEL_u00 0x33 +#define MODEL_g257 0x32 +#define MODEL_o945 0x31 +#define MODEL_g254 0x30 +#define MODEL_o1132 0x2F +#define MODEL_g283 0x2E +#define MODEL_o1011 0x2D +#define MODEL_g287 0x2C +#define MODEL_o1118 0x2B +#define MODEL_o1112 0x2A +#define MODEL_o1106 0x29 +#define MODEL_o1067 0x28 +#define MODEL_o1066 0x27 +#define MODEL_o1065 0x26 +#define MODEL_o1064 0x25 +#define MODEL_o1063 0x24 +#define MODEL_g275 0x23 +#define MODEL_g294 0x22 +#define MODEL_o1096 0x21 +#define MODEL_g293 0x20 +#define MODEL_o1094 0x1F +#define MODEL_g277 0x1E +#define MODEL_o997 0x1D +#define MODEL_g276 0x1C +#define MODEL_o995 0x1B +#define MODEL_g286 0x1A +#define MODEL_o1133 0x19 +#define MODEL_o1021 0x18 +#define MODEL_g274 0x17 +#define MODEL_o992 0x16 +#define MODEL_o990 0x15 +#define MODEL_o988 0x14 +#define MODEL_g238 0x13 +#define MODEL_g237 0x12 +#define MODEL_o861 0x11 +#define MODEL_g236 0x10 +#define MODEL_o859 0xF +#define MODEL_g220 0xE +#define MODEL_o772 0xD +#define MODEL_g219 0xC +#define MODEL_o768 0xB +#define MODEL_g253 0xA +#define MODEL_o1134 0x9 +#define MODEL_o903 0x8 +#define MODEL_g185 0x7 +#define MODEL_o638 0x6 +#define MODEL_o636 0x5 +#define MODEL_o634 0x4 +#define MODEL_g230 0x3 +#define MODEL_o895 0x2 +#define MODEL_o664 0x1 +#define MODEL_o662 0x0 + diff --git a/include/mapfs/pra_31_hit.h b/include/mapfs/pra_31_hit.h index e5fb3ca12f..8a80b86545 100644 --- a/include/mapfs/pra_31_hit.h +++ b/include/mapfs/pra_31_hit.h @@ -1,44 +1,50 @@ -#define COLLIDER_Root 0x2B -#define COLLIDER_g144 0x2A -#define COLLIDER_g267 0x29 -#define COLLIDER_g274 0x28 -#define COLLIDER_s03w 0x27 -#define COLLIDER_s03s 0x26 -#define COLLIDER_s03e 0x25 -#define COLLIDER_s03n 0x24 -#define COLLIDER_g273 0x23 -#define COLLIDER_s02w 0x22 -#define COLLIDER_s02s 0x21 -#define COLLIDER_s02e 0x20 -#define COLLIDER_s02n 0x1F -#define COLLIDER_g270 0x1E -#define COLLIDER_s01w 0x1D -#define COLLIDER_s01s 0x1C -#define COLLIDER_s01e 0x1B -#define COLLIDER_s01n 0x1A -#define COLLIDER_g261 0x19 -#define COLLIDER_o1071 0x18 -#define COLLIDER_g253 0x17 -#define COLLIDER_o1054 0x16 -#define COLLIDER_deilitte 0x15 -#define COLLIDER_deilite 0x14 -#define COLLIDER_deilie 0x13 -#define COLLIDER_o960 0x12 -#define COLLIDER_deilittnw 0x11 -#define COLLIDER_deilitnw 0x10 -#define COLLIDER_deilinw 0xF -#define COLLIDER_o903 0xE -#define COLLIDER_deilittsw 0xD -#define COLLIDER_deilitsw 0xC -#define COLLIDER_deilisw 0xB -#define COLLIDER_g260 0xA -#define COLLIDER_o1089 0x9 -#define COLLIDER_o1088 0x8 -#define COLLIDER_o1026 0x7 -#define COLLIDER_o1025 0x6 -#define COLLIDER_o1024 0x5 -#define COLLIDER_o1023 0x4 -#define COLLIDER_o1022 0x3 -#define COLLIDER_o1021 0x2 -#define COLLIDER_o1018 0x1 -#define COLLIDER_o1016 0x0 +#define COLLIDER_Root 0x2B +#define COLLIDER_g144 0x2A +#define COLLIDER_g267 0x29 +#define COLLIDER_g274 0x28 +#define COLLIDER_s03w 0x27 +#define COLLIDER_s03s 0x26 +#define COLLIDER_s03e 0x25 +#define COLLIDER_s03n 0x24 +#define COLLIDER_g273 0x23 +#define COLLIDER_s02w 0x22 +#define COLLIDER_s02s 0x21 +#define COLLIDER_s02e 0x20 +#define COLLIDER_s02n 0x1F +#define COLLIDER_g270 0x1E +#define COLLIDER_s01w 0x1D +#define COLLIDER_s01s 0x1C +#define COLLIDER_s01e 0x1B +#define COLLIDER_s01n 0x1A +#define COLLIDER_g261 0x19 +#define COLLIDER_o1071 0x18 +#define COLLIDER_g253 0x17 +#define COLLIDER_o1054 0x16 +#define COLLIDER_deilitte 0x15 +#define COLLIDER_deilite 0x14 +#define COLLIDER_deilie 0x13 +#define COLLIDER_o960 0x12 +#define COLLIDER_deilittnw 0x11 +#define COLLIDER_deilitnw 0x10 +#define COLLIDER_deilinw 0xF +#define COLLIDER_o903 0xE +#define COLLIDER_deilittsw 0xD +#define COLLIDER_deilitsw 0xC +#define COLLIDER_deilisw 0xB +#define COLLIDER_g260 0xA +#define COLLIDER_o1089 0x9 +#define COLLIDER_o1088 0x8 +#define COLLIDER_o1026 0x7 +#define COLLIDER_o1025 0x6 +#define COLLIDER_o1024 0x5 +#define COLLIDER_o1023 0x4 +#define COLLIDER_o1022 0x3 +#define COLLIDER_o1021 0x2 +#define COLLIDER_o1018 0x1 +#define COLLIDER_o1016 0x0 + +#define ZONE_Root 0x3 +#define ZONE_g144 0x2 +#define ZONE_o1021 0x1 +#define ZONE_o1016 0x0 + diff --git a/include/mapfs/pra_31_shape.h b/include/mapfs/pra_31_shape.h index 0b694fabe5..e7d272a144 100644 --- a/include/mapfs/pra_31_shape.h +++ b/include/mapfs/pra_31_shape.h @@ -1,94 +1,95 @@ -#define MODEL_Root 0x5D -#define MODEL_kage 0x5C -#define MODEL_kage_yuka 0x5B -#define MODEL_k5 0x5A -#define MODEL_k4 0x59 -#define MODEL_k3 0x58 -#define MODEL_k2 0x57 -#define MODEL_k1 0x56 -#define MODEL_no 0x55 -#define MODEL_n5 0x54 -#define MODEL_n4 0x53 -#define MODEL_n3 0x52 -#define MODEL_n2 0x51 -#define MODEL_n1 0x50 -#define MODEL_Default 0x4F -#define MODEL_o1111 0x4E -#define MODEL_g144 0x4D -#define MODEL_g283 0x4C -#define MODEL_s03 0x4B -#define MODEL_g301 0x4A -#define MODEL_o1051 0x49 -#define MODEL_g299 0x48 -#define MODEL_o1047 0x47 -#define MODEL_o1046 0x46 -#define MODEL_o1045 0x45 -#define MODEL_o1044 0x44 -#define MODEL_s02 0x43 -#define MODEL_g300 0x42 -#define MODEL_o1049 0x41 -#define MODEL_g298 0x40 -#define MODEL_o1043 0x3F -#define MODEL_o1042 0x3E -#define MODEL_o1041 0x3D -#define MODEL_o1040 0x3C -#define MODEL_s01 0x3B -#define MODEL_g293 0x3A -#define MODEL_o1033 0x39 -#define MODEL_g292 0x38 -#define MODEL_o1029 0x37 -#define MODEL_o1030 0x36 -#define MODEL_o1031 0x35 -#define MODEL_o1032 0x34 -#define MODEL_g263 0x33 -#define MODEL_g265 0x32 -#define MODEL_o957 0x31 -#define MODEL_g264 0x30 -#define MODEL_o955 0x2F -#define MODEL_g238 0x2E -#define MODEL_g237 0x2D -#define MODEL_o861 0x2C -#define MODEL_g236 0x2B -#define MODEL_o859 0x2A -#define MODEL_g220 0x29 -#define MODEL_o772 0x28 -#define MODEL_g219 0x27 -#define MODEL_o768 0x26 -#define MODEL_g181 0x25 -#define MODEL_g240 0x24 -#define MODEL_g262 0x23 -#define MODEL_o954 0x22 -#define MODEL_g255 0x21 -#define MODEL_o1216 0x20 -#define MODEL_o918 0x1F -#define MODEL_g241 0x1E -#define MODEL_o873 0x1D -#define MODEL_o870 0x1C -#define MODEL_o869 0x1B -#define MODEL_g183 0x1A -#define MODEL_g312 0x19 -#define MODEL_o1090 0x18 -#define MODEL_o1089 0x17 -#define MODEL_o1088 0x16 -#define MODEL_o1087 0x15 -#define MODEL_g317 0x14 -#define MODEL_o1091 0x13 -#define MODEL_o1094 0x12 -#define MODEL_o1092 0x11 -#define MODEL_o1093 0x10 -#define MODEL_g253 0xF -#define MODEL_o1217 0xE -#define MODEL_o903 0xD -#define MODEL_g197 0xC -#define MODEL_o680 0xB -#define MODEL_g185 0xA -#define MODEL_o856 0x9 -#define MODEL_o855 0x8 -#define MODEL_o854 0x7 -#define MODEL_o638 0x6 -#define MODEL_o636 0x5 -#define MODEL_o634 0x4 -#define MODEL_g316 0x3 -#define MODEL_o1105 0x2 -#define MODEL_o1104 0x1 -#define MODEL_o1103 0x0 +#define MODEL_Root 0x5D +#define MODEL_kage 0x5C +#define MODEL_kage_yuka 0x5B +#define MODEL_k5 0x5A +#define MODEL_k4 0x59 +#define MODEL_k3 0x58 +#define MODEL_k2 0x57 +#define MODEL_k1 0x56 +#define MODEL_no 0x55 +#define MODEL_n5 0x54 +#define MODEL_n4 0x53 +#define MODEL_n3 0x52 +#define MODEL_n2 0x51 +#define MODEL_n1 0x50 +#define MODEL_Default 0x4F +#define MODEL_o1111 0x4E +#define MODEL_g144 0x4D +#define MODEL_g283 0x4C +#define MODEL_s03 0x4B +#define MODEL_g301 0x4A +#define MODEL_o1051 0x49 +#define MODEL_g299 0x48 +#define MODEL_o1047 0x47 +#define MODEL_o1046 0x46 +#define MODEL_o1045 0x45 +#define MODEL_o1044 0x44 +#define MODEL_s02 0x43 +#define MODEL_g300 0x42 +#define MODEL_o1049 0x41 +#define MODEL_g298 0x40 +#define MODEL_o1043 0x3F +#define MODEL_o1042 0x3E +#define MODEL_o1041 0x3D +#define MODEL_o1040 0x3C +#define MODEL_s01 0x3B +#define MODEL_g293 0x3A +#define MODEL_o1033 0x39 +#define MODEL_g292 0x38 +#define MODEL_o1029 0x37 +#define MODEL_o1030 0x36 +#define MODEL_o1031 0x35 +#define MODEL_o1032 0x34 +#define MODEL_g263 0x33 +#define MODEL_g265 0x32 +#define MODEL_o957 0x31 +#define MODEL_g264 0x30 +#define MODEL_o955 0x2F +#define MODEL_g238 0x2E +#define MODEL_g237 0x2D +#define MODEL_o861 0x2C +#define MODEL_g236 0x2B +#define MODEL_o859 0x2A +#define MODEL_g220 0x29 +#define MODEL_o772 0x28 +#define MODEL_g219 0x27 +#define MODEL_o768 0x26 +#define MODEL_g181 0x25 +#define MODEL_g240 0x24 +#define MODEL_g262 0x23 +#define MODEL_o954 0x22 +#define MODEL_g255 0x21 +#define MODEL_o1216 0x20 +#define MODEL_o918 0x1F +#define MODEL_g241 0x1E +#define MODEL_o873 0x1D +#define MODEL_o870 0x1C +#define MODEL_o869 0x1B +#define MODEL_g183 0x1A +#define MODEL_g312 0x19 +#define MODEL_o1090 0x18 +#define MODEL_o1089 0x17 +#define MODEL_o1088 0x16 +#define MODEL_o1087 0x15 +#define MODEL_g317 0x14 +#define MODEL_o1091 0x13 +#define MODEL_o1094 0x12 +#define MODEL_o1092 0x11 +#define MODEL_o1093 0x10 +#define MODEL_g253 0xF +#define MODEL_o1217 0xE +#define MODEL_o903 0xD +#define MODEL_g197 0xC +#define MODEL_o680 0xB +#define MODEL_g185 0xA +#define MODEL_o856 0x9 +#define MODEL_o855 0x8 +#define MODEL_o854 0x7 +#define MODEL_o638 0x6 +#define MODEL_o636 0x5 +#define MODEL_o634 0x4 +#define MODEL_g316 0x3 +#define MODEL_o1105 0x2 +#define MODEL_o1104 0x1 +#define MODEL_o1103 0x0 + diff --git a/include/mapfs/pra_32_hit.h b/include/mapfs/pra_32_hit.h index c47065b007..3db9871911 100644 --- a/include/mapfs/pra_32_hit.h +++ b/include/mapfs/pra_32_hit.h @@ -1,15 +1,20 @@ -#define COLLIDER_Root 0xE -#define COLLIDER_g144 0xD -#define COLLIDER_o1350 0xC -#define COLLIDER_o1309 0xB -#define COLLIDER_o1293 0xA -#define COLLIDER_o1317 0x9 -#define COLLIDER_g257 0x8 -#define COLLIDER_g270 0x7 -#define COLLIDER_o971 0x6 -#define COLLIDER_deilittw 0x5 -#define COLLIDER_deilitw 0x4 -#define COLLIDER_deiliw 0x3 -#define COLLIDER_g258 0x2 -#define COLLIDER_o1262 0x1 -#define COLLIDER_o1261 0x0 +#define COLLIDER_Root 0xE +#define COLLIDER_g144 0xD +#define COLLIDER_o1350 0xC +#define COLLIDER_o1309 0xB +#define COLLIDER_o1293 0xA +#define COLLIDER_o1317 0x9 +#define COLLIDER_g257 0x8 +#define COLLIDER_g270 0x7 +#define COLLIDER_o971 0x6 +#define COLLIDER_deilittw 0x5 +#define COLLIDER_deilitw 0x4 +#define COLLIDER_deiliw 0x3 +#define COLLIDER_g258 0x2 +#define COLLIDER_o1262 0x1 +#define COLLIDER_o1261 0x0 + +#define ZONE_Root 0x2 +#define ZONE_g144 0x1 +#define ZONE_o1312 0x0 + diff --git a/include/mapfs/pra_32_shape.h b/include/mapfs/pra_32_shape.h index f5ce8e2442..4862b7af7b 100644 --- a/include/mapfs/pra_32_shape.h +++ b/include/mapfs/pra_32_shape.h @@ -1,44 +1,45 @@ -#define MODEL_Root 0x2B -#define MODEL_g144 0x2A -#define MODEL_Default 0x29 -#define MODEL_g183 0x28 -#define MODEL_o1234 0x27 -#define MODEL_o1233 0x26 -#define MODEL_o1231 0x25 -#define MODEL_o1288 0x24 -#define MODEL_o1287 0x23 -#define MODEL_o1230 0x22 -#define MODEL_g316 0x21 -#define MODEL_o1294 0x20 -#define MODEL_o1293 0x1F -#define MODEL_o1292 0x1E -#define MODEL_o1291 0x1D -#define MODEL_o1286 0x1C -#define MODEL_g315 0x1B -#define MODEL_o1275 0x1A -#define MODEL_o1274 0x19 -#define MODEL_o1273 0x18 -#define MODEL_g312 0x17 -#define MODEL_o1266 0x16 -#define MODEL_o1265 0x15 -#define MODEL_o1264 0x14 -#define MODEL_g313 0x13 -#define MODEL_o1271 0x12 -#define MODEL_g311 0x11 -#define MODEL_o1257 0x10 -#define MODEL_g181 0xF -#define MODEL_g252 0xE -#define MODEL_o1207 0xD -#define MODEL_g257 0xC -#define MODEL_g270 0xB -#define MODEL_o973 0xA -#define MODEL_o971 0x9 -#define MODEL_g259 0x8 -#define MODEL_g261 0x7 -#define MODEL_o948 0x6 -#define MODEL_g260 0x5 -#define MODEL_o946 0x4 -#define MODEL_g258 0x3 -#define MODEL_o1262 0x2 -#define MODEL_o1261 0x1 -#define MODEL_o943 0x0 +#define MODEL_Root 0x2B +#define MODEL_g144 0x2A +#define MODEL_Default 0x29 +#define MODEL_g183 0x28 +#define MODEL_o1234 0x27 +#define MODEL_o1233 0x26 +#define MODEL_o1231 0x25 +#define MODEL_o1288 0x24 +#define MODEL_o1287 0x23 +#define MODEL_o1230 0x22 +#define MODEL_g316 0x21 +#define MODEL_o1294 0x20 +#define MODEL_o1293 0x1F +#define MODEL_o1292 0x1E +#define MODEL_o1291 0x1D +#define MODEL_o1286 0x1C +#define MODEL_g315 0x1B +#define MODEL_o1275 0x1A +#define MODEL_o1274 0x19 +#define MODEL_o1273 0x18 +#define MODEL_g312 0x17 +#define MODEL_o1266 0x16 +#define MODEL_o1265 0x15 +#define MODEL_o1264 0x14 +#define MODEL_g313 0x13 +#define MODEL_o1271 0x12 +#define MODEL_g311 0x11 +#define MODEL_o1257 0x10 +#define MODEL_g181 0xF +#define MODEL_g252 0xE +#define MODEL_o1207 0xD +#define MODEL_g257 0xC +#define MODEL_g270 0xB +#define MODEL_o973 0xA +#define MODEL_o971 0x9 +#define MODEL_g259 0x8 +#define MODEL_g261 0x7 +#define MODEL_o948 0x6 +#define MODEL_g260 0x5 +#define MODEL_o946 0x4 +#define MODEL_g258 0x3 +#define MODEL_o1262 0x2 +#define MODEL_o1261 0x1 +#define MODEL_o943 0x0 + diff --git a/include/mapfs/pra_33_hit.h b/include/mapfs/pra_33_hit.h index 5502c19723..069a3ff52e 100644 --- a/include/mapfs/pra_33_hit.h +++ b/include/mapfs/pra_33_hit.h @@ -1,33 +1,41 @@ -#define COLLIDER_Root 0x20 -#define COLLIDER_g144 0x1F -#define COLLIDER_g263 0x1E -#define COLLIDER_o1063 0x1D -#define COLLIDER_o1045 0x1C -#define COLLIDER_g253 0x1B -#define COLLIDER_o1059 0x1A -#define COLLIDER_deilittne 0x19 -#define COLLIDER_deilitne 0x18 -#define COLLIDER_deiline 0x17 -#define COLLIDER_o979 0x16 -#define COLLIDER_deilittse 0x15 -#define COLLIDER_deilitse 0x14 -#define COLLIDER_deilise 0x13 -#define COLLIDER_o960 0x12 -#define COLLIDER_deilittnw 0x11 -#define COLLIDER_deilitnw 0x10 -#define COLLIDER_deilinw 0xF -#define COLLIDER_g261 0xE -#define COLLIDER_o1038 0xD -#define COLLIDER_g260 0xC -#define COLLIDER_o1034 0xB -#define COLLIDER_o1033 0xA -#define COLLIDER_o1030 0x9 -#define COLLIDER_o1029 0x8 -#define COLLIDER_o1026 0x7 -#define COLLIDER_o1025 0x6 -#define COLLIDER_o1024 0x5 -#define COLLIDER_o1023 0x4 -#define COLLIDER_o1022 0x3 -#define COLLIDER_o1021 0x2 -#define COLLIDER_o1018 0x1 -#define COLLIDER_o1016 0x0 +#define COLLIDER_Root 0x20 +#define COLLIDER_g144 0x1F +#define COLLIDER_g263 0x1E +#define COLLIDER_o1063 0x1D +#define COLLIDER_o1045 0x1C +#define COLLIDER_g253 0x1B +#define COLLIDER_o1059 0x1A +#define COLLIDER_deilittne 0x19 +#define COLLIDER_deilitne 0x18 +#define COLLIDER_deiline 0x17 +#define COLLIDER_o979 0x16 +#define COLLIDER_deilittse 0x15 +#define COLLIDER_deilitse 0x14 +#define COLLIDER_deilise 0x13 +#define COLLIDER_o960 0x12 +#define COLLIDER_deilittnw 0x11 +#define COLLIDER_deilitnw 0x10 +#define COLLIDER_deilinw 0xF +#define COLLIDER_g261 0xE +#define COLLIDER_o1038 0xD +#define COLLIDER_g260 0xC +#define COLLIDER_o1034 0xB +#define COLLIDER_o1033 0xA +#define COLLIDER_o1030 0x9 +#define COLLIDER_o1029 0x8 +#define COLLIDER_o1026 0x7 +#define COLLIDER_o1025 0x6 +#define COLLIDER_o1024 0x5 +#define COLLIDER_o1023 0x4 +#define COLLIDER_o1022 0x3 +#define COLLIDER_o1021 0x2 +#define COLLIDER_o1018 0x1 +#define COLLIDER_o1016 0x0 + +#define ZONE_Root 0x5 +#define ZONE_g144 0x4 +#define ZONE_o1020 0x3 +#define ZONE_o1019 0x2 +#define ZONE_o1017 0x1 +#define ZONE_o1016 0x0 + diff --git a/include/mapfs/pra_33_shape.h b/include/mapfs/pra_33_shape.h index 468e9f5deb..d526ed7ae4 100644 --- a/include/mapfs/pra_33_shape.h +++ b/include/mapfs/pra_33_shape.h @@ -1,58 +1,59 @@ -#define MODEL_Root 0x39 -#define MODEL_g197 0x38 -#define MODEL_o1032 0x37 -#define MODEL_pikapika 0x36 -#define MODEL_o985 0x35 -#define MODEL_o987 0x34 -#define MODEL_g260 0x33 -#define MODEL_o991 0x32 -#define MODEL_o990 0x31 -#define MODEL_o989 0x30 -#define MODEL_g253 0x2F -#define MODEL_o1034 0x2E -#define MODEL_g283 0x2D -#define MODEL_g242 0x2C -#define MODEL_g244 0x2B -#define MODEL_o876 0x2A -#define MODEL_g243 0x29 -#define MODEL_o874 0x28 -#define MODEL_g286 0x27 -#define MODEL_o680 0x26 -#define MODEL_o1041 0x25 -#define MODEL_g240 0x24 -#define MODEL_o873 0x23 -#define MODEL_o872 0x22 -#define MODEL_o870 0x21 -#define MODEL_g282 0x20 -#define MODEL_g254 0x1F -#define MODEL_o1038 0x1E -#define MODEL_o1037 0x1D -#define MODEL_g257 0x1C -#define MODEL_o945 0x1B -#define MODEL_g281 0x1A -#define MODEL_g285 0x19 -#define MODEL_o1036 0x18 -#define MODEL_o1040 0x17 -#define MODEL_g238 0x16 -#define MODEL_g237 0x15 -#define MODEL_o861 0x14 -#define MODEL_g236 0x13 -#define MODEL_o859 0x12 -#define MODEL_g183 0x11 -#define MODEL_o634 0x10 -#define MODEL_o638 0xF -#define MODEL_o855 0xE -#define MODEL_g279 0xD -#define MODEL_o1026 0xC -#define MODEL_o1025 0xB -#define MODEL_o1024 0xA -#define MODEL_g265 0x9 -#define MODEL_g269 0x8 -#define MODEL_g270 0x7 -#define MODEL_o1004 0x6 -#define MODEL_o1003 0x5 -#define MODEL_o1002 0x4 -#define MODEL_g266 0x3 -#define MODEL_g267 0x2 -#define MODEL_o1000 0x1 -#define MODEL_o999 0x0 +#define MODEL_Root 0x39 +#define MODEL_g197 0x38 +#define MODEL_o1032 0x37 +#define MODEL_pikapika 0x36 +#define MODEL_o985 0x35 +#define MODEL_o987 0x34 +#define MODEL_g260 0x33 +#define MODEL_o991 0x32 +#define MODEL_o990 0x31 +#define MODEL_o989 0x30 +#define MODEL_g253 0x2F +#define MODEL_o1034 0x2E +#define MODEL_g283 0x2D +#define MODEL_g242 0x2C +#define MODEL_g244 0x2B +#define MODEL_o876 0x2A +#define MODEL_g243 0x29 +#define MODEL_o874 0x28 +#define MODEL_g286 0x27 +#define MODEL_o680 0x26 +#define MODEL_o1041 0x25 +#define MODEL_g240 0x24 +#define MODEL_o873 0x23 +#define MODEL_o872 0x22 +#define MODEL_o870 0x21 +#define MODEL_g282 0x20 +#define MODEL_g254 0x1F +#define MODEL_o1038 0x1E +#define MODEL_o1037 0x1D +#define MODEL_g257 0x1C +#define MODEL_o945 0x1B +#define MODEL_g281 0x1A +#define MODEL_g285 0x19 +#define MODEL_o1036 0x18 +#define MODEL_o1040 0x17 +#define MODEL_g238 0x16 +#define MODEL_g237 0x15 +#define MODEL_o861 0x14 +#define MODEL_g236 0x13 +#define MODEL_o859 0x12 +#define MODEL_g183 0x11 +#define MODEL_o634 0x10 +#define MODEL_o638 0xF +#define MODEL_o855 0xE +#define MODEL_g279 0xD +#define MODEL_o1026 0xC +#define MODEL_o1025 0xB +#define MODEL_o1024 0xA +#define MODEL_g265 0x9 +#define MODEL_g269 0x8 +#define MODEL_g270 0x7 +#define MODEL_o1004 0x6 +#define MODEL_o1003 0x5 +#define MODEL_o1002 0x4 +#define MODEL_g266 0x3 +#define MODEL_g267 0x2 +#define MODEL_o1000 0x1 +#define MODEL_o999 0x0 + diff --git a/include/mapfs/pra_34_hit.h b/include/mapfs/pra_34_hit.h index 9575794cef..1bf90ff8df 100644 --- a/include/mapfs/pra_34_hit.h +++ b/include/mapfs/pra_34_hit.h @@ -1,29 +1,37 @@ -#define COLLIDER_Root 0x1C -#define COLLIDER_g253 0x1B -#define COLLIDER_o975 0x1A -#define COLLIDER_deilittne 0x19 -#define COLLIDER_deilitne 0x18 -#define COLLIDER_deiline 0x17 -#define COLLIDER_o979 0x16 -#define COLLIDER_deilittse 0x15 -#define COLLIDER_deilitse 0x14 -#define COLLIDER_deilise 0x13 -#define COLLIDER_o960 0x12 -#define COLLIDER_deilittnw 0x11 -#define COLLIDER_deilitnw 0x10 -#define COLLIDER_deilinw 0xF -#define COLLIDER_o903 0xE -#define COLLIDER_deilittsw 0xD -#define COLLIDER_deilitsw 0xC -#define COLLIDER_deilisw 0xB -#define COLLIDER_g257 0xA -#define COLLIDER_o1023 0x9 -#define COLLIDER_g229 0x8 -#define COLLIDER_o688 0x7 -#define COLLIDER_o686 0x6 -#define COLLIDER_o957 0x5 -#define COLLIDER_o955 0x4 -#define COLLIDER_o954 0x3 -#define COLLIDER_o953 0x2 -#define COLLIDER_o952 0x1 -#define COLLIDER_o662 0x0 +#define COLLIDER_Root 0x1C +#define COLLIDER_g253 0x1B +#define COLLIDER_o975 0x1A +#define COLLIDER_deilittne 0x19 +#define COLLIDER_deilitne 0x18 +#define COLLIDER_deiline 0x17 +#define COLLIDER_o979 0x16 +#define COLLIDER_deilittse 0x15 +#define COLLIDER_deilitse 0x14 +#define COLLIDER_deilise 0x13 +#define COLLIDER_o960 0x12 +#define COLLIDER_deilittnw 0x11 +#define COLLIDER_deilitnw 0x10 +#define COLLIDER_deilinw 0xF +#define COLLIDER_o903 0xE +#define COLLIDER_deilittsw 0xD +#define COLLIDER_deilitsw 0xC +#define COLLIDER_deilisw 0xB +#define COLLIDER_g257 0xA +#define COLLIDER_o1023 0x9 +#define COLLIDER_g229 0x8 +#define COLLIDER_o688 0x7 +#define COLLIDER_o686 0x6 +#define COLLIDER_o957 0x5 +#define COLLIDER_o955 0x4 +#define COLLIDER_o954 0x3 +#define COLLIDER_o953 0x2 +#define COLLIDER_o952 0x1 +#define COLLIDER_o662 0x0 + +#define ZONE_Root 0x5 +#define ZONE_g144 0x4 +#define ZONE_o1020 0x3 +#define ZONE_o1019 0x2 +#define ZONE_o1017 0x1 +#define ZONE_o1016 0x0 + diff --git a/include/mapfs/pra_34_shape.h b/include/mapfs/pra_34_shape.h index b42c0b3f0c..51a0515a59 100644 --- a/include/mapfs/pra_34_shape.h +++ b/include/mapfs/pra_34_shape.h @@ -1,61 +1,62 @@ -#define MODEL_Root 0x3C -#define MODEL_g289 0x3B -#define MODEL_o1018 0x3A -#define MODEL_o686 0x39 -#define MODEL_g292 0x38 -#define MODEL_g197 0x37 -#define MODEL_o680 0x36 -#define MODEL_g296 0x35 -#define MODEL_o1026 0x34 -#define MODEL_g284 0x33 -#define MODEL_o1015 0x32 -#define MODEL_o1014 0x31 -#define MODEL_g283 0x30 -#define MODEL_o1013 0x2F -#define MODEL_o1012 0x2E -#define MODEL_g244 0x2D -#define MODEL_o877 0x2C -#define MODEL_o876 0x2B -#define MODEL_g243 0x2A -#define MODEL_o875 0x29 -#define MODEL_o874 0x28 -#define MODEL_g291 0x27 -#define MODEL_o1031 0x26 -#define MODEL_o961 0x25 -#define MODEL_o963 0x24 -#define MODEL_g294 0x23 -#define MODEL_g252 0x22 -#define MODEL_o1023 0x21 -#define MODEL_o690 0x20 -#define MODEL_g257 0x1F -#define MODEL_o947 0x1E -#define MODEL_o945 0x1D -#define MODEL_g293 0x1C -#define MODEL_g242 0x1B -#define MODEL_g282 0x1A -#define MODEL_o1011 0x19 -#define MODEL_o1010 0x18 -#define MODEL_g281 0x17 -#define MODEL_o1009 0x16 -#define MODEL_o1008 0x15 -#define MODEL_g246 0x14 -#define MODEL_o881 0x13 -#define MODEL_o880 0x12 -#define MODEL_g245 0x11 -#define MODEL_o879 0x10 -#define MODEL_o878 0xF -#define MODEL_g264 0xE -#define MODEL_o964 0xD -#define MODEL_o1029 0xC -#define MODEL_o1030 0xB -#define MODEL_o958 0xA -#define MODEL_o1028 0x9 -#define MODEL_g229 0x8 -#define MODEL_o666 0x7 -#define MODEL_o895 0x6 -#define MODEL_o664 0x5 -#define MODEL_o662 0x4 -#define MODEL_o1027 0x3 -#define MODEL_g269 0x2 -#define MODEL_o1022 0x1 -#define MODEL_o978 0x0 +#define MODEL_Root 0x3C +#define MODEL_g289 0x3B +#define MODEL_o1018 0x3A +#define MODEL_o686 0x39 +#define MODEL_g292 0x38 +#define MODEL_g197 0x37 +#define MODEL_o680 0x36 +#define MODEL_g296 0x35 +#define MODEL_o1026 0x34 +#define MODEL_g284 0x33 +#define MODEL_o1015 0x32 +#define MODEL_o1014 0x31 +#define MODEL_g283 0x30 +#define MODEL_o1013 0x2F +#define MODEL_o1012 0x2E +#define MODEL_g244 0x2D +#define MODEL_o877 0x2C +#define MODEL_o876 0x2B +#define MODEL_g243 0x2A +#define MODEL_o875 0x29 +#define MODEL_o874 0x28 +#define MODEL_g291 0x27 +#define MODEL_o1031 0x26 +#define MODEL_o961 0x25 +#define MODEL_o963 0x24 +#define MODEL_g294 0x23 +#define MODEL_g252 0x22 +#define MODEL_o1023 0x21 +#define MODEL_o690 0x20 +#define MODEL_g257 0x1F +#define MODEL_o947 0x1E +#define MODEL_o945 0x1D +#define MODEL_g293 0x1C +#define MODEL_g242 0x1B +#define MODEL_g282 0x1A +#define MODEL_o1011 0x19 +#define MODEL_o1010 0x18 +#define MODEL_g281 0x17 +#define MODEL_o1009 0x16 +#define MODEL_o1008 0x15 +#define MODEL_g246 0x14 +#define MODEL_o881 0x13 +#define MODEL_o880 0x12 +#define MODEL_g245 0x11 +#define MODEL_o879 0x10 +#define MODEL_o878 0xF +#define MODEL_g264 0xE +#define MODEL_o964 0xD +#define MODEL_o1029 0xC +#define MODEL_o1030 0xB +#define MODEL_o958 0xA +#define MODEL_o1028 0x9 +#define MODEL_g229 0x8 +#define MODEL_o666 0x7 +#define MODEL_o895 0x6 +#define MODEL_o664 0x5 +#define MODEL_o662 0x4 +#define MODEL_o1027 0x3 +#define MODEL_g269 0x2 +#define MODEL_o1022 0x1 +#define MODEL_o978 0x0 + diff --git a/include/mapfs/pra_35_hit.h b/include/mapfs/pra_35_hit.h index 69db2dc98d..85a4cc1cc2 100644 --- a/include/mapfs/pra_35_hit.h +++ b/include/mapfs/pra_35_hit.h @@ -1,38 +1,46 @@ -#define COLLIDER_Root 0x25 -#define COLLIDER_g144 0x24 -#define COLLIDER_g263 0x23 -#define COLLIDER_deilittne 0x22 -#define COLLIDER_deilittse 0x21 -#define COLLIDER_g253 0x20 -#define COLLIDER_o1058 0x1F -#define COLLIDER_o1057 0x1E -#define COLLIDER_deilitne 0x1D -#define COLLIDER_deiline 0x1C -#define COLLIDER_deilitse 0x1B -#define COLLIDER_deilise 0x1A -#define COLLIDER_o960 0x19 -#define COLLIDER_deilittnw 0x18 -#define COLLIDER_deilitnw 0x17 -#define COLLIDER_deilinw 0x16 -#define COLLIDER_o903 0x15 -#define COLLIDER_deilittsw 0x14 -#define COLLIDER_deilitsw 0x13 -#define COLLIDER_deilisw 0x12 -#define COLLIDER_g261 0x11 -#define COLLIDER_o1038 0x10 -#define COLLIDER_g260 0xF -#define COLLIDER_o1056 0xE -#define COLLIDER_o1034 0xD -#define COLLIDER_o1033 0xC -#define COLLIDER_o1030 0xB -#define COLLIDER_o1029 0xA -#define COLLIDER_o1026 0x9 -#define COLLIDER_o1025 0x8 -#define COLLIDER_o1024 0x7 -#define COLLIDER_o1023 0x6 -#define COLLIDER_o1022 0x5 -#define COLLIDER_o1021 0x4 -#define COLLIDER_o1018 0x3 -#define COLLIDER_o1016 0x2 -#define COLLIDER_o1020 0x1 -#define COLLIDER_o1017 0x0 +#define COLLIDER_Root 0x25 +#define COLLIDER_g144 0x24 +#define COLLIDER_g263 0x23 +#define COLLIDER_deilittne 0x22 +#define COLLIDER_deilittse 0x21 +#define COLLIDER_g253 0x20 +#define COLLIDER_o1058 0x1F +#define COLLIDER_o1057 0x1E +#define COLLIDER_deilitne 0x1D +#define COLLIDER_deiline 0x1C +#define COLLIDER_deilitse 0x1B +#define COLLIDER_deilise 0x1A +#define COLLIDER_o960 0x19 +#define COLLIDER_deilittnw 0x18 +#define COLLIDER_deilitnw 0x17 +#define COLLIDER_deilinw 0x16 +#define COLLIDER_o903 0x15 +#define COLLIDER_deilittsw 0x14 +#define COLLIDER_deilitsw 0x13 +#define COLLIDER_deilisw 0x12 +#define COLLIDER_g261 0x11 +#define COLLIDER_o1038 0x10 +#define COLLIDER_g260 0xF +#define COLLIDER_o1056 0xE +#define COLLIDER_o1034 0xD +#define COLLIDER_o1033 0xC +#define COLLIDER_o1030 0xB +#define COLLIDER_o1029 0xA +#define COLLIDER_o1026 0x9 +#define COLLIDER_o1025 0x8 +#define COLLIDER_o1024 0x7 +#define COLLIDER_o1023 0x6 +#define COLLIDER_o1022 0x5 +#define COLLIDER_o1021 0x4 +#define COLLIDER_o1018 0x3 +#define COLLIDER_o1016 0x2 +#define COLLIDER_o1020 0x1 +#define COLLIDER_o1017 0x0 + +#define ZONE_Root 0x5 +#define ZONE_g144 0x4 +#define ZONE_o1020 0x3 +#define ZONE_o1019 0x2 +#define ZONE_o1017 0x1 +#define ZONE_o1016 0x0 + diff --git a/include/mapfs/pra_35_shape.h b/include/mapfs/pra_35_shape.h index 8f85aa2018..4da33e99de 100644 --- a/include/mapfs/pra_35_shape.h +++ b/include/mapfs/pra_35_shape.h @@ -1,76 +1,77 @@ -#define MODEL_Root 0x4B -#define MODEL_g197 0x4A -#define MODEL_o891 0x49 -#define MODEL_o680 0x48 -#define MODEL_o1050 0x47 -#define MODEL_g311 0x46 -#define MODEL_g313 0x45 -#define MODEL_o1070 0x44 -#define MODEL_o1061 0x43 -#define MODEL_g257 0x42 -#define MODEL_o947 0x41 -#define MODEL_o945 0x40 -#define MODEL_g314 0x3F -#define MODEL_o1062 0x3E -#define MODEL_g231 0x3D -#define MODEL_o1064 0x3C -#define MODEL_o1063 0x3B -#define MODEL_o949 0x3A -#define MODEL_o816 0x39 -#define MODEL_o805 0x38 -#define MODEL_o794 0x37 -#define MODEL_g238 0x36 -#define MODEL_g237 0x35 -#define MODEL_o862 0x34 -#define MODEL_o861 0x33 -#define MODEL_g236 0x32 -#define MODEL_o860 0x31 -#define MODEL_o859 0x30 -#define MODEL_g220 0x2F -#define MODEL_o844 0x2E -#define MODEL_o772 0x2D -#define MODEL_g219 0x2C -#define MODEL_o846 0x2B -#define MODEL_o768 0x2A -#define MODEL_g185 0x29 -#define MODEL_o1049 0x28 -#define MODEL_o638 0x27 -#define MODEL_o636 0x26 -#define MODEL_o634 0x25 -#define MODEL_g259 0x24 -#define MODEL_g299 0x23 -#define MODEL_g301 0x22 -#define MODEL_o1036 0x21 -#define MODEL_g300 0x20 -#define MODEL_o1034 0x1F -#define MODEL_o1033 0x1E -#define MODEL_o1032 0x1D -#define MODEL_g296 0x1C -#define MODEL_g298 0x1B -#define MODEL_o1030 0x1A -#define MODEL_g297 0x19 -#define MODEL_o1028 0x18 -#define MODEL_o1027 0x17 -#define MODEL_g288 0x16 -#define MODEL_g290 0x15 -#define MODEL_o1017 0x14 -#define MODEL_g289 0x13 -#define MODEL_o1015 0x12 -#define MODEL_o1014 0x11 -#define MODEL_g253 0x10 -#define MODEL_o913 0xF -#define MODEL_o903 0xE -#define MODEL_g241 0xD -#define MODEL_o888 0xC -#define MODEL_o997 0xB -#define MODEL_o871 0xA -#define MODEL_o1065 0x9 -#define MODEL_o1066 0x8 -#define MODEL_g310 0x7 -#define MODEL_o1058 0x6 -#define MODEL_o1057 0x5 -#define MODEL_o1056 0x4 -#define MODEL_o1055 0x3 -#define MODEL_g309 0x2 -#define MODEL_o1052 0x1 -#define MODEL_o1051 0x0 +#define MODEL_Root 0x4B +#define MODEL_g197 0x4A +#define MODEL_o891 0x49 +#define MODEL_o680 0x48 +#define MODEL_o1050 0x47 +#define MODEL_g311 0x46 +#define MODEL_g313 0x45 +#define MODEL_o1070 0x44 +#define MODEL_o1061 0x43 +#define MODEL_g257 0x42 +#define MODEL_o947 0x41 +#define MODEL_o945 0x40 +#define MODEL_g314 0x3F +#define MODEL_o1062 0x3E +#define MODEL_g231 0x3D +#define MODEL_o1064 0x3C +#define MODEL_o1063 0x3B +#define MODEL_o949 0x3A +#define MODEL_o816 0x39 +#define MODEL_o805 0x38 +#define MODEL_o794 0x37 +#define MODEL_g238 0x36 +#define MODEL_g237 0x35 +#define MODEL_o862 0x34 +#define MODEL_o861 0x33 +#define MODEL_g236 0x32 +#define MODEL_o860 0x31 +#define MODEL_o859 0x30 +#define MODEL_g220 0x2F +#define MODEL_o844 0x2E +#define MODEL_o772 0x2D +#define MODEL_g219 0x2C +#define MODEL_o846 0x2B +#define MODEL_o768 0x2A +#define MODEL_g185 0x29 +#define MODEL_o1049 0x28 +#define MODEL_o638 0x27 +#define MODEL_o636 0x26 +#define MODEL_o634 0x25 +#define MODEL_g259 0x24 +#define MODEL_g299 0x23 +#define MODEL_g301 0x22 +#define MODEL_o1036 0x21 +#define MODEL_g300 0x20 +#define MODEL_o1034 0x1F +#define MODEL_o1033 0x1E +#define MODEL_o1032 0x1D +#define MODEL_g296 0x1C +#define MODEL_g298 0x1B +#define MODEL_o1030 0x1A +#define MODEL_g297 0x19 +#define MODEL_o1028 0x18 +#define MODEL_o1027 0x17 +#define MODEL_g288 0x16 +#define MODEL_g290 0x15 +#define MODEL_o1017 0x14 +#define MODEL_g289 0x13 +#define MODEL_o1015 0x12 +#define MODEL_o1014 0x11 +#define MODEL_g253 0x10 +#define MODEL_o913 0xF +#define MODEL_o903 0xE +#define MODEL_g241 0xD +#define MODEL_o888 0xC +#define MODEL_o997 0xB +#define MODEL_o871 0xA +#define MODEL_o1065 0x9 +#define MODEL_o1066 0x8 +#define MODEL_g310 0x7 +#define MODEL_o1058 0x6 +#define MODEL_o1057 0x5 +#define MODEL_o1056 0x4 +#define MODEL_o1055 0x3 +#define MODEL_g309 0x2 +#define MODEL_o1052 0x1 +#define MODEL_o1051 0x0 + diff --git a/include/mapfs/pra_36_hit.h b/include/mapfs/pra_36_hit.h index b149746b8f..76050b01e8 100644 --- a/include/mapfs/pra_36_hit.h +++ b/include/mapfs/pra_36_hit.h @@ -1 +1,4 @@ -#define COLLIDER_Root 0x0 +#define COLLIDER_Root 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/pra_36_shape.h b/include/mapfs/pra_36_shape.h index 98ef430c86..dee3600cd9 100644 --- a/include/mapfs/pra_36_shape.h +++ b/include/mapfs/pra_36_shape.h @@ -1 +1,2 @@ -#define MODEL_Root 0x0 +#define MODEL_Root 0x0 + diff --git a/include/mapfs/pra_37_hit.h b/include/mapfs/pra_37_hit.h index b149746b8f..76050b01e8 100644 --- a/include/mapfs/pra_37_hit.h +++ b/include/mapfs/pra_37_hit.h @@ -1 +1,4 @@ -#define COLLIDER_Root 0x0 +#define COLLIDER_Root 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/pra_37_shape.h b/include/mapfs/pra_37_shape.h index 98ef430c86..dee3600cd9 100644 --- a/include/mapfs/pra_37_shape.h +++ b/include/mapfs/pra_37_shape.h @@ -1 +1,2 @@ -#define MODEL_Root 0x0 +#define MODEL_Root 0x0 + diff --git a/include/mapfs/pra_38_hit.h b/include/mapfs/pra_38_hit.h index b149746b8f..76050b01e8 100644 --- a/include/mapfs/pra_38_hit.h +++ b/include/mapfs/pra_38_hit.h @@ -1 +1,4 @@ -#define COLLIDER_Root 0x0 +#define COLLIDER_Root 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/pra_38_shape.h b/include/mapfs/pra_38_shape.h index 98ef430c86..dee3600cd9 100644 --- a/include/mapfs/pra_38_shape.h +++ b/include/mapfs/pra_38_shape.h @@ -1 +1,2 @@ -#define MODEL_Root 0x0 +#define MODEL_Root 0x0 + diff --git a/include/mapfs/pra_39_hit.h b/include/mapfs/pra_39_hit.h index b149746b8f..76050b01e8 100644 --- a/include/mapfs/pra_39_hit.h +++ b/include/mapfs/pra_39_hit.h @@ -1 +1,4 @@ -#define COLLIDER_Root 0x0 +#define COLLIDER_Root 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/pra_39_shape.h b/include/mapfs/pra_39_shape.h index 98ef430c86..dee3600cd9 100644 --- a/include/mapfs/pra_39_shape.h +++ b/include/mapfs/pra_39_shape.h @@ -1 +1,2 @@ -#define MODEL_Root 0x0 +#define MODEL_Root 0x0 + diff --git a/include/mapfs/pra_40_hit.h b/include/mapfs/pra_40_hit.h index a2e826ef81..22f9aac3fc 100644 --- a/include/mapfs/pra_40_hit.h +++ b/include/mapfs/pra_40_hit.h @@ -1,20 +1,26 @@ -#define COLLIDER_Root 0x13 -#define COLLIDER_g253 0x12 -#define COLLIDER_o975 0x11 -#define COLLIDER_deilitt2 0x10 -#define COLLIDER_deilit2 0xF -#define COLLIDER_deili2 0xE -#define COLLIDER_o960 0xD -#define COLLIDER_deilitt1 0xC -#define COLLIDER_deilit1 0xB -#define COLLIDER_deili1 0xA -#define COLLIDER_g229 0x9 -#define COLLIDER_o686 0x8 -#define COLLIDER_o957 0x7 -#define COLLIDER_o955 0x6 -#define COLLIDER_o952 0x5 -#define COLLIDER_o662 0x4 -#define COLLIDER_o1027 0x3 -#define COLLIDER_o1026 0x2 -#define COLLIDER_o1025 0x1 -#define COLLIDER_o1024 0x0 +#define COLLIDER_Root 0x13 +#define COLLIDER_g253 0x12 +#define COLLIDER_o975 0x11 +#define COLLIDER_deilitt2 0x10 +#define COLLIDER_deilit2 0xF +#define COLLIDER_deili2 0xE +#define COLLIDER_o960 0xD +#define COLLIDER_deilitt1 0xC +#define COLLIDER_deilit1 0xB +#define COLLIDER_deili1 0xA +#define COLLIDER_g229 0x9 +#define COLLIDER_o686 0x8 +#define COLLIDER_o957 0x7 +#define COLLIDER_o955 0x6 +#define COLLIDER_o952 0x5 +#define COLLIDER_o662 0x4 +#define COLLIDER_o1027 0x3 +#define COLLIDER_o1026 0x2 +#define COLLIDER_o1025 0x1 +#define COLLIDER_o1024 0x0 + +#define ZONE_Root 0x3 +#define ZONE_g144 0x2 +#define ZONE_o1017 0x1 +#define ZONE_o1016 0x0 + diff --git a/include/mapfs/pra_40_shape.h b/include/mapfs/pra_40_shape.h index 984ecc3cf4..768c58ad3e 100644 --- a/include/mapfs/pra_40_shape.h +++ b/include/mapfs/pra_40_shape.h @@ -1,30 +1,31 @@ -#define MODEL_Root 0x1D -#define MODEL_g294 0x1C -#define MODEL_o1057 0x1B -#define MODEL_o1068 0x1A -#define MODEL_g296 0x19 -#define MODEL_o1043 0x18 -#define MODEL_o918 0x17 -#define MODEL_g242 0x16 -#define MODEL_g246 0x15 -#define MODEL_o880 0x14 -#define MODEL_g245 0x13 -#define MODEL_o878 0x12 -#define MODEL_g301 0x11 -#define MODEL_o1055 0x10 -#define MODEL_g300 0xF -#define MODEL_o1053 0xE -#define MODEL_g181 0xD -#define MODEL_o680 0xC -#define MODEL_g295 0xB -#define MODEL_o1039 0xA -#define MODEL_o1038 0x9 -#define MODEL_o1037 0x8 -#define MODEL_g241 0x7 -#define MODEL_o870 0x6 -#define MODEL_o869 0x5 -#define MODEL_o868 0x4 -#define MODEL_g303 0x3 -#define MODEL_o1060 0x2 -#define MODEL_o1059 0x1 -#define MODEL_o1058 0x0 +#define MODEL_Root 0x1D +#define MODEL_g294 0x1C +#define MODEL_o1057 0x1B +#define MODEL_o1068 0x1A +#define MODEL_g296 0x19 +#define MODEL_o1043 0x18 +#define MODEL_o918 0x17 +#define MODEL_g242 0x16 +#define MODEL_g246 0x15 +#define MODEL_o880 0x14 +#define MODEL_g245 0x13 +#define MODEL_o878 0x12 +#define MODEL_g301 0x11 +#define MODEL_o1055 0x10 +#define MODEL_g300 0xF +#define MODEL_o1053 0xE +#define MODEL_g181 0xD +#define MODEL_o680 0xC +#define MODEL_g295 0xB +#define MODEL_o1039 0xA +#define MODEL_o1038 0x9 +#define MODEL_o1037 0x8 +#define MODEL_g241 0x7 +#define MODEL_o870 0x6 +#define MODEL_o869 0x5 +#define MODEL_o868 0x4 +#define MODEL_g303 0x3 +#define MODEL_o1060 0x2 +#define MODEL_o1059 0x1 +#define MODEL_o1058 0x0 + diff --git a/include/mapfs/pra_bt01_hit.h b/include/mapfs/pra_bt01_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/pra_bt01_hit.h +++ b/include/mapfs/pra_bt01_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/pra_bt01_shape.h b/include/mapfs/pra_bt01_shape.h index bd60362f04..27b293c5c1 100644 --- a/include/mapfs/pra_bt01_shape.h +++ b/include/mapfs/pra_bt01_shape.h @@ -1,25 +1,26 @@ -#define MODEL_Root 0x18 -#define MODEL_dai 0x17 -#define MODEL_hasira 0x16 -#define MODEL_o385 0x15 -#define MODEL_o384 0x14 -#define MODEL_o383 0x13 -#define MODEL_waku1 0x12 -#define MODEL_yuka 0x11 -#define MODEL_g49 0x10 -#define MODEL_futi3 0xF -#define MODEL_waku3 0xE -#define MODEL_waku2_2 0xD -#define MODEL_waku_2 0xC -#define MODEL_waku2 0xB -#define MODEL_futi2_2 0xA -#define MODEL_hsi2_2_2 0x9 -#define MODEL_hasi2_2 0x8 -#define MODEL_hasi2 0x7 -#define MODEL_hasi1 0x6 -#define MODEL_futi2 0x5 -#define MODEL_futi1 0x4 -#define MODEL_kabe 0x3 -#define MODEL_yuka2 0x2 -#define MODEL_waku 0x1 -#define MODEL_ten 0x0 +#define MODEL_Root 0x18 +#define MODEL_dai 0x17 +#define MODEL_hasira 0x16 +#define MODEL_o385 0x15 +#define MODEL_o384 0x14 +#define MODEL_o383 0x13 +#define MODEL_waku1 0x12 +#define MODEL_yuka 0x11 +#define MODEL_g49 0x10 +#define MODEL_futi3 0xF +#define MODEL_waku3 0xE +#define MODEL_waku2_2 0xD +#define MODEL_waku_2 0xC +#define MODEL_waku2 0xB +#define MODEL_futi2_2 0xA +#define MODEL_hsi2_2_2 0x9 +#define MODEL_hasi2_2 0x8 +#define MODEL_hasi2 0x7 +#define MODEL_hasi1 0x6 +#define MODEL_futi2 0x5 +#define MODEL_futi1 0x4 +#define MODEL_kabe 0x3 +#define MODEL_yuka2 0x2 +#define MODEL_waku 0x1 +#define MODEL_ten 0x0 + diff --git a/include/mapfs/pra_bt02_hit.h b/include/mapfs/pra_bt02_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/pra_bt02_hit.h +++ b/include/mapfs/pra_bt02_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/pra_bt02_shape.h b/include/mapfs/pra_bt02_shape.h index 8eb5ccf3f8..eaf68b0550 100644 --- a/include/mapfs/pra_bt02_shape.h +++ b/include/mapfs/pra_bt02_shape.h @@ -1,32 +1,33 @@ -#define MODEL_Root 0x1F -#define MODEL_dai 0x1E -#define MODEL_hasira2 0x1D -#define MODEL_o397 0x1C -#define MODEL_o396 0x1B -#define MODEL_o395 0x1A -#define MODEL_hasira 0x19 -#define MODEL_o385 0x18 -#define MODEL_o384 0x17 -#define MODEL_o383 0x16 -#define MODEL_waku1 0x15 -#define MODEL_yuka 0x14 -#define MODEL_g104 0x13 -#define MODEL_o413 0x12 -#define MODEL_o412 0x11 -#define MODEL_g49 0x10 -#define MODEL_g105 0xF -#define MODEL_o414 0xE -#define MODEL_waku2_2 0xD -#define MODEL_waku_2 0xC -#define MODEL_waku2 0xB -#define MODEL_futi2_2 0xA -#define MODEL_hsi2_2_2 0x9 -#define MODEL_hasi2_2 0x8 -#define MODEL_hasi2 0x7 -#define MODEL_hasi1 0x6 -#define MODEL_futi2 0x5 -#define MODEL_futi1 0x4 -#define MODEL_kabe 0x3 -#define MODEL_yuka2 0x2 -#define MODEL_ten 0x1 -#define MODEL_waku 0x0 +#define MODEL_Root 0x1F +#define MODEL_dai 0x1E +#define MODEL_hasira2 0x1D +#define MODEL_o397 0x1C +#define MODEL_o396 0x1B +#define MODEL_o395 0x1A +#define MODEL_hasira 0x19 +#define MODEL_o385 0x18 +#define MODEL_o384 0x17 +#define MODEL_o383 0x16 +#define MODEL_waku1 0x15 +#define MODEL_yuka 0x14 +#define MODEL_g104 0x13 +#define MODEL_o413 0x12 +#define MODEL_o412 0x11 +#define MODEL_g49 0x10 +#define MODEL_g105 0xF +#define MODEL_o414 0xE +#define MODEL_waku2_2 0xD +#define MODEL_waku_2 0xC +#define MODEL_waku2 0xB +#define MODEL_futi2_2 0xA +#define MODEL_hsi2_2_2 0x9 +#define MODEL_hasi2_2 0x8 +#define MODEL_hasi2 0x7 +#define MODEL_hasi1 0x6 +#define MODEL_futi2 0x5 +#define MODEL_futi1 0x4 +#define MODEL_kabe 0x3 +#define MODEL_yuka2 0x2 +#define MODEL_ten 0x1 +#define MODEL_waku 0x0 + diff --git a/include/mapfs/pra_bt03_hit.h b/include/mapfs/pra_bt03_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/pra_bt03_hit.h +++ b/include/mapfs/pra_bt03_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/pra_bt03_shape.h b/include/mapfs/pra_bt03_shape.h index f51272cc35..ec8d11b382 100644 --- a/include/mapfs/pra_bt03_shape.h +++ b/include/mapfs/pra_bt03_shape.h @@ -1,40 +1,41 @@ -#define MODEL_Root 0x27 -#define MODEL_g117 0x26 -#define MODEL_o459 0x25 -#define MODEL_o458 0x24 -#define MODEL_o457 0x23 -#define MODEL_o456 0x22 -#define MODEL_g115 0x21 -#define MODEL_o453 0x20 -#define MODEL_o452 0x1F -#define MODEL_o455 0x1E -#define MODEL_o440 0x1D -#define MODEL_g49 0x1C -#define MODEL_sikiri2 0x1B -#define MODEL_sikiri1 0x1A -#define MODEL_g112 0x19 -#define MODEL_waku2 0x18 -#define MODEL_hasi2 0x17 -#define MODEL_hasi1 0x16 -#define MODEL_ten 0x15 -#define MODEL_waku 0x14 -#define MODEL_o430 0x13 -#define MODEL_o441 0x12 -#define MODEL_o429 0x11 -#define MODEL_o432 0x10 -#define MODEL_o431 0xF -#define MODEL_waku2_2_2 0xE -#define MODEL_futi2 0xD -#define MODEL_futi1 0xC -#define MODEL_kabe 0xB -#define MODEL_dai 0xA -#define MODEL_soku2 0x9 -#define MODEL_saku1 0x8 -#define MODEL_hasira2 0x7 -#define MODEL_o397 0x6 -#define MODEL_o396 0x5 -#define MODEL_hasira 0x4 -#define MODEL_o385 0x3 -#define MODEL_o384 0x2 -#define MODEL_waku1 0x1 -#define MODEL_yuka 0x0 +#define MODEL_Root 0x27 +#define MODEL_g117 0x26 +#define MODEL_o459 0x25 +#define MODEL_o458 0x24 +#define MODEL_o457 0x23 +#define MODEL_o456 0x22 +#define MODEL_g115 0x21 +#define MODEL_o453 0x20 +#define MODEL_o452 0x1F +#define MODEL_o455 0x1E +#define MODEL_o440 0x1D +#define MODEL_g49 0x1C +#define MODEL_sikiri2 0x1B +#define MODEL_sikiri1 0x1A +#define MODEL_g112 0x19 +#define MODEL_waku2 0x18 +#define MODEL_hasi2 0x17 +#define MODEL_hasi1 0x16 +#define MODEL_ten 0x15 +#define MODEL_waku 0x14 +#define MODEL_o430 0x13 +#define MODEL_o441 0x12 +#define MODEL_o429 0x11 +#define MODEL_o432 0x10 +#define MODEL_o431 0xF +#define MODEL_waku2_2_2 0xE +#define MODEL_futi2 0xD +#define MODEL_futi1 0xC +#define MODEL_kabe 0xB +#define MODEL_dai 0xA +#define MODEL_soku2 0x9 +#define MODEL_saku1 0x8 +#define MODEL_hasira2 0x7 +#define MODEL_o397 0x6 +#define MODEL_o396 0x5 +#define MODEL_hasira 0x4 +#define MODEL_o385 0x3 +#define MODEL_o384 0x2 +#define MODEL_waku1 0x1 +#define MODEL_yuka 0x0 + diff --git a/include/mapfs/pra_bt04_hit.h b/include/mapfs/pra_bt04_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/pra_bt04_hit.h +++ b/include/mapfs/pra_bt04_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/pra_bt04_shape.h b/include/mapfs/pra_bt04_shape.h index f8733ee987..95196d2c1e 100644 --- a/include/mapfs/pra_bt04_shape.h +++ b/include/mapfs/pra_bt04_shape.h @@ -1,29 +1,30 @@ -#define MODEL_Root 0x1C -#define MODEL_g102 0x1B -#define MODEL_o428 0x1A -#define MODEL_m_fit2 0x19 -#define MODEL_m_doa 0x18 -#define MODEL_m_kab1 0x17 -#define MODEL_m_fut1 0x16 -#define MODEL_mo_kab 0x15 -#define MODEL_yuka2 0x14 -#define MODEL_ms_kab1 0x13 -#define MODEL_ms_fut2 0x12 -#define MODEL_ms_doa 0x11 -#define MODEL_os_fut2 0x10 -#define MODEL_os_fut1 0xF -#define MODEL_os_doa1 0xE -#define MODEL_o_fut2 0xD -#define MODEL_o_fut1 0xC -#define MODEL_o_kab1 0xB -#define MODEL_o_doa1 0xA -#define MODEL_waku2 0x9 -#define MODEL_ten 0x8 -#define MODEL_waku 0x7 -#define MODEL_waku2_2 0x6 -#define MODEL_dai 0x5 -#define MODEL_waku1 0x4 -#define MODEL_yuka 0x3 -#define MODEL_waku_2 0x2 -#define MODEL_kira1 0x1 -#define MODEL_kira2 0x0 +#define MODEL_Root 0x1C +#define MODEL_g102 0x1B +#define MODEL_o428 0x1A +#define MODEL_m_fit2 0x19 +#define MODEL_m_doa 0x18 +#define MODEL_m_kab1 0x17 +#define MODEL_m_fut1 0x16 +#define MODEL_mo_kab 0x15 +#define MODEL_yuka2 0x14 +#define MODEL_ms_kab1 0x13 +#define MODEL_ms_fut2 0x12 +#define MODEL_ms_doa 0x11 +#define MODEL_os_fut2 0x10 +#define MODEL_os_fut1 0xF +#define MODEL_os_doa1 0xE +#define MODEL_o_fut2 0xD +#define MODEL_o_fut1 0xC +#define MODEL_o_kab1 0xB +#define MODEL_o_doa1 0xA +#define MODEL_waku2 0x9 +#define MODEL_ten 0x8 +#define MODEL_waku 0x7 +#define MODEL_waku2_2 0x6 +#define MODEL_dai 0x5 +#define MODEL_waku1 0x4 +#define MODEL_yuka 0x3 +#define MODEL_waku_2 0x2 +#define MODEL_kira1 0x1 +#define MODEL_kira2 0x0 + diff --git a/include/mapfs/sam_01_hit.h b/include/mapfs/sam_01_hit.h index 8bd37ac41f..0c1d8cb5a2 100644 --- a/include/mapfs/sam_01_hit.h +++ b/include/mapfs/sam_01_hit.h @@ -1,61 +1,74 @@ -#define COLLIDER_Root 0x3C -#define COLLIDER_exit 0x3B -#define COLLIDER_ne 0x3A -#define COLLIDER_deilite 0x39 -#define COLLIDER_deilie 0x38 -#define COLLIDER_min 0x37 -#define COLLIDER_g91 0x36 -#define COLLIDER_o390 0x35 -#define COLLIDER_o376 0x34 -#define COLLIDER_m_noki 0x33 -#define COLLIDER_o385 0x32 -#define COLLIDER_exitm 0x31 -#define COLLIDER_o355 0x30 -#define COLLIDER_ttm 0x2F -#define COLLIDER_m_mae 0x2E -#define COLLIDER_mm_kabe 0x2D -#define COLLIDER_m_naiso 0x2C -#define COLLIDER_o417 0x2B -#define COLLIDER_m_yuka 0x2A -#define COLLIDER_o377 0x29 -#define COLLIDER_mn_kabe 0x28 -#define COLLIDER_f2 0x27 -#define COLLIDER_f_noki 0x26 -#define COLLIDER_f_yuka 0x25 -#define COLLIDER_exitf2 0x24 -#define COLLIDER_o354 0x23 -#define COLLIDER_ttf2 0x22 -#define COLLIDER_f_sita 0x21 -#define COLLIDER_fs_kabe 0x20 -#define COLLIDER_f_naiso 0x1F -#define COLLIDER_fn_hako 0x1E -#define COLLIDER_fn_hasi 0x1D -#define COLLIDER_fn_kabe 0x1C -#define COLLIDER_f_kabe 0x1B -#define COLLIDER_son 0x1A -#define COLLIDER_s_yuka 0x19 -#define COLLIDER_s_naisou 0x18 -#define COLLIDER_yana 0x17 -#define COLLIDER_o368 0x16 -#define COLLIDER_exitsn 0x15 -#define COLLIDER_o353 0x14 -#define COLLIDER_ttsn 0x13 -#define COLLIDER_sn_tns 0x12 -#define COLLIDER_sn_kabe 0x11 -#define COLLIDER_exits 0x10 -#define COLLIDER_o352 0xF -#define COLLIDER_tts 0xE -#define COLLIDER_s_noki 0xD -#define COLLIDER_s_kabe 0xC -#define COLLIDER_g3 0xB -#define COLLIDER_o414 0xA -#define COLLIDER_o413 0x9 -#define COLLIDER_o412 0x8 -#define COLLIDER_o401 0x7 -#define COLLIDER_o402 0x6 -#define COLLIDER_o399 0x5 -#define COLLIDER_o398 0x4 -#define COLLIDER_saku 0x3 -#define COLLIDER_o409 0x2 -#define COLLIDER_o408 0x1 -#define COLLIDER_o341 0x0 +#define COLLIDER_Root 0x3C +#define COLLIDER_exit 0x3B +#define COLLIDER_ne 0x3A +#define COLLIDER_deilite 0x39 +#define COLLIDER_deilie 0x38 +#define COLLIDER_min 0x37 +#define COLLIDER_g91 0x36 +#define COLLIDER_o390 0x35 +#define COLLIDER_o376 0x34 +#define COLLIDER_m_noki 0x33 +#define COLLIDER_o385 0x32 +#define COLLIDER_exitm 0x31 +#define COLLIDER_o355 0x30 +#define COLLIDER_ttm 0x2F +#define COLLIDER_m_mae 0x2E +#define COLLIDER_mm_kabe 0x2D +#define COLLIDER_m_naiso 0x2C +#define COLLIDER_o417 0x2B +#define COLLIDER_m_yuka 0x2A +#define COLLIDER_o377 0x29 +#define COLLIDER_mn_kabe 0x28 +#define COLLIDER_f2 0x27 +#define COLLIDER_f_noki 0x26 +#define COLLIDER_f_yuka 0x25 +#define COLLIDER_exitf2 0x24 +#define COLLIDER_o354 0x23 +#define COLLIDER_ttf2 0x22 +#define COLLIDER_f_sita 0x21 +#define COLLIDER_fs_kabe 0x20 +#define COLLIDER_f_naiso 0x1F +#define COLLIDER_fn_hako 0x1E +#define COLLIDER_fn_hasi 0x1D +#define COLLIDER_fn_kabe 0x1C +#define COLLIDER_f_kabe 0x1B +#define COLLIDER_son 0x1A +#define COLLIDER_s_yuka 0x19 +#define COLLIDER_s_naisou 0x18 +#define COLLIDER_yana 0x17 +#define COLLIDER_o368 0x16 +#define COLLIDER_exitsn 0x15 +#define COLLIDER_o353 0x14 +#define COLLIDER_ttsn 0x13 +#define COLLIDER_sn_tns 0x12 +#define COLLIDER_sn_kabe 0x11 +#define COLLIDER_exits 0x10 +#define COLLIDER_o352 0xF +#define COLLIDER_tts 0xE +#define COLLIDER_s_noki 0xD +#define COLLIDER_s_kabe 0xC +#define COLLIDER_g3 0xB +#define COLLIDER_o414 0xA +#define COLLIDER_o413 0x9 +#define COLLIDER_o412 0x8 +#define COLLIDER_o401 0x7 +#define COLLIDER_o402 0x6 +#define COLLIDER_o399 0x5 +#define COLLIDER_o398 0x4 +#define COLLIDER_saku 0x3 +#define COLLIDER_o409 0x2 +#define COLLIDER_o408 0x1 +#define COLLIDER_o341 0x0 + +#define ZONE_Root 0xA +#define ZONE_Default 0x9 +#define ZONE_min2 0x8 +#define ZONE_min 0x7 +#define ZONE_f2 0x6 +#define ZONE_son2 0x5 +#define ZONE_son 0x4 +#define ZONE_g3 0x3 +#define ZONE_s 0x2 +#define ZONE_e 0x1 +#define ZONE_w 0x0 + diff --git a/include/mapfs/sam_01_shape.h b/include/mapfs/sam_01_shape.h index 10bd9cea9d..aa0cbe55e8 100644 --- a/include/mapfs/sam_01_shape.h +++ b/include/mapfs/sam_01_shape.h @@ -1,163 +1,164 @@ -#define MODEL_Root 0xA2 -#define MODEL_g88 0xA1 -#define MODEL_o431 0xA0 -#define MODEL_miki2 0x9F -#define MODEL_miki1 0x9E -#define MODEL_saku 0x9D -#define MODEL_ki2 0x9C -#define MODEL_ki1 0x9B -#define MODEL_min 0x9A -#define MODEL_m_mado1 0x99 -#define MODEL_o402 0x98 -#define MODEL_m_doa 0x97 -#define MODEL_o336 0x96 -#define MODEL_m_ue 0x95 -#define MODEL_mu_y1 0x94 -#define MODEL_mu_y2 0x93 -#define MODEL_m_mae 0x92 -#define MODEL_mm_kabe 0x91 -#define MODEL_mm_mado 0x90 -#define MODEL_mm_waku 0x8F -#define MODEL_mm_hasi 0x8E -#define MODEL_m_naiso 0x8D -#define MODEL_mn_bin2 0x8C -#define MODEL_mn_sar 0x8B -#define MODEL_mn_book3 0x8A -#define MODEL_mn_book2 0x89 -#define MODEL_mn_book4 0x88 -#define MODEL_mn_book1 0x87 -#define MODEL_mn_tan4 0x86 -#define MODEL_mn_bin1 0x85 -#define MODEL_mn_tan2 0x84 -#define MODEL_mn_tan3 0x83 -#define MODEL_mn_tan1 0x82 -#define MODEL_mn_dan1 0x81 -#define MODEL_mn_dan2 0x80 -#define MODEL_mn_dan3 0x7F -#define MODEL_mn_dan4 0x7E -#define MODEL_mn_mat 0x7D -#define MODEL_mn_waku 0x7C -#define MODEL_mn_kabe 0x7B -#define MODEL_mn_hasi 0x7A -#define MODEL_mn_mado 0x79 -#define MODEL_mn_yuka 0x78 -#define MODEL_m_ento2 0x77 -#define MODEL_m_entto 0x76 -#define MODEL_m_noki1 0x75 -#define MODEL_m_noki2 0x74 -#define MODEL_m_yuki1 0x73 -#define MODEL_m_yuki2 0x72 -#define MODEL_m_waku 0x71 -#define MODEL_m_hasi 0x70 -#define MODEL_m_kabe 0x6F -#define MODEL_m_mad 0x6E -#define MODEL_f2 0x6D -#define MODEL_f_ue 0x6C -#define MODEL_fu_k 0x6B -#define MODEL_fu_h 0x6A -#define MODEL_fu_y2 0x69 -#define MODEL_fu_y1 0x68 -#define MODEL_f_sita 0x67 -#define MODEL_fs_kabe 0x66 -#define MODEL_fs_mado 0x65 -#define MODEL_fs_waku 0x64 -#define MODEL_fs_h1 0x63 -#define MODEL_exitf2 0x62 -#define MODEL_o253 0x61 -#define MODEL_f_naiso 0x60 -#define MODEL_fn_saku 0x5F -#define MODEL_fn_hak2 0x5E -#define MODEL_fn_hak1 0x5D -#define MODEL_fn_mado 0x5C -#define MODEL_fn_yuka 0x5B -#define MODEL_fn_waku 0x5A -#define MODEL_fn_hasi 0x59 -#define MODEL_fn_kabe 0x58 -#define MODEL_f_noki2 0x57 -#define MODEL_f_noki1 0x56 -#define MODEL_f_yuki2 0x55 -#define MODEL_f_yuki1 0x54 -#define MODEL_f_waku 0x53 -#define MODEL_f_mado 0x52 -#define MODEL_f_kabe 0x51 -#define MODEL_f_hasi 0x50 -#define MODEL_son 0x4F -#define MODEL_s_doa 0x4E -#define MODEL_o235 0x4D -#define MODEL_s_yane 0x4C -#define MODEL_sy_y2 0x4B -#define MODEL_sy_y1 0x4A -#define MODEL_s_mae 0x49 -#define MODEL_sm_k 0x48 -#define MODEL_sm_h 0x47 -#define MODEL_sm_m 0x46 -#define MODEL_sm_w 0x45 -#define MODEL_s_yuki 0x44 -#define MODEL_s_yoko 0x43 -#define MODEL_sy_k 0x42 -#define MODEL_sy_h 0x41 -#define MODEL_sy_w 0x40 -#define MODEL_s_naisou 0x3F -#define MODEL_sn_sya 0x3E -#define MODEL_sn_sar 0x3D -#define MODEL_sn_bou 0x3C -#define MODEL_sn_kago2 0x3B -#define MODEL_sn_kago1 0x3A -#define MODEL_sn_keito 0x39 -#define MODEL_sn_book3 0x38 -#define MODEL_sn_book2 0x37 -#define MODEL_sn_book1 0x36 -#define MODEL_sn_tana4 0x35 -#define MODEL_sn_tana3 0x34 -#define MODEL_sn_tana2 0x33 -#define MODEL_sn_tana1 0x32 -#define MODEL_sn_bin3 0x31 -#define MODEL_sn_bin2 0x30 -#define MODEL_sn_bin1 0x2F -#define MODEL_kakik 0x2E -#define MODEL_o366 0x2D -#define MODEL_o365 0x2C -#define MODEL_o212 0x2B -#define MODEL_sn_doa 0x2A -#define MODEL_o236 0x29 -#define MODEL_tana_d2 0x28 -#define MODEL_o412 0x27 -#define MODEL_tana_d1 0x26 -#define MODEL_o411 0x25 -#define MODEL_sn_mad 0x24 -#define MODEL_sn_tns 0x23 -#define MODEL_sn_is2 0x22 -#define MODEL_sn_is1 0x21 -#define MODEL_sn_tke2 0x20 -#define MODEL_sn_tke1 0x1F -#define MODEL_sn_dan4 0x1E -#define MODEL_sn_dan3 0x1D -#define MODEL_sn_dan2 0x1C -#define MODEL_sn_dan1 0x1B -#define MODEL_sn_mat 0x1A -#define MODEL_sn_hasi 0x19 -#define MODEL_sn_waku 0x18 -#define MODEL_sn_yuka 0x17 -#define MODEL_sn_kabe 0x16 -#define MODEL_s_yuki2 0x15 -#define MODEL_s_enttu 0x14 -#define MODEL_s_yuki1 0x13 -#define MODEL_s_waku 0x12 -#define MODEL_s_hasi 0x11 -#define MODEL_s_kabe 0x10 -#define MODEL_yukidaru 0xF -#define MODEL_y_me 0xE -#define MODEL_y_yuki 0xD -#define MODEL_ya_bake 0xC -#define MODEL_y_maf 0xB -#define MODEL_g3 0xA -#define MODEL_o424 0x9 -#define MODEL_o423 0x8 -#define MODEL_o421 0x7 -#define MODEL_o420 0x6 -#define MODEL_o341 0x5 -#define MODEL_road 0x4 -#define MODEL_exitdai 0x3 -#define MODEL_waku 0x2 -#define MODEL_g97 0x1 -#define MODEL_o430 0x0 +#define MODEL_Root 0xA2 +#define MODEL_g88 0xA1 +#define MODEL_o431 0xA0 +#define MODEL_miki2 0x9F +#define MODEL_miki1 0x9E +#define MODEL_saku 0x9D +#define MODEL_ki2 0x9C +#define MODEL_ki1 0x9B +#define MODEL_min 0x9A +#define MODEL_m_mado1 0x99 +#define MODEL_o402 0x98 +#define MODEL_m_doa 0x97 +#define MODEL_o336 0x96 +#define MODEL_m_ue 0x95 +#define MODEL_mu_y1 0x94 +#define MODEL_mu_y2 0x93 +#define MODEL_m_mae 0x92 +#define MODEL_mm_kabe 0x91 +#define MODEL_mm_mado 0x90 +#define MODEL_mm_waku 0x8F +#define MODEL_mm_hasi 0x8E +#define MODEL_m_naiso 0x8D +#define MODEL_mn_bin2 0x8C +#define MODEL_mn_sar 0x8B +#define MODEL_mn_book3 0x8A +#define MODEL_mn_book2 0x89 +#define MODEL_mn_book4 0x88 +#define MODEL_mn_book1 0x87 +#define MODEL_mn_tan4 0x86 +#define MODEL_mn_bin1 0x85 +#define MODEL_mn_tan2 0x84 +#define MODEL_mn_tan3 0x83 +#define MODEL_mn_tan1 0x82 +#define MODEL_mn_dan1 0x81 +#define MODEL_mn_dan2 0x80 +#define MODEL_mn_dan3 0x7F +#define MODEL_mn_dan4 0x7E +#define MODEL_mn_mat 0x7D +#define MODEL_mn_waku 0x7C +#define MODEL_mn_kabe 0x7B +#define MODEL_mn_hasi 0x7A +#define MODEL_mn_mado 0x79 +#define MODEL_mn_yuka 0x78 +#define MODEL_m_ento2 0x77 +#define MODEL_m_entto 0x76 +#define MODEL_m_noki1 0x75 +#define MODEL_m_noki2 0x74 +#define MODEL_m_yuki1 0x73 +#define MODEL_m_yuki2 0x72 +#define MODEL_m_waku 0x71 +#define MODEL_m_hasi 0x70 +#define MODEL_m_kabe 0x6F +#define MODEL_m_mad 0x6E +#define MODEL_f2 0x6D +#define MODEL_f_ue 0x6C +#define MODEL_fu_k 0x6B +#define MODEL_fu_h 0x6A +#define MODEL_fu_y2 0x69 +#define MODEL_fu_y1 0x68 +#define MODEL_f_sita 0x67 +#define MODEL_fs_kabe 0x66 +#define MODEL_fs_mado 0x65 +#define MODEL_fs_waku 0x64 +#define MODEL_fs_h1 0x63 +#define MODEL_exitf2 0x62 +#define MODEL_o253 0x61 +#define MODEL_f_naiso 0x60 +#define MODEL_fn_saku 0x5F +#define MODEL_fn_hak2 0x5E +#define MODEL_fn_hak1 0x5D +#define MODEL_fn_mado 0x5C +#define MODEL_fn_yuka 0x5B +#define MODEL_fn_waku 0x5A +#define MODEL_fn_hasi 0x59 +#define MODEL_fn_kabe 0x58 +#define MODEL_f_noki2 0x57 +#define MODEL_f_noki1 0x56 +#define MODEL_f_yuki2 0x55 +#define MODEL_f_yuki1 0x54 +#define MODEL_f_waku 0x53 +#define MODEL_f_mado 0x52 +#define MODEL_f_kabe 0x51 +#define MODEL_f_hasi 0x50 +#define MODEL_son 0x4F +#define MODEL_s_doa 0x4E +#define MODEL_o235 0x4D +#define MODEL_s_yane 0x4C +#define MODEL_sy_y2 0x4B +#define MODEL_sy_y1 0x4A +#define MODEL_s_mae 0x49 +#define MODEL_sm_k 0x48 +#define MODEL_sm_h 0x47 +#define MODEL_sm_m 0x46 +#define MODEL_sm_w 0x45 +#define MODEL_s_yuki 0x44 +#define MODEL_s_yoko 0x43 +#define MODEL_sy_k 0x42 +#define MODEL_sy_h 0x41 +#define MODEL_sy_w 0x40 +#define MODEL_s_naisou 0x3F +#define MODEL_sn_sya 0x3E +#define MODEL_sn_sar 0x3D +#define MODEL_sn_bou 0x3C +#define MODEL_sn_kago2 0x3B +#define MODEL_sn_kago1 0x3A +#define MODEL_sn_keito 0x39 +#define MODEL_sn_book3 0x38 +#define MODEL_sn_book2 0x37 +#define MODEL_sn_book1 0x36 +#define MODEL_sn_tana4 0x35 +#define MODEL_sn_tana3 0x34 +#define MODEL_sn_tana2 0x33 +#define MODEL_sn_tana1 0x32 +#define MODEL_sn_bin3 0x31 +#define MODEL_sn_bin2 0x30 +#define MODEL_sn_bin1 0x2F +#define MODEL_kakik 0x2E +#define MODEL_o366 0x2D +#define MODEL_o365 0x2C +#define MODEL_o212 0x2B +#define MODEL_sn_doa 0x2A +#define MODEL_o236 0x29 +#define MODEL_tana_d2 0x28 +#define MODEL_o412 0x27 +#define MODEL_tana_d1 0x26 +#define MODEL_o411 0x25 +#define MODEL_sn_mad 0x24 +#define MODEL_sn_tns 0x23 +#define MODEL_sn_is2 0x22 +#define MODEL_sn_is1 0x21 +#define MODEL_sn_tke2 0x20 +#define MODEL_sn_tke1 0x1F +#define MODEL_sn_dan4 0x1E +#define MODEL_sn_dan3 0x1D +#define MODEL_sn_dan2 0x1C +#define MODEL_sn_dan1 0x1B +#define MODEL_sn_mat 0x1A +#define MODEL_sn_hasi 0x19 +#define MODEL_sn_waku 0x18 +#define MODEL_sn_yuka 0x17 +#define MODEL_sn_kabe 0x16 +#define MODEL_s_yuki2 0x15 +#define MODEL_s_enttu 0x14 +#define MODEL_s_yuki1 0x13 +#define MODEL_s_waku 0x12 +#define MODEL_s_hasi 0x11 +#define MODEL_s_kabe 0x10 +#define MODEL_yukidaru 0xF +#define MODEL_y_me 0xE +#define MODEL_y_yuki 0xD +#define MODEL_ya_bake 0xC +#define MODEL_y_maf 0xB +#define MODEL_g3 0xA +#define MODEL_o424 0x9 +#define MODEL_o423 0x8 +#define MODEL_o421 0x7 +#define MODEL_o420 0x6 +#define MODEL_o341 0x5 +#define MODEL_road 0x4 +#define MODEL_exitdai 0x3 +#define MODEL_waku 0x2 +#define MODEL_g97 0x1 +#define MODEL_o430 0x0 + diff --git a/include/mapfs/sam_02_hit.h b/include/mapfs/sam_02_hit.h index ab1ba1d9e9..a944716a90 100644 --- a/include/mapfs/sam_02_hit.h +++ b/include/mapfs/sam_02_hit.h @@ -1,71 +1,82 @@ -#define COLLIDER_Root 0x46 -#define COLLIDER_kino 0x45 -#define COLLIDER_o530 0x44 -#define COLLIDER_k_yuka 0x43 -#define COLLIDER_mk_doa 0x42 -#define COLLIDER_o472 0x41 -#define COLLIDER_k_doa 0x40 -#define COLLIDER_k_naisou 0x3F -#define COLLIDER_o516 0x3E -#define COLLIDER_kn_kagu 0x3D -#define COLLIDER_kn_kabe 0x3C -#define COLLIDER_k_kabe 0x3B -#define COLLIDER_o517 0x3A -#define COLLIDER_ten 0x39 -#define COLLIDER_o531 0x38 -#define COLLIDER_o487 0x37 -#define COLLIDER_t_yuka 0x36 -#define COLLIDER_t_naiso 0x35 -#define COLLIDER_o496 0x34 -#define COLLIDER_g217 0x33 -#define COLLIDER_o512 0x32 -#define COLLIDER_atari 0x31 -#define COLLIDER_o438 0x30 -#define COLLIDER_o437 0x2F -#define COLLIDER_o436 0x2E -#define COLLIDER_o435 0x2D -#define COLLIDER_o434 0x2C -#define COLLIDER_o433 0x2B -#define COLLIDER_tn_kabe 0x2A -#define COLLIDER_t_doa 0x29 -#define COLLIDER_o471 0x28 -#define COLLIDER_o382 0x27 -#define COLLIDER_t_kabe 0x26 -#define COLLIDER_t_noki 0x25 -#define COLLIDER_min 0x24 -#define COLLIDER_m_yuka 0x23 -#define COLLIDER_mc_doa 0x22 -#define COLLIDER_o470 0x21 -#define COLLIDER_c_doa 0x20 -#define COLLIDER_m_naiso 0x1F -#define COLLIDER_o490 0x1E -#define COLLIDER_o424 0x1D -#define COLLIDER_mn_kabe 0x1C -#define COLLIDER_m_kabe 0x1B -#define COLLIDER_m_noki 0x1A -#define COLLIDER_etc 0x19 -#define COLLIDER_o508 0x18 -#define COLLIDER_o507 0x17 -#define COLLIDER_o506 0x16 -#define COLLIDER_o505 0x15 -#define COLLIDER_ki 0x14 -#define COLLIDER_o525 0x13 -#define COLLIDER_tumori 0x12 -#define COLLIDER_o529 0x11 -#define COLLIDER_o528 0x10 -#define COLLIDER_o502 0xF -#define COLLIDER_saku 0xE -#define COLLIDER_o524 0xD -#define COLLIDER_o523 0xC -#define COLLIDER_kabe 0xB -#define COLLIDER_dokan 0xA -#define COLLIDER_nd 0x9 -#define COLLIDER_ttd 0x8 -#define COLLIDER_eexite 0x7 -#define COLLIDER_ne 0x6 -#define COLLIDER_deilie 0x5 -#define COLLIDER_deilite 0x4 -#define COLLIDER_exitw 0x3 -#define COLLIDER_nw 0x2 -#define COLLIDER_deiliw 0x1 -#define COLLIDER_deilitw 0x0 +#define COLLIDER_Root 0x46 +#define COLLIDER_kino 0x45 +#define COLLIDER_o530 0x44 +#define COLLIDER_k_yuka 0x43 +#define COLLIDER_mk_doa 0x42 +#define COLLIDER_o472 0x41 +#define COLLIDER_k_doa 0x40 +#define COLLIDER_k_naisou 0x3F +#define COLLIDER_o516 0x3E +#define COLLIDER_kn_kagu 0x3D +#define COLLIDER_kn_kabe 0x3C +#define COLLIDER_k_kabe 0x3B +#define COLLIDER_o517 0x3A +#define COLLIDER_ten 0x39 +#define COLLIDER_o531 0x38 +#define COLLIDER_o487 0x37 +#define COLLIDER_t_yuka 0x36 +#define COLLIDER_t_naiso 0x35 +#define COLLIDER_o496 0x34 +#define COLLIDER_g217 0x33 +#define COLLIDER_o512 0x32 +#define COLLIDER_atari 0x31 +#define COLLIDER_o438 0x30 +#define COLLIDER_o437 0x2F +#define COLLIDER_o436 0x2E +#define COLLIDER_o435 0x2D +#define COLLIDER_o434 0x2C +#define COLLIDER_o433 0x2B +#define COLLIDER_tn_kabe 0x2A +#define COLLIDER_t_doa 0x29 +#define COLLIDER_o471 0x28 +#define COLLIDER_o382 0x27 +#define COLLIDER_t_kabe 0x26 +#define COLLIDER_t_noki 0x25 +#define COLLIDER_min 0x24 +#define COLLIDER_m_yuka 0x23 +#define COLLIDER_mc_doa 0x22 +#define COLLIDER_o470 0x21 +#define COLLIDER_c_doa 0x20 +#define COLLIDER_m_naiso 0x1F +#define COLLIDER_o490 0x1E +#define COLLIDER_o424 0x1D +#define COLLIDER_mn_kabe 0x1C +#define COLLIDER_m_kabe 0x1B +#define COLLIDER_m_noki 0x1A +#define COLLIDER_etc 0x19 +#define COLLIDER_o508 0x18 +#define COLLIDER_o507 0x17 +#define COLLIDER_o506 0x16 +#define COLLIDER_o505 0x15 +#define COLLIDER_ki 0x14 +#define COLLIDER_o525 0x13 +#define COLLIDER_tumori 0x12 +#define COLLIDER_o529 0x11 +#define COLLIDER_o528 0x10 +#define COLLIDER_o502 0xF +#define COLLIDER_saku 0xE +#define COLLIDER_o524 0xD +#define COLLIDER_o523 0xC +#define COLLIDER_kabe 0xB +#define COLLIDER_dokan 0xA +#define COLLIDER_nd 0x9 +#define COLLIDER_ttd 0x8 +#define COLLIDER_eexite 0x7 +#define COLLIDER_ne 0x6 +#define COLLIDER_deilie 0x5 +#define COLLIDER_deilite 0x4 +#define COLLIDER_exitw 0x3 +#define COLLIDER_nw 0x2 +#define COLLIDER_deiliw 0x1 +#define COLLIDER_deilitw 0x0 + +#define ZONE_Root 0x8 +#define ZONE_g50 0x7 +#define ZONE_kin 0x6 +#define ZONE_mise 0x5 +#define ZONE_min 0x4 +#define ZONE_g3 0x3 +#define ZONE_s 0x2 +#define ZONE_e 0x1 +#define ZONE_w 0x0 + diff --git a/include/mapfs/sam_02_shape.h b/include/mapfs/sam_02_shape.h index dcb1add2ca..115b9bf555 100644 --- a/include/mapfs/sam_02_shape.h +++ b/include/mapfs/sam_02_shape.h @@ -1,169 +1,170 @@ -#define MODEL_Root 0xA8 -#define MODEL_dokan 0xA7 -#define MODEL_o411 0xA6 -#define MODEL_g50 0xA5 -#define MODEL_o416 0xA4 -#define MODEL_tumori 0xA3 -#define MODEL_saku 0xA2 -#define MODEL_ki 0xA1 -#define MODEL_o496 0xA0 -#define MODEL_o495 0x9F -#define MODEL_o494 0x9E -#define MODEL_miki3 0x9D -#define MODEL_miki2 0x9C -#define MODEL_o185 0x9B -#define MODEL_miki1 0x9A -#define MODEL_o189 0x99 -#define MODEL_o188 0x98 -#define MODEL_o186 0x97 -#define MODEL_o192 0x96 -#define MODEL_yukidaru 0x95 -#define MODEL_o500 0x94 -#define MODEL_o499 0x93 -#define MODEL_o498 0x92 -#define MODEL_o497 0x91 -#define MODEL_kino 0x90 -#define MODEL_mk_doa 0x8F -#define MODEL_k_doa 0x8E -#define MODEL_mk_ue 0x8D -#define MODEL_mk_yu1 0x8C -#define MODEL_mk_yu2 0x8B -#define MODEL_mk_sita 0x8A -#define MODEL_o272 0x89 -#define MODEL_o274 0x88 -#define MODEL_o273 0x87 -#define MODEL_o271 0x86 -#define MODEL_k_naisou 0x85 -#define MODEL_g207 0x84 -#define MODEL_o517 0x83 -#define MODEL_o514 0x82 -#define MODEL_o513 0x81 -#define MODEL_bed2 0x80 -#define MODEL_g206 0x7F -#define MODEL_hi1 0x7E -#define MODEL_maki2 0x7D -#define MODEL_maki1 0x7C -#define MODEL_o475 0x7B -#define MODEL_o474 0x7A -#define MODEL_k_dan4 0x79 -#define MODEL_k_dan3 0x78 -#define MODEL_k_dan2 0x77 -#define MODEL_k_asi 0x76 -#define MODEL_k_kurosu 0x75 -#define MODEL_k_isu2 0x74 -#define MODEL_k_isu1 0x73 -#define MODEL_s_yuka2 0x72 -#define MODEL_s_yuka 0x71 -#define MODEL_kn_hasi 0x70 -#define MODEL_kn_kabe 0x6F -#define MODEL_kn_mado 0x6E -#define MODEL_kn_waku 0x6D -#define MODEL_k_ento 0x6C -#define MODEL_k_ento2 0x6B -#define MODEL_kanban 0x6A -#define MODEL_k_noki 0x69 -#define MODEL_k_yuki2 0x68 -#define MODEL_k_yuki1 0x67 -#define MODEL_k_waku 0x66 -#define MODEL_k_mado 0x65 -#define MODEL_k_kabe 0x64 -#define MODEL_k_hasira 0x63 -#define MODEL_ten 0x62 -#define MODEL_t_doa 0x61 -#define MODEL_o382 0x60 -#define MODEL_t_ue 0x5F -#define MODEL_tu_y2 0x5E -#define MODEL_tu_y1 0x5D -#define MODEL_t_sita 0x5C -#define MODEL_ts_w 0x5B -#define MODEL_ts_h 0x5A -#define MODEL_ts_k 0x59 -#define MODEL_t_naiso 0x58 -#define MODEL_tn_book 0x57 -#define MODEL_tn_sar 0x56 -#define MODEL_tn_scop 0x55 -#define MODEL_tn_nun2 0x54 -#define MODEL_tn_nun1 0x53 -#define MODEL_tn_kag 0x52 -#define MODEL_tn_kei 0x51 -#define MODEL_tn_tan3 0x50 -#define MODEL_tn_bin2 0x4F -#define MODEL_tn_bin1 0x4E -#define MODEL_tn_tan2 0x4D -#define MODEL_tn_tan1 0x4C -#define MODEL_tn_isu1 0x4B -#define MODEL_tn_isu2 0x4A -#define MODEL_tn_hako 0x49 -#define MODEL_tn_dai 0x48 -#define MODEL_tn_tana 0x47 -#define MODEL_6 0x46 -#define MODEL_5 0x45 -#define MODEL_4 0x44 -#define MODEL_3 0x43 -#define MODEL_2 0x42 -#define MODEL_1 0x41 -#define MODEL_tn_kaunta 0x40 -#define MODEL_tn_yuka 0x3F -#define MODEL_tn_mado 0x3E -#define MODEL_tn_waku 0x3D -#define MODEL_tn_hasi 0x3C -#define MODEL_tn_kabe 0x3B -#define MODEL_t_kan 0x3A -#define MODEL_t_yuki 0x39 -#define MODEL_t_yuki2 0x38 -#define MODEL_t_yuki1 0x37 -#define MODEL_t_mado 0x36 -#define MODEL_t_waku 0x35 -#define MODEL_t_hasi 0x34 -#define MODEL_t_kabe 0x33 -#define MODEL_min 0x32 -#define MODEL_mc_doa 0x31 -#define MODEL_c_doa 0x30 -#define MODEL_mc_sita 0x2F -#define MODEL_o290 0x2E -#define MODEL_c_noki 0x2D -#define MODEL_o289 0x2C -#define MODEL_o293 0x2B -#define MODEL_o292 0x2A -#define MODEL_m_naiso 0x29 -#define MODEL_m_tan4 0x28 -#define MODEL_m_tan3 0x27 -#define MODEL_m_bin4 0x26 -#define MODEL_m_bin3 0x25 -#define MODEL_m_binn2 0x24 -#define MODEL_m_tan2 0x23 -#define MODEL_m_tan1 0x22 -#define MODEL_m_book3 0x21 -#define MODEL_m_book1 0x20 -#define MODEL_m_book2 0x1F -#define MODEL_m_sar 0x1E -#define MODEL_m_isu2 0x1D -#define MODEL_m_isu1 0x1C -#define MODEL_m_asi 0x1B -#define MODEL_m_kurosu 0x1A -#define MODEL_m_dan4 0x19 -#define MODEL_m_dan3 0x18 -#define MODEL_m_dan2 0x17 -#define MODEL_m_dan1 0x16 -#define MODEL_m_yuka2 0x15 -#define MODEL_m_yuka 0x14 -#define MODEL_mn_hasi 0x13 -#define MODEL_mn_kabe 0x12 -#define MODEL_mn_waku 0x11 -#define MODEL_mn_mado 0x10 -#define MODEL_m_yuki2 0xF -#define MODEL_m_yuki1 0xE -#define MODEL_m_enttu 0xD -#define MODEL_m_waku 0xC -#define MODEL_m_kabe 0xB -#define MODEL_m_hasira 0xA -#define MODEL_g3 0x9 -#define MODEL_o506 0x8 -#define MODEL_o505 0x7 -#define MODEL_o504 0x6 -#define MODEL_o503 0x5 -#define MODEL_o502 0x4 -#define MODEL_road 0x3 -#define MODEL_waku 0x2 -#define MODEL_exitdai 0x1 -#define MODEL_ground 0x0 +#define MODEL_Root 0xA8 +#define MODEL_dokan 0xA7 +#define MODEL_o411 0xA6 +#define MODEL_g50 0xA5 +#define MODEL_o416 0xA4 +#define MODEL_tumori 0xA3 +#define MODEL_saku 0xA2 +#define MODEL_ki 0xA1 +#define MODEL_o496 0xA0 +#define MODEL_o495 0x9F +#define MODEL_o494 0x9E +#define MODEL_miki3 0x9D +#define MODEL_miki2 0x9C +#define MODEL_o185 0x9B +#define MODEL_miki1 0x9A +#define MODEL_o189 0x99 +#define MODEL_o188 0x98 +#define MODEL_o186 0x97 +#define MODEL_o192 0x96 +#define MODEL_yukidaru 0x95 +#define MODEL_o500 0x94 +#define MODEL_o499 0x93 +#define MODEL_o498 0x92 +#define MODEL_o497 0x91 +#define MODEL_kino 0x90 +#define MODEL_mk_doa 0x8F +#define MODEL_k_doa 0x8E +#define MODEL_mk_ue 0x8D +#define MODEL_mk_yu1 0x8C +#define MODEL_mk_yu2 0x8B +#define MODEL_mk_sita 0x8A +#define MODEL_o272 0x89 +#define MODEL_o274 0x88 +#define MODEL_o273 0x87 +#define MODEL_o271 0x86 +#define MODEL_k_naisou 0x85 +#define MODEL_g207 0x84 +#define MODEL_o517 0x83 +#define MODEL_o514 0x82 +#define MODEL_o513 0x81 +#define MODEL_bed2 0x80 +#define MODEL_g206 0x7F +#define MODEL_hi1 0x7E +#define MODEL_maki2 0x7D +#define MODEL_maki1 0x7C +#define MODEL_o475 0x7B +#define MODEL_o474 0x7A +#define MODEL_k_dan4 0x79 +#define MODEL_k_dan3 0x78 +#define MODEL_k_dan2 0x77 +#define MODEL_k_asi 0x76 +#define MODEL_k_kurosu 0x75 +#define MODEL_k_isu2 0x74 +#define MODEL_k_isu1 0x73 +#define MODEL_s_yuka2 0x72 +#define MODEL_s_yuka 0x71 +#define MODEL_kn_hasi 0x70 +#define MODEL_kn_kabe 0x6F +#define MODEL_kn_mado 0x6E +#define MODEL_kn_waku 0x6D +#define MODEL_k_ento 0x6C +#define MODEL_k_ento2 0x6B +#define MODEL_kanban 0x6A +#define MODEL_k_noki 0x69 +#define MODEL_k_yuki2 0x68 +#define MODEL_k_yuki1 0x67 +#define MODEL_k_waku 0x66 +#define MODEL_k_mado 0x65 +#define MODEL_k_kabe 0x64 +#define MODEL_k_hasira 0x63 +#define MODEL_ten 0x62 +#define MODEL_t_doa 0x61 +#define MODEL_o382 0x60 +#define MODEL_t_ue 0x5F +#define MODEL_tu_y2 0x5E +#define MODEL_tu_y1 0x5D +#define MODEL_t_sita 0x5C +#define MODEL_ts_w 0x5B +#define MODEL_ts_h 0x5A +#define MODEL_ts_k 0x59 +#define MODEL_t_naiso 0x58 +#define MODEL_tn_book 0x57 +#define MODEL_tn_sar 0x56 +#define MODEL_tn_scop 0x55 +#define MODEL_tn_nun2 0x54 +#define MODEL_tn_nun1 0x53 +#define MODEL_tn_kag 0x52 +#define MODEL_tn_kei 0x51 +#define MODEL_tn_tan3 0x50 +#define MODEL_tn_bin2 0x4F +#define MODEL_tn_bin1 0x4E +#define MODEL_tn_tan2 0x4D +#define MODEL_tn_tan1 0x4C +#define MODEL_tn_isu1 0x4B +#define MODEL_tn_isu2 0x4A +#define MODEL_tn_hako 0x49 +#define MODEL_tn_dai 0x48 +#define MODEL_tn_tana 0x47 +#define MODEL_6 0x46 +#define MODEL_5 0x45 +#define MODEL_4 0x44 +#define MODEL_3 0x43 +#define MODEL_2 0x42 +#define MODEL_1 0x41 +#define MODEL_tn_kaunta 0x40 +#define MODEL_tn_yuka 0x3F +#define MODEL_tn_mado 0x3E +#define MODEL_tn_waku 0x3D +#define MODEL_tn_hasi 0x3C +#define MODEL_tn_kabe 0x3B +#define MODEL_t_kan 0x3A +#define MODEL_t_yuki 0x39 +#define MODEL_t_yuki2 0x38 +#define MODEL_t_yuki1 0x37 +#define MODEL_t_mado 0x36 +#define MODEL_t_waku 0x35 +#define MODEL_t_hasi 0x34 +#define MODEL_t_kabe 0x33 +#define MODEL_min 0x32 +#define MODEL_mc_doa 0x31 +#define MODEL_c_doa 0x30 +#define MODEL_mc_sita 0x2F +#define MODEL_o290 0x2E +#define MODEL_c_noki 0x2D +#define MODEL_o289 0x2C +#define MODEL_o293 0x2B +#define MODEL_o292 0x2A +#define MODEL_m_naiso 0x29 +#define MODEL_m_tan4 0x28 +#define MODEL_m_tan3 0x27 +#define MODEL_m_bin4 0x26 +#define MODEL_m_bin3 0x25 +#define MODEL_m_binn2 0x24 +#define MODEL_m_tan2 0x23 +#define MODEL_m_tan1 0x22 +#define MODEL_m_book3 0x21 +#define MODEL_m_book1 0x20 +#define MODEL_m_book2 0x1F +#define MODEL_m_sar 0x1E +#define MODEL_m_isu2 0x1D +#define MODEL_m_isu1 0x1C +#define MODEL_m_asi 0x1B +#define MODEL_m_kurosu 0x1A +#define MODEL_m_dan4 0x19 +#define MODEL_m_dan3 0x18 +#define MODEL_m_dan2 0x17 +#define MODEL_m_dan1 0x16 +#define MODEL_m_yuka2 0x15 +#define MODEL_m_yuka 0x14 +#define MODEL_mn_hasi 0x13 +#define MODEL_mn_kabe 0x12 +#define MODEL_mn_waku 0x11 +#define MODEL_mn_mado 0x10 +#define MODEL_m_yuki2 0xF +#define MODEL_m_yuki1 0xE +#define MODEL_m_enttu 0xD +#define MODEL_m_waku 0xC +#define MODEL_m_kabe 0xB +#define MODEL_m_hasira 0xA +#define MODEL_g3 0x9 +#define MODEL_o506 0x8 +#define MODEL_o505 0x7 +#define MODEL_o504 0x6 +#define MODEL_o503 0x5 +#define MODEL_o502 0x4 +#define MODEL_road 0x3 +#define MODEL_waku 0x2 +#define MODEL_exitdai 0x1 +#define MODEL_ground 0x0 + diff --git a/include/mapfs/sam_03_hit.h b/include/mapfs/sam_03_hit.h index 2b4d9fdccb..d77e1b841c 100644 --- a/include/mapfs/sam_03_hit.h +++ b/include/mapfs/sam_03_hit.h @@ -1,16 +1,26 @@ -#define COLLIDER_Root 0xF -#define COLLIDER_kori 0xE -#define COLLIDER_o44 0xD -#define COLLIDER_g1 0xC -#define COLLIDER_o43 0xB -#define COLLIDER_road 0xA -#define COLLIDER_exitw 0x9 -#define COLLIDER_ttw 0x8 -#define COLLIDER_nw 0x7 -#define COLLIDER_deiliw 0x6 -#define COLLIDER_deilitw 0x5 -#define COLLIDER_exite 0x4 -#define COLLIDER_tte 0x3 -#define COLLIDER_ne 0x2 -#define COLLIDER_deilie 0x1 -#define COLLIDER_deilite 0x0 +#define COLLIDER_Root 0xF +#define COLLIDER_kori 0xE +#define COLLIDER_o44 0xD +#define COLLIDER_g1 0xC +#define COLLIDER_o43 0xB +#define COLLIDER_road 0xA +#define COLLIDER_exitw 0x9 +#define COLLIDER_ttw 0x8 +#define COLLIDER_nw 0x7 +#define COLLIDER_deiliw 0x6 +#define COLLIDER_deilitw 0x5 +#define COLLIDER_exite 0x4 +#define COLLIDER_tte 0x3 +#define COLLIDER_ne 0x2 +#define COLLIDER_deilie 0x1 +#define COLLIDER_deilite 0x0 + +#define ZONE_Root 0x7 +#define ZONE_g1 0x6 +#define ZONE_road 0x5 +#define ZONE_yuki 0x4 +#define ZONE_exitw 0x3 +#define ZONE_o2 0x2 +#define ZONE_exite 0x1 +#define ZONE_o1 0x0 + diff --git a/include/mapfs/sam_03_shape.h b/include/mapfs/sam_03_shape.h index 0a06cad827..87d2f66bfa 100644 --- a/include/mapfs/sam_03_shape.h +++ b/include/mapfs/sam_03_shape.h @@ -1,38 +1,39 @@ -#define MODEL_Root 0x25 -#define MODEL_kori 0x24 -#define MODEL_o44 0x23 -#define MODEL_Default 0x22 -#define MODEL_saku 0x21 -#define MODEL_miki8 0x20 -#define MODEL_miki14 0x1F -#define MODEL_miki13 0x1E -#define MODEL_miki7 0x1D -#define MODEL_miki6 0x1C -#define MODEL_miki3 0x1B -#define MODEL_miki2 0x1A -#define MODEL_miki1 0x19 -#define MODEL_ki14 0x18 -#define MODEL_ki13 0x17 -#define MODEL_ki12 0x16 -#define MODEL_ki11 0x15 -#define MODEL_ki10 0x14 -#define MODEL_ki9 0x13 -#define MODEL_ki8 0x12 -#define MODEL_ki7 0x11 -#define MODEL_ki6 0x10 -#define MODEL_ki5 0xF -#define MODEL_ki4 0xE -#define MODEL_ki3 0xD -#define MODEL_ki2 0xC -#define MODEL_ki1 0xB -#define MODEL_g1 0xA -#define MODEL_tareyuki 0x9 -#define MODEL_kabe 0x8 -#define MODEL_road 0x7 -#define MODEL_yuki 0x6 -#define MODEL_exitw 0x5 -#define MODEL_o2 0x4 -#define MODEL_o26 0x3 -#define MODEL_exite 0x2 -#define MODEL_o1 0x1 -#define MODEL_o25 0x0 +#define MODEL_Root 0x25 +#define MODEL_kori 0x24 +#define MODEL_o44 0x23 +#define MODEL_Default 0x22 +#define MODEL_saku 0x21 +#define MODEL_miki8 0x20 +#define MODEL_miki14 0x1F +#define MODEL_miki13 0x1E +#define MODEL_miki7 0x1D +#define MODEL_miki6 0x1C +#define MODEL_miki3 0x1B +#define MODEL_miki2 0x1A +#define MODEL_miki1 0x19 +#define MODEL_ki14 0x18 +#define MODEL_ki13 0x17 +#define MODEL_ki12 0x16 +#define MODEL_ki11 0x15 +#define MODEL_ki10 0x14 +#define MODEL_ki9 0x13 +#define MODEL_ki8 0x12 +#define MODEL_ki7 0x11 +#define MODEL_ki6 0x10 +#define MODEL_ki5 0xF +#define MODEL_ki4 0xE +#define MODEL_ki3 0xD +#define MODEL_ki2 0xC +#define MODEL_ki1 0xB +#define MODEL_g1 0xA +#define MODEL_tareyuki 0x9 +#define MODEL_kabe 0x8 +#define MODEL_road 0x7 +#define MODEL_yuki 0x6 +#define MODEL_exitw 0x5 +#define MODEL_o2 0x4 +#define MODEL_o26 0x3 +#define MODEL_exite 0x2 +#define MODEL_o1 0x1 +#define MODEL_o25 0x0 + diff --git a/include/mapfs/sam_04_hit.h b/include/mapfs/sam_04_hit.h index d1e437e1b4..8fee262f55 100644 --- a/include/mapfs/sam_04_hit.h +++ b/include/mapfs/sam_04_hit.h @@ -1,48 +1,55 @@ -#define COLLIDER_Root 0x2F -#define COLLIDER_g28 0x2E -#define COLLIDER_g29 0x2D -#define COLLIDER_o122 0x2C -#define COLLIDER_o121 0x2B -#define COLLIDER_o120 0x2A -#define COLLIDER_o119 0x29 -#define COLLIDER_o118 0x28 -#define COLLIDER_o106 0x27 -#define COLLIDER_o105 0x26 -#define COLLIDER_o104 0x25 -#define COLLIDER_o103 0x24 -#define COLLIDER_yukidaru 0x23 -#define COLLIDER_o89 0x22 -#define COLLIDER_o88 0x21 -#define COLLIDER_o87 0x20 -#define COLLIDER_zyumoku 0x1F -#define COLLIDER_miki5 0x1E -#define COLLIDER_miki6 0x1D -#define COLLIDER_miki4 0x1C -#define COLLIDER_miki3 0x1B -#define COLLIDER_miki2 0x1A -#define COLLIDER_miki1 0x19 -#define COLLIDER_moue 0x18 -#define COLLIDER_o80 0x17 -#define COLLIDER_g23 0x16 -#define COLLIDER_o79 0x15 -#define COLLIDER_g22 0x14 -#define COLLIDER_o78 0x13 -#define COLLIDER_g2 0x12 -#define COLLIDER_kabe 0x11 -#define COLLIDER_yama 0x10 -#define COLLIDER_ground 0xF -#define COLLIDER_exitn 0xE -#define COLLIDER_nn 0xD -#define COLLIDER_ttn 0xC -#define COLLIDER_deilin 0xB -#define COLLIDER_deilitn 0xA -#define COLLIDER_exite 0x9 -#define COLLIDER_tte 0x8 -#define COLLIDER_ne 0x7 -#define COLLIDER_deilie 0x6 -#define COLLIDER_deilite 0x5 -#define COLLIDER_exitsw 0x4 -#define COLLIDER_ttw 0x3 -#define COLLIDER_nsw 0x2 -#define COLLIDER_deilisw 0x1 -#define COLLIDER_deilitsw 0x0 +#define COLLIDER_Root 0x2F +#define COLLIDER_g28 0x2E +#define COLLIDER_g29 0x2D +#define COLLIDER_o122 0x2C +#define COLLIDER_o121 0x2B +#define COLLIDER_o120 0x2A +#define COLLIDER_o119 0x29 +#define COLLIDER_o118 0x28 +#define COLLIDER_o106 0x27 +#define COLLIDER_o105 0x26 +#define COLLIDER_o104 0x25 +#define COLLIDER_o103 0x24 +#define COLLIDER_yukidaru 0x23 +#define COLLIDER_o89 0x22 +#define COLLIDER_o88 0x21 +#define COLLIDER_o87 0x20 +#define COLLIDER_zyumoku 0x1F +#define COLLIDER_miki5 0x1E +#define COLLIDER_miki6 0x1D +#define COLLIDER_miki4 0x1C +#define COLLIDER_miki3 0x1B +#define COLLIDER_miki2 0x1A +#define COLLIDER_miki1 0x19 +#define COLLIDER_moue 0x18 +#define COLLIDER_o80 0x17 +#define COLLIDER_g23 0x16 +#define COLLIDER_o79 0x15 +#define COLLIDER_g22 0x14 +#define COLLIDER_o78 0x13 +#define COLLIDER_g2 0x12 +#define COLLIDER_kabe 0x11 +#define COLLIDER_yama 0x10 +#define COLLIDER_ground 0xF +#define COLLIDER_exitn 0xE +#define COLLIDER_nn 0xD +#define COLLIDER_ttn 0xC +#define COLLIDER_deilin 0xB +#define COLLIDER_deilitn 0xA +#define COLLIDER_exite 0x9 +#define COLLIDER_tte 0x8 +#define COLLIDER_ne 0x7 +#define COLLIDER_deilie 0x6 +#define COLLIDER_deilite 0x5 +#define COLLIDER_exitsw 0x4 +#define COLLIDER_ttw 0x3 +#define COLLIDER_nsw 0x2 +#define COLLIDER_deilisw 0x1 +#define COLLIDER_deilitsw 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g11 0x3 +#define ZONE_o38 0x2 +#define ZONE_o37 0x1 +#define ZONE_o36 0x0 + diff --git a/include/mapfs/sam_04_shape.h b/include/mapfs/sam_04_shape.h index 3c7e4f19df..0fda74275d 100644 --- a/include/mapfs/sam_04_shape.h +++ b/include/mapfs/sam_04_shape.h @@ -1,44 +1,45 @@ -#define MODEL_Root 0x2B -#define MODEL_g22 0x2A -#define MODEL_o84 0x29 -#define MODEL_yukidaru 0x28 -#define MODEL_mafu 0x27 -#define MODEL_baketu 0x26 -#define MODEL_body 0x25 -#define MODEL_d_me 0x24 -#define MODEL_zyumoku 0x23 -#define MODEL_g24 0x22 -#define MODEL_ki2_1 0x21 -#define MODEL_ki2_2 0x20 -#define MODEL_ki2_3 0x1F -#define MODEL_miki2 0x1E -#define MODEL_miki6 0x1D -#define MODEL_mili5 0x1C -#define MODEL_miki4 0x1B -#define MODEL_miki3 0x1A -#define MODEL_miki1 0x19 -#define MODEL_ki6 0x18 -#define MODEL_ki5 0x17 -#define MODEL_ki4 0x16 -#define MODEL_ki3 0x15 -#define MODEL_ki1 0x14 -#define MODEL_g2 0x13 -#define MODEL_g13 0x12 -#define MODEL_o45 0x11 -#define MODEL_o44 0x10 -#define MODEL_ground 0xF -#define MODEL_road 0xE -#define MODEL_exitdai 0xD -#define MODEL_waku 0xC -#define MODEL_move 0xB -#define MODEL_o66 0xA -#define MODEL_doae 0x9 -#define MODEL_o64 0x8 -#define MODEL_doaw 0x7 -#define MODEL_o65 0x6 -#define MODEL_yama 0x5 -#define MODEL_o79 0x4 -#define MODEL_o78 0x3 -#define MODEL_o70 0x2 -#define MODEL_yamae 0x1 -#define MODEL_yamaw 0x0 +#define MODEL_Root 0x2B +#define MODEL_g22 0x2A +#define MODEL_o84 0x29 +#define MODEL_yukidaru 0x28 +#define MODEL_mafu 0x27 +#define MODEL_baketu 0x26 +#define MODEL_body 0x25 +#define MODEL_d_me 0x24 +#define MODEL_zyumoku 0x23 +#define MODEL_g24 0x22 +#define MODEL_ki2_1 0x21 +#define MODEL_ki2_2 0x20 +#define MODEL_ki2_3 0x1F +#define MODEL_miki2 0x1E +#define MODEL_miki6 0x1D +#define MODEL_mili5 0x1C +#define MODEL_miki4 0x1B +#define MODEL_miki3 0x1A +#define MODEL_miki1 0x19 +#define MODEL_ki6 0x18 +#define MODEL_ki5 0x17 +#define MODEL_ki4 0x16 +#define MODEL_ki3 0x15 +#define MODEL_ki1 0x14 +#define MODEL_g2 0x13 +#define MODEL_g13 0x12 +#define MODEL_o45 0x11 +#define MODEL_o44 0x10 +#define MODEL_ground 0xF +#define MODEL_road 0xE +#define MODEL_exitdai 0xD +#define MODEL_waku 0xC +#define MODEL_move 0xB +#define MODEL_o66 0xA +#define MODEL_doae 0x9 +#define MODEL_o64 0x8 +#define MODEL_doaw 0x7 +#define MODEL_o65 0x6 +#define MODEL_yama 0x5 +#define MODEL_o79 0x4 +#define MODEL_o78 0x3 +#define MODEL_o70 0x2 +#define MODEL_yamae 0x1 +#define MODEL_yamaw 0x0 + diff --git a/include/mapfs/sam_05_hit.h b/include/mapfs/sam_05_hit.h index c62e6143de..e38076e5e9 100644 --- a/include/mapfs/sam_05_hit.h +++ b/include/mapfs/sam_05_hit.h @@ -1,30 +1,37 @@ -#define COLLIDER_Root 0x1D -#define COLLIDER_exite 0x1C -#define COLLIDER_tte 0x1B -#define COLLIDER_ne 0x1A -#define COLLIDER_deilie 0x19 -#define COLLIDER_deilite 0x18 -#define COLLIDER_exitw 0x17 -#define COLLIDER_ttw 0x16 -#define COLLIDER_nw 0x15 -#define COLLIDER_deiliw 0x14 -#define COLLIDER_deilitw 0x13 -#define COLLIDER_g7 0x12 -#define COLLIDER_o51 0x11 -#define COLLIDER_o50 0x10 -#define COLLIDER_o47 0xF -#define COLLIDER_o46 0xE -#define COLLIDER_o45 0xD -#define COLLIDER_o44 0xC -#define COLLIDER_o41 0xB -#define COLLIDER_g1 0xA -#define COLLIDER_o55 0x9 -#define COLLIDER_o58 0x8 -#define COLLIDER_o57 0x7 -#define COLLIDER_o54 0x6 -#define COLLIDER_o62 0x5 -#define COLLIDER_o61 0x4 -#define COLLIDER_kabe 0x3 -#define COLLIDER_o60 0x2 -#define COLLIDER_o59 0x1 -#define COLLIDER_ground 0x0 +#define COLLIDER_Root 0x1D +#define COLLIDER_exite 0x1C +#define COLLIDER_tte 0x1B +#define COLLIDER_ne 0x1A +#define COLLIDER_deilie 0x19 +#define COLLIDER_deilite 0x18 +#define COLLIDER_exitw 0x17 +#define COLLIDER_ttw 0x16 +#define COLLIDER_nw 0x15 +#define COLLIDER_deiliw 0x14 +#define COLLIDER_deilitw 0x13 +#define COLLIDER_g7 0x12 +#define COLLIDER_o51 0x11 +#define COLLIDER_o50 0x10 +#define COLLIDER_o47 0xF +#define COLLIDER_o46 0xE +#define COLLIDER_o45 0xD +#define COLLIDER_o44 0xC +#define COLLIDER_o41 0xB +#define COLLIDER_g1 0xA +#define COLLIDER_o55 0x9 +#define COLLIDER_o58 0x8 +#define COLLIDER_o57 0x7 +#define COLLIDER_o54 0x6 +#define COLLIDER_o62 0x5 +#define COLLIDER_o61 0x4 +#define COLLIDER_kabe 0x3 +#define COLLIDER_o60 0x2 +#define COLLIDER_o59 0x1 +#define COLLIDER_ground 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g1 0x3 +#define ZONE_o10 0x2 +#define ZONE_o9 0x1 +#define ZONE_ground 0x0 + diff --git a/include/mapfs/sam_05_shape.h b/include/mapfs/sam_05_shape.h index 001600b21d..d863668d27 100644 --- a/include/mapfs/sam_05_shape.h +++ b/include/mapfs/sam_05_shape.h @@ -1,21 +1,22 @@ -#define MODEL_Root 0x14 -#define MODEL_g4 0x13 -#define MODEL_o28 0x12 -#define MODEL_o22 0x11 -#define MODEL_o10 0x10 -#define MODEL_g5 0xF -#define MODEL_o20 0xE -#define MODEL_o19 0xD -#define MODEL_o18 0xC -#define MODEL_o17 0xB -#define MODEL_o16 0xA -#define MODEL_o15 0x9 -#define MODEL_o14 0x8 -#define MODEL_o13 0x7 -#define MODEL_o12 0x6 -#define MODEL_o11 0x5 -#define MODEL_g1 0x4 -#define MODEL_futi 0x3 -#define MODEL_exitdai 0x2 -#define MODEL_kabe 0x1 -#define MODEL_ground 0x0 +#define MODEL_Root 0x14 +#define MODEL_g4 0x13 +#define MODEL_o28 0x12 +#define MODEL_o22 0x11 +#define MODEL_o10 0x10 +#define MODEL_g5 0xF +#define MODEL_o20 0xE +#define MODEL_o19 0xD +#define MODEL_o18 0xC +#define MODEL_o17 0xB +#define MODEL_o16 0xA +#define MODEL_o15 0x9 +#define MODEL_o14 0x8 +#define MODEL_o13 0x7 +#define MODEL_o12 0x6 +#define MODEL_o11 0x5 +#define MODEL_g1 0x4 +#define MODEL_futi 0x3 +#define MODEL_exitdai 0x2 +#define MODEL_kabe 0x1 +#define MODEL_ground 0x0 + diff --git a/include/mapfs/sam_06_hit.h b/include/mapfs/sam_06_hit.h index b1fbb0d9f7..0b58a6ec77 100644 --- a/include/mapfs/sam_06_hit.h +++ b/include/mapfs/sam_06_hit.h @@ -1,66 +1,77 @@ -#define COLLIDER_Root 0x41 -#define COLLIDER_g43 0x40 -#define COLLIDER_o293 0x3F -#define COLLIDER_o292 0x3E -#define COLLIDER_o291 0x3D -#define COLLIDER_o290 0x3C -#define COLLIDER_o225 0x3B -#define COLLIDER_g2 0x3A -#define COLLIDER_o288 0x39 -#define COLLIDER_o262 0x38 -#define COLLIDER_o287 0x37 -#define COLLIDER_ground 0x36 -#define COLLIDER_kabe2 0x35 -#define COLLIDER_o268 0x34 -#define COLLIDER_o286 0x33 -#define COLLIDER_o267 0x32 -#define COLLIDER_o266 0x31 -#define COLLIDER_o265 0x30 -#define COLLIDER_o264 0x2F -#define COLLIDER_o285 0x2E -#define COLLIDER_o263 0x2D -#define COLLIDER_o296 0x2C -#define COLLIDER_kabe 0x2B -#define COLLIDER_hakun 0x2A -#define COLLIDER_h_exit 0x29 -#define COLLIDER_h_yuka2 0x28 -#define COLLIDER_h_yuka1 0x27 -#define COLLIDER_h_doa2 0x26 -#define COLLIDER_h_doa1 0x25 -#define COLLIDER_h_naiso 0x24 -#define COLLIDER_o277 0x23 -#define COLLIDER_hn_kabe 0x22 -#define COLLIDER_hn_isu1 0x21 -#define COLLIDER_hn_yuka1 0x20 -#define COLLIDER_h_kabe 0x1F -#define COLLIDER_h_noki 0x1E -#define COLLIDER_k 0x1D -#define COLLIDER_exitk 0x1C -#define COLLIDER_k_yuka2 0x1B -#define COLLIDER_k_yuka1 0x1A -#define COLLIDER_k_d2 0x19 -#define COLLIDER_k_d1 0x18 -#define COLLIDER_k_naiso 0x17 -#define COLLIDER_kn_kabe 0x16 -#define COLLIDER_kn_dan 0x15 -#define COLLIDER_kn_yuka 0x14 -#define COLLIDER_k_kabe 0x13 -#define COLLIDER_k_noki 0x12 -#define COLLIDER_kinohuse 0x11 -#define COLLIDER_kn_noki 0x10 -#define COLLIDER_kh_exit 0xF -#define COLLIDER_kh_yuka2 0xE -#define COLLIDER_kh_yuka11 0xD -#define COLLIDER_kh_d2 0xC -#define COLLIDER_kh_d1 0xB -#define COLLIDER_kh_naiso 0xA -#define COLLIDER_o250 0x9 -#define COLLIDER_khn_bed1 0x8 -#define COLLIDER_khn_isu2 0x7 -#define COLLIDER_khn_yuka1 0x6 -#define COLLIDER_khn_kabe 0x5 -#define COLLIDER_kh_kabe 0x4 -#define COLLIDER_exitsw 0x3 -#define COLLIDER_nsw 0x2 -#define COLLIDER_deilisw 0x1 -#define COLLIDER_deilitsw 0x0 +#define COLLIDER_Root 0x41 +#define COLLIDER_g43 0x40 +#define COLLIDER_o293 0x3F +#define COLLIDER_o292 0x3E +#define COLLIDER_o291 0x3D +#define COLLIDER_o290 0x3C +#define COLLIDER_o225 0x3B +#define COLLIDER_g2 0x3A +#define COLLIDER_o288 0x39 +#define COLLIDER_o262 0x38 +#define COLLIDER_o287 0x37 +#define COLLIDER_ground 0x36 +#define COLLIDER_kabe2 0x35 +#define COLLIDER_o268 0x34 +#define COLLIDER_o286 0x33 +#define COLLIDER_o267 0x32 +#define COLLIDER_o266 0x31 +#define COLLIDER_o265 0x30 +#define COLLIDER_o264 0x2F +#define COLLIDER_o285 0x2E +#define COLLIDER_o263 0x2D +#define COLLIDER_o296 0x2C +#define COLLIDER_kabe 0x2B +#define COLLIDER_hakun 0x2A +#define COLLIDER_h_exit 0x29 +#define COLLIDER_h_yuka2 0x28 +#define COLLIDER_h_yuka1 0x27 +#define COLLIDER_h_doa2 0x26 +#define COLLIDER_h_doa1 0x25 +#define COLLIDER_h_naiso 0x24 +#define COLLIDER_o277 0x23 +#define COLLIDER_hn_kabe 0x22 +#define COLLIDER_hn_isu1 0x21 +#define COLLIDER_hn_yuka1 0x20 +#define COLLIDER_h_kabe 0x1F +#define COLLIDER_h_noki 0x1E +#define COLLIDER_k 0x1D +#define COLLIDER_exitk 0x1C +#define COLLIDER_k_yuka2 0x1B +#define COLLIDER_k_yuka1 0x1A +#define COLLIDER_k_d2 0x19 +#define COLLIDER_k_d1 0x18 +#define COLLIDER_k_naiso 0x17 +#define COLLIDER_kn_kabe 0x16 +#define COLLIDER_kn_dan 0x15 +#define COLLIDER_kn_yuka 0x14 +#define COLLIDER_k_kabe 0x13 +#define COLLIDER_k_noki 0x12 +#define COLLIDER_kinohuse 0x11 +#define COLLIDER_kn_noki 0x10 +#define COLLIDER_kh_exit 0xF +#define COLLIDER_kh_yuka2 0xE +#define COLLIDER_kh_yuka11 0xD +#define COLLIDER_kh_d2 0xC +#define COLLIDER_kh_d1 0xB +#define COLLIDER_kh_naiso 0xA +#define COLLIDER_o250 0x9 +#define COLLIDER_khn_bed1 0x8 +#define COLLIDER_khn_isu2 0x7 +#define COLLIDER_khn_yuka1 0x6 +#define COLLIDER_khn_kabe 0x5 +#define COLLIDER_kh_kabe 0x4 +#define COLLIDER_exitsw 0x3 +#define COLLIDER_nsw 0x2 +#define COLLIDER_deilisw 0x1 +#define COLLIDER_deilitsw 0x0 + +#define ZONE_Root 0x8 +#define ZONE_k_ie 0x7 +#define ZONE_ki_yuka1 0x6 +#define ZONE_kino 0x5 +#define ZONE_kn_yuka1 0x4 +#define ZONE_hakun 0x3 +#define ZONE_hn_yuka 0x2 +#define ZONE_g2 0x1 +#define ZONE_ground 0x0 + diff --git a/include/mapfs/sam_06_shape.h b/include/mapfs/sam_06_shape.h index 352ca5cbe6..bb9d8acb14 100644 --- a/include/mapfs/sam_06_shape.h +++ b/include/mapfs/sam_06_shape.h @@ -1,165 +1,166 @@ -#define MODEL_Root 0xA4 -#define MODEL_etc 0xA3 -#define MODEL_ki 0xA2 -#define MODEL_miki10 0xA1 -#define MODEL_ki10 0xA0 -#define MODEL_ki7b 0x9F -#define MODEL_ki6b 0x9E -#define MODEL_ki5b 0x9D -#define MODEL_ki4b 0x9C -#define MODEL_miki7 0x9B -#define MODEL_miki6 0x9A -#define MODEL_muki5 0x99 -#define MODEL_miki4 0x98 -#define MODEL_ki3 0x97 -#define MODEL_miki3 0x96 -#define MODEL_ki2 0x95 -#define MODEL_miki2 0x94 -#define MODEL_hakun 0x93 -#define MODEL_h_naiso 0x92 -#define MODEL_g43 0x91 -#define MODEL_hi1 0x90 -#define MODEL_maki2 0x8F -#define MODEL_maki1 0x8E -#define MODEL_hn_book2 0x8D -#define MODEL_hn_book1 0x8C -#define MODEL_kn_bin3 0x8B -#define MODEL_hn_bin2 0x8A -#define MODEL_hn_bin1 0x89 -#define MODEL_hn_tan4 0x88 -#define MODEL_hn_tan3 0x87 -#define MODEL_hn_tan2 0x86 -#define MODEL_hn_tan1 0x85 -#define MODEL_hn_nabe 0x84 -#define MODEL_hn_yuge 0x83 -#define MODEL_hn_nabe1 0x82 -#define MODEL_hn_nakami 0x81 -#define MODEL_hn_tote 0x80 -#define MODEL_hn_sazi 0x7F -#define MODEL_hn_isu2 0x7E -#define MODEL_hn_isu1 0x7D -#define MODEL_hn_asi 0x7C -#define MODEL_hn_kurosu 0x7B -#define MODEL_hn_dan3 0x7A -#define MODEL_hn_dan2 0x79 -#define MODEL_hn_dan1 0x78 -#define MODEL_hn_mado 0x77 -#define MODEL_hn_waku 0x76 -#define MODEL_hn_kabe 0x75 -#define MODEL_hn_hasira 0x74 -#define MODEL_hn_yuka2 0x73 -#define MODEL_hn_yuka1 0x72 -#define MODEL_hm_doa 0x71 -#define MODEL_o122 0x70 -#define MODEL_hm_yane 0x6F -#define MODEL_hm_yuki1 0x6E -#define MODEL_hm_yuki2 0x6D -#define MODEL_hm_sita 0x6C -#define MODEL_hm_mado 0x6B -#define MODEL_hm_waku 0x6A -#define MODEL_hm_hasira 0x69 -#define MODEL_hm_kabe 0x68 -#define MODEL_hm_ento2 0x67 -#define MODEL_hm_entotu 0x66 -#define MODEL_h_noki 0x65 -#define MODEL_h_yuki2 0x64 -#define MODEL_h_yuki1 0x63 -#define MODEL_h_mado 0x62 -#define MODEL_h_waku 0x61 -#define MODEL_h_hasira 0x60 -#define MODEL_h_kabe 0x5F -#define MODEL_k 0x5E -#define MODEL_k_naiso 0x5D -#define MODEL_g44 0x5C -#define MODEL_hi2 0x5B -#define MODEL_maki4 0x5A -#define MODEL_maki3 0x59 -#define MODEL_kn_tan2 0x58 -#define MODEL_kn_bin2 0x57 -#define MODEL_kn_bin1 0x56 -#define MODEL_kn_mado 0x55 -#define MODEL_kn_waku 0x54 -#define MODEL_kn_hasira 0x53 -#define MODEL_kn_kabe 0x52 -#define MODEL_kn_tana 0x51 -#define MODEL_kn_dan4 0x50 -#define MODEL_kn_dan2 0x4F -#define MODEL_kn_dan1 0x4E -#define MODEL_kn_yuka 0x4D -#define MODEL_k_doa 0x4C -#define MODEL_km_doa 0x4B -#define MODEL_km_yane 0x4A -#define MODEL_km_yuki1 0x49 -#define MODEL_km_yuki2 0x48 -#define MODEL_km_sita 0x47 -#define MODEL_km_kabe 0x46 -#define MODEL_km_mado 0x45 -#define MODEL_km_hasira 0x44 -#define MODEL_km_waku 0x43 -#define MODEL_km_ento2 0x42 -#define MODEL_km_entotu 0x41 -#define MODEL_k_noki 0x40 -#define MODEL_k_yuki2 0x3F -#define MODEL_k_yuki 0x3E -#define MODEL_k_mado 0x3D -#define MODEL_k_waku 0x3C -#define MODEL_k_hasira 0x3B -#define MODEL_k_kabe 0x3A -#define MODEL_kinohuse 0x39 -#define MODEL_kh_naiso 0x38 -#define MODEL_g46 0x37 -#define MODEL_o326 0x36 -#define MODEL_o327 0x35 -#define MODEL_khn_bed2 0x34 -#define MODEL_khn_bed1 0x33 -#define MODEL_g45 0x32 -#define MODEL_hi3 0x31 -#define MODEL_maki6 0x30 -#define MODEL_maki5 0x2F -#define MODEL_khn_book2 0x2E -#define MODEL_khn_book1 0x2D -#define MODEL_khn_tana 0x2C -#define MODEL_khn_mado 0x2B -#define MODEL_khn_waku 0x2A -#define MODEL_khn_haisra 0x29 -#define MODEL_khn_kabe 0x28 -#define MODEL_khn_dan1 0x27 -#define MODEL_khn_dan2 0x26 -#define MODEL_khn_dan3 0x25 -#define MODEL_khn_asi 0x24 -#define MODEL_khn_kurosu 0x23 -#define MODEL_khn_isu1 0x22 -#define MODEL_khn_isu2 0x21 -#define MODEL_khn_yuka2 0x20 -#define MODEL_khn_yuka1 0x1F -#define MODEL_kh_doa 0x1E -#define MODEL_khm_doa 0x1D -#define MODEL_khm_yane 0x1C -#define MODEL_khm_y2 0x1B -#define MODEL_khm_y1 0x1A -#define MODEL_khm_sita 0x19 -#define MODEL_khm_mado 0x18 -#define MODEL_khm_waku 0x17 -#define MODEL_khm_hasira 0x16 -#define MODEL_khm_kabe 0x15 -#define MODEL_ento2 0x14 -#define MODEL_enttu 0x13 -#define MODEL_yuki2 0x12 -#define MODEL_yuki1 0x11 -#define MODEL_kh_kanban 0x10 -#define MODEL_kh_noki 0xF -#define MODEL_kh_maso 0xE -#define MODEL_kh_waku 0xD -#define MODEL_kh_hasir 0xC -#define MODEL_kh_kabe 0xB -#define MODEL_g41 0xA -#define MODEL_gr1 0x9 -#define MODEL_o221 0x8 -#define MODEL_k1 0x7 -#define MODEL_exitdai 0x6 -#define MODEL_o305 0x5 -#define MODEL_g2 0x4 -#define MODEL_waku 0x3 -#define MODEL_g1 0x2 -#define MODEL_o336 0x1 -#define MODEL_o9 0x0 +#define MODEL_Root 0xA4 +#define MODEL_etc 0xA3 +#define MODEL_ki 0xA2 +#define MODEL_miki10 0xA1 +#define MODEL_ki10 0xA0 +#define MODEL_ki7b 0x9F +#define MODEL_ki6b 0x9E +#define MODEL_ki5b 0x9D +#define MODEL_ki4b 0x9C +#define MODEL_miki7 0x9B +#define MODEL_miki6 0x9A +#define MODEL_muki5 0x99 +#define MODEL_miki4 0x98 +#define MODEL_ki3 0x97 +#define MODEL_miki3 0x96 +#define MODEL_ki2 0x95 +#define MODEL_miki2 0x94 +#define MODEL_hakun 0x93 +#define MODEL_h_naiso 0x92 +#define MODEL_g43 0x91 +#define MODEL_hi1 0x90 +#define MODEL_maki2 0x8F +#define MODEL_maki1 0x8E +#define MODEL_hn_book2 0x8D +#define MODEL_hn_book1 0x8C +#define MODEL_kn_bin3 0x8B +#define MODEL_hn_bin2 0x8A +#define MODEL_hn_bin1 0x89 +#define MODEL_hn_tan4 0x88 +#define MODEL_hn_tan3 0x87 +#define MODEL_hn_tan2 0x86 +#define MODEL_hn_tan1 0x85 +#define MODEL_hn_nabe 0x84 +#define MODEL_hn_yuge 0x83 +#define MODEL_hn_nabe1 0x82 +#define MODEL_hn_nakami 0x81 +#define MODEL_hn_tote 0x80 +#define MODEL_hn_sazi 0x7F +#define MODEL_hn_isu2 0x7E +#define MODEL_hn_isu1 0x7D +#define MODEL_hn_asi 0x7C +#define MODEL_hn_kurosu 0x7B +#define MODEL_hn_dan3 0x7A +#define MODEL_hn_dan2 0x79 +#define MODEL_hn_dan1 0x78 +#define MODEL_hn_mado 0x77 +#define MODEL_hn_waku 0x76 +#define MODEL_hn_kabe 0x75 +#define MODEL_hn_hasira 0x74 +#define MODEL_hn_yuka2 0x73 +#define MODEL_hn_yuka1 0x72 +#define MODEL_hm_doa 0x71 +#define MODEL_o122 0x70 +#define MODEL_hm_yane 0x6F +#define MODEL_hm_yuki1 0x6E +#define MODEL_hm_yuki2 0x6D +#define MODEL_hm_sita 0x6C +#define MODEL_hm_mado 0x6B +#define MODEL_hm_waku 0x6A +#define MODEL_hm_hasira 0x69 +#define MODEL_hm_kabe 0x68 +#define MODEL_hm_ento2 0x67 +#define MODEL_hm_entotu 0x66 +#define MODEL_h_noki 0x65 +#define MODEL_h_yuki2 0x64 +#define MODEL_h_yuki1 0x63 +#define MODEL_h_mado 0x62 +#define MODEL_h_waku 0x61 +#define MODEL_h_hasira 0x60 +#define MODEL_h_kabe 0x5F +#define MODEL_k 0x5E +#define MODEL_k_naiso 0x5D +#define MODEL_g44 0x5C +#define MODEL_hi2 0x5B +#define MODEL_maki4 0x5A +#define MODEL_maki3 0x59 +#define MODEL_kn_tan2 0x58 +#define MODEL_kn_bin2 0x57 +#define MODEL_kn_bin1 0x56 +#define MODEL_kn_mado 0x55 +#define MODEL_kn_waku 0x54 +#define MODEL_kn_hasira 0x53 +#define MODEL_kn_kabe 0x52 +#define MODEL_kn_tana 0x51 +#define MODEL_kn_dan4 0x50 +#define MODEL_kn_dan2 0x4F +#define MODEL_kn_dan1 0x4E +#define MODEL_kn_yuka 0x4D +#define MODEL_k_doa 0x4C +#define MODEL_km_doa 0x4B +#define MODEL_km_yane 0x4A +#define MODEL_km_yuki1 0x49 +#define MODEL_km_yuki2 0x48 +#define MODEL_km_sita 0x47 +#define MODEL_km_kabe 0x46 +#define MODEL_km_mado 0x45 +#define MODEL_km_hasira 0x44 +#define MODEL_km_waku 0x43 +#define MODEL_km_ento2 0x42 +#define MODEL_km_entotu 0x41 +#define MODEL_k_noki 0x40 +#define MODEL_k_yuki2 0x3F +#define MODEL_k_yuki 0x3E +#define MODEL_k_mado 0x3D +#define MODEL_k_waku 0x3C +#define MODEL_k_hasira 0x3B +#define MODEL_k_kabe 0x3A +#define MODEL_kinohuse 0x39 +#define MODEL_kh_naiso 0x38 +#define MODEL_g46 0x37 +#define MODEL_o326 0x36 +#define MODEL_o327 0x35 +#define MODEL_khn_bed2 0x34 +#define MODEL_khn_bed1 0x33 +#define MODEL_g45 0x32 +#define MODEL_hi3 0x31 +#define MODEL_maki6 0x30 +#define MODEL_maki5 0x2F +#define MODEL_khn_book2 0x2E +#define MODEL_khn_book1 0x2D +#define MODEL_khn_tana 0x2C +#define MODEL_khn_mado 0x2B +#define MODEL_khn_waku 0x2A +#define MODEL_khn_haisra 0x29 +#define MODEL_khn_kabe 0x28 +#define MODEL_khn_dan1 0x27 +#define MODEL_khn_dan2 0x26 +#define MODEL_khn_dan3 0x25 +#define MODEL_khn_asi 0x24 +#define MODEL_khn_kurosu 0x23 +#define MODEL_khn_isu1 0x22 +#define MODEL_khn_isu2 0x21 +#define MODEL_khn_yuka2 0x20 +#define MODEL_khn_yuka1 0x1F +#define MODEL_kh_doa 0x1E +#define MODEL_khm_doa 0x1D +#define MODEL_khm_yane 0x1C +#define MODEL_khm_y2 0x1B +#define MODEL_khm_y1 0x1A +#define MODEL_khm_sita 0x19 +#define MODEL_khm_mado 0x18 +#define MODEL_khm_waku 0x17 +#define MODEL_khm_hasira 0x16 +#define MODEL_khm_kabe 0x15 +#define MODEL_ento2 0x14 +#define MODEL_enttu 0x13 +#define MODEL_yuki2 0x12 +#define MODEL_yuki1 0x11 +#define MODEL_kh_kanban 0x10 +#define MODEL_kh_noki 0xF +#define MODEL_kh_maso 0xE +#define MODEL_kh_waku 0xD +#define MODEL_kh_hasir 0xC +#define MODEL_kh_kabe 0xB +#define MODEL_g41 0xA +#define MODEL_gr1 0x9 +#define MODEL_o221 0x8 +#define MODEL_k1 0x7 +#define MODEL_exitdai 0x6 +#define MODEL_o305 0x5 +#define MODEL_g2 0x4 +#define MODEL_waku 0x3 +#define MODEL_g1 0x2 +#define MODEL_o336 0x1 +#define MODEL_o9 0x0 + diff --git a/include/mapfs/sam_07_hit.h b/include/mapfs/sam_07_hit.h index 441f850a08..5932b4258b 100644 --- a/include/mapfs/sam_07_hit.h +++ b/include/mapfs/sam_07_hit.h @@ -1,28 +1,33 @@ -#define COLLIDER_Root 0x1B -#define COLLIDER_g1 0x1A -#define COLLIDER_move1 0x19 -#define COLLIDER_o116 0x18 -#define COLLIDER_m1_kabe 0x17 -#define COLLIDER_m1_yuka 0x16 -#define COLLIDER_Default 0x15 -#define COLLIDER_o130 0x14 -#define COLLIDER_o117 0x13 -#define COLLIDER_o129 0x12 -#define COLLIDER_o118 0x11 -#define COLLIDER_iwa2 0x10 -#define COLLIDER_o127 0xF -#define COLLIDER_o119 0xE -#define COLLIDER_o128 0xD -#define COLLIDER_kabe1 0xC -#define COLLIDER_o126 0xB -#define COLLIDER_yuka 0xA -#define COLLIDER_exite 0x9 -#define COLLIDER_tte 0x8 -#define COLLIDER_ne 0x7 -#define COLLIDER_deilie 0x6 -#define COLLIDER_deilite 0x5 -#define COLLIDER_exitw 0x4 -#define COLLIDER_ttw 0x3 -#define COLLIDER_nw 0x2 -#define COLLIDER_deiliw 0x1 -#define COLLIDER_deilitw 0x0 +#define COLLIDER_Root 0x1B +#define COLLIDER_g1 0x1A +#define COLLIDER_move1 0x19 +#define COLLIDER_o116 0x18 +#define COLLIDER_m1_kabe 0x17 +#define COLLIDER_m1_yuka 0x16 +#define COLLIDER_Default 0x15 +#define COLLIDER_o130 0x14 +#define COLLIDER_o117 0x13 +#define COLLIDER_o129 0x12 +#define COLLIDER_o118 0x11 +#define COLLIDER_iwa2 0x10 +#define COLLIDER_o127 0xF +#define COLLIDER_o119 0xE +#define COLLIDER_o128 0xD +#define COLLIDER_kabe1 0xC +#define COLLIDER_o126 0xB +#define COLLIDER_yuka 0xA +#define COLLIDER_exite 0x9 +#define COLLIDER_tte 0x8 +#define COLLIDER_ne 0x7 +#define COLLIDER_deilie 0x6 +#define COLLIDER_deilite 0x5 +#define COLLIDER_exitw 0x4 +#define COLLIDER_ttw 0x3 +#define COLLIDER_nw 0x2 +#define COLLIDER_deiliw 0x1 +#define COLLIDER_deilitw 0x0 + +#define ZONE_Root 0x2 +#define ZONE_g1 0x1 +#define ZONE_o22 0x0 + diff --git a/include/mapfs/sam_07_shape.h b/include/mapfs/sam_07_shape.h index 2b1512c564..74ad75cb1b 100644 --- a/include/mapfs/sam_07_shape.h +++ b/include/mapfs/sam_07_shape.h @@ -1,140 +1,141 @@ -#define MODEL_Root 0x8B -#define MODEL_g1 0x8A -#define MODEL_g72 0x89 -#define MODEL_o137 0x88 -#define MODEL_o135 0x87 -#define MODEL_move1 0x86 -#define MODEL_s19 0x85 -#define MODEL_o115 0x84 -#define MODEL_s18 0x83 -#define MODEL_o125 0x82 -#define MODEL_s17 0x81 -#define MODEL_o126 0x80 -#define MODEL_s16 0x7F -#define MODEL_o114 0x7E -#define MODEL_s15 0x7D -#define MODEL_o124 0x7C -#define MODEL_s14 0x7B -#define MODEL_o123 0x7A -#define MODEL_s13 0x79 -#define MODEL_o113 0x78 -#define MODEL_s12 0x77 -#define MODEL_o121 0x76 -#define MODEL_s11 0x75 -#define MODEL_o122 0x74 -#define MODEL_s10 0x73 -#define MODEL_o112 0x72 -#define MODEL_s9 0x71 -#define MODEL_o120 0x70 -#define MODEL_s8 0x6F -#define MODEL_o119 0x6E -#define MODEL_s7 0x6D -#define MODEL_o111 0x6C -#define MODEL_s6 0x6B -#define MODEL_o117 0x6A -#define MODEL_s5 0x69 -#define MODEL_o118 0x68 -#define MODEL_s4 0x67 -#define MODEL_o109 0x66 -#define MODEL_s3 0x65 -#define MODEL_o116 0x64 -#define MODEL_s2 0x63 -#define MODEL_o107 0x62 -#define MODEL_s1 0x61 -#define MODEL_o106 0x60 -#define MODEL_36 0x5F -#define MODEL_o80 0x5E -#define MODEL_35 0x5D -#define MODEL_o73 0x5C -#define MODEL_34 0x5B -#define MODEL_o50 0x5A -#define MODEL_33 0x59 -#define MODEL_o48 0x58 -#define MODEL_32 0x57 -#define MODEL_o78 0x56 -#define MODEL_31 0x55 -#define MODEL_o81 0x54 -#define MODEL_30 0x53 -#define MODEL_o91 0x52 -#define MODEL_29 0x51 -#define MODEL_o94 0x50 -#define MODEL_28 0x4F -#define MODEL_o65 0x4E -#define MODEL_27 0x4D -#define MODEL_o68 0x4C -#define MODEL_26 0x4B -#define MODEL_o70 0x4A -#define MODEL_25 0x49 -#define MODEL_o55 0x48 -#define MODEL_24 0x47 -#define MODEL_o47 0x46 -#define MODEL_23 0x45 -#define MODEL_o44 0x44 -#define MODEL_22 0x43 -#define MODEL_o51 0x42 -#define MODEL_21 0x41 -#define MODEL_o75 0x40 -#define MODEL_20 0x3F -#define MODEL_o84 0x3E -#define MODEL_19 0x3D -#define MODEL_o77 0x3C -#define MODEL_18 0x3B -#define MODEL_o82 0x3A -#define MODEL_17 0x39 -#define MODEL_o100 0x38 -#define MODEL_16 0x37 -#define MODEL_o93 0x36 -#define MODEL_15 0x35 -#define MODEL_o98 0x34 -#define MODEL_14 0x33 -#define MODEL_o64 0x32 -#define MODEL_13 0x31 -#define MODEL_o66 0x30 -#define MODEL_12 0x2F -#define MODEL_o67 0x2E -#define MODEL_11 0x2D -#define MODEL_o54 0x2C -#define MODEL_10 0x2B -#define MODEL_o46 0x2A -#define MODEL_9 0x29 -#define MODEL_o52 0x28 -#define MODEL_8 0x27 -#define MODEL_o86 0x26 -#define MODEL_7 0x25 -#define MODEL_o63 0x24 -#define MODEL_6 0x23 -#define MODEL_o58 0x22 -#define MODEL_5 0x21 -#define MODEL_o56 0x20 -#define MODEL_4 0x1F -#define MODEL_o105 0x1E -#define MODEL_3 0x1D -#define MODEL_o89 0x1C -#define MODEL_2 0x1B -#define MODEL_o61 0x1A -#define MODEL_1 0x19 -#define MODEL_o59 0x18 -#define MODEL_m1_kabe 0x17 -#define MODEL_m1_yuka 0x16 -#define MODEL_exitw 0x15 -#define MODEL_exite2 0x14 -#define MODEL_exite1 0x13 -#define MODEL_o17 0x12 -#define MODEL_o18 0x11 -#define MODEL_g2 0x10 -#define MODEL_o41 0xF -#define MODEL_ten3 0xE -#define MODEL_ten2 0xD -#define MODEL_Default 0xC -#define MODEL_ten 0xB -#define MODEL_o132 0xA -#define MODEL_o131 0x9 -#define MODEL_futi 0x8 -#define MODEL_kaidan 0x7 -#define MODEL_kai_kabe 0x6 -#define MODEL_yuka 0x5 -#define MODEL_oku 0x4 -#define MODEL_iwa2 0x3 -#define MODEL_iwa1 0x2 -#define MODEL_kabe1 0x1 -#define MODEL_o_kabe 0x0 +#define MODEL_Root 0x8B +#define MODEL_g1 0x8A +#define MODEL_g72 0x89 +#define MODEL_o137 0x88 +#define MODEL_o135 0x87 +#define MODEL_move1 0x86 +#define MODEL_s19 0x85 +#define MODEL_o115 0x84 +#define MODEL_s18 0x83 +#define MODEL_o125 0x82 +#define MODEL_s17 0x81 +#define MODEL_o126 0x80 +#define MODEL_s16 0x7F +#define MODEL_o114 0x7E +#define MODEL_s15 0x7D +#define MODEL_o124 0x7C +#define MODEL_s14 0x7B +#define MODEL_o123 0x7A +#define MODEL_s13 0x79 +#define MODEL_o113 0x78 +#define MODEL_s12 0x77 +#define MODEL_o121 0x76 +#define MODEL_s11 0x75 +#define MODEL_o122 0x74 +#define MODEL_s10 0x73 +#define MODEL_o112 0x72 +#define MODEL_s9 0x71 +#define MODEL_o120 0x70 +#define MODEL_s8 0x6F +#define MODEL_o119 0x6E +#define MODEL_s7 0x6D +#define MODEL_o111 0x6C +#define MODEL_s6 0x6B +#define MODEL_o117 0x6A +#define MODEL_s5 0x69 +#define MODEL_o118 0x68 +#define MODEL_s4 0x67 +#define MODEL_o109 0x66 +#define MODEL_s3 0x65 +#define MODEL_o116 0x64 +#define MODEL_s2 0x63 +#define MODEL_o107 0x62 +#define MODEL_s1 0x61 +#define MODEL_o106 0x60 +#define MODEL_36 0x5F +#define MODEL_o80 0x5E +#define MODEL_35 0x5D +#define MODEL_o73 0x5C +#define MODEL_34 0x5B +#define MODEL_o50 0x5A +#define MODEL_33 0x59 +#define MODEL_o48 0x58 +#define MODEL_32 0x57 +#define MODEL_o78 0x56 +#define MODEL_31 0x55 +#define MODEL_o81 0x54 +#define MODEL_30 0x53 +#define MODEL_o91 0x52 +#define MODEL_29 0x51 +#define MODEL_o94 0x50 +#define MODEL_28 0x4F +#define MODEL_o65 0x4E +#define MODEL_27 0x4D +#define MODEL_o68 0x4C +#define MODEL_26 0x4B +#define MODEL_o70 0x4A +#define MODEL_25 0x49 +#define MODEL_o55 0x48 +#define MODEL_24 0x47 +#define MODEL_o47 0x46 +#define MODEL_23 0x45 +#define MODEL_o44 0x44 +#define MODEL_22 0x43 +#define MODEL_o51 0x42 +#define MODEL_21 0x41 +#define MODEL_o75 0x40 +#define MODEL_20 0x3F +#define MODEL_o84 0x3E +#define MODEL_19 0x3D +#define MODEL_o77 0x3C +#define MODEL_18 0x3B +#define MODEL_o82 0x3A +#define MODEL_17 0x39 +#define MODEL_o100 0x38 +#define MODEL_16 0x37 +#define MODEL_o93 0x36 +#define MODEL_15 0x35 +#define MODEL_o98 0x34 +#define MODEL_14 0x33 +#define MODEL_o64 0x32 +#define MODEL_13 0x31 +#define MODEL_o66 0x30 +#define MODEL_12 0x2F +#define MODEL_o67 0x2E +#define MODEL_11 0x2D +#define MODEL_o54 0x2C +#define MODEL_10 0x2B +#define MODEL_o46 0x2A +#define MODEL_9 0x29 +#define MODEL_o52 0x28 +#define MODEL_8 0x27 +#define MODEL_o86 0x26 +#define MODEL_7 0x25 +#define MODEL_o63 0x24 +#define MODEL_6 0x23 +#define MODEL_o58 0x22 +#define MODEL_5 0x21 +#define MODEL_o56 0x20 +#define MODEL_4 0x1F +#define MODEL_o105 0x1E +#define MODEL_3 0x1D +#define MODEL_o89 0x1C +#define MODEL_2 0x1B +#define MODEL_o61 0x1A +#define MODEL_1 0x19 +#define MODEL_o59 0x18 +#define MODEL_m1_kabe 0x17 +#define MODEL_m1_yuka 0x16 +#define MODEL_exitw 0x15 +#define MODEL_exite2 0x14 +#define MODEL_exite1 0x13 +#define MODEL_o17 0x12 +#define MODEL_o18 0x11 +#define MODEL_g2 0x10 +#define MODEL_o41 0xF +#define MODEL_ten3 0xE +#define MODEL_ten2 0xD +#define MODEL_Default 0xC +#define MODEL_ten 0xB +#define MODEL_o132 0xA +#define MODEL_o131 0x9 +#define MODEL_futi 0x8 +#define MODEL_kaidan 0x7 +#define MODEL_kai_kabe 0x6 +#define MODEL_yuka 0x5 +#define MODEL_oku 0x4 +#define MODEL_iwa2 0x3 +#define MODEL_iwa1 0x2 +#define MODEL_kabe1 0x1 +#define MODEL_o_kabe 0x0 + diff --git a/include/mapfs/sam_08_hit.h b/include/mapfs/sam_08_hit.h index c626452642..8180172fe8 100644 --- a/include/mapfs/sam_08_hit.h +++ b/include/mapfs/sam_08_hit.h @@ -1,30 +1,38 @@ -#define COLLIDER_Root 0x1D -#define COLLIDER_g1 0x1C -#define COLLIDER_o47 0x1B -#define COLLIDER_move1 0x1A -#define COLLIDER_m1_kabe 0x19 -#define COLLIDER_m1_yuka 0x18 -#define COLLIDER_exite 0x17 -#define COLLIDER_tte 0x16 -#define COLLIDER_ne 0x15 -#define COLLIDER_deilie 0x14 -#define COLLIDER_deilite 0x13 -#define COLLIDER_exitw 0x12 -#define COLLIDER_ttw 0x11 -#define COLLIDER_nw 0x10 -#define COLLIDER_deiliw 0xF -#define COLLIDER_deilitw 0xE -#define COLLIDER_Default 0xD -#define COLLIDER_o49 0xC -#define COLLIDER_iwa2 0xB -#define COLLIDER_iwa1 0xA -#define COLLIDER_kabe1 0x9 -#define COLLIDER_o52 0x8 -#define COLLIDER_o56 0x7 -#define COLLIDER_o51 0x6 -#define COLLIDER_o55 0x5 -#define COLLIDER_kaidan 0x4 -#define COLLIDER_kai_kabe 0x3 -#define COLLIDER_o54 0x2 -#define COLLIDER_o53 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x1D +#define COLLIDER_g1 0x1C +#define COLLIDER_o47 0x1B +#define COLLIDER_move1 0x1A +#define COLLIDER_m1_kabe 0x19 +#define COLLIDER_m1_yuka 0x18 +#define COLLIDER_exite 0x17 +#define COLLIDER_tte 0x16 +#define COLLIDER_ne 0x15 +#define COLLIDER_deilie 0x14 +#define COLLIDER_deilite 0x13 +#define COLLIDER_exitw 0x12 +#define COLLIDER_ttw 0x11 +#define COLLIDER_nw 0x10 +#define COLLIDER_deiliw 0xF +#define COLLIDER_deilitw 0xE +#define COLLIDER_Default 0xD +#define COLLIDER_o49 0xC +#define COLLIDER_iwa2 0xB +#define COLLIDER_iwa1 0xA +#define COLLIDER_kabe1 0x9 +#define COLLIDER_o52 0x8 +#define COLLIDER_o56 0x7 +#define COLLIDER_o51 0x6 +#define COLLIDER_o55 0x5 +#define COLLIDER_kaidan 0x4 +#define COLLIDER_kai_kabe 0x3 +#define COLLIDER_o54 0x2 +#define COLLIDER_o53 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x5 +#define ZONE_Default 0x4 +#define ZONE_o42 0x3 +#define ZONE_o38 0x2 +#define ZONE_o37 0x1 +#define ZONE_yuka 0x0 + diff --git a/include/mapfs/sam_08_shape.h b/include/mapfs/sam_08_shape.h index 4b5b3719a7..b9dee56c8c 100644 --- a/include/mapfs/sam_08_shape.h +++ b/include/mapfs/sam_08_shape.h @@ -1,26 +1,27 @@ -#define MODEL_Root 0x19 -#define MODEL_g1 0x18 -#define MODEL_move1 0x17 -#define MODEL_m1_kabe 0x16 -#define MODEL_m1_yuka 0x15 -#define MODEL_Default 0x14 -#define MODEL_iwa1 0x13 -#define MODEL_kabe1 0x12 -#define MODEL_futi 0x11 -#define MODEL_iwa4 0x10 -#define MODEL_iwa3 0xF -#define MODEL_yuka 0xE -#define MODEL_kai_kabe 0xD -#define MODEL_iwa2 0xC -#define MODEL_g12 0xB -#define MODEL_kabe3 0xA -#define MODEL_iwa7 0x9 -#define MODEL_kabe2 0x8 -#define MODEL_iwa6 0x7 -#define MODEL_iwa5 0x6 -#define MODEL_exite 0x5 -#define MODEL_o20 0x4 -#define MODEL_o19 0x3 -#define MODEL_exitw 0x2 -#define MODEL_o18 0x1 -#define MODEL_o17 0x0 +#define MODEL_Root 0x19 +#define MODEL_g1 0x18 +#define MODEL_move1 0x17 +#define MODEL_m1_kabe 0x16 +#define MODEL_m1_yuka 0x15 +#define MODEL_Default 0x14 +#define MODEL_iwa1 0x13 +#define MODEL_kabe1 0x12 +#define MODEL_futi 0x11 +#define MODEL_iwa4 0x10 +#define MODEL_iwa3 0xF +#define MODEL_yuka 0xE +#define MODEL_kai_kabe 0xD +#define MODEL_iwa2 0xC +#define MODEL_g12 0xB +#define MODEL_kabe3 0xA +#define MODEL_iwa7 0x9 +#define MODEL_kabe2 0x8 +#define MODEL_iwa6 0x7 +#define MODEL_iwa5 0x6 +#define MODEL_exite 0x5 +#define MODEL_o20 0x4 +#define MODEL_o19 0x3 +#define MODEL_exitw 0x2 +#define MODEL_o18 0x1 +#define MODEL_o17 0x0 + diff --git a/include/mapfs/sam_09_hit.h b/include/mapfs/sam_09_hit.h index 13e2e4b186..a3d410ecd2 100644 --- a/include/mapfs/sam_09_hit.h +++ b/include/mapfs/sam_09_hit.h @@ -1,25 +1,35 @@ -#define COLLIDER_Root 0x18 -#define COLLIDER_g1 0x17 -#define COLLIDER_move3 0x16 -#define COLLIDER_o53 0x15 -#define COLLIDER_move2 0x14 -#define COLLIDER_o54 0x13 -#define COLLIDER_move1 0x12 -#define COLLIDER_o55 0x11 -#define COLLIDER_exite 0x10 -#define COLLIDER_tte 0xF -#define COLLIDER_ne 0xE -#define COLLIDER_deilie 0xD -#define COLLIDER_deilite 0xC -#define COLLIDER_exitw 0xB -#define COLLIDER_ttw 0xA -#define COLLIDER_nw 0x9 -#define COLLIDER_deiliw 0x8 -#define COLLIDER_deilitw 0x7 -#define COLLIDER_Default 0x6 -#define COLLIDER_o59 0x5 -#define COLLIDER_hako 0x4 -#define COLLIDER_ten 0x3 -#define COLLIDER_iwa2 0x2 -#define COLLIDER_kabe1 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x18 +#define COLLIDER_g1 0x17 +#define COLLIDER_move3 0x16 +#define COLLIDER_o53 0x15 +#define COLLIDER_move2 0x14 +#define COLLIDER_o54 0x13 +#define COLLIDER_move1 0x12 +#define COLLIDER_o55 0x11 +#define COLLIDER_exite 0x10 +#define COLLIDER_tte 0xF +#define COLLIDER_ne 0xE +#define COLLIDER_deilie 0xD +#define COLLIDER_deilite 0xC +#define COLLIDER_exitw 0xB +#define COLLIDER_ttw 0xA +#define COLLIDER_nw 0x9 +#define COLLIDER_deiliw 0x8 +#define COLLIDER_deilitw 0x7 +#define COLLIDER_Default 0x6 +#define COLLIDER_o59 0x5 +#define COLLIDER_hako 0x4 +#define COLLIDER_ten 0x3 +#define COLLIDER_iwa2 0x2 +#define COLLIDER_kabe1 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x7 +#define ZONE_g1 0x6 +#define ZONE_exite 0x5 +#define ZONE_o19 0x4 +#define ZONE_exitw 0x3 +#define ZONE_o17 0x2 +#define ZONE_Default 0x1 +#define ZONE_yuka 0x0 + diff --git a/include/mapfs/sam_09_shape.h b/include/mapfs/sam_09_shape.h index 1693b99644..876fabf1aa 100644 --- a/include/mapfs/sam_09_shape.h +++ b/include/mapfs/sam_09_shape.h @@ -1,27 +1,28 @@ -#define MODEL_Root 0x1A -#define MODEL_g1 0x19 -#define MODEL_move3 0x18 -#define MODEL_m3_kabe 0x17 -#define MODEL_move2 0x16 -#define MODEL_m2_kabe 0x15 -#define MODEL_move1 0x14 -#define MODEL_m1_kabe 0x13 -#define MODEL_exite 0x12 -#define MODEL_o20 0x11 -#define MODEL_o19 0x10 -#define MODEL_exitw 0xF -#define MODEL_o18 0xE -#define MODEL_o17 0xD -#define MODEL_g2 0xC -#define MODEL_hasira 0xB -#define MODEL_ten3 0xA -#define MODEL_ten2 0x9 -#define MODEL_ten 0x8 -#define MODEL_Default 0x7 -#define MODEL_hako 0x6 -#define MODEL_iwa2 0x5 -#define MODEL_kabe1 0x4 -#define MODEL_futi 0x3 -#define MODEL_yuka 0x2 -#define MODEL_oku 0x1 -#define MODEL_o_kabe 0x0 +#define MODEL_Root 0x1A +#define MODEL_g1 0x19 +#define MODEL_move3 0x18 +#define MODEL_m3_kabe 0x17 +#define MODEL_move2 0x16 +#define MODEL_m2_kabe 0x15 +#define MODEL_move1 0x14 +#define MODEL_m1_kabe 0x13 +#define MODEL_exite 0x12 +#define MODEL_o20 0x11 +#define MODEL_o19 0x10 +#define MODEL_exitw 0xF +#define MODEL_o18 0xE +#define MODEL_o17 0xD +#define MODEL_g2 0xC +#define MODEL_hasira 0xB +#define MODEL_ten3 0xA +#define MODEL_ten2 0x9 +#define MODEL_ten 0x8 +#define MODEL_Default 0x7 +#define MODEL_hako 0x6 +#define MODEL_iwa2 0x5 +#define MODEL_kabe1 0x4 +#define MODEL_futi 0x3 +#define MODEL_yuka 0x2 +#define MODEL_oku 0x1 +#define MODEL_o_kabe 0x0 + diff --git a/include/mapfs/sam_10_hit.h b/include/mapfs/sam_10_hit.h index 57ca724c5c..c6e52eb574 100644 --- a/include/mapfs/sam_10_hit.h +++ b/include/mapfs/sam_10_hit.h @@ -1,48 +1,74 @@ -#define COLLIDER_Root 0x2F -#define COLLIDER_g21 0x2E -#define COLLIDER_o89 0x2D -#define COLLIDER_g19 0x2C -#define COLLIDER_o61 0x2B -#define COLLIDER_ana 0x2A -#define COLLIDER_na 0x29 -#define COLLIDER_tta 0x28 -#define COLLIDER_deilia 0x27 -#define COLLIDER_deilita 0x26 -#define COLLIDER_move2 0x25 -#define COLLIDER_o76 0x24 -#define COLLIDER_o75 0x23 -#define COLLIDER_m2_kabe 0x22 -#define COLLIDER_o69 0x21 -#define COLLIDER_o68 0x20 -#define COLLIDER_o70 0x1F -#define COLLIDER_o67 0x1E -#define COLLIDER_o74 0x1D -#define COLLIDER_o73 0x1C -#define COLLIDER_m2_yuka 0x1B -#define COLLIDER_o72 0x1A -#define COLLIDER_o71 0x19 -#define COLLIDER_move1 0x18 -#define COLLIDER_m1_kabe 0x17 -#define COLLIDER_Default 0x16 -#define COLLIDER_iwa2 0x15 -#define COLLIDER_o47 0x14 -#define COLLIDER_o84 0x13 -#define COLLIDER_o81 0x12 -#define COLLIDER_o83 0x11 -#define COLLIDER_o79 0x10 -#define COLLIDER_o88 0xF -#define COLLIDER_o80 0xE -#define COLLIDER_o87 0xD -#define COLLIDER_o86 0xC -#define COLLIDER_kabe1 0xB -#define COLLIDER_yuka 0xA -#define COLLIDER_exite 0x9 -#define COLLIDER_tte 0x8 -#define COLLIDER_ne 0x7 -#define COLLIDER_deilie 0x6 -#define COLLIDER_deilite 0x5 -#define COLLIDER_exitw 0x4 -#define COLLIDER_ttw 0x3 -#define COLLIDER_nw 0x2 -#define COLLIDER_deiliw 0x1 -#define COLLIDER_deilitw 0x0 +#define COLLIDER_Root 0x2F +#define COLLIDER_g21 0x2E +#define COLLIDER_o89 0x2D +#define COLLIDER_g19 0x2C +#define COLLIDER_o61 0x2B +#define COLLIDER_ana 0x2A +#define COLLIDER_na 0x29 +#define COLLIDER_tta 0x28 +#define COLLIDER_deilia 0x27 +#define COLLIDER_deilita 0x26 +#define COLLIDER_move2 0x25 +#define COLLIDER_o76 0x24 +#define COLLIDER_o75 0x23 +#define COLLIDER_m2_kabe 0x22 +#define COLLIDER_o69 0x21 +#define COLLIDER_o68 0x20 +#define COLLIDER_o70 0x1F +#define COLLIDER_o67 0x1E +#define COLLIDER_o74 0x1D +#define COLLIDER_o73 0x1C +#define COLLIDER_m2_yuka 0x1B +#define COLLIDER_o72 0x1A +#define COLLIDER_o71 0x19 +#define COLLIDER_move1 0x18 +#define COLLIDER_m1_kabe 0x17 +#define COLLIDER_Default 0x16 +#define COLLIDER_iwa2 0x15 +#define COLLIDER_o47 0x14 +#define COLLIDER_o84 0x13 +#define COLLIDER_o81 0x12 +#define COLLIDER_o83 0x11 +#define COLLIDER_o79 0x10 +#define COLLIDER_o88 0xF +#define COLLIDER_o80 0xE +#define COLLIDER_o87 0xD +#define COLLIDER_o86 0xC +#define COLLIDER_kabe1 0xB +#define COLLIDER_yuka 0xA +#define COLLIDER_exite 0x9 +#define COLLIDER_tte 0x8 +#define COLLIDER_ne 0x7 +#define COLLIDER_deilie 0x6 +#define COLLIDER_deilite 0x5 +#define COLLIDER_exitw 0x4 +#define COLLIDER_ttw 0x3 +#define COLLIDER_nw 0x2 +#define COLLIDER_deiliw 0x1 +#define COLLIDER_deilitw 0x0 + +#define ZONE_Root 0x17 +#define ZONE_i 0x16 +#define ZONE_i3 0x15 +#define ZONE_h 0x14 +#define ZONE_h3 0x13 +#define ZONE_g 0x12 +#define ZONE_g3 0x11 +#define ZONE_g2 0x10 +#define ZONE_f 0xF +#define ZONE_f2 0xE +#define ZONE_e 0xD +#define ZONE_e2 0xC +#define ZONE_e1 0xB +#define ZONE_d 0xA +#define ZONE_d2 0x9 +#define ZONE_d1 0x8 +#define ZONE_c 0x7 +#define ZONE_c1 0x6 +#define ZONE_b 0x5 +#define ZONE_b1 0x4 +#define ZONE_a 0x3 +#define ZONE_a3 0x2 +#define ZONE_a2 0x1 +#define ZONE_a1 0x0 + diff --git a/include/mapfs/sam_10_shape.h b/include/mapfs/sam_10_shape.h index 6cbbeecc7b..5d8b149847 100644 --- a/include/mapfs/sam_10_shape.h +++ b/include/mapfs/sam_10_shape.h @@ -1,142 +1,143 @@ -#define MODEL_Root 0x8D -#define MODEL_g51 0x8C -#define MODEL_star 0x8B -#define MODEL_kouri 0x8A -#define MODEL_ana 0x89 -#define MODEL_a_hibi 0x88 -#define MODEL_a_kabe 0x87 -#define MODEL_g1 0x86 -#define MODEL_g14 0x85 -#define MODEL_o52 0x84 -#define MODEL_o48 0x83 -#define MODEL_o47 0x82 -#define MODEL_o46 0x81 -#define MODEL_move2 0x80 -#define MODEL_30 0x7F -#define MODEL_30k 0x7E -#define MODEL_30y 0x7D -#define MODEL_29 0x7C -#define MODEL_29k 0x7B -#define MODEL_29y 0x7A -#define MODEL_28 0x79 -#define MODEL_28k 0x78 -#define MODEL_28y 0x77 -#define MODEL_27 0x76 -#define MODEL_27k 0x75 -#define MODEL_27y 0x74 -#define MODEL_26 0x73 -#define MODEL_26k 0x72 -#define MODEL_26y 0x71 -#define MODEL_25 0x70 -#define MODEL_25k 0x6F -#define MODEL_25y 0x6E -#define MODEL_24 0x6D -#define MODEL_24k 0x6C -#define MODEL_24y 0x6B -#define MODEL_23 0x6A -#define MODEL_23k 0x69 -#define MODEL_23y 0x68 -#define MODEL_22 0x67 -#define MODEL_22k 0x66 -#define MODEL_22y 0x65 -#define MODEL_21 0x64 -#define MODEL_21k 0x63 -#define MODEL_21y 0x62 -#define MODEL_20 0x61 -#define MODEL_20k 0x60 -#define MODEL_20y 0x5F -#define MODEL_19 0x5E -#define MODEL_19k 0x5D -#define MODEL_19y 0x5C -#define MODEL_18 0x5B -#define MODEL_18k 0x5A -#define MODEL_18y 0x59 -#define MODEL_17 0x58 -#define MODEL_17k 0x57 -#define MODEL_17y 0x56 -#define MODEL_16 0x55 -#define MODEL_16k 0x54 -#define MODEL_16y 0x53 -#define MODEL_15 0x52 -#define MODEL_15k 0x51 -#define MODEL_15y 0x50 -#define MODEL_14 0x4F -#define MODEL_14k 0x4E -#define MODEL_14y 0x4D -#define MODEL_13 0x4C -#define MODEL_13k 0x4B -#define MODEL_13y 0x4A -#define MODEL_12 0x49 -#define MODEL_12k 0x48 -#define MODEL_12y 0x47 -#define MODEL_11 0x46 -#define MODEL_11k 0x45 -#define MODEL_11y 0x44 -#define MODEL_10 0x43 -#define MODEL_10k 0x42 -#define MODEL_10y 0x41 -#define MODEL_9 0x40 -#define MODEL_9k 0x3F -#define MODEL_9y 0x3E -#define MODEL_8 0x3D -#define MODEL_8k 0x3C -#define MODEL_8y 0x3B -#define MODEL_7 0x3A -#define MODEL_7k 0x39 -#define MODEL_7y 0x38 -#define MODEL_6 0x37 -#define MODEL_6k 0x36 -#define MODEL_6y 0x35 -#define MODEL_5 0x34 -#define MODEL_5k 0x33 -#define MODEL_5y 0x32 -#define MODEL_4 0x31 -#define MODEL_4k 0x30 -#define MODEL_4y 0x2F -#define MODEL_3 0x2E -#define MODEL_3k 0x2D -#define MODEL_3y 0x2C -#define MODEL_2 0x2B -#define MODEL_2k 0x2A -#define MODEL_2y 0x29 -#define MODEL_1 0x28 -#define MODEL_1k 0x27 -#define MODEL_1y 0x26 -#define MODEL_move3 0x25 -#define MODEL_m3_kabe 0x24 -#define MODEL_m3_yuka 0x23 -#define MODEL_m3_kabeb2 0x22 -#define MODEL_m3_yuka2 0x21 -#define MODEL_m3_kabe4 0x20 -#define MODEL_m3_yuka4 0x1F -#define MODEL_m3_kabe3 0x1E -#define MODEL_move1 0x1D -#define MODEL_m1_yuka 0x1C -#define MODEL_m1_kabe 0x1B -#define MODEL_g76 0x1A -#define MODEL_a_oku 0x19 -#define MODEL_a_yuka 0x18 -#define MODEL_exite 0x17 -#define MODEL_ne 0x16 -#define MODEL_deilie 0x15 -#define MODEL_exitw 0x14 -#define MODEL_nw 0x13 -#define MODEL_deiliw 0x12 -#define MODEL_Default 0x11 -#define MODEL_iwa6 0x10 -#define MODEL_iwa4 0xF -#define MODEL_iwa3 0xE -#define MODEL_iwa2 0xD -#define MODEL_kai_kabe 0xC -#define MODEL_kabe1 0xB -#define MODEL_futi 0xA -#define MODEL_yuka 0x9 -#define MODEL_g75 0x8 -#define MODEL_iwa5 0x7 -#define MODEL_o231 0x6 -#define MODEL_o229 0x5 -#define MODEL_g74 0x4 -#define MODEL_iwa1 0x3 -#define MODEL_o225 0x2 -#define MODEL_o145 0x1 -#define MODEL_o50 0x0 +#define MODEL_Root 0x8D +#define MODEL_g51 0x8C +#define MODEL_star 0x8B +#define MODEL_kouri 0x8A +#define MODEL_ana 0x89 +#define MODEL_a_hibi 0x88 +#define MODEL_a_kabe 0x87 +#define MODEL_g1 0x86 +#define MODEL_g14 0x85 +#define MODEL_o52 0x84 +#define MODEL_o48 0x83 +#define MODEL_o47 0x82 +#define MODEL_o46 0x81 +#define MODEL_move2 0x80 +#define MODEL_30 0x7F +#define MODEL_30k 0x7E +#define MODEL_30y 0x7D +#define MODEL_29 0x7C +#define MODEL_29k 0x7B +#define MODEL_29y 0x7A +#define MODEL_28 0x79 +#define MODEL_28k 0x78 +#define MODEL_28y 0x77 +#define MODEL_27 0x76 +#define MODEL_27k 0x75 +#define MODEL_27y 0x74 +#define MODEL_26 0x73 +#define MODEL_26k 0x72 +#define MODEL_26y 0x71 +#define MODEL_25 0x70 +#define MODEL_25k 0x6F +#define MODEL_25y 0x6E +#define MODEL_24 0x6D +#define MODEL_24k 0x6C +#define MODEL_24y 0x6B +#define MODEL_23 0x6A +#define MODEL_23k 0x69 +#define MODEL_23y 0x68 +#define MODEL_22 0x67 +#define MODEL_22k 0x66 +#define MODEL_22y 0x65 +#define MODEL_21 0x64 +#define MODEL_21k 0x63 +#define MODEL_21y 0x62 +#define MODEL_20 0x61 +#define MODEL_20k 0x60 +#define MODEL_20y 0x5F +#define MODEL_19 0x5E +#define MODEL_19k 0x5D +#define MODEL_19y 0x5C +#define MODEL_18 0x5B +#define MODEL_18k 0x5A +#define MODEL_18y 0x59 +#define MODEL_17 0x58 +#define MODEL_17k 0x57 +#define MODEL_17y 0x56 +#define MODEL_16 0x55 +#define MODEL_16k 0x54 +#define MODEL_16y 0x53 +#define MODEL_15 0x52 +#define MODEL_15k 0x51 +#define MODEL_15y 0x50 +#define MODEL_14 0x4F +#define MODEL_14k 0x4E +#define MODEL_14y 0x4D +#define MODEL_13 0x4C +#define MODEL_13k 0x4B +#define MODEL_13y 0x4A +#define MODEL_12 0x49 +#define MODEL_12k 0x48 +#define MODEL_12y 0x47 +#define MODEL_11 0x46 +#define MODEL_11k 0x45 +#define MODEL_11y 0x44 +#define MODEL_10 0x43 +#define MODEL_10k 0x42 +#define MODEL_10y 0x41 +#define MODEL_9 0x40 +#define MODEL_9k 0x3F +#define MODEL_9y 0x3E +#define MODEL_8 0x3D +#define MODEL_8k 0x3C +#define MODEL_8y 0x3B +#define MODEL_7 0x3A +#define MODEL_7k 0x39 +#define MODEL_7y 0x38 +#define MODEL_6 0x37 +#define MODEL_6k 0x36 +#define MODEL_6y 0x35 +#define MODEL_5 0x34 +#define MODEL_5k 0x33 +#define MODEL_5y 0x32 +#define MODEL_4 0x31 +#define MODEL_4k 0x30 +#define MODEL_4y 0x2F +#define MODEL_3 0x2E +#define MODEL_3k 0x2D +#define MODEL_3y 0x2C +#define MODEL_2 0x2B +#define MODEL_2k 0x2A +#define MODEL_2y 0x29 +#define MODEL_1 0x28 +#define MODEL_1k 0x27 +#define MODEL_1y 0x26 +#define MODEL_move3 0x25 +#define MODEL_m3_kabe 0x24 +#define MODEL_m3_yuka 0x23 +#define MODEL_m3_kabeb2 0x22 +#define MODEL_m3_yuka2 0x21 +#define MODEL_m3_kabe4 0x20 +#define MODEL_m3_yuka4 0x1F +#define MODEL_m3_kabe3 0x1E +#define MODEL_move1 0x1D +#define MODEL_m1_yuka 0x1C +#define MODEL_m1_kabe 0x1B +#define MODEL_g76 0x1A +#define MODEL_a_oku 0x19 +#define MODEL_a_yuka 0x18 +#define MODEL_exite 0x17 +#define MODEL_ne 0x16 +#define MODEL_deilie 0x15 +#define MODEL_exitw 0x14 +#define MODEL_nw 0x13 +#define MODEL_deiliw 0x12 +#define MODEL_Default 0x11 +#define MODEL_iwa6 0x10 +#define MODEL_iwa4 0xF +#define MODEL_iwa3 0xE +#define MODEL_iwa2 0xD +#define MODEL_kai_kabe 0xC +#define MODEL_kabe1 0xB +#define MODEL_futi 0xA +#define MODEL_yuka 0x9 +#define MODEL_g75 0x8 +#define MODEL_iwa5 0x7 +#define MODEL_o231 0x6 +#define MODEL_o229 0x5 +#define MODEL_g74 0x4 +#define MODEL_iwa1 0x3 +#define MODEL_o225 0x2 +#define MODEL_o145 0x1 +#define MODEL_o50 0x0 + diff --git a/include/mapfs/sam_11_hit.h b/include/mapfs/sam_11_hit.h index d683be76db..4b6a301c9e 100644 --- a/include/mapfs/sam_11_hit.h +++ b/include/mapfs/sam_11_hit.h @@ -1,81 +1,96 @@ -#define COLLIDER_Root 0x50 -#define COLLIDER_g280 0x4F -#define COLLIDER_o663 0x4E -#define COLLIDER_o662 0x4D -#define COLLIDER_o661 0x4C -#define COLLIDER_o660 0x4B -#define COLLIDER_o658 0x4A -#define COLLIDER_o657 0x49 -#define COLLIDER_monban 0x48 -#define COLLIDER_o621 0x47 -#define COLLIDER_g189 0x46 -#define COLLIDER_o683 0x45 -#define COLLIDER_pnori 0x44 -#define COLLIDER_deilitp 0x43 -#define COLLIDER_o356 0x42 -#define COLLIDER_g50 0x41 -#define COLLIDER_suimen 0x40 -#define COLLIDER_mon 0x3F -#define COLLIDER_o579 0x3E -#define COLLIDER_tumori 0x3D -#define COLLIDER_saku 0x3C -#define COLLIDER_ki 0x3B -#define COLLIDER_miki5 0x3A -#define COLLIDER_miki4 0x39 -#define COLLIDER_o653 0x38 -#define COLLIDER_sou 0x37 -#define COLLIDER_s_tou 0x36 -#define COLLIDER_o571 0x35 -#define COLLIDER_o570 0x34 -#define COLLIDER_s_naiso 0x33 -#define COLLIDER_o643 0x32 -#define COLLIDER_o626 0x31 -#define COLLIDER_sn_isu2 0x30 -#define COLLIDER_sn_isu1 0x2F -#define COLLIDER_sn_hako 0x2E -#define COLLIDER_sn_yuka2 0x2D -#define COLLIDER_sn_kabe 0x2C -#define COLLIDER_s_doa 0x2B -#define COLLIDER_o591 0x2A -#define COLLIDER_o540 0x29 -#define COLLIDER_s_noki 0x28 -#define COLLIDER_s_kabe 0x27 -#define COLLIDER_gon 0x26 -#define COLLIDER_g_yuka 0x25 -#define COLLIDER_g_doa 0x24 -#define COLLIDER_o590 0x23 -#define COLLIDER_o541 0x22 -#define COLLIDER_g_naiso 0x21 -#define COLLIDER_isu 0x20 -#define COLLIDER_ana 0x1F -#define COLLIDER_g_kai 0x1E -#define COLLIDER_o525 0x1D -#define COLLIDER_gn_dan 0x1C -#define COLLIDER_kagu2 0x1B -#define COLLIDER_kagu1 0x1A -#define COLLIDER_gn_yuka 0x19 -#define COLLIDER_gn_hasi 0x18 -#define COLLIDER_gn_kabe 0x17 -#define COLLIDER_g_noki 0x16 -#define COLLIDER_g_yuki1 0x15 -#define COLLIDER_g_yuki2 0x14 -#define COLLIDER_g_kabe 0x13 -#define COLLIDER_g10 0x12 -#define COLLIDER_ike 0x11 -#define COLLIDER_o681 0x10 -#define COLLIDER_o682 0xF -#define COLLIDER_o578 0xE -#define COLLIDER_o634 0xD -#define COLLIDER_o596 0xC -#define COLLIDER_o678 0xB -#define COLLIDER_o664 0xA -#define COLLIDER_o677 0x9 -#define COLLIDER_o595 0x8 -#define COLLIDER_exite 0x7 -#define COLLIDER_ne 0x6 -#define COLLIDER_deilie 0x5 -#define COLLIDER_deilite 0x4 -#define COLLIDER_exitw 0x3 -#define COLLIDER_nw 0x2 -#define COLLIDER_deiliw 0x1 -#define COLLIDER_deilitw 0x0 +#define COLLIDER_Root 0x50 +#define COLLIDER_g280 0x4F +#define COLLIDER_o663 0x4E +#define COLLIDER_o662 0x4D +#define COLLIDER_o661 0x4C +#define COLLIDER_o660 0x4B +#define COLLIDER_o658 0x4A +#define COLLIDER_o657 0x49 +#define COLLIDER_monban 0x48 +#define COLLIDER_o621 0x47 +#define COLLIDER_g189 0x46 +#define COLLIDER_o683 0x45 +#define COLLIDER_pnori 0x44 +#define COLLIDER_deilitp 0x43 +#define COLLIDER_o356 0x42 +#define COLLIDER_g50 0x41 +#define COLLIDER_suimen 0x40 +#define COLLIDER_mon 0x3F +#define COLLIDER_o579 0x3E +#define COLLIDER_tumori 0x3D +#define COLLIDER_saku 0x3C +#define COLLIDER_ki 0x3B +#define COLLIDER_miki5 0x3A +#define COLLIDER_miki4 0x39 +#define COLLIDER_o653 0x38 +#define COLLIDER_sou 0x37 +#define COLLIDER_s_tou 0x36 +#define COLLIDER_o571 0x35 +#define COLLIDER_o570 0x34 +#define COLLIDER_s_naiso 0x33 +#define COLLIDER_o643 0x32 +#define COLLIDER_o626 0x31 +#define COLLIDER_sn_isu2 0x30 +#define COLLIDER_sn_isu1 0x2F +#define COLLIDER_sn_hako 0x2E +#define COLLIDER_sn_yuka2 0x2D +#define COLLIDER_sn_kabe 0x2C +#define COLLIDER_s_doa 0x2B +#define COLLIDER_o591 0x2A +#define COLLIDER_o540 0x29 +#define COLLIDER_s_noki 0x28 +#define COLLIDER_s_kabe 0x27 +#define COLLIDER_gon 0x26 +#define COLLIDER_g_yuka 0x25 +#define COLLIDER_g_doa 0x24 +#define COLLIDER_o590 0x23 +#define COLLIDER_o541 0x22 +#define COLLIDER_g_naiso 0x21 +#define COLLIDER_isu 0x20 +#define COLLIDER_ana 0x1F +#define COLLIDER_g_kai 0x1E +#define COLLIDER_o525 0x1D +#define COLLIDER_gn_dan 0x1C +#define COLLIDER_kagu2 0x1B +#define COLLIDER_kagu1 0x1A +#define COLLIDER_gn_yuka 0x19 +#define COLLIDER_gn_hasi 0x18 +#define COLLIDER_gn_kabe 0x17 +#define COLLIDER_g_noki 0x16 +#define COLLIDER_g_yuki1 0x15 +#define COLLIDER_g_yuki2 0x14 +#define COLLIDER_g_kabe 0x13 +#define COLLIDER_g10 0x12 +#define COLLIDER_ike 0x11 +#define COLLIDER_o681 0x10 +#define COLLIDER_o682 0xF +#define COLLIDER_o578 0xE +#define COLLIDER_o634 0xD +#define COLLIDER_o596 0xC +#define COLLIDER_o678 0xB +#define COLLIDER_o664 0xA +#define COLLIDER_o677 0x9 +#define COLLIDER_o595 0x8 +#define COLLIDER_exite 0x7 +#define COLLIDER_ne 0x6 +#define COLLIDER_deilie 0x5 +#define COLLIDER_deilite 0x4 +#define COLLIDER_exitw 0x3 +#define COLLIDER_nw 0x2 +#define COLLIDER_deiliw 0x1 +#define COLLIDER_deilitw 0x0 + +#define ZONE_Root 0xC +#define ZONE_Default 0xB +#define ZONE_y3 0xA +#define ZONE_y2 0x9 +#define ZONE_y1 0x8 +#define ZONE_g50 0x7 +#define ZONE_sou 0x6 +#define ZONE_gon2 0x5 +#define ZONE_gon 0x4 +#define ZONE_g3 0x3 +#define ZONE_s 0x2 +#define ZONE_e 0x1 +#define ZONE_w 0x0 + diff --git a/include/mapfs/sam_11_shape.h b/include/mapfs/sam_11_shape.h index 27275f2399..8c6eed6657 100644 --- a/include/mapfs/sam_11_shape.h +++ b/include/mapfs/sam_11_shape.h @@ -1,198 +1,199 @@ -#define MODEL_Root 0xC5 -#define MODEL_ice 0xC4 -#define MODEL_ice04 0xC3 -#define MODEL_i0429 0xC2 -#define MODEL_i0428 0xC1 -#define MODEL_i0427 0xC0 -#define MODEL_i0426 0xBF -#define MODEL_i0425 0xBE -#define MODEL_i0424 0xBD -#define MODEL_i0423 0xBC -#define MODEL_i0422 0xBB -#define MODEL_i0421 0xBA -#define MODEL_i0420 0xB9 -#define MODEL_i0419 0xB8 -#define MODEL_i0418 0xB7 -#define MODEL_i0417 0xB6 -#define MODEL_i0416 0xB5 -#define MODEL_i0415 0xB4 -#define MODEL_i0414 0xB3 -#define MODEL_i0413 0xB2 -#define MODEL_i0412 0xB1 -#define MODEL_i0411 0xB0 -#define MODEL_i0410 0xAF -#define MODEL_i0409 0xAE -#define MODEL_i0408 0xAD -#define MODEL_i0407 0xAC -#define MODEL_i0406 0xAB -#define MODEL_i0405 0xAA -#define MODEL_i0404 0xA9 -#define MODEL_i0403 0xA8 -#define MODEL_i0402 0xA7 -#define MODEL_i0401 0xA6 -#define MODEL_ice01 0xA5 -#define MODEL_ice02 0xA4 -#define MODEL_ice03 0xA3 -#define MODEL_ice00 0xA2 -#define MODEL_sui 0xA1 -#define MODEL_o583 0xA0 -#define MODEL_o774 0x9F -#define MODEL_ike 0x9E -#define MODEL_o578 0x9D -#define MODEL_o855 0x9C -#define MODEL_o854 0x9B -#define MODEL_o562 0x9A -#define MODEL_g279 0x99 -#define MODEL_o780 0x98 -#define MODEL_o779 0x97 -#define MODEL_o778 0x96 -#define MODEL_o777 0x95 -#define MODEL_o775 0x94 -#define MODEL_o773 0x93 -#define MODEL_g189 0x92 -#define MODEL_o356 0x91 -#define MODEL_o355 0x90 -#define MODEL_g50 0x8F -#define MODEL_tumori 0x8E -#define MODEL_saku 0x8D -#define MODEL_ki 0x8C -#define MODEL_o563 0x8B -#define MODEL_miki5 0x8A -#define MODEL_miki4 0x89 -#define MODEL_miki3 0x88 -#define MODEL_o558 0x87 -#define MODEL_miki2 0x86 -#define MODEL_o190 0x85 -#define MODEL_o189 0x84 -#define MODEL_o186 0x83 -#define MODEL_o192 0x82 -#define MODEL_sou 0x81 -#define MODEL_s_tou 0x80 -#define MODEL_st_y2 0x7F -#define MODEL_st_y1 0x7E -#define MODEL_st_hasi 0x7D -#define MODEL_st_kabe 0x7C -#define MODEL_s_naiso 0x7B -#define MODEL_sn_book1 0x7A -#define MODEL_sn_book2 0x79 -#define MODEL_sn_suk 0x78 -#define MODEL_sn_tan2 0x77 -#define MODEL_s_hako2 0x76 -#define MODEL_sn_hako 0x75 -#define MODEL_sn_bin1 0x74 -#define MODEL_sn_bin2 0x73 -#define MODEL_sn_tan1 0x72 -#define MODEL_sn_isu2 0x71 -#define MODEL_sn_isu1 0x70 -#define MODEL_sn_hako1 0x6F -#define MODEL_sn_saku 0x6E -#define MODEL_sn_yuka2 0x6D -#define MODEL_sn_yuka1 0x6C -#define MODEL_sn_hasi 0x6B -#define MODEL_g285 0x6A -#define MODEL_sn_kai 0x69 -#define MODEL_o874 0x68 -#define MODEL_sn_mado 0x67 -#define MODEL_sn_kabe 0x66 -#define MODEL_sn_waku 0x65 -#define MODEL_s_doa 0x64 -#define MODEL_o540 0x63 -#define MODEL_s_ue 0x62 -#define MODEL_su_k 0x61 -#define MODEL_su_h 0x60 -#define MODEL_su_m 0x5F -#define MODEL_s_sita 0x5E -#define MODEL_ss_k 0x5D -#define MODEL_s_noki 0x5C -#define MODEL_ss_h 0x5B -#define MODEL_ss_w 0x5A -#define MODEL_ss_m 0x59 -#define MODEL_s_yuki2 0x58 -#define MODEL_s_yuki 0x57 -#define MODEL_s_waku 0x56 -#define MODEL_s_mado 0x55 -#define MODEL_s_hasi 0x54 -#define MODEL_s_kabe 0x53 -#define MODEL_gon 0x52 -#define MODEL_g_doa 0x51 -#define MODEL_o541 0x50 -#define MODEL_g_sita 0x4F -#define MODEL_gs_k 0x4E -#define MODEL_gs_m 0x4D -#define MODEL_gs_w 0x4C -#define MODEL_gs_h 0x4B -#define MODEL_g_noki 0x4A -#define MODEL_g_ue 0x49 -#define MODEL_gu_k 0x48 -#define MODEL_gu_h 0x47 -#define MODEL_gu_m 0x46 -#define MODEL_g_naiso 0x45 -#define MODEL_gomi 0x44 -#define MODEL_bn_kami 0x43 -#define MODEL_kami6 0x42 -#define MODEL_kami2 0x41 -#define MODEL_kami1 0x40 -#define MODEL_gn_book 0x3F -#define MODEL_gn_book5 0x3E -#define MODEL_gn_book4 0x3D -#define MODEL_gn_book2 0x3C -#define MODEL_ranpu 0x3B -#define MODEL_g_kai 0x3A -#define MODEL_o733 0x39 -#define MODEL_g275 0x38 -#define MODEL_o732 0x37 -#define MODEL_g274 0x36 -#define MODEL_o731 0x35 -#define MODEL_g_kai2 0x34 -#define MODEL_o730 0x33 -#define MODEL_g_kai1 0x32 -#define MODEL_o729 0x31 -#define MODEL_g277 0x30 -#define MODEL_o769 0x2F -#define MODEL_ana 0x2E -#define MODEL_gn_kuro 0x2D -#define MODEL_gn_asi 0x2C -#define MODEL_gn_isu2 0x2B -#define MODEL_gn_isu1 0x2A -#define MODEL_gn_dan3 0x29 -#define MODEL_gn_dan2 0x28 -#define MODEL_gn_dan1 0x27 -#define MODEL_g286 0x26 -#define MODEL_kami4 0x25 -#define MODEL_kami3 0x24 -#define MODEL_gn_yuka1 0x23 -#define MODEL_gn_hasi 0x22 -#define MODEL_g284 0x21 -#define MODEL_kami5 0x20 -#define MODEL_o863 0x1F -#define MODEL_o862 0x1E -#define MODEL_o861 0x1D -#define MODEL_gn_book1 0x1C -#define MODEL_gn_book3 0x1B -#define MODEL_gn_bin2 0x1A -#define MODEL_gn_bin1 0x19 -#define MODEL_gn_tan3 0x18 -#define MODEL_gn_tan2 0x17 -#define MODEL_gn_tan1 0x16 -#define MODEL_gn_tan4 0x15 -#define MODEL_gn_e 0x14 -#define MODEL_gn_toda 0x13 -#define MODEL_gn_yuka2 0x12 -#define MODEL_gn_mado 0x11 -#define MODEL_gn_waku 0x10 -#define MODEL_gn_kabe 0xF -#define MODEL_o867 0xE -#define MODEL_g_yuki2 0xD -#define MODEL_g_yuki1 0xC -#define MODEL_g_hasi 0xB -#define MODEL_g_waku 0xA -#define MODEL_g_mado 0x9 -#define MODEL_g_kabe 0x8 -#define MODEL_g10 0x7 -#define MODEL_mon2 0x6 -#define MODEL_mon1 0x5 -#define MODEL_road 0x4 -#define MODEL_waku 0x3 -#define MODEL_exitdai 0x2 -#define MODEL_ground2 0x1 -#define MODEL_ground 0x0 +#define MODEL_Root 0xC5 +#define MODEL_ice 0xC4 +#define MODEL_ice04 0xC3 +#define MODEL_i0429 0xC2 +#define MODEL_i0428 0xC1 +#define MODEL_i0427 0xC0 +#define MODEL_i0426 0xBF +#define MODEL_i0425 0xBE +#define MODEL_i0424 0xBD +#define MODEL_i0423 0xBC +#define MODEL_i0422 0xBB +#define MODEL_i0421 0xBA +#define MODEL_i0420 0xB9 +#define MODEL_i0419 0xB8 +#define MODEL_i0418 0xB7 +#define MODEL_i0417 0xB6 +#define MODEL_i0416 0xB5 +#define MODEL_i0415 0xB4 +#define MODEL_i0414 0xB3 +#define MODEL_i0413 0xB2 +#define MODEL_i0412 0xB1 +#define MODEL_i0411 0xB0 +#define MODEL_i0410 0xAF +#define MODEL_i0409 0xAE +#define MODEL_i0408 0xAD +#define MODEL_i0407 0xAC +#define MODEL_i0406 0xAB +#define MODEL_i0405 0xAA +#define MODEL_i0404 0xA9 +#define MODEL_i0403 0xA8 +#define MODEL_i0402 0xA7 +#define MODEL_i0401 0xA6 +#define MODEL_ice01 0xA5 +#define MODEL_ice02 0xA4 +#define MODEL_ice03 0xA3 +#define MODEL_ice00 0xA2 +#define MODEL_sui 0xA1 +#define MODEL_o583 0xA0 +#define MODEL_o774 0x9F +#define MODEL_ike 0x9E +#define MODEL_o578 0x9D +#define MODEL_o855 0x9C +#define MODEL_o854 0x9B +#define MODEL_o562 0x9A +#define MODEL_g279 0x99 +#define MODEL_o780 0x98 +#define MODEL_o779 0x97 +#define MODEL_o778 0x96 +#define MODEL_o777 0x95 +#define MODEL_o775 0x94 +#define MODEL_o773 0x93 +#define MODEL_g189 0x92 +#define MODEL_o356 0x91 +#define MODEL_o355 0x90 +#define MODEL_g50 0x8F +#define MODEL_tumori 0x8E +#define MODEL_saku 0x8D +#define MODEL_ki 0x8C +#define MODEL_o563 0x8B +#define MODEL_miki5 0x8A +#define MODEL_miki4 0x89 +#define MODEL_miki3 0x88 +#define MODEL_o558 0x87 +#define MODEL_miki2 0x86 +#define MODEL_o190 0x85 +#define MODEL_o189 0x84 +#define MODEL_o186 0x83 +#define MODEL_o192 0x82 +#define MODEL_sou 0x81 +#define MODEL_s_tou 0x80 +#define MODEL_st_y2 0x7F +#define MODEL_st_y1 0x7E +#define MODEL_st_hasi 0x7D +#define MODEL_st_kabe 0x7C +#define MODEL_s_naiso 0x7B +#define MODEL_sn_book1 0x7A +#define MODEL_sn_book2 0x79 +#define MODEL_sn_suk 0x78 +#define MODEL_sn_tan2 0x77 +#define MODEL_s_hako2 0x76 +#define MODEL_sn_hako 0x75 +#define MODEL_sn_bin1 0x74 +#define MODEL_sn_bin2 0x73 +#define MODEL_sn_tan1 0x72 +#define MODEL_sn_isu2 0x71 +#define MODEL_sn_isu1 0x70 +#define MODEL_sn_hako1 0x6F +#define MODEL_sn_saku 0x6E +#define MODEL_sn_yuka2 0x6D +#define MODEL_sn_yuka1 0x6C +#define MODEL_sn_hasi 0x6B +#define MODEL_g285 0x6A +#define MODEL_sn_kai 0x69 +#define MODEL_o874 0x68 +#define MODEL_sn_mado 0x67 +#define MODEL_sn_kabe 0x66 +#define MODEL_sn_waku 0x65 +#define MODEL_s_doa 0x64 +#define MODEL_o540 0x63 +#define MODEL_s_ue 0x62 +#define MODEL_su_k 0x61 +#define MODEL_su_h 0x60 +#define MODEL_su_m 0x5F +#define MODEL_s_sita 0x5E +#define MODEL_ss_k 0x5D +#define MODEL_s_noki 0x5C +#define MODEL_ss_h 0x5B +#define MODEL_ss_w 0x5A +#define MODEL_ss_m 0x59 +#define MODEL_s_yuki2 0x58 +#define MODEL_s_yuki 0x57 +#define MODEL_s_waku 0x56 +#define MODEL_s_mado 0x55 +#define MODEL_s_hasi 0x54 +#define MODEL_s_kabe 0x53 +#define MODEL_gon 0x52 +#define MODEL_g_doa 0x51 +#define MODEL_o541 0x50 +#define MODEL_g_sita 0x4F +#define MODEL_gs_k 0x4E +#define MODEL_gs_m 0x4D +#define MODEL_gs_w 0x4C +#define MODEL_gs_h 0x4B +#define MODEL_g_noki 0x4A +#define MODEL_g_ue 0x49 +#define MODEL_gu_k 0x48 +#define MODEL_gu_h 0x47 +#define MODEL_gu_m 0x46 +#define MODEL_g_naiso 0x45 +#define MODEL_gomi 0x44 +#define MODEL_bn_kami 0x43 +#define MODEL_kami6 0x42 +#define MODEL_kami2 0x41 +#define MODEL_kami1 0x40 +#define MODEL_gn_book 0x3F +#define MODEL_gn_book5 0x3E +#define MODEL_gn_book4 0x3D +#define MODEL_gn_book2 0x3C +#define MODEL_ranpu 0x3B +#define MODEL_g_kai 0x3A +#define MODEL_o733 0x39 +#define MODEL_g275 0x38 +#define MODEL_o732 0x37 +#define MODEL_g274 0x36 +#define MODEL_o731 0x35 +#define MODEL_g_kai2 0x34 +#define MODEL_o730 0x33 +#define MODEL_g_kai1 0x32 +#define MODEL_o729 0x31 +#define MODEL_g277 0x30 +#define MODEL_o769 0x2F +#define MODEL_ana 0x2E +#define MODEL_gn_kuro 0x2D +#define MODEL_gn_asi 0x2C +#define MODEL_gn_isu2 0x2B +#define MODEL_gn_isu1 0x2A +#define MODEL_gn_dan3 0x29 +#define MODEL_gn_dan2 0x28 +#define MODEL_gn_dan1 0x27 +#define MODEL_g286 0x26 +#define MODEL_kami4 0x25 +#define MODEL_kami3 0x24 +#define MODEL_gn_yuka1 0x23 +#define MODEL_gn_hasi 0x22 +#define MODEL_g284 0x21 +#define MODEL_kami5 0x20 +#define MODEL_o863 0x1F +#define MODEL_o862 0x1E +#define MODEL_o861 0x1D +#define MODEL_gn_book1 0x1C +#define MODEL_gn_book3 0x1B +#define MODEL_gn_bin2 0x1A +#define MODEL_gn_bin1 0x19 +#define MODEL_gn_tan3 0x18 +#define MODEL_gn_tan2 0x17 +#define MODEL_gn_tan1 0x16 +#define MODEL_gn_tan4 0x15 +#define MODEL_gn_e 0x14 +#define MODEL_gn_toda 0x13 +#define MODEL_gn_yuka2 0x12 +#define MODEL_gn_mado 0x11 +#define MODEL_gn_waku 0x10 +#define MODEL_gn_kabe 0xF +#define MODEL_o867 0xE +#define MODEL_g_yuki2 0xD +#define MODEL_g_yuki1 0xC +#define MODEL_g_hasi 0xB +#define MODEL_g_waku 0xA +#define MODEL_g_mado 0x9 +#define MODEL_g_kabe 0x8 +#define MODEL_g10 0x7 +#define MODEL_mon2 0x6 +#define MODEL_mon1 0x5 +#define MODEL_road 0x4 +#define MODEL_waku 0x3 +#define MODEL_exitdai 0x2 +#define MODEL_ground2 0x1 +#define MODEL_ground 0x0 + diff --git a/include/mapfs/sam_12_hit.h b/include/mapfs/sam_12_hit.h index 9b0a7916c9..6b64da31db 100644 --- a/include/mapfs/sam_12_hit.h +++ b/include/mapfs/sam_12_hit.h @@ -1,19 +1,30 @@ -#define COLLIDER_Root 0x12 -#define COLLIDER_g6 0x11 -#define COLLIDER_o23 0x10 -#define COLLIDER_g3 0xF -#define COLLIDER_ne 0xE -#define COLLIDER_deili 0xD -#define COLLIDER_deilit 0xC -#define COLLIDER_hasi 0xB -#define COLLIDER_g5 0xA -#define COLLIDER_o22 0x9 -#define COLLIDER_o21 0x8 -#define COLLIDER_o20 0x7 -#define COLLIDER_o17 0x6 -#define COLLIDER_o16 0x5 -#define COLLIDER_o15 0x4 -#define COLLIDER_g2 0x3 -#define COLLIDER_dan 0x2 -#define COLLIDER_yuka 0x1 -#define COLLIDER_kabe 0x0 +#define COLLIDER_Root 0x12 +#define COLLIDER_g6 0x11 +#define COLLIDER_o23 0x10 +#define COLLIDER_g3 0xF +#define COLLIDER_ne 0xE +#define COLLIDER_deili 0xD +#define COLLIDER_deilit 0xC +#define COLLIDER_hasi 0xB +#define COLLIDER_g5 0xA +#define COLLIDER_o22 0x9 +#define COLLIDER_o21 0x8 +#define COLLIDER_o20 0x7 +#define COLLIDER_o17 0x6 +#define COLLIDER_o16 0x5 +#define COLLIDER_o15 0x4 +#define COLLIDER_g2 0x3 +#define COLLIDER_dan 0x2 +#define COLLIDER_yuka 0x1 +#define COLLIDER_kabe 0x0 + +#define ZONE_Root 0x8 +#define ZONE_g5 0x7 +#define ZONE_r3 0x6 +#define ZONE_r2 0x5 +#define ZONE_r1 0x4 +#define ZONE_g4 0x3 +#define ZONE_l3 0x2 +#define ZONE_l2 0x1 +#define ZONE_l1 0x0 + diff --git a/include/mapfs/sam_12_shape.h b/include/mapfs/sam_12_shape.h index d8060b68f3..ce7428d34f 100644 --- a/include/mapfs/sam_12_shape.h +++ b/include/mapfs/sam_12_shape.h @@ -1,45 +1,46 @@ -#define MODEL_Root 0x2C -#define MODEL_g4 0x2B -#define MODEL_dai 0x2A -#define MODEL_hasi 0x29 -#define MODEL_o21 0x28 -#define MODEL_o20 0x27 -#define MODEL_o19 0x26 -#define MODEL_g2 0x25 -#define MODEL_kabe2 0x24 -#define MODEL_o57 0x23 -#define MODEL_o58 0x22 -#define MODEL_o60 0x21 -#define MODEL_o59 0x20 -#define MODEL_o70 0x1F -#define MODEL_o45 0x1E -#define MODEL_o48 0x1D -#define MODEL_g9 0x1C -#define MODEL_o69 0x1B -#define MODEL_o66 0x1A -#define MODEL_o65 0x19 -#define MODEL_o64 0x18 -#define MODEL_o63 0x17 -#define MODEL_o62 0x16 -#define MODEL_o61 0x15 -#define MODEL_o56 0x14 -#define MODEL_o54 0x13 -#define MODEL_o53 0x12 -#define MODEL_o52 0x11 -#define MODEL_o50 0x10 -#define MODEL_o49 0xF -#define MODEL_o47 0xE -#define MODEL_o67 0xD -#define MODEL_g11 0xC -#define MODEL_yuka 0xB -#define MODEL_dan 0xA -#define MODEL_kabe 0x9 -#define MODEL_hasi3 0x8 -#define MODEL_hasi2 0x7 -#define MODEL_hasi1 0x6 -#define MODEL_kouri 0x5 -#define MODEL_o68 0x4 -#define MODEL_o6 0x3 -#define MODEL_g10 0x2 -#define MODEL_o71 0x1 -#define MODEL_o7 0x0 +#define MODEL_Root 0x2C +#define MODEL_g4 0x2B +#define MODEL_dai 0x2A +#define MODEL_hasi 0x29 +#define MODEL_o21 0x28 +#define MODEL_o20 0x27 +#define MODEL_o19 0x26 +#define MODEL_g2 0x25 +#define MODEL_kabe2 0x24 +#define MODEL_o57 0x23 +#define MODEL_o58 0x22 +#define MODEL_o60 0x21 +#define MODEL_o59 0x20 +#define MODEL_o70 0x1F +#define MODEL_o45 0x1E +#define MODEL_o48 0x1D +#define MODEL_g9 0x1C +#define MODEL_o69 0x1B +#define MODEL_o66 0x1A +#define MODEL_o65 0x19 +#define MODEL_o64 0x18 +#define MODEL_o63 0x17 +#define MODEL_o62 0x16 +#define MODEL_o61 0x15 +#define MODEL_o56 0x14 +#define MODEL_o54 0x13 +#define MODEL_o53 0x12 +#define MODEL_o52 0x11 +#define MODEL_o50 0x10 +#define MODEL_o49 0xF +#define MODEL_o47 0xE +#define MODEL_o67 0xD +#define MODEL_g11 0xC +#define MODEL_yuka 0xB +#define MODEL_dan 0xA +#define MODEL_kabe 0x9 +#define MODEL_hasi3 0x8 +#define MODEL_hasi2 0x7 +#define MODEL_hasi1 0x6 +#define MODEL_kouri 0x5 +#define MODEL_o68 0x4 +#define MODEL_o6 0x3 +#define MODEL_g10 0x2 +#define MODEL_o71 0x1 +#define MODEL_o7 0x0 + diff --git a/include/mapfs/sam_bt01_hit.h b/include/mapfs/sam_bt01_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/sam_bt01_hit.h +++ b/include/mapfs/sam_bt01_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/sam_bt01_shape.h b/include/mapfs/sam_bt01_shape.h index 686bb60afd..ecfb3dcb13 100644 --- a/include/mapfs/sam_bt01_shape.h +++ b/include/mapfs/sam_bt01_shape.h @@ -1,31 +1,32 @@ -#define MODEL_Root 0x1E -#define MODEL_dai 0x1D -#define MODEL_waku1 0x1C -#define MODEL_o234 0x1B -#define MODEL_saku 0x1A -#define MODEL_tare1 0x19 -#define MODEL_yuka1 0x18 -#define MODEL_yuki4 0x17 -#define MODEL_o262 0x16 -#define MODEL_yuki3 0x15 -#define MODEL_o261 0x14 -#define MODEL_yuki2 0x13 -#define MODEL_o260 0x12 -#define MODEL_yuki 0x11 -#define MODEL_o253 0x10 -#define MODEL_g47 0xF -#define MODEL_waku2 0xE -#define MODEL_tare2 0xD -#define MODEL_gake1 0xC -#define MODEL_tare3 0xB -#define MODEL_gake2 0xA -#define MODEL_ki 0x9 -#define MODEL_miki 0x8 -#define MODEL_ki1 0x7 -#define MODEL_miki2 0x6 -#define MODEL_ki3 0x5 -#define MODEL_miki3 0x4 -#define MODEL_tare4 0x3 -#define MODEL_gake3 0x2 -#define MODEL_waku 0x1 -#define MODEL_yuka2 0x0 +#define MODEL_Root 0x1E +#define MODEL_dai 0x1D +#define MODEL_waku1 0x1C +#define MODEL_o234 0x1B +#define MODEL_saku 0x1A +#define MODEL_tare1 0x19 +#define MODEL_yuka1 0x18 +#define MODEL_yuki4 0x17 +#define MODEL_o262 0x16 +#define MODEL_yuki3 0x15 +#define MODEL_o261 0x14 +#define MODEL_yuki2 0x13 +#define MODEL_o260 0x12 +#define MODEL_yuki 0x11 +#define MODEL_o253 0x10 +#define MODEL_g47 0xF +#define MODEL_waku2 0xE +#define MODEL_tare2 0xD +#define MODEL_gake1 0xC +#define MODEL_tare3 0xB +#define MODEL_gake2 0xA +#define MODEL_ki 0x9 +#define MODEL_miki 0x8 +#define MODEL_ki1 0x7 +#define MODEL_miki2 0x6 +#define MODEL_ki3 0x5 +#define MODEL_miki3 0x4 +#define MODEL_tare4 0x3 +#define MODEL_gake3 0x2 +#define MODEL_waku 0x1 +#define MODEL_yuka2 0x0 + diff --git a/include/mapfs/sam_bt02_hit.h b/include/mapfs/sam_bt02_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/sam_bt02_hit.h +++ b/include/mapfs/sam_bt02_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/sam_bt02_shape.h b/include/mapfs/sam_bt02_shape.h index b40df7aa79..c553ff062d 100644 --- a/include/mapfs/sam_bt02_shape.h +++ b/include/mapfs/sam_bt02_shape.h @@ -1,32 +1,33 @@ -#define MODEL_Root 0x1F -#define MODEL_dai 0x1E -#define MODEL_waku1 0x1D -#define MODEL_kouri1 0x1C -#define MODEL_yuka1 0x1B -#define MODEL_yuki 0x1A -#define MODEL_yuki4 0x19 -#define MODEL_o285 0x18 -#define MODEL_yuki3 0x17 -#define MODEL_o284 0x16 -#define MODEL_yuki2 0x15 -#define MODEL_o283 0x14 -#define MODEL_yuki1 0x13 -#define MODEL_o253 0x12 -#define MODEL_base 0x11 -#define MODEL_kouri5 0x10 -#define MODEL_kouri4 0xF -#define MODEL_waku2 0xE -#define MODEL_waku 0xD -#define MODEL_p3 0xC -#define MODEL_o278 0xB -#define MODEL_p2 0xA -#define MODEL_o282 0x9 -#define MODEL_o281 0x8 -#define MODEL_o280 0x7 -#define MODEL_o279 0x6 -#define MODEL_hsr1 0x5 -#define MODEL_hsr2 0x4 -#define MODEL_p1 0x3 -#define MODEL_kouri3 0x2 -#define MODEL_kouri2 0x1 -#define MODEL_o274 0x0 +#define MODEL_Root 0x1F +#define MODEL_dai 0x1E +#define MODEL_waku1 0x1D +#define MODEL_kouri1 0x1C +#define MODEL_yuka1 0x1B +#define MODEL_yuki 0x1A +#define MODEL_yuki4 0x19 +#define MODEL_o285 0x18 +#define MODEL_yuki3 0x17 +#define MODEL_o284 0x16 +#define MODEL_yuki2 0x15 +#define MODEL_o283 0x14 +#define MODEL_yuki1 0x13 +#define MODEL_o253 0x12 +#define MODEL_base 0x11 +#define MODEL_kouri5 0x10 +#define MODEL_kouri4 0xF +#define MODEL_waku2 0xE +#define MODEL_waku 0xD +#define MODEL_p3 0xC +#define MODEL_o278 0xB +#define MODEL_p2 0xA +#define MODEL_o282 0x9 +#define MODEL_o281 0x8 +#define MODEL_o280 0x7 +#define MODEL_o279 0x6 +#define MODEL_hsr1 0x5 +#define MODEL_hsr2 0x4 +#define MODEL_p1 0x3 +#define MODEL_kouri3 0x2 +#define MODEL_kouri2 0x1 +#define MODEL_o274 0x0 + diff --git a/include/mapfs/sam_bt03_hit.h b/include/mapfs/sam_bt03_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/sam_bt03_hit.h +++ b/include/mapfs/sam_bt03_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/sam_bt03_shape.h b/include/mapfs/sam_bt03_shape.h index 53d6349628..cfa3b5ed3f 100644 --- a/include/mapfs/sam_bt03_shape.h +++ b/include/mapfs/sam_bt03_shape.h @@ -1,33 +1,34 @@ -#define MODEL_Root 0x20 -#define MODEL_dai 0x1F -#define MODEL_o278 0x1E -#define MODEL_waku1 0x1D -#define MODEL_tare1 0x1C -#define MODEL_yuka1 0x1B -#define MODEL_yuki4 0x1A -#define MODEL_g62 0x19 -#define MODEL_o276 0x18 -#define MODEL_yuki3 0x17 -#define MODEL_g60 0x16 -#define MODEL_o275 0x15 -#define MODEL_yuki2 0x14 -#define MODEL_g58 0x13 -#define MODEL_o273 0x12 -#define MODEL_yuki 0x11 -#define MODEL_Default 0x10 -#define MODEL_o253 0xF -#define MODEL_g47 0xE -#define MODEL_waku2 0xD -#define MODEL_o262 0xC -#define MODEL_o263 0xB -#define MODEL_1 0xA -#define MODEL_kouri2 0x9 -#define MODEL_o266 0x8 -#define MODEL_o264 0x7 -#define MODEL_2 0x6 -#define MODEL_kouri3 0x5 -#define MODEL_o265 0x4 -#define MODEL_o267 0x3 -#define MODEL_3 0x2 -#define MODEL_waku 0x1 -#define MODEL_yuka2 0x0 +#define MODEL_Root 0x20 +#define MODEL_dai 0x1F +#define MODEL_o278 0x1E +#define MODEL_waku1 0x1D +#define MODEL_tare1 0x1C +#define MODEL_yuka1 0x1B +#define MODEL_yuki4 0x1A +#define MODEL_g62 0x19 +#define MODEL_o276 0x18 +#define MODEL_yuki3 0x17 +#define MODEL_g60 0x16 +#define MODEL_o275 0x15 +#define MODEL_yuki2 0x14 +#define MODEL_g58 0x13 +#define MODEL_o273 0x12 +#define MODEL_yuki 0x11 +#define MODEL_Default 0x10 +#define MODEL_o253 0xF +#define MODEL_g47 0xE +#define MODEL_waku2 0xD +#define MODEL_o262 0xC +#define MODEL_o263 0xB +#define MODEL_1 0xA +#define MODEL_kouri2 0x9 +#define MODEL_o266 0x8 +#define MODEL_o264 0x7 +#define MODEL_2 0x6 +#define MODEL_kouri3 0x5 +#define MODEL_o265 0x4 +#define MODEL_o267 0x3 +#define MODEL_3 0x2 +#define MODEL_waku 0x1 +#define MODEL_yuka2 0x0 + diff --git a/include/mapfs/sam_bt04_hit.h b/include/mapfs/sam_bt04_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/sam_bt04_hit.h +++ b/include/mapfs/sam_bt04_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/sam_bt04_shape.h b/include/mapfs/sam_bt04_shape.h index 146e94c3bd..b6f9be3179 100644 --- a/include/mapfs/sam_bt04_shape.h +++ b/include/mapfs/sam_bt04_shape.h @@ -1,14 +1,15 @@ -#define MODEL_Root 0xD -#define MODEL_dai 0xC -#define MODEL_t3 0xB -#define MODEL_t2 0xA -#define MODEL_t1 0x9 -#define MODEL_waku1 0x8 -#define MODEL_yuka1 0x7 -#define MODEL_base 0x6 -#define MODEL_yuka2 0x5 -#define MODEL_iwa3 0x4 -#define MODEL_iwa2 0x3 -#define MODEL_iwa1 0x2 -#define MODEL_waku2 0x1 -#define MODEL_waku 0x0 +#define MODEL_Root 0xD +#define MODEL_dai 0xC +#define MODEL_t3 0xB +#define MODEL_t2 0xA +#define MODEL_t1 0x9 +#define MODEL_waku1 0x8 +#define MODEL_yuka1 0x7 +#define MODEL_base 0x6 +#define MODEL_yuka2 0x5 +#define MODEL_iwa3 0x4 +#define MODEL_iwa2 0x3 +#define MODEL_iwa1 0x2 +#define MODEL_waku2 0x1 +#define MODEL_waku 0x0 + diff --git a/include/mapfs/sbk_00_hit.h b/include/mapfs/sbk_00_hit.h index 3222d112d3..b8c9909e5d 100644 --- a/include/mapfs/sbk_00_hit.h +++ b/include/mapfs/sbk_00_hit.h @@ -1,20 +1,36 @@ -#define COLLIDER_Root 0x13 -#define COLLIDER_g25 0x12 -#define COLLIDER_g33 0x11 -#define COLLIDER_o149 0x10 -#define COLLIDER_o148 0xF -#define COLLIDER_o147 0xE -#define COLLIDER_o150 0xD -#define COLLIDER_o136 0xC -#define COLLIDER_o134 0xB -#define COLLIDER_tuitate 0xA -#define COLLIDER_tte 0x9 -#define COLLIDER_tts 0x8 -#define COLLIDER_bero 0x7 -#define COLLIDER_deilis 0x6 -#define COLLIDER_deilits 0x5 -#define COLLIDER_deilite 0x4 -#define COLLIDER_deilie 0x3 -#define COLLIDER_g1 0x2 -#define COLLIDER_mawari 0x1 -#define COLLIDER_stage 0x0 +#define COLLIDER_Root 0x13 +#define COLLIDER_g25 0x12 +#define COLLIDER_g33 0x11 +#define COLLIDER_o149 0x10 +#define COLLIDER_o148 0xF +#define COLLIDER_o147 0xE +#define COLLIDER_o150 0xD +#define COLLIDER_o136 0xC +#define COLLIDER_o134 0xB +#define COLLIDER_tuitate 0xA +#define COLLIDER_tte 0x9 +#define COLLIDER_tts 0x8 +#define COLLIDER_bero 0x7 +#define COLLIDER_deilis 0x6 +#define COLLIDER_deilits 0x5 +#define COLLIDER_deilite 0x4 +#define COLLIDER_deilie 0x3 +#define COLLIDER_g1 0x2 +#define COLLIDER_mawari 0x1 +#define COLLIDER_stage 0x0 + +#define ZONE_Root 0xD +#define ZONE_g1 0xC +#define ZONE_g6 0xB +#define ZONE_g7 0xA +#define ZONE_b_w 0x9 +#define ZONE_g11 0x8 +#define ZONE_b_s 0x7 +#define ZONE_g8 0x6 +#define ZONE_b_e 0x5 +#define ZONE_g12 0x4 +#define ZONE_b_n 0x3 +#define ZONE_g2 0x2 +#define ZONE_g10 0x1 +#define ZONE_hiru_came 0x0 + diff --git a/include/mapfs/sbk_00_shape.h b/include/mapfs/sbk_00_shape.h index aef27c8b89..c0f174e9c6 100644 --- a/include/mapfs/sbk_00_shape.h +++ b/include/mapfs/sbk_00_shape.h @@ -1,32 +1,33 @@ -#define MODEL_Root 0x1F -#define MODEL_g1 0x1E -#define MODEL_g28 0x1D -#define MODEL_g30 0x1C -#define MODEL_g33 0x1B -#define MODEL_o67 0x1A -#define MODEL_o66 0x19 -#define MODEL_g32 0x18 -#define MODEL_o65 0x17 -#define MODEL_o64 0x16 -#define MODEL_o63 0x15 -#define MODEL_o62 0x14 -#define MODEL_g31 0x13 -#define MODEL_o61 0x12 -#define MODEL_o60 0x11 -#define MODEL_o59 0x10 -#define MODEL_o58 0xF -#define MODEL_o57 0xE -#define MODEL_o56 0xD -#define MODEL_o55 0xC -#define MODEL_exit 0xB -#define MODEL_g11 0xA -#define MODEL_b_s2 0x9 -#define MODEL_b_s 0x8 -#define MODEL_g8 0x7 -#define MODEL_b_e2 0x6 -#define MODEL_b_e 0x5 -#define MODEL_g2 0x4 -#define MODEL_g10 0x3 -#define MODEL_stage 0x2 -#define MODEL_g5 0x1 -#define MODEL_o3 0x0 +#define MODEL_Root 0x1F +#define MODEL_g1 0x1E +#define MODEL_g28 0x1D +#define MODEL_g30 0x1C +#define MODEL_g33 0x1B +#define MODEL_o67 0x1A +#define MODEL_o66 0x19 +#define MODEL_g32 0x18 +#define MODEL_o65 0x17 +#define MODEL_o64 0x16 +#define MODEL_o63 0x15 +#define MODEL_o62 0x14 +#define MODEL_g31 0x13 +#define MODEL_o61 0x12 +#define MODEL_o60 0x11 +#define MODEL_o59 0x10 +#define MODEL_o58 0xF +#define MODEL_o57 0xE +#define MODEL_o56 0xD +#define MODEL_o55 0xC +#define MODEL_exit 0xB +#define MODEL_g11 0xA +#define MODEL_b_s2 0x9 +#define MODEL_b_s 0x8 +#define MODEL_g8 0x7 +#define MODEL_b_e2 0x6 +#define MODEL_b_e 0x5 +#define MODEL_g2 0x4 +#define MODEL_g10 0x3 +#define MODEL_stage 0x2 +#define MODEL_g5 0x1 +#define MODEL_o3 0x0 + diff --git a/include/mapfs/sbk_01_hit.h b/include/mapfs/sbk_01_hit.h index 663c428ff1..6743612b09 100644 --- a/include/mapfs/sbk_01_hit.h +++ b/include/mapfs/sbk_01_hit.h @@ -1,18 +1,34 @@ -#define COLLIDER_Root 0x11 -#define COLLIDER_g25 0x10 -#define COLLIDER_o141 0xF -#define COLLIDER_o151 0xE -#define COLLIDER_tuitate 0xD -#define COLLIDER_ttw 0xC -#define COLLIDER_tts 0xB -#define COLLIDER_tte 0xA -#define COLLIDER_dero 0x9 -#define COLLIDER_deilitw 0x8 -#define COLLIDER_deiliw 0x7 -#define COLLIDER_deilits 0x6 -#define COLLIDER_deilis 0x5 -#define COLLIDER_deilite 0x4 -#define COLLIDER_deilie 0x3 -#define COLLIDER_g1 0x2 -#define COLLIDER_mawari 0x1 -#define COLLIDER_stage 0x0 +#define COLLIDER_Root 0x11 +#define COLLIDER_g25 0x10 +#define COLLIDER_o141 0xF +#define COLLIDER_o151 0xE +#define COLLIDER_tuitate 0xD +#define COLLIDER_ttw 0xC +#define COLLIDER_tts 0xB +#define COLLIDER_tte 0xA +#define COLLIDER_dero 0x9 +#define COLLIDER_deilitw 0x8 +#define COLLIDER_deiliw 0x7 +#define COLLIDER_deilits 0x6 +#define COLLIDER_deilis 0x5 +#define COLLIDER_deilite 0x4 +#define COLLIDER_deilie 0x3 +#define COLLIDER_g1 0x2 +#define COLLIDER_mawari 0x1 +#define COLLIDER_stage 0x0 + +#define ZONE_Root 0xD +#define ZONE_g1 0xC +#define ZONE_g6 0xB +#define ZONE_g7 0xA +#define ZONE_b_w 0x9 +#define ZONE_g11 0x8 +#define ZONE_b_s 0x7 +#define ZONE_g8 0x6 +#define ZONE_b_e 0x5 +#define ZONE_g12 0x4 +#define ZONE_b_n 0x3 +#define ZONE_g2 0x2 +#define ZONE_g10 0x1 +#define ZONE_hiru_came 0x0 + diff --git a/include/mapfs/sbk_01_shape.h b/include/mapfs/sbk_01_shape.h index b890022f59..f39f348588 100644 --- a/include/mapfs/sbk_01_shape.h +++ b/include/mapfs/sbk_01_shape.h @@ -1,26 +1,27 @@ -#define MODEL_Root 0x19 -#define MODEL_g1 0x18 -#define MODEL_g28 0x17 -#define MODEL_g32 0x16 -#define MODEL_o64 0x15 -#define MODEL_o63 0x14 -#define MODEL_g31 0x13 -#define MODEL_o62 0x12 -#define MODEL_o61 0x11 -#define MODEL_o60 0x10 -#define MODEL_o59 0xF -#define MODEL_exit 0xE -#define MODEL_g7 0xD -#define MODEL_b_w2 0xC -#define MODEL_b_w 0xB -#define MODEL_g11 0xA -#define MODEL_b_s2 0x9 -#define MODEL_b_s 0x8 -#define MODEL_g8 0x7 -#define MODEL_b_e2 0x6 -#define MODEL_b_e 0x5 -#define MODEL_g2 0x4 -#define MODEL_g10 0x3 -#define MODEL_stage 0x2 -#define MODEL_g5 0x1 -#define MODEL_o3 0x0 +#define MODEL_Root 0x19 +#define MODEL_g1 0x18 +#define MODEL_g28 0x17 +#define MODEL_g32 0x16 +#define MODEL_o64 0x15 +#define MODEL_o63 0x14 +#define MODEL_g31 0x13 +#define MODEL_o62 0x12 +#define MODEL_o61 0x11 +#define MODEL_o60 0x10 +#define MODEL_o59 0xF +#define MODEL_exit 0xE +#define MODEL_g7 0xD +#define MODEL_b_w2 0xC +#define MODEL_b_w 0xB +#define MODEL_g11 0xA +#define MODEL_b_s2 0x9 +#define MODEL_b_s 0x8 +#define MODEL_g8 0x7 +#define MODEL_b_e2 0x6 +#define MODEL_b_e 0x5 +#define MODEL_g2 0x4 +#define MODEL_g10 0x3 +#define MODEL_stage 0x2 +#define MODEL_g5 0x1 +#define MODEL_o3 0x0 + diff --git a/include/mapfs/sbk_02_hit.h b/include/mapfs/sbk_02_hit.h index 57b183edaa..2e795d247d 100644 --- a/include/mapfs/sbk_02_hit.h +++ b/include/mapfs/sbk_02_hit.h @@ -1,24 +1,41 @@ -#define COLLIDER_Root 0x17 -#define COLLIDER_ruin 0x16 -#define COLLIDER_r6 0x15 -#define COLLIDER_r5 0x14 -#define COLLIDER_r4 0x13 -#define COLLIDER_r3 0x12 -#define COLLIDER_r2 0x11 -#define COLLIDER_r1 0x10 -#define COLLIDER_pikapika 0xF -#define COLLIDER_point 0xE -#define COLLIDER_iwa 0xD -#define COLLIDER_deili 0xC -#define COLLIDER_o222 0xB -#define COLLIDER_deilit1 0xA -#define COLLIDER_deili1 0x9 -#define COLLIDER_deilite 0x8 -#define COLLIDER_deilie 0x7 -#define COLLIDER_deilits 0x6 -#define COLLIDER_deilis 0x5 -#define COLLIDER_deilitw 0x4 -#define COLLIDER_deiliw 0x3 -#define COLLIDER_g6 0x2 -#define COLLIDER_o218 0x1 -#define COLLIDER_o16 0x0 +#define COLLIDER_Root 0x17 +#define COLLIDER_ruin 0x16 +#define COLLIDER_r6 0x15 +#define COLLIDER_r5 0x14 +#define COLLIDER_r4 0x13 +#define COLLIDER_r3 0x12 +#define COLLIDER_r2 0x11 +#define COLLIDER_r1 0x10 +#define COLLIDER_pikapika 0xF +#define COLLIDER_point 0xE +#define COLLIDER_iwa 0xD +#define COLLIDER_deili 0xC +#define COLLIDER_o222 0xB +#define COLLIDER_deilit1 0xA +#define COLLIDER_deili1 0x9 +#define COLLIDER_deilite 0x8 +#define COLLIDER_deilie 0x7 +#define COLLIDER_deilits 0x6 +#define COLLIDER_deilis 0x5 +#define COLLIDER_deilitw 0x4 +#define COLLIDER_deiliw 0x3 +#define COLLIDER_g6 0x2 +#define COLLIDER_o218 0x1 +#define COLLIDER_o16 0x0 + +#define ZONE_Root 0xE +#define ZONE_g1 0xD +#define ZONE_g6 0xC +#define ZONE_g7 0xB +#define ZONE_b_w 0xA +#define ZONE_g11 0x9 +#define ZONE_b_s 0x8 +#define ZONE_g8 0x7 +#define ZONE_b_e 0x6 +#define ZONE_g12 0x5 +#define ZONE_b_n 0x4 +#define ZONE_g2 0x3 +#define ZONE_g10 0x2 +#define ZONE_o22 0x1 +#define ZONE_hiru_came 0x0 + diff --git a/include/mapfs/sbk_02_shape.h b/include/mapfs/sbk_02_shape.h index c7cc64caca..d98d62e4e6 100644 --- a/include/mapfs/sbk_02_shape.h +++ b/include/mapfs/sbk_02_shape.h @@ -1,133 +1,134 @@ -#define MODEL_Root 0x84 -#define MODEL_g80 0x83 -#define MODEL_point_iwa 0x82 -#define MODEL_g72 0x81 -#define MODEL_o225 0x80 -#define MODEL_g74 0x7F -#define MODEL_upper_light 0x7E -#define MODEL_step 0x7D -#define MODEL_step2 0x7C -#define MODEL_o105 0x7B -#define MODEL_o100 0x7A -#define MODEL_o107 0x79 -#define MODEL_o106 0x78 -#define MODEL_step1 0x77 -#define MODEL_o99 0x76 -#define MODEL_o104 0x75 -#define MODEL_o103 0x74 -#define MODEL_o102 0x73 -#define MODEL_ruins 0x72 -#define MODEL_o232 0x71 -#define MODEL_dai 0x70 -#define MODEL_o109 0x6F -#define MODEL_o101 0x6E -#define MODEL_o110 0x6D -#define MODEL_g28 0x6C -#define MODEL_o78 0x6B -#define MODEL_o170 0x6A -#define MODEL_o128 0x69 -#define MODEL_o81 0x68 -#define MODEL_o77 0x67 -#define MODEL_o76 0x66 -#define MODEL_o75 0x65 -#define MODEL_o182 0x64 -#define MODEL_o202 0x63 -#define MODEL_o201 0x62 -#define MODEL_o204 0x61 -#define MODEL_o203 0x60 -#define MODEL_tenjou 0x5F -#define MODEL_o52 0x5E -#define MODEL_o51 0x5D -#define MODEL_o181 0x5C -#define MODEL_o180 0x5B -#define MODEL_d 0x5A -#define MODEL_d2 0x59 -#define MODEL_o172 0x58 -#define MODEL_o158 0x57 -#define MODEL_d1 0x56 -#define MODEL_o171 0x55 -#define MODEL_o157 0x54 -#define MODEL_g55 0x53 -#define MODEL_o156 0x52 -#define MODEL_o155 0x51 -#define MODEL_o154 0x50 -#define MODEL_o153 0x4F -#define MODEL_d_wang 0x4E -#define MODEL_o185 0x4D -#define MODEL_o186 0x4C -#define MODEL_o187 0x4B -#define MODEL_o188 0x4A -#define MODEL_c 0x49 -#define MODEL_c2 0x48 -#define MODEL_o173 0x47 -#define MODEL_o140 0x46 -#define MODEL_c1 0x45 -#define MODEL_o174 0x44 -#define MODEL_o141 0x43 -#define MODEL_g51 0x42 -#define MODEL_o145 0x41 -#define MODEL_o144 0x40 -#define MODEL_o143 0x3F -#define MODEL_o142 0x3E -#define MODEL_c_wang 0x3D -#define MODEL_o65 0x3C -#define MODEL_o68 0x3B -#define MODEL_o67 0x3A -#define MODEL_o66 0x39 -#define MODEL_b 0x38 -#define MODEL_b2 0x37 -#define MODEL_o129 0x36 -#define MODEL_o175 0x35 -#define MODEL_b1 0x34 -#define MODEL_o176 0x33 -#define MODEL_o130 0x32 -#define MODEL_g27 0x31 -#define MODEL_o72 0x30 -#define MODEL_o71 0x2F -#define MODEL_o70 0x2E -#define MODEL_o69 0x2D -#define MODEL_b_wang 0x2C -#define MODEL_o196 0x2B -#define MODEL_o195 0x2A -#define MODEL_o194 0x29 -#define MODEL_o193 0x28 -#define MODEL_a 0x27 -#define MODEL_a2 0x26 -#define MODEL_o178 0x25 -#define MODEL_o169 0x24 -#define MODEL_a1 0x23 -#define MODEL_o177 0x22 -#define MODEL_o168 0x21 -#define MODEL_g59 0x20 -#define MODEL_o167 0x1F -#define MODEL_o166 0x1E -#define MODEL_o165 0x1D -#define MODEL_o164 0x1C -#define MODEL_a_wang 0x1B -#define MODEL_o200 0x1A -#define MODEL_o199 0x19 -#define MODEL_o198 0x18 -#define MODEL_o197 0x17 -#define MODEL_day_version 0x16 -#define MODEL_da13 0x15 -#define MODEL_da12 0x14 -#define MODEL_da11 0x13 -#define MODEL_da10 0x12 -#define MODEL_da9 0x11 -#define MODEL_da8 0x10 -#define MODEL_da7 0xF -#define MODEL_da6 0xE -#define MODEL_da5 0xD -#define MODEL_da4 0xC -#define MODEL_da3 0xB -#define MODEL_da2 0xA -#define MODEL_da1 0x9 -#define MODEL_display 0x8 -#define MODEL_ds7 0x7 -#define MODEL_ds6 0x6 -#define MODEL_ds5 0x5 -#define MODEL_ds4 0x4 -#define MODEL_ds3 0x3 -#define MODEL_ds2 0x2 -#define MODEL_ds1 0x1 -#define MODEL_o248 0x0 +#define MODEL_Root 0x84 +#define MODEL_g80 0x83 +#define MODEL_point_iwa 0x82 +#define MODEL_g72 0x81 +#define MODEL_o225 0x80 +#define MODEL_g74 0x7F +#define MODEL_upper_light 0x7E +#define MODEL_step 0x7D +#define MODEL_step2 0x7C +#define MODEL_o105 0x7B +#define MODEL_o100 0x7A +#define MODEL_o107 0x79 +#define MODEL_o106 0x78 +#define MODEL_step1 0x77 +#define MODEL_o99 0x76 +#define MODEL_o104 0x75 +#define MODEL_o103 0x74 +#define MODEL_o102 0x73 +#define MODEL_ruins 0x72 +#define MODEL_o232 0x71 +#define MODEL_dai 0x70 +#define MODEL_o109 0x6F +#define MODEL_o101 0x6E +#define MODEL_o110 0x6D +#define MODEL_g28 0x6C +#define MODEL_o78 0x6B +#define MODEL_o170 0x6A +#define MODEL_o128 0x69 +#define MODEL_o81 0x68 +#define MODEL_o77 0x67 +#define MODEL_o76 0x66 +#define MODEL_o75 0x65 +#define MODEL_o182 0x64 +#define MODEL_o202 0x63 +#define MODEL_o201 0x62 +#define MODEL_o204 0x61 +#define MODEL_o203 0x60 +#define MODEL_tenjou 0x5F +#define MODEL_o52 0x5E +#define MODEL_o51 0x5D +#define MODEL_o181 0x5C +#define MODEL_o180 0x5B +#define MODEL_d 0x5A +#define MODEL_d2 0x59 +#define MODEL_o172 0x58 +#define MODEL_o158 0x57 +#define MODEL_d1 0x56 +#define MODEL_o171 0x55 +#define MODEL_o157 0x54 +#define MODEL_g55 0x53 +#define MODEL_o156 0x52 +#define MODEL_o155 0x51 +#define MODEL_o154 0x50 +#define MODEL_o153 0x4F +#define MODEL_d_wang 0x4E +#define MODEL_o185 0x4D +#define MODEL_o186 0x4C +#define MODEL_o187 0x4B +#define MODEL_o188 0x4A +#define MODEL_c 0x49 +#define MODEL_c2 0x48 +#define MODEL_o173 0x47 +#define MODEL_o140 0x46 +#define MODEL_c1 0x45 +#define MODEL_o174 0x44 +#define MODEL_o141 0x43 +#define MODEL_g51 0x42 +#define MODEL_o145 0x41 +#define MODEL_o144 0x40 +#define MODEL_o143 0x3F +#define MODEL_o142 0x3E +#define MODEL_c_wang 0x3D +#define MODEL_o65 0x3C +#define MODEL_o68 0x3B +#define MODEL_o67 0x3A +#define MODEL_o66 0x39 +#define MODEL_b 0x38 +#define MODEL_b2 0x37 +#define MODEL_o129 0x36 +#define MODEL_o175 0x35 +#define MODEL_b1 0x34 +#define MODEL_o176 0x33 +#define MODEL_o130 0x32 +#define MODEL_g27 0x31 +#define MODEL_o72 0x30 +#define MODEL_o71 0x2F +#define MODEL_o70 0x2E +#define MODEL_o69 0x2D +#define MODEL_b_wang 0x2C +#define MODEL_o196 0x2B +#define MODEL_o195 0x2A +#define MODEL_o194 0x29 +#define MODEL_o193 0x28 +#define MODEL_a 0x27 +#define MODEL_a2 0x26 +#define MODEL_o178 0x25 +#define MODEL_o169 0x24 +#define MODEL_a1 0x23 +#define MODEL_o177 0x22 +#define MODEL_o168 0x21 +#define MODEL_g59 0x20 +#define MODEL_o167 0x1F +#define MODEL_o166 0x1E +#define MODEL_o165 0x1D +#define MODEL_o164 0x1C +#define MODEL_a_wang 0x1B +#define MODEL_o200 0x1A +#define MODEL_o199 0x19 +#define MODEL_o198 0x18 +#define MODEL_o197 0x17 +#define MODEL_day_version 0x16 +#define MODEL_da13 0x15 +#define MODEL_da12 0x14 +#define MODEL_da11 0x13 +#define MODEL_da10 0x12 +#define MODEL_da9 0x11 +#define MODEL_da8 0x10 +#define MODEL_da7 0xF +#define MODEL_da6 0xE +#define MODEL_da5 0xD +#define MODEL_da4 0xC +#define MODEL_da3 0xB +#define MODEL_da2 0xA +#define MODEL_da1 0x9 +#define MODEL_display 0x8 +#define MODEL_ds7 0x7 +#define MODEL_ds6 0x6 +#define MODEL_ds5 0x5 +#define MODEL_ds4 0x4 +#define MODEL_ds3 0x3 +#define MODEL_ds2 0x2 +#define MODEL_ds1 0x1 +#define MODEL_o248 0x0 + diff --git a/include/mapfs/sbk_03_hit.h b/include/mapfs/sbk_03_hit.h index 4e030d15c9..2c14cac471 100644 --- a/include/mapfs/sbk_03_hit.h +++ b/include/mapfs/sbk_03_hit.h @@ -1,20 +1,36 @@ -#define COLLIDER_Root 0x13 -#define COLLIDER_g25 0x12 -#define COLLIDER_o141 0x11 -#define COLLIDER_o153 0x10 -#define COLLIDER_o152 0xF -#define COLLIDER_o151 0xE -#define COLLIDER_tuitate 0xD -#define COLLIDER_ttw 0xC -#define COLLIDER_tts 0xB -#define COLLIDER_tte 0xA -#define COLLIDER_dero 0x9 -#define COLLIDER_deilitw 0x8 -#define COLLIDER_deiliw 0x7 -#define COLLIDER_deilits 0x6 -#define COLLIDER_deilis 0x5 -#define COLLIDER_deilite 0x4 -#define COLLIDER_deilie 0x3 -#define COLLIDER_g1 0x2 -#define COLLIDER_mawari 0x1 -#define COLLIDER_stage 0x0 +#define COLLIDER_Root 0x13 +#define COLLIDER_g25 0x12 +#define COLLIDER_o141 0x11 +#define COLLIDER_o153 0x10 +#define COLLIDER_o152 0xF +#define COLLIDER_o151 0xE +#define COLLIDER_tuitate 0xD +#define COLLIDER_ttw 0xC +#define COLLIDER_tts 0xB +#define COLLIDER_tte 0xA +#define COLLIDER_dero 0x9 +#define COLLIDER_deilitw 0x8 +#define COLLIDER_deiliw 0x7 +#define COLLIDER_deilits 0x6 +#define COLLIDER_deilis 0x5 +#define COLLIDER_deilite 0x4 +#define COLLIDER_deilie 0x3 +#define COLLIDER_g1 0x2 +#define COLLIDER_mawari 0x1 +#define COLLIDER_stage 0x0 + +#define ZONE_Root 0xD +#define ZONE_g1 0xC +#define ZONE_g6 0xB +#define ZONE_g7 0xA +#define ZONE_b_w 0x9 +#define ZONE_g11 0x8 +#define ZONE_b_s 0x7 +#define ZONE_g8 0x6 +#define ZONE_b_e 0x5 +#define ZONE_g12 0x4 +#define ZONE_b_n 0x3 +#define ZONE_g2 0x2 +#define ZONE_g10 0x1 +#define ZONE_hiru_came 0x0 + diff --git a/include/mapfs/sbk_03_shape.h b/include/mapfs/sbk_03_shape.h index db9ea9d443..f0c251ef5f 100644 --- a/include/mapfs/sbk_03_shape.h +++ b/include/mapfs/sbk_03_shape.h @@ -1,36 +1,37 @@ -#define MODEL_Root 0x23 -#define MODEL_g1 0x22 -#define MODEL_g28 0x21 -#define MODEL_g32 0x20 -#define MODEL_o68 0x1F -#define MODEL_o67 0x1E -#define MODEL_o66 0x1D -#define MODEL_o65 0x1C -#define MODEL_g31 0x1B -#define MODEL_o64 0x1A -#define MODEL_o63 0x19 -#define MODEL_o62 0x18 -#define MODEL_o61 0x17 -#define MODEL_g30 0x16 -#define MODEL_o60 0x15 -#define MODEL_o59 0x14 -#define MODEL_g29 0x13 -#define MODEL_o58 0x12 -#define MODEL_o57 0x11 -#define MODEL_o56 0x10 -#define MODEL_o55 0xF -#define MODEL_exit 0xE -#define MODEL_g7 0xD -#define MODEL_b_w2 0xC -#define MODEL_b_w 0xB -#define MODEL_g11 0xA -#define MODEL_b_s2 0x9 -#define MODEL_b_s 0x8 -#define MODEL_g8 0x7 -#define MODEL_b_e2 0x6 -#define MODEL_b_e 0x5 -#define MODEL_g2 0x4 -#define MODEL_g10 0x3 -#define MODEL_stage 0x2 -#define MODEL_g5 0x1 -#define MODEL_o3 0x0 +#define MODEL_Root 0x23 +#define MODEL_g1 0x22 +#define MODEL_g28 0x21 +#define MODEL_g32 0x20 +#define MODEL_o68 0x1F +#define MODEL_o67 0x1E +#define MODEL_o66 0x1D +#define MODEL_o65 0x1C +#define MODEL_g31 0x1B +#define MODEL_o64 0x1A +#define MODEL_o63 0x19 +#define MODEL_o62 0x18 +#define MODEL_o61 0x17 +#define MODEL_g30 0x16 +#define MODEL_o60 0x15 +#define MODEL_o59 0x14 +#define MODEL_g29 0x13 +#define MODEL_o58 0x12 +#define MODEL_o57 0x11 +#define MODEL_o56 0x10 +#define MODEL_o55 0xF +#define MODEL_exit 0xE +#define MODEL_g7 0xD +#define MODEL_b_w2 0xC +#define MODEL_b_w 0xB +#define MODEL_g11 0xA +#define MODEL_b_s2 0x9 +#define MODEL_b_s 0x8 +#define MODEL_g8 0x7 +#define MODEL_b_e2 0x6 +#define MODEL_b_e 0x5 +#define MODEL_g2 0x4 +#define MODEL_g10 0x3 +#define MODEL_stage 0x2 +#define MODEL_g5 0x1 +#define MODEL_o3 0x0 + diff --git a/include/mapfs/sbk_04_hit.h b/include/mapfs/sbk_04_hit.h index 78ecc2ea18..4f9f397081 100644 --- a/include/mapfs/sbk_04_hit.h +++ b/include/mapfs/sbk_04_hit.h @@ -1,17 +1,33 @@ -#define COLLIDER_Root 0x10 -#define COLLIDER_g25 0xF -#define COLLIDER_o152 0xE -#define COLLIDER_tuitate 0xD -#define COLLIDER_ttw 0xC -#define COLLIDER_tts 0xB -#define COLLIDER_tte 0xA -#define COLLIDER_dero 0x9 -#define COLLIDER_deilitw 0x8 -#define COLLIDER_deiliw 0x7 -#define COLLIDER_deilits 0x6 -#define COLLIDER_deilis 0x5 -#define COLLIDER_deilite 0x4 -#define COLLIDER_deilie 0x3 -#define COLLIDER_g1 0x2 -#define COLLIDER_mawari 0x1 -#define COLLIDER_stage 0x0 +#define COLLIDER_Root 0x10 +#define COLLIDER_g25 0xF +#define COLLIDER_o152 0xE +#define COLLIDER_tuitate 0xD +#define COLLIDER_ttw 0xC +#define COLLIDER_tts 0xB +#define COLLIDER_tte 0xA +#define COLLIDER_dero 0x9 +#define COLLIDER_deilitw 0x8 +#define COLLIDER_deiliw 0x7 +#define COLLIDER_deilits 0x6 +#define COLLIDER_deilis 0x5 +#define COLLIDER_deilite 0x4 +#define COLLIDER_deilie 0x3 +#define COLLIDER_g1 0x2 +#define COLLIDER_mawari 0x1 +#define COLLIDER_stage 0x0 + +#define ZONE_Root 0xD +#define ZONE_g1 0xC +#define ZONE_g6 0xB +#define ZONE_g7 0xA +#define ZONE_b_w 0x9 +#define ZONE_g11 0x8 +#define ZONE_b_s 0x7 +#define ZONE_g8 0x6 +#define ZONE_b_e 0x5 +#define ZONE_g12 0x4 +#define ZONE_b_n 0x3 +#define ZONE_g2 0x2 +#define ZONE_g10 0x1 +#define ZONE_hiru_came 0x0 + diff --git a/include/mapfs/sbk_04_shape.h b/include/mapfs/sbk_04_shape.h index 22d4dcd526..631bcfd489 100644 --- a/include/mapfs/sbk_04_shape.h +++ b/include/mapfs/sbk_04_shape.h @@ -1,23 +1,24 @@ -#define MODEL_Root 0x16 -#define MODEL_g1 0x15 -#define MODEL_g28 0x14 -#define MODEL_g30 0x13 -#define MODEL_o62 0x12 -#define MODEL_o61 0x11 -#define MODEL_o60 0x10 -#define MODEL_o59 0xF -#define MODEL_exit 0xE -#define MODEL_g7 0xD -#define MODEL_b_w2 0xC -#define MODEL_b_w 0xB -#define MODEL_g11 0xA -#define MODEL_b_s2 0x9 -#define MODEL_b_s 0x8 -#define MODEL_g8 0x7 -#define MODEL_b_e2 0x6 -#define MODEL_b_e 0x5 -#define MODEL_g2 0x4 -#define MODEL_g10 0x3 -#define MODEL_stage 0x2 -#define MODEL_g5 0x1 -#define MODEL_o3 0x0 +#define MODEL_Root 0x16 +#define MODEL_g1 0x15 +#define MODEL_g28 0x14 +#define MODEL_g30 0x13 +#define MODEL_o62 0x12 +#define MODEL_o61 0x11 +#define MODEL_o60 0x10 +#define MODEL_o59 0xF +#define MODEL_exit 0xE +#define MODEL_g7 0xD +#define MODEL_b_w2 0xC +#define MODEL_b_w 0xB +#define MODEL_g11 0xA +#define MODEL_b_s2 0x9 +#define MODEL_b_s 0x8 +#define MODEL_g8 0x7 +#define MODEL_b_e2 0x6 +#define MODEL_b_e 0x5 +#define MODEL_g2 0x4 +#define MODEL_g10 0x3 +#define MODEL_stage 0x2 +#define MODEL_g5 0x1 +#define MODEL_o3 0x0 + diff --git a/include/mapfs/sbk_05_hit.h b/include/mapfs/sbk_05_hit.h index 1c7613ec8b..d50ec10d13 100644 --- a/include/mapfs/sbk_05_hit.h +++ b/include/mapfs/sbk_05_hit.h @@ -1,19 +1,35 @@ -#define COLLIDER_Root 0x12 -#define COLLIDER_g25 0x11 -#define COLLIDER_o141 0x10 -#define COLLIDER_o152 0xF -#define COLLIDER_o151 0xE -#define COLLIDER_tuitate 0xD -#define COLLIDER_ttw 0xC -#define COLLIDER_tts 0xB -#define COLLIDER_tte 0xA -#define COLLIDER_dero 0x9 -#define COLLIDER_deilitw 0x8 -#define COLLIDER_deiliw 0x7 -#define COLLIDER_deilits 0x6 -#define COLLIDER_deilis 0x5 -#define COLLIDER_deilite 0x4 -#define COLLIDER_deilie 0x3 -#define COLLIDER_g1 0x2 -#define COLLIDER_mawari 0x1 -#define COLLIDER_stage 0x0 +#define COLLIDER_Root 0x12 +#define COLLIDER_g25 0x11 +#define COLLIDER_o141 0x10 +#define COLLIDER_o152 0xF +#define COLLIDER_o151 0xE +#define COLLIDER_tuitate 0xD +#define COLLIDER_ttw 0xC +#define COLLIDER_tts 0xB +#define COLLIDER_tte 0xA +#define COLLIDER_dero 0x9 +#define COLLIDER_deilitw 0x8 +#define COLLIDER_deiliw 0x7 +#define COLLIDER_deilits 0x6 +#define COLLIDER_deilis 0x5 +#define COLLIDER_deilite 0x4 +#define COLLIDER_deilie 0x3 +#define COLLIDER_g1 0x2 +#define COLLIDER_mawari 0x1 +#define COLLIDER_stage 0x0 + +#define ZONE_Root 0xD +#define ZONE_g1 0xC +#define ZONE_g6 0xB +#define ZONE_g7 0xA +#define ZONE_b_w 0x9 +#define ZONE_g11 0x8 +#define ZONE_b_s 0x7 +#define ZONE_g8 0x6 +#define ZONE_b_e 0x5 +#define ZONE_g12 0x4 +#define ZONE_b_n 0x3 +#define ZONE_g2 0x2 +#define ZONE_g10 0x1 +#define ZONE_hiru_came 0x0 + diff --git a/include/mapfs/sbk_05_shape.h b/include/mapfs/sbk_05_shape.h index 72d3687153..3d3e6112a9 100644 --- a/include/mapfs/sbk_05_shape.h +++ b/include/mapfs/sbk_05_shape.h @@ -1,31 +1,32 @@ -#define MODEL_Root 0x1E -#define MODEL_g1 0x1D -#define MODEL_g28 0x1C -#define MODEL_g33 0x1B -#define MODEL_o68 0x1A -#define MODEL_o67 0x19 -#define MODEL_o66 0x18 -#define MODEL_o65 0x17 -#define MODEL_g32 0x16 -#define MODEL_o64 0x15 -#define MODEL_o63 0x14 -#define MODEL_g31 0x13 -#define MODEL_o62 0x12 -#define MODEL_o61 0x11 -#define MODEL_o60 0x10 -#define MODEL_o59 0xF -#define MODEL_exit 0xE -#define MODEL_g7 0xD -#define MODEL_b_w2 0xC -#define MODEL_b_w 0xB -#define MODEL_g11 0xA -#define MODEL_b_s2 0x9 -#define MODEL_b_s 0x8 -#define MODEL_g8 0x7 -#define MODEL_b_e2 0x6 -#define MODEL_b_e 0x5 -#define MODEL_g2 0x4 -#define MODEL_g10 0x3 -#define MODEL_stage 0x2 -#define MODEL_g5 0x1 -#define MODEL_o3 0x0 +#define MODEL_Root 0x1E +#define MODEL_g1 0x1D +#define MODEL_g28 0x1C +#define MODEL_g33 0x1B +#define MODEL_o68 0x1A +#define MODEL_o67 0x19 +#define MODEL_o66 0x18 +#define MODEL_o65 0x17 +#define MODEL_g32 0x16 +#define MODEL_o64 0x15 +#define MODEL_o63 0x14 +#define MODEL_g31 0x13 +#define MODEL_o62 0x12 +#define MODEL_o61 0x11 +#define MODEL_o60 0x10 +#define MODEL_o59 0xF +#define MODEL_exit 0xE +#define MODEL_g7 0xD +#define MODEL_b_w2 0xC +#define MODEL_b_w 0xB +#define MODEL_g11 0xA +#define MODEL_b_s2 0x9 +#define MODEL_b_s 0x8 +#define MODEL_g8 0x7 +#define MODEL_b_e2 0x6 +#define MODEL_b_e 0x5 +#define MODEL_g2 0x4 +#define MODEL_g10 0x3 +#define MODEL_stage 0x2 +#define MODEL_g5 0x1 +#define MODEL_o3 0x0 + diff --git a/include/mapfs/sbk_06_hit.h b/include/mapfs/sbk_06_hit.h index 2a4716b463..018a24e2ba 100644 --- a/include/mapfs/sbk_06_hit.h +++ b/include/mapfs/sbk_06_hit.h @@ -1,14 +1,30 @@ -#define COLLIDER_Root 0xD -#define COLLIDER_g48 0xC -#define COLLIDER_o191 0xB -#define COLLIDER_tuitate 0xA -#define COLLIDER_ttw 0x9 -#define COLLIDER_tts 0x8 -#define COLLIDER_dero 0x7 -#define COLLIDER_deilitw 0x6 -#define COLLIDER_deiliw 0x5 -#define COLLIDER_deilits 0x4 -#define COLLIDER_deilis 0x3 -#define COLLIDER_g1 0x2 -#define COLLIDER_mawari 0x1 -#define COLLIDER_stage 0x0 +#define COLLIDER_Root 0xD +#define COLLIDER_g48 0xC +#define COLLIDER_o191 0xB +#define COLLIDER_tuitate 0xA +#define COLLIDER_ttw 0x9 +#define COLLIDER_tts 0x8 +#define COLLIDER_dero 0x7 +#define COLLIDER_deilitw 0x6 +#define COLLIDER_deiliw 0x5 +#define COLLIDER_deilits 0x4 +#define COLLIDER_deilis 0x3 +#define COLLIDER_g1 0x2 +#define COLLIDER_mawari 0x1 +#define COLLIDER_stage 0x0 + +#define ZONE_Root 0xD +#define ZONE_g1 0xC +#define ZONE_g6 0xB +#define ZONE_g7 0xA +#define ZONE_b_w 0x9 +#define ZONE_g11 0x8 +#define ZONE_b_s 0x7 +#define ZONE_g8 0x6 +#define ZONE_b_e 0x5 +#define ZONE_g12 0x4 +#define ZONE_b_n 0x3 +#define ZONE_g2 0x2 +#define ZONE_g10 0x1 +#define ZONE_hiru_came 0x0 + diff --git a/include/mapfs/sbk_06_shape.h b/include/mapfs/sbk_06_shape.h index 63268a34c2..735ec0079d 100644 --- a/include/mapfs/sbk_06_shape.h +++ b/include/mapfs/sbk_06_shape.h @@ -1,19 +1,20 @@ -#define MODEL_Root 0x12 -#define MODEL_g1 0x11 -#define MODEL_g28 0x10 -#define MODEL_g31 0xF -#define MODEL_o59 0xE -#define MODEL_o58 0xD -#define MODEL_o57 0xC -#define MODEL_exit 0xB -#define MODEL_g7 0xA -#define MODEL_b_w2 0x9 -#define MODEL_b_w 0x8 -#define MODEL_g11 0x7 -#define MODEL_b_s2 0x6 -#define MODEL_b_s 0x5 -#define MODEL_g2 0x4 -#define MODEL_g10 0x3 -#define MODEL_stage 0x2 -#define MODEL_g5 0x1 -#define MODEL_o3 0x0 +#define MODEL_Root 0x12 +#define MODEL_g1 0x11 +#define MODEL_g28 0x10 +#define MODEL_g31 0xF +#define MODEL_o59 0xE +#define MODEL_o58 0xD +#define MODEL_o57 0xC +#define MODEL_exit 0xB +#define MODEL_g7 0xA +#define MODEL_b_w2 0x9 +#define MODEL_b_w 0x8 +#define MODEL_g11 0x7 +#define MODEL_b_s2 0x6 +#define MODEL_b_s 0x5 +#define MODEL_g2 0x4 +#define MODEL_g10 0x3 +#define MODEL_stage 0x2 +#define MODEL_g5 0x1 +#define MODEL_o3 0x0 + diff --git a/include/mapfs/sbk_10_hit.h b/include/mapfs/sbk_10_hit.h index 547e350c23..9dd24535f4 100644 --- a/include/mapfs/sbk_10_hit.h +++ b/include/mapfs/sbk_10_hit.h @@ -1,22 +1,38 @@ -#define COLLIDER_Root 0x15 -#define COLLIDER_Default 0x14 -#define COLLIDER_o130 0x13 -#define COLLIDER_g25 0x12 -#define COLLIDER_o128 0x11 -#define COLLIDER_o129 0x10 -#define COLLIDER_o124 0xF -#define COLLIDER_o123 0xE -#define COLLIDER_tuitate 0xD -#define COLLIDER_tts 0xC -#define COLLIDER_tte 0xB -#define COLLIDER_ttn 0xA -#define COLLIDER_dero 0x9 -#define COLLIDER_deilits 0x8 -#define COLLIDER_deilis 0x7 -#define COLLIDER_deilite 0x6 -#define COLLIDER_deilie 0x5 -#define COLLIDER_deilitn 0x4 -#define COLLIDER_deilin 0x3 -#define COLLIDER_g1 0x2 -#define COLLIDER_mawari 0x1 -#define COLLIDER_stage 0x0 +#define COLLIDER_Root 0x15 +#define COLLIDER_Default 0x14 +#define COLLIDER_o130 0x13 +#define COLLIDER_g25 0x12 +#define COLLIDER_o128 0x11 +#define COLLIDER_o129 0x10 +#define COLLIDER_o124 0xF +#define COLLIDER_o123 0xE +#define COLLIDER_tuitate 0xD +#define COLLIDER_tts 0xC +#define COLLIDER_tte 0xB +#define COLLIDER_ttn 0xA +#define COLLIDER_dero 0x9 +#define COLLIDER_deilits 0x8 +#define COLLIDER_deilis 0x7 +#define COLLIDER_deilite 0x6 +#define COLLIDER_deilie 0x5 +#define COLLIDER_deilitn 0x4 +#define COLLIDER_deilin 0x3 +#define COLLIDER_g1 0x2 +#define COLLIDER_mawari 0x1 +#define COLLIDER_stage 0x0 + +#define ZONE_Root 0xD +#define ZONE_g1 0xC +#define ZONE_g6 0xB +#define ZONE_g7 0xA +#define ZONE_b_w 0x9 +#define ZONE_g11 0x8 +#define ZONE_b_s 0x7 +#define ZONE_g8 0x6 +#define ZONE_b_e 0x5 +#define ZONE_g12 0x4 +#define ZONE_b_n 0x3 +#define ZONE_g2 0x2 +#define ZONE_g10 0x1 +#define ZONE_hiru_came 0x0 + diff --git a/include/mapfs/sbk_10_shape.h b/include/mapfs/sbk_10_shape.h index 3534a24944..e0289308db 100644 --- a/include/mapfs/sbk_10_shape.h +++ b/include/mapfs/sbk_10_shape.h @@ -1,23 +1,24 @@ -#define MODEL_Root 0x16 -#define MODEL_g1 0x15 -#define MODEL_g28 0x14 -#define MODEL_o59 0x13 -#define MODEL_o58 0x12 -#define MODEL_o57 0x11 -#define MODEL_o56 0x10 -#define MODEL_o55 0xF -#define MODEL_exit 0xE -#define MODEL_g11 0xD -#define MODEL_b_s2 0xC -#define MODEL_b_s 0xB -#define MODEL_g8 0xA -#define MODEL_b_e2 0x9 -#define MODEL_b_e 0x8 -#define MODEL_g12 0x7 -#define MODEL_b_n2 0x6 -#define MODEL_b_n 0x5 -#define MODEL_g2 0x4 -#define MODEL_g10 0x3 -#define MODEL_stage 0x2 -#define MODEL_g5 0x1 -#define MODEL_o3 0x0 +#define MODEL_Root 0x16 +#define MODEL_g1 0x15 +#define MODEL_g28 0x14 +#define MODEL_o59 0x13 +#define MODEL_o58 0x12 +#define MODEL_o57 0x11 +#define MODEL_o56 0x10 +#define MODEL_o55 0xF +#define MODEL_exit 0xE +#define MODEL_g11 0xD +#define MODEL_b_s2 0xC +#define MODEL_b_s 0xB +#define MODEL_g8 0xA +#define MODEL_b_e2 0x9 +#define MODEL_b_e 0x8 +#define MODEL_g12 0x7 +#define MODEL_b_n2 0x6 +#define MODEL_b_n 0x5 +#define MODEL_g2 0x4 +#define MODEL_g10 0x3 +#define MODEL_stage 0x2 +#define MODEL_g5 0x1 +#define MODEL_o3 0x0 + diff --git a/include/mapfs/sbk_11_hit.h b/include/mapfs/sbk_11_hit.h index ce9931b39c..fbebe766f0 100644 --- a/include/mapfs/sbk_11_hit.h +++ b/include/mapfs/sbk_11_hit.h @@ -1,22 +1,38 @@ -#define COLLIDER_Root 0x15 -#define COLLIDER_g25 0x14 -#define COLLIDER_o139 0x13 -#define COLLIDER_o138 0x12 -#define COLLIDER_o137 0x11 -#define COLLIDER_tuitate 0x10 -#define COLLIDER_ttw 0xF -#define COLLIDER_tts 0xE -#define COLLIDER_tte 0xD -#define COLLIDER_ttn 0xC -#define COLLIDER_dero 0xB -#define COLLIDER_deilitw 0xA -#define COLLIDER_deiliw 0x9 -#define COLLIDER_deilits 0x8 -#define COLLIDER_deilis 0x7 -#define COLLIDER_deilite 0x6 -#define COLLIDER_deilie 0x5 -#define COLLIDER_deilitn 0x4 -#define COLLIDER_deilin 0x3 -#define COLLIDER_g1 0x2 -#define COLLIDER_mawari 0x1 -#define COLLIDER_stage 0x0 +#define COLLIDER_Root 0x15 +#define COLLIDER_g25 0x14 +#define COLLIDER_o139 0x13 +#define COLLIDER_o138 0x12 +#define COLLIDER_o137 0x11 +#define COLLIDER_tuitate 0x10 +#define COLLIDER_ttw 0xF +#define COLLIDER_tts 0xE +#define COLLIDER_tte 0xD +#define COLLIDER_ttn 0xC +#define COLLIDER_dero 0xB +#define COLLIDER_deilitw 0xA +#define COLLIDER_deiliw 0x9 +#define COLLIDER_deilits 0x8 +#define COLLIDER_deilis 0x7 +#define COLLIDER_deilite 0x6 +#define COLLIDER_deilie 0x5 +#define COLLIDER_deilitn 0x4 +#define COLLIDER_deilin 0x3 +#define COLLIDER_g1 0x2 +#define COLLIDER_mawari 0x1 +#define COLLIDER_stage 0x0 + +#define ZONE_Root 0xD +#define ZONE_g1 0xC +#define ZONE_g6 0xB +#define ZONE_g7 0xA +#define ZONE_b_w 0x9 +#define ZONE_g11 0x8 +#define ZONE_b_s 0x7 +#define ZONE_g8 0x6 +#define ZONE_b_e 0x5 +#define ZONE_g12 0x4 +#define ZONE_b_n 0x3 +#define ZONE_g2 0x2 +#define ZONE_g10 0x1 +#define ZONE_hiru_came 0x0 + diff --git a/include/mapfs/sbk_11_shape.h b/include/mapfs/sbk_11_shape.h index 1c7afd61b4..8e09547d99 100644 --- a/include/mapfs/sbk_11_shape.h +++ b/include/mapfs/sbk_11_shape.h @@ -1,24 +1,25 @@ -#define MODEL_Root 0x17 -#define MODEL_g1 0x16 -#define MODEL_g28 0x15 -#define MODEL_o57 0x14 -#define MODEL_o56 0x13 -#define MODEL_o55 0x12 -#define MODEL_exit 0x11 -#define MODEL_g7 0x10 -#define MODEL_b_w2 0xF -#define MODEL_b_w 0xE -#define MODEL_g11 0xD -#define MODEL_b_s2 0xC -#define MODEL_b_s 0xB -#define MODEL_g8 0xA -#define MODEL_b_e2 0x9 -#define MODEL_b_e 0x8 -#define MODEL_g12 0x7 -#define MODEL_b_n2 0x6 -#define MODEL_b_n 0x5 -#define MODEL_g2 0x4 -#define MODEL_g10 0x3 -#define MODEL_stage 0x2 -#define MODEL_g5 0x1 -#define MODEL_o3 0x0 +#define MODEL_Root 0x17 +#define MODEL_g1 0x16 +#define MODEL_g28 0x15 +#define MODEL_o57 0x14 +#define MODEL_o56 0x13 +#define MODEL_o55 0x12 +#define MODEL_exit 0x11 +#define MODEL_g7 0x10 +#define MODEL_b_w2 0xF +#define MODEL_b_w 0xE +#define MODEL_g11 0xD +#define MODEL_b_s2 0xC +#define MODEL_b_s 0xB +#define MODEL_g8 0xA +#define MODEL_b_e2 0x9 +#define MODEL_b_e 0x8 +#define MODEL_g12 0x7 +#define MODEL_b_n2 0x6 +#define MODEL_b_n 0x5 +#define MODEL_g2 0x4 +#define MODEL_g10 0x3 +#define MODEL_stage 0x2 +#define MODEL_g5 0x1 +#define MODEL_o3 0x0 + diff --git a/include/mapfs/sbk_12_hit.h b/include/mapfs/sbk_12_hit.h index 05bb14302f..29490db0c9 100644 --- a/include/mapfs/sbk_12_hit.h +++ b/include/mapfs/sbk_12_hit.h @@ -1,22 +1,38 @@ -#define COLLIDER_Root 0x15 -#define COLLIDER_g25 0x14 -#define COLLIDER_o154 0x13 -#define COLLIDER_o152 0x12 -#define COLLIDER_o151 0x11 -#define COLLIDER_tuitate 0x10 -#define COLLIDER_ttw 0xF -#define COLLIDER_tts 0xE -#define COLLIDER_tte 0xD -#define COLLIDER_ttn 0xC -#define COLLIDER_dero 0xB -#define COLLIDER_deilitw 0xA -#define COLLIDER_deiliw 0x9 -#define COLLIDER_deilits 0x8 -#define COLLIDER_deilis 0x7 -#define COLLIDER_deilite 0x6 -#define COLLIDER_deilie 0x5 -#define COLLIDER_deilitn 0x4 -#define COLLIDER_deilin 0x3 -#define COLLIDER_g1 0x2 -#define COLLIDER_mawari 0x1 -#define COLLIDER_stage 0x0 +#define COLLIDER_Root 0x15 +#define COLLIDER_g25 0x14 +#define COLLIDER_o154 0x13 +#define COLLIDER_o152 0x12 +#define COLLIDER_o151 0x11 +#define COLLIDER_tuitate 0x10 +#define COLLIDER_ttw 0xF +#define COLLIDER_tts 0xE +#define COLLIDER_tte 0xD +#define COLLIDER_ttn 0xC +#define COLLIDER_dero 0xB +#define COLLIDER_deilitw 0xA +#define COLLIDER_deiliw 0x9 +#define COLLIDER_deilits 0x8 +#define COLLIDER_deilis 0x7 +#define COLLIDER_deilite 0x6 +#define COLLIDER_deilie 0x5 +#define COLLIDER_deilitn 0x4 +#define COLLIDER_deilin 0x3 +#define COLLIDER_g1 0x2 +#define COLLIDER_mawari 0x1 +#define COLLIDER_stage 0x0 + +#define ZONE_Root 0xD +#define ZONE_g1 0xC +#define ZONE_g6 0xB +#define ZONE_g7 0xA +#define ZONE_b_w 0x9 +#define ZONE_g11 0x8 +#define ZONE_b_s 0x7 +#define ZONE_g8 0x6 +#define ZONE_b_e 0x5 +#define ZONE_g12 0x4 +#define ZONE_b_n 0x3 +#define ZONE_g2 0x2 +#define ZONE_g10 0x1 +#define ZONE_hiru_came 0x0 + diff --git a/include/mapfs/sbk_12_shape.h b/include/mapfs/sbk_12_shape.h index a99b1d083a..811a33df68 100644 --- a/include/mapfs/sbk_12_shape.h +++ b/include/mapfs/sbk_12_shape.h @@ -1,34 +1,35 @@ -#define MODEL_Root 0x21 -#define MODEL_g1 0x20 -#define MODEL_g28 0x1F -#define MODEL_g31 0x1E -#define MODEL_o64 0x1D -#define MODEL_o63 0x1C -#define MODEL_o62 0x1B -#define MODEL_o61 0x1A -#define MODEL_g30 0x19 -#define MODEL_o60 0x18 -#define MODEL_o59 0x17 -#define MODEL_o58 0x16 -#define MODEL_o57 0x15 -#define MODEL_g29 0x14 -#define MODEL_o56 0x13 -#define MODEL_o55 0x12 -#define MODEL_exit 0x11 -#define MODEL_g7 0x10 -#define MODEL_b_w2 0xF -#define MODEL_b_w 0xE -#define MODEL_g11 0xD -#define MODEL_b_s2 0xC -#define MODEL_b_s 0xB -#define MODEL_g8 0xA -#define MODEL_b_e2 0x9 -#define MODEL_b_e 0x8 -#define MODEL_g12 0x7 -#define MODEL_b_n2 0x6 -#define MODEL_b_n 0x5 -#define MODEL_g2 0x4 -#define MODEL_g10 0x3 -#define MODEL_stage 0x2 -#define MODEL_g5 0x1 -#define MODEL_o3 0x0 +#define MODEL_Root 0x21 +#define MODEL_g1 0x20 +#define MODEL_g28 0x1F +#define MODEL_g31 0x1E +#define MODEL_o64 0x1D +#define MODEL_o63 0x1C +#define MODEL_o62 0x1B +#define MODEL_o61 0x1A +#define MODEL_g30 0x19 +#define MODEL_o60 0x18 +#define MODEL_o59 0x17 +#define MODEL_o58 0x16 +#define MODEL_o57 0x15 +#define MODEL_g29 0x14 +#define MODEL_o56 0x13 +#define MODEL_o55 0x12 +#define MODEL_exit 0x11 +#define MODEL_g7 0x10 +#define MODEL_b_w2 0xF +#define MODEL_b_w 0xE +#define MODEL_g11 0xD +#define MODEL_b_s2 0xC +#define MODEL_b_s 0xB +#define MODEL_g8 0xA +#define MODEL_b_e2 0x9 +#define MODEL_b_e 0x8 +#define MODEL_g12 0x7 +#define MODEL_b_n2 0x6 +#define MODEL_b_n 0x5 +#define MODEL_g2 0x4 +#define MODEL_g10 0x3 +#define MODEL_stage 0x2 +#define MODEL_g5 0x1 +#define MODEL_o3 0x0 + diff --git a/include/mapfs/sbk_13_hit.h b/include/mapfs/sbk_13_hit.h index a46845cc3f..afa1cd852a 100644 --- a/include/mapfs/sbk_13_hit.h +++ b/include/mapfs/sbk_13_hit.h @@ -1,24 +1,40 @@ -#define COLLIDER_Root 0x17 -#define COLLIDER_g25 0x16 -#define COLLIDER_o154 0x15 -#define COLLIDER_o141 0x14 -#define COLLIDER_o153 0x13 -#define COLLIDER_o152 0x12 -#define COLLIDER_o151 0x11 -#define COLLIDER_tuitate 0x10 -#define COLLIDER_ttw 0xF -#define COLLIDER_tts 0xE -#define COLLIDER_tte 0xD -#define COLLIDER_ttn 0xC -#define COLLIDER_dero 0xB -#define COLLIDER_deilitw 0xA -#define COLLIDER_deiliw 0x9 -#define COLLIDER_deilits 0x8 -#define COLLIDER_deilis 0x7 -#define COLLIDER_deilite 0x6 -#define COLLIDER_deilie 0x5 -#define COLLIDER_deilitn 0x4 -#define COLLIDER_deilin 0x3 -#define COLLIDER_g1 0x2 -#define COLLIDER_mawari 0x1 -#define COLLIDER_stage 0x0 +#define COLLIDER_Root 0x17 +#define COLLIDER_g25 0x16 +#define COLLIDER_o154 0x15 +#define COLLIDER_o141 0x14 +#define COLLIDER_o153 0x13 +#define COLLIDER_o152 0x12 +#define COLLIDER_o151 0x11 +#define COLLIDER_tuitate 0x10 +#define COLLIDER_ttw 0xF +#define COLLIDER_tts 0xE +#define COLLIDER_tte 0xD +#define COLLIDER_ttn 0xC +#define COLLIDER_dero 0xB +#define COLLIDER_deilitw 0xA +#define COLLIDER_deiliw 0x9 +#define COLLIDER_deilits 0x8 +#define COLLIDER_deilis 0x7 +#define COLLIDER_deilite 0x6 +#define COLLIDER_deilie 0x5 +#define COLLIDER_deilitn 0x4 +#define COLLIDER_deilin 0x3 +#define COLLIDER_g1 0x2 +#define COLLIDER_mawari 0x1 +#define COLLIDER_stage 0x0 + +#define ZONE_Root 0xD +#define ZONE_g1 0xC +#define ZONE_g6 0xB +#define ZONE_g7 0xA +#define ZONE_b_w 0x9 +#define ZONE_g11 0x8 +#define ZONE_b_s 0x7 +#define ZONE_g8 0x6 +#define ZONE_b_e 0x5 +#define ZONE_g12 0x4 +#define ZONE_b_n 0x3 +#define ZONE_g2 0x2 +#define ZONE_g10 0x1 +#define ZONE_hiru_came 0x0 + diff --git a/include/mapfs/sbk_13_shape.h b/include/mapfs/sbk_13_shape.h index bd0c4cb7cf..40e3fd77ec 100644 --- a/include/mapfs/sbk_13_shape.h +++ b/include/mapfs/sbk_13_shape.h @@ -1,42 +1,43 @@ -#define MODEL_Root 0x29 -#define MODEL_g29 0x28 -#define MODEL_g34 0x27 -#define MODEL_o70 0x26 -#define MODEL_o69 0x25 -#define MODEL_g33 0x24 -#define MODEL_o68 0x23 -#define MODEL_o67 0x22 -#define MODEL_o66 0x21 -#define MODEL_o65 0x20 -#define MODEL_g32 0x1F -#define MODEL_o64 0x1E -#define MODEL_o63 0x1D -#define MODEL_o62 0x1C -#define MODEL_o61 0x1B -#define MODEL_g31 0x1A -#define MODEL_o60 0x19 -#define MODEL_o59 0x18 -#define MODEL_g30 0x17 -#define MODEL_o58 0x16 -#define MODEL_o57 0x15 -#define MODEL_o56 0x14 -#define MODEL_o55 0x13 -#define MODEL_g1 0x12 -#define MODEL_exit 0x11 -#define MODEL_g7 0x10 -#define MODEL_b_w2 0xF -#define MODEL_b_w 0xE -#define MODEL_g11 0xD -#define MODEL_b_s2 0xC -#define MODEL_b_s 0xB -#define MODEL_g8 0xA -#define MODEL_b_e2 0x9 -#define MODEL_b_e 0x8 -#define MODEL_g12 0x7 -#define MODEL_b_n2 0x6 -#define MODEL_b_n 0x5 -#define MODEL_g2 0x4 -#define MODEL_g10 0x3 -#define MODEL_stage 0x2 -#define MODEL_g5 0x1 -#define MODEL_o3 0x0 +#define MODEL_Root 0x29 +#define MODEL_g29 0x28 +#define MODEL_g34 0x27 +#define MODEL_o70 0x26 +#define MODEL_o69 0x25 +#define MODEL_g33 0x24 +#define MODEL_o68 0x23 +#define MODEL_o67 0x22 +#define MODEL_o66 0x21 +#define MODEL_o65 0x20 +#define MODEL_g32 0x1F +#define MODEL_o64 0x1E +#define MODEL_o63 0x1D +#define MODEL_o62 0x1C +#define MODEL_o61 0x1B +#define MODEL_g31 0x1A +#define MODEL_o60 0x19 +#define MODEL_o59 0x18 +#define MODEL_g30 0x17 +#define MODEL_o58 0x16 +#define MODEL_o57 0x15 +#define MODEL_o56 0x14 +#define MODEL_o55 0x13 +#define MODEL_g1 0x12 +#define MODEL_exit 0x11 +#define MODEL_g7 0x10 +#define MODEL_b_w2 0xF +#define MODEL_b_w 0xE +#define MODEL_g11 0xD +#define MODEL_b_s2 0xC +#define MODEL_b_s 0xB +#define MODEL_g8 0xA +#define MODEL_b_e2 0x9 +#define MODEL_b_e 0x8 +#define MODEL_g12 0x7 +#define MODEL_b_n2 0x6 +#define MODEL_b_n 0x5 +#define MODEL_g2 0x4 +#define MODEL_g10 0x3 +#define MODEL_stage 0x2 +#define MODEL_g5 0x1 +#define MODEL_o3 0x0 + diff --git a/include/mapfs/sbk_14_hit.h b/include/mapfs/sbk_14_hit.h index 05bb14302f..29490db0c9 100644 --- a/include/mapfs/sbk_14_hit.h +++ b/include/mapfs/sbk_14_hit.h @@ -1,22 +1,38 @@ -#define COLLIDER_Root 0x15 -#define COLLIDER_g25 0x14 -#define COLLIDER_o154 0x13 -#define COLLIDER_o152 0x12 -#define COLLIDER_o151 0x11 -#define COLLIDER_tuitate 0x10 -#define COLLIDER_ttw 0xF -#define COLLIDER_tts 0xE -#define COLLIDER_tte 0xD -#define COLLIDER_ttn 0xC -#define COLLIDER_dero 0xB -#define COLLIDER_deilitw 0xA -#define COLLIDER_deiliw 0x9 -#define COLLIDER_deilits 0x8 -#define COLLIDER_deilis 0x7 -#define COLLIDER_deilite 0x6 -#define COLLIDER_deilie 0x5 -#define COLLIDER_deilitn 0x4 -#define COLLIDER_deilin 0x3 -#define COLLIDER_g1 0x2 -#define COLLIDER_mawari 0x1 -#define COLLIDER_stage 0x0 +#define COLLIDER_Root 0x15 +#define COLLIDER_g25 0x14 +#define COLLIDER_o154 0x13 +#define COLLIDER_o152 0x12 +#define COLLIDER_o151 0x11 +#define COLLIDER_tuitate 0x10 +#define COLLIDER_ttw 0xF +#define COLLIDER_tts 0xE +#define COLLIDER_tte 0xD +#define COLLIDER_ttn 0xC +#define COLLIDER_dero 0xB +#define COLLIDER_deilitw 0xA +#define COLLIDER_deiliw 0x9 +#define COLLIDER_deilits 0x8 +#define COLLIDER_deilis 0x7 +#define COLLIDER_deilite 0x6 +#define COLLIDER_deilie 0x5 +#define COLLIDER_deilitn 0x4 +#define COLLIDER_deilin 0x3 +#define COLLIDER_g1 0x2 +#define COLLIDER_mawari 0x1 +#define COLLIDER_stage 0x0 + +#define ZONE_Root 0xD +#define ZONE_g1 0xC +#define ZONE_g6 0xB +#define ZONE_g7 0xA +#define ZONE_b_w 0x9 +#define ZONE_g11 0x8 +#define ZONE_b_s 0x7 +#define ZONE_g8 0x6 +#define ZONE_b_e 0x5 +#define ZONE_g12 0x4 +#define ZONE_b_n 0x3 +#define ZONE_g2 0x2 +#define ZONE_g10 0x1 +#define ZONE_hiru_came 0x0 + diff --git a/include/mapfs/sbk_14_shape.h b/include/mapfs/sbk_14_shape.h index e3ef5688b2..70eb238713 100644 --- a/include/mapfs/sbk_14_shape.h +++ b/include/mapfs/sbk_14_shape.h @@ -1,34 +1,35 @@ -#define MODEL_Root 0x21 -#define MODEL_g1 0x20 -#define MODEL_g28 0x1F -#define MODEL_g31 0x1E -#define MODEL_o64 0x1D -#define MODEL_o63 0x1C -#define MODEL_g30 0x1B -#define MODEL_o62 0x1A -#define MODEL_o61 0x19 -#define MODEL_o60 0x18 -#define MODEL_o59 0x17 -#define MODEL_g29 0x16 -#define MODEL_o58 0x15 -#define MODEL_o57 0x14 -#define MODEL_o56 0x13 -#define MODEL_o55 0x12 -#define MODEL_exit 0x11 -#define MODEL_g7 0x10 -#define MODEL_b_w2 0xF -#define MODEL_b_w 0xE -#define MODEL_g11 0xD -#define MODEL_b_s2 0xC -#define MODEL_b_s 0xB -#define MODEL_g8 0xA -#define MODEL_b_e2 0x9 -#define MODEL_b_e 0x8 -#define MODEL_g12 0x7 -#define MODEL_b_n2 0x6 -#define MODEL_b_n 0x5 -#define MODEL_g2 0x4 -#define MODEL_g10 0x3 -#define MODEL_stage 0x2 -#define MODEL_g5 0x1 -#define MODEL_o3 0x0 +#define MODEL_Root 0x21 +#define MODEL_g1 0x20 +#define MODEL_g28 0x1F +#define MODEL_g31 0x1E +#define MODEL_o64 0x1D +#define MODEL_o63 0x1C +#define MODEL_g30 0x1B +#define MODEL_o62 0x1A +#define MODEL_o61 0x19 +#define MODEL_o60 0x18 +#define MODEL_o59 0x17 +#define MODEL_g29 0x16 +#define MODEL_o58 0x15 +#define MODEL_o57 0x14 +#define MODEL_o56 0x13 +#define MODEL_o55 0x12 +#define MODEL_exit 0x11 +#define MODEL_g7 0x10 +#define MODEL_b_w2 0xF +#define MODEL_b_w 0xE +#define MODEL_g11 0xD +#define MODEL_b_s2 0xC +#define MODEL_b_s 0xB +#define MODEL_g8 0xA +#define MODEL_b_e2 0x9 +#define MODEL_b_e 0x8 +#define MODEL_g12 0x7 +#define MODEL_b_n2 0x6 +#define MODEL_b_n 0x5 +#define MODEL_g2 0x4 +#define MODEL_g10 0x3 +#define MODEL_stage 0x2 +#define MODEL_g5 0x1 +#define MODEL_o3 0x0 + diff --git a/include/mapfs/sbk_15_hit.h b/include/mapfs/sbk_15_hit.h index f51203014d..0119511328 100644 --- a/include/mapfs/sbk_15_hit.h +++ b/include/mapfs/sbk_15_hit.h @@ -1,18 +1,34 @@ -#define COLLIDER_Root 0x11 -#define COLLIDER_tuitate 0x10 -#define COLLIDER_ttw 0xF -#define COLLIDER_tts 0xE -#define COLLIDER_tte 0xD -#define COLLIDER_ttn 0xC -#define COLLIDER_dero 0xB -#define COLLIDER_deilitw 0xA -#define COLLIDER_deiliw 0x9 -#define COLLIDER_deilits 0x8 -#define COLLIDER_deilis 0x7 -#define COLLIDER_deilite 0x6 -#define COLLIDER_deilie 0x5 -#define COLLIDER_deilitn 0x4 -#define COLLIDER_deilin 0x3 -#define COLLIDER_g1 0x2 -#define COLLIDER_mawari 0x1 -#define COLLIDER_stage 0x0 +#define COLLIDER_Root 0x11 +#define COLLIDER_tuitate 0x10 +#define COLLIDER_ttw 0xF +#define COLLIDER_tts 0xE +#define COLLIDER_tte 0xD +#define COLLIDER_ttn 0xC +#define COLLIDER_dero 0xB +#define COLLIDER_deilitw 0xA +#define COLLIDER_deiliw 0x9 +#define COLLIDER_deilits 0x8 +#define COLLIDER_deilis 0x7 +#define COLLIDER_deilite 0x6 +#define COLLIDER_deilie 0x5 +#define COLLIDER_deilitn 0x4 +#define COLLIDER_deilin 0x3 +#define COLLIDER_g1 0x2 +#define COLLIDER_mawari 0x1 +#define COLLIDER_stage 0x0 + +#define ZONE_Root 0xD +#define ZONE_g1 0xC +#define ZONE_g6 0xB +#define ZONE_g7 0xA +#define ZONE_b_w 0x9 +#define ZONE_g11 0x8 +#define ZONE_b_s 0x7 +#define ZONE_g8 0x6 +#define ZONE_b_e 0x5 +#define ZONE_g12 0x4 +#define ZONE_b_n 0x3 +#define ZONE_g2 0x2 +#define ZONE_g10 0x1 +#define ZONE_hiru_came 0x0 + diff --git a/include/mapfs/sbk_15_shape.h b/include/mapfs/sbk_15_shape.h index 12f2f73887..7e4eebcb24 100644 --- a/include/mapfs/sbk_15_shape.h +++ b/include/mapfs/sbk_15_shape.h @@ -1,20 +1,21 @@ -#define MODEL_Root 0x13 -#define MODEL_g1 0x12 -#define MODEL_exit 0x11 -#define MODEL_g7 0x10 -#define MODEL_b_w2 0xF -#define MODEL_b_w 0xE -#define MODEL_g11 0xD -#define MODEL_b_s2 0xC -#define MODEL_b_s 0xB -#define MODEL_g8 0xA -#define MODEL_b_e2 0x9 -#define MODEL_b_e 0x8 -#define MODEL_g12 0x7 -#define MODEL_b_n2 0x6 -#define MODEL_b_n 0x5 -#define MODEL_g2 0x4 -#define MODEL_g10 0x3 -#define MODEL_stage 0x2 -#define MODEL_g5 0x1 -#define MODEL_o3 0x0 +#define MODEL_Root 0x13 +#define MODEL_g1 0x12 +#define MODEL_exit 0x11 +#define MODEL_g7 0x10 +#define MODEL_b_w2 0xF +#define MODEL_b_w 0xE +#define MODEL_g11 0xD +#define MODEL_b_s2 0xC +#define MODEL_b_s 0xB +#define MODEL_g8 0xA +#define MODEL_b_e2 0x9 +#define MODEL_b_e 0x8 +#define MODEL_g12 0x7 +#define MODEL_b_n2 0x6 +#define MODEL_b_n 0x5 +#define MODEL_g2 0x4 +#define MODEL_g10 0x3 +#define MODEL_stage 0x2 +#define MODEL_g5 0x1 +#define MODEL_o3 0x0 + diff --git a/include/mapfs/sbk_16_hit.h b/include/mapfs/sbk_16_hit.h index 43d11249a9..c51e9b5b0c 100644 --- a/include/mapfs/sbk_16_hit.h +++ b/include/mapfs/sbk_16_hit.h @@ -1,18 +1,34 @@ -#define COLLIDER_Root 0x11 -#define COLLIDER_g48 0x10 -#define COLLIDER_o193 0xF -#define COLLIDER_o191 0xE -#define COLLIDER_tuitate 0xD -#define COLLIDER_ttw 0xC -#define COLLIDER_tts 0xB -#define COLLIDER_ttn 0xA -#define COLLIDER_dero 0x9 -#define COLLIDER_deilitw 0x8 -#define COLLIDER_deiliw 0x7 -#define COLLIDER_deilits 0x6 -#define COLLIDER_deilis 0x5 -#define COLLIDER_deilitn 0x4 -#define COLLIDER_deilin 0x3 -#define COLLIDER_g1 0x2 -#define COLLIDER_mawari 0x1 -#define COLLIDER_stage 0x0 +#define COLLIDER_Root 0x11 +#define COLLIDER_g48 0x10 +#define COLLIDER_o193 0xF +#define COLLIDER_o191 0xE +#define COLLIDER_tuitate 0xD +#define COLLIDER_ttw 0xC +#define COLLIDER_tts 0xB +#define COLLIDER_ttn 0xA +#define COLLIDER_dero 0x9 +#define COLLIDER_deilitw 0x8 +#define COLLIDER_deiliw 0x7 +#define COLLIDER_deilits 0x6 +#define COLLIDER_deilis 0x5 +#define COLLIDER_deilitn 0x4 +#define COLLIDER_deilin 0x3 +#define COLLIDER_g1 0x2 +#define COLLIDER_mawari 0x1 +#define COLLIDER_stage 0x0 + +#define ZONE_Root 0xD +#define ZONE_g1 0xC +#define ZONE_g6 0xB +#define ZONE_g7 0xA +#define ZONE_b_w 0x9 +#define ZONE_g11 0x8 +#define ZONE_b_s 0x7 +#define ZONE_g8 0x6 +#define ZONE_b_e 0x5 +#define ZONE_g12 0x4 +#define ZONE_b_n 0x3 +#define ZONE_g2 0x2 +#define ZONE_g10 0x1 +#define ZONE_hiru_came 0x0 + diff --git a/include/mapfs/sbk_16_shape.h b/include/mapfs/sbk_16_shape.h index fcded290e4..1069ad362b 100644 --- a/include/mapfs/sbk_16_shape.h +++ b/include/mapfs/sbk_16_shape.h @@ -1,26 +1,27 @@ -#define MODEL_Root 0x19 -#define MODEL_g1 0x18 -#define MODEL_g28 0x17 -#define MODEL_g31 0x16 -#define MODEL_o58 0x15 -#define MODEL_o57 0x14 -#define MODEL_o61 0x13 -#define MODEL_g30 0x12 -#define MODEL_o62 0x11 -#define MODEL_o56 0x10 -#define MODEL_o55 0xF -#define MODEL_exit 0xE -#define MODEL_g7 0xD -#define MODEL_b_w2 0xC -#define MODEL_b_w 0xB -#define MODEL_g11 0xA -#define MODEL_b_s2 0x9 -#define MODEL_b_s 0x8 -#define MODEL_g12 0x7 -#define MODEL_b_n2 0x6 -#define MODEL_b_n 0x5 -#define MODEL_g2 0x4 -#define MODEL_g10 0x3 -#define MODEL_stage 0x2 -#define MODEL_g5 0x1 -#define MODEL_o3 0x0 +#define MODEL_Root 0x19 +#define MODEL_g1 0x18 +#define MODEL_g28 0x17 +#define MODEL_g31 0x16 +#define MODEL_o58 0x15 +#define MODEL_o57 0x14 +#define MODEL_o61 0x13 +#define MODEL_g30 0x12 +#define MODEL_o62 0x11 +#define MODEL_o56 0x10 +#define MODEL_o55 0xF +#define MODEL_exit 0xE +#define MODEL_g7 0xD +#define MODEL_b_w2 0xC +#define MODEL_b_w 0xB +#define MODEL_g11 0xA +#define MODEL_b_s2 0x9 +#define MODEL_b_s 0x8 +#define MODEL_g12 0x7 +#define MODEL_b_n2 0x6 +#define MODEL_b_n 0x5 +#define MODEL_g2 0x4 +#define MODEL_g10 0x3 +#define MODEL_stage 0x2 +#define MODEL_g5 0x1 +#define MODEL_o3 0x0 + diff --git a/include/mapfs/sbk_20_hit.h b/include/mapfs/sbk_20_hit.h index 01daabe6e5..11152e0cd7 100644 --- a/include/mapfs/sbk_20_hit.h +++ b/include/mapfs/sbk_20_hit.h @@ -1,27 +1,43 @@ -#define COLLIDER_Root 0x1A -#define COLLIDER_g23 0x19 -#define COLLIDER_o98 0x18 -#define COLLIDER_o97 0x17 -#define COLLIDER_o96 0x16 -#define COLLIDER_o95 0x15 -#define COLLIDER_o94 0x14 -#define COLLIDER_o92 0x13 -#define COLLIDER_o91 0x12 -#define COLLIDER_o89 0x11 -#define COLLIDER_o87 0x10 -#define COLLIDER_o86 0xF -#define COLLIDER_o84 0xE -#define COLLIDER_tuitate 0xD -#define COLLIDER_tts 0xC -#define COLLIDER_tte 0xB -#define COLLIDER_ttn 0xA -#define COLLIDER_dero 0x9 -#define COLLIDER_deilits 0x8 -#define COLLIDER_deilis 0x7 -#define COLLIDER_deilite 0x6 -#define COLLIDER_deilie 0x5 -#define COLLIDER_deilitn 0x4 -#define COLLIDER_deilin 0x3 -#define COLLIDER_g1 0x2 -#define COLLIDER_mawari 0x1 -#define COLLIDER_stage 0x0 +#define COLLIDER_Root 0x1A +#define COLLIDER_g23 0x19 +#define COLLIDER_o98 0x18 +#define COLLIDER_o97 0x17 +#define COLLIDER_o96 0x16 +#define COLLIDER_o95 0x15 +#define COLLIDER_o94 0x14 +#define COLLIDER_o92 0x13 +#define COLLIDER_o91 0x12 +#define COLLIDER_o89 0x11 +#define COLLIDER_o87 0x10 +#define COLLIDER_o86 0xF +#define COLLIDER_o84 0xE +#define COLLIDER_tuitate 0xD +#define COLLIDER_tts 0xC +#define COLLIDER_tte 0xB +#define COLLIDER_ttn 0xA +#define COLLIDER_dero 0x9 +#define COLLIDER_deilits 0x8 +#define COLLIDER_deilis 0x7 +#define COLLIDER_deilite 0x6 +#define COLLIDER_deilie 0x5 +#define COLLIDER_deilitn 0x4 +#define COLLIDER_deilin 0x3 +#define COLLIDER_g1 0x2 +#define COLLIDER_mawari 0x1 +#define COLLIDER_stage 0x0 + +#define ZONE_Root 0xD +#define ZONE_g1 0xC +#define ZONE_g6 0xB +#define ZONE_g7 0xA +#define ZONE_b_w 0x9 +#define ZONE_g11 0x8 +#define ZONE_b_s 0x7 +#define ZONE_g8 0x6 +#define ZONE_b_e 0x5 +#define ZONE_g12 0x4 +#define ZONE_b_n 0x3 +#define ZONE_g2 0x2 +#define ZONE_g10 0x1 +#define ZONE_hiru_came 0x0 + diff --git a/include/mapfs/sbk_20_shape.h b/include/mapfs/sbk_20_shape.h index 75b84bc941..ebc8d2811a 100644 --- a/include/mapfs/sbk_20_shape.h +++ b/include/mapfs/sbk_20_shape.h @@ -1,30 +1,31 @@ -#define MODEL_Root 0x1D -#define MODEL_g1 0x1C -#define MODEL_g28 0x1B -#define MODEL_g29 0x1A -#define MODEL_o65 0x19 -#define MODEL_o63 0x18 -#define MODEL_o62 0x17 -#define MODEL_o61 0x16 -#define MODEL_o64 0x15 -#define MODEL_o60 0x14 -#define MODEL_o59 0x13 -#define MODEL_o58 0x12 -#define MODEL_o57 0x11 -#define MODEL_o56 0x10 -#define MODEL_o55 0xF -#define MODEL_exit 0xE -#define MODEL_g11 0xD -#define MODEL_b_s2 0xC -#define MODEL_b_s 0xB -#define MODEL_g8 0xA -#define MODEL_b_e2 0x9 -#define MODEL_b_e 0x8 -#define MODEL_g12 0x7 -#define MODEL_b_n2 0x6 -#define MODEL_b_n 0x5 -#define MODEL_g2 0x4 -#define MODEL_g10 0x3 -#define MODEL_stage 0x2 -#define MODEL_g5 0x1 -#define MODEL_o3 0x0 +#define MODEL_Root 0x1D +#define MODEL_g1 0x1C +#define MODEL_g28 0x1B +#define MODEL_g29 0x1A +#define MODEL_o65 0x19 +#define MODEL_o63 0x18 +#define MODEL_o62 0x17 +#define MODEL_o61 0x16 +#define MODEL_o64 0x15 +#define MODEL_o60 0x14 +#define MODEL_o59 0x13 +#define MODEL_o58 0x12 +#define MODEL_o57 0x11 +#define MODEL_o56 0x10 +#define MODEL_o55 0xF +#define MODEL_exit 0xE +#define MODEL_g11 0xD +#define MODEL_b_s2 0xC +#define MODEL_b_s 0xB +#define MODEL_g8 0xA +#define MODEL_b_e2 0x9 +#define MODEL_b_e 0x8 +#define MODEL_g12 0x7 +#define MODEL_b_n2 0x6 +#define MODEL_b_n 0x5 +#define MODEL_g2 0x4 +#define MODEL_g10 0x3 +#define MODEL_stage 0x2 +#define MODEL_g5 0x1 +#define MODEL_o3 0x0 + diff --git a/include/mapfs/sbk_21_hit.h b/include/mapfs/sbk_21_hit.h index 0ded704f0e..2a7230d78e 100644 --- a/include/mapfs/sbk_21_hit.h +++ b/include/mapfs/sbk_21_hit.h @@ -1,24 +1,40 @@ -#define COLLIDER_Root 0x17 -#define COLLIDER_g24 0x16 -#define COLLIDER_o94 0x15 -#define COLLIDER_o93 0x14 -#define COLLIDER_o92 0x13 -#define COLLIDER_o91 0x12 -#define COLLIDER_o90 0x11 -#define COLLIDER_tuitate 0x10 -#define COLLIDER_ttw 0xF -#define COLLIDER_tts 0xE -#define COLLIDER_tte 0xD -#define COLLIDER_ttn 0xC -#define COLLIDER_dero 0xB -#define COLLIDER_deilitw 0xA -#define COLLIDER_deiliw 0x9 -#define COLLIDER_deilits 0x8 -#define COLLIDER_deilis 0x7 -#define COLLIDER_deilite 0x6 -#define COLLIDER_deilie 0x5 -#define COLLIDER_deilitn 0x4 -#define COLLIDER_deilin 0x3 -#define COLLIDER_g1 0x2 -#define COLLIDER_mawari 0x1 -#define COLLIDER_stage 0x0 +#define COLLIDER_Root 0x17 +#define COLLIDER_g24 0x16 +#define COLLIDER_o94 0x15 +#define COLLIDER_o93 0x14 +#define COLLIDER_o92 0x13 +#define COLLIDER_o91 0x12 +#define COLLIDER_o90 0x11 +#define COLLIDER_tuitate 0x10 +#define COLLIDER_ttw 0xF +#define COLLIDER_tts 0xE +#define COLLIDER_tte 0xD +#define COLLIDER_ttn 0xC +#define COLLIDER_dero 0xB +#define COLLIDER_deilitw 0xA +#define COLLIDER_deiliw 0x9 +#define COLLIDER_deilits 0x8 +#define COLLIDER_deilis 0x7 +#define COLLIDER_deilite 0x6 +#define COLLIDER_deilie 0x5 +#define COLLIDER_deilitn 0x4 +#define COLLIDER_deilin 0x3 +#define COLLIDER_g1 0x2 +#define COLLIDER_mawari 0x1 +#define COLLIDER_stage 0x0 + +#define ZONE_Root 0xD +#define ZONE_g1 0xC +#define ZONE_g6 0xB +#define ZONE_g7 0xA +#define ZONE_b_w 0x9 +#define ZONE_g11 0x8 +#define ZONE_b_s 0x7 +#define ZONE_g8 0x6 +#define ZONE_b_e 0x5 +#define ZONE_g12 0x4 +#define ZONE_b_n 0x3 +#define ZONE_g2 0x2 +#define ZONE_g10 0x1 +#define ZONE_hiru_came 0x0 + diff --git a/include/mapfs/sbk_21_shape.h b/include/mapfs/sbk_21_shape.h index e99be013d5..7f354a7d1c 100644 --- a/include/mapfs/sbk_21_shape.h +++ b/include/mapfs/sbk_21_shape.h @@ -1,26 +1,27 @@ -#define MODEL_Root 0x19 -#define MODEL_g1 0x18 -#define MODEL_g28 0x17 -#define MODEL_o59 0x16 -#define MODEL_o58 0x15 -#define MODEL_o57 0x14 -#define MODEL_o56 0x13 -#define MODEL_o55 0x12 -#define MODEL_exit 0x11 -#define MODEL_g7 0x10 -#define MODEL_b_w2 0xF -#define MODEL_b_w 0xE -#define MODEL_g11 0xD -#define MODEL_b_s2 0xC -#define MODEL_b_s 0xB -#define MODEL_g8 0xA -#define MODEL_b_e2 0x9 -#define MODEL_b_e 0x8 -#define MODEL_g12 0x7 -#define MODEL_b_n2 0x6 -#define MODEL_b_n 0x5 -#define MODEL_g2 0x4 -#define MODEL_g10 0x3 -#define MODEL_stage 0x2 -#define MODEL_g5 0x1 -#define MODEL_o3 0x0 +#define MODEL_Root 0x19 +#define MODEL_g1 0x18 +#define MODEL_g28 0x17 +#define MODEL_o59 0x16 +#define MODEL_o58 0x15 +#define MODEL_o57 0x14 +#define MODEL_o56 0x13 +#define MODEL_o55 0x12 +#define MODEL_exit 0x11 +#define MODEL_g7 0x10 +#define MODEL_b_w2 0xF +#define MODEL_b_w 0xE +#define MODEL_g11 0xD +#define MODEL_b_s2 0xC +#define MODEL_b_s 0xB +#define MODEL_g8 0xA +#define MODEL_b_e2 0x9 +#define MODEL_b_e 0x8 +#define MODEL_g12 0x7 +#define MODEL_b_n2 0x6 +#define MODEL_b_n 0x5 +#define MODEL_g2 0x4 +#define MODEL_g10 0x3 +#define MODEL_stage 0x2 +#define MODEL_g5 0x1 +#define MODEL_o3 0x0 + diff --git a/include/mapfs/sbk_22_hit.h b/include/mapfs/sbk_22_hit.h index c9d71dfbae..bbca1e9156 100644 --- a/include/mapfs/sbk_22_hit.h +++ b/include/mapfs/sbk_22_hit.h @@ -1,20 +1,36 @@ -#define COLLIDER_Root 0x13 -#define COLLIDER_g25 0x12 -#define COLLIDER_o152 0x11 -#define COLLIDER_tuitate 0x10 -#define COLLIDER_ttw 0xF -#define COLLIDER_tts 0xE -#define COLLIDER_tte 0xD -#define COLLIDER_ttn 0xC -#define COLLIDER_dero 0xB -#define COLLIDER_deilitw 0xA -#define COLLIDER_deiliw 0x9 -#define COLLIDER_deilits 0x8 -#define COLLIDER_deilis 0x7 -#define COLLIDER_deilite 0x6 -#define COLLIDER_deilie 0x5 -#define COLLIDER_deilitn 0x4 -#define COLLIDER_deilin 0x3 -#define COLLIDER_g1 0x2 -#define COLLIDER_mawari 0x1 -#define COLLIDER_stage 0x0 +#define COLLIDER_Root 0x13 +#define COLLIDER_g25 0x12 +#define COLLIDER_o152 0x11 +#define COLLIDER_tuitate 0x10 +#define COLLIDER_ttw 0xF +#define COLLIDER_tts 0xE +#define COLLIDER_tte 0xD +#define COLLIDER_ttn 0xC +#define COLLIDER_dero 0xB +#define COLLIDER_deilitw 0xA +#define COLLIDER_deiliw 0x9 +#define COLLIDER_deilits 0x8 +#define COLLIDER_deilis 0x7 +#define COLLIDER_deilite 0x6 +#define COLLIDER_deilie 0x5 +#define COLLIDER_deilitn 0x4 +#define COLLIDER_deilin 0x3 +#define COLLIDER_g1 0x2 +#define COLLIDER_mawari 0x1 +#define COLLIDER_stage 0x0 + +#define ZONE_Root 0xD +#define ZONE_g1 0xC +#define ZONE_g6 0xB +#define ZONE_g7 0xA +#define ZONE_b_w 0x9 +#define ZONE_g11 0x8 +#define ZONE_b_s 0x7 +#define ZONE_g8 0x6 +#define ZONE_b_e 0x5 +#define ZONE_g12 0x4 +#define ZONE_b_n 0x3 +#define ZONE_g2 0x2 +#define ZONE_g10 0x1 +#define ZONE_hiru_came 0x0 + diff --git a/include/mapfs/sbk_22_shape.h b/include/mapfs/sbk_22_shape.h index 4d16f7bdf1..5c6644df22 100644 --- a/include/mapfs/sbk_22_shape.h +++ b/include/mapfs/sbk_22_shape.h @@ -1,26 +1,27 @@ -#define MODEL_Root 0x19 -#define MODEL_g1 0x18 -#define MODEL_g28 0x17 -#define MODEL_g30 0x16 -#define MODEL_o61 0x15 -#define MODEL_o60 0x14 -#define MODEL_o59 0x13 -#define MODEL_o58 0x12 -#define MODEL_exit 0x11 -#define MODEL_g7 0x10 -#define MODEL_b_w2 0xF -#define MODEL_b_w 0xE -#define MODEL_g11 0xD -#define MODEL_b_s2 0xC -#define MODEL_b_s 0xB -#define MODEL_g8 0xA -#define MODEL_b_e2 0x9 -#define MODEL_b_e 0x8 -#define MODEL_g12 0x7 -#define MODEL_b_n2 0x6 -#define MODEL_b_n 0x5 -#define MODEL_g2 0x4 -#define MODEL_g10 0x3 -#define MODEL_stage 0x2 -#define MODEL_g5 0x1 -#define MODEL_o3 0x0 +#define MODEL_Root 0x19 +#define MODEL_g1 0x18 +#define MODEL_g28 0x17 +#define MODEL_g30 0x16 +#define MODEL_o61 0x15 +#define MODEL_o60 0x14 +#define MODEL_o59 0x13 +#define MODEL_o58 0x12 +#define MODEL_exit 0x11 +#define MODEL_g7 0x10 +#define MODEL_b_w2 0xF +#define MODEL_b_w 0xE +#define MODEL_g11 0xD +#define MODEL_b_s2 0xC +#define MODEL_b_s 0xB +#define MODEL_g8 0xA +#define MODEL_b_e2 0x9 +#define MODEL_b_e 0x8 +#define MODEL_g12 0x7 +#define MODEL_b_n2 0x6 +#define MODEL_b_n 0x5 +#define MODEL_g2 0x4 +#define MODEL_g10 0x3 +#define MODEL_stage 0x2 +#define MODEL_g5 0x1 +#define MODEL_o3 0x0 + diff --git a/include/mapfs/sbk_23_hit.h b/include/mapfs/sbk_23_hit.h index 05bb14302f..29490db0c9 100644 --- a/include/mapfs/sbk_23_hit.h +++ b/include/mapfs/sbk_23_hit.h @@ -1,22 +1,38 @@ -#define COLLIDER_Root 0x15 -#define COLLIDER_g25 0x14 -#define COLLIDER_o154 0x13 -#define COLLIDER_o152 0x12 -#define COLLIDER_o151 0x11 -#define COLLIDER_tuitate 0x10 -#define COLLIDER_ttw 0xF -#define COLLIDER_tts 0xE -#define COLLIDER_tte 0xD -#define COLLIDER_ttn 0xC -#define COLLIDER_dero 0xB -#define COLLIDER_deilitw 0xA -#define COLLIDER_deiliw 0x9 -#define COLLIDER_deilits 0x8 -#define COLLIDER_deilis 0x7 -#define COLLIDER_deilite 0x6 -#define COLLIDER_deilie 0x5 -#define COLLIDER_deilitn 0x4 -#define COLLIDER_deilin 0x3 -#define COLLIDER_g1 0x2 -#define COLLIDER_mawari 0x1 -#define COLLIDER_stage 0x0 +#define COLLIDER_Root 0x15 +#define COLLIDER_g25 0x14 +#define COLLIDER_o154 0x13 +#define COLLIDER_o152 0x12 +#define COLLIDER_o151 0x11 +#define COLLIDER_tuitate 0x10 +#define COLLIDER_ttw 0xF +#define COLLIDER_tts 0xE +#define COLLIDER_tte 0xD +#define COLLIDER_ttn 0xC +#define COLLIDER_dero 0xB +#define COLLIDER_deilitw 0xA +#define COLLIDER_deiliw 0x9 +#define COLLIDER_deilits 0x8 +#define COLLIDER_deilis 0x7 +#define COLLIDER_deilite 0x6 +#define COLLIDER_deilie 0x5 +#define COLLIDER_deilitn 0x4 +#define COLLIDER_deilin 0x3 +#define COLLIDER_g1 0x2 +#define COLLIDER_mawari 0x1 +#define COLLIDER_stage 0x0 + +#define ZONE_Root 0xD +#define ZONE_g1 0xC +#define ZONE_g6 0xB +#define ZONE_g7 0xA +#define ZONE_b_w 0x9 +#define ZONE_g11 0x8 +#define ZONE_b_s 0x7 +#define ZONE_g8 0x6 +#define ZONE_b_e 0x5 +#define ZONE_g12 0x4 +#define ZONE_b_n 0x3 +#define ZONE_g2 0x2 +#define ZONE_g10 0x1 +#define ZONE_hiru_came 0x0 + diff --git a/include/mapfs/sbk_23_shape.h b/include/mapfs/sbk_23_shape.h index 7c2e25eef2..b02cb206be 100644 --- a/include/mapfs/sbk_23_shape.h +++ b/include/mapfs/sbk_23_shape.h @@ -1,34 +1,35 @@ -#define MODEL_Root 0x21 -#define MODEL_g1 0x20 -#define MODEL_g28 0x1F -#define MODEL_g34 0x1E -#define MODEL_o70 0x1D -#define MODEL_o69 0x1C -#define MODEL_g32 0x1B -#define MODEL_o64 0x1A -#define MODEL_o63 0x19 -#define MODEL_o62 0x18 -#define MODEL_o61 0x17 -#define MODEL_g30 0x16 -#define MODEL_o58 0x15 -#define MODEL_o57 0x14 -#define MODEL_o56 0x13 -#define MODEL_o55 0x12 -#define MODEL_exit 0x11 -#define MODEL_g7 0x10 -#define MODEL_b_w2 0xF -#define MODEL_b_w 0xE -#define MODEL_g11 0xD -#define MODEL_b_s2 0xC -#define MODEL_b_s 0xB -#define MODEL_g8 0xA -#define MODEL_b_e2 0x9 -#define MODEL_b_e 0x8 -#define MODEL_g12 0x7 -#define MODEL_b_n2 0x6 -#define MODEL_b_n 0x5 -#define MODEL_g2 0x4 -#define MODEL_g10 0x3 -#define MODEL_stage 0x2 -#define MODEL_g5 0x1 -#define MODEL_o3 0x0 +#define MODEL_Root 0x21 +#define MODEL_g1 0x20 +#define MODEL_g28 0x1F +#define MODEL_g34 0x1E +#define MODEL_o70 0x1D +#define MODEL_o69 0x1C +#define MODEL_g32 0x1B +#define MODEL_o64 0x1A +#define MODEL_o63 0x19 +#define MODEL_o62 0x18 +#define MODEL_o61 0x17 +#define MODEL_g30 0x16 +#define MODEL_o58 0x15 +#define MODEL_o57 0x14 +#define MODEL_o56 0x13 +#define MODEL_o55 0x12 +#define MODEL_exit 0x11 +#define MODEL_g7 0x10 +#define MODEL_b_w2 0xF +#define MODEL_b_w 0xE +#define MODEL_g11 0xD +#define MODEL_b_s2 0xC +#define MODEL_b_s 0xB +#define MODEL_g8 0xA +#define MODEL_b_e2 0x9 +#define MODEL_b_e 0x8 +#define MODEL_g12 0x7 +#define MODEL_b_n2 0x6 +#define MODEL_b_n 0x5 +#define MODEL_g2 0x4 +#define MODEL_g10 0x3 +#define MODEL_stage 0x2 +#define MODEL_g5 0x1 +#define MODEL_o3 0x0 + diff --git a/include/mapfs/sbk_24_hit.h b/include/mapfs/sbk_24_hit.h index 6c965e037d..adf10a364a 100644 --- a/include/mapfs/sbk_24_hit.h +++ b/include/mapfs/sbk_24_hit.h @@ -1,23 +1,39 @@ -#define COLLIDER_Root 0x16 -#define COLLIDER_g1 0x15 -#define COLLIDER_ki 0x14 -#define COLLIDER_o82 0x13 -#define COLLIDER_o81 0x12 -#define COLLIDER_o49 0x11 -#define COLLIDER_tuitate 0x10 -#define COLLIDER_ttw 0xF -#define COLLIDER_tts 0xE -#define COLLIDER_tte 0xD -#define COLLIDER_ttn 0xC -#define COLLIDER_bero 0xB -#define COLLIDER_deilitn 0xA -#define COLLIDER_deilin 0x9 -#define COLLIDER_deilite 0x8 -#define COLLIDER_deilie 0x7 -#define COLLIDER_deilits 0x6 -#define COLLIDER_deilis 0x5 -#define COLLIDER_deilitw 0x4 -#define COLLIDER_deiliw 0x3 -#define COLLIDER_g30 0x2 -#define COLLIDER_o56 0x1 -#define COLLIDER_o55 0x0 +#define COLLIDER_Root 0x16 +#define COLLIDER_g1 0x15 +#define COLLIDER_ki 0x14 +#define COLLIDER_o82 0x13 +#define COLLIDER_o81 0x12 +#define COLLIDER_o49 0x11 +#define COLLIDER_tuitate 0x10 +#define COLLIDER_ttw 0xF +#define COLLIDER_tts 0xE +#define COLLIDER_tte 0xD +#define COLLIDER_ttn 0xC +#define COLLIDER_bero 0xB +#define COLLIDER_deilitn 0xA +#define COLLIDER_deilin 0x9 +#define COLLIDER_deilite 0x8 +#define COLLIDER_deilie 0x7 +#define COLLIDER_deilits 0x6 +#define COLLIDER_deilis 0x5 +#define COLLIDER_deilitw 0x4 +#define COLLIDER_deiliw 0x3 +#define COLLIDER_g30 0x2 +#define COLLIDER_o56 0x1 +#define COLLIDER_o55 0x0 + +#define ZONE_Root 0xD +#define ZONE_g1 0xC +#define ZONE_g6 0xB +#define ZONE_g7 0xA +#define ZONE_b_w 0x9 +#define ZONE_g11 0x8 +#define ZONE_b_s 0x7 +#define ZONE_g8 0x6 +#define ZONE_b_e 0x5 +#define ZONE_g12 0x4 +#define ZONE_b_n 0x3 +#define ZONE_g2 0x2 +#define ZONE_g10 0x1 +#define ZONE_hiru_came 0x0 + diff --git a/include/mapfs/sbk_24_shape.h b/include/mapfs/sbk_24_shape.h index 54a2759965..c3815bd988 100644 --- a/include/mapfs/sbk_24_shape.h +++ b/include/mapfs/sbk_24_shape.h @@ -1,33 +1,34 @@ -#define MODEL_Root 0x20 -#define MODEL_g1 0x1F -#define MODEL_g28 0x1E -#define MODEL_g31 0x1D -#define MODEL_o58 0x1C -#define MODEL_o57 0x1B -#define MODEL_g30 0x1A -#define MODEL_o61 0x19 -#define MODEL_o60 0x18 -#define MODEL_o56 0x17 -#define MODEL_o55 0x16 -#define MODEL_g29 0x15 -#define MODEL_o59 0x14 -#define MODEL_o50 0x13 -#define MODEL_o49 0x12 -#define MODEL_exit 0x11 -#define MODEL_g7 0x10 -#define MODEL_b_w2 0xF -#define MODEL_b_w 0xE -#define MODEL_g11 0xD -#define MODEL_b_s2 0xC -#define MODEL_b_s 0xB -#define MODEL_g8 0xA -#define MODEL_b_e2 0x9 -#define MODEL_b_e 0x8 -#define MODEL_g12 0x7 -#define MODEL_b_n2 0x6 -#define MODEL_b_n 0x5 -#define MODEL_g2 0x4 -#define MODEL_g10 0x3 -#define MODEL_stage 0x2 -#define MODEL_g5 0x1 -#define MODEL_o3 0x0 +#define MODEL_Root 0x20 +#define MODEL_g1 0x1F +#define MODEL_g28 0x1E +#define MODEL_g31 0x1D +#define MODEL_o58 0x1C +#define MODEL_o57 0x1B +#define MODEL_g30 0x1A +#define MODEL_o61 0x19 +#define MODEL_o60 0x18 +#define MODEL_o56 0x17 +#define MODEL_o55 0x16 +#define MODEL_g29 0x15 +#define MODEL_o59 0x14 +#define MODEL_o50 0x13 +#define MODEL_o49 0x12 +#define MODEL_exit 0x11 +#define MODEL_g7 0x10 +#define MODEL_b_w2 0xF +#define MODEL_b_w 0xE +#define MODEL_g11 0xD +#define MODEL_b_s2 0xC +#define MODEL_b_s 0xB +#define MODEL_g8 0xA +#define MODEL_b_e2 0x9 +#define MODEL_b_e 0x8 +#define MODEL_g12 0x7 +#define MODEL_b_n2 0x6 +#define MODEL_b_n 0x5 +#define MODEL_g2 0x4 +#define MODEL_g10 0x3 +#define MODEL_stage 0x2 +#define MODEL_g5 0x1 +#define MODEL_o3 0x0 + diff --git a/include/mapfs/sbk_25_hit.h b/include/mapfs/sbk_25_hit.h index c486b47b82..a33a80bb01 100644 --- a/include/mapfs/sbk_25_hit.h +++ b/include/mapfs/sbk_25_hit.h @@ -1,21 +1,37 @@ -#define COLLIDER_Root 0x14 -#define COLLIDER_g52 0x13 -#define COLLIDER_o199 0x12 -#define COLLIDER_o197 0x11 -#define COLLIDER_tuitate 0x10 -#define COLLIDER_ttw 0xF -#define COLLIDER_tts 0xE -#define COLLIDER_tte 0xD -#define COLLIDER_ttn 0xC -#define COLLIDER_dero 0xB -#define COLLIDER_deilitw 0xA -#define COLLIDER_deiliw 0x9 -#define COLLIDER_deilits 0x8 -#define COLLIDER_deilis 0x7 -#define COLLIDER_deilite 0x6 -#define COLLIDER_deilie 0x5 -#define COLLIDER_deilitn 0x4 -#define COLLIDER_deilin 0x3 -#define COLLIDER_g1 0x2 -#define COLLIDER_mawari 0x1 -#define COLLIDER_stage 0x0 +#define COLLIDER_Root 0x14 +#define COLLIDER_g52 0x13 +#define COLLIDER_o199 0x12 +#define COLLIDER_o197 0x11 +#define COLLIDER_tuitate 0x10 +#define COLLIDER_ttw 0xF +#define COLLIDER_tts 0xE +#define COLLIDER_tte 0xD +#define COLLIDER_ttn 0xC +#define COLLIDER_dero 0xB +#define COLLIDER_deilitw 0xA +#define COLLIDER_deiliw 0x9 +#define COLLIDER_deilits 0x8 +#define COLLIDER_deilis 0x7 +#define COLLIDER_deilite 0x6 +#define COLLIDER_deilie 0x5 +#define COLLIDER_deilitn 0x4 +#define COLLIDER_deilin 0x3 +#define COLLIDER_g1 0x2 +#define COLLIDER_mawari 0x1 +#define COLLIDER_stage 0x0 + +#define ZONE_Root 0xD +#define ZONE_g1 0xC +#define ZONE_g6 0xB +#define ZONE_g7 0xA +#define ZONE_b_w 0x9 +#define ZONE_g11 0x8 +#define ZONE_b_s 0x7 +#define ZONE_g8 0x6 +#define ZONE_b_e 0x5 +#define ZONE_g12 0x4 +#define ZONE_b_n 0x3 +#define ZONE_g2 0x2 +#define ZONE_g10 0x1 +#define ZONE_hiru_came 0x0 + diff --git a/include/mapfs/sbk_25_shape.h b/include/mapfs/sbk_25_shape.h index f2b9ab69c7..69f823223c 100644 --- a/include/mapfs/sbk_25_shape.h +++ b/include/mapfs/sbk_25_shape.h @@ -1,29 +1,30 @@ -#define MODEL_Root 0x1C -#define MODEL_g1 0x1B -#define MODEL_g28 0x1A -#define MODEL_g32 0x19 -#define MODEL_o62 0x18 -#define MODEL_o60 0x17 -#define MODEL_o59 0x16 -#define MODEL_g31 0x15 -#define MODEL_o61 0x14 -#define MODEL_o58 0x13 -#define MODEL_o57 0x12 -#define MODEL_exit 0x11 -#define MODEL_g7 0x10 -#define MODEL_b_w2 0xF -#define MODEL_b_w 0xE -#define MODEL_g11 0xD -#define MODEL_b_s2 0xC -#define MODEL_b_s 0xB -#define MODEL_g8 0xA -#define MODEL_b_e2 0x9 -#define MODEL_b_e 0x8 -#define MODEL_g12 0x7 -#define MODEL_b_n2 0x6 -#define MODEL_b_n 0x5 -#define MODEL_g2 0x4 -#define MODEL_g10 0x3 -#define MODEL_stage 0x2 -#define MODEL_g5 0x1 -#define MODEL_o3 0x0 +#define MODEL_Root 0x1C +#define MODEL_g1 0x1B +#define MODEL_g28 0x1A +#define MODEL_g32 0x19 +#define MODEL_o62 0x18 +#define MODEL_o60 0x17 +#define MODEL_o59 0x16 +#define MODEL_g31 0x15 +#define MODEL_o61 0x14 +#define MODEL_o58 0x13 +#define MODEL_o57 0x12 +#define MODEL_exit 0x11 +#define MODEL_g7 0x10 +#define MODEL_b_w2 0xF +#define MODEL_b_w 0xE +#define MODEL_g11 0xD +#define MODEL_b_s2 0xC +#define MODEL_b_s 0xB +#define MODEL_g8 0xA +#define MODEL_b_e2 0x9 +#define MODEL_b_e 0x8 +#define MODEL_g12 0x7 +#define MODEL_b_n2 0x6 +#define MODEL_b_n 0x5 +#define MODEL_g2 0x4 +#define MODEL_g10 0x3 +#define MODEL_stage 0x2 +#define MODEL_g5 0x1 +#define MODEL_o3 0x0 + diff --git a/include/mapfs/sbk_26_hit.h b/include/mapfs/sbk_26_hit.h index 8cb3fa55ce..ff73f031fc 100644 --- a/include/mapfs/sbk_26_hit.h +++ b/include/mapfs/sbk_26_hit.h @@ -1,17 +1,33 @@ -#define COLLIDER_Root 0x10 -#define COLLIDER_g48 0xF -#define COLLIDER_o191 0xE -#define COLLIDER_tuitate 0xD -#define COLLIDER_ttw 0xC -#define COLLIDER_tts 0xB -#define COLLIDER_ttn 0xA -#define COLLIDER_dero 0x9 -#define COLLIDER_deilitw 0x8 -#define COLLIDER_deiliw 0x7 -#define COLLIDER_deilits 0x6 -#define COLLIDER_deilis 0x5 -#define COLLIDER_deilitn 0x4 -#define COLLIDER_deilin 0x3 -#define COLLIDER_g1 0x2 -#define COLLIDER_mawari 0x1 -#define COLLIDER_stage 0x0 +#define COLLIDER_Root 0x10 +#define COLLIDER_g48 0xF +#define COLLIDER_o191 0xE +#define COLLIDER_tuitate 0xD +#define COLLIDER_ttw 0xC +#define COLLIDER_tts 0xB +#define COLLIDER_ttn 0xA +#define COLLIDER_dero 0x9 +#define COLLIDER_deilitw 0x8 +#define COLLIDER_deiliw 0x7 +#define COLLIDER_deilits 0x6 +#define COLLIDER_deilis 0x5 +#define COLLIDER_deilitn 0x4 +#define COLLIDER_deilin 0x3 +#define COLLIDER_g1 0x2 +#define COLLIDER_mawari 0x1 +#define COLLIDER_stage 0x0 + +#define ZONE_Root 0xD +#define ZONE_g1 0xC +#define ZONE_g6 0xB +#define ZONE_g7 0xA +#define ZONE_b_w 0x9 +#define ZONE_g11 0x8 +#define ZONE_b_s 0x7 +#define ZONE_g8 0x6 +#define ZONE_b_e 0x5 +#define ZONE_g12 0x4 +#define ZONE_b_n 0x3 +#define ZONE_g2 0x2 +#define ZONE_g10 0x1 +#define ZONE_hiru_came 0x0 + diff --git a/include/mapfs/sbk_26_shape.h b/include/mapfs/sbk_26_shape.h index 1e0ffaa78d..0c6426f7b8 100644 --- a/include/mapfs/sbk_26_shape.h +++ b/include/mapfs/sbk_26_shape.h @@ -1,22 +1,23 @@ -#define MODEL_Root 0x15 -#define MODEL_g1 0x14 -#define MODEL_g28 0x13 -#define MODEL_g32 0x12 -#define MODEL_o61 0x11 -#define MODEL_o60 0x10 -#define MODEL_o59 0xF -#define MODEL_exit 0xE -#define MODEL_g7 0xD -#define MODEL_b_w2 0xC -#define MODEL_b_w 0xB -#define MODEL_g11 0xA -#define MODEL_b_s2 0x9 -#define MODEL_b_s 0x8 -#define MODEL_g12 0x7 -#define MODEL_b_n2 0x6 -#define MODEL_b_n 0x5 -#define MODEL_g2 0x4 -#define MODEL_g10 0x3 -#define MODEL_stage 0x2 -#define MODEL_g5 0x1 -#define MODEL_o3 0x0 +#define MODEL_Root 0x15 +#define MODEL_g1 0x14 +#define MODEL_g28 0x13 +#define MODEL_g32 0x12 +#define MODEL_o61 0x11 +#define MODEL_o60 0x10 +#define MODEL_o59 0xF +#define MODEL_exit 0xE +#define MODEL_g7 0xD +#define MODEL_b_w2 0xC +#define MODEL_b_w 0xB +#define MODEL_g11 0xA +#define MODEL_b_s2 0x9 +#define MODEL_b_s 0x8 +#define MODEL_g12 0x7 +#define MODEL_b_n2 0x6 +#define MODEL_b_n 0x5 +#define MODEL_g2 0x4 +#define MODEL_g10 0x3 +#define MODEL_stage 0x2 +#define MODEL_g5 0x1 +#define MODEL_o3 0x0 + diff --git a/include/mapfs/sbk_30_hit.h b/include/mapfs/sbk_30_hit.h index 74df3b0dde..671636d7ec 100644 --- a/include/mapfs/sbk_30_hit.h +++ b/include/mapfs/sbk_30_hit.h @@ -1,31 +1,48 @@ -#define COLLIDER_Root 0x1E -#define COLLIDER_g22 0x1D -#define COLLIDER_o86 0x1C -#define COLLIDER_o84 0x1B -#define COLLIDER_g23 0x1A -#define COLLIDER_o87 0x19 -#define COLLIDER_o73 0x18 -#define COLLIDER_Default 0x17 -#define COLLIDER_o85 0x16 -#define COLLIDER_o61 0x15 -#define COLLIDER_o59 0x14 -#define COLLIDER_o51 0x13 -#define COLLIDER_o50 0x12 -#define COLLIDER_o57 0x11 -#define COLLIDER_tuitate 0x10 -#define COLLIDER_ttw 0xF -#define COLLIDER_tts 0xE -#define COLLIDER_tte 0xD -#define COLLIDER_ttn 0xC -#define COLLIDER_dero 0xB -#define COLLIDER_deilitw 0xA -#define COLLIDER_deiliw 0x9 -#define COLLIDER_deilits 0x8 -#define COLLIDER_deilis 0x7 -#define COLLIDER_deilite 0x6 -#define COLLIDER_deilie 0x5 -#define COLLIDER_deilitn 0x4 -#define COLLIDER_deilin 0x3 -#define COLLIDER_g1 0x2 -#define COLLIDER_mawari 0x1 -#define COLLIDER_stage 0x0 +#define COLLIDER_Root 0x1E +#define COLLIDER_g22 0x1D +#define COLLIDER_o86 0x1C +#define COLLIDER_o84 0x1B +#define COLLIDER_g23 0x1A +#define COLLIDER_o87 0x19 +#define COLLIDER_o73 0x18 +#define COLLIDER_Default 0x17 +#define COLLIDER_o85 0x16 +#define COLLIDER_o61 0x15 +#define COLLIDER_o59 0x14 +#define COLLIDER_o51 0x13 +#define COLLIDER_o50 0x12 +#define COLLIDER_o57 0x11 +#define COLLIDER_tuitate 0x10 +#define COLLIDER_ttw 0xF +#define COLLIDER_tts 0xE +#define COLLIDER_tte 0xD +#define COLLIDER_ttn 0xC +#define COLLIDER_dero 0xB +#define COLLIDER_deilitw 0xA +#define COLLIDER_deiliw 0x9 +#define COLLIDER_deilits 0x8 +#define COLLIDER_deilis 0x7 +#define COLLIDER_deilite 0x6 +#define COLLIDER_deilie 0x5 +#define COLLIDER_deilitn 0x4 +#define COLLIDER_deilin 0x3 +#define COLLIDER_g1 0x2 +#define COLLIDER_mawari 0x1 +#define COLLIDER_stage 0x0 + +#define ZONE_Root 0xE +#define ZONE_g1 0xD +#define ZONE_g6 0xC +#define ZONE_g7 0xB +#define ZONE_b_w 0xA +#define ZONE_g11 0x9 +#define ZONE_b_s 0x8 +#define ZONE_g8 0x7 +#define ZONE_b_e 0x6 +#define ZONE_g12 0x5 +#define ZONE_b_n 0x4 +#define ZONE_g2 0x3 +#define ZONE_g10 0x2 +#define ZONE_o25 0x1 +#define ZONE_o26 0x0 + diff --git a/include/mapfs/sbk_30_shape.h b/include/mapfs/sbk_30_shape.h index d6f2ef1842..d251f719ee 100644 --- a/include/mapfs/sbk_30_shape.h +++ b/include/mapfs/sbk_30_shape.h @@ -1,60 +1,61 @@ -#define MODEL_Root 0x3B -#define MODEL_g1 0x3A -#define MODEL_ki 0x39 -#define MODEL_o84 0x38 -#define MODEL_ki_ha 0x37 -#define MODEL_ki_miki 0x36 -#define MODEL_iwa 0x35 -#define MODEL_o82 0x34 -#define MODEL_o81 0x33 -#define MODEL_o80 0x32 -#define MODEL_o78 0x31 -#define MODEL_o76 0x30 -#define MODEL_o75 0x2F -#define MODEL_iwab 0x2E -#define MODEL_iwaa 0x2D -#define MODEL_g28 0x2C -#define MODEL_o83 0x2B -#define MODEL_g23 0x2A -#define MODEL_o87 0x29 -#define MODEL_o85 0x28 -#define MODEL_ramp 0x27 -#define MODEL_o62 0x26 -#define MODEL_o66 0x25 -#define MODEL_o65 0x24 -#define MODEL_sakji_tent 0x23 -#define MODEL_o55 0x22 -#define MODEL_o54 0x21 -#define MODEL_juutan 0x20 -#define MODEL_o51 0x1F -#define MODEL_o50 0x1E -#define MODEL_o49 0x1D -#define MODEL_o48 0x1C -#define MODEL_o46 0x1B -#define MODEL_o42 0x1A -#define MODEL_o40 0x19 -#define MODEL_o38 0x18 -#define MODEL_g6 0x17 -#define MODEL_g7 0x16 -#define MODEL_b_w2 0x15 -#define MODEL_b_w 0x14 -#define MODEL_g11 0x13 -#define MODEL_b_s2 0x12 -#define MODEL_b_s 0x11 -#define MODEL_g8 0x10 -#define MODEL_b_e2 0xF -#define MODEL_b_e 0xE -#define MODEL_g12 0xD -#define MODEL_b_n2 0xC -#define MODEL_b_n 0xB -#define MODEL_g2 0xA -#define MODEL_g10 0x9 -#define MODEL_r1 0x8 -#define MODEL_r2 0x7 -#define MODEL_r3 0x6 -#define MODEL_r4 0x5 -#define MODEL_stage 0x4 -#define MODEL_g5 0x3 -#define MODEL_o3 0x2 -#define MODEL_g3 0x1 -#define MODEL_o1 0x0 +#define MODEL_Root 0x3B +#define MODEL_g1 0x3A +#define MODEL_ki 0x39 +#define MODEL_o84 0x38 +#define MODEL_ki_ha 0x37 +#define MODEL_ki_miki 0x36 +#define MODEL_iwa 0x35 +#define MODEL_o82 0x34 +#define MODEL_o81 0x33 +#define MODEL_o80 0x32 +#define MODEL_o78 0x31 +#define MODEL_o76 0x30 +#define MODEL_o75 0x2F +#define MODEL_iwab 0x2E +#define MODEL_iwaa 0x2D +#define MODEL_g28 0x2C +#define MODEL_o83 0x2B +#define MODEL_g23 0x2A +#define MODEL_o87 0x29 +#define MODEL_o85 0x28 +#define MODEL_ramp 0x27 +#define MODEL_o62 0x26 +#define MODEL_o66 0x25 +#define MODEL_o65 0x24 +#define MODEL_sakji_tent 0x23 +#define MODEL_o55 0x22 +#define MODEL_o54 0x21 +#define MODEL_juutan 0x20 +#define MODEL_o51 0x1F +#define MODEL_o50 0x1E +#define MODEL_o49 0x1D +#define MODEL_o48 0x1C +#define MODEL_o46 0x1B +#define MODEL_o42 0x1A +#define MODEL_o40 0x19 +#define MODEL_o38 0x18 +#define MODEL_g6 0x17 +#define MODEL_g7 0x16 +#define MODEL_b_w2 0x15 +#define MODEL_b_w 0x14 +#define MODEL_g11 0x13 +#define MODEL_b_s2 0x12 +#define MODEL_b_s 0x11 +#define MODEL_g8 0x10 +#define MODEL_b_e2 0xF +#define MODEL_b_e 0xE +#define MODEL_g12 0xD +#define MODEL_b_n2 0xC +#define MODEL_b_n 0xB +#define MODEL_g2 0xA +#define MODEL_g10 0x9 +#define MODEL_r1 0x8 +#define MODEL_r2 0x7 +#define MODEL_r3 0x6 +#define MODEL_r4 0x5 +#define MODEL_stage 0x4 +#define MODEL_g5 0x3 +#define MODEL_o3 0x2 +#define MODEL_g3 0x1 +#define MODEL_o1 0x0 + diff --git a/include/mapfs/sbk_31_hit.h b/include/mapfs/sbk_31_hit.h index e7d44882d1..34bf3cdd30 100644 --- a/include/mapfs/sbk_31_hit.h +++ b/include/mapfs/sbk_31_hit.h @@ -1,26 +1,42 @@ -#define COLLIDER_Root 0x19 -#define COLLIDER_g25 0x18 -#define COLLIDER_o114 0x17 -#define COLLIDER_o113 0x16 -#define COLLIDER_o111 0x15 -#define COLLIDER_o109 0x14 -#define COLLIDER_o108 0x13 -#define COLLIDER_o107 0x12 -#define COLLIDER_o106 0x11 -#define COLLIDER_tuitate 0x10 -#define COLLIDER_ttw 0xF -#define COLLIDER_tts 0xE -#define COLLIDER_tte 0xD -#define COLLIDER_ttn 0xC -#define COLLIDER_dero 0xB -#define COLLIDER_deilitw 0xA -#define COLLIDER_deiliw 0x9 -#define COLLIDER_deilits 0x8 -#define COLLIDER_deilis 0x7 -#define COLLIDER_deilite 0x6 -#define COLLIDER_deilie 0x5 -#define COLLIDER_deilitn 0x4 -#define COLLIDER_deilin 0x3 -#define COLLIDER_g1 0x2 -#define COLLIDER_mawari 0x1 -#define COLLIDER_stage 0x0 +#define COLLIDER_Root 0x19 +#define COLLIDER_g25 0x18 +#define COLLIDER_o114 0x17 +#define COLLIDER_o113 0x16 +#define COLLIDER_o111 0x15 +#define COLLIDER_o109 0x14 +#define COLLIDER_o108 0x13 +#define COLLIDER_o107 0x12 +#define COLLIDER_o106 0x11 +#define COLLIDER_tuitate 0x10 +#define COLLIDER_ttw 0xF +#define COLLIDER_tts 0xE +#define COLLIDER_tte 0xD +#define COLLIDER_ttn 0xC +#define COLLIDER_dero 0xB +#define COLLIDER_deilitw 0xA +#define COLLIDER_deiliw 0x9 +#define COLLIDER_deilits 0x8 +#define COLLIDER_deilis 0x7 +#define COLLIDER_deilite 0x6 +#define COLLIDER_deilie 0x5 +#define COLLIDER_deilitn 0x4 +#define COLLIDER_deilin 0x3 +#define COLLIDER_g1 0x2 +#define COLLIDER_mawari 0x1 +#define COLLIDER_stage 0x0 + +#define ZONE_Root 0xD +#define ZONE_g1 0xC +#define ZONE_g6 0xB +#define ZONE_g7 0xA +#define ZONE_b_w 0x9 +#define ZONE_g11 0x8 +#define ZONE_b_s 0x7 +#define ZONE_g8 0x6 +#define ZONE_b_e 0x5 +#define ZONE_g12 0x4 +#define ZONE_b_n 0x3 +#define ZONE_g2 0x2 +#define ZONE_g10 0x1 +#define ZONE_hiru_came 0x0 + diff --git a/include/mapfs/sbk_31_shape.h b/include/mapfs/sbk_31_shape.h index 7be6bc5ab2..b450e8e124 100644 --- a/include/mapfs/sbk_31_shape.h +++ b/include/mapfs/sbk_31_shape.h @@ -1,34 +1,35 @@ -#define MODEL_Root 0x21 -#define MODEL_g1 0x20 -#define MODEL_g25 0x1F -#define MODEL_o62 0x1E -#define MODEL_o61 0x1D -#define MODEL_o60 0x1C -#define MODEL_o59 0x1B -#define MODEL_o58 0x1A -#define MODEL_o57 0x19 -#define MODEL_o56 0x18 -#define MODEL_exit 0x17 -#define MODEL_exitw 0x16 -#define MODEL_b_w2 0x15 -#define MODEL_b_w 0x14 -#define MODEL_exits 0x13 -#define MODEL_b_s2 0x12 -#define MODEL_b_s 0x11 -#define MODEL_exite 0x10 -#define MODEL_b_e2 0xF -#define MODEL_b_e 0xE -#define MODEL_exitn 0xD -#define MODEL_b_n2 0xC -#define MODEL_b_n 0xB -#define MODEL_g2 0xA -#define MODEL_g10 0x9 -#define MODEL_r1 0x8 -#define MODEL_r2 0x7 -#define MODEL_r3 0x6 -#define MODEL_r4 0x5 -#define MODEL_stage 0x4 -#define MODEL_g5 0x3 -#define MODEL_o3 0x2 -#define MODEL_g3 0x1 -#define MODEL_o1 0x0 +#define MODEL_Root 0x21 +#define MODEL_g1 0x20 +#define MODEL_g25 0x1F +#define MODEL_o62 0x1E +#define MODEL_o61 0x1D +#define MODEL_o60 0x1C +#define MODEL_o59 0x1B +#define MODEL_o58 0x1A +#define MODEL_o57 0x19 +#define MODEL_o56 0x18 +#define MODEL_exit 0x17 +#define MODEL_exitw 0x16 +#define MODEL_b_w2 0x15 +#define MODEL_b_w 0x14 +#define MODEL_exits 0x13 +#define MODEL_b_s2 0x12 +#define MODEL_b_s 0x11 +#define MODEL_exite 0x10 +#define MODEL_b_e2 0xF +#define MODEL_b_e 0xE +#define MODEL_exitn 0xD +#define MODEL_b_n2 0xC +#define MODEL_b_n 0xB +#define MODEL_g2 0xA +#define MODEL_g10 0x9 +#define MODEL_r1 0x8 +#define MODEL_r2 0x7 +#define MODEL_r3 0x6 +#define MODEL_r4 0x5 +#define MODEL_stage 0x4 +#define MODEL_g5 0x3 +#define MODEL_o3 0x2 +#define MODEL_g3 0x1 +#define MODEL_o1 0x0 + diff --git a/include/mapfs/sbk_32_hit.h b/include/mapfs/sbk_32_hit.h index f51203014d..0119511328 100644 --- a/include/mapfs/sbk_32_hit.h +++ b/include/mapfs/sbk_32_hit.h @@ -1,18 +1,34 @@ -#define COLLIDER_Root 0x11 -#define COLLIDER_tuitate 0x10 -#define COLLIDER_ttw 0xF -#define COLLIDER_tts 0xE -#define COLLIDER_tte 0xD -#define COLLIDER_ttn 0xC -#define COLLIDER_dero 0xB -#define COLLIDER_deilitw 0xA -#define COLLIDER_deiliw 0x9 -#define COLLIDER_deilits 0x8 -#define COLLIDER_deilis 0x7 -#define COLLIDER_deilite 0x6 -#define COLLIDER_deilie 0x5 -#define COLLIDER_deilitn 0x4 -#define COLLIDER_deilin 0x3 -#define COLLIDER_g1 0x2 -#define COLLIDER_mawari 0x1 -#define COLLIDER_stage 0x0 +#define COLLIDER_Root 0x11 +#define COLLIDER_tuitate 0x10 +#define COLLIDER_ttw 0xF +#define COLLIDER_tts 0xE +#define COLLIDER_tte 0xD +#define COLLIDER_ttn 0xC +#define COLLIDER_dero 0xB +#define COLLIDER_deilitw 0xA +#define COLLIDER_deiliw 0x9 +#define COLLIDER_deilits 0x8 +#define COLLIDER_deilis 0x7 +#define COLLIDER_deilite 0x6 +#define COLLIDER_deilie 0x5 +#define COLLIDER_deilitn 0x4 +#define COLLIDER_deilin 0x3 +#define COLLIDER_g1 0x2 +#define COLLIDER_mawari 0x1 +#define COLLIDER_stage 0x0 + +#define ZONE_Root 0xD +#define ZONE_g1 0xC +#define ZONE_g6 0xB +#define ZONE_g7 0xA +#define ZONE_b_w 0x9 +#define ZONE_g11 0x8 +#define ZONE_b_s 0x7 +#define ZONE_g8 0x6 +#define ZONE_b_e 0x5 +#define ZONE_g12 0x4 +#define ZONE_b_n 0x3 +#define ZONE_g2 0x2 +#define ZONE_g10 0x1 +#define ZONE_hiru_came 0x0 + diff --git a/include/mapfs/sbk_32_shape.h b/include/mapfs/sbk_32_shape.h index c8495bf0bd..881cd5c4fc 100644 --- a/include/mapfs/sbk_32_shape.h +++ b/include/mapfs/sbk_32_shape.h @@ -1,26 +1,27 @@ -#define MODEL_Root 0x19 -#define MODEL_g1 0x18 -#define MODEL_exit 0x17 -#define MODEL_exitw 0x16 -#define MODEL_b_w2 0x15 -#define MODEL_b_w 0x14 -#define MODEL_exits 0x13 -#define MODEL_b_s2 0x12 -#define MODEL_b_s 0x11 -#define MODEL_exite 0x10 -#define MODEL_b_e2 0xF -#define MODEL_b_e 0xE -#define MODEL_exitn 0xD -#define MODEL_b_n2 0xC -#define MODEL_b_n 0xB -#define MODEL_g2 0xA -#define MODEL_g10 0x9 -#define MODEL_r1 0x8 -#define MODEL_r2 0x7 -#define MODEL_r3 0x6 -#define MODEL_r4 0x5 -#define MODEL_stage 0x4 -#define MODEL_g5 0x3 -#define MODEL_o3 0x2 -#define MODEL_g3 0x1 -#define MODEL_o1 0x0 +#define MODEL_Root 0x19 +#define MODEL_g1 0x18 +#define MODEL_exit 0x17 +#define MODEL_exitw 0x16 +#define MODEL_b_w2 0x15 +#define MODEL_b_w 0x14 +#define MODEL_exits 0x13 +#define MODEL_b_s2 0x12 +#define MODEL_b_s 0x11 +#define MODEL_exite 0x10 +#define MODEL_b_e2 0xF +#define MODEL_b_e 0xE +#define MODEL_exitn 0xD +#define MODEL_b_n2 0xC +#define MODEL_b_n 0xB +#define MODEL_g2 0xA +#define MODEL_g10 0x9 +#define MODEL_r1 0x8 +#define MODEL_r2 0x7 +#define MODEL_r3 0x6 +#define MODEL_r4 0x5 +#define MODEL_stage 0x4 +#define MODEL_g5 0x3 +#define MODEL_o3 0x2 +#define MODEL_g3 0x1 +#define MODEL_o1 0x0 + diff --git a/include/mapfs/sbk_33_hit.h b/include/mapfs/sbk_33_hit.h index 666f230ddc..e70094d25e 100644 --- a/include/mapfs/sbk_33_hit.h +++ b/include/mapfs/sbk_33_hit.h @@ -1,22 +1,38 @@ -#define COLLIDER_Root 0x15 -#define COLLIDER_g1 0x14 -#define COLLIDER_iwa 0x13 -#define COLLIDER_o76 0x12 -#define COLLIDER_tuitate 0x11 -#define COLLIDER_ttn 0x10 -#define COLLIDER_tte 0xF -#define COLLIDER_tts 0xE -#define COLLIDER_ttw 0xD -#define COLLIDER_bero 0xC -#define COLLIDER_deiliw 0xB -#define COLLIDER_deilitw 0xA -#define COLLIDER_deilis 0x9 -#define COLLIDER_deilits 0x8 -#define COLLIDER_deilie 0x7 -#define COLLIDER_deilite 0x6 -#define COLLIDER_deilin 0x5 -#define COLLIDER_deilitn 0x4 -#define COLLIDER_g26 0x3 -#define COLLIDER_g27 0x2 -#define COLLIDER_o57 0x1 -#define COLLIDER_o56 0x0 +#define COLLIDER_Root 0x15 +#define COLLIDER_g1 0x14 +#define COLLIDER_iwa 0x13 +#define COLLIDER_o76 0x12 +#define COLLIDER_tuitate 0x11 +#define COLLIDER_ttn 0x10 +#define COLLIDER_tte 0xF +#define COLLIDER_tts 0xE +#define COLLIDER_ttw 0xD +#define COLLIDER_bero 0xC +#define COLLIDER_deiliw 0xB +#define COLLIDER_deilitw 0xA +#define COLLIDER_deilis 0x9 +#define COLLIDER_deilits 0x8 +#define COLLIDER_deilie 0x7 +#define COLLIDER_deilite 0x6 +#define COLLIDER_deilin 0x5 +#define COLLIDER_deilitn 0x4 +#define COLLIDER_g26 0x3 +#define COLLIDER_g27 0x2 +#define COLLIDER_o57 0x1 +#define COLLIDER_o56 0x0 + +#define ZONE_Root 0xD +#define ZONE_g1 0xC +#define ZONE_g6 0xB +#define ZONE_g7 0xA +#define ZONE_b_w 0x9 +#define ZONE_g11 0x8 +#define ZONE_b_s 0x7 +#define ZONE_g8 0x6 +#define ZONE_b_e 0x5 +#define ZONE_g12 0x4 +#define ZONE_b_n 0x3 +#define ZONE_g2 0x2 +#define ZONE_g10 0x1 +#define ZONE_hiru_came 0x0 + diff --git a/include/mapfs/sbk_33_shape.h b/include/mapfs/sbk_33_shape.h index 667a87e002..612c988b2b 100644 --- a/include/mapfs/sbk_33_shape.h +++ b/include/mapfs/sbk_33_shape.h @@ -1,31 +1,32 @@ -#define MODEL_Root 0x1E -#define MODEL_g1 0x1D -#define MODEL_s_iwa 0x1C -#define MODEL_o71 0x1B -#define MODEL_o58 0x1A -#define MODEL_o57 0x19 -#define MODEL_o56 0x18 -#define MODEL_exit 0x17 -#define MODEL_exitw 0x16 -#define MODEL_b_w2 0x15 -#define MODEL_b_w 0x14 -#define MODEL_exits 0x13 -#define MODEL_b_s2 0x12 -#define MODEL_b_s 0x11 -#define MODEL_exite 0x10 -#define MODEL_b_e2 0xF -#define MODEL_b_e 0xE -#define MODEL_exitn 0xD -#define MODEL_b_n2 0xC -#define MODEL_b_n 0xB -#define MODEL_g2 0xA -#define MODEL_g10 0x9 -#define MODEL_r1 0x8 -#define MODEL_r2 0x7 -#define MODEL_r3 0x6 -#define MODEL_r4 0x5 -#define MODEL_stage 0x4 -#define MODEL_g5 0x3 -#define MODEL_o3 0x2 -#define MODEL_g3 0x1 -#define MODEL_o1 0x0 +#define MODEL_Root 0x1E +#define MODEL_g1 0x1D +#define MODEL_s_iwa 0x1C +#define MODEL_o71 0x1B +#define MODEL_o58 0x1A +#define MODEL_o57 0x19 +#define MODEL_o56 0x18 +#define MODEL_exit 0x17 +#define MODEL_exitw 0x16 +#define MODEL_b_w2 0x15 +#define MODEL_b_w 0x14 +#define MODEL_exits 0x13 +#define MODEL_b_s2 0x12 +#define MODEL_b_s 0x11 +#define MODEL_exite 0x10 +#define MODEL_b_e2 0xF +#define MODEL_b_e 0xE +#define MODEL_exitn 0xD +#define MODEL_b_n2 0xC +#define MODEL_b_n 0xB +#define MODEL_g2 0xA +#define MODEL_g10 0x9 +#define MODEL_r1 0x8 +#define MODEL_r2 0x7 +#define MODEL_r3 0x6 +#define MODEL_r4 0x5 +#define MODEL_stage 0x4 +#define MODEL_g5 0x3 +#define MODEL_o3 0x2 +#define MODEL_g3 0x1 +#define MODEL_o1 0x0 + diff --git a/include/mapfs/sbk_34_hit.h b/include/mapfs/sbk_34_hit.h index 5630b396c0..e7df172b7c 100644 --- a/include/mapfs/sbk_34_hit.h +++ b/include/mapfs/sbk_34_hit.h @@ -1,20 +1,36 @@ -#define COLLIDER_Root 0x13 -#define COLLIDER_g52 0x12 -#define COLLIDER_o201 0x11 -#define COLLIDER_tuitate 0x10 -#define COLLIDER_ttw 0xF -#define COLLIDER_tts 0xE -#define COLLIDER_tte 0xD -#define COLLIDER_ttn 0xC -#define COLLIDER_dero 0xB -#define COLLIDER_deilitw 0xA -#define COLLIDER_deiliw 0x9 -#define COLLIDER_deilits 0x8 -#define COLLIDER_deilis 0x7 -#define COLLIDER_deilite 0x6 -#define COLLIDER_deilie 0x5 -#define COLLIDER_deilitn 0x4 -#define COLLIDER_deilin 0x3 -#define COLLIDER_g1 0x2 -#define COLLIDER_mawari 0x1 -#define COLLIDER_stage 0x0 +#define COLLIDER_Root 0x13 +#define COLLIDER_g52 0x12 +#define COLLIDER_o201 0x11 +#define COLLIDER_tuitate 0x10 +#define COLLIDER_ttw 0xF +#define COLLIDER_tts 0xE +#define COLLIDER_tte 0xD +#define COLLIDER_ttn 0xC +#define COLLIDER_dero 0xB +#define COLLIDER_deilitw 0xA +#define COLLIDER_deiliw 0x9 +#define COLLIDER_deilits 0x8 +#define COLLIDER_deilis 0x7 +#define COLLIDER_deilite 0x6 +#define COLLIDER_deilie 0x5 +#define COLLIDER_deilitn 0x4 +#define COLLIDER_deilin 0x3 +#define COLLIDER_g1 0x2 +#define COLLIDER_mawari 0x1 +#define COLLIDER_stage 0x0 + +#define ZONE_Root 0xD +#define ZONE_g1 0xC +#define ZONE_g6 0xB +#define ZONE_g7 0xA +#define ZONE_b_w 0x9 +#define ZONE_g11 0x8 +#define ZONE_b_s 0x7 +#define ZONE_g8 0x6 +#define ZONE_b_e 0x5 +#define ZONE_g12 0x4 +#define ZONE_b_n 0x3 +#define ZONE_g2 0x2 +#define ZONE_g10 0x1 +#define ZONE_hiru_came 0x0 + diff --git a/include/mapfs/sbk_34_shape.h b/include/mapfs/sbk_34_shape.h index 7ba02175fd..4e3acb8abd 100644 --- a/include/mapfs/sbk_34_shape.h +++ b/include/mapfs/sbk_34_shape.h @@ -1,31 +1,32 @@ -#define MODEL_Root 0x1E -#define MODEL_g25 0x1D -#define MODEL_g29 0x1C -#define MODEL_o64 0x1B -#define MODEL_o63 0x1A -#define MODEL_o62 0x19 -#define MODEL_g1 0x18 -#define MODEL_exit 0x17 -#define MODEL_exitw 0x16 -#define MODEL_b_w2 0x15 -#define MODEL_b_w 0x14 -#define MODEL_exits 0x13 -#define MODEL_b_s2 0x12 -#define MODEL_b_s 0x11 -#define MODEL_exite 0x10 -#define MODEL_b_e2 0xF -#define MODEL_b_e 0xE -#define MODEL_exitn 0xD -#define MODEL_b_n2 0xC -#define MODEL_b_n 0xB -#define MODEL_g2 0xA -#define MODEL_g10 0x9 -#define MODEL_r1 0x8 -#define MODEL_r2 0x7 -#define MODEL_r3 0x6 -#define MODEL_r4 0x5 -#define MODEL_stage 0x4 -#define MODEL_g5 0x3 -#define MODEL_o3 0x2 -#define MODEL_g3 0x1 -#define MODEL_o1 0x0 +#define MODEL_Root 0x1E +#define MODEL_g25 0x1D +#define MODEL_g29 0x1C +#define MODEL_o64 0x1B +#define MODEL_o63 0x1A +#define MODEL_o62 0x19 +#define MODEL_g1 0x18 +#define MODEL_exit 0x17 +#define MODEL_exitw 0x16 +#define MODEL_b_w2 0x15 +#define MODEL_b_w 0x14 +#define MODEL_exits 0x13 +#define MODEL_b_s2 0x12 +#define MODEL_b_s 0x11 +#define MODEL_exite 0x10 +#define MODEL_b_e2 0xF +#define MODEL_b_e 0xE +#define MODEL_exitn 0xD +#define MODEL_b_n2 0xC +#define MODEL_b_n 0xB +#define MODEL_g2 0xA +#define MODEL_g10 0x9 +#define MODEL_r1 0x8 +#define MODEL_r2 0x7 +#define MODEL_r3 0x6 +#define MODEL_r4 0x5 +#define MODEL_stage 0x4 +#define MODEL_g5 0x3 +#define MODEL_o3 0x2 +#define MODEL_g3 0x1 +#define MODEL_o1 0x0 + diff --git a/include/mapfs/sbk_35_hit.h b/include/mapfs/sbk_35_hit.h index cb58f40d01..18807fb5b3 100644 --- a/include/mapfs/sbk_35_hit.h +++ b/include/mapfs/sbk_35_hit.h @@ -1,22 +1,38 @@ -#define COLLIDER_Root 0x15 -#define COLLIDER_g48 0x14 -#define COLLIDER_o195 0x13 -#define COLLIDER_o193 0x12 -#define COLLIDER_o191 0x11 -#define COLLIDER_tuitate 0x10 -#define COLLIDER_ttw 0xF -#define COLLIDER_tts 0xE -#define COLLIDER_tte 0xD -#define COLLIDER_ttn 0xC -#define COLLIDER_dero 0xB -#define COLLIDER_deilitw 0xA -#define COLLIDER_deiliw 0x9 -#define COLLIDER_deilits 0x8 -#define COLLIDER_deilis 0x7 -#define COLLIDER_deilite 0x6 -#define COLLIDER_deilie 0x5 -#define COLLIDER_deilitn 0x4 -#define COLLIDER_deilin 0x3 -#define COLLIDER_g1 0x2 -#define COLLIDER_mawari 0x1 -#define COLLIDER_stage 0x0 +#define COLLIDER_Root 0x15 +#define COLLIDER_g48 0x14 +#define COLLIDER_o195 0x13 +#define COLLIDER_o193 0x12 +#define COLLIDER_o191 0x11 +#define COLLIDER_tuitate 0x10 +#define COLLIDER_ttw 0xF +#define COLLIDER_tts 0xE +#define COLLIDER_tte 0xD +#define COLLIDER_ttn 0xC +#define COLLIDER_dero 0xB +#define COLLIDER_deilitw 0xA +#define COLLIDER_deiliw 0x9 +#define COLLIDER_deilits 0x8 +#define COLLIDER_deilis 0x7 +#define COLLIDER_deilite 0x6 +#define COLLIDER_deilie 0x5 +#define COLLIDER_deilitn 0x4 +#define COLLIDER_deilin 0x3 +#define COLLIDER_g1 0x2 +#define COLLIDER_mawari 0x1 +#define COLLIDER_stage 0x0 + +#define ZONE_Root 0xD +#define ZONE_g1 0xC +#define ZONE_g6 0xB +#define ZONE_g7 0xA +#define ZONE_b_w 0x9 +#define ZONE_g11 0x8 +#define ZONE_b_s 0x7 +#define ZONE_g8 0x6 +#define ZONE_b_e 0x5 +#define ZONE_g12 0x4 +#define ZONE_b_n 0x3 +#define ZONE_g2 0x2 +#define ZONE_g10 0x1 +#define ZONE_hiru_came 0x0 + diff --git a/include/mapfs/sbk_35_shape.h b/include/mapfs/sbk_35_shape.h index f15c4feaf8..40181aef58 100644 --- a/include/mapfs/sbk_35_shape.h +++ b/include/mapfs/sbk_35_shape.h @@ -1,39 +1,40 @@ -#define MODEL_Root 0x26 -#define MODEL_g1 0x25 -#define MODEL_g28 0x24 -#define MODEL_g27 0x23 -#define MODEL_o70 0x22 -#define MODEL_o61 0x21 -#define MODEL_o60 0x20 -#define MODEL_g26 0x1F -#define MODEL_o69 0x1E -#define MODEL_o59 0x1D -#define MODEL_o58 0x1C -#define MODEL_g25 0x1B -#define MODEL_o68 0x1A -#define MODEL_o57 0x19 -#define MODEL_o56 0x18 -#define MODEL_exit 0x17 -#define MODEL_exitw 0x16 -#define MODEL_b_w2 0x15 -#define MODEL_b_w 0x14 -#define MODEL_exits 0x13 -#define MODEL_b_s2 0x12 -#define MODEL_b_s 0x11 -#define MODEL_exite 0x10 -#define MODEL_b_e2 0xF -#define MODEL_b_e 0xE -#define MODEL_exitn 0xD -#define MODEL_b_n2 0xC -#define MODEL_b_n 0xB -#define MODEL_g2 0xA -#define MODEL_g10 0x9 -#define MODEL_r1 0x8 -#define MODEL_r2 0x7 -#define MODEL_r3 0x6 -#define MODEL_r4 0x5 -#define MODEL_stage 0x4 -#define MODEL_g5 0x3 -#define MODEL_o3 0x2 -#define MODEL_g3 0x1 -#define MODEL_o1 0x0 +#define MODEL_Root 0x26 +#define MODEL_g1 0x25 +#define MODEL_g28 0x24 +#define MODEL_g27 0x23 +#define MODEL_o70 0x22 +#define MODEL_o61 0x21 +#define MODEL_o60 0x20 +#define MODEL_g26 0x1F +#define MODEL_o69 0x1E +#define MODEL_o59 0x1D +#define MODEL_o58 0x1C +#define MODEL_g25 0x1B +#define MODEL_o68 0x1A +#define MODEL_o57 0x19 +#define MODEL_o56 0x18 +#define MODEL_exit 0x17 +#define MODEL_exitw 0x16 +#define MODEL_b_w2 0x15 +#define MODEL_b_w 0x14 +#define MODEL_exits 0x13 +#define MODEL_b_s2 0x12 +#define MODEL_b_s 0x11 +#define MODEL_exite 0x10 +#define MODEL_b_e2 0xF +#define MODEL_b_e 0xE +#define MODEL_exitn 0xD +#define MODEL_b_n2 0xC +#define MODEL_b_n 0xB +#define MODEL_g2 0xA +#define MODEL_g10 0x9 +#define MODEL_r1 0x8 +#define MODEL_r2 0x7 +#define MODEL_r3 0x6 +#define MODEL_r4 0x5 +#define MODEL_stage 0x4 +#define MODEL_g5 0x3 +#define MODEL_o3 0x2 +#define MODEL_g3 0x1 +#define MODEL_o1 0x0 + diff --git a/include/mapfs/sbk_36_hit.h b/include/mapfs/sbk_36_hit.h index 3faa001628..927462c6cc 100644 --- a/include/mapfs/sbk_36_hit.h +++ b/include/mapfs/sbk_36_hit.h @@ -1,28 +1,44 @@ -#define COLLIDER_Root 0x1B -#define COLLIDER_g48 0x1A -#define COLLIDER_o193 0x19 -#define COLLIDER_o195 0x18 -#define COLLIDER_o191 0x17 -#define COLLIDER_o197 0x16 -#define COLLIDER_o199 0x15 -#define COLLIDER_o201 0x14 -#define COLLIDER_o207 0x13 -#define COLLIDER_o203 0x12 -#define COLLIDER_o205 0x11 -#define COLLIDER_tuitate 0x10 -#define COLLIDER_ttw 0xF -#define COLLIDER_tts 0xE -#define COLLIDER_tte 0xD -#define COLLIDER_ttn 0xC -#define COLLIDER_dero 0xB -#define COLLIDER_deilitw 0xA -#define COLLIDER_deiliw 0x9 -#define COLLIDER_deilits 0x8 -#define COLLIDER_deilis 0x7 -#define COLLIDER_deilite 0x6 -#define COLLIDER_deilie 0x5 -#define COLLIDER_deilitn 0x4 -#define COLLIDER_deilin 0x3 -#define COLLIDER_g1 0x2 -#define COLLIDER_mawari 0x1 -#define COLLIDER_stage 0x0 +#define COLLIDER_Root 0x1B +#define COLLIDER_g48 0x1A +#define COLLIDER_o193 0x19 +#define COLLIDER_o195 0x18 +#define COLLIDER_o191 0x17 +#define COLLIDER_o197 0x16 +#define COLLIDER_o199 0x15 +#define COLLIDER_o201 0x14 +#define COLLIDER_o207 0x13 +#define COLLIDER_o203 0x12 +#define COLLIDER_o205 0x11 +#define COLLIDER_tuitate 0x10 +#define COLLIDER_ttw 0xF +#define COLLIDER_tts 0xE +#define COLLIDER_tte 0xD +#define COLLIDER_ttn 0xC +#define COLLIDER_dero 0xB +#define COLLIDER_deilitw 0xA +#define COLLIDER_deiliw 0x9 +#define COLLIDER_deilits 0x8 +#define COLLIDER_deilis 0x7 +#define COLLIDER_deilite 0x6 +#define COLLIDER_deilie 0x5 +#define COLLIDER_deilitn 0x4 +#define COLLIDER_deilin 0x3 +#define COLLIDER_g1 0x2 +#define COLLIDER_mawari 0x1 +#define COLLIDER_stage 0x0 + +#define ZONE_Root 0xD +#define ZONE_g1 0xC +#define ZONE_g6 0xB +#define ZONE_g7 0xA +#define ZONE_b_w 0x9 +#define ZONE_g11 0x8 +#define ZONE_b_s 0x7 +#define ZONE_g8 0x6 +#define ZONE_b_e 0x5 +#define ZONE_g12 0x4 +#define ZONE_b_n 0x3 +#define ZONE_g2 0x2 +#define ZONE_g10 0x1 +#define ZONE_hiru_came 0x0 + diff --git a/include/mapfs/sbk_36_shape.h b/include/mapfs/sbk_36_shape.h index 2bffcfd916..8adc9c72ea 100644 --- a/include/mapfs/sbk_36_shape.h +++ b/include/mapfs/sbk_36_shape.h @@ -1,63 +1,64 @@ -#define MODEL_Root 0x3E -#define MODEL_g1 0x3D -#define MODEL_g25 0x3C -#define MODEL_g30 0x3B -#define MODEL_o84 0x3A -#define MODEL_o65 0x39 -#define MODEL_o64 0x38 -#define MODEL_g29 0x37 -#define MODEL_o83 0x36 -#define MODEL_o63 0x35 -#define MODEL_o62 0x34 -#define MODEL_g31 0x33 -#define MODEL_o82 0x32 -#define MODEL_o67 0x31 -#define MODEL_o66 0x30 -#define MODEL_g27 0x2F -#define MODEL_o81 0x2E -#define MODEL_o59 0x2D -#define MODEL_o58 0x2C -#define MODEL_g26 0x2B -#define MODEL_o80 0x2A -#define MODEL_o57 0x29 -#define MODEL_o56 0x28 -#define MODEL_g32 0x27 -#define MODEL_o79 0x26 -#define MODEL_o69 0x25 -#define MODEL_o68 0x24 -#define MODEL_g35 0x23 -#define MODEL_o78 0x22 -#define MODEL_o75 0x21 -#define MODEL_o74 0x20 -#define MODEL_g33 0x1F -#define MODEL_o77 0x1E -#define MODEL_o71 0x1D -#define MODEL_o70 0x1C -#define MODEL_g34 0x1B -#define MODEL_o76 0x1A -#define MODEL_o73 0x19 -#define MODEL_o72 0x18 -#define MODEL_exit 0x17 -#define MODEL_exitw 0x16 -#define MODEL_b_w2 0x15 -#define MODEL_b_w 0x14 -#define MODEL_exits 0x13 -#define MODEL_b_s2 0x12 -#define MODEL_b_s 0x11 -#define MODEL_exite 0x10 -#define MODEL_b_e2 0xF -#define MODEL_b_e 0xE -#define MODEL_exitn 0xD -#define MODEL_b_n2 0xC -#define MODEL_b_n 0xB -#define MODEL_g2 0xA -#define MODEL_g10 0x9 -#define MODEL_r1 0x8 -#define MODEL_r2 0x7 -#define MODEL_r3 0x6 -#define MODEL_r4 0x5 -#define MODEL_stage 0x4 -#define MODEL_g5 0x3 -#define MODEL_o3 0x2 -#define MODEL_g3 0x1 -#define MODEL_o1 0x0 +#define MODEL_Root 0x3E +#define MODEL_g1 0x3D +#define MODEL_g25 0x3C +#define MODEL_g30 0x3B +#define MODEL_o84 0x3A +#define MODEL_o65 0x39 +#define MODEL_o64 0x38 +#define MODEL_g29 0x37 +#define MODEL_o83 0x36 +#define MODEL_o63 0x35 +#define MODEL_o62 0x34 +#define MODEL_g31 0x33 +#define MODEL_o82 0x32 +#define MODEL_o67 0x31 +#define MODEL_o66 0x30 +#define MODEL_g27 0x2F +#define MODEL_o81 0x2E +#define MODEL_o59 0x2D +#define MODEL_o58 0x2C +#define MODEL_g26 0x2B +#define MODEL_o80 0x2A +#define MODEL_o57 0x29 +#define MODEL_o56 0x28 +#define MODEL_g32 0x27 +#define MODEL_o79 0x26 +#define MODEL_o69 0x25 +#define MODEL_o68 0x24 +#define MODEL_g35 0x23 +#define MODEL_o78 0x22 +#define MODEL_o75 0x21 +#define MODEL_o74 0x20 +#define MODEL_g33 0x1F +#define MODEL_o77 0x1E +#define MODEL_o71 0x1D +#define MODEL_o70 0x1C +#define MODEL_g34 0x1B +#define MODEL_o76 0x1A +#define MODEL_o73 0x19 +#define MODEL_o72 0x18 +#define MODEL_exit 0x17 +#define MODEL_exitw 0x16 +#define MODEL_b_w2 0x15 +#define MODEL_b_w 0x14 +#define MODEL_exits 0x13 +#define MODEL_b_s2 0x12 +#define MODEL_b_s 0x11 +#define MODEL_exite 0x10 +#define MODEL_b_e2 0xF +#define MODEL_b_e 0xE +#define MODEL_exitn 0xD +#define MODEL_b_n2 0xC +#define MODEL_b_n 0xB +#define MODEL_g2 0xA +#define MODEL_g10 0x9 +#define MODEL_r1 0x8 +#define MODEL_r2 0x7 +#define MODEL_r3 0x6 +#define MODEL_r4 0x5 +#define MODEL_stage 0x4 +#define MODEL_g5 0x3 +#define MODEL_o3 0x2 +#define MODEL_g3 0x1 +#define MODEL_o1 0x0 + diff --git a/include/mapfs/sbk_40_hit.h b/include/mapfs/sbk_40_hit.h index 1ed372f89d..e463220969 100644 --- a/include/mapfs/sbk_40_hit.h +++ b/include/mapfs/sbk_40_hit.h @@ -1,22 +1,38 @@ -#define COLLIDER_Root 0x15 -#define COLLIDER_g25 0x14 -#define COLLIDER_o104 0x13 -#define COLLIDER_o103 0x12 -#define COLLIDER_o101 0x11 -#define COLLIDER_o97 0x10 -#define COLLIDER_o96 0xF -#define COLLIDER_o95 0xE -#define COLLIDER_tuitate 0xD -#define COLLIDER_tts 0xC -#define COLLIDER_tte 0xB -#define COLLIDER_ttn 0xA -#define COLLIDER_dero 0x9 -#define COLLIDER_deilits 0x8 -#define COLLIDER_deilis 0x7 -#define COLLIDER_deilite 0x6 -#define COLLIDER_deilie 0x5 -#define COLLIDER_deilitn 0x4 -#define COLLIDER_deilin 0x3 -#define COLLIDER_g1 0x2 -#define COLLIDER_mawari 0x1 -#define COLLIDER_stage 0x0 +#define COLLIDER_Root 0x15 +#define COLLIDER_g25 0x14 +#define COLLIDER_o104 0x13 +#define COLLIDER_o103 0x12 +#define COLLIDER_o101 0x11 +#define COLLIDER_o97 0x10 +#define COLLIDER_o96 0xF +#define COLLIDER_o95 0xE +#define COLLIDER_tuitate 0xD +#define COLLIDER_tts 0xC +#define COLLIDER_tte 0xB +#define COLLIDER_ttn 0xA +#define COLLIDER_dero 0x9 +#define COLLIDER_deilits 0x8 +#define COLLIDER_deilis 0x7 +#define COLLIDER_deilite 0x6 +#define COLLIDER_deilie 0x5 +#define COLLIDER_deilitn 0x4 +#define COLLIDER_deilin 0x3 +#define COLLIDER_g1 0x2 +#define COLLIDER_mawari 0x1 +#define COLLIDER_stage 0x0 + +#define ZONE_Root 0xD +#define ZONE_g1 0xC +#define ZONE_g6 0xB +#define ZONE_g7 0xA +#define ZONE_b_w 0x9 +#define ZONE_g11 0x8 +#define ZONE_b_s 0x7 +#define ZONE_g8 0x6 +#define ZONE_b_e 0x5 +#define ZONE_g12 0x4 +#define ZONE_b_n 0x3 +#define ZONE_g2 0x2 +#define ZONE_g10 0x1 +#define ZONE_hiru_came 0x0 + diff --git a/include/mapfs/sbk_40_shape.h b/include/mapfs/sbk_40_shape.h index 152f4a3174..67e5dfac86 100644 --- a/include/mapfs/sbk_40_shape.h +++ b/include/mapfs/sbk_40_shape.h @@ -1,24 +1,25 @@ -#define MODEL_Root 0x17 -#define MODEL_g1 0x16 -#define MODEL_g28 0x15 -#define MODEL_o62 0x14 -#define MODEL_o61 0x13 -#define MODEL_o58 0x12 -#define MODEL_o57 0x11 -#define MODEL_o56 0x10 -#define MODEL_o55 0xF -#define MODEL_exit 0xE -#define MODEL_g11 0xD -#define MODEL_b_s2 0xC -#define MODEL_b_s 0xB -#define MODEL_g8 0xA -#define MODEL_b_e2 0x9 -#define MODEL_b_e 0x8 -#define MODEL_g12 0x7 -#define MODEL_b_n2 0x6 -#define MODEL_b_n 0x5 -#define MODEL_g2 0x4 -#define MODEL_g10 0x3 -#define MODEL_stage 0x2 -#define MODEL_g5 0x1 -#define MODEL_o3 0x0 +#define MODEL_Root 0x17 +#define MODEL_g1 0x16 +#define MODEL_g28 0x15 +#define MODEL_o62 0x14 +#define MODEL_o61 0x13 +#define MODEL_o58 0x12 +#define MODEL_o57 0x11 +#define MODEL_o56 0x10 +#define MODEL_o55 0xF +#define MODEL_exit 0xE +#define MODEL_g11 0xD +#define MODEL_b_s2 0xC +#define MODEL_b_s 0xB +#define MODEL_g8 0xA +#define MODEL_b_e2 0x9 +#define MODEL_b_e 0x8 +#define MODEL_g12 0x7 +#define MODEL_b_n2 0x6 +#define MODEL_b_n 0x5 +#define MODEL_g2 0x4 +#define MODEL_g10 0x3 +#define MODEL_stage 0x2 +#define MODEL_g5 0x1 +#define MODEL_o3 0x0 + diff --git a/include/mapfs/sbk_41_hit.h b/include/mapfs/sbk_41_hit.h index 49f0d89830..ce184adce4 100644 --- a/include/mapfs/sbk_41_hit.h +++ b/include/mapfs/sbk_41_hit.h @@ -1,24 +1,40 @@ -#define COLLIDER_Root 0x17 -#define COLLIDER_g25 0x16 -#define COLLIDER_o107 0x15 -#define COLLIDER_o106 0x14 -#define COLLIDER_o105 0x13 -#define COLLIDER_o102 0x12 -#define COLLIDER_o101 0x11 -#define COLLIDER_tuitate 0x10 -#define COLLIDER_ttw 0xF -#define COLLIDER_tts 0xE -#define COLLIDER_tte 0xD -#define COLLIDER_ttn 0xC -#define COLLIDER_dero 0xB -#define COLLIDER_deilitw 0xA -#define COLLIDER_deiliw 0x9 -#define COLLIDER_deilits 0x8 -#define COLLIDER_deilis 0x7 -#define COLLIDER_deilite 0x6 -#define COLLIDER_deilie 0x5 -#define COLLIDER_deilitn 0x4 -#define COLLIDER_deilin 0x3 -#define COLLIDER_g1 0x2 -#define COLLIDER_mawari 0x1 -#define COLLIDER_stage 0x0 +#define COLLIDER_Root 0x17 +#define COLLIDER_g25 0x16 +#define COLLIDER_o107 0x15 +#define COLLIDER_o106 0x14 +#define COLLIDER_o105 0x13 +#define COLLIDER_o102 0x12 +#define COLLIDER_o101 0x11 +#define COLLIDER_tuitate 0x10 +#define COLLIDER_ttw 0xF +#define COLLIDER_tts 0xE +#define COLLIDER_tte 0xD +#define COLLIDER_ttn 0xC +#define COLLIDER_dero 0xB +#define COLLIDER_deilitw 0xA +#define COLLIDER_deiliw 0x9 +#define COLLIDER_deilits 0x8 +#define COLLIDER_deilis 0x7 +#define COLLIDER_deilite 0x6 +#define COLLIDER_deilie 0x5 +#define COLLIDER_deilitn 0x4 +#define COLLIDER_deilin 0x3 +#define COLLIDER_g1 0x2 +#define COLLIDER_mawari 0x1 +#define COLLIDER_stage 0x0 + +#define ZONE_Root 0xD +#define ZONE_g1 0xC +#define ZONE_g6 0xB +#define ZONE_g7 0xA +#define ZONE_b_w 0x9 +#define ZONE_g11 0x8 +#define ZONE_b_s 0x7 +#define ZONE_g8 0x6 +#define ZONE_b_e 0x5 +#define ZONE_g12 0x4 +#define ZONE_b_n 0x3 +#define ZONE_g2 0x2 +#define ZONE_g10 0x1 +#define ZONE_hiru_came 0x0 + diff --git a/include/mapfs/sbk_41_shape.h b/include/mapfs/sbk_41_shape.h index f8f49fd6e2..9df3e5f60f 100644 --- a/include/mapfs/sbk_41_shape.h +++ b/include/mapfs/sbk_41_shape.h @@ -1,26 +1,27 @@ -#define MODEL_Root 0x19 -#define MODEL_g1 0x18 -#define MODEL_g28 0x17 -#define MODEL_o61 0x16 -#define MODEL_o60 0x15 -#define MODEL_o59 0x14 -#define MODEL_o56 0x13 -#define MODEL_o55 0x12 -#define MODEL_exit 0x11 -#define MODEL_g7 0x10 -#define MODEL_b_w2 0xF -#define MODEL_b_w 0xE -#define MODEL_g11 0xD -#define MODEL_b_s2 0xC -#define MODEL_b_s 0xB -#define MODEL_g8 0xA -#define MODEL_b_e2 0x9 -#define MODEL_b_e 0x8 -#define MODEL_g12 0x7 -#define MODEL_b_n2 0x6 -#define MODEL_b_n 0x5 -#define MODEL_g2 0x4 -#define MODEL_g10 0x3 -#define MODEL_stage 0x2 -#define MODEL_g5 0x1 -#define MODEL_o3 0x0 +#define MODEL_Root 0x19 +#define MODEL_g1 0x18 +#define MODEL_g28 0x17 +#define MODEL_o61 0x16 +#define MODEL_o60 0x15 +#define MODEL_o59 0x14 +#define MODEL_o56 0x13 +#define MODEL_o55 0x12 +#define MODEL_exit 0x11 +#define MODEL_g7 0x10 +#define MODEL_b_w2 0xF +#define MODEL_b_w 0xE +#define MODEL_g11 0xD +#define MODEL_b_s2 0xC +#define MODEL_b_s 0xB +#define MODEL_g8 0xA +#define MODEL_b_e2 0x9 +#define MODEL_b_e 0x8 +#define MODEL_g12 0x7 +#define MODEL_b_n2 0x6 +#define MODEL_b_n 0x5 +#define MODEL_g2 0x4 +#define MODEL_g10 0x3 +#define MODEL_stage 0x2 +#define MODEL_g5 0x1 +#define MODEL_o3 0x0 + diff --git a/include/mapfs/sbk_42_hit.h b/include/mapfs/sbk_42_hit.h index f51203014d..0119511328 100644 --- a/include/mapfs/sbk_42_hit.h +++ b/include/mapfs/sbk_42_hit.h @@ -1,18 +1,34 @@ -#define COLLIDER_Root 0x11 -#define COLLIDER_tuitate 0x10 -#define COLLIDER_ttw 0xF -#define COLLIDER_tts 0xE -#define COLLIDER_tte 0xD -#define COLLIDER_ttn 0xC -#define COLLIDER_dero 0xB -#define COLLIDER_deilitw 0xA -#define COLLIDER_deiliw 0x9 -#define COLLIDER_deilits 0x8 -#define COLLIDER_deilis 0x7 -#define COLLIDER_deilite 0x6 -#define COLLIDER_deilie 0x5 -#define COLLIDER_deilitn 0x4 -#define COLLIDER_deilin 0x3 -#define COLLIDER_g1 0x2 -#define COLLIDER_mawari 0x1 -#define COLLIDER_stage 0x0 +#define COLLIDER_Root 0x11 +#define COLLIDER_tuitate 0x10 +#define COLLIDER_ttw 0xF +#define COLLIDER_tts 0xE +#define COLLIDER_tte 0xD +#define COLLIDER_ttn 0xC +#define COLLIDER_dero 0xB +#define COLLIDER_deilitw 0xA +#define COLLIDER_deiliw 0x9 +#define COLLIDER_deilits 0x8 +#define COLLIDER_deilis 0x7 +#define COLLIDER_deilite 0x6 +#define COLLIDER_deilie 0x5 +#define COLLIDER_deilitn 0x4 +#define COLLIDER_deilin 0x3 +#define COLLIDER_g1 0x2 +#define COLLIDER_mawari 0x1 +#define COLLIDER_stage 0x0 + +#define ZONE_Root 0xD +#define ZONE_g1 0xC +#define ZONE_g6 0xB +#define ZONE_g7 0xA +#define ZONE_b_w 0x9 +#define ZONE_g11 0x8 +#define ZONE_b_s 0x7 +#define ZONE_g8 0x6 +#define ZONE_b_e 0x5 +#define ZONE_g12 0x4 +#define ZONE_b_n 0x3 +#define ZONE_g2 0x2 +#define ZONE_g10 0x1 +#define ZONE_hiru_came 0x0 + diff --git a/include/mapfs/sbk_42_shape.h b/include/mapfs/sbk_42_shape.h index 12f2f73887..7e4eebcb24 100644 --- a/include/mapfs/sbk_42_shape.h +++ b/include/mapfs/sbk_42_shape.h @@ -1,20 +1,21 @@ -#define MODEL_Root 0x13 -#define MODEL_g1 0x12 -#define MODEL_exit 0x11 -#define MODEL_g7 0x10 -#define MODEL_b_w2 0xF -#define MODEL_b_w 0xE -#define MODEL_g11 0xD -#define MODEL_b_s2 0xC -#define MODEL_b_s 0xB -#define MODEL_g8 0xA -#define MODEL_b_e2 0x9 -#define MODEL_b_e 0x8 -#define MODEL_g12 0x7 -#define MODEL_b_n2 0x6 -#define MODEL_b_n 0x5 -#define MODEL_g2 0x4 -#define MODEL_g10 0x3 -#define MODEL_stage 0x2 -#define MODEL_g5 0x1 -#define MODEL_o3 0x0 +#define MODEL_Root 0x13 +#define MODEL_g1 0x12 +#define MODEL_exit 0x11 +#define MODEL_g7 0x10 +#define MODEL_b_w2 0xF +#define MODEL_b_w 0xE +#define MODEL_g11 0xD +#define MODEL_b_s2 0xC +#define MODEL_b_s 0xB +#define MODEL_g8 0xA +#define MODEL_b_e2 0x9 +#define MODEL_b_e 0x8 +#define MODEL_g12 0x7 +#define MODEL_b_n2 0x6 +#define MODEL_b_n 0x5 +#define MODEL_g2 0x4 +#define MODEL_g10 0x3 +#define MODEL_stage 0x2 +#define MODEL_g5 0x1 +#define MODEL_o3 0x0 + diff --git a/include/mapfs/sbk_43_hit.h b/include/mapfs/sbk_43_hit.h index a3775bafeb..8c05d27fc6 100644 --- a/include/mapfs/sbk_43_hit.h +++ b/include/mapfs/sbk_43_hit.h @@ -1,22 +1,38 @@ -#define COLLIDER_Root 0x15 -#define COLLIDER_g25 0x14 -#define COLLIDER_o178 0x13 -#define COLLIDER_o181 0x12 -#define COLLIDER_o180 0x11 -#define COLLIDER_tuitate 0x10 -#define COLLIDER_ttw 0xF -#define COLLIDER_tts 0xE -#define COLLIDER_tte 0xD -#define COLLIDER_ttn 0xC -#define COLLIDER_dero 0xB -#define COLLIDER_deilitw 0xA -#define COLLIDER_deiliw 0x9 -#define COLLIDER_deilits 0x8 -#define COLLIDER_deilis 0x7 -#define COLLIDER_deilite 0x6 -#define COLLIDER_deilie 0x5 -#define COLLIDER_deilitn 0x4 -#define COLLIDER_deilin 0x3 -#define COLLIDER_g1 0x2 -#define COLLIDER_mawari 0x1 -#define COLLIDER_stage 0x0 +#define COLLIDER_Root 0x15 +#define COLLIDER_g25 0x14 +#define COLLIDER_o178 0x13 +#define COLLIDER_o181 0x12 +#define COLLIDER_o180 0x11 +#define COLLIDER_tuitate 0x10 +#define COLLIDER_ttw 0xF +#define COLLIDER_tts 0xE +#define COLLIDER_tte 0xD +#define COLLIDER_ttn 0xC +#define COLLIDER_dero 0xB +#define COLLIDER_deilitw 0xA +#define COLLIDER_deiliw 0x9 +#define COLLIDER_deilits 0x8 +#define COLLIDER_deilis 0x7 +#define COLLIDER_deilite 0x6 +#define COLLIDER_deilie 0x5 +#define COLLIDER_deilitn 0x4 +#define COLLIDER_deilin 0x3 +#define COLLIDER_g1 0x2 +#define COLLIDER_mawari 0x1 +#define COLLIDER_stage 0x0 + +#define ZONE_Root 0xD +#define ZONE_g1 0xC +#define ZONE_g6 0xB +#define ZONE_g7 0xA +#define ZONE_b_w 0x9 +#define ZONE_g11 0x8 +#define ZONE_b_s 0x7 +#define ZONE_g8 0x6 +#define ZONE_b_e 0x5 +#define ZONE_g12 0x4 +#define ZONE_b_n 0x3 +#define ZONE_g2 0x2 +#define ZONE_g10 0x1 +#define ZONE_hiru_came 0x0 + diff --git a/include/mapfs/sbk_43_shape.h b/include/mapfs/sbk_43_shape.h index fc2e73b5b6..c8c3db9a36 100644 --- a/include/mapfs/sbk_43_shape.h +++ b/include/mapfs/sbk_43_shape.h @@ -1,34 +1,35 @@ -#define MODEL_Root 0x21 -#define MODEL_g1 0x20 -#define MODEL_g32 0x1F -#define MODEL_g35 0x1E -#define MODEL_o71 0x1D -#define MODEL_o70 0x1C -#define MODEL_g34 0x1B -#define MODEL_o69 0x1A -#define MODEL_o67 0x19 -#define MODEL_o66 0x18 -#define MODEL_o65 0x17 -#define MODEL_g33 0x16 -#define MODEL_o64 0x15 -#define MODEL_o62 0x14 -#define MODEL_o61 0x13 -#define MODEL_o60 0x12 -#define MODEL_exit 0x11 -#define MODEL_g7 0x10 -#define MODEL_b_w2 0xF -#define MODEL_b_w 0xE -#define MODEL_g11 0xD -#define MODEL_b_s2 0xC -#define MODEL_b_s 0xB -#define MODEL_g8 0xA -#define MODEL_b_e2 0x9 -#define MODEL_b_e 0x8 -#define MODEL_g12 0x7 -#define MODEL_b_n2 0x6 -#define MODEL_b_n 0x5 -#define MODEL_g2 0x4 -#define MODEL_g10 0x3 -#define MODEL_stage 0x2 -#define MODEL_g5 0x1 -#define MODEL_o3 0x0 +#define MODEL_Root 0x21 +#define MODEL_g1 0x20 +#define MODEL_g32 0x1F +#define MODEL_g35 0x1E +#define MODEL_o71 0x1D +#define MODEL_o70 0x1C +#define MODEL_g34 0x1B +#define MODEL_o69 0x1A +#define MODEL_o67 0x19 +#define MODEL_o66 0x18 +#define MODEL_o65 0x17 +#define MODEL_g33 0x16 +#define MODEL_o64 0x15 +#define MODEL_o62 0x14 +#define MODEL_o61 0x13 +#define MODEL_o60 0x12 +#define MODEL_exit 0x11 +#define MODEL_g7 0x10 +#define MODEL_b_w2 0xF +#define MODEL_b_w 0xE +#define MODEL_g11 0xD +#define MODEL_b_s2 0xC +#define MODEL_b_s 0xB +#define MODEL_g8 0xA +#define MODEL_b_e2 0x9 +#define MODEL_b_e 0x8 +#define MODEL_g12 0x7 +#define MODEL_b_n2 0x6 +#define MODEL_b_n 0x5 +#define MODEL_g2 0x4 +#define MODEL_g10 0x3 +#define MODEL_stage 0x2 +#define MODEL_g5 0x1 +#define MODEL_o3 0x0 + diff --git a/include/mapfs/sbk_44_hit.h b/include/mapfs/sbk_44_hit.h index f51203014d..0119511328 100644 --- a/include/mapfs/sbk_44_hit.h +++ b/include/mapfs/sbk_44_hit.h @@ -1,18 +1,34 @@ -#define COLLIDER_Root 0x11 -#define COLLIDER_tuitate 0x10 -#define COLLIDER_ttw 0xF -#define COLLIDER_tts 0xE -#define COLLIDER_tte 0xD -#define COLLIDER_ttn 0xC -#define COLLIDER_dero 0xB -#define COLLIDER_deilitw 0xA -#define COLLIDER_deiliw 0x9 -#define COLLIDER_deilits 0x8 -#define COLLIDER_deilis 0x7 -#define COLLIDER_deilite 0x6 -#define COLLIDER_deilie 0x5 -#define COLLIDER_deilitn 0x4 -#define COLLIDER_deilin 0x3 -#define COLLIDER_g1 0x2 -#define COLLIDER_mawari 0x1 -#define COLLIDER_stage 0x0 +#define COLLIDER_Root 0x11 +#define COLLIDER_tuitate 0x10 +#define COLLIDER_ttw 0xF +#define COLLIDER_tts 0xE +#define COLLIDER_tte 0xD +#define COLLIDER_ttn 0xC +#define COLLIDER_dero 0xB +#define COLLIDER_deilitw 0xA +#define COLLIDER_deiliw 0x9 +#define COLLIDER_deilits 0x8 +#define COLLIDER_deilis 0x7 +#define COLLIDER_deilite 0x6 +#define COLLIDER_deilie 0x5 +#define COLLIDER_deilitn 0x4 +#define COLLIDER_deilin 0x3 +#define COLLIDER_g1 0x2 +#define COLLIDER_mawari 0x1 +#define COLLIDER_stage 0x0 + +#define ZONE_Root 0xD +#define ZONE_g1 0xC +#define ZONE_g6 0xB +#define ZONE_g7 0xA +#define ZONE_b_w 0x9 +#define ZONE_g11 0x8 +#define ZONE_b_s 0x7 +#define ZONE_g8 0x6 +#define ZONE_b_e 0x5 +#define ZONE_g12 0x4 +#define ZONE_b_n 0x3 +#define ZONE_g2 0x2 +#define ZONE_g10 0x1 +#define ZONE_hiru_came 0x0 + diff --git a/include/mapfs/sbk_44_shape.h b/include/mapfs/sbk_44_shape.h index 12f2f73887..7e4eebcb24 100644 --- a/include/mapfs/sbk_44_shape.h +++ b/include/mapfs/sbk_44_shape.h @@ -1,20 +1,21 @@ -#define MODEL_Root 0x13 -#define MODEL_g1 0x12 -#define MODEL_exit 0x11 -#define MODEL_g7 0x10 -#define MODEL_b_w2 0xF -#define MODEL_b_w 0xE -#define MODEL_g11 0xD -#define MODEL_b_s2 0xC -#define MODEL_b_s 0xB -#define MODEL_g8 0xA -#define MODEL_b_e2 0x9 -#define MODEL_b_e 0x8 -#define MODEL_g12 0x7 -#define MODEL_b_n2 0x6 -#define MODEL_b_n 0x5 -#define MODEL_g2 0x4 -#define MODEL_g10 0x3 -#define MODEL_stage 0x2 -#define MODEL_g5 0x1 -#define MODEL_o3 0x0 +#define MODEL_Root 0x13 +#define MODEL_g1 0x12 +#define MODEL_exit 0x11 +#define MODEL_g7 0x10 +#define MODEL_b_w2 0xF +#define MODEL_b_w 0xE +#define MODEL_g11 0xD +#define MODEL_b_s2 0xC +#define MODEL_b_s 0xB +#define MODEL_g8 0xA +#define MODEL_b_e2 0x9 +#define MODEL_b_e 0x8 +#define MODEL_g12 0x7 +#define MODEL_b_n2 0x6 +#define MODEL_b_n 0x5 +#define MODEL_g2 0x4 +#define MODEL_g10 0x3 +#define MODEL_stage 0x2 +#define MODEL_g5 0x1 +#define MODEL_o3 0x0 + diff --git a/include/mapfs/sbk_45_hit.h b/include/mapfs/sbk_45_hit.h index c33ba9cc07..54d258cd4b 100644 --- a/include/mapfs/sbk_45_hit.h +++ b/include/mapfs/sbk_45_hit.h @@ -1,25 +1,41 @@ -#define COLLIDER_Root 0x18 -#define COLLIDER_g28 0x17 -#define COLLIDER_o72 0x16 -#define COLLIDER_o67 0x15 -#define COLLIDER_o66 0x14 -#define COLLIDER_o65 0x13 -#define COLLIDER_o64 0x12 -#define COLLIDER_g1 0x11 -#define COLLIDER_tuitate 0x10 -#define COLLIDER_tts 0xF -#define COLLIDER_tte 0xE -#define COLLIDER_ttn 0xD -#define COLLIDER_ttw 0xC -#define COLLIDER_bero 0xB -#define COLLIDER_deiliw 0xA -#define COLLIDER_deilitw 0x9 -#define COLLIDER_deilis 0x8 -#define COLLIDER_deilits 0x7 -#define COLLIDER_deilie 0x6 -#define COLLIDER_deilite 0x5 -#define COLLIDER_deilin 0x4 -#define COLLIDER_deilitn 0x3 -#define COLLIDER_g10 0x2 -#define COLLIDER_o49 0x1 -#define COLLIDER_stage 0x0 +#define COLLIDER_Root 0x18 +#define COLLIDER_g28 0x17 +#define COLLIDER_o72 0x16 +#define COLLIDER_o67 0x15 +#define COLLIDER_o66 0x14 +#define COLLIDER_o65 0x13 +#define COLLIDER_o64 0x12 +#define COLLIDER_g1 0x11 +#define COLLIDER_tuitate 0x10 +#define COLLIDER_tts 0xF +#define COLLIDER_tte 0xE +#define COLLIDER_ttn 0xD +#define COLLIDER_ttw 0xC +#define COLLIDER_bero 0xB +#define COLLIDER_deiliw 0xA +#define COLLIDER_deilitw 0x9 +#define COLLIDER_deilis 0x8 +#define COLLIDER_deilits 0x7 +#define COLLIDER_deilie 0x6 +#define COLLIDER_deilite 0x5 +#define COLLIDER_deilin 0x4 +#define COLLIDER_deilitn 0x3 +#define COLLIDER_g10 0x2 +#define COLLIDER_o49 0x1 +#define COLLIDER_stage 0x0 + +#define ZONE_Root 0xD +#define ZONE_g1 0xC +#define ZONE_g6 0xB +#define ZONE_g7 0xA +#define ZONE_b_w 0x9 +#define ZONE_g11 0x8 +#define ZONE_b_s 0x7 +#define ZONE_g8 0x6 +#define ZONE_b_e 0x5 +#define ZONE_g12 0x4 +#define ZONE_b_n 0x3 +#define ZONE_g2 0x2 +#define ZONE_g10 0x1 +#define ZONE_hiru_came 0x0 + diff --git a/include/mapfs/sbk_45_shape.h b/include/mapfs/sbk_45_shape.h index 448e7892f1..973e14f637 100644 --- a/include/mapfs/sbk_45_shape.h +++ b/include/mapfs/sbk_45_shape.h @@ -1,26 +1,27 @@ -#define MODEL_Root 0x19 -#define MODEL_Default 0x18 -#define MODEL_g25 0x17 -#define MODEL_i_suna 0x16 -#define MODEL_o38 0x15 -#define MODEL_o40 0x14 -#define MODEL_o37 0x13 -#define MODEL_g1 0x12 -#define MODEL_exit 0x11 -#define MODEL_g7 0x10 -#define MODEL_b_w2 0xF -#define MODEL_b_w 0xE -#define MODEL_g11 0xD -#define MODEL_b_s2 0xC -#define MODEL_b_s 0xB -#define MODEL_g8 0xA -#define MODEL_b_e2 0x9 -#define MODEL_b_e 0x8 -#define MODEL_g12 0x7 -#define MODEL_b_n2 0x6 -#define MODEL_b_n 0x5 -#define MODEL_g2 0x4 -#define MODEL_g10 0x3 -#define MODEL_stage 0x2 -#define MODEL_g5 0x1 -#define MODEL_o3 0x0 +#define MODEL_Root 0x19 +#define MODEL_Default 0x18 +#define MODEL_g25 0x17 +#define MODEL_i_suna 0x16 +#define MODEL_o38 0x15 +#define MODEL_o40 0x14 +#define MODEL_o37 0x13 +#define MODEL_g1 0x12 +#define MODEL_exit 0x11 +#define MODEL_g7 0x10 +#define MODEL_b_w2 0xF +#define MODEL_b_w 0xE +#define MODEL_g11 0xD +#define MODEL_b_s2 0xC +#define MODEL_b_s 0xB +#define MODEL_g8 0xA +#define MODEL_b_e2 0x9 +#define MODEL_b_e 0x8 +#define MODEL_g12 0x7 +#define MODEL_b_n2 0x6 +#define MODEL_b_n 0x5 +#define MODEL_g2 0x4 +#define MODEL_g10 0x3 +#define MODEL_stage 0x2 +#define MODEL_g5 0x1 +#define MODEL_o3 0x0 + diff --git a/include/mapfs/sbk_46_hit.h b/include/mapfs/sbk_46_hit.h index 400e8becb8..4b0307eeec 100644 --- a/include/mapfs/sbk_46_hit.h +++ b/include/mapfs/sbk_46_hit.h @@ -1,20 +1,36 @@ -#define COLLIDER_Root 0x13 -#define COLLIDER_g48 0x12 -#define COLLIDER_o197 0x11 -#define COLLIDER_o191 0x10 -#define COLLIDER_o195 0xF -#define COLLIDER_o193 0xE -#define COLLIDER_tuitate 0xD -#define COLLIDER_ttw 0xC -#define COLLIDER_tts 0xB -#define COLLIDER_ttn 0xA -#define COLLIDER_dero 0x9 -#define COLLIDER_deilitw 0x8 -#define COLLIDER_deiliw 0x7 -#define COLLIDER_deilits 0x6 -#define COLLIDER_deilis 0x5 -#define COLLIDER_deilitn 0x4 -#define COLLIDER_deilin 0x3 -#define COLLIDER_g1 0x2 -#define COLLIDER_mawari 0x1 -#define COLLIDER_stage 0x0 +#define COLLIDER_Root 0x13 +#define COLLIDER_g48 0x12 +#define COLLIDER_o197 0x11 +#define COLLIDER_o191 0x10 +#define COLLIDER_o195 0xF +#define COLLIDER_o193 0xE +#define COLLIDER_tuitate 0xD +#define COLLIDER_ttw 0xC +#define COLLIDER_tts 0xB +#define COLLIDER_ttn 0xA +#define COLLIDER_dero 0x9 +#define COLLIDER_deilitw 0x8 +#define COLLIDER_deiliw 0x7 +#define COLLIDER_deilits 0x6 +#define COLLIDER_deilis 0x5 +#define COLLIDER_deilitn 0x4 +#define COLLIDER_deilin 0x3 +#define COLLIDER_g1 0x2 +#define COLLIDER_mawari 0x1 +#define COLLIDER_stage 0x0 + +#define ZONE_Root 0xD +#define ZONE_g1 0xC +#define ZONE_g6 0xB +#define ZONE_g7 0xA +#define ZONE_b_w 0x9 +#define ZONE_g11 0x8 +#define ZONE_b_s 0x7 +#define ZONE_g8 0x6 +#define ZONE_b_e 0x5 +#define ZONE_g12 0x4 +#define ZONE_b_n 0x3 +#define ZONE_g2 0x2 +#define ZONE_g10 0x1 +#define ZONE_hiru_came 0x0 + diff --git a/include/mapfs/sbk_46_shape.h b/include/mapfs/sbk_46_shape.h index 155aaa18c0..5ba718a927 100644 --- a/include/mapfs/sbk_46_shape.h +++ b/include/mapfs/sbk_46_shape.h @@ -1,34 +1,35 @@ -#define MODEL_Root 0x21 -#define MODEL_g1 0x20 -#define MODEL_g28 0x1F -#define MODEL_g31 0x1E -#define MODEL_o70 0x1D -#define MODEL_o60 0x1C -#define MODEL_o59 0x1B -#define MODEL_g33 0x1A -#define MODEL_o69 0x19 -#define MODEL_o64 0x18 -#define MODEL_o63 0x17 -#define MODEL_g32 0x16 -#define MODEL_o68 0x15 -#define MODEL_o62 0x14 -#define MODEL_o61 0x13 -#define MODEL_o67 0x12 -#define MODEL_exit 0x11 -#define MODEL_g7 0x10 -#define MODEL_b_w2 0xF -#define MODEL_b_w 0xE -#define MODEL_g11 0xD -#define MODEL_b_s2 0xC -#define MODEL_b_s 0xB -#define MODEL_g12 0xA -#define MODEL_b_n2 0x9 -#define MODEL_b_n 0x8 -#define MODEL_g10 0x7 -#define MODEL_g34 0x6 -#define MODEL_o66 0x5 -#define MODEL_o65 0x4 -#define MODEL_stage 0x3 -#define MODEL_g2 0x2 -#define MODEL_g5 0x1 -#define MODEL_o3 0x0 +#define MODEL_Root 0x21 +#define MODEL_g1 0x20 +#define MODEL_g28 0x1F +#define MODEL_g31 0x1E +#define MODEL_o70 0x1D +#define MODEL_o60 0x1C +#define MODEL_o59 0x1B +#define MODEL_g33 0x1A +#define MODEL_o69 0x19 +#define MODEL_o64 0x18 +#define MODEL_o63 0x17 +#define MODEL_g32 0x16 +#define MODEL_o68 0x15 +#define MODEL_o62 0x14 +#define MODEL_o61 0x13 +#define MODEL_o67 0x12 +#define MODEL_exit 0x11 +#define MODEL_g7 0x10 +#define MODEL_b_w2 0xF +#define MODEL_b_w 0xE +#define MODEL_g11 0xD +#define MODEL_b_s2 0xC +#define MODEL_b_s 0xB +#define MODEL_g12 0xA +#define MODEL_b_n2 0x9 +#define MODEL_b_n 0x8 +#define MODEL_g10 0x7 +#define MODEL_g34 0x6 +#define MODEL_o66 0x5 +#define MODEL_o65 0x4 +#define MODEL_stage 0x3 +#define MODEL_g2 0x2 +#define MODEL_g5 0x1 +#define MODEL_o3 0x0 + diff --git a/include/mapfs/sbk_50_hit.h b/include/mapfs/sbk_50_hit.h index fd4802a330..7680b105e1 100644 --- a/include/mapfs/sbk_50_hit.h +++ b/include/mapfs/sbk_50_hit.h @@ -1,21 +1,37 @@ -#define COLLIDER_Root 0x14 -#define COLLIDER_g25 0x13 -#define COLLIDER_o120 0x12 -#define COLLIDER_o119 0x11 -#define COLLIDER_o118 0x10 -#define COLLIDER_o114 0xF -#define COLLIDER_o113 0xE -#define COLLIDER_tuitate 0xD -#define COLLIDER_tts 0xC -#define COLLIDER_tte 0xB -#define COLLIDER_ttn 0xA -#define COLLIDER_dero 0x9 -#define COLLIDER_deilits 0x8 -#define COLLIDER_deilis 0x7 -#define COLLIDER_deilite 0x6 -#define COLLIDER_deilie 0x5 -#define COLLIDER_deilitn 0x4 -#define COLLIDER_deilin 0x3 -#define COLLIDER_g1 0x2 -#define COLLIDER_mawari 0x1 -#define COLLIDER_stage 0x0 +#define COLLIDER_Root 0x14 +#define COLLIDER_g25 0x13 +#define COLLIDER_o120 0x12 +#define COLLIDER_o119 0x11 +#define COLLIDER_o118 0x10 +#define COLLIDER_o114 0xF +#define COLLIDER_o113 0xE +#define COLLIDER_tuitate 0xD +#define COLLIDER_tts 0xC +#define COLLIDER_tte 0xB +#define COLLIDER_ttn 0xA +#define COLLIDER_dero 0x9 +#define COLLIDER_deilits 0x8 +#define COLLIDER_deilis 0x7 +#define COLLIDER_deilite 0x6 +#define COLLIDER_deilie 0x5 +#define COLLIDER_deilitn 0x4 +#define COLLIDER_deilin 0x3 +#define COLLIDER_g1 0x2 +#define COLLIDER_mawari 0x1 +#define COLLIDER_stage 0x0 + +#define ZONE_Root 0xD +#define ZONE_g1 0xC +#define ZONE_g6 0xB +#define ZONE_g7 0xA +#define ZONE_b_w 0x9 +#define ZONE_g11 0x8 +#define ZONE_b_s 0x7 +#define ZONE_g8 0x6 +#define ZONE_b_e 0x5 +#define ZONE_g12 0x4 +#define ZONE_b_n 0x3 +#define ZONE_g2 0x2 +#define ZONE_g10 0x1 +#define ZONE_hiru_came 0x0 + diff --git a/include/mapfs/sbk_50_shape.h b/include/mapfs/sbk_50_shape.h index 779513f7f0..e2659d5089 100644 --- a/include/mapfs/sbk_50_shape.h +++ b/include/mapfs/sbk_50_shape.h @@ -1,23 +1,24 @@ -#define MODEL_Root 0x16 -#define MODEL_g1 0x15 -#define MODEL_g28 0x14 -#define MODEL_o63 0x13 -#define MODEL_o62 0x12 -#define MODEL_o57 0x11 -#define MODEL_o56 0x10 -#define MODEL_o55 0xF -#define MODEL_exit 0xE -#define MODEL_g11 0xD -#define MODEL_b_s2 0xC -#define MODEL_b_s 0xB -#define MODEL_g8 0xA -#define MODEL_b_e2 0x9 -#define MODEL_b_e 0x8 -#define MODEL_g12 0x7 -#define MODEL_b_n2 0x6 -#define MODEL_b_n 0x5 -#define MODEL_g2 0x4 -#define MODEL_g10 0x3 -#define MODEL_stage 0x2 -#define MODEL_g5 0x1 -#define MODEL_o3 0x0 +#define MODEL_Root 0x16 +#define MODEL_g1 0x15 +#define MODEL_g28 0x14 +#define MODEL_o63 0x13 +#define MODEL_o62 0x12 +#define MODEL_o57 0x11 +#define MODEL_o56 0x10 +#define MODEL_o55 0xF +#define MODEL_exit 0xE +#define MODEL_g11 0xD +#define MODEL_b_s2 0xC +#define MODEL_b_s 0xB +#define MODEL_g8 0xA +#define MODEL_b_e2 0x9 +#define MODEL_b_e 0x8 +#define MODEL_g12 0x7 +#define MODEL_b_n2 0x6 +#define MODEL_b_n 0x5 +#define MODEL_g2 0x4 +#define MODEL_g10 0x3 +#define MODEL_stage 0x2 +#define MODEL_g5 0x1 +#define MODEL_o3 0x0 + diff --git a/include/mapfs/sbk_51_hit.h b/include/mapfs/sbk_51_hit.h index d7a7d27416..9797338747 100644 --- a/include/mapfs/sbk_51_hit.h +++ b/include/mapfs/sbk_51_hit.h @@ -1,26 +1,42 @@ -#define COLLIDER_Root 0x19 -#define COLLIDER_Default 0x18 -#define COLLIDER_o156 0x17 -#define COLLIDER_o155 0x16 -#define COLLIDER_o154 0x15 -#define COLLIDER_g25 0x14 -#define COLLIDER_o142 0x13 -#define COLLIDER_o141 0x12 -#define COLLIDER_o140 0x11 -#define COLLIDER_tuitate 0x10 -#define COLLIDER_ttw 0xF -#define COLLIDER_tts 0xE -#define COLLIDER_tte 0xD -#define COLLIDER_ttn 0xC -#define COLLIDER_dero 0xB -#define COLLIDER_deilitw 0xA -#define COLLIDER_deiliw 0x9 -#define COLLIDER_deilits 0x8 -#define COLLIDER_deilis 0x7 -#define COLLIDER_deilite 0x6 -#define COLLIDER_deilie 0x5 -#define COLLIDER_deilitn 0x4 -#define COLLIDER_deilin 0x3 -#define COLLIDER_g1 0x2 -#define COLLIDER_mawari 0x1 -#define COLLIDER_stage 0x0 +#define COLLIDER_Root 0x19 +#define COLLIDER_Default 0x18 +#define COLLIDER_o156 0x17 +#define COLLIDER_o155 0x16 +#define COLLIDER_o154 0x15 +#define COLLIDER_g25 0x14 +#define COLLIDER_o142 0x13 +#define COLLIDER_o141 0x12 +#define COLLIDER_o140 0x11 +#define COLLIDER_tuitate 0x10 +#define COLLIDER_ttw 0xF +#define COLLIDER_tts 0xE +#define COLLIDER_tte 0xD +#define COLLIDER_ttn 0xC +#define COLLIDER_dero 0xB +#define COLLIDER_deilitw 0xA +#define COLLIDER_deiliw 0x9 +#define COLLIDER_deilits 0x8 +#define COLLIDER_deilis 0x7 +#define COLLIDER_deilite 0x6 +#define COLLIDER_deilie 0x5 +#define COLLIDER_deilitn 0x4 +#define COLLIDER_deilin 0x3 +#define COLLIDER_g1 0x2 +#define COLLIDER_mawari 0x1 +#define COLLIDER_stage 0x0 + +#define ZONE_Root 0xD +#define ZONE_g1 0xC +#define ZONE_g6 0xB +#define ZONE_g7 0xA +#define ZONE_b_w 0x9 +#define ZONE_g11 0x8 +#define ZONE_b_s 0x7 +#define ZONE_g8 0x6 +#define ZONE_b_e 0x5 +#define ZONE_g12 0x4 +#define ZONE_b_n 0x3 +#define ZONE_g2 0x2 +#define ZONE_g10 0x1 +#define ZONE_hiru_came 0x0 + diff --git a/include/mapfs/sbk_51_shape.h b/include/mapfs/sbk_51_shape.h index 2475d4f4a0..1e2c7a266b 100644 --- a/include/mapfs/sbk_51_shape.h +++ b/include/mapfs/sbk_51_shape.h @@ -1,36 +1,37 @@ -#define MODEL_Root 0x23 -#define MODEL_g1 0x22 -#define MODEL_g30 0x21 -#define MODEL_g33 0x20 -#define MODEL_o66 0x1F -#define MODEL_o65 0x1E -#define MODEL_o64 0x1D -#define MODEL_g32 0x1C -#define MODEL_o63 0x1B -#define MODEL_o62 0x1A -#define MODEL_o61 0x19 -#define MODEL_g31 0x18 -#define MODEL_o60 0x17 -#define MODEL_o59 0x16 -#define MODEL_g28 0x15 -#define MODEL_o58 0x14 -#define MODEL_o57 0x13 -#define MODEL_o55 0x12 -#define MODEL_exit 0x11 -#define MODEL_g7 0x10 -#define MODEL_b_w2 0xF -#define MODEL_b_w 0xE -#define MODEL_g11 0xD -#define MODEL_b_s2 0xC -#define MODEL_b_s 0xB -#define MODEL_g8 0xA -#define MODEL_b_e2 0x9 -#define MODEL_b_e 0x8 -#define MODEL_g12 0x7 -#define MODEL_b_n2 0x6 -#define MODEL_b_n 0x5 -#define MODEL_g2 0x4 -#define MODEL_g10 0x3 -#define MODEL_stage 0x2 -#define MODEL_g5 0x1 -#define MODEL_o3 0x0 +#define MODEL_Root 0x23 +#define MODEL_g1 0x22 +#define MODEL_g30 0x21 +#define MODEL_g33 0x20 +#define MODEL_o66 0x1F +#define MODEL_o65 0x1E +#define MODEL_o64 0x1D +#define MODEL_g32 0x1C +#define MODEL_o63 0x1B +#define MODEL_o62 0x1A +#define MODEL_o61 0x19 +#define MODEL_g31 0x18 +#define MODEL_o60 0x17 +#define MODEL_o59 0x16 +#define MODEL_g28 0x15 +#define MODEL_o58 0x14 +#define MODEL_o57 0x13 +#define MODEL_o55 0x12 +#define MODEL_exit 0x11 +#define MODEL_g7 0x10 +#define MODEL_b_w2 0xF +#define MODEL_b_w 0xE +#define MODEL_g11 0xD +#define MODEL_b_s2 0xC +#define MODEL_b_s 0xB +#define MODEL_g8 0xA +#define MODEL_b_e2 0x9 +#define MODEL_b_e 0x8 +#define MODEL_g12 0x7 +#define MODEL_b_n2 0x6 +#define MODEL_b_n 0x5 +#define MODEL_g2 0x4 +#define MODEL_g10 0x3 +#define MODEL_stage 0x2 +#define MODEL_g5 0x1 +#define MODEL_o3 0x0 + diff --git a/include/mapfs/sbk_52_hit.h b/include/mapfs/sbk_52_hit.h index cb67906c63..bde9cc20d3 100644 --- a/include/mapfs/sbk_52_hit.h +++ b/include/mapfs/sbk_52_hit.h @@ -1,21 +1,37 @@ -#define COLLIDER_Root 0x14 -#define COLLIDER_g25 0x13 -#define COLLIDER_o189 0x12 -#define COLLIDER_o188 0x11 -#define COLLIDER_tuitate 0x10 -#define COLLIDER_ttw 0xF -#define COLLIDER_tts 0xE -#define COLLIDER_tte 0xD -#define COLLIDER_ttn 0xC -#define COLLIDER_dero 0xB -#define COLLIDER_deilitw 0xA -#define COLLIDER_deiliw 0x9 -#define COLLIDER_deilits 0x8 -#define COLLIDER_deilis 0x7 -#define COLLIDER_deilite 0x6 -#define COLLIDER_deilie 0x5 -#define COLLIDER_deilitn 0x4 -#define COLLIDER_deilin 0x3 -#define COLLIDER_g1 0x2 -#define COLLIDER_mawari 0x1 -#define COLLIDER_stage 0x0 +#define COLLIDER_Root 0x14 +#define COLLIDER_g25 0x13 +#define COLLIDER_o189 0x12 +#define COLLIDER_o188 0x11 +#define COLLIDER_tuitate 0x10 +#define COLLIDER_ttw 0xF +#define COLLIDER_tts 0xE +#define COLLIDER_tte 0xD +#define COLLIDER_ttn 0xC +#define COLLIDER_dero 0xB +#define COLLIDER_deilitw 0xA +#define COLLIDER_deiliw 0x9 +#define COLLIDER_deilits 0x8 +#define COLLIDER_deilis 0x7 +#define COLLIDER_deilite 0x6 +#define COLLIDER_deilie 0x5 +#define COLLIDER_deilitn 0x4 +#define COLLIDER_deilin 0x3 +#define COLLIDER_g1 0x2 +#define COLLIDER_mawari 0x1 +#define COLLIDER_stage 0x0 + +#define ZONE_Root 0xD +#define ZONE_g1 0xC +#define ZONE_g6 0xB +#define ZONE_g7 0xA +#define ZONE_b_w 0x9 +#define ZONE_g11 0x8 +#define ZONE_b_s 0x7 +#define ZONE_g8 0x6 +#define ZONE_b_e 0x5 +#define ZONE_g12 0x4 +#define ZONE_b_n 0x3 +#define ZONE_g2 0x2 +#define ZONE_g10 0x1 +#define ZONE_hiru_came 0x0 + diff --git a/include/mapfs/sbk_52_shape.h b/include/mapfs/sbk_52_shape.h index 52d6dc703c..af5bafb73d 100644 --- a/include/mapfs/sbk_52_shape.h +++ b/include/mapfs/sbk_52_shape.h @@ -1,29 +1,30 @@ -#define MODEL_Root 0x1C -#define MODEL_g1 0x1B -#define MODEL_g28 0x1A -#define MODEL_g30 0x19 -#define MODEL_o61 0x18 -#define MODEL_o59 0x17 -#define MODEL_o58 0x16 -#define MODEL_o57 0x15 -#define MODEL_g29 0x14 -#define MODEL_o56 0x13 -#define MODEL_o55 0x12 -#define MODEL_exit 0x11 -#define MODEL_g7 0x10 -#define MODEL_b_w2 0xF -#define MODEL_b_w 0xE -#define MODEL_g11 0xD -#define MODEL_b_s2 0xC -#define MODEL_b_s 0xB -#define MODEL_g8 0xA -#define MODEL_b_e2 0x9 -#define MODEL_b_e 0x8 -#define MODEL_g12 0x7 -#define MODEL_b_n2 0x6 -#define MODEL_b_n 0x5 -#define MODEL_g2 0x4 -#define MODEL_g10 0x3 -#define MODEL_stage 0x2 -#define MODEL_g5 0x1 -#define MODEL_o3 0x0 +#define MODEL_Root 0x1C +#define MODEL_g1 0x1B +#define MODEL_g28 0x1A +#define MODEL_g30 0x19 +#define MODEL_o61 0x18 +#define MODEL_o59 0x17 +#define MODEL_o58 0x16 +#define MODEL_o57 0x15 +#define MODEL_g29 0x14 +#define MODEL_o56 0x13 +#define MODEL_o55 0x12 +#define MODEL_exit 0x11 +#define MODEL_g7 0x10 +#define MODEL_b_w2 0xF +#define MODEL_b_w 0xE +#define MODEL_g11 0xD +#define MODEL_b_s2 0xC +#define MODEL_b_s 0xB +#define MODEL_g8 0xA +#define MODEL_b_e2 0x9 +#define MODEL_b_e 0x8 +#define MODEL_g12 0x7 +#define MODEL_b_n2 0x6 +#define MODEL_b_n 0x5 +#define MODEL_g2 0x4 +#define MODEL_g10 0x3 +#define MODEL_stage 0x2 +#define MODEL_g5 0x1 +#define MODEL_o3 0x0 + diff --git a/include/mapfs/sbk_53_hit.h b/include/mapfs/sbk_53_hit.h index cf088e9134..a0f2b318ea 100644 --- a/include/mapfs/sbk_53_hit.h +++ b/include/mapfs/sbk_53_hit.h @@ -1,24 +1,40 @@ -#define COLLIDER_Root 0x17 -#define COLLIDER_g25 0x16 -#define COLLIDER_o223 0x15 -#define COLLIDER_o222 0x14 -#define COLLIDER_o221 0x13 -#define COLLIDER_o220 0x12 -#define COLLIDER_o219 0x11 -#define COLLIDER_tuitate 0x10 -#define COLLIDER_ttw 0xF -#define COLLIDER_tts 0xE -#define COLLIDER_tte 0xD -#define COLLIDER_ttn 0xC -#define COLLIDER_dero 0xB -#define COLLIDER_deilitw 0xA -#define COLLIDER_deiliw 0x9 -#define COLLIDER_deilits 0x8 -#define COLLIDER_deilis 0x7 -#define COLLIDER_deilite 0x6 -#define COLLIDER_deilie 0x5 -#define COLLIDER_deilitn 0x4 -#define COLLIDER_deilin 0x3 -#define COLLIDER_g1 0x2 -#define COLLIDER_mawari 0x1 -#define COLLIDER_stage 0x0 +#define COLLIDER_Root 0x17 +#define COLLIDER_g25 0x16 +#define COLLIDER_o223 0x15 +#define COLLIDER_o222 0x14 +#define COLLIDER_o221 0x13 +#define COLLIDER_o220 0x12 +#define COLLIDER_o219 0x11 +#define COLLIDER_tuitate 0x10 +#define COLLIDER_ttw 0xF +#define COLLIDER_tts 0xE +#define COLLIDER_tte 0xD +#define COLLIDER_ttn 0xC +#define COLLIDER_dero 0xB +#define COLLIDER_deilitw 0xA +#define COLLIDER_deiliw 0x9 +#define COLLIDER_deilits 0x8 +#define COLLIDER_deilis 0x7 +#define COLLIDER_deilite 0x6 +#define COLLIDER_deilie 0x5 +#define COLLIDER_deilitn 0x4 +#define COLLIDER_deilin 0x3 +#define COLLIDER_g1 0x2 +#define COLLIDER_mawari 0x1 +#define COLLIDER_stage 0x0 + +#define ZONE_Root 0xD +#define ZONE_g1 0xC +#define ZONE_g6 0xB +#define ZONE_g7 0xA +#define ZONE_b_w 0x9 +#define ZONE_g11 0x8 +#define ZONE_b_s 0x7 +#define ZONE_g8 0x6 +#define ZONE_b_e 0x5 +#define ZONE_g12 0x4 +#define ZONE_b_n 0x3 +#define ZONE_g2 0x2 +#define ZONE_g10 0x1 +#define ZONE_hiru_came 0x0 + diff --git a/include/mapfs/sbk_53_shape.h b/include/mapfs/sbk_53_shape.h index 5d75aeaf8d..5fa2a26591 100644 --- a/include/mapfs/sbk_53_shape.h +++ b/include/mapfs/sbk_53_shape.h @@ -1,42 +1,43 @@ -#define MODEL_Root 0x29 -#define MODEL_g1 0x28 -#define MODEL_g32 0x27 -#define MODEL_g37 0x26 -#define MODEL_o78 0x25 -#define MODEL_o76 0x24 -#define MODEL_o75 0x23 -#define MODEL_o74 0x22 -#define MODEL_g36 0x21 -#define MODEL_o73 0x20 -#define MODEL_o72 0x1F -#define MODEL_g35 0x1E -#define MODEL_o71 0x1D -#define MODEL_o70 0x1C -#define MODEL_g34 0x1B -#define MODEL_o69 0x1A -#define MODEL_o67 0x19 -#define MODEL_o66 0x18 -#define MODEL_o65 0x17 -#define MODEL_g33 0x16 -#define MODEL_o64 0x15 -#define MODEL_o62 0x14 -#define MODEL_o61 0x13 -#define MODEL_o60 0x12 -#define MODEL_exit 0x11 -#define MODEL_g7 0x10 -#define MODEL_b_w2 0xF -#define MODEL_b_w 0xE -#define MODEL_g11 0xD -#define MODEL_b_s2 0xC -#define MODEL_b_s 0xB -#define MODEL_g8 0xA -#define MODEL_b_e2 0x9 -#define MODEL_b_e 0x8 -#define MODEL_g12 0x7 -#define MODEL_b_n2 0x6 -#define MODEL_b_n 0x5 -#define MODEL_g2 0x4 -#define MODEL_g10 0x3 -#define MODEL_stage 0x2 -#define MODEL_g5 0x1 -#define MODEL_o3 0x0 +#define MODEL_Root 0x29 +#define MODEL_g1 0x28 +#define MODEL_g32 0x27 +#define MODEL_g37 0x26 +#define MODEL_o78 0x25 +#define MODEL_o76 0x24 +#define MODEL_o75 0x23 +#define MODEL_o74 0x22 +#define MODEL_g36 0x21 +#define MODEL_o73 0x20 +#define MODEL_o72 0x1F +#define MODEL_g35 0x1E +#define MODEL_o71 0x1D +#define MODEL_o70 0x1C +#define MODEL_g34 0x1B +#define MODEL_o69 0x1A +#define MODEL_o67 0x19 +#define MODEL_o66 0x18 +#define MODEL_o65 0x17 +#define MODEL_g33 0x16 +#define MODEL_o64 0x15 +#define MODEL_o62 0x14 +#define MODEL_o61 0x13 +#define MODEL_o60 0x12 +#define MODEL_exit 0x11 +#define MODEL_g7 0x10 +#define MODEL_b_w2 0xF +#define MODEL_b_w 0xE +#define MODEL_g11 0xD +#define MODEL_b_s2 0xC +#define MODEL_b_s 0xB +#define MODEL_g8 0xA +#define MODEL_b_e2 0x9 +#define MODEL_b_e 0x8 +#define MODEL_g12 0x7 +#define MODEL_b_n2 0x6 +#define MODEL_b_n 0x5 +#define MODEL_g2 0x4 +#define MODEL_g10 0x3 +#define MODEL_stage 0x2 +#define MODEL_g5 0x1 +#define MODEL_o3 0x0 + diff --git a/include/mapfs/sbk_54_hit.h b/include/mapfs/sbk_54_hit.h index cb67906c63..bde9cc20d3 100644 --- a/include/mapfs/sbk_54_hit.h +++ b/include/mapfs/sbk_54_hit.h @@ -1,21 +1,37 @@ -#define COLLIDER_Root 0x14 -#define COLLIDER_g25 0x13 -#define COLLIDER_o189 0x12 -#define COLLIDER_o188 0x11 -#define COLLIDER_tuitate 0x10 -#define COLLIDER_ttw 0xF -#define COLLIDER_tts 0xE -#define COLLIDER_tte 0xD -#define COLLIDER_ttn 0xC -#define COLLIDER_dero 0xB -#define COLLIDER_deilitw 0xA -#define COLLIDER_deiliw 0x9 -#define COLLIDER_deilits 0x8 -#define COLLIDER_deilis 0x7 -#define COLLIDER_deilite 0x6 -#define COLLIDER_deilie 0x5 -#define COLLIDER_deilitn 0x4 -#define COLLIDER_deilin 0x3 -#define COLLIDER_g1 0x2 -#define COLLIDER_mawari 0x1 -#define COLLIDER_stage 0x0 +#define COLLIDER_Root 0x14 +#define COLLIDER_g25 0x13 +#define COLLIDER_o189 0x12 +#define COLLIDER_o188 0x11 +#define COLLIDER_tuitate 0x10 +#define COLLIDER_ttw 0xF +#define COLLIDER_tts 0xE +#define COLLIDER_tte 0xD +#define COLLIDER_ttn 0xC +#define COLLIDER_dero 0xB +#define COLLIDER_deilitw 0xA +#define COLLIDER_deiliw 0x9 +#define COLLIDER_deilits 0x8 +#define COLLIDER_deilis 0x7 +#define COLLIDER_deilite 0x6 +#define COLLIDER_deilie 0x5 +#define COLLIDER_deilitn 0x4 +#define COLLIDER_deilin 0x3 +#define COLLIDER_g1 0x2 +#define COLLIDER_mawari 0x1 +#define COLLIDER_stage 0x0 + +#define ZONE_Root 0xD +#define ZONE_g1 0xC +#define ZONE_g6 0xB +#define ZONE_g7 0xA +#define ZONE_b_w 0x9 +#define ZONE_g11 0x8 +#define ZONE_b_s 0x7 +#define ZONE_g8 0x6 +#define ZONE_b_e 0x5 +#define ZONE_g12 0x4 +#define ZONE_b_n 0x3 +#define ZONE_g2 0x2 +#define ZONE_g10 0x1 +#define ZONE_hiru_came 0x0 + diff --git a/include/mapfs/sbk_54_shape.h b/include/mapfs/sbk_54_shape.h index 70258fc974..d596080280 100644 --- a/include/mapfs/sbk_54_shape.h +++ b/include/mapfs/sbk_54_shape.h @@ -1,35 +1,36 @@ -#define MODEL_Root 0x22 -#define MODEL_g1 0x21 -#define MODEL_g28 0x20 -#define MODEL_g31 0x1F -#define MODEL_o68 0x1E -#define MODEL_o67 0x1D -#define MODEL_o66 0x1C -#define MODEL_o65 0x1B -#define MODEL_o64 0x1A -#define MODEL_g30 0x19 -#define MODEL_o61 0x18 -#define MODEL_o59 0x17 -#define MODEL_o58 0x16 -#define MODEL_o57 0x15 -#define MODEL_g29 0x14 -#define MODEL_o56 0x13 -#define MODEL_o55 0x12 -#define MODEL_exit 0x11 -#define MODEL_g7 0x10 -#define MODEL_b_w2 0xF -#define MODEL_b_w 0xE -#define MODEL_g11 0xD -#define MODEL_b_s2 0xC -#define MODEL_b_s 0xB -#define MODEL_g8 0xA -#define MODEL_b_e2 0x9 -#define MODEL_b_e 0x8 -#define MODEL_g12 0x7 -#define MODEL_b_n2 0x6 -#define MODEL_b_n 0x5 -#define MODEL_g2 0x4 -#define MODEL_g10 0x3 -#define MODEL_stage 0x2 -#define MODEL_g5 0x1 -#define MODEL_o3 0x0 +#define MODEL_Root 0x22 +#define MODEL_g1 0x21 +#define MODEL_g28 0x20 +#define MODEL_g31 0x1F +#define MODEL_o68 0x1E +#define MODEL_o67 0x1D +#define MODEL_o66 0x1C +#define MODEL_o65 0x1B +#define MODEL_o64 0x1A +#define MODEL_g30 0x19 +#define MODEL_o61 0x18 +#define MODEL_o59 0x17 +#define MODEL_o58 0x16 +#define MODEL_o57 0x15 +#define MODEL_g29 0x14 +#define MODEL_o56 0x13 +#define MODEL_o55 0x12 +#define MODEL_exit 0x11 +#define MODEL_g7 0x10 +#define MODEL_b_w2 0xF +#define MODEL_b_w 0xE +#define MODEL_g11 0xD +#define MODEL_b_s2 0xC +#define MODEL_b_s 0xB +#define MODEL_g8 0xA +#define MODEL_b_e2 0x9 +#define MODEL_b_e 0x8 +#define MODEL_g12 0x7 +#define MODEL_b_n2 0x6 +#define MODEL_b_n 0x5 +#define MODEL_g2 0x4 +#define MODEL_g10 0x3 +#define MODEL_stage 0x2 +#define MODEL_g5 0x1 +#define MODEL_o3 0x0 + diff --git a/include/mapfs/sbk_55_hit.h b/include/mapfs/sbk_55_hit.h index 338ed90821..d22c7e9067 100644 --- a/include/mapfs/sbk_55_hit.h +++ b/include/mapfs/sbk_55_hit.h @@ -1,21 +1,37 @@ -#define COLLIDER_Root 0x14 -#define COLLIDER_g48 0x13 -#define COLLIDER_o193 0x12 -#define COLLIDER_o191 0x11 -#define COLLIDER_tuitate 0x10 -#define COLLIDER_ttw 0xF -#define COLLIDER_tts 0xE -#define COLLIDER_tte 0xD -#define COLLIDER_ttn 0xC -#define COLLIDER_dero 0xB -#define COLLIDER_deilitw 0xA -#define COLLIDER_deiliw 0x9 -#define COLLIDER_deilits 0x8 -#define COLLIDER_deilis 0x7 -#define COLLIDER_deilite 0x6 -#define COLLIDER_deilie 0x5 -#define COLLIDER_deilitn 0x4 -#define COLLIDER_deilin 0x3 -#define COLLIDER_g1 0x2 -#define COLLIDER_mawari 0x1 -#define COLLIDER_stage 0x0 +#define COLLIDER_Root 0x14 +#define COLLIDER_g48 0x13 +#define COLLIDER_o193 0x12 +#define COLLIDER_o191 0x11 +#define COLLIDER_tuitate 0x10 +#define COLLIDER_ttw 0xF +#define COLLIDER_tts 0xE +#define COLLIDER_tte 0xD +#define COLLIDER_ttn 0xC +#define COLLIDER_dero 0xB +#define COLLIDER_deilitw 0xA +#define COLLIDER_deiliw 0x9 +#define COLLIDER_deilits 0x8 +#define COLLIDER_deilis 0x7 +#define COLLIDER_deilite 0x6 +#define COLLIDER_deilie 0x5 +#define COLLIDER_deilitn 0x4 +#define COLLIDER_deilin 0x3 +#define COLLIDER_g1 0x2 +#define COLLIDER_mawari 0x1 +#define COLLIDER_stage 0x0 + +#define ZONE_Root 0xD +#define ZONE_g1 0xC +#define ZONE_g6 0xB +#define ZONE_g7 0xA +#define ZONE_b_w 0x9 +#define ZONE_g11 0x8 +#define ZONE_b_s 0x7 +#define ZONE_g8 0x6 +#define ZONE_b_e 0x5 +#define ZONE_g12 0x4 +#define ZONE_b_n 0x3 +#define ZONE_g2 0x2 +#define ZONE_g10 0x1 +#define ZONE_hiru_came 0x0 + diff --git a/include/mapfs/sbk_55_shape.h b/include/mapfs/sbk_55_shape.h index f37f1b848c..9468d93d10 100644 --- a/include/mapfs/sbk_55_shape.h +++ b/include/mapfs/sbk_55_shape.h @@ -1,29 +1,30 @@ -#define MODEL_Root 0x1C -#define MODEL_g1 0x1B -#define MODEL_g28 0x1A -#define MODEL_g29 0x19 -#define MODEL_o60 0x18 -#define MODEL_o56 0x17 -#define MODEL_o55 0x16 -#define MODEL_o59 0x15 -#define MODEL_exit 0x14 -#define MODEL_g7 0x13 -#define MODEL_b_w2 0x12 -#define MODEL_b_w 0x11 -#define MODEL_g11 0x10 -#define MODEL_b_s2 0xF -#define MODEL_b_s 0xE -#define MODEL_g8 0xD -#define MODEL_b_e2 0xC -#define MODEL_b_e 0xB -#define MODEL_g12 0xA -#define MODEL_b_n2 0x9 -#define MODEL_b_n 0x8 -#define MODEL_g10 0x7 -#define MODEL_g30 0x6 -#define MODEL_o58 0x5 -#define MODEL_o57 0x4 -#define MODEL_stage 0x3 -#define MODEL_g2 0x2 -#define MODEL_g5 0x1 -#define MODEL_o3 0x0 +#define MODEL_Root 0x1C +#define MODEL_g1 0x1B +#define MODEL_g28 0x1A +#define MODEL_g29 0x19 +#define MODEL_o60 0x18 +#define MODEL_o56 0x17 +#define MODEL_o55 0x16 +#define MODEL_o59 0x15 +#define MODEL_exit 0x14 +#define MODEL_g7 0x13 +#define MODEL_b_w2 0x12 +#define MODEL_b_w 0x11 +#define MODEL_g11 0x10 +#define MODEL_b_s2 0xF +#define MODEL_b_s 0xE +#define MODEL_g8 0xD +#define MODEL_b_e2 0xC +#define MODEL_b_e 0xB +#define MODEL_g12 0xA +#define MODEL_b_n2 0x9 +#define MODEL_b_n 0x8 +#define MODEL_g10 0x7 +#define MODEL_g30 0x6 +#define MODEL_o58 0x5 +#define MODEL_o57 0x4 +#define MODEL_stage 0x3 +#define MODEL_g2 0x2 +#define MODEL_g5 0x1 +#define MODEL_o3 0x0 + diff --git a/include/mapfs/sbk_56_hit.h b/include/mapfs/sbk_56_hit.h index b0f615df3d..aea516213a 100644 --- a/include/mapfs/sbk_56_hit.h +++ b/include/mapfs/sbk_56_hit.h @@ -1,32 +1,48 @@ -#define COLLIDER_Root 0x1F -#define COLLIDER_g1 0x1E -#define COLLIDER_g35 0x1D -#define COLLIDER_o73 0x1C -#define COLLIDER_o72 0x1B -#define COLLIDER_o71 0x1A -#define COLLIDER_o70 0x19 -#define COLLIDER_o69 0x18 -#define COLLIDER_o68 0x17 -#define COLLIDER_o67 0x16 -#define COLLIDER_y_miki 0x15 -#define COLLIDER_yasi 0x14 -#define COLLIDER_rim 0x13 -#define COLLIDER_remon 0x12 -#define COLLIDER_kusa 0x11 -#define COLLIDER_exit 0x10 -#define COLLIDER_exitw 0xF -#define COLLIDER_nw 0xE -#define COLLIDER_deilitw 0xD -#define COLLIDER_deiliw 0xC -#define COLLIDER_exits 0xB -#define COLLIDER_ns 0xA -#define COLLIDER_deilits 0x9 -#define COLLIDER_deilis 0x8 -#define COLLIDER_exitn 0x7 -#define COLLIDER_nn 0x6 -#define COLLIDER_deilitn 0x5 -#define COLLIDER_deilin 0x4 -#define COLLIDER_g34 0x3 -#define COLLIDER_o64 0x2 -#define COLLIDER_o65 0x1 -#define COLLIDER_o63 0x0 +#define COLLIDER_Root 0x1F +#define COLLIDER_g1 0x1E +#define COLLIDER_g35 0x1D +#define COLLIDER_o73 0x1C +#define COLLIDER_o72 0x1B +#define COLLIDER_o71 0x1A +#define COLLIDER_o70 0x19 +#define COLLIDER_o69 0x18 +#define COLLIDER_o68 0x17 +#define COLLIDER_o67 0x16 +#define COLLIDER_y_miki 0x15 +#define COLLIDER_yasi 0x14 +#define COLLIDER_rim 0x13 +#define COLLIDER_remon 0x12 +#define COLLIDER_kusa 0x11 +#define COLLIDER_exit 0x10 +#define COLLIDER_exitw 0xF +#define COLLIDER_nw 0xE +#define COLLIDER_deilitw 0xD +#define COLLIDER_deiliw 0xC +#define COLLIDER_exits 0xB +#define COLLIDER_ns 0xA +#define COLLIDER_deilits 0x9 +#define COLLIDER_deilis 0x8 +#define COLLIDER_exitn 0x7 +#define COLLIDER_nn 0x6 +#define COLLIDER_deilitn 0x5 +#define COLLIDER_deilin 0x4 +#define COLLIDER_g34 0x3 +#define COLLIDER_o64 0x2 +#define COLLIDER_o65 0x1 +#define COLLIDER_o63 0x0 + +#define ZONE_Root 0xD +#define ZONE_g1 0xC +#define ZONE_g6 0xB +#define ZONE_g7 0xA +#define ZONE_b_w 0x9 +#define ZONE_g11 0x8 +#define ZONE_b_s 0x7 +#define ZONE_g8 0x6 +#define ZONE_b_e 0x5 +#define ZONE_g12 0x4 +#define ZONE_b_n 0x3 +#define ZONE_g2 0x2 +#define ZONE_g10 0x1 +#define ZONE_hiru_came 0x0 + diff --git a/include/mapfs/sbk_56_shape.h b/include/mapfs/sbk_56_shape.h index a593b7dc60..80f3ebb67e 100644 --- a/include/mapfs/sbk_56_shape.h +++ b/include/mapfs/sbk_56_shape.h @@ -1,65 +1,66 @@ -#define MODEL_Root 0x40 -#define MODEL_g1 0x3F -#define MODEL_g38 0x3E -#define MODEL_o64 0x3D -#define MODEL_o63 0x3C -#define MODEL_g37 0x3B -#define MODEL_o62 0x3A -#define MODEL_o61 0x39 -#define MODEL_g36 0x38 -#define MODEL_o75 0x37 -#define MODEL_o74 0x36 -#define MODEL_o73 0x35 -#define MODEL_o60 0x34 -#define MODEL_o59 0x33 -#define MODEL_g35 0x32 -#define MODEL_o72 0x31 -#define MODEL_o58 0x30 -#define MODEL_o57 0x2F -#define MODEL_g34 0x2E -#define MODEL_o80 0x2D -#define MODEL_o56 0x2C -#define MODEL_o55 0x2B -#define MODEL_g33 0x2A -#define MODEL_o70 0x29 -#define MODEL_o54 0x28 -#define MODEL_o53 0x27 -#define MODEL_g32 0x26 -#define MODEL_o69 0x25 -#define MODEL_y_ha 0x24 -#define MODEL_o51 0x23 -#define MODEL_g31 0x22 -#define MODEL_o68 0x21 -#define MODEL_o52 0x20 -#define MODEL_y_miki 0x1F -#define MODEL_yasi 0x1E -#define MODEL_o78 0x1D -#define MODEL_o76 0x1C -#define MODEL_o50 0x1B -#define MODEL_miki 0x1A -#define MODEL_ki 0x19 -#define MODEL_exit 0x18 -#define MODEL_g7 0x17 -#define MODEL_b_w2 0x16 -#define MODEL_b_w 0x15 -#define MODEL_g11 0x14 -#define MODEL_b_s2 0x13 -#define MODEL_b_s 0x12 -#define MODEL_g12 0x11 -#define MODEL_b_n2 0x10 -#define MODEL_b_n 0xF -#define MODEL_g2 0xE -#define MODEL_kasane 0xD -#define MODEL_o66 0xC -#define MODEL_o65 0xB -#define MODEL_k_suna 0xA -#define MODEL_k_kusa 0x9 -#define MODEL_stage2 0x8 -#define MODEL_stage 0x7 -#define MODEL_g10 0x6 -#define MODEL_stage3 0x5 -#define MODEL_sui 0x4 -#define MODEL_o49 0x3 -#define MODEL_mizu 0x2 -#define MODEL_g5 0x1 -#define MODEL_o3 0x0 +#define MODEL_Root 0x40 +#define MODEL_g1 0x3F +#define MODEL_g38 0x3E +#define MODEL_o64 0x3D +#define MODEL_o63 0x3C +#define MODEL_g37 0x3B +#define MODEL_o62 0x3A +#define MODEL_o61 0x39 +#define MODEL_g36 0x38 +#define MODEL_o75 0x37 +#define MODEL_o74 0x36 +#define MODEL_o73 0x35 +#define MODEL_o60 0x34 +#define MODEL_o59 0x33 +#define MODEL_g35 0x32 +#define MODEL_o72 0x31 +#define MODEL_o58 0x30 +#define MODEL_o57 0x2F +#define MODEL_g34 0x2E +#define MODEL_o80 0x2D +#define MODEL_o56 0x2C +#define MODEL_o55 0x2B +#define MODEL_g33 0x2A +#define MODEL_o70 0x29 +#define MODEL_o54 0x28 +#define MODEL_o53 0x27 +#define MODEL_g32 0x26 +#define MODEL_o69 0x25 +#define MODEL_y_ha 0x24 +#define MODEL_o51 0x23 +#define MODEL_g31 0x22 +#define MODEL_o68 0x21 +#define MODEL_o52 0x20 +#define MODEL_y_miki 0x1F +#define MODEL_yasi 0x1E +#define MODEL_o78 0x1D +#define MODEL_o76 0x1C +#define MODEL_o50 0x1B +#define MODEL_miki 0x1A +#define MODEL_ki 0x19 +#define MODEL_exit 0x18 +#define MODEL_g7 0x17 +#define MODEL_b_w2 0x16 +#define MODEL_b_w 0x15 +#define MODEL_g11 0x14 +#define MODEL_b_s2 0x13 +#define MODEL_b_s 0x12 +#define MODEL_g12 0x11 +#define MODEL_b_n2 0x10 +#define MODEL_b_n 0xF +#define MODEL_g2 0xE +#define MODEL_kasane 0xD +#define MODEL_o66 0xC +#define MODEL_o65 0xB +#define MODEL_k_suna 0xA +#define MODEL_k_kusa 0x9 +#define MODEL_stage2 0x8 +#define MODEL_stage 0x7 +#define MODEL_g10 0x6 +#define MODEL_stage3 0x5 +#define MODEL_sui 0x4 +#define MODEL_o49 0x3 +#define MODEL_mizu 0x2 +#define MODEL_g5 0x1 +#define MODEL_o3 0x0 + diff --git a/include/mapfs/sbk_60_hit.h b/include/mapfs/sbk_60_hit.h index e918184324..d6f93360a6 100644 --- a/include/mapfs/sbk_60_hit.h +++ b/include/mapfs/sbk_60_hit.h @@ -1,18 +1,34 @@ -#define COLLIDER_Root 0x11 -#define COLLIDER_g25 0x10 -#define COLLIDER_o140 0xF -#define COLLIDER_o139 0xE -#define COLLIDER_o138 0xD -#define COLLIDER_o130 0xC -#define COLLIDER_o128 0xB -#define COLLIDER_tuitate 0xA -#define COLLIDER_tte 0x9 -#define COLLIDER_ttn 0x8 -#define COLLIDER_dero 0x7 -#define COLLIDER_deilite 0x6 -#define COLLIDER_deilie 0x5 -#define COLLIDER_deilitn 0x4 -#define COLLIDER_deilin 0x3 -#define COLLIDER_g1 0x2 -#define COLLIDER_mawari 0x1 -#define COLLIDER_stage 0x0 +#define COLLIDER_Root 0x11 +#define COLLIDER_g25 0x10 +#define COLLIDER_o140 0xF +#define COLLIDER_o139 0xE +#define COLLIDER_o138 0xD +#define COLLIDER_o130 0xC +#define COLLIDER_o128 0xB +#define COLLIDER_tuitate 0xA +#define COLLIDER_tte 0x9 +#define COLLIDER_ttn 0x8 +#define COLLIDER_dero 0x7 +#define COLLIDER_deilite 0x6 +#define COLLIDER_deilie 0x5 +#define COLLIDER_deilitn 0x4 +#define COLLIDER_deilin 0x3 +#define COLLIDER_g1 0x2 +#define COLLIDER_mawari 0x1 +#define COLLIDER_stage 0x0 + +#define ZONE_Root 0xD +#define ZONE_g1 0xC +#define ZONE_g6 0xB +#define ZONE_g7 0xA +#define ZONE_b_w 0x9 +#define ZONE_g11 0x8 +#define ZONE_b_s 0x7 +#define ZONE_g8 0x6 +#define ZONE_b_e 0x5 +#define ZONE_g12 0x4 +#define ZONE_b_n 0x3 +#define ZONE_g2 0x2 +#define ZONE_g10 0x1 +#define ZONE_hiru_came 0x0 + diff --git a/include/mapfs/sbk_60_shape.h b/include/mapfs/sbk_60_shape.h index 0f97270b7b..ddefc6ef6a 100644 --- a/include/mapfs/sbk_60_shape.h +++ b/include/mapfs/sbk_60_shape.h @@ -1,26 +1,27 @@ -#define MODEL_Root 0x19 -#define MODEL_g1 0x18 -#define MODEL_g30 0x17 -#define MODEL_g32 0x16 -#define MODEL_o64 0x15 -#define MODEL_o63 0x14 -#define MODEL_g31 0x13 -#define MODEL_o62 0x12 -#define MODEL_o61 0x11 -#define MODEL_o60 0x10 -#define MODEL_g28 0xF -#define MODEL_o59 0xE -#define MODEL_o57 0xD -#define MODEL_o55 0xC -#define MODEL_exit 0xB -#define MODEL_g8 0xA -#define MODEL_b_e2 0x9 -#define MODEL_b_e 0x8 -#define MODEL_g12 0x7 -#define MODEL_b_n2 0x6 -#define MODEL_b_n 0x5 -#define MODEL_g2 0x4 -#define MODEL_g10 0x3 -#define MODEL_stage 0x2 -#define MODEL_g5 0x1 -#define MODEL_o3 0x0 +#define MODEL_Root 0x19 +#define MODEL_g1 0x18 +#define MODEL_g30 0x17 +#define MODEL_g32 0x16 +#define MODEL_o64 0x15 +#define MODEL_o63 0x14 +#define MODEL_g31 0x13 +#define MODEL_o62 0x12 +#define MODEL_o61 0x11 +#define MODEL_o60 0x10 +#define MODEL_g28 0xF +#define MODEL_o59 0xE +#define MODEL_o57 0xD +#define MODEL_o55 0xC +#define MODEL_exit 0xB +#define MODEL_g8 0xA +#define MODEL_b_e2 0x9 +#define MODEL_b_e 0x8 +#define MODEL_g12 0x7 +#define MODEL_b_n2 0x6 +#define MODEL_b_n 0x5 +#define MODEL_g2 0x4 +#define MODEL_g10 0x3 +#define MODEL_stage 0x2 +#define MODEL_g5 0x1 +#define MODEL_o3 0x0 + diff --git a/include/mapfs/sbk_61_hit.h b/include/mapfs/sbk_61_hit.h index 94f1bbc674..482bed828c 100644 --- a/include/mapfs/sbk_61_hit.h +++ b/include/mapfs/sbk_61_hit.h @@ -1,17 +1,33 @@ -#define COLLIDER_Root 0x10 -#define COLLIDER_g25 0xF -#define COLLIDER_o130 0xE -#define COLLIDER_tuitate 0xD -#define COLLIDER_ttw 0xC -#define COLLIDER_tte 0xB -#define COLLIDER_ttn 0xA -#define COLLIDER_dero 0x9 -#define COLLIDER_deilite 0x8 -#define COLLIDER_deilie 0x7 -#define COLLIDER_deilitn 0x6 -#define COLLIDER_deilin 0x5 -#define COLLIDER_deiliw 0x4 -#define COLLIDER_deilitw 0x3 -#define COLLIDER_g1 0x2 -#define COLLIDER_mawari 0x1 -#define COLLIDER_stage 0x0 +#define COLLIDER_Root 0x10 +#define COLLIDER_g25 0xF +#define COLLIDER_o130 0xE +#define COLLIDER_tuitate 0xD +#define COLLIDER_ttw 0xC +#define COLLIDER_tte 0xB +#define COLLIDER_ttn 0xA +#define COLLIDER_dero 0x9 +#define COLLIDER_deilite 0x8 +#define COLLIDER_deilie 0x7 +#define COLLIDER_deilitn 0x6 +#define COLLIDER_deilin 0x5 +#define COLLIDER_deiliw 0x4 +#define COLLIDER_deilitw 0x3 +#define COLLIDER_g1 0x2 +#define COLLIDER_mawari 0x1 +#define COLLIDER_stage 0x0 + +#define ZONE_Root 0xD +#define ZONE_g1 0xC +#define ZONE_g6 0xB +#define ZONE_g7 0xA +#define ZONE_b_w 0x9 +#define ZONE_g11 0x8 +#define ZONE_b_s 0x7 +#define ZONE_g8 0x6 +#define ZONE_b_e 0x5 +#define ZONE_g12 0x4 +#define ZONE_b_n 0x3 +#define ZONE_g2 0x2 +#define ZONE_g10 0x1 +#define ZONE_hiru_came 0x0 + diff --git a/include/mapfs/sbk_61_shape.h b/include/mapfs/sbk_61_shape.h index 3d4fdcb615..382852c93d 100644 --- a/include/mapfs/sbk_61_shape.h +++ b/include/mapfs/sbk_61_shape.h @@ -1,19 +1,20 @@ -#define MODEL_Root 0x12 -#define MODEL_g1 0x11 -#define MODEL_iwa 0x10 -#define MODEL_o55 0xF -#define MODEL_exit 0xE -#define MODEL_g7 0xD -#define MODEL_b_w2 0xC -#define MODEL_b_w 0xB -#define MODEL_g8 0xA -#define MODEL_b_e2 0x9 -#define MODEL_b_e 0x8 -#define MODEL_g12 0x7 -#define MODEL_b_n2 0x6 -#define MODEL_b_n 0x5 -#define MODEL_g2 0x4 -#define MODEL_g10 0x3 -#define MODEL_stage 0x2 -#define MODEL_g5 0x1 -#define MODEL_o3 0x0 +#define MODEL_Root 0x12 +#define MODEL_g1 0x11 +#define MODEL_iwa 0x10 +#define MODEL_o55 0xF +#define MODEL_exit 0xE +#define MODEL_g7 0xD +#define MODEL_b_w2 0xC +#define MODEL_b_w 0xB +#define MODEL_g8 0xA +#define MODEL_b_e2 0x9 +#define MODEL_b_e 0x8 +#define MODEL_g12 0x7 +#define MODEL_b_n2 0x6 +#define MODEL_b_n 0x5 +#define MODEL_g2 0x4 +#define MODEL_g10 0x3 +#define MODEL_stage 0x2 +#define MODEL_g5 0x1 +#define MODEL_o3 0x0 + diff --git a/include/mapfs/sbk_62_hit.h b/include/mapfs/sbk_62_hit.h index 637a230c69..a069995a01 100644 --- a/include/mapfs/sbk_62_hit.h +++ b/include/mapfs/sbk_62_hit.h @@ -1,19 +1,35 @@ -#define COLLIDER_Root 0x12 -#define COLLIDER_g25 0x11 -#define COLLIDER_o149 0x10 -#define COLLIDER_o148 0xF -#define COLLIDER_o147 0xE -#define COLLIDER_tuitate 0xD -#define COLLIDER_ttw 0xC -#define COLLIDER_tte 0xB -#define COLLIDER_ttn 0xA -#define COLLIDER_dero 0x9 -#define COLLIDER_deilitw 0x8 -#define COLLIDER_deiliw 0x7 -#define COLLIDER_deilite 0x6 -#define COLLIDER_deilie 0x5 -#define COLLIDER_deilitn 0x4 -#define COLLIDER_deilin 0x3 -#define COLLIDER_g1 0x2 -#define COLLIDER_mawari 0x1 -#define COLLIDER_stage 0x0 +#define COLLIDER_Root 0x12 +#define COLLIDER_g25 0x11 +#define COLLIDER_o149 0x10 +#define COLLIDER_o148 0xF +#define COLLIDER_o147 0xE +#define COLLIDER_tuitate 0xD +#define COLLIDER_ttw 0xC +#define COLLIDER_tte 0xB +#define COLLIDER_ttn 0xA +#define COLLIDER_dero 0x9 +#define COLLIDER_deilitw 0x8 +#define COLLIDER_deiliw 0x7 +#define COLLIDER_deilite 0x6 +#define COLLIDER_deilie 0x5 +#define COLLIDER_deilitn 0x4 +#define COLLIDER_deilin 0x3 +#define COLLIDER_g1 0x2 +#define COLLIDER_mawari 0x1 +#define COLLIDER_stage 0x0 + +#define ZONE_Root 0xD +#define ZONE_g1 0xC +#define ZONE_g6 0xB +#define ZONE_g7 0xA +#define ZONE_b_w 0x9 +#define ZONE_g11 0x8 +#define ZONE_b_s 0x7 +#define ZONE_g8 0x6 +#define ZONE_b_e 0x5 +#define ZONE_g12 0x4 +#define ZONE_b_n 0x3 +#define ZONE_g2 0x2 +#define ZONE_g10 0x1 +#define ZONE_hiru_came 0x0 + diff --git a/include/mapfs/sbk_62_shape.h b/include/mapfs/sbk_62_shape.h index 77e7f411bf..741debc9cc 100644 --- a/include/mapfs/sbk_62_shape.h +++ b/include/mapfs/sbk_62_shape.h @@ -1,32 +1,33 @@ -#define MODEL_Root 0x1F -#define MODEL_g1 0x1E -#define MODEL_g32 0x1D -#define MODEL_g34 0x1C -#define MODEL_o69 0x1B -#define MODEL_o67 0x1A -#define MODEL_o66 0x19 -#define MODEL_o65 0x18 -#define MODEL_g33 0x17 -#define MODEL_o64 0x16 -#define MODEL_o62 0x15 -#define MODEL_o61 0x14 -#define MODEL_o60 0x13 -#define MODEL_g30 0x12 -#define MODEL_o59 0x11 -#define MODEL_o58 0x10 -#define MODEL_o57 0xF -#define MODEL_exit 0xE -#define MODEL_g7 0xD -#define MODEL_b_w2 0xC -#define MODEL_b_w 0xB -#define MODEL_g8 0xA -#define MODEL_b_e2 0x9 -#define MODEL_b_e 0x8 -#define MODEL_g12 0x7 -#define MODEL_b_n2 0x6 -#define MODEL_b_n 0x5 -#define MODEL_g2 0x4 -#define MODEL_g10 0x3 -#define MODEL_stage 0x2 -#define MODEL_g5 0x1 -#define MODEL_o3 0x0 +#define MODEL_Root 0x1F +#define MODEL_g1 0x1E +#define MODEL_g32 0x1D +#define MODEL_g34 0x1C +#define MODEL_o69 0x1B +#define MODEL_o67 0x1A +#define MODEL_o66 0x19 +#define MODEL_o65 0x18 +#define MODEL_g33 0x17 +#define MODEL_o64 0x16 +#define MODEL_o62 0x15 +#define MODEL_o61 0x14 +#define MODEL_o60 0x13 +#define MODEL_g30 0x12 +#define MODEL_o59 0x11 +#define MODEL_o58 0x10 +#define MODEL_o57 0xF +#define MODEL_exit 0xE +#define MODEL_g7 0xD +#define MODEL_b_w2 0xC +#define MODEL_b_w 0xB +#define MODEL_g8 0xA +#define MODEL_b_e2 0x9 +#define MODEL_b_e 0x8 +#define MODEL_g12 0x7 +#define MODEL_b_n2 0x6 +#define MODEL_b_n 0x5 +#define MODEL_g2 0x4 +#define MODEL_g10 0x3 +#define MODEL_stage 0x2 +#define MODEL_g5 0x1 +#define MODEL_o3 0x0 + diff --git a/include/mapfs/sbk_63_hit.h b/include/mapfs/sbk_63_hit.h index b9adf97234..e333853cdb 100644 --- a/include/mapfs/sbk_63_hit.h +++ b/include/mapfs/sbk_63_hit.h @@ -1,20 +1,36 @@ -#define COLLIDER_Root 0x13 -#define COLLIDER_g25 0x12 -#define COLLIDER_o181 0x11 -#define COLLIDER_o180 0x10 -#define COLLIDER_o179 0xF -#define COLLIDER_o178 0xE -#define COLLIDER_tuitate 0xD -#define COLLIDER_ttw 0xC -#define COLLIDER_tte 0xB -#define COLLIDER_ttn 0xA -#define COLLIDER_dero 0x9 -#define COLLIDER_deilitw 0x8 -#define COLLIDER_deiliw 0x7 -#define COLLIDER_deilite 0x6 -#define COLLIDER_deilie 0x5 -#define COLLIDER_deilitn 0x4 -#define COLLIDER_deilin 0x3 -#define COLLIDER_g1 0x2 -#define COLLIDER_mawari 0x1 -#define COLLIDER_stage 0x0 +#define COLLIDER_Root 0x13 +#define COLLIDER_g25 0x12 +#define COLLIDER_o181 0x11 +#define COLLIDER_o180 0x10 +#define COLLIDER_o179 0xF +#define COLLIDER_o178 0xE +#define COLLIDER_tuitate 0xD +#define COLLIDER_ttw 0xC +#define COLLIDER_tte 0xB +#define COLLIDER_ttn 0xA +#define COLLIDER_dero 0x9 +#define COLLIDER_deilitw 0x8 +#define COLLIDER_deiliw 0x7 +#define COLLIDER_deilite 0x6 +#define COLLIDER_deilie 0x5 +#define COLLIDER_deilitn 0x4 +#define COLLIDER_deilin 0x3 +#define COLLIDER_g1 0x2 +#define COLLIDER_mawari 0x1 +#define COLLIDER_stage 0x0 + +#define ZONE_Root 0xD +#define ZONE_g1 0xC +#define ZONE_g6 0xB +#define ZONE_g7 0xA +#define ZONE_b_w 0x9 +#define ZONE_g11 0x8 +#define ZONE_b_s 0x7 +#define ZONE_g8 0x6 +#define ZONE_b_e 0x5 +#define ZONE_g12 0x4 +#define ZONE_b_n 0x3 +#define ZONE_g2 0x2 +#define ZONE_g10 0x1 +#define ZONE_hiru_came 0x0 + diff --git a/include/mapfs/sbk_63_shape.h b/include/mapfs/sbk_63_shape.h index 7b3132a2f0..ce3c27e574 100644 --- a/include/mapfs/sbk_63_shape.h +++ b/include/mapfs/sbk_63_shape.h @@ -1,34 +1,35 @@ -#define MODEL_Root 0x21 -#define MODEL_g1 0x20 -#define MODEL_g32 0x1F -#define MODEL_g36 0x1E -#define MODEL_o73 0x1D -#define MODEL_o72 0x1C -#define MODEL_g35 0x1B -#define MODEL_o71 0x1A -#define MODEL_o70 0x19 -#define MODEL_g34 0x18 -#define MODEL_o69 0x17 -#define MODEL_o67 0x16 -#define MODEL_o66 0x15 -#define MODEL_o65 0x14 -#define MODEL_g33 0x13 -#define MODEL_o64 0x12 -#define MODEL_o62 0x11 -#define MODEL_o61 0x10 -#define MODEL_o60 0xF -#define MODEL_exit 0xE -#define MODEL_g7 0xD -#define MODEL_b_w2 0xC -#define MODEL_b_w 0xB -#define MODEL_g8 0xA -#define MODEL_b_e2 0x9 -#define MODEL_b_e 0x8 -#define MODEL_g12 0x7 -#define MODEL_b_n2 0x6 -#define MODEL_b_n 0x5 -#define MODEL_g2 0x4 -#define MODEL_g10 0x3 -#define MODEL_stage 0x2 -#define MODEL_g5 0x1 -#define MODEL_o3 0x0 +#define MODEL_Root 0x21 +#define MODEL_g1 0x20 +#define MODEL_g32 0x1F +#define MODEL_g36 0x1E +#define MODEL_o73 0x1D +#define MODEL_o72 0x1C +#define MODEL_g35 0x1B +#define MODEL_o71 0x1A +#define MODEL_o70 0x19 +#define MODEL_g34 0x18 +#define MODEL_o69 0x17 +#define MODEL_o67 0x16 +#define MODEL_o66 0x15 +#define MODEL_o65 0x14 +#define MODEL_g33 0x13 +#define MODEL_o64 0x12 +#define MODEL_o62 0x11 +#define MODEL_o61 0x10 +#define MODEL_o60 0xF +#define MODEL_exit 0xE +#define MODEL_g7 0xD +#define MODEL_b_w2 0xC +#define MODEL_b_w 0xB +#define MODEL_g8 0xA +#define MODEL_b_e2 0x9 +#define MODEL_b_e 0x8 +#define MODEL_g12 0x7 +#define MODEL_b_n2 0x6 +#define MODEL_b_n 0x5 +#define MODEL_g2 0x4 +#define MODEL_g10 0x3 +#define MODEL_stage 0x2 +#define MODEL_g5 0x1 +#define MODEL_o3 0x0 + diff --git a/include/mapfs/sbk_64_hit.h b/include/mapfs/sbk_64_hit.h index 65c1c40c0a..75203f05a5 100644 --- a/include/mapfs/sbk_64_hit.h +++ b/include/mapfs/sbk_64_hit.h @@ -1,17 +1,33 @@ -#define COLLIDER_Root 0x10 -#define COLLIDER_g25 0xF -#define COLLIDER_o180 0xE -#define COLLIDER_tuitate 0xD -#define COLLIDER_ttw 0xC -#define COLLIDER_tte 0xB -#define COLLIDER_ttn 0xA -#define COLLIDER_dero 0x9 -#define COLLIDER_deilitw 0x8 -#define COLLIDER_deiliw 0x7 -#define COLLIDER_deilite 0x6 -#define COLLIDER_deilie 0x5 -#define COLLIDER_deilitn 0x4 -#define COLLIDER_deilin 0x3 -#define COLLIDER_g1 0x2 -#define COLLIDER_mawari 0x1 -#define COLLIDER_stage 0x0 +#define COLLIDER_Root 0x10 +#define COLLIDER_g25 0xF +#define COLLIDER_o180 0xE +#define COLLIDER_tuitate 0xD +#define COLLIDER_ttw 0xC +#define COLLIDER_tte 0xB +#define COLLIDER_ttn 0xA +#define COLLIDER_dero 0x9 +#define COLLIDER_deilitw 0x8 +#define COLLIDER_deiliw 0x7 +#define COLLIDER_deilite 0x6 +#define COLLIDER_deilie 0x5 +#define COLLIDER_deilitn 0x4 +#define COLLIDER_deilin 0x3 +#define COLLIDER_g1 0x2 +#define COLLIDER_mawari 0x1 +#define COLLIDER_stage 0x0 + +#define ZONE_Root 0xD +#define ZONE_g1 0xC +#define ZONE_g6 0xB +#define ZONE_g7 0xA +#define ZONE_b_w 0x9 +#define ZONE_g11 0x8 +#define ZONE_b_s 0x7 +#define ZONE_g8 0x6 +#define ZONE_b_e 0x5 +#define ZONE_g12 0x4 +#define ZONE_b_n 0x3 +#define ZONE_g2 0x2 +#define ZONE_g10 0x1 +#define ZONE_hiru_came 0x0 + diff --git a/include/mapfs/sbk_64_shape.h b/include/mapfs/sbk_64_shape.h index 7d8179037e..5975e2e21f 100644 --- a/include/mapfs/sbk_64_shape.h +++ b/include/mapfs/sbk_64_shape.h @@ -1,21 +1,22 @@ -#define MODEL_Root 0x14 -#define MODEL_g1 0x13 -#define MODEL_g28 0x12 -#define MODEL_g29 0x11 -#define MODEL_o56 0x10 -#define MODEL_o55 0xF -#define MODEL_exit 0xE -#define MODEL_g7 0xD -#define MODEL_b_w2 0xC -#define MODEL_b_w 0xB -#define MODEL_g8 0xA -#define MODEL_b_e2 0x9 -#define MODEL_b_e 0x8 -#define MODEL_g12 0x7 -#define MODEL_b_n2 0x6 -#define MODEL_b_n 0x5 -#define MODEL_g2 0x4 -#define MODEL_g10 0x3 -#define MODEL_stage 0x2 -#define MODEL_g5 0x1 -#define MODEL_o3 0x0 +#define MODEL_Root 0x14 +#define MODEL_g1 0x13 +#define MODEL_g28 0x12 +#define MODEL_g29 0x11 +#define MODEL_o56 0x10 +#define MODEL_o55 0xF +#define MODEL_exit 0xE +#define MODEL_g7 0xD +#define MODEL_b_w2 0xC +#define MODEL_b_w 0xB +#define MODEL_g8 0xA +#define MODEL_b_e2 0x9 +#define MODEL_b_e 0x8 +#define MODEL_g12 0x7 +#define MODEL_b_n2 0x6 +#define MODEL_b_n 0x5 +#define MODEL_g2 0x4 +#define MODEL_g10 0x3 +#define MODEL_stage 0x2 +#define MODEL_g5 0x1 +#define MODEL_o3 0x0 + diff --git a/include/mapfs/sbk_65_hit.h b/include/mapfs/sbk_65_hit.h index 84f8919a89..896bf30b47 100644 --- a/include/mapfs/sbk_65_hit.h +++ b/include/mapfs/sbk_65_hit.h @@ -1,18 +1,34 @@ -#define COLLIDER_Root 0x11 -#define COLLIDER_g25 0x10 -#define COLLIDER_o196 0xF -#define COLLIDER_o195 0xE -#define COLLIDER_tuitate 0xD -#define COLLIDER_ttw 0xC -#define COLLIDER_tte 0xB -#define COLLIDER_ttn 0xA -#define COLLIDER_dero 0x9 -#define COLLIDER_deilitw 0x8 -#define COLLIDER_deiliw 0x7 -#define COLLIDER_deilite 0x6 -#define COLLIDER_deilie 0x5 -#define COLLIDER_deilitn 0x4 -#define COLLIDER_deilin 0x3 -#define COLLIDER_g1 0x2 -#define COLLIDER_mawari 0x1 -#define COLLIDER_stage 0x0 +#define COLLIDER_Root 0x11 +#define COLLIDER_g25 0x10 +#define COLLIDER_o196 0xF +#define COLLIDER_o195 0xE +#define COLLIDER_tuitate 0xD +#define COLLIDER_ttw 0xC +#define COLLIDER_tte 0xB +#define COLLIDER_ttn 0xA +#define COLLIDER_dero 0x9 +#define COLLIDER_deilitw 0x8 +#define COLLIDER_deiliw 0x7 +#define COLLIDER_deilite 0x6 +#define COLLIDER_deilie 0x5 +#define COLLIDER_deilitn 0x4 +#define COLLIDER_deilin 0x3 +#define COLLIDER_g1 0x2 +#define COLLIDER_mawari 0x1 +#define COLLIDER_stage 0x0 + +#define ZONE_Root 0xD +#define ZONE_g1 0xC +#define ZONE_g6 0xB +#define ZONE_g7 0xA +#define ZONE_b_w 0x9 +#define ZONE_g11 0x8 +#define ZONE_b_s 0x7 +#define ZONE_g8 0x6 +#define ZONE_b_e 0x5 +#define ZONE_g12 0x4 +#define ZONE_b_n 0x3 +#define ZONE_g2 0x2 +#define ZONE_g10 0x1 +#define ZONE_hiru_came 0x0 + diff --git a/include/mapfs/sbk_65_shape.h b/include/mapfs/sbk_65_shape.h index 4111682933..00b4d2cd37 100644 --- a/include/mapfs/sbk_65_shape.h +++ b/include/mapfs/sbk_65_shape.h @@ -1,26 +1,27 @@ -#define MODEL_Root 0x19 -#define MODEL_g1 0x18 -#define MODEL_g28 0x17 -#define MODEL_g31 0x16 -#define MODEL_o61 0x15 -#define MODEL_o59 0x14 -#define MODEL_o58 0x13 -#define MODEL_o57 0x12 -#define MODEL_g30 0x11 -#define MODEL_o56 0x10 -#define MODEL_o55 0xF -#define MODEL_exit 0xE -#define MODEL_g7 0xD -#define MODEL_b_w2 0xC -#define MODEL_b_w 0xB -#define MODEL_g8 0xA -#define MODEL_b_e2 0x9 -#define MODEL_b_e 0x8 -#define MODEL_g12 0x7 -#define MODEL_b_n2 0x6 -#define MODEL_b_n 0x5 -#define MODEL_g2 0x4 -#define MODEL_g10 0x3 -#define MODEL_stage 0x2 -#define MODEL_g5 0x1 -#define MODEL_o3 0x0 +#define MODEL_Root 0x19 +#define MODEL_g1 0x18 +#define MODEL_g28 0x17 +#define MODEL_g31 0x16 +#define MODEL_o61 0x15 +#define MODEL_o59 0x14 +#define MODEL_o58 0x13 +#define MODEL_o57 0x12 +#define MODEL_g30 0x11 +#define MODEL_o56 0x10 +#define MODEL_o55 0xF +#define MODEL_exit 0xE +#define MODEL_g7 0xD +#define MODEL_b_w2 0xC +#define MODEL_b_w 0xB +#define MODEL_g8 0xA +#define MODEL_b_e2 0x9 +#define MODEL_b_e 0x8 +#define MODEL_g12 0x7 +#define MODEL_b_n2 0x6 +#define MODEL_b_n 0x5 +#define MODEL_g2 0x4 +#define MODEL_g10 0x3 +#define MODEL_stage 0x2 +#define MODEL_g5 0x1 +#define MODEL_o3 0x0 + diff --git a/include/mapfs/sbk_66_hit.h b/include/mapfs/sbk_66_hit.h index 8ee398d7f6..781b12fbf2 100644 --- a/include/mapfs/sbk_66_hit.h +++ b/include/mapfs/sbk_66_hit.h @@ -1,16 +1,32 @@ -#define COLLIDER_Root 0xF -#define COLLIDER_g25 0xE -#define COLLIDER_o184 0xD -#define COLLIDER_o182 0xC -#define COLLIDER_o180 0xB -#define COLLIDER_tuitate 0xA -#define COLLIDER_ttw 0x9 -#define COLLIDER_ttn 0x8 -#define COLLIDER_dero 0x7 -#define COLLIDER_deilitw 0x6 -#define COLLIDER_deiliw 0x5 -#define COLLIDER_deilitn 0x4 -#define COLLIDER_deilin 0x3 -#define COLLIDER_g1 0x2 -#define COLLIDER_mawari 0x1 -#define COLLIDER_stage 0x0 +#define COLLIDER_Root 0xF +#define COLLIDER_g25 0xE +#define COLLIDER_o184 0xD +#define COLLIDER_o182 0xC +#define COLLIDER_o180 0xB +#define COLLIDER_tuitate 0xA +#define COLLIDER_ttw 0x9 +#define COLLIDER_ttn 0x8 +#define COLLIDER_dero 0x7 +#define COLLIDER_deilitw 0x6 +#define COLLIDER_deiliw 0x5 +#define COLLIDER_deilitn 0x4 +#define COLLIDER_deilin 0x3 +#define COLLIDER_g1 0x2 +#define COLLIDER_mawari 0x1 +#define COLLIDER_stage 0x0 + +#define ZONE_Root 0xD +#define ZONE_g1 0xC +#define ZONE_g6 0xB +#define ZONE_g7 0xA +#define ZONE_b_w 0x9 +#define ZONE_g11 0x8 +#define ZONE_b_s 0x7 +#define ZONE_g8 0x6 +#define ZONE_b_e 0x5 +#define ZONE_g12 0x4 +#define ZONE_b_n 0x3 +#define ZONE_g2 0x2 +#define ZONE_g10 0x1 +#define ZONE_hiru_came 0x0 + diff --git a/include/mapfs/sbk_66_shape.h b/include/mapfs/sbk_66_shape.h index 8288a9acf9..b60177b7c7 100644 --- a/include/mapfs/sbk_66_shape.h +++ b/include/mapfs/sbk_66_shape.h @@ -1,30 +1,31 @@ -#define MODEL_Root 0x1D -#define MODEL_g1 0x1C -#define MODEL_g28 0x1B -#define MODEL_g29 0x1A -#define MODEL_o67 0x19 -#define MODEL_o56 0x18 -#define MODEL_o55 0x17 -#define MODEL_g30 0x16 -#define MODEL_o66 0x15 -#define MODEL_o58 0x14 -#define MODEL_o57 0x13 -#define MODEL_g33 0x12 -#define MODEL_o65 0x11 -#define MODEL_o62 0x10 -#define MODEL_o61 0xF -#define MODEL_exit 0xE -#define MODEL_g7 0xD -#define MODEL_b_w2 0xC -#define MODEL_b_w 0xB -#define MODEL_g12 0xA -#define MODEL_b_n2 0x9 -#define MODEL_b_n 0x8 -#define MODEL_g10 0x7 -#define MODEL_g34 0x6 -#define MODEL_o64 0x5 -#define MODEL_o63 0x4 -#define MODEL_stage 0x3 -#define MODEL_g2 0x2 -#define MODEL_g5 0x1 -#define MODEL_o3 0x0 +#define MODEL_Root 0x1D +#define MODEL_g1 0x1C +#define MODEL_g28 0x1B +#define MODEL_g29 0x1A +#define MODEL_o67 0x19 +#define MODEL_o56 0x18 +#define MODEL_o55 0x17 +#define MODEL_g30 0x16 +#define MODEL_o66 0x15 +#define MODEL_o58 0x14 +#define MODEL_o57 0x13 +#define MODEL_g33 0x12 +#define MODEL_o65 0x11 +#define MODEL_o62 0x10 +#define MODEL_o61 0xF +#define MODEL_exit 0xE +#define MODEL_g7 0xD +#define MODEL_b_w2 0xC +#define MODEL_b_w 0xB +#define MODEL_g12 0xA +#define MODEL_b_n2 0x9 +#define MODEL_b_n 0x8 +#define MODEL_g10 0x7 +#define MODEL_g34 0x6 +#define MODEL_o64 0x5 +#define MODEL_o63 0x4 +#define MODEL_stage 0x3 +#define MODEL_g2 0x2 +#define MODEL_g5 0x1 +#define MODEL_o3 0x0 + diff --git a/include/mapfs/sbk_99_hit.h b/include/mapfs/sbk_99_hit.h index a45c9e536e..b8fe2332e7 100644 --- a/include/mapfs/sbk_99_hit.h +++ b/include/mapfs/sbk_99_hit.h @@ -1,38 +1,46 @@ -#define COLLIDER_Root 0x25 -#define COLLIDER_g40 0x24 -#define COLLIDER_o197 0x23 -#define COLLIDER_o196 0x22 -#define COLLIDER_g38 0x21 -#define COLLIDER_o184 0x20 -#define COLLIDER_o298 0x1F -#define COLLIDER_o183 0x1E -#define COLLIDER_o193 0x1D -#define COLLIDER_o199 0x1C -#define COLLIDER_o292 0x1B -#define COLLIDER_g37 0x1A -#define COLLIDER_o296 0x19 -#define COLLIDER_o295 0x18 -#define COLLIDER_o294 0x17 -#define COLLIDER_o293 0x16 -#define COLLIDER_o182 0x15 -#define COLLIDER_noko1 0x14 -#define COLLIDER_o157 0x13 -#define COLLIDER_o161 0x12 -#define COLLIDER_g34 0x11 -#define COLLIDER_o162 0x10 -#define COLLIDER_o158 0xF -#define COLLIDER_g36 0xE -#define COLLIDER_o155 0xD -#define COLLIDER_o160 0xC -#define COLLIDER_g35 0xB -#define COLLIDER_o154 0xA -#define COLLIDER_o198 0x9 -#define COLLIDER_o159 0x8 -#define COLLIDER_berone 0x7 -#define COLLIDER_o192 0x6 -#define COLLIDER_deilitne 0x5 -#define COLLIDER_deiline 0x4 -#define COLLIDER_beroe 0x3 -#define COLLIDER_o190 0x2 -#define COLLIDER_deilitw 0x1 -#define COLLIDER_deiliw 0x0 +#define COLLIDER_Root 0x25 +#define COLLIDER_g40 0x24 +#define COLLIDER_o197 0x23 +#define COLLIDER_o196 0x22 +#define COLLIDER_g38 0x21 +#define COLLIDER_o184 0x20 +#define COLLIDER_o298 0x1F +#define COLLIDER_o183 0x1E +#define COLLIDER_o193 0x1D +#define COLLIDER_o199 0x1C +#define COLLIDER_o292 0x1B +#define COLLIDER_g37 0x1A +#define COLLIDER_o296 0x19 +#define COLLIDER_o295 0x18 +#define COLLIDER_o294 0x17 +#define COLLIDER_o293 0x16 +#define COLLIDER_o182 0x15 +#define COLLIDER_noko1 0x14 +#define COLLIDER_o157 0x13 +#define COLLIDER_o161 0x12 +#define COLLIDER_g34 0x11 +#define COLLIDER_o162 0x10 +#define COLLIDER_o158 0xF +#define COLLIDER_g36 0xE +#define COLLIDER_o155 0xD +#define COLLIDER_o160 0xC +#define COLLIDER_g35 0xB +#define COLLIDER_o154 0xA +#define COLLIDER_o198 0x9 +#define COLLIDER_o159 0x8 +#define COLLIDER_berone 0x7 +#define COLLIDER_o192 0x6 +#define COLLIDER_deilitne 0x5 +#define COLLIDER_deiline 0x4 +#define COLLIDER_beroe 0x3 +#define COLLIDER_o190 0x2 +#define COLLIDER_deilitw 0x1 +#define COLLIDER_deiliw 0x0 + +#define ZONE_Root 0x5 +#define ZONE_Default 0x4 +#define ZONE_o210 0x3 +#define ZONE_o209 0x2 +#define ZONE_g1 0x1 +#define ZONE_o161 0x0 + diff --git a/include/mapfs/sbk_99_shape.h b/include/mapfs/sbk_99_shape.h index 8e95945d2c..f1ff7d111d 100644 --- a/include/mapfs/sbk_99_shape.h +++ b/include/mapfs/sbk_99_shape.h @@ -1,33 +1,34 @@ -#define MODEL_Root 0x20 -#define MODEL_Default 0x1F -#define MODEL_s_ishi 0x1E -#define MODEL_o175 0x1D -#define MODEL_fuchi 0x1C -#define MODEL_o186 0x1B -#define MODEL_o183 0x1A -#define MODEL_o187 0x19 -#define MODEL_o111 0x18 -#define MODEL_kabe 0x17 -#define MODEL_o163 0x16 -#define MODEL_o154 0x15 -#define MODEL_o198 0x14 -#define MODEL_obj 0x13 -#define MODEL_o222 0x12 -#define MODEL_o209 0x11 -#define MODEL_o167 0x10 -#define MODEL_o218 0xF -#define MODEL_o171 0xE -#define MODEL_o168 0xD -#define MODEL_o153 0xC -#define MODEL_o220 0xB -#define MODEL_o177 0xA -#define MODEL_o178 0x9 -#define MODEL_o219 0x8 -#define MODEL_o197 0x7 -#define MODEL_o174 0x6 -#define MODEL_jimen 0x5 -#define MODEL_o195 0x4 -#define MODEL_o161 0x3 -#define MODEL_g1 0x2 -#define MODEL_stage 0x1 -#define MODEL_frame 0x0 +#define MODEL_Root 0x20 +#define MODEL_Default 0x1F +#define MODEL_s_ishi 0x1E +#define MODEL_o175 0x1D +#define MODEL_fuchi 0x1C +#define MODEL_o186 0x1B +#define MODEL_o183 0x1A +#define MODEL_o187 0x19 +#define MODEL_o111 0x18 +#define MODEL_kabe 0x17 +#define MODEL_o163 0x16 +#define MODEL_o154 0x15 +#define MODEL_o198 0x14 +#define MODEL_obj 0x13 +#define MODEL_o222 0x12 +#define MODEL_o209 0x11 +#define MODEL_o167 0x10 +#define MODEL_o218 0xF +#define MODEL_o171 0xE +#define MODEL_o168 0xD +#define MODEL_o153 0xC +#define MODEL_o220 0xB +#define MODEL_o177 0xA +#define MODEL_o178 0x9 +#define MODEL_o219 0x8 +#define MODEL_o197 0x7 +#define MODEL_o174 0x6 +#define MODEL_jimen 0x5 +#define MODEL_o195 0x4 +#define MODEL_o161 0x3 +#define MODEL_g1 0x2 +#define MODEL_stage 0x1 +#define MODEL_frame 0x0 + diff --git a/include/mapfs/sbk_bt02_hit.h b/include/mapfs/sbk_bt02_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/sbk_bt02_hit.h +++ b/include/mapfs/sbk_bt02_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/sbk_bt02_shape.h b/include/mapfs/sbk_bt02_shape.h index cf156c18e5..0dabfc6d4c 100644 --- a/include/mapfs/sbk_bt02_shape.h +++ b/include/mapfs/sbk_bt02_shape.h @@ -1,45 +1,46 @@ -#define MODEL_Root 0x2C -#define MODEL_g47 0x2B -#define MODEL_waku1 0x2A -#define MODEL_g61 0x29 -#define MODEL_o322 0x28 -#define MODEL_o321 0x27 -#define MODEL_o320 0x26 -#define MODEL_o319 0x25 -#define MODEL_yuka 0x24 -#define MODEL_dai 0x23 -#define MODEL_waku2 0x22 -#define MODEL_iwa1 0x21 -#define MODEL_iwa2 0x20 -#define MODEL_yasi2 0x1F -#define MODEL_o317 0x1E -#define MODEL_o318 0x1D -#define MODEL_o315 0x1C -#define MODEL_o316 0x1B -#define MODEL_o313 0x1A -#define MODEL_o314 0x19 -#define MODEL_o311 0x18 -#define MODEL_o312 0x17 -#define MODEL_o272 0x16 -#define MODEL_yasi 0x15 -#define MODEL_o271 0x14 -#define MODEL_o230 0x13 -#define MODEL_o270 0x12 -#define MODEL_o229 0x11 -#define MODEL_o269 0x10 -#define MODEL_o228 0xF -#define MODEL_o268 0xE -#define MODEL_o214 0xD -#define MODEL_o213 0xC -#define MODEL_suna1 0xB -#define MODEL_suna2 0xA -#define MODEL_suna3 0x9 -#define MODEL_waku 0x8 -#define MODEL_yuka2 0x7 -#define MODEL_g48 0x6 -#define MODEL_g62 0x5 -#define MODEL_o324 0x4 -#define MODEL_g63 0x3 -#define MODEL_o325 0x2 -#define MODEL_g60 0x1 -#define MODEL_o233 0x0 +#define MODEL_Root 0x2C +#define MODEL_g47 0x2B +#define MODEL_waku1 0x2A +#define MODEL_g61 0x29 +#define MODEL_o322 0x28 +#define MODEL_o321 0x27 +#define MODEL_o320 0x26 +#define MODEL_o319 0x25 +#define MODEL_yuka 0x24 +#define MODEL_dai 0x23 +#define MODEL_waku2 0x22 +#define MODEL_iwa1 0x21 +#define MODEL_iwa2 0x20 +#define MODEL_yasi2 0x1F +#define MODEL_o317 0x1E +#define MODEL_o318 0x1D +#define MODEL_o315 0x1C +#define MODEL_o316 0x1B +#define MODEL_o313 0x1A +#define MODEL_o314 0x19 +#define MODEL_o311 0x18 +#define MODEL_o312 0x17 +#define MODEL_o272 0x16 +#define MODEL_yasi 0x15 +#define MODEL_o271 0x14 +#define MODEL_o230 0x13 +#define MODEL_o270 0x12 +#define MODEL_o229 0x11 +#define MODEL_o269 0x10 +#define MODEL_o228 0xF +#define MODEL_o268 0xE +#define MODEL_o214 0xD +#define MODEL_o213 0xC +#define MODEL_suna1 0xB +#define MODEL_suna2 0xA +#define MODEL_suna3 0x9 +#define MODEL_waku 0x8 +#define MODEL_yuka2 0x7 +#define MODEL_g48 0x6 +#define MODEL_g62 0x5 +#define MODEL_o324 0x4 +#define MODEL_g63 0x3 +#define MODEL_o325 0x2 +#define MODEL_g60 0x1 +#define MODEL_o233 0x0 + diff --git a/include/mapfs/tik_01_hit.h b/include/mapfs/tik_01_hit.h index 66882676bf..39178aeab8 100644 --- a/include/mapfs/tik_01_hit.h +++ b/include/mapfs/tik_01_hit.h @@ -1,20 +1,27 @@ -#define COLLIDER_Root 0x13 -#define COLLIDER_exite 0x12 -#define COLLIDER_o63 0x11 -#define COLLIDER_tte 0x10 -#define COLLIDER_deilite 0xF -#define COLLIDER_deilie 0xE -#define COLLIDER_ne 0xD -#define COLLIDER_exitw 0xC -#define COLLIDER_o64 0xB -#define COLLIDER_ttw 0xA -#define COLLIDER_nw 0x9 -#define COLLIDER_deiliw 0x8 -#define COLLIDER_deilitw 0x7 -#define COLLIDER_Default 0x6 -#define COLLIDER_at 0x5 -#define COLLIDER_tennzyou 0x4 -#define COLLIDER_o31 0x3 -#define COLLIDER_o30 0x2 -#define COLLIDER_kabe 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x13 +#define COLLIDER_exite 0x12 +#define COLLIDER_o63 0x11 +#define COLLIDER_tte 0x10 +#define COLLIDER_deilite 0xF +#define COLLIDER_deilie 0xE +#define COLLIDER_ne 0xD +#define COLLIDER_exitw 0xC +#define COLLIDER_o64 0xB +#define COLLIDER_ttw 0xA +#define COLLIDER_nw 0x9 +#define COLLIDER_deiliw 0x8 +#define COLLIDER_deilitw 0x7 +#define COLLIDER_Default 0x6 +#define COLLIDER_at 0x5 +#define COLLIDER_tennzyou 0x4 +#define COLLIDER_o31 0x3 +#define COLLIDER_o30 0x2 +#define COLLIDER_kabe 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x4 +#define ZONE_Default 0x3 +#define ZONE_3 0x2 +#define ZONE_2 0x1 +#define ZONE_1 0x0 + diff --git a/include/mapfs/tik_01_shape.h b/include/mapfs/tik_01_shape.h index cc25ab76f8..3cd089fdf4 100644 --- a/include/mapfs/tik_01_shape.h +++ b/include/mapfs/tik_01_shape.h @@ -1,24 +1,25 @@ -#define MODEL_Root 0x17 -#define MODEL_dokan 0x16 -#define MODEL_doka3 0x15 -#define MODEL_doka2 0x14 -#define MODEL_g7 0x13 -#define MODEL_sizuku 0x12 -#define MODEL_exite 0x11 -#define MODEL_o21 0x10 -#define MODEL_o23 0xF -#define MODEL_exitw 0xE -#define MODEL_o22 0xD -#define MODEL_o20 0xC -#define MODEL_sui 0xB -#define MODEL_mizu2 0xA -#define MODEL_mizu 0x9 -#define MODEL_naga1b 0x8 -#define MODEL_nagare1 0x7 -#define MODEL_Default 0x6 -#define MODEL_masuku 0x5 -#define MODEL_futi 0x4 -#define MODEL_yuka 0x3 -#define MODEL_saku 0x2 -#define MODEL_tennzyou 0x1 -#define MODEL_kabe 0x0 +#define MODEL_Root 0x17 +#define MODEL_dokan 0x16 +#define MODEL_doka3 0x15 +#define MODEL_doka2 0x14 +#define MODEL_g7 0x13 +#define MODEL_sizuku 0x12 +#define MODEL_exite 0x11 +#define MODEL_o21 0x10 +#define MODEL_o23 0xF +#define MODEL_exitw 0xE +#define MODEL_o22 0xD +#define MODEL_o20 0xC +#define MODEL_sui 0xB +#define MODEL_mizu2 0xA +#define MODEL_mizu 0x9 +#define MODEL_naga1b 0x8 +#define MODEL_nagare1 0x7 +#define MODEL_Default 0x6 +#define MODEL_masuku 0x5 +#define MODEL_futi 0x4 +#define MODEL_yuka 0x3 +#define MODEL_saku 0x2 +#define MODEL_tennzyou 0x1 +#define MODEL_kabe 0x0 + diff --git a/include/mapfs/tik_02_hit.h b/include/mapfs/tik_02_hit.h index ead15f8a28..6f166d5ecd 100644 --- a/include/mapfs/tik_02_hit.h +++ b/include/mapfs/tik_02_hit.h @@ -1,13 +1,20 @@ -#define COLLIDER_Root 0xC -#define COLLIDER_exitw 0xB -#define COLLIDER_ttw 0xA -#define COLLIDER_nw 0x9 -#define COLLIDER_deiliw 0x8 -#define COLLIDER_deilitw 0x7 -#define COLLIDER_Default 0x6 -#define COLLIDER_o69 0x5 -#define COLLIDER_at 0x4 -#define COLLIDER_o43 0x3 -#define COLLIDER_kabe 0x2 -#define COLLIDER_dokanhasi 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0xC +#define COLLIDER_exitw 0xB +#define COLLIDER_ttw 0xA +#define COLLIDER_nw 0x9 +#define COLLIDER_deiliw 0x8 +#define COLLIDER_deilitw 0x7 +#define COLLIDER_Default 0x6 +#define COLLIDER_o69 0x5 +#define COLLIDER_at 0x4 +#define COLLIDER_o43 0x3 +#define COLLIDER_kabe 0x2 +#define COLLIDER_dokanhasi 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g9 0x3 +#define ZONE_3 0x2 +#define ZONE_2 0x1 +#define ZONE_1 0x0 + diff --git a/include/mapfs/tik_02_shape.h b/include/mapfs/tik_02_shape.h index 182607f48b..df52966ef0 100644 --- a/include/mapfs/tik_02_shape.h +++ b/include/mapfs/tik_02_shape.h @@ -1,25 +1,26 @@ -#define MODEL_Root 0x18 -#define MODEL_dokan 0x17 -#define MODEL_dokan4 0x16 -#define MODEL_dokan3 0x15 -#define MODEL_dokan2 0x14 -#define MODEL_dokan1 0x13 -#define MODEL_g7 0x12 -#define MODEL_sizuku 0x11 -#define MODEL_g5 0x10 -#define MODEL_o22 0xF -#define MODEL_o20 0xE -#define MODEL_sui 0xD -#define MODEL_o49 0xC -#define MODEL_taki 0xB -#define MODEL_mizu2 0xA -#define MODEL_mizu 0x9 -#define MODEL_naga1b 0x8 -#define MODEL_nagare1 0x7 -#define MODEL_Default 0x6 -#define MODEL_masuk 0x5 -#define MODEL_yuka 0x4 -#define MODEL_futi 0x3 -#define MODEL_saku 0x2 -#define MODEL_tennzyou 0x1 -#define MODEL_kabe 0x0 +#define MODEL_Root 0x18 +#define MODEL_dokan 0x17 +#define MODEL_dokan4 0x16 +#define MODEL_dokan3 0x15 +#define MODEL_dokan2 0x14 +#define MODEL_dokan1 0x13 +#define MODEL_g7 0x12 +#define MODEL_sizuku 0x11 +#define MODEL_g5 0x10 +#define MODEL_o22 0xF +#define MODEL_o20 0xE +#define MODEL_sui 0xD +#define MODEL_o49 0xC +#define MODEL_taki 0xB +#define MODEL_mizu2 0xA +#define MODEL_mizu 0x9 +#define MODEL_naga1b 0x8 +#define MODEL_nagare1 0x7 +#define MODEL_Default 0x6 +#define MODEL_masuk 0x5 +#define MODEL_yuka 0x4 +#define MODEL_futi 0x3 +#define MODEL_saku 0x2 +#define MODEL_tennzyou 0x1 +#define MODEL_kabe 0x0 + diff --git a/include/mapfs/tik_03_hit.h b/include/mapfs/tik_03_hit.h index bf0b98db8b..8b97d0c7de 100644 --- a/include/mapfs/tik_03_hit.h +++ b/include/mapfs/tik_03_hit.h @@ -1,22 +1,29 @@ -#define COLLIDER_Root 0x15 -#define COLLIDER_exite 0x14 -#define COLLIDER_tte 0x13 -#define COLLIDER_deilite 0x12 -#define COLLIDER_deilie 0x11 -#define COLLIDER_ne 0x10 -#define COLLIDER_g9 0xF -#define COLLIDER_erb 0xE -#define COLLIDER_4 0xD -#define COLLIDER_3 0xC -#define COLLIDER_2 0xB -#define COLLIDER_1 0xA -#define COLLIDER_g11 0x9 -#define COLLIDER_o45 0x8 -#define COLLIDER_g8 0x7 -#define COLLIDER_o46 0x6 -#define COLLIDER_exit_dokan 0x5 -#define COLLIDER_Default 0x4 -#define COLLIDER_at 0x3 -#define COLLIDER_o22 0x2 -#define COLLIDER_kabe 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x15 +#define COLLIDER_exite 0x14 +#define COLLIDER_tte 0x13 +#define COLLIDER_deilite 0x12 +#define COLLIDER_deilie 0x11 +#define COLLIDER_ne 0x10 +#define COLLIDER_g9 0xF +#define COLLIDER_erb 0xE +#define COLLIDER_4 0xD +#define COLLIDER_3 0xC +#define COLLIDER_2 0xB +#define COLLIDER_1 0xA +#define COLLIDER_g11 0x9 +#define COLLIDER_o45 0x8 +#define COLLIDER_g8 0x7 +#define COLLIDER_o46 0x6 +#define COLLIDER_exit_dokan 0x5 +#define COLLIDER_Default 0x4 +#define COLLIDER_at 0x3 +#define COLLIDER_o22 0x2 +#define COLLIDER_kabe 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g9 0x3 +#define ZONE_3 0x2 +#define ZONE_2 0x1 +#define ZONE_1 0x0 + diff --git a/include/mapfs/tik_03_shape.h b/include/mapfs/tik_03_shape.h index 4fd9aac209..d1c60bc37d 100644 --- a/include/mapfs/tik_03_shape.h +++ b/include/mapfs/tik_03_shape.h @@ -1,33 +1,34 @@ -#define MODEL_Root 0x20 -#define MODEL_g9 0x1F -#define MODEL_o41 0x1E -#define MODEL_o40 0x1D -#define MODEL_o39 0x1C -#define MODEL_erb 0x1B -#define MODEL_dokan 0x1A -#define MODEL_dokan4 0x19 -#define MODEL_gokan3 0x18 -#define MODEL_dokan2 0x17 -#define MODEL_dokan1 0x16 -#define MODEL_g7 0x15 -#define MODEL_sizuku 0x14 -#define MODEL_exite 0x13 -#define MODEL_o43 0x12 -#define MODEL_o42 0x11 -#define MODEL_exitd 0x10 -#define MODEL_o58 0xF -#define MODEL_exit_dokan 0xE -#define MODEL_sui 0xD -#define MODEL_o53 0xC -#define MODEL_taki 0xB -#define MODEL_mizu2 0xA -#define MODEL_mizu 0x9 -#define MODEL_nagab 0x8 -#define MODEL_nagare 0x7 -#define MODEL_Default 0x6 -#define MODEL_masuk 0x5 -#define MODEL_futi 0x4 -#define MODEL_saku 0x3 -#define MODEL_tennzyou 0x2 -#define MODEL_kabe 0x1 -#define MODEL_yuka 0x0 +#define MODEL_Root 0x20 +#define MODEL_g9 0x1F +#define MODEL_o41 0x1E +#define MODEL_o40 0x1D +#define MODEL_o39 0x1C +#define MODEL_erb 0x1B +#define MODEL_dokan 0x1A +#define MODEL_dokan4 0x19 +#define MODEL_gokan3 0x18 +#define MODEL_dokan2 0x17 +#define MODEL_dokan1 0x16 +#define MODEL_g7 0x15 +#define MODEL_sizuku 0x14 +#define MODEL_exite 0x13 +#define MODEL_o43 0x12 +#define MODEL_o42 0x11 +#define MODEL_exitd 0x10 +#define MODEL_o58 0xF +#define MODEL_exit_dokan 0xE +#define MODEL_sui 0xD +#define MODEL_o53 0xC +#define MODEL_taki 0xB +#define MODEL_mizu2 0xA +#define MODEL_mizu 0x9 +#define MODEL_nagab 0x8 +#define MODEL_nagare 0x7 +#define MODEL_Default 0x6 +#define MODEL_masuk 0x5 +#define MODEL_futi 0x4 +#define MODEL_saku 0x3 +#define MODEL_tennzyou 0x2 +#define MODEL_kabe 0x1 +#define MODEL_yuka 0x0 + diff --git a/include/mapfs/tik_04_hit.h b/include/mapfs/tik_04_hit.h index 2ccb74a91e..072c2d3767 100644 --- a/include/mapfs/tik_04_hit.h +++ b/include/mapfs/tik_04_hit.h @@ -1,30 +1,37 @@ -#define COLLIDER_Root 0x1D -#define COLLIDER_exitd2 0x1C -#define COLLIDER_ttd2 0x1B -#define COLLIDER_nd2 0x1A -#define COLLIDER_exitd 0x19 -#define COLLIDER_ttd 0x18 -#define COLLIDER_nd 0x17 -#define COLLIDER_exite 0x16 -#define COLLIDER_tte 0x15 -#define COLLIDER_deilite 0x14 -#define COLLIDER_deilie 0x13 -#define COLLIDER_ne 0x12 -#define COLLIDER_exitw 0x11 -#define COLLIDER_ttw 0x10 -#define COLLIDER_nw 0xF -#define COLLIDER_deiliw 0xE -#define COLLIDER_deilitw 0xD -#define COLLIDER_g9 0xC -#define COLLIDER_erb2 0xB -#define COLLIDER_erb 0xA -#define COLLIDER_erb1 0x9 -#define COLLIDER_Default 0x8 -#define COLLIDER_o23 0x7 -#define COLLIDER_o22 0x6 -#define COLLIDER_o53 0x5 -#define COLLIDER_o52 0x4 -#define COLLIDER_kabe 0x3 -#define COLLIDER_o51 0x2 -#define COLLIDER_o50 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x1D +#define COLLIDER_exitd2 0x1C +#define COLLIDER_ttd2 0x1B +#define COLLIDER_nd2 0x1A +#define COLLIDER_exitd 0x19 +#define COLLIDER_ttd 0x18 +#define COLLIDER_nd 0x17 +#define COLLIDER_exite 0x16 +#define COLLIDER_tte 0x15 +#define COLLIDER_deilite 0x14 +#define COLLIDER_deilie 0x13 +#define COLLIDER_ne 0x12 +#define COLLIDER_exitw 0x11 +#define COLLIDER_ttw 0x10 +#define COLLIDER_nw 0xF +#define COLLIDER_deiliw 0xE +#define COLLIDER_deilitw 0xD +#define COLLIDER_g9 0xC +#define COLLIDER_erb2 0xB +#define COLLIDER_erb 0xA +#define COLLIDER_erb1 0x9 +#define COLLIDER_Default 0x8 +#define COLLIDER_o23 0x7 +#define COLLIDER_o22 0x6 +#define COLLIDER_o53 0x5 +#define COLLIDER_o52 0x4 +#define COLLIDER_kabe 0x3 +#define COLLIDER_o51 0x2 +#define COLLIDER_o50 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x4 +#define ZONE_Default 0x3 +#define ZONE_o36 0x2 +#define ZONE_o37 0x1 +#define ZONE_o39 0x0 + diff --git a/include/mapfs/tik_04_shape.h b/include/mapfs/tik_04_shape.h index 52208c9693..97ff8234bc 100644 --- a/include/mapfs/tik_04_shape.h +++ b/include/mapfs/tik_04_shape.h @@ -1,32 +1,33 @@ -#define MODEL_Root 0x1F -#define MODEL_dokan 0x1E -#define MODEL_o42 0x1D -#define MODEL_o41 0x1C -#define MODEL_o40 0x1B -#define MODEL_o44 0x1A -#define MODEL_dokan1 0x19 -#define MODEL_dokan4 0x18 -#define MODEL_dokan3 0x17 -#define MODEL_dokan2 0x16 -#define MODEL_g9 0x15 -#define MODEL_erb2 0x14 -#define MODEL_erb 0x13 -#define MODEL_erb1 0x12 -#define MODEL_g7 0x11 -#define MODEL_sizuku 0x10 -#define MODEL_exite 0xF -#define MODEL_o35 0xE -#define MODEL_o34 0xD -#define MODEL_exitw 0xC -#define MODEL_o37 0xB -#define MODEL_o36 0xA -#define MODEL_sui 0x9 -#define MODEL_mizu 0x8 -#define MODEL_Default 0x7 -#define MODEL_masuku 0x6 -#define MODEL_kaidan 0x5 -#define MODEL_saku 0x4 -#define MODEL_tennzyou 0x3 -#define MODEL_futi 0x2 -#define MODEL_kabe 0x1 -#define MODEL_yuka 0x0 +#define MODEL_Root 0x1F +#define MODEL_dokan 0x1E +#define MODEL_o42 0x1D +#define MODEL_o41 0x1C +#define MODEL_o40 0x1B +#define MODEL_o44 0x1A +#define MODEL_dokan1 0x19 +#define MODEL_dokan4 0x18 +#define MODEL_dokan3 0x17 +#define MODEL_dokan2 0x16 +#define MODEL_g9 0x15 +#define MODEL_erb2 0x14 +#define MODEL_erb 0x13 +#define MODEL_erb1 0x12 +#define MODEL_g7 0x11 +#define MODEL_sizuku 0x10 +#define MODEL_exite 0xF +#define MODEL_o35 0xE +#define MODEL_o34 0xD +#define MODEL_exitw 0xC +#define MODEL_o37 0xB +#define MODEL_o36 0xA +#define MODEL_sui 0x9 +#define MODEL_mizu 0x8 +#define MODEL_Default 0x7 +#define MODEL_masuku 0x6 +#define MODEL_kaidan 0x5 +#define MODEL_saku 0x4 +#define MODEL_tennzyou 0x3 +#define MODEL_futi 0x2 +#define MODEL_kabe 0x1 +#define MODEL_yuka 0x0 + diff --git a/include/mapfs/tik_05_hit.h b/include/mapfs/tik_05_hit.h index 7635f72aab..d2292d6631 100644 --- a/include/mapfs/tik_05_hit.h +++ b/include/mapfs/tik_05_hit.h @@ -1,11 +1,18 @@ -#define COLLIDER_Root 0xA -#define COLLIDER_exite 0x9 -#define COLLIDER_deilite 0x8 -#define COLLIDER_deilie 0x7 -#define COLLIDER_ne 0x6 -#define COLLIDER_Default 0x5 -#define COLLIDER_o71 0x4 -#define COLLIDER_o72 0x3 -#define COLLIDER_kabe 0x2 -#define COLLIDER_o70 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0xA +#define COLLIDER_exite 0x9 +#define COLLIDER_deilite 0x8 +#define COLLIDER_deilie 0x7 +#define COLLIDER_ne 0x6 +#define COLLIDER_Default 0x5 +#define COLLIDER_o71 0x4 +#define COLLIDER_o72 0x3 +#define COLLIDER_kabe 0x2 +#define COLLIDER_o70 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g16 0x3 +#define ZONE_3 0x2 +#define ZONE_2 0x1 +#define ZONE_1 0x0 + diff --git a/include/mapfs/tik_05_shape.h b/include/mapfs/tik_05_shape.h index db1d030b18..52ee8f1d4d 100644 --- a/include/mapfs/tik_05_shape.h +++ b/include/mapfs/tik_05_shape.h @@ -1,24 +1,25 @@ -#define MODEL_Root 0x17 -#define MODEL_dokan 0x16 -#define MODEL_dokan5 0x15 -#define MODEL_dokan4 0x14 -#define MODEL_dokan3 0x13 -#define MODEL_dokan2 0x12 -#define MODEL_dokan1 0x11 -#define MODEL_g7 0x10 -#define MODEL_sizuku 0xF -#define MODEL_exite 0xE -#define MODEL_o52 0xD -#define MODEL_o51 0xC -#define MODEL_sui 0xB -#define MODEL_o59 0xA -#define MODEL_taki 0x9 -#define MODEL_nagab 0x8 -#define MODEL_nagare 0x7 -#define MODEL_Default 0x6 -#define MODEL_masuk 0x5 -#define MODEL_futi 0x4 -#define MODEL_saku 0x3 -#define MODEL_tennzyou 0x2 -#define MODEL_kabe 0x1 -#define MODEL_yuka 0x0 +#define MODEL_Root 0x17 +#define MODEL_dokan 0x16 +#define MODEL_dokan5 0x15 +#define MODEL_dokan4 0x14 +#define MODEL_dokan3 0x13 +#define MODEL_dokan2 0x12 +#define MODEL_dokan1 0x11 +#define MODEL_g7 0x10 +#define MODEL_sizuku 0xF +#define MODEL_exite 0xE +#define MODEL_o52 0xD +#define MODEL_o51 0xC +#define MODEL_sui 0xB +#define MODEL_o59 0xA +#define MODEL_taki 0x9 +#define MODEL_nagab 0x8 +#define MODEL_nagare 0x7 +#define MODEL_Default 0x6 +#define MODEL_masuk 0x5 +#define MODEL_futi 0x4 +#define MODEL_saku 0x3 +#define MODEL_tennzyou 0x2 +#define MODEL_kabe 0x1 +#define MODEL_yuka 0x0 + diff --git a/include/mapfs/tik_06_hit.h b/include/mapfs/tik_06_hit.h index a136584ab2..55ec314dca 100644 --- a/include/mapfs/tik_06_hit.h +++ b/include/mapfs/tik_06_hit.h @@ -1,28 +1,35 @@ -#define COLLIDER_Root 0x1B -#define COLLIDER_g25 0x1A -#define COLLIDER_o89 0x19 -#define COLLIDER_o88 0x18 -#define COLLIDER_g16 0x17 -#define COLLIDER_o57 0x16 -#define COLLIDER_exite 0x15 -#define COLLIDER_o93 0x14 -#define COLLIDER_tte 0x13 -#define COLLIDER_deilite 0x12 -#define COLLIDER_deilie 0x11 -#define COLLIDER_ne 0x10 -#define COLLIDER_exitw 0xF -#define COLLIDER_o90 0xE -#define COLLIDER_ttw 0xD -#define COLLIDER_nw 0xC -#define COLLIDER_deiliw 0xB -#define COLLIDER_deilitw 0xA -#define COLLIDER_g12 0x9 -#define COLLIDER_o49 0x8 -#define COLLIDER_o48 0x7 -#define COLLIDER_Default 0x6 -#define COLLIDER_at 0x5 -#define COLLIDER_o42 0x4 -#define COLLIDER_o92 0x3 -#define COLLIDER_kabe 0x2 -#define COLLIDER_o91 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x1B +#define COLLIDER_g25 0x1A +#define COLLIDER_o89 0x19 +#define COLLIDER_o88 0x18 +#define COLLIDER_g16 0x17 +#define COLLIDER_o57 0x16 +#define COLLIDER_exite 0x15 +#define COLLIDER_o93 0x14 +#define COLLIDER_tte 0x13 +#define COLLIDER_deilite 0x12 +#define COLLIDER_deilie 0x11 +#define COLLIDER_ne 0x10 +#define COLLIDER_exitw 0xF +#define COLLIDER_o90 0xE +#define COLLIDER_ttw 0xD +#define COLLIDER_nw 0xC +#define COLLIDER_deiliw 0xB +#define COLLIDER_deilitw 0xA +#define COLLIDER_g12 0x9 +#define COLLIDER_o49 0x8 +#define COLLIDER_o48 0x7 +#define COLLIDER_Default 0x6 +#define COLLIDER_at 0x5 +#define COLLIDER_o42 0x4 +#define COLLIDER_o92 0x3 +#define COLLIDER_kabe 0x2 +#define COLLIDER_o91 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g13 0x3 +#define ZONE_3 0x2 +#define ZONE_2 0x1 +#define ZONE_1 0x0 + diff --git a/include/mapfs/tik_06_shape.h b/include/mapfs/tik_06_shape.h index b73db8edc1..21c5da0141 100644 --- a/include/mapfs/tik_06_shape.h +++ b/include/mapfs/tik_06_shape.h @@ -1,43 +1,44 @@ -#define MODEL_Root 0x2A -#define MODEL_dokan 0x29 -#define MODEL_o66 0x28 -#define MODEL_o65 0x27 -#define MODEL_dokanhasi 0x26 -#define MODEL_dokan2 0x25 -#define MODEL_ana 0x24 -#define MODEL_o49 0x23 -#define MODEL_o48 0x22 -#define MODEL_g7 0x21 -#define MODEL_sizuku 0x20 -#define MODEL_exitd 0x1F -#define MODEL_o52 0x1E -#define MODEL_exite 0x1D -#define MODEL_o54 0x1C -#define MODEL_o53 0x1B -#define MODEL_exutw 0x1A -#define MODEL_o55 0x19 -#define MODEL_o56 0x18 -#define MODEL_sui 0x17 -#define MODEL_o75 0x16 -#define MODEL_o73 0x15 -#define MODEL_o74 0x14 -#define MODEL_o72 0x13 -#define MODEL_o61 0x12 -#define MODEL_taki 0x11 -#define MODEL_mizu2 0x10 -#define MODEL_mizu 0xF -#define MODEL_naga1b 0xE -#define MODEL_nagare1 0xD -#define MODEL_Default 0xC -#define MODEL_masuk 0xB -#define MODEL_yuka 0xA -#define MODEL_futi 0x9 -#define MODEL_saku 0x8 -#define MODEL_tennzyou 0x7 -#define MODEL_kabe 0x6 -#define MODEL_g20 0x5 -#define MODEL_dokan1 0x4 -#define MODEL_marudokan 0x3 -#define MODEL_o71 0x2 -#define MODEL_o70 0x1 -#define MODEL_o69 0x0 +#define MODEL_Root 0x2A +#define MODEL_dokan 0x29 +#define MODEL_o66 0x28 +#define MODEL_o65 0x27 +#define MODEL_dokanhasi 0x26 +#define MODEL_dokan2 0x25 +#define MODEL_ana 0x24 +#define MODEL_o49 0x23 +#define MODEL_o48 0x22 +#define MODEL_g7 0x21 +#define MODEL_sizuku 0x20 +#define MODEL_exitd 0x1F +#define MODEL_o52 0x1E +#define MODEL_exite 0x1D +#define MODEL_o54 0x1C +#define MODEL_o53 0x1B +#define MODEL_exutw 0x1A +#define MODEL_o55 0x19 +#define MODEL_o56 0x18 +#define MODEL_sui 0x17 +#define MODEL_o75 0x16 +#define MODEL_o73 0x15 +#define MODEL_o74 0x14 +#define MODEL_o72 0x13 +#define MODEL_o61 0x12 +#define MODEL_taki 0x11 +#define MODEL_mizu2 0x10 +#define MODEL_mizu 0xF +#define MODEL_naga1b 0xE +#define MODEL_nagare1 0xD +#define MODEL_Default 0xC +#define MODEL_masuk 0xB +#define MODEL_yuka 0xA +#define MODEL_futi 0x9 +#define MODEL_saku 0x8 +#define MODEL_tennzyou 0x7 +#define MODEL_kabe 0x6 +#define MODEL_g20 0x5 +#define MODEL_dokan1 0x4 +#define MODEL_marudokan 0x3 +#define MODEL_o71 0x2 +#define MODEL_o70 0x1 +#define MODEL_o69 0x0 + diff --git a/include/mapfs/tik_07_hit.h b/include/mapfs/tik_07_hit.h index d59e35a380..07bf90e07b 100644 --- a/include/mapfs/tik_07_hit.h +++ b/include/mapfs/tik_07_hit.h @@ -1,30 +1,45 @@ -#define COLLIDER_Root 0x1D -#define COLLIDER_exitw 0x1C -#define COLLIDER_ttw 0x1B -#define COLLIDER_nw 0x1A -#define COLLIDER_deiliw 0x19 -#define COLLIDER_deilitww 0x18 -#define COLLIDER_d_exit2 0x17 -#define COLLIDER_dokan_e2 0x16 -#define COLLIDER_erb 0x15 -#define COLLIDER_o48 0x14 -#define COLLIDER_o34 0x13 -#define COLLIDER_o33 0x12 -#define COLLIDER_o32 0x11 -#define COLLIDER_o31 0x10 -#define COLLIDER_d_exit1 0xF -#define COLLIDER_dokan_e1 0xE -#define COLLIDER_Default 0xD -#define COLLIDER_kabe 0xC -#define COLLIDER_kabe2 0xB -#define COLLIDER_o83 0xA -#define COLLIDER_o89 0x9 -#define COLLIDER_o82 0x8 -#define COLLIDER_o90 0x7 -#define COLLIDER_o88 0x6 -#define COLLIDER_o87 0x5 -#define COLLIDER_o81 0x4 -#define COLLIDER_o86 0x3 -#define COLLIDER_o84 0x2 -#define COLLIDER_o85 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x1D +#define COLLIDER_exitw 0x1C +#define COLLIDER_ttw 0x1B +#define COLLIDER_nw 0x1A +#define COLLIDER_deiliw 0x19 +#define COLLIDER_deilitww 0x18 +#define COLLIDER_d_exit2 0x17 +#define COLLIDER_dokan_e2 0x16 +#define COLLIDER_erb 0x15 +#define COLLIDER_o48 0x14 +#define COLLIDER_o34 0x13 +#define COLLIDER_o33 0x12 +#define COLLIDER_o32 0x11 +#define COLLIDER_o31 0x10 +#define COLLIDER_d_exit1 0xF +#define COLLIDER_dokan_e1 0xE +#define COLLIDER_Default 0xD +#define COLLIDER_kabe 0xC +#define COLLIDER_kabe2 0xB +#define COLLIDER_o83 0xA +#define COLLIDER_o89 0x9 +#define COLLIDER_o82 0x8 +#define COLLIDER_o90 0x7 +#define COLLIDER_o88 0x6 +#define COLLIDER_o87 0x5 +#define COLLIDER_o81 0x4 +#define COLLIDER_o86 0x3 +#define COLLIDER_o84 0x2 +#define COLLIDER_o85 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0xC +#define ZONE_on 0xB +#define ZONE_o3 0xA +#define ZONE_o2 0x9 +#define ZONE_o1 0x8 +#define ZONE_rigut 0x7 +#define ZONE_r3 0x6 +#define ZONE_r2 0x5 +#define ZONE_r1 0x4 +#define ZONE_left 0x3 +#define ZONE_l3 0x2 +#define ZONE_l2 0x1 +#define ZONE_l1 0x0 + diff --git a/include/mapfs/tik_07_shape.h b/include/mapfs/tik_07_shape.h index 627491fdfd..92b81e31f6 100644 --- a/include/mapfs/tik_07_shape.h +++ b/include/mapfs/tik_07_shape.h @@ -1,33 +1,34 @@ -#define MODEL_Root 0x20 -#define MODEL_dokan 0x1F -#define MODEL_dokan7 0x1E -#define MODEL_gokan6 0x1D -#define MODEL_dokan5 0x1C -#define MODEL_dokan4 0x1B -#define MODEL_dokan3 0x1A -#define MODEL_dokan2 0x19 -#define MODEL_exitd2 0x18 -#define MODEL_dokan_e2 0x17 -#define MODEL_erb 0x16 -#define MODEL_o34 0x15 -#define MODEL_o33 0x14 -#define MODEL_o32 0x13 -#define MODEL_o31 0x12 -#define MODEL_g7 0x11 -#define MODEL_sizuku 0x10 -#define MODEL_exitw 0xF -#define MODEL_o20 0xE -#define MODEL_o47 0xD -#define MODEL_exitd1 0xC -#define MODEL_dokan_e1 0xB -#define MODEL_Default 0xA -#define MODEL_o50 0x9 -#define MODEL_masuk 0x8 -#define MODEL_tenn2 0x7 -#define MODEL_futi2 0x6 -#define MODEL_kabe2 0x5 -#define MODEL_yuka2 0x4 -#define MODEL_tennzyou 0x3 -#define MODEL_futi 0x2 -#define MODEL_kabe 0x1 -#define MODEL_yuka 0x0 +#define MODEL_Root 0x20 +#define MODEL_dokan 0x1F +#define MODEL_dokan7 0x1E +#define MODEL_gokan6 0x1D +#define MODEL_dokan5 0x1C +#define MODEL_dokan4 0x1B +#define MODEL_dokan3 0x1A +#define MODEL_dokan2 0x19 +#define MODEL_exitd2 0x18 +#define MODEL_dokan_e2 0x17 +#define MODEL_erb 0x16 +#define MODEL_o34 0x15 +#define MODEL_o33 0x14 +#define MODEL_o32 0x13 +#define MODEL_o31 0x12 +#define MODEL_g7 0x11 +#define MODEL_sizuku 0x10 +#define MODEL_exitw 0xF +#define MODEL_o20 0xE +#define MODEL_o47 0xD +#define MODEL_exitd1 0xC +#define MODEL_dokan_e1 0xB +#define MODEL_Default 0xA +#define MODEL_o50 0x9 +#define MODEL_masuk 0x8 +#define MODEL_tenn2 0x7 +#define MODEL_futi2 0x6 +#define MODEL_kabe2 0x5 +#define MODEL_yuka2 0x4 +#define MODEL_tennzyou 0x3 +#define MODEL_futi 0x2 +#define MODEL_kabe 0x1 +#define MODEL_yuka 0x0 + diff --git a/include/mapfs/tik_08_hit.h b/include/mapfs/tik_08_hit.h index 5b67c57567..3de9dfe154 100644 --- a/include/mapfs/tik_08_hit.h +++ b/include/mapfs/tik_08_hit.h @@ -1,32 +1,39 @@ -#define COLLIDER_Root 0x1F -#define COLLIDER_exitd 0x1E -#define COLLIDER_ttd 0x1D -#define COLLIDER_nd 0x1C -#define COLLIDER_exite 0x1B -#define COLLIDER_tte 0x1A -#define COLLIDER_deilite 0x19 -#define COLLIDER_deilie 0x18 -#define COLLIDER_ne 0x17 -#define COLLIDER_exitw 0x16 -#define COLLIDER_ttw 0x15 -#define COLLIDER_nw 0x14 -#define COLLIDER_deiliw 0x13 -#define COLLIDER_deilitw 0x12 -#define COLLIDER_g12 0x11 -#define COLLIDER_o118 0x10 -#define COLLIDER_o115 0xF -#define COLLIDER_o78 0xE -#define COLLIDER_o77 0xD -#define COLLIDER_o114 0xC -#define COLLIDER_o76 0xB -#define COLLIDER_o75 0xA -#define COLLIDER_Default 0x9 -#define COLLIDER_at 0x8 -#define COLLIDER_suimen 0x7 -#define COLLIDER_tennzyou 0x6 -#define COLLIDER_o42 0x5 -#define COLLIDER_o120 0x4 -#define COLLIDER_o121 0x3 -#define COLLIDER_kabe 0x2 -#define COLLIDER_o119 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x1F +#define COLLIDER_exitd 0x1E +#define COLLIDER_ttd 0x1D +#define COLLIDER_nd 0x1C +#define COLLIDER_exite 0x1B +#define COLLIDER_tte 0x1A +#define COLLIDER_deilite 0x19 +#define COLLIDER_deilie 0x18 +#define COLLIDER_ne 0x17 +#define COLLIDER_exitw 0x16 +#define COLLIDER_ttw 0x15 +#define COLLIDER_nw 0x14 +#define COLLIDER_deiliw 0x13 +#define COLLIDER_deilitw 0x12 +#define COLLIDER_g12 0x11 +#define COLLIDER_o118 0x10 +#define COLLIDER_o115 0xF +#define COLLIDER_o78 0xE +#define COLLIDER_o77 0xD +#define COLLIDER_o114 0xC +#define COLLIDER_o76 0xB +#define COLLIDER_o75 0xA +#define COLLIDER_Default 0x9 +#define COLLIDER_at 0x8 +#define COLLIDER_suimen 0x7 +#define COLLIDER_tennzyou 0x6 +#define COLLIDER_o42 0x5 +#define COLLIDER_o120 0x4 +#define COLLIDER_o121 0x3 +#define COLLIDER_kabe 0x2 +#define COLLIDER_o119 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g15 0x3 +#define ZONE_o73 0x2 +#define ZONE_o72 0x1 +#define ZONE_o71 0x0 + diff --git a/include/mapfs/tik_08_shape.h b/include/mapfs/tik_08_shape.h index 988f8136fb..65fcd179d2 100644 --- a/include/mapfs/tik_08_shape.h +++ b/include/mapfs/tik_08_shape.h @@ -1,38 +1,39 @@ -#define MODEL_Root 0x25 -#define MODEL_g23 0x24 -#define MODEL_taki 0x23 -#define MODEL_takib 0x22 -#define MODEL_sui 0x21 -#define MODEL_o93 0x20 -#define MODEL_nagab 0x1F -#define MODEL_o92 0x1E -#define MODEL_nagare1 0x1D -#define MODEL_dokan 0x1C -#define MODEL_o90 0x1B -#define MODEL_o81 0x1A -#define MODEL_dokan3 0x19 -#define MODEL_dokan2b 0x18 -#define MODEL_dokan2 0x17 -#define MODEL_hasi 0x16 -#define MODEL_o61 0x15 -#define MODEL_o60 0x14 -#define MODEL_o59 0x13 -#define MODEL_o58 0x12 -#define MODEL_o56 0x11 -#define MODEL_g12 0x10 -#define MODEL_o49 0xF -#define MODEL_g7 0xE -#define MODEL_sizuku 0xD -#define MODEL_exite 0xC -#define MODEL_o20 0xB -#define MODEL_o75 0xA -#define MODEL_exitw 0x9 -#define MODEL_o43 0x8 -#define MODEL_o78 0x7 -#define MODEL_Default 0x6 -#define MODEL_masuk 0x5 -#define MODEL_saku 0x4 -#define MODEL_tennzyou 0x3 -#define MODEL_futi 0x2 -#define MODEL_kabe 0x1 -#define MODEL_yuka 0x0 +#define MODEL_Root 0x25 +#define MODEL_g23 0x24 +#define MODEL_taki 0x23 +#define MODEL_takib 0x22 +#define MODEL_sui 0x21 +#define MODEL_o93 0x20 +#define MODEL_nagab 0x1F +#define MODEL_o92 0x1E +#define MODEL_nagare1 0x1D +#define MODEL_dokan 0x1C +#define MODEL_o90 0x1B +#define MODEL_o81 0x1A +#define MODEL_dokan3 0x19 +#define MODEL_dokan2b 0x18 +#define MODEL_dokan2 0x17 +#define MODEL_hasi 0x16 +#define MODEL_o61 0x15 +#define MODEL_o60 0x14 +#define MODEL_o59 0x13 +#define MODEL_o58 0x12 +#define MODEL_o56 0x11 +#define MODEL_g12 0x10 +#define MODEL_o49 0xF +#define MODEL_g7 0xE +#define MODEL_sizuku 0xD +#define MODEL_exite 0xC +#define MODEL_o20 0xB +#define MODEL_o75 0xA +#define MODEL_exitw 0x9 +#define MODEL_o43 0x8 +#define MODEL_o78 0x7 +#define MODEL_Default 0x6 +#define MODEL_masuk 0x5 +#define MODEL_saku 0x4 +#define MODEL_tennzyou 0x3 +#define MODEL_futi 0x2 +#define MODEL_kabe 0x1 +#define MODEL_yuka 0x0 + diff --git a/include/mapfs/tik_09_hit.h b/include/mapfs/tik_09_hit.h index 4403e71a40..701b0cf523 100644 --- a/include/mapfs/tik_09_hit.h +++ b/include/mapfs/tik_09_hit.h @@ -1,16 +1,23 @@ -#define COLLIDER_Root 0xF -#define COLLIDER_g19 0xE -#define COLLIDER_o59 0xD -#define COLLIDER_o58 0xC -#define COLLIDER_exitw 0xB -#define COLLIDER_nw 0xA -#define COLLIDER_deiliw 0x9 -#define COLLIDER_deilitw 0x8 -#define COLLIDER_exite 0x7 -#define COLLIDER_deiliye 0x6 -#define COLLIDER_deilie 0x5 -#define COLLIDER_ne 0x4 -#define COLLIDER_Default 0x3 -#define COLLIDER_at 0x2 -#define COLLIDER_kabe 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0xF +#define COLLIDER_g19 0xE +#define COLLIDER_o59 0xD +#define COLLIDER_o58 0xC +#define COLLIDER_exitw 0xB +#define COLLIDER_nw 0xA +#define COLLIDER_deiliw 0x9 +#define COLLIDER_deilitw 0x8 +#define COLLIDER_exite 0x7 +#define COLLIDER_deiliye 0x6 +#define COLLIDER_deilie 0x5 +#define COLLIDER_ne 0x4 +#define COLLIDER_Default 0x3 +#define COLLIDER_at 0x2 +#define COLLIDER_kabe 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g17 0x3 +#define ZONE_3 0x2 +#define ZONE_2 0x1 +#define ZONE_1 0x0 + diff --git a/include/mapfs/tik_09_shape.h b/include/mapfs/tik_09_shape.h index 29f679e8ef..c8ffa142af 100644 --- a/include/mapfs/tik_09_shape.h +++ b/include/mapfs/tik_09_shape.h @@ -1,49 +1,50 @@ -#define MODEL_Root 0x30 -#define MODEL_g23 0x2F -#define MODEL_kan2 0x2E -#define MODEL_o82 0x2D -#define MODEL_kan1 0x2C -#define MODEL_o81 0x2B -#define MODEL_bin 0x2A -#define MODEL_o79 0x29 -#define MODEL_dokan 0x28 -#define MODEL_dokan3 0x27 -#define MODEL_dokan2 0x26 -#define MODEL_dokan1 0x25 -#define MODEL_g7 0x24 -#define MODEL_sizuku 0x23 -#define MODEL_exite 0x22 -#define MODEL_ee_kousi 0x21 -#define MODEL_o20 0x20 -#define MODEL_o63 0x1F -#define MODEL_exitw 0x1E -#define MODEL_ew_kousi 0x1D -#define MODEL_o49 0x1C -#define MODEL_o65 0x1B -#define MODEL_sui 0x1A -#define MODEL_taki 0x19 -#define MODEL_o71 0x18 -#define MODEL_takib 0x17 -#define MODEL_nagare2 0x16 -#define MODEL_o86 0x15 -#define MODEL_nagab 0x14 -#define MODEL_o85 0x13 -#define MODEL_o87 0x12 -#define MODEL_o90 0x11 -#define MODEL_o88 0x10 -#define MODEL_o84 0xF -#define MODEL_o91 0xE -#define MODEL_o89 0xD -#define MODEL_nagare 0xC -#define MODEL_o92 0xB -#define MODEL_Default 0xA -#define MODEL_masuk 0x9 -#define MODEL_saku 0x8 -#define MODEL_tennzyou 0x7 -#define MODEL_futi 0x6 -#define MODEL_kabe 0x5 -#define MODEL_yuka 0x4 -#define MODEL_g27 0x3 -#define MODEL_marudokan 0x2 -#define MODEL_dokan5 0x1 -#define MODEL_o83 0x0 +#define MODEL_Root 0x30 +#define MODEL_g23 0x2F +#define MODEL_kan2 0x2E +#define MODEL_o82 0x2D +#define MODEL_kan1 0x2C +#define MODEL_o81 0x2B +#define MODEL_bin 0x2A +#define MODEL_o79 0x29 +#define MODEL_dokan 0x28 +#define MODEL_dokan3 0x27 +#define MODEL_dokan2 0x26 +#define MODEL_dokan1 0x25 +#define MODEL_g7 0x24 +#define MODEL_sizuku 0x23 +#define MODEL_exite 0x22 +#define MODEL_ee_kousi 0x21 +#define MODEL_o20 0x20 +#define MODEL_o63 0x1F +#define MODEL_exitw 0x1E +#define MODEL_ew_kousi 0x1D +#define MODEL_o49 0x1C +#define MODEL_o65 0x1B +#define MODEL_sui 0x1A +#define MODEL_taki 0x19 +#define MODEL_o71 0x18 +#define MODEL_takib 0x17 +#define MODEL_nagare2 0x16 +#define MODEL_o86 0x15 +#define MODEL_nagab 0x14 +#define MODEL_o85 0x13 +#define MODEL_o87 0x12 +#define MODEL_o90 0x11 +#define MODEL_o88 0x10 +#define MODEL_o84 0xF +#define MODEL_o91 0xE +#define MODEL_o89 0xD +#define MODEL_nagare 0xC +#define MODEL_o92 0xB +#define MODEL_Default 0xA +#define MODEL_masuk 0x9 +#define MODEL_saku 0x8 +#define MODEL_tennzyou 0x7 +#define MODEL_futi 0x6 +#define MODEL_kabe 0x5 +#define MODEL_yuka 0x4 +#define MODEL_g27 0x3 +#define MODEL_marudokan 0x2 +#define MODEL_dokan5 0x1 +#define MODEL_o83 0x0 + diff --git a/include/mapfs/tik_10_hit.h b/include/mapfs/tik_10_hit.h index c1ebeaa0d5..497b70cad2 100644 --- a/include/mapfs/tik_10_hit.h +++ b/include/mapfs/tik_10_hit.h @@ -1,13 +1,20 @@ -#define COLLIDER_Root 0xC -#define COLLIDER_exite 0xB -#define COLLIDER_deilite 0xA -#define COLLIDER_deilie 0x9 -#define COLLIDER_ne 0x8 -#define COLLIDER_Default 0x7 -#define COLLIDER_at 0x6 -#define COLLIDER_o79 0x5 -#define COLLIDER_o78 0x4 -#define COLLIDER_kabe 0x3 -#define COLLIDER_o77 0x2 -#define COLLIDER_o76 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0xC +#define COLLIDER_exite 0xB +#define COLLIDER_deilite 0xA +#define COLLIDER_deilie 0x9 +#define COLLIDER_ne 0x8 +#define COLLIDER_Default 0x7 +#define COLLIDER_at 0x6 +#define COLLIDER_o79 0x5 +#define COLLIDER_o78 0x4 +#define COLLIDER_kabe 0x3 +#define COLLIDER_o77 0x2 +#define COLLIDER_o76 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g16 0x3 +#define ZONE_o55 0x2 +#define ZONE_o54 0x1 +#define ZONE_o53 0x0 + diff --git a/include/mapfs/tik_10_shape.h b/include/mapfs/tik_10_shape.h index 8a6b49a0fc..544c8498a3 100644 --- a/include/mapfs/tik_10_shape.h +++ b/include/mapfs/tik_10_shape.h @@ -1,21 +1,22 @@ -#define MODEL_Root 0x14 -#define MODEL_dokan 0x13 -#define MODEL_dokan3 0x12 -#define MODEL_dokan2 0x11 -#define MODEL_dokan1 0x10 -#define MODEL_g7 0xF -#define MODEL_sizuku 0xE -#define MODEL_exite 0xD -#define MODEL_o20 0xC -#define MODEL_o54 0xB -#define MODEL_sui 0xA -#define MODEL_nagab 0x9 -#define MODEL_nagare 0x8 -#define MODEL_Default 0x7 -#define MODEL_o65 0x6 -#define MODEL_masuk 0x5 -#define MODEL_futi 0x4 -#define MODEL_saku 0x3 -#define MODEL_tennzyou 0x2 -#define MODEL_kabe 0x1 -#define MODEL_yuka 0x0 +#define MODEL_Root 0x14 +#define MODEL_dokan 0x13 +#define MODEL_dokan3 0x12 +#define MODEL_dokan2 0x11 +#define MODEL_dokan1 0x10 +#define MODEL_g7 0xF +#define MODEL_sizuku 0xE +#define MODEL_exite 0xD +#define MODEL_o20 0xC +#define MODEL_o54 0xB +#define MODEL_sui 0xA +#define MODEL_nagab 0x9 +#define MODEL_nagare 0x8 +#define MODEL_Default 0x7 +#define MODEL_o65 0x6 +#define MODEL_masuk 0x5 +#define MODEL_futi 0x4 +#define MODEL_saku 0x3 +#define MODEL_tennzyou 0x2 +#define MODEL_kabe 0x1 +#define MODEL_yuka 0x0 + diff --git a/include/mapfs/tik_12_hit.h b/include/mapfs/tik_12_hit.h index b405afc5ae..7163fa2503 100644 --- a/include/mapfs/tik_12_hit.h +++ b/include/mapfs/tik_12_hit.h @@ -1,9 +1,16 @@ -#define COLLIDER_Root 0x8 -#define COLLIDER_g15 0x7 -#define COLLIDER_o48 0x6 -#define COLLIDER_o47 0x5 -#define COLLIDER_Default 0x4 -#define COLLIDER_o35 0x3 -#define COLLIDER_futi 0x2 -#define COLLIDER_kabe 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x8 +#define COLLIDER_g15 0x7 +#define COLLIDER_o48 0x6 +#define COLLIDER_o47 0x5 +#define COLLIDER_Default 0x4 +#define COLLIDER_o35 0x3 +#define COLLIDER_futi 0x2 +#define COLLIDER_kabe 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g10 0x3 +#define ZONE_3 0x2 +#define ZONE_2 0x1 +#define ZONE_1 0x0 + diff --git a/include/mapfs/tik_12_shape.h b/include/mapfs/tik_12_shape.h index a9b01b14fd..9e20d01778 100644 --- a/include/mapfs/tik_12_shape.h +++ b/include/mapfs/tik_12_shape.h @@ -1,19 +1,20 @@ -#define MODEL_Root 0x12 -#define MODEL_dokan 0x11 -#define MODEL_dokan3 0x10 -#define MODEL_dokan2 0xF -#define MODEL_dokan1 0xE -#define MODEL_exitd 0xD -#define MODEL_o38 0xC -#define MODEL_o37 0xB -#define MODEL_g7 0xA -#define MODEL_sizuku 0x9 -#define MODEL_sui 0x8 -#define MODEL_mizu 0x7 -#define MODEL_Default 0x6 -#define MODEL_masuk 0x5 -#define MODEL_yuka 0x4 -#define MODEL_saku 0x3 -#define MODEL_tennzyou 0x2 -#define MODEL_futi 0x1 -#define MODEL_kabe 0x0 +#define MODEL_Root 0x12 +#define MODEL_dokan 0x11 +#define MODEL_dokan3 0x10 +#define MODEL_dokan2 0xF +#define MODEL_dokan1 0xE +#define MODEL_exitd 0xD +#define MODEL_o38 0xC +#define MODEL_o37 0xB +#define MODEL_g7 0xA +#define MODEL_sizuku 0x9 +#define MODEL_sui 0x8 +#define MODEL_mizu 0x7 +#define MODEL_Default 0x6 +#define MODEL_masuk 0x5 +#define MODEL_yuka 0x4 +#define MODEL_saku 0x3 +#define MODEL_tennzyou 0x2 +#define MODEL_futi 0x1 +#define MODEL_kabe 0x0 + diff --git a/include/mapfs/tik_14_hit.h b/include/mapfs/tik_14_hit.h index 83827d5e3a..f7895f64de 100644 --- a/include/mapfs/tik_14_hit.h +++ b/include/mapfs/tik_14_hit.h @@ -1,13 +1,20 @@ -#define COLLIDER_Root 0xC -#define COLLIDER_exitd 0xB -#define COLLIDER_o47 0xA -#define COLLIDER_o46 0x9 -#define COLLIDER_exit 0x8 -#define COLLIDER_tte2 0x7 -#define COLLIDER_ne 0x6 -#define COLLIDER_tte 0x5 -#define COLLIDER_deilie 0x4 -#define COLLIDER_deilite 0x3 -#define COLLIDER_Default 0x2 -#define COLLIDER_kabe 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0xC +#define COLLIDER_exitd 0xB +#define COLLIDER_o47 0xA +#define COLLIDER_o46 0x9 +#define COLLIDER_exit 0x8 +#define COLLIDER_tte2 0x7 +#define COLLIDER_ne 0x6 +#define COLLIDER_tte 0x5 +#define COLLIDER_deilie 0x4 +#define COLLIDER_deilite 0x3 +#define COLLIDER_Default 0x2 +#define COLLIDER_kabe 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g9 0x3 +#define ZONE_3 0x2 +#define ZONE_2 0x1 +#define ZONE_1 0x0 + diff --git a/include/mapfs/tik_14_shape.h b/include/mapfs/tik_14_shape.h index 2ef2527ea4..8fc68d97c0 100644 --- a/include/mapfs/tik_14_shape.h +++ b/include/mapfs/tik_14_shape.h @@ -1,19 +1,20 @@ -#define MODEL_Root 0x12 -#define MODEL_dokan 0x11 -#define MODEL_dokan2 0x10 -#define MODEL_dokan1 0xF -#define MODEL_g7 0xE -#define MODEL_sizuku 0xD -#define MODEL_ana 0xC -#define MODEL_oku 0xB -#define MODEL_tyka 0xA -#define MODEL_a_kabe 0x9 -#define MODEL_sui 0x8 -#define MODEL_mizu 0x7 -#define MODEL_Default 0x6 -#define MODEL_o40 0x5 -#define MODEL_nasuk 0x4 -#define MODEL_yuka 0x3 -#define MODEL_tennzyou 0x2 -#define MODEL_futi 0x1 -#define MODEL_kabe 0x0 +#define MODEL_Root 0x12 +#define MODEL_dokan 0x11 +#define MODEL_dokan2 0x10 +#define MODEL_dokan1 0xF +#define MODEL_g7 0xE +#define MODEL_sizuku 0xD +#define MODEL_ana 0xC +#define MODEL_oku 0xB +#define MODEL_tyka 0xA +#define MODEL_a_kabe 0x9 +#define MODEL_sui 0x8 +#define MODEL_mizu 0x7 +#define MODEL_Default 0x6 +#define MODEL_o40 0x5 +#define MODEL_nasuk 0x4 +#define MODEL_yuka 0x3 +#define MODEL_tennzyou 0x2 +#define MODEL_futi 0x1 +#define MODEL_kabe 0x0 + diff --git a/include/mapfs/tik_15_hit.h b/include/mapfs/tik_15_hit.h index e55417391d..0b962de523 100644 --- a/include/mapfs/tik_15_hit.h +++ b/include/mapfs/tik_15_hit.h @@ -1,17 +1,24 @@ -#define COLLIDER_Root 0x10 -#define COLLIDER_ana 0xF -#define COLLIDER_deilite 0xE -#define COLLIDER_ne 0xD -#define COLLIDER_deilie 0xC -#define COLLIDER_tte 0xB -#define COLLIDER_g19 0xA -#define COLLIDER_o59 0x9 -#define COLLIDER_o58 0x8 -#define COLLIDER_Default 0x7 -#define COLLIDER_kagu 0x6 -#define COLLIDER_o60 0x5 -#define COLLIDER_isu1 0x4 -#define COLLIDER_kurosu 0x3 -#define COLLIDER_tennzyou 0x2 -#define COLLIDER_kabe 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x10 +#define COLLIDER_ana 0xF +#define COLLIDER_deilite 0xE +#define COLLIDER_ne 0xD +#define COLLIDER_deilie 0xC +#define COLLIDER_tte 0xB +#define COLLIDER_g19 0xA +#define COLLIDER_o59 0x9 +#define COLLIDER_o58 0x8 +#define COLLIDER_Default 0x7 +#define COLLIDER_kagu 0x6 +#define COLLIDER_o60 0x5 +#define COLLIDER_isu1 0x4 +#define COLLIDER_kurosu 0x3 +#define COLLIDER_tennzyou 0x2 +#define COLLIDER_kabe 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g10 0x3 +#define ZONE_3 0x2 +#define ZONE_2 0x1 +#define ZONE_1 0x0 + diff --git a/include/mapfs/tik_15_shape.h b/include/mapfs/tik_15_shape.h index 67c5f27457..2a2945d2ad 100644 --- a/include/mapfs/tik_15_shape.h +++ b/include/mapfs/tik_15_shape.h @@ -1,29 +1,30 @@ -#define MODEL_Root 0x1C -#define MODEL_dokan 0x1B -#define MODEL_o54 0x1A -#define MODEL_dokan2 0x19 -#define MODEL_dokan1 0x18 -#define MODEL_g7 0x17 -#define MODEL_sizuku 0x16 -#define MODEL_ana 0x15 -#define MODEL_oku 0x14 -#define MODEL_tyka 0x13 -#define MODEL_a_kabe 0x12 -#define MODEL_sui 0x11 -#define MODEL_mizu 0x10 -#define MODEL_Default 0xF -#define MODEL_omasuk 0xE -#define MODEL_kagu 0xD -#define MODEL_bin 0xC -#define MODEL_o45 0xB -#define MODEL_o44 0xA -#define MODEL_hako 0x9 -#define MODEL_isu2 0x8 -#define MODEL_isu1 0x7 -#define MODEL_asi 0x6 -#define MODEL_kurosu 0x5 -#define MODEL_yuka 0x4 -#define MODEL_saku 0x3 -#define MODEL_tennzyou 0x2 -#define MODEL_futi 0x1 -#define MODEL_kabe 0x0 +#define MODEL_Root 0x1C +#define MODEL_dokan 0x1B +#define MODEL_o54 0x1A +#define MODEL_dokan2 0x19 +#define MODEL_dokan1 0x18 +#define MODEL_g7 0x17 +#define MODEL_sizuku 0x16 +#define MODEL_ana 0x15 +#define MODEL_oku 0x14 +#define MODEL_tyka 0x13 +#define MODEL_a_kabe 0x12 +#define MODEL_sui 0x11 +#define MODEL_mizu 0x10 +#define MODEL_Default 0xF +#define MODEL_omasuk 0xE +#define MODEL_kagu 0xD +#define MODEL_bin 0xC +#define MODEL_o45 0xB +#define MODEL_o44 0xA +#define MODEL_hako 0x9 +#define MODEL_isu2 0x8 +#define MODEL_isu1 0x7 +#define MODEL_asi 0x6 +#define MODEL_kurosu 0x5 +#define MODEL_yuka 0x4 +#define MODEL_saku 0x3 +#define MODEL_tennzyou 0x2 +#define MODEL_futi 0x1 +#define MODEL_kabe 0x0 + diff --git a/include/mapfs/tik_17_hit.h b/include/mapfs/tik_17_hit.h index 7ec4070d5e..f5ad185265 100644 --- a/include/mapfs/tik_17_hit.h +++ b/include/mapfs/tik_17_hit.h @@ -1,12 +1,19 @@ -#define COLLIDER_Root 0xB -#define COLLIDER_exitd 0xA -#define COLLIDER_g17 0x9 -#define COLLIDER_o105 0x8 -#define COLLIDER_o104 0x7 -#define COLLIDER_exit 0x6 -#define COLLIDER_o58 0x5 -#define COLLIDER_Default 0x4 -#define COLLIDER_o108 0x3 -#define COLLIDER_kaidan 0x2 -#define COLLIDER_kabe 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0xB +#define COLLIDER_exitd 0xA +#define COLLIDER_g17 0x9 +#define COLLIDER_o105 0x8 +#define COLLIDER_o104 0x7 +#define COLLIDER_exit 0x6 +#define COLLIDER_o58 0x5 +#define COLLIDER_Default 0x4 +#define COLLIDER_o108 0x3 +#define COLLIDER_kaidan 0x2 +#define COLLIDER_kabe 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g12 0x3 +#define ZONE_3 0x2 +#define ZONE_2 0x1 +#define ZONE_1 0x0 + diff --git a/include/mapfs/tik_17_shape.h b/include/mapfs/tik_17_shape.h index b322ceab5c..949d4f696d 100644 --- a/include/mapfs/tik_17_shape.h +++ b/include/mapfs/tik_17_shape.h @@ -1,39 +1,40 @@ -#define MODEL_Root 0x26 -#define MODEL_dokan 0x25 -#define MODEL_dokan4 0x24 -#define MODEL_dokan3 0x23 -#define MODEL_dokan2 0x22 -#define MODEL_dokan1 0x21 -#define MODEL_exit_d 0x20 -#define MODEL_o75 0x1F -#define MODEL_exit 0x1E -#define MODEL_o58 0x1D -#define MODEL_ice 0x1C -#define MODEL_o68 0x1B -#define MODEL_kai_ice2 0x1A -#define MODEL_kai_ice 0x19 -#define MODEL_o57 0x18 -#define MODEL_kiri 0x17 -#define MODEL_d4_ice 0x16 -#define MODEL_simo 0x15 -#define MODEL_ice_futi 0x14 -#define MODEL_o90 0x13 -#define MODEL_ice_yuka2 0x12 -#define MODEL_o89 0x11 -#define MODEL_ice_yuka 0x10 -#define MODEL_d2_ice2 0xF -#define MODEL_d2_ice1 0xE -#define MODEL_r_ice 0xD -#define MODEL_l_ice 0xC -#define MODEL_d3_ice2 0xB -#define MODEL_d_ice3 0xA -#define MODEL_d_ice2 0x9 -#define MODEL_d_ice1 0x8 -#define MODEL_kouri 0x7 -#define MODEL_Default 0x6 -#define MODEL_kaidan 0x5 -#define MODEL_saku 0x4 -#define MODEL_tennzyou 0x3 -#define MODEL_futi 0x2 -#define MODEL_kabe 0x1 -#define MODEL_yuka 0x0 +#define MODEL_Root 0x26 +#define MODEL_dokan 0x25 +#define MODEL_dokan4 0x24 +#define MODEL_dokan3 0x23 +#define MODEL_dokan2 0x22 +#define MODEL_dokan1 0x21 +#define MODEL_exit_d 0x20 +#define MODEL_o75 0x1F +#define MODEL_exit 0x1E +#define MODEL_o58 0x1D +#define MODEL_ice 0x1C +#define MODEL_o68 0x1B +#define MODEL_kai_ice2 0x1A +#define MODEL_kai_ice 0x19 +#define MODEL_o57 0x18 +#define MODEL_kiri 0x17 +#define MODEL_d4_ice 0x16 +#define MODEL_simo 0x15 +#define MODEL_ice_futi 0x14 +#define MODEL_o90 0x13 +#define MODEL_ice_yuka2 0x12 +#define MODEL_o89 0x11 +#define MODEL_ice_yuka 0x10 +#define MODEL_d2_ice2 0xF +#define MODEL_d2_ice1 0xE +#define MODEL_r_ice 0xD +#define MODEL_l_ice 0xC +#define MODEL_d3_ice2 0xB +#define MODEL_d_ice3 0xA +#define MODEL_d_ice2 0x9 +#define MODEL_d_ice1 0x8 +#define MODEL_kouri 0x7 +#define MODEL_Default 0x6 +#define MODEL_kaidan 0x5 +#define MODEL_saku 0x4 +#define MODEL_tennzyou 0x3 +#define MODEL_futi 0x2 +#define MODEL_kabe 0x1 +#define MODEL_yuka 0x0 + diff --git a/include/mapfs/tik_18_hit.h b/include/mapfs/tik_18_hit.h index 1bbb3af9f8..f37ecd1b9c 100644 --- a/include/mapfs/tik_18_hit.h +++ b/include/mapfs/tik_18_hit.h @@ -1,20 +1,27 @@ -#define COLLIDER_Root 0x13 -#define COLLIDER_exite 0x12 -#define COLLIDER_o45 0x11 -#define COLLIDER_tte 0x10 -#define COLLIDER_deilite 0xF -#define COLLIDER_deilie 0xE -#define COLLIDER_ne 0xD -#define COLLIDER_exitw 0xC -#define COLLIDER_o44 0xB -#define COLLIDER_ttw 0xA -#define COLLIDER_nw 0x9 -#define COLLIDER_deiliw 0x8 -#define COLLIDER_deilitw 0x7 -#define COLLIDER_Default 0x6 -#define COLLIDER_at 0x5 -#define COLLIDER_tennzyou 0x4 -#define COLLIDER_o31 0x3 -#define COLLIDER_o30 0x2 -#define COLLIDER_kabe 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x13 +#define COLLIDER_exite 0x12 +#define COLLIDER_o45 0x11 +#define COLLIDER_tte 0x10 +#define COLLIDER_deilite 0xF +#define COLLIDER_deilie 0xE +#define COLLIDER_ne 0xD +#define COLLIDER_exitw 0xC +#define COLLIDER_o44 0xB +#define COLLIDER_ttw 0xA +#define COLLIDER_nw 0x9 +#define COLLIDER_deiliw 0x8 +#define COLLIDER_deilitw 0x7 +#define COLLIDER_Default 0x6 +#define COLLIDER_at 0x5 +#define COLLIDER_tennzyou 0x4 +#define COLLIDER_o31 0x3 +#define COLLIDER_o30 0x2 +#define COLLIDER_kabe 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x4 +#define ZONE_Default 0x3 +#define ZONE_3 0x2 +#define ZONE_2 0x1 +#define ZONE_1 0x0 + diff --git a/include/mapfs/tik_18_shape.h b/include/mapfs/tik_18_shape.h index f3767177ee..55e1bc4886 100644 --- a/include/mapfs/tik_18_shape.h +++ b/include/mapfs/tik_18_shape.h @@ -1,24 +1,25 @@ -#define MODEL_Root 0x17 -#define MODEL_dokan 0x16 -#define MODEL_doka3 0x15 -#define MODEL_doka2 0x14 -#define MODEL_g7 0x13 -#define MODEL_sizuku 0x12 -#define MODEL_exite 0x11 -#define MODEL_o21 0x10 -#define MODEL_o23 0xF -#define MODEL_exitw 0xE -#define MODEL_o22 0xD -#define MODEL_o20 0xC -#define MODEL_sui 0xB -#define MODEL_mizu2 0xA -#define MODEL_mizu 0x9 -#define MODEL_nagab 0x8 -#define MODEL_nagare 0x7 -#define MODEL_Default 0x6 -#define MODEL_masuku 0x5 -#define MODEL_futi 0x4 -#define MODEL_yuka 0x3 -#define MODEL_saku 0x2 -#define MODEL_tennzyou 0x1 -#define MODEL_kabe 0x0 +#define MODEL_Root 0x17 +#define MODEL_dokan 0x16 +#define MODEL_doka3 0x15 +#define MODEL_doka2 0x14 +#define MODEL_g7 0x13 +#define MODEL_sizuku 0x12 +#define MODEL_exite 0x11 +#define MODEL_o21 0x10 +#define MODEL_o23 0xF +#define MODEL_exitw 0xE +#define MODEL_o22 0xD +#define MODEL_o20 0xC +#define MODEL_sui 0xB +#define MODEL_mizu2 0xA +#define MODEL_mizu 0x9 +#define MODEL_nagab 0x8 +#define MODEL_nagare 0x7 +#define MODEL_Default 0x6 +#define MODEL_masuku 0x5 +#define MODEL_futi 0x4 +#define MODEL_yuka 0x3 +#define MODEL_saku 0x2 +#define MODEL_tennzyou 0x1 +#define MODEL_kabe 0x0 + diff --git a/include/mapfs/tik_19_hit.h b/include/mapfs/tik_19_hit.h index 14c0ed372a..bc68486bc4 100644 --- a/include/mapfs/tik_19_hit.h +++ b/include/mapfs/tik_19_hit.h @@ -1,8 +1,15 @@ -#define COLLIDER_Root 0x7 -#define COLLIDER_exit_d 0x6 -#define COLLIDER_ttd 0x5 -#define COLLIDER_o94 0x4 -#define COLLIDER_Default 0x3 -#define COLLIDER_at 0x2 -#define COLLIDER_kabe 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x7 +#define COLLIDER_exit_d 0x6 +#define COLLIDER_ttd 0x5 +#define COLLIDER_o94 0x4 +#define COLLIDER_Default 0x3 +#define COLLIDER_at 0x2 +#define COLLIDER_kabe 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g12 0x3 +#define ZONE_3 0x2 +#define ZONE_2 0x1 +#define ZONE_1 0x0 + diff --git a/include/mapfs/tik_19_shape.h b/include/mapfs/tik_19_shape.h index 66f17e49ff..3da3e2c20d 100644 --- a/include/mapfs/tik_19_shape.h +++ b/include/mapfs/tik_19_shape.h @@ -1,21 +1,22 @@ -#define MODEL_Root 0x14 -#define MODEL_dokan 0x13 -#define MODEL_dokan3 0x12 -#define MODEL_dokan2 0x11 -#define MODEL_dokan1 0x10 -#define MODEL_exit_d 0xF -#define MODEL_o95 0xE -#define MODEL_o75 0xD -#define MODEL_g16 0xC -#define MODEL_takib 0xB -#define MODEL_taki 0xA -#define MODEL_sui 0x9 -#define MODEL_nagare 0x8 -#define MODEL_nagab 0x7 -#define MODEL_Default 0x6 -#define MODEL_kaidan 0x5 -#define MODEL_saku 0x4 -#define MODEL_tennzyou 0x3 -#define MODEL_futi 0x2 -#define MODEL_kabe 0x1 -#define MODEL_yuka 0x0 +#define MODEL_Root 0x14 +#define MODEL_dokan 0x13 +#define MODEL_dokan3 0x12 +#define MODEL_dokan2 0x11 +#define MODEL_dokan1 0x10 +#define MODEL_exit_d 0xF +#define MODEL_o95 0xE +#define MODEL_o75 0xD +#define MODEL_g16 0xC +#define MODEL_takib 0xB +#define MODEL_taki 0xA +#define MODEL_sui 0x9 +#define MODEL_nagare 0x8 +#define MODEL_nagab 0x7 +#define MODEL_Default 0x6 +#define MODEL_kaidan 0x5 +#define MODEL_saku 0x4 +#define MODEL_tennzyou 0x3 +#define MODEL_futi 0x2 +#define MODEL_kabe 0x1 +#define MODEL_yuka 0x0 + diff --git a/include/mapfs/tik_20_hit.h b/include/mapfs/tik_20_hit.h index 849e05916d..6250b952a9 100644 --- a/include/mapfs/tik_20_hit.h +++ b/include/mapfs/tik_20_hit.h @@ -1,21 +1,28 @@ -#define COLLIDER_Root 0x14 -#define COLLIDER_exitd 0x13 -#define COLLIDER_o110 0x12 -#define COLLIDER_o109 0x11 -#define COLLIDER_exite 0x10 -#define COLLIDER_tte 0xF -#define COLLIDER_deilite 0xE -#define COLLIDER_deilie 0xD -#define COLLIDER_ne 0xC -#define COLLIDER_exitw 0xB -#define COLLIDER_ttw 0xA -#define COLLIDER_nw 0x9 -#define COLLIDER_deiliw 0x8 -#define COLLIDER_deilitw 0x7 -#define COLLIDER_Default 0x6 -#define COLLIDER_o112 0x5 -#define COLLIDER_at 0x4 -#define COLLIDER_toge 0x3 -#define COLLIDER_kabe 0x2 -#define COLLIDER_yuka2 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x14 +#define COLLIDER_exitd 0x13 +#define COLLIDER_o110 0x12 +#define COLLIDER_o109 0x11 +#define COLLIDER_exite 0x10 +#define COLLIDER_tte 0xF +#define COLLIDER_deilite 0xE +#define COLLIDER_deilie 0xD +#define COLLIDER_ne 0xC +#define COLLIDER_exitw 0xB +#define COLLIDER_ttw 0xA +#define COLLIDER_nw 0x9 +#define COLLIDER_deiliw 0x8 +#define COLLIDER_deilitw 0x7 +#define COLLIDER_Default 0x6 +#define COLLIDER_o112 0x5 +#define COLLIDER_at 0x4 +#define COLLIDER_toge 0x3 +#define COLLIDER_kabe 0x2 +#define COLLIDER_yuka2 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g19 0x3 +#define ZONE_3 0x2 +#define ZONE_2 0x1 +#define ZONE_1 0x0 + diff --git a/include/mapfs/tik_20_shape.h b/include/mapfs/tik_20_shape.h index 66ccd121ff..242976332c 100644 --- a/include/mapfs/tik_20_shape.h +++ b/include/mapfs/tik_20_shape.h @@ -1,35 +1,36 @@ -#define MODEL_Root 0x22 -#define MODEL_g29 0x21 -#define MODEL_kan2 0x20 -#define MODEL_o90 0x1F -#define MODEL_kan1 0x1E -#define MODEL_o89 0x1D -#define MODEL_bin 0x1C -#define MODEL_o87 0x1B -#define MODEL_dokan 0x1A -#define MODEL_dokan5 0x19 -#define MODEL_dokan4 0x18 -#define MODEL_dokan3 0x17 -#define MODEL_dokan2 0x16 -#define MODEL_dokan1 0x15 -#define MODEL_g7 0x14 -#define MODEL_sizuku 0x13 -#define MODEL_exitd 0x12 -#define MODEL_o65 0x11 -#define MODEL_exitw 0x10 -#define MODEL_o49 0xF -#define MODEL_o80 0xE -#define MODEL_exite 0xD -#define MODEL_o79 0xC -#define MODEL_o20 0xB -#define MODEL_sui 0xA -#define MODEL_nagab 0x9 -#define MODEL_nagare 0x8 -#define MODEL_Default 0x7 -#define MODEL_saku 0x6 -#define MODEL_masuk 0x5 -#define MODEL_toge 0x4 -#define MODEL_tennzyou 0x3 -#define MODEL_futi 0x2 -#define MODEL_kabe 0x1 -#define MODEL_yuka 0x0 +#define MODEL_Root 0x22 +#define MODEL_g29 0x21 +#define MODEL_kan2 0x20 +#define MODEL_o90 0x1F +#define MODEL_kan1 0x1E +#define MODEL_o89 0x1D +#define MODEL_bin 0x1C +#define MODEL_o87 0x1B +#define MODEL_dokan 0x1A +#define MODEL_dokan5 0x19 +#define MODEL_dokan4 0x18 +#define MODEL_dokan3 0x17 +#define MODEL_dokan2 0x16 +#define MODEL_dokan1 0x15 +#define MODEL_g7 0x14 +#define MODEL_sizuku 0x13 +#define MODEL_exitd 0x12 +#define MODEL_o65 0x11 +#define MODEL_exitw 0x10 +#define MODEL_o49 0xF +#define MODEL_o80 0xE +#define MODEL_exite 0xD +#define MODEL_o79 0xC +#define MODEL_o20 0xB +#define MODEL_sui 0xA +#define MODEL_nagab 0x9 +#define MODEL_nagare 0x8 +#define MODEL_Default 0x7 +#define MODEL_saku 0x6 +#define MODEL_masuk 0x5 +#define MODEL_toge 0x4 +#define MODEL_tennzyou 0x3 +#define MODEL_futi 0x2 +#define MODEL_kabe 0x1 +#define MODEL_yuka 0x0 + diff --git a/include/mapfs/tik_21_hit.h b/include/mapfs/tik_21_hit.h index af2bdfef49..bb9b8eff93 100644 --- a/include/mapfs/tik_21_hit.h +++ b/include/mapfs/tik_21_hit.h @@ -1,20 +1,27 @@ -#define COLLIDER_Root 0x13 -#define COLLIDER_exitd 0x12 -#define COLLIDER_o50 0x11 -#define COLLIDER_o49 0x10 -#define COLLIDER_exite 0xF -#define COLLIDER_tte 0xE -#define COLLIDER_deilite 0xD -#define COLLIDER_deilie 0xC -#define COLLIDER_ne 0xB -#define COLLIDER_exitw 0xA -#define COLLIDER_ttw 0x9 -#define COLLIDER_nw 0x8 -#define COLLIDER_deiliw 0x7 -#define COLLIDER_deilitw 0x6 -#define COLLIDER_Default 0x5 -#define COLLIDER_o56 0x4 -#define COLLIDER_o22 0x3 -#define COLLIDER_kabe 0x2 -#define COLLIDER_yuka 0x1 -#define COLLIDER_o52 0x0 +#define COLLIDER_Root 0x13 +#define COLLIDER_exitd 0x12 +#define COLLIDER_o50 0x11 +#define COLLIDER_o49 0x10 +#define COLLIDER_exite 0xF +#define COLLIDER_tte 0xE +#define COLLIDER_deilite 0xD +#define COLLIDER_deilie 0xC +#define COLLIDER_ne 0xB +#define COLLIDER_exitw 0xA +#define COLLIDER_ttw 0x9 +#define COLLIDER_nw 0x8 +#define COLLIDER_deiliw 0x7 +#define COLLIDER_deilitw 0x6 +#define COLLIDER_Default 0x5 +#define COLLIDER_o56 0x4 +#define COLLIDER_o22 0x3 +#define COLLIDER_kabe 0x2 +#define COLLIDER_yuka 0x1 +#define COLLIDER_o52 0x0 + +#define ZONE_Root 0x4 +#define ZONE_Default 0x3 +#define ZONE_o36 0x2 +#define ZONE_o37 0x1 +#define ZONE_o39 0x0 + diff --git a/include/mapfs/tik_21_shape.h b/include/mapfs/tik_21_shape.h index 77fe755c18..416086a55a 100644 --- a/include/mapfs/tik_21_shape.h +++ b/include/mapfs/tik_21_shape.h @@ -1,28 +1,29 @@ -#define MODEL_Root 0x1B -#define MODEL_g15 0x1A -#define MODEL_o43 0x19 -#define MODEL_dokan 0x18 -#define MODEL_dokan3 0x17 -#define MODEL_dokan2 0x16 -#define MODEL_dokan1 0x15 -#define MODEL_g7 0x14 -#define MODEL_sizuku 0x13 -#define MODEL_sui 0x12 -#define MODEL_mizu 0x11 -#define MODEL_exitw 0x10 -#define MODEL_o41 0xF -#define MODEL_o40 0xE -#define MODEL_exite 0xD -#define MODEL_g18 0xC -#define MODEL_o47 0xB -#define MODEL_g17 0xA -#define MODEL_o46 0x9 -#define MODEL_o45 0x8 -#define MODEL_o44 0x7 -#define MODEL_Default 0x6 -#define MODEL_masuk 0x5 -#define MODEL_yuka 0x4 -#define MODEL_saku 0x3 -#define MODEL_tennzyou 0x2 -#define MODEL_futi 0x1 -#define MODEL_kabe 0x0 +#define MODEL_Root 0x1B +#define MODEL_g15 0x1A +#define MODEL_o43 0x19 +#define MODEL_dokan 0x18 +#define MODEL_dokan3 0x17 +#define MODEL_dokan2 0x16 +#define MODEL_dokan1 0x15 +#define MODEL_g7 0x14 +#define MODEL_sizuku 0x13 +#define MODEL_sui 0x12 +#define MODEL_mizu 0x11 +#define MODEL_exitw 0x10 +#define MODEL_o41 0xF +#define MODEL_o40 0xE +#define MODEL_exite 0xD +#define MODEL_g18 0xC +#define MODEL_o47 0xB +#define MODEL_g17 0xA +#define MODEL_o46 0x9 +#define MODEL_o45 0x8 +#define MODEL_o44 0x7 +#define MODEL_Default 0x6 +#define MODEL_masuk 0x5 +#define MODEL_yuka 0x4 +#define MODEL_saku 0x3 +#define MODEL_tennzyou 0x2 +#define MODEL_futi 0x1 +#define MODEL_kabe 0x0 + diff --git a/include/mapfs/tik_22_hit.h b/include/mapfs/tik_22_hit.h index 0b18072d7b..0d9acfe6bb 100644 --- a/include/mapfs/tik_22_hit.h +++ b/include/mapfs/tik_22_hit.h @@ -1,13 +1,20 @@ -#define COLLIDER_Root 0xC -#define COLLIDER_exitd 0xB -#define COLLIDER_o62 0xA -#define COLLIDER_o61 0x9 -#define COLLIDER_exit 0x8 -#define COLLIDER_ne 0x7 -#define COLLIDER_tte 0x6 -#define COLLIDER_deilie 0x5 -#define COLLIDER_deilite 0x4 -#define COLLIDER_Default 0x3 -#define COLLIDER_kabe 0x2 -#define COLLIDER_yuka 0x1 -#define COLLIDER_o66 0x0 +#define COLLIDER_Root 0xC +#define COLLIDER_exitd 0xB +#define COLLIDER_o62 0xA +#define COLLIDER_o61 0x9 +#define COLLIDER_exit 0x8 +#define COLLIDER_ne 0x7 +#define COLLIDER_tte 0x6 +#define COLLIDER_deilie 0x5 +#define COLLIDER_deilite 0x4 +#define COLLIDER_Default 0x3 +#define COLLIDER_kabe 0x2 +#define COLLIDER_yuka 0x1 +#define COLLIDER_o66 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g9 0x3 +#define ZONE_3 0x2 +#define ZONE_2 0x1 +#define ZONE_1 0x0 + diff --git a/include/mapfs/tik_22_shape.h b/include/mapfs/tik_22_shape.h index 46b8e26e45..7dada65b76 100644 --- a/include/mapfs/tik_22_shape.h +++ b/include/mapfs/tik_22_shape.h @@ -1,25 +1,26 @@ -#define MODEL_Root 0x18 -#define MODEL_dokan 0x17 -#define MODEL_dokan3 0x16 -#define MODEL_dokan2 0x15 -#define MODEL_dokan1 0x14 -#define MODEL_g7 0x13 -#define MODEL_sizuku 0x12 -#define MODEL_sui 0x11 -#define MODEL_mizu 0x10 -#define MODEL_g13 0xF -#define MODEL_doa2 0xE -#define MODEL_o47 0xD -#define MODEL_doa1 0xC -#define MODEL_o46 0xB -#define MODEL_o41 0xA -#define MODEL_o40 0x9 -#define MODEL_Default 0x8 -#define MODEL_dai2 0x7 -#define MODEL_dai1 0x6 -#define MODEL_saku 0x5 -#define MODEL_nasuk 0x4 -#define MODEL_yuka 0x3 -#define MODEL_tennzyou 0x2 -#define MODEL_futi 0x1 -#define MODEL_kabe 0x0 +#define MODEL_Root 0x18 +#define MODEL_dokan 0x17 +#define MODEL_dokan3 0x16 +#define MODEL_dokan2 0x15 +#define MODEL_dokan1 0x14 +#define MODEL_g7 0x13 +#define MODEL_sizuku 0x12 +#define MODEL_sui 0x11 +#define MODEL_mizu 0x10 +#define MODEL_g13 0xF +#define MODEL_doa2 0xE +#define MODEL_o47 0xD +#define MODEL_doa1 0xC +#define MODEL_o46 0xB +#define MODEL_o41 0xA +#define MODEL_o40 0x9 +#define MODEL_Default 0x8 +#define MODEL_dai2 0x7 +#define MODEL_dai1 0x6 +#define MODEL_saku 0x5 +#define MODEL_nasuk 0x4 +#define MODEL_yuka 0x3 +#define MODEL_tennzyou 0x2 +#define MODEL_futi 0x1 +#define MODEL_kabe 0x0 + diff --git a/include/mapfs/tik_23_hit.h b/include/mapfs/tik_23_hit.h index 18e0133752..b6887bad8a 100644 --- a/include/mapfs/tik_23_hit.h +++ b/include/mapfs/tik_23_hit.h @@ -1,15 +1,22 @@ -#define COLLIDER_Root 0xE -#define COLLIDER_exitd 0xD -#define COLLIDER_ttd 0xC -#define COLLIDER_o90 0xB -#define COLLIDER_exite 0xA -#define COLLIDER_o102 0x9 -#define COLLIDER_tte 0x8 -#define COLLIDER_ne 0x7 -#define COLLIDER_deilie 0x6 -#define COLLIDER_deilite 0x5 -#define COLLIDER_Default 0x4 -#define COLLIDER_o100 0x3 -#define COLLIDER_kabe 0x2 -#define COLLIDER_yuka 0x1 -#define COLLIDER_o79 0x0 +#define COLLIDER_Root 0xE +#define COLLIDER_exitd 0xD +#define COLLIDER_ttd 0xC +#define COLLIDER_o90 0xB +#define COLLIDER_exite 0xA +#define COLLIDER_o102 0x9 +#define COLLIDER_tte 0x8 +#define COLLIDER_ne 0x7 +#define COLLIDER_deilie 0x6 +#define COLLIDER_deilite 0x5 +#define COLLIDER_Default 0x4 +#define COLLIDER_o100 0x3 +#define COLLIDER_kabe 0x2 +#define COLLIDER_yuka 0x1 +#define COLLIDER_o79 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g19 0x3 +#define ZONE_3 0x2 +#define ZONE_2 0x1 +#define ZONE_1 0x0 + diff --git a/include/mapfs/tik_23_shape.h b/include/mapfs/tik_23_shape.h index ed678d260e..d9a64f2d70 100644 --- a/include/mapfs/tik_23_shape.h +++ b/include/mapfs/tik_23_shape.h @@ -1,38 +1,39 @@ -#define MODEL_Root 0x25 -#define MODEL_g29 0x24 -#define MODEL_kan2 0x23 -#define MODEL_o94 0x22 -#define MODEL_kan1 0x21 -#define MODEL_o93 0x20 -#define MODEL_bin 0x1F -#define MODEL_o91 0x1E -#define MODEL_dokan 0x1D -#define MODEL_dokan5 0x1C -#define MODEL_dokan4 0x1B -#define MODEL_dokan3 0x1A -#define MODEL_dokan2 0x19 -#define MODEL_dokan1 0x18 -#define MODEL_g7 0x17 -#define MODEL_sizuku 0x16 -#define MODEL_exitd 0x15 -#define MODEL_o95 0x14 -#define MODEL_o89 0x13 -#define MODEL_exite 0x12 -#define MODEL_o79 0x11 -#define MODEL_o20 0x10 -#define MODEL_sui 0xF -#define MODEL_o103 0xE -#define MODEL_o99 0xD -#define MODEL_o102 0xC -#define MODEL_o98 0xB -#define MODEL_o101 0xA -#define MODEL_o97 0x9 -#define MODEL_nagare2 0x8 -#define MODEL_nagare1 0x7 -#define MODEL_Default 0x6 -#define MODEL_saku 0x5 -#define MODEL_masuk 0x4 -#define MODEL_tennzyou 0x3 -#define MODEL_futi 0x2 -#define MODEL_kabe 0x1 -#define MODEL_yuka 0x0 +#define MODEL_Root 0x25 +#define MODEL_g29 0x24 +#define MODEL_kan2 0x23 +#define MODEL_o94 0x22 +#define MODEL_kan1 0x21 +#define MODEL_o93 0x20 +#define MODEL_bin 0x1F +#define MODEL_o91 0x1E +#define MODEL_dokan 0x1D +#define MODEL_dokan5 0x1C +#define MODEL_dokan4 0x1B +#define MODEL_dokan3 0x1A +#define MODEL_dokan2 0x19 +#define MODEL_dokan1 0x18 +#define MODEL_g7 0x17 +#define MODEL_sizuku 0x16 +#define MODEL_exitd 0x15 +#define MODEL_o95 0x14 +#define MODEL_o89 0x13 +#define MODEL_exite 0x12 +#define MODEL_o79 0x11 +#define MODEL_o20 0x10 +#define MODEL_sui 0xF +#define MODEL_o103 0xE +#define MODEL_o99 0xD +#define MODEL_o102 0xC +#define MODEL_o98 0xB +#define MODEL_o101 0xA +#define MODEL_o97 0x9 +#define MODEL_nagare2 0x8 +#define MODEL_nagare1 0x7 +#define MODEL_Default 0x6 +#define MODEL_saku 0x5 +#define MODEL_masuk 0x4 +#define MODEL_tennzyou 0x3 +#define MODEL_futi 0x2 +#define MODEL_kabe 0x1 +#define MODEL_yuka 0x0 + diff --git a/include/mapfs/tik_24_hit.h b/include/mapfs/tik_24_hit.h index b149746b8f..76050b01e8 100644 --- a/include/mapfs/tik_24_hit.h +++ b/include/mapfs/tik_24_hit.h @@ -1 +1,4 @@ -#define COLLIDER_Root 0x0 +#define COLLIDER_Root 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/tik_24_shape.h b/include/mapfs/tik_24_shape.h index 98ef430c86..dee3600cd9 100644 --- a/include/mapfs/tik_24_shape.h +++ b/include/mapfs/tik_24_shape.h @@ -1 +1,2 @@ -#define MODEL_Root 0x0 +#define MODEL_Root 0x0 + diff --git a/include/mapfs/tik_25_hit.h b/include/mapfs/tik_25_hit.h index 8fff4ed80e..001592dd17 100644 --- a/include/mapfs/tik_25_hit.h +++ b/include/mapfs/tik_25_hit.h @@ -1,11 +1,18 @@ -#define COLLIDER_Root 0xA -#define COLLIDER_exitw 0x9 -#define COLLIDER_nw 0x8 -#define COLLIDER_deiliw 0x7 -#define COLLIDER_deilitw 0x6 -#define COLLIDER_ttw 0x5 -#define COLLIDER_Default 0x4 -#define COLLIDER_o50 0x3 -#define COLLIDER_yuka 0x2 -#define COLLIDER_futi 0x1 -#define COLLIDER_kabe 0x0 +#define COLLIDER_Root 0xA +#define COLLIDER_exitw 0x9 +#define COLLIDER_nw 0x8 +#define COLLIDER_deiliw 0x7 +#define COLLIDER_deilitw 0x6 +#define COLLIDER_ttw 0x5 +#define COLLIDER_Default 0x4 +#define COLLIDER_o50 0x3 +#define COLLIDER_yuka 0x2 +#define COLLIDER_futi 0x1 +#define COLLIDER_kabe 0x0 + +#define ZONE_Root 0x4 +#define ZONE_Default 0x3 +#define ZONE_o36 0x2 +#define ZONE_o37 0x1 +#define ZONE_o39 0x0 + diff --git a/include/mapfs/tik_25_shape.h b/include/mapfs/tik_25_shape.h index 51ade714e8..bc163ad26d 100644 --- a/include/mapfs/tik_25_shape.h +++ b/include/mapfs/tik_25_shape.h @@ -1,21 +1,22 @@ -#define MODEL_Root 0x14 -#define MODEL_dokan 0x13 -#define MODEL_dokan3 0x12 -#define MODEL_dokan2 0x11 -#define MODEL_dokan1 0x10 -#define MODEL_g7 0xF -#define MODEL_sizuku 0xE -#define MODEL_sui 0xD -#define MODEL_mizu 0xC -#define MODEL_exitw 0xB -#define MODEL_o41 0xA -#define MODEL_o40 0x9 -#define MODEL_Default 0x8 -#define MODEL_dai2 0x7 -#define MODEL_dai1 0x6 -#define MODEL_masuk 0x5 -#define MODEL_yuka 0x4 -#define MODEL_saku 0x3 -#define MODEL_tennzyou 0x2 -#define MODEL_futi 0x1 -#define MODEL_kabe 0x0 +#define MODEL_Root 0x14 +#define MODEL_dokan 0x13 +#define MODEL_dokan3 0x12 +#define MODEL_dokan2 0x11 +#define MODEL_dokan1 0x10 +#define MODEL_g7 0xF +#define MODEL_sizuku 0xE +#define MODEL_sui 0xD +#define MODEL_mizu 0xC +#define MODEL_exitw 0xB +#define MODEL_o41 0xA +#define MODEL_o40 0x9 +#define MODEL_Default 0x8 +#define MODEL_dai2 0x7 +#define MODEL_dai1 0x6 +#define MODEL_masuk 0x5 +#define MODEL_yuka 0x4 +#define MODEL_saku 0x3 +#define MODEL_tennzyou 0x2 +#define MODEL_futi 0x1 +#define MODEL_kabe 0x0 + diff --git a/include/mapfs/tik_bt01_hit.h b/include/mapfs/tik_bt01_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/tik_bt01_hit.h +++ b/include/mapfs/tik_bt01_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/tik_bt01_shape.h b/include/mapfs/tik_bt01_shape.h index 8a0b0d33b3..188e26e6ab 100644 --- a/include/mapfs/tik_bt01_shape.h +++ b/include/mapfs/tik_bt01_shape.h @@ -1,19 +1,20 @@ -#define MODEL_Root 0x12 -#define MODEL_g78 0x11 -#define MODEL_o351 0x10 -#define MODEL_dai 0xF -#define MODEL_waku1 0xE -#define MODEL_misu 0xD -#define MODEL_yuka 0xC -#define MODEL_g49 0xB -#define MODEL_waku2 0xA -#define MODEL_mizu2 0x9 -#define MODEL_exit 0x8 -#define MODEL_dokan1 0x7 -#define MODEL_kabe2 0x6 -#define MODEL_dokan2 0x5 -#define MODEL_futi 0x4 -#define MODEL_saku 0x3 -#define MODEL_kabe 0x2 -#define MODEL_yuka2 0x1 -#define MODEL_waku 0x0 +#define MODEL_Root 0x12 +#define MODEL_g78 0x11 +#define MODEL_o351 0x10 +#define MODEL_dai 0xF +#define MODEL_waku1 0xE +#define MODEL_misu 0xD +#define MODEL_yuka 0xC +#define MODEL_g49 0xB +#define MODEL_waku2 0xA +#define MODEL_mizu2 0x9 +#define MODEL_exit 0x8 +#define MODEL_dokan1 0x7 +#define MODEL_kabe2 0x6 +#define MODEL_dokan2 0x5 +#define MODEL_futi 0x4 +#define MODEL_saku 0x3 +#define MODEL_kabe 0x2 +#define MODEL_yuka2 0x1 +#define MODEL_waku 0x0 + diff --git a/include/mapfs/tik_bt02_hit.h b/include/mapfs/tik_bt02_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/tik_bt02_hit.h +++ b/include/mapfs/tik_bt02_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/tik_bt02_shape.h b/include/mapfs/tik_bt02_shape.h index 63221c5056..89d0f31127 100644 --- a/include/mapfs/tik_bt02_shape.h +++ b/include/mapfs/tik_bt02_shape.h @@ -1,19 +1,20 @@ -#define MODEL_Root 0x12 -#define MODEL_g79 0x11 -#define MODEL_o354 0x10 -#define MODEL_dai 0xF -#define MODEL_misu 0xE -#define MODEL_waku1 0xD -#define MODEL_yuka 0xC -#define MODEL_g49 0xB -#define MODEL_waku2 0xA -#define MODEL_mizu2 0x9 -#define MODEL_futi2 0x8 -#define MODEL_kabe3 0x7 -#define MODEL_dokan1 0x6 -#define MODEL_dokan2 0x5 -#define MODEL_futi 0x4 -#define MODEL_saku 0x3 -#define MODEL_kabe 0x2 -#define MODEL_yuka2 0x1 -#define MODEL_waku 0x0 +#define MODEL_Root 0x12 +#define MODEL_g79 0x11 +#define MODEL_o354 0x10 +#define MODEL_dai 0xF +#define MODEL_misu 0xE +#define MODEL_waku1 0xD +#define MODEL_yuka 0xC +#define MODEL_g49 0xB +#define MODEL_waku2 0xA +#define MODEL_mizu2 0x9 +#define MODEL_futi2 0x8 +#define MODEL_kabe3 0x7 +#define MODEL_dokan1 0x6 +#define MODEL_dokan2 0x5 +#define MODEL_futi 0x4 +#define MODEL_saku 0x3 +#define MODEL_kabe 0x2 +#define MODEL_yuka2 0x1 +#define MODEL_waku 0x0 + diff --git a/include/mapfs/tik_bt03_hit.h b/include/mapfs/tik_bt03_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/tik_bt03_hit.h +++ b/include/mapfs/tik_bt03_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/tik_bt03_shape.h b/include/mapfs/tik_bt03_shape.h index b6827207ad..42a025b876 100644 --- a/include/mapfs/tik_bt03_shape.h +++ b/include/mapfs/tik_bt03_shape.h @@ -1,21 +1,22 @@ -#define MODEL_Root 0x14 -#define MODEL_g82 0x13 -#define MODEL_o371 0x12 -#define MODEL_dai 0x11 -#define MODEL_waku1 0x10 -#define MODEL_dokan 0xF -#define MODEL_futi 0xE -#define MODEL_kabe 0xD -#define MODEL_yuka 0xC -#define MODEL_g49 0xB -#define MODEL_waku2 0xA -#define MODEL_exit2 0x9 -#define MODEL_exit 0x8 -#define MODEL_dokan2 0x7 -#define MODEL_kabe3 0x6 -#define MODEL_kabe2 0x5 -#define MODEL_yuka2 0x4 -#define MODEL_dokan3 0x3 -#define MODEL_gokan4 0x2 -#define MODEL_kabe1 0x1 -#define MODEL_waku 0x0 +#define MODEL_Root 0x14 +#define MODEL_g82 0x13 +#define MODEL_o371 0x12 +#define MODEL_dai 0x11 +#define MODEL_waku1 0x10 +#define MODEL_dokan 0xF +#define MODEL_futi 0xE +#define MODEL_kabe 0xD +#define MODEL_yuka 0xC +#define MODEL_g49 0xB +#define MODEL_waku2 0xA +#define MODEL_exit2 0x9 +#define MODEL_exit 0x8 +#define MODEL_dokan2 0x7 +#define MODEL_kabe3 0x6 +#define MODEL_kabe2 0x5 +#define MODEL_yuka2 0x4 +#define MODEL_dokan3 0x3 +#define MODEL_gokan4 0x2 +#define MODEL_kabe1 0x1 +#define MODEL_waku 0x0 + diff --git a/include/mapfs/tik_bt04_hit.h b/include/mapfs/tik_bt04_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/tik_bt04_hit.h +++ b/include/mapfs/tik_bt04_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/tik_bt04_shape.h b/include/mapfs/tik_bt04_shape.h index 6e5d60d89a..f086bfa55f 100644 --- a/include/mapfs/tik_bt04_shape.h +++ b/include/mapfs/tik_bt04_shape.h @@ -1,25 +1,26 @@ -#define MODEL_Root 0x18 -#define MODEL_g79 0x17 -#define MODEL_waku3 0x16 -#define MODEL_exit 0x15 -#define MODEL_dokan1 0x14 -#define MODEL_kabe2 0x13 -#define MODEL_yuka2 0x12 -#define MODEL_mizu4 0x11 -#define MODEL_mizu3 0x10 -#define MODEL_mizu2 0xF -#define MODEL_kan 0xE -#define MODEL_o360 0xD -#define MODEL_o358 0xC -#define MODEL_bin 0xB -#define MODEL_o361 0xA -#define MODEL_o357 0x9 -#define MODEL_dai 0x8 -#define MODEL_waku1 0x7 -#define MODEL_yuka 0x6 -#define MODEL_g49 0x5 -#define MODEL_dokan2 0x4 -#define MODEL_misu1 0x3 -#define MODEL_gokan3 0x2 -#define MODEL_kabe 0x1 -#define MODEL_waku 0x0 +#define MODEL_Root 0x18 +#define MODEL_g79 0x17 +#define MODEL_waku3 0x16 +#define MODEL_exit 0x15 +#define MODEL_dokan1 0x14 +#define MODEL_kabe2 0x13 +#define MODEL_yuka2 0x12 +#define MODEL_mizu4 0x11 +#define MODEL_mizu3 0x10 +#define MODEL_mizu2 0xF +#define MODEL_kan 0xE +#define MODEL_o360 0xD +#define MODEL_o358 0xC +#define MODEL_bin 0xB +#define MODEL_o361 0xA +#define MODEL_o357 0x9 +#define MODEL_dai 0x8 +#define MODEL_waku1 0x7 +#define MODEL_yuka 0x6 +#define MODEL_g49 0x5 +#define MODEL_dokan2 0x4 +#define MODEL_misu1 0x3 +#define MODEL_gokan3 0x2 +#define MODEL_kabe 0x1 +#define MODEL_waku 0x0 + diff --git a/include/mapfs/tik_bt05_hit.h b/include/mapfs/tik_bt05_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/tik_bt05_hit.h +++ b/include/mapfs/tik_bt05_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/tik_bt05_shape.h b/include/mapfs/tik_bt05_shape.h index c7184cdfbb..6f4cd7be98 100644 --- a/include/mapfs/tik_bt05_shape.h +++ b/include/mapfs/tik_bt05_shape.h @@ -1,20 +1,21 @@ -#define MODEL_Root 0x13 -#define MODEL_dai 0x12 -#define MODEL_waku1 0x11 -#define MODEL_taki2 0x10 -#define MODEL_taki1 0xF -#define MODEL_mizu2 0xE -#define MODEL_misu 0xD -#define MODEL_futi2 0xC -#define MODEL_kabe1 0xB -#define MODEL_yuka 0xA -#define MODEL_g49 0x9 -#define MODEL_waku3 0x8 -#define MODEL_dokan3 0x7 -#define MODEL_dokan1 0x6 -#define MODEL_dokan2 0x5 -#define MODEL_futi 0x4 -#define MODEL_saku 0x3 -#define MODEL_kabe 0x2 -#define MODEL_yuka2 0x1 -#define MODEL_waku 0x0 +#define MODEL_Root 0x13 +#define MODEL_dai 0x12 +#define MODEL_waku1 0x11 +#define MODEL_taki2 0x10 +#define MODEL_taki1 0xF +#define MODEL_mizu2 0xE +#define MODEL_misu 0xD +#define MODEL_futi2 0xC +#define MODEL_kabe1 0xB +#define MODEL_yuka 0xA +#define MODEL_g49 0x9 +#define MODEL_waku3 0x8 +#define MODEL_dokan3 0x7 +#define MODEL_dokan1 0x6 +#define MODEL_dokan2 0x5 +#define MODEL_futi 0x4 +#define MODEL_saku 0x3 +#define MODEL_kabe 0x2 +#define MODEL_yuka2 0x1 +#define MODEL_waku 0x0 + diff --git a/include/mapfs/trd_00_hit.h b/include/mapfs/trd_00_hit.h index 5faaf00174..285cb538dd 100644 --- a/include/mapfs/trd_00_hit.h +++ b/include/mapfs/trd_00_hit.h @@ -1,32 +1,42 @@ -#define COLLIDER_Root 0x1F -#define COLLIDER_g9 0x1E -#define COLLIDER_tou 0x1D -#define COLLIDER_4_2 0x1C -#define COLLIDER_4 0x1B -#define COLLIDER_3 0x1A -#define COLLIDER_2 0x19 -#define COLLIDER_o112 0x18 -#define COLLIDER_1 0x17 -#define COLLIDER_ana 0x16 -#define COLLIDER_o83 0x15 -#define COLLIDER_tt5 0x14 -#define COLLIDER_deili5 0x13 -#define COLLIDER_deilit5 0x12 -#define COLLIDER_exitt 0x11 -#define COLLIDER_nt 0x10 -#define COLLIDER_deilit 0xF -#define COLLIDER_deilitt 0xE -#define COLLIDER_exit3 0xD -#define COLLIDER_o92 0xC -#define COLLIDER_tt3 0xB -#define COLLIDER_deili3 0xA -#define COLLIDER_deilit3 0x9 -#define COLLIDER_exit2 0x8 -#define COLLIDER_o87 0x7 -#define COLLIDER_tt2 0x6 -#define COLLIDER_deili2 0x5 -#define COLLIDER_deilit2 0x4 -#define COLLIDER_exit 0x3 -#define COLLIDER_o89 0x2 -#define COLLIDER_deiliw 0x1 -#define COLLIDER_deilitw 0x0 +#define COLLIDER_Root 0x1F +#define COLLIDER_g9 0x1E +#define COLLIDER_tou 0x1D +#define COLLIDER_4_2 0x1C +#define COLLIDER_4 0x1B +#define COLLIDER_3 0x1A +#define COLLIDER_2 0x19 +#define COLLIDER_o112 0x18 +#define COLLIDER_1 0x17 +#define COLLIDER_ana 0x16 +#define COLLIDER_o83 0x15 +#define COLLIDER_tt5 0x14 +#define COLLIDER_deili5 0x13 +#define COLLIDER_deilit5 0x12 +#define COLLIDER_exitt 0x11 +#define COLLIDER_nt 0x10 +#define COLLIDER_deilit 0xF +#define COLLIDER_deilitt 0xE +#define COLLIDER_exit3 0xD +#define COLLIDER_o92 0xC +#define COLLIDER_tt3 0xB +#define COLLIDER_deili3 0xA +#define COLLIDER_deilit3 0x9 +#define COLLIDER_exit2 0x8 +#define COLLIDER_o87 0x7 +#define COLLIDER_tt2 0x6 +#define COLLIDER_deili2 0x5 +#define COLLIDER_deilit2 0x4 +#define COLLIDER_exit 0x3 +#define COLLIDER_o89 0x2 +#define COLLIDER_deiliw 0x1 +#define COLLIDER_deilitw 0x0 + +#define ZONE_Root 0x7 +#define ZONE_frame 0x6 +#define ZONE_tou 0x5 +#define ZONE_yuka3 0x4 +#define ZONE_yuka2 0x3 +#define ZONE_yuka 0x2 +#define ZONE_k_ue 0x1 +#define ZONE_bero 0x0 + diff --git a/include/mapfs/trd_00_shape.h b/include/mapfs/trd_00_shape.h index 0616795cb7..d99b436a08 100644 --- a/include/mapfs/trd_00_shape.h +++ b/include/mapfs/trd_00_shape.h @@ -1,82 +1,83 @@ -#define MODEL_Root 0x51 -#define MODEL_g21 0x50 -#define MODEL_o95 0x4F -#define MODEL_o94 0x4E -#define MODEL_ana 0x4D -#define MODEL_hibi 0x4C -#define MODEL_an_kabe 0x4B -#define MODEL_doakabe 0x4A -#define MODEL_o75 0x49 -#define MODEL_g14 0x48 -#define MODEL_o70 0x47 -#define MODEL_g13 0x46 -#define MODEL_o69 0x45 -#define MODEL_doa2 0x44 -#define MODEL_o62 0x43 -#define MODEL_doa1 0x42 -#define MODEL_doa 0x41 -#define MODEL_hasi2 0x40 -#define MODEL_h2_waku 0x3F -#define MODEL_h2_ue 0x3E -#define MODEL_h2_kiwa 0x3D -#define MODEL_hasi 0x3C -#define MODEL_h_waku 0x3B -#define MODEL_h_ue 0x3A -#define MODEL_h_kiwa 0x39 -#define MODEL_saku 0x38 -#define MODEL_kusi 0x37 -#define MODEL_dai2 0x36 -#define MODEL_dai 0x35 -#define MODEL_kisi 0x34 -#define MODEL_k_waku 0x33 -#define MODEL_k_sita 0x32 -#define MODEL_k_kiwa 0x31 -#define MODEL_miti 0x30 -#define MODEL_k_ue 0x2F -#define MODEL_tou2 0x2E -#define MODEL_o105 0x2D -#define MODEL_o104 0x2C -#define MODEL_o103 0x2B -#define MODEL_o102 0x2A -#define MODEL_o108 0x29 -#define MODEL_o107 0x28 -#define MODEL_o100 0x27 -#define MODEL_tou 0x26 -#define MODEL_t_yuka 0x25 -#define MODEL_t_hasi 0x24 -#define MODEL_t_kusa 0x23 -#define MODEL_t_waku2 0x22 -#define MODEL_t_waku1 0x21 -#define MODEL_t_saku3 0x20 -#define MODEL_t_saku2 0x1F -#define MODEL_t_saku 0x1E -#define MODEL_g_ue 0x1D -#define MODEL_g_kiwa2 0x1C -#define MODEL_g_kiwa 0x1B -#define MODEL_trd 0x1A -#define MODEL_o_futa2 0x19 -#define MODEL_o_futa 0x18 -#define MODEL_o_doa 0x17 -#define MODEL_o_waku 0x16 -#define MODEL_o_yuka 0x15 -#define MODEL_waku2 0x14 -#define MODEL_waku 0x13 -#define MODEL_sita 0x12 -#define MODEL_mado 0x11 -#define MODEL_kabe 0x10 -#define MODEL_kiwa 0xF -#define MODEL_sima 0xE -#define MODEL_yuka3 0xD -#define MODEL_yuka2 0xC -#define MODEL_yuka 0xB -#define MODEL_frame 0xA -#define MODEL_bero3 0x9 -#define MODEL_bero2 0x8 -#define MODEL_bero 0x7 -#define MODEL_o1 0x6 -#define MODEL_g24 0x5 -#define MODEL_o125 0x4 -#define MODEL_o109 0x3 -#define MODEL_ue 0x2 -#define MODEL_mizu 0x1 -#define MODEL_soko 0x0 +#define MODEL_Root 0x51 +#define MODEL_g21 0x50 +#define MODEL_o95 0x4F +#define MODEL_o94 0x4E +#define MODEL_ana 0x4D +#define MODEL_hibi 0x4C +#define MODEL_an_kabe 0x4B +#define MODEL_doakabe 0x4A +#define MODEL_o75 0x49 +#define MODEL_g14 0x48 +#define MODEL_o70 0x47 +#define MODEL_g13 0x46 +#define MODEL_o69 0x45 +#define MODEL_doa2 0x44 +#define MODEL_o62 0x43 +#define MODEL_doa1 0x42 +#define MODEL_doa 0x41 +#define MODEL_hasi2 0x40 +#define MODEL_h2_waku 0x3F +#define MODEL_h2_ue 0x3E +#define MODEL_h2_kiwa 0x3D +#define MODEL_hasi 0x3C +#define MODEL_h_waku 0x3B +#define MODEL_h_ue 0x3A +#define MODEL_h_kiwa 0x39 +#define MODEL_saku 0x38 +#define MODEL_kusi 0x37 +#define MODEL_dai2 0x36 +#define MODEL_dai 0x35 +#define MODEL_kisi 0x34 +#define MODEL_k_waku 0x33 +#define MODEL_k_sita 0x32 +#define MODEL_k_kiwa 0x31 +#define MODEL_miti 0x30 +#define MODEL_k_ue 0x2F +#define MODEL_tou2 0x2E +#define MODEL_o105 0x2D +#define MODEL_o104 0x2C +#define MODEL_o103 0x2B +#define MODEL_o102 0x2A +#define MODEL_o108 0x29 +#define MODEL_o107 0x28 +#define MODEL_o100 0x27 +#define MODEL_tou 0x26 +#define MODEL_t_yuka 0x25 +#define MODEL_t_hasi 0x24 +#define MODEL_t_kusa 0x23 +#define MODEL_t_waku2 0x22 +#define MODEL_t_waku1 0x21 +#define MODEL_t_saku3 0x20 +#define MODEL_t_saku2 0x1F +#define MODEL_t_saku 0x1E +#define MODEL_g_ue 0x1D +#define MODEL_g_kiwa2 0x1C +#define MODEL_g_kiwa 0x1B +#define MODEL_trd 0x1A +#define MODEL_o_futa2 0x19 +#define MODEL_o_futa 0x18 +#define MODEL_o_doa 0x17 +#define MODEL_o_waku 0x16 +#define MODEL_o_yuka 0x15 +#define MODEL_waku2 0x14 +#define MODEL_waku 0x13 +#define MODEL_sita 0x12 +#define MODEL_mado 0x11 +#define MODEL_kabe 0x10 +#define MODEL_kiwa 0xF +#define MODEL_sima 0xE +#define MODEL_yuka3 0xD +#define MODEL_yuka2 0xC +#define MODEL_yuka 0xB +#define MODEL_frame 0xA +#define MODEL_bero3 0x9 +#define MODEL_bero2 0x8 +#define MODEL_bero 0x7 +#define MODEL_o1 0x6 +#define MODEL_g24 0x5 +#define MODEL_o125 0x4 +#define MODEL_o109 0x3 +#define MODEL_ue 0x2 +#define MODEL_mizu 0x1 +#define MODEL_soko 0x0 + diff --git a/include/mapfs/trd_01_hit.h b/include/mapfs/trd_01_hit.h index 6fec363438..e176a39453 100644 --- a/include/mapfs/trd_01_hit.h +++ b/include/mapfs/trd_01_hit.h @@ -1,30 +1,41 @@ -#define COLLIDER_Root 0x1D -#define COLLIDER_exit4 0x1C -#define COLLIDER_ne3 0x1B -#define COLLIDER_tte3 0x1A -#define COLLIDER_deilie3 0x19 -#define COLLIDER_deilite3 0x18 -#define COLLIDER_exit3 0x17 -#define COLLIDER_ne2 0x16 -#define COLLIDER_tte2 0x15 -#define COLLIDER_deilie2 0x14 -#define COLLIDER_deilite2 0x13 -#define COLLIDER_exit2 0x12 -#define COLLIDER_ne 0x11 -#define COLLIDER_tte 0x10 -#define COLLIDER_deilie 0xF -#define COLLIDER_deilite 0xE -#define COLLIDER_exitw 0xD -#define COLLIDER_nw 0xC -#define COLLIDER_ttw 0xB -#define COLLIDER_deiliw 0xA -#define COLLIDER_deilitw 0x9 -#define COLLIDER_kaidan 0x8 -#define COLLIDER_o158 0x7 -#define COLLIDER_o157 0x6 -#define COLLIDER_Default 0x5 -#define COLLIDER_hako 0x4 -#define COLLIDER_g25 0x3 -#define COLLIDER_o162 0x2 -#define COLLIDER_utikabe 0x1 -#define COLLIDER_kabe 0x0 +#define COLLIDER_Root 0x1D +#define COLLIDER_exit4 0x1C +#define COLLIDER_ne3 0x1B +#define COLLIDER_tte3 0x1A +#define COLLIDER_deilie3 0x19 +#define COLLIDER_deilite3 0x18 +#define COLLIDER_exit3 0x17 +#define COLLIDER_ne2 0x16 +#define COLLIDER_tte2 0x15 +#define COLLIDER_deilie2 0x14 +#define COLLIDER_deilite2 0x13 +#define COLLIDER_exit2 0x12 +#define COLLIDER_ne 0x11 +#define COLLIDER_tte 0x10 +#define COLLIDER_deilie 0xF +#define COLLIDER_deilite 0xE +#define COLLIDER_exitw 0xD +#define COLLIDER_nw 0xC +#define COLLIDER_ttw 0xB +#define COLLIDER_deiliw 0xA +#define COLLIDER_deilitw 0x9 +#define COLLIDER_kaidan 0x8 +#define COLLIDER_o158 0x7 +#define COLLIDER_o157 0x6 +#define COLLIDER_Default 0x5 +#define COLLIDER_hako 0x4 +#define COLLIDER_g25 0x3 +#define COLLIDER_o162 0x2 +#define COLLIDER_utikabe 0x1 +#define COLLIDER_kabe 0x0 + +#define ZONE_Root 0x8 +#define ZONE_exit2 0x7 +#define ZONE_deilie 0x6 +#define ZONE_g26 0x5 +#define ZONE_yuka2 0x4 +#define ZONE_Default 0x3 +#define ZONE_yuka 0x2 +#define ZONE_exitw 0x1 +#define ZONE_deiliw 0x0 + diff --git a/include/mapfs/trd_01_shape.h b/include/mapfs/trd_01_shape.h index 9e01fc85e4..c5735baf7a 100644 --- a/include/mapfs/trd_01_shape.h +++ b/include/mapfs/trd_01_shape.h @@ -1,59 +1,60 @@ -#define MODEL_Root 0x3A -#define MODEL_exit4 0x39 -#define MODEL_o100 0x38 -#define MODEL_o99 0x37 -#define MODEL_doa8 0x36 -#define MODEL_e4_doa2 0x35 -#define MODEL_doa7 0x34 -#define MODEL_e4_doa 0x33 -#define MODEL_exit3 0x32 -#define MODEL_o97 0x31 -#define MODEL_o96 0x30 -#define MODEL_doa6 0x2F -#define MODEL_e3_doa2 0x2E -#define MODEL_doa5 0x2D -#define MODEL_e3_doa 0x2C -#define MODEL_exit2 0x2B -#define MODEL_o88 0x2A -#define MODEL_o87 0x29 -#define MODEL_doa4 0x28 -#define MODEL_e2_doa2 0x27 -#define MODEL_doa3 0x26 -#define MODEL_e2_doa 0x25 -#define MODEL_exitw 0x24 -#define MODEL_deiliw 0x23 -#define MODEL_nw 0x22 -#define MODEL_doa2 0x21 -#define MODEL_ew_doa2 0x20 -#define MODEL_doa1 0x1F -#define MODEL_ew_doa 0x1E -#define MODEL_etc 0x1D -#define MODEL_saku3 0x1C -#define MODEL_saku2 0x1B -#define MODEL_kusari 0x1A -#define MODEL_saku 0x19 -#define MODEL_g34 0x18 -#define MODEL_o145 0x17 -#define MODEL_sui 0x16 -#define MODEL_sui2 0x15 -#define MODEL_sui1 0x14 -#define MODEL_suimenn 0x13 -#define MODEL_Default 0x12 -#define MODEL_m_saku 0x11 -#define MODEL_m_soko 0x10 -#define MODEL_suityu 0xF -#define MODEL_mado3 0xE -#define MODEL_mado2 0xD -#define MODEL_mado1 0xC -#define MODEL_hako 0xB -#define MODEL_m_kiwa 0xA -#define MODEL_soku 0x9 -#define MODEL_yuka 0x8 -#define MODEL_kabe 0x7 -#define MODEL_move_saku 0x6 -#define MODEL_o141 0x5 -#define MODEL_o134 0x4 -#define MODEL_kaidan 0x3 -#define MODEL_k_kusari 0x2 -#define MODEL_k_soku 0x1 -#define MODEL_dan 0x0 +#define MODEL_Root 0x3A +#define MODEL_exit4 0x39 +#define MODEL_o100 0x38 +#define MODEL_o99 0x37 +#define MODEL_doa8 0x36 +#define MODEL_e4_doa2 0x35 +#define MODEL_doa7 0x34 +#define MODEL_e4_doa 0x33 +#define MODEL_exit3 0x32 +#define MODEL_o97 0x31 +#define MODEL_o96 0x30 +#define MODEL_doa6 0x2F +#define MODEL_e3_doa2 0x2E +#define MODEL_doa5 0x2D +#define MODEL_e3_doa 0x2C +#define MODEL_exit2 0x2B +#define MODEL_o88 0x2A +#define MODEL_o87 0x29 +#define MODEL_doa4 0x28 +#define MODEL_e2_doa2 0x27 +#define MODEL_doa3 0x26 +#define MODEL_e2_doa 0x25 +#define MODEL_exitw 0x24 +#define MODEL_deiliw 0x23 +#define MODEL_nw 0x22 +#define MODEL_doa2 0x21 +#define MODEL_ew_doa2 0x20 +#define MODEL_doa1 0x1F +#define MODEL_ew_doa 0x1E +#define MODEL_etc 0x1D +#define MODEL_saku3 0x1C +#define MODEL_saku2 0x1B +#define MODEL_kusari 0x1A +#define MODEL_saku 0x19 +#define MODEL_g34 0x18 +#define MODEL_o145 0x17 +#define MODEL_sui 0x16 +#define MODEL_sui2 0x15 +#define MODEL_sui1 0x14 +#define MODEL_suimenn 0x13 +#define MODEL_Default 0x12 +#define MODEL_m_saku 0x11 +#define MODEL_m_soko 0x10 +#define MODEL_suityu 0xF +#define MODEL_mado3 0xE +#define MODEL_mado2 0xD +#define MODEL_mado1 0xC +#define MODEL_hako 0xB +#define MODEL_m_kiwa 0xA +#define MODEL_soku 0x9 +#define MODEL_yuka 0x8 +#define MODEL_kabe 0x7 +#define MODEL_move_saku 0x6 +#define MODEL_o141 0x5 +#define MODEL_o134 0x4 +#define MODEL_kaidan 0x3 +#define MODEL_k_kusari 0x2 +#define MODEL_k_soku 0x1 +#define MODEL_dan 0x0 + diff --git a/include/mapfs/trd_02_hit.h b/include/mapfs/trd_02_hit.h index 9cdab9ccb7..29a81ce791 100644 --- a/include/mapfs/trd_02_hit.h +++ b/include/mapfs/trd_02_hit.h @@ -1,35 +1,42 @@ -#define COLLIDER_Root 0x22 -#define COLLIDER_kaidan 0x21 -#define COLLIDER_o65 0x20 -#define COLLIDER_o55 0x1F -#define COLLIDER_o54 0x1E -#define COLLIDER_g1 0x1D -#define COLLIDER_dai 0x1C -#define COLLIDER_yuka 0x1B -#define COLLIDER_utiwaku 0x1A -#define COLLIDER_kabe 0x19 -#define COLLIDER_ana 0x18 -#define COLLIDER_na 0x17 -#define COLLIDER_tta 0x16 -#define COLLIDER_deilia 0x15 -#define COLLIDER_deilita 0x14 -#define COLLIDER_exitw2 0x13 -#define COLLIDER_nw2 0x12 -#define COLLIDER_ttw2 0x11 -#define COLLIDER_deiliw2 0x10 -#define COLLIDER_deilitw2 0xF -#define COLLIDER_exite2 0xE -#define COLLIDER_ne2 0xD -#define COLLIDER_tte2 0xC -#define COLLIDER_deilie2 0xB -#define COLLIDER_deilite2 0xA -#define COLLIDER_exite 0x9 -#define COLLIDER_o32 0x8 -#define COLLIDER_tte 0x7 -#define COLLIDER_deilie 0x6 -#define COLLIDER_deilite 0x5 -#define COLLIDER_exitw 0x4 -#define COLLIDER_nw 0x3 -#define COLLIDER_ttw 0x2 -#define COLLIDER_deiliw 0x1 -#define COLLIDER_deilitw 0x0 +#define COLLIDER_Root 0x22 +#define COLLIDER_kaidan 0x21 +#define COLLIDER_o65 0x20 +#define COLLIDER_o55 0x1F +#define COLLIDER_o54 0x1E +#define COLLIDER_g1 0x1D +#define COLLIDER_dai 0x1C +#define COLLIDER_yuka 0x1B +#define COLLIDER_utiwaku 0x1A +#define COLLIDER_kabe 0x19 +#define COLLIDER_ana 0x18 +#define COLLIDER_na 0x17 +#define COLLIDER_tta 0x16 +#define COLLIDER_deilia 0x15 +#define COLLIDER_deilita 0x14 +#define COLLIDER_exitw2 0x13 +#define COLLIDER_nw2 0x12 +#define COLLIDER_ttw2 0x11 +#define COLLIDER_deiliw2 0x10 +#define COLLIDER_deilitw2 0xF +#define COLLIDER_exite2 0xE +#define COLLIDER_ne2 0xD +#define COLLIDER_tte2 0xC +#define COLLIDER_deilie2 0xB +#define COLLIDER_deilite2 0xA +#define COLLIDER_exite 0x9 +#define COLLIDER_o32 0x8 +#define COLLIDER_tte 0x7 +#define COLLIDER_deilie 0x6 +#define COLLIDER_deilite 0x5 +#define COLLIDER_exitw 0x4 +#define COLLIDER_nw 0x3 +#define COLLIDER_ttw 0x2 +#define COLLIDER_deiliw 0x1 +#define COLLIDER_deilitw 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g17 0x3 +#define ZONE_3 0x2 +#define ZONE_2 0x1 +#define ZONE_1 0x0 + diff --git a/include/mapfs/trd_02_shape.h b/include/mapfs/trd_02_shape.h index 19eae98b5e..0599e210db 100644 --- a/include/mapfs/trd_02_shape.h +++ b/include/mapfs/trd_02_shape.h @@ -1,42 +1,43 @@ -#define MODEL_Root 0x29 -#define MODEL_doa8 0x28 -#define MODEL_o12 0x27 -#define MODEL_doa7 0x26 -#define MODEL_o13 0x25 -#define MODEL_doa6 0x24 -#define MODEL_o11 0x23 -#define MODEL_doa5 0x22 -#define MODEL_o10 0x21 -#define MODEL_doa4 0x20 -#define MODEL_o9 0x1F -#define MODEL_doa3 0x1E -#define MODEL_o8 0x1D -#define MODEL_doa2 0x1C -#define MODEL_o7 0x1B -#define MODEL_doa1 0x1A -#define MODEL_o6 0x19 -#define MODEL_kaidan 0x18 -#define MODEL_kusari 0x17 -#define MODEL_dan 0x16 -#define MODEL_k_soku 0x15 -#define MODEL_ana 0x14 -#define MODEL_g14 0x13 -#define MODEL_hibi 0x12 -#define MODEL_futa 0x11 -#define MODEL_oku 0x10 -#define MODEL_anaaki 0xF -#define MODEL_g1 0xE -#define MODEL_hikari 0xD -#define MODEL_mado 0xC -#define MODEL_kabe 0xB -#define MODEL_move_saku 0xA -#define MODEL_o32 0x9 -#define MODEL_g2 0x8 -#define MODEL_saku3 0x7 -#define MODEL_saku2 0x6 -#define MODEL_saku 0x5 -#define MODEL_yuka1 0x4 -#define MODEL_bero2 0x3 -#define MODEL_bero 0x2 -#define MODEL_f2_soku 0x1 -#define MODEL_dai 0x0 +#define MODEL_Root 0x29 +#define MODEL_doa8 0x28 +#define MODEL_o12 0x27 +#define MODEL_doa7 0x26 +#define MODEL_o13 0x25 +#define MODEL_doa6 0x24 +#define MODEL_o11 0x23 +#define MODEL_doa5 0x22 +#define MODEL_o10 0x21 +#define MODEL_doa4 0x20 +#define MODEL_o9 0x1F +#define MODEL_doa3 0x1E +#define MODEL_o8 0x1D +#define MODEL_doa2 0x1C +#define MODEL_o7 0x1B +#define MODEL_doa1 0x1A +#define MODEL_o6 0x19 +#define MODEL_kaidan 0x18 +#define MODEL_kusari 0x17 +#define MODEL_dan 0x16 +#define MODEL_k_soku 0x15 +#define MODEL_ana 0x14 +#define MODEL_g14 0x13 +#define MODEL_hibi 0x12 +#define MODEL_futa 0x11 +#define MODEL_oku 0x10 +#define MODEL_anaaki 0xF +#define MODEL_g1 0xE +#define MODEL_hikari 0xD +#define MODEL_mado 0xC +#define MODEL_kabe 0xB +#define MODEL_move_saku 0xA +#define MODEL_o32 0x9 +#define MODEL_g2 0x8 +#define MODEL_saku3 0x7 +#define MODEL_saku2 0x6 +#define MODEL_saku 0x5 +#define MODEL_yuka1 0x4 +#define MODEL_bero2 0x3 +#define MODEL_bero 0x2 +#define MODEL_f2_soku 0x1 +#define MODEL_dai 0x0 + diff --git a/include/mapfs/trd_03_hit.h b/include/mapfs/trd_03_hit.h index 7571e473a5..f281195f2f 100644 --- a/include/mapfs/trd_03_hit.h +++ b/include/mapfs/trd_03_hit.h @@ -1,62 +1,71 @@ -#define COLLIDER_Root 0x3D -#define COLLIDER_g1 0x3C -#define COLLIDER_o75 0x3B -#define COLLIDER_o74 0x3A -#define COLLIDER_o73 0x39 -#define COLLIDER_ori3 0x38 -#define COLLIDER_ori2 0x37 -#define COLLIDER_ori1 0x36 -#define COLLIDER_4 0x35 -#define COLLIDER_3 0x34 -#define COLLIDER_2 0x33 -#define COLLIDER_1 0x32 -#define COLLIDER_g2 0x31 -#define COLLIDER_rou3 0x30 -#define COLLIDER_rou2 0x2F -#define COLLIDER_rou 0x2E -#define COLLIDER_kabe3 0x2D -#define COLLIDER_kabe2 0x2C -#define COLLIDER_kabe 0x2B -#define COLLIDER_kaidan 0x2A -#define COLLIDER_yuka3 0x29 -#define COLLIDER_yuka2 0x28 -#define COLLIDER_yuka 0x27 -#define COLLIDER_sukim2 0x26 -#define COLLIDER_o85 0x25 -#define COLLIDER_sukim1 0x24 -#define COLLIDER_o84 0x23 -#define COLLIDER_ana3 0x22 -#define COLLIDER_n3 0x21 -#define COLLIDER_tt3 0x20 -#define COLLIDER_deili3 0x1F -#define COLLIDER_deilit3 0x1E -#define COLLIDER_ana2 0x1D -#define COLLIDER_n2 0x1C -#define COLLIDER_tt2 0x1B -#define COLLIDER_deili2 0x1A -#define COLLIDER_deilit2 0x19 -#define COLLIDER_ana1 0x18 -#define COLLIDER_n1 0x17 -#define COLLIDER_tt1 0x16 -#define COLLIDER_deili1 0x15 -#define COLLIDER_deilit1 0x14 -#define COLLIDER_exit4 0x13 -#define COLLIDER_nwo 0x12 -#define COLLIDER_ttwo 0x11 -#define COLLIDER_deiliwo 0x10 -#define COLLIDER_deilitwo 0xF -#define COLLIDER_exit3 0xE -#define COLLIDER_neo 0xD -#define COLLIDER_tteo 0xC -#define COLLIDER_deilieo 0xB -#define COLLIDER_deiliteo 0xA -#define COLLIDER_exit2 0x9 -#define COLLIDER_ne 0x8 -#define COLLIDER_tte 0x7 -#define COLLIDER_deilie 0x6 -#define COLLIDER_deilite 0x5 -#define COLLIDER_exit1 0x4 -#define COLLIDER_nw 0x3 -#define COLLIDER_ttw 0x2 -#define COLLIDER_deiliw 0x1 -#define COLLIDER_deilitw 0x0 +#define COLLIDER_Root 0x3D +#define COLLIDER_g1 0x3C +#define COLLIDER_o75 0x3B +#define COLLIDER_o74 0x3A +#define COLLIDER_o73 0x39 +#define COLLIDER_ori3 0x38 +#define COLLIDER_ori2 0x37 +#define COLLIDER_ori1 0x36 +#define COLLIDER_4 0x35 +#define COLLIDER_3 0x34 +#define COLLIDER_2 0x33 +#define COLLIDER_1 0x32 +#define COLLIDER_g2 0x31 +#define COLLIDER_rou3 0x30 +#define COLLIDER_rou2 0x2F +#define COLLIDER_rou 0x2E +#define COLLIDER_kabe3 0x2D +#define COLLIDER_kabe2 0x2C +#define COLLIDER_kabe 0x2B +#define COLLIDER_kaidan 0x2A +#define COLLIDER_yuka3 0x29 +#define COLLIDER_yuka2 0x28 +#define COLLIDER_yuka 0x27 +#define COLLIDER_sukim2 0x26 +#define COLLIDER_o85 0x25 +#define COLLIDER_sukim1 0x24 +#define COLLIDER_o84 0x23 +#define COLLIDER_ana3 0x22 +#define COLLIDER_n3 0x21 +#define COLLIDER_tt3 0x20 +#define COLLIDER_deili3 0x1F +#define COLLIDER_deilit3 0x1E +#define COLLIDER_ana2 0x1D +#define COLLIDER_n2 0x1C +#define COLLIDER_tt2 0x1B +#define COLLIDER_deili2 0x1A +#define COLLIDER_deilit2 0x19 +#define COLLIDER_ana1 0x18 +#define COLLIDER_n1 0x17 +#define COLLIDER_tt1 0x16 +#define COLLIDER_deili1 0x15 +#define COLLIDER_deilit1 0x14 +#define COLLIDER_exit4 0x13 +#define COLLIDER_nwo 0x12 +#define COLLIDER_ttwo 0x11 +#define COLLIDER_deiliwo 0x10 +#define COLLIDER_deilitwo 0xF +#define COLLIDER_exit3 0xE +#define COLLIDER_neo 0xD +#define COLLIDER_tteo 0xC +#define COLLIDER_deilieo 0xB +#define COLLIDER_deiliteo 0xA +#define COLLIDER_exit2 0x9 +#define COLLIDER_ne 0x8 +#define COLLIDER_tte 0x7 +#define COLLIDER_deilie 0x6 +#define COLLIDER_deilite 0x5 +#define COLLIDER_exit1 0x4 +#define COLLIDER_nw 0x3 +#define COLLIDER_ttw 0x2 +#define COLLIDER_deiliw 0x1 +#define COLLIDER_deilitw 0x0 + +#define ZONE_Root 0x6 +#define ZONE_f2 0x5 +#define ZONE_yuka2 0x4 +#define ZONE_f1 0x3 +#define ZONE_yuka 0x2 +#define ZONE_exite 0x1 +#define ZONE_exitw 0x0 + diff --git a/include/mapfs/trd_03_shape.h b/include/mapfs/trd_03_shape.h index c91554397c..ed05ceb35d 100644 --- a/include/mapfs/trd_03_shape.h +++ b/include/mapfs/trd_03_shape.h @@ -1,68 +1,69 @@ -#define MODEL_Root 0x43 -#define MODEL_g21 0x42 -#define MODEL_o37 0x41 -#define MODEL_g20 0x40 -#define MODEL_o36 0x3F -#define MODEL_g19 0x3E -#define MODEL_o35 0x3D -#define MODEL_g18 0x3C -#define MODEL_o34 0x3B -#define MODEL_g17 0x3A -#define MODEL_o33 0x39 -#define MODEL_g16 0x38 -#define MODEL_o32 0x37 -#define MODEL_g15 0x36 -#define MODEL_o31 0x35 -#define MODEL_g14 0x34 -#define MODEL_d4 0x33 -#define MODEL_g13 0x32 -#define MODEL_d3 0x31 -#define MODEL_g12 0x30 -#define MODEL_d2 0x2F -#define MODEL_g5 0x2E -#define MODEL_d1 0x2D -#define MODEL_kesumo 0x2C -#define MODEL_ana3 0x2B -#define MODEL_k_ana3 0x2A -#define MODEL_k_k3 0x29 -#define MODEL_ana2 0x28 -#define MODEL_k_ana2 0x27 -#define MODEL_k_k2 0x26 -#define MODEL_ana1 0x25 -#define MODEL_k_ana1 0x24 -#define MODEL_k_k1 0x23 -#define MODEL_nk 0x22 -#define MODEL_nk3 0x21 -#define MODEL_nk2 0x20 -#define MODEL_hibi 0x1F -#define MODEL_nk1 0x1E -#define MODEL_oku 0x1D -#define MODEL_oku3 0x1C -#define MODEL_oku2 0x1B -#define MODEL_oku1 0x1A -#define MODEL_Default 0x19 -#define MODEL_mado 0x18 -#define MODEL_hikari 0x17 -#define MODEL_kusari 0x16 -#define MODEL_g1 0x15 -#define MODEL_7 0x14 -#define MODEL_6 0x13 -#define MODEL_5 0x12 -#define MODEL_4 0x11 -#define MODEL_3 0x10 -#define MODEL_2 0xF -#define MODEL_1 0xE -#define MODEL_g2 0xD -#define MODEL_0ri 0xC -#define MODEL_dai2 0xB -#define MODEL_dai1 0xA -#define MODEL_rou3 0x9 -#define MODEL_rou2 0x8 -#define MODEL_rou1 0x7 -#define MODEL_kabe 0x6 -#define MODEL_kaiw2 0x5 -#define MODEL_kaie 0x4 -#define MODEL_kaiw 0x3 -#define MODEL_yuka2 0x2 -#define MODEL_yuka1 0x1 -#define MODEL_bero 0x0 +#define MODEL_Root 0x43 +#define MODEL_g21 0x42 +#define MODEL_o37 0x41 +#define MODEL_g20 0x40 +#define MODEL_o36 0x3F +#define MODEL_g19 0x3E +#define MODEL_o35 0x3D +#define MODEL_g18 0x3C +#define MODEL_o34 0x3B +#define MODEL_g17 0x3A +#define MODEL_o33 0x39 +#define MODEL_g16 0x38 +#define MODEL_o32 0x37 +#define MODEL_g15 0x36 +#define MODEL_o31 0x35 +#define MODEL_g14 0x34 +#define MODEL_d4 0x33 +#define MODEL_g13 0x32 +#define MODEL_d3 0x31 +#define MODEL_g12 0x30 +#define MODEL_d2 0x2F +#define MODEL_g5 0x2E +#define MODEL_d1 0x2D +#define MODEL_kesumo 0x2C +#define MODEL_ana3 0x2B +#define MODEL_k_ana3 0x2A +#define MODEL_k_k3 0x29 +#define MODEL_ana2 0x28 +#define MODEL_k_ana2 0x27 +#define MODEL_k_k2 0x26 +#define MODEL_ana1 0x25 +#define MODEL_k_ana1 0x24 +#define MODEL_k_k1 0x23 +#define MODEL_nk 0x22 +#define MODEL_nk3 0x21 +#define MODEL_nk2 0x20 +#define MODEL_hibi 0x1F +#define MODEL_nk1 0x1E +#define MODEL_oku 0x1D +#define MODEL_oku3 0x1C +#define MODEL_oku2 0x1B +#define MODEL_oku1 0x1A +#define MODEL_Default 0x19 +#define MODEL_mado 0x18 +#define MODEL_hikari 0x17 +#define MODEL_kusari 0x16 +#define MODEL_g1 0x15 +#define MODEL_7 0x14 +#define MODEL_6 0x13 +#define MODEL_5 0x12 +#define MODEL_4 0x11 +#define MODEL_3 0x10 +#define MODEL_2 0xF +#define MODEL_1 0xE +#define MODEL_g2 0xD +#define MODEL_0ri 0xC +#define MODEL_dai2 0xB +#define MODEL_dai1 0xA +#define MODEL_rou3 0x9 +#define MODEL_rou2 0x8 +#define MODEL_rou1 0x7 +#define MODEL_kabe 0x6 +#define MODEL_kaiw2 0x5 +#define MODEL_kaie 0x4 +#define MODEL_kaiw 0x3 +#define MODEL_yuka2 0x2 +#define MODEL_yuka1 0x1 +#define MODEL_bero 0x0 + diff --git a/include/mapfs/trd_04_hit.h b/include/mapfs/trd_04_hit.h index 16d5bfcf3a..6f0570d390 100644 --- a/include/mapfs/trd_04_hit.h +++ b/include/mapfs/trd_04_hit.h @@ -1,44 +1,51 @@ -#define COLLIDER_Root 0x2B -#define COLLIDER_g25 0x2A -#define COLLIDER_o87 0x29 -#define COLLIDER_o86 0x28 -#define COLLIDER_kaidan 0x27 -#define COLLIDER_o101 0x26 -#define COLLIDER_k_soku 0x25 -#define COLLIDER_g1 0x24 -#define COLLIDER_o155 0x23 -#define COLLIDER_utiwaku 0x22 -#define COLLIDER_kabe 0x21 -#define COLLIDER_g2 0x20 -#define COLLIDER_yuka1 0x1F -#define COLLIDER_dai 0x1E -#define COLLIDER_exite3 0x1D -#define COLLIDER_ne3 0x1C -#define COLLIDER_tte3 0x1B -#define COLLIDER_deilie3 0x1A -#define COLLIDER_deilite3 0x19 -#define COLLIDER_exitw3 0x18 -#define COLLIDER_nw3 0x17 -#define COLLIDER_ttw3 0x16 -#define COLLIDER_deiliw3 0x15 -#define COLLIDER_deilitw3 0x14 -#define COLLIDER_exite2 0x13 -#define COLLIDER_ne2 0x12 -#define COLLIDER_tte2 0x11 -#define COLLIDER_deilie2 0x10 -#define COLLIDER_deilite2 0xF -#define COLLIDER_exitw2 0xE -#define COLLIDER_nw2 0xD -#define COLLIDER_ttw2 0xC -#define COLLIDER_deiliw2 0xB -#define COLLIDER_deilitw2 0xA -#define COLLIDER_exite1 0x9 -#define COLLIDER_ne 0x8 -#define COLLIDER_tte 0x7 -#define COLLIDER_deilie 0x6 -#define COLLIDER_deilite 0x5 -#define COLLIDER_exitw1 0x4 -#define COLLIDER_nw 0x3 -#define COLLIDER_ttw 0x2 -#define COLLIDER_deiliw 0x1 -#define COLLIDER_deilitw 0x0 +#define COLLIDER_Root 0x2B +#define COLLIDER_g25 0x2A +#define COLLIDER_o87 0x29 +#define COLLIDER_o86 0x28 +#define COLLIDER_kaidan 0x27 +#define COLLIDER_o101 0x26 +#define COLLIDER_k_soku 0x25 +#define COLLIDER_g1 0x24 +#define COLLIDER_o155 0x23 +#define COLLIDER_utiwaku 0x22 +#define COLLIDER_kabe 0x21 +#define COLLIDER_g2 0x20 +#define COLLIDER_yuka1 0x1F +#define COLLIDER_dai 0x1E +#define COLLIDER_exite3 0x1D +#define COLLIDER_ne3 0x1C +#define COLLIDER_tte3 0x1B +#define COLLIDER_deilie3 0x1A +#define COLLIDER_deilite3 0x19 +#define COLLIDER_exitw3 0x18 +#define COLLIDER_nw3 0x17 +#define COLLIDER_ttw3 0x16 +#define COLLIDER_deiliw3 0x15 +#define COLLIDER_deilitw3 0x14 +#define COLLIDER_exite2 0x13 +#define COLLIDER_ne2 0x12 +#define COLLIDER_tte2 0x11 +#define COLLIDER_deilie2 0x10 +#define COLLIDER_deilite2 0xF +#define COLLIDER_exitw2 0xE +#define COLLIDER_nw2 0xD +#define COLLIDER_ttw2 0xC +#define COLLIDER_deiliw2 0xB +#define COLLIDER_deilitw2 0xA +#define COLLIDER_exite1 0x9 +#define COLLIDER_ne 0x8 +#define COLLIDER_tte 0x7 +#define COLLIDER_deilie 0x6 +#define COLLIDER_deilite 0x5 +#define COLLIDER_exitw1 0x4 +#define COLLIDER_nw 0x3 +#define COLLIDER_ttw 0x2 +#define COLLIDER_deiliw 0x1 +#define COLLIDER_deilitw 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g24 0x3 +#define ZONE_o58 0x2 +#define ZONE_o57 0x1 +#define ZONE_o56 0x0 + diff --git a/include/mapfs/trd_04_shape.h b/include/mapfs/trd_04_shape.h index 053ad9de48..dbea6497a0 100644 --- a/include/mapfs/trd_04_shape.h +++ b/include/mapfs/trd_04_shape.h @@ -1,43 +1,44 @@ -#define MODEL_Root 0x2A -#define MODEL_ori 0x29 -#define MODEL_o34 0x28 -#define MODEL_doa12 0x27 -#define MODEL_o29 0x26 -#define MODEL_doa11 0x25 -#define MODEL_o28 0x24 -#define MODEL_doa8 0x23 -#define MODEL_o12 0x22 -#define MODEL_doa7 0x21 -#define MODEL_o13 0x20 -#define MODEL_doa6 0x1F -#define MODEL_o11 0x1E -#define MODEL_doa5 0x1D -#define MODEL_o10 0x1C -#define MODEL_doa4 0x1B -#define MODEL_o9 0x1A -#define MODEL_doa3 0x19 -#define MODEL_o8 0x18 -#define MODEL_doa2 0x17 -#define MODEL_o7 0x16 -#define MODEL_doa1 0x15 -#define MODEL_o6 0x14 -#define MODEL_kaidan 0x13 -#define MODEL_k_kusari 0x12 -#define MODEL_k_dan 0x11 -#define MODEL_k_sokumen 0x10 -#define MODEL_g1 0xF -#define MODEL_hikari 0xE -#define MODEL_mado 0xD -#define MODEL_kabe 0xC -#define MODEL_g2 0xB -#define MODEL_saku3 0xA -#define MODEL_saku2 0x9 -#define MODEL_saku 0x8 -#define MODEL_suimen 0x7 -#define MODEL_kiwa 0x6 -#define MODEL_suityuu 0x5 -#define MODEL_yuka1 0x4 -#define MODEL_bero2 0x3 -#define MODEL_bero 0x2 -#define MODEL_f2_soku 0x1 -#define MODEL_dai 0x0 +#define MODEL_Root 0x2A +#define MODEL_ori 0x29 +#define MODEL_o34 0x28 +#define MODEL_doa12 0x27 +#define MODEL_o29 0x26 +#define MODEL_doa11 0x25 +#define MODEL_o28 0x24 +#define MODEL_doa8 0x23 +#define MODEL_o12 0x22 +#define MODEL_doa7 0x21 +#define MODEL_o13 0x20 +#define MODEL_doa6 0x1F +#define MODEL_o11 0x1E +#define MODEL_doa5 0x1D +#define MODEL_o10 0x1C +#define MODEL_doa4 0x1B +#define MODEL_o9 0x1A +#define MODEL_doa3 0x19 +#define MODEL_o8 0x18 +#define MODEL_doa2 0x17 +#define MODEL_o7 0x16 +#define MODEL_doa1 0x15 +#define MODEL_o6 0x14 +#define MODEL_kaidan 0x13 +#define MODEL_k_kusari 0x12 +#define MODEL_k_dan 0x11 +#define MODEL_k_sokumen 0x10 +#define MODEL_g1 0xF +#define MODEL_hikari 0xE +#define MODEL_mado 0xD +#define MODEL_kabe 0xC +#define MODEL_g2 0xB +#define MODEL_saku3 0xA +#define MODEL_saku2 0x9 +#define MODEL_saku 0x8 +#define MODEL_suimen 0x7 +#define MODEL_kiwa 0x6 +#define MODEL_suityuu 0x5 +#define MODEL_yuka1 0x4 +#define MODEL_bero2 0x3 +#define MODEL_bero 0x2 +#define MODEL_f2_soku 0x1 +#define MODEL_dai 0x0 + diff --git a/include/mapfs/trd_05_hit.h b/include/mapfs/trd_05_hit.h index 420ad226f8..ab284f9c4b 100644 --- a/include/mapfs/trd_05_hit.h +++ b/include/mapfs/trd_05_hit.h @@ -1,29 +1,40 @@ -#define COLLIDER_Root 0x1C -#define COLLIDER_g14 0x1B -#define COLLIDER_sikake 0x1A -#define COLLIDER_o103 0x19 -#define COLLIDER_o82 0x18 -#define COLLIDER_yuka 0x17 -#define COLLIDER_sotokabe 0x16 -#define COLLIDER_utikabe 0x15 -#define COLLIDER_ana 0x14 -#define COLLIDER_tte 0x13 -#define COLLIDER_ne 0x12 -#define COLLIDER_deilie 0x11 -#define COLLIDER_deilite 0x10 -#define COLLIDER_kesukabe 0xF -#define COLLIDER_exit3 0xE -#define COLLIDER_nw2 0xD -#define COLLIDER_ttw2 0xC -#define COLLIDER_deiliw2 0xB -#define COLLIDER_deilitw2 0xA -#define COLLIDER_exit2 0x9 -#define COLLIDER_nse 0x8 -#define COLLIDER_ttse 0x7 -#define COLLIDER_deilise 0x6 -#define COLLIDER_deilitse 0x5 -#define COLLIDER_exit1 0x4 -#define COLLIDER_nw 0x3 -#define COLLIDER_ttw 0x2 -#define COLLIDER_deiliw 0x1 -#define COLLIDER_deilitw 0x0 +#define COLLIDER_Root 0x1C +#define COLLIDER_g14 0x1B +#define COLLIDER_sikake 0x1A +#define COLLIDER_o103 0x19 +#define COLLIDER_o82 0x18 +#define COLLIDER_yuka 0x17 +#define COLLIDER_sotokabe 0x16 +#define COLLIDER_utikabe 0x15 +#define COLLIDER_ana 0x14 +#define COLLIDER_tte 0x13 +#define COLLIDER_ne 0x12 +#define COLLIDER_deilie 0x11 +#define COLLIDER_deilite 0x10 +#define COLLIDER_kesukabe 0xF +#define COLLIDER_exit3 0xE +#define COLLIDER_nw2 0xD +#define COLLIDER_ttw2 0xC +#define COLLIDER_deiliw2 0xB +#define COLLIDER_deilitw2 0xA +#define COLLIDER_exit2 0x9 +#define COLLIDER_nse 0x8 +#define COLLIDER_ttse 0x7 +#define COLLIDER_deilise 0x6 +#define COLLIDER_deilitse 0x5 +#define COLLIDER_exit1 0x4 +#define COLLIDER_nw 0x3 +#define COLLIDER_ttw 0x2 +#define COLLIDER_deiliw 0x1 +#define COLLIDER_deilitw 0x0 + +#define ZONE_Root 0x8 +#define ZONE_exit2 0x7 +#define ZONE_deilie 0x6 +#define ZONE_g26 0x5 +#define ZONE_yuka2 0x4 +#define ZONE_Default 0x3 +#define ZONE_yuka 0x2 +#define ZONE_exitw 0x1 +#define ZONE_deiliw 0x0 + diff --git a/include/mapfs/trd_05_shape.h b/include/mapfs/trd_05_shape.h index e41ff7e3a6..4525e5cc10 100644 --- a/include/mapfs/trd_05_shape.h +++ b/include/mapfs/trd_05_shape.h @@ -1,61 +1,62 @@ -#define MODEL_Root 0x3C -#define MODEL_sikake2 0x3B -#define MODEL_o96 0x3A -#define MODEL_sikake1 0x39 -#define MODEL_o95 0x38 -#define MODEL_doa 0x37 -#define MODEL_6 0x36 -#define MODEL_doa8 0x35 -#define MODEL_5 0x34 -#define MODEL_doa7 0x33 -#define MODEL_4 0x32 -#define MODEL_doa6 0x31 -#define MODEL_doa5 0x30 -#define MODEL_3 0x2F -#define MODEL_doa4 0x2E -#define MODEL_doa3 0x2D -#define MODEL_2 0x2C -#define MODEL_doa2 0x2B -#define MODEL_1 0x2A -#define MODEL_doa1 0x29 -#define MODEL_g10 0x28 -#define MODEL_suimen 0x27 -#define MODEL_suityuu 0x26 -#define MODEL_t_soku 0x25 -#define MODEL_t_kabe 0x24 -#define MODEL_g18 0x23 -#define MODEL_kusari2 0x22 -#define MODEL_g17 0x21 -#define MODEL_kusari1 0x20 -#define MODEL_ana3 0x1F -#define MODEL_hibi 0x1E -#define MODEL_futa 0x1D -#define MODEL_ana2 0x1C -#define MODEL_oku 0x1B -#define MODEL_anakabe 0x1A -#define MODEL_exitw2 0x19 -#define MODEL_deiliw2 0x18 -#define MODEL_nw2 0x17 -#define MODEL_exitse 0x16 -#define MODEL_deilise 0x15 -#define MODEL_exitw 0x14 -#define MODEL_deiliw 0x13 -#define MODEL_nw 0x12 -#define MODEL_etc 0x11 -#define MODEL_saku4 0x10 -#define MODEL_kusari5 0xF -#define MODEL_kusari4 0xE -#define MODEL_kusari3 0xD -#define MODEL_saku3 0xC -#define MODEL_saku2 0xB -#define MODEL_saku 0xA -#define MODEL_Default 0x9 -#define MODEL_mado3 0x8 -#define MODEL_mado2 0x7 -#define MODEL_mado1 0x6 -#define MODEL_kesu 0x5 -#define MODEL_o103 0x4 -#define MODEL_o101 0x3 -#define MODEL_soku 0x2 -#define MODEL_yuka 0x1 -#define MODEL_kabe 0x0 +#define MODEL_Root 0x3C +#define MODEL_sikake2 0x3B +#define MODEL_o96 0x3A +#define MODEL_sikake1 0x39 +#define MODEL_o95 0x38 +#define MODEL_doa 0x37 +#define MODEL_6 0x36 +#define MODEL_doa8 0x35 +#define MODEL_5 0x34 +#define MODEL_doa7 0x33 +#define MODEL_4 0x32 +#define MODEL_doa6 0x31 +#define MODEL_doa5 0x30 +#define MODEL_3 0x2F +#define MODEL_doa4 0x2E +#define MODEL_doa3 0x2D +#define MODEL_2 0x2C +#define MODEL_doa2 0x2B +#define MODEL_1 0x2A +#define MODEL_doa1 0x29 +#define MODEL_g10 0x28 +#define MODEL_suimen 0x27 +#define MODEL_suityuu 0x26 +#define MODEL_t_soku 0x25 +#define MODEL_t_kabe 0x24 +#define MODEL_g18 0x23 +#define MODEL_kusari2 0x22 +#define MODEL_g17 0x21 +#define MODEL_kusari1 0x20 +#define MODEL_ana3 0x1F +#define MODEL_hibi 0x1E +#define MODEL_futa 0x1D +#define MODEL_ana2 0x1C +#define MODEL_oku 0x1B +#define MODEL_anakabe 0x1A +#define MODEL_exitw2 0x19 +#define MODEL_deiliw2 0x18 +#define MODEL_nw2 0x17 +#define MODEL_exitse 0x16 +#define MODEL_deilise 0x15 +#define MODEL_exitw 0x14 +#define MODEL_deiliw 0x13 +#define MODEL_nw 0x12 +#define MODEL_etc 0x11 +#define MODEL_saku4 0x10 +#define MODEL_kusari5 0xF +#define MODEL_kusari4 0xE +#define MODEL_kusari3 0xD +#define MODEL_saku3 0xC +#define MODEL_saku2 0xB +#define MODEL_saku 0xA +#define MODEL_Default 0x9 +#define MODEL_mado3 0x8 +#define MODEL_mado2 0x7 +#define MODEL_mado1 0x6 +#define MODEL_kesu 0x5 +#define MODEL_o103 0x4 +#define MODEL_o101 0x3 +#define MODEL_soku 0x2 +#define MODEL_yuka 0x1 +#define MODEL_kabe 0x0 + diff --git a/include/mapfs/trd_06_hit.h b/include/mapfs/trd_06_hit.h index 6671f58b92..69cf2b82e6 100644 --- a/include/mapfs/trd_06_hit.h +++ b/include/mapfs/trd_06_hit.h @@ -1,17 +1,28 @@ -#define COLLIDER_Root 0x10 -#define COLLIDER_g21 0xF -#define COLLIDER_o109 0xE -#define COLLIDER_ana 0xD -#define COLLIDER_nse 0xC -#define COLLIDER_ttse 0xB -#define COLLIDER_deilise 0xA -#define COLLIDER_deilitse 0x9 -#define COLLIDER_exitw 0x8 -#define COLLIDER_nw 0x7 -#define COLLIDER_ttw 0x6 -#define COLLIDER_deiliw 0x5 -#define COLLIDER_deilitw 0x4 -#define COLLIDER_g10 0x3 -#define COLLIDER_yuka 0x2 -#define COLLIDER_rou 0x1 -#define COLLIDER_t_kabe 0x0 +#define COLLIDER_Root 0x10 +#define COLLIDER_g21 0xF +#define COLLIDER_o109 0xE +#define COLLIDER_ana 0xD +#define COLLIDER_nse 0xC +#define COLLIDER_ttse 0xB +#define COLLIDER_deilise 0xA +#define COLLIDER_deilitse 0x9 +#define COLLIDER_exitw 0x8 +#define COLLIDER_nw 0x7 +#define COLLIDER_ttw 0x6 +#define COLLIDER_deiliw 0x5 +#define COLLIDER_deilitw 0x4 +#define COLLIDER_g10 0x3 +#define COLLIDER_yuka 0x2 +#define COLLIDER_rou 0x1 +#define COLLIDER_t_kabe 0x0 + +#define ZONE_Root 0x8 +#define ZONE_g18 0x7 +#define ZONE_g21 0x6 +#define ZONE_o93 0x5 +#define ZONE_exite 0x4 +#define ZONE_o91 0x3 +#define ZONE_exitw 0x2 +#define ZONE_o95 0x1 +#define ZONE_yuka2 0x0 + diff --git a/include/mapfs/trd_06_shape.h b/include/mapfs/trd_06_shape.h index 2502597374..dbc2f93d6f 100644 --- a/include/mapfs/trd_06_shape.h +++ b/include/mapfs/trd_06_shape.h @@ -1,66 +1,67 @@ -#define MODEL_Root 0x41 -#define MODEL_g27 0x40 -#define MODEL_g36 0x3F -#define MODEL_o127 0x3E -#define MODEL_g35 0x3D -#define MODEL_o126 0x3C -#define MODEL_g34 0x3B -#define MODEL_o125 0x3A -#define MODEL_o124 0x39 -#define MODEL_o123 0x38 -#define MODEL_g33 0x37 -#define MODEL_o122 0x36 -#define MODEL_o121 0x35 -#define MODEL_o120 0x34 -#define MODEL_g32 0x33 -#define MODEL_o119 0x32 -#define MODEL_o118 0x31 -#define MODEL_o117 0x30 -#define MODEL_g31 0x2F -#define MODEL_o116 0x2E -#define MODEL_o115 0x2D -#define MODEL_o114 0x2C -#define MODEL_o113 0x2B -#define MODEL_o112 0x2A -#define MODEL_g30 0x29 -#define MODEL_o111 0x28 -#define MODEL_o110 0x27 -#define MODEL_o109 0x26 -#define MODEL_o108 0x25 -#define MODEL_o107 0x24 -#define MODEL_o106 0x23 -#define MODEL_o105 0x22 -#define MODEL_o104 0x21 -#define MODEL_o103 0x20 -#define MODEL_g29 0x1F -#define MODEL_o102 0x1E -#define MODEL_o101 0x1D -#define MODEL_o100 0x1C -#define MODEL_g28 0x1B -#define MODEL_o99 0x1A -#define MODEL_g25 0x19 -#define MODEL_o94 0x18 -#define MODEL_g24 0x17 -#define MODEL_o93 0x16 -#define MODEL_g26 0x15 -#define MODEL_o98 0x14 -#define MODEL_o97 0x13 -#define MODEL_ana2 0x12 -#define MODEL_hibi 0x11 -#define MODEL_futa 0x10 -#define MODEL_ana 0xF -#define MODEL_oku 0xE -#define MODEL_kabeana 0xD -#define MODEL_exit1 0xC -#define MODEL_e_yuka 0xB -#define MODEL_e_kabe 0xA -#define MODEL_g10 0x9 -#define MODEL_saku 0x8 -#define MODEL_suimen 0x7 -#define MODEL_suityuu 0x6 -#define MODEL_soko 0x5 -#define MODEL_ori 0x4 -#define MODEL_rou 0x3 -#define MODEL_t_soku 0x2 -#define MODEL_o52 0x1 -#define MODEL_t_kabe 0x0 +#define MODEL_Root 0x41 +#define MODEL_g27 0x40 +#define MODEL_g36 0x3F +#define MODEL_o127 0x3E +#define MODEL_g35 0x3D +#define MODEL_o126 0x3C +#define MODEL_g34 0x3B +#define MODEL_o125 0x3A +#define MODEL_o124 0x39 +#define MODEL_o123 0x38 +#define MODEL_g33 0x37 +#define MODEL_o122 0x36 +#define MODEL_o121 0x35 +#define MODEL_o120 0x34 +#define MODEL_g32 0x33 +#define MODEL_o119 0x32 +#define MODEL_o118 0x31 +#define MODEL_o117 0x30 +#define MODEL_g31 0x2F +#define MODEL_o116 0x2E +#define MODEL_o115 0x2D +#define MODEL_o114 0x2C +#define MODEL_o113 0x2B +#define MODEL_o112 0x2A +#define MODEL_g30 0x29 +#define MODEL_o111 0x28 +#define MODEL_o110 0x27 +#define MODEL_o109 0x26 +#define MODEL_o108 0x25 +#define MODEL_o107 0x24 +#define MODEL_o106 0x23 +#define MODEL_o105 0x22 +#define MODEL_o104 0x21 +#define MODEL_o103 0x20 +#define MODEL_g29 0x1F +#define MODEL_o102 0x1E +#define MODEL_o101 0x1D +#define MODEL_o100 0x1C +#define MODEL_g28 0x1B +#define MODEL_o99 0x1A +#define MODEL_g25 0x19 +#define MODEL_o94 0x18 +#define MODEL_g24 0x17 +#define MODEL_o93 0x16 +#define MODEL_g26 0x15 +#define MODEL_o98 0x14 +#define MODEL_o97 0x13 +#define MODEL_ana2 0x12 +#define MODEL_hibi 0x11 +#define MODEL_futa 0x10 +#define MODEL_ana 0xF +#define MODEL_oku 0xE +#define MODEL_kabeana 0xD +#define MODEL_exit1 0xC +#define MODEL_e_yuka 0xB +#define MODEL_e_kabe 0xA +#define MODEL_g10 0x9 +#define MODEL_saku 0x8 +#define MODEL_suimen 0x7 +#define MODEL_suityuu 0x6 +#define MODEL_soko 0x5 +#define MODEL_ori 0x4 +#define MODEL_rou 0x3 +#define MODEL_t_soku 0x2 +#define MODEL_o52 0x1 +#define MODEL_t_kabe 0x0 + diff --git a/include/mapfs/trd_07_hit.h b/include/mapfs/trd_07_hit.h index bb51e77bf5..f880a3ebee 100644 --- a/include/mapfs/trd_07_hit.h +++ b/include/mapfs/trd_07_hit.h @@ -1,16 +1,23 @@ -#define COLLIDER_Root 0xF -#define COLLIDER_g21 0xE -#define COLLIDER_o37 0xD -#define COLLIDER_g2 0xC -#define COLLIDER_kiwa 0xB -#define COLLIDER_yuka1 0xA -#define COLLIDER_exite 0x9 -#define COLLIDER_ne 0x8 -#define COLLIDER_tte 0x7 -#define COLLIDER_deilie 0x6 -#define COLLIDER_deilite 0x5 -#define COLLIDER_exitw 0x4 -#define COLLIDER_nw 0x3 -#define COLLIDER_ttw 0x2 -#define COLLIDER_deiliw 0x1 -#define COLLIDER_deilitw 0x0 +#define COLLIDER_Root 0xF +#define COLLIDER_g21 0xE +#define COLLIDER_o37 0xD +#define COLLIDER_g2 0xC +#define COLLIDER_kiwa 0xB +#define COLLIDER_yuka1 0xA +#define COLLIDER_exite 0x9 +#define COLLIDER_ne 0x8 +#define COLLIDER_tte 0x7 +#define COLLIDER_deilie 0x6 +#define COLLIDER_deilite 0x5 +#define COLLIDER_exitw 0x4 +#define COLLIDER_nw 0x3 +#define COLLIDER_ttw 0x2 +#define COLLIDER_deiliw 0x1 +#define COLLIDER_deilitw 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g2 0x3 +#define ZONE_yuka1 0x2 +#define ZONE_tte 0x1 +#define ZONE_deiliw 0x0 + diff --git a/include/mapfs/trd_07_shape.h b/include/mapfs/trd_07_shape.h index 3dda347ea8..e8669537b1 100644 --- a/include/mapfs/trd_07_shape.h +++ b/include/mapfs/trd_07_shape.h @@ -1,24 +1,25 @@ -#define MODEL_Root 0x17 -#define MODEL_g25 0x16 -#define MODEL_o44 0x15 -#define MODEL_o52 0x14 -#define MODEL_g24 0x13 -#define MODEL_o43 0x12 -#define MODEL_o51 0x11 -#define MODEL_migi 0x10 -#define MODEL_o40 0xF -#define MODEL_o39 0xE -#define MODEL_o38 0xD -#define MODEL_hidari 0xC -#define MODEL_o50 0xB -#define MODEL_o49 0xA -#define MODEL_o48 0x9 -#define MODEL_kusari1 0x8 -#define MODEL_o31 0x7 -#define MODEL_g2 0x6 -#define MODEL_suimen2 0x5 -#define MODEL_suityuu 0x4 -#define MODEL_kusari 0x3 -#define MODEL_kiwa 0x2 -#define MODEL_yuka1 0x1 -#define MODEL_kabe 0x0 +#define MODEL_Root 0x17 +#define MODEL_g25 0x16 +#define MODEL_o44 0x15 +#define MODEL_o52 0x14 +#define MODEL_g24 0x13 +#define MODEL_o43 0x12 +#define MODEL_o51 0x11 +#define MODEL_migi 0x10 +#define MODEL_o40 0xF +#define MODEL_o39 0xE +#define MODEL_o38 0xD +#define MODEL_hidari 0xC +#define MODEL_o50 0xB +#define MODEL_o49 0xA +#define MODEL_o48 0x9 +#define MODEL_kusari1 0x8 +#define MODEL_o31 0x7 +#define MODEL_g2 0x6 +#define MODEL_suimen2 0x5 +#define MODEL_suityuu 0x4 +#define MODEL_kusari 0x3 +#define MODEL_kiwa 0x2 +#define MODEL_yuka1 0x1 +#define MODEL_kabe 0x0 + diff --git a/include/mapfs/trd_08_hit.h b/include/mapfs/trd_08_hit.h index 6f1631ef89..98f5f010af 100644 --- a/include/mapfs/trd_08_hit.h +++ b/include/mapfs/trd_08_hit.h @@ -1,11 +1,17 @@ -#define COLLIDER_Root 0xA -#define COLLIDER_g2 0x9 -#define COLLIDER_o38 0x8 -#define COLLIDER_yuka1 0x7 -#define COLLIDER_kabe 0x6 -#define COLLIDER_kabe2 0x5 -#define COLLIDER_exit 0x4 -#define COLLIDER_ne 0x3 -#define COLLIDER_tte 0x2 -#define COLLIDER_deilie 0x1 -#define COLLIDER_deilite 0x0 +#define COLLIDER_Root 0xA +#define COLLIDER_g2 0x9 +#define COLLIDER_o38 0x8 +#define COLLIDER_yuka1 0x7 +#define COLLIDER_kabe 0x6 +#define COLLIDER_kabe2 0x5 +#define COLLIDER_exit 0x4 +#define COLLIDER_ne 0x3 +#define COLLIDER_tte 0x2 +#define COLLIDER_deilie 0x1 +#define COLLIDER_deilite 0x0 + +#define ZONE_Root 0x3 +#define ZONE_g2 0x2 +#define ZONE_yuka1 0x1 +#define ZONE_deilie 0x0 + diff --git a/include/mapfs/trd_08_shape.h b/include/mapfs/trd_08_shape.h index d4878e6a5c..2611dbd80d 100644 --- a/include/mapfs/trd_08_shape.h +++ b/include/mapfs/trd_08_shape.h @@ -1,17 +1,18 @@ -#define MODEL_Root 0x10 -#define MODEL_g19 0xF -#define MODEL_o36 0xE -#define MODEL_g18 0xD -#define MODEL_o32 0xC -#define MODEL_kusari1 0xB -#define MODEL_o31 0xA -#define MODEL_g2 0x9 -#define MODEL_suimen 0x8 -#define MODEL_hako 0x7 -#define MODEL_kusari 0x6 -#define MODEL_suityuu 0x5 -#define MODEL_kiwa 0x4 -#define MODEL_yuka1 0x3 -#define MODEL_kabe 0x2 -#define MODEL_bero2 0x1 -#define MODEL_bero 0x0 +#define MODEL_Root 0x10 +#define MODEL_g19 0xF +#define MODEL_o36 0xE +#define MODEL_g18 0xD +#define MODEL_o32 0xC +#define MODEL_kusari1 0xB +#define MODEL_o31 0xA +#define MODEL_g2 0x9 +#define MODEL_suimen 0x8 +#define MODEL_hako 0x7 +#define MODEL_kusari 0x6 +#define MODEL_suityuu 0x5 +#define MODEL_kiwa 0x4 +#define MODEL_yuka1 0x3 +#define MODEL_kabe 0x2 +#define MODEL_bero2 0x1 +#define MODEL_bero 0x0 + diff --git a/include/mapfs/trd_09_hit.h b/include/mapfs/trd_09_hit.h index 24ba045bf4..33e332a07a 100644 --- a/include/mapfs/trd_09_hit.h +++ b/include/mapfs/trd_09_hit.h @@ -1,22 +1,28 @@ -#define COLLIDER_Root 0x15 -#define COLLIDER_g37 0x14 -#define COLLIDER_o85 0x13 -#define COLLIDER_exit5 0x12 -#define COLLIDER_o67 0x11 -#define COLLIDER_tt5 0x10 -#define COLLIDER_deili5 0xF -#define COLLIDER_deilit5 0xE -#define COLLIDER_exit4 0xD -#define COLLIDER_o65 0xC -#define COLLIDER_tt4 0xB -#define COLLIDER_deili4 0xA -#define COLLIDER_deilit4 0x9 -#define COLLIDER_g13 0x8 -#define COLLIDER_o84 0x7 -#define COLLIDER_o83 0x6 -#define COLLIDER_o82 0x5 -#define COLLIDER_o81 0x4 -#define COLLIDER_o80 0x3 -#define COLLIDER_o79 0x2 -#define COLLIDER_o78 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x15 +#define COLLIDER_g37 0x14 +#define COLLIDER_o85 0x13 +#define COLLIDER_exit5 0x12 +#define COLLIDER_o67 0x11 +#define COLLIDER_tt5 0x10 +#define COLLIDER_deili5 0xF +#define COLLIDER_deilit5 0xE +#define COLLIDER_exit4 0xD +#define COLLIDER_o65 0xC +#define COLLIDER_tt4 0xB +#define COLLIDER_deili4 0xA +#define COLLIDER_deilit4 0x9 +#define COLLIDER_g13 0x8 +#define COLLIDER_o84 0x7 +#define COLLIDER_o83 0x6 +#define COLLIDER_o82 0x5 +#define COLLIDER_o81 0x4 +#define COLLIDER_o80 0x3 +#define COLLIDER_o79 0x2 +#define COLLIDER_o78 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x3 +#define ZONE_g13 0x2 +#define ZONE_o37 0x1 +#define ZONE_yuka 0x0 + diff --git a/include/mapfs/trd_09_shape.h b/include/mapfs/trd_09_shape.h index f618297965..b2d0762ddf 100644 --- a/include/mapfs/trd_09_shape.h +++ b/include/mapfs/trd_09_shape.h @@ -1,21 +1,22 @@ -#define MODEL_Root 0x14 -#define MODEL_doa8 0x13 -#define MODEL_o60 0x12 -#define MODEL_doa7 0x11 -#define MODEL_o65 0x10 -#define MODEL_doa4 0xF -#define MODEL_o63 0xE -#define MODEL_doa3 0xD -#define MODEL_o67 0xC -#define MODEL_g13 0xB -#define MODEL_mado 0xA -#define MODEL_yuka 0x9 -#define MODEL_kabe 0x8 -#define MODEL_Default 0x7 -#define MODEL_saku3 0x6 -#define MODEL_saku2 0x5 -#define MODEL_sku1 0x4 -#define MODEL_okuyuki 0x3 -#define MODEL_doa_naka 0x2 -#define MODEL_o76 0x1 -#define MODEL_o75 0x0 +#define MODEL_Root 0x14 +#define MODEL_doa8 0x13 +#define MODEL_o60 0x12 +#define MODEL_doa7 0x11 +#define MODEL_o65 0x10 +#define MODEL_doa4 0xF +#define MODEL_o63 0xE +#define MODEL_doa3 0xD +#define MODEL_o67 0xC +#define MODEL_g13 0xB +#define MODEL_mado 0xA +#define MODEL_yuka 0x9 +#define MODEL_kabe 0x8 +#define MODEL_Default 0x7 +#define MODEL_saku3 0x6 +#define MODEL_saku2 0x5 +#define MODEL_sku1 0x4 +#define MODEL_okuyuki 0x3 +#define MODEL_doa_naka 0x2 +#define MODEL_o76 0x1 +#define MODEL_o75 0x0 + diff --git a/include/mapfs/trd_10_hit.h b/include/mapfs/trd_10_hit.h index 074a40e27f..6eb6ef7957 100644 --- a/include/mapfs/trd_10_hit.h +++ b/include/mapfs/trd_10_hit.h @@ -1,9 +1,16 @@ -#define COLLIDER_Root 0x8 -#define COLLIDER_g18 0x7 -#define COLLIDER_nw 0x6 -#define COLLIDER_ttw 0x5 -#define COLLIDER_deiliw 0x4 -#define COLLIDER_deilitw 0x3 -#define COLLIDER_g10 0x2 -#define COLLIDER_o52 0x1 -#define COLLIDER_t_kabe 0x0 +#define COLLIDER_Root 0x8 +#define COLLIDER_g18 0x7 +#define COLLIDER_nw 0x6 +#define COLLIDER_ttw 0x5 +#define COLLIDER_deiliw 0x4 +#define COLLIDER_deilitw 0x3 +#define COLLIDER_g10 0x2 +#define COLLIDER_o52 0x1 +#define COLLIDER_t_kabe 0x0 + +#define ZONE_Root 0x4 +#define ZONE_g10 0x3 +#define ZONE_exite 0x2 +#define ZONE_exitw 0x1 +#define ZONE_yuka1 0x0 + diff --git a/include/mapfs/trd_10_shape.h b/include/mapfs/trd_10_shape.h index b25aa63a51..a14c5b1e52 100644 --- a/include/mapfs/trd_10_shape.h +++ b/include/mapfs/trd_10_shape.h @@ -1,56 +1,57 @@ -#define MODEL_Root 0x37 -#define MODEL_g42 0x36 -#define MODEL_g49 0x35 -#define MODEL_kusari2 0x34 -#define MODEL_kusari 0x33 -#define MODEL_soku 0x32 -#define MODEL_saku 0x31 -#define MODEL_yuka 0x30 -#define MODEL_kabe 0x2F -#define MODEL_exitw 0x2E -#define MODEL_deilitw 0x2D -#define MODEL_deiliw 0x2C -#define MODEL_nw 0x2B -#define MODEL_doa4 0x2A -#define MODEL_o192 0x29 -#define MODEL_doa3 0x28 -#define MODEL_o191 0x27 -#define MODEL_nise_koppa 0x26 -#define MODEL_koma2 0x25 -#define MODEL_km2 0x24 -#define MODEL_koma1 0x23 -#define MODEL_km1 0x22 -#define MODEL_ashi 0x21 -#define MODEL_o165 0x20 -#define MODEL_o120 0x1F -#define MODEL_o118 0x1E -#define MODEL_right_arm 0x1D -#define MODEL_o183 0x1C -#define MODEL_o172 0x1B -#define MODEL_o171 0x1A -#define MODEL_dou 0x19 -#define MODEL_d3 0x18 -#define MODEL_d2 0x17 -#define MODEL_d1 0x16 -#define MODEL_koura 0x15 -#define MODEL_s5 0x14 -#define MODEL_s4 0x13 -#define MODEL_s3 0x12 -#define MODEL_s2 0x11 -#define MODEL_s1 0x10 -#define MODEL_atama 0xF -#define MODEL_k9 0xE -#define MODEL_k8 0xD -#define MODEL_k7 0xC -#define MODEL_k6 0xB -#define MODEL_k5 0xA -#define MODEL_k4 0x9 -#define MODEL_k3 0x8 -#define MODEL_k2 0x7 -#define MODEL_k1 0x6 -#define MODEL_left_arm 0x5 -#define MODEL_u3 0x4 -#define MODEL_u2 0x3 -#define MODEL_u1 0x2 -#define MODEL_shippo 0x1 -#define MODEL_p1 0x0 +#define MODEL_Root 0x37 +#define MODEL_g42 0x36 +#define MODEL_g49 0x35 +#define MODEL_kusari2 0x34 +#define MODEL_kusari 0x33 +#define MODEL_soku 0x32 +#define MODEL_saku 0x31 +#define MODEL_yuka 0x30 +#define MODEL_kabe 0x2F +#define MODEL_exitw 0x2E +#define MODEL_deilitw 0x2D +#define MODEL_deiliw 0x2C +#define MODEL_nw 0x2B +#define MODEL_doa4 0x2A +#define MODEL_o192 0x29 +#define MODEL_doa3 0x28 +#define MODEL_o191 0x27 +#define MODEL_nise_koppa 0x26 +#define MODEL_koma2 0x25 +#define MODEL_km2 0x24 +#define MODEL_koma1 0x23 +#define MODEL_km1 0x22 +#define MODEL_ashi 0x21 +#define MODEL_o165 0x20 +#define MODEL_o120 0x1F +#define MODEL_o118 0x1E +#define MODEL_right_arm 0x1D +#define MODEL_o183 0x1C +#define MODEL_o172 0x1B +#define MODEL_o171 0x1A +#define MODEL_dou 0x19 +#define MODEL_d3 0x18 +#define MODEL_d2 0x17 +#define MODEL_d1 0x16 +#define MODEL_koura 0x15 +#define MODEL_s5 0x14 +#define MODEL_s4 0x13 +#define MODEL_s3 0x12 +#define MODEL_s2 0x11 +#define MODEL_s1 0x10 +#define MODEL_atama 0xF +#define MODEL_k9 0xE +#define MODEL_k8 0xD +#define MODEL_k7 0xC +#define MODEL_k6 0xB +#define MODEL_k5 0xA +#define MODEL_k4 0x9 +#define MODEL_k3 0x8 +#define MODEL_k2 0x7 +#define MODEL_k1 0x6 +#define MODEL_left_arm 0x5 +#define MODEL_u3 0x4 +#define MODEL_u2 0x3 +#define MODEL_u1 0x2 +#define MODEL_shippo 0x1 +#define MODEL_p1 0x0 + diff --git a/include/mapfs/trd_bt00_hit.h b/include/mapfs/trd_bt00_hit.h index 5ac2d8376c..6c2b115b20 100644 --- a/include/mapfs/trd_bt00_hit.h +++ b/include/mapfs/trd_bt00_hit.h @@ -1,5 +1,8 @@ -#define COLLIDER_Root 0x4 -#define COLLIDER_kihonset 0x3 -#define COLLIDER_right 0x2 -#define COLLIDER_hit 0x1 -#define COLLIDER_left 0x0 +#define COLLIDER_Root 0x4 +#define COLLIDER_kihonset 0x3 +#define COLLIDER_right 0x2 +#define COLLIDER_hit 0x1 +#define COLLIDER_left 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/trd_bt00_shape.h b/include/mapfs/trd_bt00_shape.h index 63e78724e5..a6c88dbc19 100644 --- a/include/mapfs/trd_bt00_shape.h +++ b/include/mapfs/trd_bt00_shape.h @@ -1,49 +1,50 @@ -#define MODEL_Root 0x30 -#define MODEL_nise_koppa 0x2F -#define MODEL_koma2 0x2E -#define MODEL_km2 0x2D -#define MODEL_koma1 0x2C -#define MODEL_km1 0x2B -#define MODEL_ashi 0x2A -#define MODEL_o165 0x29 -#define MODEL_o120 0x28 -#define MODEL_o118 0x27 -#define MODEL_right_arm 0x26 -#define MODEL_o183 0x25 -#define MODEL_o172 0x24 -#define MODEL_o171 0x23 -#define MODEL_dou 0x22 -#define MODEL_d3 0x21 -#define MODEL_d2 0x20 -#define MODEL_d1 0x1F -#define MODEL_koura 0x1E -#define MODEL_s5 0x1D -#define MODEL_s4 0x1C -#define MODEL_s3 0x1B -#define MODEL_s2 0x1A -#define MODEL_s1 0x19 -#define MODEL_atama 0x18 -#define MODEL_k9 0x17 -#define MODEL_k8 0x16 -#define MODEL_k7 0x15 -#define MODEL_k6 0x14 -#define MODEL_k5 0x13 -#define MODEL_k4 0x12 -#define MODEL_k3 0x11 -#define MODEL_k2 0x10 -#define MODEL_k1 0xF -#define MODEL_left_arm 0xE -#define MODEL_u3 0xD -#define MODEL_u2 0xC -#define MODEL_u1 0xB -#define MODEL_shippo 0xA -#define MODEL_p1 0x9 -#define MODEL_battle_satge 0x8 -#define MODEL_o106 0x7 -#define MODEL_o110 0x6 -#define MODEL_o108 0x5 -#define MODEL_o104 0x4 -#define MODEL_t_kabe 0x3 -#define MODEL_o95 0x2 -#define MODEL_o92 0x1 -#define MODEL_o113 0x0 +#define MODEL_Root 0x30 +#define MODEL_nise_koppa 0x2F +#define MODEL_koma2 0x2E +#define MODEL_km2 0x2D +#define MODEL_koma1 0x2C +#define MODEL_km1 0x2B +#define MODEL_ashi 0x2A +#define MODEL_o165 0x29 +#define MODEL_o120 0x28 +#define MODEL_o118 0x27 +#define MODEL_right_arm 0x26 +#define MODEL_o183 0x25 +#define MODEL_o172 0x24 +#define MODEL_o171 0x23 +#define MODEL_dou 0x22 +#define MODEL_d3 0x21 +#define MODEL_d2 0x20 +#define MODEL_d1 0x1F +#define MODEL_koura 0x1E +#define MODEL_s5 0x1D +#define MODEL_s4 0x1C +#define MODEL_s3 0x1B +#define MODEL_s2 0x1A +#define MODEL_s1 0x19 +#define MODEL_atama 0x18 +#define MODEL_k9 0x17 +#define MODEL_k8 0x16 +#define MODEL_k7 0x15 +#define MODEL_k6 0x14 +#define MODEL_k5 0x13 +#define MODEL_k4 0x12 +#define MODEL_k3 0x11 +#define MODEL_k2 0x10 +#define MODEL_k1 0xF +#define MODEL_left_arm 0xE +#define MODEL_u3 0xD +#define MODEL_u2 0xC +#define MODEL_u1 0xB +#define MODEL_shippo 0xA +#define MODEL_p1 0x9 +#define MODEL_battle_satge 0x8 +#define MODEL_o106 0x7 +#define MODEL_o110 0x6 +#define MODEL_o108 0x5 +#define MODEL_o104 0x4 +#define MODEL_t_kabe 0x3 +#define MODEL_o95 0x2 +#define MODEL_o92 0x1 +#define MODEL_o113 0x0 + diff --git a/include/mapfs/trd_bt01_hit.h b/include/mapfs/trd_bt01_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/trd_bt01_hit.h +++ b/include/mapfs/trd_bt01_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/trd_bt01_shape.h b/include/mapfs/trd_bt01_shape.h index b66de0c0d2..a557014267 100644 --- a/include/mapfs/trd_bt01_shape.h +++ b/include/mapfs/trd_bt01_shape.h @@ -1,18 +1,19 @@ -#define MODEL_Root 0x11 -#define MODEL_dai 0x10 -#define MODEL_waku1 0xF -#define MODEL_yuka 0xE -#define MODEL_g59 0xD -#define MODEL_waku2 0xC -#define MODEL_kusari3 0xB -#define MODEL_kusari2 0xA -#define MODEL_ksari1 0x9 -#define MODEL_saku 0x8 -#define MODEL_rou 0x7 -#define MODEL_o292 0x6 -#define MODEL_kai 0x5 -#define MODEL_hikari 0x4 -#define MODEL_mado 0x3 -#define MODEL_waku 0x2 -#define MODEL_oku 0x1 -#define MODEL_yuka2 0x0 +#define MODEL_Root 0x11 +#define MODEL_dai 0x10 +#define MODEL_waku1 0xF +#define MODEL_yuka 0xE +#define MODEL_g59 0xD +#define MODEL_waku2 0xC +#define MODEL_kusari3 0xB +#define MODEL_kusari2 0xA +#define MODEL_ksari1 0x9 +#define MODEL_saku 0x8 +#define MODEL_rou 0x7 +#define MODEL_o292 0x6 +#define MODEL_kai 0x5 +#define MODEL_hikari 0x4 +#define MODEL_mado 0x3 +#define MODEL_waku 0x2 +#define MODEL_oku 0x1 +#define MODEL_yuka2 0x0 + diff --git a/include/mapfs/trd_bt02_hit.h b/include/mapfs/trd_bt02_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/trd_bt02_hit.h +++ b/include/mapfs/trd_bt02_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/trd_bt02_shape.h b/include/mapfs/trd_bt02_shape.h index f2da569a6d..87c0625c51 100644 --- a/include/mapfs/trd_bt02_shape.h +++ b/include/mapfs/trd_bt02_shape.h @@ -1,28 +1,29 @@ -#define MODEL_Root 0x1B -#define MODEL_dai 0x1A -#define MODEL_waku1 0x19 -#define MODEL_waku3 0x18 -#define MODEL_yuka 0x17 -#define MODEL_saku 0x16 -#define MODEL_g67 0x15 -#define MODEL_g69 0x14 -#define MODEL_mizu 0x13 -#define MODEL_g68 0x12 -#define MODEL_mizu2 0x11 -#define MODEL_g70 0x10 -#define MODEL_o298 0xF -#define MODEL_g71 0xE -#define MODEL_o297 0xD -#define MODEL_kabe2_2 0xC -#define MODEL_kabe2 0xB -#define MODEL_tyuu 0xA -#define MODEL_kiwa 0x9 -#define MODEL_waku4 0x8 -#define MODEL_waku 0x7 -#define MODEL_g59 0x6 -#define MODEL_hikari 0x5 -#define MODEL_kusari3 0x4 -#define MODEL_kusari2 0x3 -#define MODEL_kusari1 0x2 -#define MODEL_mado 0x1 -#define MODEL_kabe1 0x0 +#define MODEL_Root 0x1B +#define MODEL_dai 0x1A +#define MODEL_waku1 0x19 +#define MODEL_waku3 0x18 +#define MODEL_yuka 0x17 +#define MODEL_saku 0x16 +#define MODEL_g67 0x15 +#define MODEL_g69 0x14 +#define MODEL_mizu 0x13 +#define MODEL_g68 0x12 +#define MODEL_mizu2 0x11 +#define MODEL_g70 0x10 +#define MODEL_o298 0xF +#define MODEL_g71 0xE +#define MODEL_o297 0xD +#define MODEL_kabe2_2 0xC +#define MODEL_kabe2 0xB +#define MODEL_tyuu 0xA +#define MODEL_kiwa 0x9 +#define MODEL_waku4 0x8 +#define MODEL_waku 0x7 +#define MODEL_g59 0x6 +#define MODEL_hikari 0x5 +#define MODEL_kusari3 0x4 +#define MODEL_kusari2 0x3 +#define MODEL_kusari1 0x2 +#define MODEL_mado 0x1 +#define MODEL_kabe1 0x0 + diff --git a/include/mapfs/trd_bt03_hit.h b/include/mapfs/trd_bt03_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/trd_bt03_hit.h +++ b/include/mapfs/trd_bt03_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/trd_bt03_shape.h b/include/mapfs/trd_bt03_shape.h index 89809b72d4..de589cc561 100644 --- a/include/mapfs/trd_bt03_shape.h +++ b/include/mapfs/trd_bt03_shape.h @@ -1,19 +1,20 @@ -#define MODEL_Root 0x12 -#define MODEL_dai 0x11 -#define MODEL_waku1 0x10 -#define MODEL_saku 0xF -#define MODEL_kabe2 0xE -#define MODEL_kabe 0xD -#define MODEL_yuka 0xC -#define MODEL_g59 0xB -#define MODEL_ya 0xA -#define MODEL_o301 0x9 -#define MODEL_waku2 0x8 -#define MODEL_waku 0x7 -#define MODEL_yuka2 0x6 -#define MODEL_g64 0x5 -#define MODEL_g65 0x4 -#define MODEL_o304 0x3 -#define MODEL_g62 0x2 -#define MODEL_g63 0x1 -#define MODEL_o303 0x0 +#define MODEL_Root 0x12 +#define MODEL_dai 0x11 +#define MODEL_waku1 0x10 +#define MODEL_saku 0xF +#define MODEL_kabe2 0xE +#define MODEL_kabe 0xD +#define MODEL_yuka 0xC +#define MODEL_g59 0xB +#define MODEL_ya 0xA +#define MODEL_o301 0x9 +#define MODEL_waku2 0x8 +#define MODEL_waku 0x7 +#define MODEL_yuka2 0x6 +#define MODEL_g64 0x5 +#define MODEL_g65 0x4 +#define MODEL_o304 0x3 +#define MODEL_g62 0x2 +#define MODEL_g63 0x1 +#define MODEL_o303 0x0 + diff --git a/include/mapfs/trd_bt04_hit.h b/include/mapfs/trd_bt04_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/trd_bt04_hit.h +++ b/include/mapfs/trd_bt04_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/trd_bt04_shape.h b/include/mapfs/trd_bt04_shape.h index a70c7b72e2..07e9e7bad1 100644 --- a/include/mapfs/trd_bt04_shape.h +++ b/include/mapfs/trd_bt04_shape.h @@ -1,17 +1,18 @@ -#define MODEL_Root 0x10 -#define MODEL_dai 0xF -#define MODEL_waku1 0xE -#define MODEL_hikari1 0xD -#define MODEL_yuka 0xC -#define MODEL_g59 0xB -#define MODEL_waku3 0xA -#define MODEL_saku 0x9 -#define MODEL_hikari 0x8 -#define MODEL_kusari2 0x7 -#define MODEL_kusari1 0x6 -#define MODEL_mado 0x5 -#define MODEL_saku2 0x4 -#define MODEL_yuka2 0x3 -#define MODEL_futi 0x2 -#define MODEL_waku 0x1 -#define MODEL_kabe1 0x0 +#define MODEL_Root 0x10 +#define MODEL_dai 0xF +#define MODEL_waku1 0xE +#define MODEL_hikari1 0xD +#define MODEL_yuka 0xC +#define MODEL_g59 0xB +#define MODEL_waku3 0xA +#define MODEL_saku 0x9 +#define MODEL_hikari 0x8 +#define MODEL_kusari2 0x7 +#define MODEL_kusari1 0x6 +#define MODEL_mado 0x5 +#define MODEL_saku2 0x4 +#define MODEL_yuka2 0x3 +#define MODEL_futi 0x2 +#define MODEL_waku 0x1 +#define MODEL_kabe1 0x0 + diff --git a/include/mapfs/trd_bt05_hit.h b/include/mapfs/trd_bt05_hit.h index 6de159259b..f58ee02c44 100644 --- a/include/mapfs/trd_bt05_hit.h +++ b/include/mapfs/trd_bt05_hit.h @@ -1,3 +1,6 @@ -#define COLLIDER_Root 0x2 -#define COLLIDER_dai 0x1 -#define COLLIDER_yuka 0x0 +#define COLLIDER_Root 0x2 +#define COLLIDER_dai 0x1 +#define COLLIDER_yuka 0x0 + +#define ZONE_Root 0x0 + diff --git a/include/mapfs/trd_bt05_shape.h b/include/mapfs/trd_bt05_shape.h index 0a35b7b3b5..acb9e673d8 100644 --- a/include/mapfs/trd_bt05_shape.h +++ b/include/mapfs/trd_bt05_shape.h @@ -1,31 +1,32 @@ -#define MODEL_Root 0x1E -#define MODEL_dai 0x1D -#define MODEL_g64 0x1C -#define MODEL_o318 0x1B -#define MODEL_g63 0x1A -#define MODEL_mizu4 0x19 -#define MODEL_waku1 0x18 -#define MODEL_yuka 0x17 -#define MODEL_g59 0x16 -#define MODEL_waku2 0x15 -#define MODEL_ori 0x14 -#define MODEL_saku2 0x13 -#define MODEL_saku1 0x12 -#define MODEL_kusari1 0x11 -#define MODEL_kai 0x10 -#define MODEL_hako 0xF -#define MODEL_hikari2 0xE -#define MODEL_hikari 0xD -#define MODEL_mado 0xC -#define MODEL_soto 0xB -#define MODEL_yuka3 0xA -#define MODEL_yuka4 0x9 -#define MODEL_yuka2 0x8 -#define MODEL_g68 0x7 -#define MODEL_mizu3 0x6 -#define MODEL_g67 0x5 -#define MODEL_mizu2 0x4 -#define MODEL_g66 0x3 -#define MODEL_mizu1 0x2 -#define MODEL_oku 0x1 -#define MODEL_waku 0x0 +#define MODEL_Root 0x1E +#define MODEL_dai 0x1D +#define MODEL_g64 0x1C +#define MODEL_o318 0x1B +#define MODEL_g63 0x1A +#define MODEL_mizu4 0x19 +#define MODEL_waku1 0x18 +#define MODEL_yuka 0x17 +#define MODEL_g59 0x16 +#define MODEL_waku2 0x15 +#define MODEL_ori 0x14 +#define MODEL_saku2 0x13 +#define MODEL_saku1 0x12 +#define MODEL_kusari1 0x11 +#define MODEL_kai 0x10 +#define MODEL_hako 0xF +#define MODEL_hikari2 0xE +#define MODEL_hikari 0xD +#define MODEL_mado 0xC +#define MODEL_soto 0xB +#define MODEL_yuka3 0xA +#define MODEL_yuka4 0x9 +#define MODEL_yuka2 0x8 +#define MODEL_g68 0x7 +#define MODEL_mizu3 0x6 +#define MODEL_g67 0x5 +#define MODEL_mizu2 0x4 +#define MODEL_g66 0x3 +#define MODEL_mizu1 0x2 +#define MODEL_oku 0x1 +#define MODEL_waku 0x0 + diff --git a/include/mapfs/tst_01_hit.h b/include/mapfs/tst_01_hit.h index a594af9981..4b6e2b1e2d 100644 --- a/include/mapfs/tst_01_hit.h +++ b/include/mapfs/tst_01_hit.h @@ -1,20 +1,25 @@ -#define COLLIDER_Root 0x13 -#define COLLIDER_g1 0x12 -#define COLLIDER_g3 0x11 -#define COLLIDER_o17 0x10 -#define COLLIDER_o16 0xF -#define COLLIDER_deilite 0xE -#define COLLIDER_deilitw 0xD -#define COLLIDER_deilie 0xC -#define COLLIDER_deiliw 0xB -#define COLLIDER_g2 0xA -#define COLLIDER_o21 0x9 -#define COLLIDER_o20 0x8 -#define COLLIDER_o19 0x7 -#define COLLIDER_o18 0x6 -#define COLLIDER_o10 0x5 -#define COLLIDER_o9 0x4 -#define COLLIDER_o7 0x3 -#define COLLIDER_o8 0x2 -#define COLLIDER_o11 0x1 -#define COLLIDER_o1 0x0 +#define COLLIDER_Root 0x13 +#define COLLIDER_g1 0x12 +#define COLLIDER_g3 0x11 +#define COLLIDER_o17 0x10 +#define COLLIDER_o16 0xF +#define COLLIDER_deilite 0xE +#define COLLIDER_deilitw 0xD +#define COLLIDER_deilie 0xC +#define COLLIDER_deiliw 0xB +#define COLLIDER_g2 0xA +#define COLLIDER_o21 0x9 +#define COLLIDER_o20 0x8 +#define COLLIDER_o19 0x7 +#define COLLIDER_o18 0x6 +#define COLLIDER_o10 0x5 +#define COLLIDER_o9 0x4 +#define COLLIDER_o7 0x3 +#define COLLIDER_o8 0x2 +#define COLLIDER_o11 0x1 +#define COLLIDER_o1 0x0 + +#define ZONE_Root 0x2 +#define ZONE_g1 0x1 +#define ZONE_o22 0x0 + diff --git a/include/mapfs/tst_01_shape.h b/include/mapfs/tst_01_shape.h index 6f3f118ff0..90c756e67a 100644 --- a/include/mapfs/tst_01_shape.h +++ b/include/mapfs/tst_01_shape.h @@ -1,14 +1,15 @@ -#define MODEL_Root 0xD -#define MODEL_g1 0xC -#define MODEL_g3 0xB -#define MODEL_o15 0xA -#define MODEL_o14 0x9 -#define MODEL_o13 0x8 -#define MODEL_o12 0x7 -#define MODEL_g2 0x6 -#define MODEL_o10 0x5 -#define MODEL_o9 0x4 -#define MODEL_o7 0x3 -#define MODEL_o8 0x2 -#define MODEL_o11 0x1 -#define MODEL_o1 0x0 +#define MODEL_Root 0xD +#define MODEL_g1 0xC +#define MODEL_g3 0xB +#define MODEL_o15 0xA +#define MODEL_o14 0x9 +#define MODEL_o13 0x8 +#define MODEL_o12 0x7 +#define MODEL_g2 0x6 +#define MODEL_o10 0x5 +#define MODEL_o9 0x4 +#define MODEL_o7 0x3 +#define MODEL_o8 0x2 +#define MODEL_o11 0x1 +#define MODEL_o1 0x0 + diff --git a/include/mapfs/tst_02_hit.h b/include/mapfs/tst_02_hit.h index 8bbe5bb2c7..0d4d94d065 100644 --- a/include/mapfs/tst_02_hit.h +++ b/include/mapfs/tst_02_hit.h @@ -1,13 +1,18 @@ -#define COLLIDER_Root 0xC -#define COLLIDER_g1 0xB -#define COLLIDER_g3 0xA -#define COLLIDER_o19 0x9 -#define COLLIDER_o18 0x8 -#define COLLIDER_deilite 0x7 -#define COLLIDER_deilitw 0x6 -#define COLLIDER_deilie 0x5 -#define COLLIDER_deiliw 0x4 -#define COLLIDER_g2 0x3 -#define COLLIDER_o17 0x2 -#define COLLIDER_o16 0x1 -#define COLLIDER_o9 0x0 +#define COLLIDER_Root 0xC +#define COLLIDER_g1 0xB +#define COLLIDER_g3 0xA +#define COLLIDER_o19 0x9 +#define COLLIDER_o18 0x8 +#define COLLIDER_deilite 0x7 +#define COLLIDER_deilitw 0x6 +#define COLLIDER_deilie 0x5 +#define COLLIDER_deiliw 0x4 +#define COLLIDER_g2 0x3 +#define COLLIDER_o17 0x2 +#define COLLIDER_o16 0x1 +#define COLLIDER_o9 0x0 + +#define ZONE_Root 0x2 +#define ZONE_g1 0x1 +#define ZONE_o20 0x0 + diff --git a/include/mapfs/tst_02_shape.h b/include/mapfs/tst_02_shape.h index e3a9778fd4..76937a349f 100644 --- a/include/mapfs/tst_02_shape.h +++ b/include/mapfs/tst_02_shape.h @@ -1,10 +1,11 @@ -#define MODEL_Root 0x9 -#define MODEL_g1 0x8 -#define MODEL_g3 0x7 -#define MODEL_o15 0x6 -#define MODEL_o14 0x5 -#define MODEL_o13 0x4 -#define MODEL_o12 0x3 -#define MODEL_g2 0x2 -#define MODEL_o16 0x1 -#define MODEL_o9 0x0 +#define MODEL_Root 0x9 +#define MODEL_g1 0x8 +#define MODEL_g3 0x7 +#define MODEL_o15 0x6 +#define MODEL_o14 0x5 +#define MODEL_o13 0x4 +#define MODEL_o12 0x3 +#define MODEL_g2 0x2 +#define MODEL_o16 0x1 +#define MODEL_o9 0x0 + diff --git a/include/mapfs/tst_03_hit.h b/include/mapfs/tst_03_hit.h index 6560a93b9b..d3bbedac0c 100644 --- a/include/mapfs/tst_03_hit.h +++ b/include/mapfs/tst_03_hit.h @@ -1,33 +1,49 @@ -#define COLLIDER_Root 0x20 -#define COLLIDER_g45 0x1F -#define COLLIDER_o274 0x1E -#define COLLIDER_o273 0x1D -#define COLLIDER_deilite 0x1C -#define COLLIDER_deilitw 0x1B -#define COLLIDER_deilie 0x1A -#define COLLIDER_deiliw 0x19 -#define COLLIDER_o275 0x18 -#define COLLIDER_g39 0x17 -#define COLLIDER_o268 0x16 -#define COLLIDER_o267 0x15 -#define COLLIDER_o266 0x14 -#define COLLIDER_g37 0x13 -#define COLLIDER_o236 0x12 -#define COLLIDER_o224 0x11 -#define COLLIDER_o223 0x10 -#define COLLIDER_o222 0xF -#define COLLIDER_g32 0xE -#define COLLIDER_o265 0xD -#define COLLIDER_o191 0xC -#define COLLIDER_o190 0xB -#define COLLIDER_o189 0xA -#define COLLIDER_g31 0x9 -#define COLLIDER_pukut 0x8 -#define COLLIDER_puku 0x7 -#define COLLIDER_o279 0x6 -#define COLLIDER_o278 0x5 -#define COLLIDER_o276 0x4 -#define COLLIDER_o264 0x3 -#define COLLIDER_o187 0x2 -#define COLLIDER_o188 0x1 -#define COLLIDER_o184 0x0 +#define COLLIDER_Root 0x20 +#define COLLIDER_g45 0x1F +#define COLLIDER_o274 0x1E +#define COLLIDER_o273 0x1D +#define COLLIDER_deilite 0x1C +#define COLLIDER_deilitw 0x1B +#define COLLIDER_deilie 0x1A +#define COLLIDER_deiliw 0x19 +#define COLLIDER_o275 0x18 +#define COLLIDER_g39 0x17 +#define COLLIDER_o268 0x16 +#define COLLIDER_o267 0x15 +#define COLLIDER_o266 0x14 +#define COLLIDER_g37 0x13 +#define COLLIDER_o236 0x12 +#define COLLIDER_o224 0x11 +#define COLLIDER_o223 0x10 +#define COLLIDER_o222 0xF +#define COLLIDER_g32 0xE +#define COLLIDER_o265 0xD +#define COLLIDER_o191 0xC +#define COLLIDER_o190 0xB +#define COLLIDER_o189 0xA +#define COLLIDER_g31 0x9 +#define COLLIDER_pukut 0x8 +#define COLLIDER_puku 0x7 +#define COLLIDER_o279 0x6 +#define COLLIDER_o278 0x5 +#define COLLIDER_o276 0x4 +#define COLLIDER_o264 0x3 +#define COLLIDER_o187 0x2 +#define COLLIDER_o188 0x1 +#define COLLIDER_o184 0x0 + +#define ZONE_Root 0xD +#define ZONE_g45 0xC +#define ZONE_o271 0xB +#define ZONE_o270 0xA +#define ZONE_g37 0x9 +#define ZONE_o223 0x8 +#define ZONE_o222 0x7 +#define ZONE_g32 0x6 +#define ZONE_o190 0x5 +#define ZONE_o189 0x4 +#define ZONE_g31 0x3 +#define ZONE_o269 0x2 +#define ZONE_o188 0x1 +#define ZONE_o184 0x0 + diff --git a/include/mapfs/tst_03_shape.h b/include/mapfs/tst_03_shape.h index e8b9b99106..cc88005341 100644 --- a/include/mapfs/tst_03_shape.h +++ b/include/mapfs/tst_03_shape.h @@ -1,59 +1,60 @@ -#define MODEL_Root 0x3A -#define MODEL_g49 0x39 -#define MODEL_o283 0x38 -#define MODEL_o282 0x37 -#define MODEL_o281 0x36 -#define MODEL_o280 0x35 -#define MODEL_g45 0x34 -#define MODEL_g48 0x33 -#define MODEL_o279 0x32 -#define MODEL_o278 0x31 -#define MODEL_o277 0x30 -#define MODEL_o276 0x2F -#define MODEL_g47 0x2E -#define MODEL_o275 0x2D -#define MODEL_o274 0x2C -#define MODEL_o273 0x2B -#define MODEL_o272 0x2A -#define MODEL_g46 0x29 -#define MODEL_o271 0x28 -#define MODEL_o270 0x27 -#define MODEL_o269 0x26 -#define MODEL_o268 0x25 -#define MODEL_o267 0x24 -#define MODEL_o266 0x23 -#define MODEL_o265 0x22 -#define MODEL_o264 0x21 -#define MODEL_g37 0x20 -#define MODEL_o237 0x1F -#define MODEL_o236 0x1E -#define MODEL_o225 0x1D -#define MODEL_o224 0x1C -#define MODEL_o223 0x1B -#define MODEL_o222 0x1A -#define MODEL_g32 0x19 -#define MODEL_g34 0x18 -#define MODEL_o207 0x17 -#define MODEL_o206 0x16 -#define MODEL_o205 0x15 -#define MODEL_o203 0x14 -#define MODEL_o202 0x13 -#define MODEL_o201 0x12 -#define MODEL_o200 0x11 -#define MODEL_o199 0x10 -#define MODEL_o198 0xF -#define MODEL_o197 0xE -#define MODEL_o192 0xD -#define MODEL_o191 0xC -#define MODEL_o190 0xB -#define MODEL_o189 0xA -#define MODEL_g31 0x9 -#define MODEL_o302 0x8 -#define MODEL_o289 0x7 -#define MODEL_o287 0x6 -#define MODEL_o238 0x5 -#define MODEL_o185 0x4 -#define MODEL_o187 0x3 -#define MODEL_o291 0x2 -#define MODEL_o188 0x1 -#define MODEL_o184 0x0 +#define MODEL_Root 0x3A +#define MODEL_g49 0x39 +#define MODEL_o283 0x38 +#define MODEL_o282 0x37 +#define MODEL_o281 0x36 +#define MODEL_o280 0x35 +#define MODEL_g45 0x34 +#define MODEL_g48 0x33 +#define MODEL_o279 0x32 +#define MODEL_o278 0x31 +#define MODEL_o277 0x30 +#define MODEL_o276 0x2F +#define MODEL_g47 0x2E +#define MODEL_o275 0x2D +#define MODEL_o274 0x2C +#define MODEL_o273 0x2B +#define MODEL_o272 0x2A +#define MODEL_g46 0x29 +#define MODEL_o271 0x28 +#define MODEL_o270 0x27 +#define MODEL_o269 0x26 +#define MODEL_o268 0x25 +#define MODEL_o267 0x24 +#define MODEL_o266 0x23 +#define MODEL_o265 0x22 +#define MODEL_o264 0x21 +#define MODEL_g37 0x20 +#define MODEL_o237 0x1F +#define MODEL_o236 0x1E +#define MODEL_o225 0x1D +#define MODEL_o224 0x1C +#define MODEL_o223 0x1B +#define MODEL_o222 0x1A +#define MODEL_g32 0x19 +#define MODEL_g34 0x18 +#define MODEL_o207 0x17 +#define MODEL_o206 0x16 +#define MODEL_o205 0x15 +#define MODEL_o203 0x14 +#define MODEL_o202 0x13 +#define MODEL_o201 0x12 +#define MODEL_o200 0x11 +#define MODEL_o199 0x10 +#define MODEL_o198 0xF +#define MODEL_o197 0xE +#define MODEL_o192 0xD +#define MODEL_o191 0xC +#define MODEL_o190 0xB +#define MODEL_o189 0xA +#define MODEL_g31 0x9 +#define MODEL_o302 0x8 +#define MODEL_o289 0x7 +#define MODEL_o287 0x6 +#define MODEL_o238 0x5 +#define MODEL_o185 0x4 +#define MODEL_o187 0x3 +#define MODEL_o291 0x2 +#define MODEL_o188 0x1 +#define MODEL_o184 0x0 + diff --git a/include/mapfs/tst_04_hit.h b/include/mapfs/tst_04_hit.h index b4a58d7c95..598b862bef 100644 --- a/include/mapfs/tst_04_hit.h +++ b/include/mapfs/tst_04_hit.h @@ -1,22 +1,30 @@ -#define COLLIDER_Root 0x15 -#define COLLIDER_g7 0x14 -#define COLLIDER_o19 0x13 -#define COLLIDER_o17 0x12 -#define COLLIDER_o16 0x11 -#define COLLIDER_o20 0x10 -#define COLLIDER_deilite 0xF -#define COLLIDER_deilie 0xE -#define COLLIDER_o21 0xD -#define COLLIDER_deilitw 0xC -#define COLLIDER_deiliw 0xB -#define COLLIDER_g1 0xA -#define COLLIDER_g5 0x9 -#define COLLIDER_o5 0x8 -#define COLLIDER_g4 0x7 -#define COLLIDER_g6 0x6 -#define COLLIDER_o3 0x5 -#define COLLIDER_o4 0x4 -#define COLLIDER_g2 0x3 -#define COLLIDER_o18 0x2 -#define COLLIDER_o2 0x1 -#define COLLIDER_o1 0x0 +#define COLLIDER_Root 0x15 +#define COLLIDER_g7 0x14 +#define COLLIDER_o19 0x13 +#define COLLIDER_o17 0x12 +#define COLLIDER_o16 0x11 +#define COLLIDER_o20 0x10 +#define COLLIDER_deilite 0xF +#define COLLIDER_deilie 0xE +#define COLLIDER_o21 0xD +#define COLLIDER_deilitw 0xC +#define COLLIDER_deiliw 0xB +#define COLLIDER_g1 0xA +#define COLLIDER_g5 0x9 +#define COLLIDER_o5 0x8 +#define COLLIDER_g4 0x7 +#define COLLIDER_g6 0x6 +#define COLLIDER_o3 0x5 +#define COLLIDER_o4 0x4 +#define COLLIDER_g2 0x3 +#define COLLIDER_o18 0x2 +#define COLLIDER_o2 0x1 +#define COLLIDER_o1 0x0 + +#define ZONE_Root 0x5 +#define ZONE_g7 0x4 +#define ZONE_o17 0x3 +#define ZONE_o16 0x2 +#define ZONE_deilie 0x1 +#define ZONE_deiliw 0x0 + diff --git a/include/mapfs/tst_04_shape.h b/include/mapfs/tst_04_shape.h index 615e55e966..9b111f17a6 100644 --- a/include/mapfs/tst_04_shape.h +++ b/include/mapfs/tst_04_shape.h @@ -1,20 +1,21 @@ -#define MODEL_Root 0x13 -#define MODEL_g7 0x12 -#define MODEL_o17 0x11 -#define MODEL_o16 0x10 -#define MODEL_o14 0xF -#define MODEL_o11 0xE -#define MODEL_o10 0xD -#define MODEL_o9 0xC -#define MODEL_o8 0xB -#define MODEL_g1 0xA -#define MODEL_g5 0x9 -#define MODEL_o5 0x8 -#define MODEL_g4 0x7 -#define MODEL_g6 0x6 -#define MODEL_o3 0x5 -#define MODEL_o4 0x4 -#define MODEL_g2 0x3 -#define MODEL_o18 0x2 -#define MODEL_o2 0x1 -#define MODEL_o1 0x0 +#define MODEL_Root 0x13 +#define MODEL_g7 0x12 +#define MODEL_o17 0x11 +#define MODEL_o16 0x10 +#define MODEL_o14 0xF +#define MODEL_o11 0xE +#define MODEL_o10 0xD +#define MODEL_o9 0xC +#define MODEL_o8 0xB +#define MODEL_g1 0xA +#define MODEL_g5 0x9 +#define MODEL_o5 0x8 +#define MODEL_g4 0x7 +#define MODEL_g6 0x6 +#define MODEL_o3 0x5 +#define MODEL_o4 0x4 +#define MODEL_g2 0x3 +#define MODEL_o18 0x2 +#define MODEL_o2 0x1 +#define MODEL_o1 0x0 + diff --git a/include/mapfs/tst_10_hit.h b/include/mapfs/tst_10_hit.h index a47482e4d8..9f58240388 100644 --- a/include/mapfs/tst_10_hit.h +++ b/include/mapfs/tst_10_hit.h @@ -1,17 +1,39 @@ -#define COLLIDER_Root 0x10 -#define COLLIDER_Default 0xF -#define COLLIDER_change 0xE -#define COLLIDER_stage 0xD -#define COLLIDER_7 0xC -#define COLLIDER_deiliw 0xB -#define COLLIDER_o134 0xA -#define COLLIDER_5 0x9 -#define COLLIDER_deilis 0x8 -#define COLLIDER_o138 0x7 -#define COLLIDER_3 0x6 -#define COLLIDER_deilie 0x5 -#define COLLIDER_o132 0x4 -#define COLLIDER_1 0x3 -#define COLLIDER_deilitn 0x2 -#define COLLIDER_deilin 0x1 -#define COLLIDER_o136 0x0 +#define COLLIDER_Root 0x10 +#define COLLIDER_Default 0xF +#define COLLIDER_change 0xE +#define COLLIDER_stage 0xD +#define COLLIDER_7 0xC +#define COLLIDER_deiliw 0xB +#define COLLIDER_o134 0xA +#define COLLIDER_5 0x9 +#define COLLIDER_deilis 0x8 +#define COLLIDER_o138 0x7 +#define COLLIDER_3 0x6 +#define COLLIDER_deilie 0x5 +#define COLLIDER_o132 0x4 +#define COLLIDER_1 0x3 +#define COLLIDER_deilitn 0x2 +#define COLLIDER_deilin 0x1 +#define COLLIDER_o136 0x0 + +#define ZONE_Root 0x13 +#define ZONE_enter_cam 0x12 +#define ZONE_south 0x11 +#define ZONE_north 0x10 +#define ZONE_west 0xF +#define ZONE_east 0xE +#define ZONE_Default 0xD +#define ZONE_higashi 0xC +#define ZONE_nishi 0xB +#define ZONE_kita 0xA +#define ZONE_minami 0x9 +#define ZONE_stage 0x8 +#define ZONE_7 0x7 +#define ZONE_o135 0x6 +#define ZONE_5 0x5 +#define ZONE_o139 0x4 +#define ZONE_3 0x3 +#define ZONE_o133 0x2 +#define ZONE_1 0x1 +#define ZONE_o137 0x0 + diff --git a/include/mapfs/tst_10_shape.h b/include/mapfs/tst_10_shape.h index e027184de9..3e9f9315c1 100644 --- a/include/mapfs/tst_10_shape.h +++ b/include/mapfs/tst_10_shape.h @@ -1,31 +1,32 @@ -#define MODEL_Root 0x1E -#define MODEL_enter_cam 0x1D -#define MODEL_south 0x1C -#define MODEL_north 0x1B -#define MODEL_west 0x1A -#define MODEL_east 0x19 -#define MODEL_g32 0x18 -#define MODEL_o166 0x17 -#define MODEL_o165 0x16 -#define MODEL_Default 0x15 -#define MODEL_o167 0x14 -#define MODEL_higashi 0x13 -#define MODEL_nishi 0x12 -#define MODEL_kita 0x11 -#define MODEL_minami 0x10 -#define MODEL_maru 0xF -#define MODEL_stage 0xE -#define MODEL_7 0xD -#define MODEL_o135 0xC -#define MODEL_o134 0xB -#define MODEL_5 0xA -#define MODEL_o139 0x9 -#define MODEL_o138 0x8 -#define MODEL_3 0x7 -#define MODEL_o133 0x6 -#define MODEL_o132 0x5 -#define MODEL_1 0x4 -#define MODEL_o137 0x3 -#define MODEL_o136 0x2 -#define MODEL_g1 0x1 -#define MODEL_frame 0x0 +#define MODEL_Root 0x1E +#define MODEL_enter_cam 0x1D +#define MODEL_south 0x1C +#define MODEL_north 0x1B +#define MODEL_west 0x1A +#define MODEL_east 0x19 +#define MODEL_g32 0x18 +#define MODEL_o166 0x17 +#define MODEL_o165 0x16 +#define MODEL_Default 0x15 +#define MODEL_o167 0x14 +#define MODEL_higashi 0x13 +#define MODEL_nishi 0x12 +#define MODEL_kita 0x11 +#define MODEL_minami 0x10 +#define MODEL_maru 0xF +#define MODEL_stage 0xE +#define MODEL_7 0xD +#define MODEL_o135 0xC +#define MODEL_o134 0xB +#define MODEL_5 0xA +#define MODEL_o139 0x9 +#define MODEL_o138 0x8 +#define MODEL_3 0x7 +#define MODEL_o133 0x6 +#define MODEL_o132 0x5 +#define MODEL_1 0x4 +#define MODEL_o137 0x3 +#define MODEL_o136 0x2 +#define MODEL_g1 0x1 +#define MODEL_frame 0x0 + diff --git a/include/mapfs/tst_11_hit.h b/include/mapfs/tst_11_hit.h index 2e637350fa..88f9297bb4 100644 --- a/include/mapfs/tst_11_hit.h +++ b/include/mapfs/tst_11_hit.h @@ -1,5 +1,10 @@ -#define COLLIDER_Root 0x4 -#define COLLIDER_g49 0x3 -#define COLLIDER_deili1 0x2 -#define COLLIDER_deilit1 0x1 -#define COLLIDER_o171 0x0 +#define COLLIDER_Root 0x4 +#define COLLIDER_g49 0x3 +#define COLLIDER_deili1 0x2 +#define COLLIDER_deilit1 0x1 +#define COLLIDER_o171 0x0 + +#define ZONE_Root 0x2 +#define ZONE_g49 0x1 +#define ZONE_o151 0x0 + diff --git a/include/mapfs/tst_11_shape.h b/include/mapfs/tst_11_shape.h index 4e58fd388a..cab1df6ad2 100644 --- a/include/mapfs/tst_11_shape.h +++ b/include/mapfs/tst_11_shape.h @@ -1,77 +1,78 @@ -#define MODEL_Root 0x4C -#define MODEL_g49 0x4B -#define MODEL_o170 0x4A -#define MODEL_o169 0x49 -#define MODEL_o168 0x48 -#define MODEL_o167 0x47 -#define MODEL_g42 0x46 -#define MODEL_g48 0x45 -#define MODEL_o166 0x44 -#define MODEL_o164 0x43 -#define MODEL_o163 0x42 -#define MODEL_o162 0x41 -#define MODEL_o161 0x40 -#define MODEL_g47 0x3F -#define MODEL_o160 0x3E -#define MODEL_g46 0x3D -#define MODEL_o159 0x3C -#define MODEL_o157 0x3B -#define MODEL_o156 0x3A -#define MODEL_o155 0x39 -#define MODEL_g45 0x38 -#define MODEL_o154 0x37 -#define MODEL_o153 0x36 -#define MODEL_g44 0x35 -#define MODEL_o151 0x34 -#define MODEL_o150 0x33 -#define MODEL_g43 0x32 -#define MODEL_o149 0x31 -#define MODEL_g36 0x30 -#define MODEL_g37 0x2F -#define MODEL_o138 0x2E -#define MODEL_o137 0x2D -#define MODEL_o136 0x2C -#define MODEL_o135 0x2B -#define MODEL_g17 0x2A -#define MODEL_g21 0x29 -#define MODEL_o94 0x28 -#define MODEL_g19 0x27 -#define MODEL_o89 0x26 -#define MODEL_o85 0x25 -#define MODEL_g18 0x24 -#define MODEL_o84 0x23 -#define MODEL_o83 0x22 -#define MODEL_o82 0x21 -#define MODEL_g16 0x20 -#define MODEL_o81 0x1F -#define MODEL_o80 0x1E -#define MODEL_o79 0x1D -#define MODEL_o78 0x1C -#define MODEL_g13 0x1B -#define MODEL_o70 0x1A -#define MODEL_o65 0x19 -#define MODEL_o64 0x18 -#define MODEL_o63 0x17 -#define MODEL_g7 0x16 -#define MODEL_g12 0x15 -#define MODEL_o53 0x14 -#define MODEL_o51 0x13 -#define MODEL_o50 0x12 -#define MODEL_o49 0x11 -#define MODEL_o48 0x10 -#define MODEL_g11 0xF -#define MODEL_o47 0xE -#define MODEL_g10 0xD -#define MODEL_o46 0xC -#define MODEL_o42 0xB -#define MODEL_o41 0xA -#define MODEL_o40 0x9 -#define MODEL_g9 0x8 -#define MODEL_o131 0x7 -#define MODEL_o132 0x6 -#define MODEL_o38 0x5 -#define MODEL_g8 0x4 -#define MODEL_o33 0x3 -#define MODEL_o57 0x2 -#define MODEL_g29 0x1 -#define MODEL_o134 0x0 +#define MODEL_Root 0x4C +#define MODEL_g49 0x4B +#define MODEL_o170 0x4A +#define MODEL_o169 0x49 +#define MODEL_o168 0x48 +#define MODEL_o167 0x47 +#define MODEL_g42 0x46 +#define MODEL_g48 0x45 +#define MODEL_o166 0x44 +#define MODEL_o164 0x43 +#define MODEL_o163 0x42 +#define MODEL_o162 0x41 +#define MODEL_o161 0x40 +#define MODEL_g47 0x3F +#define MODEL_o160 0x3E +#define MODEL_g46 0x3D +#define MODEL_o159 0x3C +#define MODEL_o157 0x3B +#define MODEL_o156 0x3A +#define MODEL_o155 0x39 +#define MODEL_g45 0x38 +#define MODEL_o154 0x37 +#define MODEL_o153 0x36 +#define MODEL_g44 0x35 +#define MODEL_o151 0x34 +#define MODEL_o150 0x33 +#define MODEL_g43 0x32 +#define MODEL_o149 0x31 +#define MODEL_g36 0x30 +#define MODEL_g37 0x2F +#define MODEL_o138 0x2E +#define MODEL_o137 0x2D +#define MODEL_o136 0x2C +#define MODEL_o135 0x2B +#define MODEL_g17 0x2A +#define MODEL_g21 0x29 +#define MODEL_o94 0x28 +#define MODEL_g19 0x27 +#define MODEL_o89 0x26 +#define MODEL_o85 0x25 +#define MODEL_g18 0x24 +#define MODEL_o84 0x23 +#define MODEL_o83 0x22 +#define MODEL_o82 0x21 +#define MODEL_g16 0x20 +#define MODEL_o81 0x1F +#define MODEL_o80 0x1E +#define MODEL_o79 0x1D +#define MODEL_o78 0x1C +#define MODEL_g13 0x1B +#define MODEL_o70 0x1A +#define MODEL_o65 0x19 +#define MODEL_o64 0x18 +#define MODEL_o63 0x17 +#define MODEL_g7 0x16 +#define MODEL_g12 0x15 +#define MODEL_o53 0x14 +#define MODEL_o51 0x13 +#define MODEL_o50 0x12 +#define MODEL_o49 0x11 +#define MODEL_o48 0x10 +#define MODEL_g11 0xF +#define MODEL_o47 0xE +#define MODEL_g10 0xD +#define MODEL_o46 0xC +#define MODEL_o42 0xB +#define MODEL_o41 0xA +#define MODEL_o40 0x9 +#define MODEL_g9 0x8 +#define MODEL_o131 0x7 +#define MODEL_o132 0x6 +#define MODEL_o38 0x5 +#define MODEL_g8 0x4 +#define MODEL_o33 0x3 +#define MODEL_o57 0x2 +#define MODEL_g29 0x1 +#define MODEL_o134 0x0 + diff --git a/include/mapfs/tst_12_hit.h b/include/mapfs/tst_12_hit.h index 080f8d626f..3821c1c971 100644 --- a/include/mapfs/tst_12_hit.h +++ b/include/mapfs/tst_12_hit.h @@ -1,18 +1,23 @@ -#define COLLIDER_Root 0x11 -#define COLLIDER_g5 0x10 -#define COLLIDER_o89 0xF -#define COLLIDER_o88 0xE -#define COLLIDER_o87 0xD -#define COLLIDER_o86 0xC -#define COLLIDER_o85 0xB -#define COLLIDER_o28 0xA -#define COLLIDER_o25 0x9 -#define COLLIDER_g13 0x8 -#define COLLIDER_o56 0x7 -#define COLLIDER_o55 0x6 -#define COLLIDER_o54 0x5 -#define COLLIDER_o53 0x4 -#define COLLIDER_o52 0x3 -#define COLLIDER_g6 0x2 -#define COLLIDER_o34 0x1 -#define COLLIDER_o92 0x0 +#define COLLIDER_Root 0x11 +#define COLLIDER_g5 0x10 +#define COLLIDER_o89 0xF +#define COLLIDER_o88 0xE +#define COLLIDER_o87 0xD +#define COLLIDER_o86 0xC +#define COLLIDER_o85 0xB +#define COLLIDER_o28 0xA +#define COLLIDER_o25 0x9 +#define COLLIDER_g13 0x8 +#define COLLIDER_o56 0x7 +#define COLLIDER_o55 0x6 +#define COLLIDER_o54 0x5 +#define COLLIDER_o53 0x4 +#define COLLIDER_o52 0x3 +#define COLLIDER_g6 0x2 +#define COLLIDER_o34 0x1 +#define COLLIDER_o92 0x0 + +#define ZONE_Root 0x2 +#define ZONE_g6 0x1 +#define ZONE_o31 0x0 + diff --git a/include/mapfs/tst_12_shape.h b/include/mapfs/tst_12_shape.h index a51fd85bbb..0a0ada1643 100644 --- a/include/mapfs/tst_12_shape.h +++ b/include/mapfs/tst_12_shape.h @@ -1,67 +1,68 @@ -#define MODEL_Root 0x42 -#define MODEL_g21 0x41 -#define MODEL_o91 0x40 -#define MODEL_o90 0x3F -#define MODEL_g20 0x3E -#define MODEL_o83 0x3D -#define MODEL_o82 0x3C -#define MODEL_g19 0x3B -#define MODEL_o76 0x3A -#define MODEL_o73 0x39 -#define MODEL_o71 0x38 -#define MODEL_o70 0x37 -#define MODEL_o69 0x36 -#define MODEL_o67 0x35 -#define MODEL_g18 0x34 -#define MODEL_o62 0x33 -#define MODEL_o61 0x32 -#define MODEL_g17 0x31 -#define MODEL_o80 0x30 -#define MODEL_o79 0x2F -#define MODEL_o78 0x2E -#define MODEL_o77 0x2D -#define MODEL_o65 0x2C -#define MODEL_o64 0x2B -#define MODEL_o60 0x2A -#define MODEL_o59 0x29 -#define MODEL_o58 0x28 -#define MODEL_g13 0x27 -#define MODEL_o56 0x26 -#define MODEL_o55 0x25 -#define MODEL_o54 0x24 -#define MODEL_o53 0x23 -#define MODEL_o52 0x22 -#define MODEL_g8 0x21 -#define MODEL_g12 0x20 -#define MODEL_o81 0x1F -#define MODEL_o63 0x1E -#define MODEL_o51 0x1D -#define MODEL_o50 0x1C -#define MODEL_o49 0x1B -#define MODEL_o48 0x1A -#define MODEL_g11 0x19 -#define MODEL_o47 0x18 -#define MODEL_o46 0x17 -#define MODEL_o45 0x16 -#define MODEL_o44 0x15 -#define MODEL_g10 0x14 -#define MODEL_o40 0x13 -#define MODEL_o39 0x12 -#define MODEL_o38 0x11 -#define MODEL_o22 0x10 -#define MODEL_g5 0xF -#define MODEL_o89 0xE -#define MODEL_o88 0xD -#define MODEL_o87 0xC -#define MODEL_o86 0xB -#define MODEL_o85 0xA -#define MODEL_o25 0x9 -#define MODEL_g6 0x8 -#define MODEL_g7 0x7 -#define MODEL_o37 0x6 -#define MODEL_o36 0x5 -#define MODEL_o35 0x4 -#define MODEL_o34 0x3 -#define MODEL_o33 0x2 -#define MODEL_o32 0x1 -#define MODEL_o31 0x0 +#define MODEL_Root 0x42 +#define MODEL_g21 0x41 +#define MODEL_o91 0x40 +#define MODEL_o90 0x3F +#define MODEL_g20 0x3E +#define MODEL_o83 0x3D +#define MODEL_o82 0x3C +#define MODEL_g19 0x3B +#define MODEL_o76 0x3A +#define MODEL_o73 0x39 +#define MODEL_o71 0x38 +#define MODEL_o70 0x37 +#define MODEL_o69 0x36 +#define MODEL_o67 0x35 +#define MODEL_g18 0x34 +#define MODEL_o62 0x33 +#define MODEL_o61 0x32 +#define MODEL_g17 0x31 +#define MODEL_o80 0x30 +#define MODEL_o79 0x2F +#define MODEL_o78 0x2E +#define MODEL_o77 0x2D +#define MODEL_o65 0x2C +#define MODEL_o64 0x2B +#define MODEL_o60 0x2A +#define MODEL_o59 0x29 +#define MODEL_o58 0x28 +#define MODEL_g13 0x27 +#define MODEL_o56 0x26 +#define MODEL_o55 0x25 +#define MODEL_o54 0x24 +#define MODEL_o53 0x23 +#define MODEL_o52 0x22 +#define MODEL_g8 0x21 +#define MODEL_g12 0x20 +#define MODEL_o81 0x1F +#define MODEL_o63 0x1E +#define MODEL_o51 0x1D +#define MODEL_o50 0x1C +#define MODEL_o49 0x1B +#define MODEL_o48 0x1A +#define MODEL_g11 0x19 +#define MODEL_o47 0x18 +#define MODEL_o46 0x17 +#define MODEL_o45 0x16 +#define MODEL_o44 0x15 +#define MODEL_g10 0x14 +#define MODEL_o40 0x13 +#define MODEL_o39 0x12 +#define MODEL_o38 0x11 +#define MODEL_o22 0x10 +#define MODEL_g5 0xF +#define MODEL_o89 0xE +#define MODEL_o88 0xD +#define MODEL_o87 0xC +#define MODEL_o86 0xB +#define MODEL_o85 0xA +#define MODEL_o25 0x9 +#define MODEL_g6 0x8 +#define MODEL_g7 0x7 +#define MODEL_o37 0x6 +#define MODEL_o36 0x5 +#define MODEL_o35 0x4 +#define MODEL_o34 0x3 +#define MODEL_o33 0x2 +#define MODEL_o32 0x1 +#define MODEL_o31 0x0 + diff --git a/include/mapfs/tst_13_hit.h b/include/mapfs/tst_13_hit.h index bddf6b88b7..80c906317f 100644 --- a/include/mapfs/tst_13_hit.h +++ b/include/mapfs/tst_13_hit.h @@ -1,7 +1,12 @@ -#define COLLIDER_Root 0x6 -#define COLLIDER_spot 0x5 -#define COLLIDER_point 0x4 -#define COLLIDER_g34 0x3 -#define COLLIDER_deili1 0x2 -#define COLLIDER_around 0x1 -#define COLLIDER_o152 0x0 +#define COLLIDER_Root 0x6 +#define COLLIDER_spot 0x5 +#define COLLIDER_point 0x4 +#define COLLIDER_g34 0x3 +#define COLLIDER_deili1 0x2 +#define COLLIDER_around 0x1 +#define COLLIDER_o152 0x0 + +#define ZONE_Root 0x2 +#define ZONE_g34 0x1 +#define ZONE_o152 0x0 + diff --git a/include/mapfs/tst_13_shape.h b/include/mapfs/tst_13_shape.h index 0e69b2f2c8..bed29e4744 100644 --- a/include/mapfs/tst_13_shape.h +++ b/include/mapfs/tst_13_shape.h @@ -1,8 +1,9 @@ -#define MODEL_Root 0x7 -#define MODEL_spot 0x6 -#define MODEL_point 0x5 -#define MODEL_g34 0x4 -#define MODEL_o157 0x3 -#define MODEL_around 0x2 -#define MODEL_o152 0x1 -#define MODEL_o151 0x0 +#define MODEL_Root 0x7 +#define MODEL_spot 0x6 +#define MODEL_point 0x5 +#define MODEL_g34 0x4 +#define MODEL_o157 0x3 +#define MODEL_around 0x2 +#define MODEL_o152 0x1 +#define MODEL_o151 0x0 + diff --git a/include/mapfs/tst_20_hit.h b/include/mapfs/tst_20_hit.h index 30036a3c37..b5fe6d5be4 100644 --- a/include/mapfs/tst_20_hit.h +++ b/include/mapfs/tst_20_hit.h @@ -1,33 +1,38 @@ -#define COLLIDER_Root 0x20 -#define COLLIDER_tukaeruyo 0x1F -#define COLLIDER_o51 0x1E -#define COLLIDER_o34 0x1D -#define COLLIDER_g1 0x1C -#define COLLIDER_deili5b 0x1B -#define COLLIDER_5b 0x1A -#define COLLIDER_deili4b 0x19 -#define COLLIDER_4b 0x18 -#define COLLIDER_deili3b 0x17 -#define COLLIDER_3b 0x16 -#define COLLIDER_deili10a 0x15 -#define COLLIDER_10a 0x14 -#define COLLIDER_deili9a 0x13 -#define COLLIDER_9a 0x12 -#define COLLIDER_deili8a 0x11 -#define COLLIDER_8a 0x10 -#define COLLIDER_deili7a 0xF -#define COLLIDER_7a 0xE -#define COLLIDER_deili6a 0xD -#define COLLIDER_6a 0xC -#define COLLIDER_deili5a 0xB -#define COLLIDER_5a 0xA -#define COLLIDER_deili4a 0x9 -#define COLLIDER_4a 0x8 -#define COLLIDER_deili3a 0x7 -#define COLLIDER_3a 0x6 -#define COLLIDER_deili2 0x5 -#define COLLIDER_2 0x4 -#define COLLIDER_deili1 0x3 -#define COLLIDER_1 0x2 -#define COLLIDER_g3 0x1 -#define COLLIDER_o10 0x0 +#define COLLIDER_Root 0x20 +#define COLLIDER_tukaeruyo 0x1F +#define COLLIDER_o51 0x1E +#define COLLIDER_o34 0x1D +#define COLLIDER_g1 0x1C +#define COLLIDER_deili5b 0x1B +#define COLLIDER_5b 0x1A +#define COLLIDER_deili4b 0x19 +#define COLLIDER_4b 0x18 +#define COLLIDER_deili3b 0x17 +#define COLLIDER_3b 0x16 +#define COLLIDER_deili10a 0x15 +#define COLLIDER_10a 0x14 +#define COLLIDER_deili9a 0x13 +#define COLLIDER_9a 0x12 +#define COLLIDER_deili8a 0x11 +#define COLLIDER_8a 0x10 +#define COLLIDER_deili7a 0xF +#define COLLIDER_7a 0xE +#define COLLIDER_deili6a 0xD +#define COLLIDER_6a 0xC +#define COLLIDER_deili5a 0xB +#define COLLIDER_5a 0xA +#define COLLIDER_deili4a 0x9 +#define COLLIDER_4a 0x8 +#define COLLIDER_deili3a 0x7 +#define COLLIDER_3a 0x6 +#define COLLIDER_deili2 0x5 +#define COLLIDER_2 0x4 +#define COLLIDER_deili1 0x3 +#define COLLIDER_1 0x2 +#define COLLIDER_g3 0x1 +#define COLLIDER_o10 0x0 + +#define ZONE_Root 0x2 +#define ZONE_g3 0x1 +#define ZONE_o10 0x0 + diff --git a/include/mapfs/tst_20_shape.h b/include/mapfs/tst_20_shape.h index b04c8ed096..2cc4b35dba 100644 --- a/include/mapfs/tst_20_shape.h +++ b/include/mapfs/tst_20_shape.h @@ -1,20 +1,21 @@ -#define MODEL_Root 0x13 -#define MODEL_g4 0x12 -#define MODEL_o17 0x11 -#define MODEL_g1 0x10 -#define MODEL_5b 0xF -#define MODEL_4b 0xE -#define MODEL_3b 0xD -#define MODEL_10a 0xC -#define MODEL_9a 0xB -#define MODEL_8a 0xA -#define MODEL_7a 0x9 -#define MODEL_6a 0x8 -#define MODEL_5a 0x7 -#define MODEL_4a 0x6 -#define MODEL_3a 0x5 -#define MODEL_2 0x4 -#define MODEL_1 0x3 -#define MODEL_g3 0x2 -#define MODEL_o10 0x1 -#define MODEL_o9 0x0 +#define MODEL_Root 0x13 +#define MODEL_g4 0x12 +#define MODEL_o17 0x11 +#define MODEL_g1 0x10 +#define MODEL_5b 0xF +#define MODEL_4b 0xE +#define MODEL_3b 0xD +#define MODEL_10a 0xC +#define MODEL_9a 0xB +#define MODEL_8a 0xA +#define MODEL_7a 0x9 +#define MODEL_6a 0x8 +#define MODEL_5a 0x7 +#define MODEL_4a 0x6 +#define MODEL_3a 0x5 +#define MODEL_2 0x4 +#define MODEL_1 0x3 +#define MODEL_g3 0x2 +#define MODEL_o10 0x1 +#define MODEL_o9 0x0 + diff --git a/include/npc.h b/include/npc.h index f12cc7fd80..6787ff7324 100644 --- a/include/npc.h +++ b/include/npc.h @@ -405,11 +405,11 @@ void init_npc_list(void); /// Presumably did something once upon a time but got commented out. void npc_iter_no_op(void); -s32 _create_npc(NpcBlueprint* blueprint, AnimID** animList, s32 skipLoadingAnims); +s32 _create_npc(NpcBlueprint* blueprint, AnimID* animList, s32 skipLoadingAnims); s32 _create_npc_basic(NpcBlueprint* blueprint); -s32 _create_npc_standard(NpcBlueprint* blueprint, AnimID** animList); +s32 _create_npc_standard(NpcBlueprint* blueprint, AnimID* animList); s32 _create_npc_partner(NpcBlueprint* blueprint); diff --git a/include/script_api/common.h b/include/script_api/common.h index f059f0fe8e..a045799223 100644 --- a/include/script_api/common.h +++ b/include/script_api/common.h @@ -218,9 +218,11 @@ ApiStatus ClampAngleFloat(Evt* script, s32 isInitialCall); ApiStatus FadeOutMusic(Evt* script, s32 isInitialCall); ApiStatus SetMusicTrack(Evt* script, s32 isInitialCall); ApiStatus FadeInMusic(Evt* script, s32 isInitialCall); +ApiStatus SetMusicTrackVolumes(Evt* script, s32 isInitialCall); ApiStatus ClearAmbientSounds(Evt* script, s32 isInitialCall); ApiStatus PlayAmbientSounds(Evt* script, s32 isInitialCall); ApiStatus PlaySound(Evt* script, s32 isInitialCall); +ApiStatus PlaySoundWithVolume(Evt* script, s32 isInitialCall); ApiStatus PlaySoundAt(Evt* script, s32 isInitialCall); ApiStatus StopSound(Evt* script, s32 isInitialCall); ApiStatus UseDoorSounds(Evt* script, s32 isInitialCall); @@ -262,6 +264,7 @@ ApiStatus DemoJoystickRadial(Evt* script, s32 isInitialCall); ApiStatus DemoJoystickXY(Evt* script, s32 isInitialCall); ApiStatus WaitForPlayerInputEnabled(Evt* script, s32 isInitialCall); ApiStatus IsPlayerOnValidFloor(Evt* script, s32 isInitialCall); +ApiStatus WaitForPlayerMoveToComplete(Evt* script, s32 isInitialCall); ApiStatus func_802CFE2C(Evt* script, s32 isInitialCall); ApiStatus func_802CFD30(Evt* script, s32 isInitialCall); ApiStatus IsStartingConversation(Evt* script, s32 isInitialCall); diff --git a/src/16F740.c b/src/16F740.c index bc768d58c1..a4d712e67b 100644 --- a/src/16F740.c +++ b/src/16F740.c @@ -252,9 +252,9 @@ void btl_state_update_normal_start(void) { battleStatus->damageTaken = 0; battleStatus->nextMerleeSpellType = 0; battleStatus->unk_83 = 0; - gCameras[CAM_DEFAULT].flags |= CAMERA_FLAGS_2; - gCameras[CAM_BATTLE].flags |= CAMERA_FLAGS_2; - gCameras[CAM_TATTLE].flags |= CAMERA_FLAGS_2; + gCameras[CAM_DEFAULT].flags |= CAMERA_FLAGS_ENABLED; + gCameras[CAM_BATTLE].flags |= CAMERA_FLAGS_ENABLED; + gCameras[CAM_TATTLE].flags |= CAMERA_FLAGS_ENABLED; if (is_ability_active(ABILITY_MYSTERY_SCROLL)) { battleStatus->unk_83 = 1; } diff --git a/src/77480.c b/src/77480.c index 84f6b8f373..d5260a75ae 100644 --- a/src/77480.c +++ b/src/77480.c @@ -764,7 +764,7 @@ void player_reset_data(void) { PlayerStatus* playerStatus = &gPlayerStatus; mem_clear(playerStatus, sizeof(PlayerStatus)); - playerStatus->flags = PS_FLAGS_1; + playerStatus->flags = PS_FLAGS_HAS_REFLECTION; reset_player_status(); playerStatus->shadowID = create_shadow_type(0, playerStatus->position.x, playerStatus->position.y, playerStatus->position.z); diff --git a/src/8800.c b/src/8800.c index d501890c58..6bebdda324 100644 --- a/src/8800.c +++ b/src/8800.c @@ -13,7 +13,7 @@ void update_cameras(void) { for (i = 0; i < ARRAY_COUNT(gCameras); i++) { Camera* cam = &gCameras[i]; - if (cam->flags != 0 && !(cam->flags & CAM_FLAG_ENABLED)) { + if (cam->flags != 0 && !(cam->flags & CAMERA_FLAGS_ENABLED)) { s32 sx; s32 sy; s32 sz; @@ -47,18 +47,18 @@ void update_cameras(void) { guLookAtReflectF(cam->viewMtxPlayer, &gDisplayContext->lookAt, cam->lookAt_eye.x, cam->lookAt_eye.y, cam->lookAt_eye.z, cam->lookAt_obj.x, cam->lookAt_obj.y, cam->lookAt_obj.z, 0, 1.0f, 0); - if (!(cam->flags & CAM_FLAG_ORTHO)) { - if (cam->flags & CAM_FLAG_LEAD_PLAYER) { + if (!(cam->flags & CAMERA_FLAGS_ORTHO)) { + if (cam->flags & CAMERA_FLAGS_LEAD_PLAYER) { create_camera_leadplayer_matrix(cam); } guPerspectiveF(cam->perspectiveMatrix, &cam->perspNorm, cam->vfov, (f32) cam->viewportW / (f32) cam->viewportH, (f32) cam->nearClip, (f32) cam->farClip, 1.0f); - if (cam->flags & CAM_FLAG_SHAKING) { + if (cam->flags & CAMERA_FLAGS_SHAKING) { guMtxCatF(cam->viewMtxShaking, cam->perspectiveMatrix, cam->perspectiveMatrix); } - if (cam->flags & CAM_FLAG_LEAD_PLAYER) { + if (cam->flags & CAMERA_FLAGS_LEAD_PLAYER) { guMtxCatF(cam->viewMtxLeading, cam->perspectiveMatrix, cam->perspectiveMatrix); } @@ -99,7 +99,7 @@ void render_frame(s32 flag) { for (; camID < ARRAY_COUNT(gCameras) - flag; camID++) { Camera* camera = &gCameras[camID]; - if (camera->flags != 0 && !(camera->flags & (CAM_FLAG_80 | CAM_FLAG_ENABLED))) { + if (camera->flags != 0 && !(camera->flags & (CAMERA_FLAGS_80 | CAMERA_FLAGS_ENABLED))) { u16 matrixListPos; gCurrentCamID = camID; @@ -167,7 +167,7 @@ void render_frame(s32 flag) { osVirtualToPhysical(nuGfxCfb_ptr)); gDPPipeSync(gMasterGfxPos++); - if (!(camera->flags & CAM_FLAG_ORTHO)) { + if (!(camera->flags & CAMERA_FLAGS_ORTHO)) { gSPPerspNormalize(gMasterGfxPos++, camera->perspNorm); } @@ -182,12 +182,12 @@ void render_frame(s32 flag) { camera->vpAlt.vp.vtrans[0] = camera->vp.vp.vtrans[0] + gGameStatusPtr->unk_82; camera->vpAlt.vp.vtrans[1] = camera->vp.vp.vtrans[1] + gGameStatusPtr->unk_83; - if (!(camera->flags & CAM_FLAG_ORTHO)) { + if (!(camera->flags & CAMERA_FLAGS_ORTHO)) { if (gCurrentCamID != CAM_3) { - if (!(camera->flags & CAM_FLAG_200)) { + if (!(camera->flags & CAMERA_FLAGS_RENDER_ENTITIES)) { render_entities(); } - if (!(camera->flags & CAM_FLAG_400)) { + if (!(camera->flags & CAMERA_FLAGS_RENDER_MODELS)) { render_models(); } render_player(); @@ -233,7 +233,7 @@ void create_cameras_a(void) { gCameras[i].flags = 0; } - camDataPtr->flags = CAM_FLAG_ENABLED; + camDataPtr->flags = CAMERA_FLAGS_ENABLED; camDataPtr->type = 0; camDataPtr->viewWidth = 160; camDataPtr->viewHeight = 120; @@ -244,7 +244,7 @@ void create_cameras_a(void) { camDataPtr->vfov = 50; initialize_next_camera(camDataPtr); - camDataPtr->flags = CAM_FLAG_ENABLED; + camDataPtr->flags = CAMERA_FLAGS_ENABLED; camDataPtr->type = 0; camDataPtr->viewWidth = 160; camDataPtr->viewHeight = 120; @@ -255,7 +255,7 @@ void create_cameras_a(void) { camDataPtr->vfov = 50; initialize_next_camera(camDataPtr); - camDataPtr->flags = CAM_FLAG_ENABLED; + camDataPtr->flags = CAMERA_FLAGS_ENABLED; camDataPtr->type = 0; camDataPtr->viewWidth = 160; camDataPtr->viewHeight = 120; @@ -266,7 +266,7 @@ void create_cameras_a(void) { camDataPtr->vfov = 50; initialize_next_camera(camDataPtr); - camDataPtr->flags = CAM_FLAG_ENABLED; + camDataPtr->flags = CAMERA_FLAGS_ENABLED; camDataPtr->type = 0; camDataPtr->viewWidth = 160; camDataPtr->viewHeight = 120; @@ -287,7 +287,7 @@ void create_cameras_b(void) { gCameras[i].flags = 0; } - camDataPtr->flags = CAM_FLAG_ENABLED; + camDataPtr->flags = CAMERA_FLAGS_ENABLED; camDataPtr->type = 0; camDataPtr->viewWidth = 160; camDataPtr->viewHeight = 120; @@ -298,7 +298,7 @@ void create_cameras_b(void) { camDataPtr->vfov = 50; initialize_next_camera(camDataPtr); - camDataPtr->flags = CAM_FLAG_ENABLED; + camDataPtr->flags = CAMERA_FLAGS_ENABLED; camDataPtr->type = 0; camDataPtr->viewWidth = 160; camDataPtr->viewHeight = 120; @@ -309,7 +309,7 @@ void create_cameras_b(void) { camDataPtr->vfov = 50; initialize_next_camera(camDataPtr); - camDataPtr->flags = CAM_FLAG_ENABLED; + camDataPtr->flags = CAMERA_FLAGS_ENABLED; camDataPtr->type = 0; camDataPtr->viewWidth = 160; camDataPtr->viewHeight = 120; @@ -320,7 +320,7 @@ void create_cameras_b(void) { camDataPtr->vfov = 50; initialize_next_camera(camDataPtr); - camDataPtr->flags = CAM_FLAG_ENABLED; + camDataPtr->flags = CAMERA_FLAGS_ENABLED; camDataPtr->type = 0; camDataPtr->viewWidth = 160; camDataPtr->viewHeight = 120; @@ -346,7 +346,7 @@ Camera* initialize_next_camera(CameraInitData* initData) { ASSERT(camID < ARRAY_COUNT(gCameras)); - camera->flags = initData->flags | (CAM_FLAG_1 | CAM_FLAG_LEAD_PLAYER); + camera->flags = initData->flags | (CAMERA_FLAGS_1 | CAMERA_FLAGS_LEAD_PLAYER); camera->moveFlags = 0; camera->lookAt_eye.x = 0; camera->lookAt_eye.y = 0; @@ -392,7 +392,7 @@ Camera* initialize_next_camera(CameraInitData* initData) { camera->unk_528 = 0.0f; camera->unk_52C = 0; camera->aabbForZoneBelow = 0; - camera->unk_506 = 0; + camera->panActive = FALSE; camera->followPlayer = 0; camera->unk_C4 = 1000.0f; camera->unk_520 = 0.2f; diff --git a/src/B0E0.c b/src/B0E0.c index 876d4e7241..59c691e4fd 100644 --- a/src/B0E0.c +++ b/src/B0E0.c @@ -793,7 +793,7 @@ void update_camera_zone_interp(Camera* camera) { } temp2 = targetZ; - if (camera->unk_506 != 0 || camera->unk_4A4 != targetX || camera->unk_4A8 != targetY || + if (camera->panActive || camera->unk_4A4 != targetX || camera->unk_4A8 != targetY || camera->unk_4AC != targetZ || camera->changingMap) { if (camera->followPlayer) { @@ -852,7 +852,7 @@ void update_camera_zone_interp(Camera* camera) { } } - if (camera->unk_506 != 0 || (!cond2 && cs2 != currentController)) { + if (camera->panActive || (!cond2 && cs2 != currentController)) { if (camera->interpAlpha == 1.0f) { camera->prevController = camera->currentController; } else { @@ -864,7 +864,7 @@ void update_camera_zone_interp(Camera* camera) { camera->currentController = cs; camera->interpAlpha = 0.0f; camera->linearInterp = 0.0f; - camera->unk_506 = 0; + camera->panActive = FALSE; camera->linearInterpScale = camera->moveSpeed; camera->prevPrevFollowFlags = camera->prevFollowFlags; camera->prevFollowFlags = camera->followPlayer; diff --git a/src/battle/area_kzn2/59E6E0.c b/src/battle/area_kzn2/59E6E0.c index 3086c9e923..bbd6695555 100644 --- a/src/battle/area_kzn2/59E6E0.c +++ b/src/battle/area_kzn2/59E6E0.c @@ -1,7 +1,15 @@ #include "common.h" +#include "effects.h" #define NAMESPACE b_area_kzn2 +s32 bgm_init_music_players(void); + +extern Gfx D_8021CF40_5A3620[]; +extern s32 D_80222B68_5A9248; +extern s32 D_80222D48_5A9428[]; +extern s32 D_80222E20_5A9500[]; + enum { VINE_0 = 0, VINE_1 = 1, @@ -26,31 +34,234 @@ typedef struct LavaPiranhaVine { /* 0x1DC */ s32 numPoints; } LavaPiranhaVine; -typedef struct LavaPiranhaVineSet { - LavaPiranhaVine vines[NUM_VINES]; -} LavaPiranhaVineSet; // size = 0x780 - #include "common/StartRumbleWithParams.inc.c" -extern LavaPiranhaVineSet* D_8022ADD0; -extern s32 N(VineRenderState); // TODO static +static LavaPiranhaVine N(VineData)[NUM_VINES]; +static s32 N(VineRenderState); -// N(make_vine_interpolation) -INCLUDE_ASM(s32, "battle/area_kzn2/59E6E0", func_80218058_59E738); +void N(make_vine_interpolation)(LavaPiranhaVine* vine) { + Evt dummyEvt; + Evt* dummyEvtPtr = &dummyEvt; + s32 args[4]; + s32 count; -// N(SetVineBonePos) -INCLUDE_ASM(s32, "battle/area_kzn2/59E6E0", func_8021812C_59E80C); + // setup dummy call to LoadPath + args[0] = 3 * vine->boneCount; // generate three output samples per input + args[1] = (s32) &vine->bonePos; // points + args[2] = vine->boneCount; // num vectors + args[3] = EASING_LINEAR; + dummyEvtPtr->ptrReadPos = args; + LoadPath(dummyEvtPtr, 1); -// N(SetVineBoneRot) -INCLUDE_ASM(s32, "battle/area_kzn2/59E6E0", func_80218224_59E904); + count = 0; + do { + GetNextPathPos(dummyEvtPtr, 1); + vine->points[count].x = evt_get_float_variable(dummyEvtPtr, LVar1); + vine->points[count].y = evt_get_float_variable(dummyEvtPtr, LVar2); + vine->points[count].z = evt_get_float_variable(dummyEvtPtr, LVar3); + count++; + } while (dummyEvtPtr->varTable[0] != 0); + vine->numPoints = count; +} -// N(SetVineBoneScale) -INCLUDE_ASM(s32, "battle/area_kzn2/59E6E0", func_802182E4_59E9C4); +API_CALLABLE(N(SetVineBonePos)) { + Bytecode* args = script->ptrReadPos; + s32 vineIdx = evt_get_variable(script, *args++); + s32 jointIdx = evt_get_variable(script, *args++); + s32 x = evt_get_variable(script, *args++); + s32 y = evt_get_variable(script, *args++); + s32 z = evt_get_variable(script, *args++); + LavaPiranhaVine* vine = &N(VineData)[vineIdx]; -void func_8021835C_59EA3C(void* data); + vine->bonePos[jointIdx].x = x; + vine->bonePos[jointIdx].y = y; + vine->bonePos[jointIdx].z = z; + return ApiStatus_DONE2; +} +API_CALLABLE(N(SetVineBoneRot)) { + Bytecode* args = script->ptrReadPos; + s32 vineIdx = evt_get_variable(script, *args++); + s32 jointIdx = evt_get_variable(script, *args++); + s32 rx = evt_get_variable(script, *args++); + s32 ry = evt_get_variable(script, *args++); + f32 rz = evt_get_variable(script, *args++); + LavaPiranhaVine* vine = &N(VineData)[vineIdx]; + + vine->boneRot[jointIdx] = rz; + return ApiStatus_DONE2; +} + +API_CALLABLE(N(SetVineBoneScale)) { + Bytecode* args = script->ptrReadPos; + s32 vineIdx = evt_get_variable(script, *args++); + s32 jointIdx = evt_get_variable(script, *args++); + s32 sx = evt_get_variable(script, *args++); + s32 sy = evt_get_variable(script, *args++); + s32 sz = evt_get_variable(script, *args++); + LavaPiranhaVine* vine = &N(VineData)[vineIdx]; + + // do nothing + return ApiStatus_DONE2; +} + +// the f64 90.0 ends up in the wrong place +#ifdef NON_MATCHING // N(appendGfx_piranha_vines) +void func_8021835C_59EA3C(void* data) { + Vtx_t* vtxBuffer; + Vtx_t* vtx; + + f32 boneLength; + s32 boneCount; + + f32 angle; + f32 nextAngle; + f32 curAngle1; + f32 curAngle2; + + f32 alphaCoord; + f32 alphaFrac; + s32 nearest; + + s32 numPoints; + s32 i, j; + + f32 deltaX, deltaY; + f32 posX, posY, posZ; + + if (N(VineRenderState) == -1) { + return; + } + + if (N(VineRenderState) == 0) { + for (i = 0; i < NUM_VINES; i++) { + LavaPiranhaVine* vine = &N(VineData)[i]; + + switch (i) { + default: + return; + case 0: + boneCount = 9; + boneLength = 10.0f; + break; + case 1: + boneCount = 7; + boneLength = 8.0f; + break; + case 2: + boneCount = 7; + boneLength = 8.0f; + break; + case 3: + boneCount = 5; + boneLength = 8.0f; + break; + } + + vine->boneCount = boneCount; + vine->boneLength = boneLength; + + for (j = 0; j < boneCount; j++) { + if (j == (boneCount - 1)) { + vine->boneRot[j] += 90.0f; + } else { + curAngle1 = vine->boneRot[j]; + nextAngle = vine->boneRot[j + 1]; + if (nextAngle - curAngle1 > 180.0f) { + curAngle1 += 360.0f; + } else if (nextAngle - curAngle1 < -180.0f) { + nextAngle += 360.0f; + } + // average cur and next angles + vine->boneRot[j] = ((curAngle1 + nextAngle) / 2.0) + 90.0; + } + } + + b_area_kzn2_make_vine_interpolation(vine); + } + + N(VineRenderState) = 1; + } + + gDPPipeSync(gMasterGfxPos++); + gSPDisplayList(gMasterGfxPos++, D_8021CF40_5A3620); + + for (i = 0; i < NUM_VINES; i++) { + LavaPiranhaVine* vine = &N(VineData)[i]; + + boneLength = vine->boneLength; + boneCount = vine->boneCount; + numPoints = vine->numPoints; + + // we'll build the vertex data and place it in the display list, so jump forward + // here and leave space behind for the gSPBranchList command followed by two vertices + // for each point in numPoints + + vtxBuffer = (Vtx_t*)(gMasterGfxPos + 1); + gSPBranchList(gMasterGfxPos, &gMasterGfxPos[1 + 2 * (2 * numPoints)]); + vtx = (Vtx_t*) (++gMasterGfxPos); + gMasterGfxPos = &gMasterGfxPos[2 * (2 * numPoints)]; + + for (j = 0; j < numPoints; j++) { + posX = vine->points[j].x; + posY = vine->points[j].y; + posZ = vine->points[j].z; + + alphaCoord = ((f32) j * boneCount) / numPoints; + nearest = (s32) alphaCoord; + alphaFrac = alphaCoord - (f32)nearest; + + if (nearest + 1 >= boneCount) { + angle = vine->boneRot[boneCount - 1]; + } else { + curAngle2 = vine->boneRot[nearest]; + nextAngle = vine->boneRot[nearest + 1]; + if (nextAngle - curAngle2 > 180.0f) { + nextAngle -= 360.0f; + } + if (nextAngle - curAngle2 < -180.0f) { + nextAngle += 360.0f; + } + angle = ((nextAngle - curAngle2) * alphaFrac) + curAngle2; + } + + deltaX = sin_deg(angle) * boneLength; + deltaY = -cos_deg(angle) * boneLength; + + vtx->ob[0] = posX + deltaX; + vtx->ob[1] = posY + deltaY; + vtx->ob[2] = posZ; + vtx->tc[0] = j * 0x140; + vtx->tc[1] = 0; + vtx->cn[0] = j * 50; + vtx->cn[1] = j * 120;; + vtx->cn[2] = j * 30; + vtx++; + + vtx->ob[0] = posX - deltaX; + vtx->ob[1] = posY - deltaY; + vtx->ob[2] = posZ; + vtx->tc[0] = j * 0x140; + vtx->tc[1] = 0x400; + vtx->cn[0] = j * 50; + vtx->cn[1] = j * 120;; + vtx->cn[2] = j * 30; + vtx++; + } + + for (j = 0; j < numPoints - 1; j++) { + gSPVertex(gMasterGfxPos++, &vtxBuffer[2*j], 4, 0); + gSP2Triangles(gMasterGfxPos++, 1, 0, 2, 0, 1, 2, 3, 0); + } + } + + gDPPipeSync(gMasterGfxPos++); +} +#else +void func_8021835C_59EA3C(void* data); INCLUDE_ASM(s32, "battle/area_kzn2/59E6E0", func_8021835C_59EA3C); +#endif void N(worker_render_piranha_vines)(void) { RenderTask renderTask; @@ -74,12 +285,76 @@ API_CALLABLE(N(CreateVineRenderer)) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "battle/area_kzn2/59E6E0", func_80218930_59F010); +API_CALLABLE(N(func_80218930_59F010)) { + Bytecode* args = script->ptrReadPos; + EffectInstance* effect = (EffectInstance*) evt_get_variable(script, *args++); + FlameFXData* flameData = effect->data.flame; + s32 posX = evt_get_variable(script, *args++); + s32 posY = evt_get_variable(script, *args++); + f32 angle = evt_get_variable(script, *args++); + s32 radius = evt_get_variable(script, *args++); + s32 offsetY = evt_get_variable(script, *args++); + s32 unk_10 = evt_get_variable(script, *args++); + + flameData->pos.x = posX - cos_deg(angle) * radius; + flameData->pos.y = (posY + offsetY) - sin_deg(angle) * radius; + flameData->unk_10 = unk_10 * 0.01f; + return ApiStatus_DONE2; +} -INCLUDE_ASM(s32, "battle/area_kzn2/59E6E0", func_80218A98_59F178); +API_CALLABLE(N(func_80218A98_59F178)) { + D_80222B68_5A9248++; -INCLUDE_ASM(s32, "battle/area_kzn2/59E6E0", func_80218B38_59F218); + // play 'end battle' song + if (isInitialCall) { + sfx_play_sound(SOUND_D4); + bgm_set_song(0, SONG_BATTLE_END, 0, 500, 8); + return ApiStatus_BLOCK; + } -INCLUDE_ASM(s32, "battle/area_kzn2/59E6E0", func_80218B90_59F270); + switch (D_80222B68_5A9248) { + case 80: + // after a short time, stop the 'end battle' song + bgm_init_music_players(); + return ApiStatus_BLOCK; + case 340: + // restart the boss theme with the more intense variation + bgm_set_song(0, SONG_LAVA_PIRANHA_BATTLE, 1, 500, 8); + return ApiStatus_DONE2; + } -INCLUDE_ASM(s32, "battle/area_kzn2/59E6E0", func_80218BE8_59F2C8); + return ApiStatus_BLOCK; +} + +API_CALLABLE(N(func_80218B38_59F218)) { + Bytecode* args = script->ptrReadPos; + s32 index = evt_get_variable(script, *args++); + s32 outVar = *args++; + + evt_set_variable(script, outVar, D_80222D48_5A9428[index]); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(func_80218B90_59F270)) { + Bytecode* args = script->ptrReadPos; + s32 index = evt_get_variable(script, *args++); + s32 outVar = *args++; + + evt_set_variable(script, outVar, D_80222E20_5A9500[index]); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(func_80218BE8_59F2C8)) { + Bytecode* args = script->ptrReadPos; + s32 posX = evt_get_variable(script, *args++); + s32 posY = evt_get_variable(script, *args++); + f32 angle = evt_get_variable(script, *args++); + s32 radius = evt_get_variable(script, *args++); + s32 deltaY = evt_get_variable(script, *args++); + + posX = posX - cos_deg(angle) * radius; + posY = (posY + deltaY) - sin_deg(angle) * radius; + evt_set_variable(script, *args++, posX); + evt_set_variable(script, *args++, posY); + return ApiStatus_DONE2; +} diff --git a/src/battle/item/dizzy_dial.c b/src/battle/item/dizzy_dial.c index dd3cd00e79..83e30a47a7 100644 --- a/src/battle/item/dizzy_dial.c +++ b/src/battle/item/dizzy_dial.c @@ -26,7 +26,7 @@ ApiStatus N(func_802A1270_727B80)(Evt* script, s32 isInitialCall) { D_802A1CD0 = create_generic_entity_frontUI(NULL, func_802A123C_727B4C); script->functionTemp[0] = 1; case 1: - camera->flags |= CAM_FLAG_SHAKING; + camera->flags |= CAMERA_FLAGS_SHAKING; a = script->functionTemp[1]; guRotateF(camera->viewMtxShaking, a, 0.0f, 0.0f, 1.0f); script->functionTemp[1] = 2.0 * ((1.0 - sin_rad(DEG_TO_RAD(script->functionTemp[2] + 90))) * 360.0); @@ -35,7 +35,7 @@ ApiStatus N(func_802A1270_727B80)(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } camera->auxPitch = 0; - camera->flags &= ~CAM_FLAG_SHAKING; + camera->flags &= ~CAMERA_FLAGS_SHAKING; free_generic_entity(D_802A1CD0); return ApiStatus_DONE2; } diff --git a/src/camera.c b/src/camera.c index c25b5e1183..f1bcd94384 100644 --- a/src/camera.c +++ b/src/camera.c @@ -63,7 +63,7 @@ s32 func_800328A4(CameraControlSettings* camSettings, f32 x, f32 z) { void func_80032970(Camera* camera, f32 arg1) { f32 stickX; f32 deltaLeadAmount; - s32 flags = camera->flags & CAM_FLAG_1000; + s32 flags = camera->flags & CAMERA_FLAGS_1000; s32 a2 = flags != 0; if (camera->currentController != NULL && camera->currentController->type == CAMERA_SETTINGS_TYPE_4) { @@ -284,7 +284,6 @@ void func_80032C64(Camera* camera) { } } - void create_camera_leadplayer_matrix(Camera* camera) { f32 xTemp = camera->lookAt_eye.x - camera->lookAt_obj.x; f32 yTemp = camera->lookAt_eye.y - camera->lookAt_obj.y; diff --git a/src/effects.c b/src/effects.c index 715b74427f..8e0624f412 100644 --- a/src/effects.c +++ b/src/effects.c @@ -314,7 +314,7 @@ void render_effects_UI(void) { gSPClipRatio(gMasterGfxPos++, FRUSTRATIO_2); cond = FALSE; - if (!(camera->flags & 0x10)) { + if (!(camera->flags & CAMERA_FLAGS_ORTHO)) { gSPPerspNormalize(gMasterGfxPos++, camera->perspNorm); gSPMatrix(gMasterGfxPos++, &gDisplayContext->camPerspMatrix[gCurrentCameraID], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); diff --git a/src/entity/sbk_omo/Tweester.c b/src/entity/sbk_omo/Tweester.c index 07f1689cdb..2a8e4c0ac0 100644 --- a/src/entity/sbk_omo/Tweester.c +++ b/src/entity/sbk_omo/Tweester.c @@ -160,9 +160,9 @@ void entity_Tweester_select_target_point(Entity* entity) { data->currentPath = paths[j]; } pathPtr = &data->currentPath[pathOffset]; - if (*pathPtr != 0x80000000) { + if (*pathPtr != TWEETSER_PATH_STOP) { pathOffset += 3; - if (*pathPtr == 0x80000001){ + if (*pathPtr == TWEETSER_PATH_LOOP){ pathOffset = 0; pathPtr = data->currentPath; data->targetX = *pathPtr++; diff --git a/src/evt/cam_api.c b/src/evt/cam_api.c index 00ec0b1766..bc9f543185 100644 --- a/src/evt/cam_api.c +++ b/src/evt/cam_api.c @@ -21,9 +21,9 @@ ApiStatus SetCamEnabled(Evt* script, s32 isInitialCall) { s32 enabled = evt_get_variable(script, *args++); if (!enabled) { - gCameras[id].flags |= CAM_FLAG_ENABLED; + gCameras[id].flags |= CAMERA_FLAGS_ENABLED; } else { - gCameras[id].flags &= ~CAM_FLAG_ENABLED; + gCameras[id].flags &= ~CAMERA_FLAGS_ENABLED; } return ApiStatus_DONE2; } @@ -34,9 +34,9 @@ ApiStatus SetCamFlag80(Evt* script, s32 isInitialCall) { s32 enabled = evt_get_variable(script, *args++); if (!enabled) { - gCameras[id].flags |= CAM_FLAG_80; + gCameras[id].flags |= CAMERA_FLAGS_80; } else { - gCameras[id].flags &= ~CAM_FLAG_80; + gCameras[id].flags &= ~CAMERA_FLAGS_80; } return ApiStatus_DONE2; } @@ -296,7 +296,7 @@ ApiStatus ShakeCam(Evt* script, s32 isInitialCall) { } } - camera->flags |= CAM_FLAG_SHAKING; + camera->flags |= CAMERA_FLAGS_SHAKING; scale = script->functionTempF[3]; switch (shakeMode) { case CAM_SHAKE_CONSTANT_VERTICAL: @@ -318,7 +318,7 @@ ApiStatus ShakeCam(Evt* script, s32 isInitialCall) { } if (script->functionTemp[1] == 0) { - camera->flags &= ~CAM_FLAG_SHAKING; + camera->flags &= ~CAMERA_FLAGS_SHAKING; return ApiStatus_DONE2; } script->functionTemp[1]--; @@ -351,9 +351,9 @@ ApiStatus SetCamLeadPlayer(Evt* script, s32 isInitialCall) { Camera* camera = &gCameras[id]; if (enabled) { - camera->flags |= CAM_FLAG_LEAD_PLAYER; + camera->flags |= CAMERA_FLAGS_LEAD_PLAYER; } else { - camera->flags &= ~CAM_FLAG_LEAD_PLAYER; + camera->flags &= ~CAMERA_FLAGS_LEAD_PLAYER; } return ApiStatus_DONE2; } @@ -375,7 +375,7 @@ ApiStatus PanToTarget(Evt* script, s32 isInitialCall) { s32 targetType = evt_get_variable(script, *args++); Camera* camera = &gCameras[id]; - camera->unk_506 = 1; + camera->panActive = TRUE; if (targetType != 0) { camera->followPlayer = TRUE; camera->panPhase = panPhase; @@ -497,7 +497,7 @@ ApiStatus SetPanTarget(Evt* script, s32 isInitialCall) { camera->movePos.x = x; camera->movePos.y = y; camera->movePos.z = z; - camera->unk_506 = 1; + camera->panActive = TRUE; return ApiStatus_DONE2; } @@ -634,7 +634,7 @@ ApiStatus SetCamProperties(Evt* script, s32 isInitialCall) { camera->controlSettings.boomPitch = boomPitch; camera->controlSettings.viewPitch = viewPitch; camera->moveSpeed = moveSpeed; - camera->unk_506 = 1; + camera->panActive = TRUE; camera->followPlayer = TRUE; camera->panPhase = 0.0f; return ApiStatus_BLOCK; @@ -677,7 +677,7 @@ ApiStatus AdjustCam(Evt* script, s32 isInitialCall) { camera->controlSettings.boomPitch = boomPitch; camera->controlSettings.viewPitch = viewPitch; camera->moveSpeed = moveSpeed; - camera->unk_506 = 1; + camera->panActive = TRUE; camera->followPlayer = TRUE; camera->panPhase = 0.0f; return ApiStatus_BLOCK; @@ -717,14 +717,14 @@ ApiStatus ResetCam(Evt* script, s32 isInitialCall) { camera->movePos.y = y; camera->movePos.z = z; camera->moveSpeed = moveSpeed; - camera->unk_506 = 1; + camera->panActive = TRUE; camera->followPlayer = TRUE; camera->panPhase = 0.0f; return ApiStatus_BLOCK; } if (camera->interpAlpha >= 1.0f) { - camera->unk_506 = 1; + camera->panActive = TRUE; camera->followPlayer = FALSE; camera->moveSpeed = 1.0f; camera->panPhase = 0.0f; diff --git a/src/hud_element.c b/src/hud_element.c index 4054247ecb..8d1190df2c 100644 --- a/src/hud_element.c +++ b/src/hud_element.c @@ -1717,7 +1717,7 @@ void func_80143C48(s32 elemID, s32 arg1, s32 camID) { Camera* camera = &gCameras[camID]; if (arg1 > 0) { - if (!camera->flags || (camera->flags & 2)) { + if (!camera->flags || (camera->flags & CAMERA_FLAGS_ENABLED)) { return; } diff --git a/src/npc.c b/src/npc.c index ed615817b5..4f0b99a98c 100644 --- a/src/npc.c +++ b/src/npc.c @@ -75,7 +75,7 @@ void npc_iter_no_op(void) { } } -s32 _create_npc(NpcBlueprint* blueprint, AnimID** animList, s32 skipLoadingAnims) { +s32 _create_npc(NpcBlueprint* blueprint, AnimID* animList, s32 skipLoadingAnims) { Npc* npc; s32 i; s32 j; @@ -181,7 +181,7 @@ s32 _create_npc_basic(NpcBlueprint* blueprint) { return _create_npc(blueprint, NULL, FALSE); } -s32 _create_npc_standard(NpcBlueprint* blueprint, AnimID** animList) { +s32 _create_npc_standard(NpcBlueprint* blueprint, AnimID* animList) { return _create_npc(blueprint, animList, FALSE); } diff --git a/src/sprite.c b/src/sprite.c index 91a0dfa0de..674de63cd2 100644 --- a/src/sprite.c +++ b/src/sprite.c @@ -720,7 +720,7 @@ s32 func_802DDA84(void) { INCLUDE_ASM(void, "sprite", spr_update_player_sprite, s32 arg0, s32 arg1, f32 arg2); #ifdef NON_EQUIVALENT -s32 spr_draw_player_sprite(s32 spriteInstanceID, s32 yaw, s32 arg2, u16** paletteList, Matrix4f mtx) { +s32 spr_draw_player_sprite(s32 spriteInstanceID, s32 yaw, s32 alphaIn, u16** paletteList, Matrix4f mtx) { PlayerCurrentAnimInfo* animInfo; SpriteComponent** compList; SpriteAnimComponent** animList; @@ -751,7 +751,7 @@ s32 spr_draw_player_sprite(s32 spriteInstanceID, s32 yaw, s32 arg2, u16** palett rasterList = spr_playerSprites[spriteIndex]->rastersOffset; animList = &spr_playerSprites[spriteIndex]->animListStart[animID & 0xFF]; drawPalettes = spr_playerSprites[spriteIndex]->palettesOffset; - if (animID & 0x01000000) { + if (animID & SPRITE_ID_BACK_FACING) { switch (spriteIndex) { case 0: case 5: @@ -763,7 +763,7 @@ s32 spr_draw_player_sprite(s32 spriteInstanceID, s32 yaw, s32 arg2, u16** palett } } - if (!(spriteInstanceID & 0x40000000)) { + if (!(spriteInstanceID & DRAW_SPRITE_OVERRIDE_YAW)) { camRelativeYaw += (s32) -gCameras[gCurrentCamID].currentYaw; if (camRelativeYaw > 360) { camRelativeYaw -= 360; @@ -778,7 +778,7 @@ s32 spr_draw_player_sprite(s32 spriteInstanceID, s32 yaw, s32 arg2, u16** palett zscale = 1.5f; } - if (spriteInstanceID & 0x10000000) { + if (spriteInstanceID & DRAW_SPRITE_UPSIDE_DOWN) { zscale = 0.0f - zscale; } @@ -786,17 +786,17 @@ s32 spr_draw_player_sprite(s32 spriteInstanceID, s32 yaw, s32 arg2, u16** palett D_802DFEA0[1] = camRelativeYaw; D_802DFEA0[2] = 0; - if (spriteInstanceID & 0x80000000) { - if (arg2 == 0) { + if (spriteInstanceID & DRAW_SPRITE_OVERRIDE_ALPHA) { + if (alphaIn == 0) { return 0; } - alpha = arg2 & 0xFF; + alpha = alphaIn & 0xFF; } else { alpha = 255; } compList = spr_playerCurrentAnimInfo[spriteAnimIndex].componentList; - if (spriteInstanceID & 0x20000000) { + if (spriteInstanceID & DRAW_SPRITE_OVERRIDE_PALETTES) { drawPalettes = paletteList; } while (*compList != PTR_LIST_END) { diff --git a/src/sprite.h b/src/sprite.h index c6421c951f..430c35c8db 100644 --- a/src/sprite.h +++ b/src/sprite.h @@ -13,6 +13,13 @@ enum SpriteIDFields { SPRITE_ID_TAIL_ALLOCATE = 0x80000000, }; +enum DrawSpriteOptions { + DRAW_SPRITE_UPSIDE_DOWN = 0x10000000, + DRAW_SPRITE_OVERRIDE_PALETTES = 0x20000000, + DRAW_SPRITE_OVERRIDE_YAW = 0x40000000, + DRAW_SPRITE_OVERRIDE_ALPHA = 0x80000000, +}; + typedef struct SpriteComponent { /* 0x00 */ s32 initialized; /* 0x04 */ s32 properties; ///< AABBCCCC : AA = unused?, BB = parent, CCCC = notify value diff --git a/src/state_file_select.c b/src/state_file_select.c index e4aac00e56..22b1c5cb36 100644 --- a/src/state_file_select.c +++ b/src/state_file_select.c @@ -44,11 +44,11 @@ void state_init_file_select(void) { gCameras[CAM_DEFAULT].unk_06 = 1; gCameras[CAM_DEFAULT].nearClip = 16; gCameras[CAM_DEFAULT].farClip = 4096; - gCameras[CAM_DEFAULT].flags |= CAM_FLAG_ENABLED; + gCameras[CAM_DEFAULT].flags |= CAMERA_FLAGS_ENABLED; gCurrentCameraID = CAM_DEFAULT; - gCameras[CAM_BATTLE].flags |= CAM_FLAG_ENABLED; - gCameras[CAM_TATTLE].flags |= CAM_FLAG_ENABLED; - gCameras[CAM_3].flags |= CAM_FLAG_ENABLED; + gCameras[CAM_BATTLE].flags |= CAMERA_FLAGS_ENABLED; + gCameras[CAM_TATTLE].flags |= CAMERA_FLAGS_ENABLED; + gCameras[CAM_3].flags |= CAMERA_FLAGS_ENABLED; gCameras[CAM_DEFAULT].vfov = 25.0f; set_cam_viewport(0, 12, 28, 296, 184); gCameras[CAM_DEFAULT].auxBoomLength = 40; diff --git a/src/state_logos.c b/src/state_logos.c index 4d372019d7..b03f8e47c9 100644 --- a/src/state_logos.c +++ b/src/state_logos.c @@ -65,10 +65,10 @@ void state_init_logos(void) { gCameras[CAM_DEFAULT].farClip = 4096; gCurrentCameraID = CAM_DEFAULT; gCameras[CAM_DEFAULT].vfov = 25.0f; - gCameras[CAM_DEFAULT].flags |= CAM_FLAG_ENABLED; - gCameras[CAM_BATTLE].flags |= CAM_FLAG_ENABLED; - gCameras[CAM_TATTLE].flags |= CAM_FLAG_ENABLED; - gCameras[CAM_3].flags |= CAM_FLAG_ENABLED; + gCameras[CAM_DEFAULT].flags |= CAMERA_FLAGS_ENABLED; + gCameras[CAM_BATTLE].flags |= CAMERA_FLAGS_ENABLED; + gCameras[CAM_TATTLE].flags |= CAMERA_FLAGS_ENABLED; + gCameras[CAM_3].flags |= CAMERA_FLAGS_ENABLED; set_cam_viewport(0, 12, 28, 296, 184); gCameras[CAM_DEFAULT].auxBoomLength = 40; gCameras[CAM_DEFAULT].bgColor[0] = 0; diff --git a/src/state_title_screen.c b/src/state_title_screen.c index 16725f9e4a..71a3740f9f 100644 --- a/src/state_title_screen.c +++ b/src/state_title_screen.c @@ -102,10 +102,10 @@ void state_init_title_screen(void) { gCameras[CAM_DEFAULT].farClip = CAM_FAR_CLIP; gCurrentCameraID = CAM_DEFAULT; gCameras[CAM_DEFAULT].vfov = 25.0f; - gCameras[CAM_DEFAULT].flags |= CAMERA_FLAGS_2; - gCameras[CAM_BATTLE].flags |= CAMERA_FLAGS_2; - gCameras[CAM_TATTLE].flags |= CAMERA_FLAGS_2; - gCameras[CAM_3].flags |= CAMERA_FLAGS_2; + gCameras[CAM_DEFAULT].flags |= CAMERA_FLAGS_ENABLED; + gCameras[CAM_BATTLE].flags |= CAMERA_FLAGS_ENABLED; + gCameras[CAM_TATTLE].flags |= CAMERA_FLAGS_ENABLED; + gCameras[CAM_3].flags |= CAMERA_FLAGS_ENABLED; set_cam_viewport(0, 12, 28, 296, 184); gCameras[CAM_DEFAULT].auxBoomLength = 40; gCameras[CAM_DEFAULT].bgColor[0] = 0; diff --git a/src/world/area_end/end.h b/src/world/area_end/end.h index dc8321c219..16f47cf059 100644 --- a/src/world/area_end/end.h +++ b/src/world/area_end/end.h @@ -22,4 +22,9 @@ enum { #define AF_END(index) AreaFlag(index) +extern MapSettings end_00_settings; +s32 end_00_map_init(void); +extern MapSettings end_01_settings; +s32 end_01_map_init(void); + #endif diff --git a/src/world/area_end/end_00/DF6A00.c b/src/world/area_end/end_00/DF6A00.c deleted file mode 100644 index 53ec63af6f..0000000000 --- a/src/world/area_end/end_00/DF6A00.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "end_00.h" - -ApiStatus func_80240000_DF6A00(Evt* script, s32 isInitialCall) { - gGameStatusPtr->playerSpriteSet = 3; - return ApiStatus_BLOCK; -} diff --git a/src/world/area_end/end_00/DF6A20.c b/src/world/area_end/end_00/DF6A20.c deleted file mode 100644 index 7add49356a..0000000000 --- a/src/world/area_end/end_00/DF6A20.c +++ /dev/null @@ -1,327 +0,0 @@ -#include "end_00.h" - -extern s32 spr_allocateBtlComponentsOnWorldHeap; -extern ParadeNpcInfo N(ParadeNpcsTable)[]; - -extern CreditsUnkBeta N(Font4Patterns)[16]; -extern CreditsUnkBeta N(Font3Patterns)[16]; -extern Vp N(CreditsViewport); -extern s32 N(CreditsBufferIndex); - -// start of BSS: -extern CreditsData N(CreditsData); -extern CreditsData* N(CreditsDataPtr); -extern u8 N(CreditsMessageBuffers)[23][256]; -extern Mtx N(CreditsProjMatrices)[2]; - -s32 msg_get_print_char_width(s32 character, s32 charset, s32 variation, f32 msgScale, s32 overrideCharWidth, u8 flags); -void msg_get_glyph(s32 font, s32 variation, s32 charIndex, s32 palette, MesasgeFontGlyphData* out); -void dma_load_msg(u32 msgID, void* dest); - -#include "world/common/atomic/Credits_1.inc.c" - -void N(credits_update_line)(CreditsLine* line) { - CreditsChar creditsChar; - CreditsChar* curChar = &creditsChar; - CreditsUnkBeta* curPattern; - s32 msgHeight, msgWidth, msgMaxLineChars; - s32 doneCurrentState; - s32 readPos; - u8 curMsgChar; - u16 nextMsgChar1, nextMsgChar2; - u16 doneCalcLoop, doneDrawLoop; - s32 drawCount; - s32 posX; - s32 i; - - doneCurrentState = FALSE; - if (line->flags & CREDITS_LINE_FLAG_2) { - line->flags &= ~CREDITS_LINE_FLAG_2; - line->time = 0; - line->state = 0; - } - - get_msg_properties((s32) line->message, &msgHeight, &msgWidth, &msgMaxLineChars, NULL, NULL, NULL, 0); - - curChar->font = 0; - curChar->variation = 0; - - // calculate message width - msgWidth = 1; - readPos = 0; - do { - curMsgChar = line->message[readPos++]; - nextMsgChar1 = line->message[readPos]; - doneCalcLoop = FALSE; - - switch (curMsgChar) { - case MSG_CHAR_READ_VARIANT0: - case MSG_CHAR_READ_VARIANT1: - case MSG_CHAR_READ_VARIANT2: - curChar->variation = curMsgChar - MSG_CHAR_READ_VARIANT0; - break; - case MSG_CHAR_READ_ENDL: - case MSG_CHAR_READ_END: - doneCalcLoop = TRUE; - break; - case MSG_CHAR_READ_FUNCTION: - // only support function for selecting font - if (line->message[readPos++] == MSG_READ_FUNC_FONT) { - curChar->font = line->message[readPos++]; - } - break; - default: - msgWidth += msg_get_print_char_width(curMsgChar, curChar->font, curChar->variation, 1.0f, 0, 1) - 1; - if (curChar->font == MSG_FONT_TITLE || curChar->font == MSG_FONT_SUBTITLE) { - curPattern = N(Font3Patterns); - if (curChar->font == MSG_FONT_SUBTITLE) { - curPattern = N(Font4Patterns); - } - - i = 0; - - if (curChar->font == MSG_FONT_SUBTITLE) { - if (curMsgChar == MSG_CHAR_LPAREN || nextMsgChar1 == MSG_CHAR_LPAREN) { - msgWidth++; - } - } - - do { - if (curMsgChar == curPattern[i].unk_00 && nextMsgChar1 == curPattern[i].unk_01) { - msgWidth += curPattern[i].size; - } - i++; - } while (curPattern[i].size != 0); - } - break; - } - } while (!doneCalcLoop); - - line->msgWidth = msgWidth; - if (line->flags & CREDITS_LINE_FLAG_1) { - posX = line->posX - (((f32) msgWidth * 0.5) + 0.0); - } else { - posX = line->posX; - } - - curChar->font = 0; - curChar->variation = 0; - curChar->palette = line->palette; - - drawCount = 0; - readPos = 0; - do { - curMsgChar = line->message[readPos++]; - nextMsgChar2 = line->message[readPos]; - doneDrawLoop = FALSE; - - switch (curMsgChar) { - case MSG_CHAR_READ_VARIANT0: - case MSG_CHAR_READ_VARIANT1: - case MSG_CHAR_READ_VARIANT2: - curChar->variation = curMsgChar - MSG_CHAR_READ_VARIANT0; - break; - case MSG_CHAR_READ_ENDL: - case MSG_CHAR_READ_END: - doneDrawLoop = TRUE; - break; - case MSG_CHAR_READ_FUNCTION: - if (line->message[readPos++] == 0) { - curChar->font = line->message[readPos++]; - } - break; - default: - if (curMsgChar < MSG_CHAR_READ_ENDL) { - curChar->charIndex = curMsgChar; - curChar->posX = posX; - curChar->posY = line->posY; - - switch (line->state) { - case CREDITS_LINE_APPEARING: - curChar->fadeInTime = line->time - (line->perCharDelayIn * drawCount); - if (curChar->fadeInTime >= 0) { - if (line->appearTime < curChar->fadeInTime) { - curChar->fadeInTime = line->appearTime; - } - if ((nextMsgChar2 == MSG_CHAR_READ_END) && (curChar->fadeInTime == line->appearTime)) { - doneCurrentState = TRUE; - } - switch (line->appearMode) { - case 0: - N(CharAnim_FadeIn_5)(line, curChar); - break; - case 1: - N(CharAnim_FadeIn_1)(line, curChar); - break; - case 2: - N(CharAnim_FadeIn_2)(line, curChar); - break; - case 3: - N(CharAnim_FadeIn_3)(line, curChar); - break; - case 4: - N(CharAnim_FadeIn_4)(line, curChar); - break; - case 5: - N(CharAnim_FadeIn_5)(line, curChar); - break; - } - } - break; - - case CREDITS_LINE_HOLDING: - if (nextMsgChar2 == MSG_CHAR_READ_END) { - if (line->time == line->holdTime) { - doneCurrentState = TRUE; - } - } - N(CharAnim_Hold)(line, curChar); - break; - - case CREDITS_LINE_VANISHING: - curChar->fadeInTime = line->time - (line->perCharDelayOut * drawCount); - if (curChar->fadeInTime < 0) { - curChar->fadeInTime = 0; - } - if (curChar->fadeInTime > line->vanishTime) { - curChar->fadeInTime = line->vanishTime; - } - if (nextMsgChar2 == MSG_CHAR_READ_END && curChar->fadeInTime == line->vanishTime) { - doneCurrentState = TRUE; - } - - switch (line->vanishMode) { - case 0: - N(CharAnim_FadeOut_3)(line, curChar); - break; - case 1: - N(CharAnim_FadeOut_1)(line, curChar); - break; - case 2: - N(CharAnim_FadeOut_2)(line, curChar); - break; - case 3: - N(CharAnim_FadeOut_3)(line, curChar); - break; - } - break; - } - drawCount++; - } - - posX += msg_get_print_char_width(curMsgChar, curChar->font, curChar->variation, 1.0f, 0, 1) - 1; - if (curChar->font == MSG_FONT_TITLE || curChar->font == MSG_FONT_SUBTITLE) { - curPattern = N(Font3Patterns); - if (curChar->font == MSG_FONT_SUBTITLE) { - curPattern = N(Font4Patterns); - } - - i = 0; - - if (curChar->font == MSG_FONT_SUBTITLE) { - if (curMsgChar == MSG_CHAR_LPAREN || nextMsgChar2 == MSG_CHAR_LPAREN) { - posX++; - } - } - do { - if (curMsgChar == curPattern[i].unk_00 && nextMsgChar2 == curPattern[i].unk_01) { - posX += curPattern[i].size; - } - i++; - } while (curPattern[i].size != 0); - } - break; - } - } while (!doneDrawLoop); - - if ((line->state == CREDITS_LINE_APPEARING) && doneCurrentState) { - s32 temp = 0; - get_msg_properties((s32) line->message, NULL, NULL, &temp, NULL, NULL, NULL, 0); - line->time = 0; - line->state++; - if (line->holdTime <= 0) { - line->state++; - } - } else if ((line->state == CREDITS_LINE_HOLDING) && doneCurrentState) { - line->time = 0; - line->state++; - } else if ((line->state == CREDITS_LINE_VANISHING) && doneCurrentState) { - line->flags &= ~CREDITS_LINE_FLAG_1; - } - line->time++; -} - -#include "world/common/atomic/Credits_2.inc.c" - -ApiStatus func_80242680_DF9080(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 npcID = evt_get_variable(script, *args++); - ParadeNpcInfo* npcInfo = &N(ParadeNpcsTable)[npcID]; - NpcBlueprint bp; - Npc* npc; - - bp.flags = NPC_FLAG_100; - bp.initialAnim = npcInfo->initialAnim; - bp.onUpdate = NULL; - bp.onRender = NULL; - - spr_allocateBtlComponentsOnWorldHeap = TRUE; - - npc = get_npc_by_index(_create_npc_standard(&bp, npcInfo->animList)); - npc->npcID = npcID; - npc->flags &= ~NPC_FLAG_PARTICLE; - npc->pos.x = npcInfo->pos.x; - npc->pos.y = npcInfo->pos.y; - npc->pos.z = npcInfo->pos.z; - set_npc_yaw(npc, npcInfo->yaw); - return ApiStatus_DONE2; -} - -ApiStatus func_80242744_DF9144(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 heapSize = evt_get_variable(script, *args++); - s32 outVar = *args++; - - evt_set_variable(script, outVar, (s32) _heap_malloc(&gSpriteHeapPtr, heapSize)); - return ApiStatus_DONE2; -} - -ApiStatus func_802427A4_DF91A4(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 pointer = *args++; - - _heap_free(&gSpriteHeapPtr, (void*) evt_get_variable(script, pointer)); - return ApiStatus_DONE2; -} - -ApiStatus func_802427D8_DF91D8(Evt* script, s32 isInitialCall) { - Camera* camera = &gCameras[gCurrentCameraID]; - - camera->unk_506 = 1; - camera->movePos.x += 0.6666667f; - return ApiStatus_DONE2; -} - -ApiStatus N(SetNpcShadowScale)(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 npcID = evt_get_variable(script, *args++); - f32 newShadowScale = evt_get_float_variable(script, *args++); - - resolve_npc(script, npcID)->shadowScale = newShadowScale; - return ApiStatus_DONE2; -} - -ApiStatus func_80242898_DF9298(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - Npc** npc = (Npc**)&script->functionTempPtr[1]; - - if (isInitialCall) { - *npc = get_npc_unsafe(evt_get_variable(script, *args++)); - } - - (*npc)->pos.x += 0.6666667f; - - return ApiStatus_BLOCK; -} - -static char* N(exit_str_0) = "end_01"; diff --git a/src/world/area_end/end_00/DF9300.c b/src/world/area_end/end_00/DF9300.c deleted file mode 100644 index 3591717146..0000000000 --- a/src/world/area_end/end_00/DF9300.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "end_00.h" - -#include "world/common/PlayFX3D.inc.c" diff --git a/src/world/area_end/end_00/DF9510.c b/src/world/area_end/end_00/DF9510.c deleted file mode 100644 index 733a564a3b..0000000000 --- a/src/world/area_end/end_00/DF9510.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "end_00.h" - -extern s32 D_80249D60_E00760; - -ApiStatus func_80242B10_DF9510(Evt *script, s32 isInitialCall) { - D_80249D60_E00760 = evt_get_variable(script, *script->ptrReadPos); - return ApiStatus_DONE2; -} diff --git a/src/world/area_end/end_00/credits_jobs.inc.c b/src/world/area_end/end_00/credits_jobs.inc.c new file mode 100644 index 0000000000..06334b8414 --- /dev/null +++ b/src/world/area_end/end_00/credits_jobs.inc.c @@ -0,0 +1,397 @@ +#include "world/common/atomic/Credits.h" + +CreditsEntry N(Credits_Jobs)[] = { + { + .next = 235, + }, + { + .msgID = MSG_Credits_0009, + .posX = STANDARD_POS_X, + .posY = 166, + .appearMode = CREDITS_APPEAR_MODE_04, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 2, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 176, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 0, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_000A, + .posX = STANDARD_POS_X, + .posY = 175, + .appearMode = CREDITS_APPEAR_MODE_04, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 2, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 176, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 246, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_000B, + .posX = STANDARD_POS_X, + .posY = 170, + .appearMode = CREDITS_APPEAR_MODE_04, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 2, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 588, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 658, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_000C, + .posX = STANDARD_POS_X, + .posY = 166, + .appearMode = CREDITS_APPEAR_MODE_04, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 2, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 176, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 246, + .flags = CREDITS_FLAG_1, + }, + { + .appearMode = CREDITS_APPEAR_MODE_04, + .appearTime = 0, + .perCharDelayIn = 0, + .next = 60, + }, + { + .msgID = MSG_Credits_000D, + .posX = STANDARD_POS_X, + .posY = 166, + .appearMode = CREDITS_APPEAR_MODE_04, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 2, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 176, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 0, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_000E, + .posX = STANDARD_POS_X, + .posY = 175, + .appearMode = CREDITS_APPEAR_MODE_04, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 2, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 176, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 246, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_000F, + .posX = STANDARD_POS_X, + .posY = 166, + .appearMode = CREDITS_APPEAR_MODE_04, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 2, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 1412, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 1482, + .flags = CREDITS_FLAG_1, + }, + { + .appearMode = CREDITS_APPEAR_MODE_04, + .appearTime = 0, + .perCharDelayIn = 0, + .next = 60, + }, + { + .msgID = MSG_Credits_0010, + .posX = STANDARD_POS_X, + .posY = 170, + .appearMode = CREDITS_APPEAR_MODE_04, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 2, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 176, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 246, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_0011, + .posX = STANDARD_POS_X, + .posY = 170, + .appearMode = CREDITS_APPEAR_MODE_04, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 2, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 176, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 246, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_0023, + .posX = STANDARD_POS_X, + .posY = 166, + .appearMode = CREDITS_APPEAR_MODE_04, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 2, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 190, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 1, + .next = 246, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_0012, + .posX = STANDARD_POS_X, + .posY = 166, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 1, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 754, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 824, + .flags = CREDITS_FLAG_1, + }, + { + .appearMode = CREDITS_APPEAR_MODE_04, + .appearTime = 0, + .perCharDelayIn = 0, + .next = 60, + }, + { + .msgID = MSG_Credits_0013, + .posX = STANDARD_POS_X, + .posY = 170, + .appearMode = CREDITS_APPEAR_MODE_04, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 2, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 176, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 246, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_0014, + .posX = STANDARD_POS_X, + .posY = 166, + .appearMode = CREDITS_APPEAR_MODE_04, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 2, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 176, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 0, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_0015, + .posX = STANDARD_POS_X, + .posY = 175, + .appearMode = CREDITS_APPEAR_MODE_04, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 2, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 176, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 246, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_0016, + .posX = STANDARD_POS_X, + .posY = 170, + .appearMode = CREDITS_APPEAR_MODE_04, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 2, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 176, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 246, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_0017, + .posX = STANDARD_POS_X, + .posY = 166, + .appearMode = CREDITS_APPEAR_MODE_04, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 2, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 176, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 0, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_0018, + .posX = STANDARD_POS_X, + .posY = 175, + .appearMode = CREDITS_APPEAR_MODE_04, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 2, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 176, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 246, + .flags = CREDITS_FLAG_1, + }, + { + .appearMode = CREDITS_APPEAR_MODE_04, + .appearTime = 0, + .perCharDelayIn = 0, + .next = 60, + }, + { + .msgID = MSG_Credits_001F, + .posX = STANDARD_POS_X, + .posY = 170, + .appearMode = CREDITS_APPEAR_MODE_04, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 2, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 176, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 246, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_0029, + .posX = STANDARD_POS_X, + .posY = 170, + .appearMode = CREDITS_APPEAR_MODE_04, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 2, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 176, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 246, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_002A, + .posX = STANDARD_POS_X, + .posY = 170, + .appearMode = CREDITS_APPEAR_MODE_04, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 2, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 176, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 246, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_002B, + .posX = STANDARD_POS_X, + .posY = 170, + .appearMode = CREDITS_APPEAR_MODE_04, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 2, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 382, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 452, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_002C, + .posX = STANDARD_POS_X, + .posY = 170, + .appearMode = CREDITS_APPEAR_MODE_04, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 2, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 382, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 452, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_0024, + .posX = STANDARD_POS_X, + .posY = 170, + .appearMode = CREDITS_APPEAR_MODE_04, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 2, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 176, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 246, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_0022, + .posX = STANDARD_POS_X, + .posY = 166, + .appearMode = CREDITS_APPEAR_MODE_04, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 2, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 382, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 452, + .flags = CREDITS_FLAG_1, + }, + { + .appearMode = CREDITS_APPEAR_MODE_04, + .appearTime = 0, + .perCharDelayIn = 0, + .next = -1, + }, +}; diff --git a/src/world/area_end/end_00/credits_names.inc.c b/src/world/area_end/end_00/credits_names.inc.c new file mode 100644 index 0000000000..6ffd81a329 --- /dev/null +++ b/src/world/area_end/end_00/credits_names.inc.c @@ -0,0 +1,990 @@ +#include "world/common/atomic/Credits.h" + +CreditsEntry N(Credits_Names)[] = { + { + .next = 235, + }, + { + .next = 40, + }, + { + .msgID = MSG_Credits_002D, + .posX = STANDARD_POS_X, + .posY = 195, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 0, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 136, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 206, + .flags = CREDITS_FLAG_1, + }, + { + .next = 40, + }, + { + .msgID = MSG_Credits_002E, + .posX = STANDARD_POS_X, + .posY = 191, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 0, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 148, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 1, + .next = 206, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_002F, + .posX = 159, + .posY = 191, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 1, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 150, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 1, + .next = 206, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_0030, + .posX = STANDARD_POS_X, + .posY = 191, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 1, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 136, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 206, + .flags = CREDITS_FLAG_1, + }, + { + .next = 40, + }, + { + .msgID = MSG_Credits_0031, + .posX = STANDARD_POS_X, + .posY = 186, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 0, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 136, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 0, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_0032, + .posX = STANDARD_POS_X, + .posY = 203, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 0, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 136, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 206, + .flags = CREDITS_FLAG_1, + }, + { + .appearMode = CREDITS_APPEAR_MODE_04, + .appearTime = 0, + .perCharDelayIn = 0, + .next = 60, + }, + { + .next = 40, + }, + { + .msgID = MSG_Credits_0033, + .posX = STANDARD_POS_X, + .posY = 195, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 0, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 136, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 206, + .flags = CREDITS_FLAG_1, + }, + { + .next = 40, + }, + { + .msgID = MSG_Credits_0034, + .posX = STANDARD_POS_X, + .posY = 186, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 0, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 150, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 1, + .next = 0, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_0035, + .posX = STANDARD_POS_X, + .posY = 203, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 0, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 150, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 1, + .next = 206, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_0036, + .posX = STANDARD_POS_X, + .posY = 186, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 1, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 150, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 1, + .next = 0, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_0037, + .posX = STANDARD_POS_X, + .posY = 203, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 1, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 150, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 1, + .next = 206, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_0038, + .posX = STANDARD_POS_X, + .posY = 186, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 1, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 150, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 1, + .next = 0, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_0039, + .posX = STANDARD_POS_X, + .posY = 203, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 1, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 150, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 1, + .next = 206, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_003A, + .posX = STANDARD_POS_X, + .posY = 186, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 1, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 150, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 1, + .next = 0, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_003B, + .posX = STANDARD_POS_X, + .posY = 203, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 1, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 150, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 1, + .next = 206, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_003C, + .posX = STANDARD_POS_X, + .posY = 186, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 1, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 150, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 1, + .next = 0, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_003E, + .posX = STANDARD_POS_X, + .posY = 203, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 1, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 150, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 1, + .next = 206, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_003D, + .posX = STANDARD_POS_X, + .posY = 186, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 1, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 150, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 1, + .next = 0, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_003F, + .posX = STANDARD_POS_X, + .posY = 203, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 1, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 150, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 1, + .next = 206, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_0040, + .posX = STANDARD_POS_X, + .posY = 182, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 1, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 136, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 0, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_0041, + .posX = STANDARD_POS_X, + .posY = 195, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 1, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 136, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 0, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_0042, + .posX = STANDARD_POS_X, + .posY = 208, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 1, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 136, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 206, + .flags = CREDITS_FLAG_1, + }, + { + .appearMode = CREDITS_APPEAR_MODE_04, + .appearTime = 0, + .perCharDelayIn = 0, + .next = 60, + }, + { + .next = 40, + }, + { + .msgID = MSG_Credits_0043, + .posX = STANDARD_POS_X, + .posY = 191, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 0, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 136, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 206, + .flags = CREDITS_FLAG_1, + }, + { + .next = 40, + }, + { + .msgID = MSG_Credits_0044, + .posX = STANDARD_POS_X, + .posY = 191, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 0, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 136, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 206, + .flags = CREDITS_FLAG_1, + }, + { + .next = 40, + }, + { + .msgID = MSG_Credits_0045, + .posX = STANDARD_POS_X, + .posY = 191, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 0, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 150, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 1, + .next = 206, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_0046, + .posX = STANDARD_POS_X, + .posY = 186, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 1, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 150, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 1, + .next = 0, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_0047, + .posX = STANDARD_POS_X, + .posY = 203, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 1, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 150, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 1, + .next = 206, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_0048, + .posX = STANDARD_POS_X, + .posY = 186, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 1, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 150, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 1, + .next = 0, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_0049, + .posX = STANDARD_POS_X, + .posY = 203, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 1, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 150, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 1, + .next = 206, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_004A, + .posX = STANDARD_POS_X, + .posY = 186, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 1, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 150, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 1, + .next = 0, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_004B, + .posX = STANDARD_POS_X, + .posY = 203, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 1, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 150, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 1, + .next = 206, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_004C, + .posX = STANDARD_POS_X, + .posY = 186, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 1, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 136, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 0, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_004D, + .posX = STANDARD_POS_X, + .posY = 203, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 1, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 136, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 206, + .flags = CREDITS_FLAG_1, + }, + { + .appearMode = CREDITS_APPEAR_MODE_04, + .appearTime = 0, + .perCharDelayIn = 0, + .next = 60, + }, + { + .next = 40, + }, + { + .msgID = MSG_Credits_004E, + .posX = STANDARD_POS_X, + .posY = 195, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 0, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 136, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 206, + .flags = CREDITS_FLAG_1, + }, + { + .next = 40, + }, + { + .msgID = MSG_Credits_0050, + .posX = STANDARD_POS_X, + .posY = 195, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 0, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 136, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 206, + .flags = CREDITS_FLAG_1, + }, + { + .next = 40, + }, + { + .msgID = MSG_Credits_004F, + .posX = STANDARD_POS_X, + .posY = 191, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 0, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 136, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 206, + .flags = CREDITS_FLAG_1, + }, + { + .next = 40, + }, + { + .msgID = MSG_Credits_006F, + .posX = STANDARD_POS_X, + .posY = 195, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 0, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 136, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 206, + .flags = CREDITS_FLAG_1, + }, + { + .appearMode = CREDITS_APPEAR_MODE_04, + .appearTime = 0, + .perCharDelayIn = 0, + .next = 60, + }, + { + .next = 40, + }, + { + .msgID = MSG_Credits_0069, + .posX = STANDARD_POS_X, + .posY = 191, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 0, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 136, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 206, + .flags = CREDITS_FLAG_1, + }, + { + .next = 40, + }, + { + .msgID = MSG_Credits_0079, + .posX = STANDARD_POS_X, + .posY = 191, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 0, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 136, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 206, + .flags = CREDITS_FLAG_1, + }, + { + .next = 40, + }, + { + .msgID = MSG_Credits_007A, + .posX = STANDARD_POS_X, + .posY = 191, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 0, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 136, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 206, + .flags = CREDITS_FLAG_1, + }, + { + .next = 40, + }, + { + .msgID = MSG_Credits_007B, + .posX = STANDARD_POS_X, + .posY = 182, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 0, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 150, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 1, + .next = 0, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_007C, + .posX = STANDARD_POS_X, + .posY = 195, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 0, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 150, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 1, + .next = 0, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_007D, + .posX = STANDARD_POS_X, + .posY = 208, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 0, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 150, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 1, + .next = 206, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_007E, + .posX = STANDARD_POS_X, + .posY = 182, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 1, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 136, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 0, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_007F, + .posX = STANDARD_POS_X, + .posY = 195, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 1, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 136, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 0, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_0080, + .posX = STANDARD_POS_X, + .posY = 208, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 1, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 136, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 206, + .flags = CREDITS_FLAG_1, + }, + { + .next = 40, + }, + { + .msgID = MSG_Credits_0081, + .posX = STANDARD_POS_X, + .posY = 182, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 0, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 150, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 1, + .next = 0, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_0082, + .posX = STANDARD_POS_X, + .posY = 195, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 0, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 150, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 1, + .next = 0, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_0083, + .posX = STANDARD_POS_X, + .posY = 208, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 0, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 150, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 1, + .next = 206, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_0084, + .posX = STANDARD_POS_X, + .posY = 191, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 1, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 136, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 206, + .flags = CREDITS_FLAG_1, + }, + { + .next = 40, + }, + { + .msgID = MSG_Credits_0077, + .posX = STANDARD_POS_X, + .posY = 191, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 0, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 136, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 206, + .flags = CREDITS_FLAG_1, + }, + { + .next = 40, + }, + { + .msgID = MSG_Credits_0067, + .posX = STANDARD_POS_X, + .posY = 186, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 0, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 150, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 1, + .next = 0, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_0074, + .posX = STANDARD_POS_X, + .posY = 203, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 0, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 150, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 1, + .next = 206, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_0056, + .posX = STANDARD_POS_X, + .posY = 182, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 1, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 136, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 0, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_0057, + .posX = STANDARD_POS_X, + .posY = 195, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 1, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 136, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 0, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_0058, + .posX = STANDARD_POS_X, + .posY = 208, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 1, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 136, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 206, + .flags = CREDITS_FLAG_1, + }, + { + .appearMode = CREDITS_APPEAR_MODE_04, + .appearTime = 0, + .perCharDelayIn = 0, + .next = -1, + }, +}; diff --git a/src/world/area_end/end_00/credits_title.inc.c b/src/world/area_end/end_00/credits_title.inc.c new file mode 100644 index 0000000000..2318aa000f --- /dev/null +++ b/src/world/area_end/end_00/credits_title.inc.c @@ -0,0 +1,35 @@ +#include "world/common/atomic/Credits.h" + +CreditsEntry N(Credits_Title)[] = { + { + .msgID = MSG_Credits_0000, + .posX = STANDARD_POS_X, + .posY = 173, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 0, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 120, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 40, + .perCharDelayOut = 0, + .next = 40, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_0001, + .posX = STANDARD_POS_X, + .posY = 191, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 0, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 80, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 40, + .perCharDelayOut = 0, + .next = -1, + .flags = CREDITS_FLAG_1, + }, +}; diff --git a/src/world/area_end/end_00/end_00.h b/src/world/area_end/end_00/end_00.h index 8167d40aad..7666b22741 100644 --- a/src/world/area_end/end_00/end_00.h +++ b/src/world/area_end/end_00/end_00.h @@ -2,8 +2,163 @@ /// @brief Ending - Parade (Day) #include "common.h" -#include "../end.h" #include "message_ids.h" #include "map.h" +#include "../end.h" +#include "mapfs/end_00_shape.h" +#include "mapfs/end_00_hit.h" + +#include "sprite/npc/ParadeLuigi.h" +#include "sprite/npc/ParadePartner.h" +#include "sprite/npc/ParadeToad.h" +#include "sprite/npc/ChuckQuizmo.h" +#include "sprite/npc/VannaT.h" +#include "sprite/npc/KoopaBros.h" +#include "sprite/npc/Bobomb.h" +#include "sprite/npc/ParadeKolorado.h" +#include "sprite/npc/Rowf.h" +#include "sprite/npc/Moustafa.h" +#include "sprite/npc/Mouser.h" +#include "sprite/npc/Tutankoopa.h" +#include "sprite/npc/ChainChomp.h" +#include "sprite/npc/Buzzar.h" +#include "sprite/npc/ParadeChick.h" +#include "sprite/npc/TubbasHeart.h" +#include "sprite/npc/Bootler.h" +#include "sprite/npc/Boo.h" +#include "sprite/npc/ParadeTubba.h" +#include "sprite/npc/GoombaBros.h" +#include "sprite/npc/GoombaKing.h" +#include "sprite/npc/HuffNPuff.h" +#include "sprite/npc/TuffPuff.h" +#include "sprite/npc/GourmetGuy.h" + +#include "sprite/npc/RafaelRaven.h" +#include "sprite/npc/LavaPiranha.h" +#include "sprite/npc/ParadeYoshi.h" +#include "sprite/npc/YoshiKid.h" + +#include "sprite/npc/CrystalKing.h" +#include "sprite/npc/Duplighost.h" +#include "sprite/npc/MageJrTroopa.h" +#include "sprite/npc/WorldKammy.h" +#include "sprite/npc/ParadeKoopas.h" +#include "sprite/npc/ParadeBurntBowser.h" + +enum { + NPC_Luigi = 0, + NPC_HornPlayer1 = 1, + NPC_HornPlayer2 = 2, + NPC_Drummer1 = 3, + NPC_Drummer2 = 4, + NPC_StandardBearer1 = 5, + NPC_StandardBearer2 = 6, + NPC_Goombario = 7, + NPC_Kooper = 8, + NPC_Bombette = 9, + NPC_Parakarry = 10, + NPC_Bow = 11, + NPC_Watt = 12, + NPC_Sushie = 13, + NPC_Lakilester = 14, + NPC_Twirler1 = 15, + NPC_Twirler2 = 16, + NPC_Twirler3 = 17, + NPC_Baton1 = 18, + NPC_Baton2 = 19, + NPC_Baton3 = 20, + NPC_ChuckQuizmo = 21, + NPC_VannaT = 22, + NPC_KoopaBrosRed = 23, + NPC_KoopaBrosBlack = 24, + NPC_KoopaBrosYellow = 25, + NPC_KoopaBrosGreen = 26, + NPC_Bobomb1 = 27, + NPC_Bobomb2 = 28, + NPC_Bobomb3 = 29, + NPC_Bobomb4 = 30, + NPC_Kolorado = 31, + NPC_KoloradoWife = 32, + NPC_Rowf = 33, + NPC_Rhuff = 34, + NPC_Moustafa = 35, + NPC_Mouser1 = 36, + NPC_Mouser2 = 37, + NPC_Tutankoopa1 = 38, + NPC_ChainChomp1 = 39, + NPC_Buzzar = 40, + NPC_VultureChick1 = 41, + NPC_VultureChick2 = 42, + NPC_VultureChick3 = 43, + NPC_Bootler = 44, + NPC_Tutankoopa2 = 45, + NPC_ChainChomp2 = 46, + NPC_ChainChomp3 = 47, + NPC_ChainChomp4 = 48, + NPC_TubbasBody = 49, + NPC_Boo1 = 50, + NPC_Boo2 = 51, + NPC_Boo3 = 52, + NPC_TubbasHeart = 53, + NPC_GoombaKing = 54, + NPC_RedGoombaBros = 55, + NPC_BlueGoombaBros = 56, + NPC_Yoshi1 = 57, + NPC_Yoshi2 = 58, + NPC_Yoshi3 = 59, + NPC_Yoshi4 = 60, + NPC_YoshiChief = 61, + NPC_RafaelRaven = 62, + NPC_LavaPiranha = 63, + NPC_YoshiKidGreen = 64, + NPC_YoshiKidBlue = 65, + NPC_YoshiKidPurple = 66, + NPC_YoshiKidYellow = 67, + NPC_YoshiKidRed = 68, + NPC_HuffNPuffBody = 69, + NPC_HuffNPuffFace = 70, + NPC_HuffNPuffArms = 71, + NPC_TuffPuff1 = 72, + NPC_TuffPuff2 = 73, + NPC_GourmetGuy = 74, + NPC_Duplighost1 = 75, + NPC_Duplighost2 = 76, + NPC_TrueCrystalKing = 77, + NPC_FakeCrystalKing = 78, + NPC_CrystalBit1 = 79, + NPC_CrystalBit2 = 80, + NPC_CrystalBit3 = 81, + NPC_Kammy = 82, + NPC_JrTroopa = 83, + NPC_Bowser = 84, + NPC_BowserPropeller = 85, + NPC_HammerBros1 = 86, + NPC_HammerBros2 = 87, + NPC_Koopatrol1 = 88, + NPC_Koopatrol2 = 89, + NPC_BurntBowser = 90, + NPC_BurntBowserPropeller = 91, +}; + +#define PARADE_SCROLL_RATE (2.0f/3.0f) + +enum { + PARADE_START = -3080, + PARADE_PHASE_PARTNERS = -2845, + PARADE_PHASE_TOAD_TOWN = -2550, + PARADE_PHASE_KOOPA_BROS = -2150, + PARADE_PHASE_KOLORADO = -2090, + PARADE_PHASE_CARAVAN = -1500, + PARADE_PHASE_BUZZAR = -1355, + PARADE_PHASE_TUTANKOOPA = -760, + PARADE_PHASE_BOOS = -960, + PARADE_PHASE_GOOMBA_KING = -310, + PARADE_PHASE_YOSHIS = -53, + PARADE_PHASE_HUFF_PUFF = 750, + PARADE_PHASE_CRYSTAL_KING = 1200, + PARADE_PHASE_BOWSER = 1860, + PARADE_PHASE_DONE = 2580, +}; + #define NAMESPACE end_00 diff --git a/src/world/area_end/end_00/end_00_0_init.c b/src/world/area_end/end_00/end_00_0_init.c new file mode 100644 index 0000000000..cadb4b6a91 --- /dev/null +++ b/src/world/area_end/end_00/end_00_0_init.c @@ -0,0 +1,6 @@ +#include "end_00.h" + +s32 N(map_init)(void) { + gGameStatusPtr->playerSpriteSet = 3; + return FALSE; +} diff --git a/src/world/area_end/end_00/end_00_1_main.c b/src/world/area_end/end_00/end_00_1_main.c new file mode 100644 index 0000000000..f22e7899f0 --- /dev/null +++ b/src/world/area_end/end_00/end_00_1_main.c @@ -0,0 +1,29 @@ +#include "end_00.h" + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_ManageParade); // EVS_ManageParade + +EntryList N(Entrances) = { + [end_00_ENTRY_0] { 0.0, 0.0, 0.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), +}; + +EvtScript N(EVS_Main) = { + EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 35, 16, 4096) + EVT_CALL(SetCamViewport, CAM_DEFAULT, 15, 28, 290, 128) + EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0) + EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) + EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) + EVT_CALL(FadeOutMusic, 0, 500) + EVT_CALL(ClearAmbientSounds, 250) + EVT_CALL(EnableStatusMenu, FALSE) + EVT_WAIT(30) + EVT_EXEC(N(EVS_ManageParade)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_end/end_00/end_00_2_credits.c b/src/world/area_end/end_00/end_00_2_credits.c new file mode 100644 index 0000000000..3440933d98 --- /dev/null +++ b/src/world/area_end/end_00/end_00_2_credits.c @@ -0,0 +1,31 @@ +#include "end_00.h" + +#include "world/common/atomic/Credits.inc.c" + +#include "credits_title.inc.c" +#include "credits_jobs.inc.c" +#include "credits_names.inc.c" + +EvtScript N(EVS_InitCredits) = { + EVT_CALL(N(InitCredits)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ShowCredits_Jobs) = { + EVT_CALL(N(ShowCreditList), EVT_PTR(N(Credits_Jobs))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ShowCredits_Names) = { + EVT_CALL(N(ShowCreditList), EVT_PTR(N(Credits_Names))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ShowCredits_Title) = { + EVT_CALL(N(ShowCreditList), EVT_PTR(N(Credits_Title))) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_end/end_00/end_00_3_parade_setup.c b/src/world/area_end/end_00/end_00_3_parade_setup.c new file mode 100644 index 0000000000..904547dc02 --- /dev/null +++ b/src/world/area_end/end_00/end_00_3_parade_setup.c @@ -0,0 +1,1301 @@ +#include "end_00.h" +#include "effects.h" + +extern s32 spr_allocateBtlComponentsOnWorldHeap; +extern ParadeNpcInfo N(ParadeNpcsTable)[]; + +extern EvtScript N(EVS_ParadePhase_Luigi); +extern EvtScript N(EVS_ParadePhase_Partners); +extern EvtScript N(EVS_ParadePhase_Toads); +extern EvtScript N(EVS_ParadePhase_KoopaBros); +extern EvtScript N(EVS_ParadePhase_Kolorado); +extern EvtScript N(EVS_ParadePhase_Caravan); +extern EvtScript N(EVS_ParadePhase_BuzzarNest); +extern EvtScript N(EVS_ParadePhase_Tutankoopa); +extern EvtScript N(EVS_ParadePhase_Boos); +extern EvtScript N(EVS_ParadePhase_GoombaKing); +extern EvtScript N(EVS_ParadePhase_Yoshis); +extern EvtScript N(EVS_ParadePhase_HuffNPuff); +extern EvtScript N(EVS_ParadePhase_CrystalKing); +extern EvtScript N(EVS_ParadePhase_Bowser); + +extern EvtScript N(EVS_InitCredits); +extern EvtScript N(EVS_ShowCredits_Title); +extern EvtScript N(EVS_ShowCredits_Jobs); +extern EvtScript N(EVS_ShowCredits_Names); + +API_CALLABLE(N(CreateParadeNPC)) { + Bytecode* args = script->ptrReadPos; + s32 npcID = evt_get_variable(script, *args++); + ParadeNpcInfo* npcInfo = &N(ParadeNpcsTable)[npcID]; + NpcBlueprint bp; + Npc* npc; + + bp.flags = NPC_FLAG_100; + bp.initialAnim = npcInfo->initialAnim; + bp.onUpdate = NULL; + bp.onRender = NULL; + + spr_allocateBtlComponentsOnWorldHeap = TRUE; + + npc = get_npc_by_index(_create_npc_standard(&bp, npcInfo->animList)); + npc->npcID = npcID; + npc->flags &= ~NPC_FLAG_PARTICLE; + npc->pos.x = npcInfo->pos.x; + npc->pos.y = npcInfo->pos.y; + npc->pos.z = npcInfo->pos.z; + set_npc_yaw(npc, npcInfo->yaw); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(ParadeSpriteHeapMalloc)) { + Bytecode* args = script->ptrReadPos; + s32 heapSize = evt_get_variable(script, *args++); + s32 outVar = *args++; + + evt_set_variable(script, outVar, (s32) _heap_malloc(&gSpriteHeapPtr, heapSize)); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(ParadeSpriteHeapFree)) { + Bytecode* args = script->ptrReadPos; + s32 pointer = *args++; + + _heap_free(&gSpriteHeapPtr, (void*) evt_get_variable(script, pointer)); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(UpdateCameraScroll)) { + Camera* camera = &gCameras[gCurrentCameraID]; + + camera->panActive = TRUE; + camera->movePos.x += PARADE_SCROLL_RATE; + return ApiStatus_DONE2; +} + +API_CALLABLE(N(SetNpcShadowScale)) { + Bytecode* args = script->ptrReadPos; + s32 npcID = evt_get_variable(script, *args++); + f32 newShadowScale = evt_get_float_variable(script, *args++); + + resolve_npc(script, npcID)->shadowScale = newShadowScale; + return ApiStatus_DONE2; +} + +API_CALLABLE(N(AddScrollToNpcPos)) { + Bytecode* args = script->ptrReadPos; + Npc** npc = (Npc**)&script->functionTempPtr[1]; + + if (isInitialCall) { + *npc = get_npc_unsafe(evt_get_variable(script, *args++)); + } + + (*npc)->pos.x += PARADE_SCROLL_RATE; + + return ApiStatus_BLOCK; +} + +EvtScript N(EVS_SetupInitialCamera) = { + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, PARADE_START, 0, 0) + EVT_CALL(SetPanTarget, CAM_DEFAULT, PARADE_START, 0, 0) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UpdateScrollPos) = { + EVT_CALL(SetPanTarget, CAM_DEFAULT, EVT_FLOAT(PARADE_START), 0, 0) + EVT_SETF(LVar1, EVT_FLOAT(0.0)) + EVT_LOOP(0) + EVT_CALL(N(UpdateCameraScroll)) + EVT_CALL(TranslateGroup, MODEL_bg, LVar1, 0, 0) + EVT_ADDF(LVar1, EVT_FLOAT(PARADE_SCROLL_RATE)) + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetNpcShadowScale) = { + EVT_CALL(N(SetNpcShadowScale), LVar0, LVar2) + EVT_CALL(SetNpcFlagBits, LVar0, NPC_FLAG_DIRTY_SHADOW, TRUE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OffsetNpcScroll) = { + EVT_CALL(N(AddScrollToNpcPos), LVar0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UpdateTexPan_Ground) = { + EVT_CALL(EnableTexPanning, MODEL_j1, TRUE) + EVT_CALL(EnableTexPanning, MODEL_j2, TRUE) + EVT_CALL(EnableTexPanning, MODEL_j3, TRUE) + EVT_CALL(EnableTexPanning, MODEL_j4, TRUE) + EVT_CALL(EnableTexPanning, MODEL_j5, TRUE) + EVT_CALL(EnableTexPanning, MODEL_j6, TRUE) + EVT_CALL(EnableTexPanning, MODEL_j7, TRUE) + EVT_CALL(EnableTexPanning, MODEL_j8, TRUE) + EVT_CALL(EnableTexPanning, MODEL_j9, TRUE) + EVT_CALL(EnableTexPanning, MODEL_j10, TRUE) + EVT_CALL(EnableTexPanning, MODEL_j11, TRUE) + EVT_CALL(EnableTexPanning, MODEL_j12, TRUE) + EVT_CALL(EnableTexPanning, MODEL_j13, TRUE) + EVT_CALL(EnableTexPanning, MODEL_j14, TRUE) + EVT_CALL(EnableTexPanning, MODEL_j15, TRUE) + EVT_CALL(EnableTexPanning, MODEL_j16, TRUE) + EVT_CALL(EnableTexPanning, MODEL_j17, TRUE) + EVT_CALL(EnableTexPanning, MODEL_j18, TRUE) + EVT_CALL(EnableTexPanning, MODEL_j19, TRUE) + EVT_CALL(EnableTexPanning, MODEL_j20, TRUE) + EVT_CALL(EnableTexPanning, MODEL_j21, TRUE) + EVT_CALL(EnableTexPanning, MODEL_j22, TRUE) + EVT_CALL(EnableTexPanning, MODEL_j23, TRUE) + EVT_CALL(EnableTexPanning, MODEL_j24, TRUE) + EVT_CALL(EnableTexPanning, MODEL_j25, TRUE) + EVT_CALL(EnableTexPanning, MODEL_j26, TRUE) + EVT_CALL(EnableTexPanning, MODEL_j27, TRUE) + EVT_THREAD + EVT_SET(LVar0, 0) + EVT_SET(LVar1, 0) + EVT_LOOP(0) + EVT_ADD(LVar0, 300) + EVT_IF_GT(LVar0, 0x20000) + EVT_ADD(LVar0, -0x20000) + EVT_END_IF + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TexPan_Clouds) = { + EVT_CALL(EnableTexPanning, MODEL_cloud, TRUE) + EVT_SET(LVar0, 0) + EVT_LOOP(0) + EVT_ADD(LVar0, 0x8000) + EVT_CALL(SetTexPanOffset, TEX_PANNER_2, TEX_PANNER_MAIN, 0, LVar0) + EVT_WAIT(16) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TexPan_Water) = { + EVT_CALL(EnableTexPanning, MODEL_umi, TRUE) + EVT_SET(LVar0, 0) + EVT_SET(LVar1, 0) + EVT_SET(LVar2, 0) + EVT_SET(LVar3, 0) + EVT_LOOP(0) + EVT_ADD(LVar0, 50) + EVT_ADD(LVar1, 50) + EVT_CALL(SetTexPanOffset, TEX_PANNER_3, TEX_PANNER_MAIN, LVar0, LVar1) + EVT_ADD(LVar2, -50) + EVT_ADD(LVar3, -50) + EVT_CALL(SetTexPanOffset, TEX_PANNER_3, TEX_PANNER_AUX, LVar2, LVar3) + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +s32 N(ExtraAnims_Tutankoopa)[] = { + ANIM_Tutankoopa_Anim02, + ANIM_Tutankoopa_Anim06, + ANIM_Tutankoopa_Anim09, + ANIM_Tutankoopa_Anim01, + ANIM_Tutankoopa_Anim04, + -1 +}; + +s32 N(ExtraAnims_Rowf)[] = { + ANIM_Rowf_PackedStill, + ANIM_Rowf_PackedIdle, + ANIM_Rowf_PackedWalk, + ANIM_Rowf_PackedRun, + ANIM_Rowf_PackedTalk, + ANIM_Rowf_PackedCheer, + -1 +}; + +s32 N(ExtraAnims_Moustafa)[] = { + ANIM_Moustafa_Run, + ANIM_Moustafa_Shout, + ANIM_Moustafa_Talk, + ANIM_Moustafa_Toss, + ANIM_Moustafa_Idle, + -1 +}; + +s32 N(ExtraAnims_Mouser)[] = { + ANIM_Mouser_Blue_Run, + ANIM_Mouser_Blue_IdleOnlyBlink, + ANIM_Mouser_Blue_Whisper, + -1 +}; + +s32 N(ExtraAnims_Buzzar)[] = { + ANIM_Buzzar_Anim05, + ANIM_Buzzar_Anim03, + -1 +}; + +s32 N(ExtraAnims_GoombaKing)[] = { + ANIM_GoombaKing_Still, + ANIM_GoombaKing_Dead, + ANIM_GoombaKing_Angry, + -1 +}; + +s32 N(ExtraAnims_RafaelRaven)[] = { + ANIM_RafaelRaven_IdleNoFeet, + -1 +}; + +s32 N(ExtraAnims_LavaPiranha)[] = { + ANIM_LavaPiranha_Anim04, + -1 +}; + +s32 N(ExtraAnims_HuffNPuff)[] = { + ANIM_HuffNPuff_Anim01, + ANIM_HuffNPuff_Anim02, + ANIM_HuffNPuff_Anim03, + ANIM_HuffNPuff_Anim07, + ANIM_HuffNPuff_Anim08, + ANIM_HuffNPuff_Anim09, + ANIM_HuffNPuff_Anim26, + ANIM_HuffNPuff_Anim27, + ANIM_HuffNPuff_Anim28, + -1 +}; + +s32 N(ExtraAnims_TuffPuff)[] = { + ANIM_TuffPuff_Idle, + ANIM_TuffPuff_Hurt, + ANIM_TuffPuff_Blush, + -1 +}; + +s32 N(ExtraAnims_GourmetGuy)[] = { + ANIM_GourmetGuy_Walk, + ANIM_GourmetGuy_Leap, + ANIM_GourmetGuy_TalkSurprise, + ANIM_GourmetGuy_Still, + ANIM_GourmetGuy_Idle, + ANIM_GourmetGuy_Inspect, + ANIM_GourmetGuy_Panic, + -1 +}; + +s32 N(ExtraAnims_MageJrTroopa)[] = { + ANIM_MageJrTroopa_Idle, + ANIM_MageJrTroopa_Run, + ANIM_MageJrTroopa_RaiseStaff, + ANIM_MageJrTroopa_SwingStaff, + ANIM_MageJrTroopa_BurnStill, + -1 +}; + +s32 N(ExtraAnims_Kammy)[] = { + ANIM_WorldKammy_Anim14, + ANIM_WorldKammy_Anim0C, + ANIM_WorldKammy_Anim0E, + ANIM_WorldKammy_Anim0F, + ANIM_WorldKammy_Anim12, + ANIM_WorldKammy_Anim07, + -1 +}; + +ParadeNpcInfo N(ParadeNpcsTable)[] = { + [NPC_Luigi] { + .initialAnim = ANIM_ParadeLuigi_March, + .pos = { -2880.0f, 0.0f, 0.0f }, + .yaw = 270.0f + }, + [NPC_HornPlayer1] { + .initialAnim = ANIM_ParadeToad_Red_HornWalk, + .pos = { -2880.0f, 0.0f, -20.0f }, + .yaw = 270.0f + }, + [NPC_HornPlayer2] { + .initialAnim = ANIM_ParadeToad_Red_HornWalk, + .pos = { -2880.0f, 0.0f, 20.0f }, + .yaw = 270.0f + }, + [NPC_Drummer1] { + .initialAnim = ANIM_ParadeToad_Red_DrummerWalk, + .pos = { -2830.0f, 0.0f, -20.0f }, + .yaw = 270.0f + }, + [NPC_Drummer2] { + .initialAnim = ANIM_ParadeToad_Red_DrummerWalk, + .pos = { -2830.0f, 0.0f, 20.0f }, + .yaw = 270.0f + }, + [NPC_StandardBearer1] { + .initialAnim = ANIM_ParadeToad_Red_BannerWalk, + .pos = { -2780.0f, 0.0f, -20.0f }, + .yaw = 270.0f + }, + [NPC_StandardBearer2] { + .initialAnim = ANIM_ParadeToad_Red_BannerWalk, + .pos = { -2780.0f, 0.0f, 20.0f }, + .yaw = 270.0f + }, + [NPC_Goombario] { + .initialAnim = ANIM_ParadePartner_Goombario, + .pos = { -2585.0f, 70.0f, 15.0f }, + .yaw = 270.0f + }, + [NPC_Kooper] { + .initialAnim = ANIM_ParadePartner_Kooper, + .pos = { -2517.0f, 40.0f, 7.0f }, + .yaw = 90.0f + }, + [NPC_Bombette] { + .initialAnim = ANIM_ParadePartner_Bombette, + .pos = { -2536.0f, 50.0f, 38.0f }, + .yaw = 270.0f + }, + [NPC_Parakarry] { + .initialAnim = ANIM_ParadePartner_Parakarry, + .pos = { -2515.0f, 80.0f, 5.0f }, + .yaw = 270.0f + }, + [NPC_Bow] { + .initialAnim = ANIM_ParadePartner_Bow, + .pos = { -2475.0f, 56.0f, 0.0f }, + .yaw = 270.0f + }, + [NPC_Watt] { + .initialAnim = ANIM_ParadePartner_Watt, + .pos = { -2575.0f, 20.0f, 48.0f }, + .yaw = 270.0f + }, + [NPC_Sushie] { + .initialAnim = ANIM_ParadePartner_Sushie, + .pos = { -2570.0f, 61.0f, 7.0f }, + .yaw = 90.0f + }, + [NPC_Lakilester] { + .initialAnim = ANIM_ParadePartner_Lakilester, + .pos = { -2635.0f, 40.0f, 0.0f }, + .yaw = 270.0f + }, + [NPC_Twirler1] { + .initialAnim = ANIM_ParadeToad_Red_TwirlerWalk, + .pos = { -2350.0f, 0.0f, 0.0f }, + .yaw = 270.0f + }, + [NPC_Twirler2] { + .initialAnim = ANIM_ParadeToad_Red_TwirlerWalk, + .pos = { -2300.0f, 0.0f, 0.0f }, + .yaw = 270.0f + }, + [NPC_Twirler3] { + .initialAnim = ANIM_ParadeToad_Red_TwirlerWalk, + .pos = { -2250.0f, 0.0f, 0.0f }, + .yaw = 270.0f + }, + [NPC_Baton1] { + .initialAnim = ANIM_ParadeToad_Red_BatonSpin, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 270.0f + }, + [NPC_Baton2] { + .initialAnim = ANIM_ParadeToad_Red_BatonSpin, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 270.0f + }, + [NPC_Baton3] { + .initialAnim = ANIM_ParadeToad_Red_BatonSpin, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 270.0f + }, + [NPC_ChuckQuizmo] { + .initialAnim = ANIM_ChuckQuizmo_Walk, + .pos = { -2120.0f, 0.0f, 0.0f }, + .yaw = 270.0f + }, + [NPC_VannaT] { + .initialAnim = ANIM_VannaT_Walk, + .pos = { -2070.0f, 0.0f, 0.0f }, + .yaw = 270.0f + }, + [NPC_KoopaBrosRed] { + .initialAnim = ANIM_KoopaBros_Red_Anim1A, + .pos = { -1860.0f, 65.0f, 10.0f }, + .yaw = 270.0f + }, + [NPC_KoopaBrosBlack] { + .initialAnim = ANIM_KoopaBros_Black_Anim1A, + .pos = { -1840.0f, 65.0f, 10.0f }, + .yaw = 90.0f + }, + [NPC_KoopaBrosYellow] { + .initialAnim = ANIM_KoopaBros_Yellow_Anim1A, + .pos = { -1870.0f, 12.0f, 37.0f }, + .yaw = 270.0f + }, + [NPC_KoopaBrosGreen] { + .initialAnim = ANIM_KoopaBros_Green_Anim1A, + .pos = { -1830.0f, 12.0f, 37.0f }, + .yaw = 90.0f + }, + [NPC_Bobomb1] { + .initialAnim = ANIM_Bobomb_Anim05, + .pos = { -1750.0f, 0.0f, 43.0f }, + .yaw = 270.0f + }, + [NPC_Bobomb2] { + .initialAnim = ANIM_Bobomb_Anim05, + .pos = { -1720.0f, 0.0f, 43.0f }, + .yaw = 270.0f + }, + [NPC_Bobomb3] { + .initialAnim = ANIM_Bobomb_Anim05, + .pos = { -1690.0f, 0.0f, 43.0f }, + .yaw = 270.0f + }, + [NPC_Bobomb4] { + .initialAnim = ANIM_Bobomb_Anim05, + .pos = { -1660.0f, 0.0f, 43.0f }, + .yaw = 270.0f + }, + [NPC_Kolorado] { + .initialAnim = ANIM_ParadeKolorado_IdleFwd, + .pos = { -1555.0f, 45.0f, -190.0f }, + .yaw = 270.0f + }, + [NPC_KoloradoWife] { + .initialAnim = ANIM_ParadeKolorado_WifeIdleFwd, + .pos = { -1575.0f, 45.0f, -210.0f }, + .yaw = 270.0f + }, + [NPC_Rowf] { + .initialAnim = ANIM_Rowf_PackedWalk, + .animList = N(ExtraAnims_Rowf), + .pos = { -1775.0f, 0.0f, 2.0f }, + .yaw = 90.0f + }, + [NPC_Rhuff] { + .initialAnim = ANIM_Rowf_PackedWalk, + .animList = N(ExtraAnims_Rowf), + .pos = { -1740.0f, 0.0f, 2.0f }, + .yaw = 90.0f + }, + [NPC_Moustafa] { + .initialAnim = ANIM_Moustafa_Run, + .animList = N(ExtraAnims_Moustafa), + .pos = { -1240.0f, 0.0f, -2.0f }, + .yaw = 270.0f + }, + [NPC_Mouser1] { + .initialAnim = ANIM_Mouser_Blue_Run, + .animList = N(ExtraAnims_Mouser), + .pos = { -1210.0f, 0.0f, -2.0f }, + .yaw = 270.0f + }, + [NPC_Mouser2] { + .initialAnim = ANIM_Mouser_Blue_Run, + .animList = N(ExtraAnims_Mouser), + .pos = { -1180.0f, 0.0f, -2.0f }, + .yaw = 270.0f + }, + [NPC_Tutankoopa1] { + .initialAnim = ANIM_Tutankoopa_Anim02, + .animList = N(ExtraAnims_Tutankoopa), + .pos = { -1040.0f, 0.0f, 30.0f }, + .yaw = 270.0f + }, + [NPC_ChainChomp1] { + .initialAnim = ANIM_ChainChomp_Anim03, + .pos = { -1000.0f, 0.0f, 30.0f }, + .yaw = 270.0f + }, + [NPC_Buzzar] { + .initialAnim = ANIM_Buzzar_Anim05, + .animList = N(ExtraAnims_Buzzar), + .pos = { -855.0f, 70.0f, -140.0f }, + .yaw = 270.0f + }, + [NPC_VultureChick1] { + .initialAnim = ANIM_ParadeChick_Egg, + .pos = { -875.0f, 70.0f, -165.0f }, + .yaw = 270.0f + }, + [NPC_VultureChick2] { + .initialAnim = ANIM_ParadeChick_Egg, + .pos = { -855.0f, 70.0f, -160.0f }, + .yaw = 90.0f + }, + [NPC_VultureChick3] { + .initialAnim = ANIM_ParadeChick_Egg, + .pos = { -835.0f, 70.0f, -165.0f }, + .yaw = 90.0f + }, + [NPC_Bootler] { + .initialAnim = ANIM_Bootler_Idle, + .pos = { -650.0f, 20.0f, 0.0f }, + .yaw = 270.0f + }, + [NPC_Tutankoopa2] { + .initialAnim = ANIM_Tutankoopa_Anim02, + .animList = N(ExtraAnims_Tutankoopa), + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 90.0f + }, + [NPC_ChainChomp2] { + .initialAnim = ANIM_ChainChomp_Anim03, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 90.0f + }, + [NPC_ChainChomp3] { + .initialAnim = ANIM_ChainChomp_Anim03, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 90.0f + }, + [NPC_ChainChomp4] { + .initialAnim = ANIM_ChainChomp_Anim03, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 90.0f + }, + [NPC_TubbasBody] { + .initialAnim = ANIM_ParadeTubba_Still, + .pos = { -310.0f, 35.0f, 0.0f }, + .yaw = 270.0f + }, + [NPC_Boo1] { + .initialAnim = ANIM_Boo_CarryIdle, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 90.0f + }, + [NPC_Boo2] { + .initialAnim = ANIM_Boo_CarryIdle, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 90.0f + }, + [NPC_Boo3] { + .initialAnim = ANIM_Boo_CarryIdle, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 90.0f + }, + [NPC_TubbasHeart] { + .initialAnim = ANIM_TubbasHeart_Anim01, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 270.0f + }, + [NPC_GoombaKing] { + .initialAnim = ANIM_GoombaKing_Still, + .animList = N(ExtraAnims_GoombaKing), + .pos = { -70.0f, 130.0f, -60.0f }, + .yaw = 270.0f + }, + [NPC_RedGoombaBros] { + .initialAnim = ANIM_GoombaBros_Red_Walk, + .pos = { -110.0f, 0.0f, -28.0f }, + .yaw = 90.0f + }, + [NPC_BlueGoombaBros] { + .initialAnim = ANIM_GoombaBros_Blue_Walk, + .pos = { -30.0f, 0.0f, -32.0f }, + .yaw = 270.0f + }, + [NPC_Yoshi1] { + .initialAnim = ANIM_ParadeYoshi_IdleGreen, + .pos = { 212.0f, 40.0f, 35.0f }, + .yaw = 270.0f + }, + [NPC_Yoshi2] { + .initialAnim = ANIM_ParadeYoshi_IdleBlue, + .pos = { 247.0f, 40.0f, 35.0f }, + .yaw = 270.0f + }, + [NPC_Yoshi3] { + .initialAnim = ANIM_ParadeYoshi_IdleYellow, + .pos = { 282.0f, 40.0f, 35.0f }, + .yaw = 90.0f + }, + [NPC_Yoshi4] { + .initialAnim = ANIM_ParadeYoshi_IdleBrown, + .pos = { 272.0f, 50.0f, 25.0f }, + .yaw = 90.0f + }, + [NPC_YoshiChief] { + .initialAnim = ANIM_ParadeYoshi_IdleLeader, + .pos = { 232.0f, 50.0f, 25.0f }, + .yaw = 270.0f + }, + [NPC_RafaelRaven] { + .initialAnim = ANIM_RafaelRaven_IdleNoFeet, + .animList = N(ExtraAnims_RafaelRaven), + .pos = { 357.0f, -120.0f, -30.0f }, + .yaw = 90.0f + }, + [NPC_LavaPiranha] { + .initialAnim = ANIM_LavaPiranha_Anim04, + .animList = N(ExtraAnims_LavaPiranha), + .pos = { 507.0f, 50.0f, -5.0f }, + .yaw = 90.0f + }, + [NPC_YoshiKidGreen] { + .initialAnim = ANIM_YoshiKid_Green_Walk, + .pos = { 570.0f, 50.0f, 0.0f }, + .yaw = 90.0f + }, + [NPC_YoshiKidBlue] { + .initialAnim = ANIM_YoshiKid_Blue_Run, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 90.0f + }, + [NPC_YoshiKidPurple] { + .initialAnim = ANIM_YoshiKid_Purple_Run, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 90.0f + }, + [NPC_YoshiKidYellow] { + .initialAnim = ANIM_YoshiKid_Yellow_Run, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 90.0f + }, + [NPC_YoshiKidRed] { + .initialAnim = ANIM_YoshiKid_Red_Run, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 90.0f + }, + [NPC_HuffNPuffBody] { + .initialAnim = ANIM_HuffNPuff_Anim01, + .animList = N(ExtraAnims_HuffNPuff), + .pos = { 1060.0f, 80.0f, 0.0f }, + .yaw = 270.0f + }, + [NPC_HuffNPuffFace] { + .initialAnim = ANIM_HuffNPuff_Anim02, + .animList = N(ExtraAnims_HuffNPuff), + .pos = { 1060.0f, 80.0f, 0.0f }, + .yaw = 270.0f + }, + [NPC_HuffNPuffArms] { + .initialAnim = ANIM_HuffNPuff_Anim03, + .animList = N(ExtraAnims_HuffNPuff), + .pos = { 1060.0f, 80.0f, 0.0f }, + .yaw = 270.0f + }, + [NPC_TuffPuff1] { + .initialAnim = ANIM_TuffPuff_Idle, + .animList = N(ExtraAnims_TuffPuff), + .pos = { 980.0f, 60.0f, 0.0f }, + .yaw = 270.0f + }, + [NPC_TuffPuff2] { + .initialAnim = ANIM_TuffPuff_Idle, + .animList = N(ExtraAnims_TuffPuff), + .pos = { 1140.0f, 60.0f, 0.0f }, + .yaw = 270.0f + }, + [NPC_GourmetGuy] { + .initialAnim = ANIM_GourmetGuy_Walk, + .animList = N(ExtraAnims_GourmetGuy), + .pos = { 1270.0f, 0.0f, -20.0f }, + .yaw = 270.0f + }, + [NPC_Duplighost1] { + .initialAnim = ANIM_Duplighost_Anim0A, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 90.0f + }, + [NPC_Duplighost2] { + .initialAnim = ANIM_Duplighost_Anim0A, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 90.0f + }, + [NPC_TrueCrystalKing] { + .initialAnim = ANIM_CrystalKing_Anim0E, + .pos = { 1440.0f, 0.0f, 0.0f }, + .yaw = 270.0f + }, + [NPC_FakeCrystalKing] { + .initialAnim = ANIM_CrystalKing_Anim0E, + .pos = { 1600.0f, 0.0f, 0.0f }, + .yaw = 270.0f + }, + [NPC_CrystalBit1] { + .initialAnim = ANIM_CrystalKing_Anim0A, + .pos = { 2000.0f, 100.0f, 0.0f }, + .yaw = 270.0f + }, + [NPC_CrystalBit2] { + .initialAnim = ANIM_CrystalKing_Anim0B, + .pos = { 2050.0f, 100.0f, 0.0f }, + .yaw = 270.0f + }, + [NPC_CrystalBit3] { + .initialAnim = ANIM_CrystalKing_Anim0C, + .pos = { 2100.0f, 100.0f, 0.0f }, + .yaw = 270.0f + }, + [NPC_Kammy] { + .initialAnim = ANIM_WorldKammy_Anim14, + .animList = N(ExtraAnims_Kammy), + .pos = { 2160.0f, 60.0f, 0.0f }, + .yaw = 270.0f + }, + [NPC_JrTroopa] { + .initialAnim = ANIM_MageJrTroopa_RaiseStaff, + .animList = N(ExtraAnims_MageJrTroopa), + .pos = { 2060.0f, 0.0f, 0.0f }, + .yaw = 90.0f + }, + [NPC_Bowser] { + .initialAnim = ANIM_ParadeKoopas_Bowser_Bowser, + .pos = { 2390.0f, 10.0f, 0.0f }, + .yaw = 270.0f + }, + [NPC_BowserPropeller] { + .initialAnim = ANIM_ParadeKoopas_Bowser_Propeller, + .pos = { 2390.0f, 10.0f, 0.0f }, + .yaw = 270.0f + }, + [NPC_HammerBros1] { + .initialAnim = ANIM_ParadeKoopas_Bowser_HammerBrosJuggle, + .pos = { 2300.0f, 0.0f, 0.0f }, + .yaw = 270.0f + }, + [NPC_HammerBros2] { + .initialAnim = ANIM_ParadeKoopas_Bowser_HammerBrosJuggle, + .pos = { 2260.0f, 0.0f, 0.0f }, + .yaw = 270.0f + }, + [NPC_Koopatrol1] { + .initialAnim = ANIM_ParadeKoopas_Bowser_KoopatrolMarch, + .pos = { 2480.0f, 0.0f, 0.0f }, + .yaw = 270.0f + }, + [NPC_Koopatrol2] { + .initialAnim = ANIM_ParadeKoopas_Bowser_KoopatrolMarch, + .pos = { 2520.0f, 0.0f, 0.0f }, + .yaw = 270.0f + }, + [NPC_BurntBowser] { + .initialAnim = ANIM_ParadeBurntBowser_BurntIdle, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 270.0f + }, + [NPC_BurntBowserPropeller] { + .initialAnim = ANIM_ParadeBurntBowser_BurntPropeller, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 270.0f + }, +}; + +EvtScript N(EVS_ManageNpcPool) = { + EVT_CALL(N(CreateParadeNPC), NPC_Luigi) + EVT_CALL(N(ParadeSpriteHeapMalloc), 0x25000, LVar0) + EVT_CALL(N(CreateParadeNPC), NPC_HornPlayer1) + EVT_CALL(N(CreateParadeNPC), NPC_HornPlayer2) + EVT_CALL(N(CreateParadeNPC), NPC_Drummer1) + EVT_CALL(N(CreateParadeNPC), NPC_Drummer2) + EVT_CALL(N(CreateParadeNPC), NPC_StandardBearer1) + EVT_CALL(N(CreateParadeNPC), NPC_StandardBearer2) + EVT_CALL(N(ParadeSpriteHeapFree), LVar0) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_PARTNERS) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(DeleteNpc, NPC_Luigi) + EVT_CALL(N(CreateParadeNPC), NPC_Goombario) + EVT_CALL(N(CreateParadeNPC), NPC_Kooper) + EVT_CALL(N(CreateParadeNPC), NPC_Bombette) + EVT_CALL(N(CreateParadeNPC), NPC_Parakarry) + EVT_CALL(N(CreateParadeNPC), NPC_Bow) + EVT_CALL(N(CreateParadeNPC), NPC_Watt) + EVT_CALL(N(CreateParadeNPC), NPC_Sushie) + EVT_CALL(N(CreateParadeNPC), NPC_Lakilester) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_TOAD_TOWN) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(DeleteNpc, NPC_HornPlayer1) + EVT_CALL(DeleteNpc, NPC_HornPlayer2) + EVT_CALL(DeleteNpc, NPC_Drummer1) + EVT_CALL(DeleteNpc, NPC_Drummer2) + EVT_CALL(DeleteNpc, NPC_StandardBearer1) + EVT_CALL(DeleteNpc, NPC_StandardBearer2) + EVT_WAIT(1) + EVT_CALL(N(ParadeSpriteHeapMalloc), 0x25000, LVar0) + EVT_CALL(N(CreateParadeNPC), NPC_Twirler1) + EVT_CALL(N(CreateParadeNPC), NPC_Twirler2) + EVT_CALL(N(CreateParadeNPC), NPC_Twirler3) + EVT_CALL(N(CreateParadeNPC), NPC_Baton1) + EVT_CALL(N(CreateParadeNPC), NPC_Baton2) + EVT_CALL(N(CreateParadeNPC), NPC_Baton3) + EVT_CALL(N(ParadeSpriteHeapFree), LVar0) + EVT_WAIT(60) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_TOAD_TOWN + 250) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(DeleteNpc, NPC_Goombario) + EVT_CALL(DeleteNpc, NPC_Kooper) + EVT_CALL(DeleteNpc, NPC_Bombette) + EVT_CALL(DeleteNpc, NPC_Parakarry) + EVT_CALL(DeleteNpc, NPC_Bow) + EVT_CALL(DeleteNpc, NPC_Watt) + EVT_CALL(DeleteNpc, NPC_Sushie) + EVT_CALL(DeleteNpc, NPC_Lakilester) + EVT_WAIT(1) + EVT_CALL(N(CreateParadeNPC), NPC_ChuckQuizmo) + EVT_CALL(N(CreateParadeNPC), NPC_VannaT) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_KOLORADO + 20) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(DeleteNpc, NPC_Twirler1) + EVT_CALL(DeleteNpc, NPC_Twirler2) + EVT_CALL(DeleteNpc, NPC_Twirler3) + EVT_CALL(DeleteNpc, NPC_Baton1) + EVT_CALL(DeleteNpc, NPC_Baton2) + EVT_CALL(DeleteNpc, NPC_Baton3) + EVT_WAIT(1) + EVT_CALL(N(ParadeSpriteHeapMalloc), 0xB000, LVar0) + EVT_CALL(N(CreateParadeNPC), NPC_KoopaBrosRed) + EVT_CALL(N(CreateParadeNPC), NPC_KoopaBrosBlack) + EVT_CALL(N(CreateParadeNPC), NPC_KoopaBrosYellow) + EVT_CALL(N(CreateParadeNPC), NPC_KoopaBrosGreen) + EVT_CALL(N(CreateParadeNPC), NPC_Bobomb1) + EVT_CALL(N(CreateParadeNPC), NPC_Bobomb2) + EVT_CALL(N(CreateParadeNPC), NPC_Bobomb3) + EVT_CALL(N(CreateParadeNPC), NPC_Bobomb4) + EVT_CALL(N(ParadeSpriteHeapFree), LVar0) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_KOLORADO + 200) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(DeleteNpc, NPC_ChuckQuizmo) + EVT_CALL(DeleteNpc, NPC_VannaT) + EVT_WAIT(1) + EVT_CALL(N(CreateParadeNPC), NPC_Kolorado) + EVT_CALL(N(CreateParadeNPC), NPC_KoloradoWife) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_CARAVAN) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(DeleteNpc, NPC_KoopaBrosRed) + EVT_CALL(DeleteNpc, NPC_KoopaBrosBlack) + EVT_CALL(DeleteNpc, NPC_KoopaBrosYellow) + EVT_CALL(DeleteNpc, NPC_KoopaBrosGreen) + EVT_CALL(DeleteNpc, NPC_Bobomb1) + EVT_CALL(DeleteNpc, NPC_Bobomb2) + EVT_CALL(DeleteNpc, NPC_Bobomb3) + EVT_CALL(DeleteNpc, NPC_Bobomb4) + EVT_WAIT(1) + EVT_CALL(N(ParadeSpriteHeapMalloc), 0x19F00, LVar0) + EVT_CALL(N(CreateParadeNPC), NPC_Tutankoopa1) + EVT_CALL(N(CreateParadeNPC), NPC_Rowf) + EVT_CALL(N(CreateParadeNPC), NPC_Rhuff) + EVT_CALL(N(CreateParadeNPC), NPC_Moustafa) + EVT_CALL(N(CreateParadeNPC), NPC_Mouser1) + EVT_CALL(N(CreateParadeNPC), NPC_Mouser2) + EVT_CALL(N(CreateParadeNPC), NPC_ChainChomp1) + EVT_CALL(N(ParadeSpriteHeapMalloc), 0x7000, LVarF) + EVT_CALL(N(ParadeSpriteHeapFree), LVar0) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_BUZZAR + 175) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(DeleteNpc, NPC_Kolorado) + EVT_CALL(DeleteNpc, NPC_KoloradoWife) + EVT_WAIT(1) + EVT_CALL(N(CreateParadeNPC), NPC_Buzzar) + EVT_CALL(N(CreateParadeNPC), NPC_VultureChick1) + EVT_CALL(N(CreateParadeNPC), NPC_VultureChick2) + EVT_CALL(N(CreateParadeNPC), NPC_VultureChick3) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_BOOS) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(DeleteNpc, NPC_Tutankoopa1) + EVT_CALL(DeleteNpc, NPC_Rowf) + EVT_CALL(DeleteNpc, NPC_Rhuff) + EVT_CALL(DeleteNpc, NPC_Moustafa) + EVT_CALL(DeleteNpc, NPC_Mouser1) + EVT_CALL(DeleteNpc, NPC_Mouser2) + EVT_CALL(DeleteNpc, NPC_ChainChomp1) + EVT_CALL(N(ParadeSpriteHeapFree), LVarF) + EVT_WAIT(1) + EVT_CALL(N(ParadeSpriteHeapMalloc), 0x11F00, LVar0) + EVT_CALL(N(CreateParadeNPC), NPC_Tutankoopa2) + EVT_CALL(N(CreateParadeNPC), NPC_ChainChomp2) + EVT_CALL(N(CreateParadeNPC), NPC_ChainChomp3) + EVT_CALL(N(CreateParadeNPC), NPC_ChainChomp4) + EVT_CALL(N(CreateParadeNPC), NPC_Bootler) + EVT_CALL(N(ParadeSpriteHeapMalloc), 0xA000, LVarF) + EVT_CALL(N(ParadeSpriteHeapFree), LVar0) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_BOOS + 420) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(DeleteNpc, NPC_Buzzar) + EVT_CALL(DeleteNpc, NPC_VultureChick1) + EVT_CALL(DeleteNpc, NPC_VultureChick2) + EVT_CALL(DeleteNpc, NPC_VultureChick3) + EVT_WAIT(1) + EVT_CALL(N(CreateParadeNPC), NPC_TubbasHeart) + EVT_CALL(N(CreateParadeNPC), NPC_Boo1) + EVT_CALL(N(CreateParadeNPC), NPC_Boo2) + EVT_CALL(N(CreateParadeNPC), NPC_Boo3) + EVT_CALL(N(CreateParadeNPC), NPC_TubbasBody) + EVT_CALL(N(SetNpcShadowScale), NPC_TubbasBody, EVT_FLOAT(4.0)) + EVT_CALL(SetNpcFlagBits, NPC_TubbasBody, NPC_FLAG_DIRTY_SHADOW, TRUE) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_GOOMBA_KING) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(DeleteNpc, NPC_Bootler) + EVT_CALL(DeleteNpc, NPC_Tutankoopa2) + EVT_CALL(DeleteNpc, NPC_ChainChomp2) + EVT_CALL(DeleteNpc, NPC_ChainChomp3) + EVT_CALL(DeleteNpc, NPC_ChainChomp4) + EVT_CALL(N(ParadeSpriteHeapFree), LVarF) + EVT_WAIT(1) + EVT_CALL(N(ParadeSpriteHeapMalloc), 0xF000, LVar0) + EVT_CALL(N(CreateParadeNPC), NPC_GoombaKing) + EVT_CALL(N(CreateParadeNPC), NPC_RedGoombaBros) + EVT_CALL(N(CreateParadeNPC), NPC_BlueGoombaBros) + EVT_CALL(N(ParadeSpriteHeapFree), LVar0) + EVT_CALL(N(SetNpcShadowScale), NPC_GoombaKing, EVT_FLOAT(3.0)) + EVT_CALL(SetNpcFlagBits, NPC_GoombaKing, NPC_FLAG_DIRTY_SHADOW, TRUE) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_YOSHIS) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(DeleteNpc, NPC_TubbasBody) + EVT_CALL(DeleteNpc, NPC_Boo1) + EVT_CALL(DeleteNpc, NPC_Boo2) + EVT_CALL(DeleteNpc, NPC_Boo3) + EVT_CALL(DeleteNpc, NPC_TubbasHeart) + EVT_WAIT(1) + EVT_CALL(N(CreateParadeNPC), NPC_RafaelRaven) + EVT_CALL(N(CreateParadeNPC), NPC_LavaPiranha) + EVT_CALL(N(CreateParadeNPC), NPC_Yoshi1) + EVT_CALL(N(CreateParadeNPC), NPC_Yoshi2) + EVT_CALL(N(CreateParadeNPC), NPC_Yoshi3) + EVT_CALL(N(CreateParadeNPC), NPC_Yoshi4) + EVT_CALL(N(CreateParadeNPC), NPC_YoshiChief) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_HUFF_PUFF) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(DeleteNpc, NPC_GoombaKing) + EVT_CALL(DeleteNpc, NPC_RedGoombaBros) + EVT_CALL(DeleteNpc, NPC_BlueGoombaBros) + EVT_WAIT(1) + EVT_CALL(N(ParadeSpriteHeapMalloc), 0x20000, LVar0) + EVT_CALL(N(CreateParadeNPC), NPC_YoshiKidGreen) + EVT_CALL(N(CreateParadeNPC), NPC_YoshiKidBlue) + EVT_CALL(N(CreateParadeNPC), NPC_YoshiKidPurple) + EVT_CALL(N(CreateParadeNPC), NPC_YoshiKidYellow) + EVT_CALL(N(CreateParadeNPC), NPC_YoshiKidRed) + EVT_CALL(N(ParadeSpriteHeapFree), LVar0) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_HUFF_PUFF + 50) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(DeleteNpc, NPC_Yoshi1) + EVT_CALL(DeleteNpc, NPC_Yoshi2) + EVT_CALL(DeleteNpc, NPC_Yoshi3) + EVT_CALL(DeleteNpc, NPC_Yoshi4) + EVT_CALL(DeleteNpc, NPC_YoshiChief) + EVT_CALL(DeleteNpc, NPC_RafaelRaven) + EVT_CALL(DeleteNpc, NPC_LavaPiranha) + EVT_WAIT(1) + EVT_CALL(N(CreateParadeNPC), NPC_HuffNPuffBody) + EVT_CALL(N(CreateParadeNPC), NPC_HuffNPuffFace) + EVT_CALL(N(CreateParadeNPC), NPC_HuffNPuffArms) + EVT_CALL(N(CreateParadeNPC), NPC_GourmetGuy) + EVT_CALL(N(CreateParadeNPC), NPC_TuffPuff1) + EVT_CALL(N(CreateParadeNPC), NPC_TuffPuff2) + EVT_CALL(N(SetNpcShadowScale), 69, EVT_FLOAT(6.0)) + EVT_CALL(SetNpcFlagBits, NPC_HuffNPuffBody, NPC_FLAG_DIRTY_SHADOW, TRUE) + EVT_CALL(N(SetNpcShadowScale), 74, EVT_FLOAT(3.0)) + EVT_CALL(SetNpcFlagBits, NPC_GourmetGuy, NPC_FLAG_DIRTY_SHADOW, TRUE) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_CRYSTAL_KING) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(DeleteNpc, NPC_YoshiKidGreen) + EVT_CALL(DeleteNpc, NPC_YoshiKidBlue) + EVT_CALL(DeleteNpc, NPC_YoshiKidPurple) + EVT_CALL(DeleteNpc, NPC_YoshiKidYellow) + EVT_CALL(DeleteNpc, NPC_YoshiKidRed) + EVT_WAIT(1) + EVT_CALL(N(ParadeSpriteHeapMalloc), 0x2000, LVar0) + EVT_CALL(N(CreateParadeNPC), NPC_TrueCrystalKing) + EVT_CALL(N(CreateParadeNPC), NPC_FakeCrystalKing) + EVT_CALL(N(CreateParadeNPC), NPC_CrystalBit1) + EVT_CALL(N(CreateParadeNPC), NPC_CrystalBit2) + EVT_CALL(N(CreateParadeNPC), NPC_CrystalBit3) + EVT_CALL(N(ParadeSpriteHeapFree), LVar0) + EVT_CALL(N(SetNpcShadowScale), NPC_TrueCrystalKing, EVT_FLOAT(2.0)) + EVT_CALL(SetNpcFlagBits, NPC_TrueCrystalKing, NPC_FLAG_DIRTY_SHADOW, TRUE) + EVT_CALL(N(SetNpcShadowScale), NPC_FakeCrystalKing, EVT_FLOAT(2.0)) + EVT_CALL(SetNpcFlagBits, NPC_FakeCrystalKing, NPC_FLAG_DIRTY_SHADOW, TRUE) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_CRYSTAL_KING + 150) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(DeleteNpc, NPC_HuffNPuffBody) + EVT_CALL(DeleteNpc, NPC_HuffNPuffFace) + EVT_CALL(DeleteNpc, NPC_HuffNPuffArms) + EVT_CALL(DeleteNpc, NPC_GourmetGuy) + EVT_CALL(DeleteNpc, NPC_TuffPuff1) + EVT_CALL(DeleteNpc, NPC_TuffPuff2) + EVT_WAIT(1) + EVT_CALL(N(CreateParadeNPC), NPC_Duplighost1) + EVT_CALL(N(CreateParadeNPC), NPC_Duplighost2) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_BOWSER) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(DeleteNpc, NPC_TrueCrystalKing) + EVT_CALL(DeleteNpc, NPC_FakeCrystalKing) + EVT_CALL(DeleteNpc, NPC_CrystalBit1) + EVT_CALL(DeleteNpc, NPC_CrystalBit2) + EVT_CALL(DeleteNpc, NPC_CrystalBit3) + EVT_WAIT(1) + EVT_CALL(N(CreateParadeNPC), NPC_JrTroopa) + EVT_CALL(N(CreateParadeNPC), NPC_Kammy) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_BOWSER + 100) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(DeleteNpc, NPC_Duplighost1) + EVT_CALL(DeleteNpc, NPC_Duplighost2) + EVT_WAIT(1) + EVT_CALL(N(CreateParadeNPC), NPC_Bowser) + EVT_CALL(N(CreateParadeNPC), NPC_BowserPropeller) + EVT_CALL(N(CreateParadeNPC), NPC_HammerBros1) + EVT_CALL(N(CreateParadeNPC), NPC_HammerBros2) + EVT_CALL(N(CreateParadeNPC), NPC_Koopatrol1) + EVT_CALL(N(CreateParadeNPC), NPC_Koopatrol2) + EVT_CALL(N(CreateParadeNPC), NPC_BurntBowser) + EVT_CALL(N(CreateParadeNPC), NPC_BurntBowserPropeller) + EVT_CALL(N(SetNpcShadowScale), NPC_Bowser, EVT_FLOAT(3.0)) + EVT_CALL(SetNpcFlagBits, NPC_Bowser, NPC_FLAG_DIRTY_SHADOW, TRUE) + EVT_CALL(N(SetNpcShadowScale), NPC_BurntBowser, EVT_FLOAT(3.0)) + EVT_CALL(SetNpcFlagBits, NPC_BurntBowser, NPC_FLAG_DIRTY_SHADOW, TRUE) + EVT_CALL(EnableNpcShadow, NPC_BowserPropeller, FALSE) + EVT_CALL(EnableNpcShadow, NPC_BurntBowserPropeller, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ParadePhase_PlayCredits) = { + EVT_WAIT(240) + EVT_EXEC(N(EVS_InitCredits)) + EVT_EXEC(N(EVS_ShowCredits_Title)) + EVT_EXEC(N(EVS_ShowCredits_Jobs)) + EVT_EXEC(N(EVS_ShowCredits_Names)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ManageParade) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_THREAD + EVT_LABEL(0) + EVT_CALL(SetPlayerPos, NPC_DISPOSE_LOCATION) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_END_THREAD + EVT_EXEC(N(EVS_TexPan_Clouds)) + EVT_EXEC(N(EVS_TexPan_Water)) + EVT_EXEC(N(EVS_SetupInitialCamera)) + EVT_EXEC(N(EVS_ManageNpcPool)) + EVT_EXEC_GET_TID(N(EVS_ParadePhase_Luigi), LVarA) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_IS_THREAD_RUNNING(LVarA, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_EXEC(N(EVS_ParadePhase_PlayCredits)) + EVT_EXEC(N(EVS_UpdateScrollPos)) + EVT_EXEC(N(EVS_UpdateTexPan_Ground)) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_PARTNERS) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_EXEC(N(EVS_ParadePhase_Partners)) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_TOAD_TOWN) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_EXEC(N(EVS_ParadePhase_Toads)) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_KOOPA_BROS) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_EXEC(N(EVS_ParadePhase_KoopaBros)) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_KOLORADO) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_EXEC(N(EVS_ParadePhase_Kolorado)) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_CARAVAN) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_EXEC(N(EVS_ParadePhase_Caravan)) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_BUZZAR) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_EXEC(N(EVS_ParadePhase_BuzzarNest)) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_TUTANKOOPA) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_EXEC(N(EVS_ParadePhase_Tutankoopa)) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_BOOS) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_EXEC(N(EVS_ParadePhase_Boos)) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_GOOMBA_KING) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_EXEC(N(EVS_ParadePhase_GoombaKing)) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_YOSHIS) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_EXEC(N(EVS_ParadePhase_Yoshis)) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_HUFF_PUFF) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_EXEC(N(EVS_ParadePhase_HuffNPuff)) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_CRYSTAL_KING) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_EXEC(N(EVS_ParadePhase_CrystalKing)) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_BOWSER) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_EXEC(N(EVS_ParadePhase_Bowser)) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_DONE) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(GotoMap, EVT_PTR("end_01"), end_01_ENTRY_0) + EVT_CALL(FadeOutMusic, 0, 500) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_end/end_00/end_00_4_allies.c b/src/world/area_end/end_00/end_00_4_allies.c new file mode 100644 index 0000000000..048ff39b65 --- /dev/null +++ b/src/world/area_end/end_00/end_00_4_allies.c @@ -0,0 +1,172 @@ +#include "end_00.h" +#include "effects.h" + +EvtScript N(EVS_ParadePhase_Luigi) = { + EVT_CALL(PlaySound, SOUND_89) + EVT_WAIT(80) + EVT_THREAD + EVT_LOOP(9) + EVT_CALL(PlaySoundAtNpc, NPC_Luigi, SOUND_11, 0) + EVT_WAIT(15) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(NpcMoveTo, NPC_Luigi, PARADE_START, 0, 120) + EVT_CALL(SetNpcAnimation, NPC_Luigi, ANIM_ParadeLuigi_Idle) + EVT_WAIT(10) + EVT_CALL(InterpNpcYaw, NPC_Luigi, 90, 0) + EVT_WAIT(25) + EVT_CALL(StopSound, SOUND_89) + EVT_WAIT(15) + EVT_THREAD + EVT_WAIT(10) + EVT_LOOP(4) + EVT_CALL(PlaySoundAtNpc, NPC_Luigi, SOUND_14, 0) + EVT_WAIT(15) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(SetNpcAnimation, NPC_Luigi, ANIM_ParadeLuigi_BlowWhistle) + EVT_WAIT(30) + EVT_WAIT(30) + EVT_CALL(SetNpcAnimation, NPC_Luigi, ANIM_ParadeLuigi_MarchInPlace) + EVT_WAIT(7) + EVT_CALL(SetMusicTrack, 0, SONG_PARADE_DAY, 0, 8) + EVT_WAIT(120) + EVT_WAIT(100) + EVT_CALL(InterpNpcYaw, NPC_Luigi, 270, 0) + EVT_WAIT(30) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ParadePhase_Partners) = { + EVT_CALL(PlayEffect, EFFECT_CONFETTI, 3, -2545, 200, 0, 1, 800, 0, 0, 0, 0, 0, 0, 0) + EVT_CALL(EnableNpcShadow, NPC_Goombario, FALSE) + EVT_CALL(EnableNpcShadow, NPC_Bombette, FALSE) + EVT_CHILD_THREAD + EVT_LOOP(0) + EVT_WAIT(25) + EVT_CALL(PlayEffect, EFFECT_CONFETTI, 4, -2530, 95, 5, 1, 20, 0, 0, 0, 0, 0, 0, 0) + EVT_WAIT(20) + EVT_END_LOOP + EVT_END_CHILD_THREAD + EVT_CHILD_THREAD + EVT_CALL(SetNpcJumpscale, NPC_Sushie, EVT_FLOAT(1.0)) + EVT_LOOP(0) + EVT_CALL(NpcJump0, NPC_Sushie, -2550, 35, 7, 15) + EVT_WAIT(10) + EVT_CALL(NpcJump0, NPC_Sushie, -2570, 61, 7, 15) + EVT_WAIT(10) + EVT_END_LOOP + EVT_END_CHILD_THREAD + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_PARTNERS + 545) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Twirler) = { + EVT_CALL(EnableNpcShadow, LVar1, FALSE) + EVT_CALL(SetNpcJumpscale, LVar1, EVT_FLOAT(0.5)) + EVT_LOOP(0) + EVT_CALL(SetNpcAnimation, LVar0, ANIM_ParadeToad_Red_TwirlerWalk) + EVT_WAIT(30) + EVT_CHILD_THREAD + EVT_CALL(GetNpcPos, LVar0, LVar2, LVar3, LVar4) + EVT_ADD(LVar2, -7) + EVT_CALL(SetNpcPos, LVar1, LVar2, LVar3, LVar4) + EVT_CALL(NpcJump0, LVar1, LVar2, LVar3, LVar4, 40) + EVT_CALL(SetNpcPos, LVar1, 0, -500, 0) + EVT_END_CHILD_THREAD + EVT_CALL(SetNpcAnimation, LVar0, ANIM_ParadeToad_Red_TwirlerToss) + EVT_WAIT(5) + EVT_CALL(SetNpcAnimation, LVar0, ANIM_ParadeToad_Red_TwirlerCatch) + EVT_WAIT(5) + EVT_CALL(SetNpcAnimation, LVar0, ANIM_ParadeToad_Red_TwirlerSpin) + EVT_WAIT(20) + EVT_CALL(SetNpcAnimation, LVar0, ANIM_ParadeToad_Red_TwirlerToss) + EVT_WAIT(5) + EVT_CALL(SetNpcAnimation, LVar0, ANIM_ParadeToad_Red_TwirlerCatch) + EVT_WAIT(5) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_QuizCrew) = { + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_TOAD_TOWN + 420) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SetNpcAnimation, NPC_ChuckQuizmo, ANIM_ChuckQuizmo_OpenHat) + EVT_WAIT(10) + EVT_CALL(GetNpcPos, NPC_ChuckQuizmo, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, 80) + EVT_CALL(PlayEffect, EFFECT_EXPLOSION, 0, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_CALL(SetNpcAnimation, NPC_VannaT, ANIM_VannaT_Clap) + EVT_WAIT(60) + EVT_CALL(SetNpcAnimation, NPC_ChuckQuizmo, ANIM_ChuckQuizmo_CloseHat) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_ChuckQuizmo, ANIM_ChuckQuizmo_Walk) + EVT_CALL(SetNpcAnimation, NPC_VannaT, ANIM_VannaT_Walk) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_TOAD_TOWN + 600) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(InterpNpcYaw, NPC_VannaT, 90, 5) + EVT_CALL(SetNpcAnimation, NPC_VannaT, ANIM_VannaT_Wave) + EVT_WAIT(30) + EVT_CALL(InterpNpcYaw, NPC_VannaT, 270, 5) + EVT_CALL(SetNpcAnimation, NPC_VannaT, ANIM_VannaT_Walk) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ParadePhase_Toads) = { + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_TOAD_TOWN) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_SET(LVar0, NPC_Twirler1) + EVT_SET(LVar1, NPC_Baton1) + EVT_EXEC_GET_TID(N(EVS_Twirler), LVarA) + EVT_SET(LVar0, NPC_Twirler2) + EVT_SET(LVar1, NPC_Baton2) + EVT_EXEC_GET_TID(N(EVS_Twirler), LVarB) + EVT_SET(LVar0, NPC_Twirler3) + EVT_SET(LVar1, NPC_Baton3) + EVT_EXEC_GET_TID(N(EVS_Twirler), LVarC) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_TOAD_TOWN + 250) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_EXEC(N(EVS_QuizCrew)) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_TOAD_TOWN + 480) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_KILL_THREAD(LVarA) + EVT_KILL_THREAD(LVarB) + EVT_KILL_THREAD(LVarC) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_end/end_00/end_00_5_koopas.c b/src/world/area_end/end_00/end_00_5_koopas.c new file mode 100644 index 0000000000..33e041ff89 --- /dev/null +++ b/src/world/area_end/end_00/end_00_5_koopas.c @@ -0,0 +1,306 @@ +#include "end_00.h" + +#include "world/common/atomic/WhaleGeyser.inc.c" + +EvtScript N(EVS_FakeBowserFloat) = { + EVT_CALL(EnableModel, MODEL_o81, FALSE) + EVT_LOOP(0) + EVT_CALL(MakeLerp, 15, -15, 30, EASING_QUADRATIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateGroup, MODEL_g13, LVar0, 0, 0, 1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(MakeLerp, -15, 15, 30, EASING_QUADRATIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateGroup, MODEL_g13, LVar0, 0, 0, 1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_KoopaBros_Red) = { + EVT_CALL(EnableNpcShadow, NPC_KoopaBrosRed, FALSE) + EVT_WAIT(150) + EVT_CALL(GetNpcPos, NPC_KoopaBrosRed, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 5) + EVT_ADD(LVar1, 30) + EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 40, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_WAIT(100) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosRed, ANIM_KoopaBros_Red_Anim20) + EVT_WAIT(60) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosRed, ANIM_KoopaBros_Red_Anim0E) + EVT_CALL(SetNpcJumpscale, NPC_KoopaBrosRed, EVT_FLOAT(1.0)) + EVT_CALL(GetNpcPos, NPC_KoopaBrosRed, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_KoopaBrosRed, LVar0, LVar1, LVar2, 20) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosRed, ANIM_KoopaBros_Red_Anim0F) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_KoopaBros_Black) = { + EVT_CALL(EnableNpcShadow, NPC_KoopaBrosBlack, FALSE) + EVT_WAIT(155) + EVT_CALL(GetNpcPos, NPC_KoopaBrosBlack, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, -5) + EVT_ADD(LVar1, 30) + EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 40, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_WAIT(95) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosBlack, ANIM_KoopaBros_Black_Anim20) + EVT_WAIT(60) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosBlack, ANIM_KoopaBros_Black_Anim0E) + EVT_CALL(SetNpcJumpscale, NPC_KoopaBrosBlack, EVT_FLOAT(1.0)) + EVT_CALL(GetNpcPos, NPC_KoopaBrosBlack, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_KoopaBrosBlack, LVar0, LVar1, LVar2, 20) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosBlack, ANIM_KoopaBros_Black_Anim0F) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_KoopaBros_Yellow) = { + EVT_CALL(EnableNpcShadow, NPC_KoopaBrosYellow, FALSE) + EVT_WAIT(160) + EVT_CALL(GetNpcPos, NPC_KoopaBrosYellow, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 5) + EVT_ADD(LVar1, 30) + EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 40, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_WAIT(90) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosYellow, ANIM_KoopaBros_Yellow_Anim20) + EVT_WAIT(60) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosYellow, ANIM_KoopaBros_Yellow_Anim0E) + EVT_CALL(SetNpcJumpscale, NPC_KoopaBrosYellow, EVT_FLOAT(1.0)) + EVT_CALL(GetNpcPos, NPC_KoopaBrosYellow, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_KoopaBrosYellow, LVar0, LVar1, LVar2, 20) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosYellow, ANIM_KoopaBros_Yellow_Anim0F) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_KoopaBros_Green) = { + EVT_CALL(EnableNpcShadow, NPC_KoopaBrosGreen, FALSE) + EVT_WAIT(165) + EVT_CALL(GetNpcPos, NPC_KoopaBrosGreen, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, -5) + EVT_ADD(LVar1, 30) + EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 40, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_WAIT(85) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosGreen, ANIM_KoopaBros_Green_Anim20) + EVT_WAIT(60) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosGreen, ANIM_KoopaBros_Green_Anim0E) + EVT_CALL(SetNpcJumpscale, NPC_KoopaBrosGreen, EVT_FLOAT(1.0)) + EVT_CALL(GetNpcPos, NPC_KoopaBrosGreen, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_KoopaBrosGreen, LVar0, LVar1, LVar2, 20) + EVT_CALL(SetNpcAnimation, NPC_KoopaBrosGreen, ANIM_KoopaBros_Green_Anim0F) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Bobomb1) = { + EVT_CALL(SetNpcFlagBits, NPC_Bobomb1, NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_40 | NPC_FLAG_8000, TRUE) + EVT_WAIT(180) + EVT_CALL(NpcMoveTo, NPC_Bobomb1, -1900, 43, 70) + EVT_CALL(SetNpcAnimation, NPC_Bobomb1, ANIM_Bobomb_Anim0B) + EVT_WAIT(40) + EVT_CALL(SetNpcAnimation, NPC_Bobomb1, ANIM_Bobomb_Anim14) + EVT_WAIT(20) + EVT_CALL(SetNpcAnimation, NPC_Bobomb1, ANIM_Bobomb_Anim16) + EVT_CALL(GetNpcPos, NPC_Bobomb1, LVar0, LVar1, LVar2) + EVT_CALL(PlayEffect, EFFECT_00, LVar0, LVar1, LVar2, 1, 20, 3, 2, 0, 0, 0, 0, 0, 0) + EVT_CALL(EnableNpcShadow, NPC_Bobomb1, FALSE) + EVT_CALL(NpcFlyTo, NPC_Bobomb1, LVar0, 200, LVar2, 10, 0, EASING_LINEAR) + EVT_CALL(SetNpcPos, NPC_Bobomb1, -1870, 200, 40) + EVT_CALL(NpcFlyTo, NPC_Bobomb1, -1870, 12, 40, 20, 0, EASING_LINEAR) + EVT_CALL(SetNpcYaw, NPC_Bobomb1, 270) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Bobomb1, ANIM_Bobomb_Anim17) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Bobomb2) = { + EVT_CALL(SetNpcFlagBits, NPC_Bobomb2, NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_40 | NPC_FLAG_8000, TRUE) + EVT_WAIT(180) + EVT_CALL(NpcMoveTo, NPC_Bobomb2, -1870, 43, 70) + EVT_CALL(SetNpcAnimation, NPC_Bobomb2, ANIM_Bobomb_Anim0B) + EVT_WAIT(40) + EVT_CALL(SetNpcAnimation, NPC_Bobomb2, ANIM_Bobomb_Anim14) + EVT_WAIT(20) + EVT_CALL(SetNpcAnimation, NPC_Bobomb2, ANIM_Bobomb_Anim16) + EVT_CALL(GetNpcPos, NPC_Bobomb2, LVar0, LVar1, LVar2) + EVT_CALL(PlayEffect, EFFECT_00, LVar0, LVar1, LVar2, 1, 20, 3, 2, 0, 0, 0, 0, 0, 0) + EVT_CALL(EnableNpcShadow, NPC_Bobomb2, FALSE) + EVT_CALL(NpcFlyTo, NPC_Bobomb2, LVar0, 200, LVar2, 10, 0, EASING_LINEAR) + EVT_CALL(SetNpcPos, NPC_Bobomb2, -1860, 200, 13) + EVT_CALL(NpcFlyTo, NPC_Bobomb2, -1860, 65, 13, 20, 0, EASING_LINEAR) + EVT_CALL(SetNpcYaw, NPC_Bobomb2, 270) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Bobomb2, ANIM_Bobomb_Anim17) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Bobomb3) = { + EVT_CALL(SetNpcFlagBits, NPC_Bobomb3, NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_40 | NPC_FLAG_8000, TRUE) + EVT_WAIT(180) + EVT_CALL(NpcMoveTo, NPC_Bobomb3, -1840, 43, 70) + EVT_CALL(SetNpcAnimation, NPC_Bobomb3, ANIM_Bobomb_Anim0B) + EVT_WAIT(40) + EVT_CALL(SetNpcAnimation, NPC_Bobomb3, ANIM_Bobomb_Anim14) + EVT_WAIT(20) + EVT_CALL(SetNpcAnimation, NPC_Bobomb3, ANIM_Bobomb_Anim16) + EVT_CALL(GetNpcPos, NPC_Bobomb3, LVar0, LVar1, LVar2) + EVT_CALL(PlayEffect, EFFECT_00, LVar0, LVar1, LVar2, 1, 20, 3, 2, 0, 0, 0, 0, 0, 0) + EVT_CALL(EnableNpcShadow, NPC_Bobomb3, FALSE) + EVT_CALL(NpcFlyTo, NPC_Bobomb3, LVar0, 200, LVar2, 10, 0, EASING_LINEAR) + EVT_CALL(SetNpcPos, NPC_Bobomb3, -1840, 200, 13) + EVT_CALL(NpcFlyTo, NPC_Bobomb3, -1840, 65, 13, 20, 0, EASING_LINEAR) + EVT_CALL(SetNpcYaw, NPC_Bobomb3, 90) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Bobomb3, ANIM_Bobomb_Anim17) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Bobomb4) = { + EVT_CALL(SetNpcFlagBits, NPC_Bobomb4, NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_40 | NPC_FLAG_8000, TRUE) + EVT_WAIT(180) + EVT_CALL(NpcMoveTo, NPC_Bobomb4, -1810, 43, 70) + EVT_CALL(SetNpcAnimation, NPC_Bobomb4, ANIM_Bobomb_Anim0B) + EVT_WAIT(40) + EVT_CALL(SetNpcAnimation, NPC_Bobomb4, ANIM_Bobomb_Anim14) + EVT_WAIT(20) + EVT_CALL(SetNpcAnimation, NPC_Bobomb4, ANIM_Bobomb_Anim16) + EVT_CALL(GetNpcPos, NPC_Bobomb4, LVar0, LVar1, LVar2) + EVT_CALL(PlayEffect, EFFECT_00, LVar0, LVar1, LVar2, 1, 20, 3, 2, 0, 0, 0, 0, 0, 0) + EVT_CALL(EnableNpcShadow, NPC_Bobomb4, FALSE) + EVT_CALL(NpcFlyTo, NPC_Bobomb4, LVar0, 200, LVar2, 10, 0, EASING_LINEAR) + EVT_CALL(SetNpcPos, NPC_Bobomb4, -1830, 200, 40) + EVT_CALL(NpcFlyTo, NPC_Bobomb4, -1830, 12, 40, 20, 0, EASING_LINEAR) + EVT_CALL(SetNpcYaw, NPC_Bobomb4, 90) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Bobomb4, ANIM_Bobomb_Anim17) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ParadePhase_KoopaBros) = { + EVT_EXEC_GET_TID(N(EVS_FakeBowserFloat), LVarA) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_KOOPA_BROS + 80) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(1) + EVT_EXEC(N(EVS_KoopaBros_Red)) + EVT_EXEC(N(EVS_KoopaBros_Black)) + EVT_EXEC(N(EVS_KoopaBros_Yellow)) + EVT_EXEC(N(EVS_KoopaBros_Green)) + EVT_EXEC(N(EVS_Bobomb1)) + EVT_EXEC(N(EVS_Bobomb2)) + EVT_EXEC(N(EVS_Bobomb3)) + EVT_EXEC(N(EVS_Bobomb4)) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_KOOPA_BROS + 550) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_KILL_THREAD(LVarA) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Whale_WagTail) = { + EVT_LOOP(0) + EVT_CALL(MakeLerp, 20, -20, 40, EASING_QUADRATIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o88, LVar0, 0, 0, 1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(MakeLerp, -20, 20, 40, EASING_QUADRATIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o88, LVar0, 0, 0, 1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ParadePhase_Kolorado) = { + EVT_EXEC_GET_TID(N(EVS_Whale_WagTail), LVarA) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_KOLORADO + 500) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_SET(LVar1, 15) + EVT_CALL(N(CreateWhaleGeyser), 0, -1565, LVar1, -200, 0, -1, 0, 30) + EVT_CALL(GetNpcPos, NPC_Kolorado, LVar2, LVar3, LVar4) + EVT_CALL(GetNpcPos, NPC_KoloradoWife, LVar5, LVar6, LVar7) + EVT_LOOP(5) + EVT_ADD(LVar3, 8) + EVT_CALL(SetNpcPos, NPC_Kolorado, LVar2, LVar3, LVar4) + EVT_ADD(LVar6, 8) + EVT_CALL(SetNpcPos, NPC_KoloradoWife, LVar5, LVar6, LVar7) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(SetNpcAnimation, NPC_Kolorado, ANIM_ParadeKolorado_Wave) + EVT_CALL(SetNpcAnimation, NPC_KoloradoWife, ANIM_ParadeKolorado_WifeWave) + EVT_CHILD_THREAD + EVT_LOOP(0) + EVT_LOOP(20) + EVT_SUB(LVar1, 1) + EVT_CALL(N(SetWhaleGeyserPos), LVar0, -1565, LVar1, -200) + EVT_SUB(LVar3, 1) + EVT_CALL(SetNpcPos, NPC_Kolorado, LVar2, LVar3, LVar4) + EVT_SUB(LVar6, 1) + EVT_CALL(SetNpcPos, NPC_KoloradoWife, LVar5, LVar6, LVar7) + EVT_WAIT(1) + EVT_END_LOOP + EVT_LOOP(20) + EVT_ADD(LVar1, 1) + EVT_CALL(N(SetWhaleGeyserPos), LVar0, -1565, LVar1, -200) + EVT_ADD(LVar3, 1) + EVT_CALL(SetNpcPos, NPC_Kolorado, LVar2, LVar3, LVar4) + EVT_ADD(LVar6, 1) + EVT_CALL(SetNpcPos, NPC_KoloradoWife, LVar5, LVar6, LVar7) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_LOOP + EVT_END_CHILD_THREAD + EVT_SET(LVar3, LVar0) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_KOLORADO + 900) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(N(DisposeWhaleGeyser), LVar3) + EVT_KILL_THREAD(LVarA) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_end/end_00/end_00_6_caravan.c b/src/world/area_end/end_00/end_00_6_caravan.c new file mode 100644 index 0000000000..2e31f48efd --- /dev/null +++ b/src/world/area_end/end_00/end_00_6_caravan.c @@ -0,0 +1,235 @@ +#include "end_00.h" + +EvtScript N(EVS_CaravanStopMarching) = { + EVT_CALL(GetNpcPos, LVar0, LVar1, LVar2, LVar3) + EVT_SETF(LVar1, LVar1) + EVT_LOOP(0) + EVT_ADDF(LVar1, EVT_FLOAT(0.87)) + EVT_CALL(SetNpcPos, LVar0, LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +// unused +EvtScript N(EVS_MoustafaStopMarching) = { + EVT_CALL(GetNpcPos, NPC_Moustafa, LVar0, LVar1, LVar2) + EVT_SETF(LVar0, LVar0) + EVT_LOOP(0) + EVT_ADDF(LVar0, EVT_FLOAT(0.87)) + EVT_CALL(SetNpcPos, NPC_Moustafa, LVar0, 0, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ParadePhase_Caravan) = { + EVT_CALL(SetNpcScale, NPC_Rhuff, EVT_FLOAT(0.75), EVT_FLOAT(0.75), EVT_FLOAT(0.75)) + EVT_THREAD + EVT_CALL(NpcMoveTo, NPC_Rowf, -1447, -2, 200) + EVT_SET(LVar0, NPC_Rowf) + EVT_EXEC_GET_TID(N(EVS_CaravanStopMarching), LVarA) + EVT_CALL(SetNpcAnimation, NPC_Rowf, ANIM_Rowf_PackedIdle) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Rowf, ANIM_Rowf_PackedTalk) + EVT_WAIT(30) + EVT_CALL(SetNpcAnimation, NPC_Rowf, ANIM_Rowf_PackedCheer) + EVT_WAIT(30) + EVT_CALL(SetNpcAnimation, NPC_Rowf, ANIM_Rowf_PackedIdle) + EVT_WAIT(60) + EVT_CALL(SetNpcAnimation, NPC_Rowf, ANIM_Rowf_PackedTalk) + EVT_WAIT(30) + EVT_CALL(SetNpcAnimation, NPC_Rowf, ANIM_Rowf_PackedCheer) + EVT_WAIT(30) + EVT_CALL(SetNpcAnimation, NPC_Rowf, ANIM_Rowf_PackedIdle) + EVT_WAIT(30) + EVT_CALL(SetNpcAnimation, NPC_Rowf, ANIM_Rowf_PackedWalk) + EVT_KILL_THREAD(LVarA) + EVT_CALL(NpcMoveTo, NPC_Rowf, -785, -2, 300) + EVT_CALL(SetNpcPos, NPC_Rowf, 0, -500, 0) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(NpcMoveTo, NPC_Rhuff, -1412, -2, 200) + EVT_SET(LVar0, NPC_Rhuff) + EVT_EXEC_GET_TID(N(EVS_CaravanStopMarching), LVarA) + EVT_CALL(SetNpcAnimation, NPC_Rhuff, ANIM_Rowf_PackedIdle) + EVT_WAIT(220) + EVT_CALL(SetNpcAnimation, NPC_Rhuff, ANIM_Rowf_PackedWalk) + EVT_KILL_THREAD(LVarA) + EVT_CALL(NpcMoveTo, NPC_Rhuff, -750, -2, 300) + EVT_CALL(SetNpcPos, NPC_Rhuff, 0, -500, 0) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(NpcMoveTo, NPC_Moustafa, -1380, 2, 180) + EVT_SET(LVar0, NPC_Moustafa) + EVT_EXEC_GET_TID(N(EVS_CaravanStopMarching), LVarA) + EVT_CALL(SetNpcAnimation, NPC_Moustafa, ANIM_Moustafa_Idle) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Moustafa, ANIM_Moustafa_Toss) + EVT_WAIT(20) + EVT_CALL(SetNpcAnimation, NPC_Moustafa, ANIM_Moustafa_Shout) + EVT_WAIT(30) + EVT_CALL(SetNpcAnimation, NPC_Moustafa, ANIM_Moustafa_Talk) + EVT_WAIT(30) + EVT_CALL(InterpNpcYaw, NPC_Moustafa, 90, 0) + EVT_CALL(SetNpcAnimation, NPC_Moustafa, ANIM_Moustafa_Shout) + EVT_WAIT(30) + EVT_CALL(SetNpcAnimation, NPC_Moustafa, ANIM_Moustafa_Talk) + EVT_WAIT(30) + EVT_CALL(InterpNpcYaw, NPC_Moustafa, 270, 0) + EVT_CALL(SetNpcAnimation, NPC_Moustafa, ANIM_Moustafa_Shout) + EVT_WAIT(30) + EVT_CALL(SetNpcAnimation, NPC_Moustafa, ANIM_Moustafa_Talk) + EVT_WAIT(30) + EVT_CALL(SetNpcAnimation, NPC_Moustafa, ANIM_Moustafa_Toss) + EVT_WAIT(20) + EVT_CALL(SetNpcAnimation, NPC_Moustafa, ANIM_Moustafa_Idle) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Moustafa, ANIM_Moustafa_Run) + EVT_KILL_THREAD(LVarA) + EVT_CALL(NpcMoveTo, NPC_Moustafa, -1360, 2, 180) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(10) + EVT_CALL(NpcMoveTo, NPC_Mouser1, -1342, 2, 180) + EVT_SET(LVar0, NPC_Mouser1) + EVT_EXEC_GET_TID(N(EVS_CaravanStopMarching), LVarA) + EVT_CALL(SetNpcAnimation, NPC_Mouser1, ANIM_Mouser_Blue_IdleOnlyBlink) + EVT_WAIT(110) + EVT_CALL(SetNpcAnimation, NPC_Mouser1, ANIM_Mouser_Blue_Whisper) + EVT_WAIT(30) + EVT_CALL(SetNpcAnimation, NPC_Mouser1, ANIM_Mouser_Blue_IdleOnlyBlink) + EVT_WAIT(90) + EVT_CALL(SetNpcAnimation, NPC_Mouser1, ANIM_Mouser_Blue_Run) + EVT_KILL_THREAD(LVarA) + EVT_CALL(NpcMoveTo, NPC_Mouser1, -1330, 2, 180) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(10) + EVT_CALL(NpcMoveTo, NPC_Mouser2, -1312, 2, 180) + EVT_SET(LVar0, NPC_Mouser2) + EVT_EXEC_GET_TID(N(EVS_CaravanStopMarching), LVarA) + EVT_CALL(SetNpcAnimation, NPC_Mouser2, ANIM_Mouser_Blue_IdleOnlyBlink) + EVT_WAIT(230) + EVT_CALL(SetNpcAnimation, NPC_Mouser2, ANIM_Mouser_Blue_Run) + EVT_KILL_THREAD(LVarA) + EVT_CALL(NpcMoveTo, NPC_Mouser2, -1300, 2, 180) + EVT_END_THREAD + // tutankoopa is chased around by chomp + EVT_THREAD + EVT_WAIT(240) + EVT_CALL(NpcMoveTo, NPC_Tutankoopa1, -1540, 30, 60) + EVT_WAIT(210) + EVT_CALL(SetNpcPos, NPC_Tutankoopa1, -1350, 0, 30) + EVT_CALL(SetNpcYaw, NPC_Tutankoopa1, 90) + EVT_CALL(NpcMoveTo, NPC_Tutankoopa1, -1110, 30, 30) + EVT_CALL(SetNpcAnimation, NPC_Tutankoopa1, ANIM_Tutankoopa_Anim09) + EVT_CALL(MakeLerp, 0, 90, 5, EASING_LINEAR) + EVT_LOOP(5) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, NPC_Tutankoopa1, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(20) + EVT_CALL(ShowEmote, NPC_Tutankoopa1, EMOTE_ELLIPSIS, 0, 60, TRUE, 0, 0, 0, 0) + EVT_WAIT(60) + EVT_CALL(MakeLerp, 90, 0, 5, EASING_LINEAR) + EVT_LOOP(5) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, NPC_Tutankoopa1, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SetNpcAnimation, NPC_Tutankoopa1, ANIM_Tutankoopa_Anim01) + EVT_CALL(InterpNpcYaw, NPC_Tutankoopa1, 270, 7) + EVT_WAIT(15) + EVT_CALL(InterpNpcYaw, NPC_Tutankoopa1, 90, 7) + EVT_WAIT(15) + EVT_CALL(InterpNpcYaw, NPC_Tutankoopa1, 270, 7) + EVT_WAIT(15) + EVT_CALL(SetNpcAnimation, NPC_Tutankoopa1, ANIM_Tutankoopa_Anim04) + EVT_CALL(SetNpcJumpscale, NPC_Tutankoopa1, EVT_FLOAT(1.0)) + EVT_CALL(NpcJump0, NPC_Tutankoopa1, -1140, 0, 30, 15) + EVT_CALL(NpcJump0, NPC_Tutankoopa1, -1170, 0, 30, 15) + EVT_CALL(NpcJump0, NPC_Tutankoopa1, -1200, 0, 30, 15) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(240) + EVT_CALL(NpcMoveTo, NPC_ChainChomp1, -1480, 30, 60) + EVT_WAIT(210) + EVT_CALL(SetNpcPos, NPC_ChainChomp1, -1410, 0, 30) + EVT_CALL(SetNpcYaw, NPC_ChainChomp1, 90) + EVT_CALL(NpcMoveTo, NPC_ChainChomp1, -690, 30, 90) + EVT_CALL(SetNpcPos, NPC_ChainChomp1, 0, -500, 0) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +Vec3f N(BuzzarFlightPath)[] = { + { -805.0, 100.0, -80.0 }, + { -675.0, 100.0, -230.0 }, + { -805.0, 100.0, -280.0 }, + { -935.0, 100.0, -230.0 }, + { -805.0, 100.0, -80.0 }, +}; + +EvtScript N(EVS_ParadePhase_BuzzarNest) = { + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_BUZZAR + 175) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(200) + EVT_CALL(ShowEmote, NPC_Buzzar, EMOTE_SHOCK, 45, 30, TRUE, 0, 0, 0, 0) + EVT_WAIT(40) + EVT_CALL(SetNpcAnimation, NPC_Buzzar, ANIM_Buzzar_Anim03) + EVT_CALL(NpcFlyTo, NPC_Buzzar, -855, 100, -180, 60, 0, EASING_LINEAR) + EVT_CALL(SetNpcAnimation, NPC_VultureChick1, ANIM_ParadeChick_EggTremble) + EVT_CALL(SetNpcAnimation, NPC_VultureChick2, ANIM_ParadeChick_EggTremble) + EVT_CALL(SetNpcAnimation, NPC_VultureChick3, ANIM_ParadeChick_EggTremble) + EVT_WAIT(30) + EVT_CALL(SetNpcAnimation, NPC_VultureChick1, ANIM_ParadeChick_BreakEgg) + EVT_CALL(SetNpcAnimation, NPC_VultureChick2, ANIM_ParadeChick_BreakEggFwd) + EVT_CALL(SetNpcAnimation, NPC_VultureChick3, ANIM_ParadeChick_BreakEgg) + EVT_WAIT(30) + EVT_CALL(SetNpcAnimation, NPC_VultureChick1, ANIM_ParadeChick_Chirp) + EVT_CALL(SetNpcAnimation, NPC_VultureChick2, ANIM_ParadeChick_ChirpFwd) + EVT_CALL(SetNpcAnimation, NPC_VultureChick3, ANIM_ParadeChick_Chirp) + EVT_WAIT(30) + EVT_CALL(InterpNpcYaw, NPC_Buzzar, 90, 0) + EVT_CALL(NpcFlyTo, NPC_Buzzar, -805, 100, -80, 30, 0, EASING_LINEAR) + EVT_THREAD + EVT_LOOP(6) + EVT_WAIT(20) + EVT_CALL(InterpNpcYaw, NPC_Buzzar, 270, 0) + EVT_WAIT(40) + EVT_CALL(InterpNpcYaw, NPC_Buzzar, 90, 0) + EVT_WAIT(20) + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_LOOP(6) + EVT_CALL(LoadPath, 80, EVT_PTR(N(BuzzarFlightPath)), ARRAY_COUNT(N(BuzzarFlightPath)), EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(GetNextPathPos) + EVT_CALL(SetNpcPos, NPC_Buzzar, LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_LOOP + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_end/end_00/end_00_7_boos.c b/src/world/area_end/end_00/end_00_7_boos.c new file mode 100644 index 0000000000..b63bc74bfd --- /dev/null +++ b/src/world/area_end/end_00/end_00_7_boos.c @@ -0,0 +1,246 @@ +#include "end_00.h" +#include "effects.h" + +extern EvtScript N(EVS_OffsetNpcScroll); + +API_CALLABLE(N(AddScrollToNpcPos)); + +s32 N(UnusedAlpha) = 255; + +API_CALLABLE(N(SetUnusedAlpha)) { + N(UnusedAlpha) = evt_get_variable(script, *script->ptrReadPos); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_MoveBoosToTubbaBody) = { + EVT_CALL(GetNpcPos, NPC_TubbasBody, LVar0, LVar1, LVar2) + EVT_SETF(LVar0, LVar0) + EVT_SETF(LVar3, LVar0) + EVT_SETF(LVar4, LVar0) + EVT_SUBF(LVar3, EVT_FLOAT(25.0)) + EVT_ADDF(LVar4, EVT_FLOAT(25.0)) + EVT_CALL(SetNpcPos, NPC_Boo1, LVar0, 20, 2) + EVT_CALL(SetNpcPos, NPC_Boo2, LVar3, 20, -2) + EVT_CALL(SetNpcPos, NPC_Boo3, LVar4, 20, 2) + EVT_CHILD_THREAD + EVT_CALL(N(AddScrollToNpcPos), NPC_Boo1) + EVT_END_CHILD_THREAD + EVT_CHILD_THREAD + EVT_CALL(N(AddScrollToNpcPos), NPC_Boo2) + EVT_END_CHILD_THREAD + EVT_CHILD_THREAD + EVT_CALL(N(AddScrollToNpcPos), NPC_Boo3) + EVT_END_CHILD_THREAD + EVT_CALL(N(AddScrollToNpcPos), 49) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ParadePhase_Tutankoopa) = { + EVT_THREAD + EVT_CALL(SetNpcPos, NPC_Tutankoopa2, -960, 0, 30) + EVT_CALL(NpcMoveTo, NPC_Tutankoopa2, -240, 30, 90) + EVT_CALL(SetNpcPos, NPC_Tutankoopa2, 0, -500, 0) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcPos, NPC_ChainChomp2, -1020, 0, 30) + EVT_CALL(NpcMoveTo, NPC_ChainChomp2, -300, 30, 90) + EVT_CALL(SetNpcPos, NPC_ChainChomp2, 0, -500, 0) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcPos, NPC_ChainChomp3, -1050, 0, 30) + EVT_CALL(NpcMoveTo, NPC_ChainChomp3, -330, 30, 90) + EVT_CALL(SetNpcPos, NPC_ChainChomp3, 0, -500, 0) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcPos, NPC_ChainChomp4, -1080, 0, 30) + EVT_CALL(NpcMoveTo, NPC_ChainChomp4, -360, 30, 90) + EVT_CALL(SetNpcPos, NPC_ChainChomp4, 0, -500, 0) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ParadePhase_Boos) = { + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, -580) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(InterpNpcYaw, NPC_Bootler, 90, 0) + EVT_SET(LVar0, NPC_Bootler) + EVT_EXEC_GET_TID(N(EVS_OffsetNpcScroll), LVarA) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, -540) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(10) + EVT_CALL(N(SetUnusedAlpha), 255) + EVT_CALL(func_802CFD30, NPC_Boo1, 7, 0, 0, 0, 0) + EVT_CALL(func_802CFD30, NPC_Boo2, 7, 0, 0, 0, 0) + EVT_CALL(func_802CFD30, NPC_Boo3, 7, 0, 0, 0, 0) + EVT_CALL(EnableNpcShadow, NPC_Boo1, FALSE) + EVT_CALL(EnableNpcShadow, NPC_Boo2, FALSE) + EVT_CALL(EnableNpcShadow, NPC_Boo3, FALSE) + EVT_CALL(NpcMoveTo, NPC_TubbasBody, -460, 0, 100) + EVT_EXEC_GET_TID(N(EVS_MoveBoosToTubbaBody), LVarB) + EVT_WAIT(20) + EVT_CALL(SetNpcPos, NPC_TubbasHeart, -260, 0, 0) + EVT_CALL(SetNpcJumpscale, NPC_TubbasHeart, EVT_FLOAT(1.0)) + EVT_CALL(NpcJump0, NPC_TubbasHeart, -290, 0, 0, 10) + EVT_CALL(NpcJump0, NPC_TubbasHeart, -320, 0, 0, 10) + EVT_SET(LVar0, 53) + EVT_EXEC_GET_TID(N(EVS_OffsetNpcScroll), LVarC) + EVT_CALL(InterpNpcYaw, NPC_TubbasBody, 90, 0) + EVT_THREAD + EVT_CALL(MakeLerp, 0, 255, 30, EASING_LINEAR) + EVT_LOOP(30) + EVT_CALL(UpdateLerp) + EVT_CALL(func_802CFD30, NPC_Boo1, 7, LVar0, 0, 0, 0) + EVT_CALL(func_802CFD30, NPC_Boo2, 7, LVar0, 0, 0, 0) + EVT_CALL(func_802CFD30, NPC_Boo3, 7, LVar0, 0, 0, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(EnableNpcShadow, NPC_Boo1, TRUE) + EVT_CALL(EnableNpcShadow, NPC_Boo2, TRUE) + EVT_CALL(EnableNpcShadow, NPC_Boo3, TRUE) + EVT_END_THREAD + EVT_WAIT(30) + EVT_CALL(SetNpcAnimation, NPC_TubbasHeart, ANIM_TubbasHeart_Anim0B) + EVT_WAIT(20) + EVT_CALL(SetNpcAnimation, NPC_Bootler, ANIM_Bootler_Spook) + EVT_CALL(SetNpcAnimation, NPC_Boo1, ANIM_Boo_CarryWalk) + EVT_CALL(SetNpcAnimation, NPC_Boo2, ANIM_Boo_CarryWalk) + EVT_CALL(SetNpcAnimation, NPC_Boo3, ANIM_Boo_CarryWalk) + EVT_WAIT(10) + EVT_THREAD + EVT_LOOP(6) + EVT_CALL(SetNpcAnimation, NPC_TubbasHeart, ANIM_TubbasHeart_Anim16) + EVT_WAIT(5) + EVT_CALL(SetNpcAnimation, NPC_TubbasHeart, ANIM_TubbasHeart_Anim0B) + EVT_WAIT(10) + EVT_END_LOOP + EVT_END_THREAD + EVT_WAIT(60) + EVT_KILL_THREAD(LVarA) + EVT_THREAD + EVT_CALL(InterpNpcYaw, NPC_Bootler, 270, 0) + EVT_CALL(SetNpcAnimation, NPC_Bootler, ANIM_Bootler_Talk) + EVT_CALL(GetNpcPos, NPC_Bootler, LVar0, LVar1, LVar2) + EVT_SUB(LVar0, 180) + EVT_CALL(NpcMoveTo, NPC_Bootler, LVar0, LVar2, 60) + EVT_END_THREAD + EVT_KILL_THREAD(LVarB) + EVT_THREAD + EVT_CALL(InterpNpcYaw, NPC_TubbasBody, 270, 0) + EVT_CALL(GetNpcPos, NPC_TubbasBody, LVar0, LVar1, LVar2) + EVT_SUB(LVar0, 180) + EVT_CALL(NpcMoveTo, NPC_TubbasBody, LVar0, LVar2, 60) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(InterpNpcYaw, NPC_Boo1, 270, 0) + EVT_CALL(SetNpcAnimation, NPC_Boo1, ANIM_Boo_Wave) + EVT_CALL(GetNpcPos, NPC_Boo1, LVar0, LVar1, LVar2) + EVT_SUB(LVar0, 180) + EVT_CALL(NpcMoveTo, NPC_Boo1, LVar0, LVar2, 60) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(InterpNpcYaw, NPC_Boo2, 270, 0) + EVT_CALL(SetNpcAnimation, NPC_Boo2, ANIM_Boo_Wave) + EVT_CALL(GetNpcPos, NPC_Boo2, LVar0, LVar1, LVar2) + EVT_SUB(LVar0, 180) + EVT_CALL(NpcMoveTo, NPC_Boo2, LVar0, LVar2, 60) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(InterpNpcYaw, NPC_Boo3, 270, 0) + EVT_CALL(SetNpcAnimation, NPC_Boo3, ANIM_Boo_Wave) + EVT_CALL(GetNpcPos, NPC_Boo3, LVar0, LVar1, LVar2) + EVT_SUB(LVar0, 180) + EVT_CALL(NpcMoveTo, NPC_Boo3, LVar0, LVar2, 60) + EVT_END_THREAD + EVT_WAIT(30) + EVT_KILL_THREAD(LVarC) + EVT_CALL(SetNpcAnimation, NPC_TubbasHeart, ANIM_TubbasHeart_Anim0B) + EVT_CALL(GetNpcPos, NPC_TubbasHeart, LVar0, LVar1, LVar2) + EVT_LOOP(6) + EVT_SUB(LVar0, 45) + EVT_CALL(NpcJump0, NPC_TubbasHeart, LVar0, LVar1, LVar2, 15) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ParadePhase_GoombaKing) = { + EVT_WAIT(1) + EVT_CALL(SetNpcRotation, NPC_GoombaKing, 0, 0, 180) + EVT_THREAD + EVT_LOOP(8) + EVT_CALL(NpcMoveTo, NPC_RedGoombaBros, -30, -28, 20) + EVT_CALL(NpcMoveTo, NPC_RedGoombaBros, -110, -28, 20) + EVT_END_LOOP + EVT_CALL(NpcMoveTo, NPC_RedGoombaBros, -30, -28, 20) + EVT_CALL(GetNpcPos, NPC_RedGoombaBros, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_RedGoombaBros, LVar0, LVar1, LVar2, 20) + EVT_END_THREAD + EVT_THREAD + EVT_LOOP(8) + EVT_CALL(NpcMoveTo, NPC_BlueGoombaBros, -110, -32, 20) + EVT_CALL(NpcMoveTo, NPC_BlueGoombaBros, -30, -32, 20) + EVT_END_LOOP + EVT_CALL(NpcMoveTo, NPC_BlueGoombaBros, -110, -32, 20) + EVT_CALL(GetNpcPos, NPC_BlueGoombaBros, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_BlueGoombaBros, LVar0, LVar1, LVar2, 20) + EVT_END_THREAD + EVT_LOOP(16) + EVT_CALL(ShowSweat, NPC_RedGoombaBros, 0, 45, 1, 0, 0, 0, 0, 20) + EVT_CALL(ShowSweat, NPC_BlueGoombaBros, 0, -45, 1, 0, 0, 0, 0, 20) + EVT_WAIT(10) + EVT_CALL(ShowSweat, NPC_RedGoombaBros, 0, -45, 1, 0, 0, 0, 0, 20) + EVT_CALL(ShowSweat, NPC_BlueGoombaBros, 0, 45, 1, 0, 0, 0, 0, 20) + EVT_WAIT(10) + EVT_END_LOOP + EVT_CALL(SetNpcFlagBits, NPC_GoombaKing, NPC_FLAG_GRAVITY, TRUE) + EVT_CALL(SetNpcAnimation, NPC_GoombaKing, ANIM_GoombaKing_Dead) + EVT_LOOP(0) + EVT_CALL(GetNpcPos, NPC_GoombaKing, LVar0, LVar1, LVar2) + EVT_IF_LT(LVar1, 80) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(PlayEffect, EFFECT_LANDING_DUST, 4, LVar0, 0, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_CALL(SetNpcFlagBits, NPC_GoombaKing, NPC_FLAG_GRAVITY, FALSE) + EVT_WAIT(60) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_GoombaKing, ANIM_GoombaKing_Angry) + EVT_CALL(MakeLerp, 180, 360, 10, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, NPC_GoombaKing, 0, 0, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(GetNpcPos, NPC_GoombaKing, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcJumpscale, NPC_GoombaKing, EVT_FLOAT(0.5)) + EVT_CALL(NpcJump0, NPC_GoombaKing, LVar0, 0, 0, 20) + EVT_WAIT(30) + EVT_THREAD + EVT_CALL(NpcMoveTo, NPC_RedGoombaBros, -30, 0, 15) + EVT_CALL(NpcMoveTo, NPC_RedGoombaBros, -210, 0, 180) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(NpcMoveTo, NPC_BlueGoombaBros, -30, 0, 55) + EVT_CALL(NpcMoveTo, NPC_BlueGoombaBros, -170, 0, 140) + EVT_END_THREAD + EVT_CALL(NpcMoveTo, NPC_GoombaKing, -250, 0, 180) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_end/end_00/end_00_8_yoshis.c b/src/world/area_end/end_00/end_00_8_yoshis.c new file mode 100644 index 0000000000..c10885132e --- /dev/null +++ b/src/world/area_end/end_00/end_00_8_yoshis.c @@ -0,0 +1,50 @@ +#include "end_00.h" + +EvtScript N(EVS_ParadePhase_Yoshis) = { + EVT_CHILD_THREAD + EVT_CALL(EnableTexPanning, MODEL_o119, TRUE) + EVT_SET(LVar0, 0) + EVT_LOOP(0) + EVT_ADD(LVar0, 512) + EVT_CALL(SetTexPanOffset, TEX_PANNER_4, TEX_PANNER_AUX, LVar0, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_CHILD_THREAD + EVT_CHILD_THREAD + EVT_CALL(SetNpcScale, NPC_RafaelRaven, EVT_FLOAT(2.0), EVT_FLOAT(2.0), 1) + EVT_LOOP(0) + EVT_CALL(NpcFlyTo, NPC_RafaelRaven, 357, 0, -30, 10, 0, EASING_LINEAR) + EVT_WAIT(60) + EVT_CALL(NpcFlyTo, NPC_RafaelRaven, 357, -120, -30, 10, 0, EASING_LINEAR) + EVT_WAIT(60) + EVT_END_LOOP + EVT_END_CHILD_THREAD + EVT_CHILD_THREAD + EVT_CALL(GetNpcPos, NPC_LavaPiranha, LVar0, LVar1, LVar2) + EVT_LOOP(0) + EVT_WAIT(60) + EVT_LOOP(10) + EVT_ADD(LVar0, 5) + EVT_ADD(LVar1, 5) + EVT_CALL(SetNpcPos, NPC_LavaPiranha, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_WAIT(60) + EVT_LOOP(10) + EVT_SUB(LVar0, 5) + EVT_SUB(LVar1, 5) + EVT_CALL(SetNpcPos, NPC_LavaPiranha, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_LOOP + EVT_END_CHILD_THREAD + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, 800) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_end/end_00/end_00_9_huff_n_puff.c b/src/world/area_end/end_00/end_00_9_huff_n_puff.c new file mode 100644 index 0000000000..d8aec74702 --- /dev/null +++ b/src/world/area_end/end_00/end_00_9_huff_n_puff.c @@ -0,0 +1,450 @@ +#include "end_00.h" +#include "effects.h" + +extern EvtScript N(EVS_SetNpcShadowScale); + +API_CALLABLE(N(AddScrollToNpcPos)); + +EvtScript N(EVS_HoldPosition_Yoshis) = { + EVT_CALL(GetNpcPos, NPC_YoshiKidGreen, LVar0, LVar1, LVar2) + EVT_SETF(LVar0, LVar0) + EVT_SETF(LVar3, LVar0) + EVT_SUBF(LVar3, 40) + EVT_SETF(LVar4, LVar0) + EVT_SUBF(LVar4, 80) + EVT_SETF(LVar5, LVar0) + EVT_SUBF(LVar5, 120) + EVT_SETF(LVar6, LVar0) + EVT_SUBF(LVar6, 160) + EVT_CALL(SetNpcPos, NPC_YoshiKidGreen, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcPos, NPC_YoshiKidBlue, LVar3, LVar1, LVar2) + EVT_CALL(SetNpcPos, NPC_YoshiKidPurple, LVar4, LVar1, LVar2) + EVT_CALL(SetNpcPos, NPC_YoshiKidYellow, LVar5, LVar1, LVar2) + EVT_CALL(SetNpcPos, NPC_YoshiKidRed, LVar6, LVar1, LVar2) + EVT_CHILD_THREAD + EVT_CALL(N(AddScrollToNpcPos), NPC_YoshiKidBlue) + EVT_END_CHILD_THREAD + EVT_CHILD_THREAD + EVT_CALL(N(AddScrollToNpcPos), NPC_YoshiKidPurple) + EVT_END_CHILD_THREAD + EVT_CHILD_THREAD + EVT_CALL(N(AddScrollToNpcPos), NPC_YoshiKidYellow) + EVT_END_CHILD_THREAD + EVT_CHILD_THREAD + EVT_CALL(N(AddScrollToNpcPos), NPC_YoshiKidRed) + EVT_END_CHILD_THREAD + EVT_CALL(N(AddScrollToNpcPos), NPC_YoshiKidGreen) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_HoldPosition_Puffs) = { + EVT_CALL(GetNpcPos, NPC_HuffNPuffBody, LVar0, LVar1, LVar2) + EVT_SETF(LVar0, LVar0) + EVT_SETF(LVar3, LVar0) + EVT_ADDF(LVar3, 80) + EVT_SETF(LVar4, LVar0) + EVT_SUBF(LVar4, 80) + EVT_CALL(SetNpcPos, NPC_HuffNPuffBody, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcPos, NPC_HuffNPuffFace, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcPos, NPC_HuffNPuffArms, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcPos, NPC_TuffPuff1, LVar3, 60, 0) + EVT_CALL(SetNpcPos, NPC_TuffPuff2, LVar4, 60, 0) + EVT_CHILD_THREAD + EVT_CALL(N(AddScrollToNpcPos), NPC_HuffNPuffFace) + EVT_END_CHILD_THREAD + EVT_CHILD_THREAD + EVT_CALL(N(AddScrollToNpcPos), NPC_HuffNPuffArms) + EVT_END_CHILD_THREAD + EVT_CHILD_THREAD + EVT_CALL(N(AddScrollToNpcPos), NPC_TuffPuff1) + EVT_END_CHILD_THREAD + EVT_CHILD_THREAD + EVT_CALL(N(AddScrollToNpcPos), NPC_TuffPuff2) + EVT_END_CHILD_THREAD + EVT_CALL(N(AddScrollToNpcPos), NPC_HuffNPuffBody) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Puffs_Surprise) = { + EVT_CALL(SetNpcAnimation, NPC_HuffNPuffBody, ANIM_HuffNPuff_Anim26) + EVT_CALL(SetNpcAnimation, NPC_HuffNPuffFace, ANIM_HuffNPuff_Anim27) + EVT_CALL(SetNpcAnimation, NPC_HuffNPuffArms, ANIM_HuffNPuff_Anim28) + EVT_CALL(SetNpcAnimation, NPC_TuffPuff1, ANIM_TuffPuff_Blush) + EVT_CALL(SetNpcAnimation, NPC_TuffPuff2, ANIM_TuffPuff_Blush) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Puffs_Hurt) = { + EVT_CALL(SetNpcAnimation, NPC_HuffNPuffBody, ANIM_HuffNPuff_Anim07) + EVT_CALL(SetNpcAnimation, NPC_HuffNPuffFace, ANIM_HuffNPuff_Anim08) + EVT_CALL(SetNpcAnimation, NPC_HuffNPuffArms, ANIM_HuffNPuff_Anim09) + EVT_CALL(SetNpcAnimation, NPC_TuffPuff1, ANIM_TuffPuff_Hurt) + EVT_CALL(SetNpcAnimation, NPC_TuffPuff2, ANIM_TuffPuff_Hurt) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Puffs_Retreat) = { + EVT_CALL(GetNpcPos, NPC_HuffNPuffBody, LVar0, LVar1, LVar2) + EVT_SET(LVar3, LVar0) + EVT_ADD(LVar3, 80) + EVT_SET(LVar4, LVar0) + EVT_ADD(LVar4, -80) + EVT_LOOP(10) + EVT_ADD(LVar0, -2) + EVT_CALL(SetNpcPos, NPC_HuffNPuffBody, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcPos, NPC_HuffNPuffFace, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcPos, NPC_HuffNPuffArms, LVar0, LVar1, LVar2) + EVT_ADD(LVar3, -2) + EVT_CALL(SetNpcPos, NPC_TuffPuff1, LVar3, 60, 0) + EVT_ADD(LVar4, -2) + EVT_CALL(SetNpcPos, NPC_TuffPuff2, LVar4, 60, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_GourmetGuy_Enter) = { + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetNpcPos, NPC_YoshiKidGreen, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, 1060) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(GetNpcPos, NPC_TuffPuff2, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcSpeed, NPC_GourmetGuy, EVT_FLOAT(1.0)) + EVT_CALL(NpcMoveTo, NPC_GourmetGuy, LVar0, -20, 0) + EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_Idle) + EVT_CALL(N(AddScrollToNpcPos), NPC_GourmetGuy) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_HoldPosition_GourmetGuy) = { + EVT_CALL(N(AddScrollToNpcPos), NPC_GourmetGuy) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_YoshiKids) = { + EVT_WAIT(20) + EVT_CALL(SetNpcJumpscale, NPC_YoshiKidGreen, EVT_FLOAT(1.0)) + EVT_CALL(NpcJump0, NPC_YoshiKidGreen, 680, 0, 0, 20) + EVT_CALL(NpcJump0, NPC_YoshiKidGreen, 740, 0, 0, 10) + EVT_CALL(SetNpcAnimation, NPC_YoshiKidGreen, ANIM_YoshiKid_Green_Idle) + EVT_LOOP(2) + EVT_CALL(InterpNpcYaw, NPC_YoshiKidGreen, 270, 7) + EVT_WAIT(10) + EVT_CALL(InterpNpcYaw, NPC_YoshiKidGreen, 90, 7) + EVT_WAIT(10) + EVT_END_LOOP + EVT_CALL(InterpNpcYaw, NPC_YoshiKidGreen, 270, 7) + EVT_WAIT(10) + EVT_THREAD + EVT_CALL(GetNpcPos, NPC_YoshiKidGreen, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_YoshiKidGreen, LVar0, LVar1, LVar2, 7) + EVT_CALL(SetNpcAnimation, NPC_YoshiKidGreen, ANIM_YoshiKid_Green_Run) + EVT_CALL(NpcMoveTo, NPC_YoshiKidGreen, 980, 0, 60) + EVT_CALL(SetNpcAnimation, NPC_YoshiKidGreen, ANIM_YoshiKid_Green_LookUp) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcPos, NPC_YoshiKidBlue, 660, 0, 0) + EVT_CALL(NpcMoveTo, NPC_YoshiKidBlue, 940, 0, 70) + EVT_CALL(SetNpcAnimation, NPC_YoshiKidBlue, ANIM_YoshiKid_Blue_LookUp) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(10) + EVT_CALL(SetNpcPos, NPC_YoshiKidPurple, 660, 0, 0) + EVT_CALL(NpcMoveTo, NPC_YoshiKidPurple, 900, 0, 60) + EVT_CALL(SetNpcAnimation, NPC_YoshiKidPurple, ANIM_YoshiKid_Purple_LookUp) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(20) + EVT_CALL(SetNpcPos, NPC_YoshiKidYellow, 660, 0, 0) + EVT_CALL(NpcMoveTo, NPC_YoshiKidYellow, 860, 0, 50) + EVT_CALL(SetNpcAnimation, NPC_YoshiKidYellow, ANIM_YoshiKid_Yellow_LookUp) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetNpcPos, NPC_YoshiKidRed, 660, 0, 0) + EVT_CALL(NpcMoveTo, NPC_YoshiKidRed, 820, 0, 40) + EVT_CALL(SetNpcAnimation, NPC_YoshiKidRed, ANIM_YoshiKid_Red_LookUp) + EVT_END_THREAD + EVT_WAIT(70) + EVT_EXEC_GET_TID(N(EVS_HoldPosition_Yoshis), LVarA) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetNpcPos, NPC_YoshiKidGreen, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, 0x00000424) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SetNpcAnimation, NPC_YoshiKidGreen, ANIM_YoshiKid_Green_Idle) + EVT_CALL(SetNpcAnimation, NPC_YoshiKidBlue, ANIM_YoshiKid_Blue_Idle) + EVT_CALL(SetNpcAnimation, NPC_YoshiKidPurple, ANIM_YoshiKid_Purple_Idle) + EVT_CALL(SetNpcAnimation, NPC_YoshiKidYellow, ANIM_YoshiKid_Yellow_Idle) + EVT_CALL(SetNpcAnimation, NPC_YoshiKidRed, ANIM_YoshiKid_Red_Idle) + EVT_CALL(InterpNpcYaw, NPC_YoshiKidGreen, 270, 0) + EVT_WAIT(5) + EVT_LOOP(3) + EVT_CALL(InterpNpcYaw, NPC_YoshiKidPurple, 270, 0) + EVT_WAIT(5) + EVT_CALL(InterpNpcYaw, NPC_YoshiKidBlue, 270, 0) + EVT_WAIT(5) + EVT_CALL(InterpNpcYaw, NPC_YoshiKidYellow, 270, 0) + EVT_WAIT(5) + EVT_CALL(InterpNpcYaw, NPC_YoshiKidPurple, 90, 0) + EVT_WAIT(5) + EVT_CALL(InterpNpcYaw, NPC_YoshiKidBlue, 90, 0) + EVT_WAIT(5) + EVT_CALL(InterpNpcYaw, NPC_YoshiKidYellow, 90, 0) + EVT_WAIT(5) + EVT_END_LOOP + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_HUFF_PUFF + 310) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SetNpcYaw, NPC_YoshiKidGreen, 270) + EVT_CALL(SetNpcAnimation, NPC_YoshiKidGreen, ANIM_YoshiKid_Green_EatMiss) + EVT_CALL(SetNpcYaw, NPC_YoshiKidBlue, 270) + EVT_CALL(SetNpcAnimation, NPC_YoshiKidBlue, ANIM_YoshiKid_Blue_EatMiss) + EVT_CALL(SetNpcYaw, NPC_YoshiKidPurple, 90) + EVT_CALL(SetNpcAnimation, NPC_YoshiKidPurple, ANIM_YoshiKid_Purple_EatMiss) + EVT_CALL(SetNpcYaw, NPC_YoshiKidYellow, 90) + EVT_CALL(SetNpcAnimation, NPC_YoshiKidYellow, ANIM_YoshiKid_Yellow_EatMiss) + EVT_CALL(SetNpcYaw, NPC_YoshiKidRed, 90) + EVT_CALL(SetNpcAnimation, NPC_YoshiKidRed, ANIM_YoshiKid_Red_EatMiss) + EVT_WAIT(10) + EVT_EXEC(N(EVS_Puffs_Hurt)) + EVT_THREAD + EVT_CALL(GetNpcPos, NPC_HuffNPuffBody, LVar0, LVar1, LVar2) + EVT_CALL(PlayEffect, EFFECT_SMOKE_RING, 0, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_CALL(GetNpcPos, NPC_TuffPuff1, LVar0, LVar1, LVar2) + EVT_CALL(PlayEffect, EFFECT_SMOKE_RING, 0, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_CALL(GetNpcPos, NPC_TuffPuff2, LVar0, LVar1, LVar2) + EVT_CALL(PlayEffect, EFFECT_SMOKE_RING, 0, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_CALL(MakeLerp, 750, 375, 5, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_SETF(LVar2, LVar0) + EVT_DIVF(LVar2, 1000) + EVT_CALL(SetNpcScale, NPC_HuffNPuffBody, LVar2, LVar2, 1) + EVT_CALL(SetNpcScale, NPC_HuffNPuffFace, LVar2, LVar2, 1) + EVT_CALL(SetNpcScale, NPC_HuffNPuffArms, LVar2, LVar2, 1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_CALL(MakeLerp, 100, 50, 5, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_SETF(LVar2, LVar0) + EVT_DIVF(LVar2, 100) + EVT_CALL(SetNpcScale, NPC_TuffPuff1, LVar2, LVar2, 1) + EVT_CALL(SetNpcScale, NPC_TuffPuff2, LVar2, LVar2, 1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_CALL(MakeLerp, 600, 300, 5, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_SETF(LVar2, LVar0) + EVT_DIVF(LVar2, 100) + EVT_SET(LVar0, 69) + EVT_EXEC(N(EVS_SetNpcShadowScale)) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_WAIT(40) + EVT_CALL(SetNpcAnimation, NPC_YoshiKidGreen, ANIM_YoshiKid_Green_Exhale) + EVT_CALL(SetNpcAnimation, NPC_YoshiKidBlue, ANIM_YoshiKid_Blue_Exhale) + EVT_CALL(SetNpcAnimation, NPC_YoshiKidPurple, ANIM_YoshiKid_Purple_Exhale) + EVT_CALL(SetNpcAnimation, NPC_YoshiKidYellow, ANIM_YoshiKid_Yellow_Exhale) + EVT_CALL(SetNpcAnimation, NPC_YoshiKidRed, ANIM_YoshiKid_Red_Exhale) + EVT_WAIT(50) + EVT_KILL_THREAD(LVarA) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_YoshiKidGreen, ANIM_YoshiKid_Green_Run) + EVT_CALL(GetNpcPos, NPC_YoshiKidGreen, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 300) + EVT_CALL(NpcMoveTo, NPC_YoshiKidGreen, LVar0, LVar2, 75) + EVT_CALL(SetNpcPos, NPC_YoshiKidGreen, 0, -500, 0) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_YoshiKidBlue, ANIM_YoshiKid_Blue_Run) + EVT_CALL(GetNpcPos, NPC_YoshiKidBlue, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 300) + EVT_CALL(NpcMoveTo, NPC_YoshiKidBlue, LVar0, LVar2, 75) + EVT_CALL(SetNpcPos, NPC_YoshiKidBlue, 0, -500, 0) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_YoshiKidPurple, ANIM_YoshiKid_Purple_Run) + EVT_CALL(GetNpcPos, NPC_YoshiKidPurple, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 300) + EVT_CALL(NpcMoveTo, NPC_YoshiKidPurple, LVar0, LVar2, 75) + EVT_CALL(SetNpcPos, NPC_YoshiKidPurple, 0, -500, 0) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_YoshiKidYellow, ANIM_YoshiKid_Yellow_Run) + EVT_CALL(GetNpcPos, NPC_YoshiKidYellow, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 300) + EVT_CALL(NpcMoveTo, NPC_YoshiKidYellow, LVar0, LVar2, 75) + EVT_CALL(SetNpcPos, NPC_YoshiKidYellow, 0, -500, 0) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_YoshiKidRed, ANIM_YoshiKid_Red_Run) + EVT_CALL(GetNpcPos, NPC_YoshiKidRed, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 300) + EVT_CALL(NpcMoveTo, NPC_YoshiKidRed, LVar0, LVar2, 75) + EVT_CALL(SetNpcPos, NPC_YoshiKidRed, 0, -500, 0) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ParadePhase_HuffNPuff) = { + EVT_THREAD + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_HUFF_PUFF + 50) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(10) + EVT_CALL(SetNpcFlagBits, NPC_HuffNPuffBody, NPC_FLAG_400000, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_HuffNPuffFace, NPC_FLAG_400000, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_HuffNPuffArms, NPC_FLAG_400000, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_TuffPuff1, NPC_FLAG_400000, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_TuffPuff2, NPC_FLAG_400000, FALSE) + EVT_CALL(SetNpcScale, NPC_HuffNPuffBody, EVT_FLOAT(0.75), EVT_FLOAT(0.75), 1) + EVT_CALL(SetNpcScale, NPC_HuffNPuffFace, EVT_FLOAT(0.75), EVT_FLOAT(0.75), 1) + EVT_CALL(SetNpcScale, NPC_HuffNPuffArms, EVT_FLOAT(0.75), EVT_FLOAT(0.75), 1) + EVT_CALL(EnableNpcShadow, NPC_HuffNPuffFace, FALSE) + EVT_CALL(EnableNpcShadow, NPC_HuffNPuffArms, FALSE) + EVT_END_THREAD + EVT_EXEC(N(EVS_YoshiKids)) + EVT_EXEC_GET_TID(N(EVS_GourmetGuy_Enter), LVarB) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_HUFF_PUFF + 310) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_EXEC_GET_TID(N(EVS_HoldPosition_Puffs), LVarA) + EVT_WAIT(10) + EVT_KILL_THREAD(LVarB) + EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_Leap) + EVT_CALL(GetNpcPos, NPC_GourmetGuy, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_GourmetGuy, LVar0, LVar1, LVar2, 10) + EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_TalkSurprise) + EVT_EXEC_GET_TID(N(EVS_HoldPosition_GourmetGuy), LVarB) + EVT_WAIT(130) + EVT_EXEC(N(EVS_Puffs_Surprise)) + EVT_WAIT(30) + EVT_CALL(InterpNpcYaw, NPC_HuffNPuffBody, 90, 0) + EVT_CALL(InterpNpcYaw, NPC_HuffNPuffFace, 90, 0) + EVT_CALL(InterpNpcYaw, NPC_HuffNPuffArms, 90, 0) + EVT_CALL(InterpNpcYaw, NPC_TuffPuff1, 90, 0) + EVT_CALL(InterpNpcYaw, NPC_TuffPuff2, 90, 0) + EVT_WAIT(30) + EVT_THREAD + EVT_CALL(MakeLerp, 0, 90, 3, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, NPC_GourmetGuy, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_Still) + EVT_CALL(MakeLerp, 270, 360, 3, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, NPC_GourmetGuy, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_Idle) + EVT_END_THREAD + EVT_WAIT(6) + EVT_LOOP(2) + EVT_EXEC(N(EVS_Puffs_Hurt)) + EVT_KILL_THREAD(LVarA) + EVT_EXEC_WAIT(N(EVS_Puffs_Retreat)) + EVT_EXEC(N(EVS_Puffs_Surprise)) + EVT_EXEC_GET_TID(N(EVS_HoldPosition_Puffs), LVarA) + EVT_WAIT(10) + EVT_KILL_THREAD(LVarB) + EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_Walk) + EVT_CALL(GetNpcPos, NPC_GourmetGuy, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, -20) + EVT_CALL(NpcMoveTo, NPC_GourmetGuy, LVar0, LVar2, 10) + EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_Idle) + EVT_EXEC_GET_TID(N(EVS_HoldPosition_GourmetGuy), LVarB) + EVT_WAIT(10) + EVT_END_LOOP + EVT_KILL_THREAD(LVarA) + EVT_THREAD + EVT_CALL(GetNpcPos, NPC_HuffNPuffBody, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_HuffNPuffBody, LVar0, LVar1, LVar2, 10) + EVT_ADD(LVar0, -200) + EVT_CALL(NpcMoveTo, NPC_HuffNPuffBody, LVar0, LVar2, 50) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(GetNpcPos, NPC_HuffNPuffFace, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_HuffNPuffFace, LVar0, LVar1, LVar2, 10) + EVT_ADD(LVar0, -200) + EVT_CALL(NpcMoveTo, NPC_HuffNPuffFace, LVar0, LVar2, 50) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(GetNpcPos, NPC_HuffNPuffArms, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_HuffNPuffArms, LVar0, LVar1, LVar2, 10) + EVT_ADD(LVar0, -200) + EVT_CALL(NpcMoveTo, NPC_HuffNPuffArms, LVar0, LVar2, 50) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(GetNpcPos, NPC_TuffPuff1, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_TuffPuff1, LVar0, LVar1, LVar2, 10) + EVT_ADD(LVar0, -200) + EVT_CALL(NpcMoveTo, NPC_TuffPuff1, LVar0, LVar2, 50) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(GetNpcPos, NPC_TuffPuff2, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_TuffPuff2, LVar0, LVar1, LVar2, 10) + EVT_ADD(LVar0, -200) + EVT_CALL(NpcMoveTo, NPC_TuffPuff2, LVar0, LVar2, 50) + EVT_END_THREAD + EVT_WAIT(30) + EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_Inspect) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_Walk) + EVT_KILL_THREAD(LVarB) + EVT_CALL(GetNpcPos, NPC_GourmetGuy, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, -300) + EVT_CALL(NpcMoveTo, NPC_GourmetGuy, LVar0, LVar2, 50) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_end/end_00/end_00_A_crystal_king.c b/src/world/area_end/end_00/end_00_A_crystal_king.c new file mode 100644 index 0000000000..b89a216052 --- /dev/null +++ b/src/world/area_end/end_00/end_00_A_crystal_king.c @@ -0,0 +1,189 @@ +#include "end_00.h" +#include "effects.h" + +extern EvtScript N(EVS_OffsetNpcScroll); + +Vec3f N(CrystalsFlyInPath)[] = { + { 2050.0, 100.0, 0.0 }, + { 1900.0, 80.0, 0.0 }, + { 1820.0, 70.0, 0.0 }, + { 1800.0, 60.0, 0.0 }, + { 1840.0, 50.0, 0.0 }, +}; + +Vec3f N(CrystalsFlyOutPath)[] = { + { 1840.0, 50.0, 0.0 }, + { 1880.0, 60.0, 0.0 }, + { 1860.0, 70.0, 0.0 }, + { 1760.0, 100.0, 0.0 }, + { 1660.0, 170.0, 0.0 }, +}; + +EvtScript N(EVS_ParadePhase_CrystalKing) = { + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_CRYSTAL_KING + 300) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SetNpcAnimation, NPC_TrueCrystalKing, ANIM_CrystalKing_Anim09) + EVT_SET(LVar0, 77) + EVT_EXEC_GET_TID(N(EVS_OffsetNpcScroll), LVarA) + EVT_WAIT(10) + EVT_CALL(InterpNpcYaw, NPC_TrueCrystalKing, 90, 7) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_TrueCrystalKing, ANIM_CrystalKing_Anim10) + EVT_CALL(SetNpcAnimation, NPC_FakeCrystalKing, ANIM_CrystalKing_Anim10) + EVT_SET(LVar0, 78) + EVT_EXEC_GET_TID(N(EVS_OffsetNpcScroll), LVarB) + EVT_WAIT(30) + EVT_CALL(SetNpcAnimation, NPC_FakeCrystalKing, ANIM_CrystalKing_Anim1C) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_TrueCrystalKing, ANIM_CrystalKing_Anim19) + EVT_WAIT(10) + EVT_KILL_THREAD(LVarA) + EVT_CALL(GetNpcPos, NPC_TrueCrystalKing, LVar0, LVar1, LVar2) + EVT_CALL(PlayEffect, EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0) + EVT_CALL(SetNpcPos, NPC_TrueCrystalKing, 1800, 0, 0) + EVT_CALL(SetNpcYaw, NPC_TrueCrystalKing, 270) + EVT_CALL(SetNpcAnimation, NPC_TrueCrystalKing, ANIM_CrystalKing_Anim0E) + EVT_CALL(SetNpcPos, NPC_Duplighost1, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcJumpscale, NPC_Duplighost1, EVT_FLOAT(0.5)) + EVT_ADD(LVar0, -40) + EVT_CALL(NpcJump1, NPC_Duplighost1, LVar0, LVar1, LVar2, 20) + EVT_CALL(SetNpcAnimation, NPC_Duplighost1, ANIM_Duplighost_Anim02) + EVT_SET(LVar0, 75) + EVT_EXEC_GET_TID(N(EVS_OffsetNpcScroll), LVarA) + EVT_KILL_THREAD(LVarB) + EVT_CALL(SetNpcAnimation, NPC_FakeCrystalKing, ANIM_CrystalKing_Anim0F) + EVT_CALL(GetNpcPos, NPC_FakeCrystalKing, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, -80) + EVT_CALL(NpcMoveTo, NPC_FakeCrystalKing, LVar0, LVar2, 40) + EVT_SET(LVar0, 78) + EVT_EXEC_GET_TID(N(EVS_OffsetNpcScroll), LVarB) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_FakeCrystalKing, ANIM_CrystalKing_Anim10) + EVT_WAIT(60) + EVT_CALL(SetNpcAnimation, NPC_FakeCrystalKing, ANIM_CrystalKing_Anim09) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(10) + EVT_LOOP(4) + EVT_CALL(SetNpcAnimation, NPC_Duplighost1, ANIM_Duplighost_Anim00) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Duplighost1, ANIM_Duplighost_Anim07) + EVT_WAIT(10) + EVT_END_LOOP + EVT_CALL(SetNpcAnimation, NPC_Duplighost1, ANIM_Duplighost_Anim02) + EVT_END_THREAD + EVT_WAIT(100) + EVT_CALL(InterpNpcYaw, NPC_FakeCrystalKing, 90, 7) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_FakeCrystalKing, ANIM_CrystalKing_Anim10) + EVT_CALL(SetNpcAnimation, NPC_TrueCrystalKing, ANIM_CrystalKing_Anim10) + EVT_SET(LVar0, 77) + EVT_EXEC_GET_TID(N(EVS_OffsetNpcScroll), LVarC) + EVT_WAIT(30) + EVT_CALL(SetNpcAnimation, NPC_TrueCrystalKing, ANIM_CrystalKing_Anim1C) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_FakeCrystalKing, ANIM_CrystalKing_Anim19) + EVT_WAIT(10) + EVT_KILL_THREAD(LVarB) + EVT_CALL(GetNpcPos, NPC_FakeCrystalKing, LVar0, LVar1, LVar2) + EVT_CALL(PlayEffect, EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0) + EVT_CALL(SetNpcPos, NPC_FakeCrystalKing, 0, -500, 0) + EVT_CALL(SetNpcPos, NPC_Duplighost2, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcJumpscale, NPC_Duplighost2, EVT_FLOAT(0.5)) + EVT_ADD(LVar0, -40) + EVT_CALL(NpcJump1, NPC_Duplighost2, LVar0, LVar1, LVar2, 20) + EVT_CALL(SetNpcAnimation, NPC_Duplighost2, ANIM_Duplighost_Anim02) + EVT_SET(LVar0, 76) + EVT_EXEC_GET_TID(N(EVS_OffsetNpcScroll), LVarB) + EVT_KILL_THREAD(LVarC) + EVT_CALL(SetNpcAnimation, NPC_TrueCrystalKing, ANIM_CrystalKing_Anim0F) + EVT_CALL(GetNpcPos, NPC_TrueCrystalKing, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, -80) + EVT_CALL(NpcMoveTo, NPC_TrueCrystalKing, LVar0, LVar2, 40) + EVT_SET(LVar0, 77) + EVT_EXEC_GET_TID(N(EVS_OffsetNpcScroll), LVarC) + EVT_THREAD + EVT_LOOP(6) + EVT_CALL(SetNpcAnimation, NPC_TrueCrystalKing, ANIM_CrystalKing_Anim10) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_TrueCrystalKing, ANIM_CrystalKing_Anim11) + EVT_WAIT(10) + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(10) + EVT_LOOP(4) + EVT_CALL(SetNpcAnimation, NPC_Duplighost1, ANIM_Duplighost_Anim00) + EVT_CALL(SetNpcAnimation, NPC_Duplighost2, ANIM_Duplighost_Anim00) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Duplighost1, ANIM_Duplighost_Anim07) + EVT_CALL(SetNpcAnimation, NPC_Duplighost2, ANIM_Duplighost_Anim07) + EVT_WAIT(10) + EVT_END_LOOP + EVT_CALL(SetNpcAnimation, NPC_Duplighost1, ANIM_Duplighost_Anim02) + EVT_CALL(SetNpcAnimation, NPC_Duplighost2, ANIM_Duplighost_Anim02) + EVT_END_THREAD + EVT_WAIT(60) + EVT_THREAD + EVT_CALL(LoadPath, 50, EVT_PTR(N(CrystalsFlyInPath)), ARRAY_COUNT(N(CrystalsFlyInPath)), EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(GetNextPathPos) + EVT_SET(LVar4, LVar1) + EVT_ADD(LVar4, -30) + EVT_SET(LVar5, LVar1) + EVT_ADD(LVar5, 30) + EVT_SET(LVar6, LVar2) + EVT_ADD(LVar6, -25) + EVT_CALL(SetNpcPos, NPC_CrystalBit1, LVar5, LVar6, LVar3) + EVT_CALL(SetNpcPos, NPC_CrystalBit2, LVar1, LVar2, LVar3) + EVT_CALL(SetNpcPos, NPC_CrystalBit3, LVar4, LVar6, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_WAIT(50) + EVT_KILL_THREAD(LVarC) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_TrueCrystalKing, ANIM_CrystalKing_Anim19) + EVT_CALL(LoadPath, 50, EVT_PTR(N(CrystalsFlyOutPath)), ARRAY_COUNT(N(CrystalsFlyInPath)), EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(GetNextPathPos) + EVT_SET(LVar4, LVar1) + EVT_ADD(LVar4, -30) + EVT_SET(LVar5, LVar1) + EVT_ADD(LVar5, 30) + EVT_SET(LVar6, LVar2) + EVT_ADD(LVar6, -25) + EVT_CALL(SetNpcPos, NPC_CrystalBit1, LVar5, LVar6, LVar3) + EVT_CALL(SetNpcPos, NPC_CrystalBit2, LVar1, LVar2, LVar3) + EVT_CALL(SetNpcPos, NPC_CrystalBit3, LVar4, LVar6, LVar3) + EVT_ADD(LVar2, -50) + EVT_CALL(SetNpcPos, NPC_TrueCrystalKing, LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(SetNpcAnimation, NPC_Duplighost1, ANIM_Duplighost_Anim02) + EVT_CALL(SetNpcAnimation, NPC_Duplighost2, ANIM_Duplighost_Anim02) + EVT_LOOP(50) + EVT_CALL(NpcFaceNpc, NPC_Duplighost1, NPC_TrueCrystalKing, 0) + EVT_CALL(NpcFaceNpc, NPC_Duplighost2, NPC_TrueCrystalKing, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_WAIT(30) + EVT_CALL(SetNpcAnimation, NPC_Duplighost1, ANIM_Duplighost_Anim03) + EVT_CALL(SetNpcAnimation, NPC_Duplighost2, ANIM_Duplighost_Anim03) + EVT_KILL_THREAD(LVarA) + EVT_KILL_THREAD(LVarB) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_end/end_00/end_00_B_bowser.c b/src/world/area_end/end_00/end_00_B_bowser.c new file mode 100644 index 0000000000..f01c07b4c8 --- /dev/null +++ b/src/world/area_end/end_00/end_00_B_bowser.c @@ -0,0 +1,213 @@ +#include "end_00.h" +#include "effects.h" + +EvtScript N(EVS_JrTroopa_SpinningDodge) = { + EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_RaiseStaff) + EVT_WAIT(5) + EVT_CALL(MakeLerp, 0, 360, 10, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, NPC_JrTroopa, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ParadePhase_Bowser) = { + EVT_WAIT(10) + EVT_CALL(SetNpcJumpscale, NPC_JrTroopa, EVT_FLOAT(0.5)) + EVT_CALL(NpcJump1, NPC_JrTroopa, 2010, 0, 0, 20) + EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_Run) + EVT_CALL(NpcMoveTo, NPC_JrTroopa, 1930, 0, 20) + EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_Idle) + EVT_CALL(InterpNpcYaw, NPC_JrTroopa, 90, 0) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_RaiseStaff) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_SwingStaff) + EVT_CALL(PlayEffect, EFFECT_SHAPE_SPELL, 0, 1930, 0, 0, 2160, 100, 0, 10, 0, 0, 0, 0, 0) + EVT_WAIT(30) + EVT_CALL(PlayEffect, EFFECT_SHAPE_SPELL, 0, 2160, 100, 0, 1930, 0, 0, 10, 0, 0, 0, 0, 0) + EVT_EXEC(N(EVS_JrTroopa_SpinningDodge)) + EVT_CALL(NpcJump1, NPC_JrTroopa, 1890, 0, 0, 20) + EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_Idle) + EVT_CALL(NpcFlyTo, NPC_Kammy, 2060, 60, 0, 10, -10, EASING_LINEAR) + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0E) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0F) + EVT_CALL(PlayEffect, EFFECT_SHAPE_SPELL, 0, 2060, 60, 0, 1890, 0, 0, 10, 0, 0, 0, 0, 0) + EVT_EXEC(N(EVS_JrTroopa_SpinningDodge)) + EVT_CALL(NpcJump1, NPC_JrTroopa, 2040, 0, 0, 20) + EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_Idle) + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim14) + EVT_CALL(NpcFlyTo, NPC_Kammy, 1940, 60, 0, 20, -10, EASING_LINEAR) + EVT_CALL(InterpNpcYaw, NPC_Kammy, 90, 0) + EVT_CALL(InterpNpcYaw, NPC_JrTroopa, 270, 0) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0E) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0F) + EVT_CALL(PlayEffect, EFFECT_SHAPE_SPELL, 0, 1940, 60, 0, 2040, 0, 0, 10, 0, 0, 0, 0, 0) + EVT_EXEC(N(EVS_JrTroopa_SpinningDodge)) + EVT_CALL(NpcJump1, NPC_JrTroopa, 2160, 0, 0, 20) + EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_Idle) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_RaiseStaff) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_SwingStaff) + EVT_CALL(PlayEffect, EFFECT_SHAPE_SPELL, 0, 2160, 0, 0, 1940, 60, 0, 20, 0, 0, 0, 0, 0) + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim14) + EVT_CALL(PlayEffect, EFFECT_GATHER_ENERGY_PINK, 0, 1940, 60, 0, EVT_FLOAT(0.5), 10, 0, 0, 0, 0, 0, 0, 0) + EVT_WAIT(10) + EVT_CALL(SetNpcPos, NPC_Kammy, 0, -500, 0) + EVT_CALL(PlayEffect, EFFECT_GATHER_ENERGY_PINK, 0, 2100, 60, 0, EVT_FLOAT(0.5), 10, 0, 0, 0, 0, 0, 0, 0) + EVT_WAIT(10) + EVT_CALL(SetNpcPos, NPC_Kammy, 2100, 60, 0) + EVT_WAIT(30) + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0E) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0F) + EVT_CALL(PlayEffect, EFFECT_SHAPE_SPELL, 0, 2100, 60, 0, 2160, 0, 0, 10, 0, 0, 0, 0, 0) + EVT_EXEC(N(EVS_JrTroopa_SpinningDodge)) + EVT_CALL(NpcJump1, NPC_JrTroopa, 2100, 0, 0, 20) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_Run) + EVT_CALL(NpcMoveTo, NPC_JrTroopa, 1900, 0, 50) + EVT_END_THREAD + EVT_WAIT(20) + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim14) + EVT_CALL(InterpNpcYaw, NPC_Kammy, 270, 0) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim12) + EVT_WAIT(30) + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim14) + EVT_CALL(InterpNpcYaw, NPC_Kammy, 90, 0) + EVT_WAIT(20) + EVT_CALL(NpcFlyTo, NPC_Kammy, 1900, 40, 0, 25, -10, EASING_LINEAR) + EVT_WAIT(150) + EVT_THREAD + EVT_WAIT(35) + EVT_CALL(PlayEffect, EFFECT_SHAPE_SPELL, 0, 2040, 60, -20, 2180, 0, 20, 10, 0, 0, 0, 0, 0) + EVT_WAIT(35) + EVT_CALL(SetNpcPos, NPC_Kammy, 2390, 120, -20) + EVT_CALL(NpcFlyTo, NPC_Kammy, 2440, 60, -20, 10, -10, EASING_LINEAR) + EVT_CALL(InterpNpcYaw, NPC_Kammy, 270, 0) + EVT_END_THREAD + EVT_CALL(SetNpcPos, NPC_JrTroopa, 2040, 0, 20) + EVT_CALL(SetNpcYaw, NPC_JrTroopa, 90) + EVT_CALL(NpcMoveTo, NPC_JrTroopa, 2400, 20, 90) + EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_Idle) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_RaiseStaff) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_SwingStaff) + EVT_CALL(PlayEffect, EFFECT_SHAPE_SPELL, 0, 2400, 0, 20, 2440, 60, -20, 10, 0, 0, 0, 0, 0) + EVT_THREAD + EVT_CALL(NpcFlyTo, NPC_Kammy, 2300, 60, -20, 20, -10, EASING_LINEAR) + EVT_CALL(InterpNpcYaw, NPC_Kammy, 90, 0) + EVT_WAIT(20) + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0E) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0F) + EVT_CALL(PlayEffect, EFFECT_SHAPE_SPELL, 0, 2300, 60, -20, 2390, 40, 0, 10, 0, 0, 0, 0, 0) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_Run) + EVT_CALL(NpcMoveTo, NPC_JrTroopa, 2480, 20, 20) + EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_Idle) + EVT_CALL(InterpNpcYaw, NPC_JrTroopa, 270, 0) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_RaiseStaff) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_SwingStaff) + EVT_CALL(PlayEffect, EFFECT_SHAPE_SPELL, 0, 2480, 0, 20, 2390, 40, 0, 10, 0, 0, 0, 0, 0) + EVT_END_THREAD + EVT_WAIT(60) + EVT_CALL(PlayEffect, EFFECT_RING_BLAST, 0, 2390, 40, 5, EVT_FLOAT(5.0), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_HammerBros1, ANIM_ParadeKoopas_Bowser_HammerBrosPanic) + EVT_CALL(NpcMoveTo, NPC_HammerBros1, 2180, 0, 30) + EVT_CALL(SetNpcPos, NPC_HammerBros1, 0, -500, 0) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_HammerBros2, ANIM_ParadeKoopas_Bowser_HammerBrosPanic) + EVT_CALL(NpcMoveTo, NPC_HammerBros2, 2140, 0, 30) + EVT_CALL(SetNpcPos, NPC_HammerBros2, 0, -500, 0) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Koopatrol1, ANIM_ParadeKoopas_Bowser_KoopatrolPanic) + EVT_CALL(NpcMoveTo, NPC_Koopatrol1, 2680, 0, 50) + EVT_CALL(SetNpcPos, NPC_Koopatrol1, 0, -500, 0) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Koopatrol2, ANIM_ParadeKoopas_Bowser_KoopatrolPanic) + EVT_CALL(NpcMoveTo, NPC_Koopatrol2, 2720, 0, 50) + EVT_CALL(SetNpcPos, NPC_Koopatrol2, 0, -500, 0) + EVT_END_THREAD + EVT_WAIT(10) + EVT_CALL(SetNpcPos, NPC_Bowser, 0, -500, 0) + EVT_CALL(SetNpcPos, NPC_BowserPropeller, 0, -500, 0) + EVT_CALL(SetNpcPos, NPC_BurntBowser, 2390, 10, 0) + EVT_CALL(SetNpcPos, NPC_BurntBowserPropeller, 2390, 10, 0) + EVT_WAIT(60) + EVT_CALL(SetNpcAnimation, NPC_BurntBowser, ANIM_ParadeBurntBowser_BurntDrawBack) + EVT_WAIT(10) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0C) + EVT_CALL(NpcFlyTo, NPC_Kammy, 2180, 60, -20, 30, -10, EASING_LINEAR) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_Run) + EVT_CALL(NpcMoveTo, NPC_JrTroopa, 2160, 20, 40) + EVT_END_THREAD + EVT_WAIT(40) + EVT_THREAD + EVT_CALL(NpcMoveTo, NPC_BurntBowserPropeller, 2270, 0, 60) + EVT_END_THREAD + EVT_CALL(NpcMoveTo, NPC_BurntBowser, 2270, 0, 60) + EVT_CALL(PlayEffect, EFFECT_FIRE_BREATH, 0, 2270, 40, -5, 2280, 40, -5, 5, 2, 30, 0, 0, 0) + EVT_WAIT(20) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim07) + EVT_CALL(SetNpcYaw, NPC_Kammy, 90) + EVT_CALL(SetNpcPos, NPC_Kammy, 2280, 0, 0) + EVT_CALL(SetNpcJumpscale, NPC_Kammy, EVT_FLOAT(0.5)) + EVT_CALL(NpcJump1, NPC_Kammy, 2380, 0, 0, 20) + EVT_CALL(NpcJump1, NPC_Kammy, 2430, 0, 0, 10) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_BurnStill) + EVT_CALL(SetNpcYaw, NPC_JrTroopa, 90) + EVT_CALL(SetNpcPos, NPC_JrTroopa, 2320, 0, 0) + EVT_CALL(SetNpcJumpscale, NPC_JrTroopa, EVT_FLOAT(0.5)) + EVT_CALL(NpcJump1, NPC_JrTroopa, 2420, 0, 0, 20) + EVT_CALL(NpcJump1, NPC_JrTroopa, 2470, 0, 0, 10) + EVT_END_THREAD + EVT_WAIT(30) + EVT_SETF(LVar0, 2430) + EVT_SETF(LVar1, 2470) + EVT_CHILD_THREAD + EVT_LOOP(0) + EVT_ADDF(LVar0, EVT_FLOAT(0.87)) + EVT_CALL(SetNpcPos, NPC_Kammy, LVar0, 0, 0) + EVT_ADDF(LVar1, EVT_FLOAT(0.87)) + EVT_CALL(SetNpcPos, NPC_JrTroopa, LVar1, 0, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_CHILD_THREAD + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_DONE) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_end/end_01/E05360.c b/src/world/area_end/end_01/E05360.c deleted file mode 100644 index 7e9cb74b34..0000000000 --- a/src/world/area_end/end_01/E05360.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "end_01.h" - -ApiStatus func_80240000_E05360(Evt* script, s32 isInitialCall) { - return ApiStatus_BLOCK; -} diff --git a/src/world/area_end/end_01/E05370.c b/src/world/area_end/end_01/E05370.c deleted file mode 100644 index 8e6d27fe4b..0000000000 --- a/src/world/area_end/end_01/E05370.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "end_01.h" - -ApiStatus func_80240010_E05370(void) { - gCameras[CAM_DEFAULT].vfov = 35.0f; - return ApiStatus_DONE2; -} diff --git a/src/world/area_end/end_01/E05390.c b/src/world/area_end/end_01/E05390.c deleted file mode 100644 index 062854811f..0000000000 --- a/src/world/area_end/end_01/E05390.c +++ /dev/null @@ -1,328 +0,0 @@ -#include "end_01.h" - -extern s32 spr_allocateBtlComponentsOnWorldHeap; -extern ParadeNpcInfo N(ParadeNpcsTable)[]; - -extern CreditsUnkBeta N(Font4Patterns)[16]; -extern CreditsUnkBeta N(Font3Patterns)[16]; -extern Vp N(CreditsViewport); -extern s32 N(CreditsBufferIndex); - -// start of BSS: -extern CreditsData N(CreditsData); -extern CreditsData* N(CreditsDataPtr); -extern u8 N(CreditsMessageBuffers)[23][256]; -extern Mtx N(CreditsProjMatrices)[2]; - -s32 msg_get_print_char_width(s32 character, s32 charset, s32 variation, f32 msgScale, s32 overrideCharWidth, u8 flags); -void msg_get_glyph(s32 font, s32 variation, s32 charIndex, s32 palette, MesasgeFontGlyphData* out); -void dma_load_msg(u32 msgID, void* dest); - -#include "world/common/atomic/Credits_1.inc.c" - -// same as end_00_credits_update_line, but Font3Patterns and Font4Patterns are swapped... -// might be able to fix this when data for this map is done? -void N(credits_update_line)(CreditsLine* line) { - CreditsChar creditsChar; - CreditsChar* curChar = &creditsChar; - CreditsUnkBeta* curPattern; - s32 msgHeight, msgWidth, msgMaxLineChars; - s32 doneCurrentState; - s32 readPos; - u8 curMsgChar; - u16 nextMsgChar1, nextMsgChar2; - u16 doneCalcLoop, doneDrawLoop; - s32 drawCount; - s32 posX; - s32 i; - - doneCurrentState = FALSE; - if (line->flags & CREDITS_LINE_FLAG_2) { - line->flags &= ~CREDITS_LINE_FLAG_2; - line->time = 0; - line->state = 0; - } - - get_msg_properties((s32) line->message, &msgHeight, &msgWidth, &msgMaxLineChars, NULL, NULL, NULL, 0); - - curChar->font = 0; - curChar->variation = 0; - - // calculate message width - msgWidth = 1; - readPos = 0; - do { - curMsgChar = line->message[readPos++]; - nextMsgChar1 = line->message[readPos]; - doneCalcLoop = FALSE; - - switch (curMsgChar) { - case MSG_CHAR_READ_VARIANT0: - case MSG_CHAR_READ_VARIANT1: - case MSG_CHAR_READ_VARIANT2: - curChar->variation = curMsgChar - MSG_CHAR_READ_VARIANT0; - break; - case MSG_CHAR_READ_ENDL: - case MSG_CHAR_READ_END: - doneCalcLoop = TRUE; - break; - case MSG_CHAR_READ_FUNCTION: - // only support function for selecting font - if (line->message[readPos++] == MSG_READ_FUNC_FONT) { - curChar->font = line->message[readPos++]; - } - break; - default: - msgWidth += msg_get_print_char_width(curMsgChar, curChar->font, curChar->variation, 1.0f, 0, 1) - 1; - if (curChar->font == MSG_FONT_TITLE || curChar->font == MSG_FONT_SUBTITLE) { - curPattern = N(Font4Patterns); - if (curChar->font == MSG_FONT_SUBTITLE) { - curPattern = N(Font3Patterns); - } - - i = 0; - - if (curChar->font == MSG_FONT_SUBTITLE) { - if (curMsgChar == MSG_CHAR_LPAREN || nextMsgChar1 == MSG_CHAR_LPAREN) { - msgWidth++; - } - } - - do { - if (curMsgChar == curPattern[i].unk_00 && nextMsgChar1 == curPattern[i].unk_01) { - msgWidth += curPattern[i].size; - } - i++; - } while (curPattern[i].size != 0); - } - break; - } - } while (!doneCalcLoop); - - line->msgWidth = msgWidth; - if (line->flags & CREDITS_LINE_FLAG_1) { - posX = line->posX - (((f32) msgWidth * 0.5) + 0.0); - } else { - posX = line->posX; - } - - curChar->font = 0; - curChar->variation = 0; - curChar->palette = line->palette; - - drawCount = 0; - readPos = 0; - do { - curMsgChar = line->message[readPos++]; - nextMsgChar2 = line->message[readPos]; - doneDrawLoop = FALSE; - - switch (curMsgChar) { - case MSG_CHAR_READ_VARIANT0: - case MSG_CHAR_READ_VARIANT1: - case MSG_CHAR_READ_VARIANT2: - curChar->variation = curMsgChar - MSG_CHAR_READ_VARIANT0; - break; - case MSG_CHAR_READ_ENDL: - case MSG_CHAR_READ_END: - doneDrawLoop = TRUE; - break; - case MSG_CHAR_READ_FUNCTION: - if (line->message[readPos++] == 0) { - curChar->font = line->message[readPos++]; - } - break; - default: - if (curMsgChar < MSG_CHAR_READ_ENDL) { - curChar->charIndex = curMsgChar; - curChar->posX = posX; - curChar->posY = line->posY; - - switch (line->state) { - case CREDITS_LINE_APPEARING: - curChar->fadeInTime = line->time - (line->perCharDelayIn * drawCount); - if (curChar->fadeInTime >= 0) { - if (line->appearTime < curChar->fadeInTime) { - curChar->fadeInTime = line->appearTime; - } - if ((nextMsgChar2 == MSG_CHAR_READ_END) && (curChar->fadeInTime == line->appearTime)) { - doneCurrentState = TRUE; - } - switch (line->appearMode) { - case 0: - N(CharAnim_FadeIn_5)(line, curChar); - break; - case 1: - N(CharAnim_FadeIn_1)(line, curChar); - break; - case 2: - N(CharAnim_FadeIn_2)(line, curChar); - break; - case 3: - N(CharAnim_FadeIn_3)(line, curChar); - break; - case 4: - N(CharAnim_FadeIn_4)(line, curChar); - break; - case 5: - N(CharAnim_FadeIn_5)(line, curChar); - break; - } - } - break; - - case CREDITS_LINE_HOLDING: - if (nextMsgChar2 == MSG_CHAR_READ_END) { - if (line->time == line->holdTime) { - doneCurrentState = TRUE; - } - } - N(CharAnim_Hold)(line, curChar); - break; - - case CREDITS_LINE_VANISHING: - curChar->fadeInTime = line->time - (line->perCharDelayOut * drawCount); - if (curChar->fadeInTime < 0) { - curChar->fadeInTime = 0; - } - if (curChar->fadeInTime > line->vanishTime) { - curChar->fadeInTime = line->vanishTime; - } - if (nextMsgChar2 == MSG_CHAR_READ_END && curChar->fadeInTime == line->vanishTime) { - doneCurrentState = TRUE; - } - - switch (line->vanishMode) { - case 0: - N(CharAnim_FadeOut_3)(line, curChar); - break; - case 1: - N(CharAnim_FadeOut_1)(line, curChar); - break; - case 2: - N(CharAnim_FadeOut_2)(line, curChar); - break; - case 3: - N(CharAnim_FadeOut_3)(line, curChar); - break; - } - break; - } - drawCount++; - } - - posX += msg_get_print_char_width(curMsgChar, curChar->font, curChar->variation, 1.0f, 0, 1) - 1; - if (curChar->font == MSG_FONT_TITLE || curChar->font == MSG_FONT_SUBTITLE) { - curPattern = N(Font4Patterns); - if (curChar->font == MSG_FONT_SUBTITLE) { - curPattern = N(Font3Patterns); - } - - i = 0; - - if (curChar->font == MSG_FONT_SUBTITLE) { - if (curMsgChar == MSG_CHAR_LPAREN || nextMsgChar2 == MSG_CHAR_LPAREN) { - posX++; - } - } - do { - if (curMsgChar == curPattern[i].unk_00 && nextMsgChar2 == curPattern[i].unk_01) { - posX += curPattern[i].size; - } - i++; - } while (curPattern[i].size != 0); - } - break; - } - } while (!doneDrawLoop); - - if ((line->state == CREDITS_LINE_APPEARING) && doneCurrentState) { - s32 temp = 0; - get_msg_properties((s32) line->message, NULL, NULL, &temp, NULL, NULL, NULL, 0); - line->time = 0; - line->state++; - if (line->holdTime <= 0) { - line->state++; - } - } else if ((line->state == CREDITS_LINE_HOLDING) && doneCurrentState) { - line->time = 0; - line->state++; - } else if ((line->state == CREDITS_LINE_VANISHING) && doneCurrentState) { - line->flags &= ~CREDITS_LINE_FLAG_1; - } - line->time++; -} - -#include "world/common/atomic/Credits_2.inc.c" - -ApiStatus func_80242690_E079F0(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 npcID = evt_get_variable(script, *args++); - ParadeNpcInfo* npcInfo = &N(ParadeNpcsTable)[npcID]; - NpcBlueprint bp; - Npc* npc; - - bp.flags = NPC_FLAG_100; - bp.initialAnim = npcInfo->initialAnim; - bp.onUpdate = NULL; - bp.onRender = NULL; - - spr_allocateBtlComponentsOnWorldHeap = TRUE; - - npc = get_npc_by_index(_create_npc_standard(&bp, npcInfo->animList)); - npc->npcID = npcID; - npc->flags &= ~NPC_FLAG_PARTICLE; - npc->pos.x = npcInfo->pos.x; - npc->pos.y = npcInfo->pos.y; - npc->pos.z = npcInfo->pos.z; - set_npc_yaw(npc, npcInfo->yaw); - return ApiStatus_DONE2; -} - -ApiStatus func_80242754_E07AB4(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 heapSize = evt_get_variable(script, *args++); - s32 outVar = *args++; - - evt_set_variable(script, outVar, (s32) _heap_malloc(&gSpriteHeapPtr, heapSize)); - return ApiStatus_DONE2; -} - -ApiStatus func_802427B4_E07B14(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 pointer = *args++; - - _heap_free(&gSpriteHeapPtr, (void*) evt_get_variable(script, pointer)); - return ApiStatus_DONE2; -} - -ApiStatus func_802427E8_E07B48(Evt* script, s32 isInitialCall) { - Camera* camera = &gCameras[gCurrentCameraID]; - - camera->unk_506 = 1; - camera->movePos.x += 0.6666667f; - return ApiStatus_DONE2; -} - -ApiStatus func_80242840_E07BA0(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - Npc** npc = (Npc**)&script->functionTempPtr[1]; - - if (isInitialCall) { - *npc = get_npc_unsafe(evt_get_variable(script, *args++)); - } - - (*npc)->pos.x += 0.6666667f; - - return ApiStatus_BLOCK; -} - -ApiStatus func_8024289C_E07BFC(Evt* script, s32 isInitialCall) { - if (gGameStatusPtr->pressedButtons[0] & (BUTTON_A | BUTTON_START)) { - return ApiStatus_DONE2; - } else { - return ApiStatus_BLOCK; - } -} - -static char* N(exit_str_0) = "kmr_30"; diff --git a/src/world/area_end/end_01/E07C20.c b/src/world/area_end/end_01/E07C20.c deleted file mode 100644 index 89abf8c472..0000000000 --- a/src/world/area_end/end_01/E07C20.c +++ /dev/null @@ -1,116 +0,0 @@ -#include "end_01.h" - -extern u8 D_80245D37_E0B097; -extern s32 D_80245D34_E0B094; - -ApiStatus func_802428C0_E07C20(Evt* script, s32 isInitialCall) { - func_8011B950(0x5B, -1, 1, 0); - set_background_color_blend(0, 0, 0, 255); - return ApiStatus_DONE2; -} - -ApiStatus func_80242900_E07C60(Evt* script, s32 isInitialCall) { - if (isInitialCall) { - script->functionTemp[1] = 255; - } - - script->functionTemp[1] -= 10; - if (script->functionTemp[1] < 0) { - script->functionTemp[1] = 0; - } - - set_background_color_blend(0, 0, 0, script->functionTemp[1]); - - if (script->functionTemp[1] == 0) { - func_8011B950(0x5B, -1, 0, 0); - return ApiStatus_DONE2; - } else { - return ApiStatus_BLOCK; - } -} - -ApiStatus func_80242978_E07CD8(Evt* script, s32 isInitialCall) { - Npc* npc; - - if (isInitialCall) { - script->functionTempPtr[2] = get_npc_safe(script->varTable[10]); - script->functionTemp[0] = 0; - } - npc = script->functionTempPtr[2]; - npc->rotation.y = update_lerp(4, 810.0f, 0.0f, script->functionTemp[0], 45); - npc->alpha = update_lerp(4, 0.0f, 255.0f, script->functionTemp[0], 45); - - script->functionTemp[0]++; - if (script->functionTemp[0] < 0x2E) { - return ApiStatus_BLOCK; - } else { - return ApiStatus_DONE1; - } -} - -ApiStatus func_80242A68_E07DC8(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 npcID = evt_get_variable(script, *args++); - Npc* npc; - - if (isInitialCall) { - script->functionTempPtr[1] = resolve_npc(script, npcID); - npc = script->functionTempPtr[1]; - script->functionTemp[2] = npc->pos.x; - script->functionTempF[3] = 180.0f; - script->functionTemp[0] = 72; - } - - npc = script->functionTempPtr[1]; - script->functionTempF[3] = clamp_angle(script->functionTempF[3] - 5.0f); - npc->pos.x = npc->pos.x + (cos_deg(script->functionTempF[3]) * 6.0f); - npc->pos.z = npc->pos.z + (sin_deg(script->functionTempF[3]) * 2.5f); - npc->renderYaw = clamp_angle(180.0f - script->functionTempF[3]); - - script->functionTemp[0]--; - if (script->functionTemp[0] == 0) { - return ApiStatus_DONE1; - } else { - return ApiStatus_BLOCK; - } -} - -ApiStatus func_80242B68_E07EC8(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 npcID = evt_get_variable(script, *args++); - Npc* npc; - - if (isInitialCall) { - script->functionTempPtr[1] = resolve_npc(script, npcID); - npc = script->functionTempPtr[1]; - script->functionTemp[2] = npc->pos.x; - script->functionTempF[3] = 180.0f; - script->functionTemp[0] = 72; - } - - npc = script->functionTempPtr[1]; - script->functionTempF[3] = clamp_angle(script->functionTempF[3] + 5.0f); - npc->pos.x = npc->pos.x + (cos_deg(script->functionTempF[3]) * 6.0f); - npc->pos.z = npc->pos.z + (sin_deg(script->functionTempF[3]) * 2.5f); - npc->renderYaw = clamp_angle(180.0f - script->functionTempF[3]); - - script->functionTemp[0]--; - if (script->functionTemp[0] == 0) { - return ApiStatus_DONE1; - } else { - return ApiStatus_BLOCK; - } -} - -ApiStatus func_80242C68_E07FC8(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - D_80245D34_E0B094 = evt_get_variable(script, *args++); - - return ApiStatus_DONE2; -} - -void func_80242C94_E07FF4(void) { - gDPSetCombineLERP(gMasterGfxPos++, TEXEL0, 0, SHADE, 0, SHADE, 0, PRIMITIVE, 0, TEXEL0, 0, SHADE, 0, SHADE, 0, - PRIMITIVE, 0); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, D_80245D37_E0B097); -} diff --git a/src/world/area_end/end_01/E08050.c b/src/world/area_end/end_01/E08050.c deleted file mode 100644 index 4a49b81ee2..0000000000 --- a/src/world/area_end/end_01/E08050.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "end_01.h" - -#include "world/common/atomic/UnkFunc27.inc.c" - diff --git a/src/world/area_end/end_01/credits_jobs.inc.c b/src/world/area_end/end_01/credits_jobs.inc.c new file mode 100644 index 0000000000..798ae8fe55 --- /dev/null +++ b/src/world/area_end/end_01/credits_jobs.inc.c @@ -0,0 +1,180 @@ +#include "world/common/atomic/Credits.h" + +CreditsEntry N(Credits_Jobs)[] = { + { + .msgID = MSG_Credits_0019, + .posX = STANDARD_POS_X, + .posY = 166, + .appearMode = CREDITS_APPEAR_MODE_04, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 2, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 2270, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 2340, + .flags = CREDITS_FLAG_1, + }, + { + .appearMode = CREDITS_APPEAR_MODE_04, + .appearTime = 0, + .perCharDelayIn = 0, + .next = 60, + }, + { + .msgID = MSG_Credits_001A, + .posX = STANDARD_POS_X, + .posY = 170, + .appearMode = CREDITS_APPEAR_MODE_04, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 2, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 200, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 270, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_001B, + .posX = STANDARD_POS_X, + .posY = 170, + .appearMode = CREDITS_APPEAR_MODE_04, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 2, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 430, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 500, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_001D, + .posX = STANDARD_POS_X, + .posY = 170, + .appearMode = CREDITS_APPEAR_MODE_04, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 2, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 200, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 270, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_001C, + .posX = STANDARD_POS_X, + .posY = 170, + .appearMode = CREDITS_APPEAR_MODE_04, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 2, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 430, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 500, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_001E, + .posX = STANDARD_POS_X, + .posY = 170, + .appearMode = CREDITS_APPEAR_MODE_04, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 2, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 200, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 270, + .flags = CREDITS_FLAG_1, + }, + { + .appearMode = CREDITS_APPEAR_MODE_04, + .appearTime = 0, + .perCharDelayIn = 0, + .next = 60, + }, + { + .msgID = MSG_Credits_0007, + .posX = 131, + .posY = 182, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = 60, + .perCharDelayIn = 0, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 160, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 50, + .perCharDelayOut = 0, + .next = 0, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_0008, + .posX = 189, + .posY = 182, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = 60, + .perCharDelayIn = 0, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 160, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 50, + .perCharDelayOut = 0, + .next = 270, + .flags = CREDITS_FLAG_1, + }, + { + .appearMode = CREDITS_APPEAR_MODE_04, + .appearTime = 0, + .perCharDelayIn = 0, + .next = 30, + }, + { + .msgID = MSG_Credits_0005, + .posX = STANDARD_POS_X, + .posY = 172, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = 60, + .perCharDelayIn = 0, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 160, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 50, + .perCharDelayOut = 0, + .next = 0, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_0006, + .posX = STANDARD_POS_X, + .posY = 188, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = 60, + .perCharDelayIn = 0, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 160, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 50, + .perCharDelayOut = 0, + .next = 270, + .flags = CREDITS_FLAG_1, + }, + { + .appearMode = CREDITS_APPEAR_MODE_04, + .appearTime = 0, + .perCharDelayIn = 0, + .next = -1, + }, +}; diff --git a/src/world/area_end/end_01/credits_names.inc.c b/src/world/area_end/end_01/credits_names.inc.c new file mode 100644 index 0000000000..1ba7d7825a --- /dev/null +++ b/src/world/area_end/end_01/credits_names.inc.c @@ -0,0 +1,504 @@ +#include "world/common/atomic/Credits.h" + +CreditsEntry N(Credits_Names)[] = { + { + .next = 40, + }, + { + .msgID = MSG_Credits_0071, + .posX = STANDARD_POS_X, + .posY = 186, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 0, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = STANDARD_HOLD_TIME, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 1, + .next = 0, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_0072, + .posX = STANDARD_POS_X, + .posY = 203, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 0, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = STANDARD_HOLD_TIME, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 1, + .next = STANDARD_NEXT_TIME, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_0066, + .posX = STANDARD_POS_X, + .posY = 186, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 1, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = STANDARD_HOLD_TIME, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 1, + .next = 0, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_0065, + .posX = STANDARD_POS_X, + .posY = 203, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 1, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = STANDARD_HOLD_TIME, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 1, + .next = STANDARD_NEXT_TIME, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_0075, + .posX = STANDARD_POS_X, + .posY = 186, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 1, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = STANDARD_HOLD_TIME, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 1, + .next = 0, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_0073, + .posX = STANDARD_POS_X, + .posY = 203, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 1, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = STANDARD_HOLD_TIME, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 1, + .next = STANDARD_NEXT_TIME, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_0055, + .posX = STANDARD_POS_X, + .posY = 186, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 1, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = STANDARD_HOLD_TIME, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 1, + .next = 0, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_0051, + .posX = STANDARD_POS_X, + .posY = 203, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 1, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = STANDARD_HOLD_TIME, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 1, + .next = STANDARD_NEXT_TIME, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_0059, + .posX = STANDARD_POS_X, + .posY = 186, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 1, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = STANDARD_HOLD_TIME, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 1, + .next = 0, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_005A, + .posX = STANDARD_POS_X, + .posY = 203, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 1, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = STANDARD_HOLD_TIME, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 1, + .next = STANDARD_NEXT_TIME, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_0053, + .posX = STANDARD_POS_X, + .posY = 182, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 1, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = STANDARD_HOLD_TIME, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 1, + .next = 0, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_005B, + .posX = STANDARD_POS_X, + .posY = 195, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 1, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = STANDARD_HOLD_TIME, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 1, + .next = 0, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_005C, + .posX = STANDARD_POS_X, + .posY = 208, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 1, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = STANDARD_HOLD_TIME, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 1, + .next = STANDARD_NEXT_TIME, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_005D, + .posX = STANDARD_POS_X, + .posY = 186, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 1, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = STANDARD_HOLD_TIME, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 1, + .next = 0, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_005E, + .posX = STANDARD_POS_X, + .posY = 203, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 1, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = STANDARD_HOLD_TIME, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 1, + .next = STANDARD_NEXT_TIME, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_005F, + .posX = STANDARD_POS_X, + .posY = 182, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 1, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = STANDARD_HOLD_TIME, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 1, + .next = 0, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_0060, + .posX = STANDARD_POS_X, + .posY = 195, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 1, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = STANDARD_HOLD_TIME, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 1, + .next = 0, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_0061, + .posX = STANDARD_POS_X, + .posY = 208, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 1, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = STANDARD_HOLD_TIME, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 1, + .next = STANDARD_NEXT_TIME, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_0068, + .posX = STANDARD_POS_X, + .posY = 191, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 1, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = STANDARD_HOLD_TIME, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 1, + .next = STANDARD_NEXT_TIME, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_0085, + .posX = STANDARD_POS_X, + .posY = 182, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 1, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 160, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 0, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_0086, + .posX = STANDARD_POS_X, + .posY = 195, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 1, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 160, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = 0, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_0087, + .posX = STANDARD_POS_X, + .posY = 208, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 1, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 160, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = STANDARD_NEXT_TIME, + .flags = CREDITS_FLAG_1, + }, + { + .appearMode = CREDITS_APPEAR_MODE_04, + .appearTime = 0, + .perCharDelayIn = 0, + .next = 60, + }, + { + .next = 40, + }, + { + .msgID = MSG_Credits_0052, + .posX = STANDARD_POS_X, + .posY = 191, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 0, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 160, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = STANDARD_NEXT_TIME, + .flags = CREDITS_FLAG_1, + }, + { + .next = 40, + }, + { + .msgID = MSG_Credits_006A, + .posX = STANDARD_POS_X, + .posY = 191, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 0, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = STANDARD_HOLD_TIME, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 1, + .next = STANDARD_NEXT_TIME, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_0054, + .posX = STANDARD_POS_X, + .posY = 191, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 1, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 160, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = STANDARD_NEXT_TIME, + .flags = CREDITS_FLAG_1, + }, + { + .next = 40, + }, + { + .msgID = MSG_Credits_006D, + .posX = STANDARD_POS_X, + .posY = 191, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 0, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 160, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = STANDARD_NEXT_TIME, + .flags = CREDITS_FLAG_1, + }, + { + .next = 40, + }, + { + .msgID = MSG_Credits_006C, + .posX = STANDARD_POS_X, + .posY = 191, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 0, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = STANDARD_HOLD_TIME, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 1, + .next = STANDARD_NEXT_TIME, + .flags = CREDITS_FLAG_1, + }, + { + .msgID = MSG_Credits_006B, + .posX = STANDARD_POS_X, + .posY = 191, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 1, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 160, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = STANDARD_NEXT_TIME, + .flags = CREDITS_FLAG_1, + }, + { + .next = 40, + }, + { + .msgID = MSG_Credits_006E, + .posX = STANDARD_POS_X, + .posY = 191, + .palette = 1, + .appearMode = CREDITS_APPEAR_MODE_00, + .appearTime = STANDARD_APPEAR_TIME, + .perCharDelayIn = 0, + .holdMode = CREDITS_HOLD_MODE_00, + .holdTime = 160, + .vanishMode = CREDITS_VANISH_MODE_00, + .vanishTime = 30, + .perCharDelayOut = 0, + .next = STANDARD_NEXT_TIME, + .flags = CREDITS_FLAG_1, + }, + { + .appearMode = CREDITS_APPEAR_MODE_04, + .appearTime = 0, + .perCharDelayIn = 0, + .next = 60, + }, + { + .appearMode = CREDITS_APPEAR_MODE_04, + .appearTime = 0, + .perCharDelayIn = 0, + .next = -1, + }, +}; diff --git a/src/world/area_end/end_01/end_01.h b/src/world/area_end/end_01/end_01.h index 2373d4ecf8..86ae977df1 100644 --- a/src/world/area_end/end_01/end_01.h +++ b/src/world/area_end/end_01/end_01.h @@ -2,8 +2,126 @@ /// @brief Ending - Parade (Night) #include "common.h" -#include "../end.h" #include "message_ids.h" #include "map.h" +#include "../end.h" +#include "mapfs/end_01_shape.h" +#include "mapfs/end_01_hit.h" + +#include "sprite/npc/BattleEldstar.h" +#include "sprite/npc/BattleMamar.h" +#include "sprite/npc/BattleSkolar.h" +#include "sprite/npc/BattleMuskular.h" +#include "sprite/npc/BattleMisstar.h" +#include "sprite/npc/BattleKlevar.h" +#include "sprite/npc/BattleKalmar.h" + +#include "sprite/npc/ParadeIceShow.h" +#include "sprite/npc/Musician.h" + +#include "sprite/npc/Sun.h" +#include "sprite/npc/Dayzee.h" +#include "sprite/npc/ParadeWizard.h" +#include "sprite/npc/Bubulb.h" + +#include "sprite/npc/ShyGuy.h" +#include "sprite/npc/PyroGuy.h" +#include "sprite/npc/ParadeShyGuy.h" + +#include "sprite/npc/ParadeHorn.h" +#include "sprite/npc/ParadeDrummer.h" +#include "sprite/npc/ParadeTwirler.h" +#include "sprite/npc/ParadeBanner.h" + +#include "sprite/npc/ParadeMario.h" +#include "sprite/npc/ParadePeach.h" +#include "sprite/npc/ParadeTwink.h" + +enum { + NPC_Eldstar = 0, + NPC_Mamar = 1, + NPC_Skolar = 2, + NPC_Muskular = 3, + NPC_Misstar = 4, + NPC_Klevar = 5, + NPC_Kalmar = 6, + NPC_PenguinSkater1 = 7, + NPC_PenguinSkater2 = 8, + NPC_PenguinMayor = 9, + NPC_PenguinMayorWife = 10, + NPC_ViolinPlayer1 = 11, + NPC_ViolinPlayer2 = 12, + NPC_ViolinPlayer3 = 13, + NPC_Conductor = 14, + NPC_Singer = 15, + NPC_AmayzeDayzee1 = 16, + NPC_AmayzeDayzee2 = 17, + NPC_Merle = 18, + NPC_Merlee = 19, + NPC_Merlon = 20, + NPC_Merluvlee = 21, + NPC_Merlow = 22, + NPC_Merlar = 23, + NPC_SunSad = 24, + NPC_SunHappy = 25, + NPC_Bulbulb1 = 26, + NPC_Bulbulb2 = 27, + NPC_ShyGuyMarshall = 28, + NPC_GeneralGuy = 29, + NPC_BackupDancer1 = 30, + NPC_BackupDancer2 = 31, + NPC_GrooveGuy1 = 32, + NPC_GrooveGuy2 = 33, + NPC_GrooveGuy3 = 34, + NPC_GrooveGuy4 = 35, + NPC_PyroGuy1 = 36, + NPC_PyroGuy2 = 37, + NPC_ShyGuyFormation11 = 38, + NPC_ShyGuyFormation12 = 39, + NPC_ShyGuyFormation13 = 40, + NPC_ShyGuyFormation21 = 41, + NPC_ShyGuyFormation22 = 42, + NPC_ShyGuyFormation23 = 43, + NPC_ShyGuyFormation31 = 44, + NPC_ShyGuyFormation32 = 45, + NPC_ShyGuyFormation33 = 46, + NPC_ShyGuyFormation41 = 47, + NPC_ShyGuyFormation42 = 48, + NPC_ShyGuyFormation43 = 49, + NPC_Pratfaller = 50, + NPC_HornPlayer1 = 51, + NPC_HornPlayer2 = 52, + NPC_Drummer1 = 53, + NPC_Drummer2 = 54, + NPC_StandardBearer1 = 55, + NPC_StandardBearer2 = 56, + NPC_Mario = 57, + NPC_Peach = 58, + NPC_Twink = 59, + NPC_Twirler1 = 60, + NPC_Twirler2 = 61, + NPC_Twirler3 = 62, + NPC_Baton1 = 63, + NPC_Baton2 = 64, + NPC_Baton3 = 65, + NPC_StandardBearer3 = 66, + NPC_StandardBearer4 = 67, +}; + +#define PARADE_SCROLL_RATE (2.0f/3.0f) + +enum { + PARADE_START = -3135, + PARADE_PHASE_SKATERS = -3000, + PARADE_PHASE_MAYOR = -2950, + PARADE_PHASE_OPERA = -2945, + PARADE_PHASE_WIZARDS = -2450, + PARADE_PHASE_SHYGUY_DANCE = -1778, + PARADE_PHASE_SHYGUY_MARCH = -1248, + PARADE_PHASE_TOADS = -889, + PARADE_PHASE_PEACH = -689, + PARADE_PHASE_EXIT = -330, +}; + #define NAMESPACE end_01 diff --git a/src/world/area_end/end_01/end_01_0_init.c b/src/world/area_end/end_01/end_01_0_init.c new file mode 100644 index 0000000000..90146246e6 --- /dev/null +++ b/src/world/area_end/end_01/end_01_0_init.c @@ -0,0 +1,5 @@ +#include "end_01.h" + +s32 N(map_init)(void) { + return FALSE; +} diff --git a/src/world/area_end/end_01/end_01_1_main.c b/src/world/area_end/end_01/end_01_1_main.c new file mode 100644 index 0000000000..2c46eb79fc --- /dev/null +++ b/src/world/area_end/end_01/end_01_1_main.c @@ -0,0 +1,33 @@ +#include "end_01.h" + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_ManageParade); + +API_CALLABLE(N(WidenCameraFOV)) { + gCameras[CAM_DEFAULT].vfov = 35.0f; + return ApiStatus_DONE2; +} + +EntryList N(Entrances) = { + [end_01_ENTRY_0] { 0.0, 0.0, 0.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), +}; + +EvtScript N(EVS_Main) = { + EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096) + EVT_CALL(SetCamViewport, CAM_DEFAULT, 15, 28, 290, 128) + EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0) + EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) + EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) + EVT_CALL(N(WidenCameraFOV)) + EVT_CALL(EnableStatusMenu, FALSE) + EVT_EXEC(N(EVS_ManageParade)) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_end/end_01/end_01_2_credits.c b/src/world/area_end/end_01/end_01_2_credits.c new file mode 100644 index 0000000000..09f90aab80 --- /dev/null +++ b/src/world/area_end/end_01/end_01_2_credits.c @@ -0,0 +1,24 @@ +#include "end_01.h" + +#include "world/common/atomic/Credits.inc.c" + +#include "credits_jobs.inc.c" +#include "credits_names.inc.c" + +EvtScript N(EVS_InitCredits) = { + EVT_CALL(N(InitCredits)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ShowCredits_Jobs) = { + EVT_CALL(N(ShowCreditList), EVT_PTR(N(Credits_Jobs))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ShowCredits_Names) = { + EVT_CALL(N(ShowCreditList), EVT_PTR(N(Credits_Names))) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_end/end_01/end_01_3_parade_setup.c b/src/world/area_end/end_01/end_01_3_parade_setup.c new file mode 100644 index 0000000000..1827e137a0 --- /dev/null +++ b/src/world/area_end/end_01/end_01_3_parade_setup.c @@ -0,0 +1,838 @@ +#include "end_01.h" +#include "effects.h" + +extern s32 spr_allocateBtlComponentsOnWorldHeap; +extern ParadeNpcInfo N(ParadeNpcsTable)[]; + +extern EvtScript N(EVS_ParadePhase_Wizards); +extern EvtScript N(EVS_ParadePhase_ShyGuyDancing); +extern EvtScript N(EVS_ParadePhase_ShyGuyFormation); +extern EvtScript N(EVS_ParadePhase_Toads1); +extern EvtScript N(EVS_ParadePhase_MarioPeach); +extern EvtScript N(EVS_ParadePhase_Toads2); +extern EvtScript N(EVS_MarioPeachExit); +extern EvtScript N(EVS_ParadePhase_StarSpirits); +extern EvtScript N(EVS_ParadePhase_SkatingPenguins); +extern EvtScript N(EVS_ParadePhase_Opera); +extern EvtScript N(EVS_ParadePhase_MayorPenguin); + +extern EvtScript N(EVS_InitCredits); +extern EvtScript N(EVS_ShowCredits_Jobs); +extern EvtScript N(EVS_ShowCredits_Names); + +API_CALLABLE(N(CreateParadeNPC)) { + Bytecode* args = script->ptrReadPos; + s32 npcID = evt_get_variable(script, *args++); + ParadeNpcInfo* npcInfo = &N(ParadeNpcsTable)[npcID]; + NpcBlueprint bp; + Npc* npc; + + bp.flags = NPC_FLAG_100; + bp.initialAnim = npcInfo->initialAnim; + bp.onUpdate = NULL; + bp.onRender = NULL; + + spr_allocateBtlComponentsOnWorldHeap = TRUE; + + npc = get_npc_by_index(_create_npc_standard(&bp, npcInfo->animList)); + npc->npcID = npcID; + npc->flags &= ~NPC_FLAG_PARTICLE; + npc->pos.x = npcInfo->pos.x; + npc->pos.y = npcInfo->pos.y; + npc->pos.z = npcInfo->pos.z; + set_npc_yaw(npc, npcInfo->yaw); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(ParadeSpriteHeapMalloc)) { + Bytecode* args = script->ptrReadPos; + s32 heapSize = evt_get_variable(script, *args++); + s32 outVar = *args++; + + evt_set_variable(script, outVar, (s32) _heap_malloc(&gSpriteHeapPtr, heapSize)); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(ParadeSpriteHeapFree)) { + Bytecode* args = script->ptrReadPos; + s32 pointer = *args++; + + _heap_free(&gSpriteHeapPtr, (void*) evt_get_variable(script, pointer)); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(UpdateCameraScroll)) { + Camera* camera = &gCameras[gCurrentCameraID]; + + camera->panActive = TRUE; + camera->movePos.x += PARADE_SCROLL_RATE; + return ApiStatus_DONE2; +} + +API_CALLABLE(N(AddScrollToNpcPos)) { + Bytecode* args = script->ptrReadPos; + Npc** npc = (Npc**)&script->functionTempPtr[1]; + + if (isInitialCall) { + *npc = get_npc_unsafe(evt_get_variable(script, *args++)); + } + + (*npc)->pos.x += PARADE_SCROLL_RATE; + + return ApiStatus_BLOCK; +} + +// unused +API_CALLABLE(N(WaitForConfirmInput)) { + if (gGameStatusPtr->pressedButtons[0] & (BUTTON_A | BUTTON_START)) { + return ApiStatus_DONE2; + } else { + return ApiStatus_BLOCK; + } +} + +EvtScript N(EVS_SetupInitialCamera) = { + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, PARADE_START, 0, 0) + EVT_CALL(SetPanTarget, CAM_DEFAULT, PARADE_START, 0, 0) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UpdateScrollPos) = { + EVT_CALL(SetPanTarget, CAM_DEFAULT, EVT_FLOAT(PARADE_START), 0, 0) + EVT_SETF(LVar1, EVT_FLOAT(0.0)) + EVT_LOOP(0) + EVT_CALL(N(UpdateCameraScroll)) + EVT_CALL(TranslateGroup, MODEL_bg, LVar1, 0, 0) + EVT_ADDF(LVar1, EVT_FLOAT(PARADE_SCROLL_RATE)) + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UpdateTexPan_Ground) = { + EVT_CALL(EnableTexPanning, MODEL_o145, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o146, TRUE) + EVT_CALL(EnableTexPanning, MODEL_j2, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o152, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o153, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o154, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o166, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o157, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o159, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o160, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o161, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o162, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o195, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o196, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o197, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o198, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o260, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o201, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o202, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o203, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o204, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o275, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o276, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o277, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o278, TRUE) + EVT_THREAD + EVT_SET(LVar0, 0) + EVT_SET(LVar1, 0) + EVT_LOOP(0) + EVT_ADD(LVar0, 150) + EVT_IF_GT(LVar0, 0x20000) + EVT_ADD(LVar0, -0x20000) + EVT_END_IF + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OffsetNpcScroll) = { + EVT_CALL(N(AddScrollToNpcPos), LVar0) + EVT_RETURN + EVT_END +}; + +AnimID N(ExtraAnims_Eldstar)[] = { + ANIM_BattleEldstar_Idle, + -1 +}; + +AnimID N(ExtraAnims_Mamar)[] = { + ANIM_BattleMamar_Idle, + -1 +}; + +AnimID N(ExtraAnims_Skolar)[] = { + ANIM_BattleSkolar_Idle, + -1 +}; + +AnimID N(ExtraAnims_Muskular)[] = { + ANIM_BattleMuskular_Idle, + -1 +}; + +AnimID N(ExtraAnims_Misstar)[] = { + ANIM_BattleMisstar_Still, + -1 +}; + +AnimID N(ExtraAnims_Klevar)[] = { + ANIM_BattleKlevar_Idle, + -1 +}; + +AnimID N(ExtraAnims_Kalmar)[] = { + ANIM_BattleKalmar_Idle, + -1 +}; + +AnimID N(ExtraAnims_PyroGuy)[] = { + ANIM_PyroGuy_Anim03, + -1 +}; + +AnimID N(ExtraAnims_ShyGuy)[] = { + ANIM_ShyGuy_Red_Anim04, + ANIM_ShyGuy_Red_Anim10, + ANIM_ShyGuy_Red_Anim01, + -1 +}; + +ParadeNpcInfo N(ParadeNpcsTable)[] = { + [NPC_Eldstar] { + .initialAnim = ANIM_BattleEldstar_Idle, + .animList = N(ExtraAnims_Eldstar), + .pos = { -3135.0f, 210.0f, -120.0f }, + .yaw = 270.0f + }, + [NPC_Mamar] { + .initialAnim = ANIM_BattleMamar_Idle, + .animList = N(ExtraAnims_Mamar), + .pos = { -3195.0f, 200.0f, -120.0f }, + .yaw = 270.0f + }, + [NPC_Skolar] { + .initialAnim = ANIM_BattleSkolar_Idle, + .animList = N(ExtraAnims_Skolar), + .pos = { -3075.0f, 195.0f, -120.0f }, + .yaw = 270.0f + }, + [NPC_Muskular] { + .initialAnim = ANIM_BattleMuskular_Idle, + .animList = N(ExtraAnims_Muskular), + .pos = { -3045.0f, 148.0f, -104.0f }, + .yaw = 270.0f + }, + [NPC_Misstar] { + .initialAnim = ANIM_BattleMisstar_Still, + .animList = N(ExtraAnims_Misstar), + .pos = { -3105.0f, 158.0f, -104.0f }, + .yaw = 270.0f + }, + [NPC_Klevar] { + .initialAnim = ANIM_BattleKlevar_Idle, + .animList = N(ExtraAnims_Klevar), + .pos = { -3165.0f, 158.0f, -104.0f }, + .yaw = 270.0f + }, + [NPC_Kalmar] { + .initialAnim = ANIM_BattleKalmar_Idle, + .animList = N(ExtraAnims_Kalmar), + .pos = { -3225.0f, 148.0f, -104.0f }, + .yaw = 270.0f + }, + [NPC_PenguinSkater1] { + .initialAnim = ANIM_ParadeIceShow_Violin_SkateStill, + .pos = { -2700.0f, 0.0f, -37.0f }, + .yaw = 270.0f + }, + [NPC_PenguinSkater2] { + .initialAnim = ANIM_ParadeIceShow_Violin_SkateStill, + .pos = { -2700.0f, 0.0f, 37.0f }, + .yaw = 270.0f + }, + [NPC_PenguinMayor] { + .initialAnim = ANIM_ParadeIceShow_Violin_ShadeMayorWalk, + .pos = { -2650.0f, 0.0f, -77.0f }, + .yaw = 270.0f + }, + [NPC_PenguinMayorWife] { + .initialAnim = ANIM_ParadeIceShow_Violin_ShadeMayorWifeWalk, + .pos = { -2610.0f, 0.0f, -77.0f }, + .yaw = 270.0f + }, + [NPC_ViolinPlayer1] { + .initialAnim = ANIM_ParadeIceShow_Violin_ViolinPlay, + .pos = { -2555.0f, 5.0f, 30.0f }, + .yaw = 270.0f + }, + [NPC_ViolinPlayer2] { + .initialAnim = ANIM_ParadeIceShow_Violin_ViolinPlayUpright, + .pos = { -2527.0f, 5.0f, 35.0f }, + .yaw = 270.0f + }, + [NPC_ViolinPlayer3] { + .initialAnim = ANIM_ParadeIceShow_Violin_ViolinPlay, + .pos = { -2495.0f, 5.0f, 30.0f }, + .yaw = 90.0f + }, + [NPC_Conductor] { + .initialAnim = ANIM_Musician_Poet_Dark_ConductSlow, + .pos = { -2624.0f, 20.0f, 0.0f }, + .yaw = 90.0f + }, + [NPC_Singer] { + .initialAnim = ANIM_ParadeIceShow_Violin_ShadeDivaIdle, + .pos = { -2529.0f, 0.0f, 0.0f }, + .yaw = 270.0f + }, + [NPC_AmayzeDayzee1] { + .initialAnim = ANIM_Dayzee_Amazy_Anim02, + .pos = { -2210.0f, 0.0f, -20.0f }, + .yaw = 270.0f + }, + [NPC_AmayzeDayzee2] { + .initialAnim = ANIM_Dayzee_Amazy_Anim02, + .pos = { -2210.0f, 0.0f, 20.0f }, + .yaw = 270.0f + }, + [NPC_Merle] { + .initialAnim = ANIM_ParadeWizard_Merle_MerleGather, + .pos = { -2025.0f, 20.0f, 28.0f }, + .yaw = 270.0f + }, + [NPC_Merlee] { + .initialAnim = ANIM_ParadeWizard_Merle_MerleeGather, + .pos = { -1995.0f, 20.0f, 20.0f }, + .yaw = 270.0f + }, + [NPC_Merlon] { + .initialAnim = ANIM_ParadeWizard_Merle_MerlonGather, + .pos = { -2055.0f, 20.0f, 35.0f }, + .yaw = 270.0f + }, + [NPC_Merluvlee] { + .initialAnim = ANIM_ParadeWizard_Merle_MerluvleeGather, + .pos = { -2085.0f, 20.0f, 28.0f }, + .yaw = 270.0f + }, + [NPC_Merlow] { + .initialAnim = ANIM_ParadeWizard_Merle_MerlowGather, + .pos = { -2110.0f, 20.0f, 20.0f }, + .yaw = 270.0f + }, + [NPC_Merlar] { + .initialAnim = ANIM_ParadeWizard_Merle_MerlarGather, + .pos = { -1980.0f, 60.0f, 20.0f }, + .yaw = 270.0f + }, + [NPC_SunSad] { + .initialAnim = ANIM_Sun_TalkSad, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 90.0f + }, + [NPC_SunHappy] { + .initialAnim = ANIM_Sun_FireTalkSad, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 90.0f + }, + [NPC_Bulbulb1] { + .initialAnim = ANIM_Bubulb_Pink_DarkWalk, + .pos = { -1850.0f, 0.0f, -20.0f }, + .yaw = 270.0f + }, + [NPC_Bulbulb2] { + .initialAnim = ANIM_Bubulb_Pink_DarkWalk, + .pos = { -1850.0f, 0.0f, 20.0f }, + .yaw = 270.0f + }, + [NPC_ShyGuyMarshall] { + .initialAnim = ANIM_ParadeShyGuy_MarshallWalk, + .pos = { -1548.0f, 0.0f, 0.0f }, + .yaw = 270.0f + }, + [NPC_GeneralGuy] { + .initialAnim = ANIM_ParadeShyGuy_GeneralPoint, + .pos = { -1448.0f, 57.0f, -25.0f }, + .yaw = 270.0f + }, + [NPC_BackupDancer1] { + .initialAnim = ANIM_ParadeShyGuy_StackHold, + .pos = { -1483.0f, 24.0f, -40.0f }, + .yaw = 90.0f + }, + [NPC_BackupDancer2] { + .initialAnim = ANIM_ParadeShyGuy_StackHold, + .pos = { -1413.0f, 24.0f, -40.0f }, + .yaw = 270.0f + }, + [NPC_GrooveGuy1] { + .initialAnim = ANIM_ParadeShyGuy_GroovePivot, + .pos = { -1468.0f, 24.0f, -5.0f }, + .yaw = 270.0f + }, + [NPC_GrooveGuy2] { + .initialAnim = ANIM_ParadeShyGuy_GroovePivot, + .pos = { -1458.0f, 24.0f, -5.0f }, + .yaw = 270.0f + }, + [NPC_GrooveGuy3] { + .initialAnim = ANIM_ParadeShyGuy_GroovePivot, + .pos = { -1438.0f, 24.0f, -5.0f }, + .yaw = 90.0f + }, + [NPC_GrooveGuy4] { + .initialAnim = ANIM_ParadeShyGuy_GroovePivot, + .pos = { -1428.0f, 24.0f, -5.0f }, + .yaw = 90.0f + }, + [NPC_PyroGuy1] { + .initialAnim = ANIM_PyroGuy_Anim03, + .animList = N(ExtraAnims_PyroGuy), + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 90.0f + }, + [NPC_PyroGuy2] { + .initialAnim = ANIM_PyroGuy_Anim03, + .animList = N(ExtraAnims_PyroGuy), + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 270.0f + }, + [NPC_ShyGuyFormation11] { + .initialAnim = ANIM_ParadeShyGuy_ShadeWalk, + .pos = { -1048.0f, 0.0f, -30.0f }, + .yaw = 270.0f + }, + [NPC_ShyGuyFormation12] { + .initialAnim = ANIM_ParadeShyGuy_ShadeWalk, + .pos = { -1048.0f, 0.0f, 0.0f }, + .yaw = 270.0f + }, + [NPC_ShyGuyFormation13] { + .initialAnim = ANIM_ParadeShyGuy_ShadeWalk, + .pos = { -1048.0f, 0.0f, 30.0f }, + .yaw = 270.0f + }, + [NPC_ShyGuyFormation21] { + .initialAnim = ANIM_ParadeShyGuy_ShadeWalk, + .pos = { -1018.0f, 0.0f, -30.0f }, + .yaw = 270.0f + }, + [NPC_ShyGuyFormation22] { + .initialAnim = ANIM_ParadeShyGuy_ShadeWalk, + .pos = { -1018.0f, 0.0f, 0.0f }, + .yaw = 270.0f + }, + [NPC_ShyGuyFormation23] { + .initialAnim = ANIM_ParadeShyGuy_ShadeWalk, + .pos = { -1018.0f, 0.0f, 30.0f }, + .yaw = 270.0f + }, + [NPC_ShyGuyFormation31] { + .initialAnim = ANIM_ParadeShyGuy_ShadeWalk, + .pos = { -988.0f, 0.0f, -30.0f }, + .yaw = 270.0f + }, + [NPC_ShyGuyFormation32] { + .initialAnim = ANIM_ParadeShyGuy_ShadeWalk, + .pos = { -988.0f, 0.0f, 0.0f }, + .yaw = 270.0f + }, + [NPC_ShyGuyFormation33] { + .initialAnim = ANIM_ParadeShyGuy_ShadeWalk, + .pos = { -988.0f, 0.0f, 30.0f }, + .yaw = 270.0f + }, + [NPC_ShyGuyFormation41] { + .initialAnim = ANIM_ParadeShyGuy_ShadeWalk, + .pos = { -958.0f, 0.0f, -30.0f }, + .yaw = 270.0f + }, + [NPC_ShyGuyFormation42] { + .initialAnim = ANIM_ParadeShyGuy_ShadeWalk, + .pos = { -958.0f, 0.0f, 0.0f }, + .yaw = 270.0f + }, + [NPC_ShyGuyFormation43] { + .initialAnim = ANIM_ParadeShyGuy_ShadeWalk, + .pos = { -958.0f, 0.0f, 30.0f }, + .yaw = 270.0f + }, + [NPC_Pratfaller] { + .initialAnim = ANIM_ShyGuy_Red_Anim04, + .animList = N(ExtraAnims_ShyGuy), + .pos = { -788.0f, 0.0f, 0.0f }, + .yaw = 270.0f + }, + [NPC_HornPlayer1] { + .initialAnim = ANIM_ParadeHorn_Walk, + .pos = { -689.0f, 0.0f, -20.0f }, + .yaw = 270.0f + }, + [NPC_HornPlayer2] { + .initialAnim = ANIM_ParadeHorn_Walk, + .pos = { -689.0f, 0.0f, 20.0f }, + .yaw = 270.0f + }, + [NPC_Drummer1] { + .initialAnim = ANIM_ParadeDrummer_Walk, + .pos = { -639.0f, 0.0f, -20.0f }, + .yaw = 270.0f + }, + [NPC_Drummer2] { + .initialAnim = ANIM_ParadeDrummer_Walk, + .pos = { -639.0f, 0.0f, 20.0f }, + .yaw = 270.0f + }, + [NPC_StandardBearer1] { + .initialAnim = ANIM_ParadeBanner_Walk, + .pos = { -589.0f, 0.0f, -20.0f }, + .yaw = 270.0f + }, + [NPC_StandardBearer2] { + .initialAnim = ANIM_ParadeBanner_Walk, + .pos = { -589.0f, 0.0f, 20.0f }, + .yaw = 270.0f + }, + [NPC_Mario] { + .initialAnim = ANIM_ParadeMario_Wave, + .pos = { -329.0f, 37.0f, 0.0f }, + .yaw = 270.0f + }, + [NPC_Peach] { + .initialAnim = ANIM_ParadePeach_ShadeWaveSlow, + .pos = { -289.0f, 37.0f, 0.0f }, + .yaw = 270.0f + }, + [NPC_Twink] { + .initialAnim = ANIM_ParadeTwink_Idle, + .pos = { -389.0f, 120.0f, 0.0f }, + .yaw = 90.0f + }, + [NPC_Twirler1] { + .initialAnim = ANIM_ParadeTwirler_Walk, + .pos = { -109.0f, 0.0f, 0.0f }, + .yaw = 270.0f + }, + [NPC_Twirler2] { + .initialAnim = ANIM_ParadeTwirler_Walk, + .pos = { -69.0f, 0.0f, 0.0f }, + .yaw = 270.0f + }, + [NPC_Twirler3] { + .initialAnim = ANIM_ParadeTwirler_Walk, + .pos = { -29.0f, 0.0f, 0.0f }, + .yaw = 270.0f + }, + [NPC_Baton1] { + .initialAnim = ANIM_ParadeTwirler_BatonSpin, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 270.0f + }, + [NPC_Baton2] { + .initialAnim = ANIM_ParadeTwirler_BatonSpin, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 270.0f + }, + [NPC_Baton3] { + .initialAnim = ANIM_ParadeTwirler_BatonSpin, + .pos = { 0.0f, -500.0f, 0.0f }, + .yaw = 270.0f + }, + [NPC_StandardBearer3] { + .initialAnim = ANIM_ParadeBanner_Walk, + .pos = { 41.0f, 0.0f, -20.0f }, + .yaw = 270.0f + }, + [NPC_StandardBearer4] { + .initialAnim = ANIM_ParadeBanner_Walk, + .pos = { 41.0f, 0.0f, 20.0f }, + .yaw = 270.0f + }, +}; + +EvtScript N(EVS_ManageNpcPool) = { + EVT_CALL(N(CreateParadeNPC), NPC_Eldstar) + EVT_CALL(N(CreateParadeNPC), NPC_Mamar) + EVT_CALL(N(CreateParadeNPC), NPC_Skolar) + EVT_CALL(N(CreateParadeNPC), NPC_Muskular) + EVT_CALL(N(CreateParadeNPC), NPC_Misstar) + EVT_CALL(N(CreateParadeNPC), NPC_Klevar) + EVT_CALL(N(CreateParadeNPC), NPC_Kalmar) + EVT_CALL(N(CreateParadeNPC), NPC_PenguinMayor) + EVT_CALL(N(CreateParadeNPC), NPC_PenguinMayorWife) + EVT_CALL(N(CreateParadeNPC), NPC_PenguinSkater1) + EVT_CALL(N(CreateParadeNPC), NPC_PenguinSkater2) + EVT_CALL(N(CreateParadeNPC), NPC_ViolinPlayer1) + EVT_CALL(N(CreateParadeNPC), NPC_ViolinPlayer2) + EVT_CALL(N(CreateParadeNPC), NPC_ViolinPlayer3) + EVT_CALL(N(CreateParadeNPC), NPC_Conductor) + EVT_CALL(N(CreateParadeNPC), NPC_Singer) + EVT_CALL(N(ParadeSpriteHeapMalloc), 0x13400, LVar0) + EVT_CALL(N(CreateParadeNPC), NPC_AmayzeDayzee1) + EVT_CALL(N(CreateParadeNPC), NPC_AmayzeDayzee2) + EVT_CALL(N(ParadeSpriteHeapFree), LVar0) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_WIZARDS + 100) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(DeleteNpc, NPC_Eldstar) + EVT_CALL(DeleteNpc, NPC_Mamar) + EVT_CALL(DeleteNpc, NPC_Skolar) + EVT_CALL(DeleteNpc, NPC_Muskular) + EVT_CALL(DeleteNpc, NPC_Misstar) + EVT_CALL(DeleteNpc, NPC_Klevar) + EVT_CALL(DeleteNpc, NPC_Kalmar) + EVT_CALL(DeleteNpc, NPC_PenguinMayor) + EVT_CALL(DeleteNpc, NPC_PenguinMayorWife) + EVT_CALL(DeleteNpc, NPC_PenguinSkater1) + EVT_CALL(DeleteNpc, NPC_PenguinSkater2) + EVT_CALL(DeleteNpc, NPC_ViolinPlayer1) + EVT_CALL(DeleteNpc, NPC_ViolinPlayer2) + EVT_CALL(DeleteNpc, NPC_ViolinPlayer3) + EVT_CALL(DeleteNpc, NPC_Conductor) + EVT_CALL(DeleteNpc, NPC_Singer) + EVT_WAIT(1) + EVT_CALL(N(CreateParadeNPC), NPC_Merle) + EVT_CALL(N(CreateParadeNPC), NPC_Merlee) + EVT_CALL(N(CreateParadeNPC), NPC_Merlon) + EVT_CALL(N(CreateParadeNPC), NPC_Merluvlee) + EVT_CALL(N(CreateParadeNPC), NPC_Merlow) + EVT_CALL(N(CreateParadeNPC), NPC_Merlar) + EVT_CALL(N(CreateParadeNPC), NPC_SunSad) + EVT_CALL(N(CreateParadeNPC), NPC_SunHappy) + EVT_CALL(N(CreateParadeNPC), NPC_Bulbulb1) + EVT_CALL(N(CreateParadeNPC), NPC_Bulbulb2) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_SHYGUY_DANCE) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(DeleteNpc, NPC_AmayzeDayzee1) + EVT_CALL(DeleteNpc, NPC_AmayzeDayzee2) + EVT_WAIT(1) + EVT_CALL(N(ParadeSpriteHeapMalloc), 0x4700, LVar0) + EVT_CALL(N(CreateParadeNPC), NPC_PyroGuy1) + EVT_CALL(N(CreateParadeNPC), NPC_PyroGuy2) + EVT_CALL(N(CreateParadeNPC), NPC_Pratfaller) + EVT_CALL(N(CreateParadeNPC), NPC_ShyGuyMarshall) + EVT_CALL(N(CreateParadeNPC), NPC_GeneralGuy) + EVT_CALL(N(CreateParadeNPC), NPC_BackupDancer1) + EVT_CALL(N(CreateParadeNPC), NPC_BackupDancer2) + EVT_CALL(N(CreateParadeNPC), NPC_GrooveGuy1) + EVT_CALL(N(CreateParadeNPC), NPC_GrooveGuy2) + EVT_CALL(N(CreateParadeNPC), NPC_GrooveGuy3) + EVT_CALL(N(CreateParadeNPC), NPC_GrooveGuy4) + EVT_CALL(N(CreateParadeNPC), NPC_ShyGuyFormation11) + EVT_CALL(N(CreateParadeNPC), NPC_ShyGuyFormation12) + EVT_CALL(N(CreateParadeNPC), NPC_ShyGuyFormation13) + EVT_CALL(N(CreateParadeNPC), NPC_ShyGuyFormation21) + EVT_CALL(N(CreateParadeNPC), NPC_ShyGuyFormation22) + EVT_CALL(N(CreateParadeNPC), NPC_ShyGuyFormation23) + EVT_CALL(N(CreateParadeNPC), NPC_ShyGuyFormation31) + EVT_CALL(N(CreateParadeNPC), NPC_ShyGuyFormation32) + EVT_CALL(N(CreateParadeNPC), NPC_ShyGuyFormation33) + EVT_CALL(N(CreateParadeNPC), NPC_ShyGuyFormation41) + EVT_CALL(N(CreateParadeNPC), NPC_ShyGuyFormation42) + EVT_CALL(N(CreateParadeNPC), NPC_ShyGuyFormation43) + EVT_CALL(N(ParadeSpriteHeapFree), LVar0) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_TOADS) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(DeleteNpc, NPC_Merle) + EVT_CALL(DeleteNpc, NPC_Merlee) + EVT_CALL(DeleteNpc, NPC_Merlon) + EVT_CALL(DeleteNpc, NPC_Merluvlee) + EVT_CALL(DeleteNpc, NPC_Merlow) + EVT_CALL(DeleteNpc, NPC_Merlar) + EVT_CALL(DeleteNpc, NPC_SunSad) + EVT_CALL(DeleteNpc, NPC_SunHappy) + EVT_CALL(DeleteNpc, NPC_Bulbulb1) + EVT_CALL(DeleteNpc, NPC_Bulbulb2) + EVT_WAIT(1) + EVT_CALL(N(CreateParadeNPC), NPC_HornPlayer1) + EVT_CALL(N(CreateParadeNPC), NPC_HornPlayer2) + EVT_CALL(N(CreateParadeNPC), NPC_Drummer1) + EVT_CALL(N(CreateParadeNPC), NPC_Drummer2) + EVT_CALL(N(CreateParadeNPC), NPC_StandardBearer1) + EVT_CALL(N(CreateParadeNPC), NPC_StandardBearer2) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_PEACH) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(DeleteNpc, NPC_PyroGuy1) + EVT_CALL(DeleteNpc, NPC_PyroGuy2) + EVT_CALL(DeleteNpc, NPC_Pratfaller) + EVT_CALL(DeleteNpc, NPC_ShyGuyMarshall) + EVT_CALL(DeleteNpc, NPC_GeneralGuy) + EVT_CALL(DeleteNpc, NPC_BackupDancer1) + EVT_CALL(DeleteNpc, NPC_BackupDancer2) + EVT_CALL(DeleteNpc, NPC_GrooveGuy1) + EVT_CALL(DeleteNpc, NPC_GrooveGuy2) + EVT_CALL(DeleteNpc, NPC_GrooveGuy3) + EVT_CALL(DeleteNpc, NPC_GrooveGuy4) + EVT_CALL(DeleteNpc, NPC_ShyGuyFormation11) + EVT_CALL(DeleteNpc, NPC_ShyGuyFormation12) + EVT_CALL(DeleteNpc, NPC_ShyGuyFormation13) + EVT_CALL(DeleteNpc, NPC_ShyGuyFormation21) + EVT_CALL(DeleteNpc, NPC_ShyGuyFormation22) + EVT_CALL(DeleteNpc, NPC_ShyGuyFormation23) + EVT_CALL(DeleteNpc, NPC_ShyGuyFormation31) + EVT_CALL(DeleteNpc, NPC_ShyGuyFormation32) + EVT_CALL(DeleteNpc, NPC_ShyGuyFormation33) + EVT_CALL(DeleteNpc, NPC_ShyGuyFormation41) + EVT_CALL(DeleteNpc, NPC_ShyGuyFormation42) + EVT_CALL(DeleteNpc, NPC_ShyGuyFormation43) + EVT_WAIT(1) + EVT_CALL(N(CreateParadeNPC), NPC_Mario) + EVT_CALL(N(CreateParadeNPC), NPC_Peach) + EVT_CALL(N(CreateParadeNPC), NPC_Twink) + EVT_CALL(N(CreateParadeNPC), NPC_Twirler1) + EVT_CALL(N(CreateParadeNPC), NPC_Twirler2) + EVT_CALL(N(CreateParadeNPC), NPC_Twirler3) + EVT_CALL(N(CreateParadeNPC), NPC_Baton1) + EVT_CALL(N(CreateParadeNPC), NPC_Baton2) + EVT_CALL(N(CreateParadeNPC), NPC_Baton3) + EVT_CALL(N(CreateParadeNPC), NPC_StandardBearer3) + EVT_CALL(N(CreateParadeNPC), NPC_StandardBearer4) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ParadePhase_PlayCredits) = { + EVT_WAIT(60) + EVT_EXEC(N(EVS_InitCredits)) + EVT_EXEC(N(EVS_ShowCredits_Jobs)) + EVT_EXEC(N(EVS_ShowCredits_Names)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ManageParade) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(SetMusicTrack, 0, SONG_PARADE_NIGHT, 0, 8) + EVT_EXEC(N(EVS_SetupInitialCamera)) + EVT_EXEC(N(EVS_ManageNpcPool)) + EVT_EXEC_GET_TID(N(EVS_ParadePhase_StarSpirits), LVarA) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_IS_THREAD_RUNNING(LVarA, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_EXEC(N(EVS_ParadePhase_PlayCredits)) + EVT_EXEC_GET_TID(N(EVS_UpdateScrollPos), LVarA) + EVT_EXEC_GET_TID(N(EVS_UpdateTexPan_Ground), LVarB) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_SKATERS) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_EXEC(N(EVS_ParadePhase_SkatingPenguins)) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_MAYOR) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_EXEC(N(EVS_ParadePhase_MayorPenguin)) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_OPERA) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_EXEC(N(EVS_ParadePhase_Opera)) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_WIZARDS) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_EXEC(N(EVS_ParadePhase_Wizards)) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_SHYGUY_DANCE) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_EXEC(N(EVS_ParadePhase_ShyGuyDancing)) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_SHYGUY_MARCH) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_EXEC(N(EVS_ParadePhase_ShyGuyFormation)) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_TOADS) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_EXEC(N(EVS_ParadePhase_Toads1)) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_PEACH) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_EXEC_GET_TID(N(EVS_ParadePhase_MarioPeach), LVarC) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_EXIT) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_KILL_THREAD(LVarA) + EVT_KILL_THREAD(LVarB) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_IS_THREAD_RUNNING(LVarC, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_EXEC(N(EVS_ParadePhase_Toads2)) + EVT_WAIT(150) + EVT_EXEC(N(EVS_MarioPeachExit)) + EVT_WAIT(200) + EVT_CALL(GotoMap, EVT_PTR("kmr_30"), kmr_30_ENTRY_0) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_end/end_01/end_01_4_opera_float.c b/src/world/area_end/end_01/end_01_4_opera_float.c new file mode 100644 index 0000000000..830cf242fc --- /dev/null +++ b/src/world/area_end/end_01/end_01_4_opera_float.c @@ -0,0 +1,339 @@ +#include "end_01.h" +#include "effects.h" + +extern s32 N(SpotlightsAlpha); + +API_CALLABLE(N(SetWorldDark)) { + func_8011B950(MODEL_Root, -1, 1, 0); + set_background_color_blend(0, 0, 0, 255); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(FadeInWorld)) { + if (isInitialCall) { + script->functionTemp[1] = 255; + } + + script->functionTemp[1] -= 10; + if (script->functionTemp[1] < 0) { + script->functionTemp[1] = 0; + } + + set_background_color_blend(0, 0, 0, script->functionTemp[1]); + + if (script->functionTemp[1] == 0) { + func_8011B950(MODEL_Root, -1, 0, 0); + return ApiStatus_DONE2; + } else { + return ApiStatus_BLOCK; + } +} + +API_CALLABLE(N(UpdateStarSpiritRotation)) { + Npc* npc; + + if (isInitialCall) { + script->functionTempPtr[2] = get_npc_safe(script->varTable[10]); + script->functionTemp[0] = 0; + } + npc = script->functionTempPtr[2]; + npc->rotation.y = update_lerp(EASING_QUADRATIC_OUT, 810.0f, 0.0f, script->functionTemp[0], 45); + npc->alpha = update_lerp(EASING_QUADRATIC_OUT, 0.0f, 255.0f, script->functionTemp[0], 45); + + script->functionTemp[0]++; + if (script->functionTemp[0] <= 45) { + return ApiStatus_BLOCK; + } else { + return ApiStatus_DONE1; + } +} + +API_CALLABLE(N(SkateInCirclePenguin1)) { + Bytecode* args = script->ptrReadPos; + s32 npcID = evt_get_variable(script, *args++); + Npc* npc; + + if (isInitialCall) { + script->functionTempPtr[1] = resolve_npc(script, npcID); + npc = script->functionTempPtr[1]; + script->functionTemp[2] = npc->pos.x; + script->functionTempF[3] = 180.0f; + script->functionTemp[0] = 72; + } + + npc = script->functionTempPtr[1]; + script->functionTempF[3] = clamp_angle(script->functionTempF[3] - 5.0f); + npc->pos.x = npc->pos.x + (cos_deg(script->functionTempF[3]) * 6.0f); + npc->pos.z = npc->pos.z + (sin_deg(script->functionTempF[3]) * 2.5f); + npc->renderYaw = clamp_angle(180.0f - script->functionTempF[3]); + + script->functionTemp[0]--; + if (script->functionTemp[0] == 0) { + return ApiStatus_DONE1; + } else { + return ApiStatus_BLOCK; + } +} + +API_CALLABLE(N(SkateInCirclePenguin2)) { + Bytecode* args = script->ptrReadPos; + s32 npcID = evt_get_variable(script, *args++); + Npc* npc; + + if (isInitialCall) { + script->functionTempPtr[1] = resolve_npc(script, npcID); + npc = script->functionTempPtr[1]; + script->functionTemp[2] = npc->pos.x; + script->functionTempF[3] = 180.0f; + script->functionTemp[0] = 72; + } + + npc = script->functionTempPtr[1]; + script->functionTempF[3] = clamp_angle(script->functionTempF[3] + 5.0f); + npc->pos.x = npc->pos.x + (cos_deg(script->functionTempF[3]) * 6.0f); + npc->pos.z = npc->pos.z + (sin_deg(script->functionTempF[3]) * 2.5f); + npc->renderYaw = clamp_angle(180.0f - script->functionTempF[3]); + + script->functionTemp[0]--; + if (script->functionTemp[0] == 0) { + return ApiStatus_DONE1; + } else { + return ApiStatus_BLOCK; + } +} + +API_CALLABLE(N(SetSpotlightsAlpha)) { + Bytecode* args = script->ptrReadPos; + N(SpotlightsAlpha) = evt_get_variable(script, *args++); + + return ApiStatus_DONE2; +} + +void N(gfx_build_set_spotlight_alpha)(void) { + gDPSetCombineLERP(gMasterGfxPos++, + TEXEL0, 0, SHADE, 0, SHADE, 0, PRIMITIVE, 0, + TEXEL0, 0, SHADE, 0, SHADE, 0, PRIMITIVE, 0); + gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, N(SpotlightsAlpha)); +} + +EvtScript N(EVS_MakeSpiritAppear) = { + EVT_CALL(SetNpcFlagBits, NPC_PenguinSkater1, NPC_FLAG_40000, TRUE) + EVT_CALL(GetNpcPos, LVarA, LVar2, LVar3, LVar4) + EVT_SUB(LVar3, 120) + EVT_SET(LVar5, LVar3) + EVT_ADD(LVar5, 15) + EVT_CALL(PlayEffect, EFFECT_SPARKLES, 0, LVar2, LVar5, LVar4, 30, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_CALL(SetNpcPos, LVarA, LVar2, LVar3, LVar4) + EVT_CALL(N(UpdateStarSpiritRotation)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ParadePhase_StarSpirits) = { + EVT_CALL(N(SetWorldDark)) + EVT_WAIT(20) + EVT_SET(LVarA, NPC_Eldstar) + EVT_EXEC(N(EVS_MakeSpiritAppear)) + EVT_WAIT(2) + EVT_SET(LVarA, NPC_Mamar) + EVT_EXEC(N(EVS_MakeSpiritAppear)) + EVT_WAIT(2) + EVT_SET(LVarA, NPC_Skolar) + EVT_EXEC(N(EVS_MakeSpiritAppear)) + EVT_WAIT(3) + EVT_SET(LVarA, NPC_Misstar) + EVT_EXEC(N(EVS_MakeSpiritAppear)) + EVT_WAIT(5) + EVT_SET(LVarA, NPC_Klevar) + EVT_EXEC(N(EVS_MakeSpiritAppear)) + EVT_WAIT(3) + EVT_SET(LVarA, NPC_Muskular) + EVT_EXEC(N(EVS_MakeSpiritAppear)) + EVT_WAIT(7) + EVT_SET(LVarA, NPC_Kalmar) + EVT_EXEC(N(EVS_MakeSpiritAppear)) + EVT_WAIT(30) + EVT_CALL(N(FadeInWorld)) + EVT_WAIT(60) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SkatingPenguin1) = { + EVT_CALL(SetNpcFlagBits, NPC_PenguinSkater1, NPC_FLAG_40000, TRUE) + EVT_CHILD_THREAD + EVT_LOOP(0) + EVT_CALL(SetNpcAnimation, NPC_PenguinSkater1, ANIM_ParadeIceShow_Violin_SkateKickLeft) + EVT_WAIT(30) + EVT_CALL(SetNpcAnimation, NPC_PenguinSkater1, ANIM_ParadeIceShow_Violin_SkateKickRight) + EVT_WAIT(30) + EVT_END_LOOP + EVT_END_CHILD_THREAD + EVT_CALL(GetNpcPos, NPC_PenguinSkater1, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, -180) + EVT_CALL(NpcMoveTo, NPC_PenguinSkater1, LVar0, LVar2, 120) + EVT_CALL(N(SkateInCirclePenguin1), NPC_PenguinSkater1) + EVT_CALL(GetNpcPos, NPC_PenguinSkater1, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, -180) + EVT_CALL(NpcMoveTo, NPC_PenguinSkater1, LVar0, LVar2, 120) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SkatingPenguin2) = { + EVT_CALL(SetNpcFlagBits, NPC_PenguinSkater2, NPC_FLAG_40000, TRUE) + EVT_CHILD_THREAD + EVT_LOOP(0) + EVT_CALL(SetNpcAnimation, NPC_PenguinSkater2, ANIM_ParadeIceShow_Violin_SkateKickLeft) + EVT_WAIT(30) + EVT_CALL(SetNpcAnimation, NPC_PenguinSkater2, ANIM_ParadeIceShow_Violin_SkateKickRight) + EVT_WAIT(30) + EVT_END_LOOP + EVT_END_CHILD_THREAD + EVT_CALL(GetNpcPos, NPC_PenguinSkater2, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, -210) + EVT_CALL(NpcMoveTo, NPC_PenguinSkater2, LVar0, LVar2, 140) + EVT_CALL(N(SkateInCirclePenguin2), NPC_PenguinSkater2) + EVT_CALL(GetNpcPos, NPC_PenguinSkater2, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, -180) + EVT_CALL(NpcMoveTo, NPC_PenguinSkater2, LVar0, LVar2, 120) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ParadePhase_SkatingPenguins) = { + EVT_EXEC_GET_TID(N(EVS_SkatingPenguin1), LVarA) + EVT_EXEC_GET_TID(N(EVS_SkatingPenguin2), LVarB) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_SKATERS + 200) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_KILL_THREAD(LVarA) + EVT_KILL_THREAD(LVarB) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ParadePhase_MayorPenguin) = { + EVT_THREAD + EVT_CALL(GetNpcPos, NPC_PenguinMayor, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, -300) + EVT_CALL(NpcMoveTo, NPC_PenguinMayor, LVar0, LVar2, 500) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(GetNpcPos, NPC_PenguinMayorWife, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, -300) + EVT_CALL(NpcMoveTo, NPC_PenguinMayorWife, LVar0, LVar2, 500) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +s32 N(SpotlightsAlpha) = 0; + +EvtScript N(EVS_TexPan_OperaFloat_MainStageLights) = { + EVT_CALL(EnableTexPanning, MODEL_kino3, TRUE) + EVT_CALL(EnableTexPanning, MODEL_kino5, TRUE) + EVT_CALL(EnableTexPanning, MODEL_kino6, TRUE) + EVT_SET(LVar1, LVar0) + EVT_SET(LVar0, 0) + EVT_LOOP(0) + EVT_ADD(LVar0, 0x2000) + EVT_CALL(SetTexPanOffset, TEX_PANNER_E, TEX_PANNER_MAIN, LVar0, 0) + EVT_WAIT(LVar1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TexPan_OperaFloat_StageLights) = { + EVT_CALL(EnableTexPanning, MODEL_kino4, TRUE) + EVT_SET(LVar0, 0) + EVT_LOOP(0) + EVT_ADD(LVar0, 0x2000) + EVT_CALL(SetTexPanOffset, TEX_PANNER_C, TEX_PANNER_MAIN, LVar0, 0) + EVT_WAIT(16) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UpdateLightshow) = { + EVT_CALL(EnableModel, MODEL_kino7, TRUE) + EVT_CALL(EnableModel, MODEL_kino8, TRUE) + EVT_CALL(EnableTexPanning, MODEL_kino8, TRUE) + EVT_CALL(SetModelCustomGfx, MODEL_kino7, 1, -1) + EVT_CALL(SetCustomGfxBuilders, 1, EVT_PTR(N(gfx_build_set_spotlight_alpha)), 0) + EVT_CHILD_THREAD + EVT_CALL(MakeLerp, 0, 255, 90, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(N(SetSpotlightsAlpha), LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_CHILD_THREAD + EVT_SET(LVar0, 0) + EVT_SET(LVar1, 0) + EVT_LOOP(0) + EVT_ADD(LVar0, 0x1000) + EVT_ADD(LVar1, 0x400) + EVT_CALL(SetTexPanOffset, TEX_PANNER_F, TEX_PANNER_MAIN, LVar0, LVar1) + EVT_WAIT(4) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ParadePhase_Opera) = { + EVT_CALL(EnableModel, MODEL_kino7, FALSE) + EVT_CALL(EnableModel, MODEL_kino8, FALSE) + EVT_SET(LVar0, 8) + EVT_EXEC_GET_TID(N(EVS_TexPan_OperaFloat_MainStageLights), LVarA) + EVT_EXEC_GET_TID(N(EVS_TexPan_OperaFloat_StageLights), LVarB) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_OPERA + 335) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_KILL_THREAD(LVarA) + EVT_SET(LVar0, 1) + EVT_EXEC_GET_TID(N(EVS_TexPan_OperaFloat_MainStageLights), LVarA) + EVT_EXEC_GET_TID(N(EVS_UpdateLightshow), LVarC) + EVT_CALL(SetNpcFlagBits, NPC_Singer, NPC_FLAG_ENABLE_HIT_SCRIPT, TRUE) + EVT_CALL(MakeLerp, 0, 55, 90, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, MODEL_kino1, 0, LVar0, 0) + EVT_ADD(LVar0, -19) + EVT_CALL(SetNpcPos, NPC_Singer, -2529, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_KILL_THREAD(LVarA) + EVT_SET(LVar0, 8) + EVT_EXEC_GET_TID(N(EVS_TexPan_OperaFloat_MainStageLights), LVarA) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Singer, ANIM_ParadeIceShow_Violin_ShadeDivaSing) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_OPERA + 600) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_KILL_THREAD(LVarA) + EVT_KILL_THREAD(LVarB) + EVT_KILL_THREAD(LVarC) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_end/end_01/end_01_5_flower_float.c b/src/world/area_end/end_01/end_01_5_flower_float.c new file mode 100644 index 0000000000..f24dec31a5 --- /dev/null +++ b/src/world/area_end/end_01/end_01_5_flower_float.c @@ -0,0 +1,186 @@ +#include "end_01.h" +#include "effects.h" + +EvtScript N(EVS_TexPan_FlowerFloat_Base) = { + EVT_CALL(EnableTexPanning, MODEL_flo1, TRUE) + EVT_SET(LVar0, 0) + EVT_LOOP(0) + EVT_ADD(LVar0, 0x2000) + EVT_CALL(SetTexPanOffset, TEX_PANNER_E, TEX_PANNER_MAIN, LVar0, 0) + EVT_WAIT(8) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TexPan_FlowerFloat_WisterwoodBody) = { + EVT_CALL(EnableTexPanning, MODEL_flo2, TRUE) + EVT_CALL(EnableTexPanning, MODEL_flo4, TRUE) + EVT_SET(LVar0, 0) + EVT_LOOP(0) + EVT_ADD(LVar0, 0x400) + EVT_CALL(SetTexPanOffset, TEX_PANNER_A, TEX_PANNER_AUX, LVar0, LVar0) + EVT_WAIT(4) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TexPan_FlowerFloat_WisterwoodBlink) = { + EVT_CALL(EnableTexPanning, MODEL_flo3, TRUE) + EVT_CALL(SetTexPanOffset, TEX_PANNER_B, TEX_PANNER_MAIN, 0x8000, 0) + EVT_LOOP(0) + EVT_CALL(RandInt, 30, LVar0) + EVT_ADD(LVar0, 10) + EVT_WAIT(LVar0) + EVT_CALL(RandInt, 1, LVar0) + EVT_ADD(LVar0, 1) + EVT_LOOP(LVar0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_B, TEX_PANNER_MAIN, 0, 0) + EVT_CALL(RandInt, 5, LVar1) + EVT_ADD(LVar1, 2) + EVT_WAIT(LVar1) + EVT_CALL(SetTexPanOffset, TEX_PANNER_B, TEX_PANNER_MAIN, 0x8000, 0) + EVT_CALL(RandInt, 5, LVar1) + EVT_ADD(LVar1, 2) + EVT_WAIT(LVar1) + EVT_END_LOOP + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Amayze_Dayzees) = { + EVT_CALL(GetNpcPos, NPC_AmayzeDayzee1, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, 30) + EVT_SUB(LVar2, 2) + EVT_CALL(GetNpcPos, NPC_AmayzeDayzee2, LVar3, LVar4, LVar5) + EVT_ADD(LVar4, 30) + EVT_SUB(LVar5, 2) + EVT_LOOP(0) + EVT_CALL(PlayEffect, EFFECT_SPARKLES, 3, LVar0, LVar1, LVar2, 30, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_CALL(PlayEffect, EFFECT_SPARKLES, 3, LVar0, LVar1, LVar2, 30, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_WAIT(15) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Sun) = { + EVT_THREAD + EVT_CALL(SetNpcPos, NPC_SunSad, -2185, 130, -30) + EVT_CALL(NpcFlyTo, NPC_SunSad, -2185, 50, -30, 10, 0, EASING_LINEAR) + EVT_CALL(NpcFlyTo, NPC_SunSad, -2045, 50, -30, 70, 0, EASING_LINEAR) + EVT_CALL(SetNpcAnimation, NPC_SunSad, ANIM_Sun_TalkPleased) + EVT_CALL(NpcFlyTo, NPC_SunSad, -1645, 50, -30, 200, 0, EASING_LINEAR) + EVT_CALL(SetNpcPos, NPC_SunSad, 0, -500, 0) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcPos, NPC_SunHappy, -2185, 130, -30) + EVT_CALL(NpcFlyTo, NPC_SunHappy, -2185, 50, -30, 10, 0, EASING_LINEAR) + EVT_CALL(NpcFlyTo, NPC_SunHappy, -2045, 50, -30, 70, 0, EASING_LINEAR) + EVT_CALL(SetNpcAnimation, NPC_SunHappy, ANIM_Sun_FireTalkPleased) + EVT_CALL(NpcFlyTo, NPC_SunHappy, -1645, 50, -30, 200, 0, EASING_LINEAR) + EVT_CALL(SetNpcPos, NPC_SunHappy, 0, -500, 0) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Bulbulbs) = { + EVT_CALL(GetNpcPos, NPC_Bulbulb1, LVar0, LVar1, LVar2) + EVT_SET(LVar3, LVar0) + EVT_ADD(LVar3, -120) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, LVar3) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(MakeLerp, 0, 360, 10, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, NPC_Bulbulb1, 0, LVar0, 0) + EVT_CALL(SetNpcRotation, NPC_Bulbulb2, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(GetNpcPos, NPC_Bulbulb1, LVar0, LVar1, LVar2) + EVT_SET(LVar3, LVar0) + EVT_ADD(LVar3, 100) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, LVar3) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(MakeLerp, 0, 360, 10, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, NPC_Bulbulb1, 0, LVar0, 0) + EVT_CALL(SetNpcRotation, NPC_Bulbulb2, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ParadePhase_Wizards) = { + EVT_EXEC_GET_TID(N(EVS_Amayze_Dayzees), LVarD) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_WIZARDS + 100) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(1) + EVT_EXEC_GET_TID(N(EVS_TexPan_FlowerFloat_Base), LVarA) + EVT_EXEC(N(EVS_Bulbulbs)) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_WIZARDS + 365) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SetNpcAnimation, NPC_Merle, ANIM_ParadeWizard_Merle_MerleRelease) + EVT_CALL(SetNpcAnimation, NPC_Merlee, ANIM_ParadeWizard_Merle_MerleeRelease) + EVT_CALL(SetNpcAnimation, NPC_Merlon, ANIM_ParadeWizard_Merle_MerlonRelease) + EVT_CALL(SetNpcAnimation, NPC_Merluvlee, ANIM_ParadeWizard_Merle_MerluvleeRelease) + EVT_CALL(SetNpcAnimation, NPC_Merlow, ANIM_ParadeWizard_Merle_MerlowRelease) + EVT_CALL(SetNpcAnimation, NPC_Merlar, ANIM_ParadeWizard_Merle_MerlarRelease) + EVT_CALL(GetNpcPos, NPC_Merlon, LVar0, LVar1, LVar2) + EVT_CALL(PlayEffect, EFFECT_ENERGY_ORB_WAVE, 6, LVar0, LVar1, LVar2, 1, 20, 0, 0, 0, 0, 0, 0, 0) + EVT_WAIT(30) + EVT_EXEC(N(EVS_Sun)) + EVT_EXEC_GET_TID(N(EVS_TexPan_FlowerFloat_WisterwoodBody), LVarB) + EVT_EXEC_GET_TID(N(EVS_TexPan_FlowerFloat_WisterwoodBlink), LVarC) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_SHYGUY_DANCE) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_KILL_THREAD(LVarD) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_WIZARDS + 600) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_KILL_THREAD(LVarA) + EVT_KILL_THREAD(LVarB) + EVT_KILL_THREAD(LVarC) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_end/end_01/end_01_6_shyguy_float.c b/src/world/area_end/end_01/end_01_6_shyguy_float.c new file mode 100644 index 0000000000..2d953bb025 --- /dev/null +++ b/src/world/area_end/end_01/end_01_6_shyguy_float.c @@ -0,0 +1,385 @@ +#include "end_01.h" + +#include "world/common/atomic/UnkFunc27.inc.c" + +API_CALLABLE(N(AddScrollToNpcPos)); + +extern EvtScript N(EVS_OffsetNpcScroll); + +EvtScript N(EVS_TexPan_ShyGuyFloat_Sides) = { + EVT_CALL(EnableTexPanning, MODEL_omo1, TRUE) + EVT_CALL(EnableTexPanning, MODEL_omo4, TRUE) + EVT_CALL(EnableTexPanning, MODEL_omo6, TRUE) + EVT_SET(LVar1, LVar0) + EVT_SET(LVar0, 0) + EVT_LOOP(0) + EVT_ADD(LVar0, 0x1000) + EVT_CALL(SetTexPanOffset, TEX_PANNER_9, TEX_PANNER_AUX, LVar0, LVar0) + EVT_WAIT(LVar1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TexPan_ShyGuyFloat_Top) = { + EVT_CALL(EnableTexPanning, MODEL_omo8, TRUE) + EVT_CALL(EnableTexPanning, MODEL_omo13, TRUE) + EVT_SET(LVar0, 0) + EVT_LOOP(0) + EVT_ADD(LVar0, 0x4000) + EVT_CALL(SetTexPanOffset, TEX_PANNER_8, TEX_PANNER_MAIN, LVar0, LVar0) + EVT_WAIT(6) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +s32 N(ShyGuyFloat_InteriorModels)[] = { + MODEL_omo7, MODEL_omo9, MODEL_omo10, MODEL_omo11, + MODEL_omo12, MODEL_omo13, MODEL_omo14, 0x0000FFFF +}; + +EvtScript N(EVS_ShyGuyFloat_Open) = { + EVT_THREAD + EVT_CALL(MakeLerp, 0, -90, 30, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateGroup, MODEL_h2, LVar0, 1, 0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_CALL(MakeLerp, 0, 90, 30, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateGroup, MODEL_h3, LVar0, 1, 0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(N(UnkFunc27), 0, EVT_PTR(N(ShyGuyFloat_InteriorModels)), 3) + EVT_CALL(N(UnkFunc26), 3, 255, 255, 255, 120, 120, 80, 0, 0, 0) + EVT_WAIT(30) + EVT_CALL(N(UnkFunc26), 3, 255, 255, 255, 0, 0, 0, 0, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_GeneralGuy) = { + EVT_SET(LVar0, 270) + EVT_LOOP(0) + EVT_IF_EQ(LVar0, 270) + EVT_SET(LVar0, 90) + EVT_ELSE + EVT_SET(LVar0, 270) + EVT_END_IF + EVT_CALL(SetNpcAnimation, NPC_GeneralGuy, ANIM_ParadeShyGuy_GeneralStill) + EVT_CALL(InterpNpcYaw, NPC_GeneralGuy, LVar0, 0) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_GeneralGuy, ANIM_ParadeShyGuy_GeneralPoint) + EVT_WAIT(20) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ShyGuy_BackupDancer) = { + EVT_SET(LVar2, LVar0) + EVT_LOOP(0) + EVT_LOOP(3) + EVT_CALL(SetNpcAnimation, LVar2, ANIM_ParadeShyGuy_StackLand) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, LVar2, ANIM_ParadeShyGuy_StackHold) + EVT_WAIT(10) + EVT_END_LOOP + EVT_CALL(SetNpcAnimation, LVar2, ANIM_ParadeShyGuy_StackPointUp) + EVT_WAIT(10) + EVT_CALL(MakeLerp, 0, 360, 10, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, LVar2, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(10) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_GrooveGuy) = { + EVT_WAIT(30) + EVT_SET(LVar2, LVar0) + EVT_SET(LVar3, LVar1) + EVT_CALL(SetNpcJumpscale, LVar2, EVT_FLOAT(0.5)) + EVT_CALL(NpcJump0, LVar2, LVar3, 10, 20, 20) + EVT_WAIT(10) + EVT_LOOP(0) + EVT_LOOP(2) + EVT_CALL(SetNpcAnimation, LVar2, ANIM_ParadeShyGuy_GrooveLeanLeft) + EVT_WAIT(5) + EVT_CALL(SetNpcAnimation, LVar2, ANIM_ParadeShyGuy_GroovePivot) + EVT_WAIT(5) + EVT_CALL(SetNpcAnimation, LVar2, ANIM_ParadeShyGuy_GrooveLeanRight) + EVT_WAIT(5) + EVT_CALL(SetNpcAnimation, LVar2, ANIM_ParadeShyGuy_GroovePivot) + EVT_WAIT(5) + EVT_END_LOOP + EVT_CALL(MakeLerp, 0, 360, 10, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, LVar2, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(10) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ShyGuyFloat_Performers) = { + EVT_EXEC_GET_TID(N(EVS_GeneralGuy), LVar7) + EVT_SET(LVar0, NPC_BackupDancer1) + EVT_EXEC_GET_TID(N(EVS_ShyGuy_BackupDancer), LVar8) + EVT_SET(LVar0, NPC_BackupDancer2) + EVT_EXEC_GET_TID(N(EVS_ShyGuy_BackupDancer), LVar9) + EVT_SET(LVar0, NPC_GrooveGuy1) + EVT_SET(LVar1, -1508) + EVT_EXEC_GET_TID(N(EVS_GrooveGuy), LVarA) + EVT_SET(LVar0, NPC_GrooveGuy2) + EVT_SET(LVar1, -1468) + EVT_EXEC_GET_TID(N(EVS_GrooveGuy), LVarB) + EVT_SET(LVar0, NPC_GrooveGuy3) + EVT_SET(LVar1, -1428) + EVT_EXEC_GET_TID(N(EVS_GrooveGuy), LVarC) + EVT_SET(LVar0, NPC_GrooveGuy4) + EVT_SET(LVar1, -1388) + EVT_EXEC_GET_TID(N(EVS_GrooveGuy), LVarD) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_SHYGUY_DANCE + 600) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_KILL_THREAD(LVar7) + EVT_KILL_THREAD(LVar8) + EVT_KILL_THREAD(LVar9) + EVT_KILL_THREAD(LVarA) + EVT_KILL_THREAD(LVarB) + EVT_KILL_THREAD(LVarC) + EVT_KILL_THREAD(LVarD) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ParadePhase_ShyGuyDancing) = { + EVT_SET(LVar0, 4) + EVT_EXEC_GET_TID(N(EVS_TexPan_ShyGuyFloat_Sides), LVarA) + EVT_EXEC_GET_TID(N(EVS_TexPan_ShyGuyFloat_Top), LVarB) + EVT_WAIT(10) + EVT_CALL(NpcMoveTo, NPC_ShyGuyMarshall, -1648, 0, 50) + EVT_CALL(SetNpcAnimation, NPC_ShyGuyMarshall, ANIM_ParadeShyGuy_MarshallStill) + EVT_CALL(InterpNpcYaw, NPC_ShyGuyMarshall, 90, 0) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_ShyGuyMarshall, ANIM_ParadeShyGuy_MarshallBeckon) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_SHYGUY_DANCE + 260) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_ShyGuyMarshall, ANIM_ParadeShyGuy_MarshallWalk) + EVT_CALL(NpcMoveTo, NPC_ShyGuyMarshall, -1748, 0, 50) + EVT_END_THREAD + EVT_EXEC(N(EVS_ShyGuyFloat_Performers)) + EVT_KILL_THREAD(LVarA) + EVT_SET(LVar0, 2) + EVT_EXEC_GET_TID(N(EVS_TexPan_ShyGuyFloat_Sides), LVarA) + EVT_EXEC_WAIT(N(EVS_ShyGuyFloat_Open)) + EVT_KILL_THREAD(LVarA) + EVT_SET(LVar0, 4) + EVT_EXEC_GET_TID(N(EVS_TexPan_ShyGuyFloat_Sides), LVarA) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_SHYGUY_DANCE + 600) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_KILL_THREAD(LVarA) + EVT_KILL_THREAD(LVarB) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ShyGuy_PauseFormation) = { + EVT_CALL(GetNpcPos, NPC_ShyGuyFormation11, LVar0, LVar1, LVar2) + EVT_SETF(LVar0, LVar0) + EVT_SETF(LVar1, LVar0) + EVT_ADDF(LVar1, 30) + EVT_SETF(LVar2, LVar0) + EVT_ADDF(LVar2, 60) + EVT_SETF(LVar3, LVar0) + EVT_ADDF(LVar3, 90) + EVT_CALL(SetNpcPos, NPC_ShyGuyFormation11, LVar0, 0, -30) + EVT_CALL(SetNpcPos, NPC_ShyGuyFormation12, LVar0, 0, 0) + EVT_CALL(SetNpcPos, NPC_ShyGuyFormation13, LVar0, 0, 30) + EVT_CALL(SetNpcPos, NPC_ShyGuyFormation21, LVar1, 0, -30) + EVT_CALL(SetNpcPos, NPC_ShyGuyFormation22, LVar1, 0, 0) + EVT_CALL(SetNpcPos, NPC_ShyGuyFormation23, LVar1, 0, 30) + EVT_CALL(SetNpcPos, NPC_ShyGuyFormation31, LVar2, 0, -30) + EVT_CALL(SetNpcPos, NPC_ShyGuyFormation32, LVar2, 0, 0) + EVT_CALL(SetNpcPos, NPC_ShyGuyFormation33, LVar2, 0, 30) + EVT_CALL(SetNpcPos, NPC_ShyGuyFormation41, LVar3, 0, -30) + EVT_CALL(SetNpcPos, NPC_ShyGuyFormation42, LVar3, 0, 0) + EVT_CALL(SetNpcPos, NPC_ShyGuyFormation43, LVar3, 0, 30) + EVT_CHILD_THREAD + EVT_CALL(N(AddScrollToNpcPos), NPC_ShyGuyFormation12) + EVT_END_CHILD_THREAD + EVT_CHILD_THREAD + EVT_CALL(N(AddScrollToNpcPos), NPC_ShyGuyFormation13) + EVT_END_CHILD_THREAD + EVT_CHILD_THREAD + EVT_CALL(N(AddScrollToNpcPos), NPC_ShyGuyFormation21) + EVT_END_CHILD_THREAD + EVT_CHILD_THREAD + EVT_CALL(N(AddScrollToNpcPos), NPC_ShyGuyFormation22) + EVT_END_CHILD_THREAD + EVT_CHILD_THREAD + EVT_CALL(N(AddScrollToNpcPos), NPC_ShyGuyFormation23) + EVT_END_CHILD_THREAD + EVT_CHILD_THREAD + EVT_CALL(N(AddScrollToNpcPos), NPC_ShyGuyFormation31) + EVT_END_CHILD_THREAD + EVT_CHILD_THREAD + EVT_CALL(N(AddScrollToNpcPos), NPC_ShyGuyFormation32) + EVT_END_CHILD_THREAD + EVT_CHILD_THREAD + EVT_CALL(N(AddScrollToNpcPos), NPC_ShyGuyFormation33) + EVT_END_CHILD_THREAD + EVT_CHILD_THREAD + EVT_CALL(N(AddScrollToNpcPos), NPC_ShyGuyFormation41) + EVT_END_CHILD_THREAD + EVT_CHILD_THREAD + EVT_CALL(N(AddScrollToNpcPos), NPC_ShyGuyFormation42) + EVT_END_CHILD_THREAD + EVT_CHILD_THREAD + EVT_CALL(N(AddScrollToNpcPos), NPC_ShyGuyFormation43) + EVT_END_CHILD_THREAD + EVT_CALL(N(AddScrollToNpcPos), NPC_ShyGuyFormation11) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ShyGuy_MarchInFormation) = { + EVT_CALL(GetNpcPos, LVar0, LVar2, LVar3, LVar4) + EVT_ADD(LVar2, -180) + EVT_CALL(NpcMoveTo, LVar0, LVar2, LVar4, 90) + EVT_SET(LVar2, LVar0) + EVT_SET(LVar3, 28) + EVT_SUB(LVar3, LVar1) + EVT_ADD(LVar1, 10) + EVT_CALL(SetNpcAnimation, LVar2, ANIM_ParadeShyGuy_ShadeStill) + EVT_WAIT(LVar1) + EVT_CALL(SetNpcAnimation, LVar2, ANIM_ParadeShyGuy_ShadePointUp) + EVT_CALL(MakeLerp, 0, 360, 10, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, LVar2, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(LVar3) + EVT_CALL(SetNpcAnimation, LVar2, ANIM_ParadeShyGuy_ShadeWalk) + EVT_CALL(GetNpcPos, LVar2, LVar3, LVar4, LVar5) + EVT_ADD(LVar3, -180) + EVT_CALL(NpcMoveTo, LVar2, LVar3, LVar5, 90) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ParadePhase_ShyGuyFormation) = { + EVT_SET(LVar1, 0) + EVT_SET(LVar0, NPC_ShyGuyFormation11) + EVT_EXEC(N(EVS_ShyGuy_MarchInFormation)) + EVT_SET(LVar0, NPC_ShyGuyFormation12) + EVT_EXEC(N(EVS_ShyGuy_MarchInFormation)) + EVT_SET(LVar0, NPC_ShyGuyFormation13) + EVT_EXEC(N(EVS_ShyGuy_MarchInFormation)) + EVT_SET(LVar1, 8) + EVT_SET(LVar0, NPC_ShyGuyFormation21) + EVT_EXEC(N(EVS_ShyGuy_MarchInFormation)) + EVT_SET(LVar0, NPC_ShyGuyFormation22) + EVT_EXEC(N(EVS_ShyGuy_MarchInFormation)) + EVT_SET(LVar0, NPC_ShyGuyFormation23) + EVT_EXEC(N(EVS_ShyGuy_MarchInFormation)) + EVT_SET(LVar1, 10) + EVT_SET(LVar0, NPC_ShyGuyFormation31) + EVT_EXEC(N(EVS_ShyGuy_MarchInFormation)) + EVT_SET(LVar0, NPC_ShyGuyFormation32) + EVT_EXEC(N(EVS_ShyGuy_MarchInFormation)) + EVT_SET(LVar0, NPC_ShyGuyFormation33) + EVT_EXEC(N(EVS_ShyGuy_MarchInFormation)) + EVT_SET(LVar1, 18) + EVT_SET(LVar0, NPC_ShyGuyFormation41) + EVT_EXEC(N(EVS_ShyGuy_MarchInFormation)) + EVT_SET(LVar0, NPC_ShyGuyFormation42) + EVT_EXEC(N(EVS_ShyGuy_MarchInFormation)) + EVT_SET(LVar0, NPC_ShyGuyFormation43) + EVT_EXEC(N(EVS_ShyGuy_MarchInFormation)) + // at a certain point, cause the formation to stop moving + EVT_WAIT(90) + EVT_EXEC_GET_TID(N(EVS_ShyGuy_PauseFormation), LVarA) + EVT_WAIT(48) + EVT_KILL_THREAD(LVarA) + EVT_WAIT(130) + // formation resumes moving + EVT_CALL(GetNpcPos, NPC_Pratfaller, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, -180) + EVT_CALL(NpcMoveTo, NPC_Pratfaller, LVar0, LVar2, 45) + EVT_CALL(func_802CDE68, NPC_Pratfaller, 10) + EVT_THREAD + EVT_SET(LVar0, 0) + EVT_LOOP(10) + EVT_ADD(LVar0, 9) + EVT_CALL(SetNpcRotation, NPC_Pratfaller, 0, 0, LVar0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(SetNpcRotation, NPC_Pratfaller, 0, 0, 0) + EVT_CALL(SetNpcAnimation, NPC_Pratfaller, ANIM_ShyGuy_Red_Anim10) + EVT_END_THREAD + EVT_CALL(SetNpcJumpscale, NPC_Pratfaller, EVT_FLOAT(1.0)) + EVT_CALL(GetNpcPos, NPC_Pratfaller, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, -45) + EVT_CALL(NpcJump0, NPC_Pratfaller, LVar0, LVar1, LVar2, 10) + EVT_SET(LVar0, NPC_Pratfaller) + EVT_EXEC_GET_TID(N(EVS_OffsetNpcScroll), LVarA) + EVT_WAIT(80) + EVT_CALL(func_802CDE68, NPC_Pratfaller, 0) + EVT_KILL_THREAD(LVarA) + EVT_CALL(SetNpcAnimation, NPC_Pratfaller, ANIM_ShyGuy_Red_Anim01) + EVT_CALL(GetNpcPos, NPC_Pratfaller, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, -5) + EVT_CALL(NpcJump0, NPC_Pratfaller, LVar0, LVar1, LVar2, 10) + EVT_CALL(SetNpcAnimation, NPC_Pratfaller, ANIM_ShyGuy_Red_Anim04) + EVT_CALL(GetNpcPos, NPC_Pratfaller, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, -180) + EVT_CALL(NpcMoveTo, NPC_Pratfaller, LVar0, LVar2, 90) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_end/end_01/end_01_7_peach_float.c b/src/world/area_end/end_01/end_01_7_peach_float.c new file mode 100644 index 0000000000..db8f066116 --- /dev/null +++ b/src/world/area_end/end_01/end_01_7_peach_float.c @@ -0,0 +1,323 @@ +#include "end_01.h" + +EvtScript N(EVS_ParadePhase_Toads1) = { + EVT_WAIT(10) + EVT_CALL(SetNpcPaletteSwapMode, NPC_HornPlayer1, 3) + EVT_CALL(SetNpcPaletteSwapMode, NPC_HornPlayer2, 3) + EVT_CALL(SetNpcPaletteSwapMode, NPC_Drummer1, 3) + EVT_CALL(SetNpcPaletteSwapMode, NPC_Drummer2, 3) + EVT_CALL(SetNpcPaletteSwapMode, NPC_StandardBearer1, 4) + EVT_CALL(SetNpcPaletteSwapMode, NPC_StandardBearer2, 4) + EVT_CALL(SetNpcPaletteSwapping, NPC_HornPlayer1, 1, 2, 10, 5, 10, 5, 0, 0) + EVT_CALL(SetNpcPaletteSwapping, NPC_HornPlayer2, 1, 2, 10, 5, 10, 5, 0, 0) + EVT_CALL(SetNpcPaletteSwapping, NPC_Drummer1, 1, 2, 10, 5, 10, 5, 0, 0) + EVT_CALL(SetNpcPaletteSwapping, NPC_Drummer2, 1, 2, 10, 5, 10, 5, 0, 0) + EVT_CALL(SetNpcPaletteSwapping, NPC_StandardBearer1, 1, 2, 10, 5, 10, 5, 4, 5) + EVT_CALL(SetNpcPaletteSwapping, NPC_StandardBearer2, 1, 2, 10, 5, 10, 5, 4, 5) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TexPan_FinalFloat_MushroomTop) = { + EVT_CALL(EnableTexPanning, MODEL_mp1, TRUE) + EVT_SET(LVar0, 0) + EVT_SET(LVar1, 0) + EVT_LOOP(0) + EVT_ADD(LVar0, 0x400) + EVT_CALL(SetTexPanOffset, TEX_PANNER_7, TEX_PANNER_MAIN, LVar0, 0) + EVT_ADD(LVar1, 0x4400) + EVT_CALL(SetTexPanOffset, TEX_PANNER_7, TEX_PANNER_AUX, LVar0, 0) + EVT_WAIT(12) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TexPan_FinalFloat_MushroomRim) = { + EVT_CALL(EnableTexPanning, MODEL_mp2, TRUE) + EVT_SET(LVar0, 0) + EVT_LOOP(0) + EVT_ADD(LVar0, 0x2000) + EVT_CALL(SetTexPanOffset, TEX_PANNER_E, TEX_PANNER_MAIN, LVar0, 0) + EVT_WAIT(8) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TexPan_FinalFloat_Front) = { + EVT_CALL(EnableTexPanning, MODEL_mp3, TRUE) + EVT_SET(LVar0, 0) + EVT_LOOP(0) + EVT_ADD(LVar0, 0x1000) + EVT_CALL(SetTexPanOffset, TEX_PANNER_6, TEX_PANNER_AUX, LVar0, 0) + EVT_WAIT(6) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TexPan_FinalFloat_Star) = { + EVT_CALL(EnableTexPanning, MODEL_mp4, TRUE) + EVT_SET(LVar0, 0) + EVT_LOOP(0) + EVT_ADD(LVar0, 0x1000) + EVT_CALL(SetTexPanOffset, TEX_PANNER_5, TEX_PANNER_MAIN, 0, LVar0) + EVT_WAIT(5) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TexPan_FinalFloat_Sides) = { + EVT_CALL(EnableTexPanning, MODEL_mp6, TRUE) + EVT_SET(LVar0, 0) + EVT_LOOP(0) + EVT_ADD(LVar0, 0x3000) + EVT_CALL(SetTexPanOffset, TEX_PANNER_D, TEX_PANNER_MAIN, LVar0, 0) + EVT_WAIT(8) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +Vec3f N(TwinkFlightPath)[] = { + { -389.0, 120.0, 0.0 }, + { -379.0, 90.0, 0.0 }, + { -349.0, 80.0, 0.0 }, + { -339.0, 90.0, 0.0 }, + { -349.0, 100.0, 0.0 }, + { -359.0, 90.0, 0.0 }, + { -349.0, 80.0, 0.0 }, + { -339.0, 80.0, 2.0 }, + { -329.0, 80.0, 2.0 }, + { -319.0, 90.0, 2.0 }, + { -329.0, 100.0, 2.0 }, + { -339.0, 90.0, 2.0 }, + { -329.0, 80.0, 2.0 }, + { -269.0, 90.0, 2.0 }, +}; + +EvtScript N(EVS_Twink) = { + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, PARADE_PHASE_EXIT) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(30) + EVT_CALL(LoadPath, 60, EVT_PTR(N(TwinkFlightPath)), ARRAY_COUNT(N(TwinkFlightPath)), EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(GetNextPathPos) + EVT_CALL(SetNpcPos, NPC_Twink, LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(10) + EVT_CALL(InterpNpcYaw, NPC_Twink, 270, 0) + EVT_WAIT(70) + EVT_CALL(NpcFlyTo, NPC_Twink, -249, 120, 0, 10, -10, EASING_LINEAR) + EVT_CALL(SetNpcPos, NPC_Twink, 0, -500, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Mario) = { + EVT_LOOP(5) + EVT_CALL(InterpNpcYaw, NPC_Mario, 90, 7) + EVT_WAIT(45) + EVT_CALL(InterpNpcYaw, NPC_Mario, 270, 7) + EVT_WAIT(45) + EVT_END_LOOP + EVT_WAIT(40) + EVT_CALL(SetNpcAnimation, NPC_Mario, ANIM_ParadeMario_Surprise) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Mario, ANIM_ParadeMario_LookUp) + EVT_WAIT(30) + EVT_CALL(InterpNpcYaw, NPC_Mario, 90, 0) + EVT_WAIT(70) + EVT_CALL(SetNpcAnimation, NPC_Mario, ANIM_ParadeMario_WaveUp) + EVT_WAIT(60) + EVT_CALL(SetNpcAnimation, NPC_Mario, ANIM_ParadeMario_LookUp) + EVT_WAIT(60) + EVT_CALL(SetNpcAnimation, NPC_Mario, ANIM_ParadeMario_Idle) + EVT_WAIT(40) + EVT_CALL(SetNpcAnimation, NPC_Mario, ANIM_ParadeMario_NodYes) + EVT_WAIT(30) + EVT_CALL(SetNpcAnimation, NPC_Mario, ANIM_ParadeMario_Idle) + EVT_WAIT(30) + EVT_CALL(SetNpcAnimation, NPC_Mario, ANIM_ParadeMario_WalkBack) + EVT_CALL(GetNpcPos, NPC_Mario, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 5) + EVT_ADD(LVar2, -30) + EVT_CALL(NpcMoveTo, NPC_Mario, LVar0, LVar2, 20) + EVT_LOOP(7) + EVT_ADD(LVar1, -5) + EVT_CALL(SetNpcPos, NPC_Mario, LVar0, LVar1, LVar2) + EVT_WAIT(5) + EVT_END_LOOP + EVT_CALL(SetNpcPos, NPC_Mario, LVar0, 0, LVar2) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Peach) = { + EVT_LOOP(5) + EVT_CALL(InterpNpcYaw, NPC_Peach, 90, 7) + EVT_WAIT(45) + EVT_CALL(InterpNpcYaw, NPC_Peach, 270, 7) + EVT_WAIT(45) + EVT_END_LOOP + EVT_WAIT(40) + EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_ParadePeach_ShadeRaiseArms) + EVT_WAIT(60) + EVT_CALL(InterpNpcYaw, NPC_Peach, 90, 0) + EVT_WAIT(40) + EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_ParadePeach_ShadeWaveFast) + EVT_WAIT(60) + EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_ParadePeach_ShadeIdle) + EVT_WAIT(60) + EVT_CALL(InterpNpcYaw, NPC_Peach, 270, 0) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_ParadePeach_ShadeRaiseArms) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_ParadePeach_ShadeTalk) + EVT_WAIT(20) + EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_ParadePeach_ShadeLowerArms) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_ParadePeach_ShadeIdle) + EVT_WAIT(20) + EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_ParadePeach_ShadeSlightBow) + EVT_WAIT(40) + EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_ParadePeach_ShadeWalkBack) + EVT_CALL(GetNpcPos, NPC_Peach, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, -5) + EVT_ADD(LVar2, -30) + EVT_CALL(NpcMoveTo, NPC_Peach, LVar0, LVar2, 20) + EVT_LOOP(7) + EVT_ADD(LVar1, -5) + EVT_CALL(SetNpcPos, NPC_Peach, LVar0, LVar1, LVar2) + EVT_WAIT(5) + EVT_END_LOOP + EVT_CALL(SetNpcPos, NPC_Peach, LVar0, 0, LVar2) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ParadePhase_MarioPeach) = { + EVT_EXEC(N(EVS_TexPan_FinalFloat_MushroomTop)) + EVT_EXEC(N(EVS_TexPan_FinalFloat_MushroomRim)) + EVT_EXEC(N(EVS_TexPan_FinalFloat_Front)) + EVT_EXEC(N(EVS_TexPan_FinalFloat_Star)) + EVT_EXEC(N(EVS_TexPan_FinalFloat_Sides)) + EVT_EXEC(N(EVS_Peach)) + EVT_EXEC(N(EVS_Twink)) + EVT_EXEC_WAIT(N(EVS_Mario)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Twirler) = { + EVT_CHILD_THREAD + EVT_CALL(EnableNpcShadow, LVar1, FALSE) + EVT_CALL(SetNpcJumpscale, LVar1, EVT_FLOAT(0.5)) + EVT_LOOP(0) + EVT_WAIT(30) + EVT_CALL(GetNpcPos, LVar0, LVar2, LVar3, LVar4) + EVT_ADD(LVar2, -7) + EVT_CALL(SetNpcPos, LVar1, LVar2, LVar3, LVar4) + EVT_ADD(LVar2, -25) + EVT_CALL(NpcJump0, LVar1, LVar2, LVar3, LVar4, 40) + EVT_CALL(SetNpcPos, LVar1, 0, -500, 0) + EVT_END_LOOP + EVT_END_CHILD_THREAD + EVT_CHILD_THREAD + EVT_LOOP(0) + EVT_CALL(SetNpcAnimation, LVar0, ANIM_ParadeTwirler_Walk) + EVT_WAIT(30) + EVT_CALL(SetNpcAnimation, LVar0, ANIM_ParadeTwirler_Toss) + EVT_WAIT(5) + EVT_CALL(SetNpcAnimation, LVar0, ANIM_ParadeTwirler_Catch) + EVT_WAIT(5) + EVT_CALL(SetNpcAnimation, LVar0, ANIM_ParadeTwirler_Spin) + EVT_WAIT(21) + EVT_CALL(SetNpcAnimation, LVar0, ANIM_ParadeTwirler_Toss) + EVT_WAIT(5) + EVT_CALL(SetNpcAnimation, LVar0, ANIM_ParadeTwirler_Catch) + EVT_WAIT(5) + EVT_END_LOOP + EVT_END_CHILD_THREAD + EVT_CALL(SetNpcSpeed, LVar0, EVT_FLOAT(PARADE_SCROLL_RATE)) + EVT_CALL(GetNpcPos, LVar0, LVar2, LVar3, LVar4) + EVT_ADD(LVar2, -600) + EVT_CALL(NpcMoveTo, LVar0, LVar2, LVar4, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_StandardBearer) = { + EVT_CALL(SetNpcSpeed, LVar0, EVT_FLOAT(PARADE_SCROLL_RATE)) + EVT_CALL(GetNpcPos, LVar0, LVar1, LVar2, LVar3) + EVT_ADD(LVar1, -600) + EVT_CALL(NpcMoveTo, LVar0, LVar1, LVar2, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ParadePhase_Toads2) = { + EVT_CALL(SetNpcPaletteSwapMode, NPC_Twirler1, 4) + EVT_CALL(SetNpcPaletteSwapMode, NPC_Twirler2, 4) + EVT_CALL(SetNpcPaletteSwapMode, NPC_Twirler3, 4) + EVT_CALL(SetNpcPaletteSwapMode, NPC_StandardBearer3, 4) + EVT_CALL(SetNpcPaletteSwapMode, NPC_StandardBearer4, 4) + EVT_CALL(SetNpcPaletteSwapping, NPC_Twirler1, 1, 2, 10, 5, 10, 5, 4, 5) + EVT_CALL(SetNpcPaletteSwapping, NPC_Twirler2, 1, 2, 10, 5, 10, 5, 4, 5) + EVT_CALL(SetNpcPaletteSwapping, NPC_Twirler3, 1, 2, 10, 5, 10, 5, 4, 5) + EVT_CALL(SetNpcPaletteSwapping, NPC_StandardBearer3, 1, 2, 10, 5, 10, 5, 4, 5) + EVT_CALL(SetNpcPaletteSwapping, NPC_StandardBearer4, 1, 2, 10, 5, 10, 5, 4, 5) + EVT_SET(LVar0, NPC_Twirler1) + EVT_SET(LVar1, NPC_Baton1) + EVT_EXEC(N(EVS_Twirler)) + EVT_SET(LVar0, NPC_Twirler2) + EVT_SET(LVar1, NPC_Baton2) + EVT_EXEC(N(EVS_Twirler)) + EVT_SET(LVar0, NPC_Twirler3) + EVT_SET(LVar1, NPC_Baton3) + EVT_EXEC(N(EVS_Twirler)) + EVT_SET(LVar0, NPC_StandardBearer3) + EVT_EXEC(N(EVS_StandardBearer)) + EVT_SET(LVar0, NPC_StandardBearer4) + EVT_EXEC(N(EVS_StandardBearer)) + EVT_SETF(LVar0, 0) + EVT_LOOP(500) + EVT_SUBF(LVar0, EVT_FLOAT(PARADE_SCROLL_RATE)) + EVT_CALL(TranslateGroup, MODEL_kinoko, LVar0, 0, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MarioPeachExit) = { + // walk away into the distance + EVT_THREAD + EVT_CALL(NpcMoveTo, NPC_Mario, -259, -150, 240) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(NpcMoveTo, NPC_Peach, -229, -150, 240) + EVT_END_THREAD + EVT_WAIT(60) + // slowly pan camera up + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_SETF(LVar1, EVT_FLOAT(0.0)) + EVT_LOOP(0) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_ADDF(LVar1, EVT_FLOAT(0.333333)) + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_isk/isk_05/97DAD0.c b/src/world/area_isk/isk_05/97DAD0.c index e0b0e6ac37..07e1848eee 100644 --- a/src/world/area_isk/isk_05/97DAD0.c +++ b/src/world/area_isk/isk_05/97DAD0.c @@ -33,7 +33,7 @@ void func_80241610_97F0E0(void) { Matrix4f transformMtx, tempMtx; gSPViewport(gMasterGfxPos++, &cam->vp); - if (!(cam->flags & CAMERA_FLAGS_10)) { + if (!(cam->flags & CAMERA_FLAGS_ORTHO)) { gSPPerspNormalize(gMasterGfxPos++, cam->perspNorm); } guMtxF2L(cam->perspectiveMatrix, &gDisplayContext->camPerspMatrix[gCurrentCameraID]); diff --git a/src/world/area_isk/isk_13/98F7E0.c b/src/world/area_isk/isk_13/98F7E0.c index b8b57c70f3..878811e05b 100644 --- a/src/world/area_isk/isk_13/98F7E0.c +++ b/src/world/area_isk/isk_13/98F7E0.c @@ -32,7 +32,7 @@ void func_80241610_990DF0(void) { Matrix4f transformMtx, tempMtx; gSPViewport(gMasterGfxPos++, &cam->vp); - if (!(cam->flags & CAMERA_FLAGS_10)) { + if (!(cam->flags & CAMERA_FLAGS_ORTHO)) { gSPPerspNormalize(gMasterGfxPos++, cam->perspNorm); } guMtxF2L(cam->perspectiveMatrix, &gDisplayContext->camPerspMatrix[gCurrentCameraID]); diff --git a/src/world/area_isk/isk_14/992730.c b/src/world/area_isk/isk_14/992730.c index 604373bff9..f43921a115 100644 --- a/src/world/area_isk/isk_14/992730.c +++ b/src/world/area_isk/isk_14/992730.c @@ -32,7 +32,7 @@ void func_80241610_993D40(void) { Matrix4f transformMtx, tempMtx; gSPViewport(gMasterGfxPos++, &cam->vp); - if (!(cam->flags & CAMERA_FLAGS_10)) { + if (!(cam->flags & CAMERA_FLAGS_ORTHO)) { gSPPerspNormalize(gMasterGfxPos++, cam->perspNorm); } guMtxF2L(cam->perspectiveMatrix, &gDisplayContext->camPerspMatrix[gCurrentCameraID]); diff --git a/src/world/area_jan/jan_00/B216E0.c b/src/world/area_jan/jan_00/B216E0.c index ac46951e0c..ae029cbd70 100644 --- a/src/world/area_jan/jan_00/B216E0.c +++ b/src/world/area_jan/jan_00/B216E0.c @@ -8,19 +8,9 @@ extern u32 N(unkAngle1); extern s32 N(unkAngle2); extern s32 N(unkAngle3); -void N(unkVtxFunc001)(Vtx* firstVertex, Vtx* copiedVertices, s32 numVertices, s32* arg3); +#include "world/common/atomic/WhaleAnim.inc.c" -#include "world/common/resolve_npc.inc.c" - -#include "world/common/UnkAngleFunc001.inc.c" - -INCLUDE_ASM(s32, "world/area_jan/jan_00/B216E0", jan_00_unkVtxFunc001); - -#include "world/common/unkAngleFuncs023.inc.c" - -#include "world/common/UnkFloatFunc001.inc.c" - -ApiStatus func_80241868_B21DA8(Evt* script, s32 isInitialCall) { +ApiStatus jan_00_UnkPlayerPosFunc(Evt* script, s32 isInitialCall) { Npc* player = get_npc_safe(ACTOR_PLAYER); f32 yaw = -player->yaw; f32 x = player->pos.x + 30.0f + (sin_deg(yaw) * 170.0f); diff --git a/src/world/area_kgr/kgr_02/kgr_02_2_unused.c b/src/world/area_kgr/kgr_02/kgr_02_2_unused.c index c1d48fff8a..8f8eed9835 100644 --- a/src/world/area_kgr/kgr_02/kgr_02_2_unused.c +++ b/src/world/area_kgr/kgr_02/kgr_02_2_unused.c @@ -3,7 +3,7 @@ extern s32 N(D_80240970_8AADC0); -void func_80240160_8AA5B0(s32 x1, s32 y1, s32 x2, s32 y2, s32 arg4) { +void N(func_80240160_8AA5B0)(s32 x1, s32 y1, s32 x2, s32 y2, s32 arg4) { s32 i; f32 f0; s32 n, m; diff --git a/src/world/area_kkj/kkj_18/AF2FE0.c b/src/world/area_kkj/kkj_18/AF2FE0.c index c476556860..4997bd604d 100644 --- a/src/world/area_kkj/kkj_18/AF2FE0.c +++ b/src/world/area_kkj/kkj_18/AF2FE0.c @@ -93,7 +93,7 @@ ApiStatus func_80240774_AF3414(Evt* script, s32 isInitialCall) { Camera* camera = &gCameras[CAM_DEFAULT]; if (isInitialCall) { - camera->flags |= CAM_FLAG_SHAKING; + camera->flags |= CAMERA_FLAGS_SHAKING; script->functionTempF[0] = 0.0f; } diff --git a/src/world/area_kpa/kpa_117/AA2180.c b/src/world/area_kpa/kpa_117/AA2180.c deleted file mode 100644 index 3648353d49..0000000000 --- a/src/world/area_kpa/kpa_117/AA2180.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "kpa_117.h" - -static char* N(exit_str_0) = "kpa_116"; diff --git a/src/world/area_kpa/kpa_117/kpa_117.h b/src/world/area_kpa/kpa_117/kpa_117.h index 488ff7c748..b6e42a979a 100644 --- a/src/world/area_kpa/kpa_117/kpa_117.h +++ b/src/world/area_kpa/kpa_117/kpa_117.h @@ -2,8 +2,14 @@ /// @brief Bowser's Castle - Dead End Room #include "common.h" -#include "../kpa.h" #include "message_ids.h" #include "map.h" +#include "../kpa.h" +#include "mapfs/kpa_117_shape.h" +#include "mapfs/kpa_117_hit.h" + #define NAMESPACE kpa_117 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); diff --git a/src/world/area_kpa/kpa_117/kpa_117_0_header.c b/src/world/area_kpa/kpa_117/kpa_117_0_header.c new file mode 100644 index 0000000000..397a941a7c --- /dev/null +++ b/src/world/area_kpa/kpa_117/kpa_117_0_header.c @@ -0,0 +1,23 @@ +#include "kpa_117.h" + +EntryList N(Entrances) = { + [kpa_117_ENTRY_0] { -210.0, 0.0, 100.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_kpa_117 }, +}; + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetMusicTrackVolumes, TRACK_VOLS_KPA_2) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_117/kpa_117_1_main.c b/src/world/area_kpa/kpa_117/kpa_117_1_main.c new file mode 100644 index 0000000000..d2f4c57e5a --- /dev/null +++ b/src/world/area_kpa/kpa_117/kpa_117_1_main.c @@ -0,0 +1,27 @@ +#include "kpa_117.h" + +EvtScript N(EVS_Empty) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitWalk_kpa_116_1) = EVT_EXIT_WALK(60, kpa_117_ENTRY_0, "kpa_116", kpa_116_ENTRY_1); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_116_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_EXEC_WAIT(N(EVS_Empty)) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_WAIT(1) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kzn/kzn_03/kzn_03_1_main.c b/src/world/area_kzn/kzn_03/kzn_03_1_main.c index 0cb0e0bb32..f35e831b52 100644 --- a/src/world/area_kzn/kzn_03/kzn_03_1_main.c +++ b/src/world/area_kzn/kzn_03/kzn_03_1_main.c @@ -63,7 +63,7 @@ EvtScript N(EVS_StartTexPanners_Lava) = { // animate lava bubbles (real ones, not the enemies) EVT_SET(LVar0, 0) EVT_LOOP(0) - EVT_CALL(SetTexPanOffset, 13, 0, LVar0, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_D, TEX_PANNER_MAIN, LVar0, 0) EVT_ADD(LVar0, 0x8000) EVT_WAIT(6) EVT_END_LOOP diff --git a/src/world/area_kzn/kzn_06/kzn_06_3_extra.c b/src/world/area_kzn/kzn_06/kzn_06_3_extra.c index 593647bf61..f628df75ff 100644 --- a/src/world/area_kzn/kzn_06/kzn_06_3_extra.c +++ b/src/world/area_kzn/kzn_06/kzn_06_3_extra.c @@ -1,7 +1,7 @@ #include "kzn_06.h" #include "model.h" -const s32 pad_rodata_C6E318 = 0; +MAP_RODATA_PAD(1, C6E318); #include "world/common/atomic/LavaGlowLighting.inc.c" diff --git a/src/world/area_kzn/kzn_11/kzn_11_1_main.c b/src/world/area_kzn/kzn_11/kzn_11_1_main.c index efc618f745..37eaeedd94 100644 --- a/src/world/area_kzn/kzn_11/kzn_11_1_main.c +++ b/src/world/area_kzn/kzn_11/kzn_11_1_main.c @@ -52,7 +52,7 @@ EvtScript N(EVS_StartTexPanners_Lava) = { // animate lava bubbles (real ones, not the enemies) EVT_SET(LVar0, 0) EVT_LOOP(0) - EVT_CALL(SetTexPanOffset, 13, 0, LVar0, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_D, TEX_PANNER_MAIN, LVar0, 0) EVT_ADD(LVar0, 0x8000) EVT_WAIT(6) EVT_END_LOOP diff --git a/src/world/area_kzn/kzn_19/kzn_19_1_main.c b/src/world/area_kzn/kzn_19/kzn_19_1_main.c index 8721744594..10aa3263a8 100644 --- a/src/world/area_kzn/kzn_19/kzn_19_1_main.c +++ b/src/world/area_kzn/kzn_19/kzn_19_1_main.c @@ -132,7 +132,7 @@ EvtScript N(EVS_StartTexPanners_Lava) = { EVT_THREAD EVT_SET(LVar0, 0) EVT_LOOP(0) - EVT_CALL(SetTexPanOffset, 13, 0, LVar0, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_D, TEX_PANNER_MAIN, LVar0, 0) EVT_ADD(LVar0, 0x8000) EVT_WAIT(6) EVT_END_LOOP @@ -140,7 +140,7 @@ EvtScript N(EVS_StartTexPanners_Lava) = { EVT_THREAD EVT_SET(LVar0, 0) EVT_LOOP(0) - EVT_CALL(SetTexPanOffset, 14, 0, LVar0, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_E, TEX_PANNER_MAIN, LVar0, 0) EVT_ADD(LVar0, 0x8000) EVT_WAIT(4) EVT_END_LOOP diff --git a/src/world/area_kzn/kzn_19/kzn_19_3_npc.c b/src/world/area_kzn/kzn_19/kzn_19_3_npc.c index 4498e46f5e..d6c3e23660 100644 --- a/src/world/area_kzn/kzn_19/kzn_19_3_npc.c +++ b/src/world/area_kzn/kzn_19/kzn_19_3_npc.c @@ -25,13 +25,6 @@ typedef struct LavaPiranhaVine { /* 0x1DC */ s32 numPoints; } LavaPiranhaVine; -//TODO use this instead of LavaPiranhaVineSet -typedef LavaPiranhaVine LavaPiranhaVines[NUM_VINES]; - -typedef struct LavaPiranhaVineSet { - LavaPiranhaVine vines[NUM_VINES]; -} LavaPiranhaVineSet; // size = 0x780 - extern API_CALLABLE(SetAnimatorFlags); extern API_CALLABLE(GetAnimatedPositionByTreeIndex); extern API_CALLABLE(GetAnimatedRotationByTreeIndex); @@ -58,7 +51,7 @@ extern NpcSettings N(NpcSettings_LavaPiranhaHead); (s32) world_model_anim_kzn_##name##_ROM_END,\ (s32) world_model_anim_kzn_##name##_VRAM -s32 VineAnimationsDmaTable[] = { +s32 N(VineAnimationsDmaTable)[] = { PIRANHA_DMA_ENTRY(00), PIRANHA_DMA_ENTRY(01), PIRANHA_DMA_ENTRY(02), @@ -100,7 +93,7 @@ s32 VineAnimationsDmaTable[] = { static s32 N(VineRenderState); -static s32 N(unk_static_pad); +MAP_STATIC_PAD(1, unk_static_pad); void N(make_vine_interpolation)(LavaPiranhaVine* vine) { Evt dummyEvt; @@ -134,8 +127,8 @@ API_CALLABLE(N(SetVineBonePos)) { s32 x = evt_get_variable(script, *args++); s32 y = evt_get_variable(script, *args++); s32 z = evt_get_variable(script, *args++); - LavaPiranhaVineSet* data = (LavaPiranhaVineSet*) evt_get_variable(NULL, MV_VinesData); - LavaPiranhaVine* vine = &data->vines[vineIdx]; + LavaPiranhaVine* vines = (LavaPiranhaVine*) evt_get_variable(NULL, MV_VinesData); + LavaPiranhaVine* vine = &vines[vineIdx]; vine->bonePos[jointIdx].x = x; vine->bonePos[jointIdx].y = y; @@ -150,8 +143,8 @@ API_CALLABLE(N(SetVineBoneRot)) { s32 rx = evt_get_variable(script, *args++); s32 ry = evt_get_variable(script, *args++); s32 rz = evt_get_variable(script, *args++); - LavaPiranhaVineSet* data = (LavaPiranhaVineSet*) evt_get_variable(NULL, MV_VinesData); - LavaPiranhaVine* vine = &data->vines[vineIdx]; + LavaPiranhaVine* vines = (LavaPiranhaVine*) evt_get_variable(NULL, MV_VinesData); + LavaPiranhaVine* vine = &vines[vineIdx]; vine->boneRot[jointIdx] = rz; return ApiStatus_DONE2; @@ -164,8 +157,8 @@ API_CALLABLE(N(SetVineBoneScale)) { s32 sx = evt_get_variable(script, *args++); s32 sy = evt_get_variable(script, *args++); s32 sz = evt_get_variable(script, *args++); - LavaPiranhaVineSet* data = (LavaPiranhaVineSet*) evt_get_variable(NULL, MV_VinesData); - LavaPiranhaVine* vine = &data->vines[vineIdx]; + LavaPiranhaVine* vines = (LavaPiranhaVine*) evt_get_variable(NULL, MV_VinesData); + LavaPiranhaVine* vine = &vines[vineIdx]; // do nothing return ApiStatus_DONE2; @@ -199,8 +192,8 @@ void N(appendGfx_piranha_vines)(void* data) { if (N(VineRenderState) == 0) { for (i = 0; i < NUM_VINES; i++) { - LavaPiranhaVineSet* vineData = (LavaPiranhaVineSet*) evt_get_variable(NULL, MV_VinesData); - LavaPiranhaVine* vine = &vineData->vines[i]; + LavaPiranhaVine* vines = (LavaPiranhaVine*) evt_get_variable(NULL, MV_VinesData); + LavaPiranhaVine* vine = &vines[i]; switch (i) { default: @@ -252,8 +245,8 @@ void N(appendGfx_piranha_vines)(void* data) { gSPDisplayList(gMasterGfxPos++, N(lava_piranha_vine_gfx)); for (i = 0; i < NUM_VINES; i++) { - LavaPiranhaVineSet* vineData = (LavaPiranhaVineSet*) evt_get_variable(NULL, MV_VinesData); - LavaPiranhaVine* vine = &vineData->vines[i]; + LavaPiranhaVine* vines = (LavaPiranhaVine*) evt_get_variable(NULL, MV_VinesData); + LavaPiranhaVine* vine = &vines[i]; boneLength = vine->boneLength; boneCount = vine->boneCount; @@ -341,7 +334,7 @@ API_CALLABLE(N(MarkVineInterpolationDirty)) { } API_CALLABLE(N(CreateVineRenderer)) { - LavaPiranhaVineSet* data = heap_malloc(sizeof(*data)); + LavaPiranhaVine* data = heap_malloc(NUM_VINES * sizeof(*data)); evt_set_variable(script, MV_VinesData, (s32) data); N(VineRenderState) = -1; create_generic_entity_world(NULL, &N(worker_render_piranha_vines)); @@ -535,26 +528,26 @@ API_CALLABLE(N(LoadAnimationFromTable)) { switch (type) { case VINE_0: dma_copy( - (u8*) VineAnimationsDmaTable[3 * index + 0], - (u8*) VineAnimationsDmaTable[3 * index + 1], + (u8*) N(VineAnimationsDmaTable)[3 * index + 0], + (u8*) N(VineAnimationsDmaTable)[3 * index + 1], (void*) VINE_0_BASE); break; case VINE_1: dma_copy( - (u8*) VineAnimationsDmaTable[3 * index + 0], - (u8*) VineAnimationsDmaTable[3 * index + 1], + (u8*) N(VineAnimationsDmaTable)[3 * index + 0], + (u8*) N(VineAnimationsDmaTable)[3 * index + 1], (void*) VINE_1_BASE); break; case VINE_2: dma_copy( - (u8*) VineAnimationsDmaTable[3 * index + 0], - (u8*) VineAnimationsDmaTable[3 * index + 1], + (u8*) N(VineAnimationsDmaTable)[3 * index + 0], + (u8*) N(VineAnimationsDmaTable)[3 * index + 1], (void*) VINE_2_BASE); break; case VINE_3: dma_copy( - (u8*) VineAnimationsDmaTable[3 * index + 0], - (u8*) VineAnimationsDmaTable[3 * index + 1], + (u8*) N(VineAnimationsDmaTable)[3 * index + 0], + (u8*) N(VineAnimationsDmaTable)[3 * index + 1], (void*) VINE_3_BASE); break; } diff --git a/src/world/area_mac/mac_05/855560.c b/src/world/area_mac/mac_05/855560.c index b337a92246..7505543edb 100644 --- a/src/world/area_mac/mac_05/855560.c +++ b/src/world/area_mac/mac_05/855560.c @@ -4,18 +4,21 @@ extern u32 N(unkAngle1); extern s32 N(unkAngle2); extern s32 N(unkAngle3); -void N(unkVtxFunc001)(Vtx* firstVertex, Vtx* copiedVertices, s32 numVertices, s32* arg3); +#include "world/common/atomic/WhaleAnim.inc.c" -#include "world/common/resolve_npc.inc.c" +ApiStatus N(UnkPlayerPosFunc)(Evt* script, s32 isInitialCall) { + Npc* player = get_npc_safe(ACTOR_PLAYER); + f32 yaw = -player->yaw; + f32 x = player->pos.x + 30.0f + (sin_deg(yaw) * 70.0f); + f32 z = player->pos.z + (cos_deg(yaw) * 70.0f); + f32 y = player->pos.y + 50.0f; -#include "world/common/UnkAngleFunc001.inc.c" + evt_set_float_variable(script, LVar0, x); + evt_set_float_variable(script, LVar1, y); + evt_set_float_variable(script, LVar2, z); + return ApiStatus_DONE2; +} -INCLUDE_ASM(s32, "world/area_mac/mac_05/855560", mac_05_unkVtxFunc001); +#include "world/common/atomic/WhaleGeyser.inc.c" -#include "world/common/unkAngleFuncs023.inc.c" - -#include "world/common/UnkFloatFunc001.inc.c" - -#include "world/common/UnkPlayerPosFunc.inc.c" - -#include "world/common/PlayFX3D.inc.c" +MAP_RODATA_PAD(2, unk); diff --git a/src/world/area_mac/mac_06/864B40.c b/src/world/area_mac/mac_06/864B40.c deleted file mode 100644 index dbdb1b18a1..0000000000 --- a/src/world/area_mac/mac_06/864B40.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "mac_06.h" - -#include "world/common/atomic/TexturePan.inc.c" - -#define NAMESPACE dup_mac_06 -#include "world/common/UnkFloatFunc001.inc.c" -#define NAMESPACE mac_06 - -#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_mac/mac_06/865000.c b/src/world/area_mac/mac_06/865000.c deleted file mode 100644 index 6663243326..0000000000 --- a/src/world/area_mac/mac_06/865000.c +++ /dev/null @@ -1,21 +0,0 @@ -#include "mac_06.h" - -extern u32 N(unkAngle1); -extern s32 N(unkAngle2); -extern s32 N(unkAngle3); - -void N(unkVtxFunc001)(Vtx* firstVertex, Vtx* copiedVertices, s32 numVertices, s32* arg3); - -#include "world/common/resolve_npc.inc.c" - -#include "world/common/UnkAngleFunc001.inc.c" - -INCLUDE_ASM(s32, "world/area_mac/mac_06/865000", mac_06_unkVtxFunc001); - -#include "world/common/unkAngleFuncs023.inc.c" - -#include "world/common/UnkFloatFunc001.inc.c" - -#include "world/common/UnkPlayerPosFunc.inc.c" - -#include "world/common/PlayFX3D.inc.c" diff --git a/src/world/area_mac/mac_06/8659C0.c b/src/world/area_mac/mac_06/8659C0.c deleted file mode 100644 index 105d011eae..0000000000 --- a/src/world/area_mac/mac_06/8659C0.c +++ /dev/null @@ -1,17 +0,0 @@ -#include "mac_06.h" - -INCLUDE_ASM(s32, "world/area_mac/mac_06/8659C0", func_80240E80_8659C0); - -INCLUDE_ASM(s32, "world/area_mac/mac_06/8659C0", func_80241098_865BD8); - -INCLUDE_ASM(s32, "world/area_mac/mac_06/8659C0", func_80241290_865DD0); - -INCLUDE_ASM(s32, "world/area_mac/mac_06/8659C0", func_802412AC_865DEC); - -static char* N(exit_str_0) = "mac_05"; -static char* N(exit_str_1) = "jan_00"; -static char* N(exit_str_2) = "kmr_22"; - -INCLUDE_ASM(s32, "world/area_mac/mac_06/8659C0", func_80241388_865EC8); - -INCLUDE_ASM(s32, "world/area_mac/mac_06/8659C0", func_802415FC_86613C); diff --git a/src/world/area_mac/mac_06/mac_06.h b/src/world/area_mac/mac_06/mac_06.h index 03e48672f9..214564cc83 100644 --- a/src/world/area_mac/mac_06/mac_06.h +++ b/src/world/area_mac/mac_06/mac_06.h @@ -2,8 +2,27 @@ /// @brief Toad Town - Riding the Whale #include "common.h" -#include "../mac.h" #include "message_ids.h" #include "map.h" +#include "../mac.h" +#include "mapfs/mac_06_shape.h" +#include "mapfs/mac_06_hit.h" + +#include "sprite/npc/Kolorado.h" +#include "sprite/npc/JrTroopa.h" + +enum { + NPC_Whale = 0, + NPC_01 = 1, + NPC_Kolorado = 2, + NPC_JrTroopa = 3, +}; + +enum { + MV_Unk_00 = MapVar(0), + MV_Unk_01 = MapVar(1), + MV_Unk_02 = MapVar(2), +}; + #define NAMESPACE mac_06 diff --git a/src/world/area_mac/mac_06/mac_06_1_main.c b/src/world/area_mac/mac_06/mac_06_1_main.c new file mode 100644 index 0000000000..422e902d9c --- /dev/null +++ b/src/world/area_mac/mac_06/mac_06_1_main.c @@ -0,0 +1,98 @@ +#include "mac_06.h" + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_FlyingGull); +extern EvtScript N(EVS_80242A14); + +extern NpcGroupList N(DefaultNPCs); + +EntryList N(Entrances) = { + [mac_06_ENTRY_0] { 0.0, 0.0, 100.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, +}; + +#include "world/common/atomic/TexturePan.inc.c" +#include "world/common/atomic/TexturePan.data.inc.c" + +ApiStatus N(GetWaveAmplitude)(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 timeVar = *args++; + s32 time = evt_get_variable(script, timeVar); + s32 outVar = *args++; + f32 min = evt_get_float_variable(script, *args++); + f32 max = evt_get_float_variable(script, *args++); + s32 duration = evt_get_variable(script, *args++); // period if looping + s32 onlyOnce = evt_get_variable(script, *args++); // 1 = only once, 0 = loop + f32 phaseOffset = evt_get_float_variable(script, *args++); // degrees + f32 diff = (max - min) / 2; + + if (onlyOnce && duration < time) { + time = duration; + evt_set_variable(script, timeVar, duration); + } + + evt_set_float_variable(script, outVar, + // average value + (min + diff) + // modify + - diff * cos_deg(((time * 180.0f) / duration) + phaseOffset)); + return ApiStatus_DONE2; +} + +#include "world/common/SpawnSunEffect.inc.c" + +EvtScript N(EVS_AnimateWaves) = { + EVT_SET_GROUP(EVT_GROUP_00) + EVT_SET(LVarC, 0) + EVT_LABEL(0) + EVT_IF_GE(LVarC, 60) + EVT_SET(LVarC, 0) + EVT_END_IF + EVT_CALL(N(GetWaveAmplitude), LVarC, LVar0, EVT_FLOAT(-1.0), EVT_FLOAT(1.0), 30, 0, 0) + EVT_CALL(ScaleGroup, MODEL_g34, 1, LVar0, 1) + EVT_ADD(LVarC, 1) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_TOAD_TOWN) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC(N(EVS_FlyingGull)) + EVT_EXEC(N(EVS_80242A14)) + EVT_CALL(SetMusicTrack, 0, SONG_RIDING_THE_WHALE, 0, 8) + EVT_CALL(PlayAmbientSounds, AMBIENT_BEACH) + EVT_EXEC(N(EVS_AnimateWaves)) + EVT_CALL(SetTexPanner, MODEL_o214, 1) + EVT_CALL(N(SpawnSunEffect)) + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, mac_06_ENTRY_0) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_1) + TEX_PAN_PARAMS_STEP( 400, 150, 200, -60) + TEX_PAN_PARAMS_FREQ( 1, 1, 1, 1) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) + EVT_END_THREAD + EVT_ELSE + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_1) + TEX_PAN_PARAMS_STEP( -400, -150, -200, 60) + TEX_PAN_PARAMS_FREQ( 1, 1, 1, 1) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) + EVT_END_THREAD + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mac/mac_06/mac_06_2.c b/src/world/area_mac/mac_06/mac_06_2.c new file mode 100644 index 0000000000..aaac6bac18 --- /dev/null +++ b/src/world/area_mac/mac_06/mac_06_2.c @@ -0,0 +1,351 @@ +#include "mac_06.h" + +u32 N(unkAngle1) = 0; +s32 N(unkAngle2) = -1; +s32 N(unkAngle3) = -1; + +#include "world/common/atomic/WhaleAnim.inc.c" + +ApiStatus N(UnkPlayerPosFunc)(Evt* script, s32 isInitialCall) { + Npc* player = get_npc_safe(ACTOR_PLAYER); + f32 yaw = -player->yaw; + f32 x = player->pos.x + 30.0f + (sin_deg(yaw) * 70.0f); + f32 z = player->pos.z + (cos_deg(yaw) * 70.0f); + f32 y = player->pos.y + 50.0f; + + evt_set_float_variable(script, LVar0, x); + evt_set_float_variable(script, LVar1, y); + evt_set_float_variable(script, LVar2, z); + return ApiStatus_DONE2; +} + +#include "world/common/atomic/WhaleGeyser.inc.c" + +MAP_RODATA_PAD(2, unk); + +EvtScript N(D_80241B6C_8666AC) = { + EVT_CALL(N(UnkFloatFunc001), LVarC, LVar0, 30, 60, 30, 0, 0) + EVT_CALL(RotateModel, MODEL_o167, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o168, LVar0, -1, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80241BE4_866724) = { + EVT_CALL(N(UnkFloatFunc001), LVarC, LVar0, 0, 30, 30, 1, 0) + EVT_SETF(LVar1, LVar0) + EVT_DIVF(LVar1, EVT_FLOAT(3.0)) + EVT_CALL(RotateModel, MODEL_o173, LVar0, 0, 0, 1) + EVT_CALL(RotateGroup, MODEL_dou, LVar1, 0, 0, -1) + EVT_CALL(TranslateModel, MODEL_o170, -5, -68, 0) + EVT_CALL(TranslateModel, MODEL_o183, -5, -68, 0) + EVT_CALL(TranslateModel, MODEL_o167, 60, 29, -51) + EVT_CALL(TranslateModel, MODEL_o168, 60, 29, 51) + EVT_CALL(RotateModel, MODEL_o170, LVar1, 0, 0, -1) + EVT_CALL(RotateModel, MODEL_o183, LVar1, 0, 0, -1) + EVT_CALL(RotateModel, MODEL_o167, LVar1, 0, 0, -1) + EVT_CALL(RotateModel, MODEL_o168, LVar1, 0, 0, -1) + EVT_CALL(TranslateModel, MODEL_o170, 5, 68, 0) + EVT_CALL(TranslateModel, MODEL_o183, 5, 68, 0) + EVT_CALL(TranslateModel, MODEL_o167, -60, -29, 51) + EVT_CALL(TranslateModel, MODEL_o168, -60, -29, -51) + EVT_CALL(N(UnkFloatFunc001), LVarC, LVar0, 0, -40, 30, 1, 0) + EVT_CALL(TranslateModel, MODEL_bero, LVar0, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80241E20_866960) = { + EVT_CALL(N(UnkFloatFunc001), LVarC, LVar0, 0, -30, 8, 1, 0) + EVT_ADDF(LVar0, EVT_FLOAT(30.0)) + EVT_SETF(LVar1, LVar0) + EVT_DIVF(LVar1, EVT_FLOAT(3.0)) + EVT_CALL(RotateModel, MODEL_o173, LVar0, 0, 0, 1) + EVT_CALL(RotateGroup, MODEL_dou, LVar1, 0, 0, -1) + EVT_CALL(TranslateModel, MODEL_o170, -5, -68, 0) + EVT_CALL(TranslateModel, MODEL_o183, -5, -68, 0) + EVT_CALL(TranslateModel, MODEL_o167, 60, 29, -51) + EVT_CALL(TranslateModel, MODEL_o168, 60, 29, 51) + EVT_CALL(RotateModel, MODEL_o170, LVar1, 0, 0, -1) + EVT_CALL(RotateModel, MODEL_o183, LVar1, 0, 0, -1) + EVT_CALL(RotateModel, MODEL_o167, LVar1, 0, 0, -1) + EVT_CALL(RotateModel, MODEL_o168, LVar1, 0, 0, -1) + EVT_CALL(TranslateModel, MODEL_o170, 5, 68, 0) + EVT_CALL(TranslateModel, MODEL_o183, 5, 68, 0) + EVT_CALL(TranslateModel, MODEL_o167, -60, -29, 51) + EVT_CALL(TranslateModel, MODEL_o168, -60, -29, -51) + EVT_CALL(N(UnkFloatFunc001), LVarC, LVar0, 0, -40, 120, 1, 0) + EVT_CALL(TranslateModel, MODEL_bero, LVar0, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_8024206C_866BAC) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(D_8024207C_866BBC) = { + EVT_CALL(GetNpcVar, NPC_Whale, 0, LVar3) + EVT_IF_EQ(LVar3, 0) + EVT_CALL(N(UnkPlayerPosFunc)) + EVT_CALL(PlaySoundAt, SOUND_8000004F, 0, LVar0, LVar1, LVar2) + EVT_CALL(N(CreateWhaleGeyser), 0, LVar0, LVar1, LVar2, 0, -1, 0, 30) + EVT_CALL(SetNpcVar, NPC_Whale, 0, LVar0) + EVT_END_IF + EVT_CALL(GetNpcVar, NPC_Whale, 0, LVar3) + EVT_CALL(N(UnkPlayerPosFunc)) + EVT_CALL(N(SetWhaleGeyserPos), LVar3, LVar0, LVar1, LVar2) + EVT_CALL(N(UnkFloatFunc001), LVarC, LVar0, 30, 60, 25, 0, 0) + EVT_CALL(RotateModel, MODEL_o167, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o168, LVar0, -1, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_802421D4_866D14) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(D_802421E4_866D24) = { + EVT_IF_GE(LVarC, 0) + EVT_IF_LE(LVarC, 2) + EVT_CALL(EnableModel, MODEL_o170, FALSE) + EVT_CALL(EnableModel, MODEL_o183, TRUE) + EVT_RETURN + EVT_END_IF + EVT_END_IF + EVT_IF_EQ(LVarC, 15) + EVT_CALL(EnableModel, MODEL_o170, FALSE) + EVT_CALL(EnableModel, MODEL_o183, TRUE) + EVT_RETURN + EVT_END_IF + EVT_IF_EQ(LVarC, 22) + EVT_CALL(EnableModel, MODEL_o170, FALSE) + EVT_CALL(EnableModel, MODEL_o183, TRUE) + EVT_RETURN + EVT_END_IF + EVT_CALL(EnableModel, MODEL_o170, TRUE) + EVT_CALL(EnableModel, MODEL_o183, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_8024230C_866E4C) = { + EVT_SET(LVar0, LVarC) + EVT_DIV(LVar0, 20) + EVT_MOD(LVar0, 2) + EVT_IF_EQ(LVar0, 0) + EVT_RETURN + EVT_END_IF + EVT_CALL(N(UnkFloatFunc001), LVarC, LVar0, EVT_FLOAT(-1.0), EVT_FLOAT(1.0), 3, 0, 0) + EVT_CALL(TranslateModel, MODEL_o173, LVar0, 0, 0) + EVT_CALL(TranslateGroup, MODEL_dou, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o170, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o183, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o167, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o168, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o167, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o168, LVar0, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80242474_866FB4) = { + EVT_CALL(N(UnkFloatFunc001), LVarC, LVar0, EVT_FLOAT(-6.0), EVT_FLOAT(6.0), 3, 0, 0) + EVT_CALL(N(UnkFloatFunc001), LVarC, LVar1, EVT_FLOAT(6.0), EVT_FLOAT(-6.0), 2, 0, 0) + EVT_CALL(TranslateModel, MODEL_o173, LVar0, LVar1, 0) + EVT_CALL(TranslateGroup, MODEL_dou, LVar0, LVar1, 0) + EVT_CALL(TranslateModel, MODEL_o170, LVar0, LVar1, 0) + EVT_CALL(TranslateModel, MODEL_o183, LVar0, LVar1, 0) + EVT_CALL(TranslateModel, MODEL_o167, LVar0, LVar1, 0) + EVT_CALL(TranslateModel, MODEL_o168, LVar0, LVar1, 0) + EVT_CALL(TranslateModel, MODEL_o167, LVar0, LVar1, 0) + EVT_CALL(TranslateModel, MODEL_o168, LVar0, LVar1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_802425B4_8670F4) = { + EVT_SET(LVar0, LVarC) + EVT_DIV(LVar0, 20) + EVT_MOD(LVar0, 2) + EVT_IF_EQ(LVar0, 0) + EVT_RETURN + EVT_END_IF + EVT_CALL(N(UnkFloatFunc001), LVarC, LVar0, EVT_FLOAT(-1.0), EVT_FLOAT(1.0), 3, 0, 0) + EVT_CALL(TranslateModel, MODEL_o173, LVar0, 0, 0) + EVT_CALL(TranslateGroup, MODEL_dou, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o170, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o183, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o167, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o168, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o167, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o168, LVar0, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_8024271C_86725C) = { + EVT_CALL(N(UnkFloatFunc001), LVarC, LVar0, 30, 60, 30, 0, 0) + EVT_CALL(RotateModel, MODEL_o167, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o168, LVar0, -1, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80242794_8672D4) = { + EVT_CALL(N(UnkFloatFunc001), LVarC, LVar0, 0, 30, 3, 0, 0) + EVT_SET(LVar1, LVar0) + EVT_DIV(LVar1, 3) + EVT_CALL(RotateModel, MODEL_o173, LVar0, 0, 0, 1) + EVT_CALL(RotateGroup, MODEL_dou, LVar1, 0, 0, -1) + EVT_CALL(TranslateModel, MODEL_o170, -5, -68, 0) + EVT_CALL(TranslateModel, MODEL_o183, -5, -68, 0) + EVT_CALL(TranslateModel, MODEL_o167, 60, 29, -51) + EVT_CALL(TranslateModel, MODEL_o168, 60, 29, 51) + EVT_CALL(RotateModel, MODEL_o170, LVar1, 0, 0, -1) + EVT_CALL(RotateModel, MODEL_o183, LVar1, 0, 0, -1) + EVT_CALL(RotateModel, MODEL_o167, LVar1, 0, 0, -1) + EVT_CALL(RotateModel, MODEL_o168, LVar1, 0, 0, -1) + EVT_CALL(TranslateModel, MODEL_o170, 5, 68, 0) + EVT_CALL(TranslateModel, MODEL_o183, 5, 68, 0) + EVT_CALL(TranslateModel, MODEL_o167, -60, -29, 51) + EVT_CALL(TranslateModel, MODEL_o168, -60, -29, -51) + EVT_SET(LVar0, LVarC) + EVT_MUL(LVar0, 2) + EVT_CALL(N(UnkFloatFunc001), LVar0, LVar0, 30, 60, 3, 0, 0) + EVT_CALL(RotateModel, MODEL_o167, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o168, LVar0, -1, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_80242A14) = { + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(MakeLocalVertexCopy, 1, MODEL_karada, TRUE) + EVT_CALL(SetCustomGfxBuilders, 1, EVT_PTR(N(unkAngleFunc002)), 0) + EVT_CALL(SetModelCustomGfx, MODEL_karada, 1, -1) + EVT_CALL(MakeLocalVertexCopy, 2, MODEL_onaka, TRUE) + EVT_CALL(SetCustomGfxBuilders, 2, EVT_PTR(N(unkAngleFunc003)), 0) + EVT_CALL(SetModelCustomGfx, MODEL_onaka, 2, -1) + EVT_CALL(SetNpcVar, NPC_Whale, 0, 0) + EVT_THREAD + EVT_LABEL(0) + EVT_CALL(N(UnkAngleFunc001), 0, LVar0, LVar1, LVar2) + EVT_SUBF(LVar0, -80) + EVT_SUBF(LVar1, -18) + EVT_SUBF(LVar2, 420) + EVT_ADDF(LVar0, 130) + EVT_ADDF(LVar1, -20) + EVT_ADDF(LVar2, 0) + EVT_CALL(TranslateModel, MODEL_bero, LVar0, LVar1, LVar2) + EVT_CALL(TranslateModel, MODEL_o170, LVar0, LVar1, LVar2) + EVT_CALL(TranslateModel, MODEL_o183, LVar0, LVar1, LVar2) + EVT_CALL(TranslateModel, MODEL_o173, LVar0, LVar1, LVar2) + EVT_CALL(TranslateModel, MODEL_o167, LVar0, LVar1, LVar2) + EVT_CALL(TranslateModel, MODEL_o168, LVar0, LVar1, LVar2) + EVT_CALL(TranslateGroup, MODEL_dou, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcYaw, NPC_Whale, LVar0) + EVT_MULF(LVar0, -1) + EVT_ADDF(LVar0, -90) + EVT_CALL(TranslateModel, MODEL_bero, -100, 0, 0) + EVT_CALL(TranslateModel, MODEL_o170, -100, 0, 0) + EVT_CALL(TranslateModel, MODEL_o183, -100, 0, 0) + EVT_CALL(TranslateModel, MODEL_o173, -100, 0, 0) + EVT_CALL(TranslateModel, MODEL_o167, -100, 0, 0) + EVT_CALL(TranslateModel, MODEL_o168, -100, 0, 0) + EVT_CALL(TranslateGroup, MODEL_dou, -100, 0, 0) + EVT_CALL(TranslateModel, MODEL_bero, 100, -1, 0) + EVT_CALL(TranslateModel, MODEL_o170, -5, -68, 0) + EVT_CALL(TranslateModel, MODEL_o183, -5, -68, 0) + EVT_CALL(TranslateModel, MODEL_o173, 102, 4, 0) + EVT_CALL(TranslateModel, MODEL_o167, 60, 29, -51) + EVT_CALL(TranslateModel, MODEL_o168, 60, 29, 51) + EVT_CALL(RotateModel, MODEL_bero, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o170, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o183, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o173, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o167, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o168, LVar0, 0, 1, 0) + EVT_CALL(RotateGroup, MODEL_dou, LVar0, 0, 1, 0) + EVT_CALL(TranslateModel, MODEL_bero, -100, 1, 0) + EVT_CALL(TranslateModel, MODEL_o170, 5, 68, 0) + EVT_CALL(TranslateModel, MODEL_o183, 5, 68, 0) + EVT_CALL(TranslateModel, MODEL_o173, -102, -4, 0) + EVT_CALL(TranslateModel, MODEL_o167, -60, -29, 51) + EVT_CALL(TranslateModel, MODEL_o168, -60, -29, -51) + EVT_CALL(TranslateModel, MODEL_bero, 100, 0, 0) + EVT_CALL(TranslateModel, MODEL_o170, 100, 0, 0) + EVT_CALL(TranslateModel, MODEL_o183, 100, 0, 0) + EVT_CALL(TranslateModel, MODEL_o173, 100, 0, 0) + EVT_CALL(TranslateModel, MODEL_o167, 100, 0, 0) + EVT_CALL(TranslateModel, MODEL_o168, 100, 0, 0) + EVT_CALL(TranslateGroup, MODEL_dou, 100, 0, 0) + EVT_CALL(GetNpcAnimation, NPC_Whale, LVar0) + EVT_IF_NE(LVar0, LVarB) + EVT_SET(LVarB, LVar0) + EVT_SET(LVarC, 0) + EVT_CALL(EnableModel, MODEL_o170, TRUE) + EVT_CALL(EnableModel, MODEL_o183, FALSE) + EVT_IF_NE(LVarB, ANIM_Kolorado_Shout) + EVT_CALL(GetNpcVar, NPC_Whale, 0, LVar0) + EVT_IF_NE(LVar0, 0) + EVT_CALL(PlaySound, SOUND_443) + EVT_CALL(func_802D62E4, 67) + EVT_CALL(N(DisposeWhaleGeyser), LVar0) + EVT_CALL(SetNpcVar, NPC_Whale, 0, 0) + EVT_END_IF + EVT_END_IF + EVT_SWITCH(LVarB) + EVT_CASE_EQ(ANIM_Kolorado_IdleSad) + EVT_CALL(PlaySoundAtNpc, NPC_Whale, SOUND_2037, 0) + EVT_SET(LVarD, EVT_PTR(N(D_80241E20_866960))) + EVT_CASE_EQ(ANIM_Kolorado_Still) + EVT_SET(LVarD, EVT_PTR(N(D_80241B6C_8666AC))) + EVT_CASE_EQ(ANIM_Kolorado_Yell) + EVT_CALL(PlaySoundAtNpc, NPC_Whale, SOUND_2036, 0) + EVT_SET(LVarD, EVT_PTR(N(D_80241BE4_866724))) + EVT_CASE_EQ(ANIM_Kolorado_Idle) + EVT_SET(LVarD, EVT_PTR(N(D_8024271C_86725C))) + EVT_CASE_EQ(ANIM_Kolorado_Walk) + EVT_SET(LVarD, EVT_PTR(N(D_80242794_8672D4))) + EVT_CASE_EQ(ANIM_Kolorado_WalkSad) + EVT_SET(LVarD, EVT_PTR(N(D_8024206C_866BAC))) + EVT_CALL(EnableModel, MODEL_o170, FALSE) + EVT_CALL(EnableModel, MODEL_o183, FALSE) + EVT_CASE_EQ(ANIM_Kolorado_Run) + EVT_SET(LVarD, EVT_PTR(N(D_8024230C_866E4C))) + EVT_CALL(EnableModel, MODEL_o170, FALSE) + EVT_CALL(EnableModel, MODEL_o183, FALSE) + EVT_CASE_EQ(ANIM_Kolorado_Panic) + EVT_SET(LVarD, EVT_PTR(N(D_80242474_866FB4))) + EVT_CALL(EnableModel, MODEL_o170, FALSE) + EVT_CALL(EnableModel, MODEL_o183, FALSE) + EVT_CASE_EQ(ANIM_Kolorado_Talk) + EVT_SET(LVarD, EVT_PTR(N(D_802425B4_8670F4))) + EVT_CASE_EQ(ANIM_Kolorado_Shout) + EVT_SET(LVarD, EVT_PTR(N(D_8024207C_866BBC))) + EVT_CASE_EQ(ANIM_Kolorado_TalkSad) + EVT_SET(LVarD, EVT_PTR(N(D_802421D4_866D14))) + EVT_CASE_EQ(ANIM_Kolorado_HurtStill) + EVT_SET(LVarD, EVT_PTR(N(D_802421E4_866D24))) + EVT_END_SWITCH + EVT_END_IF + EVT_EXEC_WAIT(LVarD) + EVT_ADD(LVarC, 1) + EVT_IF_GT(LVarC, 1000) + EVT_SET(LVarC, 0) + EVT_END_IF + EVT_GOTO(0) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_80243380) = { + EVT_CALL(SetNpcAnimation, NPC_Whale, ANIM_Kolorado_IdleSad) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mac/mac_06/mac_06_3.c b/src/world/area_mac/mac_06/mac_06_3.c new file mode 100644 index 0000000000..3177f2cc1f --- /dev/null +++ b/src/world/area_mac/mac_06/mac_06_3.c @@ -0,0 +1,498 @@ +#include "mac_06.h" + +#define CLONED_MODEL_GULL 11000 + +API_CALLABLE(func_80241098_865BD8); +API_CALLABLE(func_80240E80_8659C0); +API_CALLABLE(func_80241290_865DD0); +API_CALLABLE(func_802412AC_865DEC); +API_CALLABLE(func_80241388_865EC8); +API_CALLABLE(func_802415FC_86613C); + +NpcSettings N(NpcSettings_Kolorado_01) = { + .height = 24, + .radius = 48, + .level = 99, +}; + +NpcSettings N(NpcSettings_Kolorado) = { + .height = 40, + .radius = 24, + .level = 99, +}; + +NpcSettings N(NpcSettings_JrTroopa) = { + .height = 32, + .radius = 24, + .level = 99, +}; + +f32 D_80243434_867F74 = 0.0f; + +s32 D_80243438_867F78 = 0; + +s32 D_8024343C_867F7C = 0; + +s32 D_80243440_867F80 = 0; + +s32 func_80240E80_8659C0(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + Npc* whale = get_npc_safe(NPC_Whale); + Npc* kolorado; + Npc* partner; + f32 forward, radius; + f32 x, y, z; + + if (isInitialCall) { + script->functionTemp[0] = evt_get_variable(script, *args++); + switch (script->functionTemp[0]) { + case 0: + script->functionTemp[1] = 70; + break; + case 1: + script->functionTemp[1] = 100; + break; + default: + script->functionTemp[1] = 40; + break; + } + } + + radius = script->functionTemp[1]; + forward = -whale->yaw; + x = whale->pos.x + 30.0f + sin_deg(forward) * radius; + z = whale->pos.z + cos_deg(forward) * radius; + y = whale->pos.y + 50.0f; + + switch (script->functionTemp[0]) { + case 0: + gPlayerStatus.position.x = x; + gPlayerStatus.position.y = y + D_80243434_867F74; + gPlayerStatus.position.z = z; + whale->colliderPos.x = whale->pos.x; + whale->colliderPos.y = whale->pos.y; + whale->colliderPos.z = whale->pos.z; + whale->flags |= NPC_FLAG_DIRTY_SHADOW; + break; + case 1: + partner = get_npc_safe(NPC_PARTNER); + if (partner == NULL) { + return ApiStatus_DONE2; + } + partner->pos.x = x; + partner->pos.y = y; + partner->pos.z = z; + partner->colliderPos.x = partner->pos.x; + partner->colliderPos.y = partner->pos.y; + partner->colliderPos.z = partner->pos.z; + partner->flags |= NPC_FLAG_DIRTY_SHADOW; + break; + case 2: + kolorado = get_npc_safe(NPC_Kolorado); + kolorado->pos.x = x; + kolorado->pos.y = y; + kolorado->pos.z = z; + kolorado->colliderPos.x = kolorado->pos.x; + kolorado->colliderPos.y = kolorado->pos.y; + kolorado->colliderPos.z = kolorado->pos.z; + kolorado->flags |= NPC_FLAG_DIRTY_SHADOW; + break; + } + + return ApiStatus_BLOCK; +} + +INCLUDE_ASM(s32, "world/area_mac/mac_06/mac_06_3", func_80241098_865BD8); + +INCLUDE_ASM(s32, "world/area_mac/mac_06/mac_06_3", func_80241290_865DD0); + +INCLUDE_ASM(s32, "world/area_mac/mac_06/mac_06_3", func_802412AC_865DEC); + +EvtScript N(EVS_NpcIdle_Whale) = { + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, mac_06_ENTRY_0) + EVT_CALL(GetNpcPos, NPC_Whale, LVar0, LVar1, LVar2) + EVT_CALL(NpcFlyTo, NPC_Whale, 50, LVar1, 500, 120, 0, EASING_SIN_OUT) + EVT_THREAD + EVT_CALL(func_80241098_865BD8) + EVT_END_THREAD + EVT_WAIT(150) + EVT_CALL(SetNpcAnimation, NPC_Whale, ANIM_Kolorado_Idle) + EVT_CALL(NpcFlyTo, NPC_Whale, 500, LVar1, 500, 120, 0, EASING_COS_IN) + EVT_IF_EQ(GF_StartedChapter5, FALSE) + EVT_SET(GF_StartedChapter5, TRUE) + EVT_CALL(FadeOutMusic, 0, 1500) + EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_22"), kmr_22_ENTRY_5, TRANSITION_6) + EVT_ELSE + EVT_CALL(GotoMap, EVT_PTR("jan_00"), jan_00_ENTRY_0) + EVT_END_IF + EVT_ELSE + EVT_CALL(GetNpcPos, NPC_Whale, LVar0, LVar1, LVar2) + EVT_IF_GE(GB_StoryProgress, STORY_CH5_SUSHIE_JOINED_PARTY) + EVT_IF_EQ(GF_MAC01_Defeated_JrTroopa4, FALSE) + EVT_CALL(NpcFlyTo, NPC_Whale, -550, LVar1, 500, 240, 0, EASING_LINEAR) + EVT_CALL(SetNpcVar, NPC_JrTroopa, 0, 1) + EVT_RETURN + EVT_END_IF + EVT_END_IF + EVT_CALL(NpcFlyTo, NPC_Whale, -70, LVar1, 500, 120, 0, EASING_SIN_OUT) + EVT_THREAD + EVT_CALL(func_80241098_865BD8) + EVT_END_THREAD + EVT_WAIT(150) + EVT_CALL(SetNpcAnimation, NPC_Whale, ANIM_Kolorado_Idle) + EVT_CALL(NpcFlyTo, NPC_Whale, -500, LVar1, 500, 120, 0, EASING_COS_IN) + EVT_CALL(GotoMap, EVT_PTR("mac_05"), mac_05_ENTRY_1) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +INCLUDE_ASM(s32, "world/area_mac/mac_06/mac_06_3", func_80241388_865EC8); + +INCLUDE_ASM(s32, "world/area_mac/mac_06/mac_06_3", func_802415FC_86613C); + +EvtScript N(EVS_NpcInit_Whale) = { + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_1000000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_HAS_SHADOW, FALSE) + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, mac_06_ENTRY_0) + EVT_CALL(InterpPlayerYaw, 90, 0) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) + EVT_CALL(InterpNpcYaw, NPC_Kolorado, 90, 0) + EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 0) + EVT_CALL(SetNpcPos, NPC_SELF, -300, 0, 500) + EVT_ELSE + EVT_CALL(InterpPlayerYaw, 270, 0) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0) + EVT_CALL(InterpNpcYaw, NPC_Kolorado, 270, 0) + EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 0) + EVT_CALL(SetNpcPos, NPC_SELF, 300, 0, 500) + EVT_END_IF + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Whale))) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Idle) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_40 | NPC_FLAG_8000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_THREAD + EVT_CALL(func_80240E80_8659C0, 0) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(func_80240E80_8659C0, 1) + EVT_END_THREAD + EVT_THREAD + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH5_REACHED_LAVA_LAVA_ISLAND) + EVT_CALL(func_80240E80_8659C0, 2) + EVT_CASE_EQ(STORY_CH5_TRADED_VASE_FOR_SEED) + EVT_CALL(func_80240E80_8659C0, 2) + EVT_END_SWITCH + EVT_END_THREAD + EVT_IF_LT(GB_StoryProgress, STORY_CH5_REACHED_LAVA_LAVA_ISLAND) + EVT_RETURN + EVT_END_IF + EVT_IF_GE(GB_StoryProgress, STORY_CH5_SUSHIE_JOINED_PARTY) + EVT_IF_EQ(GF_MAC01_Defeated_JrTroopa4, FALSE) + EVT_RETURN + EVT_END_IF + EVT_END_IF + EVT_THREAD + EVT_CALL(func_80241290_865DD0) + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, mac_06_ENTRY_0) + EVT_CALL(GotoMap, EVT_PTR("jan_00"), jan_00_ENTRY_0) + EVT_ELSE + EVT_CALL(GotoMap, EVT_PTR("mac_05"), mac_05_ENTRY_1) + EVT_END_IF + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Kolorado) = { + EVT_RETURN + EVT_END +}; + +Vec3f N(FlightPath)[] = { + { -332.0, 50.0, 120.0 }, + { -160.0, 70.0, 300.0 }, + { -71.0, 80.0, 130.0 }, + { 105.0, 90.0, 262.0 }, + { 221.0, 100.0, 120.0 }, + { 404.0, 85.0, 150.0 }, + { 238.0, 70.0, -57.0 }, + { 63.0, 70.0, -42.0 }, + { -131.0, 60.0, 144.0 }, + { -75.0, 100.0, -60.0 }, + { 200.0, 60.0, -300.0 }, + { 20.0, 60.0, -280.0 }, + { 70.0, 60.0, 80.0 }, + { -332.0, 50.0, 120.0 }, +}; + +EvtScript N(EVS_FlyingGull) = { + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(CloneModel, MODEL_hontai, CLONED_MODEL_GULL) + EVT_SET(LocalFlag(0), TRUE) + EVT_SET(LocalFlag(1), FALSE) + EVT_SETF(LVar7, 0) + EVT_LABEL(10) + EVT_CALL(LoadPath, 500, EVT_PTR(N(FlightPath)), ARRAY_COUNT(N(FlightPath)), EASING_LINEAR) + EVT_LABEL(0) + EVT_CALL(GetNextPathPos) + EVT_CALL(TranslateModel, MODEL_hontai, LVar1, LVar2, LVar3) + EVT_SETF(LVar8, LVar2) + EVT_MULF(LVar8, -1) + EVT_CALL(TranslateModel, CLONED_MODEL_GULL, LVar1, LVar8, LVar3) + EVT_CALL(func_80241388_865EC8) + EVT_CALL(RotateModel, MODEL_hontai, LVar7, 0, 1, 0) + EVT_CALL(RotateModel, CLONED_MODEL_GULL, LVar7, 0, 1, 0) + EVT_CALL(RotateModel, CLONED_MODEL_GULL, 180, 0, 0, 1) + EVT_SET(LVar4, LVar1) + EVT_SET(LVar5, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 1) + EVT_GOTO(0) + EVT_END_IF + EVT_GOTO(10) + EVT_RETURN + EVT_END +}; + +// unused +EvtScript N(EVS_80243CAC) = { + EVT_CALL(CloneModel, MODEL_hontai, LVar0) + EVT_SET(LVarF, LVar0) + EVT_SET(LocalFlag(0), TRUE) + EVT_SET(LocalFlag(1), FALSE) + EVT_SETF(LVar7, 0) + EVT_SET(LVar8, 0) + EVT_SET(LVar9, 0) + EVT_SET(LVarA, 0) + EVT_CALL(RandInt, 200, LVar1) + EVT_ADD(LVar0, -100) + EVT_CALL(RandInt, 50, LVar2) + EVT_ADD(LVar0, 50) + EVT_CALL(RandInt, 200, LVar3) + EVT_ADD(LVar0, -100) + EVT_LABEL(10) + EVT_LABEL(0) + EVT_SET(LVarE, LVarF) + EVT_IF_EQ(LVarE, 0x00002710) + EVT_SET(LVarE, 22) + EVT_ELSE + EVT_ADD(LVarE, -1) + EVT_END_IF + EVT_CALL(func_802412AC_865DEC, LVarE, MV_Unk_00, MV_Unk_01, MV_Unk_02) + EVT_SETF(LVar0, MV_Unk_00) + EVT_SUBF(LVar0, LVar1) + EVT_IF_LT(LVar0, 0) + EVT_ADDF(LVar8, -1) + EVT_ELSE + EVT_ADDF(LVar8, 1) + EVT_END_IF + EVT_IF_LE(LVar8, -10) + EVT_SETF(LVar8, -10) + EVT_END_IF + EVT_IF_GE(LVar8, 10) + EVT_SETF(LVar8, 10) + EVT_END_IF + EVT_ADDF(LVar1, LVar8) + EVT_SETF(LVar0, MV_Unk_01) + EVT_SUBF(LVar0, LVar2) + EVT_IF_LT(LVar0, 0) + EVT_ADDF(LVar9, -1) + EVT_ELSE + EVT_ADDF(LVar9, 1) + EVT_END_IF + EVT_IF_LE(LVar9, -10) + EVT_SETF(LVar9, -10) + EVT_END_IF + EVT_IF_GE(LVar9, 10) + EVT_SETF(LVar9, 10) + EVT_END_IF + EVT_ADDF(LVar2, LVar9) + EVT_SETF(LVar0, MV_Unk_02) + EVT_SUBF(LVar0, LVar3) + EVT_IF_LT(LVar0, 0) + EVT_ADDF(LVarA, -1) + EVT_ELSE + EVT_ADDF(LVarA, 1) + EVT_END_IF + EVT_IF_LE(LVarA, -10) + EVT_SETF(LVarA, -10) + EVT_END_IF + EVT_IF_GE(LVarA, 10) + EVT_SETF(LVarA, 10) + EVT_END_IF + EVT_ADDF(LVar3, LVarA) + EVT_CALL(TranslateModel, LVarF, LVar1, LVar2, LVar3) + EVT_CALL(func_80241388_865EC8) + EVT_CALL(RotateModel, LVarF, LVar7, 0, 1, 0) + EVT_SET(LVar4, LVar1) + EVT_SET(LVar5, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 1) + EVT_GOTO(0) + EVT_END_IF + EVT_GOTO(10) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_JrTroopa) = { + EVT_CALL(SetSelfVar, 0, 0) + EVT_LOOP(0) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_IF_NE(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_WAIT(60) + EVT_CALL(SetMusicTrack, 0, SONG_JR_TROOPA_THEME, 0, 8) + EVT_CALL(PlaySound, SOUND_80000055) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_JrTroopa_ChargeTripped) + EVT_CALL(SetNpcPos, NPC_SELF, 250, -30, 500) + EVT_WAIT(5) + EVT_CHILD_THREAD + EVT_LOOP(0) + EVT_CALL(func_802415FC_86613C) + EVT_WAIT(5) + EVT_END_LOOP + EVT_END_CHILD_THREAD + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(2.0)) + EVT_CALL(NpcMoveTo, NPC_SELF, -300, 500, 0) + EVT_CALL(GotoMap, EVT_PTR("mac_05"), mac_05_ENTRY_1) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_JrTroopa) = { + EVT_IF_GE(GB_StoryProgress, STORY_CH5_SUSHIE_JOINED_PARTY) + EVT_IF_EQ(GF_MAC01_Defeated_JrTroopa4, FALSE) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_JrTroopa))) + EVT_RETURN + EVT_END_IF + EVT_END_IF + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_Whale) = { + .id = NPC_Whale, + .settings = &N(NpcSettings_Kolorado_01), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, + .init = &N(EVS_NpcInit_Whale), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Kolorado_Idle, + .walk = ANIM_Kolorado_Walk, + .run = ANIM_Kolorado_Run, + .chase = ANIM_Kolorado_Run, + .anim_4 = ANIM_Kolorado_Idle, + .anim_5 = ANIM_Kolorado_Idle, + .death = ANIM_Kolorado_Idle, + .hit = ANIM_Kolorado_Idle, + .anim_8 = ANIM_Kolorado_Idle, + .anim_9 = ANIM_Kolorado_Idle, + .anim_A = ANIM_Kolorado_Idle, + .anim_B = ANIM_Kolorado_Idle, + .anim_C = ANIM_Kolorado_Idle, + .anim_D = ANIM_Kolorado_Idle, + .anim_E = ANIM_Kolorado_Idle, + .anim_F = ANIM_Kolorado_Idle, + }, +}; + +StaticNpc N(NpcData_Kolorado) = { + .id = NPC_Kolorado, + .settings = &N(NpcSettings_Kolorado), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, + .init = &N(EVS_NpcInit_Kolorado), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Kolorado_Idle, + .walk = ANIM_Kolorado_Walk, + .run = ANIM_Kolorado_Run, + .chase = ANIM_Kolorado_Run, + .anim_4 = ANIM_Kolorado_Idle, + .anim_5 = ANIM_Kolorado_Idle, + .death = ANIM_Kolorado_Idle, + .hit = ANIM_Kolorado_Idle, + .anim_8 = ANIM_Kolorado_Idle, + .anim_9 = ANIM_Kolorado_Idle, + .anim_A = ANIM_Kolorado_Idle, + .anim_B = ANIM_Kolorado_Idle, + .anim_C = ANIM_Kolorado_Idle, + .anim_D = ANIM_Kolorado_Idle, + .anim_E = ANIM_Kolorado_Idle, + .anim_F = ANIM_Kolorado_Idle, + }, +}; + +s32 N(ExtraAnims_JrTroopa)[] = { + ANIM_JrTroopa_Still, + ANIM_JrTroopa_Idle, + ANIM_JrTroopa_ChargeTripped, + -1 +}; + +StaticNpc N(NpcData_JrTroopa) = { + .id = NPC_JrTroopa, + .settings = &N(NpcSettings_JrTroopa), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_40000 | NPC_FLAG_400000, + .init = &N(EVS_NpcInit_JrTroopa), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_JrTroopa_Idle, + .walk = ANIM_JrTroopa_Walk, + .run = ANIM_JrTroopa_Walk, + .chase = ANIM_JrTroopa_Walk, + .anim_4 = ANIM_JrTroopa_Idle, + .anim_5 = ANIM_JrTroopa_Idle, + .death = ANIM_JrTroopa_Idle, + .hit = ANIM_JrTroopa_Idle, + .anim_8 = ANIM_JrTroopa_Idle, + .anim_9 = ANIM_JrTroopa_Idle, + .anim_A = ANIM_JrTroopa_Idle, + .anim_B = ANIM_JrTroopa_Idle, + .anim_C = ANIM_JrTroopa_Idle, + .anim_D = ANIM_JrTroopa_Idle, + .anim_E = ANIM_JrTroopa_Idle, + .anim_F = ANIM_JrTroopa_Idle, + }, + .extraAnimations = N(ExtraAnims_JrTroopa), + .tattle = MSG_NpcTattle_JrTroopa, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_JrTroopa)), + NPC_GROUP(N(NpcData_Whale)), + NPC_GROUP(N(NpcData_Kolorado)), + {} +}; diff --git a/src/world/area_mgm/mgm.h b/src/world/area_mgm/mgm.h index 69591c01f6..29be41e9ab 100644 --- a/src/world/area_mgm/mgm.h +++ b/src/world/area_mgm/mgm.h @@ -22,4 +22,9 @@ enum { #define AF_MGM(index) AreaFlag(index) +extern MapSettings mgm_00_settings; +extern MapSettings mgm_01_settings; +extern MapSettings mgm_02_settings; +extern MapSettings mgm_03_settings; + #endif diff --git a/src/world/area_mgm/mgm_00/E0E7A0.c b/src/world/area_mgm/mgm_00/E0E7A0.c deleted file mode 100644 index 0a0c323241..0000000000 --- a/src/world/area_mgm/mgm_00/E0E7A0.c +++ /dev/null @@ -1,24 +0,0 @@ -#include "mgm_00.h" - -static char* N(exit_str_0) = "mac_03"; -static char* N(exit_str_1) = "mgm_01"; -static char* N(exit_str_2) = "mgm_02"; -static char* N(exit_str_3) = ""; - -#include "world/common/atomic/Pipe.inc.c" - -#include "world/common/enemy/PatrolNoAttackAI.inc.c" - -/* N(GetAvailableGamesCount) */ -ApiStatus func_80241170_E0F910(Evt* script, s32 isInitialCall) { - s32 numGames = 0; - - if (find_item(ITEM_GOLD_CREDIT) >= 0) { - numGames = 2; - } else if (find_item(ITEM_SILVER_CREDIT) >= 0) { - numGames = 1; - } - - evt_set_variable(script, LVar5, numGames); - return ApiStatus_DONE2; -} diff --git a/src/world/area_mgm/mgm_00/mgm_00.h b/src/world/area_mgm/mgm_00/mgm_00.h index fe0b85b162..22f024354c 100644 --- a/src/world/area_mgm/mgm_00/mgm_00.h +++ b/src/world/area_mgm/mgm_00/mgm_00.h @@ -2,8 +2,23 @@ /// @brief Minigame - Playroom Lobby #include "common.h" -#include "../mgm.h" #include "message_ids.h" #include "map.h" +#include "../mgm.h" +#include "mapfs/mgm_00_shape.h" +#include "mapfs/mgm_00_hit.h" + +#include "sprite/npc/Toad.h" + +enum { + NPC_RedToad = 0, + NPC_GreenToad = 1, + NPC_BlueToad = 2, +}; + +enum { + MV_RecordDisplayData = MapVar(10), +}; + #define NAMESPACE mgm_00 diff --git a/src/world/area_mgm/mgm_00/mgm_00_1_main.c b/src/world/area_mgm/mgm_00/mgm_00_1_main.c new file mode 100644 index 0000000000..eecdb263ff --- /dev/null +++ b/src/world/area_mgm/mgm_00/mgm_00_1_main.c @@ -0,0 +1,135 @@ +#include "mgm_00.h" + +extern EvtScript N(EVS_Main); +extern EvtScript N(D_80243C40_E123E0); +extern EvtScript N(EVS_BindInteractTriggers); +extern NpcGroupList N(DefaultNPCs); + +EntryList N(Entrances) = { + [mgm_00_ENTRY_0] { -152.0, 0.0, -218.0, 90.0 }, + [mgm_00_ENTRY_1] { -25.0, 30.0, -168.0, 90.0 }, + [mgm_00_ENTRY_2] { 95.0, 30.0, -168.0, 90.0 }, + [mgm_00_ENTRY_3] { 237.0, 0.0, -53.0, 270.0 }, + [mgm_00_ENTRY_4] { 20.0, 0.0, -80.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_mgm_00 }, +}; + +EvtScript N(D_80241850_E0FFF0) = { + EVT_RETURN + EVT_END +}; + +#include "world/common/atomic/Pipe.inc.c" +#include "world/common/atomic/Pipe.data.inc.c" + +EvtScript N(EVS_GotoMap_ToadTown) = { + EVT_CALL(GotoMap, EVT_PTR("mac_03"), mac_03_ENTRY_2) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OnEnterPipe_ToadTown) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_SET(LVarA, mgm_00_ENTRY_0) + EVT_SET(LVarB, COLLIDER_deili1) + EVT_SET(LVarC, EVT_PTR(N(EVS_GotoMap_ToadTown))) + EVT_EXEC_WAIT(N(EVS_Pipe_ExitHorizontal)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_GotoMap_JumpAttack) = { + EVT_CALL(GotoMap, EVT_PTR("mgm_01"), mgm_01_ENTRY_0) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OnEnterPipe_JumpAttack) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_SET(LVarA, mgm_00_ENTRY_1) + EVT_SET(LVarB, COLLIDER_deili2) + EVT_SET(LVarC, EVT_PTR(N(EVS_GotoMap_JumpAttack))) + EVT_EXEC_WAIT(N(EVS_Pipe_ExitVertical)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_GotoMap_SmashAttack) = { + EVT_CALL(GotoMap, EVT_PTR("mgm_02"), mgm_02_ENTRY_0) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +MAP_RODATA_PAD(1, unk); + +EvtScript N(EVS_OnEnterPipe_SmashAttack) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_SET(LVarA, mgm_00_ENTRY_2) + EVT_SET(LVarB, COLLIDER_deili3) + EVT_SET(LVarC, EVT_PTR(N(EVS_GotoMap_SmashAttack))) + EVT_EXEC_WAIT(N(EVS_Pipe_ExitVertical)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnEnterPipe_ToadTown)), TRIGGER_WALL_PUSH, COLLIDER_deili1, 1, 0) + EVT_IF_EQ(GF_MGM_Unlocked_JumpAttack, TRUE) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnEnterPipe_JumpAttack)), TRIGGER_FLOOR_TOUCH, COLLIDER_deili2, 1, 0) + EVT_END_IF + EVT_IF_EQ(GF_MGM_Unlocked_SmashAttack, TRUE) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnEnterPipe_SmashAttack)), TRIGGER_FLOOR_TOUCH, COLLIDER_deili3, 1, 0) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_IF_EQ(GF_MGM_Unlocked_JumpAttack, FALSE) + EVT_CALL(ModifyColliderFlags, 0, COLLIDER_o5, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, 0, COLLIDER_deili2, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(EnableModel, MODEL_o5, FALSE) + EVT_END_IF + EVT_IF_EQ(GF_MGM_Unlocked_SmashAttack, FALSE) + EVT_CALL(ModifyColliderFlags, 0, COLLIDER_o9, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, 0, COLLIDER_deili3, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(EnableModel, MODEL_o9, FALSE) + EVT_END_IF + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(mgm_00_ENTRY_0) + EVT_SET(LVarA, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_SET(LVarB, 1) + EVT_EXEC(N(EVS_Pipe_EnterHorizontal)) + EVT_CASE_EQ(mgm_00_ENTRY_1) + EVT_SET(LVarA, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(N(EVS_Pipe_EnterVertical)) + EVT_CASE_EQ(mgm_00_ENTRY_2) + EVT_SET(LVarA, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(N(EVS_Pipe_EnterVertical)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SETUP_CAMERA_DEFAULT() + EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) + EVT_EXEC_WAIT(N(D_80243C40_E123E0)) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(D_80241850_E0FFF0)) + EVT_EXEC(N(EVS_BindInteractTriggers)) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mgm/mgm_00/mgm_00_2_npc.c b/src/world/area_mgm/mgm_00/mgm_00_2_npc.c new file mode 100644 index 0000000000..5fea1a0d22 --- /dev/null +++ b/src/world/area_mgm/mgm_00/mgm_00_2_npc.c @@ -0,0 +1,396 @@ +#include "mgm_00.h" + +extern EvtScript N(EVS_OnEnterPipe_JumpAttack); +extern EvtScript N(EVS_OnEnterPipe_SmashAttack); + +#include "world/common/enemy/PatrolNoAttackAI.inc.c" + +MobileAISettings N(AISettings_GreenToad) = { + .moveSpeed = 1.5f, + .moveTime = 30, + .waitTime = 30, + .playerSearchInterval = -1, + .unk_AI_2C = 1, +}; + +EvtScript N(EVS_NpcAI_GreenToad) = { + EVT_CALL(N(PatrolNoAttackAI_Main), EVT_PTR(N(AISettings_GreenToad))) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_GreenToad) = { + .height = 30, + .radius = 24, + .level = 99, + .ai = &N(EVS_NpcAI_GreenToad), + .actionFlags = AI_ACTION_LOOK_AROUND_DURING_LOITER, +}; + +NpcSettings N(missing_80242A7C_2A7C) = { + .height = 23, + .radius = 19, + .level = 99, + .ai = &N(EVS_NpcAI_GreenToad), + .actionFlags = AI_ACTION_LOOK_AROUND_DURING_LOITER, +}; + +NpcSettings N(NpcSettings_RedToad) = { + .height = 30, + .radius = 24, + .level = 99, +}; + +NpcSettings N(missing_80242AD4_2AD4) = { + .height = 23, + .radius = 19, + .level = 99, +}; + +API_CALLABLE(N(GetAvailableGamesCount)) { + s32 numGames = 0; + + if (find_item(ITEM_GOLD_CREDIT) >= 0) { + numGames = 2; + } else if (find_item(ITEM_SILVER_CREDIT) >= 0) { + numGames = 1; + } + + evt_set_variable(script, LVar5, numGames); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_RaisePipe_JumpAttack) = { + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -25, 0, -155) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -25, 0, -155) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(400.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.2)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_WAIT(5) + EVT_CALL(PlaySoundWithVolume, SOUND_208E, 0) + EVT_CALL(EnableModel, MODEL_o5, TRUE) + EVT_SET(LVar0, -30) + EVT_LOOP(30) + EVT_ADD(LVar0, 1) + EVT_CALL(TranslateModel, MODEL_o5, 0, LVar0, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(TranslateModel, MODEL_o5, 0, 0, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o5, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_deili2, COLLIDER_FLAGS_UPPER_MASK) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnEnterPipe_JumpAttack)), TRIGGER_FLOOR_TOUCH, COLLIDER_deili2, 1, 0) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_RaisePipe_SmashAttack) = { + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 95, 0, -155) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 95, 0, -155) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(400.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.2)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_WAIT(5) + EVT_CALL(PlaySoundWithVolume, SOUND_208E, 0) + EVT_CALL(EnableModel, MODEL_o9, TRUE) + EVT_SET(LVar0, -30) + EVT_LOOP(30) + EVT_ADD(LVar0, 1) + EVT_CALL(TranslateModel, MODEL_o9, 0, LVar0, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(TranslateModel, MODEL_o9, 0, 0, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o9, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_deili3, COLLIDER_FLAGS_UPPER_MASK) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnEnterPipe_SmashAttack)), TRIGGER_FLOOR_TOUCH, COLLIDER_deili3, 1, 0) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetCamera_RaisePipe) = { + EVT_WAIT(10) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, 0, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(450.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.2)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_RedToad) = { + EVT_CALL(N(GetAvailableGamesCount)) + EVT_SET(LVar6, 0) + EVT_SET(LVar7, 0) + EVT_IF_EQ(GF_MGM_Unlocked_JumpAttack, FALSE) + EVT_SWITCH(LVar5) + EVT_CASE_EQ(0) + EVT_CASE_EQ(1) + EVT_SET(LVar6, 1) + EVT_SET(LVar7, 1) + EVT_CASE_EQ(2) + EVT_SET(LVar6, 1) + EVT_SET(LVar7, 3) + EVT_END_SWITCH + EVT_ELSE + EVT_IF_EQ(GF_MGM_Unlocked_SmashAttack, FALSE) + EVT_IF_LE(LVar5, 1) + EVT_SET(LVar6, 2) + EVT_ELSE + EVT_SET(LVar6, 3) + EVT_SET(LVar7, 2) + EVT_END_IF + EVT_ELSE + EVT_SET(LVar6, 4) + EVT_END_IF + EVT_END_IF + EVT_IF_EQ(GF_MGM00_Met_Receptionist, FALSE) + EVT_SET(GF_MGM00_Met_Receptionist, TRUE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_MGM_0012) + EVT_ELSE + EVT_SWITCH(LVar6) + EVT_CASE_EQ(0) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_MGM_0013) + EVT_RETURN + EVT_CASE_EQ(1) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_MGM_0014) + EVT_CASE_EQ(2) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_MGM_0015) + EVT_RETURN + EVT_CASE_EQ(3) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_MGM_0016) + EVT_CASE_EQ(4) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_MGM_0017) + EVT_RETURN + EVT_END_SWITCH + EVT_END_IF + EVT_SWITCH(LVar7) + EVT_CASE_EQ(0) + EVT_CALL(EndSpeech, NPC_SELF, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 5) + EVT_CASE_EQ(1) + EVT_CALL(ContinueSpeech, NPC_SELF, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_MGM_0018) + EVT_CASE_EQ(2) + EVT_CALL(ContinueSpeech, NPC_SELF, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_MGM_0019) + EVT_CASE_EQ(3) + EVT_CALL(ContinueSpeech, NPC_SELF, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_MGM_001A) + EVT_END_SWITCH + EVT_SWITCH(LVar7) + EVT_CASE_EQ(0) + EVT_CASE_EQ(1) + EVT_SET(GF_MGM_Unlocked_JumpAttack, TRUE) + EVT_EXEC_WAIT(N(EVS_RaisePipe_JumpAttack)) + EVT_EXEC_WAIT(N(EVS_SetCamera_RaisePipe)) + EVT_CASE_EQ(2) + EVT_SET(GF_MGM_Unlocked_SmashAttack, TRUE) + EVT_EXEC_WAIT(N(EVS_RaisePipe_SmashAttack)) + EVT_EXEC_WAIT(N(EVS_SetCamera_RaisePipe)) + EVT_CASE_EQ(3) + EVT_SET(GF_MGM_Unlocked_JumpAttack, TRUE) + EVT_SET(GF_MGM_Unlocked_SmashAttack, TRUE) + EVT_EXEC_WAIT(N(EVS_RaisePipe_JumpAttack)) + EVT_WAIT(10) + EVT_EXEC_WAIT(N(EVS_RaisePipe_SmashAttack)) + EVT_EXEC_WAIT(N(EVS_SetCamera_RaisePipe)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_RedToad) = { + EVT_CALL(SetNpcCollisionSize, NPC_SELF, 32, 75) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_RedToad))) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_RedToad) = { + .id = NPC_RedToad, + .settings = &N(NpcSettings_RedToad), + .pos = { -213.0f, 12.0f, -180.0f }, + .yaw = 90, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .init = &N(EVS_NpcInit_RedToad), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Toad_Red_Idle, + .walk = ANIM_Toad_Red_Walk, + .run = ANIM_Toad_Red_Run, + .chase = ANIM_Toad_Red_Run, + .anim_4 = ANIM_Toad_Red_Idle, + .anim_5 = ANIM_Toad_Red_Idle, + .death = ANIM_Toad_Red_Disappointed, + .hit = ANIM_Toad_Red_Disappointed, + .anim_8 = ANIM_Toad_Red_Run, + .anim_9 = ANIM_Toad_Red_Run, + .anim_A = ANIM_Toad_Red_Run, + .anim_B = ANIM_Toad_Red_Run, + .anim_C = ANIM_Toad_Red_Run, + .anim_D = ANIM_Toad_Red_Run, + .anim_E = ANIM_Toad_Red_Run, + .anim_F = ANIM_Toad_Red_Run, + }, + .tattle = MSG_NpcTattle_MGM_PlayroomReceptionist, +}; + +EvtScript N(EVS_NpcInteract_GreenToad) = { + EVT_CALL(N(GetAvailableGamesCount)) + EVT_SWITCH(LVar5) + EVT_CASE_EQ(0) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Green_Talk, ANIM_Toad_Green_Idle, 0, MSG_MGM_0025) + EVT_CASE_EQ(1) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Green_Talk, ANIM_Toad_Green_Idle, 0, MSG_MGM_0026) + EVT_CASE_DEFAULT + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Green_Talk, ANIM_Toad_Green_Idle, 0, MSG_MGM_0027) + EVT_CALL(SetSelfVar, 0, 1) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Green_Talk, ANIM_Toad_Green_Idle, 0, MSG_MGM_0028) + EVT_CALL(SetSelfVar, 0, 0) + EVT_END_IF + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_GreenToad) = { + EVT_CALL(SetSelfVar, 0, 0) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_GreenToad))) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_GreenToad) = { + .id = NPC_GreenToad, + .settings = &N(NpcSettings_GreenToad), + .pos = { -88.0f, 0.0f, -95.0f }, + .yaw = 270, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .init = &N(EVS_NpcInit_GreenToad), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .territory = { + .patrol = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .numPoints = 2, + .points = { + { -100, 0, -95 }, + { -70, 0, -95 }, + }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 0 }, + } + }, + .animations = { + .idle = ANIM_Toad_Green_Idle, + .walk = ANIM_Toad_Green_Walk, + .run = ANIM_Toad_Green_Run, + .chase = ANIM_Toad_Green_Run, + .anim_4 = ANIM_Toad_Green_Idle, + .anim_5 = ANIM_Toad_Green_Idle, + .death = ANIM_Toad_Green_Disappointed, + .hit = ANIM_Toad_Green_Disappointed, + .anim_8 = ANIM_Toad_Green_Run, + .anim_9 = ANIM_Toad_Green_Run, + .anim_A = ANIM_Toad_Green_Run, + .anim_B = ANIM_Toad_Green_Run, + .anim_C = ANIM_Toad_Green_Run, + .anim_D = ANIM_Toad_Green_Run, + .anim_E = ANIM_Toad_Green_Run, + .anim_F = ANIM_Toad_Green_Run, + }, + .tattle = MSG_NpcTattle_MGM_PlayroomCustomer, +}; + +EvtScript N(EVS_NpcInteract_BlueToad) = { + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_LT(25) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Blue_Talk, ANIM_Toad_Blue_Idle, 0, MSG_MGM_0029) + EVT_CASE_LT(50) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Blue_Talk, ANIM_Toad_Blue_Idle, 0, MSG_MGM_002A) + EVT_CASE_LT(75) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Blue_Talk, ANIM_Toad_Blue_Idle, 0, MSG_MGM_002B) + EVT_CASE_DEFAULT + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Blue_Talk, ANIM_Toad_Blue_Idle, 0, MSG_MGM_002C) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_BlueToad) = { + EVT_CALL(RandInt, 100, LVar0) + EVT_CALL(SetSelfVar, 0, LVar0) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_BlueToad))) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_BlueToad) = { + .id = NPC_BlueToad, + .settings = &N(NpcSettings_GreenToad), + .pos = { 46.0f, 0.0f, -205.0f }, + .yaw = 90, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .init = &N(EVS_NpcInit_BlueToad), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .territory = { + .patrol = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .numPoints = 2, + .points = { + { 25, 0, -205 }, + { 75, 0, -205 }, + }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 0 }, + } + }, + .animations = { + .idle = ANIM_Toad_Blue_Idle, + .walk = ANIM_Toad_Blue_Walk, + .run = ANIM_Toad_Blue_Run, + .chase = ANIM_Toad_Blue_Run, + .anim_4 = ANIM_Toad_Blue_Idle, + .anim_5 = ANIM_Toad_Blue_Idle, + .death = ANIM_Toad_Blue_Disappointed, + .hit = ANIM_Toad_Blue_Disappointed, + .anim_8 = ANIM_Toad_Blue_Run, + .anim_9 = ANIM_Toad_Blue_Run, + .anim_A = ANIM_Toad_Blue_Run, + .anim_B = ANIM_Toad_Blue_Run, + .anim_C = ANIM_Toad_Blue_Run, + .anim_D = ANIM_Toad_Blue_Run, + .anim_E = ANIM_Toad_Blue_Run, + .anim_F = ANIM_Toad_Blue_Run, + }, + .tattle = MSG_NpcTattle_MGM_BestPlayroomCustomer, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_RedToad)), + NPC_GROUP(N(NpcData_GreenToad)), + NPC_GROUP(N(NpcData_BlueToad)), + {} +}; diff --git a/src/world/area_mgm/mgm_00/E0F980.c b/src/world/area_mgm/mgm_00/mgm_00_3_scoreboard.c similarity index 73% rename from src/world/area_mgm/mgm_00/E0F980.c rename to src/world/area_mgm/mgm_00/mgm_00_3_scoreboard.c index 6166cfb9e0..bc151cc6e4 100644 --- a/src/world/area_mgm/mgm_00/E0F980.c +++ b/src/world/area_mgm/mgm_00/mgm_00_3_scoreboard.c @@ -2,11 +2,10 @@ void msg_draw_frame(s32 posX, s32 posY, s32 sizeX, s32 sizeY, s32 style, s32 palette, s32 fading, s32 bgAlpha, s32 frameAlpha); -extern Gfx D_80243C50_E123F0[]; +extern Gfx N(Gfx_RecordDisplay_Init)[]; -#define RECORD_DISPLAY_MAP_VAR 0xA -#define MINIGAME_TYPE_SMASH 0 #define MINIGAME_TYPE_JUMP 1 +#define MINIGAME_TYPE_SMASH 2 #define FADE_IN_TIME 5 #define FADE_OUT_TIME 5 @@ -31,7 +30,7 @@ typedef struct RecordDisplayData { void N(draw_record_display)(RecordDisplayData* data, s32 alpha) { if (alpha > 0) { - gSPDisplayList(gMasterGfxPos++, D_80243C50_E123F0); + gSPDisplayList(gMasterGfxPos++, N(Gfx_RecordDisplay_Init)); gDPPipeSync(gMasterGfxPos++); gDPSetPrimColor(gMasterGfxPos++, 0, 0, 16, 120, 24, alpha * 0.65); gDPFillRectangle(gMasterGfxPos++, 48, 53, 272, 129); @@ -59,7 +58,7 @@ void N(draw_record_display)(RecordDisplayData* data, s32 alpha) { } void N(animate_and_draw_record)(void* renderData) { - RecordDisplayData* data = (RecordDisplayData*)evt_get_variable(NULL, MapVar(RECORD_DISPLAY_MAP_VAR)); + RecordDisplayData* data = (RecordDisplayData*)evt_get_variable(NULL, MV_RecordDisplayData); switch (data->state) { case RECORD_START_SHOW: @@ -114,7 +113,7 @@ void N(work_draw_record)(void) { queue_render_task(&task); } -ApiStatus N(UpdateRecordDisplay)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UpdateRecordDisplay)) { RecordDisplayData* data; Bytecode* args = script->ptrReadPos; s32 gameType = evt_get_variable(script, *args++); @@ -126,7 +125,7 @@ ApiStatus N(UpdateRecordDisplay)(Evt* script, s32 isInitialCall) { data->alpha = 255; data->workerID = create_generic_entity_world(NULL, &N(work_draw_record)); data->gameType = gameType; - evt_set_variable(script, MapVar(RECORD_DISPLAY_MAP_VAR), (s32)data); + evt_set_variable(script, MV_RecordDisplayData, (s32)data); } data = script->functionTempPtr[0]; if (data->state == RECORD_STATE_DONE) { @@ -136,3 +135,52 @@ ApiStatus N(UpdateRecordDisplay)(Evt* script, s32 isInitialCall) { } return ApiStatus_BLOCK; } + +EvtScript N(D_80243C40_E123E0) = { + EVT_RETURN + EVT_END +}; + +Gfx N(Gfx_RecordDisplay_Init)[] = { + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_XLU_SURF, G_RM_XLU_SURF2), + gsDPSetCombineMode(G_CC_PRIMITIVE, G_CC_PRIMITIVE), + gsDPSetColorDither(G_CD_DISABLE), + gsDPSetAlphaDither(G_AD_DISABLE), + gsDPSetCombineKey(G_CK_NONE), + gsDPSetAlphaCompare(G_AC_NONE), + gsDPNoOp(), + gsDPSetPrimColor(0, 0, 255, 0, 0, 0), + gsDPFillRectangle(44, 49, 276, 51), + gsDPFillRectangle(44, 49, 46, 133), + gsDPFillRectangle(275, 49, 276, 133), + gsDPFillRectangle(44, 132, 276, 133), + gsSPEndDisplayList(), +}; + +EvtScript N(EVS_OnInteract_JumpRecords) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(N(UpdateRecordDisplay), MINIGAME_TYPE_JUMP) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OnInteract_SmashRecords) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(N(UpdateRecordDisplay), MINIGAME_TYPE_SMASH) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BindInteractTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnInteract_JumpRecords)), TRIGGER_WALL_PRESS_A, COLLIDER_score1, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnInteract_SmashRecords)), TRIGGER_WALL_PRESS_A, COLLIDER_score2, 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mgm/mgm_01/E12760.c b/src/world/area_mgm/mgm_01/E12760.c deleted file mode 100644 index fd61146aca..0000000000 --- a/src/world/area_mgm/mgm_01/E12760.c +++ /dev/null @@ -1,38 +0,0 @@ -#include "mgm_01.h" - -/* N(GetSpotlightPos) */ -ApiStatus func_80240000_E12760(Evt* script, s32 isInitialCall) { - SpriteShadingProfile* shading; - f32 spotLightPosX, spotLightPosZ; - f32 lightBeamRotX, lightBeamRotZ; - - spotLightPosX = gPlayerStatusPtr->position.x; - if (spotLightPosX < -95.0) { - spotLightPosX = -95.0; - } - if (spotLightPosX > 95.0) { - spotLightPosX = 95.0; - } - spotLightPosZ = gPlayerStatusPtr->position.z; - if (spotLightPosZ < -80.0) { - spotLightPosZ = -80.0; - } - if (spotLightPosZ > 80.0) { - spotLightPosZ = 80.0; - } - - lightBeamRotX = spotLightPosZ * -0.35 * 0.3; - lightBeamRotZ = spotLightPosX * 0.35; - - evt_set_float_variable(script, LVar0, spotLightPosX); - evt_set_float_variable(script, LVar1, spotLightPosZ); - evt_set_float_variable(script, LVar2, lightBeamRotX); - evt_set_float_variable(script, LVar3, lightBeamRotZ); - - shading = D_80151328; - shading->sources[0].pos.x = gPlayerStatusPtr->position.x * 0.8; - shading->sources[0].pos.y = 80.0f; - shading->sources[0].pos.z = gPlayerStatusPtr->position.z + 50.0f; - - return ApiStatus_DONE2; -} diff --git a/src/world/area_mgm/mgm_01/mgm_01.h b/src/world/area_mgm/mgm_01/mgm_01.h index 3e25ad4c7e..c71d8d7bca 100644 --- a/src/world/area_mgm/mgm_01/mgm_01.h +++ b/src/world/area_mgm/mgm_01/mgm_01.h @@ -2,8 +2,17 @@ /// @brief Minigame - Jump Attack Minigame #include "common.h" -#include "../mgm.h" #include "message_ids.h" #include "map.h" +#include "../mgm.h" +#include "mapfs/mgm_01_shape.h" +#include "mapfs/mgm_01_hit.h" + +#include "sprite/npc/Toad.h" + +enum { + NPC_Toad = 0, +}; + #define NAMESPACE mgm_01 diff --git a/src/world/area_mgm/mgm_01/mgm_01_1_main.c b/src/world/area_mgm/mgm_01/mgm_01_1_main.c new file mode 100644 index 0000000000..865140bc64 --- /dev/null +++ b/src/world/area_mgm/mgm_01/mgm_01_1_main.c @@ -0,0 +1,95 @@ +#include "mgm_01.h" + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_MakeEntities); +extern EvtScript N(EVS_802424A4); +extern NpcGroupList N(DefaultNPCs); + +EntryList N(Entrances) = { + [mgm_01_ENTRY_0] { 0.0, 200.0, 0.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_mgm_01 }, +}; + +API_CALLABLE(N(GetSpotlightPos)) { + SpriteShadingProfile* shading; + f32 spotLightPosX, spotLightPosZ; + f32 lightBeamRotX, lightBeamRotZ; + + spotLightPosX = gPlayerStatusPtr->position.x; + if (spotLightPosX < -95.0) { + spotLightPosX = -95.0; + } + if (spotLightPosX > 95.0) { + spotLightPosX = 95.0; + } + spotLightPosZ = gPlayerStatusPtr->position.z; + if (spotLightPosZ < -80.0) { + spotLightPosZ = -80.0; + } + if (spotLightPosZ > 80.0) { + spotLightPosZ = 80.0; + } + + lightBeamRotX = spotLightPosZ * -0.35 * 0.3; + lightBeamRotZ = spotLightPosX * 0.35; + + evt_set_float_variable(script, LVar0, spotLightPosX); + evt_set_float_variable(script, LVar1, spotLightPosZ); + evt_set_float_variable(script, LVar2, lightBeamRotX); + evt_set_float_variable(script, LVar3, lightBeamRotZ); + + shading = D_80151328; + shading->sources[0].pos.x = gPlayerStatusPtr->position.x * 0.8; + shading->sources[0].pos.y = 80.0f; + shading->sources[0].pos.z = gPlayerStatusPtr->position.z + 50.0f; + + return ApiStatus_DONE2; +} + +EvtScript N(EVS_UpdateSpotlight) = { + EVT_LABEL(0) + EVT_CALL(N(GetSpotlightPos)) + EVT_CALL(TranslateModel, MODEL_o36, LVar0, 0, LVar1) + EVT_CALL(RotateModel, MODEL_o37, LVar2, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o37, LVar3, 0, 0, 1) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_8024189C_E13FFC) = { + EVT_CALL(EnableModel, MODEL_o64, FALSE) + EVT_CALL(EnableModel, MODEL_o65, FALSE) + EVT_CALL(EnableModel, MODEL_o66, FALSE) + EVT_CALL(EnableModel, MODEL_o67, FALSE) + EVT_CALL(EnableModel, MODEL_o53, FALSE) + EVT_CALL(EnableModel, MODEL_o68, FALSE) + EVT_CALL(EnableModel, MODEL_o73, FALSE) + EVT_CALL(EnableModel, MODEL_o54, FALSE) + EVT_CALL(EnableModel, MODEL_o69, FALSE) + EVT_CALL(EnableModel, MODEL_o55, FALSE) + EVT_CALL(EnableModel, MODEL_o72, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_CALL(SetSpriteShading, SHADING_ARN_09) + EVT_SETUP_CAMERA_DEFAULT() + EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) + EVT_CALL(SetRenderMode, MODEL_o36, RENDER_MODE_SURFXLU_ZB_ZUPD) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_UpdateSpotlight)) + EVT_EXEC(N(D_8024189C_E13FFC)) + EVT_EXEC(N(EVS_802424A4)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mgm/mgm_01/E12930.c b/src/world/area_mgm/mgm_01/mgm_01_2_npc.c similarity index 59% rename from src/world/area_mgm/mgm_01/E12930.c rename to src/world/area_mgm/mgm_01/mgm_01_2_npc.c index 8212083ede..e95a16eed3 100644 --- a/src/world/area_mgm/mgm_01/E12930.c +++ b/src/world/area_mgm/mgm_01/mgm_01_2_npc.c @@ -4,7 +4,6 @@ #include "entity.h" void delete_entity(s32 entityIndex); -void set_message_images(MessageImageData* images); #define SCOREKEEPER_ENEMY_IDX 0 #define BROKEN_BLOCKS_VAR_IDX 2 @@ -85,19 +84,21 @@ extern JumpGamePanelType N(PanelTypes)[NUM_BLOCKS]; extern JumpGamePanelType N(InitialConfigurations)[4][NUM_BLOCKS]; extern EvtScript* D_802435E8_E15D48[NUM_BLOCKS]; -extern EvtScript D_80242310; -extern EvtScript D_80242330; -extern EvtScript D_80242350; -extern EvtScript D_80242370; -extern EvtScript D_80242390; -extern EvtScript D_802423B0; -extern EvtScript D_802423D0; -extern EvtScript D_802423F0; -extern EvtScript D_80242410; -extern EvtScript D_80242430; -extern EvtScript D_80242450; +extern EvtScript N(EVS_OnBreakBlock_0); +extern EvtScript N(EVS_OnBreakBlock_1); +extern EvtScript N(EVS_OnBreakBlock_2); +extern EvtScript N(EVS_OnBreakBlock_3); +extern EvtScript N(EVS_OnBreakBlock_4); +extern EvtScript N(EVS_OnBreakBlock_5); +extern EvtScript N(EVS_OnBreakBlock_6); +extern EvtScript N(EVS_OnBreakBlock_7); +extern EvtScript N(EVS_OnBreakBlock_8); +extern EvtScript N(EVS_OnBreakBlock_9); +extern EvtScript N(EVS_OnBreakBlock_10); -void N(draw_score_display) (void* renderData) { +extern EvtScript N(EVS_InitializePanels); + +void N(appendGfx_score_display) (void* renderData) { Enemy* scorekeeper = get_enemy(SCOREKEEPER_ENEMY_IDX); JumpGameData* data = (JumpGameData*)scorekeeper->varTable[JUMP_DATA_VAR_IDX]; s32 hudElemID; @@ -152,31 +153,30 @@ void N(draw_score_display) (void* renderData) { } } -void N(work_draw_score)(void) { +void N(worker_draw_score)(void) { RenderTask task; task.renderMode = RENDER_MODE_2D; task.appendGfxArg = 0; - task.appendGfx = &mgm_01_draw_score_display; + task.appendGfx = &mgm_01_appendGfx_score_display; task.distance = 0; queue_render_task(&task); } -ApiStatus N(DisableMenus)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(DisableMenus)) { gOverrideFlags |= GLOBAL_OVERRIDES_DISABLE_MENUS; func_800E9894(); close_status_menu(); return ApiStatus_DONE2; } -ApiStatus N(EnableMenus)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(EnableMenus)) { gOverrideFlags &= ~GLOBAL_OVERRIDES_DISABLE_MENUS; return ApiStatus_DONE2; } -// arg0: index -ApiStatus N(GetPanelInfo)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(GetPanelInfo)) { JumpGameData* data = (JumpGameData*)get_enemy(SCOREKEEPER_ENEMY_IDX)->varTable[JUMP_DATA_VAR_IDX]; Bytecode* args = script->ptrReadPos; s32 index = evt_get_variable(script, *args++); @@ -189,8 +189,7 @@ ApiStatus N(GetPanelInfo)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -// arg0: index, arg1: newState -ApiStatus N(SetPanelState)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(SetPanelState)) { JumpGameData* data = (JumpGameData*)get_enemy(SCOREKEEPER_ENEMY_IDX)->varTable[JUMP_DATA_VAR_IDX]; Bytecode* args = script->ptrReadPos; s32 index = evt_get_variable(script, *args++); @@ -201,8 +200,7 @@ ApiStatus N(SetPanelState)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -// arg0: index, arg1: newState -ApiStatus N(InitPanelEmergeFromBlock)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(InitPanelEmergeFromBlock)) { JumpGameData* data = (JumpGameData*)get_enemy(SCOREKEEPER_ENEMY_IDX)->varTable[JUMP_DATA_VAR_IDX]; Bytecode* args = script->ptrReadPos; s32 index = evt_get_variable(script, *args++); @@ -234,8 +232,7 @@ ApiStatus N(InitPanelEmergeFromBlock)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -// arg0: index -ApiStatus N(UpdatePanelEmergeFromBlock)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UpdatePanelEmergeFromBlock)) { JumpGameData* data = (JumpGameData*)get_enemy(SCOREKEEPER_ENEMY_IDX)->varTable[JUMP_DATA_VAR_IDX]; Bytecode* args = script->ptrReadPos; s32 index = evt_get_variable(script, *args++); @@ -267,8 +264,7 @@ ApiStatus N(UpdatePanelEmergeFromBlock)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -// arg0: index -ApiStatus N(InitPanelHoldAboveBlock)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(InitPanelHoldAboveBlock)) { JumpGameData* data = (JumpGameData*)get_enemy(SCOREKEEPER_ENEMY_IDX)->varTable[JUMP_DATA_VAR_IDX]; Bytecode* args = script->ptrReadPos; s32 index = evt_get_variable(script, *args++); @@ -279,8 +275,7 @@ ApiStatus N(InitPanelHoldAboveBlock)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -// arg0: index -ApiStatus N(UpdatetPanelHoldAboveBlock)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UpdatetPanelHoldAboveBlock)) { JumpGameData* data = (JumpGameData*)get_enemy(SCOREKEEPER_ENEMY_IDX)->varTable[JUMP_DATA_VAR_IDX]; Bytecode* args = script->ptrReadPos; s32 index = evt_get_variable(script, *args++); @@ -295,8 +290,7 @@ ApiStatus N(UpdatetPanelHoldAboveBlock)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -// arg0: index, arg1: newState -ApiStatus N(InitPanelMoveToTally)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(InitPanelMoveToTally)) { JumpGameData* data = (JumpGameData*)get_enemy(SCOREKEEPER_ENEMY_IDX)->varTable[JUMP_DATA_VAR_IDX]; Bytecode* args = script->ptrReadPos; s32 index = evt_get_variable(script, *args++); @@ -336,8 +330,7 @@ ApiStatus N(InitPanelMoveToTally)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -// arg0: index -ApiStatus N(UpdatePanelMoveToTally)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UpdatePanelMoveToTally)) { JumpGameData* data = (JumpGameData*)get_enemy(SCOREKEEPER_ENEMY_IDX)->varTable[JUMP_DATA_VAR_IDX]; Bytecode* args = script->ptrReadPos; s32 index = evt_get_variable(script, *args++); @@ -373,8 +366,7 @@ ApiStatus N(UpdatePanelMoveToTally)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -// arg0: index -ApiStatus N(EndPanelAnimation)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(EndPanelAnimation)) { JumpGameData* data = (JumpGameData*)get_enemy(SCOREKEEPER_ENEMY_IDX)->varTable[JUMP_DATA_VAR_IDX]; Bytecode* args = script->ptrReadPos; s32 index = evt_get_variable(script, *args++); @@ -384,7 +376,7 @@ ApiStatus N(EndPanelAnimation)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(UpdateRecords)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UpdateRecords)) { JumpGameData* data = (JumpGameData*)get_enemy(SCOREKEEPER_ENEMY_IDX)->varTable[JUMP_DATA_VAR_IDX]; PlayerData* player = &gPlayerData; @@ -400,7 +392,7 @@ ApiStatus N(UpdateRecords)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(GiveCoinReward)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(GiveCoinReward)) { JumpGameData* data = (JumpGameData*)get_enemy(SCOREKEEPER_ENEMY_IDX)->varTable[JUMP_DATA_VAR_IDX]; s32 coinsLeft = data->currentScore; s32 increment; @@ -433,7 +425,7 @@ ApiStatus N(GiveCoinReward)(Evt* script, s32 isInitialCall) { } } -ApiStatus N(DoubleScore)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(DoubleScore)) { JumpGameData* data = (JumpGameData*)get_enemy(SCOREKEEPER_ENEMY_IDX)->varTable[JUMP_DATA_VAR_IDX]; s32 score = 2 * data->currentScore; data->currentScore = score; @@ -442,7 +434,7 @@ ApiStatus N(DoubleScore)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(EndBowserPanelAnimation)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(EndBowserPanelAnimation)) { JumpGameData* data = (JumpGameData*)get_enemy(SCOREKEEPER_ENEMY_IDX)->varTable[JUMP_DATA_VAR_IDX]; s32 i; @@ -463,8 +455,7 @@ ApiStatus N(EndBowserPanelAnimation)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -// arg0: index -ApiStatus N(GetPanelPos)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(GetPanelPos)) { JumpGameData* data = (JumpGameData*)get_enemy(SCOREKEEPER_ENEMY_IDX)->varTable[JUMP_DATA_VAR_IDX]; Bytecode* args = script->ptrReadPos; s32 index = evt_get_variable(script, *args++); @@ -478,7 +469,7 @@ ApiStatus N(GetPanelPos)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(DestroyBlockEntities) (Evt* script, s32 isInitialCall) { +API_CALLABLE(N(DestroyBlockEntities)) { JumpGameData* data = (JumpGameData*)get_enemy(SCOREKEEPER_ENEMY_IDX)->varTable[JUMP_DATA_VAR_IDX]; s32 i; @@ -494,7 +485,7 @@ ApiStatus N(DestroyBlockEntities) (Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(OnBreakBlock)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(OnBreakBlock)) { Enemy* scorekeeper = get_enemy(SCOREKEEPER_ENEMY_IDX); JumpGameData* data = (JumpGameData*)scorekeeper->varTable[JUMP_DATA_VAR_IDX]; Bytecode* args = script->ptrReadPos; @@ -532,7 +523,7 @@ ApiStatus N(OnBreakBlock)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(CreateBlockEntities)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(CreateBlockEntities)) { JumpGameData* data = get_enemy(SCOREKEEPER_ENEMY_IDX)->varTablePtr[JUMP_DATA_VAR_IDX]; s32 entityIndex; s32 initialConfiguration; @@ -542,8 +533,9 @@ ApiStatus N(CreateBlockEntities)(Evt* script, s32 isInitialCall) { s32 i; EvtScript* scriptArray[] = { - &D_80242310, &D_80242330, &D_80242350, &D_80242370, &D_80242390, &D_802423B0, &D_802423D0, &D_802423F0, - &D_80242410, &D_80242430, &D_80242450 + &N(EVS_OnBreakBlock_0), &N(EVS_OnBreakBlock_1), &N(EVS_OnBreakBlock_2), &N(EVS_OnBreakBlock_3), + &N(EVS_OnBreakBlock_4), &N(EVS_OnBreakBlock_5), &N(EVS_OnBreakBlock_6), &N(EVS_OnBreakBlock_7), + &N(EVS_OnBreakBlock_8), &N(EVS_OnBreakBlock_9), &N(EVS_OnBreakBlock_10) }; if (isInitialCall) { @@ -596,9 +588,7 @@ ApiStatus N(CreateBlockEntities)(Evt* script, s32 isInitialCall) { } } -const char* mgm_01_str = "mgm_00"; - -ApiStatus N(TakeCoinCost)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(TakeCoinCost)) { PlayerData* playerData = &gPlayerData; if (isInitialCall) { @@ -617,7 +607,7 @@ ApiStatus N(TakeCoinCost)(Evt* script, s32 isInitialCall) { } } -ApiStatus N(InitializePanels)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(InitializePanels)) { JumpGameData* data = get_enemy(SCOREKEEPER_ENEMY_IDX)->varTablePtr[JUMP_DATA_VAR_IDX]; s32 i; @@ -634,13 +624,13 @@ ApiStatus N(InitializePanels)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(CreateMinigame)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(CreateMinigame)) { Enemy* scorekeeper = get_enemy(SCOREKEEPER_ENEMY_IDX); JumpGameData* data = general_heap_malloc(sizeof(*data)); s32 hudElemID; scorekeeper->varTablePtr[JUMP_DATA_VAR_IDX] = data; - data->workerID = create_generic_entity_world(NULL, &mgm_01_work_draw_score); + data->workerID = create_generic_entity_world(NULL, &mgm_01_worker_draw_score); hudElemID = hud_element_create(&HES_StatusCoin); data->hudElemID = hudElemID; @@ -655,7 +645,7 @@ ApiStatus N(CreateMinigame)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(DestroyMinigame) (Evt* script, s32 isInitialCall) { +API_CALLABLE(N(DestroyMinigame)) { JumpGameData* data = get_enemy(SCOREKEEPER_ENEMY_IDX)->varTablePtr[JUMP_DATA_VAR_IDX]; free_generic_entity(data->workerID); @@ -664,12 +654,12 @@ ApiStatus N(DestroyMinigame) (Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(GetCoinCount)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(GetCoinCount)) { evt_set_variable(script, LVarA, gPlayerData.coins); return ApiStatus_DONE2; } -ApiStatus N(SetMsgVars_BlocksRemaining)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(SetMsgVars_BlocksRemaining)) { Enemy* scorekeeper = get_enemy(SCOREKEEPER_ENEMY_IDX); s32 remaining = (scorekeeper->varTable[TOTAL_BLOCKS_VAR_IDX] - scorekeeper->varTable[BROKEN_BLOCKS_VAR_IDX]) + 1; @@ -679,12 +669,396 @@ ApiStatus N(SetMsgVars_BlocksRemaining)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(HideCoinCounter)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(HideCoinCounter)) { hide_coin_counter_immediately(); return ApiStatus_DONE2; } -ApiStatus N(SetMsgImgs_Panels)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(SetMsgImgs_Panels)) { set_message_images(&N(MsgImgs_Panels)); return ApiStatus_DONE2; } + +NpcSettings N(NpcSettings_Toad) = { + .height = 30, + .radius = 24, + .level = 99, +}; + +NpcSettings N(missing_80241A9C_1A9C) = { + .height = 23, + .radius = 19, + .level = 99, +}; + +s8 N(BlockPosX)[NUM_BLOCKS] = { + -125, -100, -75, -50, -25, 0, 25, 50, 75, 100, 125 +}; + +s8 N(BlockPosY)[NUM_BLOCKS] = { + 56, 60, 56, 60, 56, 60, 56, 60, 56, 60, 56 +}; + +s8 N(BlockPosZ)[NUM_BLOCKS] = { + 30, -30, 30, -30, 30, -30, 30, -30, 30, -30, 30 +}; + +f32 N(TallyPosX)[NUM_BLOCKS] = { + -105.0, -80.0, -55.0, -30.0, -5.0, -105.0, -80.0, -55.0, + -30.0, -5.0, 20.0 +}; + +f32 N(TallyPosY)[NUM_BLOCKS] = { + 157.0, 157.0, 157.0, 157.0, 157.0, 133.0, 133.0, 133.0, + 133.0, 133.0, 133.0, +}; + +s32 N(PanelModelIDs)[NUM_BLOCKS] = { + 19, 17, 15, 13, 22, 24, 26, 29, + 31, 34, 36 +}; + +JumpGamePanelType N(PanelTypes)[NUM_BLOCKS] = { + PANEL_1_COIN, PANEL_1_COIN, PANEL_1_COIN, PANEL_1_COIN, + PANEL_5_COINS, PANEL_5_COINS, PANEL_5_COINS, + PANEL_TIMES_5, PANEL_TIMES_5, + PANEL_BOWSER, PANEL_BOWSER +}; + +JumpGamePanelType N(InitialConfigurations)[4][NUM_BLOCKS] = { + { 0, 2, 0, 1, 3, 1, 0, 1, 0, 3, 2 }, + { 3, 0, 1, 2, 0, 2, 0, 1, 1, 3, 0 }, + { 1, 3, 0, 0, 1, 2, 3, 0, 1, 2, 0 }, + { 0, 0, 2, 1, 3, 3, 1, 1, 2, 0, 0 }, +}; + +EvtScript N(EVS_ManageMinigame) = { + EVT_LABEL(0) + EVT_SET(LVarA, 0) + EVT_SET(LVarB, 0) + EVT_CALL(GetNpcVar, NPC_Toad, 4, LVarC) + EVT_LOOP(11) + EVT_CALL(N(GetPanelInfo), LVarA) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(0) + EVT_CALL(EnableModel, LVar1, FALSE) + EVT_CALL(N(SetPanelState), LVarA, 1) + EVT_CASE_EQ(2) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(N(InitPanelEmergeFromBlock), LVarA) + EVT_CALL(EnableModel, LVar1, TRUE) + EVT_CALL(N(SetPanelState), LVarA, 3) + EVT_CASE_EQ(4) + EVT_IF_NE(LVar2, 3) + EVT_IF_LT(LVar3, LVarC) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_END_IF + EVT_END_IF + EVT_CALL(N(InitPanelHoldAboveBlock), LVarA) + EVT_CALL(N(SetPanelState), LVarA, 5) + EVT_CASE_EQ(6) + EVT_CALL(N(InitPanelMoveToTally), LVarA) + EVT_CALL(N(SetPanelState), LVarA, 7) + EVT_CASE_EQ(8) + EVT_CALL(N(EndPanelAnimation), LVarA) + EVT_CALL(N(SetPanelState), LVarA, 9) + EVT_END_SWITCH + EVT_SWITCH(LVar0) + EVT_CASE_EQ(3) + EVT_CALL(N(UpdatePanelEmergeFromBlock), LVarA) + EVT_IF_EQ(LVar3, 1) + EVT_CALL(N(SetPanelState), LVarA, 4) + EVT_END_IF + EVT_CASE_EQ(5) + EVT_CALL(N(UpdatetPanelHoldAboveBlock), LVarA) + EVT_IF_EQ(LVar3, 1) + EVT_CALL(N(SetPanelState), LVarA, 6) + EVT_END_IF + EVT_CASE_EQ(7) + EVT_CALL(N(UpdatePanelMoveToTally), LVarA) + EVT_IF_EQ(LVar3, 1) + EVT_CALL(N(SetPanelState), LVarA, 8) + EVT_END_IF + EVT_CASE_EQ(9) + EVT_IF_EQ(LVar2, 3) + EVT_SET(LVarB, 1) + EVT_ELSE + EVT_IF_EQ(LVar3, LVarC) + EVT_SET(LVarB, 2) + EVT_END_IF + EVT_END_IF + EVT_END_SWITCH + EVT_IF_GE(LVar0, 2) + EVT_CALL(N(GetPanelPos), LVarA) + EVT_CALL(TranslateModel, LVar1, LVar5, LVar6, LVar7) + EVT_CALL(RotateModel, LVar1, LVar8, EVT_FLOAT(0.0), EVT_FLOAT(1.0), EVT_FLOAT(0.0)) + EVT_CALL(ScaleModel, LVar1, LVar9, LVar9, EVT_FLOAT(1.0)) + EVT_END_IF + EVT_ADD(LVarA, 1) + EVT_END_LOOP + EVT_IF_NE(LVarB, 0) + EVT_GOTO(99) + EVT_END_IF + EVT_WAIT(1) + EVT_GOTO(0) + EVT_LABEL(99) + EVT_CALL(N(EnableMenus)) + EVT_THREAD + EVT_WAIT(15) + EVT_CALL(PopSong) + EVT_END_THREAD + EVT_SWITCH(LVarB) + EVT_CASE_EQ(1) + EVT_CALL(PlaySoundWithVolume, SOUND_CANNON2, 0) + EVT_WAIT(10) + EVT_CALL(PlaySoundWithVolume, SOUND_CANNON2, 0) + EVT_WAIT(10) + EVT_CALL(N(EndBowserPanelAnimation)) + EVT_CALL(TranslateModel, LVar1, LVar5, LVar6, LVar7) + EVT_WAIT(15) + EVT_CALL(SpeakToPlayer, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_MGM_0034) + EVT_CASE_EQ(2) + EVT_SWITCH(LVarC) + EVT_CASE_EQ(4) + EVT_CALL(N(UpdateRecords)) + EVT_CALL(SpeakToPlayer, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_MGM_0035) + EVT_CASE_EQ(6) + EVT_CALL(N(UpdateRecords)) + EVT_CALL(SpeakToPlayer, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_MGM_0036) + EVT_CASE_EQ(8) + EVT_CALL(SpeakToPlayer, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_MGM_0037) + EVT_CALL(N(DoubleScore)) + EVT_CALL(PlaySoundWithVolume, SOUND_3FC, 0) + EVT_WAIT(30) + EVT_CALL(N(UpdateRecords)) + EVT_CALL(SpeakToPlayer, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_MGM_0038) + EVT_END_SWITCH + EVT_CALL(ShowCoinCounter, TRUE) + EVT_WAIT(10) + EVT_CALL(N(GiveCoinReward)) + EVT_WAIT(15) + EVT_CALL(ShowCoinCounter, FALSE) + EVT_WAIT(5) + EVT_CALL(SpeakToPlayer, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_MGM_003A) + EVT_END_SWITCH + EVT_WAIT(10) + EVT_CALL(N(DestroyBlockEntities)) + EVT_EXEC(N(EVS_InitializePanels)) + EVT_WAIT(1) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OnBreakBlock_0) = { + EVT_CALL(N(OnBreakBlock), 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OnBreakBlock_1) = { + EVT_CALL(N(OnBreakBlock), 1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OnBreakBlock_2) = { + EVT_CALL(N(OnBreakBlock), 2) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OnBreakBlock_3) = { + EVT_CALL(N(OnBreakBlock), 3) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OnBreakBlock_4) = { + EVT_CALL(N(OnBreakBlock), 4) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OnBreakBlock_5) = { + EVT_CALL(N(OnBreakBlock), 5) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OnBreakBlock_6) = { + EVT_CALL(N(OnBreakBlock), 6) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OnBreakBlock_7) = { + EVT_CALL(N(OnBreakBlock), 7) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OnBreakBlock_8) = { + EVT_CALL(N(OnBreakBlock), 8) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OnBreakBlock_9) = { + EVT_CALL(N(OnBreakBlock), 9) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OnBreakBlock_10) = { + EVT_CALL(N(OnBreakBlock), 10) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_InitializePanels) = { + EVT_CALL(SetNpcVar, NPC_Toad, 2, -1) + EVT_CALL(N(InitializePanels)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_802424A4) = { + EVT_CALL(N(CreateMinigame)) + EVT_EXEC(N(EVS_InitializePanels)) + EVT_EXEC(N(EVS_ManageMinigame)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_DestroyMinigame) = { + EVT_CALL(N(DestroyMinigame)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Toad) = { + EVT_CALL(GetSelfVar, 1, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(SetSelfVar, 1, 1) + EVT_END_IF + EVT_CALL(GetSelfVar, 2, LVar0) + EVT_IF_EQ(LVar0, -1) + EVT_IF_EQ(GF_MGM_Met_JumpAttack, FALSE) + EVT_CALL(N(SetMsgImgs_Panels)) + EVT_CALL(SpeakToPlayer, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_MGM_002D) + EVT_SET(GF_MGM_Met_JumpAttack, TRUE) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_MGM_002E) + EVT_END_IF + EVT_CALL(ShowCoinCounter, TRUE) + EVT_CALL(N(GetCoinCount)) + EVT_IF_LT(LVarA, 10) + EVT_CALL(ContinueSpeech, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_MGM_0039) + EVT_CALL(N(HideCoinCounter)) + EVT_WAIT(12) + EVT_EXEC(N(EVS_DestroyMinigame)) + EVT_CALL(GotoMap, EVT_PTR("mgm_00"), mgm_00_ENTRY_1) + EVT_WAIT(100) + EVT_RETURN + EVT_END_IF + EVT_CALL(ShowChoice, MSG_Choice_004E) + EVT_IF_EQ(LVar0, 3) + EVT_CALL(N(HideCoinCounter)) + EVT_WAIT(5) + EVT_CALL(ContinueSpeech, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_MGM_0032) + EVT_EXEC(N(EVS_DestroyMinigame)) + EVT_CALL(GotoMap, EVT_PTR("mgm_00"), mgm_00_ENTRY_1) + EVT_WAIT(100) + EVT_RETURN + EVT_END_IF + EVT_CALL(GetSelfVar, 6, LVar1) + EVT_IF_LT(LVar1, 100) + EVT_ADD(LVar1, 1) + EVT_CALL(SetSelfVar, 6, LVar1) + EVT_END_IF + EVT_THREAD + EVT_CALL(N(TakeCoinCost)) + EVT_END_THREAD + EVT_SWITCH(LVar0) + EVT_CASE_EQ(0) + EVT_CALL(SetNpcVar, NPC_Toad, 4, 4) + EVT_CALL(ContinueSpeech, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_MGM_002F) + EVT_CASE_EQ(1) + EVT_CALL(SetNpcVar, NPC_Toad, 4, 6) + EVT_CALL(ContinueSpeech, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_MGM_0030) + EVT_CASE_EQ(2) + EVT_CALL(SetNpcVar, NPC_Toad, 4, 8) + EVT_CALL(ContinueSpeech, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_MGM_0031) + EVT_CASE_EQ(3) + EVT_END_SWITCH + EVT_CALL(N(HideCoinCounter)) + EVT_CALL(EndSpeech, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 5) + EVT_WAIT(5) + EVT_CALL(N(CreateBlockEntities)) + EVT_WAIT(10) + EVT_CALL(EndSpeech, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 5) + EVT_CALL(PushSong, 133, 0) + EVT_WAIT(10) + EVT_CALL(EndSpeech, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 5) + EVT_CALL(N(DisableMenus)) + EVT_CALL(SetNpcVar, NPC_Toad, 3, -1) + EVT_CALL(SetNpcVar, NPC_Toad, 2, 0) + EVT_WAIT(1) + EVT_ELSE + EVT_CALL(N(SetMsgVars_BlocksRemaining)) + EVT_CALL(SpeakToPlayer, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_MGM_0033) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Toad) = { + EVT_CALL(SetNpcPos, NPC_SELF, 75, -1, 100) + EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 0) + EVT_CALL(SetNpcVar, NPC_Toad, 2, -1) + EVT_CALL(SetNpcVar, NPC_Toad, 1, 0) + EVT_CALL(SetNpcVar, NPC_Toad, 6, 0) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Toad))) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_Toad) = { + .id = NPC_Toad, + .settings = &N(NpcSettings_Toad), + .pos = { 0.0f, 0.0f, -20.0f }, + .yaw = 270, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .init = &N(EVS_NpcInit_Toad), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Toad_Red_Idle, + .walk = ANIM_Toad_Red_Walk, + .run = ANIM_Toad_Red_Run, + .chase = ANIM_Toad_Red_Run, + .anim_4 = ANIM_Toad_Red_Idle, + .anim_5 = ANIM_Toad_Red_Idle, + .death = ANIM_Toad_Red_Disappointed, + .hit = ANIM_Toad_Red_Disappointed, + .anim_8 = ANIM_Toad_Red_Run, + .anim_9 = ANIM_Toad_Red_Run, + .anim_A = ANIM_Toad_Red_Run, + .anim_B = ANIM_Toad_Red_Run, + .anim_C = ANIM_Toad_Red_Run, + .anim_D = ANIM_Toad_Red_Run, + .anim_E = ANIM_Toad_Red_Run, + .anim_F = ANIM_Toad_Red_Run, + }, + .tattle = MSG_NpcTattle_MGM_JumpAttackGuide, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Toad)), + {} +}; diff --git a/src/world/area_mgm/mgm_01/mgm_01_3_entity.c b/src/world/area_mgm/mgm_01/mgm_01_3_entity.c new file mode 100644 index 0000000000..a29676bae5 --- /dev/null +++ b/src/world/area_mgm/mgm_01/mgm_01_3_entity.c @@ -0,0 +1,20 @@ +#include "mgm_01.h" +#include "entity.h" + +extern API_CALLABLE(N(SetMsgImgs_Panels)); + +EvtScript N(EVS_ReadSign_HowToPlay) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(N(SetMsgImgs_Panels)) + EVT_CALL(ShowMessageAtScreenPos, MSG_MGM_003B, 160, 40) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_Signpost), -55, -2, -80, 0, MAKE_ENTITY_END) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_ReadSign_HowToPlay))) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mgm/mgm_01/mgm_01_4_images.c b/src/world/area_mgm/mgm_01/mgm_01_4_images.c new file mode 100644 index 0000000000..9523776374 --- /dev/null +++ b/src/world/area_mgm/mgm_01/mgm_01_4_images.c @@ -0,0 +1,52 @@ +#include "mgm_01.h" + +#include "world/area_mgm/mgm_01/panel_1_coin.png.h" +#include "world/area_mgm/mgm_01/panel_1_coin.png.inc.c" +#include "world/area_mgm/mgm_01/panel_1_coin.pal.inc.c" + +#include "world/area_mgm/mgm_01/panel_5_coins.png.h" +#include "world/area_mgm/mgm_01/panel_5_coins.png.inc.c" +#include "world/area_mgm/mgm_01/panel_5_coins.pal.inc.c" + +#include "world/area_mgm/mgm_01/panel_times_5.png.h" +#include "world/area_mgm/mgm_01/panel_times_5.png.inc.c" +#include "world/area_mgm/mgm_01/panel_times_5.pal.inc.c" + +#include "world/area_mgm/mgm_01/panel_bowser.png.h" +#include "world/area_mgm/mgm_01/panel_bowser.png.inc.c" +#include "world/area_mgm/mgm_01/panel_bowser.pal.inc.c" + +MessageImageData N(MsgImgs_Panels)[] = { + { + .raster = N(panel_1_coin_img), + .palette = N(panel_1_coin_pal), + .width = N(panel_1_coin_img_width), + .height = N(panel_1_coin_img_height), + .format = G_IM_FMT_CI, + .bitDepth = G_IM_SIZ_4b, + }, + { + .raster = N(panel_5_coins_img), + .palette = N(panel_5_coins_pal), + .width = N(panel_5_coins_img_width), + .height = N(panel_5_coins_img_height), + .format = G_IM_FMT_CI, + .bitDepth = G_IM_SIZ_4b, + }, + { + .raster = N(panel_times_5_img), + .palette = N(panel_times_5_pal), + .width = N(panel_times_5_img_width), + .height = N(panel_times_5_img_height), + .format = G_IM_FMT_CI, + .bitDepth = G_IM_SIZ_4b, + }, + { + .raster = N(panel_bowser_img), + .palette = N(panel_bowser_pal), + .width = N(panel_bowser_img_width), + .height = N(panel_bowser_img_height), + .format = G_IM_FMT_CI, + .bitDepth = G_IM_SIZ_4b, + } +}; diff --git a/src/world/area_mgm/mgm_02/E15D80.c b/src/world/area_mgm/mgm_02/E15D80.c deleted file mode 100644 index 69cfbdd673..0000000000 --- a/src/world/area_mgm/mgm_02/E15D80.c +++ /dev/null @@ -1,1003 +0,0 @@ -#include "mgm_02.h" -#include "hud_element.h" -#include "effects.h" -#include "model.h" -#include "entity.h" -#include "sprite/npc/Bobomb.h" -#include "sprite/npc/Fuzzy.h" - -void startup_draw_prim_rect_COPY(s16 left, s16 top, s16 right, s16 bottom, u16 r, u16 g, u16 b, u16 a); -void delete_entity(s32); -void partner_enable_input(void); - -#define SCOREKEEPER_ENEMY_IDX 0 -#define SMASH_DATA_VAR_IDX 0 - -#define PLAY_COST 10 -#define PLAY_TIME 900 -#define NUM_BOXES 35 -#define NUM_PANELS 10 - -#define SMASH_DATA_VAR_IDX 0 -#define SMASH_DATA_VAR_IDX 0 - -#define FUZZY_NPC_ID_BASE 0x0A -#define BOBOMB_NPC_ID_BASE 0x1E -#define LUIGI_NPC_ID_BASE 0x64 - -extern HudScript HES_BlueMeter; -extern HudScript HES_AButton; -extern HudScript HES_MashAButton; - -extern s32 mgm_02_InitialConfigurations[3][NUM_BOXES]; -extern s32 mgm_02_BoxModelIDs[NUM_BOXES]; -extern s32 mgm_02_BoxColliderIDs[NUM_BOXES]; -extern s32 mgm_02_PanelModelIDs[NUM_PANELS]; -extern s32 D_80248600[NUM_PANELS]; //TODO set name: mgm_02_PanelModelsAssigned - -extern IMG_BIN mgm_02_PeachPanelImg; -extern PAL_BIN mgm_02_PeachPanelPal; - -extern EvtScript D_80242A3C_E187BC; // EVT_ReadSign - -typedef enum SmashGameBoxCotent { - BOX_CONTENT_FUZZY = 0, - BOX_CONTENT_BOMB = 1, - BOX_CONTENT_PEACH = 2, - BOX_CONTENT_EMPTY = 3 -} SmashGameBoxCotent; - -typedef enum SmashGameStunFlags { - STUN_FLAGS_STUNNED = 1, - STUN_FLAGS_CHANGED = 2, - STUN_FLAGS_GRABBED = 4 -} SmashGameStunFlags; - -typedef enum SmashGameBoxState { - BOX_STATE_FUZZY_INIT = 10, - BOX_STATE_FUZZY_IDLE = 11, - BOX_STATE_FUZZY_POPUP = 12, - BOX_STATE_FUZZY_HIT = 13, - BOX_STATE_FUZZY_ATTACH = 14, - BOX_STATE_FUZZY_GRAB = 15, - BOX_STATE_FUZZY_DETACH = 16, - BOX_STATE_FUZZY_DONE = 17, - BOX_STATE_FUZZY_END = 18, - - BOX_STATE_BOMB_INIT = 30, - BOX_STATE_BOMB_IDLE = 31, - BOX_STATE_BOMB_POPUP = 32, - BOX_STATE_BOMB_HIT = 33, - BOX_STATE_BOMB_ATTACK = 34, - BOX_STATE_BOMB_STUN = 35, - BOX_STATE_BOMB_DONE = 36, - BOX_STATE_BOMB_END = 37, - - BOX_STATE_EMPTY_INIT = 50, - BOX_STATE_EMPTY_IDLE = 51, - BOX_STATE_EMPTY_HIT = 52, - - BOX_STATE_PEACH_INIT = 70, - BOX_STATE_PEACH_IDLE = 71, - BOX_STATE_PEACH_POPUP = 72, - BOX_STATE_PEACH_HIT = 73, - BOX_STATE_PEACH_EMERGE = 74, - BOX_STATE_PEACH_DONE = 75 -} SmashGameBoxState; - -typedef struct SmashGameBoxData { - /* 0x00 */ SmashGameBoxState state; - /* 0x04 */ s32 stateTimer; - /* 0x08 */ s32 content; - /* 0x0C */ s32 modelID; - /* 0x10 */ s32 colliderID; - /* 0x14 */ s32 npcID; - /* 0x18 */ s32 peachPanelModelID; -} SmashGameBoxData; /* size = 0x1C */ - -typedef struct SmashGameData { - /* 0x000 */ s32 workerID; - /* 0x004 */ s32 found; - /* 0x008 */ s32 timeLeft; // num frames at 30fps - /* 0x00C */ s32 hudElemID_AButton; - /* 0x010 */ s32 hudElemID_Meter; - /* 0x014 */ s32 windowA_posX; - /* 0x018 */ s32 windowB_posX; - /* 0x01C */ s32 signpostEntity; - /* 0x020 */ s32 currentScore; - /* 0x024 */ s32 mashProgress; - /* 0x028 */ SmashGameStunFlags stunFlags; - /* 0x02C */ SmashGameBoxData box[NUM_BOXES]; -} SmashGameData; /* size = 0x400 */ - -void N(draw_score_display)(void* renderData) { - Enemy* scorekeeper = get_enemy(SCOREKEEPER_ENEMY_IDX); - SmashGameData* data = scorekeeper->varTablePtr[SMASH_DATA_VAR_IDX]; - s32 hudElemA; - s32 hudElemMeter; - s32 timeLeft; - s32 seconds; - s32 deciseconds; - - // show mash meter while grabbed by a fuzzy - if (data->stunFlags & STUN_FLAGS_GRABBED) { - hudElemA = data->hudElemID_AButton; - hud_element_set_render_pos(hudElemA, 90, 90); - hud_element_draw_clipped(hudElemA); - hudElemMeter = data->hudElemID_Meter; - hud_element_set_render_pos(hudElemMeter, 90, 120); - hud_element_draw_clipped(hudElemMeter); - startup_draw_prim_rect_COPY(62, 116, 62 + (s32)(((f32)data->mashProgress / 12.0) * 59.0), 116 + 5, 0, 228, 134, 255); - } - - if (scorekeeper->varTable[3] == 0 || scorekeeper->varTable[3] >= 4) { - if (data->windowA_posX > -80) { - data->windowA_posX -= 10; - if (data->windowA_posX < -80) { - data->windowA_posX = -80; - } - } - } else { - if (data->windowA_posX < 23) { - data->windowA_posX += 10; - if (data->windowA_posX > 23) { - data->windowA_posX = 23; - } - } - } - - if (scorekeeper->varTable[3] == 0) { - if (data->windowB_posX < SCREEN_WIDTH) { - data->windowB_posX += 10; - if (data->windowB_posX > SCREEN_WIDTH) { - data->windowB_posX = SCREEN_WIDTH; - } - } - } else { - if (data->windowB_posX > 225) { - data->windowB_posX -= 10; - if (data->windowB_posX < 225) { - data->windowB_posX = 225; - } - } - } - - draw_box(0, 9, data->windowA_posX, 23, 0, 80, 38, 180, 0, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, NULL, NULL, NULL, SCREEN_WIDTH, SCREEN_HEIGHT, NULL); - draw_msg(MSG_MGM_0047, data->windowA_posX + 42, 28, 255, MSG_PAL_WHITE, 0); - draw_number(NUM_PANELS - data->found, data->windowA_posX + 65, 43, TRUE, MSG_PAL_WHITE, 255, 3); - draw_ci_image_with_clipping(&mgm_02_PeachPanelImg, 32, 32, G_IM_FMT_CI, G_IM_SIZ_4b, &mgm_02_PeachPanelPal, - data->windowA_posX + 5, 26, 10, 20, 300, 200, 255); - - timeLeft = MIN(data->timeLeft, PLAY_TIME); - deciseconds = ((f32)(timeLeft % 30) * 10.0) / 30; - seconds = timeLeft / 30; - - draw_box(0, 0xB, data->windowB_posX, 27, 0, 60, 20, 180, 0, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, NULL, NULL, NULL, SCREEN_WIDTH, SCREEN_HEIGHT, NULL); - // draw whole seconds - draw_number(seconds, data->windowB_posX + 29, 31, TRUE, MSG_PAL_WHITE, 255, 3); - // draw tenths of seconds - draw_number(deciseconds, data->windowB_posX + 40, 31, TRUE, MSG_PAL_WHITE, 255, 0); - // draw dot - draw_msg(MSG_MGM_0024, data->windowB_posX + 30, 29, 255, MSG_PAL_WHITE, 0); -} - -void N(work_draw_score)(void) { - RenderTask task; - - task.renderMode = RENDER_MODE_2D; - task.appendGfxArg = 0; - task.appendGfx = &mgm_02_draw_score_display; - task.distance = 0; - - queue_render_task(&task); -} - -ApiStatus N(CreateScoreDisplay)(Evt* script, s32 isInitialCall) { - SmashGameData* data = get_enemy(SCOREKEEPER_ENEMY_IDX)->varTablePtr[SMASH_DATA_VAR_IDX]; - s32 hudElemA, hudElemMeter; - - if (isInitialCall) { - data->workerID = create_generic_entity_world(NULL, &mgm_02_work_draw_score); - - hudElemA = hud_element_create(&HES_AButton); - data->hudElemID_AButton = hudElemA; - hud_element_set_render_depth(hudElemA, 0); - hud_element_set_flags(hudElemA, HUD_ELEMENT_FLAGS_80); - hud_element_set_tint(hudElemA, 255, 255, 255); - hud_element_set_script(hudElemA, &HES_AButton); - - hudElemMeter = hud_element_create(&HES_BlueMeter); - data->hudElemID_Meter = hudElemMeter; - hud_element_set_render_depth(hudElemMeter, 0); - hud_element_set_flags(hudElemMeter, HUD_ELEMENT_FLAGS_80); - } - - return ApiStatus_BLOCK; -} - -ApiStatus N(DisableMenus)(Evt* script, s32 isInitialCall) { - gOverrideFlags |= GLOBAL_OVERRIDES_DISABLE_MENUS; - func_800E9894(); - close_status_menu(); - return ApiStatus_DONE2; -} - -ApiStatus N(EnableMenus)(Evt* script, s32 isInitialCall) { - gOverrideFlags &= ~GLOBAL_OVERRIDES_DISABLE_MENUS; - return ApiStatus_DONE2; -} - -ApiStatus N(DestroySignpost)(Evt* script, s32 isInitialCall) { - SmashGameData* data = get_enemy(SCOREKEEPER_ENEMY_IDX)->varTablePtr[SMASH_DATA_VAR_IDX]; - delete_entity(data->signpostEntity); - return ApiStatus_DONE2; -} - -ApiStatus N(CreateSignpost)(void) { - SmashGameData* data = get_enemy(SCOREKEEPER_ENEMY_IDX)->varTablePtr[SMASH_DATA_VAR_IDX]; - s32 entityIndex = create_entity(&Entity_Signpost, 355, 20, -180, 0, 0, 0, 0, MAKE_ENTITY_END); - data->signpostEntity = entityIndex; - get_entity_by_index(entityIndex)->boundScriptBytecode = &D_80242A3C_E187BC; - - return ApiStatus_DONE2; -} - -ApiStatus N(OnHitBox)(Evt* script, s32 isInitialCall0) { - SmashGameData* data = get_enemy(SCOREKEEPER_ENEMY_IDX)->varTablePtr[SMASH_DATA_VAR_IDX]; - s32 hitModelID = evt_get_variable(script, LVarA); - s32 hitColliderID = evt_get_variable(script, LVarB); // unused - s32 i; - - for (i = 0; i < NUM_BOXES; i++) { - if (hitModelID == data->box[i].modelID) { - break; - } - } - - evt_set_variable(script, LVarC, data->box[i].content); - - switch (data->box[i].content) { - case BOX_CONTENT_FUZZY: - evt_set_variable(script, LVarD, data->box[i].npcID); - data->box[i].state = BOX_STATE_FUZZY_HIT; - break; - case BOX_CONTENT_BOMB: - evt_set_variable(script, LVarD, data->box[i].npcID); - data->box[i].state = BOX_STATE_BOMB_HIT; - break; - case BOX_CONTENT_EMPTY: - evt_set_variable(script, LVarD, data->box[i].npcID); - data->box[i].state = BOX_STATE_EMPTY_HIT; - break; - case BOX_CONTENT_PEACH: - data->found++; - data->box[i].state = BOX_STATE_PEACH_HIT; - break; - } - - return ApiStatus_DONE2; -} - -ApiStatus N(SetBoxContents)(Evt* script, s32 isInitialCall) { - s32 initialConfiguration; - s32 configuration[NUM_BOXES]; - s32 indexA, indexB, temp; - s32 i, j; - - Enemy* enemy; - Npc* npc; - - SmashGameData* data = get_enemy(SCOREKEEPER_ENEMY_IDX)->varTablePtr[SMASH_DATA_VAR_IDX]; - data->found = 0; - data->timeLeft = PLAY_TIME + 10; - data->currentScore = 0; - data->mashProgress = 0; - data->stunFlags = 0; - - // choose one of three initial configurations at random - initialConfiguration = rand_int(1000) % ARRAY_COUNT(mgm_02_InitialConfigurations); - for (i = 0; i < NUM_BOXES; i++) { - configuration[i] = mgm_02_InitialConfigurations[initialConfiguration][i]; - } - - // randomly swap 10000 pairs - for (i = 0; i < 10000; i++) { - indexA = rand_int(1000) % NUM_BOXES; - indexB = rand_int(1000) % NUM_BOXES; - - if (indexA != indexB) { - temp = configuration[indexB]; - configuration[indexB] = configuration[indexA]; - configuration[indexA] = temp; - } - } - - for (i = 0; i < NUM_BOXES; i++) { - data->box[i].state = -1; - data->box[i].stateTimer = 0; - data->box[i].content = configuration[i]; - data->box[i].modelID = mgm_02_BoxModelIDs[i]; - data->box[i].colliderID = mgm_02_BoxColliderIDs[i]; - data->box[i].npcID = -1; - data->box[i].peachPanelModelID = -1; - } - - for (i = FUZZY_NPC_ID_BASE; i < FUZZY_NPC_ID_BASE + 5; i++) { - enemy = get_enemy(i); - enemy->varTable[0] = 0; - } - - for (i = BOBOMB_NPC_ID_BASE; i < BOBOMB_NPC_ID_BASE + 5; i++) { - enemy = get_enemy(i); - enemy->varTable[0] = 0; - } - - for (i = LUIGI_NPC_ID_BASE; i < LUIGI_NPC_ID_BASE + 10; i++) { - enemy = get_enemy(i); - enemy->varTable[0] = 0; - } - - for (i = 0; i < ARRAY_COUNT(D_80248600); i++) { - D_80248600[i] = FALSE; - } - - for (i = 0; i < NUM_BOXES; i++) { - switch (data->box[i].content) { - case BOX_CONTENT_FUZZY: - data->box[i].state = BOX_STATE_FUZZY_INIT; - for (j = FUZZY_NPC_ID_BASE; j < FUZZY_NPC_ID_BASE + 5; j++) { - enemy = get_enemy(j); - if (enemy->varTable[0] == 0) { - npc = get_npc_unsafe(enemy->npcID); - enemy->varTable[0] = 1; - data->box[i].npcID = j; - disable_npc_shadow(npc); - npc->flags |= NPC_FLAG_2; - break; - } - } - break; - case BOX_CONTENT_BOMB: - data->box[i].state = BOX_STATE_BOMB_INIT; - for (j = BOBOMB_NPC_ID_BASE; j < BOBOMB_NPC_ID_BASE + 5; j++) { - enemy = get_enemy(j); - if (enemy->varTable[0] == 0) { - npc = get_npc_unsafe(enemy->npcID); - enemy->varTable[0] = 1; - data->box[i].npcID = j; - disable_npc_shadow(npc); - npc->flags |= NPC_FLAG_2; - break; - } - } - break; - case BOX_CONTENT_PEACH: - data->box[i].state = BOX_STATE_PEACH_INIT; - for (j = LUIGI_NPC_ID_BASE; j < LUIGI_NPC_ID_BASE + 10; j++) { - enemy = get_enemy(j); - if (enemy->varTable[0] == 0) { - npc = get_npc_unsafe(enemy->npcID); - enemy->varTable[0] = 1; - data->box[i].npcID = j; - disable_npc_shadow(npc); - npc->flags |= NPC_FLAG_2; - break; - } - } - // ARRAY BOUNDS ERROR IN ORIGINAL CODE! - for (j = 0; j <= ARRAY_COUNT(D_80248600); j++) { - if (!D_80248600[j]) { - D_80248600[j] = TRUE; - data->box[i].peachPanelModelID = mgm_02_PanelModelIDs[j]; - break; - } - } - break; - case 3: - data->box[i].state = BOX_STATE_EMPTY_INIT; - break; - } - } - return ApiStatus_DONE2; -} - -ApiStatus N(RunMinigame)(Evt* script, s32 isInitialCall) { - SmashGameData* data; - Enemy* enemy; - - Npc* npc; - s32 writeback; - - Model* model; - Matrix4f mtx; - f32 centerX, centerY, centerZ; - f32 sizeX, sizeY, sizeZ; - s32 i; - - s32 gameFinished; - s32 hittingPeachBlock; - - gameFinished = FALSE; - hittingPeachBlock = FALSE; - data = get_enemy(0)->varTablePtr[0]; - - for (i = 0; i < NUM_BOXES; i++) { - if (data->box[i].npcID != -1) { - enemy = get_enemy(data->box[i].npcID); - npc = get_npc_unsafe(enemy->npcID); - switch (data->box[i].state) { - case BOX_STATE_FUZZY_INIT: - data->box[i].state = BOX_STATE_FUZZY_IDLE; - data->box[i].stateTimer = rand_int(210); - npc->pos.y = -1000.0f; - npc->flags &= -(NPC_FLAG_PASSIVE | NPC_FLAG_2); - disable_npc_shadow(npc); - // fallthrough - case BOX_STATE_FUZZY_IDLE: - data->box[i].stateTimer--; - if (data->box[i].stateTimer <= 0) { - npc->currentAnim = ANIM_Fuzzy_Anim02; - data->box[i].state = BOX_STATE_FUZZY_POPUP; - sfx_play_sound_at_position(enemy->varTable[8], 0x100000, npc->pos.x, npc->pos.y, npc->pos.z); - get_model_center_and_size(data->box[i].modelID, ¢erX, ¢erY, ¢erZ, &sizeX, &sizeY, &sizeZ); - npc->jumpVelocity = 10.5f; - npc->pos.x = centerX; - npc->jumpScale = 1.5f; - npc->pos.y = centerY - 12.5; - npc->moveToPos.y = npc->pos.y; - npc->pos.z = centerZ + 2.0; - data->box[i].stateTimer = 0; - } - break; - case BOX_STATE_FUZZY_POPUP: - data->box[i].stateTimer++; - npc->pos.y += npc->jumpVelocity; - npc->jumpVelocity -= npc->jumpScale; - if ((npc->moveToPos.y + 20.0f) < npc->pos.y) { - enable_npc_shadow(npc); - } else { - disable_npc_shadow(npc); - } - if ((npc->jumpVelocity < 0.0) && (npc->pos.y <= npc->moveToPos.y)) { - data->box[i].state = BOX_STATE_FUZZY_IDLE; - data->box[i].stateTimer = rand_int(330) + 90; - npc->pos.y = -1000.0f; - if (rand_int(100) < 50) { - npc->yaw = 270.0f; - } else { - npc->yaw = 90.0f; - } - disable_npc_shadow(npc); - } - break; - case BOX_STATE_FUZZY_HIT: - hud_element_set_script(data->hudElemID_AButton, &HES_AButton); - hud_element_set_alpha(data->hudElemID_AButton, 160); - hud_element_set_alpha(data->hudElemID_Meter, 160); - data->mashProgress = 0; - data->stunFlags |= STUN_FLAGS_GRABBED; - enable_npc_shadow(npc); - data->stunFlags |= (STUN_FLAGS_STUNNED | STUN_FLAGS_CHANGED); - npc->duration = 8; - sfx_play_sound(enemy->varTable[8]); - data->box[i].state = BOX_STATE_FUZZY_ATTACH; - gPlayerStatusPtr->anim = ANIM_Mario_CrouchStill; - npc->currentAnim = ANIM_Fuzzy_Anim03; - get_model_center_and_size(data->box[i].modelID, ¢erX, ¢erY, ¢erZ, &sizeX, &sizeY, &sizeZ); - npc->pos.x = centerX; - npc->pos.y = centerY; - npc->pos.z = centerZ + 2.0; - npc->moveToPos.y = gPlayerStatusPtr->position.y + 35.0f; - npc->jumpVelocity = 10.5f; - npc->jumpScale = 1.5f; - - data->box[i].stateTimer = 0; - fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, 0.0f, 10, &writeback); - enemy->varTable[1] = npc->pos.x * 10.0f; - enemy->varTable[2] = npc->pos.y * 10.0f; - enemy->varTable[3] = npc->pos.z * 10.0f; - enemy->varTable[4] = gPlayerStatusPtr->position.x * 10.0f; - enemy->varTable[5] = (gPlayerStatusPtr->position.y + 28.0f) * 10.0f; - enemy->varTable[6] = (gPlayerStatusPtr->position.z + 2.0f) * 10.0f; - enemy->varTable[7] = 0; - break; - case BOX_STATE_FUZZY_ATTACH: - enemy->varTable[7]++; - npc->pos.x = update_lerp(EASING_LINEAR, (f32)enemy->varTable[1] / 10.0, (f32)enemy->varTable[4] / 10.0, enemy->varTable[7], 8); - npc->pos.y = update_lerp(EASING_LINEAR, (f32)enemy->varTable[2] / 10.0, (f32)enemy->varTable[5] / 10.0, enemy->varTable[7], 8); - npc->pos.z = update_lerp(EASING_LINEAR, (f32)enemy->varTable[3] / 10.0, (f32)enemy->varTable[6] / 10.0, enemy->varTable[7], 8); - gPlayerStatusPtr->anim = ANIM_Mario_CrouchStill; - npc->duration--; - if (npc->duration <= 0) { - npc->currentAnim = ANIM_Fuzzy_Anim0F; - gPlayerStatusPtr->anim = ANIM_Mario_RunPanic; - data->mashProgress = 0; - npc->pos.x = gPlayerStatusPtr->position.x; - npc->pos.y = gPlayerStatusPtr->position.y + 28.0; - npc->pos.z = gPlayerStatusPtr->position.z + 2.0; - hud_element_set_script(data->hudElemID_AButton, &HES_MashAButton); - hud_element_set_alpha(data->hudElemID_AButton, 255); - hud_element_set_alpha(data->hudElemID_Meter, 255); - data->box[i].state = BOX_STATE_FUZZY_GRAB; - } - break; - case BOX_STATE_FUZZY_GRAB: - gPlayerStatusPtr->anim = ANIM_Mario_RunPanic; - if (gGameStatusPtr->pressedButtons[0] & BUTTON_A) { - data->mashProgress++; - } - if (data->mashProgress >= 12) { - gPlayerStatusPtr->anim = ANIM_Mario_10002; - data->stunFlags &= ~STUN_FLAGS_STUNNED; - data->stunFlags |= STUN_FLAGS_CHANGED; - data->box[i].state = BOX_STATE_FUZZY_DETACH; - npc->duration = 10; - hud_element_set_script(data->hudElemID_AButton, &HES_AButton); - hud_element_set_alpha(data->hudElemID_AButton, 160); - hud_element_set_alpha(data->hudElemID_Meter, 160); - npc->currentAnim = ANIM_Fuzzy_Anim08; - npc->pos.y += 3.0; - } - break; - case BOX_STATE_FUZZY_DETACH: - npc->duration--; - if (npc->duration == 8) { - data->stunFlags &= ~STUN_FLAGS_GRABBED; - } - if (npc->duration <= 0) { - data->box[i].state = BOX_STATE_FUZZY_DONE; - disable_npc_shadow(npc); - npc->flags |= NPC_FLAG_2; - fx_walking_dust(1, npc->pos.x, npc->pos.y + 10.0f, npc->pos.z + 1.0f, 0, 0); - } - break; - case BOX_STATE_FUZZY_DONE: - break; - - case BOX_STATE_BOMB_INIT: - data->box[i].state = BOX_STATE_BOMB_IDLE; - data->box[i].stateTimer = rand_int(210); - npc->pos.y = -1000.0f; - disable_npc_shadow(npc); - npc->flags &= -(NPC_FLAG_PASSIVE | NPC_FLAG_2); - // fallthrough - case BOX_STATE_BOMB_IDLE: - data->box[i].stateTimer--; - if (data->box[i].stateTimer <= 0) { - data->box[i].state = BOX_STATE_BOMB_POPUP; - sfx_play_sound_at_position(enemy->varTable[8], 0x100000, npc->pos.x, npc->pos.y, npc->pos.z); - get_model_center_and_size(data->box[i].modelID, ¢erX, ¢erY, ¢erZ, &sizeX, &sizeY, &sizeZ); - npc->jumpVelocity = 10.5f; - npc->pos.x = centerX; - npc->jumpScale = 1.5f; - npc->pos.y = centerY - 12.5; - npc->moveToPos.y = npc->pos.y; - npc->pos.z = centerZ + 2.0; - data->box[i].stateTimer = 0; - } - break; - case BOX_STATE_BOMB_POPUP: - data->box[i].stateTimer++; - npc->pos.y += npc->jumpVelocity; - npc->jumpVelocity -= npc->jumpScale; - if ((npc->moveToPos.y + 20.0f) < npc->pos.y) { - enable_npc_shadow(npc); - } else { - disable_npc_shadow(npc); - } - if ((npc->jumpVelocity < 0.0) && (npc->pos.y <= npc->moveToPos.y)) { - data->box[i].state = BOX_STATE_BOMB_IDLE; - data->box[i].stateTimer = rand_int(330) + 90; - npc->pos.y = -1000.0f; - if (rand_int(100) < 50) { - npc->yaw = 270.0f; - } else { - npc->yaw = 90.0f; - } - disable_npc_shadow(npc); - } - break; - case BOX_STATE_BOMB_HIT: - enable_npc_shadow(npc); - npc->duration = 15; - npc->currentAnim = ANIM_Bobomb_Anim05; - data->stunFlags |= (STUN_FLAGS_STUNNED | STUN_FLAGS_CHANGED); - data->box[i].state = BOX_STATE_BOMB_ATTACK; - get_model_center_and_size(data->box[i].modelID, ¢erX, ¢erY, ¢erZ, &sizeX, &sizeY, &sizeZ); - npc->pos.x = centerX; - npc->pos.y = centerY - 10.0f; - npc->pos.z = centerZ + 8.0; - fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, 0.0f, 10, &writeback); - if (npc->pos.x > gPlayerStatusPtr->position.x) { - npc->yaw = 270.0f; - gPlayerStatusPtr->targetYaw = 95.0f; - } else { - npc->yaw = 90.0f; - gPlayerStatusPtr->targetYaw = 265.0f; - } - // rest of case could simply use fallthough, but wouldnt match - gPlayerStatusPtr->anim = ANIM_Mario_CrouchStill; - npc->duration--; - if (npc->duration <= 0) { - fx_explosion(0, npc->pos.x, npc->pos.y, npc->pos.z + 1.0f); - npc->duration = 30; - npc->pos.y = -1000.0f; - data->box[i].state = BOX_STATE_BOMB_STUN; - sfx_play_sound(SOUND_BOMB_BLAST); - } - break; - case BOX_STATE_BOMB_ATTACK: - gPlayerStatusPtr->anim = ANIM_Mario_CrouchStill; - npc->duration--; - if (npc->duration <= 0) { - fx_explosion(0, npc->pos.x, npc->pos.y, npc->pos.z + 1.0f); - npc->duration = 30; - npc->pos.y = -1000.0f; - data->box[i].state = BOX_STATE_BOMB_STUN; - sfx_play_sound(SOUND_BOMB_BLAST); - } - break; - case BOX_STATE_BOMB_STUN: - npc->duration--; - if (npc->duration == 25) { - gPlayerStatusPtr->anim = ANIM_Mario_Charred; - } - if (npc->duration <= 0) { - gPlayerStatusPtr->anim = ANIM_Mario_10002; - data->stunFlags &= ~STUN_FLAGS_STUNNED; - data->stunFlags |= STUN_FLAGS_CHANGED; - data->box[i].state = BOX_STATE_BOMB_DONE; - disable_npc_shadow(npc); - npc->flags |= NPC_FLAG_2; - } - break; - case BOX_STATE_BOMB_DONE: - break; - - case BOX_STATE_PEACH_INIT: - get_model_center_and_size(data->box[i].modelID, ¢erX, ¢erY, ¢erZ, &sizeX, &sizeY, &sizeZ); - data->box[i].state = BOX_STATE_PEACH_IDLE; - data->box[i].stateTimer = rand_int(210); - npc->pos.x = centerX; - npc->pos.y = centerY; - npc->moveToPos.y = npc->pos.y; - npc->pos.z = centerZ + 2.0; - disable_npc_shadow(npc); - // fallthrough - case BOX_STATE_PEACH_IDLE: - data->box[i].stateTimer--; - if (data->box[i].stateTimer <= 0) { - get_model_center_and_size(data->box[i].modelID, ¢erX, ¢erY, ¢erZ, &sizeX, &sizeY, &sizeZ); - data->box[i].state = BOX_STATE_PEACH_POPUP; - sfx_play_sound_at_position(SOUND_214, 0x200000, npc->pos.x, npc->pos.y, npc->pos.z); - get_model_center_and_size(data->box[i].modelID, ¢erX, ¢erY, ¢erZ, &sizeX, &sizeY, &sizeZ); - npc->jumpVelocity = 10.0f; - npc->pos.y = npc->moveToPos.y; - npc->jumpScale = 1.1f; - data->box[i].stateTimer = 0; - model = get_model_from_list_index(get_model_list_index_from_tree_index(data->box[i].peachPanelModelID)); - model->flags &= -(MODEL_FLAGS_FLAG_1 | MODEL_FLAGS_ENABLED); - if (!(model->flags & MODEL_FLAGS_HAS_TRANSFORM_APPLIED)) { - guTranslateF(model->transformMatrix, npc->pos.x, npc->pos.y, npc->pos.z); - model->flags |= (MODEL_FLAGS_USES_TRANSFORM_MATRIX | MODEL_FLAGS_HAS_TRANSFORM_APPLIED); - } - else { - guTranslateF(mtx, npc->pos.x, npc->pos.y, npc->pos.z); - guMtxCatF(mtx, model->transformMatrix, model->transformMatrix); - } - } - break; - case BOX_STATE_PEACH_POPUP: - data->box[i].stateTimer++; - npc->pos.y += npc->jumpVelocity; - npc->jumpVelocity -= npc->jumpScale; - model = get_model_from_list_index(get_model_list_index_from_tree_index(data->box[i].peachPanelModelID)); - if (!(model->flags & MODEL_FLAGS_HAS_TRANSFORM_APPLIED)) { - guTranslateF(model->transformMatrix, npc->pos.x, npc->pos.y, npc->pos.z); - model->flags |= (MODEL_FLAGS_USES_TRANSFORM_MATRIX | MODEL_FLAGS_HAS_TRANSFORM_APPLIED); - } else { - guTranslateF(mtx, npc->pos.x, npc->pos.y, npc->pos.z); - guMtxCatF(mtx, model->transformMatrix, model->transformMatrix); - } - if ((npc->moveToPos.y + 20.0f) < npc->pos.y) { - enable_npc_shadow(npc); - } else { - disable_npc_shadow(npc); - } - if ((npc->jumpVelocity < 0.0) && (npc->pos.y <= npc->moveToPos.y)) { - data->box[i].state = BOX_STATE_PEACH_IDLE; - data->box[i].stateTimer = rand_int(330) + 90; - disable_npc_shadow(npc); - model->flags |= MODEL_FLAGS_ENABLED; - } - break; - case BOX_STATE_PEACH_HIT: - sfx_play_sound(SOUND_21C); - model = get_model_from_list_index(get_model_list_index_from_tree_index(data->box[i].peachPanelModelID)); - enable_npc_shadow(npc); - npc->duration = 0; - data->box[i].state = BOX_STATE_PEACH_EMERGE; - model->flags &= -(MODEL_FLAGS_FLAG_1 | MODEL_FLAGS_ENABLED); - // fallthrough - case BOX_STATE_PEACH_EMERGE: - hittingPeachBlock = TRUE; - model = get_model_from_list_index(get_model_list_index_from_tree_index(data->box[i].peachPanelModelID)); - centerY = update_lerp(EASING_QUADRATIC_OUT, npc->moveToPos.y, npc->moveToPos.y + 30.0, npc->duration, 30); - if (!(model->flags & MODEL_FLAGS_HAS_TRANSFORM_APPLIED)) { - guTranslateF(model->transformMatrix, npc->pos.x, centerY, npc->pos.z); - model->flags |= (MODEL_FLAGS_USES_TRANSFORM_MATRIX | MODEL_FLAGS_HAS_TRANSFORM_APPLIED); - } else { - guTranslateF(mtx, npc->pos.x, centerY, npc->pos.z); - guMtxCatF(mtx, model->transformMatrix, model->transformMatrix); - } - npc->duration++; - if (npc->duration >= 30) { - data->box[i].state = BOX_STATE_PEACH_DONE; - disable_npc_shadow(npc); - model->flags |= MODEL_FLAGS_ENABLED; - } - break; - case BOX_STATE_PEACH_DONE: - break; - } - } else { - if (data->box[i].state == BOX_STATE_EMPTY_INIT) { - data->box[i].state = BOX_STATE_EMPTY_IDLE; - data->box[i].stateTimer = 0; - } - } - } - - if (data->timeLeft > 0) { - if (data->found < NUM_PANELS) { - data->timeLeft--; - if (data->timeLeft == 750) { - sfx_play_sound(SOUND_1A5); - } else if (data->timeLeft == 600) { - sfx_play_sound(SOUND_1A5); - } else if (data->timeLeft == 450) { - sfx_play_sound(SOUND_1A5); - } else if (data->timeLeft == 300) { - sfx_play_sound(SOUND_1A6); - } else if (data->timeLeft == 270) { - sfx_play_sound(SOUND_1A6); - } else if (data->timeLeft == 240) { - sfx_play_sound(SOUND_1A6); - } else if (data->timeLeft == 210) { - sfx_play_sound(SOUND_1A6); - } else if (data->timeLeft == 180) { - sfx_play_sound(SOUND_1A6); - } else if (data->timeLeft == 150) { - sfx_play_sound(SOUND_1A7); - } else if (data->timeLeft == 120) { - sfx_play_sound(SOUND_1A7); - } else if (data->timeLeft == 90) { - sfx_play_sound(SOUND_1A7); - } else if (data->timeLeft == 60) { - sfx_play_sound(SOUND_1A7); - } else if (data->timeLeft == 30) { - sfx_play_sound(SOUND_1A7); - } - } - if ((data->timeLeft > 0) && (data->found == NUM_PANELS)) { - if (!(data->stunFlags & STUN_FLAGS_STUNNED)) { - data->stunFlags |= (STUN_FLAGS_STUNNED | STUN_FLAGS_CHANGED); - } - } - } - if ((data->timeLeft == 0) && hittingPeachBlock) { - if (!(data->stunFlags & STUN_FLAGS_STUNNED)) { - data->stunFlags |= (STUN_FLAGS_STUNNED | STUN_FLAGS_CHANGED); - } - } - if (data->stunFlags & STUN_FLAGS_CHANGED) { - data->stunFlags &= ~STUN_FLAGS_CHANGED; - if (data->stunFlags & STUN_FLAGS_STUNNED) { - disable_player_input(); - partner_disable_input(); - } else { - enable_player_input(); - partner_enable_input(); - } - } - if (!hittingPeachBlock && ((data->found == 10) || ((data->timeLeft == 0) - && (gPlayerStatusPtr->actionState != ACTION_STATE_HAMMER)))) { - gameFinished = TRUE; - } - if (gameFinished) { - if (data->stunFlags & STUN_FLAGS_STUNNED) { - enable_player_input(); - partner_enable_input(); - } - data->stunFlags = 0; - - gPlayerStatusPtr->targetYaw = 180.0; - if (data->timeLeft == 0) { - sfx_play_sound(SOUND_MENU_ERROR); - gPlayerStatusPtr->anim = ANIM_Mario_10002; - } else { - sfx_play_sound(SOUND_D4); - gPlayerStatusPtr->anim = ANIM_Mario_10002; - } - - return ApiStatus_DONE2; - } - - return ApiStatus_BLOCK; -} - - -static char* N(exit_str_0) = "mgm_00"; - -ApiStatus N(UpdateRecords)(Evt* script, s32 isInitialCall) { - PlayerData* playerData = &gPlayerData; - SmashGameData* data = get_enemy(SCOREKEEPER_ENEMY_IDX)->varTablePtr[SMASH_DATA_VAR_IDX]; - s32 seconds, deciseconds; - s32 outScore; - - seconds = data->timeLeft / 30; - deciseconds = ((f32)(data->timeLeft % 30) * 10.0) / 30; - - data->currentScore = (seconds * 10) + deciseconds; - playerData->smashGameTotal += data->currentScore; - - if (playerData->smashGameTotal > 99999) { - playerData->smashGameTotal = 99999; - } - if (playerData->smashGameRecord < data->currentScore) { - playerData->smashGameRecord = data->currentScore; - } - - set_message_value(seconds, 0); - set_message_value(deciseconds, 1); - set_message_value(data->currentScore, 2); - - outScore = data->currentScore; - if (data->currentScore == 0 && data->found == NUM_PANELS) { - outScore = -1; - } - evt_set_variable(script, LVar0, outScore); - - return ApiStatus_DONE2; -} - -ApiStatus N(GiveCoinReward)(Evt* script, s32 isInitialCall) { - SmashGameData* data = get_enemy(SCOREKEEPER_ENEMY_IDX)->varTablePtr[SMASH_DATA_VAR_IDX]; - s32 coinsLeft = data->currentScore; - s32 increment; - - if (coinsLeft > 100) { - increment = 40; - } else if (coinsLeft > 75) { - increment = 35; - } else if (coinsLeft > 50) { - increment = 30; - } else if (coinsLeft > 30) { - increment = 10; - } else if (coinsLeft > 20) { - increment = 5; - } else if (coinsLeft > 10) { - increment = 2; - } else { - increment = 1; - } - - data->currentScore -= increment; - add_coins(increment); - sfx_play_sound(SOUND_211); - - return (data->currentScore > 0) ? ApiStatus_BLOCK : ApiStatus_DONE2; -} - -ApiStatus N(CleanupGame)(Evt* script, s32 isInitialCall) { - Enemy* enemy = get_enemy(SCOREKEEPER_ENEMY_IDX); - SmashGameData* data = enemy->varTablePtr[SMASH_DATA_VAR_IDX]; - Npc* npc; - u32 screenX, screenY,screenZ; - s32 writeback; - s32 i; - - if (enemy->varTable[3] == 4) { - for (i = 0; i < NUM_BOXES; i++) { - if (data->box[i].npcID == -1) { - continue; - } - enemy = get_enemy(data->box[i].npcID); - npc = get_npc_unsafe(enemy->npcID); - if ((npc->flags & NPC_FLAG_2)) { - continue; - } - - get_screen_coords(0, npc->pos.x, npc->pos.y, npc->pos.z, &screenX, &screenY, &screenZ); - if (screenX - 1 < SCREEN_WIDTH - 1) { - fx_walking_dust(1, npc->pos.x, npc->pos.y, npc->pos.z, 0, 0); - sfx_play_sound(SOUND_283); - } - npc->flags |= NPC_FLAG_2; - disable_npc_shadow(npc); - enemy->varTable[0] = 0; - } - return ApiStatus_DONE2; - } else { - for (i = 0; i < NUM_BOXES; i++) { - if (data->box[i].npcID == -1) { - continue; - } - enemy = get_enemy(data->box[i].npcID); - npc = get_npc_unsafe(enemy->npcID); - if ((npc->flags & NPC_FLAG_2)) { - continue; - } - - switch (data->box[i].content) { - case BOX_CONTENT_FUZZY: - if (data->box[i].state != BOX_STATE_FUZZY_END) { - data->box[i].state = BOX_STATE_FUZZY_END; - fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, 0.0f, 30, &writeback); - npc->currentAnim = ANIM_Fuzzy_Anim0E; - enable_npc_shadow(npc); - } - break; - - case BOX_CONTENT_BOMB: - if (data->box[i].state != BOX_STATE_BOMB_END) { - data->box[i].state = BOX_STATE_BOMB_END; - fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, 0.0f, 30, &writeback); - npc->currentAnim = ANIM_Bobomb_Anim1C; - enable_npc_shadow(npc); - } - break; - } - } - return ApiStatus_BLOCK; - } -} - -ApiStatus N(CreateMinigame)(Evt* script, s32 isInitialCall) { - Enemy* scorekeeper = get_enemy(SCOREKEEPER_ENEMY_IDX); - SmashGameData* data = heap_malloc(sizeof(*data)); - scorekeeper->varTablePtr[SMASH_DATA_VAR_IDX] = data; - - data->windowA_posX = -80; - data->windowB_posX = SCREEN_WIDTH; - data->timeLeft = PLAY_TIME; - - func_800E9894(); - close_status_menu(); - - return ApiStatus_DONE2; -} - -ApiStatus N(DestroyMinigame)(Evt* script, s32 isInitialCall) { - SmashGameData* data = get_enemy(SCOREKEEPER_ENEMY_IDX)->varTablePtr[SMASH_DATA_VAR_IDX]; - - free_generic_entity(data->workerID); - hud_element_free(data->hudElemID_AButton); - hud_element_free(data->hudElemID_Meter); - - return ApiStatus_DONE2; -} - -ApiStatus N(GetCoinCount)(Evt* script, s32 isInitialCall) { - evt_set_variable(script, LVarA, gPlayerData.coins); - return ApiStatus_DONE2; -} - -ApiStatus N(TakeCoinCost)(Evt* script, s32 isInitialCall) { - PlayerData* playerData = &gPlayerData; - - if (isInitialCall) { - playerData->smashGamePlays++; - script->functionTemp[0] = 0; - } - add_coins(-1); - sfx_play_sound(SOUND_211); - - script->functionTemp[0]++; - return (script->functionTemp[0] == PLAY_COST) ? ApiStatus_DONE2 : ApiStatus_BLOCK; -} - -ApiStatus N(HideCoinCounter)(Evt* script, s32 isInitialCall) { - hide_coin_counter_immediately(); - return ApiStatus_DONE2; -} diff --git a/src/world/area_mgm/mgm_02/E18150.c b/src/world/area_mgm/mgm_02/E18150.c deleted file mode 100644 index 88ef7297c7..0000000000 --- a/src/world/area_mgm/mgm_02/E18150.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "mgm_02.h" - -void set_message_images(MessageImageData* images); - -extern MessageImageData N(MsgImg_PeachPanel); - -ApiStatus N(SetMsgImgs_Panel)(Evt* script, s32 isInitialCall) { - set_message_images(&N(MsgImg_PeachPanel)); - return ApiStatus_DONE2; -} diff --git a/src/world/area_mgm/mgm_02/mgm_02.h b/src/world/area_mgm/mgm_02/mgm_02.h index 69d1b55f5d..0f1cb19420 100644 --- a/src/world/area_mgm/mgm_02/mgm_02.h +++ b/src/world/area_mgm/mgm_02/mgm_02.h @@ -2,8 +2,40 @@ /// @brief Minigame - Smash Attack Minigame #include "common.h" -#include "../mgm.h" #include "message_ids.h" #include "map.h" +#include "../mgm.h" +#include "mapfs/mgm_02_shape.h" +#include "mapfs/mgm_02_hit.h" + +#include "sprite/npc/Toad.h" +#include "sprite/npc/Fuzzy.h" +#include "sprite/npc/Bobomb.h" +#include "sprite/npc/Luigi.h" + +enum { + NPC_Toad = 0, + NPC_Fuzzy_01 = 10, + NPC_Fuzzy_02 = 11, + NPC_Fuzzy_03 = 12, + NPC_Fuzzy_04 = 13, + NPC_Fuzzy_05 = 14, + NPC_Bombomb_01 = 30, + NPC_Bombomb_02 = 31, + NPC_Bombomb_03 = 32, + NPC_Bombomb_04 = 33, + NPC_Bombomb_05 = 34, + NPC_Luigi_01 = 100, + NPC_Luigi_02 = 101, + NPC_Luigi_03 = 102, + NPC_Luigi_04 = 103, + NPC_Luigi_05 = 104, + NPC_Luigi_06 = 105, + NPC_Luigi_07 = 106, + NPC_Luigi_08 = 107, + NPC_Luigi_09 = 108, + NPC_Luigi_10 = 109, +}; + #define NAMESPACE mgm_02 diff --git a/src/world/area_mgm/mgm_02/mgm_02_1_main.c b/src/world/area_mgm/mgm_02/mgm_02_1_main.c new file mode 100644 index 0000000000..8a17647a13 --- /dev/null +++ b/src/world/area_mgm/mgm_02/mgm_02_1_main.c @@ -0,0 +1,49 @@ +#include "mgm_02.h" + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_Dummy); +extern EvtScript N(EVS_InitializeMinigame); +extern NpcGroupList N(DefaultNPCs); + +EntryList N(Entrances) = { + [mgm_02_ENTRY_0] { -300.0, 200.0, 200.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_mgm_02 }, +}; + +EvtScript N(EVS_SetupCamera) = { + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -300, -20, 200) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 250, -20, 220) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SetPlayerPos, 250, 200, 220) + EVT_CALL(SetNpcPos, NPC_PARTNER, 250, 200, 220) + EVT_CALL(InterpPlayerYaw, 90, 0) + EVT_LABEL(10) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_IF_NE(LVar1, -20) + EVT_WAIT(1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SETUP_CAMERA_DEFAULT() + EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) + EVT_EXEC(N(EVS_SetupCamera)) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_Dummy)) + EVT_EXEC_WAIT(N(EVS_InitializeMinigame)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mgm/mgm_02/mgm_02_2_npc.c b/src/world/area_mgm/mgm_02/mgm_02_2_npc.c new file mode 100644 index 0000000000..2ef806396a --- /dev/null +++ b/src/world/area_mgm/mgm_02/mgm_02_2_npc.c @@ -0,0 +1,2568 @@ +#include "mgm_02.h" +#include "hud_element.h" +#include "effects.h" +#include "model.h" +#include "entity.h" + +void startup_draw_prim_rect_COPY(s16 left, s16 top, s16 right, s16 bottom, u16 r, u16 g, u16 b, u16 a); +void delete_entity(s32); +void partner_enable_input(void); + +#define SCOREKEEPER_ENEMY_IDX 0 +#define SMASH_DATA_VAR_IDX 0 + +#define PLAY_COST 10 +#define PLAY_TIME 900 +#define NUM_BOXES 35 +#define NUM_PANELS 10 + +#define SMASH_DATA_VAR_IDX 0 +#define SMASH_DATA_VAR_IDX 0 + +#define FUZZY_NPC_ID_BASE NPC_Fuzzy_01 +#define BOBOMB_NPC_ID_BASE NPC_Bombomb_01 +#define LUIGI_NPC_ID_BASE NPC_Luigi_01 + +extern HudScript HES_BlueMeter; +extern HudScript HES_AButton; +extern HudScript HES_MashAButton; + +extern s32 N(InitialConfigurations)[3][NUM_BOXES]; +extern s32 N(BoxModelIDs)[NUM_BOXES]; +extern s32 N(BoxColliderIDs)[NUM_BOXES]; +extern s32 N(PanelModelIDs)[NUM_PANELS]; +extern s32 D_80248600[NUM_PANELS]; //TODO set name: PanelModelsAssigned + +extern IMG_BIN N(panel_peach_img); +extern PAL_BIN N(panel_peach_pal); + +API_CALLABLE(N(SetMsgImgs_Panel)); + +extern EvtScript N(read_sign_instructions); // EVT_ReadSign + +typedef enum SmashGameBoxCotent { + BOX_CONTENT_FUZZY = 0, + BOX_CONTENT_BOMB = 1, + BOX_CONTENT_PEACH = 2, + BOX_CONTENT_EMPTY = 3 +} SmashGameBoxCotent; + +typedef enum SmashGameStunFlags { + STUN_FLAGS_STUNNED = 1, + STUN_FLAGS_CHANGED = 2, + STUN_FLAGS_GRABBED = 4 +} SmashGameStunFlags; + +typedef enum SmashGameBoxState { + BOX_STATE_FUZZY_INIT = 10, + BOX_STATE_FUZZY_IDLE = 11, + BOX_STATE_FUZZY_POPUP = 12, + BOX_STATE_FUZZY_HIT = 13, + BOX_STATE_FUZZY_ATTACH = 14, + BOX_STATE_FUZZY_GRAB = 15, + BOX_STATE_FUZZY_DETACH = 16, + BOX_STATE_FUZZY_DONE = 17, + BOX_STATE_FUZZY_END = 18, + + BOX_STATE_BOMB_INIT = 30, + BOX_STATE_BOMB_IDLE = 31, + BOX_STATE_BOMB_POPUP = 32, + BOX_STATE_BOMB_HIT = 33, + BOX_STATE_BOMB_ATTACK = 34, + BOX_STATE_BOMB_STUN = 35, + BOX_STATE_BOMB_DONE = 36, + BOX_STATE_BOMB_END = 37, + + BOX_STATE_EMPTY_INIT = 50, + BOX_STATE_EMPTY_IDLE = 51, + BOX_STATE_EMPTY_HIT = 52, + + BOX_STATE_PEACH_INIT = 70, + BOX_STATE_PEACH_IDLE = 71, + BOX_STATE_PEACH_POPUP = 72, + BOX_STATE_PEACH_HIT = 73, + BOX_STATE_PEACH_EMERGE = 74, + BOX_STATE_PEACH_DONE = 75 +} SmashGameBoxState; + +typedef struct SmashGameBoxData { + /* 0x00 */ SmashGameBoxState state; + /* 0x04 */ s32 stateTimer; + /* 0x08 */ s32 content; + /* 0x0C */ s32 modelID; + /* 0x10 */ s32 colliderID; + /* 0x14 */ s32 npcID; + /* 0x18 */ s32 peachPanelModelID; +} SmashGameBoxData; /* size = 0x1C */ + +typedef struct SmashGameData { + /* 0x000 */ s32 workerID; + /* 0x004 */ s32 found; + /* 0x008 */ s32 timeLeft; // num frames at 30fps + /* 0x00C */ s32 hudElemID_AButton; + /* 0x010 */ s32 hudElemID_Meter; + /* 0x014 */ s32 windowA_posX; + /* 0x018 */ s32 windowB_posX; + /* 0x01C */ s32 signpostEntity; + /* 0x020 */ s32 currentScore; + /* 0x024 */ s32 mashProgress; + /* 0x028 */ SmashGameStunFlags stunFlags; + /* 0x02C */ SmashGameBoxData box[NUM_BOXES]; +} SmashGameData; /* size = 0x400 */ + +void N(appendGfx_score_display)(void* renderData) { + Enemy* scorekeeper = get_enemy(SCOREKEEPER_ENEMY_IDX); + SmashGameData* data = scorekeeper->varTablePtr[SMASH_DATA_VAR_IDX]; + s32 hudElemA; + s32 hudElemMeter; + s32 timeLeft; + s32 seconds; + s32 deciseconds; + + // show mash meter while grabbed by a fuzzy + if (data->stunFlags & STUN_FLAGS_GRABBED) { + hudElemA = data->hudElemID_AButton; + hud_element_set_render_pos(hudElemA, 90, 90); + hud_element_draw_clipped(hudElemA); + hudElemMeter = data->hudElemID_Meter; + hud_element_set_render_pos(hudElemMeter, 90, 120); + hud_element_draw_clipped(hudElemMeter); + startup_draw_prim_rect_COPY(62, 116, 62 + (s32)(((f32)data->mashProgress / 12.0) * 59.0), 116 + 5, 0, 228, 134, 255); + } + + if (scorekeeper->varTable[3] == 0 || scorekeeper->varTable[3] >= 4) { + if (data->windowA_posX > -80) { + data->windowA_posX -= 10; + if (data->windowA_posX < -80) { + data->windowA_posX = -80; + } + } + } else { + if (data->windowA_posX < 23) { + data->windowA_posX += 10; + if (data->windowA_posX > 23) { + data->windowA_posX = 23; + } + } + } + + if (scorekeeper->varTable[3] == 0) { + if (data->windowB_posX < SCREEN_WIDTH) { + data->windowB_posX += 10; + if (data->windowB_posX > SCREEN_WIDTH) { + data->windowB_posX = SCREEN_WIDTH; + } + } + } else { + if (data->windowB_posX > 225) { + data->windowB_posX -= 10; + if (data->windowB_posX < 225) { + data->windowB_posX = 225; + } + } + } + + draw_box(0, 9, data->windowA_posX, 23, 0, 80, 38, 180, 0, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, NULL, NULL, NULL, SCREEN_WIDTH, SCREEN_HEIGHT, NULL); + draw_msg(MSG_MGM_0047, data->windowA_posX + 42, 28, 255, MSG_PAL_WHITE, 0); + draw_number(NUM_PANELS - data->found, data->windowA_posX + 65, 43, TRUE, MSG_PAL_WHITE, 255, 3); + draw_ci_image_with_clipping(&N(panel_peach_img), 32, 32, G_IM_FMT_CI, G_IM_SIZ_4b, &N(panel_peach_pal), + data->windowA_posX + 5, 26, 10, 20, 300, 200, 255); + + timeLeft = MIN(data->timeLeft, PLAY_TIME); + deciseconds = ((f32)(timeLeft % 30) * 10.0) / 30; + seconds = timeLeft / 30; + + draw_box(0, 0xB, data->windowB_posX, 27, 0, 60, 20, 180, 0, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, NULL, NULL, NULL, SCREEN_WIDTH, SCREEN_HEIGHT, NULL); + // draw whole seconds + draw_number(seconds, data->windowB_posX + 29, 31, TRUE, MSG_PAL_WHITE, 255, 3); + // draw tenths of seconds + draw_number(deciseconds, data->windowB_posX + 40, 31, TRUE, MSG_PAL_WHITE, 255, 0); + // draw dot + draw_msg(MSG_MGM_0024, data->windowB_posX + 30, 29, 255, MSG_PAL_WHITE, 0); +} + +void N(worker_draw_score)(void) { + RenderTask task; + + task.renderMode = RENDER_MODE_2D; + task.appendGfxArg = 0; + task.appendGfx = &N(appendGfx_score_display); + task.distance = 0; + + queue_render_task(&task); +} + +API_CALLABLE(N(CreateScoreDisplay)) { + SmashGameData* data = get_enemy(SCOREKEEPER_ENEMY_IDX)->varTablePtr[SMASH_DATA_VAR_IDX]; + s32 hudElemA, hudElemMeter; + + if (isInitialCall) { + data->workerID = create_generic_entity_world(NULL, &N(worker_draw_score)); + + hudElemA = hud_element_create(&HES_AButton); + data->hudElemID_AButton = hudElemA; + hud_element_set_render_depth(hudElemA, 0); + hud_element_set_flags(hudElemA, HUD_ELEMENT_FLAGS_80); + hud_element_set_tint(hudElemA, 255, 255, 255); + hud_element_set_script(hudElemA, &HES_AButton); + + hudElemMeter = hud_element_create(&HES_BlueMeter); + data->hudElemID_Meter = hudElemMeter; + hud_element_set_render_depth(hudElemMeter, 0); + hud_element_set_flags(hudElemMeter, HUD_ELEMENT_FLAGS_80); + } + + return ApiStatus_BLOCK; +} + +API_CALLABLE(N(DisableMenus)) { + gOverrideFlags |= GLOBAL_OVERRIDES_DISABLE_MENUS; + func_800E9894(); + close_status_menu(); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(EnableMenus)) { + gOverrideFlags &= ~GLOBAL_OVERRIDES_DISABLE_MENUS; + return ApiStatus_DONE2; +} + +API_CALLABLE(N(DestroySignpost)) { + SmashGameData* data = get_enemy(SCOREKEEPER_ENEMY_IDX)->varTablePtr[SMASH_DATA_VAR_IDX]; + delete_entity(data->signpostEntity); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(CreateSignpost)) { + SmashGameData* data = get_enemy(SCOREKEEPER_ENEMY_IDX)->varTablePtr[SMASH_DATA_VAR_IDX]; + s32 entityIndex = create_entity(&Entity_Signpost, 355, 20, -180, 0, 0, 0, 0, MAKE_ENTITY_END); + data->signpostEntity = entityIndex; + get_entity_by_index(entityIndex)->boundScriptBytecode = &N(read_sign_instructions); + + return ApiStatus_DONE2; +} + +API_CALLABLE(N(OnHitBox)) { + SmashGameData* data = get_enemy(SCOREKEEPER_ENEMY_IDX)->varTablePtr[SMASH_DATA_VAR_IDX]; + s32 hitModelID = evt_get_variable(script, LVarA); + s32 hitColliderID = evt_get_variable(script, LVarB); // unused + s32 i; + + for (i = 0; i < NUM_BOXES; i++) { + if (hitModelID == data->box[i].modelID) { + break; + } + } + + evt_set_variable(script, LVarC, data->box[i].content); + + switch (data->box[i].content) { + case BOX_CONTENT_FUZZY: + evt_set_variable(script, LVarD, data->box[i].npcID); + data->box[i].state = BOX_STATE_FUZZY_HIT; + break; + case BOX_CONTENT_BOMB: + evt_set_variable(script, LVarD, data->box[i].npcID); + data->box[i].state = BOX_STATE_BOMB_HIT; + break; + case BOX_CONTENT_EMPTY: + evt_set_variable(script, LVarD, data->box[i].npcID); + data->box[i].state = BOX_STATE_EMPTY_HIT; + break; + case BOX_CONTENT_PEACH: + data->found++; + data->box[i].state = BOX_STATE_PEACH_HIT; + break; + } + + return ApiStatus_DONE2; +} + +API_CALLABLE(N(SetBoxContents)) { + s32 initialConfiguration; + s32 configuration[NUM_BOXES]; + s32 indexA, indexB, temp; + s32 i, j; + + Enemy* enemy; + Npc* npc; + + SmashGameData* data = get_enemy(SCOREKEEPER_ENEMY_IDX)->varTablePtr[SMASH_DATA_VAR_IDX]; + data->found = 0; + data->timeLeft = PLAY_TIME + 10; + data->currentScore = 0; + data->mashProgress = 0; + data->stunFlags = 0; + + // choose one of three initial configurations at random + initialConfiguration = rand_int(1000) % ARRAY_COUNT(N(InitialConfigurations)); + for (i = 0; i < NUM_BOXES; i++) { + configuration[i] = N(InitialConfigurations[initialConfiguration][i]); + } + + // randomly swap 10000 pairs + for (i = 0; i < 10000; i++) { + indexA = rand_int(1000) % NUM_BOXES; + indexB = rand_int(1000) % NUM_BOXES; + + if (indexA != indexB) { + temp = configuration[indexB]; + configuration[indexB] = configuration[indexA]; + configuration[indexA] = temp; + } + } + + for (i = 0; i < NUM_BOXES; i++) { + data->box[i].state = -1; + data->box[i].stateTimer = 0; + data->box[i].content = configuration[i]; + data->box[i].modelID = N(BoxModelIDs[i]); + data->box[i].colliderID = N(BoxColliderIDs[i]); + data->box[i].npcID = -1; + data->box[i].peachPanelModelID = -1; + } + + for (i = FUZZY_NPC_ID_BASE; i < FUZZY_NPC_ID_BASE + 5; i++) { + enemy = get_enemy(i); + enemy->varTable[0] = 0; + } + + for (i = BOBOMB_NPC_ID_BASE; i < BOBOMB_NPC_ID_BASE + 5; i++) { + enemy = get_enemy(i); + enemy->varTable[0] = 0; + } + + for (i = LUIGI_NPC_ID_BASE; i < LUIGI_NPC_ID_BASE + 10; i++) { + enemy = get_enemy(i); + enemy->varTable[0] = 0; + } + + for (i = 0; i < ARRAY_COUNT(D_80248600); i++) { + D_80248600[i] = FALSE; + } + + for (i = 0; i < NUM_BOXES; i++) { + switch (data->box[i].content) { + case BOX_CONTENT_FUZZY: + data->box[i].state = BOX_STATE_FUZZY_INIT; + for (j = FUZZY_NPC_ID_BASE; j < FUZZY_NPC_ID_BASE + 5; j++) { + enemy = get_enemy(j); + if (enemy->varTable[0] == 0) { + npc = get_npc_unsafe(enemy->npcID); + enemy->varTable[0] = 1; + data->box[i].npcID = j; + disable_npc_shadow(npc); + npc->flags |= NPC_FLAG_2; + break; + } + } + break; + case BOX_CONTENT_BOMB: + data->box[i].state = BOX_STATE_BOMB_INIT; + for (j = BOBOMB_NPC_ID_BASE; j < BOBOMB_NPC_ID_BASE + 5; j++) { + enemy = get_enemy(j); + if (enemy->varTable[0] == 0) { + npc = get_npc_unsafe(enemy->npcID); + enemy->varTable[0] = 1; + data->box[i].npcID = j; + disable_npc_shadow(npc); + npc->flags |= NPC_FLAG_2; + break; + } + } + break; + case BOX_CONTENT_PEACH: + data->box[i].state = BOX_STATE_PEACH_INIT; + for (j = LUIGI_NPC_ID_BASE; j < LUIGI_NPC_ID_BASE + 10; j++) { + enemy = get_enemy(j); + if (enemy->varTable[0] == 0) { + npc = get_npc_unsafe(enemy->npcID); + enemy->varTable[0] = 1; + data->box[i].npcID = j; + disable_npc_shadow(npc); + npc->flags |= NPC_FLAG_2; + break; + } + } + // ARRAY BOUNDS ERROR IN ORIGINAL CODE! + for (j = 0; j <= ARRAY_COUNT(D_80248600); j++) { + if (!D_80248600[j]) { + D_80248600[j] = TRUE; + data->box[i].peachPanelModelID = N(PanelModelIDs[j]); + break; + } + } + break; + case 3: + data->box[i].state = BOX_STATE_EMPTY_INIT; + break; + } + } + return ApiStatus_DONE2; +} + +API_CALLABLE(N(RunMinigame)) { + SmashGameData* data; + Enemy* enemy; + + Npc* npc; + s32 writeback; + + Model* model; + Matrix4f mtx; + f32 centerX, centerY, centerZ; + f32 sizeX, sizeY, sizeZ; + s32 i; + + s32 gameFinished; + s32 hittingPeachBlock; + + gameFinished = FALSE; + hittingPeachBlock = FALSE; + data = get_enemy(0)->varTablePtr[0]; + + for (i = 0; i < NUM_BOXES; i++) { + if (data->box[i].npcID != -1) { + enemy = get_enemy(data->box[i].npcID); + npc = get_npc_unsafe(enemy->npcID); + switch (data->box[i].state) { + case BOX_STATE_FUZZY_INIT: + data->box[i].state = BOX_STATE_FUZZY_IDLE; + data->box[i].stateTimer = rand_int(210); + npc->pos.y = NPC_DISPOSE_POS_Y; + npc->flags &= -(NPC_FLAG_PASSIVE | NPC_FLAG_2); + disable_npc_shadow(npc); + // fallthrough + case BOX_STATE_FUZZY_IDLE: + data->box[i].stateTimer--; + if (data->box[i].stateTimer <= 0) { + npc->currentAnim = ANIM_Fuzzy_Anim02; + data->box[i].state = BOX_STATE_FUZZY_POPUP; + sfx_play_sound_at_position(enemy->varTable[8], 0x100000, npc->pos.x, npc->pos.y, npc->pos.z); + get_model_center_and_size(data->box[i].modelID, ¢erX, ¢erY, ¢erZ, &sizeX, &sizeY, &sizeZ); + npc->jumpVelocity = 10.5f; + npc->pos.x = centerX; + npc->jumpScale = 1.5f; + npc->pos.y = centerY - 12.5; + npc->moveToPos.y = npc->pos.y; + npc->pos.z = centerZ + 2.0; + data->box[i].stateTimer = 0; + } + break; + case BOX_STATE_FUZZY_POPUP: + data->box[i].stateTimer++; + npc->pos.y += npc->jumpVelocity; + npc->jumpVelocity -= npc->jumpScale; + if ((npc->moveToPos.y + 20.0f) < npc->pos.y) { + enable_npc_shadow(npc); + } else { + disable_npc_shadow(npc); + } + if ((npc->jumpVelocity < 0.0) && (npc->pos.y <= npc->moveToPos.y)) { + data->box[i].state = BOX_STATE_FUZZY_IDLE; + data->box[i].stateTimer = rand_int(330) + 90; + npc->pos.y = NPC_DISPOSE_POS_Y; + if (rand_int(100) < 50) { + npc->yaw = 270.0f; + } else { + npc->yaw = 90.0f; + } + disable_npc_shadow(npc); + } + break; + case BOX_STATE_FUZZY_HIT: + hud_element_set_script(data->hudElemID_AButton, &HES_AButton); + hud_element_set_alpha(data->hudElemID_AButton, 160); + hud_element_set_alpha(data->hudElemID_Meter, 160); + data->mashProgress = 0; + data->stunFlags |= STUN_FLAGS_GRABBED; + enable_npc_shadow(npc); + data->stunFlags |= (STUN_FLAGS_STUNNED | STUN_FLAGS_CHANGED); + npc->duration = 8; + sfx_play_sound(enemy->varTable[8]); + data->box[i].state = BOX_STATE_FUZZY_ATTACH; + gPlayerStatusPtr->anim = ANIM_Mario_CrouchStill; + npc->currentAnim = ANIM_Fuzzy_Anim03; + get_model_center_and_size(data->box[i].modelID, ¢erX, ¢erY, ¢erZ, &sizeX, &sizeY, &sizeZ); + npc->pos.x = centerX; + npc->pos.y = centerY; + npc->pos.z = centerZ + 2.0; + npc->moveToPos.y = gPlayerStatusPtr->position.y + 35.0f; + npc->jumpVelocity = 10.5f; + npc->jumpScale = 1.5f; + + data->box[i].stateTimer = 0; + fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, 0.0f, 10, &writeback); + enemy->varTable[1] = npc->pos.x * 10.0f; + enemy->varTable[2] = npc->pos.y * 10.0f; + enemy->varTable[3] = npc->pos.z * 10.0f; + enemy->varTable[4] = gPlayerStatusPtr->position.x * 10.0f; + enemy->varTable[5] = (gPlayerStatusPtr->position.y + 28.0f) * 10.0f; + enemy->varTable[6] = (gPlayerStatusPtr->position.z + 2.0f) * 10.0f; + enemy->varTable[7] = 0; + break; + case BOX_STATE_FUZZY_ATTACH: + enemy->varTable[7]++; + npc->pos.x = update_lerp(EASING_LINEAR, (f32)enemy->varTable[1] / 10.0, (f32)enemy->varTable[4] / 10.0, enemy->varTable[7], 8); + npc->pos.y = update_lerp(EASING_LINEAR, (f32)enemy->varTable[2] / 10.0, (f32)enemy->varTable[5] / 10.0, enemy->varTable[7], 8); + npc->pos.z = update_lerp(EASING_LINEAR, (f32)enemy->varTable[3] / 10.0, (f32)enemy->varTable[6] / 10.0, enemy->varTable[7], 8); + gPlayerStatusPtr->anim = ANIM_Mario_CrouchStill; + npc->duration--; + if (npc->duration <= 0) { + npc->currentAnim = ANIM_Fuzzy_Anim0F; + gPlayerStatusPtr->anim = ANIM_Mario_RunPanic; + data->mashProgress = 0; + npc->pos.x = gPlayerStatusPtr->position.x; + npc->pos.y = gPlayerStatusPtr->position.y + 28.0; + npc->pos.z = gPlayerStatusPtr->position.z + 2.0; + hud_element_set_script(data->hudElemID_AButton, &HES_MashAButton); + hud_element_set_alpha(data->hudElemID_AButton, 255); + hud_element_set_alpha(data->hudElemID_Meter, 255); + data->box[i].state = BOX_STATE_FUZZY_GRAB; + } + break; + case BOX_STATE_FUZZY_GRAB: + gPlayerStatusPtr->anim = ANIM_Mario_RunPanic; + if (gGameStatusPtr->pressedButtons[0] & BUTTON_A) { + data->mashProgress++; + } + if (data->mashProgress >= 12) { + gPlayerStatusPtr->anim = ANIM_Mario_10002; + data->stunFlags &= ~STUN_FLAGS_STUNNED; + data->stunFlags |= STUN_FLAGS_CHANGED; + data->box[i].state = BOX_STATE_FUZZY_DETACH; + npc->duration = 10; + hud_element_set_script(data->hudElemID_AButton, &HES_AButton); + hud_element_set_alpha(data->hudElemID_AButton, 160); + hud_element_set_alpha(data->hudElemID_Meter, 160); + npc->currentAnim = ANIM_Fuzzy_Anim08; + npc->pos.y += 3.0; + } + break; + case BOX_STATE_FUZZY_DETACH: + npc->duration--; + if (npc->duration == 8) { + data->stunFlags &= ~STUN_FLAGS_GRABBED; + } + if (npc->duration <= 0) { + data->box[i].state = BOX_STATE_FUZZY_DONE; + disable_npc_shadow(npc); + npc->flags |= NPC_FLAG_2; + fx_walking_dust(1, npc->pos.x, npc->pos.y + 10.0f, npc->pos.z + 1.0f, 0, 0); + } + break; + case BOX_STATE_FUZZY_DONE: + break; + + case BOX_STATE_BOMB_INIT: + data->box[i].state = BOX_STATE_BOMB_IDLE; + data->box[i].stateTimer = rand_int(210); + npc->pos.y = NPC_DISPOSE_POS_Y; + disable_npc_shadow(npc); + npc->flags &= -(NPC_FLAG_PASSIVE | NPC_FLAG_2); + // fallthrough + case BOX_STATE_BOMB_IDLE: + data->box[i].stateTimer--; + if (data->box[i].stateTimer <= 0) { + data->box[i].state = BOX_STATE_BOMB_POPUP; + sfx_play_sound_at_position(enemy->varTable[8], 0x100000, npc->pos.x, npc->pos.y, npc->pos.z); + get_model_center_and_size(data->box[i].modelID, ¢erX, ¢erY, ¢erZ, &sizeX, &sizeY, &sizeZ); + npc->jumpVelocity = 10.5f; + npc->pos.x = centerX; + npc->jumpScale = 1.5f; + npc->pos.y = centerY - 12.5; + npc->moveToPos.y = npc->pos.y; + npc->pos.z = centerZ + 2.0; + data->box[i].stateTimer = 0; + } + break; + case BOX_STATE_BOMB_POPUP: + data->box[i].stateTimer++; + npc->pos.y += npc->jumpVelocity; + npc->jumpVelocity -= npc->jumpScale; + if ((npc->moveToPos.y + 20.0f) < npc->pos.y) { + enable_npc_shadow(npc); + } else { + disable_npc_shadow(npc); + } + if ((npc->jumpVelocity < 0.0) && (npc->pos.y <= npc->moveToPos.y)) { + data->box[i].state = BOX_STATE_BOMB_IDLE; + data->box[i].stateTimer = rand_int(330) + 90; + npc->pos.y = NPC_DISPOSE_POS_Y; + if (rand_int(100) < 50) { + npc->yaw = 270.0f; + } else { + npc->yaw = 90.0f; + } + disable_npc_shadow(npc); + } + break; + case BOX_STATE_BOMB_HIT: + enable_npc_shadow(npc); + npc->duration = 15; + npc->currentAnim = ANIM_Bobomb_Anim05; + data->stunFlags |= (STUN_FLAGS_STUNNED | STUN_FLAGS_CHANGED); + data->box[i].state = BOX_STATE_BOMB_ATTACK; + get_model_center_and_size(data->box[i].modelID, ¢erX, ¢erY, ¢erZ, &sizeX, &sizeY, &sizeZ); + npc->pos.x = centerX; + npc->pos.y = centerY - 10.0f; + npc->pos.z = centerZ + 8.0; + fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, 0.0f, 10, &writeback); + if (npc->pos.x > gPlayerStatusPtr->position.x) { + npc->yaw = 270.0f; + gPlayerStatusPtr->targetYaw = 95.0f; + } else { + npc->yaw = 90.0f; + gPlayerStatusPtr->targetYaw = 265.0f; + } + // rest of case could simply use fallthough, but wouldnt match + gPlayerStatusPtr->anim = ANIM_Mario_CrouchStill; + npc->duration--; + if (npc->duration <= 0) { + fx_explosion(0, npc->pos.x, npc->pos.y, npc->pos.z + 1.0f); + npc->duration = 30; + npc->pos.y = NPC_DISPOSE_POS_Y; + data->box[i].state = BOX_STATE_BOMB_STUN; + sfx_play_sound(SOUND_BOMB_BLAST); + } + break; + case BOX_STATE_BOMB_ATTACK: + gPlayerStatusPtr->anim = ANIM_Mario_CrouchStill; + npc->duration--; + if (npc->duration <= 0) { + fx_explosion(0, npc->pos.x, npc->pos.y, npc->pos.z + 1.0f); + npc->duration = 30; + npc->pos.y = NPC_DISPOSE_POS_Y; + data->box[i].state = BOX_STATE_BOMB_STUN; + sfx_play_sound(SOUND_BOMB_BLAST); + } + break; + case BOX_STATE_BOMB_STUN: + npc->duration--; + if (npc->duration == 25) { + gPlayerStatusPtr->anim = ANIM_Mario_Charred; + } + if (npc->duration <= 0) { + gPlayerStatusPtr->anim = ANIM_Mario_10002; + data->stunFlags &= ~STUN_FLAGS_STUNNED; + data->stunFlags |= STUN_FLAGS_CHANGED; + data->box[i].state = BOX_STATE_BOMB_DONE; + disable_npc_shadow(npc); + npc->flags |= NPC_FLAG_2; + } + break; + case BOX_STATE_BOMB_DONE: + break; + + case BOX_STATE_PEACH_INIT: + get_model_center_and_size(data->box[i].modelID, ¢erX, ¢erY, ¢erZ, &sizeX, &sizeY, &sizeZ); + data->box[i].state = BOX_STATE_PEACH_IDLE; + data->box[i].stateTimer = rand_int(210); + npc->pos.x = centerX; + npc->pos.y = centerY; + npc->moveToPos.y = npc->pos.y; + npc->pos.z = centerZ + 2.0; + disable_npc_shadow(npc); + // fallthrough + case BOX_STATE_PEACH_IDLE: + data->box[i].stateTimer--; + if (data->box[i].stateTimer <= 0) { + get_model_center_and_size(data->box[i].modelID, ¢erX, ¢erY, ¢erZ, &sizeX, &sizeY, &sizeZ); + data->box[i].state = BOX_STATE_PEACH_POPUP; + sfx_play_sound_at_position(SOUND_214, 0x200000, npc->pos.x, npc->pos.y, npc->pos.z); + get_model_center_and_size(data->box[i].modelID, ¢erX, ¢erY, ¢erZ, &sizeX, &sizeY, &sizeZ); + npc->jumpVelocity = 10.0f; + npc->pos.y = npc->moveToPos.y; + npc->jumpScale = 1.1f; + data->box[i].stateTimer = 0; + model = get_model_from_list_index(get_model_list_index_from_tree_index(data->box[i].peachPanelModelID)); + model->flags &= -(MODEL_FLAGS_FLAG_1 | MODEL_FLAGS_ENABLED); + if (!(model->flags & MODEL_FLAGS_HAS_TRANSFORM_APPLIED)) { + guTranslateF(model->transformMatrix, npc->pos.x, npc->pos.y, npc->pos.z); + model->flags |= (MODEL_FLAGS_USES_TRANSFORM_MATRIX | MODEL_FLAGS_HAS_TRANSFORM_APPLIED); + } + else { + guTranslateF(mtx, npc->pos.x, npc->pos.y, npc->pos.z); + guMtxCatF(mtx, model->transformMatrix, model->transformMatrix); + } + } + break; + case BOX_STATE_PEACH_POPUP: + data->box[i].stateTimer++; + npc->pos.y += npc->jumpVelocity; + npc->jumpVelocity -= npc->jumpScale; + model = get_model_from_list_index(get_model_list_index_from_tree_index(data->box[i].peachPanelModelID)); + if (!(model->flags & MODEL_FLAGS_HAS_TRANSFORM_APPLIED)) { + guTranslateF(model->transformMatrix, npc->pos.x, npc->pos.y, npc->pos.z); + model->flags |= (MODEL_FLAGS_USES_TRANSFORM_MATRIX | MODEL_FLAGS_HAS_TRANSFORM_APPLIED); + } else { + guTranslateF(mtx, npc->pos.x, npc->pos.y, npc->pos.z); + guMtxCatF(mtx, model->transformMatrix, model->transformMatrix); + } + if ((npc->moveToPos.y + 20.0f) < npc->pos.y) { + enable_npc_shadow(npc); + } else { + disable_npc_shadow(npc); + } + if ((npc->jumpVelocity < 0.0) && (npc->pos.y <= npc->moveToPos.y)) { + data->box[i].state = BOX_STATE_PEACH_IDLE; + data->box[i].stateTimer = rand_int(330) + 90; + disable_npc_shadow(npc); + model->flags |= MODEL_FLAGS_ENABLED; + } + break; + case BOX_STATE_PEACH_HIT: + sfx_play_sound(SOUND_21C); + model = get_model_from_list_index(get_model_list_index_from_tree_index(data->box[i].peachPanelModelID)); + enable_npc_shadow(npc); + npc->duration = 0; + data->box[i].state = BOX_STATE_PEACH_EMERGE; + model->flags &= -(MODEL_FLAGS_FLAG_1 | MODEL_FLAGS_ENABLED); + // fallthrough + case BOX_STATE_PEACH_EMERGE: + hittingPeachBlock = TRUE; + model = get_model_from_list_index(get_model_list_index_from_tree_index(data->box[i].peachPanelModelID)); + centerY = update_lerp(EASING_QUADRATIC_OUT, npc->moveToPos.y, npc->moveToPos.y + 30.0, npc->duration, 30); + if (!(model->flags & MODEL_FLAGS_HAS_TRANSFORM_APPLIED)) { + guTranslateF(model->transformMatrix, npc->pos.x, centerY, npc->pos.z); + model->flags |= (MODEL_FLAGS_USES_TRANSFORM_MATRIX | MODEL_FLAGS_HAS_TRANSFORM_APPLIED); + } else { + guTranslateF(mtx, npc->pos.x, centerY, npc->pos.z); + guMtxCatF(mtx, model->transformMatrix, model->transformMatrix); + } + npc->duration++; + if (npc->duration >= 30) { + data->box[i].state = BOX_STATE_PEACH_DONE; + disable_npc_shadow(npc); + model->flags |= MODEL_FLAGS_ENABLED; + } + break; + case BOX_STATE_PEACH_DONE: + break; + } + } else { + if (data->box[i].state == BOX_STATE_EMPTY_INIT) { + data->box[i].state = BOX_STATE_EMPTY_IDLE; + data->box[i].stateTimer = 0; + } + } + } + + if (data->timeLeft > 0) { + if (data->found < NUM_PANELS) { + data->timeLeft--; + if (data->timeLeft == 750) { + sfx_play_sound(SOUND_1A5); + } else if (data->timeLeft == 600) { + sfx_play_sound(SOUND_1A5); + } else if (data->timeLeft == 450) { + sfx_play_sound(SOUND_1A5); + } else if (data->timeLeft == 300) { + sfx_play_sound(SOUND_1A6); + } else if (data->timeLeft == 270) { + sfx_play_sound(SOUND_1A6); + } else if (data->timeLeft == 240) { + sfx_play_sound(SOUND_1A6); + } else if (data->timeLeft == 210) { + sfx_play_sound(SOUND_1A6); + } else if (data->timeLeft == 180) { + sfx_play_sound(SOUND_1A6); + } else if (data->timeLeft == 150) { + sfx_play_sound(SOUND_1A7); + } else if (data->timeLeft == 120) { + sfx_play_sound(SOUND_1A7); + } else if (data->timeLeft == 90) { + sfx_play_sound(SOUND_1A7); + } else if (data->timeLeft == 60) { + sfx_play_sound(SOUND_1A7); + } else if (data->timeLeft == 30) { + sfx_play_sound(SOUND_1A7); + } + } + if ((data->timeLeft > 0) && (data->found == NUM_PANELS)) { + if (!(data->stunFlags & STUN_FLAGS_STUNNED)) { + data->stunFlags |= (STUN_FLAGS_STUNNED | STUN_FLAGS_CHANGED); + } + } + } + if ((data->timeLeft == 0) && hittingPeachBlock) { + if (!(data->stunFlags & STUN_FLAGS_STUNNED)) { + data->stunFlags |= (STUN_FLAGS_STUNNED | STUN_FLAGS_CHANGED); + } + } + if (data->stunFlags & STUN_FLAGS_CHANGED) { + data->stunFlags &= ~STUN_FLAGS_CHANGED; + if (data->stunFlags & STUN_FLAGS_STUNNED) { + disable_player_input(); + partner_disable_input(); + } else { + enable_player_input(); + partner_enable_input(); + } + } + if (!hittingPeachBlock && ((data->found == 10) || ((data->timeLeft == 0) + && (gPlayerStatusPtr->actionState != ACTION_STATE_HAMMER)))) { + gameFinished = TRUE; + } + if (gameFinished) { + if (data->stunFlags & STUN_FLAGS_STUNNED) { + enable_player_input(); + partner_enable_input(); + } + data->stunFlags = 0; + + gPlayerStatusPtr->targetYaw = 180.0; + if (data->timeLeft == 0) { + sfx_play_sound(SOUND_MENU_ERROR); + gPlayerStatusPtr->anim = ANIM_Mario_10002; + } else { + sfx_play_sound(SOUND_D4); + gPlayerStatusPtr->anim = ANIM_Mario_10002; + } + + return ApiStatus_DONE2; + } + + return ApiStatus_BLOCK; +} + +API_CALLABLE(N(UpdateRecords)) { + PlayerData* playerData = &gPlayerData; + SmashGameData* data = get_enemy(SCOREKEEPER_ENEMY_IDX)->varTablePtr[SMASH_DATA_VAR_IDX]; + s32 seconds, deciseconds; + s32 outScore; + + seconds = data->timeLeft / 30; + deciseconds = ((f32)(data->timeLeft % 30) * 10.0) / 30; + + data->currentScore = (seconds * 10) + deciseconds; + playerData->smashGameTotal += data->currentScore; + + if (playerData->smashGameTotal > 99999) { + playerData->smashGameTotal = 99999; + } + if (playerData->smashGameRecord < data->currentScore) { + playerData->smashGameRecord = data->currentScore; + } + + set_message_value(seconds, 0); + set_message_value(deciseconds, 1); + set_message_value(data->currentScore, 2); + + outScore = data->currentScore; + if (data->currentScore == 0 && data->found == NUM_PANELS) { + outScore = -1; + } + evt_set_variable(script, LVar0, outScore); + + return ApiStatus_DONE2; +} + +API_CALLABLE(N(GiveCoinReward)) { + SmashGameData* data = get_enemy(SCOREKEEPER_ENEMY_IDX)->varTablePtr[SMASH_DATA_VAR_IDX]; + s32 coinsLeft = data->currentScore; + s32 increment; + + if (coinsLeft > 100) { + increment = 40; + } else if (coinsLeft > 75) { + increment = 35; + } else if (coinsLeft > 50) { + increment = 30; + } else if (coinsLeft > 30) { + increment = 10; + } else if (coinsLeft > 20) { + increment = 5; + } else if (coinsLeft > 10) { + increment = 2; + } else { + increment = 1; + } + + data->currentScore -= increment; + add_coins(increment); + sfx_play_sound(SOUND_211); + + return (data->currentScore > 0) ? ApiStatus_BLOCK : ApiStatus_DONE2; +} + +API_CALLABLE(N(CleanupGame)) { + Enemy* enemy = get_enemy(SCOREKEEPER_ENEMY_IDX); + SmashGameData* data = enemy->varTablePtr[SMASH_DATA_VAR_IDX]; + Npc* npc; + u32 screenX, screenY,screenZ; + s32 writeback; + s32 i; + + if (enemy->varTable[3] == 4) { + for (i = 0; i < NUM_BOXES; i++) { + if (data->box[i].npcID == -1) { + continue; + } + enemy = get_enemy(data->box[i].npcID); + npc = get_npc_unsafe(enemy->npcID); + if ((npc->flags & NPC_FLAG_2)) { + continue; + } + + get_screen_coords(0, npc->pos.x, npc->pos.y, npc->pos.z, &screenX, &screenY, &screenZ); + if (screenX - 1 < SCREEN_WIDTH - 1) { + fx_walking_dust(1, npc->pos.x, npc->pos.y, npc->pos.z, 0, 0); + sfx_play_sound(SOUND_283); + } + npc->flags |= NPC_FLAG_2; + disable_npc_shadow(npc); + enemy->varTable[0] = 0; + } + return ApiStatus_DONE2; + } else { + for (i = 0; i < NUM_BOXES; i++) { + if (data->box[i].npcID == -1) { + continue; + } + enemy = get_enemy(data->box[i].npcID); + npc = get_npc_unsafe(enemy->npcID); + if ((npc->flags & NPC_FLAG_2)) { + continue; + } + + switch (data->box[i].content) { + case BOX_CONTENT_FUZZY: + if (data->box[i].state != BOX_STATE_FUZZY_END) { + data->box[i].state = BOX_STATE_FUZZY_END; + fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, 0.0f, 30, &writeback); + npc->currentAnim = ANIM_Fuzzy_Anim0E; + enable_npc_shadow(npc); + } + break; + + case BOX_CONTENT_BOMB: + if (data->box[i].state != BOX_STATE_BOMB_END) { + data->box[i].state = BOX_STATE_BOMB_END; + fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, 0.0f, 30, &writeback); + npc->currentAnim = ANIM_Bobomb_Anim1C; + enable_npc_shadow(npc); + } + break; + } + } + return ApiStatus_BLOCK; + } +} + +API_CALLABLE(N(CreateMinigame)) { + Enemy* scorekeeper = get_enemy(SCOREKEEPER_ENEMY_IDX); + SmashGameData* data = heap_malloc(sizeof(*data)); + scorekeeper->varTablePtr[SMASH_DATA_VAR_IDX] = data; + + data->windowA_posX = -80; + data->windowB_posX = SCREEN_WIDTH; + data->timeLeft = PLAY_TIME; + + func_800E9894(); + close_status_menu(); + + return ApiStatus_DONE2; +} + +API_CALLABLE(N(DestroyMinigame)) { + SmashGameData* data = get_enemy(SCOREKEEPER_ENEMY_IDX)->varTablePtr[SMASH_DATA_VAR_IDX]; + + free_generic_entity(data->workerID); + hud_element_free(data->hudElemID_AButton); + hud_element_free(data->hudElemID_Meter); + + return ApiStatus_DONE2; +} + +API_CALLABLE(N(GetCoinCount)) { + evt_set_variable(script, LVarA, gPlayerData.coins); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(TakeCoinCost)) { + PlayerData* playerData = &gPlayerData; + + if (isInitialCall) { + playerData->smashGamePlays++; + script->functionTemp[0] = 0; + } + add_coins(-1); + sfx_play_sound(SOUND_211); + + script->functionTemp[0]++; + return (script->functionTemp[0] == PLAY_COST) ? ApiStatus_DONE2 : ApiStatus_BLOCK; +} + +API_CALLABLE(N(HideCoinCounter)) { + hide_coin_counter_immediately(); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_Dummy) = { + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_Toad) = { + .height = 30, + .radius = 24, + .level = 99, +}; + +NpcSettings N(NpcSettings_Unused) = { + .height = 23, + .radius = 19, + .level = 99, +}; + +NpcSettings N(NpcSettings_Luigi) = { + .height = 24, + .radius = 24, + .level = 99, +}; + +NpcSettings N(NpcSettings_Fuzzy) = { + .height = 20, + .radius = 22, + .level = 6, + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, +}; + +NpcSettings N(NpcSettings_Bombomb) = { + .height = 23, + .radius = 20, + .level = 6, + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, +}; + +s32 N(InitialConfigurations)[3][NUM_BOXES] = { + { 2, 0, 2, 0, 2, 3, 3, 3, 3, 3, 2, 3, 2, 1, 3, 3, 2, 3, 0, 3, 3, 2, 3, 3, 1, 2, 3, 3, 2, 3, 3, 1, 3, 3, 2 }, + { 2, 0, 2, 1, 2, 3, 2, 3, 3, 3, 3, 1, 3, 2, 3, 0, 3, 3, 3, 3, 3, 2, 3, 2, 3, 3, 1, 0, 3, 2, 3, 3, 2, 3, 2 }, + { 3, 3, 0, 3, 3, 1, 0, 1, 2, 3, 3, 3, 2, 3, 0, 3, 2, 2, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 3, 3, 2, 3, 1, 3, 3 }, +}; + +s32 N(BoxModelIDs)[NUM_BOXES] = { + MODEL_a1, MODEL_b1, MODEL_c1, MODEL_d1, MODEL_e1, MODEL_f1, MODEL_g1, + MODEL_a2, MODEL_b2, MODEL_c2, MODEL_d2, MODEL_e2, MODEL_f2, MODEL_g2, + MODEL_a3, MODEL_b3, MODEL_c3, MODEL_d3, MODEL_e3, MODEL_f3, MODEL_g3, + MODEL_a4, MODEL_b4, MODEL_c4, MODEL_d4, MODEL_e4, MODEL_f4, MODEL_g4, + MODEL_a5, MODEL_b5, MODEL_c5, MODEL_d5, MODEL_e5, MODEL_f5, MODEL_g5, +}; + +s32 N(BoxColliderIDs)[NUM_BOXES] = { + COLLIDER_a1, COLLIDER_b1, COLLIDER_c1, COLLIDER_d1, COLLIDER_e1, COLLIDER_f1, COLLIDER_g1, + COLLIDER_a2, COLLIDER_b2, COLLIDER_c2, COLLIDER_d2, COLLIDER_e2, COLLIDER_f2, COLLIDER_g2, + COLLIDER_a3, COLLIDER_b3, COLLIDER_c3, COLLIDER_d3, COLLIDER_e3, COLLIDER_f3, COLLIDER_g3, + COLLIDER_a4, COLLIDER_b4, COLLIDER_c4, COLLIDER_d4, COLLIDER_e4, COLLIDER_f4, COLLIDER_g4, + COLLIDER_a5, COLLIDER_b5, COLLIDER_c5, COLLIDER_d5, COLLIDER_e5, COLLIDER_f5, COLLIDER_g5, +}; + +s32 N(PanelModelIDs)[NUM_PANELS] = { + MODEL_o50, MODEL_o51, MODEL_o52, MODEL_o53, MODEL_o54, + MODEL_o55, MODEL_o56, MODEL_o57, MODEL_o58, MODEL_o59 +}; + +EvtScript N(EVS_CreateScoreDisplay) = { + EVT_CALL(N(CreateScoreDisplay)) + EVT_RETURN + EVT_END +}; + +EvtScript N(read_sign_instructions) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(N(SetMsgImgs_Panel)) + EVT_CALL(ShowMessageAtScreenPos, MSG_MGM_0046, 160, 40) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ShowBox) = { + EVT_CALL(EnableModel, LVar0, TRUE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, LVar1, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(TranslateModel, LVar0, 0, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeBoxAppear) = { + EVT_EXEC(N(EVS_ShowBox)) + EVT_SET(LVarA, -25) + EVT_LOOP(13) + EVT_ADD(LVarA, 2) + EVT_CALL(TranslateModel, LVar0, 0, LVarA, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(TranslateModel, LVar0, 0, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_HideBox) = { + EVT_CALL(TranslateModel, LVar0, 0, 0, 0) + EVT_CALL(EnableModel, LVar0, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, LVar1, COLLIDER_FLAGS_UPPER_MASK) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_HideBoxWithSmoke) = { + EVT_EXEC(N(EVS_HideBox)) + EVT_WAIT(1) + EVT_CALL(GetColliderCenter, LVar1) + EVT_SUB(LVar1, 5) + EVT_CALL(PlayEffect, EFFECT_WALKING_DUST, 1, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_HideAllBoxes) = { + EVT_SET(LVar0, MODEL_a1) + EVT_SET(LVar1, MODEL_a1) + EVT_EXEC(N(EVS_HideBox)) + EVT_SET(LVar0, MODEL_a2) + EVT_SET(LVar1, MODEL_a2) + EVT_EXEC(N(EVS_HideBox)) + EVT_SET(LVar0, MODEL_a3) + EVT_SET(LVar1, MODEL_a3) + EVT_EXEC(N(EVS_HideBox)) + EVT_SET(LVar0, MODEL_a4) + EVT_SET(LVar1, MODEL_a4) + EVT_EXEC(N(EVS_HideBox)) + EVT_SET(LVar0, MODEL_a5) + EVT_SET(LVar1, MODEL_a5) + EVT_EXEC(N(EVS_HideBox)) + EVT_SET(LVar0, MODEL_b1) + EVT_SET(LVar1, MODEL_b1) + EVT_EXEC(N(EVS_HideBox)) + EVT_SET(LVar0, MODEL_b2) + EVT_SET(LVar1, MODEL_b2) + EVT_EXEC(N(EVS_HideBox)) + EVT_SET(LVar0, MODEL_b3) + EVT_SET(LVar1, MODEL_b3) + EVT_EXEC(N(EVS_HideBox)) + EVT_SET(LVar0, MODEL_b4) + EVT_SET(LVar1, MODEL_b4) + EVT_EXEC(N(EVS_HideBox)) + EVT_SET(LVar0, MODEL_b5) + EVT_SET(LVar1, MODEL_b5) + EVT_EXEC(N(EVS_HideBox)) + EVT_SET(LVar0, MODEL_c1) + EVT_SET(LVar1, MODEL_c1) + EVT_EXEC(N(EVS_HideBox)) + EVT_SET(LVar0, MODEL_c2) + EVT_SET(LVar1, MODEL_c2) + EVT_EXEC(N(EVS_HideBox)) + EVT_SET(LVar0, MODEL_c3) + EVT_SET(LVar1, MODEL_c3) + EVT_EXEC(N(EVS_HideBox)) + EVT_SET(LVar0, MODEL_c4) + EVT_SET(LVar1, MODEL_c4) + EVT_EXEC(N(EVS_HideBox)) + EVT_SET(LVar0, MODEL_c5) + EVT_SET(LVar1, MODEL_c5) + EVT_EXEC(N(EVS_HideBox)) + EVT_SET(LVar0, MODEL_d1) + EVT_SET(LVar1, MODEL_d1) + EVT_EXEC(N(EVS_HideBox)) + EVT_SET(LVar0, MODEL_d2) + EVT_SET(LVar1, MODEL_d2) + EVT_EXEC(N(EVS_HideBox)) + EVT_SET(LVar0, MODEL_d3) + EVT_SET(LVar1, MODEL_d3) + EVT_EXEC(N(EVS_HideBox)) + EVT_SET(LVar0, MODEL_d4) + EVT_SET(LVar1, MODEL_d4) + EVT_EXEC(N(EVS_HideBox)) + EVT_SET(LVar0, MODEL_d5) + EVT_SET(LVar1, MODEL_d5) + EVT_EXEC(N(EVS_HideBox)) + EVT_SET(LVar0, MODEL_e1) + EVT_SET(LVar1, MODEL_e1) + EVT_EXEC(N(EVS_HideBox)) + EVT_SET(LVar0, MODEL_e2) + EVT_SET(LVar1, MODEL_e2) + EVT_EXEC(N(EVS_HideBox)) + EVT_SET(LVar0, MODEL_e3) + EVT_SET(LVar1, MODEL_e3) + EVT_EXEC(N(EVS_HideBox)) + EVT_SET(LVar0, MODEL_e4) + EVT_SET(LVar1, MODEL_e4) + EVT_EXEC(N(EVS_HideBox)) + EVT_SET(LVar0, MODEL_e5) + EVT_SET(LVar1, MODEL_e5) + EVT_EXEC(N(EVS_HideBox)) + EVT_SET(LVar0, MODEL_f1) + EVT_SET(LVar1, MODEL_f1) + EVT_EXEC(N(EVS_HideBox)) + EVT_SET(LVar0, MODEL_f2) + EVT_SET(LVar1, MODEL_f2) + EVT_EXEC(N(EVS_HideBox)) + EVT_SET(LVar0, MODEL_f3) + EVT_SET(LVar1, MODEL_f3) + EVT_EXEC(N(EVS_HideBox)) + EVT_SET(LVar0, MODEL_f4) + EVT_SET(LVar1, MODEL_f4) + EVT_EXEC(N(EVS_HideBox)) + EVT_SET(LVar0, MODEL_f5) + EVT_SET(LVar1, MODEL_f5) + EVT_EXEC(N(EVS_HideBox)) + EVT_SET(LVar0, MODEL_g1) + EVT_SET(LVar1, MODEL_g1) + EVT_EXEC(N(EVS_HideBox)) + EVT_SET(LVar0, MODEL_g2) + EVT_SET(LVar1, MODEL_g2) + EVT_EXEC(N(EVS_HideBox)) + EVT_SET(LVar0, MODEL_g3) + EVT_SET(LVar1, MODEL_g3) + EVT_EXEC(N(EVS_HideBox)) + EVT_SET(LVar0, MODEL_g4) + EVT_SET(LVar1, MODEL_g4) + EVT_EXEC(N(EVS_HideBox)) + EVT_SET(LVar0, MODEL_g5) + EVT_SET(LVar1, MODEL_g5) + EVT_EXEC(N(EVS_HideBox)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_HideAllBoxesWithSmoke) = { + EVT_SET(LVar0, MODEL_a1) + EVT_SET(LVar1, MODEL_a1) + EVT_EXEC(N(EVS_HideBoxWithSmoke)) + EVT_SET(LVar0, MODEL_a2) + EVT_SET(LVar1, MODEL_a2) + EVT_EXEC(N(EVS_HideBoxWithSmoke)) + EVT_SET(LVar0, MODEL_a3) + EVT_SET(LVar1, MODEL_a3) + EVT_EXEC(N(EVS_HideBoxWithSmoke)) + EVT_SET(LVar0, MODEL_a4) + EVT_SET(LVar1, MODEL_a4) + EVT_EXEC(N(EVS_HideBoxWithSmoke)) + EVT_SET(LVar0, MODEL_a5) + EVT_SET(LVar1, MODEL_a5) + EVT_EXEC(N(EVS_HideBoxWithSmoke)) + EVT_SET(LVar0, MODEL_b1) + EVT_SET(LVar1, MODEL_b1) + EVT_EXEC(N(EVS_HideBoxWithSmoke)) + EVT_SET(LVar0, MODEL_b2) + EVT_SET(LVar1, MODEL_b2) + EVT_EXEC(N(EVS_HideBoxWithSmoke)) + EVT_SET(LVar0, MODEL_b3) + EVT_SET(LVar1, MODEL_b3) + EVT_EXEC(N(EVS_HideBoxWithSmoke)) + EVT_SET(LVar0, MODEL_b4) + EVT_SET(LVar1, MODEL_b4) + EVT_EXEC(N(EVS_HideBoxWithSmoke)) + EVT_SET(LVar0, MODEL_b5) + EVT_SET(LVar1, MODEL_b5) + EVT_EXEC(N(EVS_HideBoxWithSmoke)) + EVT_SET(LVar0, MODEL_c1) + EVT_SET(LVar1, MODEL_c1) + EVT_EXEC(N(EVS_HideBoxWithSmoke)) + EVT_SET(LVar0, MODEL_c2) + EVT_SET(LVar1, MODEL_c2) + EVT_EXEC(N(EVS_HideBoxWithSmoke)) + EVT_SET(LVar0, MODEL_c3) + EVT_SET(LVar1, MODEL_c3) + EVT_EXEC(N(EVS_HideBoxWithSmoke)) + EVT_SET(LVar0, MODEL_c4) + EVT_SET(LVar1, MODEL_c4) + EVT_EXEC(N(EVS_HideBoxWithSmoke)) + EVT_SET(LVar0, MODEL_c5) + EVT_SET(LVar1, MODEL_c5) + EVT_EXEC(N(EVS_HideBoxWithSmoke)) + EVT_SET(LVar0, MODEL_d1) + EVT_SET(LVar1, MODEL_d1) + EVT_EXEC(N(EVS_HideBoxWithSmoke)) + EVT_SET(LVar0, MODEL_d2) + EVT_SET(LVar1, MODEL_d2) + EVT_EXEC(N(EVS_HideBoxWithSmoke)) + EVT_SET(LVar0, MODEL_d3) + EVT_SET(LVar1, MODEL_d3) + EVT_EXEC(N(EVS_HideBoxWithSmoke)) + EVT_SET(LVar0, MODEL_d4) + EVT_SET(LVar1, MODEL_d4) + EVT_EXEC(N(EVS_HideBoxWithSmoke)) + EVT_SET(LVar0, MODEL_d5) + EVT_SET(LVar1, MODEL_d5) + EVT_EXEC(N(EVS_HideBoxWithSmoke)) + EVT_SET(LVar0, MODEL_e1) + EVT_SET(LVar1, MODEL_e1) + EVT_EXEC(N(EVS_HideBoxWithSmoke)) + EVT_SET(LVar0, MODEL_e2) + EVT_SET(LVar1, MODEL_e2) + EVT_EXEC(N(EVS_HideBoxWithSmoke)) + EVT_SET(LVar0, MODEL_e3) + EVT_SET(LVar1, MODEL_e3) + EVT_EXEC(N(EVS_HideBoxWithSmoke)) + EVT_SET(LVar0, MODEL_e4) + EVT_SET(LVar1, MODEL_e4) + EVT_EXEC(N(EVS_HideBoxWithSmoke)) + EVT_SET(LVar0, MODEL_e5) + EVT_SET(LVar1, MODEL_e5) + EVT_EXEC(N(EVS_HideBoxWithSmoke)) + EVT_SET(LVar0, MODEL_f1) + EVT_SET(LVar1, MODEL_f1) + EVT_EXEC(N(EVS_HideBoxWithSmoke)) + EVT_SET(LVar0, MODEL_f2) + EVT_SET(LVar1, MODEL_f2) + EVT_EXEC(N(EVS_HideBoxWithSmoke)) + EVT_SET(LVar0, MODEL_f3) + EVT_SET(LVar1, MODEL_f3) + EVT_EXEC(N(EVS_HideBoxWithSmoke)) + EVT_SET(LVar0, MODEL_f4) + EVT_SET(LVar1, MODEL_f4) + EVT_EXEC(N(EVS_HideBoxWithSmoke)) + EVT_SET(LVar0, MODEL_f5) + EVT_SET(LVar1, MODEL_f5) + EVT_EXEC(N(EVS_HideBoxWithSmoke)) + EVT_SET(LVar0, MODEL_g1) + EVT_SET(LVar1, MODEL_g1) + EVT_EXEC(N(EVS_HideBoxWithSmoke)) + EVT_SET(LVar0, MODEL_g2) + EVT_SET(LVar1, MODEL_g2) + EVT_EXEC(N(EVS_HideBoxWithSmoke)) + EVT_SET(LVar0, MODEL_g3) + EVT_SET(LVar1, MODEL_g3) + EVT_EXEC(N(EVS_HideBoxWithSmoke)) + EVT_SET(LVar0, MODEL_g4) + EVT_SET(LVar1, MODEL_g4) + EVT_EXEC(N(EVS_HideBoxWithSmoke)) + EVT_SET(LVar0, MODEL_g5) + EVT_SET(LVar1, MODEL_g5) + EVT_EXEC(N(EVS_HideBoxWithSmoke)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeAllBoxesAppear) = { + EVT_SET(LVar0, MODEL_a1) + EVT_SET(LVar1, MODEL_a1) + EVT_EXEC(N(EVS_MakeBoxAppear)) + EVT_SET(LVar0, MODEL_a2) + EVT_SET(LVar1, MODEL_a2) + EVT_EXEC(N(EVS_MakeBoxAppear)) + EVT_SET(LVar0, MODEL_a3) + EVT_SET(LVar1, MODEL_a3) + EVT_EXEC(N(EVS_MakeBoxAppear)) + EVT_SET(LVar0, MODEL_a4) + EVT_SET(LVar1, MODEL_a4) + EVT_EXEC(N(EVS_MakeBoxAppear)) + EVT_SET(LVar0, MODEL_a5) + EVT_SET(LVar1, MODEL_a5) + EVT_EXEC(N(EVS_MakeBoxAppear)) + EVT_SET(LVar0, MODEL_b1) + EVT_SET(LVar1, MODEL_b1) + EVT_EXEC(N(EVS_MakeBoxAppear)) + EVT_SET(LVar0, MODEL_b2) + EVT_SET(LVar1, MODEL_b2) + EVT_EXEC(N(EVS_MakeBoxAppear)) + EVT_SET(LVar0, MODEL_b3) + EVT_SET(LVar1, MODEL_b3) + EVT_EXEC(N(EVS_MakeBoxAppear)) + EVT_SET(LVar0, MODEL_b4) + EVT_SET(LVar1, MODEL_b4) + EVT_EXEC(N(EVS_MakeBoxAppear)) + EVT_SET(LVar0, MODEL_b5) + EVT_SET(LVar1, MODEL_b5) + EVT_EXEC(N(EVS_MakeBoxAppear)) + EVT_SET(LVar0, MODEL_c1) + EVT_SET(LVar1, MODEL_c1) + EVT_EXEC(N(EVS_MakeBoxAppear)) + EVT_SET(LVar0, MODEL_c2) + EVT_SET(LVar1, MODEL_c2) + EVT_EXEC(N(EVS_MakeBoxAppear)) + EVT_SET(LVar0, MODEL_c3) + EVT_SET(LVar1, MODEL_c3) + EVT_EXEC(N(EVS_MakeBoxAppear)) + EVT_SET(LVar0, MODEL_c4) + EVT_SET(LVar1, MODEL_c4) + EVT_EXEC(N(EVS_MakeBoxAppear)) + EVT_SET(LVar0, MODEL_c5) + EVT_SET(LVar1, MODEL_c5) + EVT_EXEC(N(EVS_MakeBoxAppear)) + EVT_SET(LVar0, MODEL_d1) + EVT_SET(LVar1, MODEL_d1) + EVT_EXEC(N(EVS_MakeBoxAppear)) + EVT_SET(LVar0, MODEL_d2) + EVT_SET(LVar1, MODEL_d2) + EVT_EXEC(N(EVS_MakeBoxAppear)) + EVT_SET(LVar0, MODEL_d3) + EVT_SET(LVar1, MODEL_d3) + EVT_EXEC(N(EVS_MakeBoxAppear)) + EVT_SET(LVar0, MODEL_d4) + EVT_SET(LVar1, MODEL_d4) + EVT_EXEC(N(EVS_MakeBoxAppear)) + EVT_SET(LVar0, MODEL_d5) + EVT_SET(LVar1, MODEL_d5) + EVT_EXEC(N(EVS_MakeBoxAppear)) + EVT_SET(LVar0, MODEL_e1) + EVT_SET(LVar1, MODEL_e1) + EVT_EXEC(N(EVS_MakeBoxAppear)) + EVT_SET(LVar0, MODEL_e2) + EVT_SET(LVar1, MODEL_e2) + EVT_EXEC(N(EVS_MakeBoxAppear)) + EVT_SET(LVar0, MODEL_e3) + EVT_SET(LVar1, MODEL_e3) + EVT_EXEC(N(EVS_MakeBoxAppear)) + EVT_SET(LVar0, MODEL_e4) + EVT_SET(LVar1, MODEL_e4) + EVT_EXEC(N(EVS_MakeBoxAppear)) + EVT_SET(LVar0, MODEL_e5) + EVT_SET(LVar1, MODEL_e5) + EVT_EXEC(N(EVS_MakeBoxAppear)) + EVT_SET(LVar0, MODEL_f1) + EVT_SET(LVar1, MODEL_f1) + EVT_EXEC(N(EVS_MakeBoxAppear)) + EVT_SET(LVar0, MODEL_f2) + EVT_SET(LVar1, MODEL_f2) + EVT_EXEC(N(EVS_MakeBoxAppear)) + EVT_SET(LVar0, MODEL_f3) + EVT_SET(LVar1, MODEL_f3) + EVT_EXEC(N(EVS_MakeBoxAppear)) + EVT_SET(LVar0, MODEL_f4) + EVT_SET(LVar1, MODEL_f4) + EVT_EXEC(N(EVS_MakeBoxAppear)) + EVT_SET(LVar0, MODEL_f5) + EVT_SET(LVar1, MODEL_f5) + EVT_EXEC(N(EVS_MakeBoxAppear)) + EVT_SET(LVar0, MODEL_g1) + EVT_SET(LVar1, MODEL_g1) + EVT_EXEC(N(EVS_MakeBoxAppear)) + EVT_SET(LVar0, MODEL_g2) + EVT_SET(LVar1, MODEL_g2) + EVT_EXEC(N(EVS_MakeBoxAppear)) + EVT_SET(LVar0, MODEL_g3) + EVT_SET(LVar1, MODEL_g3) + EVT_EXEC(N(EVS_MakeBoxAppear)) + EVT_SET(LVar0, MODEL_g4) + EVT_SET(LVar1, MODEL_g4) + EVT_EXEC(N(EVS_MakeBoxAppear)) + EVT_SET(LVar0, MODEL_g5) + EVT_SET(LVar1, MODEL_g5) + EVT_EXEC(N(EVS_MakeBoxAppear)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_HidePeachPanels) = { + EVT_CALL(EnableModel, MODEL_o50, FALSE) + EVT_CALL(EnableModel, MODEL_o51, FALSE) + EVT_CALL(EnableModel, MODEL_o52, FALSE) + EVT_CALL(EnableModel, MODEL_o53, FALSE) + EVT_CALL(EnableModel, MODEL_o54, FALSE) + EVT_CALL(EnableModel, MODEL_o55, FALSE) + EVT_CALL(EnableModel, MODEL_o56, FALSE) + EVT_CALL(EnableModel, MODEL_o57, FALSE) + EVT_CALL(EnableModel, MODEL_o58, FALSE) + EVT_CALL(EnableModel, MODEL_o59, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OnHitBox) = { + EVT_SET(LVarA, LVar0) + EVT_SET(LVarB, LVar1) + EVT_CALL(N(OnHitBox)) + EVT_CALL(GetColliderCenter, LVarB) + EVT_SWITCH(LVarC) + EVT_CASE_EQ(2) + EVT_ADD(LVar1, 2) + EVT_CALL(PlayEffect, EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 25, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_CASE_EQ(3) + EVT_CALL(TranslateModel, LVarA, 0, -9, 0) + EVT_WAIT(1) + EVT_CALL(TranslateModel, LVarA, 0, -15, 0) + EVT_WAIT(1) + EVT_CALL(TranslateModel, LVarA, 0, -21, 0) + EVT_WAIT(1) + EVT_CALL(EnableModel, LVarA, FALSE) + EVT_CALL(ModifyColliderFlags, 0, LVarB, COLLIDER_FLAGS_UPPER_MASK) + EVT_WAIT(4) + EVT_SUB(LVar1, 5) + EVT_CALL(PlayEffect, EFFECT_WALKING_DUST, 1, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_CASE_OR_EQ(0) + EVT_CASE_OR_EQ(1) + EVT_SUB(LVar1, 5) + EVT_CALL(PlayEffect, EFFECT_WALKING_DUST, 1, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_CALL(EnableModel, LVarA, FALSE) + EVT_CALL(ModifyColliderFlags, 0, LVarB, COLLIDER_FLAGS_UPPER_MASK) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_802441E4_E19F64) = { + EVT_SET(LVar0, MODEL_a1) + EVT_SET(LVar1, MODEL_a1) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnHitBox)), TRIGGER_WALL_HAMMER, LVar1, 1, 0) + EVT_SET(LVar0, MODEL_a2) + EVT_SET(LVar1, MODEL_a2) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnHitBox)), TRIGGER_WALL_HAMMER, LVar1, 1, 0) + EVT_SET(LVar0, MODEL_a3) + EVT_SET(LVar1, MODEL_a3) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnHitBox)), TRIGGER_WALL_HAMMER, LVar1, 1, 0) + EVT_SET(LVar0, MODEL_a4) + EVT_SET(LVar1, MODEL_a4) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnHitBox)), TRIGGER_WALL_HAMMER, LVar1, 1, 0) + EVT_SET(LVar0, MODEL_a5) + EVT_SET(LVar1, MODEL_a5) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnHitBox)), TRIGGER_WALL_HAMMER, LVar1, 1, 0) + EVT_SET(LVar0, MODEL_b1) + EVT_SET(LVar1, MODEL_b1) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnHitBox)), TRIGGER_WALL_HAMMER, LVar1, 1, 0) + EVT_SET(LVar0, MODEL_b2) + EVT_SET(LVar1, MODEL_b2) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnHitBox)), TRIGGER_WALL_HAMMER, LVar1, 1, 0) + EVT_SET(LVar0, MODEL_b3) + EVT_SET(LVar1, MODEL_b3) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnHitBox)), TRIGGER_WALL_HAMMER, LVar1, 1, 0) + EVT_SET(LVar0, MODEL_b4) + EVT_SET(LVar1, MODEL_b4) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnHitBox)), TRIGGER_WALL_HAMMER, LVar1, 1, 0) + EVT_SET(LVar0, MODEL_b5) + EVT_SET(LVar1, MODEL_b5) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnHitBox)), TRIGGER_WALL_HAMMER, LVar1, 1, 0) + EVT_SET(LVar0, MODEL_c1) + EVT_SET(LVar1, MODEL_c1) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnHitBox)), TRIGGER_WALL_HAMMER, LVar1, 1, 0) + EVT_SET(LVar0, MODEL_c2) + EVT_SET(LVar1, MODEL_c2) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnHitBox)), TRIGGER_WALL_HAMMER, LVar1, 1, 0) + EVT_SET(LVar0, MODEL_c3) + EVT_SET(LVar1, MODEL_c3) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnHitBox)), TRIGGER_WALL_HAMMER, LVar1, 1, 0) + EVT_SET(LVar0, MODEL_c4) + EVT_SET(LVar1, MODEL_c4) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnHitBox)), TRIGGER_WALL_HAMMER, LVar1, 1, 0) + EVT_SET(LVar0, MODEL_c5) + EVT_SET(LVar1, MODEL_c5) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnHitBox)), TRIGGER_WALL_HAMMER, LVar1, 1, 0) + EVT_SET(LVar0, MODEL_d1) + EVT_SET(LVar1, MODEL_d1) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnHitBox)), TRIGGER_WALL_HAMMER, LVar1, 1, 0) + EVT_SET(LVar0, MODEL_d2) + EVT_SET(LVar1, MODEL_d2) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnHitBox)), TRIGGER_WALL_HAMMER, LVar1, 1, 0) + EVT_SET(LVar0, MODEL_d3) + EVT_SET(LVar1, MODEL_d3) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnHitBox)), TRIGGER_WALL_HAMMER, LVar1, 1, 0) + EVT_SET(LVar0, MODEL_d4) + EVT_SET(LVar1, MODEL_d4) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnHitBox)), TRIGGER_WALL_HAMMER, LVar1, 1, 0) + EVT_SET(LVar0, MODEL_d5) + EVT_SET(LVar1, MODEL_d5) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnHitBox)), TRIGGER_WALL_HAMMER, LVar1, 1, 0) + EVT_SET(LVar0, MODEL_e1) + EVT_SET(LVar1, MODEL_e1) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnHitBox)), TRIGGER_WALL_HAMMER, LVar1, 1, 0) + EVT_SET(LVar0, MODEL_e2) + EVT_SET(LVar1, MODEL_e2) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnHitBox)), TRIGGER_WALL_HAMMER, LVar1, 1, 0) + EVT_SET(LVar0, MODEL_e3) + EVT_SET(LVar1, MODEL_e3) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnHitBox)), TRIGGER_WALL_HAMMER, LVar1, 1, 0) + EVT_SET(LVar0, MODEL_e4) + EVT_SET(LVar1, MODEL_e4) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnHitBox)), TRIGGER_WALL_HAMMER, LVar1, 1, 0) + EVT_SET(LVar0, MODEL_e5) + EVT_SET(LVar1, MODEL_e5) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnHitBox)), TRIGGER_WALL_HAMMER, LVar1, 1, 0) + EVT_SET(LVar0, MODEL_f1) + EVT_SET(LVar1, MODEL_f1) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnHitBox)), TRIGGER_WALL_HAMMER, LVar1, 1, 0) + EVT_SET(LVar0, MODEL_f2) + EVT_SET(LVar1, MODEL_f2) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnHitBox)), TRIGGER_WALL_HAMMER, LVar1, 1, 0) + EVT_SET(LVar0, MODEL_f3) + EVT_SET(LVar1, MODEL_f3) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnHitBox)), TRIGGER_WALL_HAMMER, LVar1, 1, 0) + EVT_SET(LVar0, MODEL_f4) + EVT_SET(LVar1, MODEL_f4) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnHitBox)), TRIGGER_WALL_HAMMER, LVar1, 1, 0) + EVT_SET(LVar0, MODEL_f5) + EVT_SET(LVar1, MODEL_f5) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnHitBox)), TRIGGER_WALL_HAMMER, LVar1, 1, 0) + EVT_SET(LVar0, MODEL_g1) + EVT_SET(LVar1, MODEL_g1) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnHitBox)), TRIGGER_WALL_HAMMER, LVar1, 1, 0) + EVT_SET(LVar0, MODEL_g2) + EVT_SET(LVar1, MODEL_g2) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnHitBox)), TRIGGER_WALL_HAMMER, LVar1, 1, 0) + EVT_SET(LVar0, MODEL_g3) + EVT_SET(LVar1, MODEL_g3) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnHitBox)), TRIGGER_WALL_HAMMER, LVar1, 1, 0) + EVT_SET(LVar0, MODEL_g4) + EVT_SET(LVar1, MODEL_g4) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnHitBox)), TRIGGER_WALL_HAMMER, LVar1, 1, 0) + EVT_SET(LVar0, MODEL_g5) + EVT_SET(LVar1, MODEL_g5) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnHitBox)), TRIGGER_WALL_HAMMER, LVar1, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetBoxContents) = { + EVT_CALL(N(SetBoxContents)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_CleanupGame) = { + EVT_CALL(N(CleanupGame)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Toad_GovernGame) = { + EVT_CALL(N(DisableMenus)) + EVT_CALL(N(RunMinigame)) + EVT_CALL(N(EnableMenus)) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SetSelfVar, 3, 3) + EVT_CALL(PopSong) + EVT_EXEC(N(EVS_CleanupGame)) + EVT_CALL(ShowMessageAtScreenPos, MSG_MGM_0041, 160, 40) + EVT_WAIT(5) + EVT_CALL(SetSelfVar, 3, 4) + EVT_EXEC(N(EVS_HidePeachPanels)) + EVT_EXEC(N(EVS_HideAllBoxesWithSmoke)) + EVT_WAIT(15) + EVT_THREAD + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 358, -20, 185) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 358, -20, 185) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(400.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_END_THREAD + EVT_CALL(SetNpcFlagBits, NPC_Toad, NPC_FLAG_100, TRUE) + EVT_CALL(N(CreateSignpost)) + EVT_CALL(PlayEffect, EFFECT_WALKING_DUST, 1, 355, 45, -175, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_THREAD + EVT_CALL(SetNpcPos, NPC_Toad, 358, -20, 185) + EVT_CALL(EnableNpcShadow, NPC_Toad, TRUE) + EVT_CALL(PlayEffect, EFFECT_WALKING_DUST, 1, 358, 5, 189, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_10000000, 0) + EVT_END_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_Toad, LVar3, LVar4, LVar5) + EVT_CALL(GetDist2D, LVarA, LVar0, LVar2, LVar3, LVar5) + EVT_DIV(LVarA, 8) + EVT_IF_LT(LVarA, 3) + EVT_SET(LVarA, 3) + EVT_END_IF + EVT_CALL(PlayerMoveTo, 330, 185, LVarA) + EVT_CALL(WaitForPlayerMoveToComplete) + EVT_CALL(SetNpcFlagBits, NPC_Toad, NPC_FLAG_100, FALSE) + EVT_WAIT(5) + EVT_CALL(SetSelfVar, 3, 5) + EVT_CALL(N(UpdateRecords)) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(-1) + EVT_CALL(SetSelfVar, 3, 0) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_MGM_0043) + EVT_CASE_EQ(0) + EVT_CALL(SetSelfVar, 3, 0) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_MGM_0044) + EVT_CASE_DEFAULT + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_MGM_0042) + EVT_CALL(ShowCoinCounter, TRUE) + EVT_WAIT(10) + EVT_CALL(N(GiveCoinReward)) + EVT_WAIT(15) + EVT_CALL(ShowCoinCounter, FALSE) + EVT_CALL(SetSelfVar, 3, 0) + EVT_WAIT(5) + EVT_CALL(ContinueSpeech, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_MGM_0045) + EVT_END_SWITCH + EVT_WAIT(5) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(450.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_InitializeMinigame) = { + EVT_CALL(N(CreateMinigame)) + EVT_EXEC(N(EVS_HideAllBoxes)) + EVT_CALL(N(CreateSignpost)) + EVT_EXEC(N(EVS_CreateScoreDisplay)) + EVT_EXEC(N(D_802441E4_E19F64)) + EVT_EXEC(N(EVS_HidePeachPanels)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_DestroyMinigame) = { + EVT_CALL(N(DestroyMinigame)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Toad) = { + EVT_IF_EQ(GF_MGM_Met_SmashAttack, FALSE) + EVT_CALL(N(SetMsgImgs_Panel)) + EVT_SET(GF_MGM_Met_SmashAttack, TRUE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_MGM_003C) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_MGM_003D) + EVT_END_IF + EVT_CALL(ShowCoinCounter, TRUE) + EVT_CALL(N(GetCoinCount)) + EVT_IF_LT(LVarA, 10) + EVT_CALL(ContinueSpeech, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_MGM_003E) + EVT_CALL(N(HideCoinCounter)) + EVT_WAIT(12) + EVT_EXEC(N(EVS_DestroyMinigame)) + EVT_CALL(GotoMap, EVT_PTR("mgm_00"), mgm_00_ENTRY_2) + EVT_WAIT(100) + EVT_RETURN + EVT_END_IF + EVT_CALL(ShowChoice, MSG_Choice_004F) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(0) + EVT_CALL(GetSelfVar, 4, LVar1) + EVT_IF_LT(LVar1, 100) + EVT_ADD(LVar1, 1) + EVT_CALL(SetSelfVar, 4, LVar1) + EVT_END_IF + EVT_THREAD + EVT_CALL(N(TakeCoinCost)) + EVT_END_THREAD + EVT_CALL(ContinueSpeech, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_MGM_003F) + EVT_CALL(N(HideCoinCounter)) + EVT_CASE_DEFAULT + EVT_CALL(N(HideCoinCounter)) + EVT_WAIT(5) + EVT_CALL(ContinueSpeech, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_MGM_0040) + EVT_EXEC(N(EVS_DestroyMinigame)) + EVT_CALL(GotoMap, EVT_PTR("mgm_00"), mgm_00_ENTRY_2) + EVT_WAIT(100) + EVT_RETURN + EVT_END_SWITCH + EVT_THREAD + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_SUB(LVar2, 3) + EVT_CALL(NpcMoveTo, NPC_PARTNER, LVar0, LVar2, 10) + EVT_END_THREAD + EVT_CALL(EndSpeech, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 5) + EVT_CALL(SetSelfVar, 3, 1) + EVT_CALL(PlaySoundWithVolume, SOUND_2108, 80) + EVT_EXEC(N(EVS_MakeAllBoxesAppear)) + EVT_EXEC(N(EVS_SetBoxContents)) + EVT_WAIT(25) + EVT_THREAD + EVT_WAIT(12) + EVT_CALL(PlayEffect, EFFECT_WALKING_DUST, 1, 358, -10, 185, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_CALL(SetNpcPos, NPC_Toad, 358, 500, 185) + EVT_CALL(EnableNpcShadow, NPC_Toad, FALSE) + EVT_CALL(N(DestroySignpost)) + EVT_CALL(PlayEffect, EFFECT_WALKING_DUST, 1, 355, 30, -180, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_END_THREAD + EVT_CALL(EndSpeech, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 5) + EVT_CALL(PushSong, 133, 0) + EVT_WAIT(8) + EVT_CALL(EndSpeech, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 5) + EVT_CALL(EnablePartnerAI) + EVT_CALL(SetSelfVar, 3, 2) + EVT_EXEC(N(EVS_Toad_GovernGame)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Toad) = { + EVT_CALL(SetNpcPos, NPC_Toad, 358, -20, 185) + EVT_CALL(SetSelfVar, 4, 0) + EVT_CALL(SetSelfVar, 3, 0) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Toad))) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_GuideToad) = { + .id = NPC_Toad, + .settings = &N(NpcSettings_Toad), + .pos = { 353.0f, -20.0f, 185.0f }, + .yaw = 270, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .init = &N(EVS_NpcInit_Toad), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Toad_Red_Idle, + .walk = ANIM_Toad_Red_Walk, + .run = ANIM_Toad_Red_Run, + .chase = ANIM_Toad_Red_Run, + .anim_4 = ANIM_Toad_Red_Idle, + .anim_5 = ANIM_Toad_Red_Idle, + .death = ANIM_Toad_Red_Disappointed, + .hit = ANIM_Toad_Red_Disappointed, + .anim_8 = ANIM_Toad_Red_Run, + .anim_9 = ANIM_Toad_Red_Run, + .anim_A = ANIM_Toad_Red_Run, + .anim_B = ANIM_Toad_Red_Run, + .anim_C = ANIM_Toad_Red_Run, + .anim_D = ANIM_Toad_Red_Run, + .anim_E = ANIM_Toad_Red_Run, + .anim_F = ANIM_Toad_Red_Run, + }, + .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, +}; + +EvtScript N(EVS_NpcInit_Fuzzy) = { + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Fuzzy_Anim03) + EVT_CALL(SetSelfVar, 0, 0) + EVT_CALL(GetSelfNpcID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(10) + EVT_CALL(SetSelfVar, 8, 817) + EVT_CASE_EQ(11) + EVT_CALL(SetSelfVar, 8, 818) + EVT_CASE_EQ(12) + EVT_CALL(SetSelfVar, 8, 819) + EVT_CASE_EQ(13) + EVT_CALL(SetSelfVar, 8, 817) + EVT_CASE_DEFAULT + EVT_CALL(SetSelfVar, 8, 818) + EVT_END_SWITCH + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_JUMPING, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) + EVT_CALL(RandInt, 100, LVar0) + EVT_IF_LT(LVar0, 50) + EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 0) + EVT_ELSE + EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 0) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Bombomb) = { + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Bobomb_Anim0B) + EVT_CALL(SetSelfVar, 0, 0) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_JUMPING, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) + EVT_CALL(GetSelfNpcID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(30) + EVT_CALL(SetSelfVar, 8, 812) + EVT_CASE_EQ(31) + EVT_CALL(SetSelfVar, 8, 813) + EVT_CASE_EQ(32) + EVT_CALL(SetSelfVar, 8, 812) + EVT_CASE_DEFAULT + EVT_CALL(SetSelfVar, 8, 813) + EVT_END_SWITCH + EVT_CALL(RandInt, 100, LVar0) + EVT_IF_LT(LVar0, 50) + EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 0) + EVT_ELSE + EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 0) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Luigi) = { + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Luigi_Jump) + EVT_CALL(SetSelfVar, 0, 0) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_JUMPING, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) + EVT_CALL(RandInt, 100, LVar0) + EVT_IF_LT(LVar0, 50) + EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 0) + EVT_ELSE + EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 0) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_Fuzzy_01) = { + .id = NPC_Fuzzy_01, + .settings = &N(NpcSettings_Fuzzy), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_200000 | NPC_FLAG_1000000 | NPC_FLAG_SIMPLIFIED_PHYSICS | NPC_FLAG_PARTICLE | NPC_FLAG_8000000 | NPC_FLAG_10000000 | NPC_FLAG_20000000, + .init = &N(EVS_NpcInit_Fuzzy), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Fuzzy_Anim02, + .walk = ANIM_Fuzzy_Anim02, + .run = ANIM_Fuzzy_Anim03, + .chase = ANIM_Fuzzy_Anim03, + .anim_4 = ANIM_Fuzzy_Anim01, + .anim_5 = ANIM_Fuzzy_Anim01, + .death = ANIM_Fuzzy_Anim08, + .hit = ANIM_Fuzzy_Anim08, + .anim_8 = ANIM_Fuzzy_Anim03, + .anim_9 = ANIM_Fuzzy_Anim03, + .anim_A = ANIM_Fuzzy_Anim03, + .anim_B = ANIM_Fuzzy_Anim03, + .anim_C = ANIM_Fuzzy_Anim03, + .anim_D = ANIM_Fuzzy_Anim03, + .anim_E = ANIM_Fuzzy_Anim03, + .anim_F = ANIM_Fuzzy_Anim03, + }, + .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, +}; + +StaticNpc N(NpcData_Fuzzy_02) = { + .id = NPC_Fuzzy_02, + .settings = &N(NpcSettings_Fuzzy), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_200000 | NPC_FLAG_1000000 | NPC_FLAG_SIMPLIFIED_PHYSICS | NPC_FLAG_PARTICLE | NPC_FLAG_8000000 | NPC_FLAG_10000000 | NPC_FLAG_20000000, + .init = &N(EVS_NpcInit_Fuzzy), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Fuzzy_Anim02, + .walk = ANIM_Fuzzy_Anim02, + .run = ANIM_Fuzzy_Anim03, + .chase = ANIM_Fuzzy_Anim03, + .anim_4 = ANIM_Fuzzy_Anim01, + .anim_5 = ANIM_Fuzzy_Anim01, + .death = ANIM_Fuzzy_Anim08, + .hit = ANIM_Fuzzy_Anim08, + .anim_8 = ANIM_Fuzzy_Anim03, + .anim_9 = ANIM_Fuzzy_Anim03, + .anim_A = ANIM_Fuzzy_Anim03, + .anim_B = ANIM_Fuzzy_Anim03, + .anim_C = ANIM_Fuzzy_Anim03, + .anim_D = ANIM_Fuzzy_Anim03, + .anim_E = ANIM_Fuzzy_Anim03, + .anim_F = ANIM_Fuzzy_Anim03, + }, + .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, +}; + +StaticNpc N(NpcData_Fuzzy_03) = { + .id = NPC_Fuzzy_03, + .settings = &N(NpcSettings_Fuzzy), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_200000 | NPC_FLAG_1000000 | NPC_FLAG_SIMPLIFIED_PHYSICS | NPC_FLAG_PARTICLE | NPC_FLAG_8000000 | NPC_FLAG_10000000 | NPC_FLAG_20000000, + .init = &N(EVS_NpcInit_Fuzzy), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Fuzzy_Anim02, + .walk = ANIM_Fuzzy_Anim02, + .run = ANIM_Fuzzy_Anim03, + .chase = ANIM_Fuzzy_Anim03, + .anim_4 = ANIM_Fuzzy_Anim01, + .anim_5 = ANIM_Fuzzy_Anim01, + .death = ANIM_Fuzzy_Anim08, + .hit = ANIM_Fuzzy_Anim08, + .anim_8 = ANIM_Fuzzy_Anim03, + .anim_9 = ANIM_Fuzzy_Anim03, + .anim_A = ANIM_Fuzzy_Anim03, + .anim_B = ANIM_Fuzzy_Anim03, + .anim_C = ANIM_Fuzzy_Anim03, + .anim_D = ANIM_Fuzzy_Anim03, + .anim_E = ANIM_Fuzzy_Anim03, + .anim_F = ANIM_Fuzzy_Anim03, + }, + .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, +}; + +StaticNpc N(NpcData_Fuzzy_04) = { + .id = NPC_Fuzzy_04, + .settings = &N(NpcSettings_Fuzzy), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_200000 | NPC_FLAG_1000000 | NPC_FLAG_SIMPLIFIED_PHYSICS | NPC_FLAG_PARTICLE | NPC_FLAG_8000000 | NPC_FLAG_10000000 | NPC_FLAG_20000000, + .init = &N(EVS_NpcInit_Fuzzy), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Fuzzy_Anim02, + .walk = ANIM_Fuzzy_Anim02, + .run = ANIM_Fuzzy_Anim03, + .chase = ANIM_Fuzzy_Anim03, + .anim_4 = ANIM_Fuzzy_Anim01, + .anim_5 = ANIM_Fuzzy_Anim01, + .death = ANIM_Fuzzy_Anim08, + .hit = ANIM_Fuzzy_Anim08, + .anim_8 = ANIM_Fuzzy_Anim03, + .anim_9 = ANIM_Fuzzy_Anim03, + .anim_A = ANIM_Fuzzy_Anim03, + .anim_B = ANIM_Fuzzy_Anim03, + .anim_C = ANIM_Fuzzy_Anim03, + .anim_D = ANIM_Fuzzy_Anim03, + .anim_E = ANIM_Fuzzy_Anim03, + .anim_F = ANIM_Fuzzy_Anim03, + }, + .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, +}; + +StaticNpc N(NpcData_Fuzzy_05) = { + .id = NPC_Fuzzy_05, + .settings = &N(NpcSettings_Fuzzy), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_200000 | NPC_FLAG_1000000 | NPC_FLAG_SIMPLIFIED_PHYSICS | NPC_FLAG_PARTICLE | NPC_FLAG_8000000 | NPC_FLAG_10000000 | NPC_FLAG_20000000, + .init = &N(EVS_NpcInit_Fuzzy), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Fuzzy_Anim02, + .walk = ANIM_Fuzzy_Anim02, + .run = ANIM_Fuzzy_Anim03, + .chase = ANIM_Fuzzy_Anim03, + .anim_4 = ANIM_Fuzzy_Anim01, + .anim_5 = ANIM_Fuzzy_Anim01, + .death = ANIM_Fuzzy_Anim08, + .hit = ANIM_Fuzzy_Anim08, + .anim_8 = ANIM_Fuzzy_Anim03, + .anim_9 = ANIM_Fuzzy_Anim03, + .anim_A = ANIM_Fuzzy_Anim03, + .anim_B = ANIM_Fuzzy_Anim03, + .anim_C = ANIM_Fuzzy_Anim03, + .anim_D = ANIM_Fuzzy_Anim03, + .anim_E = ANIM_Fuzzy_Anim03, + .anim_F = ANIM_Fuzzy_Anim03, + }, + .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, +}; + +StaticNpc N(NpcData_Bombomb_01) = { + .id = NPC_Bombomb_01, + .settings = &N(NpcSettings_Bombomb), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_200000 | NPC_FLAG_1000000 | NPC_FLAG_SIMPLIFIED_PHYSICS | NPC_FLAG_PARTICLE | NPC_FLAG_8000000 | NPC_FLAG_10000000 | NPC_FLAG_20000000, + .init = &N(EVS_NpcInit_Bombomb), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Bobomb_Anim02, + .walk = ANIM_Bobomb_Anim04, + .run = ANIM_Bobomb_Anim06, + .chase = ANIM_Bobomb_Anim06, + .anim_4 = ANIM_Bobomb_Anim02, + .anim_5 = ANIM_Bobomb_Anim02, + .death = ANIM_Bobomb_Anim0E, + .hit = ANIM_Bobomb_Anim0E, + .anim_8 = ANIM_Bobomb_Anim06, + .anim_9 = ANIM_Bobomb_Anim06, + .anim_A = ANIM_Bobomb_Anim06, + .anim_B = ANIM_Bobomb_Anim06, + .anim_C = ANIM_Bobomb_Anim06, + .anim_D = ANIM_Bobomb_Anim06, + .anim_E = ANIM_Bobomb_Anim06, + .anim_F = ANIM_Bobomb_Anim06, + }, + .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, +}; + +StaticNpc N(NpcData_Bombomb_02) = { + .id = NPC_Bombomb_02, + .settings = &N(NpcSettings_Bombomb), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_200000 | NPC_FLAG_1000000 | NPC_FLAG_SIMPLIFIED_PHYSICS | NPC_FLAG_PARTICLE | NPC_FLAG_8000000 | NPC_FLAG_10000000 | NPC_FLAG_20000000, + .init = &N(EVS_NpcInit_Bombomb), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Bobomb_Anim02, + .walk = ANIM_Bobomb_Anim04, + .run = ANIM_Bobomb_Anim06, + .chase = ANIM_Bobomb_Anim06, + .anim_4 = ANIM_Bobomb_Anim02, + .anim_5 = ANIM_Bobomb_Anim02, + .death = ANIM_Bobomb_Anim0E, + .hit = ANIM_Bobomb_Anim0E, + .anim_8 = ANIM_Bobomb_Anim06, + .anim_9 = ANIM_Bobomb_Anim06, + .anim_A = ANIM_Bobomb_Anim06, + .anim_B = ANIM_Bobomb_Anim06, + .anim_C = ANIM_Bobomb_Anim06, + .anim_D = ANIM_Bobomb_Anim06, + .anim_E = ANIM_Bobomb_Anim06, + .anim_F = ANIM_Bobomb_Anim06, + }, + .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, +}; + +StaticNpc N(NpcData_Bombomb_03) = { + .id = NPC_Bombomb_03, + .settings = &N(NpcSettings_Bombomb), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_200000 | NPC_FLAG_1000000 | NPC_FLAG_SIMPLIFIED_PHYSICS | NPC_FLAG_PARTICLE | NPC_FLAG_8000000 | NPC_FLAG_10000000 | NPC_FLAG_20000000, + .init = &N(EVS_NpcInit_Bombomb), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Bobomb_Anim02, + .walk = ANIM_Bobomb_Anim04, + .run = ANIM_Bobomb_Anim06, + .chase = ANIM_Bobomb_Anim06, + .anim_4 = ANIM_Bobomb_Anim02, + .anim_5 = ANIM_Bobomb_Anim02, + .death = ANIM_Bobomb_Anim0E, + .hit = ANIM_Bobomb_Anim0E, + .anim_8 = ANIM_Bobomb_Anim06, + .anim_9 = ANIM_Bobomb_Anim06, + .anim_A = ANIM_Bobomb_Anim06, + .anim_B = ANIM_Bobomb_Anim06, + .anim_C = ANIM_Bobomb_Anim06, + .anim_D = ANIM_Bobomb_Anim06, + .anim_E = ANIM_Bobomb_Anim06, + .anim_F = ANIM_Bobomb_Anim06, + }, + .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, +}; + +StaticNpc N(NpcData_Bombomb_04) = { + .id = NPC_Bombomb_04, + .settings = &N(NpcSettings_Bombomb), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_200000 | NPC_FLAG_1000000 | NPC_FLAG_SIMPLIFIED_PHYSICS | NPC_FLAG_PARTICLE | NPC_FLAG_8000000 | NPC_FLAG_10000000 | NPC_FLAG_20000000, + .init = &N(EVS_NpcInit_Bombomb), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Bobomb_Anim02, + .walk = ANIM_Bobomb_Anim04, + .run = ANIM_Bobomb_Anim06, + .chase = ANIM_Bobomb_Anim06, + .anim_4 = ANIM_Bobomb_Anim02, + .anim_5 = ANIM_Bobomb_Anim02, + .death = ANIM_Bobomb_Anim0E, + .hit = ANIM_Bobomb_Anim0E, + .anim_8 = ANIM_Bobomb_Anim06, + .anim_9 = ANIM_Bobomb_Anim06, + .anim_A = ANIM_Bobomb_Anim06, + .anim_B = ANIM_Bobomb_Anim06, + .anim_C = ANIM_Bobomb_Anim06, + .anim_D = ANIM_Bobomb_Anim06, + .anim_E = ANIM_Bobomb_Anim06, + .anim_F = ANIM_Bobomb_Anim06, + }, + .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, +}; + +StaticNpc N(NpcData_Bombomb_05) = { + .id = NPC_Bombomb_05, + .settings = &N(NpcSettings_Bombomb), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_200000 | NPC_FLAG_1000000 | NPC_FLAG_SIMPLIFIED_PHYSICS | NPC_FLAG_PARTICLE | NPC_FLAG_8000000 | NPC_FLAG_10000000 | NPC_FLAG_20000000, + .init = &N(EVS_NpcInit_Bombomb), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Bobomb_Anim02, + .walk = ANIM_Bobomb_Anim04, + .run = ANIM_Bobomb_Anim06, + .chase = ANIM_Bobomb_Anim06, + .anim_4 = ANIM_Bobomb_Anim02, + .anim_5 = ANIM_Bobomb_Anim02, + .death = ANIM_Bobomb_Anim0E, + .hit = ANIM_Bobomb_Anim0E, + .anim_8 = ANIM_Bobomb_Anim06, + .anim_9 = ANIM_Bobomb_Anim06, + .anim_A = ANIM_Bobomb_Anim06, + .anim_B = ANIM_Bobomb_Anim06, + .anim_C = ANIM_Bobomb_Anim06, + .anim_D = ANIM_Bobomb_Anim06, + .anim_E = ANIM_Bobomb_Anim06, + .anim_F = ANIM_Bobomb_Anim06, + }, + .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, +}; + +StaticNpc N(NpcData_Luigis)[] = { + { + .id = NPC_Luigi_01, + .settings = &N(NpcSettings_Luigi), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_200000 | NPC_FLAG_1000000 | NPC_FLAG_SIMPLIFIED_PHYSICS | NPC_FLAG_PARTICLE | NPC_FLAG_8000000 | NPC_FLAG_10000000 | NPC_FLAG_20000000, + .init = &N(EVS_NpcInit_Luigi), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Luigi_Still, + .walk = ANIM_Luigi_Still, + .run = ANIM_Luigi_Still, + .chase = ANIM_Luigi_Still, + .anim_4 = ANIM_Luigi_Still, + .anim_5 = ANIM_Luigi_Still, + .death = ANIM_Luigi_Still, + .hit = ANIM_Luigi_Still, + .anim_8 = ANIM_Luigi_Still, + .anim_9 = ANIM_Luigi_Still, + .anim_A = ANIM_Luigi_Still, + .anim_B = ANIM_Luigi_Still, + .anim_C = ANIM_Luigi_Still, + .anim_D = ANIM_Luigi_Still, + .anim_E = ANIM_Luigi_Still, + .anim_F = ANIM_Luigi_Still, + }, + .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, + }, + { + .id = NPC_Luigi_02, + .settings = &N(NpcSettings_Luigi), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_200000 | NPC_FLAG_1000000 | NPC_FLAG_SIMPLIFIED_PHYSICS | NPC_FLAG_PARTICLE | NPC_FLAG_8000000 | NPC_FLAG_10000000 | NPC_FLAG_20000000, + .init = &N(EVS_NpcInit_Luigi), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Luigi_Still, + .walk = ANIM_Luigi_Still, + .run = ANIM_Luigi_Still, + .chase = ANIM_Luigi_Still, + .anim_4 = ANIM_Luigi_Still, + .anim_5 = ANIM_Luigi_Still, + .death = ANIM_Luigi_Still, + .hit = ANIM_Luigi_Still, + .anim_8 = ANIM_Luigi_Still, + .anim_9 = ANIM_Luigi_Still, + .anim_A = ANIM_Luigi_Still, + .anim_B = ANIM_Luigi_Still, + .anim_C = ANIM_Luigi_Still, + .anim_D = ANIM_Luigi_Still, + .anim_E = ANIM_Luigi_Still, + .anim_F = ANIM_Luigi_Still, + }, + .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, + }, + { + .id = NPC_Luigi_03, + .settings = &N(NpcSettings_Luigi), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_200000 | NPC_FLAG_1000000 | NPC_FLAG_SIMPLIFIED_PHYSICS | NPC_FLAG_PARTICLE | NPC_FLAG_8000000 | NPC_FLAG_10000000 | NPC_FLAG_20000000, + .init = &N(EVS_NpcInit_Luigi), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Luigi_Still, + .walk = ANIM_Luigi_Still, + .run = ANIM_Luigi_Still, + .chase = ANIM_Luigi_Still, + .anim_4 = ANIM_Luigi_Still, + .anim_5 = ANIM_Luigi_Still, + .death = ANIM_Luigi_Still, + .hit = ANIM_Luigi_Still, + .anim_8 = ANIM_Luigi_Still, + .anim_9 = ANIM_Luigi_Still, + .anim_A = ANIM_Luigi_Still, + .anim_B = ANIM_Luigi_Still, + .anim_C = ANIM_Luigi_Still, + .anim_D = ANIM_Luigi_Still, + .anim_E = ANIM_Luigi_Still, + .anim_F = ANIM_Luigi_Still, + }, + .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, + }, + { + .id = NPC_Luigi_04, + .settings = &N(NpcSettings_Luigi), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_200000 | NPC_FLAG_1000000 | NPC_FLAG_SIMPLIFIED_PHYSICS | NPC_FLAG_PARTICLE | NPC_FLAG_8000000 | NPC_FLAG_10000000 | NPC_FLAG_20000000, + .init = &N(EVS_NpcInit_Luigi), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Luigi_Still, + .walk = ANIM_Luigi_Still, + .run = ANIM_Luigi_Still, + .chase = ANIM_Luigi_Still, + .anim_4 = ANIM_Luigi_Still, + .anim_5 = ANIM_Luigi_Still, + .death = ANIM_Luigi_Still, + .hit = ANIM_Luigi_Still, + .anim_8 = ANIM_Luigi_Still, + .anim_9 = ANIM_Luigi_Still, + .anim_A = ANIM_Luigi_Still, + .anim_B = ANIM_Luigi_Still, + .anim_C = ANIM_Luigi_Still, + .anim_D = ANIM_Luigi_Still, + .anim_E = ANIM_Luigi_Still, + .anim_F = ANIM_Luigi_Still, + }, + .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, + }, + { + .id = NPC_Luigi_05, + .settings = &N(NpcSettings_Luigi), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_200000 | NPC_FLAG_1000000 | NPC_FLAG_SIMPLIFIED_PHYSICS | NPC_FLAG_PARTICLE | NPC_FLAG_8000000 | NPC_FLAG_10000000 | NPC_FLAG_20000000, + .init = &N(EVS_NpcInit_Luigi), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Luigi_Still, + .walk = ANIM_Luigi_Still, + .run = ANIM_Luigi_Still, + .chase = ANIM_Luigi_Still, + .anim_4 = ANIM_Luigi_Still, + .anim_5 = ANIM_Luigi_Still, + .death = ANIM_Luigi_Still, + .hit = ANIM_Luigi_Still, + .anim_8 = ANIM_Luigi_Still, + .anim_9 = ANIM_Luigi_Still, + .anim_A = ANIM_Luigi_Still, + .anim_B = ANIM_Luigi_Still, + .anim_C = ANIM_Luigi_Still, + .anim_D = ANIM_Luigi_Still, + .anim_E = ANIM_Luigi_Still, + .anim_F = ANIM_Luigi_Still, + }, + .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, + }, + { + .id = NPC_Luigi_06, + .settings = &N(NpcSettings_Luigi), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_200000 | NPC_FLAG_1000000 | NPC_FLAG_SIMPLIFIED_PHYSICS | NPC_FLAG_PARTICLE | NPC_FLAG_8000000 | NPC_FLAG_10000000 | NPC_FLAG_20000000, + .init = &N(EVS_NpcInit_Luigi), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Luigi_Still, + .walk = ANIM_Luigi_Still, + .run = ANIM_Luigi_Still, + .chase = ANIM_Luigi_Still, + .anim_4 = ANIM_Luigi_Still, + .anim_5 = ANIM_Luigi_Still, + .death = ANIM_Luigi_Still, + .hit = ANIM_Luigi_Still, + .anim_8 = ANIM_Luigi_Still, + .anim_9 = ANIM_Luigi_Still, + .anim_A = ANIM_Luigi_Still, + .anim_B = ANIM_Luigi_Still, + .anim_C = ANIM_Luigi_Still, + .anim_D = ANIM_Luigi_Still, + .anim_E = ANIM_Luigi_Still, + .anim_F = ANIM_Luigi_Still, + }, + .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, + }, + { + .id = NPC_Luigi_07, + .settings = &N(NpcSettings_Luigi), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_200000 | NPC_FLAG_1000000 | NPC_FLAG_SIMPLIFIED_PHYSICS | NPC_FLAG_PARTICLE | NPC_FLAG_8000000 | NPC_FLAG_10000000 | NPC_FLAG_20000000, + .init = &N(EVS_NpcInit_Luigi), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Luigi_Still, + .walk = ANIM_Luigi_Still, + .run = ANIM_Luigi_Still, + .chase = ANIM_Luigi_Still, + .anim_4 = ANIM_Luigi_Still, + .anim_5 = ANIM_Luigi_Still, + .death = ANIM_Luigi_Still, + .hit = ANIM_Luigi_Still, + .anim_8 = ANIM_Luigi_Still, + .anim_9 = ANIM_Luigi_Still, + .anim_A = ANIM_Luigi_Still, + .anim_B = ANIM_Luigi_Still, + .anim_C = ANIM_Luigi_Still, + .anim_D = ANIM_Luigi_Still, + .anim_E = ANIM_Luigi_Still, + .anim_F = ANIM_Luigi_Still, + }, + .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, + }, + { + .id = NPC_Luigi_08, + .settings = &N(NpcSettings_Luigi), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_200000 | NPC_FLAG_1000000 | NPC_FLAG_SIMPLIFIED_PHYSICS | NPC_FLAG_PARTICLE | NPC_FLAG_8000000 | NPC_FLAG_10000000 | NPC_FLAG_20000000, + .init = &N(EVS_NpcInit_Luigi), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Luigi_Still, + .walk = ANIM_Luigi_Still, + .run = ANIM_Luigi_Still, + .chase = ANIM_Luigi_Still, + .anim_4 = ANIM_Luigi_Still, + .anim_5 = ANIM_Luigi_Still, + .death = ANIM_Luigi_Still, + .hit = ANIM_Luigi_Still, + .anim_8 = ANIM_Luigi_Still, + .anim_9 = ANIM_Luigi_Still, + .anim_A = ANIM_Luigi_Still, + .anim_B = ANIM_Luigi_Still, + .anim_C = ANIM_Luigi_Still, + .anim_D = ANIM_Luigi_Still, + .anim_E = ANIM_Luigi_Still, + .anim_F = ANIM_Luigi_Still, + }, + .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, + }, + { + .id = NPC_Luigi_09, + .settings = &N(NpcSettings_Luigi), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_200000 | NPC_FLAG_1000000 | NPC_FLAG_SIMPLIFIED_PHYSICS | NPC_FLAG_PARTICLE | NPC_FLAG_8000000 | NPC_FLAG_10000000 | NPC_FLAG_20000000, + .init = &N(EVS_NpcInit_Luigi), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Luigi_Still, + .walk = ANIM_Luigi_Still, + .run = ANIM_Luigi_Still, + .chase = ANIM_Luigi_Still, + .anim_4 = ANIM_Luigi_Still, + .anim_5 = ANIM_Luigi_Still, + .death = ANIM_Luigi_Still, + .hit = ANIM_Luigi_Still, + .anim_8 = ANIM_Luigi_Still, + .anim_9 = ANIM_Luigi_Still, + .anim_A = ANIM_Luigi_Still, + .anim_B = ANIM_Luigi_Still, + .anim_C = ANIM_Luigi_Still, + .anim_D = ANIM_Luigi_Still, + .anim_E = ANIM_Luigi_Still, + .anim_F = ANIM_Luigi_Still, + }, + .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, + }, + { + .id = NPC_Luigi_10, + .settings = &N(NpcSettings_Luigi), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_200000 | NPC_FLAG_1000000 | NPC_FLAG_SIMPLIFIED_PHYSICS | NPC_FLAG_PARTICLE | NPC_FLAG_8000000 | NPC_FLAG_10000000 | NPC_FLAG_20000000, + .init = &N(EVS_NpcInit_Luigi), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Luigi_Still, + .walk = ANIM_Luigi_Still, + .run = ANIM_Luigi_Still, + .chase = ANIM_Luigi_Still, + .anim_4 = ANIM_Luigi_Still, + .anim_5 = ANIM_Luigi_Still, + .death = ANIM_Luigi_Still, + .hit = ANIM_Luigi_Still, + .anim_8 = ANIM_Luigi_Still, + .anim_9 = ANIM_Luigi_Still, + .anim_A = ANIM_Luigi_Still, + .anim_B = ANIM_Luigi_Still, + .anim_C = ANIM_Luigi_Still, + .anim_D = ANIM_Luigi_Still, + .anim_E = ANIM_Luigi_Still, + .anim_F = ANIM_Luigi_Still, + }, + .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, + }, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_GuideToad)), + NPC_GROUP(N(NpcData_Fuzzy_01)), + NPC_GROUP(N(NpcData_Fuzzy_02)), + NPC_GROUP(N(NpcData_Fuzzy_03)), + NPC_GROUP(N(NpcData_Fuzzy_04)), + NPC_GROUP(N(NpcData_Fuzzy_05)), + NPC_GROUP(N(NpcData_Bombomb_01)), + NPC_GROUP(N(NpcData_Bombomb_02)), + NPC_GROUP(N(NpcData_Bombomb_03)), + NPC_GROUP(N(NpcData_Bombomb_04)), + NPC_GROUP(N(NpcData_Bombomb_05)), + NPC_GROUP(N(NpcData_Luigis)), + {} +}; diff --git a/src/world/area_mgm/mgm_02/mgm_02_3_images.c b/src/world/area_mgm/mgm_02/mgm_02_3_images.c new file mode 100644 index 0000000000..8abfd79e4e --- /dev/null +++ b/src/world/area_mgm/mgm_02/mgm_02_3_images.c @@ -0,0 +1,21 @@ +#include "mgm_02.h" + +#include "world/area_mgm/mgm_02/panel_peach.png.h" +#include "world/area_mgm/mgm_02/panel_peach.png.inc.c" +#include "world/area_mgm/mgm_02/panel_peach.pal.inc.c" + +MessageImageData N(MsgImg_PeachPanel)[] = { + { + .raster = N(panel_peach_img), + .palette = N(panel_peach_pal), + .width = N(panel_peach_img_width), + .height = N(panel_peach_img_height), + .format = G_IM_FMT_CI, + .bitDepth = G_IM_SIZ_4b, + } +}; + +API_CALLABLE(N(SetMsgImgs_Panel)) { + set_message_images(N(MsgImg_PeachPanel)); + return ApiStatus_DONE2; +} diff --git a/src/world/area_mgm/mgm_03/mgm_03.h b/src/world/area_mgm/mgm_03/mgm_03.h new file mode 100644 index 0000000000..6b9efe3af3 --- /dev/null +++ b/src/world/area_mgm/mgm_03/mgm_03.h @@ -0,0 +1,12 @@ +/// @file mgm_03.h +/// @brief Minigame - Large empty test room + +#include "common.h" +#include "message_ids.h" +#include "map.h" + +#include "../mgm.h" +#include "mapfs/mgm_03_shape.h" +#include "mapfs/mgm_03_hit.h" + +#define NAMESPACE mgm_03 diff --git a/src/world/area_mgm/mgm_03/mgm_03_1_main.c b/src/world/area_mgm/mgm_03/mgm_03_1_main.c new file mode 100644 index 0000000000..b543b84ae8 --- /dev/null +++ b/src/world/area_mgm/mgm_03/mgm_03_1_main.c @@ -0,0 +1,22 @@ +#include "mgm_03.h" + +extern EvtScript N(EVS_Main); + +EntryList N(Entrances) = { + [mgm_03_ENTRY_0] { 0.0, 200.0, 0.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_mgm_01 }, +}; + +EvtScript N(EVS_Main) = { + EVT_CALL(SetSpriteShading, SHADING_ARN_09) + EVT_SETUP_CAMERA_DEFAULT() + EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tst/tst.h b/src/world/area_tst/tst.h index 2d3c2afe48..5097bfe9b4 100644 --- a/src/world/area_tst/tst.h +++ b/src/world/area_tst/tst.h @@ -20,6 +20,18 @@ enum { AB_TST_F = AreaByte(15), }; -#define AF_TST(index) AreaFlag(index) +enum { + AF_TST_00 = AreaFlag(0), +}; + +extern MapSettings tst_01_settings; +extern MapSettings tst_02_settings; +extern MapSettings tst_03_settings; +extern MapSettings tst_04_settings; +extern MapSettings tst_10_settings; +extern MapSettings tst_11_settings; +extern MapSettings tst_12_settings; +extern MapSettings tst_13_settings; +extern MapSettings tst_20_settings; #endif diff --git a/src/world/area_tst/tst_01/B1A900.c b/src/world/area_tst/tst_01/B1A900.c deleted file mode 100644 index 8e903700fb..0000000000 --- a/src/world/area_tst/tst_01/B1A900.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "tst_01.h" - -static char* N(exit_str_0) = "machi"; -static char* N(exit_str_1) = "tst_02"; diff --git a/src/world/area_tst/tst_01/tst_01.h b/src/world/area_tst/tst_01/tst_01.h index e2315a5320..f629d88c52 100644 --- a/src/world/area_tst/tst_01/tst_01.h +++ b/src/world/area_tst/tst_01/tst_01.h @@ -2,8 +2,12 @@ /// @brief Testing - Jump Width Test #include "common.h" -#include "../tst.h" #include "message_ids.h" #include "map.h" +#include "../tst.h" +#include "mapfs/tst_01_shape.h" +#include "mapfs/tst_01_hit.h" + + #define NAMESPACE tst_01 diff --git a/src/world/area_tst/tst_01/tst_01_1_main.c b/src/world/area_tst/tst_01/tst_01_1_main.c new file mode 100644 index 0000000000..a3201df4f3 --- /dev/null +++ b/src/world/area_tst/tst_01/tst_01_1_main.c @@ -0,0 +1,50 @@ + +#include "tst_01.h" + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_MakeEntities); + +EntryList N(Entrances) = { + [tst_01_ENTRY_0] { -35.0, 0.0, 17.0, 0.0 }, + [tst_01_ENTRY_1] { 338.0, 0.0, 5.0, 0.0 }, + [tst_01_ENTRY_2] { 0.0, 0.0, 0.0, 0.0 }, + [tst_01_ENTRY_3] { 0.0, 0.0, 0.0, 0.0 }, + [tst_01_ENTRY_4] { 0.0, 0.0, 0.0, 0.0 }, + [tst_01_ENTRY_5] { 0.0, 0.0, 0.0, 0.0 }, + [tst_01_ENTRY_6] { 0.0, 0.0, 0.0, 0.0 }, + [tst_01_ENTRY_7] { 0.0, 0.0, 0.0, 0.0 }, + [tst_01_ENTRY_8] { 0.0, 0.0, 0.0, 0.0 }, + [tst_01_ENTRY_9] { 0.0, 0.0, 0.0, 0.0 }, + [tst_01_ENTRY_A] { 354.0, 0.0, 294.0, 117.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), +}; + +EvtScript N(EVS_GotoMap_machi_7) = { + EVT_CALL(GotoMap, EVT_PTR("machi"), machi_ENTRY_7) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_GotoMap_tst_02_0) = { + EVT_CALL(GotoMap, EVT_PTR("tst_02"), tst_02_ENTRY_0) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_TESTING) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_GotoMap_machi_7)), TRIGGER_WALL_PUSH, COLLIDER_deilitw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_GotoMap_tst_02_0)), TRIGGER_WALL_PUSH, COLLIDER_deilite, 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tst/tst_01/tst_01_2_entity.c b/src/world/area_tst/tst_01/tst_01_2_entity.c new file mode 100644 index 0000000000..6867f99d2a --- /dev/null +++ b/src/world/area_tst/tst_01/tst_01_2_entity.c @@ -0,0 +1,13 @@ +#include "tst_01.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), 136, 80, 63, 0, ITEM_FLOWER_POINT, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), 190, 0, 63, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenYellowBlock), 201, 60, -20, 0, ITEM_HEART, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenYellowBlock), 230, 60, -20, 0, ITEM_HEART, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenRedBlock), 258, 60, -20, 0, ITEM_FLOWER_POINT, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_RedBlock), 315, 60, 63, 0, ITEM_FLOWER_POINT, MAKE_ENTITY_END) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tst/tst_02/B1AC30.c b/src/world/area_tst/tst_02/B1AC30.c deleted file mode 100644 index 24735f7ea7..0000000000 --- a/src/world/area_tst/tst_02/B1AC30.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "tst_02.h" - -static char* N(exit_str_0) = "tst_01"; -static char* N(exit_str_1) = "tst_03"; diff --git a/src/world/area_tst/tst_02/tst_02.h b/src/world/area_tst/tst_02/tst_02.h index d49bd5a4bd..d69d42a906 100644 --- a/src/world/area_tst/tst_02/tst_02.h +++ b/src/world/area_tst/tst_02/tst_02.h @@ -2,8 +2,11 @@ /// @brief Testing - Jump Height Test #include "common.h" -#include "../tst.h" #include "message_ids.h" #include "map.h" +#include "../tst.h" +#include "mapfs/tst_02_shape.h" +#include "mapfs/tst_02_hit.h" + #define NAMESPACE tst_02 diff --git a/src/world/area_tst/tst_02/tst_02_1_main.c b/src/world/area_tst/tst_02/tst_02_1_main.c new file mode 100644 index 0000000000..6314b5587b --- /dev/null +++ b/src/world/area_tst/tst_02/tst_02_1_main.c @@ -0,0 +1,49 @@ +#include "tst_02.h" + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_MakeEntities); + +EntryList N(Entrances) = { + [tst_02_ENTRY_0] { -41.0, 0.0, 25.0, 0.0 }, + [tst_02_ENTRY_1] { 278.0, 0.0, 18.0, 0.0 }, + [tst_02_ENTRY_2] { 0.0, 0.0, 0.0, 0.0 }, + [tst_02_ENTRY_3] { 0.0, 0.0, 0.0, 0.0 }, + [tst_02_ENTRY_4] { 0.0, 0.0, 0.0, 0.0 }, + [tst_02_ENTRY_5] { 0.0, 0.0, 0.0, 0.0 }, + [tst_02_ENTRY_6] { 0.0, 0.0, 0.0, 0.0 }, + [tst_02_ENTRY_7] { 0.0, 0.0, 0.0, 0.0 }, + [tst_02_ENTRY_8] { 0.0, 0.0, 0.0, 0.0 }, + [tst_02_ENTRY_9] { 0.0, 0.0, 0.0, 0.0 }, + [tst_02_ENTRY_A] { 354.0, 0.0, 294.0, 117.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), +}; + +EvtScript N(EVS_GotoMap_tst_01_1) = { + EVT_CALL(GotoMap, EVT_PTR("tst_01"), tst_01_ENTRY_1) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_GotoMap_tst_03_0) = { + EVT_CALL(GotoMap, EVT_PTR("tst_03"), tst_03_ENTRY_0) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_TESTING) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_GotoMap_tst_01_1)), TRIGGER_WALL_PUSH, COLLIDER_deilitw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_GotoMap_tst_03_0)), TRIGGER_WALL_PUSH, COLLIDER_deilite, 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tst/tst_02/tst_02_2_entity.c b/src/world/area_tst/tst_02/tst_02_2_entity.c new file mode 100644 index 0000000000..aca07249c0 --- /dev/null +++ b/src/world/area_tst/tst_02/tst_02_2_entity.c @@ -0,0 +1,14 @@ +#include "tst_02.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_InertYellowBlock), 90, 70, -210, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_InertYellowBlock), 130, 80, -210, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_InertYellowBlock), 170, 90, -210, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_InertYellowBlock), 210, 100, -210, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_InertYellowBlock), 250, 110, -210, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_GiantChest), 193, 0, -38, -20, ITEM_NONE, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Chest), 130, 0, -38, -20, 0, MAKE_ENTITY_END) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tst/tst_03/B1AF80.c b/src/world/area_tst/tst_03/B1AF80.c deleted file mode 100644 index 012b5f3e6f..0000000000 --- a/src/world/area_tst/tst_03/B1AF80.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "tst_03.h" - -static char* N(exit_str_0) = "tst_02"; -static char* N(exit_str_1) = "tst_04"; diff --git a/src/world/area_tst/tst_03/tst_03.h b/src/world/area_tst/tst_03/tst_03.h index ec9c36af0d..fc6d6e4900 100644 --- a/src/world/area_tst/tst_03/tst_03.h +++ b/src/world/area_tst/tst_03/tst_03.h @@ -2,8 +2,12 @@ /// @brief Testing - Entity Test #include "common.h" -#include "../tst.h" #include "message_ids.h" #include "map.h" +#include "../tst.h" +#include "mapfs/tst_03_shape.h" +#include "mapfs/tst_03_hit.h" + + #define NAMESPACE tst_03 diff --git a/src/world/area_tst/tst_03/tst_03_1_main.c b/src/world/area_tst/tst_03/tst_03_1_main.c new file mode 100644 index 0000000000..5e20d78ac4 --- /dev/null +++ b/src/world/area_tst/tst_03/tst_03_1_main.c @@ -0,0 +1,56 @@ +#include "tst_03.h" + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_MakeEntities); + +EntryList N(Entrances) = { + [tst_03_ENTRY_0] { -85.0, 0.0, 10.0, 0.0 }, + [tst_03_ENTRY_1] { 1536.0, 0.0, 15.0, 0.0 }, + [tst_03_ENTRY_2] { 0.0, 0.0, 0.0, 0.0 }, + [tst_03_ENTRY_3] { 0.0, 0.0, 0.0, 0.0 }, + [tst_03_ENTRY_4] { 0.0, 0.0, 0.0, 0.0 }, + [tst_03_ENTRY_5] { 0.0, 0.0, 0.0, 0.0 }, + [tst_03_ENTRY_6] { 0.0, 0.0, 0.0, 0.0 }, + [tst_03_ENTRY_7] { 0.0, 0.0, 0.0, 0.0 }, + [tst_03_ENTRY_8] { 0.0, 0.0, 0.0, 0.0 }, + [tst_03_ENTRY_9] { 0.0, 0.0, 0.0, 0.0 }, + [tst_03_ENTRY_A] { 354.0, 0.0, 294.0, 117.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), +}; + +EvtScript N(EVS_GotoMap_tst_02_1) = { + EVT_CALL(GotoMap, EVT_PTR("tst_02"), tst_02_ENTRY_1) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_GotoMap_tst_04_0) = { + EVT_CALL(GotoMap, EVT_PTR("tst_04"), tst_04_ENTRY_0) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_TESTING) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_GotoMap_tst_02_1)), TRIGGER_WALL_PUSH, COLLIDER_deilitw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_GotoMap_tst_04_0)), TRIGGER_WALL_PUSH, COLLIDER_deilite, 1, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_puku, SURFACE_TYPE_DOCK_WALL) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_pukut, SURFACE_TYPE_DOCK_WALL) + EVT_CALL(ModifyColliderFlags, 0, COLLIDER_puku, COLLIDER_FLAGS_80000) + EVT_CALL(ModifyColliderFlags, 0, COLLIDER_pukut, COLLIDER_FLAGS_80000) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o264, SURFACE_TYPE_WATER) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o265, SURFACE_TYPE_SPIKES) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o236, SURFACE_TYPE_LAVA) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tst/tst_03/tst_03_2_entity.c b/src/world/area_tst/tst_03/tst_03_2_entity.c new file mode 100644 index 0000000000..153ce2067d --- /dev/null +++ b/src/world/area_tst/tst_03/tst_03_2_entity.c @@ -0,0 +1,28 @@ +#include "tst_03.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_RedBlock), 567, 60, 100, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenRedBlock), 623, 60, 100, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_InertYellowBlock), 300, 60, -50, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BrickBlock), 360, 80, -50, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_MulticoinBlock), 420, 80, -50, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), 480, 80, -50, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_TriggerBlock), 540, 80, -50, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenYellowBlock), 600, 60, -50, 0, ITEM_MUSHROOM, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_SuperBlock), 300, 60, 160, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_HeartBlock), 420, 60, 160, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_SavePoint), 480, 60, 160, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_PowBlock), 644, 60, 118, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Hammer1BlockTiny), 460, 0, 50, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Hammer1BlockTiny), 460, 25, 50, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Hammer2BlockTiny), 490, 0, 50, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Hammer3BlockTiny), 520, 0, 50, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_PowBlock), 644, 60, 118, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BoardedFloor), 416, 0, 232, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_WoodenCrate), 336, 0, 232, 0, -1, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_WoodenCrate), 270, 0, 232, 0, ITEM_MUSHROOM, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_WoodenCrate), 270, 30, 232, 0, ITEM_MUSHROOM, 0, MAKE_ENTITY_END) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tst/tst_04/B1B570.c b/src/world/area_tst/tst_04/B1B570.c deleted file mode 100644 index 86c6dedea0..0000000000 --- a/src/world/area_tst/tst_04/B1B570.c +++ /dev/null @@ -1,163 +0,0 @@ -#include "tst_04.h" -#include "sprite.h" -#include "model.h" - -static char* N(exit_str_0) = "tst_03"; -static char* N(exit_str_1) = ""; - -void func_8024029C_B1B80C(void); -void func_80240360_B1B8D0(void* data); -void func_80240574_B1BAE4(void); - -// BSS -static s32 B_80240FD0_tst_04; - -ApiStatus func_80240000_B1B570(Evt* script, s32 isInitialCall) { - Npc* npc = get_npc_safe(0); - - if (npc != NULL && npc->currentFloor == 5) { - f32 sinTheta; - f32 cosTheta; - f32 xTemp; - f32 zTemp; - - dist2D(npc->pos.x, npc->pos.z, 0.0f, -100.0f); - sinTheta = sin_rad(1 / 180.0f * PI_S); - cosTheta = cos_rad(1 / 180.0f * PI_S); - xTemp = npc->pos.x - 0.0f; - zTemp = npc->pos.z - -100.0f; - npc->pos.x = npc->pos.x + (((cosTheta * xTemp) + (sinTheta * zTemp)) - xTemp); - npc->pos.z = npc->pos.z + (((-sinTheta * xTemp) + (cosTheta * zTemp)) - zTemp); - return ApiStatus_DONE2; - } - return ApiStatus_DONE2; -} - -ApiStatus func_802400FC_B1B66C(Evt *script, s32 isInitialCall) -{ - Npc *npc = get_npc_safe(NPC_PARTNER); - f32 angle, sinAngle, cosAngle; - f32 dist; - f32 x0, x1; - f32 z0, z1; - - if (npc == NULL) { - return ApiStatus_DONE2; - } - - dist = dist2D(npc->pos.x, npc->pos.z, -250.0f, -100.0f); - - angle = evt_get_variable(script, LVar0) - 1; - sinAngle = sin_rad(DEG_TO_RAD(angle)); - cosAngle = cos_rad(DEG_TO_RAD(angle)); - x0 = dist * cosAngle; - z0 = dist * -sinAngle; - - angle = evt_get_variable(script, LVar0); - sinAngle = sin_rad(DEG_TO_RAD(angle)); - cosAngle = cos_rad(DEG_TO_RAD(angle)); - x1 = dist * cosAngle; - z1 = dist * -sinAngle; - - npc->pos.x += x1 - x0; - npc->pos.z += z1 - z0; - - return ApiStatus_DONE2; -} - -ApiStatus func_80240260_B1B7D0(Evt* script, s32 isInitialCall) { - script->array[0] = (s32) create_generic_entity_frontUI(NULL, func_8024029C_B1B80C); - return ApiStatus_DONE2; -} - -void func_8024029C_B1B80C(void) { - PlayerStatus* playerStatus = &gPlayerStatus; - EntityModel* entityModel; - RenderTask renderTask; - RenderTask* renderTaskPtr = &renderTask; - s32 screenX; - s32 screenY; - s32 screenZ; - - if (playerStatus->flags & PS_FLAGS_1) { - entityModel = get_entity_model(get_shadow_by_index(playerStatus->shadowID)->entityModelID); - entityModel->flags |= MODEL_FLAGS_FLAG_200; - - get_screen_coords(gCurrentCamID, playerStatus->position.x, playerStatus->position.y, -playerStatus->position.z, - &screenX, &screenY, &screenZ); - - renderTaskPtr->renderMode = playerStatus->renderMode; - renderTaskPtr->appendGfxArg = playerStatus; - renderTaskPtr->appendGfx = func_80240360_B1B8D0; - renderTaskPtr->distance = -screenZ; - queue_render_task(renderTaskPtr); - } -} - -void func_80240360_B1B8D0(void* data) { - PlayerStatus* playerStatus = data; - f32 yaw = -gCameras[gCurrentCamID].currentYaw; - Matrix4f main; - Matrix4f translation; - Matrix4f rotation; - Matrix4f scale; - - guRotateF(rotation, yaw, 0.0f, -1.0f, 0.0f); - guRotateF(main, clamp_angle(playerStatus->pitch), 0.0f, 0.0f, 1.0f); - guMtxCatF(rotation, main, main); - guRotateF(rotation, yaw, 0.0f, 1.0f, 0.0f); - guMtxCatF(main, rotation, main); - guRotateF(rotation, playerStatus->spriteFacingAngle, 0.0f, 1.0f, 0.0f); - guMtxCatF(main, rotation, main); - guScaleF(scale, SPRITE_WORLD_SCALE_F, SPRITE_WORLD_SCALE_F, SPRITE_WORLD_SCALE_F); - guMtxCatF(main, scale, main); - guTranslateF(translation, playerStatus->position.x, playerStatus->position.y, -playerStatus->position.z); - guMtxCatF(main, translation, main); - spr_update_player_sprite(1, playerStatus->trueAnimation, 1.0f); - spr_draw_player_sprite(1, 0, 0, NULL, main); -} - -ApiStatus func_80240510_B1BA80(Evt* script, s32 isInitialCall) { - Npc* partner; - - script->array[1] = create_generic_entity_world(func_80240574_B1BAE4, NULL); - partner = get_npc_safe(NPC_PARTNER); - - if (partner == NULL) { - return ApiStatus_DONE2; - } - - partner->flags |= NPC_FLAG_REFLECT_WALL; - partner->flags |= NPC_FLAG_REFLECT_FLOOR; - return ApiStatus_DONE2; -} - -void func_80240574_B1BAE4(void) { - Npc* partner = get_npc_safe(NPC_PARTNER); - - if (partner != NULL) { - partner->flags |= NPC_FLAG_REFLECT_WALL; - partner->flags |= NPC_FLAG_REFLECT_FLOOR; - } -} - -void func_802405B0_B1BB20(void) { - update_model_animator(B_80240FD0_tst_04); -} - -void func_802405D4_B1BB44(void) { - Matrix4f m0; - Matrix4f m1; - Matrix4f m2; - Matrix4f m3; - Mtx m4; - - guTranslateF(m1, -484.0f, 25.0f, -40.0f); - guMtxF2L(m1, &m4); - render_animated_model(B_80240FD0_tst_04, &m4); -} - -ApiStatus func_80240628_B1BB98(Evt* script, s32 isInitialCall) { - create_generic_entity_world(func_802405B0_B1BB20, func_802405D4_B1BB44); - return ApiStatus_DONE2; -} diff --git a/src/world/area_tst/tst_04/B1BBD0.c b/src/world/area_tst/tst_04/B1BBD0.c deleted file mode 100644 index 71bd122109..0000000000 --- a/src/world/area_tst/tst_04/B1BBD0.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "tst_04.h" - -ApiStatus func_80240660_B1BBD0(Evt* script, s32 isInitialCall) { - disable_npc_shadow(get_npc_unsafe(script->owner1.enemy->npcID)); - return ApiStatus_DONE2; -} diff --git a/src/world/area_tst/tst_04/tst_04.h b/src/world/area_tst/tst_04/tst_04.h index 6e81bdb3ea..c732383a5e 100644 --- a/src/world/area_tst/tst_04/tst_04.h +++ b/src/world/area_tst/tst_04/tst_04.h @@ -2,8 +2,17 @@ /// @brief Testing - Moving Platforms Test #include "common.h" -#include "../tst.h" #include "message_ids.h" #include "map.h" +#include "../tst.h" +#include "mapfs/tst_04_shape.h" +#include "mapfs/tst_04_hit.h" + +#include "sprite/npc/Goompa.h" + +enum { + NPC_Goompa = 0, +}; + #define NAMESPACE tst_04 diff --git a/src/world/area_tst/tst_04/tst_04_1_main.c b/src/world/area_tst/tst_04/tst_04_1_main.c new file mode 100644 index 0000000000..8a3057f917 --- /dev/null +++ b/src/world/area_tst/tst_04/tst_04_1_main.c @@ -0,0 +1,174 @@ + +#include "tst_04.h" + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_MakeEntities); +extern EvtScript N(EVS_SetupReflection); +extern NpcGroupList N(DefaultNPCs); + +API_CALLABLE(N(PushGoompaTest)) { + Npc* npc = get_npc_safe(NPC_Goompa); + + if (npc != NULL && npc->currentFloor == COLLIDER_o3) { + f32 sinTheta; + f32 cosTheta; + f32 xTemp; + f32 zTemp; + + dist2D(npc->pos.x, npc->pos.z, 0.0f, -100.0f); + sinTheta = sin_rad(1 / 180.0f * PI_S); + cosTheta = cos_rad(1 / 180.0f * PI_S); + xTemp = npc->pos.x - 0.0f; + zTemp = npc->pos.z - -100.0f; + npc->pos.x = npc->pos.x + (((cosTheta * xTemp) + (sinTheta * zTemp)) - xTemp); + npc->pos.z = npc->pos.z + (((-sinTheta * xTemp) + (cosTheta * zTemp)) - zTemp); + return ApiStatus_DONE2; + } + return ApiStatus_DONE2; +} + +API_CALLABLE(N(PushPartnerTest)) { + Npc *npc = get_npc_safe(NPC_PARTNER); + f32 angle, sinAngle, cosAngle; + f32 dist; + f32 x0, x1; + f32 z0, z1; + + if (npc == NULL) { + return ApiStatus_DONE2; + } + + dist = dist2D(npc->pos.x, npc->pos.z, -250.0f, -100.0f); + + angle = evt_get_variable(script, LVar0) - 1; + sinAngle = sin_rad(DEG_TO_RAD(angle)); + cosAngle = cos_rad(DEG_TO_RAD(angle)); + x0 = dist * cosAngle; + z0 = dist * -sinAngle; + + angle = evt_get_variable(script, LVar0); + sinAngle = sin_rad(DEG_TO_RAD(angle)); + cosAngle = cos_rad(DEG_TO_RAD(angle)); + x1 = dist * cosAngle; + z1 = dist * -sinAngle; + + npc->pos.x += x1 - x0; + npc->pos.z += z1 - z0; + + return ApiStatus_DONE2; +} + +EntryList N(Entrances) = { + [tst_04_ENTRY_0] { -484.0, 0.0, 0.0, 0.0 }, + [tst_04_ENTRY_1] { 484.0, 0.0, 0.0, 0.0 }, + [tst_04_ENTRY_2] { 0.0, 0.0, 0.0, 0.0 }, + [tst_04_ENTRY_3] { 0.0, 0.0, 0.0, 0.0 }, + [tst_04_ENTRY_4] { 0.0, 0.0, 0.0, 0.0 }, + [tst_04_ENTRY_5] { 0.0, 0.0, 0.0, 0.0 }, + [tst_04_ENTRY_6] { 0.0, 0.0, 0.0, 0.0 }, + [tst_04_ENTRY_7] { 0.0, 0.0, 0.0, 0.0 }, + [tst_04_ENTRY_8] { 0.0, 0.0, 0.0, 0.0 }, + [tst_04_ENTRY_9] { 0.0, 0.0, 0.0, 0.0 }, + [tst_04_ENTRY_A] { 354.0, 0.0, 294.0, 117.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), +}; + +EvtScript N(EVS_GotoMap_tst_03_1) = { + EVT_CALL(GotoMap, EVT_PTR("tst_03"), tst_03_ENTRY_1) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UpdateMovingFloor) = { + EVT_LABEL(0) + EVT_CALL(MakeLerp, 0, 100, 50, EASING_COS_IN_OUT) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, MODEL_o5, 0, LVar0, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o5) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(MakeLerp, 100, 0, 50, EASING_COS_IN_OUT) + EVT_LABEL(20) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, MODEL_o5, 0, LVar0, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o5) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(20) + EVT_END_IF + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UpdateSpinningFloor) = { + EVT_LABEL(0) + EVT_CALL(MakeLerp, 0, 360, 360, EASING_LINEAR) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o3, LVar0, 0, 1, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o3) + EVT_CALL(N(PushGoompaTest)) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_GOTO(0) + EVT_CALL(MakeLerp, 20, -20, 40, EASING_COS_IN_OUT) + EVT_LABEL(20) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o3, LVar0, 0, 0, 1) + EVT_CALL(UpdateColliderTransform, COLLIDER_o3) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(20) + EVT_END_IF + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UpdateSpinningWall) = { + EVT_LABEL(0) + EVT_CALL(MakeLerp, 0, 360, 360, EASING_LINEAR) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o1, LVar0, 0, 1, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_TESTING) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_GotoMap_tst_03_1)), TRIGGER_WALL_PUSH, COLLIDER_deilitw, 1, 0) + EVT_CALL(ParentColliderToModel, COLLIDER_o5, MODEL_o5) + EVT_CALL(ParentColliderToModel, COLLIDER_o3, MODEL_o3) + EVT_CALL(ParentColliderToModel, COLLIDER_o1, MODEL_o1) + EVT_CALL(ParentColliderToModel, COLLIDER_o2, MODEL_o2) + EVT_CALL(ParentColliderToModel, COLLIDER_o18, MODEL_o18) + EVT_EXEC(N(EVS_UpdateMovingFloor)) + EVT_EXEC(N(EVS_UpdateSpinningFloor)) + EVT_EXEC(N(EVS_UpdateSpinningWall)) + EVT_EXEC(N(EVS_SetupReflection)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tst/tst_04/tst_04_2_entity.c b/src/world/area_tst/tst_04/tst_04_2_entity.c new file mode 100644 index 0000000000..57d88fe496 --- /dev/null +++ b/src/world/area_tst/tst_04/tst_04_2_entity.c @@ -0,0 +1,8 @@ +#include "tst_04.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_RedSwitch), 0, 0, 300, 0, MAKE_ENTITY_END) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tst/tst_04/tst_04_3_reflection.c b/src/world/area_tst/tst_04/tst_04_3_reflection.c new file mode 100644 index 0000000000..7bd5a8e144 --- /dev/null +++ b/src/world/area_tst/tst_04/tst_04_3_reflection.c @@ -0,0 +1,115 @@ +#include "tst_04.h" +#include "sprite.h" +#include "model.h" + +void N(worker_render_player_reflection)(void); +void N(appendGfx_test_player_reflection)(void* data); +void N(worker_update_partner_reflection)(void); + +static s32 N(Animator); + +API_CALLABLE(N(EnablePlayerReflection)) { + script->array[0] = (s32) create_generic_entity_frontUI(NULL, &N(worker_render_player_reflection)); + return ApiStatus_DONE2; +} + +void N(worker_render_player_reflection)(void) { + PlayerStatus* playerStatus = &gPlayerStatus; + EntityModel* entityModel; + RenderTask renderTask; + RenderTask* renderTaskPtr = &renderTask; + s32 screenX; + s32 screenY; + s32 screenZ; + + if (playerStatus->flags & PS_FLAGS_HAS_REFLECTION) { + entityModel = get_entity_model(get_shadow_by_index(playerStatus->shadowID)->entityModelID); + entityModel->flags |= MODEL_FLAGS_FLAG_200; + + get_screen_coords(gCurrentCamID, playerStatus->position.x, playerStatus->position.y, -playerStatus->position.z, + &screenX, &screenY, &screenZ); + + renderTaskPtr->renderMode = playerStatus->renderMode; + renderTaskPtr->appendGfxArg = playerStatus; + renderTaskPtr->appendGfx = &N(appendGfx_test_player_reflection); + renderTaskPtr->distance = -screenZ; + queue_render_task(renderTaskPtr); + } +} + +void N(appendGfx_test_player_reflection)(void* data) { + PlayerStatus* playerStatus = data; + f32 yaw = -gCameras[gCurrentCamID].currentYaw; + Matrix4f main; + Matrix4f translation; + Matrix4f rotation; + Matrix4f scale; + + guRotateF(rotation, yaw, 0.0f, -1.0f, 0.0f); + guRotateF(main, clamp_angle(playerStatus->pitch), 0.0f, 0.0f, 1.0f); + guMtxCatF(rotation, main, main); + guRotateF(rotation, yaw, 0.0f, 1.0f, 0.0f); + guMtxCatF(main, rotation, main); + guRotateF(rotation, playerStatus->spriteFacingAngle, 0.0f, 1.0f, 0.0f); + guMtxCatF(main, rotation, main); + guScaleF(scale, SPRITE_WORLD_SCALE_F, SPRITE_WORLD_SCALE_F, SPRITE_WORLD_SCALE_F); + guMtxCatF(main, scale, main); + guTranslateF(translation, playerStatus->position.x, playerStatus->position.y, -playerStatus->position.z); + guMtxCatF(main, translation, main); + spr_update_player_sprite(1, playerStatus->trueAnimation, 1.0f); + spr_draw_player_sprite(1, 0, 0, NULL, main); +} + +API_CALLABLE(N(EnablePartnerReflection)) { + Npc* partner; + + script->array[1] = create_generic_entity_world(&N(worker_update_partner_reflection), NULL); + partner = get_npc_safe(NPC_PARTNER); + + if (partner == NULL) { + return ApiStatus_DONE2; + } + + partner->flags |= NPC_FLAG_REFLECT_WALL; + partner->flags |= NPC_FLAG_REFLECT_FLOOR; + return ApiStatus_DONE2; +} + +void N(worker_update_partner_reflection)(void) { + Npc* partner = get_npc_safe(NPC_PARTNER); + + if (partner != NULL) { + partner->flags |= NPC_FLAG_REFLECT_WALL; + partner->flags |= NPC_FLAG_REFLECT_FLOOR; + } +} + +void N(worker_update_animator)(void) { + update_model_animator(N(Animator)); +} + +void N(worker_render_animator)(void) { + Matrix4f m0; + Matrix4f m1; + Matrix4f m2; + Matrix4f m3; + Mtx m4; + + guTranslateF(m1, -484.0f, 25.0f, -40.0f); + guMtxF2L(m1, &m4); + render_animated_model(N(Animator), &m4); +} + +API_CALLABLE(N(SetupAnimatedModel)) { + create_generic_entity_world(N(worker_update_animator), N(worker_render_animator)); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_SetupReflection) = { + EVT_CALL(N(SetupAnimatedModel)) + EVT_MALLOC_ARRAY(16, LVarA) + EVT_CALL(N(EnablePlayerReflection)) + EVT_CALL(N(EnablePartnerReflection)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tst/tst_04/tst_04_4_npc.c b/src/world/area_tst/tst_04/tst_04_4_npc.c new file mode 100644 index 0000000000..4c64f7b884 --- /dev/null +++ b/src/world/area_tst/tst_04/tst_04_4_npc.c @@ -0,0 +1,65 @@ +#include "tst_04.h" + +API_CALLABLE(N(DisableOwnerShadow)) { + disable_npc_shadow(get_npc_unsafe(script->owner1.enemy->npcID)); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_NpcAuxAI_Goompa) = { + EVT_CALL(N(DisableOwnerShadow)) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40000, TRUE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAux_Goompa) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAI_Goompa) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcHit_Goompa) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Goompa) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcDefeat_Goompa) = { + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_Goompa) = { + .defaultAnim = ANIM_Goompa_Talk, + .height = 24, + .radius = 24, + .otherAI = &N(EVS_NpcAuxAI_Goompa), + .onInteract = &N(EVS_NpcInteract_Goompa), + .ai = &N(EVS_NpcAI_Goompa), + .onHit = &N(EVS_NpcHit_Goompa), + .aux = &N(EVS_NpcAux_Goompa), + .onDefeat = &N(EVS_NpcDefeat_Goompa), + .unk_27 = 200, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4, +}; + +StaticNpc N(NpcData_Goompa) = { + .id = NPC_Goompa, + .settings = &N(NpcSettings_Goompa), + .pos = { 80.0f, 40.0f, -84.0f }, + .yaw = 0, + .flags = NPC_FLAG_1000, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Goompa)), + {} +}; diff --git a/src/world/area_tst/tst_10/B1C540.c b/src/world/area_tst/tst_10/B1C540.c deleted file mode 100644 index 0267df95de..0000000000 --- a/src/world/area_tst/tst_10/B1C540.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "tst_10.h" - -static char* N(exit_str_0) = "tst_10"; diff --git a/src/world/area_tst/tst_10/tst_10.h b/src/world/area_tst/tst_10/tst_10.h index 0b73b74cfd..33dc90f561 100644 --- a/src/world/area_tst/tst_10/tst_10.h +++ b/src/world/area_tst/tst_10/tst_10.h @@ -2,8 +2,11 @@ /// @brief Testing - Entry and Camera Test #include "common.h" -#include "../tst.h" #include "message_ids.h" #include "map.h" +#include "../tst.h" +#include "mapfs/tst_10_shape.h" +#include "mapfs/tst_10_hit.h" + #define NAMESPACE tst_10 diff --git a/src/world/area_tst/tst_10/tst_10_1_main.c b/src/world/area_tst/tst_10/tst_10_1_main.c new file mode 100644 index 0000000000..fb8a3d1d2e --- /dev/null +++ b/src/world/area_tst/tst_10/tst_10_1_main.c @@ -0,0 +1,127 @@ +#include "tst_10.h" +#include "entity.h" + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_MakeEntities); + +EntryList N(Entrances) = { + [tst_10_ENTRY_0] { 0.0, 0.0, -480.0, 180.0 }, + [tst_10_ENTRY_1] { -480.0, 0.0, 0.0, 90.0 }, + [tst_10_ENTRY_2] { 0.0, 0.0, 480.0, 0.0 }, + [tst_10_ENTRY_3] { 480.0, 0.0, 0.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, +}; + +// note: sets DisablePlayerInput, but does not use EVT_GROUP_1B +EvtScript N(EVS_ExitWalk_tst_10_2) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(UseExitHeading, 60, tst_10_ENTRY_0) + EVT_EXEC(ExitWalk) + EVT_CALL(GotoMap, EVT_PTR("tst_10"), tst_10_ENTRY_2) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +// note: sets DisablePlayerInput, but does not use EVT_GROUP_1B +EvtScript N(EVS_ExitWalk_tst_10_3) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(UseExitHeading, 60, tst_10_ENTRY_1) + EVT_EXEC(ExitWalk) + EVT_CALL(GotoMap, EVT_PTR("tst_10"), tst_10_ENTRY_3) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +// note: sets DisablePlayerInput, but does not use EVT_GROUP_1B +EvtScript N(EVS_ExitWalk_tst_10_0) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(UseExitHeading, 60, tst_10_ENTRY_2) + EVT_EXEC(ExitWalk) + EVT_CALL(GotoMap, EVT_PTR("tst_10"), tst_10_ENTRY_0) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +// note: sets DisablePlayerInput, but does not use EVT_GROUP_1B +EvtScript N(EVS_ExitWalk_tst_10_1) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(UseExitHeading, 60, tst_10_ENTRY_3) + EVT_EXEC(ExitWalk) + EVT_CALL(GotoMap, EVT_PTR("tst_10"), tst_10_ENTRY_1) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_DisableExitCameraZones) = { + EVT_CALL(SetZoneEnabled, ZONE_north, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_west, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_south, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_east, FALSE) + EVT_SET(AF_TST_00, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_tst_10_2)), TRIGGER_FLOOR_TOUCH, COLLIDER_deilin, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_tst_10_3)), TRIGGER_FLOOR_TOUCH, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_tst_10_0)), TRIGGER_FLOOR_TOUCH, COLLIDER_deilis, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_tst_10_1)), TRIGGER_FLOOR_TOUCH, COLLIDER_deilie, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_TESTING) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_IF_EQ(AF_TST_00, TRUE) + EVT_CALL(SetZoneEnabled, ZONE_north, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_west, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_south, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_east, FALSE) + EVT_SET(AF_TST_00, FALSE) + EVT_ELSE + EVT_SET(AF_TST_00, TRUE) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_DisableExitCameraZones)), TRIGGER_FLOOR_TOUCH, COLLIDER_change, 1, 0) + EVT_END_IF + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; + +s32 N(TweesterPath)[] = { + -65, 0, 217, + -262, 0, -64, + 57, 0, -286, + 327, 0, 8, + TWEETSER_PATH_LOOP + }; + + s32* N(UnusedTweesterPaths)[] = { + N(TweesterPath), + N(TweesterPath), + N(TweesterPath), + N(TweesterPath), + (s32*) -1 +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_HeartBlock), -13, 60, -50, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenPanel), -111, 0, -55, 0, MODEL_o137, MAKE_ENTITY_END) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tst/tst_11/tst_11.h b/src/world/area_tst/tst_11/tst_11.h index eb14f5da4e..843ba9ff0c 100644 --- a/src/world/area_tst/tst_11/tst_11.h +++ b/src/world/area_tst/tst_11/tst_11.h @@ -2,8 +2,11 @@ /// @brief Testing - Reflection Test #include "common.h" -#include "../tst.h" #include "message_ids.h" #include "map.h" +#include "../tst.h" +#include "mapfs/tst_11_shape.h" +#include "mapfs/tst_11_hit.h" + #define NAMESPACE tst_11 diff --git a/src/world/area_tst/tst_11/tst_11_1_main.c b/src/world/area_tst/tst_11/tst_11_1_main.c new file mode 100644 index 0000000000..3db76056a3 --- /dev/null +++ b/src/world/area_tst/tst_11/tst_11_1_main.c @@ -0,0 +1,23 @@ +#include "tst_11.h" + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupReflections); + +EntryList N(Entrances) = { + [tst_11_ENTRY_0] { 0.0, 0.0, 100.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_TESTING) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_EXEC(N(EVS_SetupReflections)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tst/tst_11/B1CA50.c b/src/world/area_tst/tst_11/tst_11_2_extra.c similarity index 67% rename from src/world/area_tst/tst_11/B1CA50.c rename to src/world/area_tst/tst_11/tst_11_2_extra.c index d4db034206..e3286ab3e4 100644 --- a/src/world/area_tst/tst_11/B1CA50.c +++ b/src/world/area_tst/tst_11/tst_11_2_extra.c @@ -1,42 +1,41 @@ #include "tst_11.h" #include "sprite.h" -void func_8024003C_B1CA8C(void); -void func_80240100_B1CB50(void*); -void func_802402F4_B1CD44(void); -void func_802403B8_B1CE08(void*); -void N(SetPartnerFlagsA0000)(void); +void N(test_reflection_worker_render_wall)(void); +void N(appendGfx_test_reflection_wall)(void*); +void N(test_reflection_worker_render_floor)(void); +void N(appendGfx_test_reflection_floor)(void*); +void N(test_reflection_worker_partner)(void); -ApiStatus func_80240000_B1CA50(Evt* script, s32 isInitialCall) { - script->array[0] = (s32) create_generic_entity_frontUI(NULL, func_8024003C_B1CA8C); +// identical to final version +API_CALLABLE(N(EnableWallReflectionTest)) { + script->array[0] = (s32) create_generic_entity_frontUI(NULL, N(test_reflection_worker_render_wall)); return ApiStatus_DONE2; } -void func_8024003C_B1CA8C(void) { +void N(test_reflection_worker_render_wall)(void) { PlayerStatus* playerStatus = &gPlayerStatus; EntityModel* entityModel; RenderTask renderTask; RenderTask* renderTaskPtr = &renderTask; - s32 screenX; - s32 screenY; - s32 screenZ; + s32 screenX, screenY, screenZ; - if (playerStatus->flags & PS_FLAGS_1) { + if (playerStatus->flags & PS_FLAGS_HAS_REFLECTION) { entityModel = get_entity_model(get_shadow_by_index(playerStatus->shadowID)->entityModelID); - entityModel->flags |= MODEL_FLAGS_FLAG_200; + entityModel->flags |= ENTITY_MODEL_FLAGS_REFLECT; get_screen_coords(gCurrentCamID, playerStatus->position.x, playerStatus->position.y, -playerStatus->position.z, &screenX, &screenY, &screenZ); - renderTask.renderMode = playerStatus->renderMode; - renderTask.appendGfxArg = playerStatus; - renderTask.appendGfx = func_80240100_B1CB50; - renderTask.distance = -screenZ; + renderTaskPtr->renderMode = playerStatus->renderMode; + renderTaskPtr->appendGfxArg = playerStatus; + renderTaskPtr->appendGfx = &N(appendGfx_test_reflection_wall); + renderTaskPtr->distance = -screenZ; queue_render_task(renderTaskPtr); } } -void func_80240100_B1CB50(void* data) { +void N(appendGfx_test_reflection_wall)(void* data) { PlayerStatus* playerStatus = data; f32 yaw = -gCameras[gCurrentCamID].currentYaw; Matrix4f main; @@ -55,40 +54,39 @@ void func_80240100_B1CB50(void* data) { guMtxCatF(main, scale, main); guTranslateF(translation, playerStatus->position.x, playerStatus->position.y, -playerStatus->position.z); guMtxCatF(main, translation, main); + // draw sprite is handled differently in final version spr_update_player_sprite(1, playerStatus->trueAnimation ^ SPRITE_ID_BACK_FACING, 1.0f); spr_draw_player_sprite(1, 0, 0, NULL, main); } -ApiStatus func_802402B8_B1CD08(Evt* script, s32 isInitialCall) { - script->array[0] = (s32) create_generic_entity_frontUI(NULL, func_802402F4_B1CD44); +API_CALLABLE(N(EnableFloorReflectionTest)) { + script->array[0] = (s32) create_generic_entity_frontUI(NULL, &N(test_reflection_worker_render_floor)); return ApiStatus_DONE2; } -void func_802402F4_B1CD44(void) { +void N(test_reflection_worker_render_floor)(void) { PlayerStatus* playerStatus = &gPlayerStatus; EntityModel* entityModel; RenderTask renderTask; RenderTask* renderTaskPtr = &renderTask; - s32 screenX; - s32 screenY; - s32 screenZ; + s32 screenX, screenY, screenZ; - if (playerStatus->flags & PS_FLAGS_1) { + if (playerStatus->flags & PS_FLAGS_HAS_REFLECTION) { entityModel = get_entity_model(get_shadow_by_index(playerStatus->shadowID)->entityModelID); - entityModel->flags |= MODEL_FLAGS_FLAG_200; + entityModel->flags |= ENTITY_MODEL_FLAGS_REFLECT; get_screen_coords(gCurrentCamID, playerStatus->position.x, -playerStatus->position.y, playerStatus->position.z, &screenX, &screenY, &screenZ); renderTaskPtr->renderMode = playerStatus->renderMode; renderTaskPtr->appendGfxArg = playerStatus; - renderTaskPtr->appendGfx = func_802403B8_B1CE08; + renderTaskPtr->appendGfx = &N(appendGfx_test_reflection_floor); renderTaskPtr->distance = -screenZ; queue_render_task(renderTaskPtr); } } -void func_802403B8_B1CE08(void* data) { +void N(appendGfx_test_reflection_floor)(void* data) { PlayerStatus* playerStatus = data; f32 yaw = -gCameras[gCurrentCamID].currentYaw; s32 trueAnimation; @@ -121,31 +119,38 @@ void func_802403B8_B1CE08(void* data) { guTranslateF(sp60, playerStatus->position.x, playerStatus->position.y, 0.0f); guMtxCatF(sp20, sp60, sp20); trueAnimation = playerStatus->trueAnimation; - func_802DDFF8(trueAnimation, 7, 0xFF, 0xFF, 0xFF, 0x14, 0); + func_802DDFF8(trueAnimation, 7, 255, 255, 255, 20, 0); spr_draw_player_sprite(1, 0, 0, 0, sp20); func_802DDFF8(trueAnimation, 0, 0, 0, 0, 0, 0); } -ApiStatus func_802406D4_B1D124(Evt* script, s32 isInitialCall) { - Npc* npc; +API_CALLABLE(N(PartnerReflectTest)) { + Npc* partner; - script->array[1] = create_generic_entity_world(N(SetPartnerFlagsA0000), NULL); + script->array[1] = create_generic_entity_world(N(test_reflection_worker_partner), NULL); + partner = get_npc_safe(NPC_PARTNER); - npc = get_npc_safe(NPC_PARTNER); - - if (npc == NULL) { + if (partner == NULL) { return ApiStatus_DONE2; } - npc->flags |= (NPC_FLAG_REFLECT_WALL | NPC_FLAG_REFLECT_FLOOR); - + partner->flags |= (NPC_FLAG_REFLECT_WALL | NPC_FLAG_REFLECT_FLOOR); return ApiStatus_DONE2; } -void N(SetPartnerFlagsA0000)(void) { +void N(test_reflection_worker_partner)(void) { Npc* partner = get_npc_safe(NPC_PARTNER); if (partner != NULL) { partner->flags |= (NPC_FLAG_REFLECT_WALL | NPC_FLAG_REFLECT_FLOOR); } } + +EvtScript N(EVS_SetupReflections) = { + EVT_MALLOC_ARRAY(16, LVarA) + EVT_CALL(N(EnableWallReflectionTest)) + EVT_CALL(N(EnableFloorReflectionTest)) + EVT_CALL(N(PartnerReflectTest)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tst/tst_12/tst_12.h b/src/world/area_tst/tst_12/tst_12.h new file mode 100644 index 0000000000..697426cedc --- /dev/null +++ b/src/world/area_tst/tst_12/tst_12.h @@ -0,0 +1,9 @@ +#include "common.h" +#include "message_ids.h" +#include "map.h" + +#include "../tst.h" +#include "mapfs/tst_12_shape.h" +#include "mapfs/tst_12_hit.h" + +#define NAMESPACE tst_12 diff --git a/src/world/area_tst/tst_12/tst_12_1_main.c b/src/world/area_tst/tst_12/tst_12_1_main.c new file mode 100644 index 0000000000..7e35a1f839 --- /dev/null +++ b/src/world/area_tst/tst_12/tst_12_1_main.c @@ -0,0 +1,79 @@ +#include "tst_12.h" +#include "effects.h" + +extern EvtScript N(EVS_Main); + +EntryList N(Entrances) = { + [tst_12_ENTRY_0] { 416.0, 0.0, 76.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, +}; + +EvtScript N(D_80240050_B1D340) = { + EVT_SET_GROUP(EVT_GROUP_0B) + EVT_SET(LVarA, LVar0) + EVT_SET(LVarB, LVar1) + EVT_SET(LVarC, LVar2) + EVT_SET(LVarD, LVar3) + EVT_SET(LVarE, LVar4) + EVT_SUB(LVarC, LVar0) + EVT_SUB(LVarD, LVar1) + EVT_SETF(LVar0, LVarC) + EVT_DIVF(LVar0, EVT_FLOAT(100.0)) + EVT_SETF(LVarF, EVT_FLOAT(100.0)) + EVT_DIVF(LVarF, LVar0) + EVT_ADD(LVarF, 11) + EVT_SET(LVar5, 200) + EVT_DIV(LVar5, LVarF) + EVT_ADD(LVar5, 1) + EVT_LOOP(LVar5) + EVT_CALL(RandInt, LVarC, LVar0) + EVT_CALL(RandInt, LVarD, LVar1) + EVT_CALL(RandInt, 199, LVar2) + EVT_SET(LVar3, 210) + EVT_SUB(LVar3, LVar2) + EVT_ADD(LVar0, LVarA) + EVT_ADD(LVar1, LVarB) + EVT_ADD(LVar2, LVarE) + EVT_CALL(PlayEffect, EFFECT_FLOATING_FLOWER, LVar0, LVar2, LVar1, LVar3, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_END_LOOP + EVT_WAIT(LVarF) + EVT_LABEL(0) + EVT_CALL(RandInt, LVarC, LVar0) + EVT_CALL(RandInt, LVarD, LVar1) + EVT_ADD(LVar0, LVarA) + EVT_ADD(LVar1, LVarB) + EVT_CALL(PlayEffect, EFFECT_FLOATING_FLOWER, LVar0, LVarE, LVar1, 200, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_WAIT(LVarF) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_TESTING) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o92, SURFACE_TYPE_FLOWERS) + EVT_SET(LVar0, 544) + EVT_SET(LVar1, 0) + EVT_SET(LVar2, 100) + EVT_SET(LVar3, 386) + EVT_SET(LVar4, 174) + EVT_SET(LVar5, 40) + EVT_EXEC(N(D_80240050_B1D340)) + EVT_SET(LVar0, 327) + EVT_SET(LVar1, 0) + EVT_SET(LVar2, 24) + EVT_SET(LVar3, 89) + EVT_SET(LVar4, 252) + EVT_SET(LVar5, 40) + EVT_EXEC(N(D_80240050_B1D340)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tst/tst_13/B1D760.c b/src/world/area_tst/tst_13/B1D760.c deleted file mode 100644 index cbf60b6b9b..0000000000 --- a/src/world/area_tst/tst_13/B1D760.c +++ /dev/null @@ -1,49 +0,0 @@ -#include "tst_13.h" - -extern Gfx D_80242860_B1FFC0[]; -extern s32 D_80242BF8_B20358; - -ApiStatus func_80240000_B1D760(Evt* script, s32 isInitialCall) { - PlayerStatus* playerStatus = &gPlayerStatus; - f32 dist = dist2D(playerStatus->position.x, playerStatus->position.z, script->array[2], script->array[3]); - - script->varTable[0] = 1; - if (playerStatus->actionState != ACTION_STATE_SPIN_POUND && playerStatus->actionState != ACTION_STATE_TORNADO_POUND) { - script->varTable[0] = 0; - } - if (script->array[4] <= dist) { - script->varTable[0] = 0; - } - - return ApiStatus_DONE2; -} - -#include "world/common/UnkDistFunc2.inc.c" - -void func_8024013C_B1D89C(void) { - Matrix4f sp10; - Matrix4f sp50; - f32 x; - f32 y; - f32 z; - - D_80242BF8_B20358 += 1; - guTranslateF(sp10, gPlayerStatus.position.x, 0.0f, gPlayerStatus.position.z); - - x = (sin_rad(D_80242BF8_B20358 / 50.0f) * 0.5) + 0.5; - y = SQ(cos_rad(D_80242BF8_B20358 / 50.0f)) + 0.1; - z = (sin_rad(D_80242BF8_B20358 / 50.0f) * 0.5) + 0.5; - - guScaleF(sp50, x, y, z); - guMtxCatF(sp50, sp10, sp10); - guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); - mdl_project_tex_coords(1, D_80242860_B1FFC0, sp10, NULL); - - gDPPipeSync(gMasterGfxPos++); - gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); - gDPSetRenderMode(gMasterGfxPos++, G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2); - mdl_draw_hidden_panel_surface(&gMasterGfxPos, 1); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_80242860_B1FFC0); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); -} diff --git a/src/world/area_tst/tst_13/tst_13.h b/src/world/area_tst/tst_13/tst_13.h index 6f29d08cbe..01356d69a2 100644 --- a/src/world/area_tst/tst_13/tst_13.h +++ b/src/world/area_tst/tst_13/tst_13.h @@ -2,8 +2,34 @@ /// @brief Testing - Partners and Shockwave #include "common.h" -#include "../tst.h" #include "message_ids.h" #include "map.h" +#include "../tst.h" +#include "mapfs/tst_13_shape.h" +#include "mapfs/tst_13_hit.h" + +#include "sprite/npc/WorldBombette.h" +#include "sprite/npc/WorldParakarry.h" +#include "sprite/npc/WorldBow.h" +#include "sprite/npc/WorldWatt.h" +#include "sprite/npc/WorldSushie.h" +#include "sprite/npc/WorldLakilester.h" +#include "sprite/npc/WorldGoombario.h" +#include "sprite/npc/WorldKooper.h" +#include "sprite/npc/Koopa.h" + #define NAMESPACE tst_13 + +enum { + NPC_00 = 0, + NPC_01 = 1, + NPC_02 = 2, + NPC_03 = 3, + NPC_04 = 4, + NPC_05 = 5, + NPC_06 = 6, + NPC_07 = 7, + NPC_08 = 8, + NPC_09 = 9, +}; diff --git a/src/world/area_tst/tst_13/tst_13_1_main.c b/src/world/area_tst/tst_13/tst_13_1_main.c new file mode 100644 index 0000000000..364d539052 --- /dev/null +++ b/src/world/area_tst/tst_13/tst_13_1_main.c @@ -0,0 +1,508 @@ +#include "tst_13.h" + +void mdl_project_tex_coords(s32 modelID, Gfx* destGfx, Matrix4f destMtx, void* destVertices); + +//TODO remove these when splat can deal with vtx arrays better +// also remove them from undefined_syms +extern Vtx D_802423D0[]; +extern Vtx D_80242310[]; +extern Vtx flo_23_ConsumableChoiceList[]; + +extern EvtScript N(EVS_Main); +extern EvtScript N(D_80240510_B1DC70); +extern EvtScript N(D_80240894_B1DFF4); +extern EvtScript N(D_80240A58_B1E1B8); +extern NpcGroupList N(DefaultNPCs); + +extern Gfx N(shockwave_gfx)[]; +extern s32 N(D_80242BF8_B20358); + +API_CALLABLE(N(func_80240000_B1D760)) { + PlayerStatus* playerStatus = &gPlayerStatus; + f32 dist = dist2D(playerStatus->position.x, playerStatus->position.z, script->array[2], script->array[3]); + + script->varTable[0] = 1; + if (playerStatus->actionState != ACTION_STATE_SPIN_POUND && playerStatus->actionState != ACTION_STATE_TORNADO_POUND) { + script->varTable[0] = 0; + } + if (script->array[4] <= dist) { + script->varTable[0] = 0; + } + + return ApiStatus_DONE2; +} + +#include "world/common/UnkDistFunc2.inc.c" + +void N(func_8024013C_B1D89C)(void) { + Matrix4f sp10; + Matrix4f sp50; + f32 x, y, z; + + N(D_80242BF8_B20358) += 1; + guTranslateF(sp10, gPlayerStatus.position.x, 0.0f, gPlayerStatus.position.z); + + x = (sin_rad(N(D_80242BF8_B20358) / 50.0f) * 0.5) + 0.5; + y = SQ(cos_rad(N(D_80242BF8_B20358) / 50.0f)) + 0.1; + z = (sin_rad(N(D_80242BF8_B20358) / 50.0f) * 0.5) + 0.5; + + guScaleF(sp50, x, y, z); + guMtxCatF(sp50, sp10, sp10); + guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); + mdl_project_tex_coords(1, N(shockwave_gfx), sp10, NULL); + + gDPPipeSync(gMasterGfxPos++); + gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); + gDPSetRenderMode(gMasterGfxPos++, G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2); + mdl_draw_hidden_panel_surface(&gMasterGfxPos, 1); + gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(gMasterGfxPos++, N(shockwave_gfx)); + gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); +} + +EntryList N(Entrances) = { + [tst_13_ENTRY_0] { 0.0, 0.0, 100.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, +}; + +EvtScript N(EVS_80240410) = { + EVT_USE_BUF(LVar0) + EVT_MALLOC_ARRAY(6, LVarA) + EVT_BUF_READ1(LVar0) + EVT_SET(ArrayVar(0), LVar0) + EVT_BUF_READ1(LVar0) + EVT_SET(ArrayVar(1), LVar0) + EVT_BUF_READ1(LVar0) + EVT_SET(ArrayVar(2), LVar0) + EVT_BUF_READ1(LVar0) + EVT_SET(ArrayVar(3), LVar0) + EVT_BUF_READ1(LVar0) + EVT_SET(ArrayVar(4), LVar0) + EVT_BUF_READ1(LVar0) + EVT_SET(ArrayVar(5), LVar0) + EVT_SET(LVar0, LVarA) + EVT_BIND_TRIGGER(EVT_PTR(N(D_80240510_B1DC70)), TRIGGER_FLOOR_TOUCH, ArrayVar(0), 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80240510_B1DC70) = { + EVT_USE_ARRAY(LVar0) + EVT_CALL(N(func_80240000_B1D760)) + EVT_IF_EQ(LVar0, 0) + EVT_RETURN + EVT_END_IF + EVT_LOOP(5) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, ArrayVar(0), COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(EnableModel, ArrayVar(1), TRUE) + EVT_WAIT(1) + EVT_CALL(ModifyColliderFlags, 0, ArrayVar(0), COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(EnableModel, ArrayVar(1), FALSE) + EVT_WAIT(1) + EVT_END_LOOP + EVT_IF_NE(ArrayVar(5), 0) + EVT_EXEC_WAIT(ArrayVar(5)) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80240600_B1DD60) = { + EVT_USE_BUF(LVar0) + EVT_MALLOC_ARRAY(6, LVar9) + EVT_BUF_READ1(LVar1) + EVT_SET(ArrayVar(0), LVar1) + EVT_BUF_READ1(LVar1) + EVT_SET(ArrayVar(1), LVar1) + EVT_BUF_READ1(LVar1) + EVT_SET(ArrayVar(2), LVar1) + EVT_BUF_READ1(LVar1) + EVT_SET(ArrayVar(3), LVar1) + EVT_BUF_READ1(LVar1) + EVT_SET(ArrayVar(4), LVar1) + EVT_BUF_READ1(LVar1) + EVT_SET(ArrayVar(5), LVar1) + EVT_CALL(ParentColliderToModel, ArrayVar(1), ArrayVar(0)) + EVT_LABEL(0) + EVT_LABEL(1) + EVT_CALL(GetPlayerActionState, LVarA) + EVT_IF_EQ(LVarA, ACTION_STATE_SPIN_JUMP) + EVT_GOTO(2) + EVT_END_IF + EVT_IF_EQ(LVarA, ACTION_STATE_TORNADO_JUMP) + EVT_GOTO(2) + EVT_END_IF + EVT_WAIT(1) + EVT_GOTO(0) + EVT_LABEL(2) + EVT_CALL(GetPlayerPos, LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_IF_NE(LVar2, ArrayVar(3)) + EVT_GOTO(2) + EVT_END_IF + EVT_CALL(N(UnkDistFunc2)) + EVT_IF_EQ(LVar0, 1) + EVT_EXEC_WAIT(N(D_80240894_B1DFF4)) + EVT_END_IF + EVT_IF_EQ(LVar0, 2) + EVT_EXEC_WAIT(N(D_80240A58_B1E1B8)) + EVT_END_IF + EVT_LABEL(3) + EVT_CALL(GetPlayerActionState, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, ACTION_STATE_SPIN_JUMP) + EVT_GOTO(3) + EVT_END_IF + EVT_IF_EQ(LVar0, ACTION_STATE_TORNADO_JUMP) + EVT_GOTO(3) + EVT_END_IF + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80240894_B1DFF4) = { + EVT_USE_ARRAY(LVar9) + EVT_CALL(GetPlayerPos, LVar2, LVar3, LVar4) + EVT_CALL(MakeLerp, 0, 5, 3, EASING_QUADRATIC_IN) + EVT_LABEL(2) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, ArrayVar(0), 0, LVar0, 0) + EVT_SET(LVar5, LVar3) + EVT_ADD(LVar5, LVar0) + EVT_CALL(SetPlayerPos, LVar2, LVar5, LVar4) + EVT_CALL(UpdateColliderTransform, ArrayVar(1)) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(2) + EVT_END_IF + EVT_CALL(MakeLerp, 5, 0, 3, EASING_QUADRATIC_IN) + EVT_LABEL(3) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, ArrayVar(0), 0, LVar0, 0) + EVT_SET(LVar5, LVar3) + EVT_ADD(LVar5, LVar0) + EVT_CALL(SetPlayerPos, LVar2, LVar5, LVar4) + EVT_CALL(UpdateColliderTransform, ArrayVar(1)) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(3) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80240A58_B1E1B8) = { + EVT_USE_ARRAY(LVar9) + EVT_CALL(MakeItemEntity, ArrayVar(5), ArrayVar(2), ArrayVar(3), ArrayVar(4), ITEM_SPAWN_MODE_TOSS_SPAWN_ALWAYS, 0) + EVT_SET(LVar2, 0) + EVT_CALL(MakeLerp, 0, 150, 19, EASING_QUADRATIC_OUT) + EVT_LABEL(2) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, ArrayVar(0), 0, LVar0, 0) + EVT_ADD(LVar2, 45) + EVT_CALL(RotateModel, ArrayVar(0), LVar2, 1, 0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(2) + EVT_END_IF + EVT_CALL(MakeLerp, 150, 0, 19, EASING_QUADRATIC_OUT) + EVT_LABEL(3) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, ArrayVar(0), 0, LVar0, 0) + EVT_ADD(LVar2, 45) + EVT_CALL(RotateModel, ArrayVar(0), LVar2, 1, 0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(3) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAuxAI_00) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_00) = { + EVT_CALL(SetNpcSprite, NPC_SELF, ANIM_WorldBombette_Idle) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_01) = { + EVT_CALL(SetNpcSprite, NPC_SELF, ANIM_WorldParakarry_Idle) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_02) = { + EVT_CALL(SetNpcSprite, NPC_SELF, ANIM_WorldBow_Idle) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_03) = { + EVT_CALL(SetNpcSprite, NPC_SELF, ANIM_WorldWatt_Idle) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_04) = { + EVT_CALL(SetNpcSprite, NPC_SELF, ANIM_WorldSushie_Idle) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_05) = { + EVT_CALL(SetNpcSprite, NPC_SELF, ANIM_WorldLakilester_Idle) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_06) = { + EVT_CALL(SetNpcSprite, NPC_SELF, ANIM_WorldLakilester_Idle) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_07) = { + EVT_CALL(SetNpcSprite, NPC_SELF, ANIM_WorldLakilester_Idle) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_08) = { + EVT_CALL(SetNpcSprite, NPC_SELF, ANIM_WorldGoombario_Idle) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_09) = { + EVT_CALL(SetNpcSprite, NPC_SELF, ANIM_WorldKooper_Idle) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_00) = { + .defaultAnim = ANIM_Koopa_Idle, + .height = 24, + .radius = 24, + .otherAI = &N(EVS_NpcAuxAI_00), + .onInteract = &N(EVS_NpcInteract_00), + .flags = ENEMY_FLAGS_1, +}; + +NpcSettings N(NpcSettings_01) = { + .defaultAnim = ANIM_Koopa_Idle, + .height = 24, + .radius = 24, + .otherAI = &N(EVS_NpcAuxAI_00), + .onInteract = &N(EVS_NpcInteract_01), + .flags = ENEMY_FLAGS_1, +}; + +NpcSettings N(NpcSettings_02) = { + .defaultAnim = ANIM_Koopa_Idle, + .height = 24, + .radius = 24, + .otherAI = &N(EVS_NpcAuxAI_00), + .onInteract = &N(EVS_NpcInteract_02), + .flags = ENEMY_FLAGS_1, +}; + +NpcSettings N(NpcSettings_03) = { + .defaultAnim = ANIM_Koopa_Idle, + .height = 24, + .radius = 24, + .otherAI = &N(EVS_NpcAuxAI_00), + .onInteract = &N(EVS_NpcInteract_03), + .flags = ENEMY_FLAGS_1, +}; + +NpcSettings N(NpcSettings_04) = { + .defaultAnim = ANIM_Koopa_Idle, + .height = 24, + .radius = 24, + .otherAI = &N(EVS_NpcAuxAI_00), + .onInteract = &N(EVS_NpcInteract_04), + .flags = ENEMY_FLAGS_1, +}; + +NpcSettings N(NpcSettings_05) = { + .defaultAnim = ANIM_Koopa_Idle, + .height = 24, + .radius = 24, + .otherAI = &N(EVS_NpcAuxAI_00), + .onInteract = &N(EVS_NpcInteract_05), + .flags = ENEMY_FLAGS_1, +}; + +NpcSettings N(NpcSettings_06) = { + .defaultAnim = ANIM_Koopa_Idle, + .height = 24, + .radius = 24, + .otherAI = &N(EVS_NpcAuxAI_00), + .onInteract = &N(EVS_NpcInteract_06), + .flags = ENEMY_FLAGS_1, +}; + +NpcSettings N(NpcSettings_07) = { + .defaultAnim = ANIM_Koopa_Idle, + .height = 24, + .radius = 24, + .otherAI = &N(EVS_NpcAuxAI_00), + .onInteract = &N(EVS_NpcInteract_07), + .flags = ENEMY_FLAGS_1, +}; + +NpcSettings N(NpcSettings_08) = { + .defaultAnim = ANIM_Koopa_Idle, + .height = 24, + .radius = 24, + .otherAI = &N(EVS_NpcAuxAI_00), + .onInteract = &N(EVS_NpcInteract_08), + .flags = ENEMY_FLAGS_1, +}; + +NpcSettings N(NpcSettings_09) = { + .defaultAnim = ANIM_Koopa_Idle, + .height = 24, + .radius = 24, + .otherAI = &N(EVS_NpcAuxAI_00), + .onInteract = &N(EVS_NpcInteract_09), + .flags = ENEMY_FLAGS_1, +}; + +StaticNpc N(D_80240F38_B1E698)[] = { + { + .id = NPC_00, + .settings = &N(NpcSettings_00), + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, + .animations = { + }, + }, + { + .id = NPC_01, + .settings = &N(NpcSettings_01), + .pos = { 20.0f, 0.0f, 20.0f }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, + .animations = { + }, + }, + { + .id = NPC_02, + .settings = &N(NpcSettings_02), + .pos = { 40.0f, 0.0f, 40.0f }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, + .animations = { + }, + }, + { + .id = NPC_03, + .settings = &N(NpcSettings_03), + .pos = { 60.0f, 0.0f, 60.0f }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, + .animations = { + }, + }, + { + .id = NPC_04, + .settings = &N(NpcSettings_04), + .pos = { 80.0f, 0.0f, 80.0f }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, + .animations = { + }, + }, + { + .id = NPC_05, + .settings = &N(NpcSettings_05), + .pos = { 100.0f, 0.0f, 100.0f }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, + .animations = { + }, + }, + { + .id = NPC_06, + .settings = &N(NpcSettings_06), + .pos = { 120.0f, 0.0f, 120.0f }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, + .animations = { + }, + }, + { + .id = NPC_07, + .settings = &N(NpcSettings_07), + .pos = { 140.0f, 0.0f, 140.0f }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, + .animations = { + }, + }, + { + .id = NPC_08, + .settings = &N(NpcSettings_08), + .pos = { 160.0f, 0.0f, 160.0f }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, + .animations = { + }, + }, + { + .id = NPC_09, + .settings = &N(NpcSettings_09), + .pos = { 180.0f, 0.0f, 180.0f }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, + .animations = { + }, + }, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(D_80240F38_B1E698)), + {} +}; + +#include "world/area_tst/tst_13/shockwave.vtx.inc.c" +#include "world/area_tst/tst_13/shockwave.gfx.inc.c" + +Gfx N(dummy_gfx)[] = { + gsSPEndDisplayList() +}; + +s32 N(D_80242BF8_B20358) = 0; + +s32 N(D_80242BFC_B2035C)[] = { + 5, 4, -35, 0, -45, 342 +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_TESTING) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096) + EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0) + EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_SET(LVar0, EVT_PTR(N(D_80242BFC_B2035C))) + EVT_EXEC(N(D_80240600_B1DD60)) + EVT_CALL(SetModelCustomGfx, MODEL_o152, 0, -1) + EVT_CALL(SetCustomGfxBuilders, 0, 0, EVT_PTR(N(func_8024013C_B1D89C))) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tst/tst_20/tst_20.h b/src/world/area_tst/tst_20/tst_20.h new file mode 100644 index 0000000000..6f027749ba --- /dev/null +++ b/src/world/area_tst/tst_20/tst_20.h @@ -0,0 +1,9 @@ +#include "common.h" +#include "message_ids.h" +#include "map.h" + +#include "../tst.h" +#include "mapfs/tst_20_shape.h" +#include "mapfs/tst_20_hit.h" + +#define NAMESPACE tst_20 diff --git a/src/world/area_tst/tst_20/tst_20_1_main.c b/src/world/area_tst/tst_20/tst_20_1_main.c new file mode 100644 index 0000000000..3c477c9c4a --- /dev/null +++ b/src/world/area_tst/tst_20/tst_20_1_main.c @@ -0,0 +1,22 @@ +#include "tst_20.h" + +extern EvtScript N(EVS_Main); + +EntryList N(Entrances) = { + [tst_20_ENTRY_0] { 0.0, 0.0, 100.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_TESTING) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_RETURN + EVT_END +}; + diff --git a/src/world/common/SetCamera0Flag1000.inc.c b/src/world/common/SetCamera0Flag1000.inc.c index 3cc46a4f42..9c2d79c9f7 100644 --- a/src/world/common/SetCamera0Flag1000.inc.c +++ b/src/world/common/SetCamera0Flag1000.inc.c @@ -5,6 +5,6 @@ ApiStatus N(SetCamera0Flag1000)(Evt* script, s32 isInitialCall) { Camera* camera = &gCameras[CAM_DEFAULT]; - camera->flags |= 0x1000; + camera->flags |= CAMERA_FLAGS_1000; return ApiStatus_DONE2; } diff --git a/src/world/common/UnkAngleFunc001.inc.c b/src/world/common/UnkAngleFunc001.inc.c deleted file mode 100644 index 42cf628e59..0000000000 --- a/src/world/common/UnkAngleFunc001.inc.c +++ /dev/null @@ -1,35 +0,0 @@ -#include "common.h" -#include "npc.h" - -ApiStatus N(UnkAngleFunc001)(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 npcID = evt_get_variable(script, *args++); - s32 outX = *args++; - s32 outY = *args++; - s32 outZ = *args++; - Npc* npc = N(resolve_npc)(script, npcID); - f32 y; - - if (npc == NULL) { - return ApiStatus_DONE2; - } - - N(unkAngle1) += 4; - if (N(unkAngle1) >= 360) { - N(unkAngle1) -= 360; - } - - y = npc->pos.y; - if (npc->currentAnim == 0xB60000 || - npc->currentAnim == 0xB60004 || - npc->currentAnim == 0xB60008 || - npc->currentAnim == 0xB6000C) - { - y += 2.0f * sin_deg(N(unkAngle1)); - } - - evt_set_float_variable(script, outX, npc->pos.x); - evt_set_float_variable(script, outY, y); - evt_set_float_variable(script, outZ, npc->pos.z); - return ApiStatus_DONE2; -} diff --git a/src/world/common/UnkDistFunc2.inc.c b/src/world/common/UnkDistFunc2.inc.c index 9853b37051..dca0ed683c 100644 --- a/src/world/common/UnkDistFunc2.inc.c +++ b/src/world/common/UnkDistFunc2.inc.c @@ -2,10 +2,10 @@ ApiStatus N(UnkDistFunc2)(Evt* script, s32 isInitialCall) { PlayerStatus* playerStatus = &gPlayerStatus; - f32 distance; - s32* array = script->array; - - distance = dist2D(playerStatus->position.x, playerStatus->position.z, array[2], array[4]); + f32 distance = dist2D( + playerStatus->position.x, playerStatus->position.z, + script->array[2], script->array[4]); + script->varTable[0] = 0; if (distance < 112.5f) { script->varTable[0] = 2; diff --git a/src/world/common/UnkPlayerPosFunc.inc.c b/src/world/common/UnkPlayerPosFunc.inc.c deleted file mode 100644 index f9a66f03ea..0000000000 --- a/src/world/common/UnkPlayerPosFunc.inc.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" -#include "npc.h" - -ApiStatus N(UnkPlayerPosFunc)(Evt* script, s32 isInitialCall) { - Npc* player = get_npc_safe(ACTOR_PLAYER); - f32 yaw = -player->yaw; - f32 x = player->pos.x + 30.0f + (sin_deg(yaw) * 70.0f); - f32 z = player->pos.z + (cos_deg(yaw) * 70.0f); - f32 y = player->pos.y + 50.0f; - - evt_set_float_variable(script, LVar0, x); - evt_set_float_variable(script, LVar1, y); - evt_set_float_variable(script, LVar2, z); - return ApiStatus_DONE2; -} diff --git a/src/world/common/UnsetCamera0Flag1000.inc.c b/src/world/common/UnsetCamera0Flag1000.inc.c index 32e794db8e..63e089ce7a 100644 --- a/src/world/common/UnsetCamera0Flag1000.inc.c +++ b/src/world/common/UnsetCamera0Flag1000.inc.c @@ -5,6 +5,6 @@ ApiStatus N(UnsetCamera0Flag1000)(Evt* script, s32 isInitialCall) { Camera* camera = &gCameras[CAM_DEFAULT]; - camera->flags &= ~CAM_FLAG_1000; + camera->flags &= ~CAMERA_FLAGS_1000; return ApiStatus_DONE2; } diff --git a/src/world/common/atomic/Credits.h b/src/world/common/atomic/Credits.h new file mode 100644 index 0000000000..c580255bb3 --- /dev/null +++ b/src/world/common/atomic/Credits.h @@ -0,0 +1,38 @@ +#ifndef _CREDITS_H_ +#define _CREDITS_H_ + +#include "common.h" +#include "message_ids.h" + +#define STANDARD_POS_X 160 +#define STANDARD_APPEAR_TIME 40 +#define STANDARD_HOLD_TIME 174 +#define STANDARD_VANISH_TIME 30 +#define STANDARD_NEXT_TIME 230 +#define STANDARD_TITLE_NEXT_TIME 270 + +enum { + CREDITS_APPEAR_MODE_00 = 0, + CREDITS_APPEAR_MODE_01 = 1, + CREDITS_APPEAR_MODE_02 = 2, + CREDITS_APPEAR_MODE_03 = 3, + CREDITS_APPEAR_MODE_04 = 4, + CREDITS_APPEAR_MODE_05 = 5, +}; + +enum { + CREDITS_HOLD_MODE_00 = 0, +}; + +enum { + CREDITS_VANISH_MODE_00 = 0, + CREDITS_VANISH_MODE_01 = 1, + CREDITS_VANISH_MODE_02 = 2, + CREDITS_VANISH_MODE_03 = 3, +}; + +enum { + CREDITS_FLAG_1 = 1, +}; + +#endif diff --git a/src/world/common/atomic/Credits.inc.c b/src/world/common/atomic/Credits.inc.c new file mode 100644 index 0000000000..ea737b0706 --- /dev/null +++ b/src/world/common/atomic/Credits.inc.c @@ -0,0 +1,842 @@ +#include "common.h" +#include "Credits.h" + +s32 msg_get_print_char_width(s32 character, s32 charset, s32 variation, f32 msgScale, s32 overrideCharWidth, u8 flags); +void msg_get_glyph(s32 font, s32 variation, s32 charIndex, s32 palette, MesasgeFontGlyphData* out); +void dma_load_msg(u32 msgID, void* dest); + +static CreditsData N(CreditsData); +static CreditsData* N(CreditsDataPtr); +static s32 N(BSS_PAD_1)[2]; +static u8 N(CreditsMessageBuffers)[23][256]; +static Mtx N(CreditsProjMatrices)[2]; + +enum { + CREDITS_LINE_FLAG_1 = 1, + CREDITS_LINE_FLAG_2 = 2, +}; + +enum { + CREDITS_LINE_APPEARING = 0, + CREDITS_LINE_HOLDING = 1, + CREDITS_LINE_VANISHING = 2 +}; + +CreditsUnkBeta N(Font4Patterns)[] = { + { .unk_00 = 0x02, .unk_01 = 0x07, .size = 1 }, + { .unk_00 = 0x02, .unk_01 = 0x0A, .size = 1 }, + { .unk_00 = 0x03, .unk_01 = 0x04, .size = 1 }, + { .unk_00 = 0x07, .unk_01 = 0x0D, .size = 1 }, + { .unk_00 = 0x09, .unk_01 = 0x04, .size = 1 }, + { .unk_00 = 0x0C, .unk_01 = 0x04, .size = 1 }, + { .unk_00 = 0x0C, .unk_01 = 0x0C, .size = 1 }, + { .unk_00 = 0x0C, .unk_01 = 0x14, .size = 1 }, + { .unk_00 = 0x0D, .unk_01 = 0x03, .size = 1 }, + { .unk_00 = 0x0D, .unk_01 = 0x04, .size = 1 }, + { .unk_00 = 0x0D, .unk_01 = 0x0A, .size = 1 }, + { .unk_00 = 0x0D, .unk_01 = 0x14, .size = 1 }, + { .unk_00 = 0x0E, .unk_01 = 0x0D, .size = 1 }, + { .unk_00 = 0x0E, .unk_01 = 0x11, .size = 1 }, + { .unk_00 = 0x11, .unk_01 = 0x04, .size = 1 }, + { .unk_00 = 0x11, .unk_01 = 0x0F, .size = 1 }, + { .unk_00 = 0x14, .unk_01 = 0x02, .size = 1 }, + { .unk_00 = 0x14, .unk_01 = 0x0D, .size = 1 }, + { .unk_00 = 0x14, .unk_01 = 0x0F, .size = 1 }, + { .unk_00 = 0x14, .unk_01 = 0x12, .size = 1 }, + { .unk_00 = 0x12, .unk_01 = 0x02, .size = 1 }, + { .unk_00 = 0x12, .unk_01 = 0x07, .size = 1 }, + { .unk_00 = 0x12, .unk_01 = 0x0F, .size = 1 }, + { .unk_00 = 0x15, .unk_01 = 0x04, .size = 1 }, + { .unk_00 = 0x16, .unk_01 = 0x11, .size = 1 }, + {} +}; + +CreditsUnkBeta N(Font3Patterns)[] = { + { .unk_00 = 0x00, .unk_01 = 0x02, .size = 1 }, + { .unk_00 = 0x00, .unk_01 = 0x06, .size = 1 }, + { .unk_00 = 0x00, .unk_01 = 0x0E, .size = 1 }, + { .unk_00 = 0x00, .unk_01 = 0x03, .size = 1 }, + { .unk_00 = 0x00, .unk_01 = 0x08, .size = 1 }, + { .unk_00 = 0x00, .unk_01 = 0x0A, .size = 1 }, + { .unk_00 = 0x00, .unk_01 = 0x0D, .size = 1 }, + { .unk_00 = 0x00, .unk_01 = 0x13, .size = 1 }, + { .unk_00 = 0x00, .unk_01 = 0x14, .size = 1 }, + { .unk_00 = 0x07, .unk_01 = 0x00, .size = 1 }, + { .unk_00 = 0x07, .unk_01 = 0x06, .size = 1 }, + { .unk_00 = 0x07, .unk_01 = 0x08, .size = 1 }, + { .unk_00 = 0x08, .unk_01 = 0x02, .size = 1 }, + { .unk_00 = 0x08, .unk_01 = 0x04, .size = 1 }, + { .unk_00 = 0x08, .unk_01 = 0x06, .size = 1 }, + { .unk_00 = 0x08, .unk_01 = 0x0A, .size = 1 }, + { .unk_00 = 0x08, .unk_01 = 0x0D, .size = 1 }, + { .unk_00 = 0x08, .unk_01 = 0x0E, .size = 1 }, + { .unk_00 = 0x08, .unk_01 = 0x13, .size = 1 }, + { .unk_00 = 0x08, .unk_01 = 0x18, .size = 1 }, + { .unk_00 = 0x09, .unk_01 = 0x08, .size = 1 }, + { .unk_00 = 0x0C, .unk_01 = 0x0E, .size = 1 }, + { .unk_00 = 0x0C, .unk_01 = 0x08, .size = 1 }, + { .unk_00 = 0x0D, .unk_01 = 0x06, .size = 1 }, + { .unk_00 = 0x0D, .unk_01 = 0x08, .size = 1 }, + { .unk_00 = 0x0D, .unk_01 = 0x0E, .size = 1 }, + { .unk_00 = 0x0D, .unk_01 = 0x13, .size = 1 }, + { .unk_00 = 0x12, .unk_01 = 0x04, .size = 1 }, + { .unk_00 = 0x12, .unk_01 = 0x08, .size = 1 }, + { .unk_00 = 0x13, .unk_01 = 0x04, .size = 1 }, + { .unk_00 = 0x14, .unk_01 = 0x02, .size = 1 }, + { .unk_00 = 0x14, .unk_01 = 0x08, .size = 1 }, + { .unk_00 = 0x14, .unk_01 = 0x0A, .size = 1 }, + {} +}; + +Vp N(CreditsViewport) = { + .vp = { + .vscale = { 640, 480, 511, 0 }, + .vtrans = { 640, 480, 511, 0 } + } +}; + +s32 N(CreditsBufferIndex) = 0; + +// unused +void N(CharAnim_FadeIn_0)(CreditsLine* line, CreditsChar* chr) { + FoldImageRecPart foldImg; + MesasgeFontGlyphData glyph; + MesasgeFontGlyphData* glyphPtr = &glyph; + Matrix4f transformMtx; + f32 posX = chr->posX; + f32 posY = chr->posY; + f32 alpha; + + alpha = update_lerp(EASING_LINEAR, 0.0f, 255.0f, chr->fadeInTime, line->appearTime); + if (alpha > 255.0f) { + alpha = 255.0; + } + fold_update(0, FOLD_TYPE_7, 255, 255, 255, alpha, 0); + msg_get_glyph(chr->font, chr->variation, chr->charIndex, chr->palette, glyphPtr); + + posX += (glyphPtr->charWidth * 0.5); + guTranslateF(transformMtx, posX, -posY, 0.0f); + guMtxF2L (transformMtx, &gDisplayContext->matrixStack[gMatrixListPos]); + gSPMatrix(gMasterGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]), + G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + + foldImg.raster = glyphPtr->raster; + foldImg.palette = glyphPtr->palette; + foldImg.width = glyphPtr->texSize.x; + foldImg.height = glyphPtr->texSize.y; + foldImg.xOffset = -(glyphPtr->charWidth * 0.5); + foldImg.yOffset = 0; + foldImg.opacity = 255; + fold_appendGfx_component(0, &foldImg, FOLD_STATE_FLAG_40000 | FOLD_STATE_FLAG_10000 | FOLD_STATE_FLAG_40, transformMtx); + + gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); +} + + +void N(CharAnim_FadeIn_1)(CreditsLine* line, CreditsChar* chr) { + FoldImageRecPart foldImg; + MesasgeFontGlyphData glyph; + MesasgeFontGlyphData* glyphPtr = &glyph; + Matrix4f transformMtx; + f32 posX = chr->posX; + f32 posY = chr->posY; + f32 alpha; + + alpha = update_lerp(0, 0.0f, 255.0f, chr->fadeInTime, line->appearTime); + if (alpha > 255.0f) { + alpha = 255.0; + } + if (chr->fadeInTime == (line->appearTime - 4)) { + fold_update(0, FOLD_TYPE_A, 64, 64, 64, alpha, 0); + } else if (chr->fadeInTime == (line->appearTime - 3)) { + fold_update(0, FOLD_TYPE_A, 96, 96, 96, alpha, 0); + } else if (chr->fadeInTime == (line->appearTime - 2)) { + fold_update(0, FOLD_TYPE_A, 127, 127, 127, alpha, 0); + } else if (chr->fadeInTime == (line->appearTime - 1)) { + fold_update(0, FOLD_TYPE_A, 80, 80, 80, alpha, 0); + } else { + fold_update(0, FOLD_TYPE_7, 255, 255, 255, alpha, 0); + } + msg_get_glyph(chr->font, chr->variation, chr->charIndex, chr->palette, glyphPtr); + + posX += (glyphPtr->charWidth * 0.5); + guTranslateF(transformMtx, posX, -posY, 0.0f); + guMtxF2L (transformMtx, &gDisplayContext->matrixStack[gMatrixListPos]); + gSPMatrix(gMasterGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]), + G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + + foldImg.raster = glyphPtr->raster; + foldImg.palette = glyphPtr->palette; + foldImg.width = glyphPtr->texSize.x; + foldImg.height = glyphPtr->texSize.y; + foldImg.xOffset = -(glyphPtr->charWidth * 0.5); + foldImg.yOffset = 0; + foldImg.opacity = 255; + fold_appendGfx_component(0, &foldImg, FOLD_STATE_FLAG_40000 | FOLD_STATE_FLAG_10000 | FOLD_STATE_FLAG_40, transformMtx); + gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); +} + +void N(CharAnim_FadeIn_2)(CreditsLine* line, CreditsChar* chr) { + FoldImageRecPart foldImg; + MesasgeFontGlyphData glyph; + MesasgeFontGlyphData* glyphPtr = &glyph; + Matrix4f transformMtx, tempMtx; + f32 posX = chr->posX; + f32 posY = chr->posY; + f32 scaleAmt; + f32 alpha; + + alpha = update_lerp(EASING_COS_IN, 16.0f, 300.0f, chr->fadeInTime, line->appearTime); + if (alpha > 255.0f) { + alpha = 255.0f; + } + fold_update(0, FOLD_TYPE_7, 255, 255, 255, alpha, 0); + + scaleAmt = update_lerp(EASING_LINEAR, 0.2f, 2.0f, chr->fadeInTime, line->appearTime); + if (scaleAmt > 1.0) { + scaleAmt = 1.0; + } + msg_get_glyph(chr->font, chr->variation, chr->charIndex, chr->palette, glyphPtr); + + posX += (glyphPtr->charWidth * 0.5); + guTranslateF(transformMtx, posX, -posY, 0.0f); + if (scaleAmt != 1.0) { + guScaleF(tempMtx, scaleAmt, scaleAmt, 1.0f); + guMtxCatF(tempMtx, transformMtx, transformMtx); + } + guMtxF2L(transformMtx, &gDisplayContext->matrixStack[gMatrixListPos]); + gSPMatrix(gMasterGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]), + G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + + foldImg.raster = glyphPtr->raster; + foldImg.palette = glyphPtr->palette; + foldImg.width = glyphPtr->texSize.x; + foldImg.height = glyphPtr->texSize.y; + foldImg.xOffset = -(glyphPtr->charWidth * 0.5); + foldImg.yOffset = 0; + foldImg.opacity = 255; + fold_appendGfx_component(0, &foldImg, FOLD_STATE_FLAG_40, transformMtx); + + gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); +} + +void N(CharAnim_FadeIn_3)(CreditsLine* line, CreditsChar* chr) { + FoldImageRecPart foldImg; + MesasgeFontGlyphData glyph; + MesasgeFontGlyphData* glyphPtr = &glyph; + Matrix4f transformMtx, tempMtx; + f32 rotAngle, alpha; + f32 posX = chr->posX; + f32 posY = chr->posY; + + alpha = update_lerp(EASING_COS_IN, 32.0f, 300.0f, chr->fadeInTime, line->appearTime); + if (alpha > 255.0f) { + alpha = 255.0f; + } + fold_update(0, FOLD_TYPE_7, 255, 255, 255, alpha, 0); + + rotAngle = update_lerp(EASING_LINEAR, -75.0f, 30.0f, chr->fadeInTime, line->appearTime); + if (rotAngle >= 0.0f) { + rotAngle = 0.0f; + } + + msg_get_glyph(chr->font, chr->variation, chr->charIndex, chr->palette, glyphPtr); + + posX += (glyphPtr->charWidth * 0.5); + guTranslateF(transformMtx, posX, -posY, 0.0f); + if (rotAngle != 0.0f) { + guRotateF(tempMtx, rotAngle, 0.0f, 1.0f, 0.0f); + guMtxCatF(tempMtx, transformMtx, transformMtx); + } + guMtxF2L(transformMtx, &gDisplayContext->matrixStack[gMatrixListPos]); + gSPMatrix(gMasterGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]), + G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + + foldImg.raster = glyphPtr->raster; + foldImg.palette = glyphPtr->palette; + foldImg.width = glyphPtr->texSize.x; + foldImg.height = glyphPtr->texSize.y; + foldImg.xOffset = -(glyphPtr->charWidth * 0.5); + foldImg.yOffset = 0; + foldImg.opacity = 255; + fold_appendGfx_component(0, &foldImg, FOLD_STATE_FLAG_10000 | FOLD_STATE_FLAG_40, transformMtx); + + gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); +} + +void N(CharAnim_FadeIn_4)(CreditsLine* line, CreditsChar* chr) { + FoldImageRecPart foldImg; + MesasgeFontGlyphData glyph; + MesasgeFontGlyphData* glyphPtr = &glyph; + Matrix4f transformMtx, tempMtx; + f32 posX, posY, scaleAmt, rotAngle; + f32 startX = (line->posX + line->msgWidth) - 16; + f32 startY = line->posY + 60; + u32 foldFlags = FOLD_STATE_FLAG_40; + + posX = update_lerp(EASING_COS_IN_OUT, startX, chr->posX, chr->fadeInTime, line->appearTime); + posY = update_lerp(EASING_CUBIC_OUT, startY, chr->posY, chr->fadeInTime, line->appearTime); + if (chr->fadeInTime == line->appearTime) { + rotAngle = 0.0f; + } else { + rotAngle = (line->appearTime - chr->fadeInTime) * 10; + } + scaleAmt = update_lerp(EASING_QUADRATIC_OUT, 2.0f, 1.0f, chr->fadeInTime, line->appearTime); + + if (chr->fadeInTime == line->appearTime) { + fold_update(0, FOLD_TYPE_NONE, 0, 0, 0, 0, 0); + foldFlags |= FOLD_STATE_FLAG_10000; + } else { + f32 alpha = update_lerp(EASING_LINEAR, 16.0f, 300.0f, chr->fadeInTime, line->appearTime); + if (alpha > 255.0f) { + alpha = 255.0f; + } + fold_update(0, FOLD_TYPE_7, 255, 255, 255, alpha, 0); + } + msg_get_glyph(chr->font, chr->variation, chr->charIndex, chr->palette, glyphPtr); + + posX += (glyphPtr->charWidth * 0.5); + guTranslateF(transformMtx, posX, -posY, 0.0f); + guRotateF(tempMtx, rotAngle, 0.0f, 1.0f, 0.2f); + guMtxCatF(tempMtx, transformMtx, transformMtx); + guScaleF (tempMtx, scaleAmt, scaleAmt, 1.0f); + guMtxCatF(tempMtx, transformMtx, transformMtx); + guMtxF2L (transformMtx, &gDisplayContext->matrixStack[gMatrixListPos]); + gSPMatrix(gMasterGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]), + G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + + foldImg.raster = glyphPtr->raster; + foldImg.palette = glyphPtr->palette; + foldImg.width = glyphPtr->texSize.x; + foldImg.height = glyphPtr->texSize.y; + foldImg.xOffset = -(glyphPtr->charWidth * 0.5); + foldImg.yOffset = 0; + foldImg.opacity = 255; + fold_appendGfx_component(0, &foldImg, foldFlags, transformMtx); + + gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); +} + +void N(CharAnim_FadeIn_5)(CreditsLine* line, CreditsChar* chr) { + MesasgeFontGlyphData glyph; + MesasgeFontGlyphData* glyphPtr = &glyph; + f32 posX = chr->posX; + f32 posY = chr->posY; + f32 alpha; + + alpha = update_lerp(EASING_LINEAR, 0.0f, 255.0f, chr->fadeInTime, line->appearTime); + msg_get_glyph(chr->font, chr->variation, chr->charIndex, chr->palette, glyphPtr); + + draw_ci_image_with_clipping(glyphPtr->raster, glyphPtr->texSize.x, glyphPtr->texSize.y, + G_IM_FMT_CI, G_IM_SIZ_4b, glyphPtr->palette, posX, posY, + 10, 20, SCREEN_WIDTH - 20, SCREEN_HEIGHT - 40, alpha); +} + +// unused +void N(CharAnim_HoldClearFold)(CreditsLine* line, CreditsChar* chr) { + FoldImageRecPart foldImg; + MesasgeFontGlyphData glyph; + MesasgeFontGlyphData* glyphPtr = &glyph; + Matrix4f transformMtx; + f32 posX = chr->posX; + f32 posY = chr->posY; + + fold_update(0, FOLD_TYPE_NONE, 0, 0, 0, 0, 0); + guTranslateF(transformMtx, posX, -posY, 0.0f); + guMtxF2L (transformMtx, &gDisplayContext->matrixStack[gMatrixListPos]); + gSPMatrix(gMasterGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]), + G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + msg_get_glyph(chr->font, chr->variation, chr->charIndex, chr->palette, glyphPtr); + + foldImg.raster = glyphPtr->raster; + foldImg.palette = glyphPtr->palette; + foldImg.width = glyphPtr->texSize.x; + foldImg.height = glyphPtr->texSize.y; + foldImg.xOffset = -(glyphPtr->charWidth * 0.5); + foldImg.yOffset = 0; + foldImg.opacity = 255; + fold_appendGfx_component(0, &foldImg, FOLD_STATE_FLAG_40000 | FOLD_STATE_FLAG_10000 | FOLD_STATE_FLAG_40, transformMtx); + + gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); +} + +void N(CharAnim_Hold)(CreditsLine* line, CreditsChar* chr) { + MesasgeFontGlyphData glyph; + MesasgeFontGlyphData* glyphPtr = &glyph; + f32 posX = chr->posX; + f32 posY = chr->posY; + + msg_get_glyph(chr->font, chr->variation, chr->charIndex, chr->palette, glyphPtr); + draw_ci_image_with_clipping(glyphPtr->raster, glyphPtr->texSize.x, glyphPtr->texSize.y, + G_IM_FMT_CI, G_IM_SIZ_4b, glyphPtr->palette, posX, posY, + 10, 20, SCREEN_WIDTH - 20, SCREEN_HEIGHT - 40, 255); +} + +// unused +void N(CharAnim_FadeOut_0)(CreditsLine* line, CreditsChar* chr) { + FoldImageRecPart foldImg; + MesasgeFontGlyphData glyph; + MesasgeFontGlyphData* glyphPtr = &glyph; + Matrix4f transformMtx; + f32 posX = chr->posX; + f32 posY = chr->posY; + f32 alpha; + + alpha = update_lerp(EASING_SIN_OUT, 255.0f, 0.0f, chr->fadeInTime, line->vanishTime); + fold_update(0, FOLD_TYPE_7, 255, 255, 255, alpha, 0); + + msg_get_glyph(chr->font, chr->variation, chr->charIndex, chr->palette, glyphPtr); + + posX += (glyphPtr->charWidth * 0.5); + guTranslateF(transformMtx, posX, -posY, 0.0f); + guMtxF2L (transformMtx, &gDisplayContext->matrixStack[gMatrixListPos]); + gSPMatrix(gMasterGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]), + G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + + foldImg.raster = glyphPtr->raster; + foldImg.palette = glyphPtr->palette; + foldImg.width = glyphPtr->texSize.x; + foldImg.height = glyphPtr->texSize.y; + foldImg.xOffset = -(glyphPtr->charWidth * 0.5); + foldImg.yOffset = 0; + foldImg.opacity = 255; + fold_appendGfx_component(0, &foldImg, FOLD_STATE_FLAG_10000 | FOLD_STATE_FLAG_40, transformMtx); + + gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); +} + +void N(CharAnim_FadeOut_1)(CreditsLine* line, CreditsChar* chr) { + FoldImageRecPart foldImg; + MesasgeFontGlyphData glyph; + MesasgeFontGlyphData* glyphPtr = &glyph; + Matrix4f transformMtx, tempMtx; + f32 scaleAmt, alpha; + f32 posX = chr->posX; + f32 posY = chr->posY; + + alpha = update_lerp(EASING_SIN_OUT, 255.0f, 0.0f, chr->fadeInTime, line->vanishTime); + fold_update(0, FOLD_TYPE_7, 255, 255, 255, alpha, 0); + + scaleAmt = update_lerp(EASING_LINEAR, 1.0f, 0.2f, chr->fadeInTime, line->vanishTime); + msg_get_glyph(chr->font, chr->variation, chr->charIndex, chr->palette, glyphPtr); + + posX += (glyphPtr->charWidth * 0.5); + guTranslateF(transformMtx, posX, -posY, 0.0f); + guScaleF(tempMtx, scaleAmt, scaleAmt, 1.0f); + guMtxCatF(tempMtx, transformMtx, transformMtx); + guMtxF2L (transformMtx, &gDisplayContext->matrixStack[gMatrixListPos]); + gSPMatrix(gMasterGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]), + G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + + foldImg.raster = glyphPtr->raster; + foldImg.palette = glyphPtr->palette; + foldImg.width = glyphPtr->texSize.x; + foldImg.height = glyphPtr->texSize.y; + foldImg.xOffset = -(glyphPtr->charWidth * 0.5); + foldImg.yOffset = 0; + foldImg.opacity = 255; + fold_appendGfx_component(0, &foldImg, FOLD_STATE_FLAG_40, transformMtx); + + gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); +} + +void N(CharAnim_FadeOut_2)(CreditsLine* line, CreditsChar* chr) { + FoldImageRecPart foldImg; + MesasgeFontGlyphData glyph; + MesasgeFontGlyphData* glyphPtr = &glyph; + Matrix4f transformMtx, tempMtx; + f32 rotAngle, alpha; + f32 posX = chr->posX; + f32 posY = chr->posY; + + alpha = update_lerp(EASING_SIN_OUT, 255.0f, 0.0f, chr->fadeInTime, line->vanishTime); + fold_update(0, FOLD_TYPE_7, 255, 255, 255, alpha, 0); + + rotAngle = update_lerp(EASING_LINEAR, 0.0f, 60.0f, chr->fadeInTime, line->vanishTime); + msg_get_glyph(chr->font, chr->variation, chr->charIndex, chr->palette, glyphPtr); + + posX += (glyphPtr->charWidth * 0.5); + guTranslateF(transformMtx, posX, -posY, 0.0f); + guRotateF(tempMtx, rotAngle, 0.0f, 1.0f, 0.0f); + guMtxCatF(tempMtx, transformMtx, transformMtx); + guMtxF2L (transformMtx, &gDisplayContext->matrixStack[gMatrixListPos]); + gSPMatrix(gMasterGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]), + G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + + foldImg.raster = glyphPtr->raster; + foldImg.palette = glyphPtr->palette; + foldImg.width = glyphPtr->texSize.x; + foldImg.height = glyphPtr->texSize.y; + foldImg.xOffset = -(glyphPtr->charWidth * 0.5); + foldImg.yOffset = 0; + foldImg.opacity = 255; + fold_appendGfx_component(0, &foldImg, FOLD_STATE_FLAG_10000 | FOLD_STATE_FLAG_40, transformMtx); + + gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); +} + +void N(CharAnim_FadeOut_3)(CreditsLine* line, CreditsChar* chr) { + MesasgeFontGlyphData glyph; + MesasgeFontGlyphData* glyphPtr = &glyph; + f32 posX = chr->posX; + f32 posY = chr->posY; + f32 alpha = update_lerp(EASING_SIN_OUT, 255.0f, 0.0f, chr->fadeInTime, line->vanishTime); + + msg_get_glyph(chr->font, chr->variation, chr->charIndex, chr->palette, glyphPtr); + draw_ci_image_with_clipping(glyphPtr->raster, glyphPtr->texSize.x, glyphPtr->texSize.y, + G_IM_FMT_CI, G_IM_SIZ_4b, glyphPtr->palette, posX, posY, + 10, 20, SCREEN_WIDTH - 20, SCREEN_HEIGHT - 40, alpha); +} + +void N(credits_update_line)(CreditsLine* line) { + CreditsChar creditsChar; + CreditsChar* curChar = &creditsChar; + CreditsUnkBeta* curPattern; + s32 msgHeight, msgWidth, msgMaxLineChars; + s32 doneCurrentState; + s32 readPos; + u8 curMsgChar; + u16 nextMsgChar1, nextMsgChar2; + u16 doneCalcLoop, doneDrawLoop; + s32 drawCount; + s32 posX; + s32 i; + + doneCurrentState = FALSE; + if (line->flags & CREDITS_LINE_FLAG_2) { + line->flags &= ~CREDITS_LINE_FLAG_2; + line->time = 0; + line->state = 0; + } + + get_msg_properties((s32) line->message, &msgHeight, &msgWidth, &msgMaxLineChars, NULL, NULL, NULL, 0); + + curChar->font = 0; + curChar->variation = 0; + + // calculate message width + msgWidth = 1; + readPos = 0; + do { + curMsgChar = line->message[readPos++]; + nextMsgChar1 = line->message[readPos]; + doneCalcLoop = FALSE; + + switch (curMsgChar) { + case MSG_CHAR_READ_VARIANT0: + case MSG_CHAR_READ_VARIANT1: + case MSG_CHAR_READ_VARIANT2: + curChar->variation = curMsgChar - MSG_CHAR_READ_VARIANT0; + break; + case MSG_CHAR_READ_ENDL: + case MSG_CHAR_READ_END: + doneCalcLoop = TRUE; + break; + case MSG_CHAR_READ_FUNCTION: + // only support function for selecting font + if (line->message[readPos++] == MSG_READ_FUNC_FONT) { + curChar->font = line->message[readPos++]; + } + break; + default: + msgWidth += msg_get_print_char_width(curMsgChar, curChar->font, curChar->variation, 1.0f, 0, 1) - 1; + if (curChar->font == MSG_FONT_TITLE || curChar->font == MSG_FONT_SUBTITLE) { + curPattern = N(Font3Patterns); + if (curChar->font == MSG_FONT_SUBTITLE) { + curPattern = N(Font4Patterns); + } + + i = 0; + + if (curChar->font == MSG_FONT_SUBTITLE) { + if (curMsgChar == MSG_CHAR_LPAREN || nextMsgChar1 == MSG_CHAR_LPAREN) { + msgWidth++; + } + } + + do { + if (curMsgChar == curPattern[i].unk_00 && nextMsgChar1 == curPattern[i].unk_01) { + msgWidth += curPattern[i].size; + } + i++; + } while (curPattern[i].size != 0); + } + break; + } + } while (!doneCalcLoop); + + line->msgWidth = msgWidth; + if (line->flags & CREDITS_LINE_FLAG_1) { + posX = line->posX - (((f32) msgWidth * 0.5) + 0.0); + } else { + posX = line->posX; + } + + curChar->font = 0; + curChar->variation = 0; + curChar->palette = line->palette; + + drawCount = 0; + readPos = 0; + do { + curMsgChar = line->message[readPos++]; + nextMsgChar2 = line->message[readPos]; + doneDrawLoop = FALSE; + + switch (curMsgChar) { + case MSG_CHAR_READ_VARIANT0: + case MSG_CHAR_READ_VARIANT1: + case MSG_CHAR_READ_VARIANT2: + curChar->variation = curMsgChar - MSG_CHAR_READ_VARIANT0; + break; + case MSG_CHAR_READ_ENDL: + case MSG_CHAR_READ_END: + doneDrawLoop = TRUE; + break; + case MSG_CHAR_READ_FUNCTION: + if (line->message[readPos++] == 0) { + curChar->font = line->message[readPos++]; + } + break; + default: + if (curMsgChar < MSG_CHAR_READ_ENDL) { + curChar->charIndex = curMsgChar; + curChar->posX = posX; + curChar->posY = line->posY; + + switch (line->state) { + case CREDITS_LINE_APPEARING: + curChar->fadeInTime = line->time - (line->perCharDelayIn * drawCount); + if (curChar->fadeInTime >= 0) { + if (line->appearTime < curChar->fadeInTime) { + curChar->fadeInTime = line->appearTime; + } + if ((nextMsgChar2 == MSG_CHAR_READ_END) && (curChar->fadeInTime == line->appearTime)) { + doneCurrentState = TRUE; + } + switch (line->appearMode) { + case 0: + N(CharAnim_FadeIn_5)(line, curChar); + break; + case 1: + N(CharAnim_FadeIn_1)(line, curChar); + break; + case 2: + N(CharAnim_FadeIn_2)(line, curChar); + break; + case 3: + N(CharAnim_FadeIn_3)(line, curChar); + break; + case 4: + N(CharAnim_FadeIn_4)(line, curChar); + break; + case 5: + N(CharAnim_FadeIn_5)(line, curChar); + break; + } + } + break; + + case CREDITS_LINE_HOLDING: + if (nextMsgChar2 == MSG_CHAR_READ_END) { + if (line->time == line->holdTime) { + doneCurrentState = TRUE; + } + } + N(CharAnim_Hold)(line, curChar); + break; + + case CREDITS_LINE_VANISHING: + curChar->fadeInTime = line->time - (line->perCharDelayOut * drawCount); + if (curChar->fadeInTime < 0) { + curChar->fadeInTime = 0; + } + if (curChar->fadeInTime > line->vanishTime) { + curChar->fadeInTime = line->vanishTime; + } + if (nextMsgChar2 == MSG_CHAR_READ_END && curChar->fadeInTime == line->vanishTime) { + doneCurrentState = TRUE; + } + + switch (line->vanishMode) { + case 0: + N(CharAnim_FadeOut_3)(line, curChar); + break; + case 1: + N(CharAnim_FadeOut_1)(line, curChar); + break; + case 2: + N(CharAnim_FadeOut_2)(line, curChar); + break; + case 3: + N(CharAnim_FadeOut_3)(line, curChar); + break; + } + break; + } + drawCount++; + } + + posX += msg_get_print_char_width(curMsgChar, curChar->font, curChar->variation, 1.0f, 0, 1) - 1; + if (curChar->font == MSG_FONT_TITLE || curChar->font == MSG_FONT_SUBTITLE) { + curPattern = N(Font3Patterns); + if (curChar->font == MSG_FONT_SUBTITLE) { + curPattern = N(Font4Patterns); + } + + i = 0; + + if (curChar->font == MSG_FONT_SUBTITLE) { + if (curMsgChar == MSG_CHAR_LPAREN || nextMsgChar2 == MSG_CHAR_LPAREN) { + posX++; + } + } + do { + if (curMsgChar == curPattern[i].unk_00 && nextMsgChar2 == curPattern[i].unk_01) { + posX += curPattern[i].size; + } + i++; + } while (curPattern[i].size != 0); + } + break; + } + } while (!doneDrawLoop); + + if ((line->state == CREDITS_LINE_APPEARING) && doneCurrentState) { + s32 temp = 0; + get_msg_properties((s32) line->message, NULL, NULL, &temp, NULL, NULL, NULL, 0); + line->time = 0; + line->state++; + if (line->holdTime <= 0) { + line->state++; + } + } else if ((line->state == CREDITS_LINE_HOLDING) && doneCurrentState) { + line->time = 0; + line->state++; + } else if ((line->state == CREDITS_LINE_VANISHING) && doneCurrentState) { + line->flags &= ~CREDITS_LINE_FLAG_1; + } + line->time++; +} + +void N(credits_worker_render)(void) { + Mtx* projMtx = &N(CreditsProjMatrices)[gCurrentDisplayContextIndex]; + CreditsData* data = N(CreditsDataPtr); + s32 i; + + gSPViewport(gMasterGfxPos++, &N(CreditsViewport)); + guOrtho(projMtx, 0.0f, 320.0f, -240.0f, 0.0f, -100.0f, 100.0f, 1.0f); + gSPMatrix(gMasterGfxPos++, OS_PHYSICAL_TO_K0(projMtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gDPPipeSync(gMasterGfxPos++); + gSPClearGeometryMode(gMasterGfxPos++, G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH); + gSPSetGeometryMode(gMasterGfxPos++, G_SHADE | G_SHADING_SMOOTH); + + for (i = 0; i < ARRAY_COUNT(data->lines); i++) { + if (data->lines[i].flags & CREDITS_LINE_FLAG_1) { + N(credits_update_line)(&data->lines[i]); + } + } +} + +void N(credits_load_message)(CreditsEntry* entry) { + CreditsLine* line; + s32 maxLineChars; + s32 unkMsgProperty; + s32 i = 0; + + while (TRUE) { + if (!(N(CreditsDataPtr)->lines[i].flags & CREDITS_LINE_FLAG_1)) { + break; + } + if (++i == ARRAY_COUNT(N(CreditsDataPtr)->lines)) { + return; + } + } + + line = &N(CreditsDataPtr)->lines[i]; + if (entry->msgID != NULL) { + if (entry->msgID >= 0) { + dma_load_msg(entry->msgID, N(CreditsMessageBuffers)[N(CreditsBufferIndex)]); + line->message = N(CreditsMessageBuffers)[N(CreditsBufferIndex)]; + N(CreditsBufferIndex)++; + if (N(CreditsBufferIndex) >= ARRAY_COUNT(N(CreditsMessageBuffers))) { + N(CreditsBufferIndex) = 0; + } + } else { + line->message = (u8*) entry->msgID; + } + get_msg_properties((s32) line->message, NULL, NULL, &maxLineChars, NULL, NULL, &unkMsgProperty, 0); + line->posX = entry->posX; + line->posY = entry->posY; + line->palette = entry->palette; + line->appearMode = entry->appearMode; + line->appearTime = entry->appearTime; + line->holdMode = entry->holdMode; + line->holdTime = entry->holdTime; + if (entry->perCharDelayIn != 0) { + line->holdTime = entry->holdTime - ((maxLineChars - 1) - unkMsgProperty) * entry->perCharDelayIn; + if (line->holdTime < 0) { + line->holdTime = 0; + } + } + line->vanishMode = entry->vanishMode; + line->vanishTime = entry->vanishTime; + line->perCharDelayIn = entry->perCharDelayIn; + line->perCharDelayOut = entry->perCharDelayOut; + line->flags = entry->flags | CREDITS_LINE_FLAG_1 | CREDITS_LINE_FLAG_2; + } +} + +void N(init_credits)(void) { + s32 i; + + N(CreditsDataPtr) = &N(CreditsData); + N(CreditsData).workerID = create_generic_entity_frontUI(NULL, N(credits_worker_render)); + + for (i = 0; i < ARRAY_COUNT(N(CreditsData).lines); i++) { + N(CreditsData).lines[i].flags = 0; + } +} + +ApiStatus N(InitCredits)(Evt* script, s32 isInitialCall) { + N(init_credits)(); + load_font(1); + return ApiStatus_DONE2; +} + +ApiStatus N(ShowCreditList)(Evt* script, s32 isInitialCall) { + CreditsEntry* creditList = (CreditsEntry*) evt_get_variable(script, *script->ptrReadPos); + + if (isInitialCall) { + script->varTable[0] = 0; + script->varTable[1] = -1; + script->varTable[2] = 0; + } + + switch (script->varTable[0]) { + case 0: + while (TRUE) { + if (creditList[script->varTable[2]].msgID != 0) { + N(credits_load_message)(&creditList[script->varTable[2]]); + } + script->varTable[1] = creditList[script->varTable[2]].next; + script->varTable[2]++; + if (script->varTable[1] > 0) { + break; + } + if (script->varTable[1] == -1) { + return ApiStatus_DONE2; + } + } + script->varTable[0] = 1; + // fallthrough + case 1: + script->varTable[1]--; + if (script->varTable[1] <= 0) { + script->varTable[0] = 0; + } + break; + } + + return ApiStatus_BLOCK; +} diff --git a/src/world/common/atomic/Credits_1.inc.c b/src/world/common/atomic/Credits_1.inc.c deleted file mode 100644 index cda27c84af..0000000000 --- a/src/world/common/atomic/Credits_1.inc.c +++ /dev/null @@ -1,403 +0,0 @@ -#include "common.h" - -enum { - CREDITS_LINE_FLAG_1 = 1, - CREDITS_LINE_FLAG_2 = 2, -}; - -enum { - CREDITS_LINE_APPEARING = 0, - CREDITS_LINE_HOLDING = 1, - CREDITS_LINE_VANISHING = 2 -}; - -// unused -void N(CharAnim_FadeIn_0)(CreditsLine* line, CreditsChar* chr) { - FoldImageRecPart foldImg; - MesasgeFontGlyphData glyph; - MesasgeFontGlyphData* glyphPtr = &glyph; - Matrix4f transformMtx; - f32 posX = chr->posX; - f32 posY = chr->posY; - f32 alpha; - - alpha = update_lerp(EASING_LINEAR, 0.0f, 255.0f, chr->fadeInTime, line->appearTime); - if (alpha > 255.0f) { - alpha = 255.0; - } - fold_update(0, FOLD_TYPE_7, 255, 255, 255, alpha, 0); - msg_get_glyph(chr->font, chr->variation, chr->charIndex, chr->palette, glyphPtr); - - posX += (glyphPtr->charWidth * 0.5); - guTranslateF(transformMtx, posX, -posY, 0.0f); - guMtxF2L (transformMtx, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]), - G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - - foldImg.raster = glyphPtr->raster; - foldImg.palette = glyphPtr->palette; - foldImg.width = glyphPtr->texSize.x; - foldImg.height = glyphPtr->texSize.y; - foldImg.xOffset = -(glyphPtr->charWidth * 0.5); - foldImg.yOffset = 0; - foldImg.opacity = 255; - fold_appendGfx_component(0, &foldImg, FOLD_STATE_FLAG_40000 | FOLD_STATE_FLAG_10000 | FOLD_STATE_FLAG_40, transformMtx); - - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); -} - - -void N(CharAnim_FadeIn_1)(CreditsLine* line, CreditsChar* chr) { - FoldImageRecPart foldImg; - MesasgeFontGlyphData glyph; - MesasgeFontGlyphData* glyphPtr = &glyph; - Matrix4f transformMtx; - f32 posX = chr->posX; - f32 posY = chr->posY; - f32 alpha; - - alpha = update_lerp(0, 0.0f, 255.0f, chr->fadeInTime, line->appearTime); - if (alpha > 255.0f) { - alpha = 255.0; - } - if (chr->fadeInTime == (line->appearTime - 4)) { - fold_update(0, FOLD_TYPE_A, 64, 64, 64, alpha, 0); - } else if (chr->fadeInTime == (line->appearTime - 3)) { - fold_update(0, FOLD_TYPE_A, 96, 96, 96, alpha, 0); - } else if (chr->fadeInTime == (line->appearTime - 2)) { - fold_update(0, FOLD_TYPE_A, 127, 127, 127, alpha, 0); - } else if (chr->fadeInTime == (line->appearTime - 1)) { - fold_update(0, FOLD_TYPE_A, 80, 80, 80, alpha, 0); - } else { - fold_update(0, FOLD_TYPE_7, 255, 255, 255, alpha, 0); - } - msg_get_glyph(chr->font, chr->variation, chr->charIndex, chr->palette, glyphPtr); - - posX += (glyphPtr->charWidth * 0.5); - guTranslateF(transformMtx, posX, -posY, 0.0f); - guMtxF2L (transformMtx, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]), - G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - - foldImg.raster = glyphPtr->raster; - foldImg.palette = glyphPtr->palette; - foldImg.width = glyphPtr->texSize.x; - foldImg.height = glyphPtr->texSize.y; - foldImg.xOffset = -(glyphPtr->charWidth * 0.5); - foldImg.yOffset = 0; - foldImg.opacity = 255; - fold_appendGfx_component(0, &foldImg, FOLD_STATE_FLAG_40000 | FOLD_STATE_FLAG_10000 | FOLD_STATE_FLAG_40, transformMtx); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); -} - -void N(CharAnim_FadeIn_2)(CreditsLine* line, CreditsChar* chr) { - FoldImageRecPart foldImg; - MesasgeFontGlyphData glyph; - MesasgeFontGlyphData* glyphPtr = &glyph; - Matrix4f transformMtx, tempMtx; - f32 posX = chr->posX; - f32 posY = chr->posY; - f32 scaleAmt; - f32 alpha; - - alpha = update_lerp(EASING_COS_IN, 16.0f, 300.0f, chr->fadeInTime, line->appearTime); - if (alpha > 255.0f) { - alpha = 255.0f; - } - fold_update(0, FOLD_TYPE_7, 255, 255, 255, alpha, 0); - - scaleAmt = update_lerp(EASING_LINEAR, 0.2f, 2.0f, chr->fadeInTime, line->appearTime); - if (scaleAmt > 1.0) { - scaleAmt = 1.0; - } - msg_get_glyph(chr->font, chr->variation, chr->charIndex, chr->palette, glyphPtr); - - posX += (glyphPtr->charWidth * 0.5); - guTranslateF(transformMtx, posX, -posY, 0.0f); - if (scaleAmt != 1.0) { - guScaleF(tempMtx, scaleAmt, scaleAmt, 1.0f); - guMtxCatF(tempMtx, transformMtx, transformMtx); - } - guMtxF2L(transformMtx, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]), - G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - - foldImg.raster = glyphPtr->raster; - foldImg.palette = glyphPtr->palette; - foldImg.width = glyphPtr->texSize.x; - foldImg.height = glyphPtr->texSize.y; - foldImg.xOffset = -(glyphPtr->charWidth * 0.5); - foldImg.yOffset = 0; - foldImg.opacity = 255; - fold_appendGfx_component(0, &foldImg, FOLD_STATE_FLAG_40, transformMtx); - - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); -} - -void N(CharAnim_FadeIn_3)(CreditsLine* line, CreditsChar* chr) { - FoldImageRecPart foldImg; - MesasgeFontGlyphData glyph; - MesasgeFontGlyphData* glyphPtr = &glyph; - Matrix4f transformMtx, tempMtx; - f32 rotAngle, alpha; - f32 posX = chr->posX; - f32 posY = chr->posY; - - alpha = update_lerp(EASING_COS_IN, 32.0f, 300.0f, chr->fadeInTime, line->appearTime); - if (alpha > 255.0f) { - alpha = 255.0f; - } - fold_update(0, FOLD_TYPE_7, 255, 255, 255, alpha, 0); - - rotAngle = update_lerp(EASING_LINEAR, -75.0f, 30.0f, chr->fadeInTime, line->appearTime); - if (rotAngle >= 0.0f) { - rotAngle = 0.0f; - } - - msg_get_glyph(chr->font, chr->variation, chr->charIndex, chr->palette, glyphPtr); - - posX += (glyphPtr->charWidth * 0.5); - guTranslateF(transformMtx, posX, -posY, 0.0f); - if (rotAngle != 0.0f) { - guRotateF(tempMtx, rotAngle, 0.0f, 1.0f, 0.0f); - guMtxCatF(tempMtx, transformMtx, transformMtx); - } - guMtxF2L(transformMtx, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]), - G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - - foldImg.raster = glyphPtr->raster; - foldImg.palette = glyphPtr->palette; - foldImg.width = glyphPtr->texSize.x; - foldImg.height = glyphPtr->texSize.y; - foldImg.xOffset = -(glyphPtr->charWidth * 0.5); - foldImg.yOffset = 0; - foldImg.opacity = 255; - fold_appendGfx_component(0, &foldImg, FOLD_STATE_FLAG_10000 | FOLD_STATE_FLAG_40, transformMtx); - - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); -} - -void N(CharAnim_FadeIn_4)(CreditsLine* line, CreditsChar* chr) { - FoldImageRecPart foldImg; - MesasgeFontGlyphData glyph; - MesasgeFontGlyphData* glyphPtr = &glyph; - Matrix4f transformMtx, tempMtx; - f32 posX, posY, scaleAmt, rotAngle; - f32 startX = (line->posX + line->msgWidth) - 16; - f32 startY = line->posY + 60; - u32 foldFlags = FOLD_STATE_FLAG_40; - - posX = update_lerp(EASING_COS_IN_OUT, startX, chr->posX, chr->fadeInTime, line->appearTime); - posY = update_lerp(EASING_CUBIC_OUT, startY, chr->posY, chr->fadeInTime, line->appearTime); - if (chr->fadeInTime == line->appearTime) { - rotAngle = 0.0f; - } else { - rotAngle = (line->appearTime - chr->fadeInTime) * 10; - } - scaleAmt = update_lerp(EASING_QUADRATIC_OUT, 2.0f, 1.0f, chr->fadeInTime, line->appearTime); - - if (chr->fadeInTime == line->appearTime) { - fold_update(0, FOLD_TYPE_NONE, 0, 0, 0, 0, 0); - foldFlags |= FOLD_STATE_FLAG_10000; - } else { - f32 alpha = update_lerp(EASING_LINEAR, 16.0f, 300.0f, chr->fadeInTime, line->appearTime); - if (alpha > 255.0f) { - alpha = 255.0f; - } - fold_update(0, FOLD_TYPE_7, 255, 255, 255, alpha, 0); - } - msg_get_glyph(chr->font, chr->variation, chr->charIndex, chr->palette, glyphPtr); - - posX += (glyphPtr->charWidth * 0.5); - guTranslateF(transformMtx, posX, -posY, 0.0f); - guRotateF(tempMtx, rotAngle, 0.0f, 1.0f, 0.2f); - guMtxCatF(tempMtx, transformMtx, transformMtx); - guScaleF (tempMtx, scaleAmt, scaleAmt, 1.0f); - guMtxCatF(tempMtx, transformMtx, transformMtx); - guMtxF2L (transformMtx, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]), - G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - - foldImg.raster = glyphPtr->raster; - foldImg.palette = glyphPtr->palette; - foldImg.width = glyphPtr->texSize.x; - foldImg.height = glyphPtr->texSize.y; - foldImg.xOffset = -(glyphPtr->charWidth * 0.5); - foldImg.yOffset = 0; - foldImg.opacity = 255; - fold_appendGfx_component(0, &foldImg, foldFlags, transformMtx); - - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); -} - -void N(CharAnim_FadeIn_5)(CreditsLine* line, CreditsChar* chr) { - MesasgeFontGlyphData glyph; - MesasgeFontGlyphData* glyphPtr = &glyph; - f32 posX = chr->posX; - f32 posY = chr->posY; - f32 alpha; - - alpha = update_lerp(EASING_LINEAR, 0.0f, 255.0f, chr->fadeInTime, line->appearTime); - msg_get_glyph(chr->font, chr->variation, chr->charIndex, chr->palette, glyphPtr); - - draw_ci_image_with_clipping(glyphPtr->raster, glyphPtr->texSize.x, glyphPtr->texSize.y, - G_IM_FMT_CI, G_IM_SIZ_4b, glyphPtr->palette, posX, posY, - 10, 20, SCREEN_WIDTH - 20, SCREEN_HEIGHT - 40, alpha); -} - -// unused -void N(CharAnim_HoldClearFold)(CreditsLine* line, CreditsChar* chr) { - FoldImageRecPart foldImg; - MesasgeFontGlyphData glyph; - MesasgeFontGlyphData* glyphPtr = &glyph; - Matrix4f transformMtx; - f32 posX = chr->posX; - f32 posY = chr->posY; - - fold_update(0, FOLD_TYPE_NONE, 0, 0, 0, 0, 0); - guTranslateF(transformMtx, posX, -posY, 0.0f); - guMtxF2L (transformMtx, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]), - G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - msg_get_glyph(chr->font, chr->variation, chr->charIndex, chr->palette, glyphPtr); - - foldImg.raster = glyphPtr->raster; - foldImg.palette = glyphPtr->palette; - foldImg.width = glyphPtr->texSize.x; - foldImg.height = glyphPtr->texSize.y; - foldImg.xOffset = -(glyphPtr->charWidth * 0.5); - foldImg.yOffset = 0; - foldImg.opacity = 255; - fold_appendGfx_component(0, &foldImg, FOLD_STATE_FLAG_40000 | FOLD_STATE_FLAG_10000 | FOLD_STATE_FLAG_40, transformMtx); - - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); -} - -void N(CharAnim_Hold)(CreditsLine* line, CreditsChar* chr) { - MesasgeFontGlyphData glyph; - MesasgeFontGlyphData* glyphPtr = &glyph; - f32 posX = chr->posX; - f32 posY = chr->posY; - - msg_get_glyph(chr->font, chr->variation, chr->charIndex, chr->palette, glyphPtr); - draw_ci_image_with_clipping(glyphPtr->raster, glyphPtr->texSize.x, glyphPtr->texSize.y, - G_IM_FMT_CI, G_IM_SIZ_4b, glyphPtr->palette, posX, posY, - 10, 20, SCREEN_WIDTH - 20, SCREEN_HEIGHT - 40, 255); -} - -// unused -void N(CharAnim_FadeOut_0)(CreditsLine* line, CreditsChar* chr) { - FoldImageRecPart foldImg; - MesasgeFontGlyphData glyph; - MesasgeFontGlyphData* glyphPtr = &glyph; - Matrix4f transformMtx; - f32 posX = chr->posX; - f32 posY = chr->posY; - f32 alpha; - - alpha = update_lerp(EASING_SIN_OUT, 255.0f, 0.0f, chr->fadeInTime, line->vanishTime); - fold_update(0, FOLD_TYPE_7, 255, 255, 255, alpha, 0); - - msg_get_glyph(chr->font, chr->variation, chr->charIndex, chr->palette, glyphPtr); - - posX += (glyphPtr->charWidth * 0.5); - guTranslateF(transformMtx, posX, -posY, 0.0f); - guMtxF2L (transformMtx, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]), - G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - - foldImg.raster = glyphPtr->raster; - foldImg.palette = glyphPtr->palette; - foldImg.width = glyphPtr->texSize.x; - foldImg.height = glyphPtr->texSize.y; - foldImg.xOffset = -(glyphPtr->charWidth * 0.5); - foldImg.yOffset = 0; - foldImg.opacity = 255; - fold_appendGfx_component(0, &foldImg, FOLD_STATE_FLAG_10000 | FOLD_STATE_FLAG_40, transformMtx); - - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); -} - -void N(CharAnim_FadeOut_1)(CreditsLine* line, CreditsChar* chr) { - FoldImageRecPart foldImg; - MesasgeFontGlyphData glyph; - MesasgeFontGlyphData* glyphPtr = &glyph; - Matrix4f transformMtx, tempMtx; - f32 scaleAmt, alpha; - f32 posX = chr->posX; - f32 posY = chr->posY; - - alpha = update_lerp(EASING_SIN_OUT, 255.0f, 0.0f, chr->fadeInTime, line->vanishTime); - fold_update(0, FOLD_TYPE_7, 255, 255, 255, alpha, 0); - - scaleAmt = update_lerp(EASING_LINEAR, 1.0f, 0.2f, chr->fadeInTime, line->vanishTime); - msg_get_glyph(chr->font, chr->variation, chr->charIndex, chr->palette, glyphPtr); - - posX += (glyphPtr->charWidth * 0.5); - guTranslateF(transformMtx, posX, -posY, 0.0f); - guScaleF(tempMtx, scaleAmt, scaleAmt, 1.0f); - guMtxCatF(tempMtx, transformMtx, transformMtx); - guMtxF2L (transformMtx, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]), - G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - - foldImg.raster = glyphPtr->raster; - foldImg.palette = glyphPtr->palette; - foldImg.width = glyphPtr->texSize.x; - foldImg.height = glyphPtr->texSize.y; - foldImg.xOffset = -(glyphPtr->charWidth * 0.5); - foldImg.yOffset = 0; - foldImg.opacity = 255; - fold_appendGfx_component(0, &foldImg, FOLD_STATE_FLAG_40, transformMtx); - - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); -} - -void N(CharAnim_FadeOut_2)(CreditsLine* line, CreditsChar* chr) { - FoldImageRecPart foldImg; - MesasgeFontGlyphData glyph; - MesasgeFontGlyphData* glyphPtr = &glyph; - Matrix4f transformMtx, tempMtx; - f32 rotAngle, alpha; - f32 posX = chr->posX; - f32 posY = chr->posY; - - alpha = update_lerp(EASING_SIN_OUT, 255.0f, 0.0f, chr->fadeInTime, line->vanishTime); - fold_update(0, FOLD_TYPE_7, 255, 255, 255, alpha, 0); - - rotAngle = update_lerp(EASING_LINEAR, 0.0f, 60.0f, chr->fadeInTime, line->vanishTime); - msg_get_glyph(chr->font, chr->variation, chr->charIndex, chr->palette, glyphPtr); - - posX += (glyphPtr->charWidth * 0.5); - guTranslateF(transformMtx, posX, -posY, 0.0f); - guRotateF(tempMtx, rotAngle, 0.0f, 1.0f, 0.0f); - guMtxCatF(tempMtx, transformMtx, transformMtx); - guMtxF2L (transformMtx, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, OS_PHYSICAL_TO_K0(&gDisplayContext->matrixStack[gMatrixListPos++]), - G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - - foldImg.raster = glyphPtr->raster; - foldImg.palette = glyphPtr->palette; - foldImg.width = glyphPtr->texSize.x; - foldImg.height = glyphPtr->texSize.y; - foldImg.xOffset = -(glyphPtr->charWidth * 0.5); - foldImg.yOffset = 0; - foldImg.opacity = 255; - fold_appendGfx_component(0, &foldImg, FOLD_STATE_FLAG_10000 | FOLD_STATE_FLAG_40, transformMtx); - - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); -} - -void N(CharAnim_FadeOut_3)(CreditsLine* line, CreditsChar* chr) { - MesasgeFontGlyphData glyph; - MesasgeFontGlyphData* glyphPtr = &glyph; - f32 posX = chr->posX; - f32 posY = chr->posY; - f32 alpha = update_lerp(EASING_SIN_OUT, 255.0f, 0.0f, chr->fadeInTime, line->vanishTime); - - msg_get_glyph(chr->font, chr->variation, chr->charIndex, chr->palette, glyphPtr); - draw_ci_image_with_clipping(glyphPtr->raster, glyphPtr->texSize.x, glyphPtr->texSize.y, - G_IM_FMT_CI, G_IM_SIZ_4b, glyphPtr->palette, posX, posY, - 10, 20, SCREEN_WIDTH - 20, SCREEN_HEIGHT - 40, alpha); -} diff --git a/src/world/common/atomic/Credits_2.inc.c b/src/world/common/atomic/Credits_2.inc.c deleted file mode 100644 index f18f513d72..0000000000 --- a/src/world/common/atomic/Credits_2.inc.c +++ /dev/null @@ -1,125 +0,0 @@ -#include "common.h" - -// split from Credits_1 due to small differences in credits_update_line - -void N(credits_worker_render)(void) { - Mtx* projMtx = &N(CreditsProjMatrices)[gCurrentDisplayContextIndex]; - CreditsData* data = N(CreditsDataPtr); - s32 i; - - gSPViewport(gMasterGfxPos++, &N(CreditsViewport)); - guOrtho(projMtx, 0.0f, 320.0f, -240.0f, 0.0f, -100.0f, 100.0f, 1.0f); - gSPMatrix(gMasterGfxPos++, OS_PHYSICAL_TO_K0(projMtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - gDPPipeSync(gMasterGfxPos++); - gSPClearGeometryMode(gMasterGfxPos++, G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH); - gSPSetGeometryMode(gMasterGfxPos++, G_SHADE | G_SHADING_SMOOTH); - - for (i = 0; i < ARRAY_COUNT(data->lines); i++) { - if (data->lines[i].flags & CREDITS_LINE_FLAG_1) { - N(credits_update_line)(&data->lines[i]); - } - } -} - -void N(credits_load_message)(CreditsEntry* entry) { - CreditsLine* line; - s32 maxLineChars; - s32 unkMsgProperty; - s32 i = 0; - - while (TRUE) { - if (!(N(CreditsDataPtr)->lines[i].flags & CREDITS_LINE_FLAG_1)) { - break; - } - if (++i == ARRAY_COUNT(N(CreditsDataPtr)->lines)) { - return; - } - } - - line = &N(CreditsDataPtr)->lines[i]; - if (entry->msgID != NULL) { - if (entry->msgID >= 0) { - dma_load_msg(entry->msgID, N(CreditsMessageBuffers)[N(CreditsBufferIndex)]); - line->message = N(CreditsMessageBuffers)[N(CreditsBufferIndex)]; - N(CreditsBufferIndex)++; - if (N(CreditsBufferIndex) >= ARRAY_COUNT(N(CreditsMessageBuffers))) { - N(CreditsBufferIndex) = 0; - } - } else { - line->message = (u8*) entry->msgID; - } - get_msg_properties((s32) line->message, NULL, NULL, &maxLineChars, NULL, NULL, &unkMsgProperty, 0); - line->posX = entry->posX; - line->posY = entry->posY; - line->palette = entry->palette; - line->appearMode = entry->appearMode; - line->appearTime = entry->appearTime; - line->holdMode = entry->holdMode; - line->holdTime = entry->holdTime; - if (entry->perCharDelayIn != 0) { - line->holdTime = entry->holdTime - ((maxLineChars - 1) - unkMsgProperty) * entry->perCharDelayIn; - if (line->holdTime < 0) { - line->holdTime = 0; - } - } - line->vanishMode = entry->vanishMode; - line->vanishTime = entry->vanishTime; - line->perCharDelayIn = entry->perCharDelayIn; - line->perCharDelayOut = entry->perCharDelayOut; - line->flags = entry->flags | CREDITS_LINE_FLAG_1 | CREDITS_LINE_FLAG_2; - } -} - -void N(init_credits)(void) { - s32 i; - - N(CreditsDataPtr) = &N(CreditsData); - N(CreditsData).workerID = create_generic_entity_frontUI(NULL, N(credits_worker_render)); - - for (i = 0; i < ARRAY_COUNT(N(CreditsData).lines); i++) { - N(CreditsData).lines[i].flags = 0; - } -} - -ApiStatus N(InitCredits)(Evt* script, s32 isInitialCall) { - N(init_credits)(); - load_font(1); - return ApiStatus_DONE2; -} - -ApiStatus N(ShowCreditList)(Evt* script, s32 isInitialCall) { - CreditsEntry* creditList = (CreditsEntry*) evt_get_variable(script, *script->ptrReadPos); - - if (isInitialCall) { - script->varTable[0] = 0; - script->varTable[1] = -1; - script->varTable[2] = 0; - } - - switch (script->varTable[0]) { - case 0: - while (TRUE) { - if (creditList[script->varTable[2]].msgID != 0) { - N(credits_load_message)(&creditList[script->varTable[2]]); - } - script->varTable[1] = creditList[script->varTable[2]].next; - script->varTable[2]++; - if (script->varTable[1] > 0) { - break; - } - if (script->varTable[1] == -1) { - return ApiStatus_DONE2; - } - } - script->varTable[0] = 1; - // fallthrough - case 1: - script->varTable[1]--; - if (script->varTable[1] <= 0) { - script->varTable[0] = 0; - } - break; - } - - return ApiStatus_BLOCK; -} diff --git a/src/world/common/atomic/Reflection.inc.c b/src/world/common/atomic/Reflection.inc.c index 8fc6874605..03a27a5d71 100644 --- a/src/world/common/atomic/Reflection.inc.c +++ b/src/world/common/atomic/Reflection.inc.c @@ -13,14 +13,14 @@ enum Reflection { REFLECTION_WALL, }; -void N(reflection_setup_wall)(void); -void N(reflection_setup_floor)(void); -void N(reflection_render_wall)(PlayerStatus* playerStatus); -void N(reflection_render_floor_fancy)(PlayerStatus* playerStatus); -void N(reflection_render_floor)(PlayerStatus* playerStatus); -void N(SetPartnerFlagsA0000)(void); -void N(SetPartnerFlags80000)(void); -void N(SetPartnerFlags20000)(void); +void N(worker_reflect_player_wall)(void); +void N(worker_reflect_player_floor)(void); +void N(appendGfx_reflect_player_wall)(PlayerStatus* playerStatus); +void N(appendGfx_reflect_player_floor_fancy)(PlayerStatus* playerStatus); +void N(appendGfx_reflect_player_floor_basic)(PlayerStatus* playerStatus); +void N(worker_reflect_partner_all)(void); +void N(worker_reflect_partner_floor)(void); +void N(worker_reflect_partner_wall)(void); s32 N(reflection_unk_resolve_anim)(s32 playerAnim) { AnimID temp; @@ -62,25 +62,23 @@ s32 N(reflection_unk_change_anim_facing)(s32 playerAnim) { return playerAnim | SPRITE_ID_BACK_FACING; } -ApiStatus N(ReflectWall)(Evt* script, s32 isInitialCall) { - script->array[0] = (s32) create_generic_entity_world(NULL, N(reflection_setup_wall)); +API_CALLABLE(N(EnableWallReflection)){ + script->array[0] = (s32) create_generic_entity_world(NULL, N(worker_reflect_player_wall)); return ApiStatus_DONE2; } -void N(reflection_setup_wall)(void) { +void N(worker_reflect_player_wall)(void) { PlayerStatus* playerStatus = &gPlayerStatus; s32 anim; EntityModel* entityModel; s32 renderMode = playerStatus->renderMode; RenderTask renderTask; RenderTask* renderTaskPtr = &renderTask; - s32 screenX; - s32 screenY; - s32 screenZ; + s32 screenX, screenY, screenZ; - if (playerStatus->flags & PS_FLAGS_1) { + if (playerStatus->flags & PS_FLAGS_HAS_REFLECTION) { entityModel = get_entity_model(get_shadow_by_index(playerStatus->shadowID)->entityModelID); - entityModel->flags |= MODEL_FLAGS_FLAG_200; + entityModel->flags |= ENTITY_MODEL_FLAGS_REFLECT; get_screen_coords(gCurrentCamID, playerStatus->position.x, playerStatus->position.y, -playerStatus->position.z, &screenX, &screenY, &screenZ); @@ -111,13 +109,13 @@ void N(reflection_setup_wall)(void) { renderTaskPtr->renderMode = renderMode; renderTaskPtr->appendGfxArg = playerStatus; - renderTaskPtr->appendGfx = (void(*))N(reflection_render_wall); + renderTaskPtr->appendGfx = (void(*))N(appendGfx_reflect_player_wall); renderTaskPtr->distance = -screenZ; queue_render_task(renderTaskPtr); } } -void N(reflection_render_wall)(PlayerStatus* playerStatus) { +void N(appendGfx_reflect_player_wall)(PlayerStatus* playerStatus) { f32 yaw = -gCameras[gCurrentCamID].currentYaw; Matrix4f main; Matrix4f translation; @@ -138,11 +136,11 @@ void N(reflection_render_wall)(PlayerStatus* playerStatus) { spr_draw_player_sprite(2, 0, 0, NULL, main); } -ApiStatus N(ReflectFloor)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(EnableFloorReflection)){ switch (script->varTable[0]) { case REFLECTION_FLOOR_WALL: case REFLECTION_FLOOR: - script->array[0] = create_generic_entity_world(NULL, N(reflection_setup_floor)); + script->array[0] = create_generic_entity_world(NULL, N(worker_reflect_player_floor)); gOverrideFlags |= GLOBAL_OVERRIDES_80; break; case REFLECTION_WALL: @@ -152,7 +150,7 @@ ApiStatus N(ReflectFloor)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -void N(reflection_setup_floor)(void) { +void N(worker_reflect_player_floor)(void) { PlayerStatus* playerStatus = &gPlayerStatus; EntityModel* entityModel; s32 renderMode = playerStatus->renderMode; @@ -160,7 +158,7 @@ void N(reflection_setup_floor)(void) { RenderTask* renderTaskPtr = &renderTask; s32 screenX, screenY, screenZ; - if (playerStatus->flags & PS_FLAGS_1) { + if (playerStatus->flags & PS_FLAGS_HAS_REFLECTION) { entityModel = get_entity_model(get_shadow_by_index(playerStatus->shadowID)->entityModelID); get_screen_coords(gCurrentCamID, playerStatus->position.x, -playerStatus->position.y, playerStatus->position.z, @@ -189,14 +187,14 @@ void N(reflection_setup_floor)(void) { renderTaskPtr->distance = -screenZ; renderTaskPtr->appendGfx = (void (*)(void*)) ( !(playerStatus->flags & PS_FLAGS_20000) - ? N(reflection_render_floor) - : N(reflection_render_floor_fancy) + ? N(appendGfx_reflect_player_floor_basic) + : N(appendGfx_reflect_player_floor_fancy) ); queue_render_task(renderTaskPtr); } } -void N(reflection_render_floor)(PlayerStatus* playerStatus) { +void N(appendGfx_reflect_player_floor_basic)(PlayerStatus* playerStatus) { f32 yaw = -gCameras[gCurrentCamID].currentYaw; Matrix4f main; Matrix4f translation; @@ -225,7 +223,7 @@ void N(reflection_render_floor)(PlayerStatus* playerStatus) { spr_draw_player_sprite(flags, 0, 0, NULL, main); } -void N(reflection_render_floor_fancy)(PlayerStatus* playerStatus) { +void N(appendGfx_reflect_player_floor_fancy)(PlayerStatus* playerStatus) { Matrix4f mtx; Matrix4f translation; Matrix4f rotation; @@ -307,7 +305,7 @@ void N(reflection_render_floor_fancy)(PlayerStatus* playerStatus) { flags = 1; if (playerStatus->spriteFacingAngle >= 90.0f && playerStatus->spriteFacingAngle < 270.0f) { - flags |= 0x10000000; + flags |= DRAW_SPRITE_UPSIDE_DOWN; } spr_draw_player_sprite(flags, 0, 0, NULL, mtx); @@ -316,26 +314,26 @@ void N(reflection_render_floor_fancy)(PlayerStatus* playerStatus) { /// int var0 = reflection type /// bool var1 = enable wall reflection -ApiStatus N(ReflectPartner)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(EnablePartnerReflection)){ Npc* partner; if (script->varTable[1] == FALSE) { switch (script->varTable[0]) { case REFLECTION_FLOOR_WALL: - script->array[1] = create_generic_entity_world(N(SetPartnerFlagsA0000), NULL); + script->array[1] = create_generic_entity_world(N(worker_reflect_partner_all), NULL); break; case REFLECTION_FLOOR: - script->array[1] = create_generic_entity_world(N(SetPartnerFlags80000), NULL); + script->array[1] = create_generic_entity_world(N(worker_reflect_partner_floor), NULL); break; case REFLECTION_WALL: - script->array[1] = create_generic_entity_world(N(SetPartnerFlags20000), NULL); + script->array[1] = create_generic_entity_world(N(worker_reflect_partner_wall), NULL); break; } } else { switch (script->varTable[0]) { case REFLECTION_FLOOR_WALL: case REFLECTION_FLOOR: - script->array[1] = create_generic_entity_world(N(SetPartnerFlags80000), NULL); + script->array[1] = create_generic_entity_world(N(worker_reflect_partner_floor), NULL); break; case REFLECTION_WALL: break; @@ -374,7 +372,7 @@ ApiStatus N(ReflectPartner)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -void N(SetPartnerFlagsA0000)(void) { +void N(worker_reflect_partner_all)(void) { Npc* partner = get_npc_safe(NPC_PARTNER); if (partner != NULL) { @@ -382,7 +380,7 @@ void N(SetPartnerFlagsA0000)(void) { } } -void N(SetPartnerFlags80000)(void) { +void N(worker_reflect_partner_floor)(void) { Npc* partner = get_npc_safe(NPC_PARTNER); if (partner != NULL) { @@ -390,7 +388,7 @@ void N(SetPartnerFlags80000)(void) { } } -void N(SetPartnerFlags20000)(void) { +void N(worker_reflect_partner_wall)(void) { Npc* partner = get_npc_safe(NPC_PARTNER); if (partner != NULL) { @@ -408,14 +406,14 @@ void N(SetPartnerFlags20000)(void) { 10: If *Var1 == 00000000 20: Switch *Var0 2C: Case == 00000000 - 38: Call $Function_802400EC ( ) // ReflectWall + 38: Call $Function_802400EC ( ) // EnableWallReflection 44: Case == 00000001 50: Case == 00000002 - 5C: Call $Function_802400EC ( ) // ReflectWall + 5C: Call $Function_802400EC ( ) // EnableWallReflection 68: EndSwitch 70: EndIf - 78: Call $Function_8024049C ( *Var0 ) // ReflectFloor - 88: Call $Function_80240D3C ( *Var0 ) // ReflectPartner + 78: Call $Function_8024049C ( *Var0 ) // EnableFloorReflection + 88: Call $Function_80240D3C ( *Var0 ) // EnablePartnerReflection 98: Return A0: End } diff --git a/src/world/common/atomic/WhaleAnim.inc.c b/src/world/common/atomic/WhaleAnim.inc.c new file mode 100644 index 0000000000..db4ce5161e --- /dev/null +++ b/src/world/common/atomic/WhaleAnim.inc.c @@ -0,0 +1,140 @@ +#include "common.h" +#include "sprite/npc/Kolorado.h" + +Npc* N(resolve_npc)(Evt* script, s32 npcIdOrPtr) { + if (npcIdOrPtr == NPC_SELF) { + return get_npc_safe(script->owner2.npcID); + } else if (npcIdOrPtr >= EVT_LIMIT) { + return get_npc_safe(npcIdOrPtr); + } else { + return (Npc*) npcIdOrPtr; + } +} + +API_CALLABLE(N(UnkAngleFunc001)) { + Bytecode* args = script->ptrReadPos; + s32 npcID = evt_get_variable(script, *args++); + s32 outX = *args++; + s32 outY = *args++; + s32 outZ = *args++; + Npc* npc = N(resolve_npc)(script, npcID); + f32 y; + + if (npc == NULL) { + return ApiStatus_DONE2; + } + + N(unkAngle1) += 4; + if (N(unkAngle1) >= 360) { + N(unkAngle1) -= 360; + } + + y = npc->pos.y; + if (npc->currentAnim == ANIM_Kolorado_Still || + npc->currentAnim == ANIM_Kolorado_Walk || + npc->currentAnim == ANIM_Kolorado_Talk || + npc->currentAnim == ANIM_Kolorado_HurtStill) + { + y += 2.0f * sin_deg(N(unkAngle1)); + } + + evt_set_float_variable(script, outX, npc->pos.x); + evt_set_float_variable(script, outY, y); + evt_set_float_variable(script, outZ, npc->pos.z); + return ApiStatus_DONE2; +} + +void N(unkVtxFunc001)(Vtx* firstVertex, Vtx* copiedVertices, s32 numVertices, s32* wagPhasePtr) { + s32 wagPhase; + s32 bendPow, bendFrac; + s32 i, j; + s16* vtxPos; + f32 newX, newY; + f32 angle; + s32 offset; + + wagPhase = *wagPhasePtr; + switch (get_npc_safe(0)->currentAnim) { + case ANIM_Kolorado_Still: + case ANIM_Kolorado_Yell: + case ANIM_Kolorado_IdleSad: + case ANIM_Kolorado_Walk: + case ANIM_Kolorado_WalkSad: + case ANIM_Kolorado_Run: + case ANIM_Kolorado_Panic: + case ANIM_Kolorado_Talk: + case ANIM_Kolorado_TalkSad: + case ANIM_Kolorado_Fallen: + case ANIM_Kolorado_HurtStill: + break; + case ANIM_Kolorado_Idle: + case ANIM_Kolorado_Shout: + if (*wagPhasePtr < 0) { + wagPhase = 0; + *wagPhasePtr = 0; + } + break; + } + + for (i = 0; i < numVertices; i++) { + vtxPos = firstVertex[i].v.ob; + offset = 30; + + if (vtxPos[0] > 30) { + newX = 0.0f; + newY = 0.0f; + // determine number of bend stages to apply + bendPow = (vtxPos[0] - offset) / 10; + bendFrac = vtxPos[0] - ((bendPow * 10) + offset); + // apply formula once per 10 unit interval from X = 30 + for (j = 0; j < bendPow; j++) { + angle = (j / 15.0f) + ((j / 40.0f) * sin_deg(wagPhase)); + newX += cos_rad(angle) * 10.0f; + newY += sin_rad(angle) * 10.0f; + } + // add fractional part between current and next interval + angle = (j / 15.0f) + ((j / 40.0f) * sin_deg(wagPhase)); + newX += bendFrac * cos_rad(angle); + newY += bendFrac * sin_rad(angle); + + copiedVertices[i].v.ob[0] = newX; + copiedVertices[i].v.ob[1] = vtxPos[1] + newY; + } + } +} + +void N(unkAngleFunc002)(void) { + Vtx* firstVertex; + Vtx* copiedVertices; + s32 numVertices; + + mdl_get_copied_vertices(1, &firstVertex, &copiedVertices, &numVertices); + N(unkVtxFunc001)(firstVertex, copiedVertices, numVertices, &N(unkAngle2)); + + gSPDisplayList(gMasterGfxPos++, mdl_get_copied_gfx(1)); + if (N(unkAngle2) >= 0) { + N(unkAngle2) += 4; + } + if (N(unkAngle2) >= 360) { + N(unkAngle2) = -1; + } +} + +void N(unkAngleFunc003)(void) { + Vtx* firstVertex; + Vtx* copiedVertices; + s32 numVertices; + + mdl_get_copied_vertices(2, &firstVertex, &copiedVertices, &numVertices); + N(unkVtxFunc001)(firstVertex, copiedVertices, numVertices, &N(unkAngle3)); + + gSPDisplayList(gMasterGfxPos++, mdl_get_copied_gfx(2)); + if (N(unkAngle3) >= 0) { + N(unkAngle3) += 4; + } + if (N(unkAngle3) >= 360) { + N(unkAngle3) = -1; + } +} + +#include "world/common/UnkFloatFunc001.inc.c" diff --git a/src/world/common/PlayFX3D.inc.c b/src/world/common/atomic/WhaleGeyser.inc.c similarity index 86% rename from src/world/common/PlayFX3D.inc.c rename to src/world/common/atomic/WhaleGeyser.inc.c index b8adcc9b38..3c1066ec98 100644 --- a/src/world/common/PlayFX3D.inc.c +++ b/src/world/common/atomic/WhaleGeyser.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects.h" -ApiStatus N(PlayFX3D)(Evt* script, s32 isInitialStatus) { +ApiStatus N(CreateWhaleGeyser)(Evt* script, s32 isInitialStatus) { Bytecode* args = script->ptrReadPos; s32 var1 = evt_get_variable(script, *args++); f32 var2 = evt_get_float_variable(script, *args++); @@ -18,7 +18,7 @@ ApiStatus N(PlayFX3D)(Evt* script, s32 isInitialStatus) { return ApiStatus_DONE2; } -ApiStatus N(UpdatePosFX3D)(Evt* script, s32 isInitialCall) { +ApiStatus N(SetWhaleGeyserPos)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EffectInstance* effect = (EffectInstance*) evt_get_variable(script, *args++); f32 x = evt_get_float_variable(script, *args++); @@ -31,7 +31,7 @@ ApiStatus N(UpdatePosFX3D)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(DisposeFX3D)(Evt *script, s32 isInitialCall) { +ApiStatus N(DisposeWhaleGeyser)(Evt *script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EffectInstance* effect = (EffectInstance*) evt_get_variable(script, *args++); diff --git a/src/world/common/resolve_npc.inc.c b/src/world/common/resolve_npc.inc.c deleted file mode 100644 index ccb2fb3fc2..0000000000 --- a/src/world/common/resolve_npc.inc.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "npc.h" - -Npc* N(resolve_npc)(Evt* script, s32 npcIdOrPtr) { - if (npcIdOrPtr == NPC_SELF) { - return get_npc_safe(script->owner2.npcID); - } else if (npcIdOrPtr >= EVT_LIMIT) { - return get_npc_safe(npcIdOrPtr); - } else { - return (Npc*) npcIdOrPtr; - } -} diff --git a/src/world/common/unkAngleFuncs023.inc.c b/src/world/common/unkAngleFuncs023.inc.c deleted file mode 100644 index bc35dddb61..0000000000 --- a/src/world/common/unkAngleFuncs023.inc.c +++ /dev/null @@ -1,36 +0,0 @@ -#include "common.h" -#include "npc.h" - -void N(unkAngleFunc002)(void) { - Vtx* firstVertex; - Vtx* copiedVertices; - s32 numVertices; - - mdl_get_copied_vertices(1, &firstVertex, &copiedVertices, &numVertices); - N(unkVtxFunc001)(firstVertex, copiedVertices, numVertices, &N(unkAngle2)); - - gSPDisplayList(gMasterGfxPos++, mdl_get_copied_gfx(1)); - if (N(unkAngle2) >= 0) { - N(unkAngle2) += 4; - } - if (N(unkAngle2) >= 360) { - N(unkAngle2) = -1; - } -} - -void N(unkAngleFunc003)(void) { - Vtx* firstVertex; - Vtx* copiedVertices; - s32 numVertices; - - mdl_get_copied_vertices(2, &firstVertex, &copiedVertices, &numVertices); - N(unkVtxFunc001)(firstVertex, copiedVertices, numVertices, &N(unkAngle3)); - - gSPDisplayList(gMasterGfxPos++, mdl_get_copied_gfx(2)); - if (N(unkAngle3) >= 0) { - N(unkAngle3) += 4; - } - if (N(unkAngle3) >= 360) { - N(unkAngle3) = -1; - } -} diff --git a/src/world/world.c b/src/world/world.c index 9cb7a250c1..d810492b27 100644 --- a/src/world/world.c +++ b/src/world/world.c @@ -159,10 +159,10 @@ void load_map_by_IDs(s16 areaID, s16 mapID, s16 loadType) { } gCurrentCameraID = CAM_DEFAULT; - gCameras[CAM_DEFAULT].flags |= CAM_FLAG_ENABLED; - gCameras[CAM_BATTLE].flags |= CAM_FLAG_ENABLED; - gCameras[CAM_TATTLE].flags |= CAM_FLAG_ENABLED; - gCameras[CAM_3].flags |= CAM_FLAG_ENABLED; + gCameras[CAM_DEFAULT].flags |= CAMERA_FLAGS_ENABLED; + gCameras[CAM_BATTLE].flags |= CAMERA_FLAGS_ENABLED; + gCameras[CAM_TATTLE].flags |= CAMERA_FLAGS_ENABLED; + gCameras[CAM_3].flags |= CAMERA_FLAGS_ENABLED; if (gGameStatusPtr->creditsViewportMode == -1) { set_cam_viewport(0, 12, 20, 296, 200); @@ -252,6 +252,10 @@ s32 get_asset_offset(char* assetName, s32* compressedSize) { .dmaEnd = map##_ROM_END, \ .dmaDest = map##_VRAM \ +#define MAP_WITH_INIT(map) \ + MAP(map), \ + .init = &map##_map_init \ + // Should be removed once the data section containing .init and .settings of all maps have been disassembled #define MAP_UNSPLIT(map, settingsVRAM) \ .id = #map, \ @@ -776,30 +780,33 @@ MapConfig omo_maps[] = { }; /// Debug +#include "area_tst/tst.h" MapConfig tst_maps[] = { - { MAP_UNSPLIT(tst_01, 0x802400B0), .bgName = "nok_bg" }, - { MAP_UNSPLIT(tst_02, 0x802400B0), .bgName = "nok_bg" }, - { MAP_UNSPLIT(tst_03, 0x802400B0), .bgName = "nok_bg" }, - { MAP_UNSPLIT(tst_04, 0x80240740), .bgName = "nok_bg" }, - { MAP_UNSPLIT(tst_10, 0x80240040), .bgName = "nok_bg" }, - { MAP_UNSPLIT(tst_11, 0x80240780), .bgName = "nok_bg" }, - { MAP_UNSPLIT(tst_12, 0x80240010), .bgName = "nok_bg" }, - { MAP_UNSPLIT(tst_13, 0x802403D0), .bgName = "nok_bg" }, - { MAP_UNSPLIT(tst_20, 0x80240010), .bgName = "nok_bg" }, + { MAP(tst_01), .bgName = "nok_bg" }, + { MAP(tst_02), .bgName = "nok_bg" }, + { MAP(tst_03), .bgName = "nok_bg" }, + { MAP(tst_04), .bgName = "nok_bg" }, + { MAP(tst_10), .bgName = "nok_bg" }, + { MAP(tst_11), .bgName = "nok_bg" }, + { MAP(tst_12), .bgName = "nok_bg" }, + { MAP(tst_13), .bgName = "nok_bg" }, + { MAP(tst_20), .bgName = "nok_bg" }, }; /// Credits +#include "area_end/end.h" MapConfig end_maps[] = { - { MAP_UNSPLIT(end_00, 0x80242B50), .init = (MapInit)0x80240000 }, - { MAP_UNSPLIT(end_01, 0x80243000), .init = (MapInit)0x80240000 }, + { MAP_WITH_INIT(end_00) }, + { MAP_WITH_INIT(end_01) }, }; /// Toad Town Playroom +#include "area_mgm/mgm.h" MapConfig mgm_maps[] = { - { MAP_UNSPLIT(mgm_00, 0x80241810) }, - { MAP_UNSPLIT(mgm_01, 0x802417C0) }, - { MAP_UNSPLIT(mgm_02, 0x80242410) }, - { MAP_UNSPLIT(mgm_03, 0x80240010) }, + { MAP(mgm_00) }, + { MAP(mgm_01) }, + { MAP(mgm_02) }, + { MAP(mgm_03) }, }; /// Game Over diff --git a/tools/splat/segtypes/n64/gfx.py b/tools/splat/segtypes/n64/gfx.py index 1116f4e2e4..008861d36f 100644 --- a/tools/splat/segtypes/n64/gfx.py +++ b/tools/splat/segtypes/n64/gfx.py @@ -129,9 +129,10 @@ class N64SegGfx(CommonSegCodeSubsegment): def vtx_handler(self, addr, count): sym = self.create_symbol( - addr=addr, in_segment=True, type="data", reference=True + addr=addr, in_segment=True, type="data", reference=True, offsets=True ) - gfxd_printf(sym.name) + index = int((addr - sym.vram_start) / 0x10) + gfxd_printf(f"&{sym.name}[{index}]") return 1 def vp_handler(self, addr): diff --git a/tools/splat_ext/npc.yaml b/tools/splat_ext/npc.yaml index 86a64ad76f..7bd50f8aee 100644 --- a/tools/splat_ext/npc.yaml +++ b/tools/splat_ext/npc.yaml @@ -11055,7 +11055,7 @@ ParadePartner: - Lakilester3 - BombetteGear palettes: - - Goombario + - Default - Kooper - Bombette - Parakarry @@ -11094,18 +11094,18 @@ ParadeYoshi: - IdleBlink1 - IdleBlink2 palettes: - - Brown + - Default - Green - Blue - Yellow - Chief animations: - - Still + - StillGreen - StillBlue - StillYellow - StillBrown - StillLeader - - Idle + - IdleGreen - IdleBlue - IdleYellow - IdleBrown @@ -11377,7 +11377,7 @@ ParadeHorn: - Still - Idle - Walk -ParadeTubbaBalloon: +ParadeTubba: frames: - Arm - Hair diff --git a/ver/us/asm/data/battle/area_kzn2/59F530.data.s b/ver/us/asm/data/battle/area_kzn2/59F530.data.s index ee221e218b..ac119b2ad1 100644 --- a/ver/us/asm/data/battle/area_kzn2/59F530.data.s +++ b/ver/us/asm/data/battle/area_kzn2/59F530.data.s @@ -240,7 +240,7 @@ dlabel D_8021D9C8_5A40A8 .word 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000002, func_802535B4, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00100104, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000009, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000020BA, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000003B4, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B70002, 0x00000043, 0x00000003, SetNpcAnimationSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24AA280, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x00000046, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000000E8, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimationSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B70006, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000027, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7E80, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x00000046, 0x000000B4, 0x00000000, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00100105, 0x00000043, 0x00000003, SetNpcYaw, 0x00000000, 0x0000010E, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000032, 0x000000B4, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000027, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7E80, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x00000032, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x00000032, 0x00000000, 0x00000000, 0x00000006, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x00000032, 0x00000000, 0x00000000, 0x00000003, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B70005, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7D4D, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x00000032, 0x00000000, 0x00000000, 0x0000000C, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000004, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000020BA, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000003B4, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B70003, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFFC4, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B70004, 0x00B70001, 0x00000005, 0x00100106, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x00000174, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B70003, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A9280, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFED4, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802535B4, 0x00000001, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8021DEEC_5A45CC -.word 0x0000003C, 0x00000001, 0x8022B558, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000000, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetPartPos, 0x00000200, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000000, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetPartRotation, 0x00000200, 0x00000001, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000043, 0x00000001, b_area_kzn2_MarkVineInterpolationDirty, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000000, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000006, func_8021812C_59E80C, 0x00000000, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000000, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000043, 0x00000006, func_80218224_59E904, 0x00000000, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000043, 0x00000006, func_802182E4_59E9C4, 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x00000001, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000000, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_8021812C_59E80C, 0x00000000, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000000, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_80218224_59E904, 0x00000000, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_802182E4_59E9C4, 0x00000000, 0x00000001, 0xF24A7D5C, 0xF24A7D5C, 0xF24A7E80, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000000, 0x00000009, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_8021812C_59E80C, 0x00000000, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000000, 0x00000009, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_80218224_59E904, 0x00000000, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_802182E4_59E9C4, 0x00000000, 0x00000002, 0xF24A7D5C, 0xF24A7D5C, 0xF24A7E80, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000000, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_8021812C_59E80C, 0x00000000, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000000, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_80218224_59E904, 0x00000000, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_802182E4_59E9C4, 0x00000000, 0x00000003, 0xF24A7D5C, 0xF24A7D5C, 0xF24A7E80, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000000, 0x00000008, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_8021812C_59E80C, 0x00000000, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000000, 0x00000008, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_80218224_59E904, 0x00000000, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_802182E4_59E9C4, 0x00000000, 0x00000004, 0xF24A7D5C, 0xF24A7D5C, 0xF24A7E80, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000000, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_8021812C_59E80C, 0x00000000, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000000, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_80218224_59E904, 0x00000000, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_802182E4_59E9C4, 0x00000000, 0x00000005, 0xF24A7D5C, 0xF24A7D5C, 0xF24A7E80, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000000, 0x00000007, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_8021812C_59E80C, 0x00000000, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000000, 0x00000007, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_80218224_59E904, 0x00000000, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_802182E4_59E9C4, 0x00000000, 0x00000006, 0xF24A7D5C, 0xF24A7D5C, 0xF24A7E80, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000000, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_8021812C_59E80C, 0x00000000, 0x00000007, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000000, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_80218224_59E904, 0x00000000, 0x00000007, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_802182E4_59E9C4, 0x00000000, 0x00000007, 0xF24A7D5C, 0xF24A7D5C, 0xF24A7E80, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000000, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_8021812C_59E80C, 0x00000000, 0x00000008, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000000, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_80218224_59E904, 0x00000000, 0x00000008, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_802182E4_59E9C4, 0x00000000, 0x00000008, 0xF24A7D5C, 0xF24A7D5C, 0xF24A7E80, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000001, 0x00000008, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetPartPos, 0x00000201, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000008, 0x00000043, 0x00000006, SetPartPos, 0x00000201, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000001, 0x00000008, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetPartRotation, 0x00000201, 0x00000001, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000001, 0x00000008, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000006, func_8021812C_59E80C, 0x00000001, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000001, 0x00000008, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000043, 0x00000006, func_80218224_59E904, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000043, 0x00000006, func_802182E4_59E9C4, 0x00000001, 0x00000000, 0x00000001, 0x00000001, 0x00000001, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000001, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000006, func_8021812C_59E80C, 0x00000001, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000001, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_80218224_59E904, 0x00000001, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_802182E4_59E9C4, 0x00000001, 0x00000001, 0xF24A7D5C, 0xF24A7D5C, 0xF24A7E80, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000001, 0x00000007, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_8021812C_59E80C, 0x00000001, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000001, 0x00000007, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_80218224_59E904, 0x00000001, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_802182E4_59E9C4, 0x00000001, 0x00000002, 0xF24A7D5C, 0xF24A7D5C, 0xF24A7E80, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000001, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_8021812C_59E80C, 0x00000001, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000001, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_80218224_59E904, 0x00000001, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_802182E4_59E9C4, 0x00000001, 0x00000003, 0xF24A7D5C, 0xF24A7D5C, 0xF24A7E80, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000001, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_8021812C_59E80C, 0x00000001, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000001, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_80218224_59E904, 0x00000001, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_802182E4_59E9C4, 0x00000001, 0x00000004, 0xF24A7D5C, 0xF24A7D5C, 0xF24A7E80, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000001, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_8021812C_59E80C, 0x00000001, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000001, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_80218224_59E904, 0x00000001, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_802182E4_59E9C4, 0x00000001, 0x00000005, 0xF24A7D5C, 0xF24A7D5C, 0xF24A7E80, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000001, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_8021812C_59E80C, 0x00000001, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000001, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_80218224_59E904, 0x00000001, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_802182E4_59E9C4, 0x00000001, 0x00000006, 0xF24A7D5C, 0xF24A7D5C, 0xF24A7E80, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000002, 0x00000008, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetPartPos, 0x00000202, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetPartPos, 0x00000202, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000002, 0x00000008, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetPartRotation, 0x00000202, 0x00000001, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000002, 0x00000008, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000006, func_8021812C_59E80C, 0x00000002, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000002, 0x00000008, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000043, 0x00000006, func_80218224_59E904, 0x00000002, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000043, 0x00000006, func_802182E4_59E9C4, 0x00000002, 0x00000000, 0x00000001, 0x00000001, 0x00000001, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000002, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000006, func_8021812C_59E80C, 0x00000002, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000002, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_80218224_59E904, 0x00000002, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_802182E4_59E9C4, 0x00000002, 0x00000001, 0xF24A7D5C, 0xF24A7D5C, 0xF24A7E80, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000002, 0x00000007, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_8021812C_59E80C, 0x00000002, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000002, 0x00000007, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_80218224_59E904, 0x00000002, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_802182E4_59E9C4, 0x00000002, 0x00000002, 0xF24A7D5C, 0xF24A7D5C, 0xF24A7E80, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000002, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_8021812C_59E80C, 0x00000002, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000002, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_80218224_59E904, 0x00000002, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_802182E4_59E9C4, 0x00000002, 0x00000003, 0xF24A7D5C, 0xF24A7D5C, 0xF24A7E80, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000002, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_8021812C_59E80C, 0x00000002, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000002, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_80218224_59E904, 0x00000002, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_802182E4_59E9C4, 0x00000002, 0x00000004, 0xF24A7D5C, 0xF24A7D5C, 0xF24A7E80, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000002, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_8021812C_59E80C, 0x00000002, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000002, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_80218224_59E904, 0x00000002, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_802182E4_59E9C4, 0x00000002, 0x00000005, 0xF24A7D5C, 0xF24A7D5C, 0xF24A7E80, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000002, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_8021812C_59E80C, 0x00000002, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000002, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_80218224_59E904, 0x00000002, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_802182E4_59E9C4, 0x00000002, 0x00000006, 0xF24A7D5C, 0xF24A7D5C, 0xF24A7E80, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000003, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_8021812C_59E80C, 0x00000003, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000003, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_80218224_59E904, 0x00000003, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_802182E4_59E9C4, 0x00000003, 0x00000000, 0xF24A7D5C, 0xF24A7D5C, 0xF24A7E80, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000003, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_8021812C_59E80C, 0x00000003, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000003, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_80218224_59E904, 0x00000003, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_802182E4_59E9C4, 0x00000003, 0x00000001, 0xF24A7D5C, 0xF24A7D5C, 0xF24A7E80, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000003, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_8021812C_59E80C, 0x00000003, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000003, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_80218224_59E904, 0x00000003, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_802182E4_59E9C4, 0x00000003, 0x00000002, 0xF24A7D5C, 0xF24A7D5C, 0xF24A7E80, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000003, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_8021812C_59E80C, 0x00000003, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000003, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_80218224_59E904, 0x00000003, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_802182E4_59E9C4, 0x00000003, 0x00000003, 0xF24A7D5C, 0xF24A7D5C, 0xF24A7E80, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000003, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_8021812C_59E80C, 0x00000003, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000003, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_80218224_59E904, 0x00000003, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_802182E4_59E9C4, 0x00000003, 0x00000004, 0xF24A7D5C, 0xF24A7D5C, 0xF24A7E80, 0x00000043, 0x00000004, GetActorVar, 0xFFFFFF81, 0x00000006, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000000, 0x0000000A, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000000, 0x0000000A, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C87, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFE2, 0x00000043, 0x00000004, GetActorVar, 0xFFFFFF81, 0x0000000A, 0xFE363C89, 0x00000043, 0x00000008, func_80218930_59F010, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetActorVar, 0x00000201, 0x00000006, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000001, 0x00000008, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000001, 0x00000008, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFF1, 0x00000043, 0x00000004, GetActorVar, 0x00000201, 0x0000000A, 0xFE363C89, 0x00000043, 0x00000008, func_80218930_59F010, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetActorVar, 0x00000202, 0x00000006, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000002, 0x00000008, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000002, 0x00000008, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFF1, 0x00000043, 0x00000004, GetActorVar, 0x00000202, 0x0000000A, 0xFE363C89, 0x00000043, 0x00000008, func_80218930_59F010, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, GetActorFlags, 0xFFFFFF81, 0xFE363C80, 0x00000011, 0x00000002, 0xFE363C80, 0x00400000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000003C, 0x00000001, 0x8022B558, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000000, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetPartPos, 0x00000200, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000000, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetPartRotation, 0x00000200, 0x00000001, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000043, 0x00000001, b_area_kzn2_MarkVineInterpolationDirty, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000000, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000006, b_area_kzn2_SetVineBonePos, 0x00000000, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000000, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneRot, 0x00000000, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneScale, 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x00000001, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000000, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBonePos, 0x00000000, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000000, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneRot, 0x00000000, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneScale, 0x00000000, 0x00000001, 0xF24A7D5C, 0xF24A7D5C, 0xF24A7E80, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000000, 0x00000009, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBonePos, 0x00000000, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000000, 0x00000009, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneRot, 0x00000000, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneScale, 0x00000000, 0x00000002, 0xF24A7D5C, 0xF24A7D5C, 0xF24A7E80, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000000, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBonePos, 0x00000000, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000000, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneRot, 0x00000000, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneScale, 0x00000000, 0x00000003, 0xF24A7D5C, 0xF24A7D5C, 0xF24A7E80, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000000, 0x00000008, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBonePos, 0x00000000, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000000, 0x00000008, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneRot, 0x00000000, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneScale, 0x00000000, 0x00000004, 0xF24A7D5C, 0xF24A7D5C, 0xF24A7E80, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000000, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBonePos, 0x00000000, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000000, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneRot, 0x00000000, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneScale, 0x00000000, 0x00000005, 0xF24A7D5C, 0xF24A7D5C, 0xF24A7E80, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000000, 0x00000007, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBonePos, 0x00000000, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000000, 0x00000007, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneRot, 0x00000000, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneScale, 0x00000000, 0x00000006, 0xF24A7D5C, 0xF24A7D5C, 0xF24A7E80, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000000, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBonePos, 0x00000000, 0x00000007, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000000, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneRot, 0x00000000, 0x00000007, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneScale, 0x00000000, 0x00000007, 0xF24A7D5C, 0xF24A7D5C, 0xF24A7E80, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000000, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBonePos, 0x00000000, 0x00000008, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000000, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneRot, 0x00000000, 0x00000008, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneScale, 0x00000000, 0x00000008, 0xF24A7D5C, 0xF24A7D5C, 0xF24A7E80, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000001, 0x00000008, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetPartPos, 0x00000201, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000008, 0x00000043, 0x00000006, SetPartPos, 0x00000201, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000001, 0x00000008, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetPartRotation, 0x00000201, 0x00000001, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000001, 0x00000008, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000006, b_area_kzn2_SetVineBonePos, 0x00000001, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000001, 0x00000008, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneRot, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneScale, 0x00000001, 0x00000000, 0x00000001, 0x00000001, 0x00000001, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000001, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000006, b_area_kzn2_SetVineBonePos, 0x00000001, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000001, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneRot, 0x00000001, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneScale, 0x00000001, 0x00000001, 0xF24A7D5C, 0xF24A7D5C, 0xF24A7E80, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000001, 0x00000007, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBonePos, 0x00000001, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000001, 0x00000007, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneRot, 0x00000001, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneScale, 0x00000001, 0x00000002, 0xF24A7D5C, 0xF24A7D5C, 0xF24A7E80, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000001, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBonePos, 0x00000001, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000001, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneRot, 0x00000001, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneScale, 0x00000001, 0x00000003, 0xF24A7D5C, 0xF24A7D5C, 0xF24A7E80, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000001, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBonePos, 0x00000001, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000001, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneRot, 0x00000001, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneScale, 0x00000001, 0x00000004, 0xF24A7D5C, 0xF24A7D5C, 0xF24A7E80, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000001, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBonePos, 0x00000001, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000001, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneRot, 0x00000001, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneScale, 0x00000001, 0x00000005, 0xF24A7D5C, 0xF24A7D5C, 0xF24A7E80, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000001, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBonePos, 0x00000001, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000001, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneRot, 0x00000001, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneScale, 0x00000001, 0x00000006, 0xF24A7D5C, 0xF24A7D5C, 0xF24A7E80, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000002, 0x00000008, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetPartPos, 0x00000202, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetPartPos, 0x00000202, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000002, 0x00000008, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SetPartRotation, 0x00000202, 0x00000001, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000002, 0x00000008, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000006, b_area_kzn2_SetVineBonePos, 0x00000002, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000002, 0x00000008, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneRot, 0x00000002, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneScale, 0x00000002, 0x00000000, 0x00000001, 0x00000001, 0x00000001, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000002, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000006, b_area_kzn2_SetVineBonePos, 0x00000002, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000002, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneRot, 0x00000002, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneScale, 0x00000002, 0x00000001, 0xF24A7D5C, 0xF24A7D5C, 0xF24A7E80, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000002, 0x00000007, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBonePos, 0x00000002, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000002, 0x00000007, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneRot, 0x00000002, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneScale, 0x00000002, 0x00000002, 0xF24A7D5C, 0xF24A7D5C, 0xF24A7E80, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000002, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBonePos, 0x00000002, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000002, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneRot, 0x00000002, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneScale, 0x00000002, 0x00000003, 0xF24A7D5C, 0xF24A7D5C, 0xF24A7E80, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000002, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBonePos, 0x00000002, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000002, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneRot, 0x00000002, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneScale, 0x00000002, 0x00000004, 0xF24A7D5C, 0xF24A7D5C, 0xF24A7E80, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000002, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBonePos, 0x00000002, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000002, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneRot, 0x00000002, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneScale, 0x00000002, 0x00000005, 0xF24A7D5C, 0xF24A7D5C, 0xF24A7E80, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000002, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBonePos, 0x00000002, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000002, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneRot, 0x00000002, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneScale, 0x00000002, 0x00000006, 0xF24A7D5C, 0xF24A7D5C, 0xF24A7E80, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000003, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBonePos, 0x00000003, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000003, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneRot, 0x00000003, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneScale, 0x00000003, 0x00000000, 0xF24A7D5C, 0xF24A7D5C, 0xF24A7E80, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000003, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBonePos, 0x00000003, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000003, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneRot, 0x00000003, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneScale, 0x00000003, 0x00000001, 0xF24A7D5C, 0xF24A7D5C, 0xF24A7E80, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000003, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBonePos, 0x00000003, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000003, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneRot, 0x00000003, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneScale, 0x00000003, 0x00000002, 0xF24A7D5C, 0xF24A7D5C, 0xF24A7E80, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000003, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBonePos, 0x00000003, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000003, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneRot, 0x00000003, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneScale, 0x00000003, 0x00000003, 0xF24A7D5C, 0xF24A7D5C, 0xF24A7E80, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000003, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBonePos, 0x00000003, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000003, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneRot, 0x00000003, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, b_area_kzn2_SetVineBoneScale, 0x00000003, 0x00000004, 0xF24A7D5C, 0xF24A7D5C, 0xF24A7E80, 0x00000043, 0x00000004, GetActorVar, 0xFFFFFF81, 0x00000006, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000000, 0x0000000A, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000000, 0x0000000A, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C87, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFE2, 0x00000043, 0x00000004, GetActorVar, 0xFFFFFF81, 0x0000000A, 0xFE363C89, 0x00000043, 0x00000008, b_area_kzn2_func_80218930_59F010, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetActorVar, 0x00000201, 0x00000006, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000001, 0x00000008, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000001, 0x00000008, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFF1, 0x00000043, 0x00000004, GetActorVar, 0x00000201, 0x0000000A, 0xFE363C89, 0x00000043, 0x00000008, b_area_kzn2_func_80218930_59F010, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetActorVar, 0x00000202, 0x00000006, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000002, 0x00000008, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000002, 0x00000008, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFF1, 0x00000043, 0x00000004, GetActorVar, 0x00000202, 0x0000000A, 0xFE363C89, 0x00000043, 0x00000008, b_area_kzn2_func_80218930_59F010, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, GetActorFlags, 0xFFFFFF81, 0xFE363C80, 0x00000011, 0x00000002, 0xFE363C80, 0x00400000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8021F5A4_5A5C84 .word 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000004, SetAnimatorFlags, 0x00000000, 0x00040000, 0x00000000, 0x00000043, 0x00000002, GetLastElement, 0xFE363C8E, 0x00000043, 0x00000003, GetLastEvent, 0xFFFFFF81, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000038, 0x00000016, 0x00000001, 0x00000009, 0x00000046, 0x00000001, D_802235AC_5A9C8C, 0x00000046, 0x00000001, D_80223D78_5AA458, 0x00000016, 0x00000001, 0x0000000A, 0x00000046, 0x00000001, D_80223764_5A9E44, 0x00000046, 0x00000001, D_80223D78_5AA458, 0x00000016, 0x00000001, 0x00000020, 0x00000046, 0x00000001, D_80220A30_5A7110, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x0000000E, 0x00000010, 0x00000002, 0xFE363C8E, 0x00000002, 0x00000046, 0x00000001, D_8021F9E8_5A60C8, 0x00000012, 0x00000000, 0x00000046, 0x00000001, D_80223764_5A9E44, 0x00000046, 0x00000001, D_80223D78_5AA458, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000024, 0x00000046, 0x00000001, D_80220A30_5A7110, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x0000000B, 0x00000046, 0x00000001, D_80223764_5A9E44, 0x00000046, 0x00000001, D_80223D78_5AA458, 0x00000016, 0x00000001, 0x00000021, 0x00000046, 0x00000001, D_80220A30_5A7110, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x0000002F, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00790009, 0x00000046, 0x00000001, DoShockHit, 0x00000016, 0x00000001, 0x00000026, 0x00000046, 0x00000001, D_80220A30_5A7110, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x00000017, 0x00000011, 0x00000002, 0xFE363C8E, 0x00000002, 0x00000046, 0x00000001, D_802235AC_5A9C8C, 0x00000046, 0x00000001, D_80223D78_5AA458, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000019, 0x00000011, 0x00000002, 0xFE363C8E, 0x00000002, 0x00000046, 0x00000001, D_80223764_5A9E44, 0x00000046, 0x00000001, D_80223D78_5AA458, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x0000001F, 0x00000016, 0x00000001, 0x0000001B, 0x00000016, 0x00000001, 0x00000035, 0x00000016, 0x00000001, 0x00000031, 0x00000043, 0x00000004, SetAnimatorFlags, 0x00000000, 0x00040000, 0x00000000, 0x00000016, 0x00000001, 0x00000030, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00790009, 0x00000046, 0x00000001, DoNormalHit, 0x00000008, 0x00000001, 0x000003E8, 0x0000001C, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000004, GetActorVar, 0xFFFFFF81, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, ForceHomePos, 0xFFFFFF81, 0x0000003D, 0x0000003D, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, GetActorVar, 0xFFFFFF81, 0x00000005, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, ForceHomePos, 0xFFFFFF81, 0x0000003D, 0x0000003D, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000005, ForceHomePos, 0xFFFFFF81, 0x00000053, 0x00000043, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, GetStatusFlags, 0xFFFFFF81, 0xFE363C80, 0x00000010, 0x00000002, 0xFE363C80, 0x00200000, 0x00000043, 0x00000004, SetAnimatorFlags, 0x00000000, 0x00040000, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -267,7 +267,7 @@ dlabel D_802204B0_5A6B90 .word 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, SetTargetActor, 0xFFFFFF81, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000013, 0x00000043, 0x00000004, SetBattleCamTarget, 0x00000050, 0x00000046, 0x00000000, 0x00000043, 0x00000002, SetBattleCamZoom, 0x0000012C, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x0000001E, 0x00000043, 0x00000002, MoveBattleCamOver, 0x0000002D, 0x00000008, 0x00000001, 0x00000036, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000002, MoveBattleCamOver, 0x0000000F, 0x00000057, 0x00000000, 0x00000043, 0x00000002, OverrideBattleDmaDest, 0x80234000, 0x00000043, 0x00000002, LoadBattleDmaData, 0x00000002, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000000, 0x80234000, 0x00000008, 0x00000001, 0x0000000E, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x0079000E, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000003C1, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00790008, 0x00000043, 0x00000006, GetPartOffset, 0xFFFFFF81, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000028, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFF6, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x0000000F, PlayEffect, 0x00000063, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0xF24A7E80, 0x00000010, 0x00000028, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000003C4, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000018, 0x00000043, 0x0000000F, PlayEffect, 0x00000070, 0x00000000, 0xFE363C83, 0x00000000, 0xFE363C85, 0x00000032, 0x00000032, 0xF24A7E80, 0x00000028, 0x00000037, 0xF24A7E80, 0xF24A7E80, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000007, EnemyTestTarget, 0xFFFFFF81, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000010, 0x00000014, 0x00000001, 0xFE363C8A, 0x0000001D, 0x00000001, 0x00000006, 0x0000001D, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, OverrideBattleDmaDest, 0x80234000, 0x00000043, 0x00000002, LoadBattleDmaData, 0x00000003, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000000, 0x80234000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00790007, 0x00000008, 0x00000001, 0x00000013, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00790004, 0x00000043, 0x00000002, OverrideBattleDmaDest, 0x80234000, 0x00000043, 0x00000002, LoadBattleDmaData, 0x00000000, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000000, 0x80234000, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000005, 0x00000043, 0x00000007, EnemyTestTarget, 0xFFFFFF81, 0xFE363C80, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C80, 0x00000002, 0x0000FFFF, 0x00000000, 0x00000007, 0x00000020, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, OverrideBattleDmaDest, 0x80234000, 0x00000043, 0x00000002, LoadBattleDmaData, 0x00000003, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000000, 0x80234000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00790007, 0x00000008, 0x00000001, 0x00000013, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00790004, 0x00000043, 0x00000002, OverrideBattleDmaDest, 0x80234000, 0x00000043, 0x00000002, LoadBattleDmaData, 0x00000000, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000000, 0x80234000, 0x0000000A, 0x00000002, 0xFE363C8F, 0x0000000A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80220A30_5A7110 -.word 0x00000043, 0x00000004, SetActorVar, 0xFFFFFF81, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_80223764_5A9E44, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetBattleFlags, 0xFE363C80, 0x00000010, 0x00000002, 0xFE363C80, 0x00000100, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetActorVar, 0xFFFFFF81, 0x00000000, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000000, 0x00000043, 0x00000002, ClearStatusEffects, 0xFFFFFF81, 0x00000043, 0x00000002, ClearStatusEffects, 0x00000201, 0x00000043, 0x00000002, ClearStatusEffects, 0x00000202, 0x00000043, 0x00000004, SetAnimatorFlags, 0x00000000, 0x00040000, 0x00000000, 0x00000043, 0x00000004, GetActorVar, 0x00000201, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, SetAnimatorFlags, 0xFE363C80, 0x00040000, 0x00000000, 0x00000043, 0x00000004, GetActorVar, 0x00000202, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, SetAnimatorFlags, 0xFE363C80, 0x00040000, 0x00000000, 0x00000043, 0x00000002, CancelEnemyTurn, 0x00000001, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000013, 0x00000043, 0x00000004, SetBattleCamTarget, 0x0000005A, 0x0000005A, 0x00000000, 0x00000043, 0x00000002, SetBattleCamZoom, 0x00000168, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000000, 0x00000043, 0x00000002, MoveBattleCamOver, 0x000000F0, 0x00000043, 0x00000002, OverrideBattleDmaDest, 0x80234000, 0x00000043, 0x00000002, LoadBattleDmaData, 0x00000009, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000000, 0x80234000, 0x00000043, 0x00000002, OverrideBattleDmaDest, 0x8022C000, 0x00000043, 0x00000002, LoadBattleDmaData, 0x00000023, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000003, 0x8022C000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, OverrideBattleDmaDest, b_area_omo2_1_shy_squad_GetActorPartSize, 0x00000043, 0x00000002, LoadBattleDmaData, 0x00000018, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000001, b_area_omo2_1_shy_squad_GetActorPartSize, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, OverrideBattleDmaDest, 0x8022E000, 0x00000043, 0x00000002, LoadBattleDmaData, 0x00000018, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000002, 0x8022E000, 0x00000008, 0x00000001, 0x00000004, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003BC, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000077, 0xF24A7BB4, 0x00000043, 0x00000002, PlaySound, 0x000007BC, 0x00000057, 0x00000000, 0x00000043, 0x00000003, b_area_kzn2_StartRumbleWithParams, 0x00000050, 0x000000EA, 0x00000043, 0x00000002, func_8027D32C, 0xFFFFFF81, 0x00000043, 0x00000002, func_8027D32C, 0x00000201, 0x00000043, 0x00000002, func_8027D32C, 0x00000202, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x0079000D, 0x00000043, 0x00000002, OverrideBattleDmaDest, 0x80234000, 0x00000043, 0x00000002, LoadBattleDmaData, 0x0000000A, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000000, 0x80234000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000003C6, 0x00000008, 0x00000001, 0x00000023, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetAnimatedModelRootPosition, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000043, 0x00000005, SetAnimatedModelRootPosition, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, func_80218B38_59F218, 0xFE363C80, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000063, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000201, 0x00000001, 0x007B000D, 0x00000043, 0x00000002, OverrideBattleDmaDest, b_area_omo2_1_shy_squad_GetActorPartSize, 0x00000043, 0x00000002, LoadBattleDmaData, 0x00000019, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000001, b_area_omo2_1_shy_squad_GetActorPartSize, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetAnimatedModelRootPosition, 0x00000001, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000043, 0x00000005, SetAnimatedModelRootPosition, 0x00000001, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, func_80218B90_59F270, 0xFE363C80, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000063, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetAnimation, 0x00000202, 0x00000001, 0x007B000D, 0x00000043, 0x00000002, OverrideBattleDmaDest, 0x8022E000, 0x00000043, 0x00000002, LoadBattleDmaData, 0x00000019, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000002, 0x8022E000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetAnimatedModelRootPosition, 0x00000002, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000043, 0x00000005, SetAnimatedModelRootPosition, 0x00000002, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, func_80218B90_59F270, 0xFE363C80, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000063, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000013, 0x00000043, 0x00000004, SetBattleCamTarget, 0x0000005A, 0x0000005A, 0x00000000, 0x00000043, 0x00000002, SetBattleCamZoom, 0x00000168, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0xFFFFFFD3, 0x00000043, 0x00000002, MoveBattleCamOver, 0x0000006E, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000005, SetAnimatedModelRootPosition, 0x00000000, 0x00000000, 0xFFFFFF06, 0x00000000, 0x00000043, 0x00000005, SetAnimatedModelRootPosition, 0x00000001, 0x00000000, 0xFFFFFF06, 0x00000000, 0x00000043, 0x00000005, SetAnimatedModelRootPosition, 0x00000002, 0x00000000, 0xFFFFFF06, 0x00000000, 0x00000043, 0x00000005, SetActorPos, 0xFFFFFF81, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DropStarPoints, 0xFFFFFF81, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000003E5, 0x00000043, 0x00000005, ForceHomePos, 0xFFFFFF81, 0x0000003D, 0x0000003D, 0x00000000, 0x00000008, 0x00000001, 0x00000041, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000013, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetBattleCamTarget, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, SetBattleCamZoom, 0x000000F0, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000028, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000014, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80218A98_59F178, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000050, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003BC, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x000000A5, 0xF24A7F4D, 0x00000043, 0x00000002, PlaySound, 0x000007BC, 0x00000057, 0x00000000, 0x00000043, 0x00000003, b_area_kzn2_StartRumbleWithParams, 0x00000050, 0x0000012C, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002A, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000263, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000043, 0x0000000F, PlayEffect, 0x00000010, 0x00000002, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x0000013B, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x0000000F, PlayEffect, 0x00000010, 0x00000002, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x0000013B, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000013, 0x00000043, 0x00000004, SetBattleCamTarget, 0x0000005A, 0x0000005A, 0x00000000, 0x00000043, 0x00000002, SetBattleCamZoom, 0x00000168, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0xFFFFFFC4, 0x00000043, 0x00000002, MoveBattleCamOver, 0x0000001E, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000013, 0x00000043, 0x00000004, SetBattleCamTarget, 0x0000005A, 0x0000005A, 0x00000000, 0x00000043, 0x00000002, SetBattleCamZoom, 0x000000C8, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0xFFFFFFC4, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000028, 0x00000008, 0x00000001, 0x00000028, 0x00000056, 0x00000000, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002B, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000013, 0x00000043, 0x00000004, SetBattleCamTarget, 0x0000001E, 0x0000005A, 0x00000000, 0x00000043, 0x00000002, SetBattleCamZoom, 0x000001CC, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000000, 0x00000043, 0x00000002, MoveBattleCamOver, 0x0000001E, 0x00000043, 0x00000003, b_area_kzn2_StartRumbleWithParams, 0x000000B4, 0x00000010, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A8680, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000058, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000013, 0x00000043, 0x00000004, SetBattleCamTarget, 0x0000005A, 0x0000005A, 0x00000000, 0x00000043, 0x00000002, SetBattleCamZoom, 0x00000168, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000000, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000028, 0x00000008, 0x00000001, 0x00000055, 0x00000059, 0x00000000, 0x00000043, 0x00000004, SetActorVar, 0xFFFFFF81, 0x00000000, 0x00000001, 0x00000043, 0x00000004, SetActorVar, 0xFFFFFF81, 0x00000007, 0x00790004, 0x00000043, 0x00000004, SetActorVar, 0xFFFFFF81, 0x00000008, 0x0079000A, 0x00000043, 0x00000004, SetActorVar, 0x00000201, 0x00000007, 0x007B0004, 0x00000043, 0x00000004, SetActorVar, 0x00000201, 0x00000008, 0x007B000B, 0x00000043, 0x00000004, SetActorVar, 0x00000202, 0x00000007, 0x007B0004, 0x00000043, 0x00000004, SetActorVar, 0x00000202, 0x00000008, 0x007B000B, 0x00000043, 0x00000004, SetIdleAnimations, 0xFFFFFF81, 0x00000001, D_802250D4_5AB7B4, 0x00000043, 0x00000004, SetIdleAnimations, 0x00000201, 0x00000001, D_802250D4_5AB7B4, 0x00000043, 0x00000004, SetIdleAnimations, 0x00000202, 0x00000001, D_802250D4_5AB7B4, 0x00000043, 0x00000004, SetDefenseTable, 0xFFFFFF81, 0x00000001, D_8021D0F0_5A37D0, 0x00000043, 0x00000004, SetDefenseTable, 0xFFFFFF81, 0x00000002, D_8021D0F0_5A37D0, 0x00000043, 0x00000004, SetDefenseTable, 0x00000201, 0x00000001, D_80225128_5AB808, 0x00000043, 0x00000004, SetDefenseTable, 0x00000201, 0x00000002, D_80225128_5AB808, 0x00000043, 0x00000004, SetDefenseTable, 0x00000202, 0x00000001, D_80225128_5AB808, 0x00000043, 0x00000004, SetDefenseTable, 0x00000202, 0x00000002, D_80225128_5AB808, 0x00000043, 0x00000005, func_8026D5A4, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000001, 0x00000043, 0x00000005, func_8026D5A4, 0xFFFFFF81, 0x00000002, 0x00000002, 0x00000001, 0x00000043, 0x00000005, func_8026D5A4, 0x00000201, 0x00000001, 0x00000002, 0x00000001, 0x00000043, 0x00000005, func_8026D5A4, 0x00000201, 0x00000002, 0x00000002, 0x00000001, 0x00000043, 0x00000005, func_8026D5A4, 0x00000202, 0x00000001, 0x00000002, 0x00000001, 0x00000043, 0x00000005, func_8026D5A4, 0x00000202, 0x00000002, 0x00000002, 0x00000001, 0x00000043, 0x00000005, SetPartFlagBits, 0x00000201, 0x00000002, 0x00002000, 0x00000000, 0x00000043, 0x00000005, SetPartFlagBits, 0x00000202, 0x00000002, 0x00002000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000200, 0x00000046, 0x00000001, D_80222EF0_5A95D0, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00790004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000201, 0x00000046, 0x00000001, D_80222EF0_5A95D0, 0x00000043, 0x00000004, SetAnimation, 0x00000201, 0x00000001, 0x007B0004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000202, 0x00000046, 0x00000001, D_80222EF0_5A95D0, 0x00000043, 0x00000004, SetAnimation, 0x00000202, 0x00000001, 0x007B0004, 0x00000043, 0x00000003, SetActorType, 0xFFFFFF81, 0x000000B4, 0x00000043, 0x00000003, SetActorType, 0x00000201, 0x000000B6, 0x00000043, 0x00000003, SetActorType, 0x00000202, 0x000000B6, 0x00000043, 0x00000004, SetActorFlagBits, 0xFFFFFF81, 0x00001000, 0x00000001, 0x00000043, 0x00000004, SetActorFlagBits, 0x00000201, 0x00001000, 0x00000001, 0x00000043, 0x00000004, SetActorFlagBits, 0x00000202, 0x00001000, 0x00000001, 0x00000043, 0x00000003, GetEnemyMaxHP, 0xFFFFFF81, 0xFE363C80, 0x00000043, 0x00000003, SetEnemyHP, 0xFFFFFF81, 0xFE363C80, 0x00000043, 0x00000003, GetEnemyMaxHP, 0x00000201, 0xFE363C80, 0x00000043, 0x00000003, SetEnemyHP, 0x00000201, 0xFE363C80, 0x00000043, 0x00000003, GetEnemyMaxHP, 0x00000202, 0xFE363C80, 0x00000043, 0x00000003, SetEnemyHP, 0x00000202, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0x0000004E, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000004F, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000050, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000051, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000052, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000053, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000054, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000055, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000057, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000058, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000003C5, 0x00000043, 0x0000000F, PlayEffect, 0x00000070, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x00000046, 0x00000050, 0xF24A8480, 0x00000050, 0x00000037, 0xF24A8280, 0xF24A8280, 0x00000000, 0x00000000, 0x00000043, 0x00000003, LoadAnimatedModel, 0x00000004, D_8021A330_5A0A10, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000004, D_8021A364_5A0A44, 0x00000043, 0x00000005, SetAnimatedModelRootPosition, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000017, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000001C, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, DeleteAnimatedModel, 0x00000004, 0x00000057, 0x00000000, 0x00000043, 0x00000002, OverrideBattleDmaDest, 0x80234000, 0x00000043, 0x00000002, LoadBattleDmaData, 0x0000000C, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000000, 0x80234000, 0x00000043, 0x00000005, SetAnimatedModelRootPosition, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, SetAnimatedModelRootPosition, 0x00000002, 0x00000032, 0x0000000E, 0x00000014, 0x00000043, 0x00000002, OverrideBattleDmaDest, 0x8022E000, 0x00000043, 0x00000002, LoadBattleDmaData, 0x0000001C, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000002, 0x8022E000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetAnimatedModelRootPosition, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, OverrideBattleDmaDest, b_area_omo2_1_shy_squad_GetActorPartSize, 0x00000043, 0x00000002, LoadBattleDmaData, 0x0000001C, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000001, b_area_omo2_1_shy_squad_GetActorPartSize, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, SetAnimatedModelRootPosition, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, OverrideBattleDmaDest, 0x8022C000, 0x00000043, 0x00000002, LoadBattleDmaData, 0x00000024, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000003, 0x8022C000, 0x00000043, 0x00000002, OverrideBattleDmaDest, 0x80234000, 0x00000043, 0x00000002, LoadBattleDmaData, 0x00000000, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000000, 0x80234000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x0079000E, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, OverrideBattleDmaDest, 0x8022E000, 0x00000043, 0x00000002, LoadBattleDmaData, 0x0000001F, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000002, 0x8022E000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, OverrideBattleDmaDest, b_area_omo2_1_shy_squad_GetActorPartSize, 0x00000043, 0x00000002, LoadBattleDmaData, 0x0000001F, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000001, b_area_omo2_1_shy_squad_GetActorPartSize, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, OverrideBattleDmaDest, 0x8022C000, 0x00000043, 0x00000002, LoadBattleDmaData, 0x00000022, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000003, 0x8022C000, 0x00000043, 0x00000003, GetEnemyMaxHP, 0x00000201, 0xFE363C80, 0x00000043, 0x00000003, SetEnemyHP, 0x00000201, 0xFE363C80, 0x00000043, 0x00000003, GetEnemyMaxHP, 0x00000202, 0xFE363C80, 0x00000043, 0x00000003, SetEnemyHP, 0x00000202, 0xFE363C80, 0x00000043, 0x00000004, SetActorVar, 0xFFFFFF81, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_8027D32C, 0x00000201, 0x00000043, 0x00000002, func_8027D32C, 0x00000202, 0x00000024, 0x00000002, 0xFE363C80, 0x00000203, 0x00000046, 0x00000001, D_80222B6C_5A924C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000204, 0x00000046, 0x00000001, D_80222B6C_5A924C, 0x00000043, 0x00000002, OverrideBattleDmaDest, 0x8022C000, 0x00000043, 0x00000002, LoadBattleDmaData, 0x00000023, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000003, 0x8022C000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003BC, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000064, 0xF24A7C80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000008, 0xF24A7B4D, 0x00000043, 0x00000002, PlaySound, 0x000007BC, 0x00000057, 0x00000000, 0x00000043, 0x00000003, b_area_kzn2_StartRumbleWithParams, 0x00000050, 0x000000D8, 0x00000056, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000003CC, 0x00000043, 0x00000004, GetActorVar, 0xFFFFFF81, 0x00000005, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, OverrideBattleDmaDest, 0x80234000, 0x00000043, 0x00000002, LoadBattleDmaData, 0x00000008, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000000, 0x80234000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, OverrideBattleDmaDest, 0x80234000, 0x00000043, 0x00000002, LoadBattleDmaData, 0x00000009, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000000, 0x80234000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000013, 0x00000043, 0x00000002, func_8027D32C, 0xFFFFFF81, 0x00000043, 0x00000002, OverrideBattleDmaDest, 0x80234000, 0x00000043, 0x00000002, LoadBattleDmaData, 0x0000000A, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000000, 0x80234000, 0x00000043, 0x00000004, GetActorVar, 0xFFFFFF81, 0x00000005, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x0000000F, PlayEffect, 0x00000070, 0x00000000, 0x00000069, 0x0000003C, 0x00000002, 0x00000050, 0x0000003C, 0xF24A81B4, 0x0000005A, 0x00000064, 0xF24A8080, 0xF24A8080, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000079, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000003CD, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x0079000A, 0x00000043, 0x00000002, OverrideBattleDmaDest, 0x80234000, 0x00000043, 0x00000002, LoadBattleDmaData, 0x0000000B, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000000, 0x80234000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, GetActorVar, 0xFFFFFF81, 0x0000000A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C81, 0x00000064, 0x00000005, 0x00000001, 0x00000032, 0x00000028, 0x00000002, 0xFE363C81, 0x00000002, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C82, 0xFE363C81, 0x0000002E, 0x00000002, 0xFE363C82, 0xF24A7A8B, 0x00000043, 0x00000004, SetActorVar, 0xFFFFFF81, 0x0000000A, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000C, 0x00000043, 0x00000004, GetActorVar, 0x00000201, 0x00000005, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, OverrideBattleDmaDest, b_area_omo2_1_shy_squad_GetActorPartSize, 0x00000043, 0x00000002, LoadBattleDmaData, 0x00000017, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000001, b_area_omo2_1_shy_squad_GetActorPartSize, 0x00000012, 0x00000000, 0x00000043, 0x00000002, OverrideBattleDmaDest, b_area_omo2_1_shy_squad_GetActorPartSize, 0x00000043, 0x00000002, LoadBattleDmaData, 0x00000018, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000001, b_area_omo2_1_shy_squad_GetActorPartSize, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000013, 0x00000043, 0x00000002, OverrideBattleDmaDest, b_area_omo2_1_shy_squad_GetActorPartSize, 0x00000043, 0x00000002, LoadBattleDmaData, 0x00000019, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000001, b_area_omo2_1_shy_squad_GetActorPartSize, 0x00000043, 0x00000004, GetActorVar, 0x00000201, 0x00000005, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x0000000F, PlayEffect, 0x00000070, 0x00000000, 0x00000043, 0x0000001E, 0x00000002, 0x00000032, 0x00000028, 0xF24A7FB4, 0x0000001E, 0x00000046, 0xF24A7F4D, 0xF24A7F4D, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000060, 0x00000043, 0x00000002, OverrideBattleDmaDest, b_area_omo2_1_shy_squad_GetActorPartSize, 0x00000043, 0x00000002, LoadBattleDmaData, 0x0000001A, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000001, b_area_omo2_1_shy_squad_GetActorPartSize, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, GetActorVar, 0x00000201, 0x0000000A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C81, 0x00000064, 0x00000005, 0x00000001, 0x00000032, 0x00000028, 0x00000002, 0xFE363C81, 0x00000002, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C82, 0xFE363C81, 0x0000002E, 0x00000002, 0xFE363C82, 0xF24A7A8B, 0x00000043, 0x00000004, SetActorVar, 0x00000201, 0x0000000A, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetActorVar, 0x00000202, 0x00000005, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, OverrideBattleDmaDest, 0x8022E000, 0x00000043, 0x00000002, LoadBattleDmaData, 0x00000017, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000002, 0x8022E000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, OverrideBattleDmaDest, 0x8022E000, 0x00000043, 0x00000002, LoadBattleDmaData, 0x00000018, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000002, 0x8022E000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000013, 0x00000043, 0x00000002, OverrideBattleDmaDest, 0x8022E000, 0x00000043, 0x00000002, LoadBattleDmaData, 0x00000019, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000002, 0x8022E000, 0x00000043, 0x00000004, GetActorVar, 0x00000202, 0x00000005, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x0000000F, PlayEffect, 0x00000070, 0x00000000, 0x00000078, 0x00000023, 0x00000005, 0x00000032, 0x00000028, 0xF24A7FB4, 0x0000001E, 0x00000046, 0xF24A7F4D, 0xF24A7F4D, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000060, 0x00000043, 0x00000002, OverrideBattleDmaDest, 0x8022E000, 0x00000043, 0x00000002, LoadBattleDmaData, 0x0000001A, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000002, 0x8022E000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, GetActorVar, 0x00000202, 0x0000000A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C81, 0x00000064, 0x00000005, 0x00000001, 0x00000032, 0x00000028, 0x00000002, 0xFE363C81, 0x00000002, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C82, 0xFE363C81, 0x0000002E, 0x00000002, 0xFE363C82, 0xF24A7A8B, 0x00000043, 0x00000004, SetActorVar, 0x00000202, 0x0000000A, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000096, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000E, 0x00000005, 0x00000001, 0x0000000E, 0x00000028, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, SetAnimatedModelRootPosition, 0x00000002, 0x00000032, 0xFE363C80, 0x00000014, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x000000D4, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000020EA, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x0079000F, 0x00000043, 0x00000004, SetAnimation, 0x00000201, 0x00000001, 0x007B000F, 0x00000043, 0x00000004, SetAnimation, 0x00000202, 0x00000001, 0x007B000F, 0x00000043, 0x0000000F, PlayEffect, 0x00000025, 0x00000000, 0xFFFFFFC4, 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, b_area_kzn2_StartRumbleWithParams, 0x000000B4, 0x00000010, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A8A80, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, SetActorPos, 0xFFFFFF81, 0xFFFFFFC4, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DropStarPoints, 0xFFFFFF81, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000003E5, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetActorVar, 0xFFFFFF81, 0x00000006, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, SetActorVar, 0xFFFFFF81, 0x00000006, 0x00000000, 0x00000043, 0x00000002, RemoveEffect, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetActorVar, 0x00000201, 0x00000006, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, SetActorVar, 0x00000201, 0x00000006, 0x00000000, 0x00000043, 0x00000002, RemoveEffect, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetActorVar, 0x00000202, 0x00000006, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, SetActorVar, 0x00000202, 0x00000006, 0x00000000, 0x00000043, 0x00000002, RemoveEffect, 0xFE363C80, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetActorFlagBits, 0x00000200, 0x00400000, 0x00000001, 0x00000043, 0x00000005, SetPartFlagBits, 0x00000200, 0x00000001, 0x00020000, 0x00000001, 0x00000043, 0x00000005, SetPartFlagBits, 0x00000200, 0x00000002, 0x00020000, 0x00000001, 0x00000043, 0x00000004, SetActorFlagBits, 0x00000201, 0x00400000, 0x00000001, 0x00000043, 0x00000004, SetActorFlagBits, 0x00000202, 0x00400000, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000004, SetActorVar, 0xFFFFFF81, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_80223764_5A9E44, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetBattleFlags, 0xFE363C80, 0x00000010, 0x00000002, 0xFE363C80, 0x00000100, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetActorVar, 0xFFFFFF81, 0x00000000, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000000, 0x00000043, 0x00000002, ClearStatusEffects, 0xFFFFFF81, 0x00000043, 0x00000002, ClearStatusEffects, 0x00000201, 0x00000043, 0x00000002, ClearStatusEffects, 0x00000202, 0x00000043, 0x00000004, SetAnimatorFlags, 0x00000000, 0x00040000, 0x00000000, 0x00000043, 0x00000004, GetActorVar, 0x00000201, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, SetAnimatorFlags, 0xFE363C80, 0x00040000, 0x00000000, 0x00000043, 0x00000004, GetActorVar, 0x00000202, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, SetAnimatorFlags, 0xFE363C80, 0x00040000, 0x00000000, 0x00000043, 0x00000002, CancelEnemyTurn, 0x00000001, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000013, 0x00000043, 0x00000004, SetBattleCamTarget, 0x0000005A, 0x0000005A, 0x00000000, 0x00000043, 0x00000002, SetBattleCamZoom, 0x00000168, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000000, 0x00000043, 0x00000002, MoveBattleCamOver, 0x000000F0, 0x00000043, 0x00000002, OverrideBattleDmaDest, 0x80234000, 0x00000043, 0x00000002, LoadBattleDmaData, 0x00000009, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000000, 0x80234000, 0x00000043, 0x00000002, OverrideBattleDmaDest, 0x8022C000, 0x00000043, 0x00000002, LoadBattleDmaData, 0x00000023, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000003, 0x8022C000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, OverrideBattleDmaDest, b_area_omo2_1_shy_squad_GetActorPartSize, 0x00000043, 0x00000002, LoadBattleDmaData, 0x00000018, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000001, b_area_omo2_1_shy_squad_GetActorPartSize, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, OverrideBattleDmaDest, 0x8022E000, 0x00000043, 0x00000002, LoadBattleDmaData, 0x00000018, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000002, 0x8022E000, 0x00000008, 0x00000001, 0x00000004, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003BC, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000077, 0xF24A7BB4, 0x00000043, 0x00000002, PlaySound, 0x000007BC, 0x00000057, 0x00000000, 0x00000043, 0x00000003, b_area_kzn2_StartRumbleWithParams, 0x00000050, 0x000000EA, 0x00000043, 0x00000002, func_8027D32C, 0xFFFFFF81, 0x00000043, 0x00000002, func_8027D32C, 0x00000201, 0x00000043, 0x00000002, func_8027D32C, 0x00000202, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x0079000D, 0x00000043, 0x00000002, OverrideBattleDmaDest, 0x80234000, 0x00000043, 0x00000002, LoadBattleDmaData, 0x0000000A, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000000, 0x80234000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000003C6, 0x00000008, 0x00000001, 0x00000023, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetAnimatedModelRootPosition, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000043, 0x00000005, SetAnimatedModelRootPosition, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, b_area_kzn2_func_80218B38_59F218, 0xFE363C80, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000063, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000201, 0x00000001, 0x007B000D, 0x00000043, 0x00000002, OverrideBattleDmaDest, b_area_omo2_1_shy_squad_GetActorPartSize, 0x00000043, 0x00000002, LoadBattleDmaData, 0x00000019, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000001, b_area_omo2_1_shy_squad_GetActorPartSize, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetAnimatedModelRootPosition, 0x00000001, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000043, 0x00000005, SetAnimatedModelRootPosition, 0x00000001, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, b_area_kzn2_func_80218B90_59F270, 0xFE363C80, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000063, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetAnimation, 0x00000202, 0x00000001, 0x007B000D, 0x00000043, 0x00000002, OverrideBattleDmaDest, 0x8022E000, 0x00000043, 0x00000002, LoadBattleDmaData, 0x00000019, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000002, 0x8022E000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetAnimatedModelRootPosition, 0x00000002, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000043, 0x00000005, SetAnimatedModelRootPosition, 0x00000002, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, b_area_kzn2_func_80218B90_59F270, 0xFE363C80, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000063, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000013, 0x00000043, 0x00000004, SetBattleCamTarget, 0x0000005A, 0x0000005A, 0x00000000, 0x00000043, 0x00000002, SetBattleCamZoom, 0x00000168, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0xFFFFFFD3, 0x00000043, 0x00000002, MoveBattleCamOver, 0x0000006E, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000005, SetAnimatedModelRootPosition, 0x00000000, 0x00000000, 0xFFFFFF06, 0x00000000, 0x00000043, 0x00000005, SetAnimatedModelRootPosition, 0x00000001, 0x00000000, 0xFFFFFF06, 0x00000000, 0x00000043, 0x00000005, SetAnimatedModelRootPosition, 0x00000002, 0x00000000, 0xFFFFFF06, 0x00000000, 0x00000043, 0x00000005, SetActorPos, 0xFFFFFF81, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DropStarPoints, 0xFFFFFF81, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000003E5, 0x00000043, 0x00000005, ForceHomePos, 0xFFFFFF81, 0x0000003D, 0x0000003D, 0x00000000, 0x00000008, 0x00000001, 0x00000041, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000013, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetBattleCamTarget, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, SetBattleCamZoom, 0x000000F0, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000028, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000014, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000043, 0x00000001, b_area_kzn2_func_80218A98_59F178, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000050, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003BC, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x000000A5, 0xF24A7F4D, 0x00000043, 0x00000002, PlaySound, 0x000007BC, 0x00000057, 0x00000000, 0x00000043, 0x00000003, b_area_kzn2_StartRumbleWithParams, 0x00000050, 0x0000012C, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002A, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000263, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000043, 0x0000000F, PlayEffect, 0x00000010, 0x00000002, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x0000013B, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x0000000F, PlayEffect, 0x00000010, 0x00000002, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x0000013B, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000013, 0x00000043, 0x00000004, SetBattleCamTarget, 0x0000005A, 0x0000005A, 0x00000000, 0x00000043, 0x00000002, SetBattleCamZoom, 0x00000168, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0xFFFFFFC4, 0x00000043, 0x00000002, MoveBattleCamOver, 0x0000001E, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000013, 0x00000043, 0x00000004, SetBattleCamTarget, 0x0000005A, 0x0000005A, 0x00000000, 0x00000043, 0x00000002, SetBattleCamZoom, 0x000000C8, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0xFFFFFFC4, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000028, 0x00000008, 0x00000001, 0x00000028, 0x00000056, 0x00000000, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002B, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000013, 0x00000043, 0x00000004, SetBattleCamTarget, 0x0000001E, 0x0000005A, 0x00000000, 0x00000043, 0x00000002, SetBattleCamZoom, 0x000001CC, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000000, 0x00000043, 0x00000002, MoveBattleCamOver, 0x0000001E, 0x00000043, 0x00000003, b_area_kzn2_StartRumbleWithParams, 0x000000B4, 0x00000010, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000004, 0xF24A8680, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000058, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000013, 0x00000043, 0x00000004, SetBattleCamTarget, 0x0000005A, 0x0000005A, 0x00000000, 0x00000043, 0x00000002, SetBattleCamZoom, 0x00000168, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000000, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000028, 0x00000008, 0x00000001, 0x00000055, 0x00000059, 0x00000000, 0x00000043, 0x00000004, SetActorVar, 0xFFFFFF81, 0x00000000, 0x00000001, 0x00000043, 0x00000004, SetActorVar, 0xFFFFFF81, 0x00000007, 0x00790004, 0x00000043, 0x00000004, SetActorVar, 0xFFFFFF81, 0x00000008, 0x0079000A, 0x00000043, 0x00000004, SetActorVar, 0x00000201, 0x00000007, 0x007B0004, 0x00000043, 0x00000004, SetActorVar, 0x00000201, 0x00000008, 0x007B000B, 0x00000043, 0x00000004, SetActorVar, 0x00000202, 0x00000007, 0x007B0004, 0x00000043, 0x00000004, SetActorVar, 0x00000202, 0x00000008, 0x007B000B, 0x00000043, 0x00000004, SetIdleAnimations, 0xFFFFFF81, 0x00000001, D_802250D4_5AB7B4, 0x00000043, 0x00000004, SetIdleAnimations, 0x00000201, 0x00000001, D_802250D4_5AB7B4, 0x00000043, 0x00000004, SetIdleAnimations, 0x00000202, 0x00000001, D_802250D4_5AB7B4, 0x00000043, 0x00000004, SetDefenseTable, 0xFFFFFF81, 0x00000001, D_8021D0F0_5A37D0, 0x00000043, 0x00000004, SetDefenseTable, 0xFFFFFF81, 0x00000002, D_8021D0F0_5A37D0, 0x00000043, 0x00000004, SetDefenseTable, 0x00000201, 0x00000001, D_80225128_5AB808, 0x00000043, 0x00000004, SetDefenseTable, 0x00000201, 0x00000002, D_80225128_5AB808, 0x00000043, 0x00000004, SetDefenseTable, 0x00000202, 0x00000001, D_80225128_5AB808, 0x00000043, 0x00000004, SetDefenseTable, 0x00000202, 0x00000002, D_80225128_5AB808, 0x00000043, 0x00000005, func_8026D5A4, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000001, 0x00000043, 0x00000005, func_8026D5A4, 0xFFFFFF81, 0x00000002, 0x00000002, 0x00000001, 0x00000043, 0x00000005, func_8026D5A4, 0x00000201, 0x00000001, 0x00000002, 0x00000001, 0x00000043, 0x00000005, func_8026D5A4, 0x00000201, 0x00000002, 0x00000002, 0x00000001, 0x00000043, 0x00000005, func_8026D5A4, 0x00000202, 0x00000001, 0x00000002, 0x00000001, 0x00000043, 0x00000005, func_8026D5A4, 0x00000202, 0x00000002, 0x00000002, 0x00000001, 0x00000043, 0x00000005, SetPartFlagBits, 0x00000201, 0x00000002, 0x00002000, 0x00000000, 0x00000043, 0x00000005, SetPartFlagBits, 0x00000202, 0x00000002, 0x00002000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000200, 0x00000046, 0x00000001, D_80222EF0_5A95D0, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00790004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000201, 0x00000046, 0x00000001, D_80222EF0_5A95D0, 0x00000043, 0x00000004, SetAnimation, 0x00000201, 0x00000001, 0x007B0004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000202, 0x00000046, 0x00000001, D_80222EF0_5A95D0, 0x00000043, 0x00000004, SetAnimation, 0x00000202, 0x00000001, 0x007B0004, 0x00000043, 0x00000003, SetActorType, 0xFFFFFF81, 0x000000B4, 0x00000043, 0x00000003, SetActorType, 0x00000201, 0x000000B6, 0x00000043, 0x00000003, SetActorType, 0x00000202, 0x000000B6, 0x00000043, 0x00000004, SetActorFlagBits, 0xFFFFFF81, 0x00001000, 0x00000001, 0x00000043, 0x00000004, SetActorFlagBits, 0x00000201, 0x00001000, 0x00000001, 0x00000043, 0x00000004, SetActorFlagBits, 0x00000202, 0x00001000, 0x00000001, 0x00000043, 0x00000003, GetEnemyMaxHP, 0xFFFFFF81, 0xFE363C80, 0x00000043, 0x00000003, SetEnemyHP, 0xFFFFFF81, 0xFE363C80, 0x00000043, 0x00000003, GetEnemyMaxHP, 0x00000201, 0xFE363C80, 0x00000043, 0x00000003, SetEnemyHP, 0x00000201, 0xFE363C80, 0x00000043, 0x00000003, GetEnemyMaxHP, 0x00000202, 0xFE363C80, 0x00000043, 0x00000003, SetEnemyHP, 0x00000202, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0x0000004E, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000004F, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000050, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000051, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000052, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000053, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000054, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000055, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000057, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000058, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000003C5, 0x00000043, 0x0000000F, PlayEffect, 0x00000070, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x00000046, 0x00000050, 0xF24A8480, 0x00000050, 0x00000037, 0xF24A8280, 0xF24A8280, 0x00000000, 0x00000000, 0x00000043, 0x00000003, LoadAnimatedModel, 0x00000004, D_8021A330_5A0A10, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000004, D_8021A364_5A0A44, 0x00000043, 0x00000005, SetAnimatedModelRootPosition, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000017, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000001C, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, DeleteAnimatedModel, 0x00000004, 0x00000057, 0x00000000, 0x00000043, 0x00000002, OverrideBattleDmaDest, 0x80234000, 0x00000043, 0x00000002, LoadBattleDmaData, 0x0000000C, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000000, 0x80234000, 0x00000043, 0x00000005, SetAnimatedModelRootPosition, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, SetAnimatedModelRootPosition, 0x00000002, 0x00000032, 0x0000000E, 0x00000014, 0x00000043, 0x00000002, OverrideBattleDmaDest, 0x8022E000, 0x00000043, 0x00000002, LoadBattleDmaData, 0x0000001C, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000002, 0x8022E000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetAnimatedModelRootPosition, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, OverrideBattleDmaDest, b_area_omo2_1_shy_squad_GetActorPartSize, 0x00000043, 0x00000002, LoadBattleDmaData, 0x0000001C, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000001, b_area_omo2_1_shy_squad_GetActorPartSize, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, SetAnimatedModelRootPosition, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, OverrideBattleDmaDest, 0x8022C000, 0x00000043, 0x00000002, LoadBattleDmaData, 0x00000024, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000003, 0x8022C000, 0x00000043, 0x00000002, OverrideBattleDmaDest, 0x80234000, 0x00000043, 0x00000002, LoadBattleDmaData, 0x00000000, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000000, 0x80234000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x0079000E, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, OverrideBattleDmaDest, 0x8022E000, 0x00000043, 0x00000002, LoadBattleDmaData, 0x0000001F, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000002, 0x8022E000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, OverrideBattleDmaDest, b_area_omo2_1_shy_squad_GetActorPartSize, 0x00000043, 0x00000002, LoadBattleDmaData, 0x0000001F, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000001, b_area_omo2_1_shy_squad_GetActorPartSize, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, OverrideBattleDmaDest, 0x8022C000, 0x00000043, 0x00000002, LoadBattleDmaData, 0x00000022, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000003, 0x8022C000, 0x00000043, 0x00000003, GetEnemyMaxHP, 0x00000201, 0xFE363C80, 0x00000043, 0x00000003, SetEnemyHP, 0x00000201, 0xFE363C80, 0x00000043, 0x00000003, GetEnemyMaxHP, 0x00000202, 0xFE363C80, 0x00000043, 0x00000003, SetEnemyHP, 0x00000202, 0xFE363C80, 0x00000043, 0x00000004, SetActorVar, 0xFFFFFF81, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_8027D32C, 0x00000201, 0x00000043, 0x00000002, func_8027D32C, 0x00000202, 0x00000024, 0x00000002, 0xFE363C80, 0x00000203, 0x00000046, 0x00000001, D_80222B6C_5A924C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000204, 0x00000046, 0x00000001, D_80222B6C_5A924C, 0x00000043, 0x00000002, OverrideBattleDmaDest, 0x8022C000, 0x00000043, 0x00000002, LoadBattleDmaData, 0x00000023, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000003, 0x8022C000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003BC, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000064, 0xF24A7C80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000008, 0xF24A7B4D, 0x00000043, 0x00000002, PlaySound, 0x000007BC, 0x00000057, 0x00000000, 0x00000043, 0x00000003, b_area_kzn2_StartRumbleWithParams, 0x00000050, 0x000000D8, 0x00000056, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000003CC, 0x00000043, 0x00000004, GetActorVar, 0xFFFFFF81, 0x00000005, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, OverrideBattleDmaDest, 0x80234000, 0x00000043, 0x00000002, LoadBattleDmaData, 0x00000008, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000000, 0x80234000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, OverrideBattleDmaDest, 0x80234000, 0x00000043, 0x00000002, LoadBattleDmaData, 0x00000009, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000000, 0x80234000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000013, 0x00000043, 0x00000002, func_8027D32C, 0xFFFFFF81, 0x00000043, 0x00000002, OverrideBattleDmaDest, 0x80234000, 0x00000043, 0x00000002, LoadBattleDmaData, 0x0000000A, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000000, 0x80234000, 0x00000043, 0x00000004, GetActorVar, 0xFFFFFF81, 0x00000005, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x0000000F, PlayEffect, 0x00000070, 0x00000000, 0x00000069, 0x0000003C, 0x00000002, 0x00000050, 0x0000003C, 0xF24A81B4, 0x0000005A, 0x00000064, 0xF24A8080, 0xF24A8080, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000079, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000003CD, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x0079000A, 0x00000043, 0x00000002, OverrideBattleDmaDest, 0x80234000, 0x00000043, 0x00000002, LoadBattleDmaData, 0x0000000B, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000000, 0x80234000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, GetActorVar, 0xFFFFFF81, 0x0000000A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C81, 0x00000064, 0x00000005, 0x00000001, 0x00000032, 0x00000028, 0x00000002, 0xFE363C81, 0x00000002, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C82, 0xFE363C81, 0x0000002E, 0x00000002, 0xFE363C82, 0xF24A7A8B, 0x00000043, 0x00000004, SetActorVar, 0xFFFFFF81, 0x0000000A, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000C, 0x00000043, 0x00000004, GetActorVar, 0x00000201, 0x00000005, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, OverrideBattleDmaDest, b_area_omo2_1_shy_squad_GetActorPartSize, 0x00000043, 0x00000002, LoadBattleDmaData, 0x00000017, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000001, b_area_omo2_1_shy_squad_GetActorPartSize, 0x00000012, 0x00000000, 0x00000043, 0x00000002, OverrideBattleDmaDest, b_area_omo2_1_shy_squad_GetActorPartSize, 0x00000043, 0x00000002, LoadBattleDmaData, 0x00000018, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000001, b_area_omo2_1_shy_squad_GetActorPartSize, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000013, 0x00000043, 0x00000002, OverrideBattleDmaDest, b_area_omo2_1_shy_squad_GetActorPartSize, 0x00000043, 0x00000002, LoadBattleDmaData, 0x00000019, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000001, b_area_omo2_1_shy_squad_GetActorPartSize, 0x00000043, 0x00000004, GetActorVar, 0x00000201, 0x00000005, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x0000000F, PlayEffect, 0x00000070, 0x00000000, 0x00000043, 0x0000001E, 0x00000002, 0x00000032, 0x00000028, 0xF24A7FB4, 0x0000001E, 0x00000046, 0xF24A7F4D, 0xF24A7F4D, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000060, 0x00000043, 0x00000002, OverrideBattleDmaDest, b_area_omo2_1_shy_squad_GetActorPartSize, 0x00000043, 0x00000002, LoadBattleDmaData, 0x0000001A, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000001, b_area_omo2_1_shy_squad_GetActorPartSize, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, GetActorVar, 0x00000201, 0x0000000A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C81, 0x00000064, 0x00000005, 0x00000001, 0x00000032, 0x00000028, 0x00000002, 0xFE363C81, 0x00000002, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C82, 0xFE363C81, 0x0000002E, 0x00000002, 0xFE363C82, 0xF24A7A8B, 0x00000043, 0x00000004, SetActorVar, 0x00000201, 0x0000000A, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetActorVar, 0x00000202, 0x00000005, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, OverrideBattleDmaDest, 0x8022E000, 0x00000043, 0x00000002, LoadBattleDmaData, 0x00000017, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000002, 0x8022E000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, OverrideBattleDmaDest, 0x8022E000, 0x00000043, 0x00000002, LoadBattleDmaData, 0x00000018, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000002, 0x8022E000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000013, 0x00000043, 0x00000002, OverrideBattleDmaDest, 0x8022E000, 0x00000043, 0x00000002, LoadBattleDmaData, 0x00000019, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000002, 0x8022E000, 0x00000043, 0x00000004, GetActorVar, 0x00000202, 0x00000005, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x0000000F, PlayEffect, 0x00000070, 0x00000000, 0x00000078, 0x00000023, 0x00000005, 0x00000032, 0x00000028, 0xF24A7FB4, 0x0000001E, 0x00000046, 0xF24A7F4D, 0xF24A7F4D, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000060, 0x00000043, 0x00000002, OverrideBattleDmaDest, 0x8022E000, 0x00000043, 0x00000002, LoadBattleDmaData, 0x0000001A, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000002, 0x8022E000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, GetActorVar, 0x00000202, 0x0000000A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C81, 0x00000064, 0x00000005, 0x00000001, 0x00000032, 0x00000028, 0x00000002, 0xFE363C81, 0x00000002, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C82, 0xFE363C81, 0x0000002E, 0x00000002, 0xFE363C82, 0xF24A7A8B, 0x00000043, 0x00000004, SetActorVar, 0x00000202, 0x0000000A, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000096, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000E, 0x00000005, 0x00000001, 0x0000000E, 0x00000028, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, SetAnimatedModelRootPosition, 0x00000002, 0x00000032, 0xFE363C80, 0x00000014, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x000000D4, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000020EA, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x0079000F, 0x00000043, 0x00000004, SetAnimation, 0x00000201, 0x00000001, 0x007B000F, 0x00000043, 0x00000004, SetAnimation, 0x00000202, 0x00000001, 0x007B000F, 0x00000043, 0x0000000F, PlayEffect, 0x00000025, 0x00000000, 0xFFFFFFC4, 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, b_area_kzn2_StartRumbleWithParams, 0x000000B4, 0x00000010, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A8A80, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, SetActorPos, 0xFFFFFF81, 0xFFFFFFC4, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DropStarPoints, 0xFFFFFF81, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000003E5, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetActorVar, 0xFFFFFF81, 0x00000006, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, SetActorVar, 0xFFFFFF81, 0x00000006, 0x00000000, 0x00000043, 0x00000002, RemoveEffect, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetActorVar, 0x00000201, 0x00000006, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, SetActorVar, 0x00000201, 0x00000006, 0x00000000, 0x00000043, 0x00000002, RemoveEffect, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetActorVar, 0x00000202, 0x00000006, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, SetActorVar, 0x00000202, 0x00000006, 0x00000000, 0x00000043, 0x00000002, RemoveEffect, 0xFE363C80, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetActorFlagBits, 0x00000200, 0x00400000, 0x00000001, 0x00000043, 0x00000005, SetPartFlagBits, 0x00000200, 0x00000001, 0x00020000, 0x00000001, 0x00000043, 0x00000005, SetPartFlagBits, 0x00000200, 0x00000002, 0x00020000, 0x00000001, 0x00000043, 0x00000004, SetActorFlagBits, 0x00000201, 0x00400000, 0x00000001, 0x00000043, 0x00000004, SetActorFlagBits, 0x00000202, 0x00400000, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80222B68_5A9248 .word 0x00000000 @@ -282,7 +282,7 @@ dlabel D_80222E20_5A9500 .word 0xFFFFFFFF, 0x00000000, 0xFFFFFFFF, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFE, 0xFFFFFFFF, 0xFFFFFFFE, 0xFFFFFFFE, 0xFFFFFFFF, 0xFFFFFFFD, 0xFFFFFFFE, 0xFFFFFFFE, 0xFFFFFFFD, 0xFFFFFFFE, 0xFFFFFFFD, 0xFFFFFFFD, 0xFFFFFFFD, 0xFFFFFFFD, 0xFFFFFFFC, 0xFFFFFFFD, 0xFFFFFFFC, 0xFFFFFFFC, 0xFFFFFFFD, 0xFFFFFFFB, 0xFFFFFFFC, 0xFFFFFFFC, 0xFFFFFFFD, 0xFFFFFFFB, 0xFFFFFFFB, 0xFFFFFFFB, 0xFFFFFFFB, 0xFFFFFFFB, 0xFFFFFFFB, 0xFFFFFFFB, 0xFFFFFFFA, 0xFFFFFFFB, 0xFFFFFFFA, 0xFFFFFFFA, 0xFFFFFFFA, 0xFFFFFFFA, 0xFFFFFFFA, 0xFFFFFFF9, 0xFFFFFFFA, 0xFFFFFFF9, 0xFFFFFFF9, 0xFFFFFFF9, 0xFFFFFFF9, 0xFFFFFFF9, 0x00000063 dlabel D_80222EF0_5A95D0 -.word 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000201, 0x00000043, 0x00000004, SetActorVar, 0x00000201, 0x0000000A, 0x00000023, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000001, 0x00000008, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000001, 0x00000008, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFF1, 0x00000043, 0x00000008, func_80218BE8_59F2C8, 0xFE363C81, 0xFE363C82, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000006, GetPartOffset, 0x00000201, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFE363C83, 0xFE363C84, 0xFE363C82, 0xF24A7BB4, 0xFE363C8A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetActorVar, 0x00000201, 0x00000006, 0xFE363C8A, 0x00000043, 0x00000004, SetIdleAnimations, 0x00000201, 0x00000001, D_802250D4_5AB7B4, 0x00000043, 0x00000004, SetDefenseTable, 0x00000201, 0x00000001, D_80225128_5AB808, 0x00000043, 0x00000004, SetDefenseTable, 0x00000201, 0x00000002, D_80225128_5AB808, 0x00000043, 0x00000005, SetPartEventBits, 0x00000201, 0x00000001, 0x00000002, 0x00000001, 0x00000043, 0x00000005, SetPartEventBits, 0x00000201, 0x00000002, 0x00000002, 0x00000001, 0x00000043, 0x00000004, SetActorVar, 0x00000201, 0x00000007, 0x007B0004, 0x00000043, 0x00000004, SetActorVar, 0x00000201, 0x00000008, 0x007B000B, 0x00000043, 0x00000004, SetActorVar, 0x00000201, 0x00000005, 0x00000001, 0x00000043, 0x00000005, SetPartFlagBits, 0x00000201, 0x00000002, 0x00020000, 0x00000000, 0x00000043, 0x00000004, SetActorFlagBits, 0x00000201, 0x00040000, 0x00000000, 0x00000016, 0x00000001, 0x00000202, 0x00000043, 0x00000004, SetActorVar, 0x00000202, 0x0000000A, 0x00000023, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000002, 0x00000008, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000002, 0x00000008, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFF1, 0x00000043, 0x00000008, func_80218BE8_59F2C8, 0xFE363C81, 0xFE363C82, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000006, GetPartOffset, 0x00000202, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFE363C83, 0xFE363C84, 0xFE363C82, 0xF24A7BB4, 0xFE363C8A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetActorVar, 0x00000202, 0x00000006, 0xFE363C8A, 0x00000043, 0x00000004, SetIdleAnimations, 0x00000202, 0x00000001, D_802250D4_5AB7B4, 0x00000043, 0x00000004, SetDefenseTable, 0x00000202, 0x00000001, D_80225128_5AB808, 0x00000043, 0x00000004, SetDefenseTable, 0x00000202, 0x00000002, D_80225128_5AB808, 0x00000043, 0x00000005, SetPartEventBits, 0x00000202, 0x00000001, 0x00000002, 0x00000001, 0x00000043, 0x00000005, SetPartEventBits, 0x00000202, 0x00000002, 0x00000002, 0x00000001, 0x00000043, 0x00000004, SetActorVar, 0x00000202, 0x00000007, 0x007B0004, 0x00000043, 0x00000004, SetActorVar, 0x00000202, 0x00000008, 0x007B000B, 0x00000043, 0x00000004, SetActorVar, 0x00000202, 0x00000005, 0x00000001, 0x00000043, 0x00000005, SetPartFlagBits, 0x00000202, 0x00000002, 0x00020000, 0x00000000, 0x00000043, 0x00000004, SetActorFlagBits, 0x00000202, 0x00040000, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, SetActorVar, 0x00000200, 0x0000000A, 0x00000046, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000000, 0x0000000A, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000000, 0x0000000A, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C87, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFE2, 0x00000043, 0x00000008, func_80218BE8_59F2C8, 0xFE363C81, 0xFE363C82, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000006, GetPartOffset, 0x00000200, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFE363C83, 0xFE363C84, 0xFE363C82, 0xF24A7D4D, 0xFE363C8A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetActorVar, 0x00000200, 0x00000006, 0xFE363C8A, 0x00000043, 0x00000004, SetIdleAnimations, 0x00000200, 0x00000001, D_8021D064_5A3744, 0x00000043, 0x00000004, SetDefenseTable, 0x00000200, 0x00000001, D_8021D0F0_5A37D0, 0x00000043, 0x00000004, SetDefenseTable, 0x00000200, 0x00000002, D_8021D0F0_5A37D0, 0x00000043, 0x00000005, SetPartEventBits, 0x00000200, 0x00000001, 0x00000002, 0x00000001, 0x00000043, 0x00000005, SetPartEventBits, 0x00000200, 0x00000002, 0x00000002, 0x00000001, 0x00000043, 0x00000004, SetActorVar, 0x00000200, 0x00000007, 0x00790004, 0x00000043, 0x00000004, SetActorVar, 0x00000200, 0x00000008, 0x0079000A, 0x00000043, 0x00000004, SetActorVar, 0x00000200, 0x00000005, 0x00000001, 0x00000043, 0x00000005, ForceHomePos, 0xFFFFFF81, 0x0000003D, 0x0000003D, 0x00000000, 0x00000043, 0x00000004, SetActorFlagBits, 0xFFFFFF81, 0x00040000, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000201, 0x00000043, 0x00000004, SetActorVar, 0x00000201, 0x0000000A, 0x00000023, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000001, 0x00000008, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000001, 0x00000008, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFF1, 0x00000043, 0x00000008, b_area_kzn2_func_80218BE8_59F2C8, 0xFE363C81, 0xFE363C82, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000006, GetPartOffset, 0x00000201, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFE363C83, 0xFE363C84, 0xFE363C82, 0xF24A7BB4, 0xFE363C8A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetActorVar, 0x00000201, 0x00000006, 0xFE363C8A, 0x00000043, 0x00000004, SetIdleAnimations, 0x00000201, 0x00000001, D_802250D4_5AB7B4, 0x00000043, 0x00000004, SetDefenseTable, 0x00000201, 0x00000001, D_80225128_5AB808, 0x00000043, 0x00000004, SetDefenseTable, 0x00000201, 0x00000002, D_80225128_5AB808, 0x00000043, 0x00000005, SetPartEventBits, 0x00000201, 0x00000001, 0x00000002, 0x00000001, 0x00000043, 0x00000005, SetPartEventBits, 0x00000201, 0x00000002, 0x00000002, 0x00000001, 0x00000043, 0x00000004, SetActorVar, 0x00000201, 0x00000007, 0x007B0004, 0x00000043, 0x00000004, SetActorVar, 0x00000201, 0x00000008, 0x007B000B, 0x00000043, 0x00000004, SetActorVar, 0x00000201, 0x00000005, 0x00000001, 0x00000043, 0x00000005, SetPartFlagBits, 0x00000201, 0x00000002, 0x00020000, 0x00000000, 0x00000043, 0x00000004, SetActorFlagBits, 0x00000201, 0x00040000, 0x00000000, 0x00000016, 0x00000001, 0x00000202, 0x00000043, 0x00000004, SetActorVar, 0x00000202, 0x0000000A, 0x00000023, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000002, 0x00000008, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000002, 0x00000008, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFF1, 0x00000043, 0x00000008, b_area_kzn2_func_80218BE8_59F2C8, 0xFE363C81, 0xFE363C82, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000006, GetPartOffset, 0x00000202, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFE363C83, 0xFE363C84, 0xFE363C82, 0xF24A7BB4, 0xFE363C8A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetActorVar, 0x00000202, 0x00000006, 0xFE363C8A, 0x00000043, 0x00000004, SetIdleAnimations, 0x00000202, 0x00000001, D_802250D4_5AB7B4, 0x00000043, 0x00000004, SetDefenseTable, 0x00000202, 0x00000001, D_80225128_5AB808, 0x00000043, 0x00000004, SetDefenseTable, 0x00000202, 0x00000002, D_80225128_5AB808, 0x00000043, 0x00000005, SetPartEventBits, 0x00000202, 0x00000001, 0x00000002, 0x00000001, 0x00000043, 0x00000005, SetPartEventBits, 0x00000202, 0x00000002, 0x00000002, 0x00000001, 0x00000043, 0x00000004, SetActorVar, 0x00000202, 0x00000007, 0x007B0004, 0x00000043, 0x00000004, SetActorVar, 0x00000202, 0x00000008, 0x007B000B, 0x00000043, 0x00000004, SetActorVar, 0x00000202, 0x00000005, 0x00000001, 0x00000043, 0x00000005, SetPartFlagBits, 0x00000202, 0x00000002, 0x00020000, 0x00000000, 0x00000043, 0x00000004, SetActorFlagBits, 0x00000202, 0x00040000, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, SetActorVar, 0x00000200, 0x0000000A, 0x00000046, 0x00000043, 0x00000006, GetAnimatedPositionByTreeIndex, 0x00000000, 0x0000000A, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000006, GetAnimatedRotationByTreeIndex, 0x00000000, 0x0000000A, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C87, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFE2, 0x00000043, 0x00000008, b_area_kzn2_func_80218BE8_59F2C8, 0xFE363C81, 0xFE363C82, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000006, GetPartOffset, 0x00000200, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFE363C83, 0xFE363C84, 0xFE363C82, 0xF24A7D4D, 0xFE363C8A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetActorVar, 0x00000200, 0x00000006, 0xFE363C8A, 0x00000043, 0x00000004, SetIdleAnimations, 0x00000200, 0x00000001, D_8021D064_5A3744, 0x00000043, 0x00000004, SetDefenseTable, 0x00000200, 0x00000001, D_8021D0F0_5A37D0, 0x00000043, 0x00000004, SetDefenseTable, 0x00000200, 0x00000002, D_8021D0F0_5A37D0, 0x00000043, 0x00000005, SetPartEventBits, 0x00000200, 0x00000001, 0x00000002, 0x00000001, 0x00000043, 0x00000005, SetPartEventBits, 0x00000200, 0x00000002, 0x00000002, 0x00000001, 0x00000043, 0x00000004, SetActorVar, 0x00000200, 0x00000007, 0x00790004, 0x00000043, 0x00000004, SetActorVar, 0x00000200, 0x00000008, 0x0079000A, 0x00000043, 0x00000004, SetActorVar, 0x00000200, 0x00000005, 0x00000001, 0x00000043, 0x00000005, ForceHomePos, 0xFFFFFF81, 0x0000003D, 0x0000003D, 0x00000000, 0x00000043, 0x00000004, SetActorFlagBits, 0xFFFFFF81, 0x00040000, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802235AC_5A9C8C .word 0x00000043, 0x00000004, GetActorVar, 0xFFFFFF81, 0x00000008, 0xFE363C80, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0xFE363C80, 0x00000043, 0x00000004, GetActorVar, 0xFFFFFF81, 0x00000005, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000003, GetLastDamage, 0xFFFFFF81, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000004, 0x00000043, 0x00000002, OverrideBattleDmaDest, 0x80234000, 0x00000043, 0x00000002, LoadBattleDmaData, 0x00000005, 0x00000012, 0x00000000, 0x00000043, 0x00000002, OverrideBattleDmaDest, 0x80234000, 0x00000043, 0x00000002, LoadBattleDmaData, 0x00000004, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000000, 0x80234000, 0x00000008, 0x00000001, 0x0000001D, 0x00000008, 0x00000001, 0x0000000E, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetLastDamage, 0xFFFFFF81, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000004, 0x00000043, 0x00000002, OverrideBattleDmaDest, 0x80234000, 0x00000043, 0x00000002, LoadBattleDmaData, 0x00000007, 0x00000012, 0x00000000, 0x00000043, 0x00000002, OverrideBattleDmaDest, 0x80234000, 0x00000043, 0x00000002, LoadBattleDmaData, 0x00000006, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000000, 0x80234000, 0x00000008, 0x00000001, 0x0000001D, 0x00000008, 0x00000001, 0x0000000E, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_end/end_00/DF9540.data.s b/ver/us/asm/data/world/area_end/end_00/DF9540.data.s deleted file mode 100644 index 9beb81cae7..0000000000 --- a/ver/us/asm/data/world/area_end/end_00/DF9540.data.s +++ /dev/null @@ -1,30 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242B40_DF9540 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80242B90_DF9590, D_80242B40_DF9540, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80242B90_DF9590 -.word 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000023, 0x00000010, 0x00001000, 0x00000043, 0x00000006, SetCamViewport, 0x00000000, 0x0000000F, 0x0000001C, 0x00000122, 0x00000080, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000001F4, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000043, 0x00000002, EnableStatusMenu, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000044, 0x00000001, 0x80246B28, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel end_00_Font4Patterns -.word 0x02070001, 0x020A0001, 0x03040001, 0x070D0001, 0x09040001, 0x0C040001, 0x0C0C0001, 0x0C140001, 0x0D030001, 0x0D040001, 0x0D0A0001, 0x0D140001, 0x0E0D0001, 0x0E110001, 0x11040001, 0x110F0001, 0x14020001, 0x140D0001, 0x140F0001, 0x14120001, 0x12020001, 0x12070001, 0x120F0001, 0x15040001, 0x16110001, 0x00000000 - -dlabel end_00_Font3Patterns -.word 0x00020001, 0x00060001, 0x000E0001, 0x00030001, 0x00080001, 0x000A0001, 0x000D0001, 0x00130001, 0x00140001, 0x07000001, 0x07060001, 0x07080001, 0x08020001, 0x08040001, 0x08060001, 0x080A0001, 0x080D0001, 0x080E0001, 0x08130001, 0x08180001, 0x09080001, 0x0C0E0001, 0x0C080001, 0x0D060001, 0x0D080001, 0x0D0E0001, 0x0D130001, 0x12040001, 0x12080001, 0x13040001, 0x14020001, 0x14080001, 0x140A0001, 0x00000000 - -dlabel end_00_CreditsViewport -.word 0x028001E0, 0x01FF0000, 0x028001E0, 0x01FF0000 - -dlabel end_00_CreditsBufferIndex -.word 0x00000000 - -dlabel D_80242D74_DF9774 -.word 0x002E0000, 0x000000A0, 0x000000AD, 0x00000001, 0x00000000, 0x00000028, 0x00000000, 0x00000000, 0x00000078, 0x00000000, 0x00000028, 0x00000000, 0x00000028, 0x00010000, 0x002E0001, 0x000000A0, 0x000000BF, 0x00000000, 0x00000000, 0x00000028, 0x00000000, 0x00000000, 0x00000050, 0x00000000, 0x00000028, 0x00000000, 0xFFFFFFFF, 0x00010000 - -dlabel D_80242DE4_DF97E4 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000000EB, 0x00000000, 0x002E0009, 0x000000A0, 0x000000A6, 0x00000000, 0x00000004, 0x00000028, 0x00000002, 0x00000000, 0x000000B0, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00010000, 0x002E000A, 0x000000A0, 0x000000AF, 0x00000000, 0x00000004, 0x00000028, 0x00000002, 0x00000000, 0x000000B0, 0x00000000, 0x0000001E, 0x00000000, 0x000000F6, 0x00010000, 0x002E000B, 0x000000A0, 0x000000AA, 0x00000000, 0x00000004, 0x00000028, 0x00000002, 0x00000000, 0x0000024C, 0x00000000, 0x0000001E, 0x00000000, 0x00000292, 0x00010000, 0x002E000C, 0x000000A0, 0x000000A6, 0x00000000, 0x00000004, 0x00000028, 0x00000002, 0x00000000, 0x000000B0, 0x00000000, 0x0000001E, 0x00000000, 0x000000F6, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000003C, 0x00000000, 0x002E000D, 0x000000A0, 0x000000A6, 0x00000000, 0x00000004, 0x00000028, 0x00000002, 0x00000000, 0x000000B0, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00010000, 0x002E000E, 0x000000A0, 0x000000AF, 0x00000000, 0x00000004, 0x00000028, 0x00000002, 0x00000000, 0x000000B0, 0x00000000, 0x0000001E, 0x00000000, 0x000000F6, 0x00010000, 0x002E000F, 0x000000A0, 0x000000A6, 0x00000000, 0x00000004, 0x00000028, 0x00000002, 0x00000000, 0x00000584, 0x00000000, 0x0000001E, 0x00000000, 0x000005CA, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000003C, 0x00000000, 0x002E0010, 0x000000A0, 0x000000AA, 0x00000000, 0x00000004, 0x00000028, 0x00000002, 0x00000000, 0x000000B0, 0x00000000, 0x0000001E, 0x00000000, 0x000000F6, 0x00010000, 0x002E0011, 0x000000A0, 0x000000AA, 0x00000000, 0x00000004, 0x00000028, 0x00000002, 0x00000000, 0x000000B0, 0x00000000, 0x0000001E, 0x00000000, 0x000000F6, 0x00010000, 0x002E0023, 0x000000A0, 0x000000A6, 0x00000000, 0x00000004, 0x00000028, 0x00000002, 0x00000000, 0x000000BE, 0x00000000, 0x0000001E, 0x00000001, 0x000000F6, 0x00010000, 0x002E0012, 0x000000A0, 0x000000A6, 0x00000000, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x000002F2, 0x00000000, 0x0000001E, 0x00000000, 0x00000338, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000003C, 0x00000000, 0x002E0013, 0x000000A0, 0x000000AA, 0x00000000, 0x00000004, 0x00000028, 0x00000002, 0x00000000, 0x000000B0, 0x00000000, 0x0000001E, 0x00000000, 0x000000F6, 0x00010000, 0x002E0014, 0x000000A0, 0x000000A6, 0x00000000, 0x00000004, 0x00000028, 0x00000002, 0x00000000, 0x000000B0, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00010000, 0x002E0015, 0x000000A0, 0x000000AF, 0x00000000, 0x00000004, 0x00000028, 0x00000002, 0x00000000, 0x000000B0, 0x00000000, 0x0000001E, 0x00000000, 0x000000F6, 0x00010000, 0x002E0016, 0x000000A0, 0x000000AA, 0x00000000, 0x00000004, 0x00000028, 0x00000002, 0x00000000, 0x000000B0, 0x00000000, 0x0000001E, 0x00000000, 0x000000F6, 0x00010000, 0x002E0017, 0x000000A0, 0x000000A6, 0x00000000, 0x00000004, 0x00000028, 0x00000002, 0x00000000, 0x000000B0, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00010000, 0x002E0018, 0x000000A0, 0x000000AF, 0x00000000, 0x00000004, 0x00000028, 0x00000002, 0x00000000, 0x000000B0, 0x00000000, 0x0000001E, 0x00000000, 0x000000F6, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000003C, 0x00000000, 0x002E001F, 0x000000A0, 0x000000AA, 0x00000000, 0x00000004, 0x00000028, 0x00000002, 0x00000000, 0x000000B0, 0x00000000, 0x0000001E, 0x00000000, 0x000000F6, 0x00010000, 0x002E0029, 0x000000A0, 0x000000AA, 0x00000000, 0x00000004, 0x00000028, 0x00000002, 0x00000000, 0x000000B0, 0x00000000, 0x0000001E, 0x00000000, 0x000000F6, 0x00010000, 0x002E002A, 0x000000A0, 0x000000AA, 0x00000000, 0x00000004, 0x00000028, 0x00000002, 0x00000000, 0x000000B0, 0x00000000, 0x0000001E, 0x00000000, 0x000000F6, 0x00010000, 0x002E002B, 0x000000A0, 0x000000AA, 0x00000000, 0x00000004, 0x00000028, 0x00000002, 0x00000000, 0x0000017E, 0x00000000, 0x0000001E, 0x00000000, 0x000001C4, 0x00010000, 0x002E002C, 0x000000A0, 0x000000AA, 0x00000000, 0x00000004, 0x00000028, 0x00000002, 0x00000000, 0x0000017E, 0x00000000, 0x0000001E, 0x00000000, 0x000001C4, 0x00010000, 0x002E0024, 0x000000A0, 0x000000AA, 0x00000000, 0x00000004, 0x00000028, 0x00000002, 0x00000000, 0x000000B0, 0x00000000, 0x0000001E, 0x00000000, 0x000000F6, 0x00010000, 0x002E0022, 0x000000A0, 0x000000A6, 0x00000000, 0x00000004, 0x00000028, 0x00000002, 0x00000000, 0x0000017E, 0x00000000, 0x0000001E, 0x00000000, 0x000001C4, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000 - -dlabel D_80243474_DF9E74 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000000EB, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000028, 0x00000000, 0x002E002D, 0x000000A0, 0x000000C3, 0x00000001, 0x00000000, 0x00000028, 0x00000000, 0x00000000, 0x00000088, 0x00000000, 0x0000001E, 0x00000000, 0x000000CE, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000028, 0x00000000, 0x002E002E, 0x000000A0, 0x000000BF, 0x00000001, 0x00000000, 0x00000028, 0x00000000, 0x00000000, 0x00000094, 0x00000000, 0x0000001E, 0x00000001, 0x000000CE, 0x00010000, 0x002E002F, 0x0000009F, 0x000000BF, 0x00000001, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x00000096, 0x00000000, 0x0000001E, 0x00000001, 0x000000CE, 0x00010000, 0x002E0030, 0x000000A0, 0x000000BF, 0x00000001, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x00000088, 0x00000000, 0x0000001E, 0x00000000, 0x000000CE, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000028, 0x00000000, 0x002E0031, 0x000000A0, 0x000000BA, 0x00000001, 0x00000000, 0x00000028, 0x00000000, 0x00000000, 0x00000088, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00010000, 0x002E0032, 0x000000A0, 0x000000CB, 0x00000001, 0x00000000, 0x00000028, 0x00000000, 0x00000000, 0x00000088, 0x00000000, 0x0000001E, 0x00000000, 0x000000CE, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000028, 0x00000000, 0x002E0033, 0x000000A0, 0x000000C3, 0x00000001, 0x00000000, 0x00000028, 0x00000000, 0x00000000, 0x00000088, 0x00000000, 0x0000001E, 0x00000000, 0x000000CE, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000028, 0x00000000, 0x002E0034, 0x000000A0, 0x000000BA, 0x00000001, 0x00000000, 0x00000028, 0x00000000, 0x00000000, 0x00000096, 0x00000000, 0x0000001E, 0x00000001, 0x00000000, 0x00010000, 0x002E0035, 0x000000A0, 0x000000CB, 0x00000001, 0x00000000, 0x00000028, 0x00000000, 0x00000000, 0x00000096, 0x00000000, 0x0000001E, 0x00000001, 0x000000CE, 0x00010000, 0x002E0036, 0x000000A0, 0x000000BA, 0x00000001, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x00000096, 0x00000000, 0x0000001E, 0x00000001, 0x00000000, 0x00010000, 0x002E0037, 0x000000A0, 0x000000CB, 0x00000001, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x00000096, 0x00000000, 0x0000001E, 0x00000001, 0x000000CE, 0x00010000, 0x002E0038, 0x000000A0, 0x000000BA, 0x00000001, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x00000096, 0x00000000, 0x0000001E, 0x00000001, 0x00000000, 0x00010000, 0x002E0039, 0x000000A0, 0x000000CB, 0x00000001, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x00000096, 0x00000000, 0x0000001E, 0x00000001, 0x000000CE, 0x00010000, 0x002E003A, 0x000000A0, 0x000000BA, 0x00000001, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x00000096, 0x00000000, 0x0000001E, 0x00000001, 0x00000000, 0x00010000, 0x002E003B, 0x000000A0, 0x000000CB, 0x00000001, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x00000096, 0x00000000, 0x0000001E, 0x00000001, 0x000000CE, 0x00010000, 0x002E003C, 0x000000A0, 0x000000BA, 0x00000001, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x00000096, 0x00000000, 0x0000001E, 0x00000001, 0x00000000, 0x00010000, 0x002E003E, 0x000000A0, 0x000000CB, 0x00000001, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x00000096, 0x00000000, 0x0000001E, 0x00000001, 0x000000CE, 0x00010000, 0x002E003D, 0x000000A0, 0x000000BA, 0x00000001, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x00000096, 0x00000000, 0x0000001E, 0x00000001, 0x00000000, 0x00010000, 0x002E003F, 0x000000A0, 0x000000CB, 0x00000001, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x00000096, 0x00000000, 0x0000001E, 0x00000001, 0x000000CE, 0x00010000, 0x002E0040, 0x000000A0, 0x000000B6, 0x00000001, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x00000088, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00010000, 0x002E0041, 0x000000A0, 0x000000C3, 0x00000001, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x00000088, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00010000, 0x002E0042, 0x000000A0, 0x000000D0, 0x00000001, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x00000088, 0x00000000, 0x0000001E, 0x00000000, 0x000000CE, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000028, 0x00000000, 0x002E0043, 0x000000A0, 0x000000BF, 0x00000001, 0x00000000, 0x00000028, 0x00000000, 0x00000000, 0x00000088, 0x00000000, 0x0000001E, 0x00000000, 0x000000CE, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000028, 0x00000000, 0x002E0044, 0x000000A0, 0x000000BF, 0x00000001, 0x00000000, 0x00000028, 0x00000000, 0x00000000, 0x00000088, 0x00000000, 0x0000001E, 0x00000000, 0x000000CE, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000028, 0x00000000, 0x002E0045, 0x000000A0, 0x000000BF, 0x00000001, 0x00000000, 0x00000028, 0x00000000, 0x00000000, 0x00000096, 0x00000000, 0x0000001E, 0x00000001, 0x000000CE, 0x00010000, 0x002E0046, 0x000000A0, 0x000000BA, 0x00000001, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x00000096, 0x00000000, 0x0000001E, 0x00000001, 0x00000000, 0x00010000, 0x002E0047, 0x000000A0, 0x000000CB, 0x00000001, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x00000096, 0x00000000, 0x0000001E, 0x00000001, 0x000000CE, 0x00010000, 0x002E0048, 0x000000A0, 0x000000BA, 0x00000001, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x00000096, 0x00000000, 0x0000001E, 0x00000001, 0x00000000, 0x00010000, 0x002E0049, 0x000000A0, 0x000000CB, 0x00000001, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x00000096, 0x00000000, 0x0000001E, 0x00000001, 0x000000CE, 0x00010000, 0x002E004A, 0x000000A0, 0x000000BA, 0x00000001, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x00000096, 0x00000000, 0x0000001E, 0x00000001, 0x00000000, 0x00010000, 0x002E004B, 0x000000A0, 0x000000CB, 0x00000001, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x00000096, 0x00000000, 0x0000001E, 0x00000001, 0x000000CE, 0x00010000, 0x002E004C, 0x000000A0, 0x000000BA, 0x00000001, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x00000088, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00010000, 0x002E004D, 0x000000A0, 0x000000CB, 0x00000001, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x00000088, 0x00000000, 0x0000001E, 0x00000000, 0x000000CE, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000028, 0x00000000, 0x002E004E, 0x000000A0, 0x000000C3, 0x00000001, 0x00000000, 0x00000028, 0x00000000, 0x00000000, 0x00000088, 0x00000000, 0x0000001E, 0x00000000, 0x000000CE, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000028, 0x00000000, 0x002E0050, 0x000000A0, 0x000000C3, 0x00000001, 0x00000000, 0x00000028, 0x00000000, 0x00000000, 0x00000088, 0x00000000, 0x0000001E, 0x00000000, 0x000000CE, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000028, 0x00000000, 0x002E004F, 0x000000A0, 0x000000BF, 0x00000001, 0x00000000, 0x00000028, 0x00000000, 0x00000000, 0x00000088, 0x00000000, 0x0000001E, 0x00000000, 0x000000CE, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000028, 0x00000000, 0x002E006F, 0x000000A0, 0x000000C3, 0x00000001, 0x00000000, 0x00000028, 0x00000000, 0x00000000, 0x00000088, 0x00000000, 0x0000001E, 0x00000000, 0x000000CE, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000028, 0x00000000, 0x002E0069, 0x000000A0, 0x000000BF, 0x00000001, 0x00000000, 0x00000028, 0x00000000, 0x00000000, 0x00000088, 0x00000000, 0x0000001E, 0x00000000, 0x000000CE, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000028, 0x00000000, 0x002E0079, 0x000000A0, 0x000000BF, 0x00000001, 0x00000000, 0x00000028, 0x00000000, 0x00000000, 0x00000088, 0x00000000, 0x0000001E, 0x00000000, 0x000000CE, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000028, 0x00000000, 0x002E007A, 0x000000A0, 0x000000BF, 0x00000001, 0x00000000, 0x00000028, 0x00000000, 0x00000000, 0x00000088, 0x00000000, 0x0000001E, 0x00000000, 0x000000CE, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000028, 0x00000000, 0x002E007B, 0x000000A0, 0x000000B6, 0x00000001, 0x00000000, 0x00000028, 0x00000000, 0x00000000, 0x00000096, 0x00000000, 0x0000001E, 0x00000001, 0x00000000, 0x00010000, 0x002E007C, 0x000000A0, 0x000000C3, 0x00000001, 0x00000000, 0x00000028, 0x00000000, 0x00000000, 0x00000096, 0x00000000, 0x0000001E, 0x00000001, 0x00000000, 0x00010000, 0x002E007D, 0x000000A0, 0x000000D0, 0x00000001, 0x00000000, 0x00000028, 0x00000000, 0x00000000, 0x00000096, 0x00000000, 0x0000001E, 0x00000001, 0x000000CE, 0x00010000, 0x002E007E, 0x000000A0, 0x000000B6, 0x00000001, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x00000088, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00010000, 0x002E007F, 0x000000A0, 0x000000C3, 0x00000001, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x00000088, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00010000, 0x002E0080, 0x000000A0, 0x000000D0, 0x00000001, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x00000088, 0x00000000, 0x0000001E, 0x00000000, 0x000000CE, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000028, 0x00000000, 0x002E0081, 0x000000A0, 0x000000B6, 0x00000001, 0x00000000, 0x00000028, 0x00000000, 0x00000000, 0x00000096, 0x00000000, 0x0000001E, 0x00000001, 0x00000000, 0x00010000, 0x002E0082, 0x000000A0, 0x000000C3, 0x00000001, 0x00000000, 0x00000028, 0x00000000, 0x00000000, 0x00000096, 0x00000000, 0x0000001E, 0x00000001, 0x00000000, 0x00010000, 0x002E0083, 0x000000A0, 0x000000D0, 0x00000001, 0x00000000, 0x00000028, 0x00000000, 0x00000000, 0x00000096, 0x00000000, 0x0000001E, 0x00000001, 0x000000CE, 0x00010000, 0x002E0084, 0x000000A0, 0x000000BF, 0x00000001, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x00000088, 0x00000000, 0x0000001E, 0x00000000, 0x000000CE, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000028, 0x00000000, 0x002E0077, 0x000000A0, 0x000000BF, 0x00000001, 0x00000000, 0x00000028, 0x00000000, 0x00000000, 0x00000088, 0x00000000, 0x0000001E, 0x00000000, 0x000000CE, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000028, 0x00000000, 0x002E0067, 0x000000A0, 0x000000BA, 0x00000001, 0x00000000, 0x00000028, 0x00000000, 0x00000000, 0x00000096, 0x00000000, 0x0000001E, 0x00000001, 0x00000000, 0x00010000, 0x002E0074, 0x000000A0, 0x000000CB, 0x00000001, 0x00000000, 0x00000028, 0x00000000, 0x00000000, 0x00000096, 0x00000000, 0x0000001E, 0x00000001, 0x000000CE, 0x00010000, 0x002E0056, 0x000000A0, 0x000000B6, 0x00000001, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x00000088, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00010000, 0x002E0057, 0x000000A0, 0x000000C3, 0x00000001, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x00000088, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00010000, 0x002E0058, 0x000000A0, 0x000000D0, 0x00000001, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x00000088, 0x00000000, 0x0000001E, 0x00000000, 0x000000CE, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000001, end_00_InitCredits, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, end_00_ShowCreditList, D_80242DE4_DF97E4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, end_00_ShowCreditList, D_80243474_DF9E74, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, end_00_ShowCreditList, D_80242D74_DF9774, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_end/end_00/DFB0B0.data.s b/ver/us/asm/data/world/area_end/end_00/DFB0B0.data.s deleted file mode 100644 index 4c99c40831..0000000000 --- a/ver/us/asm/data/world/area_end/end_00/DFB0B0.data.s +++ /dev/null @@ -1,81 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802446B0_DFB0B0 -.word 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFF3F8, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFF3F8, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244724_DFB124 -.word 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xF21A5A80, 0x00000000, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xF24A7A80, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802427D8_DF91D8, 0x00000043, 0x00000005, TranslateGroup, 0x00000006, 0xFE363C81, 0x00000000, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C81, 0xF24A7D2B, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, end_00_SetNpcShadowScale, 0xFE363C80, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFE363C80, 0x00010000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80242898_DF9298, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244814_DFB214 -.word 0x00000043, 0x00000003, EnableTexPanning, 0x00000011, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000007, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000013, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000015, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000008, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000017, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000019, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000009, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000001B, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000001D, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000000A, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000001F, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000021, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000000B, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000023, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000025, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000000C, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000027, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000029, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000000D, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000002B, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000002D, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000000E, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000002F, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000031, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000000F, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000033, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x0000012C, 0x0000000D, 0x00000002, 0xFE363C80, 0x00020000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFE0000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244AE4_DFB4E4 -.word 0x00000043, 0x00000003, EnableTexPanning, 0x00000002, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00008000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000002, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000010, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244B64_DFB564 -.word 0x00000043, 0x00000003, EnableTexPanning, 0x0000004F, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000003, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFCE, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFCE, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000003, 0x00000001, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244C60_DFB660 -.word 0x00680002, 0x00680006, 0x00680009, 0x00680001, 0x00680004, 0xFFFFFFFF - -dlabel D_80244C78_DFB678 -.word 0x00A70008, 0x00A70009, 0x00A7000A, 0x00A7000B, 0x00A7000C, 0x00A7000D, 0xFFFFFFFF - -dlabel D_80244C94_DFB694 -.word 0x00BD0004, 0x00BD0005, 0x00BD0006, 0x00BD0007, 0x00BD0001, 0xFFFFFFFF - -dlabel D_80244CAC_DFB6AC -.word 0x00940004, 0x00940003, 0x00940006, 0xFFFFFFFF - -dlabel D_80244CBC_DFB6BC -.word 0x00670005, 0x00670003, 0xFFFFFFFF - -dlabel D_80244CC8_DFB6C8 -.word 0x00630000, 0x00630006, 0x00630009, 0xFFFFFFFF - -dlabel D_80244CD8_DFB6D8 -.word 0x00C40003, 0xFFFFFFFF - -dlabel D_80244CE0_DFB6E0 -.word 0x00790004, 0xFFFFFFFF - -dlabel D_80244CE8_DFB6E8 -.word 0x007C0001, 0x007C0002, 0x007C0003, 0x007C0007, 0x007C0008, 0x007C0009, 0x007C0026, 0x007C0027, 0x007C0028, 0xFFFFFFFF - -dlabel D_80244D10_DFB710 -.word 0x007D0001, 0x007D0006, 0x007D000A, 0xFFFFFFFF - -dlabel D_80244D20_DFB720 -.word 0x00C10002, 0x00C1000B, 0x00C10008, 0x00C10000, 0x00C10001, 0x00C1000C, 0x00C10003, 0xFFFFFFFF - -dlabel D_80244D40_DFB740 -.word 0x00240002, 0x00240005, 0x00240006, 0x00240007, 0x0024000B, 0xFFFFFFFF - -dlabel D_80244D58_DFB758 -.word 0x00600014, 0x0060000C, 0x0060000E, 0x0060000F, 0x00600012, 0x00600007, 0xFFFFFFFF - -dlabel end_00_ParadeNpcsTable -.word 0x00D90002, 0x00000000, 0xC5340000, 0x00000000, 0x00000000, 0x43870000, 0x00DF0002, 0x00000000, 0xC5340000, 0x00000000, 0xC1A00000, 0x43870000, 0x00DF0002, 0x00000000, 0xC5340000, 0x00000000, 0x41A00000, 0x43870000, 0x00DF0003, 0x00000000, 0xC530E000, 0x00000000, 0xC1A00000, 0x43870000, 0x00DF0003, 0x00000000, 0xC530E000, 0x00000000, 0x41A00000, 0x43870000, 0x00DF0004, 0x00000000, 0xC52DC000, 0x00000000, 0xC1A00000, 0x43870000, 0x00DF0004, 0x00000000, 0xC52DC000, 0x00000000, 0x41A00000, 0x43870000, 0x00DA0000, 0x00000000, 0xC5219000, 0x428C0000, 0x41700000, 0x43870000, 0x00DA0001, 0x00000000, 0xC51D5000, 0x42200000, 0x40E00000, 0x42B40000, 0x00DA0002, 0x00000000, 0xC51E8000, 0x42480000, 0x42180000, 0x43870000, 0x00DA0003, 0x00000000, 0xC51D3000, 0x42A00000, 0x40A00000, 0x43870000, 0x00DA0004, 0x00000000, 0xC51AB000, 0x42600000, 0x00000000, 0x43870000, 0x00DA0005, 0x00000000, 0xC520F000, 0x41A00000, 0x42400000, 0x43870000, 0x00DA0006, 0x00000000, 0xC520A000, 0x42740000, 0x40E00000, 0x42B40000, 0x00DA0007, 0x00000000, 0xC524B000, 0x42200000, 0x00000000, 0x43870000, 0x00DF0005, 0x00000000, 0xC512E000, 0x00000000, 0x00000000, 0x43870000, 0x00DF0005, 0x00000000, 0xC50FC000, 0x00000000, 0x00000000, 0x43870000, 0x00DF0005, 0x00000000, 0xC50CA000, 0x00000000, 0x00000000, 0x43870000, 0x00DF0009, 0x00000000, 0x00000000, 0xC3FA0000, 0x00000000, 0x43870000, 0x00DF0009, 0x00000000, 0x00000000, 0xC3FA0000, 0x00000000, 0x43870000, 0x00DF0009, 0x00000000, 0x00000000, 0xC3FA0000, 0x00000000, 0x43870000, 0x00AF0002, 0x00000000, 0xC5048000, 0x00000000, 0x00000000, 0x43870000, 0x00850001, 0x00000000, 0xC5016000, 0x00000000, 0x00000000, 0x43870000, 0x0066011A, 0x00000000, 0xC4E88000, 0x42820000, 0x41200000, 0x43870000, 0x0066001A, 0x00000000, 0xC4E60000, 0x42820000, 0x41200000, 0x42B40000, 0x0066021A, 0x00000000, 0xC4E9C000, 0x41400000, 0x42140000, 0x43870000, 0x0066031A, 0x00000000, 0xC4E4C000, 0x41400000, 0x42140000, 0x42B40000, 0x002C0005, 0x00000000, 0xC4DAC000, 0x00000000, 0x422C0000, 0x43870000, 0x002C0005, 0x00000000, 0xC4D70000, 0x00000000, 0x422C0000, 0x43870000, 0x002C0005, 0x00000000, 0xC4D34000, 0x00000000, 0x422C0000, 0x43870000, 0x002C0005, 0x00000000, 0xC4CF8000, 0x00000000, 0x422C0000, 0x43870000, 0x00DC0001, 0x00000000, 0xC4C26000, 0x42340000, 0xC33E0000, 0x43870000, 0x00DC0004, 0x00000000, 0xC4C4E000, 0x42340000, 0xC3520000, 0x43870000, 0x00A7000A, D_80244C78_DFB678, 0xC4DDE000, 0x00000000, 0x40000000, 0x42B40000, 0x00A7000A, D_80244C78_DFB678, 0xC4D98000, 0x00000000, 0x40000000, 0x42B40000, 0x00BD0004, D_80244C94_DFB694, 0xC49B0000, 0x00000000, 0xC0000000, 0x43870000, 0x00940004, D_80244CAC_DFB6AC, 0xC4974000, 0x00000000, 0xC0000000, 0x43870000, 0x00940004, D_80244CAC_DFB6AC, 0xC4938000, 0x00000000, 0xC0000000, 0x43870000, 0x00680002, D_80244C60_DFB660, 0xC4820000, 0x00000000, 0x41F00000, 0x43870000, 0x00690003, 0x00000000, 0xC47A0000, 0x00000000, 0x41F00000, 0x43870000, 0x00670005, D_80244CBC_DFB6BC, 0xC455C000, 0x428C0000, 0xC30C0000, 0x43870000, 0x00DD0002, 0x00000000, 0xC45AC000, 0x428C0000, 0xC3250000, 0x43870000, 0x00DD0002, 0x00000000, 0xC455C000, 0x428C0000, 0xC3200000, 0x42B40000, 0x00DD0002, 0x00000000, 0xC450C000, 0x428C0000, 0xC3250000, 0x42B40000, 0x00BF0001, 0x00000000, 0xC4228000, 0x41A00000, 0x00000000, 0x43870000, 0x00680002, D_80244C60_DFB660, 0x00000000, 0xC3FA0000, 0x00000000, 0x42B40000, 0x00690003, 0x00000000, 0x00000000, 0xC3FA0000, 0x00000000, 0x42B40000, 0x00690003, 0x00000000, 0x00000000, 0xC3FA0000, 0x00000000, 0x42B40000, 0x00690003, 0x00000000, 0x00000000, 0xC3FA0000, 0x00000000, 0x42B40000, 0x00E40000, 0x00000000, 0xC39B0000, 0x420C0000, 0x00000000, 0x43870000, 0x0095000D, 0x00000000, 0x00000000, 0xC3FA0000, 0x00000000, 0x42B40000, 0x0095000D, 0x00000000, 0x00000000, 0xC3FA0000, 0x00000000, 0x42B40000, 0x0095000D, 0x00000000, 0x00000000, 0xC3FA0000, 0x00000000, 0x42B40000, 0x006C0001, 0x00000000, 0x00000000, 0xC3FA0000, 0x00000000, 0x43870000, 0x00630000, D_80244CC8_DFB6C8, 0xC28C0000, 0x43020000, 0xC2700000, 0x43870000, 0x00620004, 0x00000000, 0xC2DC0000, 0x00000000, 0xC1E00000, 0x42B40000, 0x00620104, 0x00000000, 0xC1F00000, 0x00000000, 0xC2000000, 0x43870000, 0x00DB0005, 0x00000000, 0x43540000, 0x42200000, 0x420C0000, 0x43870000, 0x00DB0006, 0x00000000, 0x43770000, 0x42200000, 0x420C0000, 0x43870000, 0x00DB0007, 0x00000000, 0x438D0000, 0x42200000, 0x420C0000, 0x42B40000, 0x00DB0008, 0x00000000, 0x43880000, 0x42480000, 0x41C80000, 0x42B40000, 0x00DB0009, 0x00000000, 0x43680000, 0x42480000, 0x41C80000, 0x43870000, 0x00C40003, D_80244CD8_DFB6D8, 0x43B28000, 0xC2F00000, 0xC1F00000, 0x42B40000, 0x00790004, D_80244CE0_DFB6E0, 0x43FD8000, 0x42480000, 0xC0A00000, 0x42B40000, 0x00970002, 0x00000000, 0x440E8000, 0x42480000, 0x00000000, 0x42B40000, 0x00970103, 0x00000000, 0x00000000, 0xC3FA0000, 0x00000000, 0x42B40000, 0x00970203, 0x00000000, 0x00000000, 0xC3FA0000, 0x00000000, 0x42B40000, 0x00970303, 0x00000000, 0x00000000, 0xC3FA0000, 0x00000000, 0x42B40000, 0x00970403, 0x00000000, 0x00000000, 0xC3FA0000, 0x00000000, 0x42B40000, 0x007C0001, D_80244CE8_DFB6E8, 0x44848000, 0x42A00000, 0x00000000, 0x43870000, 0x007C0002, D_80244CE8_DFB6E8, 0x44848000, 0x42A00000, 0x00000000, 0x43870000, 0x007C0003, D_80244CE8_DFB6E8, 0x44848000, 0x42A00000, 0x00000000, 0x43870000, 0x007D0001, D_80244D10_DFB710, 0x44750000, 0x42700000, 0x00000000, 0x43870000, 0x007D0001, D_80244D10_DFB710, 0x448E8000, 0x42700000, 0x00000000, 0x43870000, 0x00C10002, D_80244D20_DFB720, 0x449EC000, 0x00000000, 0xC1A00000, 0x43870000, 0x004E000A, 0x00000000, 0x00000000, 0xC3FA0000, 0x00000000, 0x42B40000, 0x004E000A, 0x00000000, 0x00000000, 0xC3FA0000, 0x00000000, 0x42B40000, 0x007F000E, 0x00000000, 0x44B40000, 0x00000000, 0x00000000, 0x43870000, 0x007F000E, 0x00000000, 0x44C80000, 0x00000000, 0x00000000, 0x43870000, 0x007F000A, 0x00000000, 0x44FA0000, 0x42C80000, 0x00000000, 0x43870000, 0x007F000B, 0x00000000, 0x45002000, 0x42C80000, 0x00000000, 0x43870000, 0x007F000C, 0x00000000, 0x45034000, 0x42C80000, 0x00000000, 0x43870000, 0x00600014, D_80244D58_DFB758, 0x45070000, 0x42700000, 0x00000000, 0x43870000, 0x00240006, D_80244D40_DFB740, 0x4500C000, 0x00000000, 0x00000000, 0x42B40000, 0x00D70000, 0x00000000, 0x45156000, 0x41200000, 0x00000000, 0x43870000, 0x00D70001, 0x00000000, 0x45156000, 0x41200000, 0x00000000, 0x43870000, 0x00D70002, 0x00000000, 0x450FC000, 0x00000000, 0x00000000, 0x43870000, 0x00D70002, 0x00000000, 0x450D4000, 0x00000000, 0x00000000, 0x43870000, 0x00D70003, 0x00000000, 0x451B0000, 0x00000000, 0x00000000, 0x43870000, 0x00D70003, 0x00000000, 0x451D8000, 0x00000000, 0x00000000, 0x43870000, 0x00D80000, 0x00000000, 0x00000000, 0xC3FA0000, 0x00000000, 0x43870000, 0x00D80002, 0x00000000, 0x00000000, 0xC3FA0000, 0x00000000, 0x43870000 - -dlabel D_80245614_DFC014 -.word 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000000, 0x00000043, 0x00000003, func_80242744_DF9144, 0x00025000, 0xFE363C80, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000001, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000002, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000003, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000004, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000005, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000006, 0x00000043, 0x00000002, func_802427A4_DF91A4, 0xFE363C80, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFF4E3, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000000, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000007, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000008, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000009, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000000A, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000000B, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000000C, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000000D, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000000E, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFF60A, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000001, 0x00000043, 0x00000002, DeleteNpc, 0x00000002, 0x00000043, 0x00000002, DeleteNpc, 0x00000003, 0x00000043, 0x00000002, DeleteNpc, 0x00000004, 0x00000043, 0x00000002, DeleteNpc, 0x00000005, 0x00000043, 0x00000002, DeleteNpc, 0x00000006, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, func_80242744_DF9144, 0x00025000, 0xFE363C80, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000000F, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000010, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000011, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000012, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000013, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000014, 0x00000043, 0x00000002, func_802427A4_DF91A4, 0xFE363C80, 0x00000008, 0x00000001, 0x0000003C, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFF704, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000007, 0x00000043, 0x00000002, DeleteNpc, 0x00000008, 0x00000043, 0x00000002, DeleteNpc, 0x00000009, 0x00000043, 0x00000002, DeleteNpc, 0x0000000A, 0x00000043, 0x00000002, DeleteNpc, 0x0000000B, 0x00000043, 0x00000002, DeleteNpc, 0x0000000C, 0x00000043, 0x00000002, DeleteNpc, 0x0000000D, 0x00000043, 0x00000002, DeleteNpc, 0x0000000E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000015, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000016, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFF7EA, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x0000000F, 0x00000043, 0x00000002, DeleteNpc, 0x00000010, 0x00000043, 0x00000002, DeleteNpc, 0x00000011, 0x00000043, 0x00000002, DeleteNpc, 0x00000012, 0x00000043, 0x00000002, DeleteNpc, 0x00000013, 0x00000043, 0x00000002, DeleteNpc, 0x00000014, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, func_80242744_DF9144, 0x0000B000, 0xFE363C80, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000017, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000018, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000019, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000001A, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000001B, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000001C, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000001D, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000001E, 0x00000043, 0x00000002, func_802427A4_DF91A4, 0xFE363C80, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFF89E, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000015, 0x00000043, 0x00000002, DeleteNpc, 0x00000016, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000001F, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000020, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFA24, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000017, 0x00000043, 0x00000002, DeleteNpc, 0x00000018, 0x00000043, 0x00000002, DeleteNpc, 0x00000019, 0x00000043, 0x00000002, DeleteNpc, 0x0000001A, 0x00000043, 0x00000002, DeleteNpc, 0x0000001B, 0x00000043, 0x00000002, DeleteNpc, 0x0000001C, 0x00000043, 0x00000002, DeleteNpc, 0x0000001D, 0x00000043, 0x00000002, DeleteNpc, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, func_80242744_DF9144, 0x00019F00, 0xFE363C80, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000026, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000021, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000022, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000023, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000024, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000025, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000027, 0x00000043, 0x00000003, func_80242744_DF9144, 0x00007000, 0xFE363C8F, 0x00000043, 0x00000002, func_802427A4_DF91A4, 0xFE363C80, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFB64, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x0000001F, 0x00000043, 0x00000002, DeleteNpc, 0x00000020, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000028, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000029, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000002A, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000002B, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFC40, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000026, 0x00000043, 0x00000002, DeleteNpc, 0x00000021, 0x00000043, 0x00000002, DeleteNpc, 0x00000022, 0x00000043, 0x00000002, DeleteNpc, 0x00000023, 0x00000043, 0x00000002, DeleteNpc, 0x00000024, 0x00000043, 0x00000002, DeleteNpc, 0x00000025, 0x00000043, 0x00000002, DeleteNpc, 0x00000027, 0x00000043, 0x00000002, func_802427A4_DF91A4, 0xFE363C8F, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, func_80242744_DF9144, 0x00011F00, 0xFE363C80, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000002D, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000002E, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000002F, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000030, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000002C, 0x00000043, 0x00000003, func_80242744_DF9144, 0x0000A000, 0xFE363C8F, 0x00000043, 0x00000002, func_802427A4_DF91A4, 0xFE363C80, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFDE4, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000028, 0x00000043, 0x00000002, DeleteNpc, 0x00000029, 0x00000043, 0x00000002, DeleteNpc, 0x0000002A, 0x00000043, 0x00000002, DeleteNpc, 0x0000002B, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000035, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000032, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000033, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000034, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000031, 0x00000043, 0x00000003, end_00_SetNpcShadowScale, 0x00000031, 0xF24A8A80, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000031, 0x00010000, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFECA, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x0000002C, 0x00000043, 0x00000002, DeleteNpc, 0x0000002D, 0x00000043, 0x00000002, DeleteNpc, 0x0000002E, 0x00000043, 0x00000002, DeleteNpc, 0x0000002F, 0x00000043, 0x00000002, DeleteNpc, 0x00000030, 0x00000043, 0x00000002, func_802427A4_DF91A4, 0xFE363C8F, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, func_80242744_DF9144, 0x0000F000, 0xFE363C80, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000036, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000037, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000038, 0x00000043, 0x00000002, func_802427A4_DF91A4, 0xFE363C80, 0x00000043, 0x00000003, end_00_SetNpcShadowScale, 0x00000036, 0xF24A8680, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000036, 0x00010000, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFFCB, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000031, 0x00000043, 0x00000002, DeleteNpc, 0x00000032, 0x00000043, 0x00000002, DeleteNpc, 0x00000033, 0x00000043, 0x00000002, DeleteNpc, 0x00000034, 0x00000043, 0x00000002, DeleteNpc, 0x00000035, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000003E, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000003F, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000039, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000003A, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000003B, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000003C, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000003D, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x000002EE, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000036, 0x00000043, 0x00000002, DeleteNpc, 0x00000037, 0x00000043, 0x00000002, DeleteNpc, 0x00000038, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, func_80242744_DF9144, 0x00020000, 0xFE363C80, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000040, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000041, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000042, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000043, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000044, 0x00000043, 0x00000002, func_802427A4_DF91A4, 0xFE363C80, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000320, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000039, 0x00000043, 0x00000002, DeleteNpc, 0x0000003A, 0x00000043, 0x00000002, DeleteNpc, 0x0000003B, 0x00000043, 0x00000002, DeleteNpc, 0x0000003C, 0x00000043, 0x00000002, DeleteNpc, 0x0000003D, 0x00000043, 0x00000002, DeleteNpc, 0x0000003E, 0x00000043, 0x00000002, DeleteNpc, 0x0000003F, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000045, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000046, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000047, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000004A, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000048, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000049, 0x00000043, 0x00000003, end_00_SetNpcShadowScale, 0x00000045, 0xF24A9280, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000045, 0x00010000, 0x00000001, 0x00000043, 0x00000003, end_00_SetNpcShadowScale, 0x0000004A, 0xF24A8680, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000004A, 0x00010000, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x000004B0, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000040, 0x00000043, 0x00000002, DeleteNpc, 0x00000041, 0x00000043, 0x00000002, DeleteNpc, 0x00000042, 0x00000043, 0x00000002, DeleteNpc, 0x00000043, 0x00000043, 0x00000002, DeleteNpc, 0x00000044, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, func_80242744_DF9144, 0x00002000, 0xFE363C80, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000004D, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000004E, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000004F, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000050, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000051, 0x00000043, 0x00000002, func_802427A4_DF91A4, 0xFE363C80, 0x00000043, 0x00000003, end_00_SetNpcShadowScale, 0x0000004D, 0xF24A8280, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000004D, 0x00010000, 0x00000001, 0x00000043, 0x00000003, end_00_SetNpcShadowScale, 0x0000004E, 0xF24A8280, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000004E, 0x00010000, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000546, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000045, 0x00000043, 0x00000002, DeleteNpc, 0x00000046, 0x00000043, 0x00000002, DeleteNpc, 0x00000047, 0x00000043, 0x00000002, DeleteNpc, 0x0000004A, 0x00000043, 0x00000002, DeleteNpc, 0x00000048, 0x00000043, 0x00000002, DeleteNpc, 0x00000049, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000004B, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000004C, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000744, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x0000004D, 0x00000043, 0x00000002, DeleteNpc, 0x0000004E, 0x00000043, 0x00000002, DeleteNpc, 0x0000004F, 0x00000043, 0x00000002, DeleteNpc, 0x00000050, 0x00000043, 0x00000002, DeleteNpc, 0x00000051, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000053, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000052, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x000007A8, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x0000004B, 0x00000043, 0x00000002, DeleteNpc, 0x0000004C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000054, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000055, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000056, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000057, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000058, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000059, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000005A, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000005B, 0x00000043, 0x00000003, end_00_SetNpcShadowScale, 0x00000054, 0xF24A8680, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000054, 0x00010000, 0x00000001, 0x00000043, 0x00000003, end_00_SetNpcShadowScale, 0x0000005A, 0xF24A8680, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000005A, 0x00010000, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000055, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x0000005B, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246ADC_DFD4DC -.word 0x00000008, 0x00000001, 0x000000F0, 0x00000044, 0x00000001, 0x8024462C, 0x00000044, 0x00000001, 0x80244688, 0x00000044, 0x00000001, 0x80244648, 0x00000044, 0x00000001, 0x80244668, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000044, 0x00000001, D_80244AE4_DFB4E4, 0x00000044, 0x00000001, D_80244B64_DFB564, 0x00000044, 0x00000001, D_802446B0_DFB0B0, 0x00000044, 0x00000001, D_80245614_DFC014, 0x00000045, 0x00000002, D_80247230_DFDC30, 0xFE363C8A, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000055, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000044, 0x00000001, D_80246ADC_DFD4DC, 0x00000044, 0x00000001, D_80244724_DFB124, 0x00000044, 0x00000001, D_80244814_DFB214, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFF4E3, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000044, 0x00000001, D_80247418_DFDE18, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFF60A, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000044, 0x00000001, D_802479C4_DFE3C4, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFF79A, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000044, 0x00000001, 0x80248928, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFF7D6, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000044, 0x00000001, 0x80248BAC, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFA24, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000044, 0x00000001, 0x80249040, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFAB5, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000044, 0x00000001, 0x80249A38, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFD08, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000044, 0x00000001, 0x80249EA4, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFC40, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000044, 0x00000001, 0x8024A044, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFECA, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000044, 0x00000001, 0x8024A804, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFFCB, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000044, 0x00000001, 0x8024AD30, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x000002EE, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000044, 0x00000001, 0x8024C38C, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x000004B0, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000044, 0x00000001, 0x8024CC78, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000744, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000044, 0x00000001, 0x8024D834, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000A14, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x8024E958, 0x00000000, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000001F4, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247230_DFDC30 -.word 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000008, 0x00000001, 0x00000050, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000009, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x00000011, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFF3F8, 0x00000000, 0x00000078, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00D90001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000005, 0x00000001, 0x00000004, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x00000014, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00D90004, 0x00000008, 0x00000001, 0x0000001E, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00D90003, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000090, 0x00000000, 0x00000008, 0x00000008, 0x00000001, 0x00000078, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247418_DFDE18 -.word 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000003, 0xFFFFF60F, 0x000000C8, 0x00000000, 0x00000001, 0x00000320, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000007, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000009, 0x00000000, 0x00000058, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFFFFF61E, 0x0000005F, 0x00000005, 0x00000001, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x0000000D, 0xF24A7E80, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x0000000D, 0xFFFFF60A, 0x00000023, 0x00000007, 0x0000000F, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, NpcJump0, 0x0000000D, 0xFFFFF5F6, 0x0000003D, 0x00000007, 0x0000000F, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFF704, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247600_DFE000 -.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFE363C81, 0xF24A7C80, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFE363C80, 0x00DF0005, 0x00000008, 0x00000001, 0x0000001E, 0x00000058, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C80, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFF9, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000006, NpcJump0, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000028, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C81, 0x00000000, 0xFFFFFE0C, 0x00000000, 0x00000059, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFE363C80, 0x00DF0006, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFE363C80, 0x00DF0007, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFE363C80, 0x00DF0008, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFE363C80, 0x00DF0006, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFE363C80, 0x00DF0007, 0x00000008, 0x00000001, 0x00000005, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802477A0_DFE1A0 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFF7AE, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000015, 0x00AF0005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x00000015, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000050, 0x00000043, 0x0000000F, PlayEffect, 0x00000019, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000016, 0x00850003, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000015, 0x00AF0006, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000015, 0x00AF0002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000016, 0x00850001, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFF862, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000016, 0x0000005A, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000016, 0x00850005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000016, 0x0000010E, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000016, 0x00850001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802479C4_DFE3C4 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFF60A, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C81, 0x00000012, 0x00000045, 0x00000002, D_80247600_DFE000, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C80, 0x00000010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000013, 0x00000045, 0x00000002, D_80247600_DFE000, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C80, 0x00000011, 0x00000024, 0x00000002, 0xFE363C81, 0x00000014, 0x00000045, 0x00000002, D_80247600_DFE000, 0xFE363C8C, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFF704, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000044, 0x00000001, D_802477A0_DFE1A0, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFF7EA, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000049, 0x00000001, 0xFE363C8B, 0x00000049, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_end/end_00/DFE5B0.data.s b/ver/us/asm/data/world/area_end/end_00/DFE5B0.data.s deleted file mode 100644 index d76c6c0c3b..0000000000 --- a/ver/us/asm/data/world/area_end/end_00/DFE5B0.data.s +++ /dev/null @@ -1,45 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80247BB0_DFE5B0 -.word 0x00000043, 0x00000003, EnableModel, 0x0000004C, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x0000000F, 0xFFFFFFF1, 0x0000001E, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0x00000045, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFF1, 0x0000000F, 0x0000001E, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0x00000045, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247CF8_DFE6F8 -.word 0x00000043, 0x00000003, EnableNpcShadow, 0x00000017, 0x00000000, 0x00000008, 0x00000001, 0x00000096, 0x00000043, 0x00000005, GetNpcPos, 0x00000017, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000005, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x0000000F, PlayEffect, 0x0000001A, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000017, 0x00660120, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000017, 0x0066010E, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000017, 0xF24A7E80, 0x00000043, 0x00000005, GetNpcPos, 0x00000017, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000017, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000017, 0x0066010F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247E4C_DFE84C -.word 0x00000043, 0x00000003, EnableNpcShadow, 0x00000018, 0x00000000, 0x00000008, 0x00000001, 0x0000009B, 0x00000043, 0x00000005, GetNpcPos, 0x00000018, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFB, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x0000000F, PlayEffect, 0x0000001A, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000005F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000018, 0x00660020, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000018, 0x0066000E, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000018, 0xF24A7E80, 0x00000043, 0x00000005, GetNpcPos, 0x00000018, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000018, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000018, 0x0066000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247FA0_DFE9A0 -.word 0x00000043, 0x00000003, EnableNpcShadow, 0x00000019, 0x00000000, 0x00000008, 0x00000001, 0x000000A0, 0x00000043, 0x00000005, GetNpcPos, 0x00000019, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000005, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x0000000F, PlayEffect, 0x0000001A, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000005A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000019, 0x00660220, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000019, 0x0066020E, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000019, 0xF24A7E80, 0x00000043, 0x00000005, GetNpcPos, 0x00000019, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000019, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000019, 0x0066020F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802480F4_DFEAF4 -.word 0x00000043, 0x00000003, EnableNpcShadow, 0x0000001A, 0x00000000, 0x00000008, 0x00000001, 0x000000A5, 0x00000043, 0x00000005, GetNpcPos, 0x0000001A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFB, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x0000000F, PlayEffect, 0x0000001A, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000055, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000001A, 0x00660320, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000001A, 0x0066030E, 0x00000043, 0x00000003, SetNpcJumpscale, 0x0000001A, 0xF24A7E80, 0x00000043, 0x00000005, GetNpcPos, 0x0000001A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x0000001A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000001A, 0x0066030F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248248_DFEC48 -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000001B, 0x00008048, 0x00000001, 0x00000008, 0x00000001, 0x000000B4, 0x00000043, 0x00000005, NpcMoveTo, 0x0000001B, 0xFFFFF894, 0x0000002B, 0x00000046, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000001B, 0x002C000B, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000001B, 0x002C0014, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000001B, 0x002C0016, 0x00000043, 0x00000005, GetNpcPos, 0x0000001B, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000014, 0x00000003, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x0000001B, 0x00000000, 0x00000043, 0x00000008, NpcFlyTo, 0x0000001B, 0xFE363C80, 0x000000C8, 0xFE363C82, 0x0000000A, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000001B, 0xFFFFF8B2, 0x000000C8, 0x00000028, 0x00000043, 0x00000008, NpcFlyTo, 0x0000001B, 0xFFFFF8B2, 0x0000000C, 0x00000028, 0x00000014, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcYaw, 0x0000001B, 0x0000010E, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000001B, 0x002C0017, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248400_DFEE00 -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000001C, 0x00008048, 0x00000001, 0x00000008, 0x00000001, 0x000000B4, 0x00000043, 0x00000005, NpcMoveTo, 0x0000001C, 0xFFFFF8B2, 0x0000002B, 0x00000046, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000001C, 0x002C000B, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000001C, 0x002C0014, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000001C, 0x002C0016, 0x00000043, 0x00000005, GetNpcPos, 0x0000001C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000014, 0x00000003, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x0000001C, 0x00000000, 0x00000043, 0x00000008, NpcFlyTo, 0x0000001C, 0xFE363C80, 0x000000C8, 0xFE363C82, 0x0000000A, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000001C, 0xFFFFF8BC, 0x000000C8, 0x0000000D, 0x00000043, 0x00000008, NpcFlyTo, 0x0000001C, 0xFFFFF8BC, 0x00000041, 0x0000000D, 0x00000014, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcYaw, 0x0000001C, 0x0000010E, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000001C, 0x002C0017, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802485B8_DFEFB8 -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000001D, 0x00008048, 0x00000001, 0x00000008, 0x00000001, 0x000000B4, 0x00000043, 0x00000005, NpcMoveTo, 0x0000001D, 0xFFFFF8D0, 0x0000002B, 0x00000046, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000001D, 0x002C000B, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000001D, 0x002C0014, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000001D, 0x002C0016, 0x00000043, 0x00000005, GetNpcPos, 0x0000001D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000014, 0x00000003, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x0000001D, 0x00000000, 0x00000043, 0x00000008, NpcFlyTo, 0x0000001D, 0xFE363C80, 0x000000C8, 0xFE363C82, 0x0000000A, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000001D, 0xFFFFF8D0, 0x000000C8, 0x0000000D, 0x00000043, 0x00000008, NpcFlyTo, 0x0000001D, 0xFFFFF8D0, 0x00000041, 0x0000000D, 0x00000014, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcYaw, 0x0000001D, 0x0000005A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000001D, 0x002C0017, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248770_DFF170 -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000001E, 0x00008048, 0x00000001, 0x00000008, 0x00000001, 0x000000B4, 0x00000043, 0x00000005, NpcMoveTo, 0x0000001E, 0xFFFFF8EE, 0x0000002B, 0x00000046, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000001E, 0x002C000B, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000001E, 0x002C0014, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000001E, 0x002C0016, 0x00000043, 0x00000005, GetNpcPos, 0x0000001E, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000014, 0x00000003, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x0000001E, 0x00000000, 0x00000043, 0x00000008, NpcFlyTo, 0x0000001E, 0xFE363C80, 0x000000C8, 0xFE363C82, 0x0000000A, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000001E, 0xFFFFF8DA, 0x000000C8, 0x00000028, 0x00000043, 0x00000008, NpcFlyTo, 0x0000001E, 0xFFFFF8DA, 0x0000000C, 0x00000028, 0x00000014, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcYaw, 0x0000001E, 0x0000005A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000001E, 0x002C0017, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80247BB0_DFE5B0, 0xFE363C8A, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFF7EA, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, D_80247CF8_DFE6F8, 0x00000044, 0x00000001, D_80247E4C_DFE84C, 0x00000044, 0x00000001, D_80247FA0_DFE9A0, 0x00000044, 0x00000001, D_802480F4_DFEAF4, 0x00000044, 0x00000001, D_80248248_DFEC48, 0x00000044, 0x00000001, D_80248400_DFEE00, 0x00000044, 0x00000001, D_802485B8_DFEFB8, 0x00000044, 0x00000001, D_80248770_DFF170, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFF9C0, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248A78_DFF478 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000014, 0xFFFFFFEC, 0x00000028, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000056, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFEC, 0x00000014, 0x00000028, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000056, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80248A78_DFF478, 0xFE363C8A, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFF9CA, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000009, end_00_PlayFX3D, 0x00000000, 0xFFFFF9E3, 0xFE363C81, 0xFFFFFF38, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x0000001E, 0x00000043, 0x00000005, GetNpcPos, 0x0000001F, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, GetNpcPos, 0x00000020, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C83, 0x00000008, 0x00000043, 0x00000005, SetNpcPos, 0x0000001F, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C86, 0x00000008, 0x00000043, 0x00000005, SetNpcPos, 0x00000020, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000001F, 0x00DC0002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000020, 0x00DC0005, 0x00000058, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, end_00_UpdatePosFX3D, 0xFE363C80, 0xFFFFF9E3, 0xFE363C81, 0xFFFFFF38, 0x00000028, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x0000001F, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000020, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, end_00_UpdatePosFX3D, 0xFE363C80, 0xFFFFF9E3, 0xFE363C81, 0xFFFFFF38, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x0000001F, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000020, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFB5A, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, end_00_DisposeFX3D, 0xFE363C83, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248F30_DFF930 -.word 0x00000043, 0x00000005, GetNpcPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C81, 0x00000005, 0x00000001, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C81, 0xF24A7DFB, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000023, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C80, 0x00000005, 0x00000001, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A7DFB, 0x00000043, 0x00000005, SetNpcPos, 0x00000023, 0xFE363C80, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetNpcScale, 0x00000022, 0xF24A7D80, 0xF24A7D80, 0xF24A7D80, 0x00000056, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000021, 0xFFFFFA59, 0xFFFFFFFE, 0x000000C8, 0x00000024, 0x00000002, 0xFE363C80, 0x00000021, 0x00000045, 0x00000002, D_80248F30_DFF930, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000021, 0x00A70009, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000021, 0x00A7000C, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000021, 0x00A7000D, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000021, 0x00A70009, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000021, 0x00A7000C, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000021, 0x00A7000D, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000021, 0x00A70009, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000021, 0x00A7000A, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000005, NpcMoveTo, 0x00000021, 0xFFFFFCEF, 0xFFFFFFFE, 0x0000012C, 0x00000043, 0x00000005, SetNpcPos, 0x00000021, 0x00000000, 0xFFFFFE0C, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000022, 0xFFFFFA7C, 0xFFFFFFFE, 0x000000C8, 0x00000024, 0x00000002, 0xFE363C80, 0x00000022, 0x00000045, 0x00000002, D_80248F30_DFF930, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000022, 0x00A70009, 0x00000008, 0x00000001, 0x000000DC, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000022, 0x00A7000A, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000005, NpcMoveTo, 0x00000022, 0xFFFFFD12, 0xFFFFFFFE, 0x0000012C, 0x00000043, 0x00000005, SetNpcPos, 0x00000022, 0x00000000, 0xFFFFFE0C, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000023, 0xFFFFFA9C, 0x00000002, 0x000000B4, 0x00000024, 0x00000002, 0xFE363C80, 0x00000023, 0x00000045, 0x00000002, D_80248F30_DFF930, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000023, 0x00BD0001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000023, 0x00BD0007, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000023, 0x00BD0005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000023, 0x00BD0006, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000023, 0x0000005A, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000023, 0x00BD0005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000023, 0x00BD0006, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000023, 0x0000010E, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000023, 0x00BD0005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000023, 0x00BD0006, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000023, 0x00BD0007, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000023, 0x00BD0001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000023, 0x00BD0004, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000005, NpcMoveTo, 0x00000023, 0xFFFFFAB0, 0x00000002, 0x000000B4, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, NpcMoveTo, 0x00000024, 0xFFFFFAC2, 0x00000002, 0x000000B4, 0x00000024, 0x00000002, 0xFE363C80, 0x00000024, 0x00000045, 0x00000002, D_80248F30_DFF930, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000024, 0x00940003, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000024, 0x00940006, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000024, 0x00940003, 0x00000008, 0x00000001, 0x0000005A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000024, 0x00940004, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000005, NpcMoveTo, 0x00000024, 0xFFFFFACE, 0x00000002, 0x000000B4, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, NpcMoveTo, 0x00000025, 0xFFFFFAE0, 0x00000002, 0x000000B4, 0x00000024, 0x00000002, 0xFE363C80, 0x00000025, 0x00000045, 0x00000002, D_80248F30_DFF930, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000025, 0x00940003, 0x00000008, 0x00000001, 0x000000E6, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000025, 0x00940004, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000005, NpcMoveTo, 0x00000025, 0xFFFFFAEC, 0x00000002, 0x000000B4, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x000000F0, 0x00000043, 0x00000005, NpcMoveTo, 0x00000026, 0xFFFFF9FC, 0x0000001E, 0x0000003C, 0x00000008, 0x00000001, 0x000000D2, 0x00000043, 0x00000005, SetNpcPos, 0x00000026, 0xFFFFFABA, 0x00000000, 0x0000001E, 0x00000043, 0x00000003, SetNpcYaw, 0x00000026, 0x0000005A, 0x00000043, 0x00000005, NpcMoveTo, 0x00000026, 0xFFFFFBAA, 0x0000001E, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000026, 0x00680009, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x00000005, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000026, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x0000000A, ShowEmote, 0x00000026, 0x00000004, 0x00000000, 0x0000003C, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0x00000000, 0x00000005, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000026, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000026, 0x00680001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000026, 0x0000010E, 0x00000007, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000026, 0x0000005A, 0x00000007, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000026, 0x0000010E, 0x00000007, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000026, 0x00680004, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000026, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x00000026, 0xFFFFFB8C, 0x00000000, 0x0000001E, 0x0000000F, 0x00000043, 0x00000006, NpcJump0, 0x00000026, 0xFFFFFB6E, 0x00000000, 0x0000001E, 0x0000000F, 0x00000043, 0x00000006, NpcJump0, 0x00000026, 0xFFFFFB50, 0x00000000, 0x0000001E, 0x0000000F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x000000F0, 0x00000043, 0x00000005, NpcMoveTo, 0x00000027, 0xFFFFFA38, 0x0000001E, 0x0000003C, 0x00000008, 0x00000001, 0x000000D2, 0x00000043, 0x00000005, SetNpcPos, 0x00000027, 0xFFFFFA7E, 0x00000000, 0x0000001E, 0x00000043, 0x00000003, SetNpcYaw, 0x00000027, 0x0000005A, 0x00000043, 0x00000005, NpcMoveTo, 0x00000027, 0xFFFFFD4E, 0x0000001E, 0x0000005A, 0x00000043, 0x00000005, SetNpcPos, 0x00000027, 0x00000000, 0xFFFFFE0C, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802499FC_E003FC -.word 0xC4494000, 0x42C80000, 0xC2A00000, 0xC428C000, 0x42C80000, 0xC3660000, 0xC4494000, 0x42C80000, 0xC38C0000, 0xC469C000, 0x42C80000, 0xC3660000, 0xC4494000, 0x42C80000, 0xC2A00000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFB64, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x000000C8, 0x00000043, 0x0000000A, ShowEmote, 0x00000028, 0x00000001, 0x0000002D, 0x0000001E, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000028, 0x00670003, 0x00000043, 0x00000008, NpcFlyTo, 0x00000028, 0xFFFFFCA9, 0x00000064, 0xFFFFFF4C, 0x0000003C, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000029, 0x00DD0007, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000002A, 0x00DD0007, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000002B, 0x00DD0007, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000029, 0x00DD0005, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000002A, 0x00DD0006, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000002B, 0x00DD0005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000029, 0x00DD0003, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000002A, 0x00DD0004, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000002B, 0x00DD0003, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000028, 0x0000005A, 0x00000000, 0x00000043, 0x00000008, NpcFlyTo, 0x00000028, 0xFFFFFCDB, 0x00000064, 0xFFFFFFB0, 0x0000001E, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000028, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000028, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000006, 0x00000043, 0x00000005, LoadPath, 0x00000050, D_802499FC_E003FC, 0x00000005, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0x00000028, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80249D60_E00760 -.word 0x000000FF - -dlabel D_80249D64_E00764 -.word 0x00000043, 0x00000005, GetNpcPos, 0x00000031, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C80, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C80, 0x0000002D, 0x00000002, 0xFE363C83, 0xF24ADE80, 0x0000002C, 0x00000002, 0xFE363C84, 0xF24ADE80, 0x00000043, 0x00000005, SetNpcPos, 0x00000032, 0xFE363C80, 0x00000014, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0x00000033, 0xFE363C83, 0x00000014, 0xFFFFFFFE, 0x00000043, 0x00000005, SetNpcPos, 0x00000034, 0xFE363C84, 0x00000014, 0x00000002, 0x00000058, 0x00000000, 0x00000043, 0x00000002, func_80242898_DF9298, 0x00000032, 0x00000059, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000002, func_80242898_DF9298, 0x00000033, 0x00000059, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000002, func_80242898_DF9298, 0x00000034, 0x00000059, 0x00000000, 0x00000043, 0x00000002, func_80242898_DF9298, 0x00000031, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000002D, 0xFFFFFC40, 0x00000000, 0x0000001E, 0x00000043, 0x00000005, NpcMoveTo, 0x0000002D, 0xFFFFFF10, 0x0000001E, 0x0000005A, 0x00000043, 0x00000005, SetNpcPos, 0x0000002D, 0x00000000, 0xFFFFFE0C, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000002E, 0xFFFFFC04, 0x00000000, 0x0000001E, 0x00000043, 0x00000005, NpcMoveTo, 0x0000002E, 0xFFFFFED4, 0x0000001E, 0x0000005A, 0x00000043, 0x00000005, SetNpcPos, 0x0000002E, 0x00000000, 0xFFFFFE0C, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000002F, 0xFFFFFBE6, 0x00000000, 0x0000001E, 0x00000043, 0x00000005, NpcMoveTo, 0x0000002F, 0xFFFFFEB6, 0x0000001E, 0x0000005A, 0x00000043, 0x00000005, SetNpcPos, 0x0000002F, 0x00000000, 0xFFFFFE0C, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000030, 0xFFFFFBC8, 0x00000000, 0x0000001E, 0x00000043, 0x00000005, NpcMoveTo, 0x00000030, 0xFFFFFE98, 0x0000001E, 0x0000005A, 0x00000043, 0x00000005, SetNpcPos, 0x00000030, 0x00000000, 0xFFFFFE0C, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFDBC, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000002C, 0x0000005A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002C, 0x00000045, 0x00000002, 0x802447F4, 0xFE363C8A, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFDE4, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_80242B10_DF9510, 0x000000FF, 0x00000043, 0x00000007, func_802CFD30, 0x00000032, 0x00000007, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000033, 0x00000007, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000034, 0x00000007, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000032, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000033, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000034, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000031, 0xFFFFFE34, 0x00000000, 0x00000064, 0x00000045, 0x00000002, D_80249D64_E00764, 0xFE363C8B, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetNpcPos, 0x00000035, 0xFFFFFEFC, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000035, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x00000035, 0xFFFFFEDE, 0x00000000, 0x00000000, 0x0000000A, 0x00000043, 0x00000006, NpcJump0, 0x00000035, 0xFFFFFEC0, 0x00000000, 0x00000000, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x00000035, 0x00000045, 0x00000002, 0x802447F4, 0xFE363C8C, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000031, 0x0000005A, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000001E, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000007, func_802CFD30, 0x00000032, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000033, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000034, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000032, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000033, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000034, 0x00000001, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000035, 0x006C000B, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000002C, 0x00BF0009, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000032, 0x0095000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000033, 0x0095000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000034, 0x0095000E, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000006, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000035, 0x006C0016, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000035, 0x006C000B, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000056, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000002C, 0x0000010E, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000002C, 0x00BF0004, 0x00000043, 0x00000005, GetNpcPos, 0x0000002C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000005, NpcMoveTo, 0x0000002C, 0xFE363C80, 0xFE363C82, 0x0000003C, 0x00000057, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8B, 0x00000056, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000031, 0x0000010E, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000031, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000005, NpcMoveTo, 0x00000031, 0xFE363C80, 0xFE363C82, 0x0000003C, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000032, 0x0000010E, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000032, 0x00950005, 0x00000043, 0x00000005, GetNpcPos, 0x00000032, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000005, NpcMoveTo, 0x00000032, 0xFE363C80, 0xFE363C82, 0x0000003C, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000033, 0x0000010E, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000033, 0x00950005, 0x00000043, 0x00000005, GetNpcPos, 0x00000033, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000005, NpcMoveTo, 0x00000033, 0xFE363C80, 0xFE363C82, 0x0000003C, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000034, 0x0000010E, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000034, 0x00950005, 0x00000043, 0x00000005, GetNpcPos, 0x00000034, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000005, NpcMoveTo, 0x00000034, 0xFE363C80, 0xFE363C82, 0x0000003C, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000049, 0x00000001, 0xFE363C8C, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000035, 0x006C000B, 0x00000043, 0x00000005, GetNpcPos, 0x00000035, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000006, 0x00000028, 0x00000002, 0xFE363C80, 0x0000002D, 0x00000043, 0x00000006, NpcJump0, 0x00000035, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetNpcRotation, 0x00000036, 0x00000000, 0x00000000, 0x000000B4, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000008, 0x00000043, 0x00000005, NpcMoveTo, 0x00000037, 0xFFFFFFE2, 0xFFFFFFE4, 0x00000014, 0x00000043, 0x00000005, NpcMoveTo, 0x00000037, 0xFFFFFF92, 0xFFFFFFE4, 0x00000014, 0x00000006, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000037, 0xFFFFFFE2, 0xFFFFFFE4, 0x00000014, 0x00000043, 0x00000005, GetNpcPos, 0x00000037, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000037, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000008, 0x00000043, 0x00000005, NpcMoveTo, 0x00000038, 0xFFFFFF92, 0xFFFFFFE0, 0x00000014, 0x00000043, 0x00000005, NpcMoveTo, 0x00000038, 0xFFFFFFE2, 0xFFFFFFE0, 0x00000014, 0x00000006, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000038, 0xFFFFFF92, 0xFFFFFFE0, 0x00000014, 0x00000043, 0x00000005, GetNpcPos, 0x00000038, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000038, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000057, 0x00000000, 0x00000005, 0x00000001, 0x00000010, 0x00000043, 0x0000000A, ShowSweat, 0x00000037, 0x00000000, 0x0000002D, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x0000000A, ShowSweat, 0x00000038, 0x00000000, 0xFFFFFFD3, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x0000000A, ShowSweat, 0x00000037, 0x00000000, 0xFFFFFFD3, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x0000000A, ShowSweat, 0x00000038, 0x00000000, 0x0000002D, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000036, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000036, 0x00630006, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000036, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000050, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000004, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000036, 0x00000200, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000036, 0x00630009, 0x00000043, 0x00000005, MakeLerp, 0x000000B4, 0x00000168, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000036, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000036, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000036, 0xF24A7C80, 0x00000043, 0x00000006, NpcJump0, 0x00000036, 0xFE363C80, 0x00000000, 0x00000000, 0x00000014, 0x00000008, 0x00000001, 0x0000001E, 0x00000056, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000037, 0xFFFFFFE2, 0x00000000, 0x0000000F, 0x00000043, 0x00000005, NpcMoveTo, 0x00000037, 0xFFFFFF2E, 0x00000000, 0x000000B4, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000038, 0xFFFFFFE2, 0x00000000, 0x00000037, 0x00000043, 0x00000005, NpcMoveTo, 0x00000038, 0xFFFFFF56, 0x00000000, 0x0000008C, 0x00000057, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000036, 0xFFFFFF06, 0x00000000, 0x000000B4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x00000061, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000200, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000004, 0x00000001, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000005, SetNpcScale, 0x0000003E, 0xF24A8280, 0xF24A8280, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000008, NpcFlyTo, 0x0000003E, 0x00000165, 0x00000000, 0xFFFFFFE2, 0x0000000A, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000008, NpcFlyTo, 0x0000003E, 0x00000165, 0xFFFFFF88, 0xFFFFFFE2, 0x0000000A, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x0000003F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0x00000005, 0x00000027, 0x00000002, 0xFE363C81, 0x00000005, 0x00000043, 0x00000005, SetNpcPos, 0x0000003F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000005, 0x00000001, 0x0000000A, 0x00000028, 0x00000002, 0xFE363C80, 0x00000005, 0x00000028, 0x00000002, 0xFE363C81, 0x00000005, 0x00000043, 0x00000005, SetNpcPos, 0x0000003F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000320, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_end/end_00/E019E0.data.s b/ver/us/asm/data/world/area_end/end_00/E019E0.data.s deleted file mode 100644 index 02a220335f..0000000000 --- a/ver/us/asm/data/world/area_end/end_00/E019E0.data.s +++ /dev/null @@ -1,33 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_8024AFE0_E019E0 -.word 0x00000043, 0x00000005, GetNpcPos, 0x00000040, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C80, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C80, 0x0000002D, 0x00000002, 0xFE363C83, 0x00000028, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C80, 0x0000002D, 0x00000002, 0xFE363C84, 0x00000050, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C80, 0x0000002D, 0x00000002, 0xFE363C85, 0x00000078, 0x00000026, 0x00000002, 0xFE363C86, 0xFE363C80, 0x0000002D, 0x00000002, 0xFE363C86, 0x000000A0, 0x00000043, 0x00000005, SetNpcPos, 0x00000040, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000041, 0xFE363C83, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000042, 0xFE363C84, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000043, 0xFE363C85, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000044, 0xFE363C86, 0xFE363C81, 0xFE363C82, 0x00000058, 0x00000000, 0x00000043, 0x00000002, func_80242898_DF9298, 0x00000041, 0x00000059, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000002, func_80242898_DF9298, 0x00000042, 0x00000059, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000002, func_80242898_DF9298, 0x00000043, 0x00000059, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000002, func_80242898_DF9298, 0x00000044, 0x00000059, 0x00000000, 0x00000043, 0x00000002, func_80242898_DF9298, 0x00000040, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024B1B8_E01BB8 -.word 0x00000043, 0x00000005, GetNpcPos, 0x00000045, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C80, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C80, 0x0000002C, 0x00000002, 0xFE363C83, 0x00000050, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C80, 0x0000002D, 0x00000002, 0xFE363C84, 0x00000050, 0x00000043, 0x00000005, SetNpcPos, 0x00000045, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000046, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000047, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000048, 0xFE363C83, 0x0000003C, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000049, 0xFE363C84, 0x0000003C, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000002, func_80242898_DF9298, 0x00000046, 0x00000059, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000002, func_80242898_DF9298, 0x00000047, 0x00000059, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000002, func_80242898_DF9298, 0x00000048, 0x00000059, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000002, func_80242898_DF9298, 0x00000049, 0x00000059, 0x00000000, 0x00000043, 0x00000002, func_80242898_DF9298, 0x00000045, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024B350_E01D50 -.word 0x00000043, 0x00000003, SetNpcAnimation, 0x00000045, 0x007C0026, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000046, 0x007C0027, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000047, 0x007C0028, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000048, 0x007D000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000049, 0x007D000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024B3C4_E01DC4 -.word 0x00000043, 0x00000003, SetNpcAnimation, 0x00000045, 0x007C0007, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000046, 0x007C0008, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000047, 0x007C0009, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000048, 0x007D0006, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000049, 0x007D0006, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024B438_E01E38 -.word 0x00000043, 0x00000005, GetNpcPos, 0x00000045, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C83, 0x00000050, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C84, 0xFFFFFFB0, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFE, 0x00000043, 0x00000005, SetNpcPos, 0x00000045, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000046, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000047, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFFE, 0x00000043, 0x00000005, SetNpcPos, 0x00000048, 0xFE363C83, 0x0000003C, 0x00000000, 0x00000027, 0x00000002, 0xFE363C84, 0xFFFFFFFE, 0x00000043, 0x00000005, SetNpcPos, 0x00000049, 0xFE363C84, 0x0000003C, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024B580_E01F80 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0x00000040, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000424, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000049, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcSpeed, 0x0000004A, 0xF24A7E80, 0x00000043, 0x00000005, NpcMoveTo, 0x0000004A, 0xFE363C80, 0xFFFFFFEC, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000004A, 0x00C10001, 0x00000043, 0x00000002, func_80242898_DF9298, 0x0000004A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024B65C_E0205C -.word 0x00000043, 0x00000002, func_80242898_DF9298, 0x0000004A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024B67C_E0207C -.word 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000040, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x00000040, 0x000002A8, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0x00000040, 0x000002E4, 0x00000000, 0x00000000, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000040, 0x00970001, 0x00000005, 0x00000001, 0x00000002, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000040, 0x0000010E, 0x00000007, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000040, 0x0000005A, 0x00000007, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000040, 0x0000010E, 0x00000007, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000040, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000040, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000007, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000040, 0x00970003, 0x00000043, 0x00000005, NpcMoveTo, 0x00000040, 0x000003D4, 0x00000000, 0x0000003C, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000040, 0x0097000C, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000041, 0x00000294, 0x00000000, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000041, 0x000003AC, 0x00000000, 0x00000046, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000041, 0x0097010C, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetNpcPos, 0x00000042, 0x00000294, 0x00000000, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000042, 0x00000384, 0x00000000, 0x0000003C, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000042, 0x0097020C, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetNpcPos, 0x00000043, 0x00000294, 0x00000000, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000043, 0x0000035C, 0x00000000, 0x00000032, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000043, 0x0097030C, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, SetNpcPos, 0x00000044, 0x00000294, 0x00000000, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000044, 0x00000334, 0x00000000, 0x00000028, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000044, 0x0097040C, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000046, 0x00000045, 0x00000002, D_8024AFE0_E019E0, 0xFE363C8A, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0x00000040, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000424, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000040, 0x00970001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000041, 0x00970101, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000042, 0x00970201, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000043, 0x00970301, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000044, 0x00970401, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000040, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000005, 0x00000001, 0x00000003, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000042, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000041, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000043, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000042, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000041, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000043, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000424, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcYaw, 0x00000040, 0x0000010E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000040, 0x0097000D, 0x00000043, 0x00000003, SetNpcYaw, 0x00000041, 0x0000010E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000041, 0x0097010D, 0x00000043, 0x00000003, SetNpcYaw, 0x00000042, 0x0000005A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000042, 0x0097020D, 0x00000043, 0x00000003, SetNpcYaw, 0x00000043, 0x0000005A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000043, 0x0097030D, 0x00000043, 0x00000003, SetNpcYaw, 0x00000044, 0x0000005A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000044, 0x0097040D, 0x00000008, 0x00000001, 0x0000000A, 0x00000044, 0x00000001, D_8024B3C4_E01DC4, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000045, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000017, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000048, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000017, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000049, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000017, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x000002EE, 0x00000177, 0x00000005, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C82, 0x000003E8, 0x00000043, 0x00000005, SetNpcScale, 0x00000045, 0xFE363C82, 0xFE363C82, 0x00000001, 0x00000043, 0x00000005, SetNpcScale, 0x00000046, 0xFE363C82, 0xFE363C82, 0x00000001, 0x00000043, 0x00000005, SetNpcScale, 0x00000047, 0xFE363C82, 0xFE363C82, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000064, 0x00000032, 0x00000005, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C82, 0x00000064, 0x00000043, 0x00000005, SetNpcScale, 0x00000048, 0xFE363C82, 0xFE363C82, 0x00000001, 0x00000043, 0x00000005, SetNpcScale, 0x00000049, 0xFE363C82, 0xFE363C82, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000258, 0x0000012C, 0x00000005, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C82, 0x00000064, 0x00000024, 0x00000002, 0xFE363C80, 0x00000045, 0x00000044, 0x00000001, 0x802447B8, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000040, 0x00970011, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000041, 0x00970111, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000042, 0x00970211, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000043, 0x00970311, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000044, 0x00970411, 0x00000008, 0x00000001, 0x00000032, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000040, 0x00970003, 0x00000043, 0x00000005, GetNpcPos, 0x00000040, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000012C, 0x00000043, 0x00000005, NpcMoveTo, 0x00000040, 0xFE363C80, 0xFE363C82, 0x0000004B, 0x00000043, 0x00000005, SetNpcPos, 0x00000040, 0x00000000, 0xFFFFFE0C, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000041, 0x00970103, 0x00000043, 0x00000005, GetNpcPos, 0x00000041, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000012C, 0x00000043, 0x00000005, NpcMoveTo, 0x00000041, 0xFE363C80, 0xFE363C82, 0x0000004B, 0x00000043, 0x00000005, SetNpcPos, 0x00000041, 0x00000000, 0xFFFFFE0C, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000042, 0x00970203, 0x00000043, 0x00000005, GetNpcPos, 0x00000042, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000012C, 0x00000043, 0x00000005, NpcMoveTo, 0x00000042, 0xFE363C80, 0xFE363C82, 0x0000004B, 0x00000043, 0x00000005, SetNpcPos, 0x00000042, 0x00000000, 0xFFFFFE0C, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000043, 0x00970303, 0x00000043, 0x00000005, GetNpcPos, 0x00000043, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000012C, 0x00000043, 0x00000005, NpcMoveTo, 0x00000043, 0xFE363C80, 0xFE363C82, 0x0000004B, 0x00000043, 0x00000005, SetNpcPos, 0x00000043, 0x00000000, 0xFFFFFE0C, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000044, 0x00970403, 0x00000043, 0x00000005, GetNpcPos, 0x00000044, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000012C, 0x00000043, 0x00000005, NpcMoveTo, 0x00000044, 0xFE363C80, 0xFE363C82, 0x0000004B, 0x00000043, 0x00000005, SetNpcPos, 0x00000044, 0x00000000, 0xFFFFFE0C, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000320, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000045, 0x00400000, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000046, 0x00400000, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000047, 0x00400000, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000048, 0x00400000, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000049, 0x00400000, 0x00000000, 0x00000043, 0x00000005, SetNpcScale, 0x00000045, 0xF24A7D80, 0xF24A7D80, 0x00000001, 0x00000043, 0x00000005, SetNpcScale, 0x00000046, 0xF24A7D80, 0xF24A7D80, 0x00000001, 0x00000043, 0x00000005, SetNpcScale, 0x00000047, 0xF24A7D80, 0xF24A7D80, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000046, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000047, 0x00000000, 0x00000057, 0x00000000, 0x00000044, 0x00000001, D_8024B67C_E0207C, 0x00000045, 0x00000002, D_8024B580_E01F80, 0xFE363C8B, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000424, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000045, 0x00000002, D_8024B1B8_E01BB8, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000000A, 0x00000049, 0x00000001, 0xFE363C8B, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000004A, 0x00C1000B, 0x00000043, 0x00000005, GetNpcPos, 0x0000004A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x0000004A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000004A, 0x00C10008, 0x00000045, 0x00000002, D_8024B65C_E0205C, 0xFE363C8B, 0x00000008, 0x00000001, 0x00000082, 0x00000044, 0x00000001, D_8024B350_E01D50, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000045, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000046, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000047, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000048, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000049, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x00000003, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x0000004A, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000004A, 0x00C10000, 0x00000043, 0x00000005, MakeLerp, 0x0000010E, 0x00000168, 0x00000003, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x0000004A, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000004A, 0x00C10001, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000005, 0x00000001, 0x00000002, 0x00000044, 0x00000001, D_8024B3C4_E01DC4, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000046, 0x00000001, D_8024B438_E01E38, 0x00000044, 0x00000001, D_8024B350_E01D50, 0x00000045, 0x00000002, D_8024B1B8_E01BB8, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000000A, 0x00000049, 0x00000001, 0xFE363C8B, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000004A, 0x00C10002, 0x00000043, 0x00000005, GetNpcPos, 0x0000004A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFEC, 0x00000043, 0x00000005, NpcMoveTo, 0x0000004A, 0xFE363C80, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000004A, 0x00C10001, 0x00000045, 0x00000002, D_8024B65C_E0205C, 0xFE363C8B, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000045, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000045, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFF38, 0x00000043, 0x00000005, NpcMoveTo, 0x00000045, 0xFE363C80, 0xFE363C82, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000046, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000046, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFF38, 0x00000043, 0x00000005, NpcMoveTo, 0x00000046, 0xFE363C80, 0xFE363C82, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000047, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000047, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFF38, 0x00000043, 0x00000005, NpcMoveTo, 0x00000047, 0xFE363C80, 0xFE363C82, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000048, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000048, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFF38, 0x00000043, 0x00000005, NpcMoveTo, 0x00000048, 0xFE363C80, 0xFE363C82, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000049, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000049, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFF38, 0x00000043, 0x00000005, NpcMoveTo, 0x00000049, 0xFE363C80, 0xFE363C82, 0x00000032, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000004A, 0x00C1000C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000004A, 0x00C10002, 0x00000049, 0x00000001, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0x0000004A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFED4, 0x00000043, 0x00000005, NpcMoveTo, 0x0000004A, 0xFE363C80, 0xFE363C82, 0x00000032, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024CC00_E03600 -.word 0x45002000, 0x42C80000, 0x00000000, 0x44ED8000, 0x42A00000, 0x00000000, 0x44E38000, 0x428C0000, 0x00000000, 0x44E10000, 0x42700000, 0x00000000, 0x44E60000, 0x42480000, 0x00000000 - -dlabel D_8024CC3C_E0363C -.word 0x44E60000, 0x42480000, 0x00000000, 0x44EB0000, 0x42700000, 0x00000000, 0x44E88000, 0x428C0000, 0x00000000, 0x44DC0000, 0x42C80000, 0x00000000, 0x44CF8000, 0x432A0000, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x000005DC, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000004D, 0x007F0009, 0x00000024, 0x00000002, 0xFE363C80, 0x0000004D, 0x00000045, 0x00000002, 0x802447F4, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000004D, 0x0000005A, 0x00000007, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000004D, 0x007F0010, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000004E, 0x007F0010, 0x00000024, 0x00000002, 0xFE363C80, 0x0000004E, 0x00000045, 0x00000002, 0x802447F4, 0xFE363C8B, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000004E, 0x007F001C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000004D, 0x007F0019, 0x00000008, 0x00000001, 0x0000000A, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000005, GetNpcPos, 0x0000004D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000004D, 0x00000708, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcYaw, 0x0000004D, 0x0000010E, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000004D, 0x007F000E, 0x00000043, 0x00000005, SetNpcPos, 0x0000004B, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcJumpscale, 0x0000004B, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFD8, 0x00000043, 0x00000006, NpcJump1, 0x0000004B, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000004B, 0x004E0002, 0x00000024, 0x00000002, 0xFE363C80, 0x0000004B, 0x00000045, 0x00000002, 0x802447F4, 0xFE363C8A, 0x00000049, 0x00000001, 0xFE363C8B, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000004E, 0x007F000F, 0x00000043, 0x00000005, GetNpcPos, 0x0000004E, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFB0, 0x00000043, 0x00000005, NpcMoveTo, 0x0000004E, 0xFE363C80, 0xFE363C82, 0x00000028, 0x00000024, 0x00000002, 0xFE363C80, 0x0000004E, 0x00000045, 0x00000002, 0x802447F4, 0xFE363C8B, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000004E, 0x007F0010, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000004E, 0x007F0009, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000005, 0x00000001, 0x00000004, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000004B, 0x004E0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000004B, 0x004E0007, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000004B, 0x004E0002, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000004E, 0x0000005A, 0x00000007, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000004E, 0x007F0010, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000004D, 0x007F0010, 0x00000024, 0x00000002, 0xFE363C80, 0x0000004D, 0x00000045, 0x00000002, 0x802447F4, 0xFE363C8C, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000004D, 0x007F001C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000004E, 0x007F0019, 0x00000008, 0x00000001, 0x0000000A, 0x00000049, 0x00000001, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0x0000004E, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000004E, 0x00000000, 0xFFFFFE0C, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000004C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcJumpscale, 0x0000004C, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFD8, 0x00000043, 0x00000006, NpcJump1, 0x0000004C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000004C, 0x004E0002, 0x00000024, 0x00000002, 0xFE363C80, 0x0000004C, 0x00000045, 0x00000002, 0x802447F4, 0xFE363C8B, 0x00000049, 0x00000001, 0xFE363C8C, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000004D, 0x007F000F, 0x00000043, 0x00000005, GetNpcPos, 0x0000004D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFB0, 0x00000043, 0x00000005, NpcMoveTo, 0x0000004D, 0xFE363C80, 0xFE363C82, 0x00000028, 0x00000024, 0x00000002, 0xFE363C80, 0x0000004D, 0x00000045, 0x00000002, 0x802447F4, 0xFE363C8C, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000006, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000004D, 0x007F0010, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000004D, 0x007F0011, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000005, 0x00000001, 0x00000004, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000004B, 0x004E0000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000004C, 0x004E0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000004B, 0x004E0007, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000004C, 0x004E0007, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000004B, 0x004E0002, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000004C, 0x004E0002, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000056, 0x00000000, 0x00000043, 0x00000005, LoadPath, 0x00000032, D_8024CC00_E03600, 0x00000005, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C84, 0xFFFFFFE2, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C85, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFE7, 0x00000043, 0x00000005, SetNpcPos, 0x0000004F, 0xFE363C85, 0xFE363C86, 0xFE363C83, 0x00000043, 0x00000005, SetNpcPos, 0x00000050, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000005, SetNpcPos, 0x00000051, 0xFE363C84, 0xFE363C86, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000049, 0x00000001, 0xFE363C8C, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000004D, 0x007F0019, 0x00000043, 0x00000005, LoadPath, 0x00000032, D_8024CC3C_E0363C, 0x00000005, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C84, 0xFFFFFFE2, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C85, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFE7, 0x00000043, 0x00000005, SetNpcPos, 0x0000004F, 0xFE363C85, 0xFE363C86, 0xFE363C83, 0x00000043, 0x00000005, SetNpcPos, 0x00000050, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000005, SetNpcPos, 0x00000051, 0xFE363C84, 0xFE363C86, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFCE, 0x00000043, 0x00000005, SetNpcPos, 0x0000004D, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000004B, 0x004E0002, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000004C, 0x004E0002, 0x00000005, 0x00000001, 0x00000032, 0x00000043, 0x00000004, NpcFaceNpc, 0x0000004B, 0x0000004D, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0x0000004C, 0x0000004D, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000004B, 0x004E0003, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000004C, 0x004E0003, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000049, 0x00000001, 0xFE363C8B, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_end/end_00/E04180.data.s b/ver/us/asm/data/world/area_end/end_00/E04180.data.s deleted file mode 100644 index dae3ecd85d..0000000000 --- a/ver/us/asm/data/world/area_end/end_00/E04180.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_8024D780_E04180 -.word 0x00000043, 0x00000003, SetNpcAnimation, 0x00000053, 0x00240006, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000168, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000053, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000053, 0xF24A7C80, 0x00000043, 0x00000006, NpcJump1, 0x00000053, 0x000007DA, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000053, 0x00240005, 0x00000043, 0x00000005, NpcMoveTo, 0x00000053, 0x0000078A, 0x00000000, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000053, 0x00240002, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000053, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000053, 0x00240006, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000053, 0x00240007, 0x00000043, 0x0000000F, PlayEffect, 0x00000012, 0x00000000, 0x0000078A, 0x00000000, 0x00000000, 0x00000870, 0x00000064, 0x00000000, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x0000000F, PlayEffect, 0x00000012, 0x00000000, 0x00000870, 0x00000064, 0x00000000, 0x0000078A, 0x00000000, 0x00000000, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, D_8024D780_E04180, 0x00000043, 0x00000006, NpcJump1, 0x00000053, 0x00000762, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000053, 0x00240002, 0x00000043, 0x00000008, NpcFlyTo, 0x00000052, 0x0000080C, 0x0000003C, 0x00000000, 0x0000000A, 0xFFFFFFF6, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000052, 0x0060000E, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000052, 0x0060000F, 0x00000043, 0x0000000F, PlayEffect, 0x00000012, 0x00000000, 0x0000080C, 0x0000003C, 0x00000000, 0x00000762, 0x00000000, 0x00000000, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, D_8024D780_E04180, 0x00000043, 0x00000006, NpcJump1, 0x00000053, 0x000007F8, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000053, 0x00240002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000052, 0x00600014, 0x00000043, 0x00000008, NpcFlyTo, 0x00000052, 0x00000794, 0x0000003C, 0x00000000, 0x00000014, 0xFFFFFFF6, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000052, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000053, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000052, 0x0060000E, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000052, 0x0060000F, 0x00000043, 0x0000000F, PlayEffect, 0x00000012, 0x00000000, 0x00000794, 0x0000003C, 0x00000000, 0x000007F8, 0x00000000, 0x00000000, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, D_8024D780_E04180, 0x00000043, 0x00000006, NpcJump1, 0x00000053, 0x00000870, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000053, 0x00240002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000053, 0x00240006, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000053, 0x00240007, 0x00000043, 0x0000000F, PlayEffect, 0x00000012, 0x00000000, 0x00000870, 0x00000000, 0x00000000, 0x00000794, 0x0000003C, 0x00000000, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000052, 0x00600014, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000000, 0x00000794, 0x0000003C, 0x00000000, 0xF24A7C80, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetNpcPos, 0x00000052, 0x00000000, 0xFFFFFE0C, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000000, 0x00000834, 0x0000003C, 0x00000000, 0xF24A7C80, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetNpcPos, 0x00000052, 0x00000834, 0x0000003C, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000052, 0x0060000E, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000052, 0x0060000F, 0x00000043, 0x0000000F, PlayEffect, 0x00000012, 0x00000000, 0x00000834, 0x0000003C, 0x00000000, 0x00000870, 0x00000000, 0x00000000, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, D_8024D780_E04180, 0x00000043, 0x00000006, NpcJump1, 0x00000053, 0x00000834, 0x00000000, 0x00000000, 0x00000014, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000053, 0x00240005, 0x00000043, 0x00000005, NpcMoveTo, 0x00000053, 0x0000076C, 0x00000000, 0x00000032, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000052, 0x00600014, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000052, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000052, 0x00600012, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000052, 0x00600014, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000052, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000008, NpcFlyTo, 0x00000052, 0x0000076C, 0x00000028, 0x00000000, 0x00000019, 0xFFFFFFF6, 0x00000000, 0x00000008, 0x00000001, 0x00000096, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x0000000F, PlayEffect, 0x00000012, 0x00000000, 0x000007F8, 0x0000003C, 0xFFFFFFEC, 0x00000884, 0x00000000, 0x00000014, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000005, SetNpcPos, 0x00000052, 0x00000956, 0x00000078, 0xFFFFFFEC, 0x00000043, 0x00000008, NpcFlyTo, 0x00000052, 0x00000988, 0x0000003C, 0xFFFFFFEC, 0x0000000A, 0xFFFFFFF6, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000052, 0x0000010E, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000053, 0x000007F8, 0x00000000, 0x00000014, 0x00000043, 0x00000003, SetNpcYaw, 0x00000053, 0x0000005A, 0x00000043, 0x00000005, NpcMoveTo, 0x00000053, 0x00000960, 0x00000014, 0x0000005A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000053, 0x00240002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000053, 0x00240006, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000053, 0x00240007, 0x00000043, 0x0000000F, PlayEffect, 0x00000012, 0x00000000, 0x00000960, 0x00000000, 0x00000014, 0x00000988, 0x0000003C, 0xFFFFFFEC, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000008, NpcFlyTo, 0x00000052, 0x000008FC, 0x0000003C, 0xFFFFFFEC, 0x00000014, 0xFFFFFFF6, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000052, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000052, 0x0060000E, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000052, 0x0060000F, 0x00000043, 0x0000000F, PlayEffect, 0x00000012, 0x00000000, 0x000008FC, 0x0000003C, 0xFFFFFFEC, 0x00000956, 0x00000028, 0x00000000, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000053, 0x00240005, 0x00000043, 0x00000005, NpcMoveTo, 0x00000053, 0x000009B0, 0x00000014, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000053, 0x00240002, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000053, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000053, 0x00240006, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000053, 0x00240007, 0x00000043, 0x0000000F, PlayEffect, 0x00000012, 0x00000000, 0x000009B0, 0x00000000, 0x00000014, 0x00000956, 0x00000028, 0x00000000, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x0000000F, PlayEffect, 0x00000024, 0x00000000, 0x00000956, 0x00000028, 0x00000005, 0xF24A8E80, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000056, 0x00D70004, 0x00000043, 0x00000005, NpcMoveTo, 0x00000056, 0x00000884, 0x00000000, 0x0000001E, 0x00000043, 0x00000005, SetNpcPos, 0x00000056, 0x00000000, 0xFFFFFE0C, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000057, 0x00D70004, 0x00000043, 0x00000005, NpcMoveTo, 0x00000057, 0x0000085C, 0x00000000, 0x0000001E, 0x00000043, 0x00000005, SetNpcPos, 0x00000057, 0x00000000, 0xFFFFFE0C, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000058, 0x00D70005, 0x00000043, 0x00000005, NpcMoveTo, 0x00000058, 0x00000A78, 0x00000000, 0x00000032, 0x00000043, 0x00000005, SetNpcPos, 0x00000058, 0x00000000, 0xFFFFFE0C, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000059, 0x00D70005, 0x00000043, 0x00000005, NpcMoveTo, 0x00000059, 0x00000AA0, 0x00000000, 0x00000032, 0x00000043, 0x00000005, SetNpcPos, 0x00000059, 0x00000000, 0xFFFFFE0C, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetNpcPos, 0x00000054, 0x00000000, 0xFFFFFE0C, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000055, 0x00000000, 0xFFFFFE0C, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000005A, 0x00000956, 0x0000000A, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000005B, 0x00000956, 0x0000000A, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000005A, 0x00D80001, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000052, 0x0060000C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000052, 0x00000884, 0x0000003C, 0xFFFFFFEC, 0x0000001E, 0xFFFFFFF6, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000053, 0x00240005, 0x00000043, 0x00000005, NpcMoveTo, 0x00000053, 0x00000870, 0x00000014, 0x00000028, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000056, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x0000005B, 0x000008DE, 0x00000000, 0x0000003C, 0x00000057, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x0000005A, 0x000008DE, 0x00000000, 0x0000003C, 0x00000043, 0x0000000F, PlayEffect, 0x00000037, 0x00000000, 0x000008DE, 0x00000028, 0xFFFFFFFB, 0x000008E8, 0x00000028, 0xFFFFFFFB, 0x00000005, 0x00000002, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000052, 0x00600007, 0x00000043, 0x00000003, SetNpcYaw, 0x00000052, 0x0000005A, 0x00000043, 0x00000005, SetNpcPos, 0x00000052, 0x000008E8, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000052, 0xF24A7C80, 0x00000043, 0x00000006, NpcJump1, 0x00000052, 0x0000094C, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x00000006, NpcJump1, 0x00000052, 0x0000097E, 0x00000000, 0x00000000, 0x0000000A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000053, 0x0024000B, 0x00000043, 0x00000003, SetNpcYaw, 0x00000053, 0x0000005A, 0x00000043, 0x00000005, SetNpcPos, 0x00000053, 0x00000910, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000053, 0xF24A7C80, 0x00000043, 0x00000006, NpcJump1, 0x00000053, 0x00000974, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x00000006, NpcJump1, 0x00000053, 0x000009A6, 0x00000000, 0x00000000, 0x0000000A, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000026, 0x00000002, 0xFE363C80, 0x0000097E, 0x00000026, 0x00000002, 0xFE363C81, 0x000009A6, 0x00000058, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A7DFB, 0x00000043, 0x00000005, SetNpcPos, 0x00000052, 0xFE363C80, 0x00000000, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C81, 0xF24A7DFB, 0x00000043, 0x00000005, SetNpcPos, 0x00000053, 0xFE363C81, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000A14, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_end/end_01/E08350.data.s b/ver/us/asm/data/world/area_end/end_01/E08350.data.s deleted file mode 100644 index 97d1628729..0000000000 --- a/ver/us/asm/data/world/area_end/end_01/E08350.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242FF0_E08350 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80243040_E083A0, D_80242FF0_E08350, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80243040_E083A0 -.word 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000006, SetCamViewport, 0x00000000, 0x0000000F, 0x0000001C, 0x00000122, 0x00000080, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000001, func_80240010_E05370, 0x00000043, 0x00000002, EnableStatusMenu, 0x00000000, 0x00000044, 0x00000001, 0x802451F8, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_end/end_01/E08470.data.s b/ver/us/asm/data/world/area_end/end_01/E08470.data.s deleted file mode 100644 index 614d26acac..0000000000 --- a/ver/us/asm/data/world/area_end/end_01/E08470.data.s +++ /dev/null @@ -1,111 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel end_01_Font3Patterns -.word 0x02070001, 0x020A0001, 0x03040001, 0x070D0001, 0x09040001, 0x0C040001, 0x0C0C0001, 0x0C140001, 0x0D030001, 0x0D040001, 0x0D0A0001, 0x0D140001, 0x0E0D0001, 0x0E110001, 0x11040001, 0x110F0001, 0x14020001, 0x140D0001, 0x140F0001, 0x14120001, 0x12020001, 0x12070001, 0x120F0001, 0x15040001, 0x16110001, 0x00000000 - -dlabel end_01_Font4Patterns -.word 0x00020001, 0x00060001, 0x000E0001, 0x00030001, 0x00080001, 0x000A0001, 0x000D0001, 0x00130001, 0x00140001, 0x07000001, 0x07060001, 0x07080001, 0x08020001, 0x08040001, 0x08060001, 0x080A0001, 0x080D0001, 0x080E0001, 0x08130001, 0x08180001, 0x09080001, 0x0C0E0001, 0x0C080001, 0x0D060001, 0x0D080001, 0x0D0E0001, 0x0D130001, 0x12040001, 0x12080001, 0x13040001, 0x14020001, 0x14080001, 0x140A0001, 0x00000000 - -dlabel end_01_CreditsViewport -.word 0x028001E0, 0x01FF0000, 0x028001E0, 0x01FF0000 - -dlabel end_01_CreditsBufferIndex -.word 0x00000000 - -dlabel D_80243214_E08574 -.word 0x002E0019, 0x000000A0, 0x000000A6, 0x00000000, 0x00000004, 0x00000028, 0x00000002, 0x00000000, 0x000008DE, 0x00000000, 0x0000001E, 0x00000000, 0x00000924, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000003C, 0x00000000, 0x002E001A, 0x000000A0, 0x000000AA, 0x00000000, 0x00000004, 0x00000028, 0x00000002, 0x00000000, 0x000000C8, 0x00000000, 0x0000001E, 0x00000000, 0x0000010E, 0x00010000, 0x002E001B, 0x000000A0, 0x000000AA, 0x00000000, 0x00000004, 0x00000028, 0x00000002, 0x00000000, 0x000001AE, 0x00000000, 0x0000001E, 0x00000000, 0x000001F4, 0x00010000, 0x002E001D, 0x000000A0, 0x000000AA, 0x00000000, 0x00000004, 0x00000028, 0x00000002, 0x00000000, 0x000000C8, 0x00000000, 0x0000001E, 0x00000000, 0x0000010E, 0x00010000, 0x002E001C, 0x000000A0, 0x000000AA, 0x00000000, 0x00000004, 0x00000028, 0x00000002, 0x00000000, 0x000001AE, 0x00000000, 0x0000001E, 0x00000000, 0x000001F4, 0x00010000, 0x002E001E, 0x000000A0, 0x000000AA, 0x00000000, 0x00000004, 0x00000028, 0x00000002, 0x00000000, 0x000000C8, 0x00000000, 0x0000001E, 0x00000000, 0x0000010E, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000003C, 0x00000000, 0x002E0007, 0x00000083, 0x000000B6, 0x00000000, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x000000A0, 0x00000000, 0x00000032, 0x00000000, 0x00000000, 0x00010000, 0x002E0008, 0x000000BD, 0x000000B6, 0x00000001, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x000000A0, 0x00000000, 0x00000032, 0x00000000, 0x0000010E, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000001E, 0x00000000, 0x002E0005, 0x000000A0, 0x000000AC, 0x00000000, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x000000A0, 0x00000000, 0x00000032, 0x00000000, 0x00000000, 0x00010000, 0x002E0006, 0x000000A0, 0x000000BC, 0x00000001, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x000000A0, 0x00000000, 0x00000032, 0x00000000, 0x0000010E, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000 - -dlabel D_80243524_E08884 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000028, 0x00000000, 0x002E0071, 0x000000A0, 0x000000BA, 0x00000001, 0x00000000, 0x00000028, 0x00000000, 0x00000000, 0x000000AE, 0x00000000, 0x0000001E, 0x00000001, 0x00000000, 0x00010000, 0x002E0072, 0x000000A0, 0x000000CB, 0x00000001, 0x00000000, 0x00000028, 0x00000000, 0x00000000, 0x000000AE, 0x00000000, 0x0000001E, 0x00000001, 0x000000E6, 0x00010000, 0x002E0066, 0x000000A0, 0x000000BA, 0x00000001, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x000000AE, 0x00000000, 0x0000001E, 0x00000001, 0x00000000, 0x00010000, 0x002E0065, 0x000000A0, 0x000000CB, 0x00000001, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x000000AE, 0x00000000, 0x0000001E, 0x00000001, 0x000000E6, 0x00010000, 0x002E0075, 0x000000A0, 0x000000BA, 0x00000001, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x000000AE, 0x00000000, 0x0000001E, 0x00000001, 0x00000000, 0x00010000, 0x002E0073, 0x000000A0, 0x000000CB, 0x00000001, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x000000AE, 0x00000000, 0x0000001E, 0x00000001, 0x000000E6, 0x00010000, 0x002E0055, 0x000000A0, 0x000000BA, 0x00000001, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x000000AE, 0x00000000, 0x0000001E, 0x00000001, 0x00000000, 0x00010000, 0x002E0051, 0x000000A0, 0x000000CB, 0x00000001, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x000000AE, 0x00000000, 0x0000001E, 0x00000001, 0x000000E6, 0x00010000, 0x002E0059, 0x000000A0, 0x000000BA, 0x00000001, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x000000AE, 0x00000000, 0x0000001E, 0x00000001, 0x00000000, 0x00010000, 0x002E005A, 0x000000A0, 0x000000CB, 0x00000001, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x000000AE, 0x00000000, 0x0000001E, 0x00000001, 0x000000E6, 0x00010000, 0x002E0053, 0x000000A0, 0x000000B6, 0x00000001, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x000000AE, 0x00000000, 0x0000001E, 0x00000001, 0x00000000, 0x00010000, 0x002E005B, 0x000000A0, 0x000000C3, 0x00000001, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x000000AE, 0x00000000, 0x0000001E, 0x00000001, 0x00000000, 0x00010000, 0x002E005C, 0x000000A0, 0x000000D0, 0x00000001, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x000000AE, 0x00000000, 0x0000001E, 0x00000001, 0x000000E6, 0x00010000, 0x002E005D, 0x000000A0, 0x000000BA, 0x00000001, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x000000AE, 0x00000000, 0x0000001E, 0x00000001, 0x00000000, 0x00010000, 0x002E005E, 0x000000A0, 0x000000CB, 0x00000001, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x000000AE, 0x00000000, 0x0000001E, 0x00000001, 0x000000E6, 0x00010000, 0x002E005F, 0x000000A0, 0x000000B6, 0x00000001, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x000000AE, 0x00000000, 0x0000001E, 0x00000001, 0x00000000, 0x00010000, 0x002E0060, 0x000000A0, 0x000000C3, 0x00000001, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x000000AE, 0x00000000, 0x0000001E, 0x00000001, 0x00000000, 0x00010000, 0x002E0061, 0x000000A0, 0x000000D0, 0x00000001, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x000000AE, 0x00000000, 0x0000001E, 0x00000001, 0x000000E6, 0x00010000, 0x002E0068, 0x000000A0, 0x000000BF, 0x00000001, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x000000AE, 0x00000000, 0x0000001E, 0x00000001, 0x000000E6, 0x00010000, 0x002E0085, 0x000000A0, 0x000000B6, 0x00000001, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x000000A0, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00010000, 0x002E0086, 0x000000A0, 0x000000C3, 0x00000001, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x000000A0, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00010000, 0x002E0087, 0x000000A0, 0x000000D0, 0x00000001, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x000000A0, 0x00000000, 0x0000001E, 0x00000000, 0x000000E6, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000028, 0x00000000, 0x002E0052, 0x000000A0, 0x000000BF, 0x00000001, 0x00000000, 0x00000028, 0x00000000, 0x00000000, 0x000000A0, 0x00000000, 0x0000001E, 0x00000000, 0x000000E6, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000028, 0x00000000, 0x002E006A, 0x000000A0, 0x000000BF, 0x00000001, 0x00000000, 0x00000028, 0x00000000, 0x00000000, 0x000000AE, 0x00000000, 0x0000001E, 0x00000001, 0x000000E6, 0x00010000, 0x002E0054, 0x000000A0, 0x000000BF, 0x00000001, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x000000A0, 0x00000000, 0x0000001E, 0x00000000, 0x000000E6, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000028, 0x00000000, 0x002E006D, 0x000000A0, 0x000000BF, 0x00000001, 0x00000000, 0x00000028, 0x00000000, 0x00000000, 0x000000A0, 0x00000000, 0x0000001E, 0x00000000, 0x000000E6, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000028, 0x00000000, 0x002E006C, 0x000000A0, 0x000000BF, 0x00000001, 0x00000000, 0x00000028, 0x00000000, 0x00000000, 0x000000AE, 0x00000000, 0x0000001E, 0x00000001, 0x000000E6, 0x00010000, 0x002E006B, 0x000000A0, 0x000000BF, 0x00000001, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x000000A0, 0x00000000, 0x0000001E, 0x00000000, 0x000000E6, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000028, 0x00000000, 0x002E006E, 0x000000A0, 0x000000BF, 0x00000001, 0x00000000, 0x00000028, 0x00000000, 0x00000000, 0x000000A0, 0x00000000, 0x0000001E, 0x00000000, 0x000000E6, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000 - -dlabel D_80243D74_E090D4 -.word 0x00000043, 0x00000001, end_01_InitCredits, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243D90_E090F0 -.word 0x00000043, 0x00000002, end_01_ShowCreditList, D_80243214_E08574, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243DB0_E09110 -.word 0x00000043, 0x00000002, end_01_ShowCreditList, D_80243524_E08884, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243DD0_E09130 -.word 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFF3C1, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFF3C1, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243E44_E091A4 -.word 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xF2197E80, 0x00000000, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xF24A7A80, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802427E8_E07B48, 0x00000043, 0x00000005, TranslateGroup, 0x00000003, 0xFE363C81, 0x00000000, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C81, 0xF24A7D2B, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243ED8_E09238 -.word 0x00000043, 0x00000003, EnableTexPanning, 0x00000004, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000005, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000006, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000008, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000009, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000000A, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000000B, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000000C, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000000E, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000000F, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000010, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000011, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000013, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000014, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000015, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000016, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000017, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000019, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000001A, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000001B, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000001C, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000001E, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000001F, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000020, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000021, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000096, 0x0000000D, 0x00000002, 0xFE363C80, 0x00020000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFE0000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80242840_E07BA0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802441A0_E09500 -.word 0x00190001, 0xFFFFFFFF - -dlabel D_802441A8_E09508 -.word 0x001A0001, 0xFFFFFFFF - -dlabel D_802441B0_E09510 -.word 0x001B0001, 0xFFFFFFFF - -dlabel D_802441B8_E09518 -.word 0x001C0001, 0xFFFFFFFF - -dlabel D_802441C0_E09520 -.word 0x001D0000, 0xFFFFFFFF - -dlabel D_802441C8_E09528 -.word 0x001E0001, 0xFFFFFFFF - -dlabel D_802441D0_E09530 -.word 0x001F0001, 0xFFFFFFFF - -dlabel D_802441D8_E09538 -.word 0x003E0003, 0xFFFFFFFF - -dlabel D_802441E0_E09540 -.word 0x003B0004, 0x003B0010, 0x003B0001, 0xFFFFFFFF - -dlabel end_01_ParadeNpcsTable -.word 0x00190001, D_802441A0_E09500, 0xC543F000, 0x43520000, 0xC2F00000, 0x43870000, 0x001A0001, D_802441A8_E09508, 0xC547B000, 0x43480000, 0xC2F00000, 0x43870000, 0x001B0001, D_802441B0_E09510, 0xC5403000, 0x43430000, 0xC2F00000, 0x43870000, 0x001C0001, D_802441B8_E09518, 0xC53E5000, 0x43140000, 0xC2D00000, 0x43870000, 0x001D0000, D_802441C0_E09520, 0xC5421000, 0x431E0000, 0xC2D00000, 0x43870000, 0x001E0001, D_802441C8_E09528, 0xC545D000, 0x431E0000, 0xC2D00000, 0x43870000, 0x001F0001, D_802441D0_E09530, 0xC5499000, 0x43140000, 0xC2D00000, 0x43870000, 0x00DE0004, 0x00000000, 0xC528C000, 0x00000000, 0xC2140000, 0x43870000, 0x00DE0004, 0x00000000, 0xC528C000, 0x00000000, 0x42140000, 0x43870000, 0x00DE0010, 0x00000000, 0xC525A000, 0x00000000, 0xC29A0000, 0x43870000, 0x00DE0013, 0x00000000, 0xC5232000, 0x00000000, 0xC29A0000, 0x43870000, 0x00DE0002, 0x00000000, 0xC51FB000, 0x40A00000, 0x41F00000, 0x43870000, 0x00DE0003, 0x00000000, 0xC51DF000, 0x40A00000, 0x420C0000, 0x43870000, 0x00DE0002, 0x00000000, 0xC51BF000, 0x40A00000, 0x41F00000, 0x42B40000, 0x008E0207, 0x00000000, 0xC5240000, 0x41A00000, 0x00000000, 0x42B40000, 0x00DE000C, 0x00000000, 0xC51E1000, 0x00000000, 0x00000000, 0x43870000, 0x00480102, 0x00000000, 0xC50A2000, 0x00000000, 0xC1A00000, 0x43870000, 0x00480102, 0x00000000, 0xC50A2000, 0x00000000, 0x41A00000, 0x43870000, 0x00E50000, 0x00000000, 0xC4FD2000, 0x41A00000, 0x41E00000, 0x43870000, 0x00E50002, 0x00000000, 0xC4F96000, 0x41A00000, 0x41A00000, 0x43870000, 0x00E50004, 0x00000000, 0xC5007000, 0x41A00000, 0x420C0000, 0x43870000, 0x00E50006, 0x00000000, 0xC5025000, 0x41A00000, 0x41E00000, 0x43870000, 0x00E50008, 0x00000000, 0xC503E000, 0x41A00000, 0x41A00000, 0x43870000, 0x00E5000A, 0x00000000, 0xC4F78000, 0x42700000, 0x41A00000, 0x43870000, 0x00CB0007, 0x00000000, 0x00000000, 0xC3FA0000, 0x00000000, 0x42B40000, 0x00CB0008, 0x00000000, 0x00000000, 0xC3FA0000, 0x00000000, 0x42B40000, 0x0099000B, 0x00000000, 0xC4E74000, 0x00000000, 0xC1A00000, 0x43870000, 0x0099000B, 0x00000000, 0xC4E74000, 0x00000000, 0x41A00000, 0x43870000, 0x00E7000A, 0x00000000, 0xC4C18000, 0x00000000, 0x00000000, 0x43870000, 0x00E7000E, 0x00000000, 0xC4B50000, 0x42640000, 0xC1C80000, 0x43870000, 0x00E70007, 0x00000000, 0xC4B96000, 0x41C00000, 0xC2200000, 0x42B40000, 0x00E70007, 0x00000000, 0xC4B0A000, 0x41C00000, 0xC2200000, 0x43870000, 0x00E70002, 0x00000000, 0xC4B78000, 0x41C00000, 0xC0A00000, 0x43870000, 0x00E70002, 0x00000000, 0xC4B64000, 0x41C00000, 0xC0A00000, 0x43870000, 0x00E70002, 0x00000000, 0xC4B3C000, 0x41C00000, 0xC0A00000, 0x42B40000, 0x00E70002, 0x00000000, 0xC4B28000, 0x41C00000, 0xC0A00000, 0x42B40000, 0x003E0003, D_802441D8_E09538, 0x00000000, 0xC3FA0000, 0x00000000, 0x42B40000, 0x003E0003, D_802441D8_E09538, 0x00000000, 0xC3FA0000, 0x00000000, 0x43870000, 0x00E7000F, 0x00000000, 0xC4830000, 0x00000000, 0xC1F00000, 0x43870000, 0x00E7000F, 0x00000000, 0xC4830000, 0x00000000, 0x00000000, 0x43870000, 0x00E7000F, 0x00000000, 0xC4830000, 0x00000000, 0x41F00000, 0x43870000, 0x00E7000F, 0x00000000, 0xC47E8000, 0x00000000, 0xC1F00000, 0x43870000, 0x00E7000F, 0x00000000, 0xC47E8000, 0x00000000, 0x00000000, 0x43870000, 0x00E7000F, 0x00000000, 0xC47E8000, 0x00000000, 0x41F00000, 0x43870000, 0x00E7000F, 0x00000000, 0xC4770000, 0x00000000, 0xC1F00000, 0x43870000, 0x00E7000F, 0x00000000, 0xC4770000, 0x00000000, 0x00000000, 0x43870000, 0x00E7000F, 0x00000000, 0xC4770000, 0x00000000, 0x41F00000, 0x43870000, 0x00E7000F, 0x00000000, 0xC46F8000, 0x00000000, 0xC1F00000, 0x43870000, 0x00E7000F, 0x00000000, 0xC46F8000, 0x00000000, 0x00000000, 0x43870000, 0x00E7000F, 0x00000000, 0xC46F8000, 0x00000000, 0x41F00000, 0x43870000, 0x003B0004, D_802441E0_E09540, 0xC4450000, 0x00000000, 0x00000000, 0x43870000, 0x00E30002, 0x00000000, 0xC42C4000, 0x00000000, 0xC1A00000, 0x43870000, 0x00E30002, 0x00000000, 0xC42C4000, 0x00000000, 0x41A00000, 0x43870000, 0x00E10002, 0x00000000, 0xC41FC000, 0x00000000, 0xC1A00000, 0x43870000, 0x00E10002, 0x00000000, 0xC41FC000, 0x00000000, 0x41A00000, 0x43870000, 0x00E20002, 0x00000000, 0xC4134000, 0x00000000, 0xC1A00000, 0x43870000, 0x00E20002, 0x00000000, 0xC4134000, 0x00000000, 0x41A00000, 0x43870000, 0x00E60005, 0x00000000, 0xC3A48000, 0x42140000, 0x00000000, 0x43870000, 0x00D60014, 0x00000000, 0xC3908000, 0x42140000, 0x00000000, 0x43870000, 0x00E80001, 0x00000000, 0xC3C28000, 0x42F00000, 0x00000000, 0x42B40000, 0x00E00002, 0x00000000, 0xC2DA0000, 0x00000000, 0x00000000, 0x43870000, 0x00E00002, 0x00000000, 0xC28A0000, 0x00000000, 0x00000000, 0x43870000, 0x00E00002, 0x00000000, 0xC1E80000, 0x00000000, 0x00000000, 0x43870000, 0x00E00006, 0x00000000, 0x00000000, 0xC3FA0000, 0x00000000, 0x43870000, 0x00E00006, 0x00000000, 0x00000000, 0xC3FA0000, 0x00000000, 0x43870000, 0x00E00006, 0x00000000, 0x00000000, 0xC3FA0000, 0x00000000, 0x43870000, 0x00E20002, 0x00000000, 0x42240000, 0x00000000, 0xC1A00000, 0x43870000, 0x00E20002, 0x00000000, 0x42240000, 0x00000000, 0x41A00000, 0x43870000 - -dlabel D_80244850_E09BB0 -.word 0x00000043, 0x00000002, func_80242690_E079F0, 0x00000000, 0x00000043, 0x00000002, func_80242690_E079F0, 0x00000001, 0x00000043, 0x00000002, func_80242690_E079F0, 0x00000002, 0x00000043, 0x00000002, func_80242690_E079F0, 0x00000003, 0x00000043, 0x00000002, func_80242690_E079F0, 0x00000004, 0x00000043, 0x00000002, func_80242690_E079F0, 0x00000005, 0x00000043, 0x00000002, func_80242690_E079F0, 0x00000006, 0x00000043, 0x00000002, func_80242690_E079F0, 0x00000009, 0x00000043, 0x00000002, func_80242690_E079F0, 0x0000000A, 0x00000043, 0x00000002, func_80242690_E079F0, 0x00000007, 0x00000043, 0x00000002, func_80242690_E079F0, 0x00000008, 0x00000043, 0x00000002, func_80242690_E079F0, 0x0000000B, 0x00000043, 0x00000002, func_80242690_E079F0, 0x0000000C, 0x00000043, 0x00000002, func_80242690_E079F0, 0x0000000D, 0x00000043, 0x00000002, func_80242690_E079F0, 0x0000000E, 0x00000043, 0x00000002, func_80242690_E079F0, 0x0000000F, 0x00000043, 0x00000003, func_80242754_E07AB4, 0x00013400, 0xFE363C80, 0x00000043, 0x00000002, func_80242690_E079F0, 0x00000010, 0x00000043, 0x00000002, func_80242690_E079F0, 0x00000011, 0x00000043, 0x00000002, func_802427B4_E07B14, 0xFE363C80, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFF6D2, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000001, 0x00000043, 0x00000002, DeleteNpc, 0x00000002, 0x00000043, 0x00000002, DeleteNpc, 0x00000003, 0x00000043, 0x00000002, DeleteNpc, 0x00000004, 0x00000043, 0x00000002, DeleteNpc, 0x00000005, 0x00000043, 0x00000002, DeleteNpc, 0x00000006, 0x00000043, 0x00000002, DeleteNpc, 0x00000009, 0x00000043, 0x00000002, DeleteNpc, 0x0000000A, 0x00000043, 0x00000002, DeleteNpc, 0x00000007, 0x00000043, 0x00000002, DeleteNpc, 0x00000008, 0x00000043, 0x00000002, DeleteNpc, 0x0000000B, 0x00000043, 0x00000002, DeleteNpc, 0x0000000C, 0x00000043, 0x00000002, DeleteNpc, 0x0000000D, 0x00000043, 0x00000002, DeleteNpc, 0x0000000E, 0x00000043, 0x00000002, DeleteNpc, 0x0000000F, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80242690_E079F0, 0x00000012, 0x00000043, 0x00000002, func_80242690_E079F0, 0x00000013, 0x00000043, 0x00000002, func_80242690_E079F0, 0x00000014, 0x00000043, 0x00000002, func_80242690_E079F0, 0x00000015, 0x00000043, 0x00000002, func_80242690_E079F0, 0x00000016, 0x00000043, 0x00000002, func_80242690_E079F0, 0x00000017, 0x00000043, 0x00000002, func_80242690_E079F0, 0x00000018, 0x00000043, 0x00000002, func_80242690_E079F0, 0x00000019, 0x00000043, 0x00000002, func_80242690_E079F0, 0x0000001A, 0x00000043, 0x00000002, func_80242690_E079F0, 0x0000001B, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFF90E, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000010, 0x00000043, 0x00000002, DeleteNpc, 0x00000011, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, func_80242754_E07AB4, 0x00004700, 0xFE363C80, 0x00000043, 0x00000002, func_80242690_E079F0, 0x00000024, 0x00000043, 0x00000002, func_80242690_E079F0, 0x00000025, 0x00000043, 0x00000002, func_80242690_E079F0, 0x00000032, 0x00000043, 0x00000002, func_80242690_E079F0, 0x0000001C, 0x00000043, 0x00000002, func_80242690_E079F0, 0x0000001D, 0x00000043, 0x00000002, func_80242690_E079F0, 0x0000001E, 0x00000043, 0x00000002, func_80242690_E079F0, 0x0000001F, 0x00000043, 0x00000002, func_80242690_E079F0, 0x00000020, 0x00000043, 0x00000002, func_80242690_E079F0, 0x00000021, 0x00000043, 0x00000002, func_80242690_E079F0, 0x00000022, 0x00000043, 0x00000002, func_80242690_E079F0, 0x00000023, 0x00000043, 0x00000002, func_80242690_E079F0, 0x00000026, 0x00000043, 0x00000002, func_80242690_E079F0, 0x00000027, 0x00000043, 0x00000002, func_80242690_E079F0, 0x00000028, 0x00000043, 0x00000002, func_80242690_E079F0, 0x00000029, 0x00000043, 0x00000002, func_80242690_E079F0, 0x0000002A, 0x00000043, 0x00000002, func_80242690_E079F0, 0x0000002B, 0x00000043, 0x00000002, func_80242690_E079F0, 0x0000002C, 0x00000043, 0x00000002, func_80242690_E079F0, 0x0000002D, 0x00000043, 0x00000002, func_80242690_E079F0, 0x0000002E, 0x00000043, 0x00000002, func_80242690_E079F0, 0x0000002F, 0x00000043, 0x00000002, func_80242690_E079F0, 0x00000030, 0x00000043, 0x00000002, func_80242690_E079F0, 0x00000031, 0x00000043, 0x00000002, func_802427B4_E07B14, 0xFE363C80, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFC87, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000012, 0x00000043, 0x00000002, DeleteNpc, 0x00000013, 0x00000043, 0x00000002, DeleteNpc, 0x00000014, 0x00000043, 0x00000002, DeleteNpc, 0x00000015, 0x00000043, 0x00000002, DeleteNpc, 0x00000016, 0x00000043, 0x00000002, DeleteNpc, 0x00000017, 0x00000043, 0x00000002, DeleteNpc, 0x00000018, 0x00000043, 0x00000002, DeleteNpc, 0x00000019, 0x00000043, 0x00000002, DeleteNpc, 0x0000001A, 0x00000043, 0x00000002, DeleteNpc, 0x0000001B, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80242690_E079F0, 0x00000033, 0x00000043, 0x00000002, func_80242690_E079F0, 0x00000034, 0x00000043, 0x00000002, func_80242690_E079F0, 0x00000035, 0x00000043, 0x00000002, func_80242690_E079F0, 0x00000036, 0x00000043, 0x00000002, func_80242690_E079F0, 0x00000037, 0x00000043, 0x00000002, func_80242690_E079F0, 0x00000038, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFD4F, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000024, 0x00000043, 0x00000002, DeleteNpc, 0x00000025, 0x00000043, 0x00000002, DeleteNpc, 0x00000032, 0x00000043, 0x00000002, DeleteNpc, 0x0000001C, 0x00000043, 0x00000002, DeleteNpc, 0x0000001D, 0x00000043, 0x00000002, DeleteNpc, 0x0000001E, 0x00000043, 0x00000002, DeleteNpc, 0x0000001F, 0x00000043, 0x00000002, DeleteNpc, 0x00000020, 0x00000043, 0x00000002, DeleteNpc, 0x00000021, 0x00000043, 0x00000002, DeleteNpc, 0x00000022, 0x00000043, 0x00000002, DeleteNpc, 0x00000023, 0x00000043, 0x00000002, DeleteNpc, 0x00000026, 0x00000043, 0x00000002, DeleteNpc, 0x00000027, 0x00000043, 0x00000002, DeleteNpc, 0x00000028, 0x00000043, 0x00000002, DeleteNpc, 0x00000029, 0x00000043, 0x00000002, DeleteNpc, 0x0000002A, 0x00000043, 0x00000002, DeleteNpc, 0x0000002B, 0x00000043, 0x00000002, DeleteNpc, 0x0000002C, 0x00000043, 0x00000002, DeleteNpc, 0x0000002D, 0x00000043, 0x00000002, DeleteNpc, 0x0000002E, 0x00000043, 0x00000002, DeleteNpc, 0x0000002F, 0x00000043, 0x00000002, DeleteNpc, 0x00000030, 0x00000043, 0x00000002, DeleteNpc, 0x00000031, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80242690_E079F0, 0x00000039, 0x00000043, 0x00000002, func_80242690_E079F0, 0x0000003A, 0x00000043, 0x00000002, func_80242690_E079F0, 0x0000003B, 0x00000043, 0x00000002, func_80242690_E079F0, 0x0000003C, 0x00000043, 0x00000002, func_80242690_E079F0, 0x0000003D, 0x00000043, 0x00000002, func_80242690_E079F0, 0x0000003E, 0x00000043, 0x00000002, func_80242690_E079F0, 0x0000003F, 0x00000043, 0x00000002, func_80242690_E079F0, 0x00000040, 0x00000043, 0x00000002, func_80242690_E079F0, 0x00000041, 0x00000043, 0x00000002, func_80242690_E079F0, 0x00000042, 0x00000043, 0x00000002, func_80242690_E079F0, 0x00000043, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802451B8_E0A518 -.word 0x00000008, 0x00000001, 0x0000003C, 0x00000044, 0x00000001, D_80243D74_E090D4, 0x00000044, 0x00000001, D_80243D90_E090F0, 0x00000044, 0x00000001, D_80243DB0_E09110, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000091, 0x00000000, 0x00000008, 0x00000044, 0x00000001, D_80243DD0_E09130, 0x00000044, 0x00000001, D_80244850_E09BB0, 0x00000045, 0x00000002, D_80245820_E0AB80, 0xFE363C8A, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000055, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000044, 0x00000001, D_802451B8_E0A518, 0x00000045, 0x00000002, D_80243E44_E091A4, 0xFE363C8A, 0x00000045, 0x00000002, D_80243ED8_E09238, 0xFE363C8B, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFF448, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000044, 0x00000001, D_80245BD0_E0AF30, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFF47A, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000044, 0x00000001, D_80245C74_E0AFD4, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFF47F, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000044, 0x00000001, D_80245FF0_E0B350, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFF66E, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000044, 0x00000001, 0x80246A60, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFF90E, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000044, 0x00000001, 0x80247620, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFB20, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000044, 0x00000001, 0x80247D68, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFC87, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000044, 0x00000001, 0x802481B0, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFD4F, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000045, 0x00000002, 0x80248D1C, 0xFE363C8C, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFEB6, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000049, 0x00000001, 0xFE363C8B, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000055, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000044, 0x00000001, 0x80249034, 0x00000008, 0x00000001, 0x00000096, 0x00000044, 0x00000001, 0x802492B0, 0x00000008, 0x00000001, 0x000000C8, 0x00000043, 0x00000003, GotoMap, 0x80249438, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245740_E0AAA0 -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000007, 0x00040000, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C8A, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C83, 0x00000078, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C85, 0x0000000F, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0xFE363C82, 0xFE363C85, 0xFE363C84, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C8A, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000001, func_80242978_E07CD8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245820_E0AB80 -.word 0x00000043, 0x00000001, func_802428C0_E07C20, 0x00000008, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, D_80245740_E0AAA0, 0x00000008, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000044, 0x00000001, D_80245740_E0AAA0, 0x00000008, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000002, 0x00000044, 0x00000001, D_80245740_E0AAA0, 0x00000008, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000004, 0x00000044, 0x00000001, D_80245740_E0AAA0, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000005, 0x00000044, 0x00000001, D_80245740_E0AAA0, 0x00000008, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000003, 0x00000044, 0x00000001, D_80245740_E0AAA0, 0x00000008, 0x00000001, 0x00000007, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000006, 0x00000044, 0x00000001, D_80245740_E0AAA0, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, func_80242900_E07C60, 0x00000008, 0x00000001, 0x0000003C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245978_E0ACD8 -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000007, 0x00040000, 0x00000001, 0x00000058, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00DE0006, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00DE0007, 0x00000008, 0x00000001, 0x0000001E, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000007, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFF4C, 0x00000043, 0x00000005, NpcMoveTo, 0x00000007, 0xFE363C80, 0xFE363C82, 0x00000078, 0x00000043, 0x00000002, func_80242A68_E07DC8, 0x00000007, 0x00000043, 0x00000005, GetNpcPos, 0x00000007, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFF4C, 0x00000043, 0x00000005, NpcMoveTo, 0x00000007, 0xFE363C80, 0xFE363C82, 0x00000078, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245AA4_E0AE04 -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000008, 0x00040000, 0x00000001, 0x00000058, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00DE0006, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00DE0007, 0x00000008, 0x00000001, 0x0000001E, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000008, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFF2E, 0x00000043, 0x00000005, NpcMoveTo, 0x00000008, 0xFE363C80, 0xFE363C82, 0x0000008C, 0x00000043, 0x00000002, func_80242B68_E07EC8, 0x00000008, 0x00000043, 0x00000005, GetNpcPos, 0x00000008, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFF4C, 0x00000043, 0x00000005, NpcMoveTo, 0x00000008, 0xFE363C80, 0xFE363C82, 0x00000078, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245BD0_E0AF30 -.word 0x00000045, 0x00000002, D_80245978_E0ACD8, 0xFE363C8A, 0x00000045, 0x00000002, D_80245AA4_E0AE04, 0xFE363C8B, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFF510, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000049, 0x00000001, 0xFE363C8B, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245C74_E0AFD4 -.word 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000009, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFED4, 0x00000043, 0x00000005, NpcMoveTo, 0x00000009, 0xFE363C80, 0xFE363C82, 0x000001F4, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFED4, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000A, 0xFE363C80, 0xFE363C82, 0x000001F4, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245D34_E0B094 -.byte 0x00, 0x00, 0x00 - -dlabel D_80245D37_E0B097 -.byte 0x00 - -dlabel D_80245D38_E0B098 -.word 0x00000043, 0x00000003, EnableTexPanning, 0x00000027, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000029, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000002A, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00002000, 0x00000043, 0x00000005, SetTexPanOffset, 0x0000000E, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0xFE363C81, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245DF0_E0B150 -.word 0x00000043, 0x00000003, EnableTexPanning, 0x00000028, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00002000, 0x00000043, 0x00000005, SetTexPanOffset, 0x0000000C, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000010, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245E70_E0B1D0 -.word 0x00000043, 0x00000003, EnableModel, 0x0000002B, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000002C, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000002C, 0x00000001, 0x00000043, 0x00000004, SetModelCustomGfx, 0x0000002B, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000004, SetCustomGfxBuilders, 0x00000001, func_80242C94_E07FF4, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000005A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000002, func_80242C68_E07FC8, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00001000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000400, 0x00000043, 0x00000005, SetTexPanOffset, 0x0000000F, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000008, 0x00000001, 0x00000004, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245FF0_E0B350 -.word 0x00000043, 0x00000003, EnableModel, 0x0000002B, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000002C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000008, 0x00000045, 0x00000002, D_80245D38_E0B098, 0xFE363C8A, 0x00000045, 0x00000002, D_80245DF0_E0B150, 0xFE363C8B, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFF5CE, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000045, 0x00000002, D_80245D38_E0B098, 0xFE363C8A, 0x00000045, 0x00000002, D_80245E70_E0B1D0, 0xFE363C8C, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000F, 0x00000008, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000037, 0x0000005A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0x00000000, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFED, 0x00000043, 0x00000005, SetNpcPos, 0x0000000F, 0xFFFFF61F, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C80, 0x00000008, 0x00000045, 0x00000002, D_80245D38_E0B098, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00DE000D, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFF6D7, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000049, 0x00000001, 0xFE363C8B, 0x00000049, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_end/end_01/E0B5F0.data.s b/ver/us/asm/data/world/area_end/end_01/E0B5F0.data.s deleted file mode 100644 index a5c252cc7c..0000000000 --- a/ver/us/asm/data/world/area_end/end_01/E0B5F0.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80246290_E0B5F0 -.word 0x00000043, 0x00000003, EnableTexPanning, 0x00000031, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00002000, 0x00000043, 0x00000005, SetTexPanOffset, 0x0000000E, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246310_E0B670 -.word 0x00000043, 0x00000003, EnableTexPanning, 0x00000032, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000034, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000400, 0x00000043, 0x00000005, SetTexPanOffset, 0x0000000A, 0x00000001, 0xFE363C80, 0xFE363C80, 0x00000008, 0x00000001, 0x00000004, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802463A4_E0B704 -.word 0x00000043, 0x00000003, EnableTexPanning, 0x00000033, 0x00000001, 0x00000043, 0x00000005, SetTexPanOffset, 0x0000000B, 0x00000000, 0x00008000, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x0000001E, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, RandInt, 0x00000001, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000005, 0x00000001, 0xFE363C80, 0x00000043, 0x00000005, SetTexPanOffset, 0x0000000B, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000005, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C81, 0x00000002, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000005, SetTexPanOffset, 0x0000000B, 0x00000000, 0x00008000, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000005, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C81, 0x00000002, 0x00000008, 0x00000001, 0xFE363C81, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802464F8_E0B858 -.word 0x00000043, 0x00000005, GetNpcPos, 0x00000010, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000028, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000005, GetNpcPos, 0x00000011, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C84, 0x0000001E, 0x00000028, 0x00000002, 0xFE363C85, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246628_E0B988 -.word 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000018, 0xFFFFF777, 0x00000082, 0xFFFFFFE2, 0x00000043, 0x00000008, NpcFlyTo, 0x00000018, 0xFFFFF777, 0x00000032, 0xFFFFFFE2, 0x0000000A, 0x00000000, 0x00000000, 0x00000043, 0x00000008, NpcFlyTo, 0x00000018, 0xFFFFF803, 0x00000032, 0xFFFFFFE2, 0x00000046, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000018, 0x00CB000B, 0x00000043, 0x00000008, NpcFlyTo, 0x00000018, 0xFFFFF993, 0x00000032, 0xFFFFFFE2, 0x000000C8, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000018, 0x00000000, 0xFFFFFE0C, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000019, 0xFFFFF777, 0x00000082, 0xFFFFFFE2, 0x00000043, 0x00000008, NpcFlyTo, 0x00000019, 0xFFFFF777, 0x00000032, 0xFFFFFFE2, 0x0000000A, 0x00000000, 0x00000000, 0x00000043, 0x00000008, NpcFlyTo, 0x00000019, 0xFFFFF803, 0x00000032, 0xFFFFFFE2, 0x00000046, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000019, 0x00CB000C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000019, 0xFFFFF993, 0x00000032, 0xFFFFFFE2, 0x000000C8, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000019, 0x00000000, 0xFFFFFE0C, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802467E0_E0BB40 -.word 0x00000043, 0x00000005, GetNpcPos, 0x0000001A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFF88, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000168, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x0000001A, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0x0000001B, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x0000001A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C83, 0x00000064, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000168, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x0000001A, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0x0000001B, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_802464F8_E0B858, 0xFE363C8D, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFF6D2, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000045, 0x00000002, D_80246290_E0B5F0, 0xFE363C8A, 0x00000044, 0x00000001, D_802467E0_E0BB40, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFF7DB, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000012, 0x00E50001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000013, 0x00E50003, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000014, 0x00E50005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000015, 0x00E50007, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000016, 0x00E50009, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000017, 0x00E5000B, 0x00000043, 0x00000005, GetNpcPos, 0x00000014, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000052, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000044, 0x00000001, D_80246628_E0B988, 0x00000045, 0x00000002, D_80246310_E0B670, 0xFE363C8B, 0x00000045, 0x00000002, D_802463A4_E0B704, 0xFE363C8C, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFF90E, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8D, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFF8C6, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000049, 0x00000001, 0xFE363C8B, 0x00000049, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_end/end_01/E0C0C0.data.s b/ver/us/asm/data/world/area_end/end_01/E0C0C0.data.s deleted file mode 100644 index 7a612d0626..0000000000 --- a/ver/us/asm/data/world/area_end/end_01/E0C0C0.data.s +++ /dev/null @@ -1,33 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80246D60_E0C0C0 -.word 0x00000043, 0x00000003, EnableTexPanning, 0x00000042, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000046, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000037, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00001000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000009, 0x00000001, 0xFE363C80, 0xFE363C80, 0x00000008, 0x00000001, 0xFE363C81, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246E18_E0C178 -.word 0x00000043, 0x00000003, EnableTexPanning, 0x00000039, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000003E, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00004000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000008, 0x00000000, 0xFE363C80, 0xFE363C80, 0x00000008, 0x00000001, 0x00000006, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246EAC_E0C20C -.word 0x00000038, 0x0000003A, 0x0000003B, 0x0000003C, 0x0000003D, 0x0000003E, 0x0000003F, 0x0000FFFF - -dlabel D_80246ECC_E0C22C -.word 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFA6, 0x0000001E, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0x00000045, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x0000001E, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0x00000048, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, end_01_UnkFunc27, 0x00000000, D_80246EAC_E0C20C, 0x00000003, 0x00000043, 0x0000000B, end_01_UnkFunc26, 0x00000003, 0x000000FF, 0x000000FF, 0x000000FF, 0x00000078, 0x00000078, 0x00000050, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x0000000B, end_01_UnkFunc26, 0x00000003, 0x000000FF, 0x000000FF, 0x000000FF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247098_E0C3F8 -.word 0x00000024, 0x00000002, 0xFE363C80, 0x0000010E, 0x00000005, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000010E, 0x00000024, 0x00000002, 0xFE363C80, 0x0000005A, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000010E, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000001D, 0x00E7000D, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000001D, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000001D, 0x00E7000E, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247164_E0C4C4 -.word 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000005, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetNpcAnimation, 0xFE363C82, 0x00E70008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFE363C82, 0x00E70007, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFE363C82, 0x00E70006, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000168, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0xFE363C82, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024729C_E0C5FC -.word 0x00000008, 0x00000001, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFE363C82, 0xF24A7C80, 0x00000043, 0x00000006, NpcJump0, 0xFE363C82, 0xFE363C83, 0x0000000A, 0x00000014, 0x00000014, 0x00000008, 0x00000001, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0xFE363C82, 0x00E70001, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFE363C82, 0x00E70002, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFE363C82, 0x00E70003, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFE363C82, 0x00E70002, 0x00000008, 0x00000001, 0x00000005, 0x00000006, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000168, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0xFE363C82, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247450_E0C7B0 -.word 0x00000045, 0x00000002, D_80247098_E0C3F8, 0xFE363C87, 0x00000024, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000045, 0x00000002, D_80247164_E0C4C4, 0xFE363C88, 0x00000024, 0x00000002, 0xFE363C80, 0x0000001F, 0x00000045, 0x00000002, D_80247164_E0C4C4, 0xFE363C89, 0x00000024, 0x00000002, 0xFE363C80, 0x00000020, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFA1C, 0x00000045, 0x00000002, D_8024729C_E0C5FC, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C80, 0x00000021, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFA44, 0x00000045, 0x00000002, D_8024729C_E0C5FC, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C80, 0x00000022, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFA6C, 0x00000045, 0x00000002, D_8024729C_E0C5FC, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000023, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFA94, 0x00000045, 0x00000002, D_8024729C_E0C5FC, 0xFE363C8D, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFB66, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000049, 0x00000001, 0xFE363C87, 0x00000049, 0x00000001, 0xFE363C88, 0x00000049, 0x00000001, 0xFE363C89, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000049, 0x00000001, 0xFE363C8B, 0x00000049, 0x00000001, 0xFE363C8C, 0x00000049, 0x00000001, 0xFE363C8D, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000045, 0x00000002, D_80246D60_E0C0C0, 0xFE363C8A, 0x00000045, 0x00000002, D_80246E18_E0C178, 0xFE363C8B, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, NpcMoveTo, 0x0000001C, 0xFFFFF990, 0x00000000, 0x00000032, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000001C, 0x00E70009, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000001C, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000001C, 0x00E7000B, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFA12, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000001C, 0x00E7000A, 0x00000043, 0x00000005, NpcMoveTo, 0x0000001C, 0xFFFFF92C, 0x00000000, 0x00000032, 0x00000057, 0x00000000, 0x00000044, 0x00000001, D_80247450_E0C7B0, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000045, 0x00000002, D_80246D60_E0C0C0, 0xFE363C8A, 0x00000046, 0x00000001, D_80246ECC_E0C22C, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000045, 0x00000002, D_80246D60_E0C0C0, 0xFE363C8A, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFB66, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000049, 0x00000001, 0xFE363C8B, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247854_E0CBB4 -.word 0x00000043, 0x00000005, GetNpcPos, 0x00000026, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C80, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000002C, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002C, 0x00000002, 0xFE363C82, 0x0000003C, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C80, 0x0000002C, 0x00000002, 0xFE363C83, 0x0000005A, 0x00000043, 0x00000005, SetNpcPos, 0x00000026, 0xFE363C80, 0x00000000, 0xFFFFFFE2, 0x00000043, 0x00000005, SetNpcPos, 0x00000027, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000028, 0xFE363C80, 0x00000000, 0x0000001E, 0x00000043, 0x00000005, SetNpcPos, 0x00000029, 0xFE363C81, 0x00000000, 0xFFFFFFE2, 0x00000043, 0x00000005, SetNpcPos, 0x0000002A, 0xFE363C81, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000002B, 0xFE363C81, 0x00000000, 0x0000001E, 0x00000043, 0x00000005, SetNpcPos, 0x0000002C, 0xFE363C82, 0x00000000, 0xFFFFFFE2, 0x00000043, 0x00000005, SetNpcPos, 0x0000002D, 0xFE363C82, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000002E, 0xFE363C82, 0x00000000, 0x0000001E, 0x00000043, 0x00000005, SetNpcPos, 0x0000002F, 0xFE363C83, 0x00000000, 0xFFFFFFE2, 0x00000043, 0x00000005, SetNpcPos, 0x00000030, 0xFE363C83, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000031, 0xFE363C83, 0x00000000, 0x0000001E, 0x00000058, 0x00000000, 0x00000043, 0x00000002, func_80242840_E07BA0, 0x00000027, 0x00000059, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000002, func_80242840_E07BA0, 0x00000028, 0x00000059, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000002, func_80242840_E07BA0, 0x00000029, 0x00000059, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000002, func_80242840_E07BA0, 0x0000002A, 0x00000059, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000002, func_80242840_E07BA0, 0x0000002B, 0x00000059, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000002, func_80242840_E07BA0, 0x0000002C, 0x00000059, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000002, func_80242840_E07BA0, 0x0000002D, 0x00000059, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000002, func_80242840_E07BA0, 0x0000002E, 0x00000059, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000002, func_80242840_E07BA0, 0x0000002F, 0x00000059, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000002, func_80242840_E07BA0, 0x00000030, 0x00000059, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000002, func_80242840_E07BA0, 0x00000031, 0x00000059, 0x00000000, 0x00000043, 0x00000002, func_80242840_E07BA0, 0x00000026, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247BB0_E0CF10 -.word 0x00000043, 0x00000005, GetNpcPos, 0xFE363C80, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFF4C, 0x00000043, 0x00000005, NpcMoveTo, 0xFE363C80, 0xFE363C82, 0xFE363C84, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C83, 0x0000001C, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFE363C82, 0x00E70010, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000003, SetNpcAnimation, 0xFE363C82, 0x00E70011, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000168, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0xFE363C82, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C83, 0x00000043, 0x00000003, SetNpcAnimation, 0xFE363C82, 0x00E7000F, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFF4C, 0x00000043, 0x00000005, NpcMoveTo, 0xFE363C82, 0xFE363C83, 0xFE363C85, 0x0000005A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000026, 0x00000044, 0x00000001, D_80247BB0_E0CF10, 0x00000024, 0x00000002, 0xFE363C80, 0x00000027, 0x00000044, 0x00000001, D_80247BB0_E0CF10, 0x00000024, 0x00000002, 0xFE363C80, 0x00000028, 0x00000044, 0x00000001, D_80247BB0_E0CF10, 0x00000024, 0x00000002, 0xFE363C81, 0x00000008, 0x00000024, 0x00000002, 0xFE363C80, 0x00000029, 0x00000044, 0x00000001, D_80247BB0_E0CF10, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002A, 0x00000044, 0x00000001, D_80247BB0_E0CF10, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002B, 0x00000044, 0x00000001, D_80247BB0_E0CF10, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002C, 0x00000044, 0x00000001, D_80247BB0_E0CF10, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002D, 0x00000044, 0x00000001, D_80247BB0_E0CF10, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002E, 0x00000044, 0x00000001, D_80247BB0_E0CF10, 0x00000024, 0x00000002, 0xFE363C81, 0x00000012, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002F, 0x00000044, 0x00000001, D_80247BB0_E0CF10, 0x00000024, 0x00000002, 0xFE363C80, 0x00000030, 0x00000044, 0x00000001, D_80247BB0_E0CF10, 0x00000024, 0x00000002, 0xFE363C80, 0x00000031, 0x00000044, 0x00000001, D_80247BB0_E0CF10, 0x00000008, 0x00000001, 0x0000005A, 0x00000045, 0x00000002, D_80247854_E0CBB4, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000030, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000082, 0x00000043, 0x00000005, GetNpcPos, 0x00000032, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFF4C, 0x00000043, 0x00000005, NpcMoveTo, 0x00000032, 0xFE363C80, 0xFE363C82, 0x0000002D, 0x00000043, 0x00000003, func_802CDE68, 0x00000032, 0x0000000A, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0x00000009, 0x00000043, 0x00000005, SetNpcRotation, 0x00000032, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0x00000032, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000032, 0x003B0010, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000032, 0xF24A7E80, 0x00000043, 0x00000005, GetNpcPos, 0x00000032, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFD3, 0x00000043, 0x00000006, NpcJump0, 0x00000032, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x00000032, 0x00000045, 0x00000002, 0x80244180, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000003, func_802CDE68, 0x00000032, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000032, 0x003B0001, 0x00000043, 0x00000005, GetNpcPos, 0x00000032, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFB, 0x00000043, 0x00000006, NpcJump0, 0x00000032, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000032, 0x003B0004, 0x00000043, 0x00000005, GetNpcPos, 0x00000032, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFF4C, 0x00000043, 0x00000005, NpcMoveTo, 0x00000032, 0xFE363C80, 0xFE363C82, 0x0000005A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_end/end_01/E0D510.data.s b/ver/us/asm/data/world/area_end/end_01/E0D510.data.s deleted file mode 100644 index d28f24f62d..0000000000 --- a/ver/us/asm/data/world/area_end/end_01/E0D510.data.s +++ /dev/null @@ -1,39 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802481B0_E0D510 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcPaletteSwapMode, 0x00000033, 0x00000003, 0x00000043, 0x00000003, SetNpcPaletteSwapMode, 0x00000034, 0x00000003, 0x00000043, 0x00000003, SetNpcPaletteSwapMode, 0x00000035, 0x00000003, 0x00000043, 0x00000003, SetNpcPaletteSwapMode, 0x00000036, 0x00000003, 0x00000043, 0x00000003, SetNpcPaletteSwapMode, 0x00000037, 0x00000004, 0x00000043, 0x00000003, SetNpcPaletteSwapMode, 0x00000038, 0x00000004, 0x00000043, 0x0000000A, SetNpcPaletteSwapping, 0x00000033, 0x00000001, 0x00000002, 0x0000000A, 0x00000005, 0x0000000A, 0x00000005, 0x00000000, 0x00000000, 0x00000043, 0x0000000A, SetNpcPaletteSwapping, 0x00000034, 0x00000001, 0x00000002, 0x0000000A, 0x00000005, 0x0000000A, 0x00000005, 0x00000000, 0x00000000, 0x00000043, 0x0000000A, SetNpcPaletteSwapping, 0x00000035, 0x00000001, 0x00000002, 0x0000000A, 0x00000005, 0x0000000A, 0x00000005, 0x00000000, 0x00000000, 0x00000043, 0x0000000A, SetNpcPaletteSwapping, 0x00000036, 0x00000001, 0x00000002, 0x0000000A, 0x00000005, 0x0000000A, 0x00000005, 0x00000000, 0x00000000, 0x00000043, 0x0000000A, SetNpcPaletteSwapping, 0x00000037, 0x00000001, 0x00000002, 0x0000000A, 0x00000005, 0x0000000A, 0x00000005, 0x00000004, 0x00000005, 0x00000043, 0x0000000A, SetNpcPaletteSwapping, 0x00000038, 0x00000001, 0x00000002, 0x0000000A, 0x00000005, 0x0000000A, 0x00000005, 0x00000004, 0x00000005, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248364_E0D6C4 -.word 0x00000043, 0x00000003, EnableTexPanning, 0x0000004A, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000400, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000007, 0x00000000, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00004400, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000007, 0x00000001, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x0000000C, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248420_E0D780 -.word 0x00000043, 0x00000003, EnableTexPanning, 0x0000004B, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00002000, 0x00000043, 0x00000005, SetTexPanOffset, 0x0000000E, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802484A0_E0D800 -.word 0x00000043, 0x00000003, EnableTexPanning, 0x0000004C, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00001000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000006, 0x00000001, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248520_E0D880 -.word 0x00000043, 0x00000003, EnableTexPanning, 0x0000004D, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00001000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000005, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000005, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802485A0_E0D900 -.word 0x00000043, 0x00000003, EnableTexPanning, 0x0000004F, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00003000, 0x00000043, 0x00000005, SetTexPanOffset, 0x0000000D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248620_E0D980 -.word 0xC3C28000, 0x42F00000, 0x00000000, 0xC3BD8000, 0x42B40000, 0x00000000, 0xC3AE8000, 0x42A00000, 0x00000000, 0xC3A98000, 0x42B40000, 0x00000000, 0xC3AE8000, 0x42C80000, 0x00000000, 0xC3B38000, 0x42B40000, 0x00000000, 0xC3AE8000, 0x42A00000, 0x00000000, 0xC3A98000, 0x42A00000, 0x40000000, 0xC3A48000, 0x42A00000, 0x40000000, 0xC39F8000, 0x42B40000, 0x40000000, 0xC3A48000, 0x42C80000, 0x40000000, 0xC3A98000, 0x42B40000, 0x40000000, 0xC3A48000, 0x42A00000, 0x40000000, 0xC3868000, 0x42B40000, 0x40000000 - -dlabel D_802486C8_E0DA28 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFEB6, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, LoadPath, 0x0000003C, D_80248620_E0D980, 0x0000000E, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0x0000003B, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000003B, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x00000046, 0x00000043, 0x00000008, NpcFlyTo, 0x0000003B, 0xFFFFFF07, 0x00000078, 0x00000000, 0x0000000A, 0xFFFFFFF6, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000003B, 0x00000000, 0xFFFFFE0C, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248838_E0DB98 -.word 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000039, 0x0000005A, 0x00000007, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000039, 0x0000010E, 0x00000007, 0x00000008, 0x00000001, 0x0000002D, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000039, 0x00E6000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000039, 0x00E60006, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000039, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000046, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000039, 0x00E60008, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000039, 0x00E60006, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000039, 0x00E60002, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000039, 0x00E60009, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000039, 0x00E60002, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000039, 0x00E60004, 0x00000043, 0x00000005, GetNpcPos, 0x00000039, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000005, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFE2, 0x00000043, 0x00000005, NpcMoveTo, 0x00000039, 0xFE363C80, 0xFE363C82, 0x00000014, 0x00000005, 0x00000001, 0x00000007, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFB, 0x00000043, 0x00000005, SetNpcPos, 0x00000039, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000005, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000039, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248A88_E0DDE8 -.word 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000003A, 0x0000005A, 0x00000007, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000003A, 0x0000010E, 0x00000007, 0x00000008, 0x00000001, 0x0000002D, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000003A, 0x00D60011, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000003A, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000003A, 0x00D60015, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000003A, 0x00D6000D, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000003A, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000003A, 0x00D60011, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000003A, 0x00D60012, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000003A, 0x00D60013, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000003A, 0x00D6000D, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000003A, 0x00D60016, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000003A, 0x00D60010, 0x00000043, 0x00000005, GetNpcPos, 0x0000003A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFB, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFE2, 0x00000043, 0x00000005, NpcMoveTo, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000014, 0x00000005, 0x00000001, 0x00000007, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFB, 0x00000043, 0x00000005, SetNpcPos, 0x0000003A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000005, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000003A, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000044, 0x00000001, D_80248364_E0D6C4, 0x00000044, 0x00000001, D_80248420_E0D780, 0x00000044, 0x00000001, D_802484A0_E0D800, 0x00000044, 0x00000001, D_80248520_E0D880, 0x00000044, 0x00000001, D_802485A0_E0D900, 0x00000044, 0x00000001, D_80248A88_E0DDE8, 0x00000044, 0x00000001, D_802486C8_E0DA28, 0x00000046, 0x00000001, D_80248838_E0DB98, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248D8C_E0E0EC -.word 0x00000058, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFE363C81, 0xF24A7C80, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C80, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFF9, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFE7, 0x00000043, 0x00000006, NpcJump0, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000028, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C81, 0x00000000, 0xFFFFFE0C, 0x00000000, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000058, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFE363C80, 0x00E00002, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0xFE363C80, 0x00E00003, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFE363C80, 0x00E00005, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFE363C80, 0x00E00004, 0x00000008, 0x00000001, 0x00000015, 0x00000043, 0x00000003, SetNpcAnimation, 0xFE363C80, 0x00E00003, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFE363C80, 0x00E00005, 0x00000008, 0x00000001, 0x00000005, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0xFE363C80, 0xF24A7D2B, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C80, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFDA8, 0x00000043, 0x00000005, NpcMoveTo, 0xFE363C80, 0xFE363C82, 0xFE363C84, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248FC8_E0E328 -.word 0x00000043, 0x00000003, SetNpcSpeed, 0xFE363C80, 0xF24A7D2B, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFDA8, 0x00000043, 0x00000005, NpcMoveTo, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcPaletteSwapMode, 0x0000003C, 0x00000004, 0x00000043, 0x00000003, SetNpcPaletteSwapMode, 0x0000003D, 0x00000004, 0x00000043, 0x00000003, SetNpcPaletteSwapMode, 0x0000003E, 0x00000004, 0x00000043, 0x00000003, SetNpcPaletteSwapMode, 0x00000042, 0x00000004, 0x00000043, 0x00000003, SetNpcPaletteSwapMode, 0x00000043, 0x00000004, 0x00000043, 0x0000000A, SetNpcPaletteSwapping, 0x0000003C, 0x00000001, 0x00000002, 0x0000000A, 0x00000005, 0x0000000A, 0x00000005, 0x00000004, 0x00000005, 0x00000043, 0x0000000A, SetNpcPaletteSwapping, 0x0000003D, 0x00000001, 0x00000002, 0x0000000A, 0x00000005, 0x0000000A, 0x00000005, 0x00000004, 0x00000005, 0x00000043, 0x0000000A, SetNpcPaletteSwapping, 0x0000003E, 0x00000001, 0x00000002, 0x0000000A, 0x00000005, 0x0000000A, 0x00000005, 0x00000004, 0x00000005, 0x00000043, 0x0000000A, SetNpcPaletteSwapping, 0x00000042, 0x00000001, 0x00000002, 0x0000000A, 0x00000005, 0x0000000A, 0x00000005, 0x00000004, 0x00000005, 0x00000043, 0x0000000A, SetNpcPaletteSwapping, 0x00000043, 0x00000001, 0x00000002, 0x0000000A, 0x00000005, 0x0000000A, 0x00000005, 0x00000004, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C81, 0x0000003F, 0x00000044, 0x00000001, D_80248D8C_E0E0EC, 0x00000024, 0x00000002, 0xFE363C80, 0x0000003D, 0x00000024, 0x00000002, 0xFE363C81, 0x00000040, 0x00000044, 0x00000001, D_80248D8C_E0E0EC, 0x00000024, 0x00000002, 0xFE363C80, 0x0000003E, 0x00000024, 0x00000002, 0xFE363C81, 0x00000041, 0x00000044, 0x00000001, D_80248D8C_E0E0EC, 0x00000024, 0x00000002, 0xFE363C80, 0x00000042, 0x00000044, 0x00000001, D_80248FC8_E0E328, 0x00000024, 0x00000002, 0xFE363C80, 0x00000043, 0x00000044, 0x00000001, D_80248FC8_E0E328, 0x00000026, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x000001F4, 0x0000002D, 0x00000002, 0xFE363C80, 0xF24A7D2B, 0x00000043, 0x00000005, TranslateGroup, 0x00000052, 0xFE363C80, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000039, 0xFFFFFEFD, 0xFFFFFF6A, 0x000000F0, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x0000003A, 0xFFFFFF1B, 0xFFFFFF6A, 0x000000F0, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C81, 0xF24A7A80, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000002C, 0x00000002, 0xFE363C81, 0xF24A7BD6, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_00/B25E90.data.s b/ver/us/asm/data/world/area_jan/jan_00/B25E90.data.s index 09c368b001..903a640e8f 100644 --- a/ver/us/asm/data/world/area_jan/jan_00/B25E90.data.s +++ b/ver/us/asm/data/world/area_jan/jan_00/B25E90.data.s @@ -24,7 +24,7 @@ dlabel D_80245E5C_B2639C .word 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245E6C_B263AC -.word 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C8C, 0x0000002B, 0x00000002, 0xFE363C81, 0x00000004, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000001, func_80241868_B21DA8, 0x00000043, 0x0000000F, PlayEffect, 0x00000018, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, jan_00_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x0000001E, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000051, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000004F, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C8C, 0x0000002B, 0x00000002, 0xFE363C81, 0x00000004, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000001, jan_00_UnkPlayerPosFunc, 0x00000043, 0x0000000F, PlayEffect, 0x00000018, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, jan_00_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x0000001E, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000051, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000004F, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245F6C_B264AC .word 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_117/AA2180.data.s b/ver/us/asm/data/world/area_kpa/kpa_117/AA2180.data.s deleted file mode 100644 index 4a8b8c4ae8..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_117/AA2180.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240000_AA2180 -.word 0xC3520000, 0x00000000, 0x42C80000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240158, D_80240000_AA2180, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190185, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetMusicTrackVolumes, 0x00000006, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_117/AA2240.data.s b/ver/us/asm/data/world/area_kpa/kpa_117/AA2240.data.s deleted file mode 100644 index 5de85f0d2a..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_117/AA2240.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802400C0_AA2240 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802400D0_AA2250 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240230, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024012C_AA22AC -.word 0x00000047, 0x00000005, D_802400D0_AA2250, 0x00080000, 0x0000000B, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000046, 0x00000001, D_802400C0_AA2240, 0x00000024, 0x00000002, 0xFE363C80, D_8024012C_AA22AC, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x80240050, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_05/862BC0.data.s b/ver/us/asm/data/world/area_mac/mac_05/862BC0.data.s index f3f43d0a1c..3c8de171a3 100644 --- a/ver/us/asm/data/world/area_mac/mac_05/862BC0.data.s +++ b/ver/us/asm/data/world/area_mac/mac_05/862BC0.data.s @@ -24,7 +24,7 @@ dlabel D_80250FA4_863114 .word 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80250FB4_863124 -.word 0x00000043, 0x00000004, GetNpcVar, 0x00000000, 0x00000000, 0xFE363C83, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000000, 0x00000043, 0x00000001, mac_05_UnkPlayerPosFunc, 0x00000043, 0x00000006, PlaySoundAt, 0x8000004F, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000009, mac_05_PlayFX3D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x0000001E, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetNpcVar, 0x00000000, 0x00000000, 0xFE363C83, 0x00000043, 0x00000001, mac_05_UnkPlayerPosFunc, 0x00000043, 0x00000005, mac_05_UpdatePosFX3D, 0xFE363C83, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000008, mac_05_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x0000001E, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000056, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000054, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000004, GetNpcVar, 0x00000000, 0x00000000, 0xFE363C83, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000000, 0x00000043, 0x00000001, mac_05_UnkPlayerPosFunc, 0x00000043, 0x00000006, PlaySoundAt, 0x8000004F, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000009, mac_05_CreateWhaleGeyser, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x0000001E, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetNpcVar, 0x00000000, 0x00000000, 0xFE363C83, 0x00000043, 0x00000001, mac_05_UnkPlayerPosFunc, 0x00000043, 0x00000005, mac_05_SetWhaleGeyserPos, 0xFE363C83, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000008, mac_05_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x0000001E, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000056, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000054, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8025110C_86327C .word 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -45,4 +45,4 @@ dlabel D_80251654_8637C4 .word 0x00000043, 0x00000008, mac_05_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x0000001E, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000056, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000054, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802516CC_86383C -.word 0x00000043, 0x00000008, mac_05_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x00000000, 0x00000008, 0x00000003, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000002A, 0x00000002, 0xFE363C81, 0x00000003, 0x00000043, 0x00000006, RotateModel, 0x00000058, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateGroup, 0x0000005D, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0x0000003C, 0x0000001D, 0xFFFFFFCD, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0x0000003C, 0x0000001D, 0x00000033, 0x00000043, 0x00000006, RotateModel, 0x00000050, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000052, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000056, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000054, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0xFFFFFFC4, 0xFFFFFFE3, 0x00000033, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0xFFFFFFC4, 0xFFFFFFE3, 0xFFFFFFCD, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x00000029, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000008, mac_05_UnkFloatFunc001, 0xFE363C80, 0xFE363C80, 0x0000001E, 0x0000003C, 0x00000003, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000056, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000054, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000004, MakeLocalVertexCopy, 0x00000001, 0x0000005A, 0x00000001, 0x00000043, 0x00000004, SetCustomGfxBuilders, 0x00000001, mac_05_unkAngleFunc002, 0x00000000, 0x00000043, 0x00000004, SetModelCustomGfx, 0x0000005A, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000004, MakeLocalVertexCopy, 0x00000002, 0x0000005B, 0x00000001, 0x00000043, 0x00000004, SetCustomGfxBuilders, 0x00000002, mac_05_unkAngleFunc003, 0x00000000, 0x00000043, 0x00000004, SetModelCustomGfx, 0x0000005B, 0x00000002, 0xFFFFFFFF, 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, mac_05_UnkAngleFunc001, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000002D, 0x00000002, 0xFE363C80, 0xFFFFFFB0, 0x0000002D, 0x00000002, 0xFE363C81, 0xFFFFFFEE, 0x0000002D, 0x00000002, 0xFE363C82, 0x000001A4, 0x0000002C, 0x00000002, 0xFE363C80, 0x00000082, 0x0000002C, 0x00000002, 0xFE363C81, 0xFFFFFFEC, 0x0000002C, 0x00000002, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000005E, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x00000058, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateGroup, 0x0000005D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, GetNpcYaw, 0x00000000, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x0000002C, 0x00000002, 0xFE363C80, 0xFFFFFFA6, 0x00000043, 0x00000005, TranslateModel, 0x0000005E, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000058, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000005D, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000005E, 0x00000064, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000058, 0x00000066, 0x00000004, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0x0000003C, 0x0000001D, 0xFFFFFFCD, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0x0000003C, 0x0000001D, 0x00000033, 0x00000043, 0x00000006, RotateModel, 0x0000005E, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000050, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000052, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000058, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000056, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000054, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000005D, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000005E, 0xFFFFFF9C, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000058, 0xFFFFFF9A, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0xFFFFFFC4, 0xFFFFFFE3, 0x00000033, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0xFFFFFFC4, 0xFFFFFFE3, 0xFFFFFFCD, 0x00000043, 0x00000005, TranslateModel, 0x0000005E, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000058, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000005D, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000003, GetNpcAnimation, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000015, 0x7FFFFE00, 0x00000043, 0x00000003, EnableModel, 0x00000050, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000052, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8B, 0x00B60009, 0x00000043, 0x00000004, GetNpcVar, 0x00000000, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000443, 0x00000043, 0x00000002, func_802D62E4, 0x00000043, 0x00000043, 0x00000002, mac_05_DisposeFX3D, 0xFE363C80, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00B60003, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x00002037, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, D_80250D58_862EC8, 0x00000016, 0x00000001, 0x00B60000, 0x00000024, 0x00000002, 0xFE363C8D, D_80250A5C_862BCC, 0x00000016, 0x00000001, 0x00B60002, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x00002036, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, D_80250AD4_862C44, 0x00000016, 0x00000001, 0x00B60001, 0x00000024, 0x00000002, 0xFE363C8D, D_80251654_8637C4, 0x00000016, 0x00000001, 0x00B60004, 0x00000024, 0x00000002, 0xFE363C8D, D_802516CC_86383C, 0x00000016, 0x00000001, 0x00B60005, 0x00000024, 0x00000002, 0xFE363C8D, D_80250FA4_863114, 0x00000043, 0x00000003, EnableModel, 0x00000050, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000052, 0x00000000, 0x00000016, 0x00000001, 0x00B60006, 0x00000024, 0x00000002, 0xFE363C8D, D_80251244_8633B4, 0x00000043, 0x00000003, EnableModel, 0x00000050, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000052, 0x00000000, 0x00000016, 0x00000001, 0x00B60007, 0x00000024, 0x00000002, 0xFE363C8D, D_802513AC_86351C, 0x00000043, 0x00000003, EnableModel, 0x00000050, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000052, 0x00000000, 0x00000016, 0x00000001, 0x00B60008, 0x00000024, 0x00000002, 0xFE363C8D, D_802514EC_86365C, 0x00000016, 0x00000001, 0x00B60009, 0x00000024, 0x00000002, 0xFE363C8D, D_80250FB4_863124, 0x00000016, 0x00000001, 0x00B6000A, 0x00000024, 0x00000002, 0xFE363C8D, D_8025110C_86327C, 0x00000016, 0x00000001, 0x00B6000C, 0x00000024, 0x00000002, 0xFE363C8D, D_8025111C_86328C, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0xFE363C8D, 0x00000027, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000000D, 0x00000002, 0xFE363C8C, 0x000003E8, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60003, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000008, mac_05_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x00000000, 0x00000008, 0x00000003, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000002A, 0x00000002, 0xFE363C81, 0x00000003, 0x00000043, 0x00000006, RotateModel, 0x00000058, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateGroup, 0x0000005D, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0x0000003C, 0x0000001D, 0xFFFFFFCD, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0x0000003C, 0x0000001D, 0x00000033, 0x00000043, 0x00000006, RotateModel, 0x00000050, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000052, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000056, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000054, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0xFFFFFFC4, 0xFFFFFFE3, 0x00000033, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0xFFFFFFC4, 0xFFFFFFE3, 0xFFFFFFCD, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x00000029, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000008, mac_05_UnkFloatFunc001, 0xFE363C80, 0xFE363C80, 0x0000001E, 0x0000003C, 0x00000003, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000056, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000054, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000004, MakeLocalVertexCopy, 0x00000001, 0x0000005A, 0x00000001, 0x00000043, 0x00000004, SetCustomGfxBuilders, 0x00000001, mac_05_unkAngleFunc002, 0x00000000, 0x00000043, 0x00000004, SetModelCustomGfx, 0x0000005A, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000004, MakeLocalVertexCopy, 0x00000002, 0x0000005B, 0x00000001, 0x00000043, 0x00000004, SetCustomGfxBuilders, 0x00000002, mac_05_unkAngleFunc003, 0x00000000, 0x00000043, 0x00000004, SetModelCustomGfx, 0x0000005B, 0x00000002, 0xFFFFFFFF, 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, mac_05_UnkAngleFunc001, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000002D, 0x00000002, 0xFE363C80, 0xFFFFFFB0, 0x0000002D, 0x00000002, 0xFE363C81, 0xFFFFFFEE, 0x0000002D, 0x00000002, 0xFE363C82, 0x000001A4, 0x0000002C, 0x00000002, 0xFE363C80, 0x00000082, 0x0000002C, 0x00000002, 0xFE363C81, 0xFFFFFFEC, 0x0000002C, 0x00000002, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000005E, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x00000058, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateGroup, 0x0000005D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, GetNpcYaw, 0x00000000, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x0000002C, 0x00000002, 0xFE363C80, 0xFFFFFFA6, 0x00000043, 0x00000005, TranslateModel, 0x0000005E, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000058, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000005D, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000005E, 0x00000064, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000058, 0x00000066, 0x00000004, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0x0000003C, 0x0000001D, 0xFFFFFFCD, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0x0000003C, 0x0000001D, 0x00000033, 0x00000043, 0x00000006, RotateModel, 0x0000005E, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000050, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000052, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000058, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000056, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000054, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000005D, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000005E, 0xFFFFFF9C, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000058, 0xFFFFFF9A, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0xFFFFFFC4, 0xFFFFFFE3, 0x00000033, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0xFFFFFFC4, 0xFFFFFFE3, 0xFFFFFFCD, 0x00000043, 0x00000005, TranslateModel, 0x0000005E, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000058, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000005D, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000003, GetNpcAnimation, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000015, 0x7FFFFE00, 0x00000043, 0x00000003, EnableModel, 0x00000050, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000052, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8B, 0x00B60009, 0x00000043, 0x00000004, GetNpcVar, 0x00000000, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000443, 0x00000043, 0x00000002, func_802D62E4, 0x00000043, 0x00000043, 0x00000002, mac_05_DisposeWhaleGeyser, 0xFE363C80, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00B60003, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x00002037, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, D_80250D58_862EC8, 0x00000016, 0x00000001, 0x00B60000, 0x00000024, 0x00000002, 0xFE363C8D, D_80250A5C_862BCC, 0x00000016, 0x00000001, 0x00B60002, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x00002036, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, D_80250AD4_862C44, 0x00000016, 0x00000001, 0x00B60001, 0x00000024, 0x00000002, 0xFE363C8D, D_80251654_8637C4, 0x00000016, 0x00000001, 0x00B60004, 0x00000024, 0x00000002, 0xFE363C8D, D_802516CC_86383C, 0x00000016, 0x00000001, 0x00B60005, 0x00000024, 0x00000002, 0xFE363C8D, D_80250FA4_863114, 0x00000043, 0x00000003, EnableModel, 0x00000050, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000052, 0x00000000, 0x00000016, 0x00000001, 0x00B60006, 0x00000024, 0x00000002, 0xFE363C8D, D_80251244_8633B4, 0x00000043, 0x00000003, EnableModel, 0x00000050, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000052, 0x00000000, 0x00000016, 0x00000001, 0x00B60007, 0x00000024, 0x00000002, 0xFE363C8D, D_802513AC_86351C, 0x00000043, 0x00000003, EnableModel, 0x00000050, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000052, 0x00000000, 0x00000016, 0x00000001, 0x00B60008, 0x00000024, 0x00000002, 0xFE363C8D, D_802514EC_86365C, 0x00000016, 0x00000001, 0x00B60009, 0x00000024, 0x00000002, 0xFE363C8D, D_80250FB4_863124, 0x00000016, 0x00000001, 0x00B6000A, 0x00000024, 0x00000002, 0xFE363C8D, D_8025110C_86327C, 0x00000016, 0x00000001, 0x00B6000C, 0x00000024, 0x00000002, 0xFE363C8D, D_8025111C_86328C, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0xFE363C8D, 0x00000027, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000000D, 0x00000002, 0xFE363C8C, 0x000003E8, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60003, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_06/8661D0.data.s b/ver/us/asm/data/world/area_mac/mac_06/8661D0.data.s deleted file mode 100644 index 0688d604d5..0000000000 --- a/ver/us/asm/data/world/area_mac/mac_06/8661D0.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241690_8661D0 -.word 0x00000000, 0x00000000, 0x42C80000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80241848_866388, D_80241690_8661D0, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00000000 - -dlabel D_802416E0_866220 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, mac_06_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_06_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024177C_8662BC -.word 0x0000004D, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C8C, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, dup_mac_06_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0xF24A7680, 0xF24A7E80, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000005, ScaleGroup, 0x00000014, 0x00000001, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C8C, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241848_866388 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000001, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x802448D8, 0x00000044, 0x00000001, 0x80243AEC, 0x00000044, 0x00000001, 0x80242A14, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000081, 0x00000000, 0x00000008, 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000002, 0x00000044, 0x00000001, D_8024177C_8662BC, 0x00000043, 0x00000003, SetTexPanner, 0x00000013, 0x00000001, 0x00000043, 0x00000001, mac_06_SpawnSunEffect, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000190, 0x00000024, 0x00000002, 0xFE363C82, 0x00000096, 0x00000024, 0x00000002, 0xFE363C83, 0x000000C8, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFC4, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802416E0_866220, 0x00000057, 0x00000000, 0x00000012, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF6A, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C84, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802416E0_866220, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_06/8666A0.data.s b/ver/us/asm/data/world/area_mac/mac_06/8666A0.data.s deleted file mode 100644 index ee9a967141..0000000000 --- a/ver/us/asm/data/world/area_mac/mac_06/8666A0.data.s +++ /dev/null @@ -1,48 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel mac_06_unkAngle1 -.word 0x00000000 - -dlabel mac_06_unkAngle2 -.word 0xFFFFFFFF - -dlabel mac_06_unkAngle3 -.word 0xFFFFFFFF - -dlabel D_80241B6C_8666AC -.word 0x00000043, 0x00000008, mac_06_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x0000001E, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000006, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000004, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241BE4_866724 -.word 0x00000043, 0x00000008, mac_06_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x00000000, 0x0000001E, 0x0000001E, 0x00000001, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C81, 0xF24A8680, 0x00000043, 0x00000006, RotateModel, 0x00000008, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateGroup, 0x0000000D, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x00000000, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000002, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000006, 0x0000003C, 0x0000001D, 0xFFFFFFCD, 0x00000043, 0x00000005, TranslateModel, 0x00000004, 0x0000003C, 0x0000001D, 0x00000033, 0x00000043, 0x00000006, RotateModel, 0x00000000, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000002, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000006, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000004, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x00000000, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000002, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000006, 0xFFFFFFC4, 0xFFFFFFE3, 0x00000033, 0x00000043, 0x00000005, TranslateModel, 0x00000004, 0xFFFFFFC4, 0xFFFFFFE3, 0xFFFFFFCD, 0x00000043, 0x00000008, mac_06_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x00000000, 0xFFFFFFD8, 0x0000001E, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000000E, 0xFE363C80, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241E20_866960 -.word 0x00000043, 0x00000008, mac_06_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x00000000, 0xFFFFFFE2, 0x00000008, 0x00000001, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24AF280, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C81, 0xF24A8680, 0x00000043, 0x00000006, RotateModel, 0x00000008, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateGroup, 0x0000000D, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x00000000, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000002, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000006, 0x0000003C, 0x0000001D, 0xFFFFFFCD, 0x00000043, 0x00000005, TranslateModel, 0x00000004, 0x0000003C, 0x0000001D, 0x00000033, 0x00000043, 0x00000006, RotateModel, 0x00000000, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000002, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000006, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000004, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x00000000, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000002, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000006, 0xFFFFFFC4, 0xFFFFFFE3, 0x00000033, 0x00000043, 0x00000005, TranslateModel, 0x00000004, 0xFFFFFFC4, 0xFFFFFFE3, 0xFFFFFFCD, 0x00000043, 0x00000008, mac_06_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x00000000, 0xFFFFFFD8, 0x00000078, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000000E, 0xFE363C80, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024206C_866BAC -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024207C_866BBC -.word 0x00000043, 0x00000004, GetNpcVar, 0x00000000, 0x00000000, 0xFE363C83, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000000, 0x00000043, 0x00000001, mac_06_UnkPlayerPosFunc, 0x00000043, 0x00000006, PlaySoundAt, 0x8000004F, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000009, mac_06_PlayFX3D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x0000001E, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetNpcVar, 0x00000000, 0x00000000, 0xFE363C83, 0x00000043, 0x00000001, mac_06_UnkPlayerPosFunc, 0x00000043, 0x00000005, mac_06_UpdatePosFX3D, 0xFE363C83, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000008, mac_06_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x0000001E, 0x0000003C, 0x00000019, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000006, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000004, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802421D4_866D14 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802421E4_866D24 -.word 0x0000000F, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000E, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000043, 0x00000003, EnableModel, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000002, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8C, 0x0000000F, 0x00000043, 0x00000003, EnableModel, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000002, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000016, 0x00000043, 0x00000003, EnableModel, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000002, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000000, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024230C_866E4C -.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000014, 0x0000002B, 0x00000002, 0xFE363C80, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, mac_06_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0xF24A7680, 0xF24A7E80, 0x00000003, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000008, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000000D, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000000, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000002, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000006, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000004, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000006, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000004, 0xFE363C80, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242474_866FB4 -.word 0x00000043, 0x00000008, mac_06_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0xF24A6280, 0xF24A9280, 0x00000003, 0x00000000, 0x00000000, 0x00000043, 0x00000008, mac_06_UnkFloatFunc001, 0xFE363C8C, 0xFE363C81, 0xF24A9280, 0xF24A6280, 0x00000002, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000008, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000000D, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000002, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000006, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000004, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000006, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000004, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802425B4_8670F4 -.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000014, 0x0000002B, 0x00000002, 0xFE363C80, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, mac_06_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0xF24A7680, 0xF24A7E80, 0x00000003, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000008, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000000D, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000000, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000002, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000006, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000004, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000006, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000004, 0xFE363C80, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024271C_86725C -.word 0x00000043, 0x00000008, mac_06_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x0000001E, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000006, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000004, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242794_8672D4 -.word 0x00000043, 0x00000008, mac_06_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x00000000, 0x0000001E, 0x00000003, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000002A, 0x00000002, 0xFE363C81, 0x00000003, 0x00000043, 0x00000006, RotateModel, 0x00000008, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateGroup, 0x0000000D, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x00000000, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000002, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000006, 0x0000003C, 0x0000001D, 0xFFFFFFCD, 0x00000043, 0x00000005, TranslateModel, 0x00000004, 0x0000003C, 0x0000001D, 0x00000033, 0x00000043, 0x00000006, RotateModel, 0x00000000, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000002, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000006, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000004, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x00000000, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000002, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000006, 0xFFFFFFC4, 0xFFFFFFE3, 0x00000033, 0x00000043, 0x00000005, TranslateModel, 0x00000004, 0xFFFFFFC4, 0xFFFFFFE3, 0xFFFFFFCD, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x00000029, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000008, mac_06_UnkFloatFunc001, 0xFE363C80, 0xFE363C80, 0x0000001E, 0x0000003C, 0x00000003, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000006, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000004, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000004, MakeLocalVertexCopy, 0x00000001, 0x0000000A, 0x00000001, 0x00000043, 0x00000004, SetCustomGfxBuilders, 0x00000001, mac_06_unkAngleFunc002, 0x00000000, 0x00000043, 0x00000004, SetModelCustomGfx, 0x0000000A, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000004, MakeLocalVertexCopy, 0x00000002, 0x0000000B, 0x00000001, 0x00000043, 0x00000004, SetCustomGfxBuilders, 0x00000002, mac_06_unkAngleFunc003, 0x00000000, 0x00000043, 0x00000004, SetModelCustomGfx, 0x0000000B, 0x00000002, 0xFFFFFFFF, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, mac_06_UnkAngleFunc001, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000002D, 0x00000002, 0xFE363C80, 0xFFFFFFB0, 0x0000002D, 0x00000002, 0xFE363C81, 0xFFFFFFEE, 0x0000002D, 0x00000002, 0xFE363C82, 0x000001A4, 0x0000002C, 0x00000002, 0xFE363C80, 0x00000082, 0x0000002C, 0x00000002, 0xFE363C81, 0xFFFFFFEC, 0x0000002C, 0x00000002, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000000E, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x00000008, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateGroup, 0x0000000D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, GetNpcYaw, 0x00000000, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x0000002C, 0x00000002, 0xFE363C80, 0xFFFFFFA6, 0x00000043, 0x00000005, TranslateModel, 0x0000000E, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000000, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000002, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000008, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000006, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000004, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000000D, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000000E, 0x00000064, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000000, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000002, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000008, 0x00000066, 0x00000004, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000006, 0x0000003C, 0x0000001D, 0xFFFFFFCD, 0x00000043, 0x00000005, TranslateModel, 0x00000004, 0x0000003C, 0x0000001D, 0x00000033, 0x00000043, 0x00000006, RotateModel, 0x0000000E, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000000, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000002, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000008, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000006, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000004, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000000D, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000000E, 0xFFFFFF9C, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000000, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000002, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000008, 0xFFFFFF9A, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000006, 0xFFFFFFC4, 0xFFFFFFE3, 0x00000033, 0x00000043, 0x00000005, TranslateModel, 0x00000004, 0xFFFFFFC4, 0xFFFFFFE3, 0xFFFFFFCD, 0x00000043, 0x00000005, TranslateModel, 0x0000000E, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000002, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000008, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000006, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000004, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000000D, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000003, GetNpcAnimation, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000000, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000002, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8B, 0x00B60009, 0x00000043, 0x00000004, GetNpcVar, 0x00000000, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000443, 0x00000043, 0x00000002, func_802D62E4, 0x00000043, 0x00000043, 0x00000002, mac_06_DisposeFX3D, 0xFE363C80, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00B60003, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x00002037, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, D_80241E20_866960, 0x00000016, 0x00000001, 0x00B60000, 0x00000024, 0x00000002, 0xFE363C8D, D_80241B6C_8666AC, 0x00000016, 0x00000001, 0x00B60002, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x00002036, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, D_80241BE4_866724, 0x00000016, 0x00000001, 0x00B60001, 0x00000024, 0x00000002, 0xFE363C8D, D_8024271C_86725C, 0x00000016, 0x00000001, 0x00B60004, 0x00000024, 0x00000002, 0xFE363C8D, D_80242794_8672D4, 0x00000016, 0x00000001, 0x00B60005, 0x00000024, 0x00000002, 0xFE363C8D, D_8024206C_866BAC, 0x00000043, 0x00000003, EnableModel, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x00B60006, 0x00000024, 0x00000002, 0xFE363C8D, D_8024230C_866E4C, 0x00000043, 0x00000003, EnableModel, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x00B60007, 0x00000024, 0x00000002, 0xFE363C8D, D_80242474_866FB4, 0x00000043, 0x00000003, EnableModel, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x00B60008, 0x00000024, 0x00000002, 0xFE363C8D, D_802425B4_8670F4, 0x00000016, 0x00000001, 0x00B60009, 0x00000024, 0x00000002, 0xFE363C8D, D_8024207C_866BBC, 0x00000016, 0x00000001, 0x00B6000A, 0x00000024, 0x00000002, 0xFE363C8D, D_802421D4_866D14, 0x00000016, 0x00000001, 0x00B6000C, 0x00000024, 0x00000002, 0xFE363C8D, D_802421E4_866D24, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0xFE363C8D, 0x00000027, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000000D, 0x00000002, 0xFE363C8C, 0x000003E8, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60003, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_06/867EF0.data.s b/ver/us/asm/data/world/area_mac/mac_06/867EF0.data.s deleted file mode 100644 index 4047e03b95..0000000000 --- a/ver/us/asm/data/world/area_mac/mac_06/867EF0.data.s +++ /dev/null @@ -1,54 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802433B0_867EF0 -.word 0x00000000, 0x00180030, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_802433DC_867F1C -.word 0x00000000, 0x00280018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80243408_867F48 -.word 0x00000000, 0x00200018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80243434_867F74 -.word 0x00000000 - -dlabel D_80243438_867F78 -.word 0x00000000 - -dlabel D_8024343C_867F7C -.word 0x00000000 - -dlabel D_80243440_867F80 -.word 0x00000000 - -dlabel D_80243444_867F84 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000008, NpcFlyTo, 0x00000000, 0x00000032, 0xFE363C81, 0x000001F4, 0x00000078, 0x00000000, 0x0000000B, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80241098_865BD8, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000096, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60001, 0x00000043, 0x00000008, NpcFlyTo, 0x00000000, 0x000001F4, 0xFE363C81, 0x000001F4, 0x00000078, 0x00000000, 0x0000000C, 0x0000000A, 0x00000002, 0xF8405B85, 0x00000000, 0x00000024, 0x00000002, 0xF8405B85, 0x00000001, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000005DC, 0x00000043, 0x00000004, GotoMapSpecial, 0x80244960, 0x00000005, 0x00000006, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x80244958, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000000F, 0x0000000A, 0x00000002, 0xF8406042, 0x00000000, 0x00000043, 0x00000008, NpcFlyTo, 0x00000000, 0xFFFFFDDA, 0xFE363C81, 0x000001F4, 0x000000F0, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000003, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, NpcFlyTo, 0x00000000, 0xFFFFFFBA, 0xFE363C81, 0x000001F4, 0x00000078, 0x00000000, 0x0000000B, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80241098_865BD8, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000096, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60001, 0x00000043, 0x00000008, NpcFlyTo, 0x00000000, 0xFFFFFE0C, 0xFE363C81, 0x000001F4, 0x00000078, 0x00000000, 0x0000000C, 0x00000043, 0x00000003, GotoMap, 0x80244950, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802436D0_868210 -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFED4, 0x00000000, 0x000001F4, 0x00000012, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000010E, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0x0000010E, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x0000012C, 0x00000000, 0x000001F4, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80243444_867F84, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00B60001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00008048, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80240E80_8659C0, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80240E80_8659C0, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x0000000B, 0x00000043, 0x00000002, func_80240E80_8659C0, 0x00000002, 0x00000016, 0x00000001, 0x00000028, 0x00000043, 0x00000002, func_80240E80_8659C0, 0x00000002, 0x00000023, 0x00000000, 0x00000057, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000000B, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000000F, 0x0000000A, 0x00000002, 0xF8406042, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80241290_865DD0, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x80244958, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x80244950, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243A34_868574 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243A44_868584 -.word 0xC3A60000, 0x42480000, 0x42F00000, 0xC3200000, 0x428C0000, 0x43960000, 0xC28E0000, 0x42A00000, 0x43020000, 0x42D20000, 0x42B40000, 0x43830000, 0x435D0000, 0x42C80000, 0x42F00000, 0x43CA0000, 0x42AA0000, 0x43160000, 0x436E0000, 0x428C0000, 0xC2640000, 0x427C0000, 0x428C0000, 0xC2280000, 0xC3030000, 0x42700000, 0x43100000, 0xC2960000, 0x42C80000, 0xC2700000, 0x43480000, 0x42700000, 0xC3960000, 0x41A00000, 0x42700000, 0xC38C0000, 0x428C0000, 0x42700000, 0x42A00000, 0xC3A60000, 0x42480000, 0x42F00000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, CloneModel, 0x00000016, 0x00002AF8, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000024, 0x00000002, 0xFBD3E281, 0x00000000, 0x00000026, 0x00000002, 0xFE363C87, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, LoadPath, 0x000001F4, D_80243A44_868584, 0x0000000E, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, TranslateModel, 0x00000016, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000026, 0x00000002, 0xFE363C88, 0xFE363C82, 0x0000002E, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x00002AF8, 0xFE363C81, 0xFE363C88, 0xFE363C83, 0x00000043, 0x00000001, func_80241388_865EC8, 0x00000043, 0x00000006, RotateModel, 0x00000016, 0xFE363C87, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00002AF8, 0xFE363C87, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00002AF8, 0x000000B4, 0x00000000, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, CloneModel, 0x00000016, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000024, 0x00000002, 0xFBD3E281, 0x00000000, 0x00000026, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFF9C, 0x00000043, 0x00000003, RandInt, 0x00000032, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFF9C, 0x00000003, 0x00000001, 0x0000000A, 0x00000003, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C8F, 0x0000000A, 0x00000002, 0xFE363C8E, 0x00002710, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000016, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8E, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000043, 0x00000005, func_802412AC_865DEC, 0xFE363C8E, 0xFD050F80, 0xFD050F81, 0xFD050F82, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F80, 0x0000002D, 0x00000002, 0xFE363C80, 0xFE363C81, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000012, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C88, 0x00000001, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xFE363C88, 0xFFFFFFF6, 0x00000026, 0x00000002, 0xFE363C88, 0xFFFFFFF6, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C88, 0x0000000A, 0x00000026, 0x00000002, 0xFE363C88, 0x0000000A, 0x00000013, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C88, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F81, 0x0000002D, 0x00000002, 0xFE363C80, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000012, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C89, 0x00000001, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xFE363C89, 0xFFFFFFF6, 0x00000026, 0x00000002, 0xFE363C89, 0xFFFFFFF6, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C89, 0x0000000A, 0x00000026, 0x00000002, 0xFE363C89, 0x0000000A, 0x00000013, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C82, 0xFE363C89, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F82, 0x0000002D, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C8A, 0xFFFFFFFF, 0x00000012, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xFE363C8A, 0xFFFFFFF6, 0x00000026, 0x00000002, 0xFE363C8A, 0xFFFFFFF6, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C8A, 0x0000000A, 0x00000026, 0x00000002, 0xFE363C8A, 0x0000000A, 0x00000013, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C83, 0xFE363C8A, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8F, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000001, func_80241388_865EC8, 0x00000043, 0x00000006, RotateModel, 0xFE363C8F, 0xFE363C87, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244114_868C54 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000047, 0x00000000, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x80000055, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0021000C, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x000000FA, 0xFFFFFFE2, 0x000001F4, 0x00000008, 0x00000001, 0x00000005, 0x00000058, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802415FC_86613C, 0x00000008, 0x00000001, 0x00000005, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8280, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFED4, 0x000001F4, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x80244950, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024428C_868DCC -.word 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000000F, 0x0000000A, 0x00000002, 0xF8406042, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80244114_868C54, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802442F8_868E38 -.word 0x00000000, D_802433B0_867EF0, 0x00000000, 0xC47A0000, 0x00000000, 0x00000F09, D_802436D0_868210, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00B60001, 0x00B60004, 0x00B60006, 0x00B60006, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802444E8_869028 -.word 0x00000002, D_802433DC_867F1C, 0x00000000, 0xC47A0000, 0x00000000, 0x00000D09, D_80243A34_868574, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00B60001, 0x00B60004, 0x00B60006, 0x00B60006, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802446D8_869218 -.word 0x00210000, 0x00210003, 0x0021000C, 0xFFFFFFFF - -dlabel D_802446E8_869228 -.word 0x00000003, D_80243408_867F48, 0x00000000, 0xC47A0000, 0x00000000, 0x00440D0D, D_8024428C_868DCC, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00210003, 0x00210007, 0x00210007, 0x00210007, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00000000, 0x00000000, D_802446D8_869218, 0x001A0006, 0x00000001, D_802446E8_869228, 0x00000000, 0x00000001, D_802442F8_868E38, 0x00000000, 0x00000001, D_802444E8_869028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mgm/mgm_00/E0FF60.data.s b/ver/us/asm/data/world/area_mgm/mgm_00/E0FF60.data.s deleted file mode 100644 index de055cff46..0000000000 --- a/ver/us/asm/data/world/area_mgm/mgm_00/E0FF60.data.s +++ /dev/null @@ -1,51 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802417C0_E0FF60 -.word 0xC3180000, 0x00000000, 0xC35A0000, 0x42B40000, 0xC1C80000, 0x41F00000, 0xC3280000, 0x42B40000, 0x42BE0000, 0x41F00000, 0xC3280000, 0x42B40000, 0x436D0000, 0x00000000, 0xC2540000, 0x43870000, 0x41A00000, 0x00000000, 0xC2A00000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80242930_E110D0, D_802417C0_E0FF60, 0x00000005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190006 - -dlabel D_80241850_E0FFF0 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241860_E10000 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, mgm_00_Pipe_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, mgm_00_Pipe_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241BB4_E10354 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, mgm_00_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, mgm_00_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241FA4_E10744 -.word 0x00000043, 0x00000001, mgm_00_Pipe_AwaitDownInput, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80242080_E10820, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242080_E10820 -.word 0x00000043, 0x00000001, mgm_00_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mgm_00_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mgm_00_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, mgm_00_Pipe_GetCameraYaw, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024225C_E109FC -.word 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, mgm_00_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mgm_00_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, mgm_00_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242590_E10D30 -.word 0x00000043, 0x00000003, GotoMap, 0x80243DD0, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802425C0_E10D60 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8C, D_80242590_E10D30, 0x00000046, 0x00000001, D_8024225C_E109FC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242618_E10DB8 -.word 0x00000043, 0x00000003, GotoMap, 0x80243DD8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242648_E10DE8 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8C, D_80242618_E10DB8, 0x00000046, 0x00000001, D_80241FA4_E10744, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802426A0_E10E40 -.word 0x00000043, 0x00000003, GotoMap, 0x80243DE0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802426D0_E10E70 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000003, 0x00000024, 0x00000002, 0xFE363C8C, D_802426A0_E10E40, 0x00000046, 0x00000001, D_80241FA4_E10744, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242728_E10EC8 -.word 0x00000047, 0x00000005, D_802425C0_E10D60, 0x00000040, 0x00000001, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405CEC, 0x00000001, 0x00000047, 0x00000005, D_80242648_E10DE8, 0x00000080, 0x00000002, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405CEE, 0x00000001, 0x00000047, 0x00000005, D_802426D0_E10E70, 0x00000080, 0x00000003, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802427BC_E10F5C -.word 0x0000000A, 0x00000002, 0xF8405CEC, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000B, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000002, 0x7FFFFE00, 0x00000043, 0x00000003, EnableModel, 0x00000005, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405CEE, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000C, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000003, 0x7FFFFE00, 0x00000043, 0x00000003, EnableModel, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, D_80242728_E10EC8, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000001, 0x00000044, 0x00000001, D_80241BB4_E10354, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8A, D_80242728_E10EC8, 0x00000044, 0x00000001, D_80241860_E10000, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8A, D_80242728_E10EC8, 0x00000044, 0x00000001, D_80241860_E10000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242930_E110D0 -.word 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000046, 0x00000001, 0x80243C40, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80243C08, 0x00000046, 0x00000001, D_80241850_E0FFF0, 0x00000044, 0x00000001, 0x80243D80, 0x00000044, 0x00000001, D_802427BC_E10F5C, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mgm/mgm_00/E111A0.data.s b/ver/us/asm/data/world/area_mgm/mgm_00/E111A0.data.s deleted file mode 100644 index a37418c116..0000000000 --- a/ver/us/asm/data/world/area_mgm/mgm_00/E111A0.data.s +++ /dev/null @@ -1,51 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242A00_E111A0 -.word 0x3FC00000, 0x0000001E, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 - -dlabel D_80242A30_E111D0 -.word 0x00000043, 0x00000002, mgm_00_PatrolNoAttackAI_Main, D_80242A00_E111A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242A50_E111F0 -.word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, D_80242A30_E111D0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010, 0x00000000, 0x00170013, 0x00000000, 0x00000000, D_80242A30_E111D0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 - -dlabel D_80242AA8_E11248 -.word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00170013, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80242B00_E112A0 -.word 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFFE7, 0x00000000, 0xFFFFFF65, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFE7, 0x00000000, 0xFFFFFF65, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A874D, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, PlaySoundWithVolume, 0x0000208E, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000005, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFE2, 0x00000005, 0x00000001, 0x0000001E, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000005, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000005, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000000B, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000002, 0x7FFFFE00, 0x00000047, 0x00000005, D_80242648_E10DE8, 0x00000080, 0x00000002, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242CA0_E11440 -.word 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x0000005F, 0x00000000, 0xFFFFFF65, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000005F, 0x00000000, 0xFFFFFF65, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A874D, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, PlaySoundWithVolume, 0x0000208E, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000007, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFE2, 0x00000005, 0x00000001, 0x0000001E, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000007, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000007, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000000C, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000003, 0x7FFFFE00, 0x00000047, 0x00000005, D_802426D0_E10E70, 0x00000080, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242E40_E115E0 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2518280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A874D, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242F18_E116B8 -.word 0x00000043, 0x00000001, func_80241170_E0F910, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x0000000A, 0x00000002, 0xF8405CEC, 0x00000000, 0x00000014, 0x00000001, 0xFE363C85, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000003, 0x00000023, 0x00000000, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8405CEE, 0x00000000, 0x0000000E, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000002, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000003, 0x00000024, 0x00000002, 0xFE363C87, 0x00000002, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000004, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405CEB, 0x00000000, 0x00000024, 0x00000002, 0xF8405CEB, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0x00080012, 0x00000012, 0x00000000, 0x00000014, 0x00000001, 0xFE363C86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0x00080013, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0x00080014, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0x00080015, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0x00080016, 0x00000016, 0x00000001, 0x00000004, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0x00080017, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C87, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000005, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0x00080018, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0x00080019, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0x0008001A, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C87, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xF8405CEC, 0x00000001, 0x00000046, 0x00000001, D_80242B00_E112A0, 0x00000046, 0x00000001, D_80242E40_E115E0, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xF8405CEE, 0x00000001, 0x00000046, 0x00000001, D_80242CA0_E11440, 0x00000046, 0x00000001, D_80242E40_E115E0, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xF8405CEC, 0x00000001, 0x00000024, 0x00000002, 0xF8405CEE, 0x00000001, 0x00000046, 0x00000001, D_80242B00_E112A0, 0x00000008, 0x00000001, 0x0000000A, 0x00000046, 0x00000001, D_80242CA0_E11440, 0x00000046, 0x00000001, D_80242E40_E115E0, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243368_E11B08 -.word 0x00000043, 0x00000004, SetNpcCollisionSize, 0xFFFFFFFF, 0x00000020, 0x0000004B, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80242F18_E116B8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802433A4_E11B44 -.word 0x00000000, D_80242AA8_E11248, 0xC3550000, 0x41400000, 0xC3340000, 0x00002D01, D_80243368_E11B08, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00830001, 0x00830002, 0x00830003, 0x00830003, 0x00830001, 0x00830001, 0x00830006, 0x00830006, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00000000, 0x00000000, 0x00000000, 0x001A005E - -dlabel D_80243594_E11D34 -.word 0x00000043, 0x00000001, func_80241170_E0F910, 0x00000014, 0x00000001, 0xFE363C85, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830104, 0x00830101, 0x00000000, 0x00080025, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830104, 0x00830101, 0x00000000, 0x00080026, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830104, 0x00830101, 0x00000000, 0x00080027, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830104, 0x00830101, 0x00000000, 0x00080028, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802436C0_E11E60 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80243594_E11D34, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802436F8_E11E98 -.word 0x00000001, D_80242A50_E111F0, 0xC2B00000, 0x00000000, 0xC2BE0000, 0x00002D01, D_802436C0_E11E60, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0xFFFFFF9C, 0x00000000, 0xFFFFFFA1, 0xFFFFFFBA, 0x00000000, 0xFFFFFFA1, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00830101, 0x00830102, 0x00830103, 0x00830103, 0x00830101, 0x00830101, 0x00830106, 0x00830106, 0x00830103, 0x00830103, 0x00830103, 0x00830103, 0x00830103, 0x00830103, 0x00830103, 0x00830103, 0x00000000, 0x00000000, 0x00000000, 0x001A005F - -dlabel D_802438E8_E12088 -.word 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000018, 0x00000001, 0x00000019, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830204, 0x00830201, 0x00000000, 0x00080029, 0x00000018, 0x00000001, 0x00000032, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830204, 0x00830201, 0x00000000, 0x0008002A, 0x00000018, 0x00000001, 0x0000004B, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830204, 0x00830201, 0x00000000, 0x0008002B, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830204, 0x00830201, 0x00000000, 0x0008002C, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802439CC_E1216C -.word 0x00000043, 0x00000003, RandInt, 0x00000064, 0xFE363C80, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0xFE363C80, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_802438E8_E12088, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243A18_E121B8 -.word 0x00000002, D_80242A50_E111F0, 0x42380000, 0x00000000, 0xC34D0000, 0x00002D01, D_802439CC_E1216C, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000019, 0x00000000, 0xFFFFFF33, 0x0000004B, 0x00000000, 0xFFFFFF33, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00830201, 0x00830202, 0x00830203, 0x00830203, 0x00830201, 0x00830201, 0x00830206, 0x00830206, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00000000, 0x00000000, 0x00000000, 0x001A0060, 0x00000001, D_802433A4_E11B44, 0x00000000, 0x00000001, D_802436F8_E11E98, 0x00000000, 0x00000001, D_80243A18_E121B8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mgm/mgm_00/E123E0.data.s b/ver/us/asm/data/world/area_mgm/mgm_00/E123E0.data.s deleted file mode 100644 index 945fb7a08a..0000000000 --- a/ver/us/asm/data/world/area_mgm/mgm_00/E123E0.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80243C40_E123E0 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243C50_E123F0 -.word 0xE3000A01, 0x00000000, 0xE200001C, 0x00504240, 0xFCFFFFFF, 0xFFFDF6FB, 0xE3001801, 0x000000C0, 0xE3001A01, 0x00000030, 0xE3001700, 0x00000000, 0xE2001E01, 0x00000000, 0x00000000, 0x00000000, 0xFA000000, 0xFF000000, 0xF64500CC, 0x000B00C4, 0xF60B8214, 0x000B00C4, 0xF6450214, 0x0044C0C4, 0xF6450214, 0x000B0210, 0xDF000000, 0x00000000 - -dlabel D_80243CC0_E12460 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, mgm_00_UpdateRecordDisplay, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243D20_E124C0 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, mgm_00_UpdateRecordDisplay, 0x00000002, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80243CC0_E12460, 0x00000100, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80243D20_E124C0, 0x00000100, 0x00000006, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mgm/mgm_01/E13F10.data.s b/ver/us/asm/data/world/area_mgm/mgm_01/E13F10.data.s deleted file mode 100644 index d8f80fd879..0000000000 --- a/ver/us/asm/data/world/area_mgm/mgm_01/E13F10.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802417B0_E13F10 -.word 0x00000000, 0x43480000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80241988_E140E8, D_802417B0_E13F10, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190007 - -dlabel D_80241800_E13F60 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80240000_E12760, 0x00000043, 0x00000005, TranslateModel, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C81, 0x00000043, 0x00000006, RotateModel, 0x00000002, 0xFE363C82, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000002, 0xFE363C83, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024189C_E13FFC -.word 0x00000043, 0x00000003, EnableModel, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000011, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000000F, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000000D, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000016, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000018, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000001A, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000001D, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000001F, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000022, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000024, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241988_E140E8 -.word 0x00000043, 0x00000002, SetSpriteShading, 0x00080000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetRenderMode, 0x00000000, 0x00000015, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80242C28, 0x00000046, 0x00000001, 0x80242C94, 0x00000044, 0x00000001, D_80241800_E13F60, 0x00000044, 0x00000001, D_8024189C_E13FFC, 0x00000044, 0x00000001, 0x802424A4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mgm/mgm_01/E141D0.data.s b/ver/us/asm/data/world/area_mgm/mgm_01/E141D0.data.s deleted file mode 100644 index fc272d8101..0000000000 --- a/ver/us/asm/data/world/area_mgm/mgm_01/E141D0.data.s +++ /dev/null @@ -1,84 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241A70_E141D0 -.word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00170013, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel mgm_01_BlockPosX -.byte 0x83, 0x9C, 0xB5, 0xCE, 0xE7, 0x00, 0x19, 0x32, 0x4B, 0x64, 0x7D, 0x00 - -dlabel mgm_01_BlockPosY -.byte 0x38, 0x3C, 0x38, 0x3C, 0x38, 0x3C, 0x38, 0x3C, 0x38, 0x3C, 0x38, 0x00 - -dlabel mgm_01_BlockPosZ -.byte 0x1E, 0xE2, 0x1E, 0xE2, 0x1E, 0xE2, 0x1E, 0xE2, 0x1E, 0xE2, 0x1E, 0x00 - -dlabel mgm_01_TallyPosX -.float -105.0, -80.0, -55.0, -30.0, -5.0, -105.0, -80.0, -55.0, -30.0, -5.0, 20.0 - -dlabel mgm_01_TallyPosY -.float 157.0, 157.0, 157.0, 157.0, 157.0, 133.0, 133.0, 133.0, 133.0, 133.0, 133.0 - -dlabel mgm_01_PanelModelIDs -.word 0x00000013, 0x00000011, 0x0000000F, 0x0000000D, 0x00000016, 0x00000018, 0x0000001A, 0x0000001D, 0x0000001F, 0x00000022, 0x00000024 - -dlabel mgm_01_PanelTypes -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x00000001, 0x00000002, 0x00000002, 0x00000003, 0x00000003 - -dlabel mgm_01_InitialConfigurations -.word 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000003, 0x00000001, 0x00000000, 0x00000001, 0x00000000, 0x00000003, 0x00000002, 0x00000003, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000001, 0x00000003, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00000003, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000001, 0x00000003, 0x00000003, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000000 - -dlabel D_80241C4C_E143AC -.word 0x00000003, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000004, GetNpcVar, 0x00000000, 0x00000004, 0xFE363C8C, 0x00000005, 0x00000001, 0x0000000B, 0x00000043, 0x00000002, mgm_01_GetPanelInfo, 0xFE363C8A, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, mgm_01_SetPanelState, 0xFE363C8A, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, mgm_01_InitPanelEmergeFromBlock, 0xFE363C8A, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, mgm_01_SetPanelState, 0xFE363C8A, 0x00000003, 0x00000016, 0x00000001, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000003, 0x0000000C, 0x00000002, 0xFE363C83, 0xFE363C8C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, mgm_01_InitPanelHoldAboveBlock, 0xFE363C8A, 0x00000043, 0x00000003, mgm_01_SetPanelState, 0xFE363C8A, 0x00000005, 0x00000016, 0x00000001, 0x00000006, 0x00000043, 0x00000002, mgm_01_InitPanelMoveToTally, 0xFE363C8A, 0x00000043, 0x00000003, mgm_01_SetPanelState, 0xFE363C8A, 0x00000007, 0x00000016, 0x00000001, 0x00000008, 0x00000043, 0x00000002, mgm_01_EndPanelAnimation, 0xFE363C8A, 0x00000043, 0x00000003, mgm_01_SetPanelState, 0xFE363C8A, 0x00000009, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000002, mgm_01_UpdatePanelEmergeFromBlock, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000003, mgm_01_SetPanelState, 0xFE363C8A, 0x00000004, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000005, 0x00000043, 0x00000002, mgm_01_UpdatetPanelHoldAboveBlock, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000003, mgm_01_SetPanelState, 0xFE363C8A, 0x00000006, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000007, 0x00000043, 0x00000002, mgm_01_UpdatePanelMoveToTally, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000003, mgm_01_SetPanelState, 0xFE363C8A, 0x00000008, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000009, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000003, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000001, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C83, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000002, mgm_01_GetPanelPos, 0xFE363C8A, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000006, RotateModel, 0xFE363C81, 0xFE363C88, 0xF24A7A80, 0xF24A7E80, 0xF24A7A80, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xFE363C89, 0xFE363C89, 0xF24A7E80, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000006, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000004, 0x00000001, 0x00000063, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x00000063, 0x00000043, 0x00000001, mgm_01_EnableMenus, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, PopSong, 0x00000057, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundWithVolume, 0x00002017, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, PlaySoundWithVolume, 0x00002017, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, mgm_01_EndBowserPanelAnimation, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x00080034, 0x00000016, 0x00000001, 0x00000002, 0x00000014, 0x00000001, 0xFE363C8C, 0x00000016, 0x00000001, 0x00000004, 0x00000043, 0x00000001, mgm_01_UpdateRecords, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x00080035, 0x00000016, 0x00000001, 0x00000006, 0x00000043, 0x00000001, mgm_01_UpdateRecords, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x00080036, 0x00000016, 0x00000001, 0x00000008, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x00080037, 0x00000043, 0x00000001, mgm_01_DoubleScore, 0x00000043, 0x00000003, PlaySoundWithVolume, 0x000003FC, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, mgm_01_UpdateRecords, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x00080038, 0x00000023, 0x00000000, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, mgm_01_GiveCoinReward, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x0008003A, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, mgm_01_DestroyBlockEntities, 0x00000044, 0x00000001, D_80242470_E14BD0, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242310 -.word 0x00000043, 0x00000002, mgm_01_OnBreakBlock, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242330 -.word 0x00000043, 0x00000002, mgm_01_OnBreakBlock, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242350 -.word 0x00000043, 0x00000002, mgm_01_OnBreakBlock, 0x00000002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242370 -.word 0x00000043, 0x00000002, mgm_01_OnBreakBlock, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242390 -.word 0x00000043, 0x00000002, mgm_01_OnBreakBlock, 0x00000004, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802423B0 -.word 0x00000043, 0x00000002, mgm_01_OnBreakBlock, 0x00000005, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802423D0 -.word 0x00000043, 0x00000002, mgm_01_OnBreakBlock, 0x00000006, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802423F0 -.word 0x00000043, 0x00000002, mgm_01_OnBreakBlock, 0x00000007, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242410 -.word 0x00000043, 0x00000002, mgm_01_OnBreakBlock, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242430 -.word 0x00000043, 0x00000002, mgm_01_OnBreakBlock, 0x00000009, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242450 -.word 0x00000043, 0x00000002, mgm_01_OnBreakBlock, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242470_E14BD0 -.word 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000002, 0xFFFFFFFF, 0x00000043, 0x00000001, mgm_01_InitializePanels, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, mgm_01_CreateMinigame, 0x00000044, 0x00000001, D_80242470_E14BD0, 0x00000044, 0x00000001, D_80241C4C_E143AC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802424D8_E14C38 -.word 0x00000043, 0x00000001, mgm_01_DestroyMinigame, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802424F4_E14C54 -.word 0x00000043, 0x00000003, GetSelfVar, 0x00000001, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF8405CED, 0x00000000, 0x00000043, 0x00000001, mgm_01_SetMsgImgs_Panels, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x0008002D, 0x00000024, 0x00000002, 0xF8405CED, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x0008002E, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000001, 0x00000043, 0x00000001, mgm_01_GetCoinCount, 0x0000000C, 0x00000002, 0xFE363C8A, 0x0000000A, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x00080039, 0x00000043, 0x00000001, mgm_01_HideCoinCounter, 0x00000008, 0x00000001, 0x0000000C, 0x00000044, 0x00000001, D_802424D8_E14C38, 0x00000043, 0x00000003, GotoMap, 0x80243614, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E004E, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000001, mgm_01_HideCoinCounter, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x00080032, 0x00000044, 0x00000001, D_802424D8_E14C38, 0x00000043, 0x00000003, GotoMap, 0x80243614, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000006, 0xFE363C81, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000064, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0xFE363C81, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, mgm_01_TakeCoinCost, 0x00000057, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000004, 0x00000004, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x0008002F, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000004, 0x00000006, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x00080030, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000004, 0x00000008, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x00080031, 0x00000016, 0x00000001, 0x00000003, 0x00000023, 0x00000000, 0x00000043, 0x00000001, mgm_01_HideCoinCounter, 0x00000043, 0x00000005, EndSpeech, 0x00000000, 0x00830004, 0x00830001, 0x00000005, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, mgm_01_CreateBlockEntities, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, EndSpeech, 0x00000000, 0x00830004, 0x00830001, 0x00000005, 0x00000043, 0x00000003, PushSong, 0x00000085, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, EndSpeech, 0x00000000, 0x00830004, 0x00830001, 0x00000005, 0x00000043, 0x00000001, mgm_01_DisableMenus, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000003, 0xFFFFFFFF, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000001, mgm_01_SetMsgVars_BlocksRemaining, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x00080033, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242998_E150F8 -.word 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x0000004B, 0xFFFFFFFF, 0x00000064, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000002, 0xFFFFFFFF, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_802424F4_E14C54, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242A38_E15198 -.word 0x00000000, D_80241A70_E141D0, 0x00000000, 0x00000000, 0xC1A00000, 0x00002D01, D_80242998_E150F8, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00830001, 0x00830002, 0x00830003, 0x00830003, 0x00830001, 0x00830001, 0x00830006, 0x00830006, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00000000, 0x00000000, 0x00000000, 0x001A0061, 0x00000001, D_80242A38_E15198, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80242C40_E153A0 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, mgm_01_SetMsgImgs_Panels, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x0008003B, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Signpost, 0xFFFFFFC9, 0xFFFFFFFE, 0xFFFFFFB0, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242C40_E153A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mgm/mgm_01/E15440.data.s b/ver/us/asm/data/world/area_mgm/mgm_01/E15440.data.s deleted file mode 100644 index 01bb1975b8..0000000000 --- a/ver/us/asm/data/world/area_mgm/mgm_01/E15440.data.s +++ /dev/null @@ -1,30 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242CE0_E15440 -.word 0xEEEEEEEE, 0xEEEEEEEE, 0xEEEEEEEE, 0xEEEEEEE6, 0xEBBBBBBB, 0xBBBBBBBB, 0xBBBBBBBB, 0xBBBBBEB6, 0xEB666666, 0x66666666, 0x66666666, 0x66666EB6, 0xEB633333, 0x33333333, 0x33333332, 0x24403EB6, 0xEB633333, 0x33333333, 0x33333330, 0x4FF43EB6, 0xEB633333, 0x33333333, 0x33333204, 0xFFF73EB6, 0xEB633333, 0x33333333, 0x33333347, 0xFFF73EB6, 0xEB633333, 0x33333333, 0x33333307, 0x7FF43EB6, 0xEB633333, 0x33333333, 0x33333310, 0x4FF03EB6, 0xEB633333, 0x33333333, 0x33333320, 0x7F703EB6, 0xEB633333, 0x33399963, 0x33333224, 0xFF713EB6, 0xEB633333, 0x3CCDCB86, 0x63333317, 0xFF413EB6, 0xEB633333, 0xCDDDDDDB, 0x86333307, 0xFF423EB6, 0xEB63333C, 0xDDD58ADD, 0xC6633334, 0x77023EB6, 0xEB63333E, 0xEEE6EFEE, 0xE8633333, 0x33333EB6, 0xEB63339E, 0xEEE8EFEE, 0xED663333, 0x33333EB6, 0xEB6333AD, 0xDDD8DFDD, 0xDD663333, 0x33333EB6, 0xEB6333AD, 0xCDD8DFDC, 0xDD663333, 0x33333EB6, 0xEB6333AB, 0xCCC8CFCC, 0xCC663333, 0x33333EB6, 0xEB6333AC, 0xBBC8CFCB, 0xCC663333, 0x33333EB6, 0xEB6333AA, 0xCAC8CFAC, 0xA8663333, 0x33333EB6, 0xEB63333A, 0xACA8AFCA, 0xA8633333, 0x33333EB6, 0xEB633339, 0xAAAAFFAA, 0x86633333, 0x33333EB6, 0xEB633333, 0x9AAAAAA8, 0x66333333, 0x33333EB6, 0xEB633333, 0x388AAA86, 0x63333333, 0x33333EB6, 0xEB633333, 0x33388663, 0x33333333, 0x33333EB6, 0xEB633333, 0x33333333, 0x33333333, 0x33333EB6, 0xEB633333, 0x33333333, 0x33333333, 0x33333EB6, 0xEC633333, 0x33333333, 0x33333333, 0x33333EB6, 0xEEEEEEEE, 0xEEEEEEEE, 0xEEEEEEEE, 0xEEEEEEB6, 0xEBBBBBBB, 0xBBBBBBBB, 0xBBBBBBBB, 0xBBBBBBB6, 0x66666666, 0x66666666, 0x66666666, 0x66666666 - -dlabel D_80242EE0_E15640 -.word 0x005B0065, 0x006B006D, 0x29538AC7, 0x93838C65, 0xBC09BC8B, 0xD549E58B, 0xE58DE64F, 0xF691F7BD - -dlabel D_80242F00_E15660 -.word 0xCDDDDDDD, 0xDDDDDDDD, 0xDDDDDDDD, 0xDDDDDDD5, 0xDAAAAAAA, 0xAAAAAAAA, 0xAAAAAAAA, 0xAAAAADA5, 0xDA555555, 0x55555555, 0x55555555, 0x55555DA5, 0xDA633333, 0x33333333, 0x33333311, 0x11112DA5, 0xDA633333, 0x33333333, 0x3333227F, 0xFFF70DA5, 0xDA6333CC, 0x9633333C, 0xC96321FF, 0xFFF70DA5, 0xDA633CCC, 0xC96333CC, 0xCC9607FF, 0x11110DA5, 0xDA633C99, 0xC99633C9, 0x9C991FF7, 0x7F703DA5, 0xDA63CCAC, 0xEB960CCA, 0xCEB97FFF, 0xFFF70DA5, 0xDA63CCBC, 0xEEB60CCB, 0xCEEB1FF7, 0x11FF1DA5, 0xDA63CCBF, 0xEEFE96CB, 0xFEEB4171, 0x17FF1DA5, 0xDA63CEBF, 0xEFFEC96B, 0xFEEB6117, 0xFFF12DA5, 0xDA63CEBF, 0xEF99C996, 0xFEE9617F, 0xFF123DA5, 0xDA633CEE, 0xFFACCB96, 0x8EB96017, 0x71233DA5, 0xDA633CCC, 0xFEBDCEB6, 0x8B960033, 0x33333DA5, 0xDA6333A9, 0xFCBFCEB6, 0x49600333, 0x33333DA5, 0xDA633330, 0xECBFEEB6, 0x00003333, 0x33333DA5, 0xDA6333CC, 0xCCBFEE96, 0x89633333, 0x33333DA5, 0xDA633CCC, 0xCCEEEB96, 0x8C9633B3, 0x33333DA5, 0xDA633C99, 0xCEEEB964, 0x4C9963E3, 0x33333DA5, 0xDA63CCAC, 0xEBA99686, 0xCEB96BFB, 0x33333DA5, 0xDA63CCBC, 0xEEB4088B, 0xCEEB60E3, 0x33333DA5, 0xDA63CCBF, 0xEEB60CCB, 0xFEEB60B3, 0x33333DA5, 0xDA63CEBF, 0xEEB60CEB, 0xFEEB6023, 0x33333DA5, 0xDA63CEBF, 0xEE960CEB, 0xFEE96023, 0x33333DA5, 0xDA633CEE, 0xEB9603CE, 0xEEB96023, 0x33333DA5, 0xDA633CCC, 0xB96003CC, 0xCB960033, 0x33333DA5, 0xDA6333A9, 0x9600333A, 0x99600333, 0x33333DA5, 0xDA533330, 0x00033333, 0x00003333, 0x33333DA5, 0xCDDDDDDD, 0xDDDDDDDD, 0xDDDDDDDD, 0xDDDDDDA5, 0xDAAAAAAA, 0xAAAAAAAA, 0xAAAAAAAA, 0xAAAAAAA5, 0x55555555, 0x55555555, 0x55555555, 0x55555555 - -dlabel D_80243100_E15860 -.word 0x78014109, 0x9001A001, 0x828393C1, 0xA3477BDF, 0xAC03BC8B, 0xE58BE64F, 0xEED5F691, 0xE725FFFF - -dlabel D_80243120_E15880 -.word 0xEEEEEEEE, 0xEEEEEEEE, 0xEEEEEEEE, 0xEEEEEEE9, 0xE9999999, 0x99999999, 0x99999999, 0x99999E99, 0xE9999999, 0x99999999, 0x99999999, 0x99999E99, 0xE9966666, 0x66666666, 0x66666666, 0x66666E99, 0xE9966666, 0x66666666, 0x66666666, 0x66666E99, 0xE9966666, 0x66666666, 0x66666666, 0x66666E99, 0xE9966666, 0x66666666, 0x66666666, 0x66666E99, 0xE9966666, 0x66666666, 0x66666666, 0x66646E99, 0xE9966666, 0x66666666, 0x66400000, 0x00166E99, 0xE9966646, 0x66666646, 0x66122222, 0x22066E99, 0xE9966461, 0x36663164, 0x64088888, 0x88246E99, 0xE9964615, 0x04640016, 0x61788888, 0x88236E99, 0xE996615F, 0xB061BF53, 0x40888222, 0x22036E99, 0xE99610FF, 0xF505FFF5, 0x07CC7000, 0x01446E99, 0xE99661BF, 0xFF5FFFF5, 0x2CCC2277, 0x70366E99, 0xE996661B, 0xFFFFFF50, 0x7CCC7CCC, 0xC7046E99, 0xE9966660, 0xBFFFB031, 0x7CCCCC77, 0xCC706E99, 0xE9966640, 0xBFFFB061, 0x7CCC7000, 0x7CC23E99, 0xE996640B, 0xFFFFF504, 0x12720107, 0xADA04E99, 0xE99630BF, 0xFFBFFFB0, 0x630102AD, 0xDA036E99, 0xE99615FF, 0xF50BFFF5, 0x3302ADDD, 0xD2346E99, 0xE99645FF, 0x5140FFB0, 0x402DDDDD, 0x21666E99, 0xE99660B5, 0x34635B04, 0x6307DDD2, 0x16666E99, 0xE9964301, 0x66660034, 0x66402721, 0x66666E99, 0xE9966666, 0x66666666, 0x66666666, 0x66666E99, 0xE9966666, 0x66666666, 0x66666666, 0x66666E99, 0xE9966666, 0x66666666, 0x66666666, 0x66666E99, 0xE9966666, 0x66666666, 0x66666666, 0x66666E99, 0xE9966666, 0x66666666, 0x66666666, 0x66666E99, 0xEEEEEEEE, 0xEEEEEEEE, 0xEEEEEEEE, 0xEEEEEE99, 0xE9999999, 0x99999999, 0x99999999, 0x99999999, 0x99999999, 0x99999999, 0x99999999, 0x99999999 - -dlabel D_80243320_E15A80 -.word 0x08C10181, 0x40C10241, 0x02C139CF, 0x03418A03, 0xE14793C1, 0xC3838C63, 0xF345F501, 0xF691FFFF - -dlabel D_80243340_E15AA0 -.word 0xAAAAAAAA, 0xAAAAAAAA, 0xAAAAAAAA, 0xAAAAAAA3, 0xA3333333, 0x33333333, 0x33333333, 0x33333A33, 0xA3333333, 0x33333333, 0x33333333, 0x33333A33, 0xA3322222, 0x22222288, 0x66622222, 0x22222A33, 0xA3322222, 0x22222866, 0x66466222, 0x22222A33, 0xA33222E2, 0x22228666, 0x66662222, 0x2E222A33, 0xA33222E2, 0x22226666, 0x66664422, 0x2E222A33, 0xA33222EE, 0x66627777, 0x77774666, 0xEE222A33, 0xA33222BE, 0x66667777, 0x77776666, 0xEB222A33, 0xA332222B, 0xE4466757, 0x7576644E, 0xB2222A33, 0xA3322222, 0xB7DF6457, 0x7546FD7B, 0x22222A33, 0xA3322222, 0x77FF0655, 0x5560FF77, 0x22222A33, 0xA3322222, 0x77FF00DD, 0xDD00FF77, 0x22222A33, 0xA33B22BE, 0xD5DF0DEE, 0xEED0FD5D, 0xEB22BA33, 0xA33EBBEE, 0xEEEEEEBE, 0xEBEEEEEE, 0xEEBBEA33, 0xA33E7EEE, 0xEEEEEEEE, 0xEEEEEEEE, 0xEEE7EA33, 0xA3375EEE, 0xEEEEEEEE, 0xEEEEEEEE, 0xEEE57A33, 0xA3355BEE, 0xE4EEEEEE, 0xEEEEEE4E, 0xEEB55A33, 0xA335FFBE, 0xE4BEEEB4, 0x4BEEEB4E, 0xEBFF5A33, 0xA33FFFFB, 0xEB4BF444, 0x444FB4BE, 0xBFFFFA33, 0xA33FFFFF, 0xEE44F444, 0x444F44EE, 0xFFFFFA33, 0xA33FFF99, 0xEE444444, 0x444444EE, 0x99FFFA33, 0xA33F9999, 0xBEB44888, 0x88844BEB, 0x9999FA33, 0xA33999F9, 0x9EE88888, 0x88888EE9, 0x9F999A33, 0xA33F9999, 0x1EE8F888, 0x888F8EE1, 0x9999FA33, 0xA3399111, 0x9BEBFF88, 0x88FFBEB9, 0x11199A33, 0xA3311CCC, 0x98EEEEEE, 0xEEEEEE89, 0xCCC11A33, 0xA33CCCCC, 0x99EEEEEE, 0xEEEEEE99, 0xCCCCCA33, 0xA33CCC99, 0x99FBEEB9, 0x9BEEBF99, 0x99CCCA33, 0xAAAAAAAA, 0xAAAAAAAA, 0xAAAAAAAA, 0xAAAAAA33, 0xA3333333, 0x33333333, 0x33333333, 0x33333333, 0x33333333, 0x33333333, 0x33333333, 0x33333333 - -dlabel D_80243540_E15CA0 -.word 0x00011007, 0x310948A1, 0x59852B01, 0xC9854403, 0xAA876B5B, 0xA2B9ACCF, 0xD4C7AD8F, 0xE697E739 - -dlabel mgm_01_MsgImgs_Panels -.word D_80242CE0_E15440, D_80242EE0_E15640, 0x00200020, 0x00000002, 0x00000000, D_80242F00_E15660, D_80243100_E15860, 0x00200020, 0x00000002, 0x00000000, D_80243120_E15880, D_80243320_E15A80, 0x00200020, 0x00000002, 0x00000000, D_80243340_E15AA0, D_80243540_E15CA0, 0x00200020, 0x00000002, 0x00000000 diff --git a/ver/us/asm/data/world/area_mgm/mgm_02/E18180.data.s b/ver/us/asm/data/world/area_mgm/mgm_02/E18180.data.s deleted file mode 100644 index fff015a2bd..0000000000 --- a/ver/us/asm/data/world/area_mgm/mgm_02/E18180.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242400_E18180 -.word 0xC3960000, 0x43480000, 0x43480000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80242598_E18318, D_80242400_E18180, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190008 - -dlabel D_80242450_E181D0 -.word 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFED4, 0xFFFFFFEC, 0x000000C8, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000FA, 0xFFFFFFEC, 0x000000DC, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0x000000FA, 0x000000C8, 0x000000DC, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x000000FA, 0x000000C8, 0x000000DC, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFEC, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242598_E18318 -.word 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000044, 0x00000001, D_80242450_E181D0, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x802481F8, 0x00000046, 0x00000001, 0x80242650, 0x00000046, 0x00000001, 0x80244FD4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mgm/mgm_02/E183D0.data.s b/ver/us/asm/data/world/area_mgm/mgm_02/E183D0.data.s deleted file mode 100644 index 5d56246656..0000000000 --- a/ver/us/asm/data/world/area_mgm/mgm_02/E183D0.data.s +++ /dev/null @@ -1,129 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242650_E183D0 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242660_E183E0 -.word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00170013, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_802426B8_E18438 -.word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_802426E4_E18464 -.word 0x00000000, 0x00140016, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 - -dlabel D_80242710_E18490 -.word 0x00000000, 0x00170014, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 - -dlabel mgm_02_InitialConfigurations -.word 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000003, 0x00000003, 0x00000003, 0x00000003, 0x00000003, 0x00000002, 0x00000003, 0x00000002, 0x00000001, 0x00000003, 0x00000003, 0x00000002, 0x00000003, 0x00000000, 0x00000003, 0x00000003, 0x00000002, 0x00000003, 0x00000003, 0x00000001, 0x00000002, 0x00000003, 0x00000003, 0x00000002, 0x00000003, 0x00000003, 0x00000001, 0x00000003, 0x00000003, 0x00000002, 0x00000002, 0x00000000, 0x00000002, 0x00000001, 0x00000002, 0x00000003, 0x00000002, 0x00000003, 0x00000003, 0x00000003, 0x00000003, 0x00000001, 0x00000003, 0x00000002, 0x00000003, 0x00000000, 0x00000003, 0x00000003, 0x00000003, 0x00000003, 0x00000003, 0x00000002, 0x00000003, 0x00000002, 0x00000003, 0x00000003, 0x00000001, 0x00000000, 0x00000003, 0x00000002, 0x00000003, 0x00000003, 0x00000002, 0x00000003, 0x00000002, 0x00000003, 0x00000003, 0x00000000, 0x00000003, 0x00000003, 0x00000001, 0x00000000, 0x00000001, 0x00000002, 0x00000003, 0x00000003, 0x00000003, 0x00000002, 0x00000003, 0x00000000, 0x00000003, 0x00000002, 0x00000002, 0x00000002, 0x00000003, 0x00000002, 0x00000003, 0x00000002, 0x00000003, 0x00000002, 0x00000003, 0x00000002, 0x00000003, 0x00000003, 0x00000003, 0x00000002, 0x00000003, 0x00000001, 0x00000003, 0x00000003 - -dlabel mgm_02_BoxModelIDs -.word 0x00000009, 0x0000000F, 0x00000015, 0x0000001B, 0x00000021, 0x00000027, 0x0000002D, 0x0000000A, 0x00000010, 0x00000016, 0x0000001C, 0x00000022, 0x00000028, 0x0000002E, 0x0000000B, 0x00000011, 0x00000017, 0x0000001D, 0x00000023, 0x00000029, 0x0000002F, 0x0000000C, 0x00000012, 0x00000018, 0x0000001E, 0x00000024, 0x0000002A, 0x00000030, 0x0000000D, 0x00000013, 0x00000019, 0x0000001F, 0x00000025, 0x0000002B, 0x00000031 - -dlabel mgm_02_BoxColliderIDs -.word 0x00000009, 0x0000000F, 0x00000015, 0x0000001B, 0x00000021, 0x00000027, 0x0000002D, 0x0000000A, 0x00000010, 0x00000016, 0x0000001C, 0x00000022, 0x00000028, 0x0000002E, 0x0000000B, 0x00000011, 0x00000017, 0x0000001D, 0x00000023, 0x00000029, 0x0000002F, 0x0000000C, 0x00000012, 0x00000018, 0x0000001E, 0x00000024, 0x0000002A, 0x00000030, 0x0000000D, 0x00000013, 0x00000019, 0x0000001F, 0x00000025, 0x0000002B, 0x00000031 - -dlabel mgm_02_PanelModelIDs -.word 0x00000034, 0x00000036, 0x00000038, 0x0000003A, 0x0000003C, 0x0000003E, 0x00000040, 0x00000042, 0x00000044, 0x00000046 - -dlabel D_80242A20_E187A0 -.word 0x00000043, 0x00000001, mgm_02_CreateScoreDisplay, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242A3C_E187BC -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, mgm_02_SetMsgImgs_Panel, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x00080046, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242A90_E18810 -.word 0x00000043, 0x00000003, EnableModel, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C81, 0x7FFFFE00, 0x00000043, 0x00000005, TranslateModel, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242AE8_E18868 -.word 0x00000044, 0x00000001, D_80242A90_E18810, 0x00000024, 0x00000002, 0xFE363C8A, 0xFFFFFFE7, 0x00000005, 0x00000001, 0x0000000D, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000002, 0x00000043, 0x00000005, TranslateModel, 0xFE363C80, 0x00000000, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242B7C_E188FC -.word 0x00000043, 0x00000005, TranslateModel, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C81, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242BD4_E18954 -.word 0x00000044, 0x00000001, D_80242B7C_E188FC, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetColliderCenter, 0xFE363C81, 0x00000028, 0x00000002, 0xFE363C81, 0x00000005, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242C60_E189E0 -.word 0x00000024, 0x00000002, 0xFE363C80, 0x00000009, 0x00000024, 0x00000002, 0xFE363C81, 0x00000009, 0x00000044, 0x00000001, D_80242B7C_E188FC, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000044, 0x00000001, D_80242B7C_E188FC, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000B, 0x00000044, 0x00000001, D_80242B7C_E188FC, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000C, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000C, 0x00000044, 0x00000001, D_80242B7C_E188FC, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000D, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000D, 0x00000044, 0x00000001, D_80242B7C_E188FC, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000044, 0x00000001, D_80242B7C_E188FC, 0x00000024, 0x00000002, 0xFE363C80, 0x00000010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000010, 0x00000044, 0x00000001, D_80242B7C_E188FC, 0x00000024, 0x00000002, 0xFE363C80, 0x00000011, 0x00000024, 0x00000002, 0xFE363C81, 0x00000011, 0x00000044, 0x00000001, D_80242B7C_E188FC, 0x00000024, 0x00000002, 0xFE363C80, 0x00000012, 0x00000024, 0x00000002, 0xFE363C81, 0x00000012, 0x00000044, 0x00000001, D_80242B7C_E188FC, 0x00000024, 0x00000002, 0xFE363C80, 0x00000013, 0x00000024, 0x00000002, 0xFE363C81, 0x00000013, 0x00000044, 0x00000001, D_80242B7C_E188FC, 0x00000024, 0x00000002, 0xFE363C80, 0x00000015, 0x00000024, 0x00000002, 0xFE363C81, 0x00000015, 0x00000044, 0x00000001, D_80242B7C_E188FC, 0x00000024, 0x00000002, 0xFE363C80, 0x00000016, 0x00000024, 0x00000002, 0xFE363C81, 0x00000016, 0x00000044, 0x00000001, D_80242B7C_E188FC, 0x00000024, 0x00000002, 0xFE363C80, 0x00000017, 0x00000024, 0x00000002, 0xFE363C81, 0x00000017, 0x00000044, 0x00000001, D_80242B7C_E188FC, 0x00000024, 0x00000002, 0xFE363C80, 0x00000018, 0x00000024, 0x00000002, 0xFE363C81, 0x00000018, 0x00000044, 0x00000001, D_80242B7C_E188FC, 0x00000024, 0x00000002, 0xFE363C80, 0x00000019, 0x00000024, 0x00000002, 0xFE363C81, 0x00000019, 0x00000044, 0x00000001, D_80242B7C_E188FC, 0x00000024, 0x00000002, 0xFE363C80, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001B, 0x00000044, 0x00000001, D_80242B7C_E188FC, 0x00000024, 0x00000002, 0xFE363C80, 0x0000001C, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001C, 0x00000044, 0x00000001, D_80242B7C_E188FC, 0x00000024, 0x00000002, 0xFE363C80, 0x0000001D, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001D, 0x00000044, 0x00000001, D_80242B7C_E188FC, 0x00000024, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000044, 0x00000001, D_80242B7C_E188FC, 0x00000024, 0x00000002, 0xFE363C80, 0x0000001F, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001F, 0x00000044, 0x00000001, D_80242B7C_E188FC, 0x00000024, 0x00000002, 0xFE363C80, 0x00000021, 0x00000024, 0x00000002, 0xFE363C81, 0x00000021, 0x00000044, 0x00000001, D_80242B7C_E188FC, 0x00000024, 0x00000002, 0xFE363C80, 0x00000022, 0x00000024, 0x00000002, 0xFE363C81, 0x00000022, 0x00000044, 0x00000001, D_80242B7C_E188FC, 0x00000024, 0x00000002, 0xFE363C80, 0x00000023, 0x00000024, 0x00000002, 0xFE363C81, 0x00000023, 0x00000044, 0x00000001, D_80242B7C_E188FC, 0x00000024, 0x00000002, 0xFE363C80, 0x00000024, 0x00000024, 0x00000002, 0xFE363C81, 0x00000024, 0x00000044, 0x00000001, D_80242B7C_E188FC, 0x00000024, 0x00000002, 0xFE363C80, 0x00000025, 0x00000024, 0x00000002, 0xFE363C81, 0x00000025, 0x00000044, 0x00000001, D_80242B7C_E188FC, 0x00000024, 0x00000002, 0xFE363C80, 0x00000027, 0x00000024, 0x00000002, 0xFE363C81, 0x00000027, 0x00000044, 0x00000001, D_80242B7C_E188FC, 0x00000024, 0x00000002, 0xFE363C80, 0x00000028, 0x00000024, 0x00000002, 0xFE363C81, 0x00000028, 0x00000044, 0x00000001, D_80242B7C_E188FC, 0x00000024, 0x00000002, 0xFE363C80, 0x00000029, 0x00000024, 0x00000002, 0xFE363C81, 0x00000029, 0x00000044, 0x00000001, D_80242B7C_E188FC, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002A, 0x00000024, 0x00000002, 0xFE363C81, 0x0000002A, 0x00000044, 0x00000001, D_80242B7C_E188FC, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002B, 0x00000024, 0x00000002, 0xFE363C81, 0x0000002B, 0x00000044, 0x00000001, D_80242B7C_E188FC, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000044, 0x00000001, D_80242B7C_E188FC, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002E, 0x00000024, 0x00000002, 0xFE363C81, 0x0000002E, 0x00000044, 0x00000001, D_80242B7C_E188FC, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002F, 0x00000024, 0x00000002, 0xFE363C81, 0x0000002F, 0x00000044, 0x00000001, D_80242B7C_E188FC, 0x00000024, 0x00000002, 0xFE363C80, 0x00000030, 0x00000024, 0x00000002, 0xFE363C81, 0x00000030, 0x00000044, 0x00000001, D_80242B7C_E188FC, 0x00000024, 0x00000002, 0xFE363C80, 0x00000031, 0x00000024, 0x00000002, 0xFE363C81, 0x00000031, 0x00000044, 0x00000001, D_80242B7C_E188FC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243274_E18FF4 -.word 0x00000024, 0x00000002, 0xFE363C80, 0x00000009, 0x00000024, 0x00000002, 0xFE363C81, 0x00000009, 0x00000044, 0x00000001, D_80242BD4_E18954, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000044, 0x00000001, D_80242BD4_E18954, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000B, 0x00000044, 0x00000001, D_80242BD4_E18954, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000C, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000C, 0x00000044, 0x00000001, D_80242BD4_E18954, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000D, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000D, 0x00000044, 0x00000001, D_80242BD4_E18954, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000044, 0x00000001, D_80242BD4_E18954, 0x00000024, 0x00000002, 0xFE363C80, 0x00000010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000010, 0x00000044, 0x00000001, D_80242BD4_E18954, 0x00000024, 0x00000002, 0xFE363C80, 0x00000011, 0x00000024, 0x00000002, 0xFE363C81, 0x00000011, 0x00000044, 0x00000001, D_80242BD4_E18954, 0x00000024, 0x00000002, 0xFE363C80, 0x00000012, 0x00000024, 0x00000002, 0xFE363C81, 0x00000012, 0x00000044, 0x00000001, D_80242BD4_E18954, 0x00000024, 0x00000002, 0xFE363C80, 0x00000013, 0x00000024, 0x00000002, 0xFE363C81, 0x00000013, 0x00000044, 0x00000001, D_80242BD4_E18954, 0x00000024, 0x00000002, 0xFE363C80, 0x00000015, 0x00000024, 0x00000002, 0xFE363C81, 0x00000015, 0x00000044, 0x00000001, D_80242BD4_E18954, 0x00000024, 0x00000002, 0xFE363C80, 0x00000016, 0x00000024, 0x00000002, 0xFE363C81, 0x00000016, 0x00000044, 0x00000001, D_80242BD4_E18954, 0x00000024, 0x00000002, 0xFE363C80, 0x00000017, 0x00000024, 0x00000002, 0xFE363C81, 0x00000017, 0x00000044, 0x00000001, D_80242BD4_E18954, 0x00000024, 0x00000002, 0xFE363C80, 0x00000018, 0x00000024, 0x00000002, 0xFE363C81, 0x00000018, 0x00000044, 0x00000001, D_80242BD4_E18954, 0x00000024, 0x00000002, 0xFE363C80, 0x00000019, 0x00000024, 0x00000002, 0xFE363C81, 0x00000019, 0x00000044, 0x00000001, D_80242BD4_E18954, 0x00000024, 0x00000002, 0xFE363C80, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001B, 0x00000044, 0x00000001, D_80242BD4_E18954, 0x00000024, 0x00000002, 0xFE363C80, 0x0000001C, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001C, 0x00000044, 0x00000001, D_80242BD4_E18954, 0x00000024, 0x00000002, 0xFE363C80, 0x0000001D, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001D, 0x00000044, 0x00000001, D_80242BD4_E18954, 0x00000024, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000044, 0x00000001, D_80242BD4_E18954, 0x00000024, 0x00000002, 0xFE363C80, 0x0000001F, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001F, 0x00000044, 0x00000001, D_80242BD4_E18954, 0x00000024, 0x00000002, 0xFE363C80, 0x00000021, 0x00000024, 0x00000002, 0xFE363C81, 0x00000021, 0x00000044, 0x00000001, D_80242BD4_E18954, 0x00000024, 0x00000002, 0xFE363C80, 0x00000022, 0x00000024, 0x00000002, 0xFE363C81, 0x00000022, 0x00000044, 0x00000001, D_80242BD4_E18954, 0x00000024, 0x00000002, 0xFE363C80, 0x00000023, 0x00000024, 0x00000002, 0xFE363C81, 0x00000023, 0x00000044, 0x00000001, D_80242BD4_E18954, 0x00000024, 0x00000002, 0xFE363C80, 0x00000024, 0x00000024, 0x00000002, 0xFE363C81, 0x00000024, 0x00000044, 0x00000001, D_80242BD4_E18954, 0x00000024, 0x00000002, 0xFE363C80, 0x00000025, 0x00000024, 0x00000002, 0xFE363C81, 0x00000025, 0x00000044, 0x00000001, D_80242BD4_E18954, 0x00000024, 0x00000002, 0xFE363C80, 0x00000027, 0x00000024, 0x00000002, 0xFE363C81, 0x00000027, 0x00000044, 0x00000001, D_80242BD4_E18954, 0x00000024, 0x00000002, 0xFE363C80, 0x00000028, 0x00000024, 0x00000002, 0xFE363C81, 0x00000028, 0x00000044, 0x00000001, D_80242BD4_E18954, 0x00000024, 0x00000002, 0xFE363C80, 0x00000029, 0x00000024, 0x00000002, 0xFE363C81, 0x00000029, 0x00000044, 0x00000001, D_80242BD4_E18954, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002A, 0x00000024, 0x00000002, 0xFE363C81, 0x0000002A, 0x00000044, 0x00000001, D_80242BD4_E18954, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002B, 0x00000024, 0x00000002, 0xFE363C81, 0x0000002B, 0x00000044, 0x00000001, D_80242BD4_E18954, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000044, 0x00000001, D_80242BD4_E18954, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002E, 0x00000024, 0x00000002, 0xFE363C81, 0x0000002E, 0x00000044, 0x00000001, D_80242BD4_E18954, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002F, 0x00000024, 0x00000002, 0xFE363C81, 0x0000002F, 0x00000044, 0x00000001, D_80242BD4_E18954, 0x00000024, 0x00000002, 0xFE363C80, 0x00000030, 0x00000024, 0x00000002, 0xFE363C81, 0x00000030, 0x00000044, 0x00000001, D_80242BD4_E18954, 0x00000024, 0x00000002, 0xFE363C80, 0x00000031, 0x00000024, 0x00000002, 0xFE363C81, 0x00000031, 0x00000044, 0x00000001, D_80242BD4_E18954, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243888_E19608 -.word 0x00000024, 0x00000002, 0xFE363C80, 0x00000009, 0x00000024, 0x00000002, 0xFE363C81, 0x00000009, 0x00000044, 0x00000001, D_80242AE8_E18868, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000044, 0x00000001, D_80242AE8_E18868, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000B, 0x00000044, 0x00000001, D_80242AE8_E18868, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000C, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000C, 0x00000044, 0x00000001, D_80242AE8_E18868, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000D, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000D, 0x00000044, 0x00000001, D_80242AE8_E18868, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000044, 0x00000001, D_80242AE8_E18868, 0x00000024, 0x00000002, 0xFE363C80, 0x00000010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000010, 0x00000044, 0x00000001, D_80242AE8_E18868, 0x00000024, 0x00000002, 0xFE363C80, 0x00000011, 0x00000024, 0x00000002, 0xFE363C81, 0x00000011, 0x00000044, 0x00000001, D_80242AE8_E18868, 0x00000024, 0x00000002, 0xFE363C80, 0x00000012, 0x00000024, 0x00000002, 0xFE363C81, 0x00000012, 0x00000044, 0x00000001, D_80242AE8_E18868, 0x00000024, 0x00000002, 0xFE363C80, 0x00000013, 0x00000024, 0x00000002, 0xFE363C81, 0x00000013, 0x00000044, 0x00000001, D_80242AE8_E18868, 0x00000024, 0x00000002, 0xFE363C80, 0x00000015, 0x00000024, 0x00000002, 0xFE363C81, 0x00000015, 0x00000044, 0x00000001, D_80242AE8_E18868, 0x00000024, 0x00000002, 0xFE363C80, 0x00000016, 0x00000024, 0x00000002, 0xFE363C81, 0x00000016, 0x00000044, 0x00000001, D_80242AE8_E18868, 0x00000024, 0x00000002, 0xFE363C80, 0x00000017, 0x00000024, 0x00000002, 0xFE363C81, 0x00000017, 0x00000044, 0x00000001, D_80242AE8_E18868, 0x00000024, 0x00000002, 0xFE363C80, 0x00000018, 0x00000024, 0x00000002, 0xFE363C81, 0x00000018, 0x00000044, 0x00000001, D_80242AE8_E18868, 0x00000024, 0x00000002, 0xFE363C80, 0x00000019, 0x00000024, 0x00000002, 0xFE363C81, 0x00000019, 0x00000044, 0x00000001, D_80242AE8_E18868, 0x00000024, 0x00000002, 0xFE363C80, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001B, 0x00000044, 0x00000001, D_80242AE8_E18868, 0x00000024, 0x00000002, 0xFE363C80, 0x0000001C, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001C, 0x00000044, 0x00000001, D_80242AE8_E18868, 0x00000024, 0x00000002, 0xFE363C80, 0x0000001D, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001D, 0x00000044, 0x00000001, D_80242AE8_E18868, 0x00000024, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000044, 0x00000001, D_80242AE8_E18868, 0x00000024, 0x00000002, 0xFE363C80, 0x0000001F, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001F, 0x00000044, 0x00000001, D_80242AE8_E18868, 0x00000024, 0x00000002, 0xFE363C80, 0x00000021, 0x00000024, 0x00000002, 0xFE363C81, 0x00000021, 0x00000044, 0x00000001, D_80242AE8_E18868, 0x00000024, 0x00000002, 0xFE363C80, 0x00000022, 0x00000024, 0x00000002, 0xFE363C81, 0x00000022, 0x00000044, 0x00000001, D_80242AE8_E18868, 0x00000024, 0x00000002, 0xFE363C80, 0x00000023, 0x00000024, 0x00000002, 0xFE363C81, 0x00000023, 0x00000044, 0x00000001, D_80242AE8_E18868, 0x00000024, 0x00000002, 0xFE363C80, 0x00000024, 0x00000024, 0x00000002, 0xFE363C81, 0x00000024, 0x00000044, 0x00000001, D_80242AE8_E18868, 0x00000024, 0x00000002, 0xFE363C80, 0x00000025, 0x00000024, 0x00000002, 0xFE363C81, 0x00000025, 0x00000044, 0x00000001, D_80242AE8_E18868, 0x00000024, 0x00000002, 0xFE363C80, 0x00000027, 0x00000024, 0x00000002, 0xFE363C81, 0x00000027, 0x00000044, 0x00000001, D_80242AE8_E18868, 0x00000024, 0x00000002, 0xFE363C80, 0x00000028, 0x00000024, 0x00000002, 0xFE363C81, 0x00000028, 0x00000044, 0x00000001, D_80242AE8_E18868, 0x00000024, 0x00000002, 0xFE363C80, 0x00000029, 0x00000024, 0x00000002, 0xFE363C81, 0x00000029, 0x00000044, 0x00000001, D_80242AE8_E18868, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002A, 0x00000024, 0x00000002, 0xFE363C81, 0x0000002A, 0x00000044, 0x00000001, D_80242AE8_E18868, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002B, 0x00000024, 0x00000002, 0xFE363C81, 0x0000002B, 0x00000044, 0x00000001, D_80242AE8_E18868, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000044, 0x00000001, D_80242AE8_E18868, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002E, 0x00000024, 0x00000002, 0xFE363C81, 0x0000002E, 0x00000044, 0x00000001, D_80242AE8_E18868, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002F, 0x00000024, 0x00000002, 0xFE363C81, 0x0000002F, 0x00000044, 0x00000001, D_80242AE8_E18868, 0x00000024, 0x00000002, 0xFE363C80, 0x00000030, 0x00000024, 0x00000002, 0xFE363C81, 0x00000030, 0x00000044, 0x00000001, D_80242AE8_E18868, 0x00000024, 0x00000002, 0xFE363C80, 0x00000031, 0x00000024, 0x00000002, 0xFE363C81, 0x00000031, 0x00000044, 0x00000001, D_80242AE8_E18868, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243E9C_E19C1C -.word 0x00000043, 0x00000003, EnableModel, 0x00000034, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000036, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000038, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000003A, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000003C, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000003E, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000040, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000042, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000044, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000046, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243F74_E19CF4 -.word 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, mgm_02_OnHitBox, 0x00000043, 0x00000002, GetColliderCenter, 0xFE363C8B, 0x00000014, 0x00000001, 0xFE363C8C, 0x00000016, 0x00000001, 0x00000002, 0x00000027, 0x00000002, 0xFE363C81, 0x00000002, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000019, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0x00000000, 0xFFFFFFF7, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0x00000000, 0xFFFFFFF1, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0x00000000, 0xFFFFFFEB, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000008, 0x00000001, 0x00000004, 0x00000028, 0x00000002, 0xFE363C81, 0x00000005, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000001, 0x00000028, 0x00000002, 0xFE363C81, 0x00000005, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802441E4_E19F64 -.word 0x00000024, 0x00000002, 0xFE363C80, 0x00000009, 0x00000024, 0x00000002, 0xFE363C81, 0x00000009, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000B, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000C, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000C, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000D, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000D, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000010, 0x00000024, 0x00000002, 0xFE363C81, 0x00000010, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000011, 0x00000024, 0x00000002, 0xFE363C81, 0x00000011, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000012, 0x00000024, 0x00000002, 0xFE363C81, 0x00000012, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000013, 0x00000024, 0x00000002, 0xFE363C81, 0x00000013, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000015, 0x00000024, 0x00000002, 0xFE363C81, 0x00000015, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000016, 0x00000024, 0x00000002, 0xFE363C81, 0x00000016, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000017, 0x00000024, 0x00000002, 0xFE363C81, 0x00000017, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000018, 0x00000024, 0x00000002, 0xFE363C81, 0x00000018, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000019, 0x00000024, 0x00000002, 0xFE363C81, 0x00000019, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001B, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000001C, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001C, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000001D, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001D, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000001F, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001F, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000021, 0x00000024, 0x00000002, 0xFE363C81, 0x00000021, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000022, 0x00000024, 0x00000002, 0xFE363C81, 0x00000022, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000023, 0x00000024, 0x00000002, 0xFE363C81, 0x00000023, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000024, 0x00000024, 0x00000002, 0xFE363C81, 0x00000024, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000025, 0x00000024, 0x00000002, 0xFE363C81, 0x00000025, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000027, 0x00000024, 0x00000002, 0xFE363C81, 0x00000027, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000028, 0x00000024, 0x00000002, 0xFE363C81, 0x00000028, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000029, 0x00000024, 0x00000002, 0xFE363C81, 0x00000029, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002A, 0x00000024, 0x00000002, 0xFE363C81, 0x0000002A, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002B, 0x00000024, 0x00000002, 0xFE363C81, 0x0000002B, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002E, 0x00000024, 0x00000002, 0xFE363C81, 0x0000002E, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002F, 0x00000024, 0x00000002, 0xFE363C81, 0x0000002F, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000030, 0x00000024, 0x00000002, 0xFE363C81, 0x00000030, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000031, 0x00000024, 0x00000002, 0xFE363C81, 0x00000031, 0x00000047, 0x00000005, D_80243F74_E19CF4, 0x00001000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244A28_E1A7A8 -.word 0x00000043, 0x00000001, mgm_02_SetBoxContents, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244A44_E1A7C4 -.word 0x00000043, 0x00000001, mgm_02_CleanupGame, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244A60_E1A7E0 -.word 0x00000043, 0x00000001, mgm_02_DisableMenus, 0x00000043, 0x00000001, mgm_02_RunMinigame, 0x00000043, 0x00000001, mgm_02_EnableMenus, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000003, 0x00000043, 0x00000001, PopSong, 0x00000044, 0x00000001, D_80244A44_E1A7C4, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x00080041, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000004, 0x00000044, 0x00000001, D_80243E9C_E19C1C, 0x00000044, 0x00000001, D_80243274_E18FF4, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000166, 0xFFFFFFEC, 0x000000B9, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000166, 0xFFFFFFEC, 0x000000B9, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000001, 0x00000043, 0x00000001, mgm_02_CreateSignpost, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000001, 0x00000163, 0x0000002D, 0xFFFFFF51, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000166, 0xFFFFFFEC, 0x000000B9, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000001, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000001, 0x00000166, 0x00000005, 0x000000BD, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x19000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000006, GetDist2D, 0xFE363C8A, 0xFE363C80, 0xFE363C82, 0xFE363C83, 0xFE363C85, 0x0000002A, 0x00000002, 0xFE363C8A, 0x00000008, 0x0000000C, 0x00000002, 0xFE363C8A, 0x00000003, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000003, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000014A, 0x000000B9, 0xFE363C8A, 0x00000043, 0x00000001, WaitForPlayerMoveToComplete, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000005, 0x00000043, 0x00000001, mgm_02_UpdateRecords, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0x00080043, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0x00080044, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0x00080042, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, mgm_02_GiveCoinReward, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x00080045, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2518280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, mgm_02_CreateMinigame, 0x00000044, 0x00000001, D_80242C60_E189E0, 0x00000043, 0x00000001, mgm_02_CreateSignpost, 0x00000044, 0x00000001, D_80242A20_E187A0, 0x00000044, 0x00000001, D_802441E4_E19F64, 0x00000044, 0x00000001, D_80243E9C_E19C1C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024502C_E1ADAC -.word 0x00000043, 0x00000001, mgm_02_DestroyMinigame, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245048_E1ADC8 -.word 0x0000000A, 0x00000002, 0xF8405CEF, 0x00000000, 0x00000043, 0x00000001, mgm_02_SetMsgImgs_Panel, 0x00000024, 0x00000002, 0xF8405CEF, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0x0008003C, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0x0008003D, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000001, 0x00000043, 0x00000001, mgm_02_GetCoinCount, 0x0000000C, 0x00000002, 0xFE363C8A, 0x0000000A, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x0008003E, 0x00000043, 0x00000001, mgm_02_HideCoinCounter, 0x00000008, 0x00000001, 0x0000000C, 0x00000044, 0x00000001, D_8024502C_E1ADAC, 0x00000043, 0x00000003, GotoMap, 0x802485F0, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E004F, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000004, 0xFE363C81, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000064, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0xFE363C81, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, mgm_02_TakeCoinCost, 0x00000057, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x0008003F, 0x00000043, 0x00000001, mgm_02_HideCoinCounter, 0x0000001C, 0x00000000, 0x00000043, 0x00000001, mgm_02_HideCoinCounter, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x00080040, 0x00000044, 0x00000001, D_8024502C_E1ADAC, 0x00000043, 0x00000003, GotoMap, 0x802485F0, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFE363C80, 0xFE363C82, 0x0000000A, 0x00000057, 0x00000000, 0x00000043, 0x00000005, EndSpeech, 0x00000000, 0x00830004, 0x00830001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000001, 0x00000043, 0x00000003, PlaySoundWithVolume, 0x00002108, 0x00000050, 0x00000044, 0x00000001, D_80243888_E19608, 0x00000044, 0x00000001, D_80244A28_E1A7A8, 0x00000008, 0x00000001, 0x00000019, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000C, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000001, 0x00000166, 0xFFFFFFF6, 0x000000B9, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000166, 0x000001F4, 0x000000B9, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000000, 0x00000043, 0x00000001, mgm_02_DestroySignpost, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000001, 0x00000163, 0x0000001E, 0xFFFFFF4C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, EndSpeech, 0x00000000, 0x00830004, 0x00830001, 0x00000005, 0x00000043, 0x00000003, PushSong, 0x00000085, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000005, EndSpeech, 0x00000000, 0x00830004, 0x00830001, 0x00000005, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000044, 0x00000001, D_80244A60_E1A7E0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802454E0_E1B260 -.word 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000166, 0xFFFFFFEC, 0x000000B9, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80245048_E1ADC8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245548_E1B2C8 -.word 0x00000000, D_80242660_E183E0, 0x43B08000, 0xC1A00000, 0x43390000, 0x00002D01, D_802454E0_E1B260, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00830001, 0x00830002, 0x00830003, 0x00830003, 0x00830001, 0x00830001, 0x00830006, 0x00830006, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00000000, 0x00000000, 0x00000000, 0x001A0062 - -dlabel D_80245738_E1B4B8 -.word 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x002B0003, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000008, 0x00000331, 0x00000016, 0x00000001, 0x0000000B, 0x00000043, 0x00000003, SetSelfVar, 0x00000008, 0x00000332, 0x00000016, 0x00000001, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000008, 0x00000333, 0x00000016, 0x00000001, 0x0000000D, 0x00000043, 0x00000003, SetSelfVar, 0x00000008, 0x00000331, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000008, 0x00000332, 0x00000023, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000808, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000064, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000032, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802458D8_E1B658 -.word 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x002C000B, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000808, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x00000008, 0x0000032C, 0x00000016, 0x00000001, 0x0000001F, 0x00000043, 0x00000003, SetSelfVar, 0x00000008, 0x0000032D, 0x00000016, 0x00000001, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000008, 0x0000032C, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000008, 0x0000032D, 0x00000023, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000064, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000032, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245A58_E1B7D8 -.word 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0082000D, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000808, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000064, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000032, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245B38_E1B8B8 -.word 0x0000000A, D_802426E4_E18464, 0x00000000, 0xC47A0000, 0x00000000, 0x3F200F01, D_80245738_E1B4B8, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002B0002, 0x002B0002, 0x002B0003, 0x002B0003, 0x002B0001, 0x002B0001, 0x002B0008, 0x002B0008, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x00000000, 0x00000000, 0x00000000, 0x001A0062 - -dlabel D_80245D28_E1BAA8 -.word 0x0000000B, D_802426E4_E18464, 0x00000000, 0xC47A0000, 0x00000000, 0x3F200F01, D_80245738_E1B4B8, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002B0002, 0x002B0002, 0x002B0003, 0x002B0003, 0x002B0001, 0x002B0001, 0x002B0008, 0x002B0008, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x00000000, 0x00000000, 0x00000000, 0x001A0062 - -dlabel D_80245F18_E1BC98 -.word 0x0000000C, D_802426E4_E18464, 0x00000000, 0xC47A0000, 0x00000000, 0x3F200F01, D_80245738_E1B4B8, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002B0002, 0x002B0002, 0x002B0003, 0x002B0003, 0x002B0001, 0x002B0001, 0x002B0008, 0x002B0008, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x00000000, 0x00000000, 0x00000000, 0x001A0062 - -dlabel D_80246108_E1BE88 -.word 0x0000000D, D_802426E4_E18464, 0x00000000, 0xC47A0000, 0x00000000, 0x3F200F01, D_80245738_E1B4B8, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002B0002, 0x002B0002, 0x002B0003, 0x002B0003, 0x002B0001, 0x002B0001, 0x002B0008, 0x002B0008, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x00000000, 0x00000000, 0x00000000, 0x001A0062 - -dlabel D_802462F8_E1C078 -.word 0x0000000E, D_802426E4_E18464, 0x00000000, 0xC47A0000, 0x00000000, 0x3F200F01, D_80245738_E1B4B8, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002B0002, 0x002B0002, 0x002B0003, 0x002B0003, 0x002B0001, 0x002B0001, 0x002B0008, 0x002B0008, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x00000000, 0x00000000, 0x00000000, 0x001A0062 - -dlabel D_802464E8_E1C268 -.word 0x0000001E, D_80242710_E18490, 0x00000000, 0xC47A0000, 0x00000000, 0x3F200F01, D_802458D8_E1B658, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002C0002, 0x002C0004, 0x002C0006, 0x002C0006, 0x002C0002, 0x002C0002, 0x002C000E, 0x002C000E, 0x002C0006, 0x002C0006, 0x002C0006, 0x002C0006, 0x002C0006, 0x002C0006, 0x002C0006, 0x002C0006, 0x00000000, 0x00000000, 0x00000000, 0x001A0062 - -dlabel D_802466D8_E1C458 -.word 0x0000001F, D_80242710_E18490, 0x00000000, 0xC47A0000, 0x00000000, 0x3F200F01, D_802458D8_E1B658, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002C0002, 0x002C0004, 0x002C0006, 0x002C0006, 0x002C0002, 0x002C0002, 0x002C000E, 0x002C000E, 0x002C0006, 0x002C0006, 0x002C0006, 0x002C0006, 0x002C0006, 0x002C0006, 0x002C0006, 0x002C0006, 0x00000000, 0x00000000, 0x00000000, 0x001A0062 - -dlabel D_802468C8_E1C648 -.word 0x00000020, D_80242710_E18490, 0x00000000, 0xC47A0000, 0x00000000, 0x3F200F01, D_802458D8_E1B658, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002C0002, 0x002C0004, 0x002C0006, 0x002C0006, 0x002C0002, 0x002C0002, 0x002C000E, 0x002C000E, 0x002C0006, 0x002C0006, 0x002C0006, 0x002C0006, 0x002C0006, 0x002C0006, 0x002C0006, 0x002C0006, 0x00000000, 0x00000000, 0x00000000, 0x001A0062 - -dlabel D_80246AB8_E1C838 -.word 0x00000021, D_80242710_E18490, 0x00000000, 0xC47A0000, 0x00000000, 0x3F200F01, D_802458D8_E1B658, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002C0002, 0x002C0004, 0x002C0006, 0x002C0006, 0x002C0002, 0x002C0002, 0x002C000E, 0x002C000E, 0x002C0006, 0x002C0006, 0x002C0006, 0x002C0006, 0x002C0006, 0x002C0006, 0x002C0006, 0x002C0006, 0x00000000, 0x00000000, 0x00000000, 0x001A0062 - -dlabel D_80246CA8_E1CA28 -.word 0x00000022, D_80242710_E18490, 0x00000000, 0xC47A0000, 0x00000000, 0x3F200F01, D_802458D8_E1B658, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002C0002, 0x002C0004, 0x002C0006, 0x002C0006, 0x002C0002, 0x002C0002, 0x002C000E, 0x002C000E, 0x002C0006, 0x002C0006, 0x002C0006, 0x002C0006, 0x002C0006, 0x002C0006, 0x002C0006, 0x002C0006, 0x00000000, 0x00000000, 0x00000000, 0x001A0062 - -dlabel D_80246E98_E1CC18 -.word 0x00000064, D_802426B8_E18438, 0x00000000, 0xC47A0000, 0x00000000, 0x3F200F09, D_80245A58_E1B7D8, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00000000, 0x00000000, 0x00000000, 0x001A0062, 0x00000065, D_802426B8_E18438, 0x00000000, 0xC47A0000, 0x00000000, 0x3F200F09, D_80245A58_E1B7D8, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00000000, 0x00000000, 0x00000000, 0x001A0062, 0x00000066, D_802426B8_E18438, 0x00000000, 0xC47A0000, 0x00000000, 0x3F200F09, D_80245A58_E1B7D8, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00000000, 0x00000000, 0x00000000, 0x001A0062, 0x00000067, D_802426B8_E18438, 0x00000000, 0xC47A0000, 0x00000000, 0x3F200F09, D_80245A58_E1B7D8, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00000000, 0x00000000, 0x00000000, 0x001A0062, 0x00000068, D_802426B8_E18438, 0x00000000, 0xC47A0000, 0x00000000, 0x3F200F09, D_80245A58_E1B7D8, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00000000, 0x00000000, 0x00000000, 0x001A0062, 0x00000069, D_802426B8_E18438, 0x00000000, 0xC47A0000, 0x00000000, 0x3F200F09, D_80245A58_E1B7D8, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00000000, 0x00000000, 0x00000000, 0x001A0062, 0x0000006A, D_802426B8_E18438, 0x00000000, 0xC47A0000, 0x00000000, 0x3F200F09, D_80245A58_E1B7D8, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00000000, 0x00000000, 0x00000000, 0x001A0062, 0x0000006B, D_802426B8_E18438, 0x00000000, 0xC47A0000, 0x00000000, 0x3F200F09, D_80245A58_E1B7D8, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00000000, 0x00000000, 0x00000000, 0x001A0062, 0x0000006C, D_802426B8_E18438, 0x00000000, 0xC47A0000, 0x00000000, 0x3F200F09, D_80245A58_E1B7D8, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00000000, 0x00000000, 0x00000000, 0x001A0062, 0x0000006D, D_802426B8_E18438, 0x00000000, 0xC47A0000, 0x00000000, 0x3F200F09, D_80245A58_E1B7D8, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00000000, 0x00000000, 0x00000000, 0x001A0062, 0x00000001, D_80245548_E1B2C8, 0x00000000, 0x00000001, D_80245B38_E1B8B8, 0x00000000, 0x00000001, D_80245D28_E1BAA8, 0x00000000, 0x00000001, D_80245F18_E1BC98, 0x00000000, 0x00000001, D_80246108_E1BE88, 0x00000000, 0x00000001, D_802462F8_E1C078, 0x00000000, 0x00000001, D_802464E8_E1C268, 0x00000000, 0x00000001, D_802466D8_E1C458, 0x00000000, 0x00000001, D_802468C8_E1C648, 0x00000000, 0x00000001, D_80246AB8_E1C838, 0x00000000, 0x00000001, D_80246CA8_E1CA28, 0x00000000, 0x0000000A, D_80246E98_E1CC18, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mgm/mgm_02/E1E020.data.s b/ver/us/asm/data/world/area_mgm/mgm_02/E1E020.data.s deleted file mode 100644 index 870867d654..0000000000 --- a/ver/us/asm/data/world/area_mgm/mgm_02/E1E020.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel mgm_02_PeachPanelImg -.word 0xCCCCCCCC, 0xCCCCCCCC, 0xCCCCCCCC, 0xCCCCCCC3, 0xC3333333, 0x33333333, 0x33333333, 0x33333C33, 0xC3333333, 0x3333030A, 0xA0303333, 0x33333C33, 0xC3311111, 0x111060AA, 0xAA060111, 0x11111C33, 0xC3311111, 0x11106AA8, 0x4AA60111, 0x11111C33, 0xC3311111, 0x111006A4, 0x4A600111, 0x11111C33, 0xC3311111, 0x100660AA, 0xAA066001, 0x11111C33, 0xC3311111, 0x06699666, 0x66699660, 0x11111C33, 0xC3310010, 0x66999996, 0x69999966, 0x01001C33, 0xC3306606, 0x69999999, 0x99999996, 0x60660C33, 0xC3306666, 0x69666999, 0x99966696, 0x66660C33, 0xC3306699, 0x96666699, 0x99666669, 0x99660C33, 0xC3310669, 0x96606669, 0x96660669, 0x96601C33, 0xC3311066, 0x620B0066, 0x6600B026, 0x66011C33, 0xC3300666, 0x20BEEB06, 0x60BEEB02, 0x66600C33, 0xC3306002, 0x60EEEEB0, 0x0BEEEE06, 0x20060C33, 0xC33100E0, 0x90EE50EE, 0xEE05EE09, 0x0E001C33, 0xC33110E0, 0x90EE5BEE, 0xEE0BEE09, 0x0E011C33, 0xC33110E0, 0x60BE50EE, 0xEE05EB06, 0x0E011C33, 0xC3310600, 0x00B99EEE, 0xEEE99B00, 0x00601C33, 0xC331066F, 0x12077EEE, 0xEEE7702F, 0x16601C33, 0xC3310661, 0x120EEE0E, 0xE0EEE021, 0x16601C33, 0xC3306000, 0x0240BEE0, 0x0EEB0420, 0x00060C33, 0xC3360888, 0x80440BEE, 0xEEB04408, 0x88806C33, 0xC3304888, 0x84844006, 0x60044848, 0x88840C33, 0xC3308888, 0x84888844, 0x44448848, 0x88880C33, 0xC3308888, 0x888888DD, 0xDD888888, 0x88880C33, 0xC3308888, 0x84888DF1, 0x1FD88848, 0x88880C33, 0xC3300444, 0x48888DF1, 0x1FD88884, 0x44400C33, 0xCCCCCCCC, 0xCCCCCCCC, 0xCCCCCCCC, 0xCCCCCC33, 0xC3333333, 0x33333333, 0x33333333, 0x33333333, 0x33333333, 0x33333333, 0x33333333, 0x33333333 - -dlabel mgm_02_PeachPanelPal -.word 0x7A8B63ED, 0x934593C1, 0xB2CB9B93, 0xD509DC93, 0xD419DDD1, 0xD649D615, 0xF691ED61, 0xEF27E731 - -dlabel mgm_02_MsgImg_PeachPanel -.word mgm_02_PeachPanelImg, mgm_02_PeachPanelPal, 0x00200020, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mgm/mgm_03/E1E380.data.s b/ver/us/asm/data/world/area_mgm/mgm_03/E1E380.data.s deleted file mode 100644 index 542dcee092..0000000000 --- a/ver/us/asm/data/world/area_mgm/mgm_03/E1E380.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240000_E1E380 -.word 0x00000000, 0x43480000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240050_E1E3D0, D_80240000_E1E380, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190007 - -dlabel D_80240050_E1E3D0 -.word 0x00000043, 0x00000002, SetSpriteShading, 0x00080000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_01/D4E500.data.s b/ver/us/asm/data/world/area_pra/pra_01/D4E500.data.s index 0a339cdc9e..1a0b3ff7d5 100644 --- a/ver/us/asm/data/world/area_pra/pra_01/D4E500.data.s +++ b/ver/us/asm/data/world/area_pra/pra_01/D4E500.data.s @@ -6,7 +6,7 @@ dlabel D_802414C0_D4E500 .word 0x00000043, 0x00000002, GetEntryID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802415D0_D4E610 -.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_01_ReflectWall, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_01_ReflectWall, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_01_ReflectFloor, 0xFE363C80, 0x00000043, 0x00000002, pra_01_ReflectPartner, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_01_EnableWallReflection, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_01_EnableWallReflection, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_01_EnableFloorReflection, 0xFE363C80, 0x00000043, 0x00000002, pra_01_EnablePartnerReflection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241678_D4E6B8 .word 0x00000043, 0x00000003, SetTexPanner, 0xFE363C80, 0xFE363C82, 0x00000043, 0x00000003, SetTexPanner, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetTexPanOffset, 0xFE363C82, 0x00000000, 0xFE363C8A, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000BB8, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x000000A0, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_02/D51720.data.s b/ver/us/asm/data/world/area_pra/pra_02/D51720.data.s index 750731e368..502b676105 100644 --- a/ver/us/asm/data/world/area_pra/pra_02/D51720.data.s +++ b/ver/us/asm/data/world/area_pra/pra_02/D51720.data.s @@ -6,7 +6,7 @@ dlabel D_80241730_D51720 .word 0x00000043, 0x00000002, GetEntryID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241840_D51830 -.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_02_ReflectWall, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_02_ReflectWall, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_02_ReflectFloor, 0xFE363C80, 0x00000043, 0x00000002, pra_02_ReflectPartner, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_02_EnableWallReflection, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_02_EnableWallReflection, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_02_EnableFloorReflection, 0xFE363C80, 0x00000043, 0x00000002, pra_02_EnablePartnerReflection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802418E8_D518D8 .word 0x00000043, 0x00000003, SetTexPanner, 0xFE363C80, 0xFE363C82, 0x00000043, 0x00000003, SetTexPanner, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetTexPanOffset, 0xFE363C82, 0x00000000, 0xFE363C8A, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000BB8, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x000000A0, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_05/D56E20.data.s b/ver/us/asm/data/world/area_pra/pra_05/D56E20.data.s index 676f295f08..6199e939d2 100644 --- a/ver/us/asm/data/world/area_pra/pra_05/D56E20.data.s +++ b/ver/us/asm/data/world/area_pra/pra_05/D56E20.data.s @@ -6,7 +6,7 @@ dlabel D_80241270_D56E20 .word 0x00000043, 0x00000002, GetEntryID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241380_D56F30 -.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_05_ReflectWall, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_05_ReflectWall, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_05_ReflectFloor, 0xFE363C80, 0x00000043, 0x00000002, pra_05_ReflectPartner, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_05_EnableWallReflection, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_05_EnableWallReflection, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_05_EnableFloorReflection, 0xFE363C80, 0x00000043, 0x00000002, pra_05_EnablePartnerReflection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241428_D56FD8 .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C82, 0x00000016, 0x00000024, 0x00000002, 0xFE363C83, 0x00000013, 0x00000024, 0x00000002, 0xFE363C84, 0x00000017, 0x00000024, 0x00000002, 0xFE363C85, 0x00000014, 0x00000044, 0x00000001, 0x80285E9C, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80241870, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_06/D58410.data.s b/ver/us/asm/data/world/area_pra/pra_06/D58410.data.s index 6dc115b566..4d0862dc02 100644 --- a/ver/us/asm/data/world/area_pra/pra_06/D58410.data.s +++ b/ver/us/asm/data/world/area_pra/pra_06/D58410.data.s @@ -6,7 +6,7 @@ dlabel D_80240FE0_D58410 .word 0x00000043, 0x00000002, GetEntryID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802410F0_D58520 -.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_06_ReflectWall, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_06_ReflectWall, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_06_ReflectFloor, 0xFE363C80, 0x00000043, 0x00000002, pra_06_ReflectPartner, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_06_EnableWallReflection, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_06_EnableWallReflection, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_06_EnableFloorReflection, 0xFE363C80, 0x00000043, 0x00000002, pra_06_EnablePartnerReflection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241198_D585C8 .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C82, 0x00000016, 0x00000024, 0x00000002, 0xFE363C83, 0x00000013, 0x00000024, 0x00000002, 0xFE363C84, 0x00000017, 0x00000024, 0x00000002, 0xFE363C85, 0x00000014, 0x00000044, 0x00000001, 0x80285E9C, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x8024144C, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_09/D59F80.data.s b/ver/us/asm/data/world/area_pra/pra_09/D59F80.data.s index 98f0c22241..d48a8667b2 100644 --- a/ver/us/asm/data/world/area_pra/pra_09/D59F80.data.s +++ b/ver/us/asm/data/world/area_pra/pra_09/D59F80.data.s @@ -6,7 +6,7 @@ dlabel D_802416F0_D59F80 .word 0x00000043, 0x00000002, GetEntryID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241800_D5A090 -.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_09_ReflectWall, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_09_ReflectWall, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_09_ReflectFloor, 0xFE363C80, 0x00000043, 0x00000002, pra_09_ReflectPartner, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_09_EnableWallReflection, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_09_EnableWallReflection, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_09_EnableFloorReflection, 0xFE363C80, 0x00000043, 0x00000002, pra_09_EnablePartnerReflection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802418A8_D5A138 .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000018, 0x00000024, 0x00000002, 0xFE363C83, 0x00000015, 0x00000024, 0x00000002, 0xFE363C84, 0x00000019, 0x00000024, 0x00000002, 0xFE363C85, 0x00000016, 0x00000044, 0x00000001, 0x80285E9C, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80246A10, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_10/D60A00.data.s b/ver/us/asm/data/world/area_pra/pra_10/D60A00.data.s index fe1aa064ce..1ede4fd945 100644 --- a/ver/us/asm/data/world/area_pra/pra_10/D60A00.data.s +++ b/ver/us/asm/data/world/area_pra/pra_10/D60A00.data.s @@ -6,7 +6,7 @@ dlabel D_80241750_D60A00 .word 0x00000043, 0x00000002, GetEntryID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241860_D60B10 -.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_10_ReflectWall, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_10_ReflectWall, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_10_ReflectFloor, 0xFE363C80, 0x00000043, 0x00000002, pra_10_ReflectPartner, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_10_EnableWallReflection, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_10_EnableWallReflection, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_10_EnableFloorReflection, 0xFE363C80, 0x00000043, 0x00000002, pra_10_EnablePartnerReflection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241908_D60BB8 .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000D, 0x00000024, 0x00000002, 0xFE363C82, 0x00000017, 0x00000024, 0x00000002, 0xFE363C83, 0x00000014, 0x00000024, 0x00000002, 0xFE363C84, 0x00000018, 0x00000024, 0x00000002, 0xFE363C85, 0x00000015, 0x00000044, 0x00000001, 0x80285E9C, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x802421F0, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_11/D62770.data.s b/ver/us/asm/data/world/area_pra/pra_11/D62770.data.s index 747c0debd2..d66c9d0c9d 100644 --- a/ver/us/asm/data/world/area_pra/pra_11/D62770.data.s +++ b/ver/us/asm/data/world/area_pra/pra_11/D62770.data.s @@ -6,7 +6,7 @@ dlabel D_80241270_D62770 .word 0x00000043, 0x00000002, GetEntryID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241380_D62880 -.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_11_ReflectWall, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_11_ReflectWall, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_11_ReflectFloor, 0xFE363C80, 0x00000043, 0x00000002, pra_11_ReflectPartner, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_11_EnableWallReflection, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_11_EnableWallReflection, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_11_EnableFloorReflection, 0xFE363C80, 0x00000043, 0x00000002, pra_11_EnablePartnerReflection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241428_D62928 .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241800, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_12/D63FB0.data.s b/ver/us/asm/data/world/area_pra/pra_12/D63FB0.data.s index 140daf80fa..e3ac11768c 100644 --- a/ver/us/asm/data/world/area_pra/pra_12/D63FB0.data.s +++ b/ver/us/asm/data/world/area_pra/pra_12/D63FB0.data.s @@ -6,7 +6,7 @@ dlabel D_802412A0_D63FB0 .word 0x00000043, 0x00000002, GetEntryID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802413B0_D640C0 -.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_12_ReflectWall, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_12_ReflectWall, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_12_ReflectFloor, 0xFE363C80, 0x00000043, 0x00000002, pra_12_ReflectPartner, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_12_EnableWallReflection, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_12_EnableWallReflection, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_12_EnableFloorReflection, 0xFE363C80, 0x00000043, 0x00000002, pra_12_EnablePartnerReflection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241458_D64168 .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C82, 0x00000016, 0x00000024, 0x00000002, 0xFE363C83, 0x00000013, 0x00000024, 0x00000002, 0xFE363C84, 0x00000017, 0x00000024, 0x00000002, 0xFE363C85, 0x00000014, 0x00000044, 0x00000001, 0x80285E9C, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x802418BC, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_13/D65C70.data.s b/ver/us/asm/data/world/area_pra/pra_13/D65C70.data.s index bdd6084c4f..02f46e177a 100644 --- a/ver/us/asm/data/world/area_pra/pra_13/D65C70.data.s +++ b/ver/us/asm/data/world/area_pra/pra_13/D65C70.data.s @@ -6,7 +6,7 @@ dlabel D_80241690_D65C70 .word 0x00000043, 0x00000002, GetEntryID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802417A0_D65D80 -.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_13_ReflectWall, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_13_ReflectWall, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_13_ReflectFloor, 0xFE363C80, 0x00000043, 0x00000002, pra_13_ReflectPartner, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_13_EnableWallReflection, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_13_EnableWallReflection, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_13_EnableFloorReflection, 0xFE363C80, 0x00000043, 0x00000002, pra_13_EnablePartnerReflection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241848_D65E28 .word 0x00000043, 0x00000003, SetTexPanner, 0xFE363C80, 0xFE363C82, 0x00000043, 0x00000003, SetTexPanner, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetTexPanOffset, 0xFE363C82, 0x00000000, 0xFE363C8A, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000BB8, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x000000A0, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_14/D68F80.data.s b/ver/us/asm/data/world/area_pra/pra_14/D68F80.data.s index 67ec045e5e..e3fe10fe4b 100644 --- a/ver/us/asm/data/world/area_pra/pra_14/D68F80.data.s +++ b/ver/us/asm/data/world/area_pra/pra_14/D68F80.data.s @@ -6,7 +6,7 @@ dlabel D_80241280_D68F80 .word 0x00000043, 0x00000002, GetEntryID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241390_D69090 -.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_14_ReflectWall, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_14_ReflectWall, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_14_ReflectFloor, 0xFE363C80, 0x00000043, 0x00000002, pra_14_ReflectPartner, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_14_EnableWallReflection, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_14_EnableWallReflection, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_14_EnableFloorReflection, 0xFE363C80, 0x00000043, 0x00000002, pra_14_EnablePartnerReflection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241438_D69138 .word 0x00000043, 0x00000003, SetTexPanner, 0xFE363C80, 0xFE363C82, 0x00000043, 0x00000003, SetTexPanner, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetTexPanOffset, 0xFE363C82, 0x00000000, 0xFE363C8A, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000BB8, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x000000A0, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_16/D6AAF0.data.s b/ver/us/asm/data/world/area_pra/pra_16/D6AAF0.data.s index c863e8bada..c12859d3ca 100644 --- a/ver/us/asm/data/world/area_pra/pra_16/D6AAF0.data.s +++ b/ver/us/asm/data/world/area_pra/pra_16/D6AAF0.data.s @@ -6,7 +6,7 @@ dlabel D_80240FD0_D6AAF0 .word 0x00000043, 0x00000002, GetEntryID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802410E0_D6AC00 -.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_16_ReflectWall, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_16_ReflectWall, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_16_ReflectFloor, 0xFE363C80, 0x00000043, 0x00000002, pra_16_ReflectPartner, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_16_EnableWallReflection, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_16_EnableWallReflection, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_16_EnableFloorReflection, 0xFE363C80, 0x00000043, 0x00000002, pra_16_EnablePartnerReflection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241188_D6ACA8 .word 0x00000043, 0x00000003, SetTexPanner, 0xFE363C80, 0xFE363C82, 0x00000043, 0x00000003, SetTexPanner, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetTexPanOffset, 0xFE363C82, 0x00000000, 0xFE363C8A, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000BB8, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x000000A0, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_18/D6C5F0.data.s b/ver/us/asm/data/world/area_pra/pra_18/D6C5F0.data.s index a96809b393..6119f05c14 100644 --- a/ver/us/asm/data/world/area_pra/pra_18/D6C5F0.data.s +++ b/ver/us/asm/data/world/area_pra/pra_18/D6C5F0.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80240FD0_D6C5F0 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_18_ReflectWall, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_18_ReflectWall, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_18_ReflectFloor, 0xFE363C80, 0x00000043, 0x00000002, pra_18_ReflectPartner, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0xFE363C80, 0xFE363C82, 0x00000043, 0x00000003, SetTexPanner, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetTexPanOffset, 0xFE363C82, 0x00000000, 0xFE363C8A, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000BB8, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x000000A0, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_18_EnableWallReflection, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_18_EnableWallReflection, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_18_EnableFloorReflection, 0xFE363C80, 0x00000043, 0x00000002, pra_18_EnablePartnerReflection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0xFE363C80, 0xFE363C82, 0x00000043, 0x00000003, SetTexPanner, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetTexPanOffset, 0xFE363C82, 0x00000000, 0xFE363C8A, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000BB8, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x000000A0, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024128C_D6C8AC .word 0x0000004B, 0xFFFFFFFF diff --git a/ver/us/asm/data/world/area_pra/pra_19/D70400.data.s b/ver/us/asm/data/world/area_pra/pra_19/D70400.data.s index 92be4f6dcc..1c31ea0674 100644 --- a/ver/us/asm/data/world/area_pra/pra_19/D70400.data.s +++ b/ver/us/asm/data/world/area_pra/pra_19/D70400.data.s @@ -6,7 +6,7 @@ dlabel D_80241A50_D70400 .word 0x00000043, 0x00000002, GetEntryID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241B60_D70510 -.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_19_ReflectWall, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_19_ReflectWall, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_19_ReflectFloor, 0xFE363C80, 0x00000043, 0x00000002, pra_19_ReflectPartner, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_19_EnableWallReflection, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_19_EnableWallReflection, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_19_EnableFloorReflection, 0xFE363C80, 0x00000043, 0x00000002, pra_19_EnablePartnerReflection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241C08_D705B8 .word 0x00000043, 0x00000003, SetTexPanner, 0xFE363C80, 0xFE363C82, 0x00000043, 0x00000003, SetTexPanner, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetTexPanOffset, 0xFE363C82, 0x00000000, 0xFE363C8A, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000BB8, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x000000A0, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_20/D77390.data.s b/ver/us/asm/data/world/area_pra/pra_20/D77390.data.s index f0ec3dcc10..5a00f4daf9 100644 --- a/ver/us/asm/data/world/area_pra/pra_20/D77390.data.s +++ b/ver/us/asm/data/world/area_pra/pra_20/D77390.data.s @@ -6,7 +6,7 @@ dlabel D_80240FF0_D77390 .word 0x00000043, 0x00000002, GetEntryID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241100_D774A0 -.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_20_ReflectWall, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_20_ReflectWall, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_20_ReflectFloor, 0xFE363C80, 0x00000043, 0x00000002, pra_20_ReflectPartner, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_20_EnableWallReflection, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_20_EnableWallReflection, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_20_EnableFloorReflection, 0xFE363C80, 0x00000043, 0x00000002, pra_20_EnablePartnerReflection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802411A8_D77548 .word 0x00000043, 0x00000003, SetTexPanner, 0xFE363C80, 0xFE363C82, 0x00000043, 0x00000003, SetTexPanner, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetTexPanOffset, 0xFE363C82, 0x00000000, 0xFE363C8A, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000BB8, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x000000A0, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_27/D7AC90.data.s b/ver/us/asm/data/world/area_pra/pra_27/D7AC90.data.s index d3bdf048bc..950d52ee6c 100644 --- a/ver/us/asm/data/world/area_pra/pra_27/D7AC90.data.s +++ b/ver/us/asm/data/world/area_pra/pra_27/D7AC90.data.s @@ -6,7 +6,7 @@ dlabel D_802412A0_D7AC90 .word 0x00000043, 0x00000002, GetEntryID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802413B0_D7ADA0 -.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_27_ReflectWall, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_27_ReflectWall, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_27_ReflectFloor, 0xFE363C80, 0x00000043, 0x00000002, pra_27_ReflectPartner, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_27_EnableWallReflection, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_27_EnableWallReflection, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_27_EnableFloorReflection, 0xFE363C80, 0x00000043, 0x00000002, pra_27_EnablePartnerReflection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241458_D7AE48 .word 0x00000016, 0x00000017, 0xFFFFFFFF diff --git a/ver/us/asm/data/world/area_pra/pra_28/D7C540.data.s b/ver/us/asm/data/world/area_pra/pra_28/D7C540.data.s index 779e307c2e..d61c9a7e56 100644 --- a/ver/us/asm/data/world/area_pra/pra_28/D7C540.data.s +++ b/ver/us/asm/data/world/area_pra/pra_28/D7C540.data.s @@ -6,7 +6,7 @@ dlabel D_802412A0_D7C540 .word 0x00000043, 0x00000002, GetEntryID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802413B0_D7C650 -.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_28_ReflectWall, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_28_ReflectWall, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_28_ReflectFloor, 0xFE363C80, 0x00000043, 0x00000002, pra_28_ReflectPartner, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_28_EnableWallReflection, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_28_EnableWallReflection, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_28_EnableFloorReflection, 0xFE363C80, 0x00000043, 0x00000002, pra_28_EnablePartnerReflection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241458_D7C6F8 .word 0x00000016, 0x00000017, 0xFFFFFFFF diff --git a/ver/us/asm/data/world/area_pra/pra_29/D7DE90.data.s b/ver/us/asm/data/world/area_pra/pra_29/D7DE90.data.s index 163573743b..40a02f86f7 100644 --- a/ver/us/asm/data/world/area_pra/pra_29/D7DE90.data.s +++ b/ver/us/asm/data/world/area_pra/pra_29/D7DE90.data.s @@ -6,7 +6,7 @@ dlabel D_80241340_D7DE90 .word 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000053, 0x00000012, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_BlueSwitch, 0x0000014A, 0x00000000, 0xFFFFFFB3, 0x00000000, 0x00000002, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_BlueSwitch, 0x0000014A, 0x00000000, 0x0000004D, 0x00000000, 0x00000001, 0x80000000, 0x00000043, 0x00000002, AssignSwitchFlag, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802414E0_D7E030 -.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_29_ReflectWall, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_29_ReflectWall, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_29_ReflectFloor, 0xFE363C80, 0x00000043, 0x00000002, pra_29_ReflectPartner, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_29_EnableWallReflection, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_29_EnableWallReflection, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_29_EnableFloorReflection, 0xFE363C80, 0x00000043, 0x00000002, pra_29_EnablePartnerReflection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241588_D7E0D8 .word 0x00000043, 0x00000003, SetTexPanner, 0xFE363C80, 0xFE363C82, 0x00000043, 0x00000003, SetTexPanner, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetTexPanOffset, 0xFE363C82, 0x00000000, 0xFE363C8A, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000BB8, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x000000A0, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_33/D8A820.data.s b/ver/us/asm/data/world/area_pra/pra_33/D8A820.data.s index 9b569a9530..6873629162 100644 --- a/ver/us/asm/data/world/area_pra/pra_33/D8A820.data.s +++ b/ver/us/asm/data/world/area_pra/pra_33/D8A820.data.s @@ -6,7 +6,7 @@ dlabel D_80241140_D8A820 .word 0x00000043, 0x00000002, GetEntryID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241250_D8A930 -.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_33_ReflectWall, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_33_ReflectWall, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_33_ReflectFloor, 0xFE363C80, 0x00000043, 0x00000002, pra_33_ReflectPartner, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_33_EnableWallReflection, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_33_EnableWallReflection, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_33_EnableFloorReflection, 0xFE363C80, 0x00000043, 0x00000002, pra_33_EnablePartnerReflection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802412F8_D8A9D8 .word 0x00000043, 0x00000003, SetTexPanner, 0xFE363C80, 0xFE363C82, 0x00000043, 0x00000003, SetTexPanner, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetTexPanOffset, 0xFE363C82, 0x00000000, 0xFE363C8A, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000BB8, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x000000A0, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_34/D8C470.data.s b/ver/us/asm/data/world/area_pra/pra_34/D8C470.data.s index c2b6a9f69c..a045bcbf5c 100644 --- a/ver/us/asm/data/world/area_pra/pra_34/D8C470.data.s +++ b/ver/us/asm/data/world/area_pra/pra_34/D8C470.data.s @@ -6,7 +6,7 @@ dlabel D_802410C0_D8C470 .word 0x00000043, 0x00000002, GetEntryID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802411D0_D8C580 -.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_34_ReflectWall, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_34_ReflectWall, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_34_ReflectFloor, 0xFE363C80, 0x00000043, 0x00000002, pra_34_ReflectPartner, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_34_EnableWallReflection, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_34_EnableWallReflection, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_34_EnableFloorReflection, 0xFE363C80, 0x00000043, 0x00000002, pra_34_EnablePartnerReflection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241278_D8C628 .word 0x00000043, 0x00000003, SetTexPanner, 0xFE363C80, 0xFE363C82, 0x00000043, 0x00000003, SetTexPanner, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetTexPanOffset, 0xFE363C82, 0x00000000, 0xFE363C8A, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000BB8, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x000000A0, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_35/D8FF10.data.s b/ver/us/asm/data/world/area_pra/pra_35/D8FF10.data.s index 796ae87459..9e5f345dff 100644 --- a/ver/us/asm/data/world/area_pra/pra_35/D8FF10.data.s +++ b/ver/us/asm/data/world/area_pra/pra_35/D8FF10.data.s @@ -6,7 +6,7 @@ dlabel D_80242CC0_D8FF10 .word 0x00000043, 0x00000003, SetTexPanner, 0xFE363C80, 0xFE363C82, 0x00000043, 0x00000003, SetTexPanner, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetTexPanOffset, 0xFE363C82, 0x00000000, 0xFE363C8A, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000BB8, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x000000A0, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242ED4_D90124 -.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_35_ReflectWall, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_35_ReflectWall, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_35_ReflectFloor, 0xFE363C80, 0x00000043, 0x00000002, pra_35_ReflectPartner, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_35_EnableWallReflection, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_35_EnableWallReflection, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_35_EnableFloorReflection, 0xFE363C80, 0x00000043, 0x00000002, pra_35_EnablePartnerReflection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242F7C_D901CC .word 0x0000002D, 0x0000002E, 0xFFFFFFFF diff --git a/ver/us/asm/data/world/area_pra/pra_36/D926F0.data.s b/ver/us/asm/data/world/area_pra/pra_36/D926F0.data.s index e3ccf927c0..ff4523955f 100644 --- a/ver/us/asm/data/world/area_pra/pra_36/D926F0.data.s +++ b/ver/us/asm/data/world/area_pra/pra_36/D926F0.data.s @@ -6,7 +6,7 @@ dlabel D_80240FF0_D926F0 .word 0x00000043, 0x00000002, GetEntryID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241100_D92800 -.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_36_ReflectWall, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_36_ReflectWall, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_36_ReflectFloor, 0xFE363C80, 0x00000043, 0x00000002, pra_36_ReflectPartner, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_36_EnableWallReflection, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_36_EnableWallReflection, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_36_EnableFloorReflection, 0xFE363C80, 0x00000043, 0x00000002, pra_36_EnablePartnerReflection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802411A8_D928A8 .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000D, 0x00000024, 0x00000002, 0xFE363C82, 0x00000017, 0x00000024, 0x00000002, 0xFE363C83, 0x00000014, 0x00000024, 0x00000002, 0xFE363C84, 0x00000018, 0x00000024, 0x00000002, 0xFE363C85, 0x00000015, 0x00000044, 0x00000001, 0x80285E9C, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x8024182C, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_37/D94800.data.s b/ver/us/asm/data/world/area_pra/pra_37/D94800.data.s index 7ada05c34d..af1155e9d7 100644 --- a/ver/us/asm/data/world/area_pra/pra_37/D94800.data.s +++ b/ver/us/asm/data/world/area_pra/pra_37/D94800.data.s @@ -6,7 +6,7 @@ dlabel D_802418C0_D94800 .word 0x00000043, 0x00000002, GetEntryID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802419D0_D94910 -.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_37_ReflectWall, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_37_ReflectWall, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_37_ReflectFloor, 0xFE363C80, 0x00000043, 0x00000002, pra_37_ReflectPartner, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_37_EnableWallReflection, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_37_EnableWallReflection, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_37_EnableFloorReflection, 0xFE363C80, 0x00000043, 0x00000002, pra_37_EnablePartnerReflection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241A78_D949B8 .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000D, 0x00000024, 0x00000002, 0xFE363C82, 0x00000017, 0x00000024, 0x00000002, 0xFE363C83, 0x00000014, 0x00000024, 0x00000002, 0xFE363C84, 0x00000018, 0x00000024, 0x00000002, 0xFE363C85, 0x00000015, 0x00000044, 0x00000001, 0x80285E9C, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x802424FC, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_38/D96D70.data.s b/ver/us/asm/data/world/area_pra/pra_38/D96D70.data.s index 5f6844b7a8..1125850b25 100644 --- a/ver/us/asm/data/world/area_pra/pra_38/D96D70.data.s +++ b/ver/us/asm/data/world/area_pra/pra_38/D96D70.data.s @@ -6,7 +6,7 @@ dlabel D_80241780_D96D70 .word 0x00000043, 0x00000002, GetEntryID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241890_D96E80 -.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_38_ReflectWall, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_38_ReflectWall, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_38_ReflectFloor, 0xFE363C80, 0x00000043, 0x00000002, pra_38_ReflectPartner, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_38_EnableWallReflection, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_38_EnableWallReflection, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_38_EnableFloorReflection, 0xFE363C80, 0x00000043, 0x00000002, pra_38_EnablePartnerReflection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241938_D96F28 .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000D, 0x00000024, 0x00000002, 0xFE363C82, 0x00000017, 0x00000024, 0x00000002, 0xFE363C83, 0x00000014, 0x00000024, 0x00000002, 0xFE363C84, 0x00000018, 0x00000024, 0x00000002, 0xFE363C85, 0x00000015, 0x00000044, 0x00000001, 0x80285E9C, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x8024223C, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_39/D99010.data.s b/ver/us/asm/data/world/area_pra/pra_39/D99010.data.s index cf25439591..2a4e8de069 100644 --- a/ver/us/asm/data/world/area_pra/pra_39/D99010.data.s +++ b/ver/us/asm/data/world/area_pra/pra_39/D99010.data.s @@ -6,7 +6,7 @@ dlabel D_80241780_D99010 .word 0x00000043, 0x00000002, GetEntryID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241890_D99120 -.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_39_ReflectWall, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_39_ReflectWall, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_39_ReflectFloor, 0xFE363C80, 0x00000043, 0x00000002, pra_39_ReflectPartner, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_39_EnableWallReflection, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_39_EnableWallReflection, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_39_EnableFloorReflection, 0xFE363C80, 0x00000043, 0x00000002, pra_39_EnablePartnerReflection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241938_D991C8 .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000D, 0x00000024, 0x00000002, 0xFE363C82, 0x00000017, 0x00000024, 0x00000002, 0xFE363C83, 0x00000014, 0x00000024, 0x00000002, 0xFE363C84, 0x00000018, 0x00000024, 0x00000002, 0xFE363C85, 0x00000015, 0x00000044, 0x00000001, 0x80285E9C, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x802420BC, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_40/D9A970.data.s b/ver/us/asm/data/world/area_pra/pra_40/D9A970.data.s index 5559a1a7e7..da153c2569 100644 --- a/ver/us/asm/data/world/area_pra/pra_40/D9A970.data.s +++ b/ver/us/asm/data/world/area_pra/pra_40/D9A970.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80240FC0_D9A970 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_40_ReflectWall, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_40_ReflectWall, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_40_ReflectFloor, 0xFE363C80, 0x00000043, 0x00000002, pra_40_ReflectPartner, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_40_EnableWallReflection, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_40_EnableWallReflection, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_40_EnableFloorReflection, 0xFE363C80, 0x00000043, 0x00000002, pra_40_EnablePartnerReflection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241178_D9AB28 .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000010, 0x00000024, 0x00000002, 0xFE363C83, 0x0000000E, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80241530, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tst/tst_01/B1A900.data.s b/ver/us/asm/data/world/area_tst/tst_01/B1A900.data.s deleted file mode 100644 index 792761328c..0000000000 --- a/ver/us/asm/data/world/area_tst/tst_01/B1A900.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240000_B1A900 -.word 0xC20C0000, 0x00000000, 0x41880000, 0x00000000, 0x43A90000, 0x00000000, 0x40A00000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x43B10000, 0x00000000, 0x43930000, 0x42EA0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240150_B1AA50, D_80240000_B1A900, 0x0000000B, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802400F0_B1A9F0 -.word 0x00000043, 0x00000003, GotoMap, 0x80240320, 0x00000007, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240120_B1AA20 -.word 0x00000043, 0x00000003, GotoMap, 0x80240328, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240150_B1AA50 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000017, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000046, 0x00000001, 0x80240220, 0x00000047, 0x00000005, D_802400F0_B1A9F0, 0x00000040, 0x0000000D, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240120_B1AA20, 0x00000040, 0x0000000E, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tst/tst_01/B1AB20.data.s b/ver/us/asm/data/world/area_tst/tst_01/B1AB20.data.s deleted file mode 100644 index 7892b3f285..0000000000 --- a/ver/us/asm/data/world/area_tst/tst_01/B1AB20.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240220_B1AB20 -.word 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x00000088, 0x00000050, 0x0000003F, 0x00000000, 0x0000015B, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_YellowBlock, 0x000000BE, 0x00000000, 0x0000003F, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0x000000C9, 0x0000003C, 0xFFFFFFEC, 0x00000000, 0x00000156, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0x000000E6, 0x0000003C, 0xFFFFFFEC, 0x00000000, 0x00000156, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenRedBlock, 0x00000102, 0x0000003C, 0xFFFFFFEC, 0x00000000, 0x0000015B, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_RedBlock, 0x0000013B, 0x0000003C, 0x0000003F, 0x00000000, 0x0000015B, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tst/tst_02/B1AC30.data.s b/ver/us/asm/data/world/area_tst/tst_02/B1AC30.data.s deleted file mode 100644 index 14e569e3d9..0000000000 --- a/ver/us/asm/data/world/area_tst/tst_02/B1AC30.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240000_B1AC30 -.word 0xC2240000, 0x00000000, 0x41C80000, 0x00000000, 0x438B0000, 0x00000000, 0x41900000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x43B10000, 0x00000000, 0x43930000, 0x42EA0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240150_B1AD80, D_80240000_B1AC30, 0x0000000B, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802400F0_B1AD20 -.word 0x00000043, 0x00000003, GotoMap, 0x80240340, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240120_B1AD50 -.word 0x00000043, 0x00000003, GotoMap, 0x80240348, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240150_B1AD80 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000017, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000046, 0x00000001, 0x80240220, 0x00000047, 0x00000005, D_802400F0_B1AD20, 0x00000040, 0x00000006, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240120_B1AD50, 0x00000040, 0x00000007, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tst/tst_02/B1AE50.data.s b/ver/us/asm/data/world/area_tst/tst_02/B1AE50.data.s deleted file mode 100644 index 4c4e4ef529..0000000000 --- a/ver/us/asm/data/world/area_tst/tst_02/B1AE50.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240220_B1AE50 -.word 0x00000043, 0x00000007, MakeEntity, Entity_InertYellowBlock, 0x0000005A, 0x00000046, 0xFFFFFF2E, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_InertYellowBlock, 0x00000082, 0x00000050, 0xFFFFFF2E, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_InertYellowBlock, 0x000000AA, 0x0000005A, 0xFFFFFF2E, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_InertYellowBlock, 0x000000D2, 0x00000064, 0xFFFFFF2E, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_InertYellowBlock, 0x000000FA, 0x0000006E, 0xFFFFFF2E, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_GiantChest, 0x000000C1, 0x00000000, 0xFFFFFFDA, 0xFFFFFFEC, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_Chest, 0x00000082, 0x00000000, 0xFFFFFFDA, 0xFFFFFFEC, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tst/tst_03/B1AF80.data.s b/ver/us/asm/data/world/area_tst/tst_03/B1AF80.data.s deleted file mode 100644 index b3df9f1e0e..0000000000 --- a/ver/us/asm/data/world/area_tst/tst_03/B1AF80.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240000_B1AF80 -.word 0xC2AA0000, 0x00000000, 0x41200000, 0x00000000, 0x44C00000, 0x00000000, 0x41700000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x43B10000, 0x00000000, 0x43930000, 0x42EA0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240150_B1B0D0, D_80240000_B1AF80, 0x0000000B, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802400F0_B1B070 -.word 0x00000043, 0x00000003, GotoMap, 0x802405E0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240120_B1B0A0 -.word 0x00000043, 0x00000003, GotoMap, 0x802405E8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240150_B1B0D0 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000017, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000046, 0x00000001, 0x802402C0, 0x00000047, 0x00000005, D_802400F0_B1B070, 0x00000040, 0x0000001B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240120_B1B0A0, 0x00000040, 0x0000001C, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000007, 0x00000004, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000008, 0x00000004, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000007, 0x00080000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000008, 0x00080000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000003, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000000D, 0x00000002, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000012, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tst/tst_03/B1B240.data.s b/ver/us/asm/data/world/area_tst/tst_03/B1B240.data.s deleted file mode 100644 index 6b638e0b70..0000000000 --- a/ver/us/asm/data/world/area_tst/tst_03/B1B240.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802402C0_B1B240 -.word 0x00000043, 0x00000007, MakeEntity, Entity_RedBlock, 0x00000237, 0x0000003C, 0x00000064, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_HiddenRedBlock, 0x0000026F, 0x0000003C, 0x00000064, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_InertYellowBlock, 0x0000012C, 0x0000003C, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x00000168, 0x00000050, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_MulticoinBlock, 0x000001A4, 0x00000050, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_YellowBlock, 0x000001E0, 0x00000050, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_TriggerBlock, 0x0000021C, 0x00000050, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0x00000258, 0x0000003C, 0xFFFFFFCE, 0x00000000, 0x0000008A, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_SuperBlock, 0x0000012C, 0x0000003C, 0x000000A0, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_HeartBlock, 0x000001A4, 0x0000003C, 0x000000A0, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x000001E0, 0x0000003C, 0x000000A0, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_PowBlock, 0x00000284, 0x0000003C, 0x00000076, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer1BlockTiny, 0x000001CC, 0x00000000, 0x00000032, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer1BlockTiny, 0x000001CC, 0x00000019, 0x00000032, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer2BlockTiny, 0x000001EA, 0x00000000, 0x00000032, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer3BlockTiny, 0x00000208, 0x00000000, 0x00000032, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_PowBlock, 0x00000284, 0x0000003C, 0x00000076, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BoardedFloor, 0x000001A0, 0x00000000, 0x000000E8, 0x00000000, 0x80000000, 0x00000043, 0x00000009, MakeEntity, Entity_WoodenCrate, 0x00000150, 0x00000000, 0x000000E8, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x80000000, 0x00000043, 0x00000009, MakeEntity, Entity_WoodenCrate, 0x0000010E, 0x00000000, 0x000000E8, 0x00000000, 0x0000008A, 0x00000000, 0x80000000, 0x00000043, 0x00000009, MakeEntity, Entity_WoodenCrate, 0x0000010E, 0x0000001E, 0x000000E8, 0x00000000, 0x0000008A, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tst/tst_04/B1BC00.data.s b/ver/us/asm/data/world/area_tst/tst_04/B1BC00.data.s deleted file mode 100644 index 4e34d8cf73..0000000000 --- a/ver/us/asm/data/world/area_tst/tst_04/B1BC00.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240690_B1BC00 -.word 0xC3F20000, 0x00000000, 0x00000000, 0x00000000, 0x43F20000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x43B10000, 0x00000000, 0x43930000, 0x42EA0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240B1C_B1C08C, D_80240690_B1BC00, 0x0000000B, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80240780_B1BCF0 -.word 0x00000043, 0x00000003, GotoMap, 0x80240FC0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802407B0_B1BD20 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000064, 0x00000032, 0x0000000A, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000008, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000008, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000064, 0x00000000, 0x00000032, 0x0000000A, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000008, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000008, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802408F8_B1BE68 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000168, 0x00000168, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000005, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000005, 0x00000043, 0x00000001, func_80240000_B1B570, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000014, 0xFFFFFFEC, 0x00000028, 0x0000000A, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000005, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000005, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240A60_B1BFD0 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000168, 0x00000168, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000000, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240B1C_B1C08C -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000017, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80240FA0, 0x00000046, 0x00000001, 0x80240C70, 0x00000047, 0x00000005, D_80240780_B1BCF0, 0x00000040, 0x0000000C, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000008, 0x00000008, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000005, 0x00000005, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000000, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000001, 0x00000001, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000002, 0x00000002, 0x00000044, 0x00000001, D_802407B0_B1BD20, 0x00000044, 0x00000001, D_802408F8_B1BE68, 0x00000044, 0x00000001, D_80240A60_B1BFD0, 0x00000044, 0x00000001, 0x80240CB0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tst/tst_04/B1C1E0.data.s b/ver/us/asm/data/world/area_tst/tst_04/B1C1E0.data.s deleted file mode 100644 index dd844abd9e..0000000000 --- a/ver/us/asm/data/world/area_tst/tst_04/B1C1E0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240C70_B1C1E0 -.word 0x00000043, 0x00000007, MakeEntity, Entity_RedSwitch, 0x00000000, 0x00000000, 0x0000012C, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tst/tst_04/B1C220.data.s b/ver/us/asm/data/world/area_tst/tst_04/B1C220.data.s deleted file mode 100644 index 2f071ab646..0000000000 --- a/ver/us/asm/data/world/area_tst/tst_04/B1C220.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240CB0_B1C220 -.word 0x00000043, 0x00000001, func_80240628_B1BB98, 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x00000043, 0x00000001, func_80240260_B1B7D0, 0x00000043, 0x00000001, func_80240510_B1BA80, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tst/tst_04/B1C270.data.s b/ver/us/asm/data/world/area_tst/tst_04/B1C270.data.s deleted file mode 100644 index 7b218adcdb..0000000000 --- a/ver/us/asm/data/world/area_tst/tst_04/B1C270.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240D00_B1C270 -.word 0x00000043, 0x00000001, func_80240660_B1BBD0, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00040000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240D34_B1C2A4 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240D44_B1C2B4 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240D54_B1C2C4 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240D64_B1C2D4 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240D74_B1C2E4 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240D84_B1C2F4 -.word 0x009D0008, 0x00180018, D_80240D00_B1C270, D_80240D64_B1C2D4, D_80240D44_B1C2B4, D_80240D54_B1C2C4, D_80240D34_B1C2A4, D_80240D74_B1C2E4, 0x00000005, 0x000000C8, 0x00000000, 0x00000000, D_80240D84_B1C2F4, 0x42A00000, 0x42200000, 0xC2A80000, 0x00001000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tst/tst_04/B1C510.data.s b/ver/us/asm/data/world/area_tst/tst_04/B1C510.data.s deleted file mode 100644 index 415670433a..0000000000 --- a/ver/us/asm/data/world/area_tst/tst_04/B1C510.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240FA0_B1C510 -.word 0x00000001, 0x80240DB0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tst/tst_10/B1C540.data.s b/ver/us/asm/data/world/area_tst/tst_10/B1C540.data.s deleted file mode 100644 index 44eff38b55..0000000000 --- a/ver/us/asm/data/world/area_tst/tst_10/B1C540.data.s +++ /dev/null @@ -1,33 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240000_B1C540 -.word 0x00000000, 0x00000000, 0xC3F00000, 0x43340000, 0xC3F00000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x43F00000, 0x00000000, 0x43F00000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802402F0_B1C830, D_80240000_B1C540, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00000000 - -dlabel D_80240080_B1C5C0 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240500, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802400E0_B1C620 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240500, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240140_B1C680 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240500, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802401A0_B1C6E0 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240500, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240200_B1C740 -.word 0x00000043, 0x00000003, SetZoneEnabled, 0x00000010, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x0000000F, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000011, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x0000000E, 0x00000000, 0x00000024, 0x00000002, 0xF9718880, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240270_B1C7B0 -.word 0x00000047, 0x00000005, D_80240080_B1C5C0, 0x00000080, 0x00000001, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802400E0_B1C620, 0x00000080, 0x0000000B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240140_B1C680, 0x00000080, 0x00000008, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802401A0_B1C6E0, 0x00000080, 0x00000005, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802402F0_B1C830 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000017, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000046, 0x00000001, D_80240498_B1C9D8, 0x0000000A, 0x00000002, 0xF9718880, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000010, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x0000000F, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000011, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x0000000E, 0x00000000, 0x00000024, 0x00000002, 0xF9718880, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xF9718880, 0x00000001, 0x00000047, 0x00000005, D_80240200_B1C740, 0x00000080, 0x0000000E, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80240270_B1C7B0, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240450_B1C990 -.word 0xFFFFFFBF, 0x00000000, 0x000000D9, 0xFFFFFEFA, 0x00000000, 0xFFFFFFC0, 0x00000039, 0x00000000, 0xFFFFFEE2, 0x00000147, 0x00000000, 0x00000008, 0x80000001, D_80240450_B1C990, D_80240450_B1C990, D_80240450_B1C990, D_80240450_B1C990, 0xFFFFFFFF - -dlabel D_80240498_B1C9D8 -.word 0x00000043, 0x00000007, MakeEntity, Entity_HeartBlock, 0xFFFFFFF3, 0x0000003C, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenPanel, 0xFFFFFF91, 0x00000000, 0xFFFFFFC9, 0x00000000, 0x00000003, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tst/tst_11/B1D1C0.data.s b/ver/us/asm/data/world/area_tst/tst_11/B1D1C0.data.s deleted file mode 100644 index f1413c6abb..0000000000 --- a/ver/us/asm/data/world/area_tst/tst_11/B1D1C0.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240770_B1D1C0 -.word 0x00000000, 0x00000000, 0x42C80000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802407C0_B1D210, D_80240770_B1D1C0, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802407C0_B1D210 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000017, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000044, 0x00000001, 0x80240850, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tst/tst_11/B1D2A0.data.s b/ver/us/asm/data/world/area_tst/tst_11/B1D2A0.data.s deleted file mode 100644 index f23eb7811b..0000000000 --- a/ver/us/asm/data/world/area_tst/tst_11/B1D2A0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240850_B1D2A0 -.word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x00000043, 0x00000001, func_80240000_B1CA50, 0x00000043, 0x00000001, func_802402B8_B1CD08, 0x00000043, 0x00000001, func_802406D4_B1D124, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tst/tst_12/B1D2F0.data.s b/ver/us/asm/data/world/area_tst/tst_12/B1D2F0.data.s deleted file mode 100644 index d3e5e67a1e..0000000000 --- a/ver/us/asm/data/world/area_tst/tst_12/B1D2F0.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240000_B1D2F0 -.word 0x43D00000, 0x00000000, 0x42980000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802402FC_B1D5EC, D_80240000_B1D2F0, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00000000 - -dlabel D_80240050_B1D340 -.word 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, RandInt, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, RandInt, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, RandInt, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, PlayEffect, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, RandInt, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, PlayEffect, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802402FC_B1D5EC -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000017, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000000, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x00000220, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000064, 0x00000024, 0x00000002, 0xFE363C83, 0x00000182, 0x00000024, 0x00000002, 0xFE363C84, 0x000000AE, 0x00000024, 0x00000002, 0xFE363C85, 0x00000028, 0x00000044, 0x00000001, D_80240050_B1D340, 0x00000024, 0x00000002, 0xFE363C80, 0x00000147, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000018, 0x00000024, 0x00000002, 0xFE363C83, 0x00000059, 0x00000024, 0x00000002, 0xFE363C84, 0x000000FC, 0x00000024, 0x00000002, 0xFE363C85, 0x00000028, 0x00000044, 0x00000001, D_80240050_B1D340, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tst/tst_13/B1DB20.data.s b/ver/us/asm/data/world/area_tst/tst_13/B1DB20.data.s deleted file mode 100644 index 28d76758f2..0000000000 --- a/ver/us/asm/data/world/area_tst/tst_13/B1DB20.data.s +++ /dev/null @@ -1,174 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802403C0_B1DB20 -.word 0x00000000, 0x00000000, 0x42C80000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80242C14_B20374, D_802403C0_B1DB20, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00000000, 0x00000030, 0x00000001, 0xFE363C80, 0x0000003E, 0x00000002, 0x00000006, 0xFE363C8A, 0x00000031, 0x00000001, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD480, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD481, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD482, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD483, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD485, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000047, 0x00000005, D_80240510_B1DC70, 0x00000080, 0xF4ACD480, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240510_B1DC70 -.word 0x0000003C, 0x00000001, 0xFE363C80, 0x00000043, 0x00000001, func_80240000_B1D760, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xF4ACD480, 0x7FFFFE00, 0x00000043, 0x00000003, EnableModel, 0xF4ACD481, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xF4ACD480, 0x7FFFFE00, 0x00000043, 0x00000003, EnableModel, 0xF4ACD481, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x0000000B, 0x00000002, 0xF4ACD485, 0x00000000, 0x00000046, 0x00000001, 0xF4ACD485, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240600_B1DD60 -.word 0x00000030, 0x00000001, 0xFE363C80, 0x0000003E, 0x00000002, 0x00000006, 0xFE363C89, 0x00000031, 0x00000001, 0xFE363C81, 0x00000024, 0x00000002, 0xF4ACD480, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C81, 0x00000024, 0x00000002, 0xF4ACD481, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C81, 0x00000024, 0x00000002, 0xF4ACD482, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C81, 0x00000024, 0x00000002, 0xF4ACD483, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C81, 0x00000024, 0x00000002, 0xF4ACD484, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C81, 0x00000024, 0x00000002, 0xF4ACD485, 0xFE363C81, 0x00000043, 0x00000003, ParentColliderToModel, 0xF4ACD481, 0xF4ACD480, 0x00000003, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x0000000D, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0x0000000F, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C82, 0xF4ACD483, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tst_13_UnkDistFunc2, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000046, 0x00000001, D_80240894_B1DFF4, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000046, 0x00000001, D_80240A58_B1E1B8, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000000D, 0x00000004, 0x00000001, 0x00000003, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000000F, 0x00000004, 0x00000001, 0x00000003, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240894_B1DFF4 -.word 0x0000003C, 0x00000001, 0xFE363C89, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000005, 0x00000003, 0x00000001, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD480, 0x00000000, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C85, 0xFE363C80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C82, 0xFE363C85, 0xFE363C84, 0x00000043, 0x00000002, UpdateColliderTransform, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000005, 0x00000000, 0x00000003, 0x00000001, 0x00000003, 0x00000001, 0x00000003, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD480, 0x00000000, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C85, 0xFE363C80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C82, 0xFE363C85, 0xFE363C84, 0x00000043, 0x00000002, UpdateColliderTransform, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000003, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240A58_B1E1B8 -.word 0x0000003C, 0x00000001, 0xFE363C89, 0x00000043, 0x00000007, MakeItemEntity, 0xF4ACD485, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000003, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000096, 0x00000013, 0x00000004, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD480, 0x00000000, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C82, 0x0000002D, 0x00000043, 0x00000006, RotateModel, 0xF4ACD480, 0xFE363C82, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000096, 0x00000000, 0x00000013, 0x00000004, 0x00000003, 0x00000001, 0x00000003, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD480, 0x00000000, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C82, 0x0000002D, 0x00000043, 0x00000006, RotateModel, 0xF4ACD480, 0xFE363C82, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000003, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240C08_B1E368 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240C18_B1E378 -.word 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00030003, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240C3C_B1E39C -.word 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00040001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240C60_B1E3C0 -.word 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00050001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240C84_B1E3E4 -.word 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00060001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240CA8_B1E408 -.word 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00070001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240CCC_B1E42C -.word 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00080001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240CF0_B1E450 -.word 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00080001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240D14_B1E474 -.word 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00080001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240D38_B1E498 -.word 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00010001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240D5C_B1E4BC -.word 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00020003, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240D80_B1E4E0 -.word 0x008F0002, 0x00180018, D_80240C08_B1E368, D_80240C18_B1E378, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000 - -dlabel D_80240DAC_B1E50C -.word 0x008F0002, 0x00180018, D_80240C08_B1E368, D_80240C3C_B1E39C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000 - -dlabel D_80240DD8_B1E538 -.word 0x008F0002, 0x00180018, D_80240C08_B1E368, D_80240C60_B1E3C0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000 - -dlabel D_80240E04_B1E564 -.word 0x008F0002, 0x00180018, D_80240C08_B1E368, D_80240C84_B1E3E4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000 - -dlabel D_80240E30_B1E590 -.word 0x008F0002, 0x00180018, D_80240C08_B1E368, D_80240CA8_B1E408, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000 - -dlabel D_80240E5C_B1E5BC -.word 0x008F0002, 0x00180018, D_80240C08_B1E368, D_80240CCC_B1E42C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000 - -dlabel D_80240E88_B1E5E8 -.word 0x008F0002, 0x00180018, D_80240C08_B1E368, D_80240CF0_B1E450, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000 - -dlabel D_80240EB4_B1E614 -.word 0x008F0002, 0x00180018, D_80240C08_B1E368, D_80240D14_B1E474, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000 - -dlabel D_80240EE0_B1E640 -.word 0x008F0002, 0x00180018, D_80240C08_B1E368, D_80240D38_B1E498, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000 - -dlabel D_80240F0C_B1E66C -.word 0x008F0002, 0x00180018, D_80240C08_B1E368, D_80240D5C_B1E4BC, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000 - -dlabel D_80240F38_B1E698 -.word 0x00000000, D_80240D80_B1E4E0, 0x00000000, 0x00000000, 0x00000000, 0x00000D09, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80240DAC_B1E50C, 0x41A00000, 0x00000000, 0x41A00000, 0x00000D09, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, D_80240DD8_B1E538, 0x42200000, 0x00000000, 0x42200000, 0x00000D09, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000003, D_80240E04_B1E564, 0x42700000, 0x00000000, 0x42700000, 0x00000D09, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000004, D_80240E30_B1E590, 0x42A00000, 0x00000000, 0x42A00000, 0x00000D09, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000005, D_80240E5C_B1E5BC, 0x42C80000, 0x00000000, 0x42C80000, 0x00000D09, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, D_80240E88_B1E5E8, 0x42F00000, 0x00000000, 0x42F00000, 0x00000D09, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000007, D_80240EB4_B1E614, 0x430C0000, 0x00000000, 0x430C0000, 0x00000D09, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, D_80240EE0_B1E640, 0x43200000, 0x00000000, 0x43200000, 0x00000D09, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000009, D_80240F0C_B1E66C, 0x43340000, 0x00000000, 0x43340000, 0x00000D09, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80242298_B1F9F8 -.word 0x0000000A, D_80240F38_B1E698, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802422B0_B1FA10 -.word 0x0000000F, 0xFF500000, 0x00000000, 0xFFFFFFFF, 0x0058000F, 0xFF680000, 0x00000000, 0xFFFFFFFF, 0x005A0000, 0xFF640000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0xFF4C0000, 0x00000000, 0xFFFFFFFF - -dlabel D_802422F0_B1FA50 -.word 0x0000001A, 0xFF5B0000, 0x00000000, 0xFFFFFFFF, 0x0053001A, 0xFF710000, 0x00000000, 0xFFFFFFFF - -dlabel D_80242310_B1FA70 -.word 0xFFA8000F, 0xFF680000, 0x00000000, 0xFFFFFFFF - -dlabel D_80242320_B1FA80 -.word 0xFFA60000, 0xFF640000, 0x00000000, 0xFFFFFFFF, 0xFFAD001A, 0xFF710000, 0x00000000, 0xFFFFFFFF, 0x0098000F, 0xFFA80000, 0x00000000, 0xFFFFFFFF, 0x009C0000, 0xFFA60000, 0x00000000, 0xFFFFFFFF, 0x008F001A, 0xFFAD0000, 0x00000000, 0xFFFFFFFF, 0x00680000, 0xFFC40000, 0x00000000, 0xFFFFFFFF, 0x003C0000, 0xFF980000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0xFF880000, 0x00000000, 0xFFFFFFFF - -dlabel D_802423A0_B1FB00 -.word 0xFFC40000, 0xFF980000, 0x00000000, 0xFFFFFFFF, 0x006B000F, 0xFFC20000, 0x00000000, 0xFFFFFFFF, 0x003E000F, 0xFF950000, 0x00000000, 0xFFFFFFFF - -dlabel D_802423D0_B1FB30 -.word 0x0000000F, 0xFF840000, 0x00000000, 0xFFFFFFFF - -dlabel D_802423E0_B1FB40 -.word 0xFFC2000F, 0xFF950000, 0x00000000, 0xFFFFFFFF, 0x00780000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x007C000F, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00B40000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x0087001A, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x0075001A, 0xFFBC0000, 0x00000000, 0xFFFFFFFF - -dlabel D_80242440_B1FBA0 -.word 0x0044001A, 0xFF8B0000, 0x00000000, 0xFFFFFFFF, 0x0000001A, 0xFF790000, 0x00000000, 0xFFFFFFFF, 0x0096001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x0082001E, 0xFFB50000, 0x00000000, 0xFFFFFFFF, 0x004B001E, 0xFF7E0000, 0x00000000, 0xFFFFFFFF, 0x0000001E, 0xFF6A0000, 0x00000000, 0xFFFFFFFF - -dlabel D_802424A0_B1FC00 -.word 0xFFB5001E, 0xFF7E0000, 0x00000000, 0xFFFFFFFF, 0xFFBC001A, 0xFF8B0000, 0x00000000, 0xFFFFFFFF, 0x00A5001A, 0x00000000, 0x00000000, 0xFFFFFFFF - -dlabel D_802424D0_B1FC30 -.word 0x0075001A, 0x00440000, 0x00000000, 0xFFFFFFFF, 0x006B000F, 0x003E0000, 0x00000000, 0xFFFFFFFF, 0x0082001E, 0x004B0000, 0x00000000, 0xFFFFFFFF, 0x00B0000F, 0x00000000, 0x00000000, 0xFFFFFFFF - -dlabel D_80242510_B1FC70 -.word 0x009C0000, 0x005A0000, 0x00000000, 0xFFFFFFFF, 0x00680000, 0x003C0000, 0x00000000, 0xFFFFFFFF - -dlabel D_80242530_B1FC90 -.word 0xFF640000, 0xFFA60000, 0x00000000, 0xFFFFFFFF, 0xFF68000F, 0xFFA80000, 0x00000000, 0xFFFFFFFF, 0xFF980000, 0xFFC40000, 0x00000000, 0xFFFFFFFF, 0xFF50000F, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFF5B001A, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFF71001A, 0xFFAD0000, 0x00000000, 0xFFFFFFFF, 0xFF4C0000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFF880000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFF95000F, 0xFFC20000, 0x00000000, 0xFFFFFFFF, 0xFF84000F, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFF8B001A, 0xFFBC0000, 0x00000000, 0xFFFFFFFF, 0xFF79001A, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFF6A001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFF7E001E, 0xFFB50000, 0x00000000, 0xFFFFFFFF - -dlabel D_80242610_B1FD70 -.word 0x0000000F, 0x00B00000, 0x00000000, 0xFFFFFFFF - -dlabel D_80242620_B1FD80 -.word 0x005A0000, 0x009C0000, 0x00000000, 0xFFFFFFFF - -dlabel D_80242630_B1FD90 -.word 0x0058000F, 0x00980000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00B40000, 0x00000000, 0xFFFFFFFF - -dlabel D_80242650_B1FDB0 -.word 0xFFA8000F, 0x00980000, 0x00000000, 0xFFFFFFFF, 0xFFA60000, 0x009C0000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00780000, 0x00000000, 0xFFFFFFFF, 0xFFC40000, 0x00680000, 0x00000000, 0xFFFFFFFF - -dlabel D_80242690_B1FDF0 -.word 0x003C0000, 0x00680000, 0x00000000, 0xFFFFFFFF, 0xFF640000, 0x005A0000, 0x00000000, 0xFFFFFFFF, 0xFF980000, 0x003C0000, 0x00000000, 0xFFFFFFFF, 0xFF95000F, 0x003E0000, 0x00000000, 0xFFFFFFFF, 0xFFC2000F, 0x006B0000, 0x00000000, 0xFFFFFFFF - -dlabel D_802426E0_B1FE40 -.word 0x0000000F, 0x007C0000, 0x00000000, 0xFFFFFFFF, 0xFF8B001A, 0x00440000, 0x00000000, 0xFFFFFFFF, 0xFFBC001A, 0x00750000, 0x00000000, 0xFFFFFFFF - -dlabel D_80242710_B1FE70 -.word 0x0000001A, 0x00870000, 0x00000000, 0xFFFFFFFF, 0xFF7E001E, 0x004B0000, 0x00000000, 0xFFFFFFFF, 0xFFB5001E, 0x00820000, 0x00000000, 0xFFFFFFFF - -dlabel D_80242740_B1FEA0 -.word 0x0000001E, 0x00960000, 0x00000000, 0xFFFFFFFF, 0x0000001A, 0x00A50000, 0x00000000, 0xFFFFFFFF, 0x0053001A, 0x008F0000, 0x00000000, 0xFFFFFFFF, 0xFFAD001A, 0x008F0000, 0x00000000, 0xFFFFFFFF - -dlabel D_80242780_B1FEE0 -.word 0x003E000F, 0x006B0000, 0x00000000, 0xFFFFFFFF, 0x0044001A, 0x00750000, 0x00000000, 0xFFFFFFFF, 0x004B001E, 0x00820000, 0x00000000, 0xFFFFFFFF - -dlabel D_802427B0_B1FF10 -.word 0xFF71001A, 0x00530000, 0x00000000, 0xFFFFFFFF, 0xFF68000F, 0x00580000, 0x00000000, 0xFFFFFFFF - -dlabel D_802427D0_B1FF30 -.word 0x0098000F, 0x00580000, 0x00000000, 0xFFFFFFFF, 0x008F001A, 0x00530000, 0x00000000, 0xFFFFFFFF - -dlabel D_802427F0_B1FF50 -.word 0xFF4C0000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFF880000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFF84000F, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFF79001A, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFF6A001E, 0x00000000, 0x00000000, 0xFFFFFFFF - -dlabel D_80242840_B1FFA0 -.word 0xFF5B001A, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFF50000F, 0x00000000, 0x00000000, 0xFFFFFFFF - -dlabel D_80242860_B1FFC0 -.word 0xE7000000, 0x00000000, 0xD9DDFFFF, 0x00000000, 0xD9FFFFFF, 0x00000400, 0x0101E03C, D_802422B0_B1FA10, 0x06000204, 0x00000406, 0x06080A02, 0x00080200, 0x060C0006, 0x000C060E, 0x06100800, 0x0010000C, 0x06021214, 0x00021404, 0x060A1612, 0x000A1202, 0x06041418, 0x0004181A, 0x0606041A, 0x00061A1C, 0x060E061C, 0x000E1C1E, 0x061A1820, 0x001A2022, 0x061C1A22, 0x001C2224, 0x061E1C24, 0x001E2426, 0x0618282A, 0x00182A20, 0x06142C28, 0x00142818, 0x06202A2E, 0x00202E30, 0x06222030, 0x00223032, 0x06242232, 0x00243234, 0x06302E36, 0x00303638, 0x06323038, 0x0032383A, 0x063A3816, 0x003A160A, 0x01002004, D_802422F0_B1FA50, 0x0100500E, D_80242320_B1FA80, 0x01001010, D_802423A0_B1FB00, 0x0100601C, D_802423D0_B1FB30, 0x0101003C, D_80242440_B1FBA0, 0x01002040, D_802427D0_B1FF30, 0x061E1C24, 0x001E2426, 0x06262402, 0x00260200, 0x06282600, 0x00280006, 0x0612101E, 0x00121E2A, 0x062A1E26, 0x002A2628, 0x0622202C, 0x00222C0C, 0x061A2E32, 0x001A3220, 0x0616302E, 0x00162E1A, 0x0620323E, 0x00203E2C, 0x062C3E3C, 0x002C3C34, 0x060C2C34, 0x000C3408, 0x06343C36, 0x00343618, 0x06083418, 0x0008180A, 0x06183638, 0x00183814, 0x06143830, 0x00143016, 0x01003006, D_80242310_B1FA70, 0x01001008, D_802423A0_B1FB00, 0x0100100A, D_802423E0_B1FB40, 0x0100200E, D_802424A0_B1FC00, 0x0101703C, D_80242530_B1FC90, 0x060E0206, 0x000E0612, 0x06100002, 0x0010020E, 0x06120608, 0x0012081E, 0x0614100E, 0x00140E1A, 0x06161810, 0x00161014, 0x06180400, 0x00180010, 0x061A0E12, 0x001A121C, 0x061C121E, 0x001C1E20, 0x061E080C, 0x001E0C22, 0x06201E22, 0x00202224, 0x06220C0A, 0x00220A28, 0x06242228, 0x00242826, 0x06262818, 0x00261816, 0x06280A04, 0x00280418, 0x062A3234, 0x002A3430, 0x062C3036, 0x002C363A, 0x062E2A30, 0x002E302C, 0x06303438, 0x00303836, 0x01001002, D_80242610_B1FD70, 0x01001004, D_80242630_B1FD90, 0x0101402C, D_80242650_B1FDB0, 0x01002030, D_802427B0_B1FF10, 0x0100603C, D_802427F0_B1FF50, 0x06042E0E, 0x00040E06, 0x06060E10, 0x0006100A, 0x06080A14, 0x00081416, 0x060A1012, 0x000A1214, 0x060C0816, 0x000C162A, 0x060E3032, 0x000E3210, 0x06103234, 0x00103412, 0x06123436, 0x00123618, 0x06141218, 0x0014181A, 0x0616141A, 0x00161A1C, 0x06183638, 0x0018381E, 0x061A181E, 0x001A1E20, 0x061C1A20, 0x001C2022, 0x061E383A, 0x001E3A2C, 0x06201E2C, 0x00202C28, 0x06222028, 0x00222824, 0x06242804, 0x00240400, 0x06262400, 0x00260002, 0x06282C2E, 0x00282E04, 0x01003006, D_802424D0_B1FC30, 0x0100200A, D_80242510_B1FC70, 0x0100200E, D_80242620_B1FD80, 0x01002012, D_80242690_B1FDF0, 0x01001014, D_802426E0_B1FE40, 0x01001016, D_80242710_B1FE70, 0x0100301C, D_80242740_B1FEA0, 0x0100802C, D_80242780_B1FEE0, 0x01002030, D_80242840_B1FFA0, 0x061C1214, 0x001C141E, 0x061E1416, 0x001E1620, 0x06201618, 0x0020181A, 0x06222C2E, 0x00222E24, 0x06242E2A, 0x00242A10, 0x06060A0E, 0x00060E08, 0x06260C0A, 0x00260A06, 0x06080E1C, 0x00081C02, 0x06021C1E, 0x00021E00, 0x06001E20, 0x00002004, 0x0604201A, 0x00041A28, 0x06281A0C, 0x00280C26, 0xDF000000, 0x00000000, 0xDF000000, 0x00000000 - -dlabel D_80242BF8_B20358 -.word 0x00000000 - -dlabel D_80242BFC_B2035C -.word 0x00000005, 0x00000004, 0xFFFFFFDD, 0x00000000, 0xFFFFFFD3, 0x00000156 - -dlabel D_80242C14_B20374 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000017, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, D_80242298_B1F9F8, 0x00000024, 0x00000002, 0xFE363C80, D_80242BFC_B2035C, 0x00000044, 0x00000001, D_80240600_B1DD60, 0x00000043, 0x00000004, SetModelCustomGfx, 0x00000001, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000004, SetCustomGfxBuilders, 0x00000000, 0x00000000, func_8024013C_B1D89C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tst/tst_20/B20470.data.s b/ver/us/asm/data/world/area_tst/tst_20/B20470.data.s deleted file mode 100644 index ca7e291e1c..0000000000 --- a/ver/us/asm/data/world/area_tst/tst_20/B20470.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240000_B20470 -.word 0x00000000, 0x00000000, 0x42C80000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240050_B204C0, D_80240000_B20470, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80240050_B204C0 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000017, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218058_59E738.s b/ver/us/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218058_59E738.s deleted file mode 100644 index e893ab6094..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218058_59E738.s +++ /dev/null @@ -1,58 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218058_59E738 -/* 59E738 80218058 27BDFE60 */ addiu $sp, $sp, -0x1a0 -/* 59E73C 8021805C AFB30194 */ sw $s3, 0x194($sp) -/* 59E740 80218060 0080982D */ daddu $s3, $a0, $zero -/* 59E744 80218064 AFB1018C */ sw $s1, 0x18c($sp) -/* 59E748 80218068 27B10010 */ addiu $s1, $sp, 0x10 -/* 59E74C 8021806C 0220202D */ daddu $a0, $s1, $zero -/* 59E750 80218070 24050001 */ addiu $a1, $zero, 1 -/* 59E754 80218074 AFBF0198 */ sw $ra, 0x198($sp) -/* 59E758 80218078 AFB20190 */ sw $s2, 0x190($sp) -/* 59E75C 8021807C AFB00188 */ sw $s0, 0x188($sp) -/* 59E760 80218080 8E630090 */ lw $v1, 0x90($s3) -/* 59E764 80218084 0000902D */ daddu $s2, $zero, $zero -/* 59E768 80218088 AFB3017C */ sw $s3, 0x17c($sp) -/* 59E76C 8021808C 00A31004 */ sllv $v0, $v1, $a1 -/* 59E770 80218090 00431021 */ addu $v0, $v0, $v1 -/* 59E774 80218094 AFA20178 */ sw $v0, 0x178($sp) -/* 59E778 80218098 8E630090 */ lw $v1, 0x90($s3) -/* 59E77C 8021809C 27A20178 */ addiu $v0, $sp, 0x178 -/* 59E780 802180A0 AFA00184 */ sw $zero, 0x184($sp) -/* 59E784 802180A4 AFA2001C */ sw $v0, 0x1c($sp) -/* 59E788 802180A8 0C0B550C */ jal LoadPath -/* 59E78C 802180AC AFA30180 */ sw $v1, 0x180($sp) -/* 59E790 802180B0 0260802D */ daddu $s0, $s3, $zero -.L802180B4: -/* 59E794 802180B4 0220202D */ daddu $a0, $s1, $zero -/* 59E798 802180B8 0C0B5549 */ jal GetNextPathPos -/* 59E79C 802180BC 24050001 */ addiu $a1, $zero, 1 -/* 59E7A0 802180C0 0220202D */ daddu $a0, $s1, $zero -/* 59E7A4 802180C4 3C05FE36 */ lui $a1, 0xfe36 -/* 59E7A8 802180C8 0C0B210B */ jal evt_get_float_variable -/* 59E7AC 802180CC 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 59E7B0 802180D0 0220202D */ daddu $a0, $s1, $zero -/* 59E7B4 802180D4 3C05FE36 */ lui $a1, 0xfe36 -/* 59E7B8 802180D8 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 59E7BC 802180DC 0C0B210B */ jal evt_get_float_variable -/* 59E7C0 802180E0 E6000098 */ swc1 $f0, 0x98($s0) -/* 59E7C4 802180E4 0220202D */ daddu $a0, $s1, $zero -/* 59E7C8 802180E8 3C05FE36 */ lui $a1, 0xfe36 -/* 59E7CC 802180EC 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 59E7D0 802180F0 0C0B210B */ jal evt_get_float_variable -/* 59E7D4 802180F4 E600009C */ swc1 $f0, 0x9c($s0) -/* 59E7D8 802180F8 E60000A0 */ swc1 $f0, 0xa0($s0) -/* 59E7DC 802180FC 2610000C */ addiu $s0, $s0, 0xc -/* 59E7E0 80218100 8E220084 */ lw $v0, 0x84($s1) -/* 59E7E4 80218104 1440FFEB */ bnez $v0, .L802180B4 -/* 59E7E8 80218108 26520001 */ addiu $s2, $s2, 1 -/* 59E7EC 8021810C AE7201DC */ sw $s2, 0x1dc($s3) -/* 59E7F0 80218110 8FBF0198 */ lw $ra, 0x198($sp) -/* 59E7F4 80218114 8FB30194 */ lw $s3, 0x194($sp) -/* 59E7F8 80218118 8FB20190 */ lw $s2, 0x190($sp) -/* 59E7FC 8021811C 8FB1018C */ lw $s1, 0x18c($sp) -/* 59E800 80218120 8FB00188 */ lw $s0, 0x188($sp) -/* 59E804 80218124 03E00008 */ jr $ra -/* 59E808 80218128 27BD01A0 */ addiu $sp, $sp, 0x1a0 diff --git a/ver/us/asm/nonmatchings/battle/area_kzn2/59E6E0/func_8021812C_59E80C.s b/ver/us/asm/nonmatchings/battle/area_kzn2/59E6E0/func_8021812C_59E80C.s deleted file mode 100644 index ea36175c55..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_kzn2/59E6E0/func_8021812C_59E80C.s +++ /dev/null @@ -1,66 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8021812C_59E80C -/* 59E80C 8021812C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 59E810 80218130 AFB10014 */ sw $s1, 0x14($sp) -/* 59E814 80218134 0080882D */ daddu $s1, $a0, $zero -/* 59E818 80218138 AFBF0024 */ sw $ra, 0x24($sp) -/* 59E81C 8021813C AFB40020 */ sw $s4, 0x20($sp) -/* 59E820 80218140 AFB3001C */ sw $s3, 0x1c($sp) -/* 59E824 80218144 AFB20018 */ sw $s2, 0x18($sp) -/* 59E828 80218148 AFB00010 */ sw $s0, 0x10($sp) -/* 59E82C 8021814C 8E30000C */ lw $s0, 0xc($s1) -/* 59E830 80218150 8E050000 */ lw $a1, ($s0) -/* 59E834 80218154 0C0B1EAF */ jal evt_get_variable -/* 59E838 80218158 26100004 */ addiu $s0, $s0, 4 -/* 59E83C 8021815C 8E050000 */ lw $a1, ($s0) -/* 59E840 80218160 26100004 */ addiu $s0, $s0, 4 -/* 59E844 80218164 0220202D */ daddu $a0, $s1, $zero -/* 59E848 80218168 0C0B1EAF */ jal evt_get_variable -/* 59E84C 8021816C 0040982D */ daddu $s3, $v0, $zero -/* 59E850 80218170 8E050000 */ lw $a1, ($s0) -/* 59E854 80218174 26100004 */ addiu $s0, $s0, 4 -/* 59E858 80218178 0220202D */ daddu $a0, $s1, $zero -/* 59E85C 8021817C 0C0B1EAF */ jal evt_get_variable -/* 59E860 80218180 0040902D */ daddu $s2, $v0, $zero -/* 59E864 80218184 8E050000 */ lw $a1, ($s0) -/* 59E868 80218188 26100004 */ addiu $s0, $s0, 4 -/* 59E86C 8021818C 0220202D */ daddu $a0, $s1, $zero -/* 59E870 80218190 0C0B1EAF */ jal evt_get_variable -/* 59E874 80218194 0040A02D */ daddu $s4, $v0, $zero -/* 59E878 80218198 0220202D */ daddu $a0, $s1, $zero -/* 59E87C 8021819C 8E050000 */ lw $a1, ($s0) -/* 59E880 802181A0 0C0B1EAF */ jal evt_get_variable -/* 59E884 802181A4 0040802D */ daddu $s0, $v0, $zero -/* 59E888 802181A8 44821000 */ mtc1 $v0, $f2 -/* 59E88C 802181AC 00000000 */ nop -/* 59E890 802181B0 468010A0 */ cvt.s.w $f2, $f2 -/* 59E894 802181B4 24020002 */ addiu $v0, $zero, 2 -/* 59E898 802181B8 3C038023 */ lui $v1, %hi(D_8022ADD0) -/* 59E89C 802181BC 2463ADD0 */ addiu $v1, $v1, %lo(D_8022ADD0) -/* 59E8A0 802181C0 00132100 */ sll $a0, $s3, 4 -/* 59E8A4 802181C4 00932023 */ subu $a0, $a0, $s3 -/* 59E8A8 802181C8 00042140 */ sll $a0, $a0, 5 -/* 59E8AC 802181CC 00832021 */ addu $a0, $a0, $v1 -/* 59E8B0 802181D0 00121840 */ sll $v1, $s2, 1 -/* 59E8B4 802181D4 00721821 */ addu $v1, $v1, $s2 -/* 59E8B8 802181D8 00431804 */ sllv $v1, $v1, $v0 -/* 59E8BC 802181DC 00832021 */ addu $a0, $a0, $v1 -/* 59E8C0 802181E0 44940000 */ mtc1 $s4, $f0 -/* 59E8C4 802181E4 00000000 */ nop -/* 59E8C8 802181E8 46800020 */ cvt.s.w $f0, $f0 -/* 59E8CC 802181EC E4800000 */ swc1 $f0, ($a0) -/* 59E8D0 802181F0 44900000 */ mtc1 $s0, $f0 -/* 59E8D4 802181F4 00000000 */ nop -/* 59E8D8 802181F8 46800020 */ cvt.s.w $f0, $f0 -/* 59E8DC 802181FC E4800004 */ swc1 $f0, 4($a0) -/* 59E8E0 80218200 E4820008 */ swc1 $f2, 8($a0) -/* 59E8E4 80218204 8FBF0024 */ lw $ra, 0x24($sp) -/* 59E8E8 80218208 8FB40020 */ lw $s4, 0x20($sp) -/* 59E8EC 8021820C 8FB3001C */ lw $s3, 0x1c($sp) -/* 59E8F0 80218210 8FB20018 */ lw $s2, 0x18($sp) -/* 59E8F4 80218214 8FB10014 */ lw $s1, 0x14($sp) -/* 59E8F8 80218218 8FB00010 */ lw $s0, 0x10($sp) -/* 59E8FC 8021821C 03E00008 */ jr $ra -/* 59E900 80218220 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218224_59E904.s b/ver/us/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218224_59E904.s deleted file mode 100644 index 103abad6de..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218224_59E904.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218224_59E904 -/* 59E904 80218224 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 59E908 80218228 AFB10014 */ sw $s1, 0x14($sp) -/* 59E90C 8021822C 0080882D */ daddu $s1, $a0, $zero -/* 59E910 80218230 AFBF0020 */ sw $ra, 0x20($sp) -/* 59E914 80218234 AFB3001C */ sw $s3, 0x1c($sp) -/* 59E918 80218238 AFB20018 */ sw $s2, 0x18($sp) -/* 59E91C 8021823C AFB00010 */ sw $s0, 0x10($sp) -/* 59E920 80218240 8E30000C */ lw $s0, 0xc($s1) -/* 59E924 80218244 8E050000 */ lw $a1, ($s0) -/* 59E928 80218248 0C0B1EAF */ jal evt_get_variable -/* 59E92C 8021824C 26100004 */ addiu $s0, $s0, 4 -/* 59E930 80218250 8E050000 */ lw $a1, ($s0) -/* 59E934 80218254 26100004 */ addiu $s0, $s0, 4 -/* 59E938 80218258 0220202D */ daddu $a0, $s1, $zero -/* 59E93C 8021825C 0C0B1EAF */ jal evt_get_variable -/* 59E940 80218260 0040982D */ daddu $s3, $v0, $zero -/* 59E944 80218264 8E050000 */ lw $a1, ($s0) -/* 59E948 80218268 26100004 */ addiu $s0, $s0, 4 -/* 59E94C 8021826C 0220202D */ daddu $a0, $s1, $zero -/* 59E950 80218270 0C0B1EAF */ jal evt_get_variable -/* 59E954 80218274 0040902D */ daddu $s2, $v0, $zero -/* 59E958 80218278 8E050000 */ lw $a1, ($s0) -/* 59E95C 8021827C 26100004 */ addiu $s0, $s0, 4 -/* 59E960 80218280 0C0B1EAF */ jal evt_get_variable -/* 59E964 80218284 0220202D */ daddu $a0, $s1, $zero -/* 59E968 80218288 8E050000 */ lw $a1, ($s0) -/* 59E96C 8021828C 0C0B1EAF */ jal evt_get_variable -/* 59E970 80218290 0220202D */ daddu $a0, $s1, $zero -/* 59E974 80218294 44820000 */ mtc1 $v0, $f0 -/* 59E978 80218298 00000000 */ nop -/* 59E97C 8021829C 46800020 */ cvt.s.w $f0, $f0 -/* 59E980 802182A0 24020002 */ addiu $v0, $zero, 2 -/* 59E984 802182A4 3C048023 */ lui $a0, %hi(D_8022ADD0) -/* 59E988 802182A8 2484ADD0 */ addiu $a0, $a0, %lo(D_8022ADD0) -/* 59E98C 802182AC 00131900 */ sll $v1, $s3, 4 -/* 59E990 802182B0 00731823 */ subu $v1, $v1, $s3 -/* 59E994 802182B4 00031940 */ sll $v1, $v1, 5 -/* 59E998 802182B8 00641821 */ addu $v1, $v1, $a0 -/* 59E99C 802182BC 00529004 */ sllv $s2, $s2, $v0 -/* 59E9A0 802182C0 00721821 */ addu $v1, $v1, $s2 -/* 59E9A4 802182C4 E460006C */ swc1 $f0, 0x6c($v1) -/* 59E9A8 802182C8 8FBF0020 */ lw $ra, 0x20($sp) -/* 59E9AC 802182CC 8FB3001C */ lw $s3, 0x1c($sp) -/* 59E9B0 802182D0 8FB20018 */ lw $s2, 0x18($sp) -/* 59E9B4 802182D4 8FB10014 */ lw $s1, 0x14($sp) -/* 59E9B8 802182D8 8FB00010 */ lw $s0, 0x10($sp) -/* 59E9BC 802182DC 03E00008 */ jr $ra -/* 59E9C0 802182E0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/battle/area_kzn2/59E6E0/func_802182E4_59E9C4.s b/ver/us/asm/nonmatchings/battle/area_kzn2/59E6E0/func_802182E4_59E9C4.s deleted file mode 100644 index 9c6e48fa49..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_kzn2/59E6E0/func_802182E4_59E9C4.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802182E4_59E9C4 -/* 59E9C4 802182E4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 59E9C8 802182E8 AFB10014 */ sw $s1, 0x14($sp) -/* 59E9CC 802182EC 0080882D */ daddu $s1, $a0, $zero -/* 59E9D0 802182F0 AFBF0018 */ sw $ra, 0x18($sp) -/* 59E9D4 802182F4 AFB00010 */ sw $s0, 0x10($sp) -/* 59E9D8 802182F8 8E30000C */ lw $s0, 0xc($s1) -/* 59E9DC 802182FC 8E050000 */ lw $a1, ($s0) -/* 59E9E0 80218300 0C0B1EAF */ jal evt_get_variable -/* 59E9E4 80218304 26100004 */ addiu $s0, $s0, 4 -/* 59E9E8 80218308 8E050000 */ lw $a1, ($s0) -/* 59E9EC 8021830C 26100004 */ addiu $s0, $s0, 4 -/* 59E9F0 80218310 0C0B1EAF */ jal evt_get_variable -/* 59E9F4 80218314 0220202D */ daddu $a0, $s1, $zero -/* 59E9F8 80218318 8E050000 */ lw $a1, ($s0) -/* 59E9FC 8021831C 26100004 */ addiu $s0, $s0, 4 -/* 59EA00 80218320 0C0B1EAF */ jal evt_get_variable -/* 59EA04 80218324 0220202D */ daddu $a0, $s1, $zero -/* 59EA08 80218328 8E050000 */ lw $a1, ($s0) -/* 59EA0C 8021832C 26100004 */ addiu $s0, $s0, 4 -/* 59EA10 80218330 0C0B1EAF */ jal evt_get_variable -/* 59EA14 80218334 0220202D */ daddu $a0, $s1, $zero -/* 59EA18 80218338 8E050000 */ lw $a1, ($s0) -/* 59EA1C 8021833C 0C0B1EAF */ jal evt_get_variable -/* 59EA20 80218340 0220202D */ daddu $a0, $s1, $zero -/* 59EA24 80218344 8FBF0018 */ lw $ra, 0x18($sp) -/* 59EA28 80218348 8FB10014 */ lw $s1, 0x14($sp) -/* 59EA2C 8021834C 8FB00010 */ lw $s0, 0x10($sp) -/* 59EA30 80218350 24020002 */ addiu $v0, $zero, 2 -/* 59EA34 80218354 03E00008 */ jr $ra -/* 59EA38 80218358 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/battle/area_kzn2/59E6E0/func_8021835C_59EA3C.s b/ver/us/asm/nonmatchings/battle/area_kzn2/59E6E0/func_8021835C_59EA3C.s index 9080ea7261..6bc504e7de 100644 --- a/ver/us/asm/nonmatchings/battle/area_kzn2/59E6E0/func_8021835C_59EA3C.s +++ b/ver/us/asm/nonmatchings/battle/area_kzn2/59E6E0/func_8021835C_59EA3C.s @@ -25,8 +25,8 @@ glabel func_8021835C_59EA3C /* 59EA8C 802183AC F7B40058 */ sdc1 $f20, 0x58($sp) /* 59EA90 802183B0 14600059 */ bnez $v1, .L80218518 /* 59EA94 802183B4 0000382D */ daddu $a3, $zero, $zero -/* 59EA98 802183B8 3C108023 */ lui $s0, %hi(D_8022ADD0) -/* 59EA9C 802183BC 2610ADD0 */ addiu $s0, $s0, %lo(D_8022ADD0) +/* 59EA98 802183B8 3C108023 */ lui $s0, %hi(b_area_kzn2_VineData) +/* 59EA9C 802183BC 2610ADD0 */ addiu $s0, $s0, %lo(b_area_kzn2_VineData) /* 59EAA0 802183C0 3C0142B4 */ lui $at, 0x42b4 /* 59EAA4 802183C4 4481E000 */ mtc1 $at, $f28 /* 59EAA8 802183C8 3C014334 */ lui $at, 0x4334 @@ -115,7 +115,7 @@ glabel func_8021835C_59EA3C /* 59EBC4 802184E4 24840004 */ addiu $a0, $a0, 4 .L802184E8: /* 59EBC8 802184E8 0200202D */ daddu $a0, $s0, $zero -/* 59EBCC 802184EC 0C086016 */ jal func_80218058_59E738 +/* 59EBCC 802184EC 0C086016 */ jal b_area_kzn2_make_vine_interpolation /* 59EBD0 802184F0 AFA70028 */ sw $a3, 0x28($sp) /* 59EBD4 802184F4 8FA70028 */ lw $a3, 0x28($sp) /* 59EBD8 802184F8 24E70001 */ addiu $a3, $a3, 1 @@ -135,8 +135,8 @@ glabel func_8021835C_59EA3C /* 59EC0C 8021852C AFA90018 */ sw $t1, 0x18($sp) /* 59EC10 80218530 3C090602 */ lui $t1, 0x602 /* 59EC14 80218534 35290004 */ ori $t1, $t1, 4 -/* 59EC18 80218538 3C158023 */ lui $s5, %hi(D_8022ADD0) -/* 59EC1C 8021853C 26B5ADD0 */ addiu $s5, $s5, %lo(D_8022ADD0) +/* 59EC18 80218538 3C158023 */ lui $s5, %hi(b_area_kzn2_VineData) +/* 59EC1C 8021853C 26B5ADD0 */ addiu $s5, $s5, %lo(b_area_kzn2_VineData) /* 59EC20 80218540 AFA9001C */ sw $t1, 0x1c($sp) /* 59EC24 80218544 8D030000 */ lw $v1, ($t0) /* 59EC28 80218548 3C02E700 */ lui $v0, 0xe700 diff --git a/ver/us/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218930_59F010.s b/ver/us/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218930_59F010.s deleted file mode 100644 index 519478a246..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218930_59F010.s +++ /dev/null @@ -1,94 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218930_59F010 -/* 59F010 80218930 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 59F014 80218934 AFB10014 */ sw $s1, 0x14($sp) -/* 59F018 80218938 0080882D */ daddu $s1, $a0, $zero -/* 59F01C 8021893C AFBF0028 */ sw $ra, 0x28($sp) -/* 59F020 80218940 AFB50024 */ sw $s5, 0x24($sp) -/* 59F024 80218944 AFB40020 */ sw $s4, 0x20($sp) -/* 59F028 80218948 AFB3001C */ sw $s3, 0x1c($sp) -/* 59F02C 8021894C AFB20018 */ sw $s2, 0x18($sp) -/* 59F030 80218950 AFB00010 */ sw $s0, 0x10($sp) -/* 59F034 80218954 F7B60038 */ sdc1 $f22, 0x38($sp) -/* 59F038 80218958 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 59F03C 8021895C 8E30000C */ lw $s0, 0xc($s1) -/* 59F040 80218960 8E050000 */ lw $a1, ($s0) -/* 59F044 80218964 0C0B1EAF */ jal evt_get_variable -/* 59F048 80218968 26100004 */ addiu $s0, $s0, 4 -/* 59F04C 8021896C 8E050000 */ lw $a1, ($s0) -/* 59F050 80218970 26100004 */ addiu $s0, $s0, 4 -/* 59F054 80218974 8C54000C */ lw $s4, 0xc($v0) -/* 59F058 80218978 0C0B1EAF */ jal evt_get_variable -/* 59F05C 8021897C 0220202D */ daddu $a0, $s1, $zero -/* 59F060 80218980 8E050000 */ lw $a1, ($s0) -/* 59F064 80218984 26100004 */ addiu $s0, $s0, 4 -/* 59F068 80218988 0220202D */ daddu $a0, $s1, $zero -/* 59F06C 8021898C 0C0B1EAF */ jal evt_get_variable -/* 59F070 80218990 0040A82D */ daddu $s5, $v0, $zero -/* 59F074 80218994 8E050000 */ lw $a1, ($s0) -/* 59F078 80218998 26100004 */ addiu $s0, $s0, 4 -/* 59F07C 8021899C 0220202D */ daddu $a0, $s1, $zero -/* 59F080 802189A0 0C0B1EAF */ jal evt_get_variable -/* 59F084 802189A4 0040902D */ daddu $s2, $v0, $zero -/* 59F088 802189A8 8E050000 */ lw $a1, ($s0) -/* 59F08C 802189AC 26100004 */ addiu $s0, $s0, 4 -/* 59F090 802189B0 4482B000 */ mtc1 $v0, $f22 -/* 59F094 802189B4 00000000 */ nop -/* 59F098 802189B8 4680B5A0 */ cvt.s.w $f22, $f22 -/* 59F09C 802189BC 0C0B1EAF */ jal evt_get_variable -/* 59F0A0 802189C0 0220202D */ daddu $a0, $s1, $zero -/* 59F0A4 802189C4 8E050000 */ lw $a1, ($s0) -/* 59F0A8 802189C8 26100004 */ addiu $s0, $s0, 4 -/* 59F0AC 802189CC 0220202D */ daddu $a0, $s1, $zero -/* 59F0B0 802189D0 0C0B1EAF */ jal evt_get_variable -/* 59F0B4 802189D4 0040982D */ daddu $s3, $v0, $zero -/* 59F0B8 802189D8 0220202D */ daddu $a0, $s1, $zero -/* 59F0BC 802189DC 8E050000 */ lw $a1, ($s0) -/* 59F0C0 802189E0 0C0B1EAF */ jal evt_get_variable -/* 59F0C4 802189E4 0040882D */ daddu $s1, $v0, $zero -/* 59F0C8 802189E8 4600B306 */ mov.s $f12, $f22 -/* 59F0CC 802189EC 0C00A8D4 */ jal cos_deg -/* 59F0D0 802189F0 0040802D */ daddu $s0, $v0, $zero -/* 59F0D4 802189F4 4493A000 */ mtc1 $s3, $f20 -/* 59F0D8 802189F8 00000000 */ nop -/* 59F0DC 802189FC 4680A520 */ cvt.s.w $f20, $f20 -/* 59F0E0 80218A00 46140002 */ mul.s $f0, $f0, $f20 -/* 59F0E4 80218A04 00000000 */ nop -/* 59F0E8 80218A08 44951000 */ mtc1 $s5, $f2 -/* 59F0EC 80218A0C 00000000 */ nop -/* 59F0F0 80218A10 468010A0 */ cvt.s.w $f2, $f2 -/* 59F0F4 80218A14 46001081 */ sub.s $f2, $f2, $f0 -/* 59F0F8 80218A18 4600B306 */ mov.s $f12, $f22 -/* 59F0FC 80218A1C 0C00A8BB */ jal sin_deg -/* 59F100 80218A20 E6820004 */ swc1 $f2, 4($s4) -/* 59F104 80218A24 46140002 */ mul.s $f0, $f0, $f20 -/* 59F108 80218A28 00000000 */ nop -/* 59F10C 80218A2C 3C013C23 */ lui $at, 0x3c23 -/* 59F110 80218A30 3421D70A */ ori $at, $at, 0xd70a -/* 59F114 80218A34 44811000 */ mtc1 $at, $f2 -/* 59F118 80218A38 44902000 */ mtc1 $s0, $f4 -/* 59F11C 80218A3C 00000000 */ nop -/* 59F120 80218A40 46802120 */ cvt.s.w $f4, $f4 -/* 59F124 80218A44 46022102 */ mul.s $f4, $f4, $f2 -/* 59F128 80218A48 00000000 */ nop -/* 59F12C 80218A4C 02519021 */ addu $s2, $s2, $s1 -/* 59F130 80218A50 44921000 */ mtc1 $s2, $f2 -/* 59F134 80218A54 00000000 */ nop -/* 59F138 80218A58 468010A0 */ cvt.s.w $f2, $f2 -/* 59F13C 80218A5C 46001081 */ sub.s $f2, $f2, $f0 -/* 59F140 80218A60 E6840010 */ swc1 $f4, 0x10($s4) -/* 59F144 80218A64 E6820008 */ swc1 $f2, 8($s4) -/* 59F148 80218A68 8FBF0028 */ lw $ra, 0x28($sp) -/* 59F14C 80218A6C 8FB50024 */ lw $s5, 0x24($sp) -/* 59F150 80218A70 8FB40020 */ lw $s4, 0x20($sp) -/* 59F154 80218A74 8FB3001C */ lw $s3, 0x1c($sp) -/* 59F158 80218A78 8FB20018 */ lw $s2, 0x18($sp) -/* 59F15C 80218A7C 8FB10014 */ lw $s1, 0x14($sp) -/* 59F160 80218A80 8FB00010 */ lw $s0, 0x10($sp) -/* 59F164 80218A84 D7B60038 */ ldc1 $f22, 0x38($sp) -/* 59F168 80218A88 D7B40030 */ ldc1 $f20, 0x30($sp) -/* 59F16C 80218A8C 24020002 */ addiu $v0, $zero, 2 -/* 59F170 80218A90 03E00008 */ jr $ra -/* 59F174 80218A94 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218A98_59F178.s b/ver/us/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218A98_59F178.s deleted file mode 100644 index 96bb284b47..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218A98_59F178.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218A98_59F178 -/* 59F178 80218A98 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 59F17C 80218A9C 3C038022 */ lui $v1, %hi(D_80222B68_5A9248) -/* 59F180 80218AA0 24632B68 */ addiu $v1, $v1, %lo(D_80222B68_5A9248) -/* 59F184 80218AA4 AFBF0018 */ sw $ra, 0x18($sp) -/* 59F188 80218AA8 8C620000 */ lw $v0, ($v1) -/* 59F18C 80218AAC 24440001 */ addiu $a0, $v0, 1 -/* 59F190 80218AB0 10A0000C */ beqz $a1, .L80218AE4 -/* 59F194 80218AB4 AC640000 */ sw $a0, ($v1) -/* 59F198 80218AB8 0C05272D */ jal sfx_play_sound -/* 59F19C 80218ABC 240400D4 */ addiu $a0, $zero, 0xd4 -/* 59F1A0 80218AC0 24020008 */ addiu $v0, $zero, 8 -/* 59F1A4 80218AC4 AFA20010 */ sw $v0, 0x10($sp) -/* 59F1A8 80218AC8 0000202D */ daddu $a0, $zero, $zero -/* 59F1AC 80218ACC 2405008B */ addiu $a1, $zero, 0x8b -/* 59F1B0 80218AD0 0080302D */ daddu $a2, $a0, $zero -/* 59F1B4 80218AD4 0C052A46 */ jal bgm_set_song -/* 59F1B8 80218AD8 240701F4 */ addiu $a3, $zero, 0x1f4 -/* 59F1BC 80218ADC 080862CB */ j .L80218B2C -/* 59F1C0 80218AE0 0000102D */ daddu $v0, $zero, $zero -.L80218AE4: -/* 59F1C4 80218AE4 24020050 */ addiu $v0, $zero, 0x50 -/* 59F1C8 80218AE8 10820005 */ beq $a0, $v0, .L80218B00 -/* 59F1CC 80218AEC 24020154 */ addiu $v0, $zero, 0x154 -/* 59F1D0 80218AF0 10820007 */ beq $a0, $v0, .L80218B10 -/* 59F1D4 80218AF4 24020008 */ addiu $v0, $zero, 8 -/* 59F1D8 80218AF8 080862CB */ j .L80218B2C -/* 59F1DC 80218AFC 0000102D */ daddu $v0, $zero, $zero -.L80218B00: -/* 59F1E0 80218B00 0C052B02 */ jal bgm_init_music_players -/* 59F1E4 80218B04 00000000 */ nop -/* 59F1E8 80218B08 080862CB */ j .L80218B2C -/* 59F1EC 80218B0C 0000102D */ daddu $v0, $zero, $zero -.L80218B10: -/* 59F1F0 80218B10 AFA20010 */ sw $v0, 0x10($sp) -/* 59F1F4 80218B14 0000202D */ daddu $a0, $zero, $zero -/* 59F1F8 80218B18 2405000D */ addiu $a1, $zero, 0xd -/* 59F1FC 80218B1C 24060001 */ addiu $a2, $zero, 1 -/* 59F200 80218B20 0C052A46 */ jal bgm_set_song -/* 59F204 80218B24 240701F4 */ addiu $a3, $zero, 0x1f4 -/* 59F208 80218B28 24020002 */ addiu $v0, $zero, 2 -.L80218B2C: -/* 59F20C 80218B2C 8FBF0018 */ lw $ra, 0x18($sp) -/* 59F210 80218B30 03E00008 */ jr $ra -/* 59F214 80218B34 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218B38_59F218.s b/ver/us/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218B38_59F218.s deleted file mode 100644 index d252ced9e5..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218B38_59F218.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218B38_59F218 -/* 59F218 80218B38 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 59F21C 80218B3C AFB10014 */ sw $s1, 0x14($sp) -/* 59F220 80218B40 0080882D */ daddu $s1, $a0, $zero -/* 59F224 80218B44 AFBF0018 */ sw $ra, 0x18($sp) -/* 59F228 80218B48 AFB00010 */ sw $s0, 0x10($sp) -/* 59F22C 80218B4C 8E30000C */ lw $s0, 0xc($s1) -/* 59F230 80218B50 8E050000 */ lw $a1, ($s0) -/* 59F234 80218B54 0C0B1EAF */ jal evt_get_variable -/* 59F238 80218B58 26100004 */ addiu $s0, $s0, 4 -/* 59F23C 80218B5C 00021080 */ sll $v0, $v0, 2 -/* 59F240 80218B60 8E050000 */ lw $a1, ($s0) -/* 59F244 80218B64 3C068022 */ lui $a2, %hi(D_80222D48_5A9428) -/* 59F248 80218B68 00C23021 */ addu $a2, $a2, $v0 -/* 59F24C 80218B6C 8CC62D48 */ lw $a2, %lo(D_80222D48_5A9428)($a2) -/* 59F250 80218B70 0C0B2026 */ jal evt_set_variable -/* 59F254 80218B74 0220202D */ daddu $a0, $s1, $zero -/* 59F258 80218B78 8FBF0018 */ lw $ra, 0x18($sp) -/* 59F25C 80218B7C 8FB10014 */ lw $s1, 0x14($sp) -/* 59F260 80218B80 8FB00010 */ lw $s0, 0x10($sp) -/* 59F264 80218B84 24020002 */ addiu $v0, $zero, 2 -/* 59F268 80218B88 03E00008 */ jr $ra -/* 59F26C 80218B8C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218B90_59F270.s b/ver/us/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218B90_59F270.s deleted file mode 100644 index 8936aa7a23..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218B90_59F270.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218B90_59F270 -/* 59F270 80218B90 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 59F274 80218B94 AFB10014 */ sw $s1, 0x14($sp) -/* 59F278 80218B98 0080882D */ daddu $s1, $a0, $zero -/* 59F27C 80218B9C AFBF0018 */ sw $ra, 0x18($sp) -/* 59F280 80218BA0 AFB00010 */ sw $s0, 0x10($sp) -/* 59F284 80218BA4 8E30000C */ lw $s0, 0xc($s1) -/* 59F288 80218BA8 8E050000 */ lw $a1, ($s0) -/* 59F28C 80218BAC 0C0B1EAF */ jal evt_get_variable -/* 59F290 80218BB0 26100004 */ addiu $s0, $s0, 4 -/* 59F294 80218BB4 00021080 */ sll $v0, $v0, 2 -/* 59F298 80218BB8 8E050000 */ lw $a1, ($s0) -/* 59F29C 80218BBC 3C068022 */ lui $a2, %hi(D_80222E20_5A9500) -/* 59F2A0 80218BC0 00C23021 */ addu $a2, $a2, $v0 -/* 59F2A4 80218BC4 8CC62E20 */ lw $a2, %lo(D_80222E20_5A9500)($a2) -/* 59F2A8 80218BC8 0C0B2026 */ jal evt_set_variable -/* 59F2AC 80218BCC 0220202D */ daddu $a0, $s1, $zero -/* 59F2B0 80218BD0 8FBF0018 */ lw $ra, 0x18($sp) -/* 59F2B4 80218BD4 8FB10014 */ lw $s1, 0x14($sp) -/* 59F2B8 80218BD8 8FB00010 */ lw $s0, 0x10($sp) -/* 59F2BC 80218BDC 24020002 */ addiu $v0, $zero, 2 -/* 59F2C0 80218BE0 03E00008 */ jr $ra -/* 59F2C4 80218BE4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218BE8_59F2C8.s b/ver/us/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218BE8_59F2C8.s deleted file mode 100644 index 088e43bf23..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_kzn2/59E6E0/func_80218BE8_59F2C8.s +++ /dev/null @@ -1,90 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218BE8_59F2C8 -/* 59F2C8 80218BE8 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 59F2CC 80218BEC AFB20018 */ sw $s2, 0x18($sp) -/* 59F2D0 80218BF0 0080902D */ daddu $s2, $a0, $zero -/* 59F2D4 80218BF4 AFBF0028 */ sw $ra, 0x28($sp) -/* 59F2D8 80218BF8 AFB50024 */ sw $s5, 0x24($sp) -/* 59F2DC 80218BFC AFB40020 */ sw $s4, 0x20($sp) -/* 59F2E0 80218C00 AFB3001C */ sw $s3, 0x1c($sp) -/* 59F2E4 80218C04 AFB10014 */ sw $s1, 0x14($sp) -/* 59F2E8 80218C08 AFB00010 */ sw $s0, 0x10($sp) -/* 59F2EC 80218C0C F7B60038 */ sdc1 $f22, 0x38($sp) -/* 59F2F0 80218C10 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 59F2F4 80218C14 8E50000C */ lw $s0, 0xc($s2) -/* 59F2F8 80218C18 8E050000 */ lw $a1, ($s0) -/* 59F2FC 80218C1C 0C0B1EAF */ jal evt_get_variable -/* 59F300 80218C20 26100004 */ addiu $s0, $s0, 4 -/* 59F304 80218C24 0040A82D */ daddu $s5, $v0, $zero -/* 59F308 80218C28 8E050000 */ lw $a1, ($s0) -/* 59F30C 80218C2C 26100004 */ addiu $s0, $s0, 4 -/* 59F310 80218C30 0C0B1EAF */ jal evt_get_variable -/* 59F314 80218C34 0240202D */ daddu $a0, $s2, $zero -/* 59F318 80218C38 0040A02D */ daddu $s4, $v0, $zero -/* 59F31C 80218C3C 8E050000 */ lw $a1, ($s0) -/* 59F320 80218C40 26100004 */ addiu $s0, $s0, 4 -/* 59F324 80218C44 0C0B1EAF */ jal evt_get_variable -/* 59F328 80218C48 0240202D */ daddu $a0, $s2, $zero -/* 59F32C 80218C4C 8E050000 */ lw $a1, ($s0) -/* 59F330 80218C50 26100004 */ addiu $s0, $s0, 4 -/* 59F334 80218C54 4482B000 */ mtc1 $v0, $f22 -/* 59F338 80218C58 00000000 */ nop -/* 59F33C 80218C5C 4680B5A0 */ cvt.s.w $f22, $f22 -/* 59F340 80218C60 0C0B1EAF */ jal evt_get_variable -/* 59F344 80218C64 0240202D */ daddu $a0, $s2, $zero -/* 59F348 80218C68 0240202D */ daddu $a0, $s2, $zero -/* 59F34C 80218C6C 8E050000 */ lw $a1, ($s0) -/* 59F350 80218C70 0C0B1EAF */ jal evt_get_variable -/* 59F354 80218C74 0040982D */ daddu $s3, $v0, $zero -/* 59F358 80218C78 4600B306 */ mov.s $f12, $f22 -/* 59F35C 80218C7C 0C00A8D4 */ jal cos_deg -/* 59F360 80218C80 0040882D */ daddu $s1, $v0, $zero -/* 59F364 80218C84 4493A000 */ mtc1 $s3, $f20 -/* 59F368 80218C88 00000000 */ nop -/* 59F36C 80218C8C 4680A520 */ cvt.s.w $f20, $f20 -/* 59F370 80218C90 46140002 */ mul.s $f0, $f0, $f20 -/* 59F374 80218C94 00000000 */ nop -/* 59F378 80218C98 44951000 */ mtc1 $s5, $f2 -/* 59F37C 80218C9C 00000000 */ nop -/* 59F380 80218CA0 468010A0 */ cvt.s.w $f2, $f2 -/* 59F384 80218CA4 46001081 */ sub.s $f2, $f2, $f0 -/* 59F388 80218CA8 26100004 */ addiu $s0, $s0, 4 -/* 59F38C 80218CAC 4600110D */ trunc.w.s $f4, $f2 -/* 59F390 80218CB0 44152000 */ mfc1 $s5, $f4 -/* 59F394 80218CB4 0C00A8BB */ jal sin_deg -/* 59F398 80218CB8 4600B306 */ mov.s $f12, $f22 -/* 59F39C 80218CBC 46140002 */ mul.s $f0, $f0, $f20 -/* 59F3A0 80218CC0 00000000 */ nop -/* 59F3A4 80218CC4 8E050000 */ lw $a1, ($s0) -/* 59F3A8 80218CC8 26100004 */ addiu $s0, $s0, 4 -/* 59F3AC 80218CCC 02918821 */ addu $s1, $s4, $s1 -/* 59F3B0 80218CD0 44911000 */ mtc1 $s1, $f2 -/* 59F3B4 80218CD4 00000000 */ nop -/* 59F3B8 80218CD8 468010A0 */ cvt.s.w $f2, $f2 -/* 59F3BC 80218CDC 46001081 */ sub.s $f2, $f2, $f0 -/* 59F3C0 80218CE0 0240202D */ daddu $a0, $s2, $zero -/* 59F3C4 80218CE4 4600110D */ trunc.w.s $f4, $f2 -/* 59F3C8 80218CE8 44142000 */ mfc1 $s4, $f4 -/* 59F3CC 80218CEC 0C0B2026 */ jal evt_set_variable -/* 59F3D0 80218CF0 02A0302D */ daddu $a2, $s5, $zero -/* 59F3D4 80218CF4 0240202D */ daddu $a0, $s2, $zero -/* 59F3D8 80218CF8 8E050000 */ lw $a1, ($s0) -/* 59F3DC 80218CFC 0C0B2026 */ jal evt_set_variable -/* 59F3E0 80218D00 0280302D */ daddu $a2, $s4, $zero -/* 59F3E4 80218D04 8FBF0028 */ lw $ra, 0x28($sp) -/* 59F3E8 80218D08 8FB50024 */ lw $s5, 0x24($sp) -/* 59F3EC 80218D0C 8FB40020 */ lw $s4, 0x20($sp) -/* 59F3F0 80218D10 8FB3001C */ lw $s3, 0x1c($sp) -/* 59F3F4 80218D14 8FB20018 */ lw $s2, 0x18($sp) -/* 59F3F8 80218D18 8FB10014 */ lw $s1, 0x14($sp) -/* 59F3FC 80218D1C 8FB00010 */ lw $s0, 0x10($sp) -/* 59F400 80218D20 D7B60038 */ ldc1 $f22, 0x38($sp) -/* 59F404 80218D24 D7B40030 */ ldc1 $f20, 0x30($sp) -/* 59F408 80218D28 24020002 */ addiu $v0, $zero, 2 -/* 59F40C 80218D2C 03E00008 */ jr $ra -/* 59F410 80218D30 27BD0040 */ addiu $sp, $sp, 0x40 -/* 59F414 80218D34 00000000 */ nop -/* 59F418 80218D38 00000000 */ nop -/* 59F41C 80218D3C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_00/B216E0/jan_00_unkVtxFunc001.s b/ver/us/asm/nonmatchings/world/area_jan/jan_00/B216E0/jan_00_unkVtxFunc001.s deleted file mode 100644 index cf6f4be674..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_00/B216E0/jan_00_unkVtxFunc001.s +++ /dev/null @@ -1,176 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80247AB8_B27FF8 -.word .L802413D4_B21914, .L802413C0_B21900, .L802413D4_B21914, .L802413D4_B21914, .L802413D4_B21914, .L802413D4_B21914, .L802413D4_B21914, .L802413D4_B21914, .L802413D4_B21914, .L802413C0_B21900, .L802413D4_B21914, .L802413D4_B21914, .L802413D4_B21914, 0 - -.section .text - -glabel jan_00_unkVtxFunc001 -/* B21878 80241338 27BDFF98 */ addiu $sp, $sp, -0x68 -/* B2187C 8024133C AFB20018 */ sw $s2, 0x18($sp) -/* B21880 80241340 0080902D */ daddu $s2, $a0, $zero -/* B21884 80241344 AFB10014 */ sw $s1, 0x14($sp) -/* B21888 80241348 00A0882D */ daddu $s1, $a1, $zero -/* B2188C 8024134C AFB7002C */ sw $s7, 0x2c($sp) -/* B21890 80241350 00C0B82D */ daddu $s7, $a2, $zero -/* B21894 80241354 AFB00010 */ sw $s0, 0x10($sp) -/* B21898 80241358 00E0802D */ daddu $s0, $a3, $zero -/* B2189C 8024135C AFBF0030 */ sw $ra, 0x30($sp) -/* B218A0 80241360 AFB60028 */ sw $s6, 0x28($sp) -/* B218A4 80241364 AFB50024 */ sw $s5, 0x24($sp) -/* B218A8 80241368 AFB40020 */ sw $s4, 0x20($sp) -/* B218AC 8024136C AFB3001C */ sw $s3, 0x1c($sp) -/* B218B0 80241370 F7BE0060 */ sdc1 $f30, 0x60($sp) -/* B218B4 80241374 F7BC0058 */ sdc1 $f28, 0x58($sp) -/* B218B8 80241378 F7BA0050 */ sdc1 $f26, 0x50($sp) -/* B218BC 8024137C F7B80048 */ sdc1 $f24, 0x48($sp) -/* B218C0 80241380 F7B60040 */ sdc1 $f22, 0x40($sp) -/* B218C4 80241384 F7B40038 */ sdc1 $f20, 0x38($sp) -/* B218C8 80241388 8E160000 */ lw $s6, ($s0) -/* B218CC 8024138C 0C00EAD2 */ jal get_npc_safe -/* B218D0 80241390 0000202D */ daddu $a0, $zero, $zero -/* B218D4 80241394 8C420028 */ lw $v0, 0x28($v0) -/* B218D8 80241398 3C03FF4A */ lui $v1, 0xff4a -/* B218DC 8024139C 00431821 */ addu $v1, $v0, $v1 -/* B218E0 802413A0 2C62000D */ sltiu $v0, $v1, 0xd -/* B218E4 802413A4 1040000B */ beqz $v0, .L802413D4_B21914 -/* B218E8 802413A8 00031080 */ sll $v0, $v1, 2 -/* B218EC 802413AC 3C018024 */ lui $at, %hi(jtbl_80247AB8_B27FF8) -/* B218F0 802413B0 00220821 */ addu $at, $at, $v0 -/* B218F4 802413B4 8C227AB8 */ lw $v0, %lo(jtbl_80247AB8_B27FF8)($at) -/* B218F8 802413B8 00400008 */ jr $v0 -/* B218FC 802413BC 00000000 */ nop -.L802413C0_B21900: -/* B21900 802413C0 8E020000 */ lw $v0, ($s0) -/* B21904 802413C4 04410003 */ bgez $v0, .L802413D4_B21914 -/* B21908 802413C8 00000000 */ nop -/* B2190C 802413CC 0000B02D */ daddu $s6, $zero, $zero -/* B21910 802413D0 AE000000 */ sw $zero, ($s0) -.L802413D4_B21914: -/* B21914 802413D4 1AE00065 */ blez $s7, .L8024156C -/* B21918 802413D8 0000A02D */ daddu $s4, $zero, $zero -/* B2191C 802413DC 0220982D */ daddu $s3, $s1, $zero -/* B21920 802413E0 3C014220 */ lui $at, 0x4220 -/* B21924 802413E4 4481F000 */ mtc1 $at, $f30 -/* B21928 802413E8 3C014120 */ lui $at, 0x4120 -/* B2192C 802413EC 4481E000 */ mtc1 $at, $f28 -.L802413F0: -/* B21930 802413F0 86440000 */ lh $a0, ($s2) -/* B21934 802413F4 2882001F */ slti $v0, $a0, 0x1f -/* B21938 802413F8 54400058 */ bnel $v0, $zero, .L8024155C -/* B2193C 802413FC 26730010 */ addiu $s3, $s3, 0x10 -/* B21940 80241400 3C026666 */ lui $v0, 0x6666 -/* B21944 80241404 34426667 */ ori $v0, $v0, 0x6667 -/* B21948 80241408 2483FFE2 */ addiu $v1, $a0, -0x1e -/* B2194C 8024140C 00620018 */ mult $v1, $v0 -/* B21950 80241410 4480C000 */ mtc1 $zero, $f24 -/* B21954 80241414 0000802D */ daddu $s0, $zero, $zero -/* B21958 80241418 00031FC3 */ sra $v1, $v1, 0x1f -/* B2195C 8024141C 4600C686 */ mov.s $f26, $f24 -/* B21960 80241420 00004010 */ mfhi $t0 -/* B21964 80241424 00081083 */ sra $v0, $t0, 2 -/* B21968 80241428 00438823 */ subu $s1, $v0, $v1 -/* B2196C 8024142C 00111080 */ sll $v0, $s1, 2 -/* B21970 80241430 00511021 */ addu $v0, $v0, $s1 -/* B21974 80241434 00021040 */ sll $v0, $v0, 1 -/* B21978 80241438 2442001E */ addiu $v0, $v0, 0x1e -/* B2197C 8024143C 1A20001D */ blez $s1, .L802414B4 -/* B21980 80241440 0082A823 */ subu $s5, $a0, $v0 -.L80241444: -/* B21984 80241444 44966000 */ mtc1 $s6, $f12 -/* B21988 80241448 00000000 */ nop -/* B2198C 8024144C 0C00A8BB */ jal sin_deg -/* B21990 80241450 46806320 */ cvt.s.w $f12, $f12 -/* B21994 80241454 44902000 */ mtc1 $s0, $f4 -/* B21998 80241458 00000000 */ nop -/* B2199C 8024145C 46802120 */ cvt.s.w $f4, $f4 -/* B219A0 80241460 461E2083 */ div.s $f2, $f4, $f30 -/* B219A4 80241464 46001082 */ mul.s $f2, $f2, $f0 -/* B219A8 80241468 00000000 */ nop -/* B219AC 8024146C 3C014170 */ lui $at, 0x4170 -/* B219B0 80241470 44813000 */ mtc1 $at, $f6 -/* B219B4 80241474 00000000 */ nop -/* B219B8 80241478 46062103 */ div.s $f4, $f4, $f6 -/* B219BC 8024147C 46022580 */ add.s $f22, $f4, $f2 -/* B219C0 80241480 0C00A874 */ jal cos_rad -/* B219C4 80241484 4600B306 */ mov.s $f12, $f22 -/* B219C8 80241488 461C0002 */ mul.s $f0, $f0, $f28 -/* B219CC 8024148C 00000000 */ nop -/* B219D0 80241490 4600D680 */ add.s $f26, $f26, $f0 -/* B219D4 80241494 0C00A85B */ jal sin_rad -/* B219D8 80241498 4600B306 */ mov.s $f12, $f22 -/* B219DC 8024149C 461C0002 */ mul.s $f0, $f0, $f28 -/* B219E0 802414A0 00000000 */ nop -/* B219E4 802414A4 26100001 */ addiu $s0, $s0, 1 -/* B219E8 802414A8 0211102A */ slt $v0, $s0, $s1 -/* B219EC 802414AC 1440FFE5 */ bnez $v0, .L80241444 -/* B219F0 802414B0 4600C600 */ add.s $f24, $f24, $f0 -.L802414B4: -/* B219F4 802414B4 44966000 */ mtc1 $s6, $f12 -/* B219F8 802414B8 00000000 */ nop -/* B219FC 802414BC 0C00A8BB */ jal sin_deg -/* B21A00 802414C0 46806320 */ cvt.s.w $f12, $f12 -/* B21A04 802414C4 44902000 */ mtc1 $s0, $f4 -/* B21A08 802414C8 00000000 */ nop -/* B21A0C 802414CC 46802120 */ cvt.s.w $f4, $f4 -/* B21A10 802414D0 461E2083 */ div.s $f2, $f4, $f30 -/* B21A14 802414D4 46001082 */ mul.s $f2, $f2, $f0 -/* B21A18 802414D8 00000000 */ nop -/* B21A1C 802414DC 3C014170 */ lui $at, 0x4170 -/* B21A20 802414E0 44813000 */ mtc1 $at, $f6 -/* B21A24 802414E4 00000000 */ nop -/* B21A28 802414E8 46062103 */ div.s $f4, $f4, $f6 -/* B21A2C 802414EC 46022580 */ add.s $f22, $f4, $f2 -/* B21A30 802414F0 0C00A874 */ jal cos_rad -/* B21A34 802414F4 4600B306 */ mov.s $f12, $f22 -/* B21A38 802414F8 4495A000 */ mtc1 $s5, $f20 -/* B21A3C 802414FC 00000000 */ nop -/* B21A40 80241500 4680A520 */ cvt.s.w $f20, $f20 -/* B21A44 80241504 4600A002 */ mul.s $f0, $f20, $f0 -/* B21A48 80241508 00000000 */ nop -/* B21A4C 8024150C 4600D680 */ add.s $f26, $f26, $f0 -/* B21A50 80241510 0C00A85B */ jal sin_rad -/* B21A54 80241514 4600B306 */ mov.s $f12, $f22 -/* B21A58 80241518 4600A502 */ mul.s $f20, $f20, $f0 -/* B21A5C 8024151C 00000000 */ nop -/* B21A60 80241520 4600D18D */ trunc.w.s $f6, $f26 -/* B21A64 80241524 44023000 */ mfc1 $v0, $f6 -/* B21A68 80241528 00000000 */ nop -/* B21A6C 8024152C A6620000 */ sh $v0, ($s3) -/* B21A70 80241530 86420002 */ lh $v0, 2($s2) -/* B21A74 80241534 4614C600 */ add.s $f24, $f24, $f20 -/* B21A78 80241538 44820000 */ mtc1 $v0, $f0 -/* B21A7C 8024153C 00000000 */ nop -/* B21A80 80241540 46800020 */ cvt.s.w $f0, $f0 -/* B21A84 80241544 46180000 */ add.s $f0, $f0, $f24 -/* B21A88 80241548 4600018D */ trunc.w.s $f6, $f0 -/* B21A8C 8024154C 44023000 */ mfc1 $v0, $f6 -/* B21A90 80241550 00000000 */ nop -/* B21A94 80241554 A6620002 */ sh $v0, 2($s3) -/* B21A98 80241558 26730010 */ addiu $s3, $s3, 0x10 -.L8024155C: -/* B21A9C 8024155C 26940001 */ addiu $s4, $s4, 1 -/* B21AA0 80241560 0297102A */ slt $v0, $s4, $s7 -/* B21AA4 80241564 1440FFA2 */ bnez $v0, .L802413F0 -/* B21AA8 80241568 26520010 */ addiu $s2, $s2, 0x10 -.L8024156C: -/* B21AAC 8024156C 8FBF0030 */ lw $ra, 0x30($sp) -/* B21AB0 80241570 8FB7002C */ lw $s7, 0x2c($sp) -/* B21AB4 80241574 8FB60028 */ lw $s6, 0x28($sp) -/* B21AB8 80241578 8FB50024 */ lw $s5, 0x24($sp) -/* B21ABC 8024157C 8FB40020 */ lw $s4, 0x20($sp) -/* B21AC0 80241580 8FB3001C */ lw $s3, 0x1c($sp) -/* B21AC4 80241584 8FB20018 */ lw $s2, 0x18($sp) -/* B21AC8 80241588 8FB10014 */ lw $s1, 0x14($sp) -/* B21ACC 8024158C 8FB00010 */ lw $s0, 0x10($sp) -/* B21AD0 80241590 D7BE0060 */ ldc1 $f30, 0x60($sp) -/* B21AD4 80241594 D7BC0058 */ ldc1 $f28, 0x58($sp) -/* B21AD8 80241598 D7BA0050 */ ldc1 $f26, 0x50($sp) -/* B21ADC 8024159C D7B80048 */ ldc1 $f24, 0x48($sp) -/* B21AE0 802415A0 D7B60040 */ ldc1 $f22, 0x40($sp) -/* B21AE4 802415A4 D7B40038 */ ldc1 $f20, 0x38($sp) -/* B21AE8 802415A8 03E00008 */ jr $ra -/* B21AEC 802415AC 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/855560/mac_05_unkVtxFunc001.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/855560/mac_05_unkVtxFunc001.s deleted file mode 100644 index 20fd68fce9..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/855560/mac_05_unkVtxFunc001.s +++ /dev/null @@ -1,176 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80252970_864AE0 -.word .L80243624_855794, .L80243610_855780, .L80243624_855794, .L80243624_855794, .L80243624_855794, .L80243624_855794, .L80243624_855794, .L80243624_855794, .L80243624_855794, .L80243610_855780, .L80243624_855794, .L80243624_855794, .L80243624_855794, 0, 0, 0 - -.section .text - -glabel mac_05_unkVtxFunc001 -/* 8556F8 80243588 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 8556FC 8024358C AFB20018 */ sw $s2, 0x18($sp) -/* 855700 80243590 0080902D */ daddu $s2, $a0, $zero -/* 855704 80243594 AFB10014 */ sw $s1, 0x14($sp) -/* 855708 80243598 00A0882D */ daddu $s1, $a1, $zero -/* 85570C 8024359C AFB7002C */ sw $s7, 0x2c($sp) -/* 855710 802435A0 00C0B82D */ daddu $s7, $a2, $zero -/* 855714 802435A4 AFB00010 */ sw $s0, 0x10($sp) -/* 855718 802435A8 00E0802D */ daddu $s0, $a3, $zero -/* 85571C 802435AC AFBF0030 */ sw $ra, 0x30($sp) -/* 855720 802435B0 AFB60028 */ sw $s6, 0x28($sp) -/* 855724 802435B4 AFB50024 */ sw $s5, 0x24($sp) -/* 855728 802435B8 AFB40020 */ sw $s4, 0x20($sp) -/* 85572C 802435BC AFB3001C */ sw $s3, 0x1c($sp) -/* 855730 802435C0 F7BE0060 */ sdc1 $f30, 0x60($sp) -/* 855734 802435C4 F7BC0058 */ sdc1 $f28, 0x58($sp) -/* 855738 802435C8 F7BA0050 */ sdc1 $f26, 0x50($sp) -/* 85573C 802435CC F7B80048 */ sdc1 $f24, 0x48($sp) -/* 855740 802435D0 F7B60040 */ sdc1 $f22, 0x40($sp) -/* 855744 802435D4 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 855748 802435D8 8E160000 */ lw $s6, ($s0) -/* 85574C 802435DC 0C00EAD2 */ jal get_npc_safe -/* 855750 802435E0 0000202D */ daddu $a0, $zero, $zero -/* 855754 802435E4 8C420028 */ lw $v0, 0x28($v0) -/* 855758 802435E8 3C03FF4A */ lui $v1, 0xff4a -/* 85575C 802435EC 00431821 */ addu $v1, $v0, $v1 -/* 855760 802435F0 2C62000D */ sltiu $v0, $v1, 0xd -/* 855764 802435F4 1040000B */ beqz $v0, .L80243624_855794 -/* 855768 802435F8 00031080 */ sll $v0, $v1, 2 -/* 85576C 802435FC 3C018025 */ lui $at, %hi(jtbl_80252970_864AE0) -/* 855770 80243600 00220821 */ addu $at, $at, $v0 -/* 855774 80243604 8C222970 */ lw $v0, %lo(jtbl_80252970_864AE0)($at) -/* 855778 80243608 00400008 */ jr $v0 -/* 85577C 8024360C 00000000 */ nop -.L80243610_855780: -/* 855780 80243610 8E020000 */ lw $v0, ($s0) -/* 855784 80243614 04410003 */ bgez $v0, .L80243624_855794 -/* 855788 80243618 00000000 */ nop -/* 85578C 8024361C 0000B02D */ daddu $s6, $zero, $zero -/* 855790 80243620 AE000000 */ sw $zero, ($s0) -.L80243624_855794: -/* 855794 80243624 1AE00065 */ blez $s7, .L802437BC -/* 855798 80243628 0000A02D */ daddu $s4, $zero, $zero -/* 85579C 8024362C 0220982D */ daddu $s3, $s1, $zero -/* 8557A0 80243630 3C014220 */ lui $at, 0x4220 -/* 8557A4 80243634 4481F000 */ mtc1 $at, $f30 -/* 8557A8 80243638 3C014120 */ lui $at, 0x4120 -/* 8557AC 8024363C 4481E000 */ mtc1 $at, $f28 -.L80243640: -/* 8557B0 80243640 86440000 */ lh $a0, ($s2) -/* 8557B4 80243644 2882001F */ slti $v0, $a0, 0x1f -/* 8557B8 80243648 54400058 */ bnel $v0, $zero, .L802437AC -/* 8557BC 8024364C 26730010 */ addiu $s3, $s3, 0x10 -/* 8557C0 80243650 3C026666 */ lui $v0, 0x6666 -/* 8557C4 80243654 34426667 */ ori $v0, $v0, 0x6667 -/* 8557C8 80243658 2483FFE2 */ addiu $v1, $a0, -0x1e -/* 8557CC 8024365C 00620018 */ mult $v1, $v0 -/* 8557D0 80243660 4480C000 */ mtc1 $zero, $f24 -/* 8557D4 80243664 0000802D */ daddu $s0, $zero, $zero -/* 8557D8 80243668 00031FC3 */ sra $v1, $v1, 0x1f -/* 8557DC 8024366C 4600C686 */ mov.s $f26, $f24 -/* 8557E0 80243670 00004010 */ mfhi $t0 -/* 8557E4 80243674 00081083 */ sra $v0, $t0, 2 -/* 8557E8 80243678 00438823 */ subu $s1, $v0, $v1 -/* 8557EC 8024367C 00111080 */ sll $v0, $s1, 2 -/* 8557F0 80243680 00511021 */ addu $v0, $v0, $s1 -/* 8557F4 80243684 00021040 */ sll $v0, $v0, 1 -/* 8557F8 80243688 2442001E */ addiu $v0, $v0, 0x1e -/* 8557FC 8024368C 1A20001D */ blez $s1, .L80243704 -/* 855800 80243690 0082A823 */ subu $s5, $a0, $v0 -.L80243694: -/* 855804 80243694 44966000 */ mtc1 $s6, $f12 -/* 855808 80243698 00000000 */ nop -/* 85580C 8024369C 0C00A8BB */ jal sin_deg -/* 855810 802436A0 46806320 */ cvt.s.w $f12, $f12 -/* 855814 802436A4 44902000 */ mtc1 $s0, $f4 -/* 855818 802436A8 00000000 */ nop -/* 85581C 802436AC 46802120 */ cvt.s.w $f4, $f4 -/* 855820 802436B0 461E2083 */ div.s $f2, $f4, $f30 -/* 855824 802436B4 46001082 */ mul.s $f2, $f2, $f0 -/* 855828 802436B8 00000000 */ nop -/* 85582C 802436BC 3C014170 */ lui $at, 0x4170 -/* 855830 802436C0 44813000 */ mtc1 $at, $f6 -/* 855834 802436C4 00000000 */ nop -/* 855838 802436C8 46062103 */ div.s $f4, $f4, $f6 -/* 85583C 802436CC 46022580 */ add.s $f22, $f4, $f2 -/* 855840 802436D0 0C00A874 */ jal cos_rad -/* 855844 802436D4 4600B306 */ mov.s $f12, $f22 -/* 855848 802436D8 461C0002 */ mul.s $f0, $f0, $f28 -/* 85584C 802436DC 00000000 */ nop -/* 855850 802436E0 4600D680 */ add.s $f26, $f26, $f0 -/* 855854 802436E4 0C00A85B */ jal sin_rad -/* 855858 802436E8 4600B306 */ mov.s $f12, $f22 -/* 85585C 802436EC 461C0002 */ mul.s $f0, $f0, $f28 -/* 855860 802436F0 00000000 */ nop -/* 855864 802436F4 26100001 */ addiu $s0, $s0, 1 -/* 855868 802436F8 0211102A */ slt $v0, $s0, $s1 -/* 85586C 802436FC 1440FFE5 */ bnez $v0, .L80243694 -/* 855870 80243700 4600C600 */ add.s $f24, $f24, $f0 -.L80243704: -/* 855874 80243704 44966000 */ mtc1 $s6, $f12 -/* 855878 80243708 00000000 */ nop -/* 85587C 8024370C 0C00A8BB */ jal sin_deg -/* 855880 80243710 46806320 */ cvt.s.w $f12, $f12 -/* 855884 80243714 44902000 */ mtc1 $s0, $f4 -/* 855888 80243718 00000000 */ nop -/* 85588C 8024371C 46802120 */ cvt.s.w $f4, $f4 -/* 855890 80243720 461E2083 */ div.s $f2, $f4, $f30 -/* 855894 80243724 46001082 */ mul.s $f2, $f2, $f0 -/* 855898 80243728 00000000 */ nop -/* 85589C 8024372C 3C014170 */ lui $at, 0x4170 -/* 8558A0 80243730 44813000 */ mtc1 $at, $f6 -/* 8558A4 80243734 00000000 */ nop -/* 8558A8 80243738 46062103 */ div.s $f4, $f4, $f6 -/* 8558AC 8024373C 46022580 */ add.s $f22, $f4, $f2 -/* 8558B0 80243740 0C00A874 */ jal cos_rad -/* 8558B4 80243744 4600B306 */ mov.s $f12, $f22 -/* 8558B8 80243748 4495A000 */ mtc1 $s5, $f20 -/* 8558BC 8024374C 00000000 */ nop -/* 8558C0 80243750 4680A520 */ cvt.s.w $f20, $f20 -/* 8558C4 80243754 4600A002 */ mul.s $f0, $f20, $f0 -/* 8558C8 80243758 00000000 */ nop -/* 8558CC 8024375C 4600D680 */ add.s $f26, $f26, $f0 -/* 8558D0 80243760 0C00A85B */ jal sin_rad -/* 8558D4 80243764 4600B306 */ mov.s $f12, $f22 -/* 8558D8 80243768 4600A502 */ mul.s $f20, $f20, $f0 -/* 8558DC 8024376C 00000000 */ nop -/* 8558E0 80243770 4600D18D */ trunc.w.s $f6, $f26 -/* 8558E4 80243774 44023000 */ mfc1 $v0, $f6 -/* 8558E8 80243778 00000000 */ nop -/* 8558EC 8024377C A6620000 */ sh $v0, ($s3) -/* 8558F0 80243780 86420002 */ lh $v0, 2($s2) -/* 8558F4 80243784 4614C600 */ add.s $f24, $f24, $f20 -/* 8558F8 80243788 44820000 */ mtc1 $v0, $f0 -/* 8558FC 8024378C 00000000 */ nop -/* 855900 80243790 46800020 */ cvt.s.w $f0, $f0 -/* 855904 80243794 46180000 */ add.s $f0, $f0, $f24 -/* 855908 80243798 4600018D */ trunc.w.s $f6, $f0 -/* 85590C 8024379C 44023000 */ mfc1 $v0, $f6 -/* 855910 802437A0 00000000 */ nop -/* 855914 802437A4 A6620002 */ sh $v0, 2($s3) -/* 855918 802437A8 26730010 */ addiu $s3, $s3, 0x10 -.L802437AC: -/* 85591C 802437AC 26940001 */ addiu $s4, $s4, 1 -/* 855920 802437B0 0297102A */ slt $v0, $s4, $s7 -/* 855924 802437B4 1440FFA2 */ bnez $v0, .L80243640 -/* 855928 802437B8 26520010 */ addiu $s2, $s2, 0x10 -.L802437BC: -/* 85592C 802437BC 8FBF0030 */ lw $ra, 0x30($sp) -/* 855930 802437C0 8FB7002C */ lw $s7, 0x2c($sp) -/* 855934 802437C4 8FB60028 */ lw $s6, 0x28($sp) -/* 855938 802437C8 8FB50024 */ lw $s5, 0x24($sp) -/* 85593C 802437CC 8FB40020 */ lw $s4, 0x20($sp) -/* 855940 802437D0 8FB3001C */ lw $s3, 0x1c($sp) -/* 855944 802437D4 8FB20018 */ lw $s2, 0x18($sp) -/* 855948 802437D8 8FB10014 */ lw $s1, 0x14($sp) -/* 85594C 802437DC 8FB00010 */ lw $s0, 0x10($sp) -/* 855950 802437E0 D7BE0060 */ ldc1 $f30, 0x60($sp) -/* 855954 802437E4 D7BC0058 */ ldc1 $f28, 0x58($sp) -/* 855958 802437E8 D7BA0050 */ ldc1 $f26, 0x50($sp) -/* 85595C 802437EC D7B80048 */ ldc1 $f24, 0x48($sp) -/* 855960 802437F0 D7B60040 */ ldc1 $f22, 0x40($sp) -/* 855964 802437F4 D7B40038 */ ldc1 $f20, 0x38($sp) -/* 855968 802437F8 03E00008 */ jr $ra -/* 85596C 802437FC 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_06/865000/mac_06_unkVtxFunc001.s b/ver/us/asm/nonmatchings/world/area_mac/mac_06/865000/mac_06_unkVtxFunc001.s deleted file mode 100644 index c5e58b31f6..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_06/865000/mac_06_unkVtxFunc001.s +++ /dev/null @@ -1,176 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80244910_869450 -.word .L802406F4_865234, .L802406E0_865220, .L802406F4_865234, .L802406F4_865234, .L802406F4_865234, .L802406F4_865234, .L802406F4_865234, .L802406F4_865234, .L802406F4_865234, .L802406E0_865220, .L802406F4_865234, .L802406F4_865234, .L802406F4_865234, 0, 0, 0 - -.section .text - -glabel mac_06_unkVtxFunc001 -/* 865198 80240658 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 86519C 8024065C AFB20018 */ sw $s2, 0x18($sp) -/* 8651A0 80240660 0080902D */ daddu $s2, $a0, $zero -/* 8651A4 80240664 AFB10014 */ sw $s1, 0x14($sp) -/* 8651A8 80240668 00A0882D */ daddu $s1, $a1, $zero -/* 8651AC 8024066C AFB7002C */ sw $s7, 0x2c($sp) -/* 8651B0 80240670 00C0B82D */ daddu $s7, $a2, $zero -/* 8651B4 80240674 AFB00010 */ sw $s0, 0x10($sp) -/* 8651B8 80240678 00E0802D */ daddu $s0, $a3, $zero -/* 8651BC 8024067C AFBF0030 */ sw $ra, 0x30($sp) -/* 8651C0 80240680 AFB60028 */ sw $s6, 0x28($sp) -/* 8651C4 80240684 AFB50024 */ sw $s5, 0x24($sp) -/* 8651C8 80240688 AFB40020 */ sw $s4, 0x20($sp) -/* 8651CC 8024068C AFB3001C */ sw $s3, 0x1c($sp) -/* 8651D0 80240690 F7BE0060 */ sdc1 $f30, 0x60($sp) -/* 8651D4 80240694 F7BC0058 */ sdc1 $f28, 0x58($sp) -/* 8651D8 80240698 F7BA0050 */ sdc1 $f26, 0x50($sp) -/* 8651DC 8024069C F7B80048 */ sdc1 $f24, 0x48($sp) -/* 8651E0 802406A0 F7B60040 */ sdc1 $f22, 0x40($sp) -/* 8651E4 802406A4 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 8651E8 802406A8 8E160000 */ lw $s6, ($s0) -/* 8651EC 802406AC 0C00EAD2 */ jal get_npc_safe -/* 8651F0 802406B0 0000202D */ daddu $a0, $zero, $zero -/* 8651F4 802406B4 8C420028 */ lw $v0, 0x28($v0) -/* 8651F8 802406B8 3C03FF4A */ lui $v1, 0xff4a -/* 8651FC 802406BC 00431821 */ addu $v1, $v0, $v1 -/* 865200 802406C0 2C62000D */ sltiu $v0, $v1, 0xd -/* 865204 802406C4 1040000B */ beqz $v0, .L802406F4_865234 -/* 865208 802406C8 00031080 */ sll $v0, $v1, 2 -/* 86520C 802406CC 3C018024 */ lui $at, %hi(jtbl_80244910_869450) -/* 865210 802406D0 00220821 */ addu $at, $at, $v0 -/* 865214 802406D4 8C224910 */ lw $v0, %lo(jtbl_80244910_869450)($at) -/* 865218 802406D8 00400008 */ jr $v0 -/* 86521C 802406DC 00000000 */ nop -.L802406E0_865220: -/* 865220 802406E0 8E020000 */ lw $v0, ($s0) -/* 865224 802406E4 04410003 */ bgez $v0, .L802406F4_865234 -/* 865228 802406E8 00000000 */ nop -/* 86522C 802406EC 0000B02D */ daddu $s6, $zero, $zero -/* 865230 802406F0 AE000000 */ sw $zero, ($s0) -.L802406F4_865234: -/* 865234 802406F4 1AE00065 */ blez $s7, .L8024088C -/* 865238 802406F8 0000A02D */ daddu $s4, $zero, $zero -/* 86523C 802406FC 0220982D */ daddu $s3, $s1, $zero -/* 865240 80240700 3C014220 */ lui $at, 0x4220 -/* 865244 80240704 4481F000 */ mtc1 $at, $f30 -/* 865248 80240708 3C014120 */ lui $at, 0x4120 -/* 86524C 8024070C 4481E000 */ mtc1 $at, $f28 -.L80240710: -/* 865250 80240710 86440000 */ lh $a0, ($s2) -/* 865254 80240714 2882001F */ slti $v0, $a0, 0x1f -/* 865258 80240718 54400058 */ bnel $v0, $zero, .L8024087C -/* 86525C 8024071C 26730010 */ addiu $s3, $s3, 0x10 -/* 865260 80240720 3C026666 */ lui $v0, 0x6666 -/* 865264 80240724 34426667 */ ori $v0, $v0, 0x6667 -/* 865268 80240728 2483FFE2 */ addiu $v1, $a0, -0x1e -/* 86526C 8024072C 00620018 */ mult $v1, $v0 -/* 865270 80240730 4480C000 */ mtc1 $zero, $f24 -/* 865274 80240734 0000802D */ daddu $s0, $zero, $zero -/* 865278 80240738 00031FC3 */ sra $v1, $v1, 0x1f -/* 86527C 8024073C 4600C686 */ mov.s $f26, $f24 -/* 865280 80240740 00004010 */ mfhi $t0 -/* 865284 80240744 00081083 */ sra $v0, $t0, 2 -/* 865288 80240748 00438823 */ subu $s1, $v0, $v1 -/* 86528C 8024074C 00111080 */ sll $v0, $s1, 2 -/* 865290 80240750 00511021 */ addu $v0, $v0, $s1 -/* 865294 80240754 00021040 */ sll $v0, $v0, 1 -/* 865298 80240758 2442001E */ addiu $v0, $v0, 0x1e -/* 86529C 8024075C 1A20001D */ blez $s1, .L802407D4 -/* 8652A0 80240760 0082A823 */ subu $s5, $a0, $v0 -.L80240764: -/* 8652A4 80240764 44966000 */ mtc1 $s6, $f12 -/* 8652A8 80240768 00000000 */ nop -/* 8652AC 8024076C 0C00A8BB */ jal sin_deg -/* 8652B0 80240770 46806320 */ cvt.s.w $f12, $f12 -/* 8652B4 80240774 44902000 */ mtc1 $s0, $f4 -/* 8652B8 80240778 00000000 */ nop -/* 8652BC 8024077C 46802120 */ cvt.s.w $f4, $f4 -/* 8652C0 80240780 461E2083 */ div.s $f2, $f4, $f30 -/* 8652C4 80240784 46001082 */ mul.s $f2, $f2, $f0 -/* 8652C8 80240788 00000000 */ nop -/* 8652CC 8024078C 3C014170 */ lui $at, 0x4170 -/* 8652D0 80240790 44813000 */ mtc1 $at, $f6 -/* 8652D4 80240794 00000000 */ nop -/* 8652D8 80240798 46062103 */ div.s $f4, $f4, $f6 -/* 8652DC 8024079C 46022580 */ add.s $f22, $f4, $f2 -/* 8652E0 802407A0 0C00A874 */ jal cos_rad -/* 8652E4 802407A4 4600B306 */ mov.s $f12, $f22 -/* 8652E8 802407A8 461C0002 */ mul.s $f0, $f0, $f28 -/* 8652EC 802407AC 00000000 */ nop -/* 8652F0 802407B0 4600D680 */ add.s $f26, $f26, $f0 -/* 8652F4 802407B4 0C00A85B */ jal sin_rad -/* 8652F8 802407B8 4600B306 */ mov.s $f12, $f22 -/* 8652FC 802407BC 461C0002 */ mul.s $f0, $f0, $f28 -/* 865300 802407C0 00000000 */ nop -/* 865304 802407C4 26100001 */ addiu $s0, $s0, 1 -/* 865308 802407C8 0211102A */ slt $v0, $s0, $s1 -/* 86530C 802407CC 1440FFE5 */ bnez $v0, .L80240764 -/* 865310 802407D0 4600C600 */ add.s $f24, $f24, $f0 -.L802407D4: -/* 865314 802407D4 44966000 */ mtc1 $s6, $f12 -/* 865318 802407D8 00000000 */ nop -/* 86531C 802407DC 0C00A8BB */ jal sin_deg -/* 865320 802407E0 46806320 */ cvt.s.w $f12, $f12 -/* 865324 802407E4 44902000 */ mtc1 $s0, $f4 -/* 865328 802407E8 00000000 */ nop -/* 86532C 802407EC 46802120 */ cvt.s.w $f4, $f4 -/* 865330 802407F0 461E2083 */ div.s $f2, $f4, $f30 -/* 865334 802407F4 46001082 */ mul.s $f2, $f2, $f0 -/* 865338 802407F8 00000000 */ nop -/* 86533C 802407FC 3C014170 */ lui $at, 0x4170 -/* 865340 80240800 44813000 */ mtc1 $at, $f6 -/* 865344 80240804 00000000 */ nop -/* 865348 80240808 46062103 */ div.s $f4, $f4, $f6 -/* 86534C 8024080C 46022580 */ add.s $f22, $f4, $f2 -/* 865350 80240810 0C00A874 */ jal cos_rad -/* 865354 80240814 4600B306 */ mov.s $f12, $f22 -/* 865358 80240818 4495A000 */ mtc1 $s5, $f20 -/* 86535C 8024081C 00000000 */ nop -/* 865360 80240820 4680A520 */ cvt.s.w $f20, $f20 -/* 865364 80240824 4600A002 */ mul.s $f0, $f20, $f0 -/* 865368 80240828 00000000 */ nop -/* 86536C 8024082C 4600D680 */ add.s $f26, $f26, $f0 -/* 865370 80240830 0C00A85B */ jal sin_rad -/* 865374 80240834 4600B306 */ mov.s $f12, $f22 -/* 865378 80240838 4600A502 */ mul.s $f20, $f20, $f0 -/* 86537C 8024083C 00000000 */ nop -/* 865380 80240840 4600D18D */ trunc.w.s $f6, $f26 -/* 865384 80240844 44023000 */ mfc1 $v0, $f6 -/* 865388 80240848 00000000 */ nop -/* 86538C 8024084C A6620000 */ sh $v0, ($s3) -/* 865390 80240850 86420002 */ lh $v0, 2($s2) -/* 865394 80240854 4614C600 */ add.s $f24, $f24, $f20 -/* 865398 80240858 44820000 */ mtc1 $v0, $f0 -/* 86539C 8024085C 00000000 */ nop -/* 8653A0 80240860 46800020 */ cvt.s.w $f0, $f0 -/* 8653A4 80240864 46180000 */ add.s $f0, $f0, $f24 -/* 8653A8 80240868 4600018D */ trunc.w.s $f6, $f0 -/* 8653AC 8024086C 44023000 */ mfc1 $v0, $f6 -/* 8653B0 80240870 00000000 */ nop -/* 8653B4 80240874 A6620002 */ sh $v0, 2($s3) -/* 8653B8 80240878 26730010 */ addiu $s3, $s3, 0x10 -.L8024087C: -/* 8653BC 8024087C 26940001 */ addiu $s4, $s4, 1 -/* 8653C0 80240880 0297102A */ slt $v0, $s4, $s7 -/* 8653C4 80240884 1440FFA2 */ bnez $v0, .L80240710 -/* 8653C8 80240888 26520010 */ addiu $s2, $s2, 0x10 -.L8024088C: -/* 8653CC 8024088C 8FBF0030 */ lw $ra, 0x30($sp) -/* 8653D0 80240890 8FB7002C */ lw $s7, 0x2c($sp) -/* 8653D4 80240894 8FB60028 */ lw $s6, 0x28($sp) -/* 8653D8 80240898 8FB50024 */ lw $s5, 0x24($sp) -/* 8653DC 8024089C 8FB40020 */ lw $s4, 0x20($sp) -/* 8653E0 802408A0 8FB3001C */ lw $s3, 0x1c($sp) -/* 8653E4 802408A4 8FB20018 */ lw $s2, 0x18($sp) -/* 8653E8 802408A8 8FB10014 */ lw $s1, 0x14($sp) -/* 8653EC 802408AC 8FB00010 */ lw $s0, 0x10($sp) -/* 8653F0 802408B0 D7BE0060 */ ldc1 $f30, 0x60($sp) -/* 8653F4 802408B4 D7BC0058 */ ldc1 $f28, 0x58($sp) -/* 8653F8 802408B8 D7BA0050 */ ldc1 $f26, 0x50($sp) -/* 8653FC 802408BC D7B80048 */ ldc1 $f24, 0x48($sp) -/* 865400 802408C0 D7B60040 */ ldc1 $f22, 0x40($sp) -/* 865404 802408C4 D7B40038 */ ldc1 $f20, 0x38($sp) -/* 865408 802408C8 03E00008 */ jr $ra -/* 86540C 802408CC 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80240E80_8659C0.s b/ver/us/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80240E80_8659C0.s deleted file mode 100644 index 8aa2a3313d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80240E80_8659C0.s +++ /dev/null @@ -1,149 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E80_8659C0 -/* 8659C0 80240E80 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 8659C4 80240E84 AFB3001C */ sw $s3, 0x1c($sp) -/* 8659C8 80240E88 0080982D */ daddu $s3, $a0, $zero -/* 8659CC 80240E8C AFB00010 */ sw $s0, 0x10($sp) -/* 8659D0 80240E90 00A0802D */ daddu $s0, $a1, $zero -/* 8659D4 80240E94 AFBF0020 */ sw $ra, 0x20($sp) -/* 8659D8 80240E98 AFB20018 */ sw $s2, 0x18($sp) -/* 8659DC 80240E9C AFB10014 */ sw $s1, 0x14($sp) -/* 8659E0 80240EA0 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 8659E4 80240EA4 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 8659E8 80240EA8 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 8659EC 80240EAC 8E72000C */ lw $s2, 0xc($s3) -/* 8659F0 80240EB0 0C00EAD2 */ jal get_npc_safe -/* 8659F4 80240EB4 0000202D */ daddu $a0, $zero, $zero -/* 8659F8 80240EB8 12000010 */ beqz $s0, .L80240EFC -/* 8659FC 80240EBC 0040882D */ daddu $s1, $v0, $zero -/* 865A00 80240EC0 8E450000 */ lw $a1, ($s2) -/* 865A04 80240EC4 0C0B1EAF */ jal evt_get_variable -/* 865A08 80240EC8 0260202D */ daddu $a0, $s3, $zero -/* 865A0C 80240ECC 0040182D */ daddu $v1, $v0, $zero -/* 865A10 80240ED0 10600006 */ beqz $v1, .L80240EEC -/* 865A14 80240ED4 AE630070 */ sw $v1, 0x70($s3) -/* 865A18 80240ED8 24020001 */ addiu $v0, $zero, 1 -/* 865A1C 80240EDC 10620005 */ beq $v1, $v0, .L80240EF4 -/* 865A20 80240EE0 24020028 */ addiu $v0, $zero, 0x28 -/* 865A24 80240EE4 080903BF */ j .L80240EFC -/* 865A28 80240EE8 AE620074 */ sw $v0, 0x74($s3) -.L80240EEC: -/* 865A2C 80240EEC 080903BE */ j .L80240EF8 -/* 865A30 80240EF0 24020046 */ addiu $v0, $zero, 0x46 -.L80240EF4: -/* 865A34 80240EF4 24020064 */ addiu $v0, $zero, 0x64 -.L80240EF8: -/* 865A38 80240EF8 AE620074 */ sw $v0, 0x74($s3) -.L80240EFC: -/* 865A3C 80240EFC C634000C */ lwc1 $f20, 0xc($s1) -/* 865A40 80240F00 C6760074 */ lwc1 $f22, 0x74($s3) -/* 865A44 80240F04 4680B5A0 */ cvt.s.w $f22, $f22 -/* 865A48 80240F08 4600A507 */ neg.s $f20, $f20 -/* 865A4C 80240F0C 0C00A8BB */ jal sin_deg -/* 865A50 80240F10 4600A306 */ mov.s $f12, $f20 -/* 865A54 80240F14 46160002 */ mul.s $f0, $f0, $f22 -/* 865A58 80240F18 00000000 */ nop -/* 865A5C 80240F1C C6220038 */ lwc1 $f2, 0x38($s1) -/* 865A60 80240F20 3C0141F0 */ lui $at, 0x41f0 -/* 865A64 80240F24 44812000 */ mtc1 $at, $f4 -/* 865A68 80240F28 00000000 */ nop -/* 865A6C 80240F2C 46041080 */ add.s $f2, $f2, $f4 -/* 865A70 80240F30 46001600 */ add.s $f24, $f2, $f0 -/* 865A74 80240F34 0C00A8D4 */ jal cos_deg -/* 865A78 80240F38 4600A306 */ mov.s $f12, $f20 -/* 865A7C 80240F3C 46160002 */ mul.s $f0, $f0, $f22 -/* 865A80 80240F40 00000000 */ nop -/* 865A84 80240F44 24020001 */ addiu $v0, $zero, 1 -/* 865A88 80240F48 C6220040 */ lwc1 $f2, 0x40($s1) -/* 865A8C 80240F4C C624003C */ lwc1 $f4, 0x3c($s1) -/* 865A90 80240F50 46001580 */ add.s $f22, $f2, $f0 -/* 865A94 80240F54 3C014248 */ lui $at, 0x4248 -/* 865A98 80240F58 44810000 */ mtc1 $at, $f0 -/* 865A9C 80240F5C 8E640070 */ lw $a0, 0x70($s3) -/* 865AA0 80240F60 1082001F */ beq $a0, $v0, .L80240FE0 -/* 865AA4 80240F64 46002500 */ add.s $f20, $f4, $f0 -/* 865AA8 80240F68 28820002 */ slti $v0, $a0, 2 -/* 865AAC 80240F6C 10400005 */ beqz $v0, .L80240F84 -/* 865AB0 80240F70 24020002 */ addiu $v0, $zero, 2 -/* 865AB4 80240F74 10800007 */ beqz $a0, .L80240F94 -/* 865AB8 80240F78 0000102D */ daddu $v0, $zero, $zero -/* 865ABC 80240F7C 0809041C */ j .L80241070 -/* 865AC0 80240F80 00000000 */ nop -.L80240F84: -/* 865AC4 80240F84 1082002A */ beq $a0, $v0, .L80241030 -/* 865AC8 80240F88 0000102D */ daddu $v0, $zero, $zero -/* 865ACC 80240F8C 0809041C */ j .L80241070 -/* 865AD0 80240F90 00000000 */ nop -.L80240F94: -/* 865AD4 80240F94 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 865AD8 80240F98 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 865ADC 80240F9C 3C018024 */ lui $at, %hi(D_80243434_867F74) -/* 865AE0 80240FA0 C4203434 */ lwc1 $f0, %lo(D_80243434_867F74)($at) -/* 865AE4 80240FA4 3C030001 */ lui $v1, 1 -/* 865AE8 80240FA8 4600A000 */ add.s $f0, $f20, $f0 -/* 865AEC 80240FAC E4580028 */ swc1 $f24, 0x28($v0) -/* 865AF0 80240FB0 E4560030 */ swc1 $f22, 0x30($v0) -/* 865AF4 80240FB4 E440002C */ swc1 $f0, 0x2c($v0) -/* 865AF8 80240FB8 C6200038 */ lwc1 $f0, 0x38($s1) -/* 865AFC 80240FBC C622003C */ lwc1 $f2, 0x3c($s1) -/* 865B00 80240FC0 8E220000 */ lw $v0, ($s1) -/* 865B04 80240FC4 C6240040 */ lwc1 $f4, 0x40($s1) -/* 865B08 80240FC8 00431025 */ or $v0, $v0, $v1 -/* 865B0C 80240FCC E620006C */ swc1 $f0, 0x6c($s1) -/* 865B10 80240FD0 E6220070 */ swc1 $f2, 0x70($s1) -/* 865B14 80240FD4 E6240074 */ swc1 $f4, 0x74($s1) -/* 865B18 80240FD8 0809041B */ j .L8024106C -/* 865B1C 80240FDC AE220000 */ sw $v0, ($s1) -.L80240FE0: -/* 865B20 80240FE0 0C00EAD2 */ jal get_npc_safe -/* 865B24 80240FE4 2404FFFC */ addiu $a0, $zero, -4 -/* 865B28 80240FE8 0040202D */ daddu $a0, $v0, $zero -/* 865B2C 80240FEC 54800003 */ bnel $a0, $zero, .L80240FFC -/* 865B30 80240FF0 E4980038 */ swc1 $f24, 0x38($a0) -/* 865B34 80240FF4 0809041C */ j .L80241070 -/* 865B38 80240FF8 24020002 */ addiu $v0, $zero, 2 -.L80240FFC: -/* 865B3C 80240FFC 4600C006 */ mov.s $f0, $f24 -/* 865B40 80241000 E494003C */ swc1 $f20, 0x3c($a0) -/* 865B44 80241004 4600A086 */ mov.s $f2, $f20 -/* 865B48 80241008 E4960040 */ swc1 $f22, 0x40($a0) -/* 865B4C 8024100C 4600B106 */ mov.s $f4, $f22 -/* 865B50 80241010 8C820000 */ lw $v0, ($a0) -/* 865B54 80241014 3C030001 */ lui $v1, 1 -/* 865B58 80241018 E480006C */ swc1 $f0, 0x6c($a0) -/* 865B5C 8024101C E4820070 */ swc1 $f2, 0x70($a0) -/* 865B60 80241020 E4840074 */ swc1 $f4, 0x74($a0) -/* 865B64 80241024 00431025 */ or $v0, $v0, $v1 -/* 865B68 80241028 0809041B */ j .L8024106C -/* 865B6C 8024102C AC820000 */ sw $v0, ($a0) -.L80241030: -/* 865B70 80241030 0C00EAD2 */ jal get_npc_safe -/* 865B74 80241034 24040002 */ addiu $a0, $zero, 2 -/* 865B78 80241038 E4580038 */ swc1 $f24, 0x38($v0) -/* 865B7C 8024103C 4600C006 */ mov.s $f0, $f24 -/* 865B80 80241040 E454003C */ swc1 $f20, 0x3c($v0) -/* 865B84 80241044 4600A086 */ mov.s $f2, $f20 -/* 865B88 80241048 E4560040 */ swc1 $f22, 0x40($v0) -/* 865B8C 8024104C 4600B106 */ mov.s $f4, $f22 -/* 865B90 80241050 8C430000 */ lw $v1, ($v0) -/* 865B94 80241054 3C040001 */ lui $a0, 1 -/* 865B98 80241058 E440006C */ swc1 $f0, 0x6c($v0) -/* 865B9C 8024105C E4420070 */ swc1 $f2, 0x70($v0) -/* 865BA0 80241060 E4440074 */ swc1 $f4, 0x74($v0) -/* 865BA4 80241064 00641825 */ or $v1, $v1, $a0 -/* 865BA8 80241068 AC430000 */ sw $v1, ($v0) -.L8024106C: -/* 865BAC 8024106C 0000102D */ daddu $v0, $zero, $zero -.L80241070: -/* 865BB0 80241070 8FBF0020 */ lw $ra, 0x20($sp) -/* 865BB4 80241074 8FB3001C */ lw $s3, 0x1c($sp) -/* 865BB8 80241078 8FB20018 */ lw $s2, 0x18($sp) -/* 865BBC 8024107C 8FB10014 */ lw $s1, 0x14($sp) -/* 865BC0 80241080 8FB00010 */ lw $s0, 0x10($sp) -/* 865BC4 80241084 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 865BC8 80241088 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 865BCC 8024108C D7B40028 */ ldc1 $f20, 0x28($sp) -/* 865BD0 80241090 03E00008 */ jr $ra -/* 865BD4 80241094 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80241098_865BD8.s b/ver/us/asm/nonmatchings/world/area_mac/mac_06/mac_06_3/func_80241098_865BD8.s similarity index 100% rename from ver/us/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80241098_865BD8.s rename to ver/us/asm/nonmatchings/world/area_mac/mac_06/mac_06_3/func_80241098_865BD8.s diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80241290_865DD0.s b/ver/us/asm/nonmatchings/world/area_mac/mac_06/mac_06_3/func_80241290_865DD0.s similarity index 100% rename from ver/us/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80241290_865DD0.s rename to ver/us/asm/nonmatchings/world/area_mac/mac_06/mac_06_3/func_80241290_865DD0.s diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_802412AC_865DEC.s b/ver/us/asm/nonmatchings/world/area_mac/mac_06/mac_06_3/func_802412AC_865DEC.s similarity index 100% rename from ver/us/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_802412AC_865DEC.s rename to ver/us/asm/nonmatchings/world/area_mac/mac_06/mac_06_3/func_802412AC_865DEC.s diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80241388_865EC8.s b/ver/us/asm/nonmatchings/world/area_mac/mac_06/mac_06_3/func_80241388_865EC8.s similarity index 100% rename from ver/us/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80241388_865EC8.s rename to ver/us/asm/nonmatchings/world/area_mac/mac_06/mac_06_3/func_80241388_865EC8.s diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_802415FC_86613C.s b/ver/us/asm/nonmatchings/world/area_mac/mac_06/mac_06_3/func_802415FC_86613C.s similarity index 100% rename from ver/us/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_802415FC_86613C.s rename to ver/us/asm/nonmatchings/world/area_mac/mac_06/mac_06_3/func_802415FC_86613C.s diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index 9d2c9a904f..02cf21f85f 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -6365,13 +6365,10 @@ segments: start: 0x864B40 vram: 0x80240000 subsegments: - - [0x864B40, c] - - [0x865000, c] - - [0x8659C0, c] - - [0x8661D0, data] - - [0x8666A0, data] - - [0x867EF0, data] - - [0x869450] + - [0x864B40, c, mac_06_1_main] + - [0x865000, c, mac_06_2] + - [0x8659C0, c, mac_06_3] + - [0x8661D0] - name: tik_01 dir: world/area_tik/tik_01 type: code @@ -8705,10 +8702,9 @@ segments: start: 0xAA2180 vram: 0x80240000 subsegments: - - [0xAA2180, c] - - [0xAA2180, data] - - [0xAA2240, data] - - [0xAA23B0] + - [0xAA2180, c, kpa_117_0_header] + - [0xAA2180, c, kpa_117_1_main] + - [0xAA2180] - name: kpa_118 dir: world/area_kpa/kpa_118 type: code @@ -9168,85 +9164,84 @@ segments: start: 0xB1A900 vram: 0x80240000 subsegments: - - [0xB1A900, c] - - [0xB1A900, data] - - [0xB1AB20, data] - - [0xB1AC20] + - [0xB1A900, c, tst_01_1_main] + - [0xB1A900, c, tst_01_2_entity] + - [0xB1A900] - name: tst_02 dir: world/area_tst/tst_02 type: code start: 0xB1AC30 vram: 0x80240000 subsegments: - - [0xB1AC30, c] - - [0xB1AC30, data] - - [0xB1AE50, data] - - [0xB1AF70] + - [0xB1AC30, c, tst_02_1_main] + - [0xB1AC30, c, tst_02_2_entity] + - [0xB1AC30] - name: tst_03 dir: world/area_tst/tst_03 type: code start: 0xB1AF80 vram: 0x80240000 subsegments: - - [0xB1AF80, c] - - [0xB1AF80, data] - - [0xB1B240, data] - - [0xB1B560] + - [0xB1AF80, c, tst_03_1_main] + - [0xB1AF80, c, tst_03_2_entity] + - [0xB1AF80] - name: tst_04 dir: world/area_tst/tst_04 type: code start: 0xB1B570 vram: 0x80240000 subsegments: - - [0xB1B570, c] - - [0xB1BBD0, c] - - [0xB1BC00, data] - - [0xB1C1E0, data] - - [0xB1C220, data] - - [0xB1C270, data] - - [0xB1C510, data] - - [0xB1C530] + - [0xB1B570, c, tst_04_1_main] + - [0xB1B7D0, c, tst_04_2_entity] + - [0xB1B8D0, c, tst_04_3_reflection] + - [0xB1BBD0, c, tst_04_4_npc] + - [0xB1BC00] - name: tst_10 dir: world/area_tst/tst_10 type: code start: 0xB1C540 vram: 0x80240000 subsegments: - - [0xB1C540, c] - - [0xB1C540, data] - - [0xB1CA40] + - [0xB1C540, c, tst_10_1_main] + - [0xB1C540] - name: tst_11 dir: world/area_tst/tst_11 type: code start: 0xB1CA50 vram: 0x80240000 subsegments: - - [0xB1CA50, c] - - [0xB1D1C0, data] - - [0xB1D2A0, data] + - [0xB1CA50, c, tst_11_1_main] + - [0xB1CA50, c, tst_11_2_extra] + - [0xB1D1C0] - name: tst_12 dir: world/area_tst/tst_12 type: code start: 0xB1D2F0 vram: 0x80240000 subsegments: - - [0xB1D2F0, data] + - [0xB1D2F0, c, tst_12_1_main] - name: tst_13 dir: world/area_tst/tst_13 type: code start: 0xB1D760 vram: 0x80240000 subsegments: - - [0xB1D760, c] - - [0xB1DB20, data] - - [0xB20460] + - [0xB1D760, c, tst_13_1_main] + - start: 0xB1DB20 + type: .data + name: tst_13_1_main + subsegments: + - [0xB1DB20] + - [0xB1FA10, vtx, shockwave] + - [0xB1FFC0, gfx, shockwave] + - [0xB20350] - name: tst_20 dir: world/area_tst/tst_20 type: code start: 0xB20470 vram: 0x80240000 subsegments: - - [0xB20470, data] + - [0xB20470, c, tst_20_1_main] - name: jan_00 dir: world/area_jan/jan_00 type: code @@ -11578,76 +11573,95 @@ segments: start: 0xDF6A00 vram: 0x80240000 subsegments: - - [0xDF6A00, c] - - [0xDF6A20, c] - - [0xDF9300, c] - - [0xDF9510, c] - - [0xDF9540, data] - - [0xDFB0B0, data] - - [0xDFE5B0, data] - - [0xE019E0, data] - - [0xE04180, data] - - [0xE052C0] + - [0xDF6A00, c, end_00_0_init] + - [0xDF6A20, c, end_00_1_main] + - [0xDF6A20, c, end_00_2_credits] + - [0xDF9080, c, end_00_3_parade_setup] + - [0xDF9080, c, end_00_4_allies] + - [0xDF9300, c, end_00_5_koopas] + - [0xDF9300, c, end_00_6_caravan] + - [0xDF9510, c, end_00_7_boos] + - [0xDF9510, c, end_00_8_yoshis] + - [0xDF9510, c, end_00_9_huff_n_puff] + - [0xDF9510, c, end_00_A_crystal_king] + - [0xDF9510, c, end_00_B_bowser] + - [0xDF9540] - name: end_01 dir: world/area_end/end_01 type: code start: 0xE05360 vram: 0x80240000 subsegments: - - [0xE05360, c] - - [0xE05370, c] - - [0xE05390, c] - - [0xE07C20, c] - - [0xE08050, c] - - [0xE08350, data] - - [0xE08470, data] - - [0xE0B5F0, data] - - [0xE0C0C0, data] - - [0xE0D510, data] - - [0xE0E740] + - [0xE05360, c, end_01_0_init] + - [0xE05370, c, end_01_1_main] + - [0xE05390, c, end_01_2_credits] + - [0xE079F0, c, end_01_3_parade_setup] + - [0xE07C20, c, end_01_4_opera_float] + - [0xE07C20, c, end_01_5_flower_float] + - [0xE08050, c, end_01_6_shyguy_float] + - [0xE08050, c, end_01_7_peach_float] + - [0xE08350] - name: mgm_00 dir: world/area_mgm/mgm_00 type: code start: 0xE0E7A0 vram: 0x80240000 subsegments: - - [0xE0E7A0, c] - - [0xE0F980, c] - - [0xE0FF60, data] - - [0xE111A0, data] - - [0xE123E0, data] - - [0xE12570] + - [0xE0E7A0, c, mgm_00_1_main] + - [0xE0EA80, c, mgm_00_2_npc] + - [0xE0F980, c, mgm_00_3_scoreboard] + - [0xE0FF60] - name: mgm_01 dir: world/area_mgm/mgm_01 type: code start: 0xE12760 vram: 0x80240000 subsegments: - - [0xE12760, c] - - [0xE12930, c] - - [0xE13F10, data] - - [0xE141D0, data] - - [0xE15440, data] - - [0xE15D10] + - [0xE12760, c, mgm_01_1_main] + - [0xE12930, c, mgm_01_2_npc] + - [0xE12930, c, mgm_01_3_entity] + - [0xE12930, c, mgm_01_4_images] + - [0xE13F10, .data, mgm_01_1_main] + - [0xE141D0, .data, mgm_01_2_npc] + - [0xE153A0, .data, mgm_01_3_entity] + - start: 0xE15440 + type: .data + name: mgm_01_4_images + subsegments: + - [0xE15440, ci4, panel_1_coin, 32, 32] + - [0xE15640, palette, panel_1_coin] + - [0xE15660, ci4, panel_5_coins, 32, 32] + - [0xE15860, palette, panel_5_coins] + - [0xE15880, ci4, panel_times_5, 32, 32] + - [0xE15A80, palette, panel_times_5] + - [0xE15AA0, ci4, panel_bowser, 32, 32] + - [0xE15CA0, palette, panel_bowser] + - [0xE15CC0] - name: mgm_02 dir: world/area_mgm/mgm_02 type: code start: 0xE15D80 vram: 0x80240000 subsegments: - - [0xE15D80, c] - - [0xE18150, c] - - [0xE18180, data] - - [0xE183D0, data] - - [0xE1E020, data] - - [0xE1E260] + - [0xE15D80, c, mgm_02_1_main] + - [0xE15D80, c, mgm_02_2_npc] + - [0xE15D80, c, mgm_02_3_images] + - [0xE18180, .data, mgm_02_1_main] + - [0xE183D0, .data, mgm_02_2_npc] + - start: 0xE1E020 + type: .data + name: mgm_02_3_images + subsegments: + - [0xE1E020, ci4, panel_peach, 32, 32] + - [0xE1E220, palette, panel_peach] + - [0xE1E240] - name: mgm_03 dir: world/area_mgm/mgm_03 type: code start: 0xE1E380 vram: 0x80240000 subsegments: - - [0xE1E380, data] + - [0xE1E380, c, mgm_03_1_main] - name: gv_01 dir: world/area_gv/gv_01 type: code @@ -13615,7 +13629,7 @@ segments: - ParadeDrummer - ParadeBanner - ParadeHorn - - ParadeTubbaBalloon + - ParadeTubba - ParadeWizard - ParadeMario - ParadeShyGuy diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 294679e7a2..77b7c1c32c 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -12595,19 +12595,19 @@ b_area_kzn_formation_14 = 0x80229E04; // type:data rom:0x59E0F4 b_area_kzn_formationTable = 0x80229E74; // type:data rom:0x59E164 b_area_kzn_stageTable = 0x8022A02C; // type:data rom:0x59E31C b_area_kzn2_StartRumbleWithParams = 0x80218000; // type:func rom:0x59E6E0 -func_80218058_59E738 = 0x80218058; // type:func rom:0x59E738 -func_8021812C_59E80C = 0x8021812C; // type:func rom:0x59E80C -func_80218224_59E904 = 0x80218224; // type:func rom:0x59E904 -func_802182E4_59E9C4 = 0x802182E4; // type:func rom:0x59E9C4 +b_area_kzn2_make_vine_interpolation = 0x80218058; // type:func rom:0x59E738 +b_area_kzn2_SetVineBonePos = 0x8021812C; // type:func rom:0x59E80C +b_area_kzn2_SetVineBoneRot = 0x80218224; // type:func rom:0x59E904 +b_area_kzn2_SetVineBoneScale = 0x802182E4; // type:func rom:0x59E9C4 func_8021835C_59EA3C = 0x8021835C; // type:func rom:0x59EA3C b_area_kzn2_worker_render_piranha_vines = 0x802188B0; // type:func rom:0x59EF90 b_area_kzn2_MarkVineInterpolationDirty = 0x802188EC; // type:func rom:0x59EFCC b_area_kzn2_CreateVineRenderer = 0x802188FC; // type:func rom:0x59EFDC -func_80218930_59F010 = 0x80218930; // type:func rom:0x59F010 -func_80218A98_59F178 = 0x80218A98; // type:func rom:0x59F178 -func_80218B38_59F218 = 0x80218B38; // type:func rom:0x59F218 -func_80218B90_59F270 = 0x80218B90; // type:func rom:0x59F270 -func_80218BE8_59F2C8 = 0x80218BE8; // type:func rom:0x59F2C8 +b_area_kzn2_func_80218930_59F010 = 0x80218930; // type:func rom:0x59F010 +b_area_kzn2_func_80218A98_59F178 = 0x80218A98; // type:func rom:0x59F178 +b_area_kzn2_func_80218B38_59F218 = 0x80218B38; // type:func rom:0x59F218 +b_area_kzn2_func_80218B90_59F270 = 0x80218B90; // type:func rom:0x59F270 +b_area_kzn2_func_80218BE8_59F2C8 = 0x80218BE8; // type:func rom:0x59F2C8 b_area_kzn2_petit_piranha_SetFlameUnk2C = 0x80218D40; // type:func rom:0x59F420 b_area_kzn2_petit_piranha_SetFlameX = 0x80218D90; // type:func rom:0x59F470 func_80218DF0_59F4D0 = 0x80218DF0; // type:func rom:0x59F4D0 @@ -15448,9 +15448,9 @@ mac_05_unkAngleFunc002 = 0x80243800; // type:func rom:0x855970 mac_05_unkAngleFunc003 = 0x802438A4; // type:func rom:0x855A14 mac_05_UnkFloatFunc001 = 0x80243948; // type:func rom:0x855AB8 mac_05_UnkPlayerPosFunc = 0x80243AB8; // type:func rom:0x855C28 -mac_05_PlayFX3D = 0x80243BA4; // type:func rom:0x855D14 -mac_05_UpdatePosFX3D = 0x80243CD4; // type:func rom:0x855E44 -mac_05_DisposeFX3D = 0x80243D78; // type:func rom:0x855EE8 +mac_05_CreateWhaleGeyser = 0x80243BA4; // type:func rom:0x855D14 +mac_05_SetWhaleGeyserPos = 0x80243CD4; // type:func rom:0x855E44 +mac_05_DisposeWhaleGeyser = 0x80243D78; // type:func rom:0x855EE8 func_80243DB0_855F20 = 0x80243DB0; // type:func rom:0x855F20 func_80243F0C_85607C = 0x80243F0C; // type:func rom:0x85607C mac_05_Quizmo_varStash = 0x802450B0; // type:data rom:0x857220 @@ -15467,7 +15467,7 @@ D_802527B8_864928 = 0x802527B8; // type:data rom:0x864928 D_802529C8_864B38 = 0x802529C8; // type:data rom:0x864B38 mac_06_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0x864B40 mac_06_UpdateTexturePanStepped = 0x80240124; // type:func rom:0x864C64 -dup_mac_06_UnkFloatFunc001 = 0x8024030C; // type:func rom:0x864E4C +mac_06_GetWaveAmplitude = 0x8024030C; // type:func rom:0x864E4C mac_06_SpawnSunEffect = 0x8024047C; // type:func rom:0x864FBC mac_06_resolve_npc = 0x802404C0; // type:func rom:0x865000 mac_06_UnkAngleFunc001 = 0x8024050C; // type:func rom:0x86504C @@ -15476,9 +15476,9 @@ mac_06_unkAngleFunc002 = 0x802408D0; // type:func rom:0x865410 mac_06_unkAngleFunc003 = 0x80240974; // type:func rom:0x8654B4 jan_00_UnkFloatFunc001 = 0x80240A18; // type:func rom:0x865558 mac_06_UnkPlayerPosFunc = 0x80240B88; // type:func rom:0x8656C8 -mac_06_PlayFX3D = 0x80240C74; // type:func rom:0x8657B4 -mac_06_UpdatePosFX3D = 0x80240DA4; // type:func rom:0x8658E4 -mac_06_DisposeFX3D = 0x80240E48; // type:func rom:0x865988 +mac_06_CreateWhaleGeyser = 0x80240C74; // type:func rom:0x8657B4 +mac_06_SetWhaleGeyserPos = 0x80240DA4; // type:func rom:0x8658E4 +mac_06_DisposeWhaleGeyser = 0x80240E48; // type:func rom:0x865988 func_80240E80_8659C0 = 0x80240E80; // type:func rom:0x8659C0 func_80241098_865BD8 = 0x80241098; // type:func rom:0x865BD8 func_80241290_865DD0 = 0x80241290; // type:func rom:0x865DD0 @@ -15874,7 +15874,7 @@ kgr_01_TongueWiggleTime = 0x802407C0; // type:data rom:0x8AA1D0 D_80240A30_8AA440 = 0x80240A30; // type:data rom:0x8AA440 D_80240A38_8AA448 = 0x80240A38; // type:data rom:0x8AA448 kgr_02_DarkRoomUpdate = 0x80240000; // type:func rom:0x8AA450 -func_80240160_8AA5B0 = 0x80240160; // type:func rom:0x8AA5B0 +kgr_02_func_80240160_8AA5B0 = 0x80240160; // type:func rom:0x8AA5B0 kgr_02_func_80240730_8AAB80 = 0x80240730; // type:func rom:0x8AAB80 kgr_02_func_80240748_8AAB98 = 0x80240748; // type:func rom:0x8AAB98 kgr_02_HasBombetteExploded = 0x80240760; // type:func rom:0x8AABB0 @@ -19074,31 +19074,33 @@ func_80240448_B141B8 = 0x80240448; // type:func rom:0xB141B8 D_80240B00_B14870 = 0x80240B00; // type:data rom:0xB14870 func_80240000_B150B0 = 0x80240000; // type:func rom:0xB150B0 func_80240030_B150E0 = 0x80240030; // type:func rom:0xB150E0 -func_80240000_B1B570 = 0x80240000; // type:func rom:0xB1B570 -func_802400FC_B1B66C = 0x802400FC; // type:func rom:0xB1B66C -func_80240260_B1B7D0 = 0x80240260; // type:func rom:0xB1B7D0 -func_8024029C_B1B80C = 0x8024029C; // type:func rom:0xB1B80C -func_80240360_B1B8D0 = 0x80240360; // type:func rom:0xB1B8D0 -func_80240510_B1BA80 = 0x80240510; // type:func rom:0xB1BA80 -func_80240574_B1BAE4 = 0x80240574; // type:func rom:0xB1BAE4 -func_802405B0_B1BB20 = 0x802405B0; // type:func rom:0xB1BB20 -func_802405D4_B1BB44 = 0x802405D4; // type:func rom:0xB1BB44 -func_80240628_B1BB98 = 0x80240628; // type:func rom:0xB1BB98 -func_80240660_B1BBD0 = 0x80240660; // type:func rom:0xB1BBD0 -func_80240000_B1CA50 = 0x80240000; // type:func rom:0xB1CA50 -func_8024003C_B1CA8C = 0x8024003C; // type:func rom:0xB1CA8C -func_80240100_B1CB50 = 0x80240100; // type:func rom:0xB1CB50 -func_802402B8_B1CD08 = 0x802402B8; // type:func rom:0xB1CD08 -func_802402F4_B1CD44 = 0x802402F4; // type:func rom:0xB1CD44 -func_802403B8_B1CE08 = 0x802403B8; // type:func rom:0xB1CE08 -func_802406D4_B1D124 = 0x802406D4; // type:func rom:0xB1D124 -tst_11_SetPartnerFlagsA0000 = 0x80240730; // type:func rom:0xB1D180 -func_80240000_B1D760 = 0x80240000; // type:func rom:0xB1D760 +tst_04_PushGoompaTest = 0x80240000; // type:func rom:0xB1B570 +tst_04_PushPartnerTest = 0x802400FC; // type:func rom:0xB1B66C +tst_04_EnablePlayerReflection = 0x80240260; // type:func rom:0xB1B7D0 +tst_04_worker_render_player_reflection = 0x8024029C; // type:func rom:0xB1B80C +tst_04_appendGfx_test_player_reflection = 0x80240360; // type:func rom:0xB1B8D0 +tst_04_EnablePartnerReflection = 0x80240510; // type:func rom:0xB1BA80 +tst_04_worker_update_partner_reflection = 0x80240574; // type:func rom:0xB1BAE4 +tst_04_worker_update_animator = 0x802405B0; // type:func rom:0xB1BB20 +tst_04_worker_render_animator = 0x802405D4; // type:func rom:0xB1BB44 +tst_04_SetupAnimatedModel = 0x80240628; // type:func rom:0xB1BB98 +tst_04_DisableOwnerShadow = 0x80240660; // type:func rom:0xB1BBD0 +tst_11_EnableWallReflectionTest = 0x80240000; // type:func rom:0xB1CA50 +tst_11_test_reflection_worker_render_wall = 0x8024003C; // type:func rom:0xB1CA8C +tst_11_appendGfx_test_reflection_wall = 0x80240100; // type:func rom:0xB1CB50 +tst_11_EnableFloorReflectionTest = 0x802402B8; // type:func rom:0xB1CD08 +tst_11_test_reflection_worker_render_floor = 0x802402F4; // type:func rom:0xB1CD44 +tst_11_appendGfx_test_reflection_floor = 0x802403B8; // type:func rom:0xB1CE08 +tst_11_PartnerReflectTest = 0x802406D4; // type:func rom:0xB1D124 +tst_11_test_reflection_worker_partner = 0x80240730; // type:func rom:0xB1D180 +tst_11_func_80240000_B1D760 = 0x80240000; // type:func rom:0xB1D760 tst_13_UnkDistFunc2 = 0x802400A0; // type:func rom:0xB1D800 -func_8024013C_B1D89C = 0x8024013C; // type:func rom:0xB1D89C -D_80242860_B1FFC0 = 0x80242860; // type:data rom:0xB1FFC0 -D_80242BF8_B20358 = 0x80242BF8; // type:data rom:0xB20358 -D_80242D00_B20460 = 0x80242D00; // type:data rom:0xB20460 +tst_13_func_8024013C_B1D89C = 0x8024013C; // type:func rom:0xB1D89C +tst_13_shockwave_vtx = 0x802422B0; // type:data rom:0xB1FA10 size:0x5B0 +tst_13_shockwave_gfx = 0x80242860; // type:data rom:0xB1FFC0 +tst_13_dummy_gfx = 0x80242BF0; // type:data rom:0xB20350 +tst_13_D_80242BF8_B20358 = 0x80242BF8; // type:data rom:0xB20358 +tst_13_D_80242BFC_B2035C = 0x80242D00; // type:data rom:0xB20460 jan_00_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xB20540 jan_00_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xB20664 func_8024030C_B2084C = 0x8024030C; // type:func rom:0xB2084C @@ -19124,7 +19126,7 @@ jan_00_unkVtxFunc001 = 0x80241338; // type:func rom:0xB21878 jan_00_unkAngleFunc002 = 0x802415B0; // type:func rom:0xB21AF0 jan_00_unkAngleFunc003 = 0x80241654; // type:func rom:0xB21B94 mac_06_UnkFloatFunc001 = 0x802416F8; // type:func rom:0xB21C38 -func_80241868_B21DA8 = 0x80241868; // type:func rom:0xB21DA8 +jan_00_UnkPlayerPosFunc = 0x80241868; // type:func rom:0xB21DA8 jan_00_foliage_setup_shear_mtx = 0x80241960; // type:func rom:0xB21EA0 jan_00_TransformFoliage = 0x802419D0; // type:func rom:0xB21F10 jan_00_varStash = 0x802423C8; // type:data rom:0xB22908 @@ -22319,7 +22321,7 @@ kzn_19_LoadAnimationFromTable = 0x80241BC0; // type:func rom:0xC8F770 kzn_19_lava_piranha_vine_img = 0x802434D8; // type:data rom:0xC91088 kzn_19_lava_piranha_vine_pal = 0x802438D8; // type:data rom:0xC91488 kzn_19_lava_piranha_vine_gfx = 0x80243AD8; // type:data rom:0xC91688 -VineAnimationsDmaTable = 0x80243BB8; // type:data rom:0xC91768 +kzn_19_VineAnimationsDmaTable = 0x80243BB8; // type:data rom:0xC91768 kzn_19_varStash = 0x80243D74; // type:data rom:0xC91924 D_80243DD8_C91988 = 0x80243DD8; // type:data rom:0xC91988 D_80243DDC_C9198C = 0x80243DDC; // type:data rom:0xC9198C @@ -23835,17 +23837,17 @@ func_80240238_D4BC58 = 0x80240238; // type:func rom:0xD4BC58 pra_01_SetGameStatusUnk84_1 = 0x80240000; // type:func rom:0xD4D040 pra_01_reflection_unk_resolve_anim = 0x80240020; // type:func rom:0xD4D060 pra_01_reflection_unk_change_anim_facing = 0x80240054; // type:func rom:0xD4D094 -pra_01_ReflectWall = 0x802400EC; // type:func rom:0xD4D12C -pra_01_reflection_setup_wall = 0x80240128; // type:func rom:0xD4D168 -pra_01_reflection_render_wall = 0x802402F0; // type:func rom:0xD4D330 -pra_01_ReflectFloor = 0x8024049C; // type:func rom:0xD4D4DC -pra_01_reflection_setup_floor = 0x80240500; // type:func rom:0xD4D540 -pra_01_reflection_render_floor = 0x8024068C; // type:func rom:0xD4D6CC -pra_01_reflection_render_floor_fancy = 0x80240870; // type:func rom:0xD4D8B0 -pra_01_ReflectPartner = 0x80240D3C; // type:func rom:0xD4DD7C -pra_01_SetPartnerFlagsA0000 = 0x80240E84; // type:func rom:0xD4DEC4 -pra_01_SetPartnerFlags80000 = 0x80240EB8; // type:func rom:0xD4DEF8 -pra_01_SetPartnerFlags20000 = 0x80240EEC; // type:func rom:0xD4DF2C +pra_01_EnableWallReflection = 0x802400EC; // type:func rom:0xD4D12C +pra_01_worker_reflect_player_wall = 0x80240128; // type:func rom:0xD4D168 +pra_01_appendGfx_reflect_player_wall = 0x802402F0; // type:func rom:0xD4D330 +pra_01_EnableFloorReflection = 0x8024049C; // type:func rom:0xD4D4DC +pra_01_worker_reflect_player_floor = 0x80240500; // type:func rom:0xD4D540 +pra_01_appendGfx_reflect_player_floor_basic = 0x8024068C; // type:func rom:0xD4D6CC +pra_01_appendGfx_reflect_player_floor_fancy = 0x80240870; // type:func rom:0xD4D8B0 +pra_01_EnablePartnerReflection = 0x80240D3C; // type:func rom:0xD4DD7C +pra_01_worker_reflect_partner_all = 0x80240E84; // type:func rom:0xD4DEC4 +pra_01_worker_reflect_partner_floor = 0x80240EB8; // type:func rom:0xD4DEF8 +pra_01_worker_reflect_partner_wall = 0x80240EEC; // type:func rom:0xD4DF2C pra_01_UnkFogFunc = 0x80240F20; // type:func rom:0xD4DF60 func_80240F60_D4DFA0 = 0x80240F60; // type:func rom:0xD4DFA0 pra_01_GetNpcCollisionHeight = 0x80240F80; // type:func rom:0xD4DFC0 @@ -23860,17 +23862,17 @@ D_80241F98_D4EFD8 = 0x80241F98; // type:data rom:0xD4EFD8 pra_02_SetGameStatusUnk84_1 = 0x80240000; // type:func rom:0xD4FFF0 pra_02_reflection_unk_resolve_anim = 0x80240020; // type:func rom:0xD50010 pra_02_reflection_unk_change_anim_facing = 0x80240054; // type:func rom:0xD50044 -pra_02_ReflectWall = 0x802400EC; // type:func rom:0xD500DC -pra_02_reflection_setup_wall = 0x80240128; // type:func rom:0xD50118 -pra_02_reflection_render_wall = 0x802402F0; // type:func rom:0xD502E0 -pra_02_ReflectFloor = 0x8024049C; // type:func rom:0xD5048C -pra_02_reflection_setup_floor = 0x80240500; // type:func rom:0xD504F0 -pra_02_reflection_render_floor = 0x8024068C; // type:func rom:0xD5067C -pra_02_reflection_render_floor_fancy = 0x80240870; // type:func rom:0xD50860 -pra_02_ReflectPartner = 0x80240D3C; // type:func rom:0xD50D2C -pra_02_SetPartnerFlagsA0000 = 0x80240E84; // type:func rom:0xD50E74 -pra_02_SetPartnerFlags80000 = 0x80240EB8; // type:func rom:0xD50EA8 -pra_02_SetPartnerFlags20000 = 0x80240EEC; // type:func rom:0xD50EDC +pra_02_EnableWallReflection = 0x802400EC; // type:func rom:0xD500DC +pra_02_worker_reflect_player_wall = 0x80240128; // type:func rom:0xD50118 +pra_02_appendGfx_reflect_player_wall = 0x802402F0; // type:func rom:0xD502E0 +pra_02_EnableFloorReflection = 0x8024049C; // type:func rom:0xD5048C +pra_02_worker_reflect_player_floor = 0x80240500; // type:func rom:0xD504F0 +pra_02_appendGfx_reflect_player_floor_basic = 0x8024068C; // type:func rom:0xD5067C +pra_02_appendGfx_reflect_player_floor_fancy = 0x80240870; // type:func rom:0xD50860 +pra_02_EnablePartnerReflection = 0x80240D3C; // type:func rom:0xD50D2C +pra_02_worker_reflect_partner_all = 0x80240E84; // type:func rom:0xD50E74 +pra_02_worker_reflect_partner_floor = 0x80240EB8; // type:func rom:0xD50EA8 +pra_02_worker_reflect_partner_wall = 0x80240EEC; // type:func rom:0xD50EDC pra_02_GetNpcCollisionHeight = 0x80240F20; // type:func rom:0xD50F10 pra_02_AddPlayerHandsOffset = 0x80240F7C; // type:func rom:0xD50F6C func_8024114C_D5113C = 0x8024114C; // type:func rom:0xD5113C @@ -23899,17 +23901,17 @@ D_80241518_D55BA8 = 0x80241518; // type:data rom:0xD55BA8 pra_05_SetGameStatusUnk84_1 = 0x80240000; // type:func rom:0xD55BB0 pra_05_reflection_unk_resolve_anim = 0x80240020; // type:func rom:0xD55BD0 pra_05_reflection_unk_change_anim_facing = 0x80240054; // type:func rom:0xD55C04 -pra_05_ReflectWall = 0x802400EC; // type:func rom:0xD55C9C -pra_05_reflection_setup_wall = 0x80240128; // type:func rom:0xD55CD8 -pra_05_reflection_render_wall = 0x802402F0; // type:func rom:0xD55EA0 -pra_05_ReflectFloor = 0x8024049C; // type:func rom:0xD5604C -pra_05_reflection_setup_floor = 0x80240500; // type:func rom:0xD560B0 -pra_05_reflection_render_floor = 0x8024068C; // type:func rom:0xD5623C -pra_05_reflection_render_floor_fancy = 0x80240870; // type:func rom:0xD56420 -pra_05_ReflectPartner = 0x80240D3C; // type:func rom:0xD568EC -pra_05_SetPartnerFlagsA0000 = 0x80240E84; // type:func rom:0xD56A34 -pra_05_SetPartnerFlags80000 = 0x80240EB8; // type:func rom:0xD56A68 -pra_05_SetPartnerFlags20000 = 0x80240EEC; // type:func rom:0xD56A9C +pra_05_EnableWallReflection = 0x802400EC; // type:func rom:0xD55C9C +pra_05_worker_reflect_player_wall = 0x80240128; // type:func rom:0xD55CD8 +pra_05_appendGfx_reflect_player_wall = 0x802402F0; // type:func rom:0xD55EA0 +pra_05_EnableFloorReflection = 0x8024049C; // type:func rom:0xD5604C +pra_05_worker_reflect_player_floor = 0x80240500; // type:func rom:0xD560B0 +pra_05_appendGfx_reflect_player_floor_basic = 0x8024068C; // type:func rom:0xD5623C +pra_05_appendGfx_reflect_player_floor_fancy = 0x80240870; // type:func rom:0xD56420 +pra_05_EnablePartnerReflection = 0x80240D3C; // type:func rom:0xD568EC +pra_05_worker_reflect_partner_all = 0x80240E84; // type:func rom:0xD56A34 +pra_05_worker_reflect_partner_floor = 0x80240EB8; // type:func rom:0xD56A68 +pra_05_worker_reflect_partner_wall = 0x80240EEC; // type:func rom:0xD56A9C pra_05_StashVars = 0x80240F20; // type:func rom:0xD56AD0 pra_05_GetItemName = 0x80240FD4; // type:func rom:0xD56B84 pra_05_SomeItemEntityFunc = 0x80241038; // type:func rom:0xD56BE8 @@ -23918,33 +23920,33 @@ pra_05_varStash = 0x80241680; // type:data rom:0xD57230 func_80240000_D57430 = 0x80240000; // type:func rom:0xD57430 pra_06_reflection_unk_resolve_anim = 0x80240050; // type:func rom:0xD57480 pra_06_reflection_unk_change_anim_facing = 0x80240084; // type:func rom:0xD574B4 -pra_06_ReflectWall = 0x8024011C; // type:func rom:0xD5754C -pra_06_reflection_setup_wall = 0x80240158; // type:func rom:0xD57588 -pra_06_reflection_render_wall = 0x80240320; // type:func rom:0xD57750 -pra_06_ReflectFloor = 0x802404CC; // type:func rom:0xD578FC -pra_06_reflection_setup_floor = 0x80240530; // type:func rom:0xD57960 -pra_06_reflection_render_floor = 0x802406BC; // type:func rom:0xD57AEC -pra_06_reflection_render_floor_fancy = 0x802408A0; // type:func rom:0xD57CD0 -pra_06_ReflectPartner = 0x80240D6C; // type:func rom:0xD5819C -pra_06_SetPartnerFlagsA0000 = 0x80240EB4; // type:func rom:0xD582E4 -pra_06_SetPartnerFlags80000 = 0x80240EE8; // type:func rom:0xD58318 -pra_06_SetPartnerFlags20000 = 0x80240F1C; // type:func rom:0xD5834C +pra_06_EnableWallReflection = 0x8024011C; // type:func rom:0xD5754C +pra_06_worker_reflect_player_wall = 0x80240158; // type:func rom:0xD57588 +pra_06_appendGfx_reflect_player_wall = 0x80240320; // type:func rom:0xD57750 +pra_06_EnableFloorReflection = 0x802404CC; // type:func rom:0xD578FC +pra_06_worker_reflect_player_floor = 0x80240530; // type:func rom:0xD57960 +pra_06_appendGfx_reflect_player_floor_basic = 0x802406BC; // type:func rom:0xD57AEC +pra_06_appendGfx_reflect_player_floor_fancy = 0x802408A0; // type:func rom:0xD57CD0 +pra_06_EnablePartnerReflection = 0x80240D6C; // type:func rom:0xD5819C +pra_06_worker_reflect_partner_all = 0x80240EB4; // type:func rom:0xD582E4 +pra_06_worker_reflect_partner_floor = 0x80240EE8; // type:func rom:0xD58318 +pra_06_worker_reflect_partner_wall = 0x80240F1C; // type:func rom:0xD5834C D_80241430_D58860 = 0x80241430; // type:data rom:0xD58860 D_80241440_D58870 = 0x80241440; // type:data rom:0xD58870 pra_09_SetGameStatusUnk84_1 = 0x80240000; // type:func rom:0xD58890 pra_09_reflection_unk_resolve_anim = 0x80240020; // type:func rom:0xD588B0 pra_09_reflection_unk_change_anim_facing = 0x80240054; // type:func rom:0xD588E4 -pra_09_ReflectWall = 0x802400EC; // type:func rom:0xD5897C -pra_09_reflection_setup_wall = 0x80240128; // type:func rom:0xD589B8 -pra_09_reflection_render_wall = 0x802402F0; // type:func rom:0xD58B80 -pra_09_ReflectFloor = 0x8024049C; // type:func rom:0xD58D2C -pra_09_reflection_setup_floor = 0x80240500; // type:func rom:0xD58D90 -pra_09_reflection_render_floor = 0x8024068C; // type:func rom:0xD58F1C -pra_09_reflection_render_floor_fancy = 0x80240870; // type:func rom:0xD59100 -pra_09_ReflectPartner = 0x80240D3C; // type:func rom:0xD595CC -pra_09_SetPartnerFlagsA0000 = 0x80240E84; // type:func rom:0xD59714 -pra_09_SetPartnerFlags80000 = 0x80240EB8; // type:func rom:0xD59748 -pra_09_SetPartnerFlags20000 = 0x80240EEC; // type:func rom:0xD5977C +pra_09_EnableWallReflection = 0x802400EC; // type:func rom:0xD5897C +pra_09_worker_reflect_player_wall = 0x80240128; // type:func rom:0xD589B8 +pra_09_appendGfx_reflect_player_wall = 0x802402F0; // type:func rom:0xD58B80 +pra_09_EnableFloorReflection = 0x8024049C; // type:func rom:0xD58D2C +pra_09_worker_reflect_player_floor = 0x80240500; // type:func rom:0xD58D90 +pra_09_appendGfx_reflect_player_floor_basic = 0x8024068C; // type:func rom:0xD58F1C +pra_09_appendGfx_reflect_player_floor_fancy = 0x80240870; // type:func rom:0xD59100 +pra_09_EnablePartnerReflection = 0x80240D3C; // type:func rom:0xD595CC +pra_09_worker_reflect_partner_all = 0x80240E84; // type:func rom:0xD59714 +pra_09_worker_reflect_partner_floor = 0x80240EB8; // type:func rom:0xD59748 +pra_09_worker_reflect_partner_wall = 0x80240EEC; // type:func rom:0xD5977C pra_09_GetNpcCollisionHeight = 0x80240F20; // type:func rom:0xD597B0 pra_09_AddPlayerHandsOffset = 0x80240F7C; // type:func rom:0xD5980C func_8024114C_D599DC = 0x8024114C; // type:func rom:0xD599DC @@ -23960,34 +23962,34 @@ D_80241D9C_D5A62C = 0x80241D9C; // type:data rom:0xD5A62C pra_10_SetGameStatusUnk84_1 = 0x80240000; // type:func rom:0xD5F2B0 pra_10_reflection_unk_resolve_anim = 0x80240020; // type:func rom:0xD5F2D0 pra_10_reflection_unk_change_anim_facing = 0x80240054; // type:func rom:0xD5F304 -pra_10_ReflectWall = 0x802400EC; // type:func rom:0xD5F39C -pra_10_reflection_setup_wall = 0x80240128; // type:func rom:0xD5F3D8 -pra_10_reflection_render_wall = 0x802402F0; // type:func rom:0xD5F5A0 -pra_10_ReflectFloor = 0x8024049C; // type:func rom:0xD5F74C -pra_10_reflection_setup_floor = 0x80240500; // type:func rom:0xD5F7B0 -pra_10_reflection_render_floor = 0x8024068C; // type:func rom:0xD5F93C -pra_10_reflection_render_floor_fancy = 0x80240870; // type:func rom:0xD5FB20 -pra_10_ReflectPartner = 0x80240D3C; // type:func rom:0xD5FFEC -pra_10_SetPartnerFlagsA0000 = 0x80240E84; // type:func rom:0xD60134 -pra_10_SetPartnerFlags80000 = 0x80240EB8; // type:func rom:0xD60168 -pra_10_SetPartnerFlags20000 = 0x80240EEC; // type:func rom:0xD6019C +pra_10_EnableWallReflection = 0x802400EC; // type:func rom:0xD5F39C +pra_10_worker_reflect_player_wall = 0x80240128; // type:func rom:0xD5F3D8 +pra_10_appendGfx_reflect_player_wall = 0x802402F0; // type:func rom:0xD5F5A0 +pra_10_EnableFloorReflection = 0x8024049C; // type:func rom:0xD5F74C +pra_10_worker_reflect_player_floor = 0x80240500; // type:func rom:0xD5F7B0 +pra_10_appendGfx_reflect_player_floor_basic = 0x8024068C; // type:func rom:0xD5F93C +pra_10_appendGfx_reflect_player_floor_fancy = 0x80240870; // type:func rom:0xD5FB20 +pra_10_EnablePartnerReflection = 0x80240D3C; // type:func rom:0xD5FFEC +pra_10_worker_reflect_partner_all = 0x80240E84; // type:func rom:0xD60134 +pra_10_worker_reflect_partner_floor = 0x80240EB8; // type:func rom:0xD60168 +pra_10_worker_reflect_partner_wall = 0x80240EEC; // type:func rom:0xD6019C pra_10_UnkFunc001 = 0x80240F20; // type:func rom:0xD601D0 D_80242240_D614F0 = 0x80242240; // type:data rom:0xD614F0 D_80242248_D614F8 = 0x80242248; // type:data rom:0xD614F8 pra_11_SetGameStatusUnk84_1 = 0x80240000; // type:func rom:0xD61500 pra_11_reflection_unk_resolve_anim = 0x80240020; // type:func rom:0xD61520 pra_11_reflection_unk_change_anim_facing = 0x80240054; // type:func rom:0xD61554 -pra_11_ReflectWall = 0x802400EC; // type:func rom:0xD615EC -pra_11_reflection_setup_wall = 0x80240128; // type:func rom:0xD61628 -pra_11_reflection_render_wall = 0x802402F0; // type:func rom:0xD617F0 -pra_11_ReflectFloor = 0x8024049C; // type:func rom:0xD6199C -pra_11_reflection_setup_floor = 0x80240500; // type:func rom:0xD61A00 -pra_11_reflection_render_floor = 0x8024068C; // type:func rom:0xD61B8C -pra_11_reflection_render_floor_fancy = 0x80240870; // type:func rom:0xD61D70 -pra_11_ReflectPartner = 0x80240D3C; // type:func rom:0xD6223C -pra_11_SetPartnerFlagsA0000 = 0x80240E84; // type:func rom:0xD62384 -pra_11_SetPartnerFlags80000 = 0x80240EB8; // type:func rom:0xD623B8 -pra_11_SetPartnerFlags20000 = 0x80240EEC; // type:func rom:0xD623EC +pra_11_EnableWallReflection = 0x802400EC; // type:func rom:0xD615EC +pra_11_worker_reflect_player_wall = 0x80240128; // type:func rom:0xD61628 +pra_11_appendGfx_reflect_player_wall = 0x802402F0; // type:func rom:0xD617F0 +pra_11_EnableFloorReflection = 0x8024049C; // type:func rom:0xD6199C +pra_11_worker_reflect_player_floor = 0x80240500; // type:func rom:0xD61A00 +pra_11_appendGfx_reflect_player_floor_basic = 0x8024068C; // type:func rom:0xD61B8C +pra_11_appendGfx_reflect_player_floor_fancy = 0x80240870; // type:func rom:0xD61D70 +pra_11_EnablePartnerReflection = 0x80240D3C; // type:func rom:0xD6223C +pra_11_worker_reflect_partner_all = 0x80240E84; // type:func rom:0xD62384 +pra_11_worker_reflect_partner_floor = 0x80240EB8; // type:func rom:0xD623B8 +pra_11_worker_reflect_partner_wall = 0x80240EEC; // type:func rom:0xD623EC pra_11_StashVars = 0x80240F20; // type:func rom:0xD62420 pra_11_GetItemName = 0x80240FD4; // type:func rom:0xD624D4 pra_11_SomeItemEntityFunc = 0x80241038; // type:func rom:0xD62538 @@ -23996,17 +23998,17 @@ pra_11_varStash = 0x80241610; // type:data rom:0xD62B10 func_80240000_D62D10 = 0x80240000; // type:func rom:0xD62D10 pra_12_reflection_unk_resolve_anim = 0x80240050; // type:func rom:0xD62D60 pra_12_reflection_unk_change_anim_facing = 0x80240084; // type:func rom:0xD62D94 -pra_12_ReflectWall = 0x8024011C; // type:func rom:0xD62E2C -pra_12_reflection_setup_wall = 0x80240158; // type:func rom:0xD62E68 -pra_12_reflection_render_wall = 0x80240320; // type:func rom:0xD63030 -pra_12_ReflectFloor = 0x802404CC; // type:func rom:0xD631DC -pra_12_reflection_setup_floor = 0x80240530; // type:func rom:0xD63240 -pra_12_reflection_render_floor = 0x802406BC; // type:func rom:0xD633CC -pra_12_reflection_render_floor_fancy = 0x802408A0; // type:func rom:0xD635B0 -pra_12_ReflectPartner = 0x80240D6C; // type:func rom:0xD63A7C -pra_12_SetPartnerFlagsA0000 = 0x80240EB4; // type:func rom:0xD63BC4 -pra_12_SetPartnerFlags80000 = 0x80240EE8; // type:func rom:0xD63BF8 -pra_12_SetPartnerFlags20000 = 0x80240F1C; // type:func rom:0xD63C2C +pra_12_EnableWallReflection = 0x8024011C; // type:func rom:0xD62E2C +pra_12_worker_reflect_player_wall = 0x80240158; // type:func rom:0xD62E68 +pra_12_appendGfx_reflect_player_wall = 0x80240320; // type:func rom:0xD63030 +pra_12_EnableFloorReflection = 0x802404CC; // type:func rom:0xD631DC +pra_12_worker_reflect_player_floor = 0x80240530; // type:func rom:0xD63240 +pra_12_appendGfx_reflect_player_floor_basic = 0x802406BC; // type:func rom:0xD633CC +pra_12_appendGfx_reflect_player_floor_fancy = 0x802408A0; // type:func rom:0xD635B0 +pra_12_EnablePartnerReflection = 0x80240D6C; // type:func rom:0xD63A7C +pra_12_worker_reflect_partner_all = 0x80240EB4; // type:func rom:0xD63BC4 +pra_12_worker_reflect_partner_floor = 0x80240EE8; // type:func rom:0xD63BF8 +pra_12_worker_reflect_partner_wall = 0x80240F1C; // type:func rom:0xD63C2C pra_12_StashVars = 0x80240F50; // type:func rom:0xD63C60 pra_12_GetItemName = 0x80241004; // type:func rom:0xD63D14 pra_12_SomeItemEntityFunc = 0x80241068; // type:func rom:0xD63D78 @@ -24017,17 +24019,17 @@ D_802418B0_D645C0 = 0x802418B0; // type:data rom:0xD645C0 pra_13_SetGameStatusUnk84_1 = 0x80240000; // type:func rom:0xD645E0 pra_13_reflection_unk_resolve_anim = 0x80240020; // type:func rom:0xD64600 pra_13_reflection_unk_change_anim_facing = 0x80240054; // type:func rom:0xD64634 -pra_13_ReflectWall = 0x802400EC; // type:func rom:0xD646CC -pra_13_reflection_setup_wall = 0x80240128; // type:func rom:0xD64708 -pra_13_reflection_render_wall = 0x802402F0; // type:func rom:0xD648D0 -pra_13_ReflectFloor = 0x8024049C; // type:func rom:0xD64A7C -pra_13_reflection_setup_floor = 0x80240500; // type:func rom:0xD64AE0 -pra_13_reflection_render_floor = 0x8024068C; // type:func rom:0xD64C6C -pra_13_reflection_render_floor_fancy = 0x80240870; // type:func rom:0xD64E50 -pra_13_ReflectPartner = 0x80240D3C; // type:func rom:0xD6531C -pra_13_SetPartnerFlagsA0000 = 0x80240E84; // type:func rom:0xD65464 -pra_13_SetPartnerFlags80000 = 0x80240EB8; // type:func rom:0xD65498 -pra_13_SetPartnerFlags20000 = 0x80240EEC; // type:func rom:0xD654CC +pra_13_EnableWallReflection = 0x802400EC; // type:func rom:0xD646CC +pra_13_worker_reflect_player_wall = 0x80240128; // type:func rom:0xD64708 +pra_13_appendGfx_reflect_player_wall = 0x802402F0; // type:func rom:0xD648D0 +pra_13_EnableFloorReflection = 0x8024049C; // type:func rom:0xD64A7C +pra_13_worker_reflect_player_floor = 0x80240500; // type:func rom:0xD64AE0 +pra_13_appendGfx_reflect_player_floor_basic = 0x8024068C; // type:func rom:0xD64C6C +pra_13_appendGfx_reflect_player_floor_fancy = 0x80240870; // type:func rom:0xD64E50 +pra_13_EnablePartnerReflection = 0x80240D3C; // type:func rom:0xD6531C +pra_13_worker_reflect_partner_all = 0x80240E84; // type:func rom:0xD65464 +pra_13_worker_reflect_partner_floor = 0x80240EB8; // type:func rom:0xD65498 +pra_13_worker_reflect_partner_wall = 0x80240EEC; // type:func rom:0xD654CC pra_13_GetNpcCollisionHeight = 0x80240F20; // type:func rom:0xD65500 pra_13_AddPlayerHandsOffset = 0x80240F7C; // type:func rom:0xD6555C func_8024114C_D6572C = 0x8024114C; // type:func rom:0xD6572C @@ -24044,17 +24046,17 @@ D_802422D0_D668B0 = 0x802422D0; // type:data rom:0xD668B0 pra_14_SetGameStatusUnk84_1 = 0x80240000; // type:func rom:0xD67D00 pra_14_reflection_unk_resolve_anim = 0x80240020; // type:func rom:0xD67D20 pra_14_reflection_unk_change_anim_facing = 0x80240054; // type:func rom:0xD67D54 -pra_14_ReflectWall = 0x802400EC; // type:func rom:0xD67DEC -pra_14_reflection_setup_wall = 0x80240128; // type:func rom:0xD67E28 -pra_14_reflection_render_wall = 0x802402F0; // type:func rom:0xD67FF0 -pra_14_ReflectFloor = 0x8024049C; // type:func rom:0xD6819C -pra_14_reflection_setup_floor = 0x80240500; // type:func rom:0xD68200 -pra_14_reflection_render_floor = 0x8024068C; // type:func rom:0xD6838C -pra_14_reflection_render_floor_fancy = 0x80240870; // type:func rom:0xD68570 -pra_14_ReflectPartner = 0x80240D3C; // type:func rom:0xD68A3C -pra_14_SetPartnerFlagsA0000 = 0x80240E84; // type:func rom:0xD68B84 -pra_14_SetPartnerFlags80000 = 0x80240EB8; // type:func rom:0xD68BB8 -pra_14_SetPartnerFlags20000 = 0x80240EEC; // type:func rom:0xD68BEC +pra_14_EnableWallReflection = 0x802400EC; // type:func rom:0xD67DEC +pra_14_worker_reflect_player_wall = 0x80240128; // type:func rom:0xD67E28 +pra_14_appendGfx_reflect_player_wall = 0x802402F0; // type:func rom:0xD67FF0 +pra_14_EnableFloorReflection = 0x8024049C; // type:func rom:0xD6819C +pra_14_worker_reflect_player_floor = 0x80240500; // type:func rom:0xD68200 +pra_14_appendGfx_reflect_player_floor_basic = 0x8024068C; // type:func rom:0xD6838C +pra_14_appendGfx_reflect_player_floor_fancy = 0x80240870; // type:func rom:0xD68570 +pra_14_EnablePartnerReflection = 0x80240D3C; // type:func rom:0xD68A3C +pra_14_worker_reflect_partner_all = 0x80240E84; // type:func rom:0xD68B84 +pra_14_worker_reflect_partner_floor = 0x80240EB8; // type:func rom:0xD68BB8 +pra_14_worker_reflect_partner_wall = 0x80240EEC; // type:func rom:0xD68BEC pra_14_StashVars = 0x80240F20; // type:func rom:0xD68C20 pra_14_GetItemName = 0x80240FD4; // type:func rom:0xD68CD4 pra_14_SomeItemEntityFunc = 0x80241038; // type:func rom:0xD68D38 @@ -24065,45 +24067,45 @@ func_80240020_D69830 = 0x80240020; // type:func rom:0xD69830 pra_16_SetGameStatusUnk84_1 = 0x80240000; // type:func rom:0xD69B20 pra_16_reflection_unk_resolve_anim = 0x80240020; // type:func rom:0xD69B40 pra_16_reflection_unk_change_anim_facing = 0x80240054; // type:func rom:0xD69B74 -pra_16_ReflectWall = 0x802400EC; // type:func rom:0xD69C0C -pra_16_reflection_setup_wall = 0x80240128; // type:func rom:0xD69C48 -pra_16_reflection_render_wall = 0x802402F0; // type:func rom:0xD69E10 -pra_16_ReflectFloor = 0x8024049C; // type:func rom:0xD69FBC -pra_16_reflection_setup_floor = 0x80240500; // type:func rom:0xD6A020 -pra_16_reflection_render_floor = 0x8024068C; // type:func rom:0xD6A1AC -pra_16_reflection_render_floor_fancy = 0x80240870; // type:func rom:0xD6A390 -pra_16_ReflectPartner = 0x80240D3C; // type:func rom:0xD6A85C -pra_16_SetPartnerFlagsA0000 = 0x80240E84; // type:func rom:0xD6A9A4 -pra_16_SetPartnerFlags80000 = 0x80240EB8; // type:func rom:0xD6A9D8 -pra_16_SetPartnerFlags20000 = 0x80240EEC; // type:func rom:0xD6AA0C +pra_16_EnableWallReflection = 0x802400EC; // type:func rom:0xD69C0C +pra_16_worker_reflect_player_wall = 0x80240128; // type:func rom:0xD69C48 +pra_16_appendGfx_reflect_player_wall = 0x802402F0; // type:func rom:0xD69E10 +pra_16_EnableFloorReflection = 0x8024049C; // type:func rom:0xD69FBC +pra_16_worker_reflect_player_floor = 0x80240500; // type:func rom:0xD6A020 +pra_16_appendGfx_reflect_player_floor_basic = 0x8024068C; // type:func rom:0xD6A1AC +pra_16_appendGfx_reflect_player_floor_fancy = 0x80240870; // type:func rom:0xD6A390 +pra_16_EnablePartnerReflection = 0x80240D3C; // type:func rom:0xD6A85C +pra_16_worker_reflect_partner_all = 0x80240E84; // type:func rom:0xD6A9A4 +pra_16_worker_reflect_partner_floor = 0x80240EB8; // type:func rom:0xD6A9D8 +pra_16_worker_reflect_partner_wall = 0x80240EEC; // type:func rom:0xD6AA0C pra_18_SetGameStatusUnk84_1 = 0x80240000; // type:func rom:0xD6B620 pra_18_reflection_unk_resolve_anim = 0x80240020; // type:func rom:0xD6B640 pra_18_reflection_unk_change_anim_facing = 0x80240054; // type:func rom:0xD6B674 -pra_18_ReflectWall = 0x802400EC; // type:func rom:0xD6B70C -pra_18_reflection_setup_wall = 0x80240128; // type:func rom:0xD6B748 -pra_18_reflection_render_wall = 0x802402F0; // type:func rom:0xD6B910 -pra_18_ReflectFloor = 0x8024049C; // type:func rom:0xD6BABC -pra_18_reflection_setup_floor = 0x80240500; // type:func rom:0xD6BB20 -pra_18_reflection_render_floor = 0x8024068C; // type:func rom:0xD6BCAC -pra_18_reflection_render_floor_fancy = 0x80240870; // type:func rom:0xD6BE90 -pra_18_ReflectPartner = 0x80240D3C; // type:func rom:0xD6C35C -pra_18_SetPartnerFlagsA0000 = 0x80240E84; // type:func rom:0xD6C4A4 -pra_18_SetPartnerFlags80000 = 0x80240EB8; // type:func rom:0xD6C4D8 -pra_18_SetPartnerFlags20000 = 0x80240EEC; // type:func rom:0xD6C50C +pra_18_EnableWallReflection = 0x802400EC; // type:func rom:0xD6B70C +pra_18_worker_reflect_player_wall = 0x80240128; // type:func rom:0xD6B748 +pra_18_appendGfx_reflect_player_wall = 0x802402F0; // type:func rom:0xD6B910 +pra_18_EnableFloorReflection = 0x8024049C; // type:func rom:0xD6BABC +pra_18_worker_reflect_player_floor = 0x80240500; // type:func rom:0xD6BB20 +pra_18_appendGfx_reflect_player_floor_basic = 0x8024068C; // type:func rom:0xD6BCAC +pra_18_appendGfx_reflect_player_floor_fancy = 0x80240870; // type:func rom:0xD6BE90 +pra_18_EnablePartnerReflection = 0x80240D3C; // type:func rom:0xD6C35C +pra_18_worker_reflect_partner_all = 0x80240E84; // type:func rom:0xD6C4A4 +pra_18_worker_reflect_partner_floor = 0x80240EB8; // type:func rom:0xD6C4D8 +pra_18_worker_reflect_partner_wall = 0x80240EEC; // type:func rom:0xD6C50C pra_19_SetGameStatusUnk84_1 = 0x80240000; // type:func rom:0xD6E9B0 pra_19_reflection_unk_resolve_anim = 0x80240020; // type:func rom:0xD6E9D0 pra_19_reflection_unk_change_anim_facing = 0x80240054; // type:func rom:0xD6EA04 -pra_19_ReflectWall = 0x802400EC; // type:func rom:0xD6EA9C -pra_19_reflection_setup_wall = 0x80240128; // type:func rom:0xD6EAD8 -pra_19_reflection_render_wall = 0x802402F0; // type:func rom:0xD6ECA0 -pra_19_ReflectFloor = 0x8024049C; // type:func rom:0xD6EE4C -pra_19_reflection_setup_floor = 0x80240500; // type:func rom:0xD6EEB0 -pra_19_reflection_render_floor = 0x8024068C; // type:func rom:0xD6F03C -pra_19_reflection_render_floor_fancy = 0x80240870; // type:func rom:0xD6F220 -pra_19_ReflectPartner = 0x80240D3C; // type:func rom:0xD6F6EC -pra_19_SetPartnerFlagsA0000 = 0x80240E84; // type:func rom:0xD6F834 -pra_19_SetPartnerFlags80000 = 0x80240EB8; // type:func rom:0xD6F868 -pra_19_SetPartnerFlags20000 = 0x80240EEC; // type:func rom:0xD6F89C +pra_19_EnableWallReflection = 0x802400EC; // type:func rom:0xD6EA9C +pra_19_worker_reflect_player_wall = 0x80240128; // type:func rom:0xD6EAD8 +pra_19_appendGfx_reflect_player_wall = 0x802402F0; // type:func rom:0xD6ECA0 +pra_19_EnableFloorReflection = 0x8024049C; // type:func rom:0xD6EE4C +pra_19_worker_reflect_player_floor = 0x80240500; // type:func rom:0xD6EEB0 +pra_19_appendGfx_reflect_player_floor_basic = 0x8024068C; // type:func rom:0xD6F03C +pra_19_appendGfx_reflect_player_floor_fancy = 0x80240870; // type:func rom:0xD6F220 +pra_19_EnablePartnerReflection = 0x80240D3C; // type:func rom:0xD6F6EC +pra_19_worker_reflect_partner_all = 0x80240E84; // type:func rom:0xD6F834 +pra_19_worker_reflect_partner_floor = 0x80240EB8; // type:func rom:0xD6F868 +pra_19_worker_reflect_partner_wall = 0x80240EEC; // type:func rom:0xD6F89C pra_19_GetNpcCollisionHeight = 0x80240F20; // type:func rom:0xD6F8D0 pra_19_AddPlayerHandsOffset = 0x80240F7C; // type:func rom:0xD6F92C func_8024114C_D6FAFC = 0x8024114C; // type:func rom:0xD6FAFC @@ -24124,17 +24126,17 @@ D_802421A0_D70B50 = 0x802421A0; // type:data rom:0xD70B50 pra_20_SetGameStatusUnk84_1 = 0x80240000; // type:func rom:0xD763A0 pra_20_reflection_unk_resolve_anim = 0x80240020; // type:func rom:0xD763C0 pra_20_reflection_unk_change_anim_facing = 0x80240054; // type:func rom:0xD763F4 -pra_20_ReflectWall = 0x802400EC; // type:func rom:0xD7648C -pra_20_reflection_setup_wall = 0x80240128; // type:func rom:0xD764C8 -pra_20_reflection_render_wall = 0x802402F0; // type:func rom:0xD76690 -pra_20_ReflectFloor = 0x8024049C; // type:func rom:0xD7683C -pra_20_reflection_setup_floor = 0x80240500; // type:func rom:0xD768A0 -pra_20_reflection_render_floor = 0x8024068C; // type:func rom:0xD76A2C -pra_20_reflection_render_floor_fancy = 0x80240870; // type:func rom:0xD76C10 -pra_20_ReflectPartner = 0x80240D3C; // type:func rom:0xD770DC -pra_20_SetPartnerFlagsA0000 = 0x80240E84; // type:func rom:0xD77224 -pra_20_SetPartnerFlags80000 = 0x80240EB8; // type:func rom:0xD77258 -pra_20_SetPartnerFlags20000 = 0x80240EEC; // type:func rom:0xD7728C +pra_20_EnableWallReflection = 0x802400EC; // type:func rom:0xD7648C +pra_20_worker_reflect_player_wall = 0x80240128; // type:func rom:0xD764C8 +pra_20_appendGfx_reflect_player_wall = 0x802402F0; // type:func rom:0xD76690 +pra_20_EnableFloorReflection = 0x8024049C; // type:func rom:0xD7683C +pra_20_worker_reflect_player_floor = 0x80240500; // type:func rom:0xD768A0 +pra_20_appendGfx_reflect_player_floor_basic = 0x8024068C; // type:func rom:0xD76A2C +pra_20_appendGfx_reflect_player_floor_fancy = 0x80240870; // type:func rom:0xD76C10 +pra_20_EnablePartnerReflection = 0x80240D3C; // type:func rom:0xD770DC +pra_20_worker_reflect_partner_all = 0x80240E84; // type:func rom:0xD77224 +pra_20_worker_reflect_partner_floor = 0x80240EB8; // type:func rom:0xD77258 +pra_20_worker_reflect_partner_wall = 0x80240EEC; // type:func rom:0xD7728C pra_21_SetGameStatusUnk84_1 = 0x80240000; // type:func rom:0xD77F20 func_80240020_D77F40 = 0x80240020; // type:func rom:0xD77F40 func_802400AC_D77FCC = 0x802400AC; // type:func rom:0xD77FCC @@ -24146,17 +24148,17 @@ func_8024025C_D78ADC = 0x8024025C; // type:func rom:0xD78ADC func_80240000_D799F0 = 0x80240000; // type:func rom:0xD799F0 pra_27_reflection_unk_resolve_anim = 0x80240050; // type:func rom:0xD79A40 pra_27_reflection_unk_change_anim_facing = 0x80240084; // type:func rom:0xD79A74 -pra_27_ReflectWall = 0x8024011C; // type:func rom:0xD79B0C -pra_27_reflection_setup_wall = 0x80240158; // type:func rom:0xD79B48 -pra_27_reflection_render_wall = 0x80240320; // type:func rom:0xD79D10 -pra_27_ReflectFloor = 0x802404CC; // type:func rom:0xD79EBC -pra_27_reflection_setup_floor = 0x80240530; // type:func rom:0xD79F20 -pra_27_reflection_render_floor = 0x802406BC; // type:func rom:0xD7A0AC -pra_27_reflection_render_floor_fancy = 0x802408A0; // type:func rom:0xD7A290 -pra_27_ReflectPartner = 0x80240D6C; // type:func rom:0xD7A75C -pra_27_SetPartnerFlagsA0000 = 0x80240EB4; // type:func rom:0xD7A8A4 -pra_27_SetPartnerFlags80000 = 0x80240EE8; // type:func rom:0xD7A8D8 -pra_27_SetPartnerFlags20000 = 0x80240F1C; // type:func rom:0xD7A90C +pra_27_EnableWallReflection = 0x8024011C; // type:func rom:0xD79B0C +pra_27_worker_reflect_player_wall = 0x80240158; // type:func rom:0xD79B48 +pra_27_appendGfx_reflect_player_wall = 0x80240320; // type:func rom:0xD79D10 +pra_27_EnableFloorReflection = 0x802404CC; // type:func rom:0xD79EBC +pra_27_worker_reflect_player_floor = 0x80240530; // type:func rom:0xD79F20 +pra_27_appendGfx_reflect_player_floor_basic = 0x802406BC; // type:func rom:0xD7A0AC +pra_27_appendGfx_reflect_player_floor_fancy = 0x802408A0; // type:func rom:0xD7A290 +pra_27_EnablePartnerReflection = 0x80240D6C; // type:func rom:0xD7A75C +pra_27_worker_reflect_partner_all = 0x80240EB4; // type:func rom:0xD7A8A4 +pra_27_worker_reflect_partner_floor = 0x80240EE8; // type:func rom:0xD7A8D8 +pra_27_worker_reflect_partner_wall = 0x80240F1C; // type:func rom:0xD7A90C pra_27_StashVars = 0x80240F50; // type:func rom:0xD7A940 pra_27_GetItemName = 0x80241004; // type:func rom:0xD7A9F4 pra_27_SomeItemEntityFunc = 0x80241068; // type:func rom:0xD7AA58 @@ -24167,17 +24169,17 @@ D_80241890_D7B280 = 0x80241890; // type:data rom:0xD7B280 func_80240000_D7B2A0 = 0x80240000; // type:func rom:0xD7B2A0 pra_28_reflection_unk_resolve_anim = 0x80240050; // type:func rom:0xD7B2F0 pra_28_reflection_unk_change_anim_facing = 0x80240084; // type:func rom:0xD7B324 -pra_28_ReflectWall = 0x8024011C; // type:func rom:0xD7B3BC -pra_28_reflection_setup_wall = 0x80240158; // type:func rom:0xD7B3F8 -pra_28_reflection_render_wall = 0x80240320; // type:func rom:0xD7B5C0 -pra_28_ReflectFloor = 0x802404CC; // type:func rom:0xD7B76C -pra_28_reflection_setup_floor = 0x80240530; // type:func rom:0xD7B7D0 -pra_28_reflection_render_floor = 0x802406BC; // type:func rom:0xD7B95C -pra_28_reflection_render_floor_fancy = 0x802408A0; // type:func rom:0xD7BB40 -pra_28_ReflectPartner = 0x80240D6C; // type:func rom:0xD7C00C -pra_28_SetPartnerFlagsA0000 = 0x80240EB4; // type:func rom:0xD7C154 -pra_28_SetPartnerFlags80000 = 0x80240EE8; // type:func rom:0xD7C188 -pra_28_SetPartnerFlags20000 = 0x80240F1C; // type:func rom:0xD7C1BC +pra_28_EnableWallReflection = 0x8024011C; // type:func rom:0xD7B3BC +pra_28_worker_reflect_player_wall = 0x80240158; // type:func rom:0xD7B3F8 +pra_28_appendGfx_reflect_player_wall = 0x80240320; // type:func rom:0xD7B5C0 +pra_28_EnableFloorReflection = 0x802404CC; // type:func rom:0xD7B76C +pra_28_worker_reflect_player_floor = 0x80240530; // type:func rom:0xD7B7D0 +pra_28_appendGfx_reflect_player_floor_basic = 0x802406BC; // type:func rom:0xD7B95C +pra_28_appendGfx_reflect_player_floor_fancy = 0x802408A0; // type:func rom:0xD7BB40 +pra_28_EnablePartnerReflection = 0x80240D6C; // type:func rom:0xD7C00C +pra_28_worker_reflect_partner_all = 0x80240EB4; // type:func rom:0xD7C154 +pra_28_worker_reflect_partner_floor = 0x80240EE8; // type:func rom:0xD7C188 +pra_28_worker_reflect_partner_wall = 0x80240F1C; // type:func rom:0xD7C1BC pra_28_StashVars = 0x80240F50; // type:func rom:0xD7C1F0 pra_28_GetItemName = 0x80241004; // type:func rom:0xD7C2A4 pra_28_SomeItemEntityFunc = 0x80241068; // type:func rom:0xD7C308 @@ -24188,17 +24190,17 @@ D_80241890_D7CB30 = 0x80241890; // type:data rom:0xD7CB30 pra_29_SetGameStatusUnk84_1 = 0x80240000; // type:func rom:0xD7CB50 pra_29_reflection_unk_resolve_anim = 0x80240020; // type:func rom:0xD7CB70 pra_29_reflection_unk_change_anim_facing = 0x80240054; // type:func rom:0xD7CBA4 -pra_29_ReflectWall = 0x802400EC; // type:func rom:0xD7CC3C -pra_29_reflection_setup_wall = 0x80240128; // type:func rom:0xD7CC78 -pra_29_reflection_render_wall = 0x802402F0; // type:func rom:0xD7CE40 -pra_29_ReflectFloor = 0x8024049C; // type:func rom:0xD7CFEC -pra_29_reflection_setup_floor = 0x80240500; // type:func rom:0xD7D050 -pra_29_reflection_render_floor = 0x8024068C; // type:func rom:0xD7D1DC -pra_29_reflection_render_floor_fancy = 0x80240870; // type:func rom:0xD7D3C0 -pra_29_ReflectPartner = 0x80240D3C; // type:func rom:0xD7D88C -pra_29_SetPartnerFlagsA0000 = 0x80240E84; // type:func rom:0xD7D9D4 -pra_29_SetPartnerFlags80000 = 0x80240EB8; // type:func rom:0xD7DA08 -pra_29_SetPartnerFlags20000 = 0x80240EEC; // type:func rom:0xD7DA3C +pra_29_EnableWallReflection = 0x802400EC; // type:func rom:0xD7CC3C +pra_29_worker_reflect_player_wall = 0x80240128; // type:func rom:0xD7CC78 +pra_29_appendGfx_reflect_player_wall = 0x802402F0; // type:func rom:0xD7CE40 +pra_29_EnableFloorReflection = 0x8024049C; // type:func rom:0xD7CFEC +pra_29_worker_reflect_player_floor = 0x80240500; // type:func rom:0xD7D050 +pra_29_appendGfx_reflect_player_floor_basic = 0x8024068C; // type:func rom:0xD7D1DC +pra_29_appendGfx_reflect_player_floor_fancy = 0x80240870; // type:func rom:0xD7D3C0 +pra_29_EnablePartnerReflection = 0x80240D3C; // type:func rom:0xD7D88C +pra_29_worker_reflect_partner_all = 0x80240E84; // type:func rom:0xD7D9D4 +pra_29_worker_reflect_partner_floor = 0x80240EB8; // type:func rom:0xD7DA08 +pra_29_worker_reflect_partner_wall = 0x80240EEC; // type:func rom:0xD7DA3C func_80240F20_D7DA70 = 0x80240F20; // type:func rom:0xD7DA70 func_802410B0_D7DC00 = 0x802410B0; // type:func rom:0xD7DC00 func_802411D4_D7DD24 = 0x802411D4; // type:func rom:0xD7DD24 @@ -24239,50 +24241,50 @@ func_80240814_D87214 = 0x80240814; // type:func rom:0xD87214 pra_33_SetGameStatusUnk84_1 = 0x80240000; // type:func rom:0xD896E0 pra_33_reflection_unk_resolve_anim = 0x80240020; // type:func rom:0xD89700 pra_33_reflection_unk_change_anim_facing = 0x80240054; // type:func rom:0xD89734 -pra_33_ReflectWall = 0x802400EC; // type:func rom:0xD897CC -pra_33_reflection_setup_wall = 0x80240128; // type:func rom:0xD89808 -pra_33_reflection_render_wall = 0x802402F0; // type:func rom:0xD899D0 -pra_33_ReflectFloor = 0x8024049C; // type:func rom:0xD89B7C -pra_33_reflection_setup_floor = 0x80240500; // type:func rom:0xD89BE0 -pra_33_reflection_render_floor = 0x8024068C; // type:func rom:0xD89D6C -pra_33_reflection_render_floor_fancy = 0x80240870; // type:func rom:0xD89F50 -pra_33_ReflectPartner = 0x80240D3C; // type:func rom:0xD8A41C -pra_33_SetPartnerFlagsA0000 = 0x80240E84; // type:func rom:0xD8A564 -pra_33_SetPartnerFlags80000 = 0x80240EB8; // type:func rom:0xD8A598 -pra_33_SetPartnerFlags20000 = 0x80240EEC; // type:func rom:0xD8A5CC +pra_33_EnableWallReflection = 0x802400EC; // type:func rom:0xD897CC +pra_33_worker_reflect_player_wall = 0x80240128; // type:func rom:0xD89808 +pra_33_appendGfx_reflect_player_wall = 0x802402F0; // type:func rom:0xD899D0 +pra_33_EnableFloorReflection = 0x8024049C; // type:func rom:0xD89B7C +pra_33_worker_reflect_player_floor = 0x80240500; // type:func rom:0xD89BE0 +pra_33_appendGfx_reflect_player_floor_basic = 0x8024068C; // type:func rom:0xD89D6C +pra_33_appendGfx_reflect_player_floor_fancy = 0x80240870; // type:func rom:0xD89F50 +pra_33_EnablePartnerReflection = 0x80240D3C; // type:func rom:0xD8A41C +pra_33_worker_reflect_partner_all = 0x80240E84; // type:func rom:0xD8A564 +pra_33_worker_reflect_partner_floor = 0x80240EB8; // type:func rom:0xD8A598 +pra_33_worker_reflect_partner_wall = 0x80240EEC; // type:func rom:0xD8A5CC func_80240F20_D8A600 = 0x80240F20; // type:func rom:0xD8A600 func_80240F58_D8A638 = 0x80240F58; // type:func rom:0xD8A638 func_80241000_D8A6E0 = 0x80241000; // type:func rom:0xD8A6E0 pra_34_SetGameStatusUnk84_1 = 0x80240000; // type:func rom:0xD8B3B0 pra_34_reflection_unk_resolve_anim = 0x80240020; // type:func rom:0xD8B3D0 pra_34_reflection_unk_change_anim_facing = 0x80240054; // type:func rom:0xD8B404 -pra_34_ReflectWall = 0x802400EC; // type:func rom:0xD8B49C -pra_34_reflection_setup_wall = 0x80240128; // type:func rom:0xD8B4D8 -pra_34_reflection_render_wall = 0x802402F0; // type:func rom:0xD8B6A0 -pra_34_ReflectFloor = 0x8024049C; // type:func rom:0xD8B84C -pra_34_reflection_setup_floor = 0x80240500; // type:func rom:0xD8B8B0 -pra_34_reflection_render_floor = 0x8024068C; // type:func rom:0xD8BA3C -pra_34_reflection_render_floor_fancy = 0x80240870; // type:func rom:0xD8BC20 -pra_34_ReflectPartner = 0x80240D3C; // type:func rom:0xD8C0EC -pra_34_SetPartnerFlagsA0000 = 0x80240E84; // type:func rom:0xD8C234 -pra_34_SetPartnerFlags80000 = 0x80240EB8; // type:func rom:0xD8C268 -pra_34_SetPartnerFlags20000 = 0x80240EEC; // type:func rom:0xD8C29C +pra_34_EnableWallReflection = 0x802400EC; // type:func rom:0xD8B49C +pra_34_worker_reflect_player_wall = 0x80240128; // type:func rom:0xD8B4D8 +pra_34_appendGfx_reflect_player_wall = 0x802402F0; // type:func rom:0xD8B6A0 +pra_34_EnableFloorReflection = 0x8024049C; // type:func rom:0xD8B84C +pra_34_worker_reflect_player_floor = 0x80240500; // type:func rom:0xD8B8B0 +pra_34_appendGfx_reflect_player_floor_basic = 0x8024068C; // type:func rom:0xD8BA3C +pra_34_appendGfx_reflect_player_floor_fancy = 0x80240870; // type:func rom:0xD8BC20 +pra_34_EnablePartnerReflection = 0x80240D3C; // type:func rom:0xD8C0EC +pra_34_worker_reflect_partner_all = 0x80240E84; // type:func rom:0xD8C234 +pra_34_worker_reflect_partner_floor = 0x80240EB8; // type:func rom:0xD8C268 +pra_34_worker_reflect_partner_wall = 0x80240EEC; // type:func rom:0xD8C29C pra_34_SetEntityFlags100000 = 0x80240F20; // type:func rom:0xD8C2D0 pra_34_GetEntityPosition = 0x80240F54; // type:func rom:0xD8C304 pra_35_SetGameStatusUnk84_1 = 0x80240000; // type:func rom:0xD8D250 pra_35_reflection_unk_resolve_anim = 0x80240020; // type:func rom:0xD8D270 pra_35_reflection_unk_change_anim_facing = 0x80240054; // type:func rom:0xD8D2A4 -pra_35_ReflectWall = 0x802400EC; // type:func rom:0xD8D33C -pra_35_reflection_setup_wall = 0x80240128; // type:func rom:0xD8D378 -pra_35_reflection_render_wall = 0x802402F0; // type:func rom:0xD8D540 -pra_35_ReflectFloor = 0x8024049C; // type:func rom:0xD8D6EC -pra_35_reflection_setup_floor = 0x80240500; // type:func rom:0xD8D750 -pra_35_reflection_render_floor = 0x8024068C; // type:func rom:0xD8D8DC -pra_35_reflection_render_floor_fancy = 0x80240870; // type:func rom:0xD8DAC0 -pra_35_ReflectPartner = 0x80240D3C; // type:func rom:0xD8DF8C -pra_35_SetPartnerFlagsA0000 = 0x80240E84; // type:func rom:0xD8E0D4 -pra_35_SetPartnerFlags80000 = 0x80240EB8; // type:func rom:0xD8E108 -pra_35_SetPartnerFlags20000 = 0x80240EEC; // type:func rom:0xD8E13C +pra_35_EnableWallReflection = 0x802400EC; // type:func rom:0xD8D33C +pra_35_worker_reflect_player_wall = 0x80240128; // type:func rom:0xD8D378 +pra_35_appendGfx_reflect_player_wall = 0x802402F0; // type:func rom:0xD8D540 +pra_35_EnableFloorReflection = 0x8024049C; // type:func rom:0xD8D6EC +pra_35_worker_reflect_player_floor = 0x80240500; // type:func rom:0xD8D750 +pra_35_appendGfx_reflect_player_floor_basic = 0x8024068C; // type:func rom:0xD8D8DC +pra_35_appendGfx_reflect_player_floor_fancy = 0x80240870; // type:func rom:0xD8DAC0 +pra_35_EnablePartnerReflection = 0x80240D3C; // type:func rom:0xD8DF8C +pra_35_worker_reflect_partner_all = 0x80240E84; // type:func rom:0xD8E0D4 +pra_35_worker_reflect_partner_floor = 0x80240EB8; // type:func rom:0xD8E108 +pra_35_worker_reflect_partner_wall = 0x80240EEC; // type:func rom:0xD8E13C pra_35_PatrolAI_MoveInit = 0x80240F20; // type:func rom:0xD8E170 pra_35_PatrolAI_Move = 0x80241078; // type:func rom:0xD8E2C8 pra_35_PatrolAI_LoiterInit = 0x80241320; // type:func rom:0xD8E570 @@ -24314,33 +24316,33 @@ D_80244180_D913D0 = 0x80244180; // type:data rom:0xD913D0 func_80240000_D91700 = 0x80240000; // type:func rom:0xD91700 pra_36_reflection_unk_resolve_anim = 0x80240050; // type:func rom:0xD91750 pra_36_reflection_unk_change_anim_facing = 0x80240084; // type:func rom:0xD91784 -pra_36_ReflectWall = 0x8024011C; // type:func rom:0xD9181C -pra_36_reflection_setup_wall = 0x80240158; // type:func rom:0xD91858 -pra_36_reflection_render_wall = 0x80240320; // type:func rom:0xD91A20 -pra_36_ReflectFloor = 0x802404CC; // type:func rom:0xD91BCC -pra_36_reflection_setup_floor = 0x80240530; // type:func rom:0xD91C30 -pra_36_reflection_render_floor = 0x802406BC; // type:func rom:0xD91DBC -pra_36_reflection_render_floor_fancy = 0x802408A0; // type:func rom:0xD91FA0 -pra_36_ReflectPartner = 0x80240D6C; // type:func rom:0xD9246C -pra_36_SetPartnerFlagsA0000 = 0x80240EB4; // type:func rom:0xD925B4 -pra_36_SetPartnerFlags80000 = 0x80240EE8; // type:func rom:0xD925E8 -pra_36_SetPartnerFlags20000 = 0x80240F1C; // type:func rom:0xD9261C +pra_36_EnableWallReflection = 0x8024011C; // type:func rom:0xD9181C +pra_36_worker_reflect_player_wall = 0x80240158; // type:func rom:0xD91858 +pra_36_appendGfx_reflect_player_wall = 0x80240320; // type:func rom:0xD91A20 +pra_36_EnableFloorReflection = 0x802404CC; // type:func rom:0xD91BCC +pra_36_worker_reflect_player_floor = 0x80240530; // type:func rom:0xD91C30 +pra_36_appendGfx_reflect_player_floor_basic = 0x802406BC; // type:func rom:0xD91DBC +pra_36_appendGfx_reflect_player_floor_fancy = 0x802408A0; // type:func rom:0xD91FA0 +pra_36_EnablePartnerReflection = 0x80240D6C; // type:func rom:0xD9246C +pra_36_worker_reflect_partner_all = 0x80240EB4; // type:func rom:0xD925B4 +pra_36_worker_reflect_partner_floor = 0x80240EE8; // type:func rom:0xD925E8 +pra_36_worker_reflect_partner_wall = 0x80240F1C; // type:func rom:0xD9261C D_80241810_D92F10 = 0x80241810; // type:data rom:0xD92F10 D_80241820_D92F20 = 0x80241820; // type:data rom:0xD92F20 func_80240000_D92F40 = 0x80240000; // type:func rom:0xD92F40 pra_37_reflection_unk_resolve_anim = 0x80240050; // type:func rom:0xD92F90 pra_37_reflection_unk_change_anim_facing = 0x80240084; // type:func rom:0xD92FC4 -pra_37_ReflectWall = 0x8024011C; // type:func rom:0xD9305C -pra_37_reflection_setup_wall = 0x80240158; // type:func rom:0xD93098 -pra_37_reflection_render_wall = 0x80240320; // type:func rom:0xD93260 -pra_37_ReflectFloor = 0x802404CC; // type:func rom:0xD9340C -pra_37_reflection_setup_floor = 0x80240530; // type:func rom:0xD93470 -pra_37_reflection_render_floor = 0x802406BC; // type:func rom:0xD935FC -pra_37_reflection_render_floor_fancy = 0x802408A0; // type:func rom:0xD937E0 -pra_37_ReflectPartner = 0x80240D6C; // type:func rom:0xD93CAC -pra_37_SetPartnerFlagsA0000 = 0x80240EB4; // type:func rom:0xD93DF4 -pra_37_SetPartnerFlags80000 = 0x80240EE8; // type:func rom:0xD93E28 -pra_37_SetPartnerFlags20000 = 0x80240F1C; // type:func rom:0xD93E5C +pra_37_EnableWallReflection = 0x8024011C; // type:func rom:0xD9305C +pra_37_worker_reflect_player_wall = 0x80240158; // type:func rom:0xD93098 +pra_37_appendGfx_reflect_player_wall = 0x80240320; // type:func rom:0xD93260 +pra_37_EnableFloorReflection = 0x802404CC; // type:func rom:0xD9340C +pra_37_worker_reflect_player_floor = 0x80240530; // type:func rom:0xD93470 +pra_37_appendGfx_reflect_player_floor_basic = 0x802406BC; // type:func rom:0xD935FC +pra_37_appendGfx_reflect_player_floor_fancy = 0x802408A0; // type:func rom:0xD937E0 +pra_37_EnablePartnerReflection = 0x80240D6C; // type:func rom:0xD93CAC +pra_37_worker_reflect_partner_all = 0x80240EB4; // type:func rom:0xD93DF4 +pra_37_worker_reflect_partner_floor = 0x80240EE8; // type:func rom:0xD93E28 +pra_37_worker_reflect_partner_wall = 0x80240F1C; // type:func rom:0xD93E5C pra_37_MeleeHitbox_30 = 0x80240F50; // type:func rom:0xD93E90 pra_37_MeleeHitbox_31 = 0x80240FBC; // type:func rom:0xD93EFC pra_37_MeleeHitbox_32 = 0x8024102C; // type:func rom:0xD93F6C @@ -24354,17 +24356,17 @@ D_80242510_D95450 = 0x80242510; // type:data rom:0xD95450 func_80240000_D955F0 = 0x80240000; // type:func rom:0xD955F0 pra_38_reflection_unk_resolve_anim = 0x80240050; // type:func rom:0xD95640 pra_38_reflection_unk_change_anim_facing = 0x80240084; // type:func rom:0xD95674 -pra_38_ReflectWall = 0x8024011C; // type:func rom:0xD9570C -pra_38_reflection_setup_wall = 0x80240158; // type:func rom:0xD95748 -pra_38_reflection_render_wall = 0x80240320; // type:func rom:0xD95910 -pra_38_ReflectFloor = 0x802404CC; // type:func rom:0xD95ABC -pra_38_reflection_setup_floor = 0x80240530; // type:func rom:0xD95B20 -pra_38_reflection_render_floor = 0x802406BC; // type:func rom:0xD95CAC -pra_38_reflection_render_floor_fancy = 0x802408A0; // type:func rom:0xD95E90 -pra_38_ReflectPartner = 0x80240D6C; // type:func rom:0xD9635C -pra_38_SetPartnerFlagsA0000 = 0x80240EB4; // type:func rom:0xD964A4 -pra_38_SetPartnerFlags80000 = 0x80240EE8; // type:func rom:0xD964D8 -pra_38_SetPartnerFlags20000 = 0x80240F1C; // type:func rom:0xD9650C +pra_38_EnableWallReflection = 0x8024011C; // type:func rom:0xD9570C +pra_38_worker_reflect_player_wall = 0x80240158; // type:func rom:0xD95748 +pra_38_appendGfx_reflect_player_wall = 0x80240320; // type:func rom:0xD95910 +pra_38_EnableFloorReflection = 0x802404CC; // type:func rom:0xD95ABC +pra_38_worker_reflect_player_floor = 0x80240530; // type:func rom:0xD95B20 +pra_38_appendGfx_reflect_player_floor_basic = 0x802406BC; // type:func rom:0xD95CAC +pra_38_appendGfx_reflect_player_floor_fancy = 0x802408A0; // type:func rom:0xD95E90 +pra_38_EnablePartnerReflection = 0x80240D6C; // type:func rom:0xD9635C +pra_38_worker_reflect_partner_all = 0x80240EB4; // type:func rom:0xD964A4 +pra_38_worker_reflect_partner_floor = 0x80240EE8; // type:func rom:0xD964D8 +pra_38_worker_reflect_partner_wall = 0x80240F1C; // type:func rom:0xD9650C pra_38_UnkFunc001 = 0x80240F50; // type:func rom:0xD96540 D_80242220_D97810 = 0x80242220; // type:data rom:0xD97810 D_80242230_D97820 = 0x80242230; // type:data rom:0xD97820 @@ -24373,17 +24375,17 @@ D_80242298_D97888 = 0x80242298; // type:data rom:0xD97888 func_80240000_D97890 = 0x80240000; // type:func rom:0xD97890 pra_39_reflection_unk_resolve_anim = 0x80240050; // type:func rom:0xD978E0 pra_39_reflection_unk_change_anim_facing = 0x80240084; // type:func rom:0xD97914 -pra_39_ReflectWall = 0x8024011C; // type:func rom:0xD979AC -pra_39_reflection_setup_wall = 0x80240158; // type:func rom:0xD979E8 -pra_39_reflection_render_wall = 0x80240320; // type:func rom:0xD97BB0 -pra_39_ReflectFloor = 0x802404CC; // type:func rom:0xD97D5C -pra_39_reflection_setup_floor = 0x80240530; // type:func rom:0xD97DC0 -pra_39_reflection_render_floor = 0x802406BC; // type:func rom:0xD97F4C -pra_39_reflection_render_floor_fancy = 0x802408A0; // type:func rom:0xD98130 -pra_39_ReflectPartner = 0x80240D6C; // type:func rom:0xD985FC -pra_39_SetPartnerFlagsA0000 = 0x80240EB4; // type:func rom:0xD98744 -pra_39_SetPartnerFlags80000 = 0x80240EE8; // type:func rom:0xD98778 -pra_39_SetPartnerFlags20000 = 0x80240F1C; // type:func rom:0xD987AC +pra_39_EnableWallReflection = 0x8024011C; // type:func rom:0xD979AC +pra_39_worker_reflect_player_wall = 0x80240158; // type:func rom:0xD979E8 +pra_39_appendGfx_reflect_player_wall = 0x80240320; // type:func rom:0xD97BB0 +pra_39_EnableFloorReflection = 0x802404CC; // type:func rom:0xD97D5C +pra_39_worker_reflect_player_floor = 0x80240530; // type:func rom:0xD97DC0 +pra_39_appendGfx_reflect_player_floor_basic = 0x802406BC; // type:func rom:0xD97F4C +pra_39_appendGfx_reflect_player_floor_fancy = 0x802408A0; // type:func rom:0xD98130 +pra_39_EnablePartnerReflection = 0x80240D6C; // type:func rom:0xD985FC +pra_39_worker_reflect_partner_all = 0x80240EB4; // type:func rom:0xD98744 +pra_39_worker_reflect_partner_floor = 0x80240EE8; // type:func rom:0xD98778 +pra_39_worker_reflect_partner_wall = 0x80240F1C; // type:func rom:0xD987AC pra_39_UnkFunc001 = 0x80240F50; // type:func rom:0xD987E0 D_802420A0_D99930 = 0x802420A0; // type:data rom:0xD99930 D_802420B0_D99940 = 0x802420B0; // type:data rom:0xD99940 @@ -24392,17 +24394,17 @@ D_80242118_D999A8 = 0x80242118; // type:data rom:0xD999A8 pra_40_SetGameStatusUnk84_1 = 0x80240000; // type:func rom:0xD999B0 pra_40_reflection_unk_resolve_anim = 0x80240020; // type:func rom:0xD999D0 pra_40_reflection_unk_change_anim_facing = 0x80240054; // type:func rom:0xD99A04 -pra_40_ReflectWall = 0x802400EC; // type:func rom:0xD99A9C -pra_40_reflection_setup_wall = 0x80240128; // type:func rom:0xD99AD8 -pra_40_reflection_render_wall = 0x802402F0; // type:func rom:0xD99CA0 -pra_40_ReflectFloor = 0x8024049C; // type:func rom:0xD99E4C -pra_40_reflection_setup_floor = 0x80240500; // type:func rom:0xD99EB0 -pra_40_reflection_render_floor = 0x8024068C; // type:func rom:0xD9A03C -pra_40_reflection_render_floor_fancy = 0x80240870; // type:func rom:0xD9A220 -pra_40_ReflectPartner = 0x80240D3C; // type:func rom:0xD9A6EC -pra_40_SetPartnerFlagsA0000 = 0x80240E84; // type:func rom:0xD9A834 -pra_40_SetPartnerFlags80000 = 0x80240EB8; // type:func rom:0xD9A868 -pra_40_SetPartnerFlags20000 = 0x80240EEC; // type:func rom:0xD9A89C +pra_40_EnableWallReflection = 0x802400EC; // type:func rom:0xD99A9C +pra_40_worker_reflect_player_wall = 0x80240128; // type:func rom:0xD99AD8 +pra_40_appendGfx_reflect_player_wall = 0x802402F0; // type:func rom:0xD99CA0 +pra_40_EnableFloorReflection = 0x8024049C; // type:func rom:0xD99E4C +pra_40_worker_reflect_player_floor = 0x80240500; // type:func rom:0xD99EB0 +pra_40_appendGfx_reflect_player_floor_basic = 0x8024068C; // type:func rom:0xD9A03C +pra_40_appendGfx_reflect_player_floor_fancy = 0x80240870; // type:func rom:0xD9A220 +pra_40_EnablePartnerReflection = 0x80240D3C; // type:func rom:0xD9A6EC +pra_40_worker_reflect_partner_all = 0x80240E84; // type:func rom:0xD9A834 +pra_40_worker_reflect_partner_floor = 0x80240EB8; // type:func rom:0xD9A868 +pra_40_worker_reflect_partner_wall = 0x80240EEC; // type:func rom:0xD9A89C func_80240000_D9AEF0 = 0x80240000; // type:func rom:0xD9AEF0 func_80240260_D9B150 = 0x80240260; // type:func rom:0xD9B150 func_80240844_D9B734 = 0x80240844; // type:func rom:0xD9B734 @@ -24828,7 +24830,7 @@ D_802479B0_DF6850 = 0x802479B0; // type:data rom:0xDF6850 D_802479B8_DF6858 = 0x802479B8; // type:data rom:0xDF6858 D_802479C0_DF6860 = 0x802479C0; // type:data rom:0xDF6860 D_802479C8_DF6868 = 0x802479C8; // type:data rom:0xDF6868 -func_80240000_DF6A00 = 0x80240000; // type:func rom:0xDF6A00 +end_00_map_init = 0x80240000; // type:func rom:0xDF6A00 end_00_CharAnim_FadeIn_0 = 0x80240020; // type:func rom:0xDF6A20 end_00_CharAnim_FadeIn_1 = 0x80240270; // type:func rom:0xDF6C70 end_00_CharAnim_FadeIn_2 = 0x80240540; // type:func rom:0xDF6F40 @@ -24847,25 +24849,25 @@ end_00_credits_load_message = 0x80242358; // type:func rom:0xDF8D58 end_00_init_credits = 0x80242500; // type:func rom:0xDF8F00 end_00_InitCredits = 0x80242558; // type:func rom:0xDF8F58 end_00_ShowCreditList = 0x80242580; // type:func rom:0xDF8F80 -func_80242680_DF9080 = 0x80242680; // type:func rom:0xDF9080 -func_80242744_DF9144 = 0x80242744; // type:func rom:0xDF9144 -func_802427A4_DF91A4 = 0x802427A4; // type:func rom:0xDF91A4 -func_802427D8_DF91D8 = 0x802427D8; // type:func rom:0xDF91D8 +end_00_CreateParadeNPC = 0x80242680; // type:func rom:0xDF9080 +end_00_ParadeSpriteHeapMalloc = 0x80242744; // type:func rom:0xDF9144 +end_00_ParadeSpriteHeapFree = 0x802427A4; // type:func rom:0xDF91A4 +end_00_UpdateCameraScroll = 0x802427D8; // type:func rom:0xDF91D8 end_00_SetNpcShadowScale = 0x80242830; // type:func rom:0xDF9230 -func_80242898_DF9298 = 0x80242898; // type:func rom:0xDF9298 -end_00_PlayFX3D = 0x80242900; // type:func rom:0xDF9300 -end_00_UpdatePosFX3D = 0x80242A30; // type:func rom:0xDF9430 -end_00_DisposeFX3D = 0x80242AD4; // type:func rom:0xDF94D4 -func_80242B10_DF9510 = 0x80242B10; // type:func rom:0xDF9510 +end_00_AddScrollToNpcPos = 0x80242898; // type:func rom:0xDF9298 +end_00_CreateWhaleGeyser = 0x80242900; // type:func rom:0xDF9300 +end_00_SetWhaleGeyserPos = 0x80242A30; // type:func rom:0xDF9430 +end_00_DisposeWhaleGeyser = 0x80242AD4; // type:func rom:0xDF94D4 +end_00_func_80242B10_DF9510 = 0x80242B10; // type:func rom:0xDF9510 end_00_Font4Patterns = 0x80242C70; // type:data rom:0xDF9670 end_00_Font3Patterns = 0x80242CD8; // type:data rom:0xDF96D8 end_00_CreditsViewport = 0x80242D60; // type:data rom:0xDF9760 end_00_CreditsBufferIndex = 0x80242D70; // type:data rom:0xDF9770 end_00_ParadeNpcsTable = 0x80244D74; // type:data rom:0xDFB774 -D_80249D60_E00760 = 0x80249D60; // type:data rom:0xE00760 -D_8024E8C0_E052C0 = 0x8024E8C0; // type:data rom:0xE052C0 -func_80240000_E05360 = 0x80240000; // type:func rom:0xE05360 -func_80240010_E05370 = 0x80240010; // type:func rom:0xE05370 +end_00_D_80249D60_E00760 = 0x80249D60; // type:data rom:0xE00760 +end_00_D_8024E8C0_E052C0 = 0x8024E8C0; // type:data rom:0xE052C0 +end_01_map_init = 0x80240000; // type:func rom:0xE05360 +end_01_WidenCameraFOV = 0x80240010; // type:func rom:0xE05370 end_01_CharAnim_FadeIn_0 = 0x80240030; // type:func rom:0xE05390 end_01_CharAnim_FadeIn_1 = 0x80240280; // type:func rom:0xE055E0 end_01_CharAnim_FadeIn_2 = 0x80240550; // type:func rom:0xE058B0 @@ -24884,19 +24886,19 @@ end_01_credits_load_message = 0x80242368; // type:func rom:0xE076C8 end_01_init_credits = 0x80242510; // type:func rom:0xE07870 end_01_InitCredits = 0x80242568; // type:func rom:0xE078C8 end_01_ShowCreditList = 0x80242590; // type:func rom:0xE078F0 -func_80242690_E079F0 = 0x80242690; // type:func rom:0xE079F0 -func_80242754_E07AB4 = 0x80242754; // type:func rom:0xE07AB4 -func_802427B4_E07B14 = 0x802427B4; // type:func rom:0xE07B14 -func_802427E8_E07B48 = 0x802427E8; // type:func rom:0xE07B48 -func_80242840_E07BA0 = 0x80242840; // type:func rom:0xE07BA0 -func_8024289C_E07BFC = 0x8024289C; // type:func rom:0xE07BFC -func_802428C0_E07C20 = 0x802428C0; // type:func rom:0xE07C20 -func_80242900_E07C60 = 0x80242900; // type:func rom:0xE07C60 -func_80242978_E07CD8 = 0x80242978; // type:func rom:0xE07CD8 -func_80242A68_E07DC8 = 0x80242A68; // type:func rom:0xE07DC8 -func_80242B68_E07EC8 = 0x80242B68; // type:func rom:0xE07EC8 -func_80242C68_E07FC8 = 0x80242C68; // type:func rom:0xE07FC8 -func_80242C94_E07FF4 = 0x80242C94; // type:func rom:0xE07FF4 +end_01_CreateParadeNPC = 0x80242690; // type:func rom:0xE079F0 +end_01_ParadeSpriteHeapMalloc = 0x80242754; // type:func rom:0xE07AB4 +end_01_ParadeSpriteHeapFree = 0x802427B4; // type:func rom:0xE07B14 +end_01_UpdateCameraScroll = 0x802427E8; // type:func rom:0xE07B48 +end_01_AddScrollToNpcPos = 0x80242840; // type:func rom:0xE07BA0 +end_01_WaitForConfirmInput = 0x8024289C; // type:func rom:0xE07BFC +end_01_SetWorldDark = 0x802428C0; // type:func rom:0xE07C20 +end_01_FadeInWorld = 0x80242900; // type:func rom:0xE07C60 +end_01_UpdateStarSpiritRotation = 0x80242978; // type:func rom:0xE07CD8 +end_01_SkateInCirclePenguin1 = 0x80242A68; // type:func rom:0xE07DC8 +end_01_SkateInCirclePenguin2 = 0x80242B68; // type:func rom:0xE07EC8 +end_01_SetSpotlightsAlpha = 0x80242C68; // type:func rom:0xE07FC8 +end_01_gfx_build_set_spotlight_alpha = 0x80242C94; // type:func rom:0xE07FF4 end_01_UnkFunc27 = 0x80242CF0; // type:func rom:0xE08050 end_01_UnkFunc26 = 0x80242E14; // type:func rom:0xE08174 end_01_Font3Patterns = 0x80243178; // type:data @@ -24904,9 +24906,8 @@ end_01_Font4Patterns = 0x80243110; // type:data end_01_CreditsViewport = 0x80243200; // type:data rom:0xE08560 end_01_CreditsBufferIndex = 0x80243210; // type:data rom:0xE08570 end_01_ParadeNpcsTable = 0x802441F0; // type:data rom:0xE09550 -D_80245D34_E0B094 = 0x80245D34; // type:data rom:0xE0B094 -D_80245D37_E0B097 = 0x80245D37; // type:data rom:0xE0B097 -D_802493A0_E0E700 = 0x802493A0; // type:data rom:0xE0E700 +end_01_D_80245D34_E0B094 = 0x80245D34; // type:data rom:0xE0B094 +end_01_D_802493A0_E0E700 = 0x802493A0; // type:data rom:0xE0E700 mgm_00_Pipe_SetAnimFlag = 0x80240000; // type:func rom:0xE0E7A0 mgm_00_Pipe_GetCurrentFloor = 0x80240020; // type:func rom:0xE0E7C0 mgm_00_Pipe_AwaitDownInput = 0x80240034; // type:func rom:0xE0E7D4 @@ -24925,19 +24926,19 @@ mgm_00_PatrolAI_Chase = 0x80240C2C; // type:func rom:0xE0F3CC mgm_00_PatrolAI_LosePlayer = 0x80240D4C; // type:func rom:0xE0F4EC mgm_00_PatrolNoAttackAI_15 = 0x80240DB4; // type:func rom:0xE0F554 mgm_00_PatrolNoAttackAI_Main = 0x80240E74; // type:func rom:0xE0F614 -func_80241170_E0F910 = 0x80241170; // type:func rom:0xE0F910 +mgm_00_GetAvailableGamesCount = 0x80241170; // type:func rom:0xE0F910 mgm_00_draw_record_display = 0x802411E0; // type:func rom:0xE0F980 mgm_00_animate_and_draw_record = 0x80241540; // type:func rom:0xE0FCE0 mgm_00_work_draw_record = 0x802416C0; // type:func rom:0xE0FE60 mgm_00_UpdateRecordDisplay = 0x802416F8; // type:func rom:0xE0FE98 -D_80243C50_E123F0 = 0x80243C50; // type:data rom:0xE123F0 +mgm_00_D_80243C50_E123F0 = 0x80243C50; // type:data rom:0xE123F0 D_80243DF0_E12590 = 0x80243DF0; // type:data rom:0xE12590 D_80243DF8_E12598 = 0x80243DF8; // type:data rom:0xE12598 D_80243F90_E12730 = 0x80243F90; // type:data rom:0xE12730 D_80243F98_E12738 = 0x80243F98; // type:data rom:0xE12738 -func_80240000_E12760 = 0x80240000; // type:func rom:0xE12760 -mgm_01_draw_score_display = 0x802401D0; // type:func rom:0xE12930 -mgm_01_work_draw_score = 0x802403C4; // type:func rom:0xE12B24 +mgm_01_GetSpotlightPos = 0x80240000; // type:func rom:0xE12760 +mgm_01_appendGfx_score_display = 0x802401D0; // type:func rom:0xE12930 +mgm_01_worker_draw_score = 0x802403C4; // type:func rom:0xE12B24 mgm_01_DisableMenus = 0x802403FC; // type:func rom:0xE12B5C mgm_01_EnableMenus = 0x80240438; // type:func rom:0xE12B98 mgm_01_GetPanelInfo = 0x8024045C; // type:func rom:0xE12BBC @@ -24973,6 +24974,14 @@ mgm_01_TallyPosY = 0x80241B18; // type:data rom:0xE14278 mgm_01_PanelModelIDs = 0x80241B44; // type:data rom:0xE142A4 mgm_01_PanelTypes = 0x80241B70; // type:data rom:0xE142D0 mgm_01_InitialConfigurations = 0x80241B9C; // type:data rom:0xE142FC +mgm_01_panel_1_coin_img = 0x80242CE0; // type:data rom:0xE15440 +mgm_01_panel_1_coin_pal = 0x80242EE0; // type:data rom:0xE15640 +mgm_01_panel_5_coins_img = 0x80242F00; // type:data rom:0xE15660 +mgm_01_panel_5_coins_pal = 0x80243100; // type:data rom:0xE15860 +mgm_01_panel_times_5_img = 0x80243120; // type:data rom:0xE15880 +mgm_01_panel_times_5_pal = 0x80243320; // type:data rom:0xE15A80 +mgm_01_panel_bowser_img = 0x80243340; // type:data rom:0xE15AA0 +mgm_01_panel_bowser_pal = 0x80243540; // type:data rom:0xE15CA0 mgm_01_MsgImgs_Panels = 0x80243560; // type:data rom:0xE15CC0 D_802435B0_E15D10 = 0x802435B0; // type:data rom:0xE15D10 D_802435B8_E15D18 = 0x802435B8; // type:data rom:0xE15D18 @@ -24982,8 +24991,8 @@ D_802435D0_E15D30 = 0x802435D0; // type:data rom:0xE15D30 D_802435D8_E15D38 = 0x802435D8; // type:data rom:0xE15D38 D_802435E0_E15D40 = 0x802435E0; // type:data rom:0xE15D40 D_802435E8_E15D48 = 0x802435E8; // type:data rom:0xE15D48 -mgm_02_draw_score_display = 0x80240000; // type:func rom:0xE15D80 -mgm_02_work_draw_score = 0x80240430; // type:func rom:0xE161B0 +mgm_02_appendGfx_score_display = 0x80240000; // type:func rom:0xE15D80 +mgm_02_worker_draw_score = 0x80240430; // type:func rom:0xE161B0 mgm_02_CreateScoreDisplay = 0x80240468; // type:func rom:0xE161E8 mgm_02_DisableMenus = 0x80240544; // type:func rom:0xE162C4 mgm_02_EnableMenus = 0x80240580; // type:func rom:0xE16300 @@ -25005,9 +25014,9 @@ mgm_02_InitialConfigurations = 0x8024273C; // type:data rom:0xE184BC mgm_02_BoxModelIDs = 0x802428E0; // type:data rom:0xE18660 mgm_02_BoxColliderIDs = 0x8024296C; // type:data rom:0xE186EC mgm_02_PanelModelIDs = 0x802429F8; // type:data rom:0xE18778 -D_80242A3C_E187BC = 0x80242A3C; // type:data rom:0xE187BC -mgm_02_PeachPanelImg = 0x802482A0; // type:data rom:0xE1E020 -mgm_02_PeachPanelPal = 0x802484A0; // type:data rom:0xE1E220 +read_sign_instructions = 0x80242A3C; // type:data rom:0xE187BC +mgm_02_panel_peach_img = 0x802482A0; // type:data rom:0xE1E020 +mgm_02_panel_peach_pal = 0x802484A0; // type:data rom:0xE1E220 mgm_02_MsgImg_PeachPanel = 0x802484C0; // type:data rom:0xE1E240 D_802484E0_E1E260 = 0x802484E0; // type:data rom:0xE1E260 gv_01_Pipe_SetAnimFlag = 0x80240000; // type:func rom:0xE1E460 @@ -25907,7 +25916,7 @@ D_80224D80 = 0x80224D80; // type:data D_80224D90 = 0x80224D90; // type:data D_80224DA0 = 0x80224DA0; // type:data D_80224DB0 = 0x80224DB0; // type:data -D_8022ADD0 = 0x8022ADD0; // type:data +b_area_kzn2_VineData = 0x8022ADD0; // type:data b_area_kzn2_VineRenderState = 0x8022B550; // type:data D_802310D0 = 0x802310D0; // type:data D_802312E0_battle_area_omo2 = 0x802312E0; // type:data @@ -26012,7 +26021,7 @@ flo_12_pad_E28 = 0x80240E28; // type:data flo_18_pad_E88 = 0x80240E88; // type:data flo_03_pad_EA4 = 0x80240EA4; // type:data dgb_10_pad_EDC = 0x80240EDC; // type:data -B_80240FD0_tst_04 = 0x80240FD0; // type:data +tst_04_B_80240FD0 = 0x80240FD0; // type:data flo_19_pad_1044 = 0x80241044; // type:data arn_08_pad_11FC = 0x802411FC; // type:data flo_07_pad_1214 = 0x80241214; // type:data diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt index 464b668e63..babc67c1dd 100644 --- a/ver/us/undefined_syms.txt +++ b/ver/us/undefined_syms.txt @@ -441,7 +441,7 @@ D_800FBBE0 = 0x800FBBE0; D_80164000 = 0x80164000; // display contexts, part of bss3 D_8022AD80_4C3F70 = 0x8022AD80; -D_8022ADD0 = 0x8022ADD0; +b_area_kzn2_VineData = 0x8022ADD0; b_area_kzn2_VineRenderState = 0x8022B550; D_80232C4C = 0x80232C4C; D_80235E00 = 0x80235E00; @@ -941,3 +941,8 @@ end_01_CreditsDataPtr = 0x8024A2C4; D_80242568_filemenu = 0x80242568; D_80243390_omo_12 = 0x80243390; D_8024F580_hos_05 = 0x8024F580; + +// incorrectly-identified vtx addresses for tst_13 +D_802423D0 = 0x802423D0; +D_80242310 = 0x80242310; +flo_23_ConsumableChoiceList = 0x802426E0;