pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-09-16 14:32:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

end/mgm/tst maps (#798)

Browse Source 
* mgm_00

* mgm_03

* mgm_01 OK

* several btl_kzn2

* reflection cleanup

* more maps

* ok for now

* tst_10

* area tst

* pre mgm

* mgm_02 ok

* mgm_02 cleanup

* added IDs

* end_01 almost compiles

* end_01 OK

* end_01 partially done

* end_01 almost done

* end_01 done

* end_00 OK

* credits include cleanup

* end_00 initial cleanup

* new splits 1

* done end_00 cleanup

* areas mgm, end, tst

* whale stuff

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
This commit is contained in:
HailSanta 2022-10-03 20:56:24 -04:00 committed by GitHub
parent 794618569d
commit cba14cc73d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1270 changed files with 69772 additions and 54629 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/camera.h
View File

@ -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*);

4
include/common_structs.h
View File

@ -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

3
include/entity.h
View File

@ -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;

17
include/enums.h
View File

@ -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,

4
include/macros.h
View File

@ -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)

7
include/mapfs/arn_02_hit.h
View File

@ -37,3 +37,10 @@
#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

1
include/mapfs/arn_02_shape.h
View File

@ -28,3 +28,4 @@
#define MODEL_exit 0x2
#define MODEL_exit2 0x1
#define MODEL_exit1 0x0

7
include/mapfs/arn_03_hit.h
View File

@ -42,3 +42,10 @@
#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

1
include/mapfs/arn_03_shape.h
View File

@ -50,3 +50,4 @@
#define MODEL_exit 0x2
#define MODEL_exit2 0x1
#define MODEL_exit1 0x0

7
include/mapfs/arn_04_hit.h
View File

@ -36,3 +36,10 @@
#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

1
include/mapfs/arn_04_shape.h
View File

@ -26,3 +26,4 @@
#define MODEL_exit 0x2
#define MODEL_exit2 0x1
#define MODEL_exit1 0x0

7
include/mapfs/arn_05_hit.h
View File

@ -27,3 +27,10 @@
#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

1
include/mapfs/arn_05_shape.h
View File

@ -43,3 +43,4 @@
#define MODEL_exit 0x2
#define MODEL_exit2 0x1
#define MODEL_exit1 0x0

15
include/mapfs/arn_07_hit.h
View File

@ -26,3 +26,18 @@
#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

1
include/mapfs/arn_07_shape.h
View File

@ -31,3 +31,4 @@
#define MODEL_exit 0x2
#define MODEL_exit2 0x1
#define MODEL_exit1 0x0

7
include/mapfs/arn_08_hit.h
View File

@ -8,3 +8,10 @@
#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

1
include/mapfs/arn_08_shape.h
View File

@ -20,3 +20,4 @@
#define MODEL_exit 0x2
#define MODEL_o37 0x1
#define MODEL_doa 0x0

7
include/mapfs/arn_09_hit.h
View File

@ -7,3 +7,10 @@
#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

1
include/mapfs/arn_09_shape.h
View File

@ -7,3 +7,4 @@
#define MODEL_exit 0x2
#define MODEL_o37 0x1
#define MODEL_doa 0x0

8
include/mapfs/arn_10_hit.h
View File

@ -13,3 +13,11 @@
#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

1
include/mapfs/arn_10_shape.h
View File

@ -6,3 +6,4 @@
#define MODEL_o37 0x2
#define MODEL_g13 0x1
#define MODEL_o44 0x0

7
include/mapfs/arn_11_hit.h
View File

@ -13,3 +13,10 @@
#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

1
include/mapfs/arn_11_shape.h
View File

@ -11,3 +11,4 @@
#define MODEL_yuka 0x2
#define MODEL_exit 0x1
#define MODEL_o37 0x0

8
include/mapfs/arn_12_hit.h
View File

@ -12,3 +12,11 @@
#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

1
include/mapfs/arn_12_shape.h
View File

@ -6,3 +6,4 @@
#define MODEL_o37 0x2
#define MODEL_exitw 0x1
#define MODEL_o44 0x0

8
include/mapfs/arn_13_hit.h
View File

@ -12,3 +12,11 @@
#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

1
include/mapfs/arn_13_shape.h
View File

@ -6,3 +6,4 @@
#define MODEL_o37 0x2
#define MODEL_exitw 0x1
#define MODEL_o44 0x0

