Added level to arena

This commit is contained in:
MysterD 2022-05-25 17:46:54 -07:00
parent a1c73d13ef
commit 0778226e60
28 changed files with 21658 additions and 1 deletions

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,35 @@
#include "src/game/envfx_snow.h"
const GeoLayout jrb_area_1_geo[] = {
GEO_NODE_START(),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, jrb_dl_LevelGeometry_mesh_layer_1),
GEO_CLOSE_NODE(),
GEO_RETURN(),
};
const GeoLayout jrb_area_1[] = {
GEO_NODE_SCREEN_AREA(10, SCREEN_WIDTH/2, SCREEN_HEIGHT/2, SCREEN_WIDTH/2, SCREEN_HEIGHT/2),
GEO_OPEN_NODE(),
GEO_ZBUFFER(0),
GEO_OPEN_NODE(),
GEO_NODE_ORTHO(100.0000),
GEO_OPEN_NODE(),
GEO_BACKGROUND(BACKGROUND_PURPLE_SKY, geo_skybox_main),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_ZBUFFER(1),
GEO_OPEN_NODE(),
GEO_CAMERA_FRUSTUM_WITH_FUNC(45.0000, 100, 30000, geo_camera_fov),
GEO_OPEN_NODE(),
GEO_CAMERA(CAMERA_MODE_8_DIRECTIONS, 0, 0, 0, 0, -100, 0, geo_camera_main),
GEO_OPEN_NODE(),
GEO_BRANCH(1, jrb_area_1_geo),
GEO_RENDER_OBJ(),
GEO_ASM(ENVFX_MODE_NONE, geo_envfx_main),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_CLOSE_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, jrb_dl_material_revert_render_settings),
GEO_CLOSE_NODE(),
GEO_END(),
};

View file

@ -0,0 +1,4 @@
const MacroObject jrb_area_1_macro_objs[] = {
MACRO_OBJECT_END(),
};

Binary file not shown.

After

Width:  |  Height:  |  Size: 9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.7 KiB

View file

@ -0,0 +1,17 @@
#include <ultra64.h>
#include "sm64.h"
#include "geo_commands.h"
#include "game/level_geo.h"
#include "game/geo_misc.h"
#include "game/camera.h"
#include "game/moving_texture.h"
#include "game/screen_transition.h"
#include "game/paintings.h"
#include "make_const_nonconst.h"
#include "levels/jrb/header.h"
#include "levels/jrb/geo.inc.c"

View file

@ -0,0 +1 @@
#include "levels/jrb/area_1/geo.inc.c"

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.4 KiB

View file

@ -0,0 +1,12 @@
#ifndef JRB_HEADER_H
#define JRB_HEADER_H
#include "types.h"
#include "game/moving_texture.h"
extern const LevelScript level_jrb_entry[];
#include "levels/jrb/header.inc.h"
#endif

View file

