mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-07-03 19:10:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use anime_X_Z definitions where applicable

Browse Source
This commit is contained in:
Cuyler36
2024-07-28 01:17:12 -04:00
parent 9326cfd81b
commit 1366a25c48
77 changed files with 42925 additions and 49126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/libforest/emu64/emu64.hpp
-13
View File
@@ -129,19 +129,6 @@
#define EMU64_TLUT_IA16 0x0000
#define EMU64_TLUT_RGBA5551 0x8000
#define SOFTSPRITE_MTX_SEG 0x07
#define ANIME_1_TXT_SEG 0x08
#define ANIME_2_TXT_SEG 0x09
#define ANIME_3_TXT_SEG 0x0A
#define ANIME_4_TXT_SEG 0x0B
#define ANIME_5_TXT_SEG 0x0C
#define ANIME_6_TXT_SEG 0x0D
#define SEGMENT_SHIFT 24
#define SEG_2_SEGADDR(seg) (seg << SEGMENT_SHIFT)
#define SEG_EQUALS(seg_addr, seg) (seg_addr == SEG_2_SEGADDR(seg))
/* TODO: figure out where this actually belongs */
namespace std {
typedef struct __va_list_struct __tag_va_List;
include/libforest/gbi_extensions.h
+30
View File
@@ -11,6 +11,36 @@ extern "C" {
#include <PR/mbi.h>
#include "dolphin/gx.h"
#define SOFTSPRITE_MTX_SEG 0x07
#define ANIME_1_TXT_SEG 0x08
#define ANIME_2_TXT_SEG 0x09
#define ANIME_3_TXT_SEG 0x0A
#define ANIME_4_TXT_SEG 0x0B
#define ANIME_5_TXT_SEG 0x0C
#define ANIME_6_TXT_SEG 0x0D
#define ANIME_4_TXT_SIZE 0x800
#define ANIME_6_MODEL_SIZE 0x408
#define SEGMENT_SHIFT 24
#define SEG_2_SEGADDR(seg) (seg << SEGMENT_SHIFT)
#define SEG_EQUALS(seg_addr, seg) (seg_addr == SEG_2_SEGADDR(seg))
#define softsprite_mtx SEG_2_SEGADDR(SOFTSPRITE_MTX_SEG)
#define anime_1_txt SEG_2_SEGADDR(ANIME_1_TXT_SEG)
#define anime_1_model SEG_2_SEGADDR(ANIME_1_TXT_SEG)
#define anime_2_txt SEG_2_SEGADDR(ANIME_2_TXT_SEG)
#define anime_2_model SEG_2_SEGADDR(ANIME_2_TXT_SEG)
#define anime_3_txt SEG_2_SEGADDR(ANIME_3_TXT_SEG)
#define anime_3_model SEG_2_SEGADDR(ANIME_3_TXT_SEG)
#define anime_4_txt SEG_2_SEGADDR(ANIME_4_TXT_SEG)
#define anime_4_model SEG_2_SEGADDR(ANIME_4_TXT_SEG)
#define anime_5_txt SEG_2_SEGADDR(ANIME_5_TXT_SEG)
#define anime_5_model SEG_2_SEGADDR(ANIME_5_TXT_SEG)
#define anime_6_txt SEG_2_SEGADDR(ANIME_6_TXT_SEG)
#define anime_6_model SEG_2_SEGADDR(ANIME_6_TXT_SEG)
/* New Microcode Command Ids */
#define G_TRIN 0x09
#define G_TRIN_INDEPEND 0x0A
src/data/model/mural/obj_mural.c
+4 -4
View File
@@ -14,11 +14,11 @@ Gfx obj_mural_model[] = {
/* @BUG - These commands were never updated for Dolphin and therefore render broken */
#ifndef BUGFIXES
gsDPLoadTLUT_pal16(15, 0x08000000),
gsDPLoadTextureBlock_4b(0x09000000, G_IM_FMT_CI, 32, 32, 15, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_CLAMP, 5, 5, G_TX_NOLOD, G_TX_NOLOD),
gsDPLoadTLUT_pal16(15, anime_1_txt),
gsDPLoadTextureBlock_4b(anime_2_txt, G_IM_FMT_CI, 32, 32, 15, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_CLAMP, 5, 5, G_TX_NOLOD, G_TX_NOLOD),
#else
gsDPLoadTLUT_Dolphin(15, 16, 1, 0x08000000),
gsDPLoadTextureBlock_4b_Dolphin(0x09000000, G_IM_FMT_CI, 32, 32, 15, GX_MIRROR, GX_CLAMP, 0, 0),
gsDPLoadTLUT_Dolphin(15, 16, 1, anime_1_txt),
gsDPLoadTextureBlock_4b_Dolphin(anime_2_txt, G_IM_FMT_CI, 32, 32, 15, GX_MIRROR, GX_CLAMP, 0, 0),
#endif
gsDPSetPrimColor(0, 128, 255, 255, 255, 255),
gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH),
src/data/model/obj_e_boat/obj_e_boat.c
+252 -279
View File
@@ -29,246 +29,219 @@ static Gfx obj_e_boat_boat1_model[] = {
gsDPSetPrimColor(0, 128, 255, 255, 255, 255),
gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH),
gsSPVertex(&obj_e_boat_v[30], 30, 0),
gsSPNTrianglesInit_5b(
4, // tri count
0, 1, 2, // tri0
0, 2, 3, // tri1
4, 5, 6 // tri2
),
gsSPNTriangles_5b(
4, 6, 7, // tri0
0, 0, 0, // tri1
0, 0, 0, // tri2
0, 0, 0 // tri3
),
gsSPNTrianglesInit_5b(4, // tri count
0, 1, 2, // tri0
0, 2, 3, // tri1
4, 5, 6 // tri2
),
gsSPNTriangles_5b(4, 6, 7, // tri0
0, 0, 0, // tri1
0, 0, 0, // tri2
0, 0, 0 // tri3
),
gsDPLoadTextureBlock_4b_Dolphin(obj_s_boat_t7_tex_txt, G_IM_FMT_CI, 16, 16, 15, GX_REPEAT, GX_REPEAT, 0, 0),
gsSPNTrianglesInit_5b(
2, // tri count
8, 9, 10, // tri0
8, 10, 11, // tri1
0, 0, 0 // tri2
),
gsSPNTrianglesInit_5b(2, // tri count
8, 9, 10, // tri0
8, 10, 11, // tri1
0, 0, 0 // tri2
),
gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH),
gsSPNTrianglesInit_5b(
2, // tri count
12, 13, 14, // tri0
12, 14, 15, // tri1
0, 0, 0 // tri2
),
gsSPNTrianglesInit_5b(2, // tri count
12, 13, 14, // tri0
12, 14, 15, // tri1
0, 0, 0 // tri2
),
gsDPLoadTextureBlock_4b_Dolphin(obj_s_boat_t1_tex_txt, G_IM_FMT_CI, 32, 64, 15, GX_REPEAT, GX_REPEAT, 0, 0),
gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH),
gsSPNTrianglesInit_5b(
5, // tri count
16, 17, 18, // tri0
16, 18, 19, // tri1
16, 20, 21 // tri2
),
gsSPNTriangles_5b(
16, 21, 17, // tri0
20, 22, 21, // tri1
0, 0, 0, // tri2
0, 0, 0 // tri3
),
gsSPNTrianglesInit_5b(5, // tri count
16, 17, 18, // tri0
16, 18, 19, // tri1
16, 20, 21 // tri2
),
gsSPNTriangles_5b(16, 21, 17, // tri0
20, 22, 21, // tri1
0, 0, 0, // tri2
0, 0, 0 // tri3
),
gsDPLoadTextureBlock_4b_Dolphin(obj_s_boat_t3_tex_txt, G_IM_FMT_CI, 32, 64, 15, GX_REPEAT, GX_REPEAT, 0, 0),
gsSPNTrianglesInit_5b(
5, // tri count
23, 24, 25, // tri0
23, 25, 26, // tri1
23, 27, 24 // tri2
),
gsSPNTriangles_5b(
26, 25, 28, // tri0
26, 28, 29, // tri1
0, 0, 0, // tri2
0, 0, 0 // tri3
),
gsSPNTrianglesInit_5b(5, // tri count
23, 24, 25, // tri0
23, 25, 26, // tri1
23, 27, 24 // tri2
),
gsSPNTriangles_5b(26, 25, 28, // tri0
26, 28, 29, // tri1
0, 0, 0, // tri2
0, 0, 0 // tri3
),
gsDPLoadTextureBlock_4b_Dolphin(obj_s_boat_t2_tex_txt, G_IM_FMT_CI, 16, 16, 15, GX_CLAMP, GX_CLAMP, 0, 0),
gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH),
gsSPVertex(&obj_e_boat_v[60], 31, 0),
gsSPNTrianglesInit_5b(
8, // tri count
0, 1, 2, // tri0
0, 2, 3, // tri1
4, 5, 6 // tri2
),
gsSPNTriangles_5b(
4, 6, 7, // tri0
8, 9, 10, // tri1
8, 10, 11, // tri2
12, 13, 14 // tri3
),
gsSPNTriangles_5b(
12, 14, 15, // tri0
0, 0, 0, // tri1
0, 0, 0, // tri2
0, 0, 0 // tri3
),
gsSPNTrianglesInit_5b(8, // tri count
0, 1, 2, // tri0
0, 2, 3, // tri1
4, 5, 6 // tri2
),
gsSPNTriangles_5b(4, 6, 7, // tri0
8, 9, 10, // tri1
8, 10, 11, // tri2
12, 13, 14 // tri3
),
gsSPNTriangles_5b(12, 14, 15, // tri0
0, 0, 0, // tri1
0, 0, 0, // tri2
0, 0, 0 // tri3
),
gsDPLoadTextureBlock_4b_Dolphin(obj_s_boat_t5_tex_txt, G_IM_FMT_CI, 16, 16, 15, GX_CLAMP, GX_CLAMP, 0, 0),
gsSPNTrianglesInit_5b(
4, // tri count
16, 17, 18, // tri0
16, 18, 19, // tri1
20, 21, 22 // tri2
),
gsSPNTriangles_5b(
20, 22, 16, // tri0
0, 0, 0, // tri1
0, 0, 0, // tri2
0, 0, 0 // tri3
),
gsSPNTrianglesInit_5b(4, // tri count
16, 17, 18, // tri0
16, 18, 19, // tri1
20, 21, 22 // tri2
),
gsSPNTriangles_5b(20, 22, 16, // tri0
0, 0, 0, // tri1
0, 0, 0, // tri2
0, 0, 0 // tri3
),
gsDPLoadTextureBlock_4b_Dolphin(obj_s_boat_t8_tex_txt, G_IM_FMT_CI, 16, 16, 15, GX_REPEAT, GX_REPEAT, 0, 0),
gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH),
gsSPNTrianglesInit_5b(
2, // tri count
23, 24, 25, // tri0
23, 25, 26, // tri1
0, 0, 0 // tri2
),
gsSPNTrianglesInit_5b(2, // tri count
23, 24, 25, // tri0
23, 25, 26, // tri1
0, 0, 0 // tri2
),
gsDPLoadTextureBlock_4b_Dolphin(obj_s_boat_t4_tex_txt, G_IM_FMT_CI, 16, 16, 15, GX_CLAMP, GX_CLAMP, 0, 0),
gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH),
gsSPNTrianglesInit_5b(
2, // tri count
27, 28, 29, // tri0
27, 29, 30, // tri1
0, 0, 0 // tri2
),
gsSPNTrianglesInit_5b(2, // tri count
27, 28, 29, // tri0
27, 29, 30, // tri1
0, 0, 0 // tri2
),
gsDPLoadTextureBlock_4b_Dolphin(obj_s_boat_t3_tex_txt, G_IM_FMT_CI, 32, 64, 15, GX_REPEAT, GX_REPEAT, 0, 0),
gsSPVertex(&obj_e_boat_v[91], 7, 0),
gsSPNTrianglesInit_5b(
5, // tri count
0, 1, 2, // tri0
0, 3, 1, // tri1
4, 5, 6 // tri2
),
gsSPNTriangles_5b(
4, 3, 0, // tri0
4, 6, 3, // tri1
0, 0, 0, // tri2
0, 0, 0 // tri3
),
gsSPNTrianglesInit_5b(5, // tri count
0, 1, 2, // tri0
0, 3, 1, // tri1
4, 5, 6 // tri2
),
gsSPNTriangles_5b(4, 3, 0, // tri0
4, 6, 3, // tri1
0, 0, 0, // tri2
0, 0, 0 // tri3
),
gsSPEndDisplayList(),
};
static Gfx obj_e_boat_water1_model[] = {
gsSPTexture(0, 0, 0, 0, G_ON),
gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, ENVIRONMENT, 0, 0, 0, 0, COMBINED, COMBINED, 0, TEXEL0, 0),
gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, ENVIRONMENT, 0, 0, 0, 0, COMBINED,
COMBINED, 0, TEXEL0, 0),
gsDPSetPrimColor(0, 255, 190, 210, 255, 230),
gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2),
gsDPLoadTextureBlock_4b_Dolphin(obj_s_boat_water2_pic_i4, G_IM_FMT_I, 32, 32, 15, GX_REPEAT, GX_REPEAT, 0, 0),
gsDPLoadTextureBlock_4b_Dolphin(obj_s_boat_water1_pic_i4, G_IM_FMT_I, 32, 32, 15, GX_REPEAT, GX_REPEAT, 0, 14),
gsSPDisplayList(0x09000000),
gsSPDisplayList(anime_2_model),
gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH),
gsSPVertex(&obj_e_boat_v[142], 14, 0),
gsSPNTrianglesInit_5b(
14, // tri count
0, 1, 2, // tri0
2, 1, 3, // tri1
4, 5, 6 // tri2
),
gsSPNTriangles_5b(
2, 7, 8, // tri0
2, 9, 0, // tri1
10, 11, 12, // tri2
8, 9, 2 // tri3
),
gsSPNTriangles_5b(
3, 7, 2, // tri0
8, 13, 10, // tri1
6, 13, 8, // tri2
8, 12, 9 // tri3
),
gsSPNTriangles_5b(
10, 12, 8, // tri0
8, 4, 6, // tri1
7, 4, 8, // tri2
0, 0, 0 // tri3
),
gsSPNTrianglesInit_5b(14, // tri count
0, 1, 2, // tri0
2, 1, 3, // tri1
4, 5, 6 // tri2
),
gsSPNTriangles_5b(2, 7, 8, // tri0
2, 9, 0, // tri1
10, 11, 12, // tri2
8, 9, 2 // tri3
),
gsSPNTriangles_5b(3, 7, 2, // tri0
8, 13, 10, // tri1
6, 13, 8, // tri2
8, 12, 9 // tri3
),
gsSPNTriangles_5b(10, 12, 8, // tri0
8, 4, 6, // tri1
7, 4, 8, // tri2
0, 0, 0 // tri3
),
gsSPEndDisplayList(),
};
static Gfx obj_e_boat_water2_model[] = {
gsSPTexture(0, 0, 0, 0, G_ON),
gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, ENVIRONMENT, 0, 0, 0, 0, COMBINED, COMBINED, 0, TEXEL0, 0),
gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, ENVIRONMENT, 0, 0, 0, 0, COMBINED,
COMBINED, 0, TEXEL0, 0),
gsDPSetPrimColor(0, 255, 190, 210, 255, 230),
gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2),
gsDPLoadTextureBlock_4b_Dolphin(obj_s_boat_water2_pic_i4, G_IM_FMT_I, 32, 32, 15, GX_REPEAT, GX_REPEAT, 0, 0),
gsDPLoadTextureBlock_4b_Dolphin(obj_s_boat_water1_pic_i4, G_IM_FMT_I, 32, 32, 15, GX_REPEAT, GX_REPEAT, 0, 14),
gsSPDisplayList(0x09000000),
gsSPMatrix(0x0D000080, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW),
gsSPDisplayList(anime_2_model),
gsSPMatrix(anime_6_model + sizeof(Mtx) * 2, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW),
gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH),
gsSPVertex(&obj_e_boat_v[125], 5, 0),
gsSPMatrix(0x0D0000C0, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW),
gsSPMatrix(anime_6_model + sizeof(Mtx) * 3, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW),
gsSPVertex(&obj_e_boat_v[130], 12, 5),
gsSPNTrianglesInit_5b(
8, // tri count
1, 5, 6, // tri0
3, 7, 8, // tri1
0, 4, 9 // tri2
),
gsSPNTriangles_5b(
4, 10, 11, // tri0
0, 12, 13, // tri1
4, 2, 14, // tri2
3, 1, 15 // tri3
),
gsSPNTriangles_5b(
2, 3, 16, // tri0
0, 0, 0, // tri1
0, 0, 0, // tri2
0, 0, 0 // tri3
),
gsSPNTrianglesInit_5b(8, // tri count
1, 5, 6, // tri0
3, 7, 8, // tri1
0, 4, 9 // tri2
),
gsSPNTriangles_5b(4, 10, 11, // tri0
0, 12, 13, // tri1
4, 2, 14, // tri2
3, 1, 15 // tri3
),
gsSPNTriangles_5b(2, 3, 16, // tri0
0, 0, 0, // tri1
0, 0, 0, // tri2
0, 0, 0 // tri3
),
gsSPEndDisplayList(),
};
static Gfx obj_e_boat_water3_model[] = {
gsSPTexture(0, 0, 0, 0, G_ON),
gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, ENVIRONMENT, 0, 0, 0, 0, COMBINED, COMBINED, 0, TEXEL0, 0),
gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, ENVIRONMENT, 0, 0, 0, 0, COMBINED,
COMBINED, 0, TEXEL0, 0),
gsDPSetPrimColor(0, 255, 190, 210, 255, 230),
gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2),
gsDPLoadTextureBlock_4b_Dolphin(obj_s_boat_water2_pic_i4, G_IM_FMT_I, 32, 32, 15, GX_REPEAT, GX_REPEAT, 0, 0),
gsDPLoadTextureBlock_4b_Dolphin(obj_s_boat_water1_pic_i4, G_IM_FMT_I, 32, 32, 15, GX_REPEAT, GX_REPEAT, 0, 14),
gsSPDisplayList(0x09000000),
gsSPMatrix(0x0D0000C0, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW),
gsSPDisplayList(anime_2_model),
gsSPMatrix(anime_6_model + sizeof(Mtx) * 3, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW),
gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH),
gsSPVertex(&obj_e_boat_v[98], 5, 0),
gsSPMatrix(0x0D000100, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW),
gsSPMatrix(anime_6_model + sizeof(Mtx) * 4, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW),
gsSPVertex(&obj_e_boat_v[103], 22, 5),
gsSPNTrianglesInit_5b(
8, // tri count
0, 1, 5, // tri0
0, 6, 7, // tri1
1, 2, 8 // tri2
),
gsSPNTriangles_5b(
2, 3, 9, // tri0
3, 4, 10, // tri1
4, 11, 12, // tri2
3, 13, 14 // tri3
),
gsSPNTriangles_5b(
1, 15, 16, // tri0
0, 0, 0, // tri1
0, 0, 0, // tri2
0, 0, 0 // tri3
),
gsSPNTrianglesInit_5b(
8, // tri count
17, 18, 19, // tri0
20, 21, 22, // tri1
19, 23, 24 // tri2
),
gsSPNTriangles_5b(
20, 22, 25, // tri0
23, 26, 24, // tri1
25, 26, 23, // tri2
25, 23, 20 // tri3
),
gsSPNTriangles_5b(
24, 17, 19, // tri0
0, 0, 0, // tri1
0, 0, 0, // tri2
0, 0, 0 // tri3
),
gsSPNTrianglesInit_5b(8, // tri count
0, 1, 5, // tri0
0, 6, 7, // tri1
1, 2, 8 // tri2
),
gsSPNTriangles_5b(2, 3, 9, // tri0
3, 4, 10, // tri1
4, 11, 12, // tri2
3, 13, 14 // tri3
),
gsSPNTriangles_5b(1, 15, 16, // tri0
0, 0, 0, // tri1
0, 0, 0, // tri2
0, 0, 0 // tri3
),
gsSPNTrianglesInit_5b(8, // tri count
17, 18, 19, // tri0
20, 21, 22, // tri1
19, 23, 24 // tri2
),
gsSPNTriangles_5b(20, 22, 25, // tri0
23, 26, 24, // tri1
25, 26, 23, // tri2
25, 23, 20 // tri3
),
gsSPNTriangles_5b(24, 17, 19, // tri0
0, 0, 0, // tri1
0, 0, 0, // tri2
0, 0, 0 // tri3
),
gsSPEndDisplayList(),
};
@@ -280,65 +253,92 @@ static Gfx obj_e_boat_oar1_model[] = {
gsDPSetPrimColor(0, 128, 255, 255, 255, 255),
gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH),
gsSPVertex(&obj_e_boat_v[0], 30, 0),
gsSPNTrianglesInit_5b(
2, // tri count
0, 1, 2, // tri0
3, 4, 5, // tri1
0, 0, 0 // tri2
),
gsSPNTrianglesInit_5b(2, // tri count
0, 1, 2, // tri0
3, 4, 5, // tri1
0, 0, 0 // tri2
),
gsDPLoadTextureBlock_4b_Dolphin(obj_s_boat_t11_tex_txt, G_IM_FMT_CI, 16, 16, 15, GX_MIRROR, GX_MIRROR, 0, 0),
gsSPNTrianglesInit_5b(
6, // tri count
6, 7, 8, // tri0
6, 8, 9, // tri1
10, 11, 12 // tri2
),
gsSPNTriangles_5b(
10, 12, 13, // tri0
14, 15, 16, // tri1
14, 16, 17, // tri2
0, 0, 0 // tri3
),
gsSPNTrianglesInit_5b(6, // tri count
6, 7, 8, // tri0
6, 8, 9, // tri1
10, 11, 12 // tri2
),
gsSPNTriangles_5b(10, 12, 13, // tri0
14, 15, 16, // tri1
14, 16, 17, // tri2
0, 0, 0 // tri3
),
gsDPLoadTextureBlock_4b_Dolphin(obj_s_boat_t9_tex_txt, G_IM_FMT_CI, 48, 8, 15, GX_CLAMP, GX_MIRROR, 0, 0),
gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH),
gsSPNTrianglesInit_5b(
4, // tri count
18, 19, 20, // tri0
21, 18, 20, // tri1
22, 23, 24 // tri2
),
gsSPNTriangles_5b(
25, 22, 24, // tri0
0, 0, 0, // tri1
0, 0, 0, // tri2
0, 0, 0 // tri3
),
gsSPNTrianglesInit_5b(4, // tri count
18, 19, 20, // tri0
21, 18, 20, // tri1
22, 23, 24 // tri2
),
gsSPNTriangles_5b(25, 22, 24, // tri0
0, 0, 0, // tri1
0, 0, 0, // tri2
0, 0, 0 // tri3
),
gsDPLoadTextureBlock_4b_Dolphin(obj_s_boat_t9_tex_txt, G_IM_FMT_CI, 48, 8, 15, GX_CLAMP, GX_CLAMP, 0, 0),
gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH),
gsSPNTrianglesInit_5b(
2, // tri count
26, 27, 28, // tri0
26, 28, 29, // tri1
0, 0, 0 // tri2
),
gsSPNTrianglesInit_5b(2, // tri count
26, 27, 28, // tri0
26, 28, 29, // tri1
0, 0, 0 // tri2
),
gsSPEndDisplayList(),
};
extern cKF_Joint_R_c cKF_je_r_obj_e_boat_tbl[] = {
/* joint 0 */ obj_e_boat_boat1_model, 2, cKF_JOINT_FLAG_DISP_OPA, 0,0,0,
/* joint 1 */ NULL, 1, cKF_JOINT_FLAG_DISP_OPA, 300,2200,-4500,
/* joint 2 */ obj_e_boat_oar1_model, 0, cKF_JOINT_FLAG_DISP_OPA, 0,0,0,
/* joint 3 */ NULL, 1, cKF_JOINT_FLAG_DISP_OPA, 0,0,4000,
/* joint 4 */ obj_e_boat_water1_model, 1, cKF_JOINT_FLAG_DISP_XLU, 0,0,0,
/* joint 5 */ obj_e_boat_water2_model, 1, cKF_JOINT_FLAG_DISP_XLU, 8400,0,0,
/* joint 6 */ obj_e_boat_water3_model, 0, cKF_JOINT_FLAG_DISP_XLU, 4600,0,0,
/* joint 0 */ obj_e_boat_boat1_model,
2,
cKF_JOINT_FLAG_DISP_OPA,
0,
0,
0,
/* joint 1 */ NULL,
1,
cKF_JOINT_FLAG_DISP_OPA,
300,
2200,
-4500,
/* joint 2 */ obj_e_boat_oar1_model,
0,
cKF_JOINT_FLAG_DISP_OPA,
0,
0,
0,
/* joint 3 */ NULL,
1,
cKF_JOINT_FLAG_DISP_OPA,
0,
0,
4000,
/* joint 4 */ obj_e_boat_water1_model,
1,
cKF_JOINT_FLAG_DISP_XLU,
0,
0,
0,
/* joint 5 */ obj_e_boat_water2_model,
1,
cKF_JOINT_FLAG_DISP_XLU,
8400,
0,
0,
/* joint 6 */ obj_e_boat_water3_model,
0,
cKF_JOINT_FLAG_DISP_XLU,
4600,
0,
0,
};
extern cKF_Skeleton_R_c cKF_bs_r_obj_e_boat = {
7, // 7 total joints
5, // 5 displayed joints (rendered joints)
cKF_je_r_obj_e_boat_tbl
};
extern cKF_Skeleton_R_c cKF_bs_r_obj_e_boat = { 7, // 7 total joints
5, // 5 displayed joints (rendered joints)
cKF_je_r_obj_e_boat_tbl };
static u8 cKF_ckcb_r_obj_e_boat_tbl[] = {
/* joint 0 */ cKF_ANIMITION_BIT_NONE,
@@ -350,59 +350,32 @@ static u8 cKF_ckcb_r_obj_e_boat_tbl[] = {
/* joint 6 */ cKF_ANIMITION_BIT_NONE
};
static s16 cKF_kn_obj_e_boat_tbl[] = {
8,
5,
9
};
static s16 cKF_kn_obj_e_boat_tbl[] = { 8, 5, 9 };
// Fixed position table (used when the joint has no translation)
static s16 cKF_c_obj_e_boat_tbl[] = {
/* joint 0 */ 0, 0, 0,
/* joint 1 */ 0, 0, 0,
/* joint 2 */ 0, 900, 900,
/* joint 3 */ -450, 900, 450,
/* joint 4 */ 0, 0, 0,
/* joint 5 */ 0, 0, 0,
/* joint 6 */ 0, 0, 0
/* joint 0 */ 0, 0, 0,
/* joint 1 */ 0, 0, 0,
/* joint 2 */ 0, 900, 900,
/* joint 3 */ -450, 900, 450,
/* joint 4 */ 0, 0, 0,
/* joint 5 */ 0, 0, 0,
/* joint 6 */ 0, 0, 0
};
/* frame value slope */
static s16 cKF_ds_obj_e_boat_tbl[] = {
/* joint 2 X rotational frames */
1, 904, 648,
13, 1075, 212,
23, 1099, -60,
40, 920, -572,
45, 828, -481,
62, 701, 20,
80, 877, 651,
81, 900, 675,
1, 904, 648, 13, 1075, 212, 23, 1099, -60, 40, 920, -572, 45, 828, -481, 62, 701, 20, 80, 877, 651, 81, 900, 675,
/* joint 2 Y rotational frames */
1, 449, 134,
27, 495, -50,
43, 442, -124,
67, 405, 49,
81, 449, 132,
1, 449, 134, 27, 495, -50, 43, 442, -124, 67, 405, 49, 81, 449, 132,
/* joint 2 Z rotational frames */
1, -180, 143,
5, -143, 443,
20, 141, 303,
26, 177, 119,
40, 183, -81,
44, 156, -370,
60, -141, -305,
65, -173, -137,
81, -180, 83
1, -180, 143, 5, -143, 443, 20, 141, 303, 26, 177, 119, 40, 183, -81, 44, 156, -370, 60, -141, -305, 65, -173, -137,
81, -180, 83
};
extern cKF_Animation_R_c cKF_ba_r_obj_e_boat = {
cKF_ckcb_r_obj_e_boat_tbl,
cKF_ds_obj_e_boat_tbl,
cKF_kn_obj_e_boat_tbl,
cKF_c_obj_e_boat_tbl,
-1,
81
cKF_ckcb_r_obj_e_boat_tbl, cKF_ds_obj_e_boat_tbl, cKF_kn_obj_e_boat_tbl, cKF_c_obj_e_boat_tbl, -1, 81
};
src/data/npc/model/mdl/ant_1.c
+550 -627
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/bea_1.c
+516 -591
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/bev_1.c
+614 -705
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/boa_1.c
+678 -782
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/bpt_1.c
+626 -717
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/brd_1.c
+582 -661
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/bul_1.c
+579 -664
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/cat_1.c
+505 -574
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/cbr_1.c
+586 -674
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/chn_1.c
+674 -767
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/cml_1.c
+634 -729
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/cow_1.c
+581 -665
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/crd_1.c
+606 -694
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/dog_1.c
+557 -638
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/duk_1.c
+553 -630
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/elp_1.c
+580 -663
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/end_1.c
+628 -719
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/flg_1.c
+451 -514
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/fob_1.c
+645 -739
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/fox_1.c
+577 -660
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/goa_1.c
+550 -628
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/gor_1.c
+665 -763
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/grf_1.c
+674 -774
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/gst_1.c
+351 -403
View File
@@ -6,422 +6,370 @@ static Vtx gst_1_v[] = {
};
static Gfx head_gst_model[] = {
gsSPTexture(0, 0, 0, 0, G_ON),
gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, ENVIRONMENT, 0, COMBINED, 0, PRIM_LOD_FRAC, COMBINED, 0, 0, 0, COMBINED),
gsDPSetPrimColor(0, 127, 255, 255, 255, 180),
gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_XLU_SURF2),
gsSPMatrix(0x0D000080, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW),
gsDPLoadTextureBlock_4b_Dolphin(0x0B000080, G_IM_FMT_CI, 16, 16, 15, GX_CLAMP, GX_CLAMP, 0, 0),
gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH),
gsSPVertex(&gst_1_v[0], 13, 0),
gsSPMatrix(0x0D0000C0, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW),
gsDPLoadTextureBlock_4b_Dolphin(0x0B000080, G_IM_FMT_CI, 16, 16, 15, GX_CLAMP, GX_CLAMP, 0, 0),
gsSPVertex(&gst_1_v[13], 19, 13),
gsSPNTrianglesInit_5b(
13, // tri count
10, 13, 14, // tri0
9, 1, 15, // tri1
0, 7, 16 // tri2
),
gsSPNTriangles_5b(
0, 18, 17, // tri0
6, 4, 19, // tri1
2, 5, 20, // tri2
3, 21, 22 // tri3
),
gsSPNTriangles_5b(
2, 23, 1, // tri0
0, 24, 4, // tri1
11, 25, 26, // tri2
3, 6, 27 // tri3
),
gsSPNTriangles_5b(
1, 29, 28, // tri0
5, 30, 31, // tri1
0, 0, 0, // tri2
0, 0, 0 // tri3
),
gsSPVertex(&gst_1_v[32], 15, 13),
gsSPNTrianglesInit_5b(
9, // tri count
6, 13, 14, // tri0
12, 15, 16, // tri1
8, 17, 18 // tri2
),
gsSPNTriangles_5b(
8, 11, 19, // tri0
12, 10, 20, // tri1
1, 21, 22, // tri2
0, 23, 24 // tri3
),
gsSPNTriangles_5b(
5, 3, 25, // tri0
3, 26, 27, // tri1
0, 0, 0, // tri2
0, 0, 0 // tri3
),
gsDPLoadTextureBlock_4b_Dolphin(0x0B000000, G_IM_FMT_CI, 16, 16, 15, GX_CLAMP, GX_CLAMP, 0, 0),
gsSPVertex(&gst_1_v[47], 13, 0),
gsSPNTrianglesInit_5b(
16, // tri count
0, 1, 2, // tri0
3, 1, 0, // tri1
4, 1, 3 // tri2
),
gsSPNTriangles_5b(
2, 1, 4, // tri0
5, 6, 2, // tri1
3, 7, 8, // tri2
8, 9, 4 // tri3
),
gsSPNTriangles_5b(
4, 3, 8, // tri0
4, 9, 5, // tri1
2, 6, 10, // tri2
10, 11, 0 // tri3
),
gsSPNTriangles_5b(
0, 2, 10, // tri0
0, 11, 12, // tri1
4, 5, 2, // tri2
12, 7, 3 // tri3
),
gsSPNTriangles_5b(
3, 0, 12, // tri0
0, 0, 0, // tri1
0, 0, 0, // tri2
0, 0, 0 // tri3
),
gsDPLoadTextureBlock_4b_Dolphin(0x0B000080, G_IM_FMT_CI, 16, 16, 15, GX_CLAMP, GX_CLAMP, 0, 0),
gsSPVertex(&gst_1_v[60], 32, 0),
gsSPNTrianglesInit_5b(
23, // tri count
0, 1, 2, // tri0
3, 4, 5, // tri1
6, 5, 7 // tri2
),
gsSPNTriangles_5b(
2, 1, 8, // tri0
2, 8, 9, // tri1
10, 11, 4, // tri2
11, 12, 5 // tri3
),
gsSPNTriangles_5b(
5, 12, 13, // tri0
14, 15, 16, // tri1
17, 18, 10, // tri2
11, 10, 18 // tri3
),
gsSPNTriangles_5b(
19, 20, 21, // tri0
19, 21, 0, // tri1
15, 14, 22, // tri2
22, 23, 15 // tri3
),
gsSPNTriangles_5b(
22, 24, 25, // tri0
5, 4, 11, // tri1
26, 16, 15, // tri2
27, 26, 28 // tri3
),
gsSPNTriangles_5b(
27, 28, 29, // tri0
2, 30, 18, // tri1
2, 18, 0, // tri2
21, 20, 8 // tri3
),
gsSPVertex(&gst_1_v[91], 32, 0),
gsSPNTrianglesInit_5b(
21, // tri count
0, 1, 2, // tri0
0, 2, 3, // tri1
4, 5, 6 // tri2
),
gsSPNTriangles_5b(
4, 6, 7, // tri0
8, 9, 10, // tri1
5, 11, 12, // tri2
13, 14, 15 // tri3
),
gsSPNTriangles_5b(
12, 6, 5, // tri0
7, 6, 12, // tri1
3, 12, 11, // tri2
3, 11, 0 // tri3
),
gsSPNTriangles_5b(
16, 17, 18, // tri0
19, 18, 20, // tri1
7, 12, 3, // tri2
7, 21, 22 // tri3
),
gsSPNTriangles_5b(
23, 24, 25, // tri0
23, 25, 26, // tri1
23, 15, 14, // tri2
27, 2, 28 // tri3
),
gsSPNTriangles_5b(
18, 17, 29, // tri0
30, 31, 16, // tri1
0, 0, 0, // tri2
0, 0, 0 // tri3
),
gsSPVertex(&gst_1_v[123], 21, 0),
gsSPNTrianglesInit_5b(
12, // tri count
0, 1, 2, // tri0
3, 4, 5, // tri1
2, 3, 0 // tri2
),
gsSPNTriangles_5b(
6, 3, 5, // tri0
7, 8, 1, // tri1
4, 8, 7, // tri2
9, 10, 4 // tri3
),
gsSPNTriangles_5b(
11, 10, 9, // tri0
12, 6, 11, // tri1
13, 14, 1, // tri2
15, 16, 17 // tri3
),
gsSPNTriangles_5b(
18, 19, 20, // tri0
0, 0, 0, // tri1
0, 0, 0, // tri2
0, 0, 0 // tri3
),
gsDPLoadTextureBlock_4b_Dolphin(0x08000000, G_IM_FMT_CI, 32, 16, 15, GX_CLAMP, GX_CLAMP, 0, 0),
gsSPVertex(&gst_1_v[144], 19, 0),
gsSPNTrianglesInit_5b(
22, // tri count
0, 1, 2, // tri0
3, 4, 5, // tri1
6, 7, 3 // tri2
),
gsSPNTriangles_5b(
6, 8, 2, // tri0
9, 10, 4, // tri1
2, 8, 11, // tri2
12, 13, 0 // tri3
),
gsSPNTriangles_5b(
14, 5, 4, // tri0
2, 15, 0, // tri1
3, 8, 6, // tri2
16, 15, 2 // tri3
),
gsSPNTriangles_5b(
2, 1, 6, // tri0
11, 8, 3, // tri1
5, 11, 3, // tri2
2, 11, 16 // tri3
),
gsSPNTriangles_5b(
17, 12, 15, // tri0
18, 4, 3, // tri1
0, 15, 12, // tri2
15, 16, 17 // tri3
),
gsSPNTriangles_5b(
4, 10, 14, // tri0
4, 18, 9, // tri1
3, 7, 18, // tri2
0, 0, 0 // tri3
),
gsDPLoadTextureBlock_4b_Dolphin(0x09000000, G_IM_FMT_CI, 32, 16, 15, GX_CLAMP, GX_CLAMP, 0, 0),
gsSPVertex(&gst_1_v[163], 15, 0),
gsSPNTrianglesInit_5b(
14, // tri count
0, 1, 2, // tri0
3, 4, 5, // tri1
0, 6, 7 // tri2
),
gsSPNTriangles_5b(
3, 8, 7, // tri0
9, 2, 1, // tri1
4, 3, 6, // tri2
10, 11, 6 // tri3
),
gsSPNTriangles_5b(
6, 11, 4, // tri0
7, 6, 3, // tri1
2, 10, 0, // tri2
6, 0, 10 // tri3
),
gsSPNTriangles_5b(
5, 12, 3, // tri0
7, 13, 0, // tri1
12, 5, 14, // tri2
0, 0, 0 // tri3
),
gsSPEndDisplayList(),
gsSPTexture(0, 0, 0, 0, G_ON),
gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, ENVIRONMENT, 0, COMBINED, 0, PRIM_LOD_FRAC, COMBINED, 0, 0, 0,
COMBINED),
gsDPSetPrimColor(0, 127, 255, 255, 255, 180),
gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_XLU_SURF2),
gsSPMatrix(anime_6_model+sizeof(Mtx)*2, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW),
gsDPLoadTextureBlock_4b_Dolphin(anime_4_txt + 0x080, G_IM_FMT_CI, 16, 16, 15, GX_CLAMP, GX_CLAMP, 0, 0),
gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH),
gsSPVertex(&gst_1_v[0], 13, 0),
gsSPMatrix(anime_6_model+sizeof(Mtx)*3, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW),
gsDPLoadTextureBlock_4b_Dolphin(anime_4_txt + 0x080, G_IM_FMT_CI, 16, 16, 15, GX_CLAMP, GX_CLAMP, 0, 0),
gsSPVertex(&gst_1_v[13], 19, 13),
gsSPNTrianglesInit_5b(13, // tri count
10, 13, 14, // tri0
9, 1, 15, // tri1
0, 7, 16 // tri2
),
gsSPNTriangles_5b(0, 18, 17, // tri0
6, 4, 19, // tri1
2, 5, 20, // tri2
3, 21, 22 // tri3
),
gsSPNTriangles_5b(2, 23, 1, // tri0
0, 24, 4, // tri1
11, 25, 26, // tri2
3, 6, 27 // tri3
),
gsSPNTriangles_5b(1, 29, 28, // tri0
5, 30, 31, // tri1
0, 0, 0, // tri2
0, 0, 0 // tri3
),
gsSPVertex(&gst_1_v[32], 15, 13),
gsSPNTrianglesInit_5b(9, // tri count
6, 13, 14, // tri0
12, 15, 16, // tri1
8, 17, 18 // tri2
),
gsSPNTriangles_5b(8, 11, 19, // tri0
12, 10, 20, // tri1
1, 21, 22, // tri2
0, 23, 24 // tri3
),
gsSPNTriangles_5b(5, 3, 25, // tri0
3, 26, 27, // tri1
0, 0, 0, // tri2
0, 0, 0 // tri3
),
gsDPLoadTextureBlock_4b_Dolphin(anime_4_txt + 0x000, G_IM_FMT_CI, 16, 16, 15, GX_CLAMP, GX_CLAMP, 0, 0),
gsSPVertex(&gst_1_v[47], 13, 0),
gsSPNTrianglesInit_5b(16, // tri count
0, 1, 2, // tri0
3, 1, 0, // tri1
4, 1, 3 // tri2
),
gsSPNTriangles_5b(2, 1, 4, // tri0
5, 6, 2, // tri1
3, 7, 8, // tri2
8, 9, 4 // tri3
),
gsSPNTriangles_5b(4, 3, 8, // tri0
4, 9, 5, // tri1
2, 6, 10, // tri2
10, 11, 0 // tri3
),
gsSPNTriangles_5b(0, 2, 10, // tri0
0, 11, 12, // tri1
4, 5, 2, // tri2
12, 7, 3 // tri3
),
gsSPNTriangles_5b(3, 0, 12, // tri0
0, 0, 0, // tri1
0, 0, 0, // tri2
0, 0, 0 // tri3
),
gsDPLoadTextureBlock_4b_Dolphin(anime_4_txt + 0x080, G_IM_FMT_CI, 16, 16, 15, GX_CLAMP, GX_CLAMP, 0, 0),
gsSPVertex(&gst_1_v[60], 32, 0),
gsSPNTrianglesInit_5b(23, // tri count
0, 1, 2, // tri0
3, 4, 5, // tri1
6, 5, 7 // tri2
),
gsSPNTriangles_5b(2, 1, 8, // tri0
2, 8, 9, // tri1
10, 11, 4, // tri2
11, 12, 5 // tri3
),
gsSPNTriangles_5b(5, 12, 13, // tri0
14, 15, 16, // tri1
17, 18, 10, // tri2
11, 10, 18 // tri3
),
gsSPNTriangles_5b(19, 20, 21, // tri0
19, 21, 0, // tri1
15, 14, 22, // tri2
22, 23, 15 // tri3
),
gsSPNTriangles_5b(22, 24, 25, // tri0
5, 4, 11, // tri1
26, 16, 15, // tri2
27, 26, 28 // tri3
),
gsSPNTriangles_5b(27, 28, 29, // tri0
2, 30, 18, // tri1
2, 18, 0, // tri2
21, 20, 8 // tri3
),
gsSPVertex(&gst_1_v[91], 32, 0),
gsSPNTrianglesInit_5b(21, // tri count
0, 1, 2, // tri0
0, 2, 3, // tri1
4, 5, 6 // tri2
),
gsSPNTriangles_5b(4, 6, 7, // tri0
8, 9, 10, // tri1
5, 11, 12, // tri2
13, 14, 15 // tri3
),
gsSPNTriangles_5b(12, 6, 5, // tri0
7, 6, 12, // tri1
3, 12, 11, // tri2
3, 11, 0 // tri3
),
gsSPNTriangles_5b(16, 17, 18, // tri0
19, 18, 20, // tri1
7, 12, 3, // tri2
7, 21, 22 // tri3
),
gsSPNTriangles_5b(23, 24, 25, // tri0
23, 25, 26, // tri1
23, 15, 14, // tri2
27, 2, 28 // tri3
),
gsSPNTriangles_5b(18, 17, 29, // tri0
30, 31, 16, // tri1
0, 0, 0, // tri2
0, 0, 0 // tri3
),
gsSPVertex(&gst_1_v[123], 21, 0),
gsSPNTrianglesInit_5b(12, // tri count
0, 1, 2, // tri0
3, 4, 5, // tri1
2, 3, 0 // tri2
),
gsSPNTriangles_5b(6, 3, 5, // tri0
7, 8, 1, // tri1
4, 8, 7, // tri2
9, 10, 4 // tri3
),
gsSPNTriangles_5b(11, 10, 9, // tri0
12, 6, 11, // tri1
13, 14, 1, // tri2
15, 16, 17 // tri3
),
gsSPNTriangles_5b(18, 19, 20, // tri0
0, 0, 0, // tri1
0, 0, 0, // tri2
0, 0, 0 // tri3
),
gsDPLoadTextureBlock_4b_Dolphin(anime_1_txt, G_IM_FMT_CI, 32, 16, 15, GX_CLAMP, GX_CLAMP, 0, 0),
gsSPVertex(&gst_1_v[144], 19, 0),
gsSPNTrianglesInit_5b(22, // tri count
0, 1, 2, // tri0
3, 4, 5, // tri1
6, 7, 3 // tri2
),
gsSPNTriangles_5b(6, 8, 2, // tri0
9, 10, 4, // tri1
2, 8, 11, // tri2
12, 13, 0 // tri3
),
gsSPNTriangles_5b(14, 5, 4, // tri0
2, 15, 0, // tri1
3, 8, 6, // tri2
16, 15, 2 // tri3
),
gsSPNTriangles_5b(2, 1, 6, // tri0
11, 8, 3, // tri1
5, 11, 3, // tri2
2, 11, 16 // tri3
),
gsSPNTriangles_5b(17, 12, 15, // tri0
18, 4, 3, // tri1
0, 15, 12, // tri2
15, 16, 17 // tri3
),
gsSPNTriangles_5b(4, 10, 14, // tri0
4, 18, 9, // tri1
3, 7, 18, // tri2
0, 0, 0 // tri3
),
gsDPLoadTextureBlock_4b_Dolphin(anime_2_txt, G_IM_FMT_CI, 32, 16, 15, GX_CLAMP, GX_CLAMP, 0, 0),
gsSPVertex(&gst_1_v[163], 15, 0),
gsSPNTrianglesInit_5b(14, // tri count
0, 1, 2, // tri0
3, 4, 5, // tri1
0, 6, 7 // tri2
),
gsSPNTriangles_5b(3, 8, 7, // tri0
9, 2, 1, // tri1
4, 3, 6, // tri2
10, 11, 6 // tri3
),
gsSPNTriangles_5b(6, 11, 4, // tri0
7, 6, 3, // tri1
2, 10, 0, // tri2
6, 0, 10 // tri3
),
gsSPNTriangles_5b(5, 12, 3, // tri0
7, 13, 0, // tri1
12, 5, 14, // tri2
0, 0, 0 // tri3
),
gsSPEndDisplayList(),
};
static Gfx feel_gst_model[] = {
gsSPTexture(0, 0, 0, 0, G_ON),
gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, ENVIRONMENT, 0, COMBINED, 0, PRIM_LOD_FRAC, COMBINED, 0, 0, 0, COMBINED),
gsDPSetPrimColor(0, 20, 255, 255, 255, 255),
gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_XLU_SURF2),
gsDPLoadTextureBlock_4b_Dolphin(0x0B000100, G_IM_FMT_CI, 16, 16, 15, GX_CLAMP, GX_CLAMP, 0, 0),
gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH),
gsSPVertex(&gst_1_v[178], 4, 0),
gsSPNTrianglesInit_5b(
2, // tri count
0, 1, 2, // tri0
2, 3, 0, // tri1
0, 0, 0 // tri2
),
gsSPEndDisplayList(),
gsSPTexture(0, 0, 0, 0, G_ON),
gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, ENVIRONMENT, 0, COMBINED, 0, PRIM_LOD_FRAC, COMBINED, 0, 0, 0,
COMBINED),
gsDPSetPrimColor(0, 20, 255, 255, 255, 255),
gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_XLU_SURF2),
gsDPLoadTextureBlock_4b_Dolphin(anime_4_txt + 0x100, G_IM_FMT_CI, 16, 16, 15, GX_CLAMP, GX_CLAMP, 0, 0),
gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH),
gsSPVertex(&gst_1_v[178], 4, 0),
gsSPNTrianglesInit_5b(2, // tri count
0, 1, 2, // tri0
2, 3, 0, // tri1
0, 0, 0 // tri2
),
gsSPEndDisplayList(),
};
static Gfx chest_gst_model[] = {
gsSPTexture(0, 0, 0, 0, G_ON),
gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, ENVIRONMENT, 0, COMBINED, 0, PRIM_LOD_FRAC, COMBINED, 0, 0, 0, COMBINED),
gsDPSetPrimColor(0, 127, 255, 255, 255, 180),
gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_XLU_SURF2),
gsSPMatrix(0x0D000000, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW),
gsDPLoadTextureBlock_4b_Dolphin(0x0B000080, G_IM_FMT_CI, 16, 16, 15, GX_CLAMP, GX_CLAMP, 0, 0),
gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH),
gsSPVertex(&gst_1_v[182], 10, 0),
gsSPMatrix(0x0D000080, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW),
gsDPLoadTextureBlock_4b_Dolphin(0x0B000080, G_IM_FMT_CI, 16, 16, 15, GX_CLAMP, GX_CLAMP, 0, 0),
gsSPVertex(&gst_1_v[192], 22, 10),
gsSPNTrianglesInit_5b(
14, // tri count
8, 2, 10, // tri0
6, 11, 12, // tri1
7, 13, 14 // tri2
),
gsSPNTriangles_5b(
0, 1, 15, // tri0
5, 0, 16, // tri1
1, 9, 17, // tri2
3, 4, 18 // tri3
),
gsSPNTriangles_5b(
3, 19, 20, // tri0
2, 3, 21, // tri1
2, 22, 23, // tri2
4, 24, 25 // tri3
),
gsSPNTriangles_5b(
3, 26, 27, // tri0
9, 28, 29, // tri1
1, 30, 31, // tri2
0, 0, 0 // tri3
),
gsSPVertex(&gst_1_v[214], 6, 10),
gsSPNTrianglesInit_5b(
4, // tri count
6, 5, 10, // tri0
5, 11, 12, // tri1
8, 13, 14 // tri2
),
gsSPNTriangles_5b(
4, 7, 15, // tri0
0, 0, 0, // tri1
0, 0, 0, // tri2
0, 0, 0 // tri3
),
gsSPEndDisplayList(),
gsSPTexture(0, 0, 0, 0, G_ON),
gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, ENVIRONMENT, 0, COMBINED, 0, PRIM_LOD_FRAC, COMBINED, 0, 0, 0,
COMBINED),
gsDPSetPrimColor(0, 127, 255, 255, 255, 180),
gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_XLU_SURF2),
gsSPMatrix(anime_6_model, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW),
gsDPLoadTextureBlock_4b_Dolphin(anime_4_txt + 0x080, G_IM_FMT_CI, 16, 16, 15, GX_CLAMP, GX_CLAMP, 0, 0),
gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH),
gsSPVertex(&gst_1_v[182], 10, 0),
gsSPMatrix(anime_6_model+sizeof(Mtx)*2, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW),
gsDPLoadTextureBlock_4b_Dolphin(anime_4_txt + 0x080, G_IM_FMT_CI, 16, 16, 15, GX_CLAMP, GX_CLAMP, 0, 0),
gsSPVertex(&gst_1_v[192], 22, 10),
gsSPNTrianglesInit_5b(14, // tri count
8, 2, 10, // tri0
6, 11, 12, // tri1
7, 13, 14 // tri2
),
gsSPNTriangles_5b(0, 1, 15, // tri0
5, 0, 16, // tri1
1, 9, 17, // tri2
3, 4, 18 // tri3
),
gsSPNTriangles_5b(3, 19, 20, // tri0
2, 3, 21, // tri1
2, 22, 23, // tri2
4, 24, 25 // tri3
),
gsSPNTriangles_5b(3, 26, 27, // tri0
9, 28, 29, // tri1
1, 30, 31, // tri2
0, 0, 0 // tri3
),
gsSPVertex(&gst_1_v[214], 6, 10),
gsSPNTrianglesInit_5b(4, // tri count
6, 5, 10, // tri0
5, 11, 12, // tri1
8, 13, 14 // tri2
),
gsSPNTriangles_5b(4, 7, 15, // tri0
0, 0, 0, // tri1
0, 0, 0, // tri2
0, 0, 0 // tri3
),
gsSPEndDisplayList(),
};
static Gfx tail1_gst_model[] = {
gsSPTexture(0, 0, 0, 0, G_ON),
gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, ENVIRONMENT, 0, COMBINED, 0, PRIM_LOD_FRAC, COMBINED, 0, 0, 0, COMBINED),
gsDPSetPrimColor(0, 127, 255, 255, 255, 180),
gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_XLU_SURF2),
gsSPMatrix(0x0D000000, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW),
gsDPLoadTextureBlock_4b_Dolphin(0x0B000080, G_IM_FMT_CI, 16, 16, 15, GX_CLAMP, GX_CLAMP, 0, 0),
gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH),
gsSPVertex(&gst_1_v[220], 8, 0),
gsSPMatrix(0x0D000040, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW),
gsDPLoadTextureBlock_4b_Dolphin(0x0B000080, G_IM_FMT_CI, 16, 16, 15, GX_CLAMP, GX_CLAMP, 0, 0),
gsSPVertex(&gst_1_v[228], 20, 8),
gsSPNTrianglesInit_5b(
14, // tri count
1, 0, 8, // tri0
1, 9, 10, // tri1
6, 11, 12 // tri2
),
gsSPNTriangles_5b(
4, 13, 14, // tri0
6, 7, 15, // tri1
2, 1, 16, // tri2
0, 6, 17 // tri3
),
gsSPNTriangles_5b(
5, 4, 18, // tri0
2, 19, 3, // tri1
5, 20, 7, // tri2
3, 21, 22 // tri3
),
gsSPNTriangles_5b(
5, 23, 24, // tri0
4, 25, 26, // tri1
4, 3, 27, // tri2
0, 0, 0 // tri3
),
gsSPVertex(&gst_1_v[248], 7, 0),
gsSPNTrianglesInit_5b(
6, // tri count
0, 1, 2, // tri0
2, 1, 3, // tri1
4, 2, 5 // tri2
),
gsSPNTriangles_5b(
0, 2, 4, // tri0
3, 6, 2, // tri1
2, 6, 5, // tri2
0, 0, 0 // tri3
),
gsSPEndDisplayList(),
gsSPTexture(0, 0, 0, 0, G_ON),
gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, ENVIRONMENT, 0, COMBINED, 0, PRIM_LOD_FRAC, COMBINED, 0, 0, 0,
COMBINED),
gsDPSetPrimColor(0, 127, 255, 255, 255, 180),
gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_XLU_SURF2),
gsSPMatrix(anime_6_model, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW),
gsDPLoadTextureBlock_4b_Dolphin(anime_4_txt + 0x080, G_IM_FMT_CI, 16, 16, 15, GX_CLAMP, GX_CLAMP, 0, 0),
gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH),
gsSPVertex(&gst_1_v[220], 8, 0),
gsSPMatrix(anime_6_model+sizeof(Mtx)*1, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW),
gsDPLoadTextureBlock_4b_Dolphin(anime_4_txt + 0x080, G_IM_FMT_CI, 16, 16, 15, GX_CLAMP, GX_CLAMP, 0, 0),
gsSPVertex(&gst_1_v[228], 20, 8),
gsSPNTrianglesInit_5b(14, // tri count
1, 0, 8, // tri0
1, 9, 10, // tri1
6, 11, 12 // tri2
),
gsSPNTriangles_5b(4, 13, 14, // tri0
6, 7, 15, // tri1
2, 1, 16, // tri2
0, 6, 17 // tri3
),
gsSPNTriangles_5b(5, 4, 18, // tri0
2, 19, 3, // tri1
5, 20, 7, // tri2
3, 21, 22 // tri3
),
gsSPNTriangles_5b(5, 23, 24, // tri0
4, 25, 26, // tri1
4, 3, 27, // tri2
0, 0, 0 // tri3
),
gsSPVertex(&gst_1_v[248], 7, 0),
gsSPNTrianglesInit_5b(6, // tri count
0, 1, 2, // tri0
2, 1, 3, // tri1
4, 2, 5 // tri2
),
gsSPNTriangles_5b(0, 2, 4, // tri0
3, 6, 2, // tri1
2, 6, 5, // tri2
0, 0, 0 // tri3
),
gsSPEndDisplayList(),
};
static Gfx base_gst_model[] = {
gsSPTexture(0, 0, 0, 0, G_ON),
gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, ENVIRONMENT, 0, COMBINED, 0, PRIM_LOD_FRAC, COMBINED, 0, 0, 0, COMBINED),
gsDPSetPrimColor(0, 127, 255, 255, 255, 180),
gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_XLU_SURF2),
gsDPLoadTextureBlock_4b_Dolphin(0x0B000080, G_IM_FMT_CI, 16, 16, 15, GX_CLAMP, GX_CLAMP, 0, 0),
gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH),
gsSPVertex(&gst_1_v[255], 18, 0),
gsSPNTrianglesInit_5b(
16, // tri count
0, 1, 2, // tri0
3, 4, 5, // tri1
3, 6, 4 // tri2
),
gsSPNTriangles_5b(
7, 8, 9, // tri0
9, 8, 6, // tri1
1, 7, 2, // tri2
10, 1, 11 // tri3
),
gsSPNTriangles_5b(
10, 12, 13, // tri0
12, 14, 13, // tri1
14, 15, 13, // tri2
16, 4, 17 // tri3
),
gsSPNTriangles_5b(
15, 17, 13, // tri0
6, 3, 9, // tri1
9, 2, 7, // tri2
17, 15, 16 // tri3
),
gsSPNTriangles_5b(
11, 12, 10, // tri0
0, 0, 0, // tri1
0, 0, 0, // tri2
0, 0, 0 // tri3
),
gsSPEndDisplayList(),
gsSPTexture(0, 0, 0, 0, G_ON),
gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, ENVIRONMENT, 0, COMBINED, 0, PRIM_LOD_FRAC, COMBINED, 0, 0, 0,
COMBINED),
gsDPSetPrimColor(0, 127, 255, 255, 255, 180),
gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_XLU_SURF2),
gsDPLoadTextureBlock_4b_Dolphin(anime_4_txt + 0x080, G_IM_FMT_CI, 16, 16, 15, GX_CLAMP, GX_CLAMP, 0, 0),
gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH),
gsSPVertex(&gst_1_v[255], 18, 0),
gsSPNTrianglesInit_5b(16, // tri count
0, 1, 2, // tri0
3, 4, 5, // tri1
3, 6, 4 // tri2
),
gsSPNTriangles_5b(7, 8, 9, // tri0
9, 8, 6, // tri1
1, 7, 2, // tri2
10, 1, 11 // tri3
),
gsSPNTriangles_5b(10, 12, 13, // tri0
12, 14, 13, // tri1
14, 15, 13, // tri2
16, 4, 17 // tri3
),
gsSPNTriangles_5b(15, 17, 13, // tri0
6, 3, 9, // tri1
9, 2, 7, // tri2
17, 15, 16 // tri3
),
gsSPNTriangles_5b(11, 12, 10, // tri0
0, 0, 0, // tri1
0, 0, 0, // tri2
0, 0, 0 // tri3
),
gsSPEndDisplayList(),
};
// clang-format off
static cKF_Joint_R_c cKF_je_r_gst_1_tbl[] = {
/* joint 0 */ { NULL, 1, cKF_JOINT_FLAG_DISP_XLU, 0,1000,0 },
@@ -453,4 +401,4 @@ static cKF_Joint_R_c cKF_je_r_gst_1_tbl[] = {
};
// clang-format on
extern cKF_Skeleton_R_c cKF_bs_r_gst_1 = { 26, 5, cKF_je_r_gst_1_tbl };
extern cKF_Skeleton_R_c cKF_bs_r_gst_1 = { 26, 5, cKF_je_r_gst_1_tbl };
src/data/npc/model/mdl/hem_1.c
+532 -619
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/hgh_1.c
+691 -792
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/hgs_1.c
+691 -792
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/hip_1.c
+649 -743
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/hrs_1.c
+623 -711
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/kab_1.c
+557 -639
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/kal_1.c
+495 -566
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/kgr_1.c
+669 -762
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/lon_1.c
+642 -737
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/lrc_1.c
+580 -664
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/mka_1.c
+510 -580
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/mnk_1.c
+649 -744
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/mob_1.c
+476 -548
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/mol_1.c
+491 -565
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/mos_1.c
+491 -565
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/mus_1.c
+581 -663
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/oct_1.c
+654 -751
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/ost_1.c
+630 -718
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/owl_1.c
+687 -783
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/pbr_1.c
+609 -693
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/pga_1.c
+685 -786
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/pgb_1.c
+681 -782
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/pgn_1.c
+581 -661
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/pig_1.c
+484 -552
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/pkn_1.c
+463 -529
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/pla_1.c
+621 -715
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/plb_1.c
+684 -785
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/plc_1.c
+593 -680
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/plj_1.c
+564 -646
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/rbt_1.c
+532 -609
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/rcc_1.c
+611 -700
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/rcd_1.c
+583 -667
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/rcf_1.c
+712 -817
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/rcn_1.c
+585 -669
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/rcs_1.c
+600 -687
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/rhn_1.c
+713 -816
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/seg_1.c
+669 -764
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/shp_1.c
+469 -538
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/snt_1.c
+554 -643
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/squ_1.c
+590 -676
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/tig_1.c
+599 -686
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/ttl_1.c
+569 -650
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/tuk_1.c
+767 -879
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/wip_1.c
+562 -649
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/wls_1.c
+681 -782
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/wol_1.c
+534 -608
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/xct_1.c
+491 -559
View File
File diff suppressed because it is too large Load Diff
src/data/npc/model/mdl/xsq_1.c
+590 -676
View File
File diff suppressed because it is too large Load Diff
src/static/libforest/emu64/emu64_print.cpp
+3 -3
View File
@@ -60,12 +60,12 @@ const char* emu64::segchk(u32 segment) {
s = "anime_5_model";
} else if (SEG_EQUALS(segment, ANIME_6_TXT_SEG)) {
s = "anime_6_model";
} else if (segment > SEG_2_SEGADDR(ANIME_4_TXT_SEG) && segment < (SEG_2_SEGADDR(ANIME_4_TXT_SEG) + 0x800)) {
} else if (segment > anime_4_txt && segment < (anime_4_txt + ANIME_4_TXT_SIZE)) {
snprintf(buf, sizeof(buf) - 1, str0, segment - SEG_2_SEGADDR(ANIME_4_TXT_SEG));
s = buf;
} else {
if (segment > 0xD000000 && segment < 0xD000408) {
int comb = segment - 0x0D000000;
if (segment > anime_6_model && segment < (anime_6_model + ANIME_6_MODEL_SIZE)) {
int comb = segment - anime_6_model;
snprintf(buf, sizeof(buf) - 1, str1, comb / (int)sizeof(Mtx));
s = buf;
} else {