6
include/mapfs/arn_20_hit.h
View File

@ -20,3 +20,9 @@
#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

1
include/mapfs/arn_20_shape.h
View File

@ -44,3 +44,4 @@
#define MODEL_o112 0x2
#define MODEL_g1 0x1
#define MODEL_frame 0x0

3
include/mapfs/arn_bt01_hit.h
View File

@ -1,3 +1,6 @@
#define COLLIDER_Root 0x2
#define COLLIDER_dai 0x1
#define COLLIDER_yuka 0x0
#define ZONE_Root 0x0

1
include/mapfs/arn_bt01_shape.h
View File

@ -34,3 +34,4 @@
#define MODEL_iwa5 0x2
#define MODEL_waku 0x1
#define MODEL_yuka1 0x0

3
include/mapfs/arn_bt02_hit.h
View File

@ -1,3 +1,6 @@
#define COLLIDER_Root 0x2
#define COLLIDER_dai 0x1
#define COLLIDER_yuka 0x0
#define ZONE_Root 0x0

1
include/mapfs/arn_bt02_shape.h
View File

@ -28,3 +28,4 @@
#define MODEL_o327 0x2
#define MODEL_waku 0x1
#define MODEL_yuka1 0x0

3
include/mapfs/arn_bt03_hit.h
View File

@ -1,3 +1,6 @@
#define COLLIDER_Root 0x2
#define COLLIDER_dai 0x1
#define COLLIDER_yuka 0x0
#define ZONE_Root 0x0

1
include/mapfs/arn_bt03_shape.h
View File

@ -29,3 +29,4 @@
#define MODEL_iwa5 0x2
#define MODEL_waku 0x1
#define MODEL_yuka1 0x0

3
include/mapfs/arn_bt04_hit.h
View File

@ -1,3 +1,6 @@
#define COLLIDER_Root 0x2
#define COLLIDER_dai 0x1
#define COLLIDER_yuka 0x0
#define ZONE_Root 0x0

1
include/mapfs/arn_bt04_shape.h
View File

@ -21,3 +21,4 @@
#define MODEL_kabe1 0x2
#define MODEL_yuka2 0x1
#define MODEL_waku 0x0

3
include/mapfs/arn_bt05_hit.h
View File

@ -1,3 +1,6 @@
#define COLLIDER_Root 0x2
#define COLLIDER_dai 0x1
#define COLLIDER_yuka 0x0
#define ZONE_Root 0x0

1
include/mapfs/arn_bt05_shape.h
View File

@ -17,3 +17,4 @@
#define MODEL_kabe1 0x2
#define MODEL_yuka2 0x1
#define MODEL_waku 0x0

3
include/mapfs/arn_bt06_hit.h
View File

@ -1,3 +1,6 @@
#define COLLIDER_Root 0x2
#define COLLIDER_dai 0x1
#define COLLIDER_yuka 0x0
#define ZONE_Root 0x0

1
include/mapfs/arn_bt06_shape.h
View File

@ -15,3 +15,4 @@
#define MODEL_kabe1 0x2
#define MODEL_yuka2 0x1
#define MODEL_waku 0x0

3
include/mapfs/dgb_00_hit.h
View File

@ -1 +1,4 @@
#define COLLIDER_Root 0x0
#define ZONE_Root 0x0

1
include/mapfs/dgb_00_shape.h
View File

@ -1 +1,2 @@
#define MODEL_Root 0x0

19
include/mapfs/dgb_01_hit.h
View File

@ -52,3 +52,22 @@
#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

1
include/mapfs/dgb_01_shape.h
View File

@ -226,3 +226,4 @@
#define MODEL_g83 0x2
#define MODEL_o384 0x1
#define MODEL_o383 0x0

6
include/mapfs/dgb_02_hit.h
View File

@ -20,3 +20,9 @@
#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

1
include/mapfs/dgb_02_shape.h
View File

@ -79,3 +79,4 @@
#define MODEL_o66 0x2
#define MODEL_o33 0x1
#define MODEL_o28 0x0

14
include/mapfs/dgb_03_hit.h
View File

@ -46,3 +46,17 @@
#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

1
include/mapfs/dgb_03_shape.h
View File

@ -128,3 +128,4 @@
#define MODEL_o33 0x2
#define MODEL_o28 0x1
#define MODEL_o25 0x0