@ -0,0 +1,78 @@
extern const GeoLayout jrb_area_1_geo[];
extern const GeoLayout jrb_area_1[];
extern const Collision jrb_area_1_collision[];
extern const MacroObject jrb_area_1_macro_objs[];
extern Lights1 jrb_dl_Material_1441_f3d_lights;
extern Lights1 jrb_dl_Material_1440_f3d_lights;
extern Lights1 jrb_dl_Material_1449_f3d_lights;
extern Lights1 jrb_dl_Material_003_f3d_lights;
extern Lights1 jrb_dl_Material_1443_f3d_lights;
extern Lights1 jrb_dl_Material_1444_f3d_lights;
extern Lights1 jrb_dl_Material_1448_f3d_lights;
extern Lights1 jrb_dl_Material_002_f3d_lights;
extern Lights1 jrb_dl_Material_1446_f3d_lights;
extern Lights1 jrb_dl_Material_1442_f3d_lights;
extern Lights1 jrb_dl_Material_1447_f3d_lights;
extern Lights1 jrb_dl_Material_1445_f3d_lights;
extern u8 jrb_dl_dirt2_rgba32[];
extern u8 jrb_dl_grass2_rgba32[];
extern u8 jrb_dl_set2_example_2_rgba32[];
extern u8 jrb_dl_big_bricks_blue_rgba32[];
extern u8 jrb_dl_mntn_canyon_d_rgba32[];
extern u8 jrb_dl_diag_tile_rgba32[];
extern u8 jrb_dl_metal_trim_rgba32[];
extern u8 jrb_dl_worn_brick_blue_rgba32[];
extern u8 jrb_dl_wood_floor_3_rgba32[];
extern u8 jrb_dl_paving_2_rgba32[];
extern u8 jrb_dl_big_bricks_rgba32[];
extern u8 jrb_dl_worn_brick_rgba32[];
extern Vtx jrb_dl_LevelGeometry_mesh_layer_1_vtx_0[353];
extern Gfx jrb_dl_LevelGeometry_mesh_layer_1_tri_0[];
extern Vtx jrb_dl_LevelGeometry_mesh_layer_1_vtx_1[956];
extern Gfx jrb_dl_LevelGeometry_mesh_layer_1_tri_1[];
extern Vtx jrb_dl_LevelGeometry_mesh_layer_1_vtx_2[1556];
extern Gfx jrb_dl_LevelGeometry_mesh_layer_1_tri_2[];
extern Vtx jrb_dl_LevelGeometry_mesh_layer_1_vtx_3[319];
extern Gfx jrb_dl_LevelGeometry_mesh_layer_1_tri_3[];
extern Vtx jrb_dl_LevelGeometry_mesh_layer_1_vtx_4[372];
extern Gfx jrb_dl_LevelGeometry_mesh_layer_1_tri_4[];
extern Vtx jrb_dl_LevelGeometry_mesh_layer_1_vtx_5[417];
extern Gfx jrb_dl_LevelGeometry_mesh_layer_1_tri_5[];
extern Vtx jrb_dl_LevelGeometry_mesh_layer_1_vtx_6[2510];
extern Gfx jrb_dl_LevelGeometry_mesh_layer_1_tri_6[];
extern Vtx jrb_dl_LevelGeometry_mesh_layer_1_vtx_7[146];
extern Gfx jrb_dl_LevelGeometry_mesh_layer_1_tri_7[];
extern Vtx jrb_dl_LevelGeometry_mesh_layer_1_vtx_8[338];
extern Gfx jrb_dl_LevelGeometry_mesh_layer_1_tri_8[];
extern Vtx jrb_dl_LevelGeometry_mesh_layer_1_vtx_9[824];
extern Gfx jrb_dl_LevelGeometry_mesh_layer_1_tri_9[];
extern Vtx jrb_dl_LevelGeometry_mesh_layer_1_vtx_10[315];
extern Gfx jrb_dl_LevelGeometry_mesh_layer_1_tri_10[];
extern Vtx jrb_dl_LevelGeometry_mesh_layer_1_vtx_11[153];
extern Gfx jrb_dl_LevelGeometry_mesh_layer_1_tri_11[];
extern Gfx mat_jrb_dl_Material_1441_f3d[];
extern Gfx mat_revert_jrb_dl_Material_1441_f3d[];
extern Gfx mat_jrb_dl_Material_1440_f3d[];
extern Gfx mat_revert_jrb_dl_Material_1440_f3d[];
extern Gfx mat_jrb_dl_Material_1449_f3d[];
extern Gfx mat_revert_jrb_dl_Material_1449_f3d[];
extern Gfx mat_jrb_dl_Material_003_f3d[];
extern Gfx mat_revert_jrb_dl_Material_003_f3d[];
extern Gfx mat_jrb_dl_Material_1443_f3d[];
extern Gfx mat_revert_jrb_dl_Material_1443_f3d[];
extern Gfx mat_jrb_dl_Material_1444_f3d[];
extern Gfx mat_revert_jrb_dl_Material_1444_f3d[];
extern Gfx mat_jrb_dl_Material_1448_f3d[];
extern Gfx mat_revert_jrb_dl_Material_1448_f3d[];
extern Gfx mat_jrb_dl_Material_002_f3d[];
extern Gfx mat_revert_jrb_dl_Material_002_f3d[];
extern Gfx mat_jrb_dl_Material_1446_f3d[];
extern Gfx mat_revert_jrb_dl_Material_1446_f3d[];
extern Gfx mat_jrb_dl_Material_1442_f3d[];
extern Gfx mat_revert_jrb_dl_Material_1442_f3d[];
extern Gfx mat_jrb_dl_Material_1447_f3d[];
extern Gfx mat_revert_jrb_dl_Material_1447_f3d[];
extern Gfx mat_jrb_dl_Material_1445_f3d[];
extern Gfx mat_revert_jrb_dl_Material_1445_f3d[];
extern Gfx jrb_dl_LevelGeometry_mesh_layer_1[];
extern Gfx jrb_dl_material_revert_render_settings[];

