diff --git a/raw_assets/code/Boss_ArmosKnight/Boss_ArmosKnight.c b/raw_assets/code/Boss_ArmosKnight/Boss_ArmosKnight.c deleted file mode 100644 index e6ca96e..0000000 --- a/raw_assets/code/Boss_ArmosKnight/Boss_ArmosKnight.c +++ /dev/null @@ -1,158 +0,0 @@ -#include -#define OBJ_ID 0x4 // OBJECT ID -#define ACT_ID 0x1 // ACTOR ID -#define PAD 0x0 - -#define MODEL_BODY 0x060031A0 // Main body mesh -#define MODEL_EYE 0x06003968 // Eye mesh -#define COLLISION 0x060018A0 // Collision mesh - -typedef struct -{ - DynaPolyActor dyna; - GfxPrint printer; - - s16 hopTimer; // Determines the time between the Armos becoming grounded and its next hop - - /* I have no clue what I'm doing so these are just variables that I may or may not use - s16 mouthOpenTimer; - s16 laserChargeTimer; - s16 laserUsageTimer; - */ - - bool beginLanding; - - /* - bool mouthOpen; - bool chargingLaser; - bool usingLaser; - */ -} entity_t; - -static InitChainEntry sInitChain[] = { - ICHAIN_F32(targetArrowOffset, 2000, ICHAIN_CONTINUE), -}; - -void Armos_Move(entity_t *en, GlobalContext *global) -{ - en->hopTimer--; - - // Begin hop movement - if (en->hopTimer <= 0 && en->dyna.actor.world.pos.y <= en->dyna.actor.floorHeight) - { - en->dyna.actor.world.pos.y = en->dyna.actor.world.pos.y + 10.0f; - en->dyna.actor.speedXZ = 10.0f; - en->dyna.actor.velocity.y = 6.0f; - en->dyna.actor.gravity = -1.0f; - Audio_PlayActorSound2(&en->dyna.actor, NA_SE_EN_STAL_JUMP); - en->hopTimer = 30; - en->beginLanding = true; - } - - // Checks for ground - if (en->beginLanding) - { - if (en->dyna.actor.world.pos.y <= en->dyna.actor.floorHeight) - { - en->dyna.actor.speedXZ = 0.0f; - en->dyna.actor.velocity.y = 0.0f; - en->dyna.actor.gravity = 0.0f; - en->beginLanding = false; - Audio_PlayActorSound2(&en->dyna.actor, NA_SE_EN_DODO_K_WALK); - } - } - - Actor_MoveForward(&en->dyna.actor); -} - -void Armos_FaceLink(entity_t *en, GlobalContext *global) -{ - // Copied from the dog actor - if (en->dyna.actor.world.pos.y > en->dyna.actor.floorHeight) // Only rotate when hopping - { - s16 rotTowardLink; - s16 prevRotY; - f32 absAngleDiff; - - rotTowardLink = en->dyna.actor.yawTowardsPlayer; - prevRotY = en->dyna.actor.world.rot.y; - - // This line adjusts rotation speed - Math_ApproachS(&en->dyna.actor.world.rot.y, rotTowardLink, 10, 3500); - - absAngleDiff = en->dyna.actor.world.rot.y; - absAngleDiff -= prevRotY; - absAngleDiff = fabsf(absAngleDiff); - - en->dyna.actor.shape.rot = en->dyna.actor.world.rot; - } -} - -static void init(entity_t *en, GlobalContext *global) -{ - Actor_ProcessInitChain(en, sInitChain); - en->dyna.actor.targetMode = 4; - - en->hopTimer = 30; - - Actor_SetScale(&en->dyna.actor, 1.0f); - - // Collision - CollisionHeader *colHeader = NULL; - DynaPolyActor_Init(&en->dyna, 0); - CollisionHeader_GetVirtual(COLLISION, &colHeader); - en->dyna.bgId = DynaPoly_SetBgActor(global, &global->colCtx.dyna, &en->dyna.actor, colHeader); -} - -static void update(entity_t *en, GlobalContext *global) -{ - Armos_Move(en, global); - Armos_FaceLink(en, global); -} - -static void dest(entity_t *en, GlobalContext *global) -{ - DynaPoly_DeleteBgActor(global, &global->colCtx.dyna, en->dyna.bgId); -} - -static void draw(entity_t *en, GlobalContext *global) -{ - // Model - Gfx_DrawDListOpa(global, MODEL_BODY); - Gfx_DrawDListOpa(global, MODEL_EYE); - - // Printer, thanks Dragorn - Gfx *gfx = global->state.gfxCtx->polyOpa.p + 1; - gSPDisplayList(global->state.gfxCtx->overlay.p++, gfx); - - GfxPrint_Init(&en->printer); - GfxPrint_Open(&en->printer, gfx); - GfxPrint_SetColor(&en->printer, 255, 0, 0, 255); - GfxPrint_SetPos(&en->printer, 1, 1); - - if (en->beginLanding) - { - GfxPrint_Printf(&en->printer, "true", en); - } - else - { - GfxPrint_Printf(&en->printer, "false", en); - } - - gfx = GfxPrint_Close(&en->printer); - GfxPrint_Destroy(&en->printer); - gSPEndDisplayList(gfx++); - gSPBranchList(global->state.gfxCtx->polyOpa.p, gfx); - global->state.gfxCtx->polyOpa.p = gfx; -} - -const ActorInit init_vars = { - ACT_ID, - 0x06, - 0x00000030, - OBJ_ID, - sizeof(entity_t), - (ActorFunc)init, - (ActorFunc)dest, - (ActorFunc)update, - (ActorFunc)draw}; \ No newline at end of file diff --git a/raw_assets/objects/Enemies/B_ArmosKnight/ArmosKnight.blend b/raw_assets/objects/Enemies/B_ArmosKnight/ArmosKnight.blend index 48decc2..bf99424 100644 Binary files a/raw_assets/objects/Enemies/B_ArmosKnight/ArmosKnight.blend and b/raw_assets/objects/Enemies/B_ArmosKnight/ArmosKnight.blend differ diff --git a/raw_assets/objects/Enemies/B_ArmosKnight/ArmosKnight.blend1 b/raw_assets/objects/Enemies/B_ArmosKnight/ArmosKnight.blend1 new file mode 100644 index 0000000..c6deb76 Binary files /dev/null and b/raw_assets/objects/Enemies/B_ArmosKnight/ArmosKnight.blend1 differ diff --git a/raw_assets/objects/Enemies/B_ArmosKnight/ArmosKnight_ZOBJ.xml b/raw_assets/objects/Enemies/B_ArmosKnight/ArmosKnight_ZOBJ.xml deleted file mode 100644 index 740f80d..0000000 --- a/raw_assets/objects/Enemies/B_ArmosKnight/ArmosKnight_ZOBJ.xml +++ /dev/null @@ -1,415 +0,0 @@ - - - - unnamed - 1 - 2 - 0 - 0 - 0 - 3 - 0 - 47185920 - 108 - 0 - 0 - 0 - 0 - false - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - false - true - false - false - false - - 0 - 0 - 0 - -1 - 4864 - - 8 - - - 0 - - - - - 0 - - - - - 0 - - - - - 0 - - - - - 0 - - - - - 0 - - - - - 0 - - - - - 0 - - - - - 0 - - C:\Users\xXzen\OneDrive\Desktop\Z64\CommunityHack\raw_assets\zone_f\model_files\Enemies\B_ArmosKnight\ArmosKnight.obj - - 0 - - - 4 - - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 4095 - 0 - 255 - 1 - 255 - 255 - - - - 8 - - -12178119 - 4802889 - -4941174 - 12040119 - -15461316 - -7571346 - 993 - 12800 - 1 - - - -9872806 - 4802889 - -16 - 12040119 - -13487526 - -10197896 - 996 - 12800 - 1 - - - -8889856 - 4802889 - -358606 - 12040119 - -14803396 - -8894926 - 995 - 12800 - 1 - - - -14137756 - 4802889 - -15461341 - 12040119 - -13487516 - -16777186 - 992 - 12800 - 1 - - - -12834746 - 4802889 - -11526596 - 12040119 - -11521386 - -12178643 - 978 - 12800 - 63 - - - -11838876 - 4802889 - -13107216 - 12040119 - -16083266 - -15443346 - 978 - 12800 - 63 - - - -12834736 - 4802889 - -12825706 - 12040119 - -12830826 - -13492706 - 978 - 12800 - 63 - - - -16766896 - 4802889 - -15453621 - 12040119 - -13474666 - -16774636 - 978 - 12800 - 63 - - - - 0 - - - 4 - - 70368878395394 - 0 - 0 - - - - 0 - - - 0 - - - 0 - - - 4 - - 0 - 0 - 0 - 0 - 0 - 0 - 3 - 45 - 65535 - 65535 - - - - 0 - - - 0 - - - 0 - - - 4 - - C:\Users\xXzen\OneDrive\Desktop\Z64\CommunityHack\raw_assets\zone_f\model_files\Enemies\B_ArmosKnight\ArmosKnight.obj - 65535 - 10 - false - false - 15 - 40 - 109 - 190 - 0 - 0 - false - false - 0 - false - - 0 - - 47185920 - - 0 - - - 0 - - - - 4294967295 - 4294967295 - 4294967295 - - - 0 - 0 - 2 - - - 0 - 0 - 2 - - - 0 - 0 - 0 - - - true - true - true - - - false - false - false - - - false - false - false - - - false - false - false - - - false - false - false - - - false - false - false - - - false - false - true - - - false - false - false - - - false - false - false - - - false - false - false - - - -1 - -1 - -1 - - - 0 - 0 - 0 - - - 0 - 0 - 0 - - - 0 - 0 - 0 - - - 0 - 0 - 0 - - - 4294967295 - 4294967295 - 4294967295 - - - false - false - false - - - 8 - 8 - 8 - - - 0 - 0 - 0 - - - 0 - 0 - 0 - - - false - false - false - - - false - false - false - - - false - false - false - - - false - false - false - - - 0 - ArmosKnight - - - \ No newline at end of file diff --git a/raw_assets/objects/Enemies/B_ArmosKnight/Statue.blend1 b/raw_assets/objects/Enemies/B_ArmosKnight/Statue.blend1 deleted file mode 100644 index d184083..0000000 Binary files a/raw_assets/objects/Enemies/B_ArmosKnight/Statue.blend1 and /dev/null differ diff --git a/raw_assets/objects/Enemies/B_Beamos/Beamos.blend b/raw_assets/objects/Enemies/B_Beamos/Beamos.blend new file mode 100644 index 0000000..b32e7b2 Binary files /dev/null and b/raw_assets/objects/Enemies/B_Beamos/Beamos.blend differ diff --git a/raw_assets/objects/Enemies/B_Beamos/barnacles.png b/raw_assets/objects/Enemies/B_Beamos/barnacles.png new file mode 100644 index 0000000..09310fe Binary files /dev/null and b/raw_assets/objects/Enemies/B_Beamos/barnacles.png differ diff --git a/raw_assets/objects/Enemies/B_Beamos/coral.png b/raw_assets/objects/Enemies/B_Beamos/coral.png new file mode 100644 index 0000000..9de74d8 Binary files /dev/null and b/raw_assets/objects/Enemies/B_Beamos/coral.png differ diff --git a/raw_assets/objects/Enemies/B_Beamos/drain.png b/raw_assets/objects/Enemies/B_Beamos/drain.png new file mode 100644 index 0000000..addce6b Binary files /dev/null and b/raw_assets/objects/Enemies/B_Beamos/drain.png differ diff --git a/raw_assets/objects/Enemies/B_Beamos/eye.png b/raw_assets/objects/Enemies/B_Beamos/eye.png new file mode 100644 index 0000000..50a4631 Binary files /dev/null and b/raw_assets/objects/Enemies/B_Beamos/eye.png differ diff --git a/raw_assets/objects/Enemies/B_Beamos/eyewarp.png b/raw_assets/objects/Enemies/B_Beamos/eyewarp.png new file mode 100644 index 0000000..81ad646 Binary files /dev/null and b/raw_assets/objects/Enemies/B_Beamos/eyewarp.png differ diff --git a/raw_assets/objects/Enemies/B_Beamos/laser.rgba16.png b/raw_assets/objects/Enemies/B_Beamos/laser.rgba16.png new file mode 100644 index 0000000..957ad1c Binary files /dev/null and b/raw_assets/objects/Enemies/B_Beamos/laser.rgba16.png differ diff --git a/raw_assets/objects/Enemies/B_Beamos/metal1.png b/raw_assets/objects/Enemies/B_Beamos/metal1.png new file mode 100644 index 0000000..8a85790 Binary files /dev/null and b/raw_assets/objects/Enemies/B_Beamos/metal1.png differ diff --git a/raw_assets/objects/Enemies/B_Beamos/metal2.png b/raw_assets/objects/Enemies/B_Beamos/metal2.png new file mode 100644 index 0000000..d42de5a Binary files /dev/null and b/raw_assets/objects/Enemies/B_Beamos/metal2.png differ diff --git a/raw_assets/objects/Enemies/B_Beamos/metal3.png b/raw_assets/objects/Enemies/B_Beamos/metal3.png new file mode 100644 index 0000000..01889fa Binary files /dev/null and b/raw_assets/objects/Enemies/B_Beamos/metal3.png differ diff --git a/raw_assets/objects/Enemies/B_Beamos/seaweed.png b/raw_assets/objects/Enemies/B_Beamos/seaweed.png new file mode 100644 index 0000000..1e9b389 Binary files /dev/null and b/raw_assets/objects/Enemies/B_Beamos/seaweed.png differ diff --git a/raw_assets/objects/Enemies/B_Beamos/spike.png b/raw_assets/objects/Enemies/B_Beamos/spike.png new file mode 100644 index 0000000..1719ba1 Binary files /dev/null and b/raw_assets/objects/Enemies/B_Beamos/spike.png differ diff --git a/raw_assets/zone_f/model_files/BossArena/BossArena.blend b/raw_assets/zone_f/model_files/BossArena/BossArena.blend new file mode 100644 index 0000000..19a8ea8 Binary files /dev/null and b/raw_assets/zone_f/model_files/BossArena/BossArena.blend differ diff --git a/raw_assets/zone_f/model_files/Maps/BossArena/Crack.png b/raw_assets/zone_f/model_files/BossArena/Crack.png similarity index 99% rename from raw_assets/zone_f/model_files/Maps/BossArena/Crack.png rename to raw_assets/zone_f/model_files/BossArena/Crack.png index 10c6d0a..a603058 100644 Binary files a/raw_assets/zone_f/model_files/Maps/BossArena/Crack.png and b/raw_assets/zone_f/model_files/BossArena/Crack.png differ diff --git a/raw_assets/zone_f/model_files/Maps/BossArena/mosswall1.png b/raw_assets/zone_f/model_files/BossArena/mosswall1.png similarity index 100% rename from raw_assets/zone_f/model_files/Maps/BossArena/mosswall1.png rename to raw_assets/zone_f/model_files/BossArena/mosswall1.png diff --git a/raw_assets/zone_f/model_files/Maps/BossArena/mosswall2.png b/raw_assets/zone_f/model_files/BossArena/mosswall2.png similarity index 100% rename from raw_assets/zone_f/model_files/Maps/BossArena/mosswall2.png rename to raw_assets/zone_f/model_files/BossArena/mosswall2.png diff --git a/raw_assets/zone_f/model_files/Maps/BossArena/outline.png b/raw_assets/zone_f/model_files/BossArena/outline.png similarity index 100% rename from raw_assets/zone_f/model_files/Maps/BossArena/outline.png rename to raw_assets/zone_f/model_files/BossArena/outline.png diff --git a/raw_assets/zone_f/model_files/Maps/BossArena/rusttile.png b/raw_assets/zone_f/model_files/BossArena/rusttile.png similarity index 100% rename from raw_assets/zone_f/model_files/Maps/BossArena/rusttile.png rename to raw_assets/zone_f/model_files/BossArena/rusttile.png diff --git a/raw_assets/zone_f/model_files/Dungeon/Crack.png b/raw_assets/zone_f/model_files/Dungeon/Crack.png new file mode 100644 index 0000000..a603058 Binary files /dev/null and b/raw_assets/zone_f/model_files/Dungeon/Crack.png differ diff --git a/raw_assets/zone_f/model_files/Dungeon/Door_Metal.png b/raw_assets/zone_f/model_files/Dungeon/Door_Metal.png new file mode 100644 index 0000000..d20c487 Binary files /dev/null and b/raw_assets/zone_f/model_files/Dungeon/Door_Metal.png differ diff --git a/raw_assets/zone_f/model_files/Dungeon/Dungeon.blend b/raw_assets/zone_f/model_files/Dungeon/Dungeon.blend new file mode 100644 index 0000000..0f172fe Binary files /dev/null and b/raw_assets/zone_f/model_files/Dungeon/Dungeon.blend differ diff --git a/raw_assets/zone_f/model_files/Dungeon/Metal_Pole01.png b/raw_assets/zone_f/model_files/Dungeon/Metal_Pole01.png new file mode 100644 index 0000000..554e505 Binary files /dev/null and b/raw_assets/zone_f/model_files/Dungeon/Metal_Pole01.png differ diff --git a/raw_assets/zone_f/model_files/Dungeon/Metal_Pole03.png b/raw_assets/zone_f/model_files/Dungeon/Metal_Pole03.png new file mode 100644 index 0000000..b6a4643 Binary files /dev/null and b/raw_assets/zone_f/model_files/Dungeon/Metal_Pole03.png differ diff --git a/raw_assets/zone_f/model_files/Dungeon/metal.png b/raw_assets/zone_f/model_files/Dungeon/metal.png new file mode 100644 index 0000000..333d3c2 Binary files /dev/null and b/raw_assets/zone_f/model_files/Dungeon/metal.png differ diff --git a/raw_assets/zone_f/model_files/Dungeon/metalBolts.png b/raw_assets/zone_f/model_files/Dungeon/metalBolts.png new file mode 100644 index 0000000..f7c2d0f Binary files /dev/null and b/raw_assets/zone_f/model_files/Dungeon/metalBolts.png differ diff --git a/raw_assets/zone_f/model_files/Dungeon/metal_Lantern_03_2.png b/raw_assets/zone_f/model_files/Dungeon/metal_Lantern_03_2.png new file mode 100644 index 0000000..44de827 Binary files /dev/null and b/raw_assets/zone_f/model_files/Dungeon/metal_Lantern_03_2.png differ diff --git a/raw_assets/zone_f/model_files/Dungeon/metal_curvy.png b/raw_assets/zone_f/model_files/Dungeon/metal_curvy.png new file mode 100644 index 0000000..b94b69b Binary files /dev/null and b/raw_assets/zone_f/model_files/Dungeon/metal_curvy.png differ diff --git a/raw_assets/zone_f/model_files/Dungeon/metal_decor_mesoft.png b/raw_assets/zone_f/model_files/Dungeon/metal_decor_mesoft.png new file mode 100644 index 0000000..db0a6a0 Binary files /dev/null and b/raw_assets/zone_f/model_files/Dungeon/metal_decor_mesoft.png differ diff --git a/raw_assets/zone_f/model_files/Dungeon/metal_door.png b/raw_assets/zone_f/model_files/Dungeon/metal_door.png new file mode 100644 index 0000000..4712c1a Binary files /dev/null and b/raw_assets/zone_f/model_files/Dungeon/metal_door.png differ diff --git a/raw_assets/zone_f/model_files/Dungeon/metal_gate_2#MirrorX#MirrorY.png b/raw_assets/zone_f/model_files/Dungeon/metal_gate_2#MirrorX#MirrorY.png new file mode 100644 index 0000000..1567bd0 Binary files /dev/null and b/raw_assets/zone_f/model_files/Dungeon/metal_gate_2#MirrorX#MirrorY.png differ diff --git a/raw_assets/zone_f/model_files/Dungeon/metalfence.png b/raw_assets/zone_f/model_files/Dungeon/metalfence.png new file mode 100644 index 0000000..86107a9 Binary files /dev/null and b/raw_assets/zone_f/model_files/Dungeon/metalfence.png differ diff --git a/raw_assets/zone_f/model_files/Dungeon/mosswall1.png b/raw_assets/zone_f/model_files/Dungeon/mosswall1.png new file mode 100644 index 0000000..96f7f1d Binary files /dev/null and b/raw_assets/zone_f/model_files/Dungeon/mosswall1.png differ diff --git a/raw_assets/zone_f/model_files/Dungeon/mosswall2.png b/raw_assets/zone_f/model_files/Dungeon/mosswall2.png new file mode 100644 index 0000000..b28207a Binary files /dev/null and b/raw_assets/zone_f/model_files/Dungeon/mosswall2.png differ diff --git a/raw_assets/zone_f/model_files/Dungeon/outline.png b/raw_assets/zone_f/model_files/Dungeon/outline.png new file mode 100644 index 0000000..90f6923 Binary files /dev/null and b/raw_assets/zone_f/model_files/Dungeon/outline.png differ diff --git a/raw_assets/zone_f/model_files/Dungeon/pipe1.png b/raw_assets/zone_f/model_files/Dungeon/pipe1.png new file mode 100644 index 0000000..3efcd64 Binary files /dev/null and b/raw_assets/zone_f/model_files/Dungeon/pipe1.png differ diff --git a/raw_assets/zone_f/model_files/Dungeon/rusttile.png b/raw_assets/zone_f/model_files/Dungeon/rusttile.png new file mode 100644 index 0000000..7e60736 Binary files /dev/null and b/raw_assets/zone_f/model_files/Dungeon/rusttile.png differ diff --git a/raw_assets/zone_f/model_files/Dungeon/stone_wall_pattern_1#MirrorX.png b/raw_assets/zone_f/model_files/Dungeon/stone_wall_pattern_1#MirrorX.png new file mode 100644 index 0000000..282438c Binary files /dev/null and b/raw_assets/zone_f/model_files/Dungeon/stone_wall_pattern_1#MirrorX.png differ diff --git a/raw_assets/zone_f/model_files/Dungeon/water.png b/raw_assets/zone_f/model_files/Dungeon/water.png new file mode 100644 index 0000000..bb94eb2 Binary files /dev/null and b/raw_assets/zone_f/model_files/Dungeon/water.png differ diff --git a/raw_assets/zone_f/model_files/DungeonMap.pdn b/raw_assets/zone_f/model_files/DungeonMap.pdn new file mode 100644 index 0000000..46ac383 Binary files /dev/null and b/raw_assets/zone_f/model_files/DungeonMap.pdn differ diff --git a/raw_assets/zone_f/model_files/DungeonMap2.pdn b/raw_assets/zone_f/model_files/DungeonMap2.pdn new file mode 100644 index 0000000..e90b062 Binary files /dev/null and b/raw_assets/zone_f/model_files/DungeonMap2.pdn differ diff --git a/raw_assets/zone_f/model_files/Entrance/Entrance.blend b/raw_assets/zone_f/model_files/Entrance/Entrance.blend new file mode 100644 index 0000000..c82e239 Binary files /dev/null and b/raw_assets/zone_f/model_files/Entrance/Entrance.blend differ diff --git a/raw_assets/zone_f/model_files/Maps/Entrance/Z2_30GYOSON (15).png b/raw_assets/zone_f/model_files/Entrance/Z2_30GYOSON (15).png similarity index 100% rename from raw_assets/zone_f/model_files/Maps/Entrance/Z2_30GYOSON (15).png rename to raw_assets/zone_f/model_files/Entrance/Z2_30GYOSON (15).png diff --git a/raw_assets/zone_f/model_files/Maps/Entrance/Z2_30GYOSON (41).png b/raw_assets/zone_f/model_files/Entrance/Z2_30GYOSON (41).png similarity index 100% rename from raw_assets/zone_f/model_files/Maps/Entrance/Z2_30GYOSON (41).png rename to raw_assets/zone_f/model_files/Entrance/Z2_30GYOSON (41).png diff --git a/raw_assets/zone_f/model_files/Maps/Entrance/Z2_HAKUGIN_BS (1).png b/raw_assets/zone_f/model_files/Entrance/Z2_HAKUGIN_BS (1).png similarity index 100% rename from raw_assets/zone_f/model_files/Maps/Entrance/Z2_HAKUGIN_BS (1).png rename to raw_assets/zone_f/model_files/Entrance/Z2_HAKUGIN_BS (1).png diff --git a/raw_assets/zone_f/model_files/Maps/Entrance/coral.png b/raw_assets/zone_f/model_files/Entrance/coral.png similarity index 100% rename from raw_assets/zone_f/model_files/Maps/Entrance/coral.png rename to raw_assets/zone_f/model_files/Entrance/coral.png diff --git a/raw_assets/zone_f/model_files/Maps/Entrance/dirt.png b/raw_assets/zone_f/model_files/Entrance/dirt.png similarity index 100% rename from raw_assets/zone_f/model_files/Maps/Entrance/dirt.png rename to raw_assets/zone_f/model_files/Entrance/dirt.png diff --git a/raw_assets/zone_f/model_files/Maps/Entrance/door.png b/raw_assets/zone_f/model_files/Entrance/door.png similarity index 100% rename from raw_assets/zone_f/model_files/Maps/Entrance/door.png rename to raw_assets/zone_f/model_files/Entrance/door.png diff --git a/raw_assets/zone_f/model_files/Maps/Entrance/ladder.png b/raw_assets/zone_f/model_files/Entrance/ladder.png similarity index 100% rename from raw_assets/zone_f/model_files/Maps/Entrance/ladder.png rename to raw_assets/zone_f/model_files/Entrance/ladder.png diff --git a/raw_assets/zone_f/model_files/Maps/Entrance/lillypad.png b/raw_assets/zone_f/model_files/Entrance/lillypad.png similarity index 100% rename from raw_assets/zone_f/model_files/Maps/Entrance/lillypad.png rename to raw_assets/zone_f/model_files/Entrance/lillypad.png diff --git a/raw_assets/zone_f/model_files/Maps/Entrance/reef.png b/raw_assets/zone_f/model_files/Entrance/reef.png similarity index 100% rename from raw_assets/zone_f/model_files/Maps/Entrance/reef.png rename to raw_assets/zone_f/model_files/Entrance/reef.png diff --git a/raw_assets/zone_f/model_files/Maps/Entrance/rockwall.png b/raw_assets/zone_f/model_files/Entrance/rockwall.png similarity index 100% rename from raw_assets/zone_f/model_files/Maps/Entrance/rockwall.png rename to raw_assets/zone_f/model_files/Entrance/rockwall.png diff --git a/raw_assets/zone_f/model_files/Maps/Entrance/roof.png b/raw_assets/zone_f/model_files/Entrance/roof.png similarity index 100% rename from raw_assets/zone_f/model_files/Maps/Entrance/roof.png rename to raw_assets/zone_f/model_files/Entrance/roof.png diff --git a/raw_assets/zone_f/model_files/Maps/Entrance/seashell.png b/raw_assets/zone_f/model_files/Entrance/seashell.png similarity index 100% rename from raw_assets/zone_f/model_files/Maps/Entrance/seashell.png rename to raw_assets/zone_f/model_files/Entrance/seashell.png diff --git a/raw_assets/zone_f/model_files/Maps/Entrance/seashell2.png b/raw_assets/zone_f/model_files/Entrance/seashell2.png similarity index 100% rename from raw_assets/zone_f/model_files/Maps/Entrance/seashell2.png rename to raw_assets/zone_f/model_files/Entrance/seashell2.png diff --git a/raw_assets/zone_f/model_files/Maps/Entrance/seaweed.png b/raw_assets/zone_f/model_files/Entrance/seaweed.png similarity index 100% rename from raw_assets/zone_f/model_files/Maps/Entrance/seaweed.png rename to raw_assets/zone_f/model_files/Entrance/seaweed.png diff --git a/raw_assets/zone_f/model_files/Maps/Entrance/splash.png b/raw_assets/zone_f/model_files/Entrance/splash.png similarity index 100% rename from raw_assets/zone_f/model_files/Maps/Entrance/splash.png rename to raw_assets/zone_f/model_files/Entrance/splash.png diff --git a/raw_assets/zone_f/model_files/Maps/Entrance/stone.png b/raw_assets/zone_f/model_files/Entrance/stone.png similarity index 100% rename from raw_assets/zone_f/model_files/Maps/Entrance/stone.png rename to raw_assets/zone_f/model_files/Entrance/stone.png diff --git a/raw_assets/zone_f/model_files/Maps/Entrance/stonerow.png b/raw_assets/zone_f/model_files/Entrance/stonerow.png similarity index 100% rename from raw_assets/zone_f/model_files/Maps/Entrance/stonerow.png rename to raw_assets/zone_f/model_files/Entrance/stonerow.png diff --git a/raw_assets/zone_f/model_files/Maps/Entrance/tile.png b/raw_assets/zone_f/model_files/Entrance/tile.png similarity index 100% rename from raw_assets/zone_f/model_files/Maps/Entrance/tile.png rename to raw_assets/zone_f/model_files/Entrance/tile.png diff --git a/raw_assets/zone_f/model_files/Maps/Entrance/tree.png b/raw_assets/zone_f/model_files/Entrance/tree.png similarity index 100% rename from raw_assets/zone_f/model_files/Maps/Entrance/tree.png rename to raw_assets/zone_f/model_files/Entrance/tree.png diff --git a/raw_assets/zone_f/model_files/Maps/Entrance/water.png b/raw_assets/zone_f/model_files/Entrance/water.png similarity index 100% rename from raw_assets/zone_f/model_files/Maps/Entrance/water.png rename to raw_assets/zone_f/model_files/Entrance/water.png diff --git a/raw_assets/zone_f/model_files/Maps/Entrance/waterfall.png b/raw_assets/zone_f/model_files/Entrance/waterfall.png similarity index 100% rename from raw_assets/zone_f/model_files/Maps/Entrance/waterfall.png rename to raw_assets/zone_f/model_files/Entrance/waterfall.png diff --git a/raw_assets/zone_f/model_files/Maps/Entrance/waterfence.png b/raw_assets/zone_f/model_files/Entrance/waterfence.png similarity index 100% rename from raw_assets/zone_f/model_files/Maps/Entrance/waterfence.png rename to raw_assets/zone_f/model_files/Entrance/waterfence.png diff --git a/raw_assets/zone_f/model_files/Maps/BossArena/BossArena.blend b/raw_assets/zone_f/model_files/Maps/BossArena/BossArena.blend deleted file mode 100644 index 38c70c8..0000000 Binary files a/raw_assets/zone_f/model_files/Maps/BossArena/BossArena.blend and /dev/null differ diff --git a/raw_assets/zone_f/model_files/Maps/BossArena/BossArena.xml b/raw_assets/zone_f/model_files/Maps/BossArena/BossArena.xml deleted file mode 100644 index e4efaf4..0000000 --- a/raw_assets/zone_f/model_files/Maps/BossArena/BossArena.xml +++ /dev/null @@ -1,459 +0,0 @@ - - - - unnamed - 1 - 27 - 0 - 0 - 0 - 3 - 0 - 47185920 - 108 - 0 - 0 - 0 - 0 - true - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - false - true - false - false - false - - 0 - 0 - 0 - -1 - 4864 - - 8 - - - 0 - - - - - 0 - - - - - 0 - - - - - 0 - - - - - 0 - - - - - 0 - - - - - 0 - - - - - 0 - - - - - 0 - - C:\Users\xXzen\OneDrive\Desktop\Z64\CommunityHack\raw_assets\zone_f\model_files\Maps\BossArena\BossArena.obj - - 4 - - 46 - 0 - 280 - 1182 - 0 - 32767 - 0 - 320 - 0 - 0 - 0 - 0 - 255 - - - - 4 - - 0 - 0 - 300 - 820 - 0 - -32768 - 0 - 4095 - 0 - 255 - 1 - 255 - 255 - - - - 8 - - -12178119 - 4802889 - -4941174 - 12040119 - -15461316 - -7571346 - 993 - 12800 - 1 - - - -9872806 - 4802889 - -16 - 12040119 - -13487526 - -10197896 - 996 - 12800 - 1 - - - -8889856 - 4802889 - -358606 - 12040119 - -14803396 - -8894926 - 995 - 12800 - 1 - - - -14137756 - 4802889 - -15461341 - 12040119 - -13487516 - -16777186 - 992 - 12800 - 1 - - - -12834746 - 4802889 - -11526596 - 12040119 - -11521386 - -12178643 - 978 - 12800 - 63 - - - -11838876 - 4802889 - -13107216 - 12040119 - -16083266 - -15443346 - 978 - 12800 - 63 - - - -12834736 - 4802889 - -12825706 - 12040119 - -12830826 - -13492706 - 978 - 12800 - 63 - - - -16766896 - 4802889 - -15453621 - 12040119 - -13474666 - -16774636 - 978 - 12800 - 63 - - - - 4 - - -1741 - 960 - -1862 - 3400 - 3400 - 1 - 0 - 63 - 0 - - - - 4 - - 0 - 0 - 0 - - - - 0 - - - 0 - - - 0 - - - 4 - - 0 - 0 - 0 - 0 - 0 - 0 - 3 - 45 - 65535 - 65535 - - - - 0 - - - 0 - - - 0 - - - 4 - - C:\Users\xXzen\OneDrive\Desktop\Z64\CommunityHack\raw_assets\zone_f\model_files\Maps\BossArena\BossArena.obj - 65535 - 0 - false - false - 15 - 40 - 109 - 190 - 0 - 0 - false - false - 0 - false - - 0 - - 47185920 - - 4 - - 4 - - - - 4 - - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 255 - - - - - 4294967295 - 4294967295 - 4294967295 - - - 0 - 0 - 2 - - - 0 - 0 - 2 - - - 0 - 0 - 0 - - - true - true - true - - - false - false - false - - - false - false - false - - - false - false - false - - - false - false - true - - - false - false - false - - - false - false - true - - - false - false - false - - - false - false - false - - - false - false - false - - - -1 - -1 - -1 - - - 0 - 0 - 0 - - - 0 - 0 - 0 - - - 0 - 0 - 0 - - - 0 - 0 - 0 - - - 4294967295 - 4294967295 - 4294967295 - - - true - true - true - - - 8 - 8 - 8 - - - 0 - 0 - 0 - - - 0 - 0 - 0 - - - false - false - false - - - false - false - false - - - false - false - false - - - false - false - false - - - 0 - BossArena - - - \ No newline at end of file diff --git a/raw_assets/zone_f/model_files/Maps/Entrance/Entrance.blend b/raw_assets/zone_f/model_files/Maps/Entrance/Entrance.blend deleted file mode 100644 index db8fa52..0000000 Binary files a/raw_assets/zone_f/model_files/Maps/Entrance/Entrance.blend and /dev/null differ diff --git a/raw_assets/zone_f/model_files/Maps/Entrance/Entrance.xml b/raw_assets/zone_f/model_files/Maps/Entrance/Entrance.xml deleted file mode 100644 index d6b533f..0000000 --- a/raw_assets/zone_f/model_files/Maps/Entrance/Entrance.xml +++ /dev/null @@ -1,844 +0,0 @@ - - - - unnamed - 1 - 2 - 0 - 0 - 0 - 3 - 0 - 47185920 - 108 - 0 - 0 - 0 - 0 - true - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - false - true - true - false - false - - 0 - 0 - 0 - -1 - 4864 - - 8 - - - 4 - - 0 - 1 - 0 - 0 - 32 - 64 - 32 - 64 - 1 - false - 0 - 0 - 255 - true - false - - 0 - - - 0 - - 0 - - - - - - 4 - - 25 - 3 - 0 - 0 - 64 - 64 - 64 - 64 - 1 - false - 0 - 0 - 255 - true - false - - 0 - - - 0 - - 0 - - - - - - 4 - - -1 - 1 - 1 - -1 - 64 - 64 - 64 - 64 - 1 - false - 0 - 0 - 255 - true - false - - 0 - - - 0 - - 0 - - - - - - 4 - - 0 - 0 - 4 - 0 - 32 - 32 - 32 - 32 - 1 - false - 0 - 0 - 255 - true - false - - 0 - - - 0 - - 0 - - - - - - 0 - - - - - 0 - - - - - 0 - - - - - 0 - - - - - 0 - - C:\Users\xXzen\OneDrive\Desktop\Z64\CommunityHack\raw_assets\zone_f\model_files\Maps\Entrance\Entrance.obj - - 0 - - - 4 - - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 4095 - 0 - 255 - 1 - 255 - 255 - - - - 8 - - -12178119 - 4802889 - -4941174 - 12040119 - -15461316 - -7571346 - 993 - 12800 - 1 - - - -9872806 - 4802889 - -16 - 12040119 - -13487526 - -10197896 - 996 - 12800 - 1 - - - -8889856 - 4802889 - -358606 - 12040119 - -14803396 - -8894926 - 995 - 12800 - 1 - - - -14137756 - 4802889 - -15461341 - 12040119 - -13487516 - -16777186 - 992 - 12800 - 1 - - - -12834746 - 4802889 - -11526596 - 12040119 - -11521386 - -12178643 - 978 - 12800 - 63 - - - -11838876 - 4802889 - -13107216 - 12040119 - -16083266 - -15443346 - 978 - 12800 - 63 - - - -12834736 - 4802889 - -12825706 - 12040119 - -12830826 - -13492706 - 978 - 12800 - 63 - - - -16766896 - 4802889 - -15453621 - 12040119 - -13474666 - -16774636 - 978 - 12800 - 63 - - - - 4 - - -2357 - -967 - -121 - 3000 - 5000 - 1 - 0 - 63 - 0 - - - -7060 - -1395 - -832 - 5000 - 5000 - 1 - 0 - 63 - 0 - - - - 4 - - 0 - 0 - 0 - - - 3170534137668829184 - 0 - 0 - - - 1099511627776 - 0 - 0 - - - - 4 - - 0 - - - - 0 - - - 0 - - - 4 - - 0 - 0 - 0 - 0 - 0 - 0 - 3 - 45 - 65535 - 65535 - - - - 0 - - - 0 - - - 0 - - - 8 - - C:\Users\xXzen\OneDrive\Desktop\Z64\CommunityHack\raw_assets\zone_f\model_files\Maps\Entrance\Entrance.obj - 65535 - 0 - false - false - 15 - 40 - 109 - 190 - 0 - 0 - false - false - 0 - false - - 0 - - 47185920 - - 0 - - - 4 - - 59 - -40 - 100 - 300 - 0 - 0 - 0 - 3 - 0 - 0 - 0 - 0 - 255 - - - - - 4294967295 - 1526726655 - 2113929215 - 4294967295 - 2113929215 - 4294967295 - 4294967295 - - - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - 0 - 0 - 0 - 1 - 0 - 2 - 0 - - - true - false - true - true - false - true - true - - - true - true - true - false - true - false - false - - - false - false - false - false - false - false - false - - - false - false - false - false - false - false - false - - - false - false - false - false - false - false - false - - - false - false - false - false - false - false - false - - - false - false - false - false - false - false - false - - - false - false - false - false - false - false - false - - - false - false - false - false - false - false - false - - - false - false - false - false - false - false - false - - - 2 - 7 - 6 - -1 - -1 - -1 - -1 - - - 1 - 1 - 1 - 0 - 0 - 0 - 0 - - - 1 - 1 - 1 - 0 - 0 - 0 - 0 - - - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - 2516582400 - 922746880 - 1677721600 - 4278190080 - 4278190080 - 4278190080 - 4278190080 - - - true - true - true - true - true - true - true - - - 8 - 9 - 10 - 8 - 11 - 8 - 8 - - - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - false - false - false - false - false - false - false - - - false - false - false - false - false - false - false - - - false - false - false - false - false - false - false - - - false - false - false - false - false - false - false - - - 0 - Entrance (Room 0) - - - C:\Users\xXzen\OneDrive\Desktop\Z64\CommunityHack\raw_assets\zone_f\model_files\Maps\Entrance\Entrance.obj - 65535 - 10 - false - false - 15 - 40 - 109 - 190 - 0 - 0 - false - false - 0 - false - - 0 - - 47185920 - - 0 - - - 0 - - - - 2113929215 - 4294967295 - 4294967295 - - - 0 - 0 - 0 - - - 0 - 0 - 0 - - - 0 - 0 - 0 - - - true - true - true - - - true - false - false - - - false - false - false - - - false - false - false - - - false - false - false - - - false - false - false - - - false - false - false - - - false - false - false - - - false - false - false - - - false - false - false - - - 6 - -1 - -1 - - - 1 - 0 - 0 - - - 1 - 0 - 0 - - - 0 - 0 - 0 - - - 0 - 0 - 0 - - - 1258291200 - 4278190080 - 4294967295 - - - true - false - false - - - 10 - 8 - 8 - - - 0 - 0 - 0 - - - 0 - 0 - 0 - - - false - false - false - - - false - false - false - - - false - false - false - - - false - false - false - - - 0 - Entrance (Room 1) - - - \ No newline at end of file