9
include/mapfs/dgb_04_hit.h
View File

@ -23,3 +23,12 @@
#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

1
include/mapfs/dgb_04_shape.h
View File

@ -46,3 +46,4 @@
#define MODEL_o152 0x2
#define MODEL_o125 0x1
#define MODEL_o33 0x0

11
include/mapfs/dgb_05_hit.h
View File

@ -20,3 +20,14 @@
#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

1
include/mapfs/dgb_05_shape.h
View File

@ -32,3 +32,4 @@
#define MODEL_o280 0x2
#define MODEL_o279 0x1
#define MODEL_o278 0x0

8
include/mapfs/dgb_06_hit.h
View File

@ -16,3 +16,11 @@
#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

1
include/mapfs/dgb_06_shape.h
View File

@ -30,3 +30,4 @@
#define MODEL_o154 0x2
#define MODEL_o150 0x1
#define MODEL_o183 0x0

8
include/mapfs/dgb_07_hit.h
View File

@ -16,3 +16,11 @@
#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

1
include/mapfs/dgb_07_shape.h
View File

@ -29,3 +29,4 @@
#define MODEL_o161 0x2
#define MODEL_o160 0x1
#define MODEL_o159 0x0

8
include/mapfs/dgb_08_hit.h
View File

@ -21,3 +21,11 @@
#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

1
include/mapfs/dgb_08_shape.h
View File

@ -49,3 +49,4 @@
#define MODEL_o127 0x2
#define MODEL_o126 0x1
#define MODEL_o125 0x0

6
include/mapfs/dgb_09_hit.h
View File

@ -20,3 +20,9 @@
#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

1
include/mapfs/dgb_09_shape.h
View File

@ -87,3 +87,4 @@
#define MODEL_o66 0x2
#define MODEL_o33 0x1
#define MODEL_o28 0x0

8
include/mapfs/dgb_10_hit.h
View File

@ -17,3 +17,11 @@
#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

1
include/mapfs/dgb_10_shape.h
View File

@ -36,3 +36,4 @@
#define MODEL_o129 0x2
#define MODEL_o127 0x1
#define MODEL_o125 0x0

11
include/mapfs/dgb_11_hit.h
View File

@ -18,3 +18,14 @@
#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

1
include/mapfs/dgb_11_shape.h
View File

@ -32,3 +32,4 @@
#define MODEL_o133 0x2
#define MODEL_o131 0x1
#define MODEL_o127 0x0

8
include/mapfs/dgb_12_hit.h
View File

@ -17,3 +17,11 @@
#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

1
include/mapfs/dgb_12_shape.h
View File

@ -21,3 +21,4 @@
#define MODEL_o161 0x2
#define MODEL_o160 0x1
#define MODEL_o159 0x0

25
include/mapfs/dgb_13_hit.h
View File

@ -49,3 +49,28 @@
#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

1
include/mapfs/dgb_13_shape.h
View File

@ -82,3 +82,4 @@
#define MODEL_o161 0x2
#define MODEL_o160 0x1
#define MODEL_o159 0x0

9
include/mapfs/dgb_14_hit.h
View File

@ -21,3 +21,12 @@
#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

1
include/mapfs/dgb_14_shape.h
View File

@ -43,3 +43,4 @@
#define MODEL_o66 0x2
#define MODEL_o33 0x1
#define MODEL_o28 0x0

6
include/mapfs/dgb_15_hit.h
View File

@ -23,3 +23,9 @@
#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

1
include/mapfs/dgb_15_shape.h
View File

@ -98,3 +98,4 @@
#define MODEL_o98 0x2
#define MODEL_o74 0x1
#define MODEL_o33 0x0

7
include/mapfs/dgb_16_hit.h
View File

@ -9,3 +9,10 @@
#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

1
include/mapfs/dgb_16_shape.h
View File

@ -23,3 +23,4 @@
#define MODEL_o66 0x2
#define MODEL_o33 0x1
#define MODEL_o28 0x0

7
include/mapfs/dgb_17_hit.h
View File

@ -14,3 +14,10 @@
#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

1
include/mapfs/dgb_17_shape.h
View File

@ -32,3 +32,4 @@
#define MODEL_o179 0x2
#define MODEL_o178 0x1
#define MODEL_o177 0x0