View file

@ -0,0 +1,14 @@
#include <ultra64.h>"
#include "sm64.h"
#include "surface_terrains.h"
#include "moving_texture_macros.h"
#include "level_misc_macros.h"
#include "macro_preset_names.h"
#include "special_preset_names.h"
#include "textures.h"
#include "dialog_ids.h"
#include "make_const_nonconst.h"
#include "levels/jrb/leveldata.inc.c"

View file

@ -0,0 +1,5 @@
#include "levels/jrb/texture_include.inc.c"
#include "levels/jrb/area_1/collision.inc.c"
#include "levels/jrb/area_1/macro.inc.c"
#include "levels/jrb/area_1/spline.inc.c"
#include "levels/jrb/model.inc.c"

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.3 KiB

File diff suppressed because it is too large Load diff

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

View file

@ -0,0 +1,106 @@
#include <ultra64.h>
#include "sm64.h"
#include "behavior_data.h"
#include "model_ids.h"
#include "seq_ids.h"
#include "dialog_ids.h"
#include "segment_symbols.h"
#include "level_commands.h"
#include "game/level_update.h"
#include "levels/scripts.h"
/* Fast64 begin persistent block [includes] */
/* Fast64 end persistent block [includes] */
#include "make_const_nonconst.h"
#include "levels/jrb/header.h"
/* Fast64 begin persistent block [scripts] */
/* Fast64 end persistent block [scripts] */
const LevelScript level_jrb_entry[] = {
INIT_LEVEL(),
LOAD_MIO0(0x7, _jrb_segment_7SegmentRomStart, _jrb_segment_7SegmentRomEnd),
LOAD_MIO0(0xa, _bits_skybox_mio0SegmentRomStart, _bits_skybox_mio0SegmentRomEnd),
ALLOC_LEVEL_POOL(),
MARIO(MODEL_MARIO, 0x00000001, bhvMario),
/* Fast64 begin persistent block [level commands] */
/* Fast64 end persistent block [level commands] */
AREA(1, jrb_area_1),
WARP_NODE(0x0A, LEVEL_WF, 0x01, 0x0A, WARP_NO_CHECKPOINT),
WARP_NODE(0xF3, LEVEL_CASTLE, 0x01, 0x20, WARP_NO_CHECKPOINT),
WARP_NODE(0xF0, LEVEL_CASTLE, 0x01, 0x26, WARP_NO_CHECKPOINT),
WARP_NODE(0xF1, LEVEL_CASTLE, 0x01, 0x23, WARP_NO_CHECKPOINT),
OBJECT(MODEL_NONE, 0, 1900, -6380, 0, 0, 0, (0x01 << 24), id_bhvArenaFlag),
OBJECT(MODEL_NONE, 0, 1900, 6380, 0, -180, 0, (0x02 << 24), id_bhvArenaFlag),
OBJECT(MODEL_NONE, 0, 1000, 0, 0, -90, 0, (0x00 << 24), id_bhvArenaFlag),
OBJECT(MODEL_NONE, 0, 700, 0, 0, 90, 0, (0x02 << 24), id_bhvArenaItem),
OBJECT(MODEL_NONE, -1300, 0, 0, 0, 90, 0, (0x06 << 24), id_bhvArenaItem),
OBJECT(MODEL_NONE, 1300, 0, 0, 0, -90, 0, (0x06 << 24), id_bhvArenaItem),
OBJECT(MODEL_NONE, 0, 1500, 4160, 0, -180, 0, (0x05 << 24), id_bhvArenaItem),
OBJECT(MODEL_NONE, 0, 1500, -4160, 0, 0, 0, (0x05 << 24), id_bhvArenaItem),
OBJECT(MODEL_NONE, -3190, 1900, 6370, 0, 90, 0, (0x04 << 24), id_bhvArenaItem),
OBJECT(MODEL_NONE, 3190, 1900, 6370, 0, -90, 0, (0x03 << 24), id_bhvArenaItem),
OBJECT(MODEL_NONE, 3190, 1900, -6380, 0, -90, 0, (0x04 << 24), id_bhvArenaItem),
OBJECT(MODEL_NONE, -3190, 1900, -6380, 0, 90, 0, (0x03 << 24), id_bhvArenaItem),
OBJECT(MODEL_NONE, 0, 1400, -7400, 0, -180, 0, (0x02 << 24), id_bhvArenaItem),
OBJECT(MODEL_NONE, 0, 1400, 7400, 0, 0, 0, (0x02 << 24), id_bhvArenaItem),
OBJECT(MODEL_NONE, 0, 1800, -4760, 0, 0, 0, (0x01 << 24), id_bhvArenaItem),
OBJECT(MODEL_NONE, 0, 1800, 4760, 0, -180, 0, (0x01 << 24), id_bhvArenaItem),
OBJECT(MODEL_NONE, 3700, 800, -8200, 0, 0, 0, (0x06 << 24), id_bhvArenaItem),
OBJECT(MODEL_NONE, -3700, 800, -8200, 0, 0, 0, (0x06 << 24), id_bhvArenaItem),
OBJECT(MODEL_NONE, 3700, 800, 8200, 0, -180, 0, (0x06 << 24), id_bhvArenaItem),
OBJECT(MODEL_NONE, -3700, 800, 8200, 0, -180, 0, (0x06 << 24), id_bhvArenaItem),
OBJECT(MODEL_NONE, 1700, 1200, -4660, 0, -180, 0, (0x06 << 24), id_bhvArenaItem),
OBJECT(MODEL_NONE, -1700, 1200, -4660, 0, -180, 0, (0x06 << 24), id_bhvArenaItem),
OBJECT(MODEL_NONE, -1700, 1200, 4660, 0, 0, 0, (0x06 << 24), id_bhvArenaItem),
OBJECT(MODEL_NONE, 1700, 1200, 4660, 0, 0, 0, (0x06 << 24), id_bhvArenaItem),
OBJECT(MODEL_NONE, 0, 510, 0, 0, -180, 0, 0x00000000, id_bhvArenaKoth),
OBJECT(MODEL_NONE, 0, 1700, 6380, 0, -180, 0, 0x00000000, id_bhvArenaKoth),
OBJECT(MODEL_NONE, 0, 1700, -6380, 0, -180, 0, 0x00000000, id_bhvArenaKoth),
OBJECT(MODEL_NONE, -3200, 1700, -6380, 0, -180, 0, 0x00000000, id_bhvArenaKoth),
OBJECT(MODEL_NONE, 0, 510, 0, 0, -180, 0, 0x00000000, id_bhvArenaKoth),
OBJECT(MODEL_NONE, 0, 750, -7900, 0, -180, 0, (0x01 << 24), id_bhvArenaSpawn),
OBJECT(MODEL_NONE, 0, 750, 7900, 0, 0, 0, (0x02 << 24), id_bhvArenaSpawn),
OBJECT(MODEL_NONE, 0, 680, 4880, 0, -180, 0, (0x02 << 24), id_bhvArenaSpawn),
OBJECT(MODEL_NONE, 0, 680, -4880, 0, 0, 0, (0x01 << 24), id_bhvArenaSpawn),
OBJECT(MODEL_NONE, -1340, 1700, -6380, 0, 90, 0, (0x01 << 24), id_bhvArenaSpawn),
OBJECT(MODEL_NONE, 1340, 1700, -6380, 0, -90, 0, (0x01 << 24), id_bhvArenaSpawn),
OBJECT(MODEL_NONE, -1340, 1700, 6380, 0, 90, 0, (0x02 << 24), id_bhvArenaSpawn),
OBJECT(MODEL_NONE, 1340, 1700, 6380, 0, -90, 0, (0x02 << 24), id_bhvArenaSpawn),
OBJECT(MODEL_NONE, 0, 1020, -5350, 0, 0, 0, (0x01 << 24), id_bhvArenaSpawn),
OBJECT(MODEL_NONE, 0, 1020, 5350, 0, -180, 0, (0x02 << 24), id_bhvArenaSpawn),
OBJECT(MODEL_NONE, 2180, 570, -6300, 0, 90, 0, (0x01 << 24), id_bhvArenaSpawn),
OBJECT(MODEL_NONE, -2180, 570, -6300, 0, -90, 0, (0x01 << 24), id_bhvArenaSpawn),
OBJECT(MODEL_NONE, -2180, 570, 6300, 0, -90, 0, (0x02 << 24), id_bhvArenaSpawn),
OBJECT(MODEL_NONE, 2180, 570, 6300, 0, 90, 0, (0x02 << 24), id_bhvArenaSpawn),
OBJECT(MODEL_NONE, 1100, 750, -7900, 0, -180, 0, (0x01 << 24), id_bhvArenaSpawn),
OBJECT(MODEL_NONE, -1100, 750, -7900, 0, -180, 0, (0x01 << 24), id_bhvArenaSpawn),
OBJECT(MODEL_NONE, -1100, 750, 7900, 0, 0, 0, (0x02 << 24), id_bhvArenaSpawn),
OBJECT(MODEL_NONE, 1100, 750, 7900, 0, 0, 0, (0x02 << 24), id_bhvArenaSpawn),
OBJECT(MODEL_NONE, -2180, 420, 4770, 0, -90, 0, (0x02 << 24), id_bhvArenaSpawn),
OBJECT(MODEL_NONE, 2180, 420, 4770, 0, 90, 0, (0x02 << 24), id_bhvArenaSpawn),
OBJECT(MODEL_NONE, 2180, 420, -4770, 0, 90, 0, (0x01 << 24), id_bhvArenaSpawn),
OBJECT(MODEL_NONE, -2180, 420, -4770, 0, -90, 0, (0x01 << 24), id_bhvArenaSpawn),
OBJECT(MODEL_NONE, 0, 1279, 0, 0, 0, 0, (10 << 16), bhvAirborneWarp),
TERRAIN(jrb_area_1_collision),
MACRO_OBJECTS(jrb_area_1_macro_objs),
SET_BACKGROUND_MUSIC(0x00, SEQ_LEVEL_GRASS),
TERRAIN_TYPE(TERRAIN_GRASS),
/* Fast64 begin persistent block [area commands] */
/* Fast64 end persistent block [area commands] */
END_AREA(),
FREE_LEVEL_POOL(),
MARIO_POS(1, 0, 0, 0, 0),
CALL(0, lvl_init_or_update),
CALL_LOOP(1, lvl_init_or_update),
CLEAR_LEVEL(),
SLEEP_BEFORE_EXIT(1),
EXIT(),
};

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.5 KiB