8
include/mapfs/dgb_18_hit.h
View File

@ -20,3 +20,11 @@
#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

1
include/mapfs/dgb_18_shape.h
View File

@ -56,3 +56,4 @@
#define MODEL_o127 0x2
#define MODEL_o126 0x1
#define MODEL_o125 0x0

3
include/mapfs/dgb_bt01_hit.h
View File

@ -1,3 +1,6 @@
#define COLLIDER_Root 0x2
#define COLLIDER_dai 0x1
#define COLLIDER_yuka 0x0
#define ZONE_Root 0x0

1
include/mapfs/dgb_bt01_shape.h
View File

@ -21,3 +21,4 @@
#define MODEL_yuka4 0x2
#define MODEL_yuka3 0x1
#define MODEL_waku 0x0

3
include/mapfs/dgb_bt02_hit.h
View File

@ -1,3 +1,6 @@
#define COLLIDER_Root 0x2
#define COLLIDER_dai 0x1
#define COLLIDER_yuka 0x0
#define ZONE_Root 0x0

1
include/mapfs/dgb_bt02_shape.h
View File

@ -25,3 +25,4 @@
#define MODEL_yuka4 0x2
#define MODEL_yuka3 0x1
#define MODEL_waku 0x0

3
include/mapfs/dgb_bt03_hit.h
View File

@ -1,3 +1,6 @@
#define COLLIDER_Root 0x2
#define COLLIDER_dai 0x1
#define COLLIDER_yuka 0x0
#define ZONE_Root 0x0

1
include/mapfs/dgb_bt03_shape.h
View File

@ -16,3 +16,4 @@
#define MODEL_kabe 0x2
#define MODEL_yuka2 0x1
#define MODEL_waku 0x0

3
include/mapfs/dgb_bt04_hit.h
View File

@ -1,3 +1,6 @@
#define COLLIDER_Root 0x2
#define COLLIDER_dai 0x1
#define COLLIDER_yuka 0x0
#define ZONE_Root 0x0

1
include/mapfs/dgb_bt04_shape.h
View File

@ -20,3 +20,4 @@
#define MODEL_ten1 0x2
#define MODEL_yuka2 0x1
#define MODEL_waku 0x0

3
include/mapfs/dgb_bt05_hit.h
View File

@ -1,3 +1,6 @@
#define COLLIDER_Root 0x2
#define COLLIDER_dai 0x1
#define COLLIDER_yuka 0x0
#define ZONE_Root 0x0

1
include/mapfs/dgb_bt05_shape.h
View File

@ -35,3 +35,4 @@
#define MODEL_yuka4 0x2
#define MODEL_yuka3 0x1
#define MODEL_waku 0x0

12
include/mapfs/dro_01_hit.h
View File

@ -39,3 +39,15 @@
#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

1
include/mapfs/dro_01_shape.h
View File

@ -180,3 +180,4 @@
#define MODEL_road1 0x2
#define MODEL_stege 0x1
#define MODEL_frame 0x0

15
include/mapfs/dro_02_hit.h
View File

@ -57,3 +57,18 @@
#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

1
include/mapfs/dro_02_shape.h
View File

@ -163,3 +163,4 @@
#define MODEL_1_uka 0x2
#define MODEL_stege2 0x1
#define MODEL_stege 0x0

13
include/mapfs/end_00_hit.h
View File

@ -23,3 +23,16 @@
#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

1
include/mapfs/end_00_shape.h
View File

@ -101,3 +101,4 @@
#define MODEL_cloud 0x2
#define MODEL_bg1 0x1
#define MODEL_sky 0x0

10
include/mapfs/end_01_hit.h
View File

@ -12,3 +12,13 @@
#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

1
include/mapfs/end_01_shape.h
View File

@ -90,3 +90,4 @@
#define MODEL_mountain 0x2
#define MODEL_bg1 0x1
#define MODEL_sky 0x0

7
include/mapfs/flo_00_hit.h
View File

@ -50,3 +50,10 @@
#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

1
include/mapfs/flo_00_shape.h
View File

@ -133,3 +133,4 @@
#define MODEL_g11 0x2
#define MODEL_o64 0x1
#define MODEL_o57 0x0

7
include/mapfs/flo_03_hit.h
View File

@ -19,3 +19,10 @@
#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

Some files were not shown because too many files have changed in this diff Show More