View file

@ -0,0 +1,60 @@
Gfx jrb_dl_dirt2_rgba32_aligner[] = {gsSPEndDisplayList()};
u8 jrb_dl_dirt2_rgba32[] = {
#include "levels/jrb/dirt2.rgba32.inc.c"
};
Gfx jrb_dl_grass2_rgba32_aligner[] = {gsSPEndDisplayList()};
u8 jrb_dl_grass2_rgba32[] = {
#include "levels/jrb/grass2.rgba32.inc.c"
};
Gfx jrb_dl_set2_example_2_rgba32_aligner[] = {gsSPEndDisplayList()};
u8 jrb_dl_set2_example_2_rgba32[] = {
#include "levels/jrb/set2_example_2.rgba32.inc.c"
};
Gfx jrb_dl_big_bricks_blue_rgba32_aligner[] = {gsSPEndDisplayList()};
u8 jrb_dl_big_bricks_blue_rgba32[] = {
#include "levels/jrb/big_bricks_blue.rgba32.inc.c"
};
Gfx jrb_dl_mntn_canyon_d_rgba32_aligner[] = {gsSPEndDisplayList()};
u8 jrb_dl_mntn_canyon_d_rgba32[] = {
#include "levels/jrb/mntn_canyon_d.rgba32.inc.c"
};
Gfx jrb_dl_diag_tile_rgba32_aligner[] = {gsSPEndDisplayList()};
u8 jrb_dl_diag_tile_rgba32[] = {
#include "levels/jrb/diag_tile.rgba32.inc.c"
};
Gfx jrb_dl_metal_trim_rgba32_aligner[] = {gsSPEndDisplayList()};
u8 jrb_dl_metal_trim_rgba32[] = {
#include "levels/jrb/metal_trim.rgba32.inc.c"
};
Gfx jrb_dl_worn_brick_blue_rgba32_aligner[] = {gsSPEndDisplayList()};
u8 jrb_dl_worn_brick_blue_rgba32[] = {
#include "levels/jrb/worn_brick_blue.rgba32.inc.c"
};
Gfx jrb_dl_wood_floor_3_rgba32_aligner[] = {gsSPEndDisplayList()};
u8 jrb_dl_wood_floor_3_rgba32[] = {
#include "levels/jrb/wood_floor_3.rgba32.inc.c"
};
Gfx jrb_dl_paving_2_rgba32_aligner[] = {gsSPEndDisplayList()};
u8 jrb_dl_paving_2_rgba32[] = {
#include "levels/jrb/paving_2.rgba32.inc.c"
};
Gfx jrb_dl_big_bricks_rgba32_aligner[] = {gsSPEndDisplayList()};
u8 jrb_dl_big_bricks_rgba32[] = {
#include "levels/jrb/big_bricks.rgba32.inc.c"
};
Gfx jrb_dl_worn_brick_rgba32_aligner[] = {gsSPEndDisplayList()};
u8 jrb_dl_worn_brick_rgba32[] = {
#include "levels/jrb/worn_brick.rgba32.inc.c"
};

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9 KiB

Binary file not shown.

View file

@ -27,12 +27,18 @@ gGameLevels = {
{ level = LEVEL_BOB, name = 'Origin' },
{ level = LEVEL_CCM, name = 'Sky Beach' },
{ level = LEVEL_WF, name = 'Pillars' },
{ level = LEVEL_JRB, name = 'Forts' },
}
smlua_text_utils_course_acts_replace(COURSE_BOB, " 1 Origin", "?", "?", "?", "?", "?", "?")
smlua_text_utils_course_acts_replace(COURSE_CCM, " 4 Sky Beach", "?", "?", "?", "?", "?", "?")
smlua_text_utils_course_acts_replace(COURSE_WF, " 2 Pillars", "?", "?", "?", "?", "?", "?")
smlua_text_utils_course_acts_replace(COURSE_JRB, " 3 Forts", "?", "?", "?", "?", "?", "?")
-- setup global sync table
gGlobalSyncTable.gameState = GAME_STATE_ACTIVE
gGlobalSyncTable.gameMode = GAME_MODE_DM
gGlobalSyncTable.currentLevel = LEVEL_BOB
gGlobalSyncTable.currentLevel = LEVEL_JRB
gGlobalSyncTable.roundsPerShuffle = 3
gGlobalSyncTable.capTeam1 = 0
gGlobalSyncTable.capTeam2 = 0