diff --git a/Makefile.split b/Makefile.split index c1b391a8d..6915f55a6 100644 --- a/Makefile.split +++ b/Makefile.split @@ -76,7 +76,7 @@ MOLE_DIRS := monty_mole_hole monty_mole smoke ukiki fwoosh LAKITU_DIRS := lakitu_cameraman toad mips boo_castle PEACH_DIRS := bird peach yoshi BOWSER_DIRS := bowser_flame impact_ring yellow_sphere bowser bomb impact_smoke -MARIO_DIRS := mario bubble walk_smoke burn_smoke stomp_smoke water_wave sparkle water_splash white_particle_small sparkle_animation +MARIO_DIRS := mario bubble walk_smoke burn_smoke small_water_splash water_wave sparkle water_splash white_particle_small sparkle_animation # Actor Textures AMP_CHUCKYA_TEXTURES := $(foreach dir,$(AMP_DIRS), $(wildcard actors/$(dir)/*.png)) diff --git a/actors/group0.c b/actors/group0.c index 9304a97f7..609837eb9 100644 --- a/actors/group0.c +++ b/actors/group0.c @@ -14,7 +14,7 @@ #include "burn_smoke/model.inc.c" -#include "stomp_smoke/model.inc.c" +#include "small_water_splash/model.inc.c" #include "water_wave/model.inc.c" diff --git a/actors/group0.h b/actors/group0.h index 44f8b05de..23712343c 100644 --- a/actors/group0.h +++ b/actors/group0.h @@ -282,25 +282,14 @@ extern const Gfx sparkles_animation_seg4_dl_04035330[]; extern const Gfx sparkles_animation_seg4_dl_04035348[]; extern const Gfx sparkles_animation_seg4_dl_04035360[]; -// stomp_smoke +// small water splash extern const GeoLayout small_water_splash_geo[]; -extern const GeoLayout mario_TODO_geo_0000E0[]; -extern const Gfx stomp_smoke_seg4_dl_04025148[]; -extern const Gfx stomp_smoke_seg4_dl_04025190[]; -extern const Gfx stomp_smoke_seg4_dl_040251C8[]; -extern const Gfx stomp_smoke_seg4_dl_040251E0[]; -extern const Gfx stomp_smoke_seg4_dl_040251F8[]; -extern const Gfx stomp_smoke_seg4_dl_04025210[]; -extern const Gfx stomp_smoke_seg4_dl_04025228[]; -extern const Gfx stomp_smoke_seg4_dl_04025240[]; -extern const Gfx stomp_smoke_seg4_dl_04025258[]; -extern const Gfx stomp_smoke_seg4_dl_04025270[]; -extern const Gfx stomp_smoke_seg4_dl_04025288[]; -extern const Gfx stomp_smoke_seg4_dl_040252A0[]; -extern const Gfx stomp_smoke_seg4_dl_040252B8[]; -extern const Gfx stomp_smoke_seg4_dl_040252D0[]; -extern const Gfx stomp_smoke_seg4_dl_040252E8[]; -extern const Gfx stomp_smoke_seg4_dl_04025300[]; +extern const Gfx small_water_splash_seg4_dl_0[]; +extern const Gfx small_water_splash_seg4_dl_1[]; +extern const Gfx small_water_splash_seg4_dl_2[]; +extern const Gfx small_water_splash_seg4_dl_3[]; +extern const Gfx small_water_splash_seg4_dl_4[]; +extern const Gfx small_water_splash_seg4_dl_5[]; // walk_smoke extern const GeoLayout smoke_geo[]; diff --git a/actors/group0_geo.c b/actors/group0_geo.c index bddefae91..1f3209d6b 100644 --- a/actors/group0_geo.c +++ b/actors/group0_geo.c @@ -10,7 +10,7 @@ #include "bubble/geo.inc.c" #include "walk_smoke/geo.inc.c" #include "burn_smoke/geo.inc.c" -#include "stomp_smoke/geo.inc.c" +#include "small_water_splash/geo.inc.c" #include "water_wave/geo.inc.c" #include "sparkle/geo.inc.c" #include "water_splash/geo.inc.c" diff --git a/actors/small_water_splash/geo.inc.c b/actors/small_water_splash/geo.inc.c new file mode 100644 index 000000000..334fe020c --- /dev/null +++ b/actors/small_water_splash/geo.inc.c @@ -0,0 +1,13 @@ +// 0x1700009C +const GeoLayout small_water_splash_geo[] = { + GEO_SWITCH_CASE(6, geo_switch_anim_state), + GEO_OPEN_NODE(), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, small_water_splash_seg4_dl_0), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, small_water_splash_seg4_dl_1), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, small_water_splash_seg4_dl_2), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, small_water_splash_seg4_dl_3), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, small_water_splash_seg4_dl_4), + GEO_DISPLAY_LIST(LAYER_TRANSPARENT, small_water_splash_seg4_dl_5), + GEO_CLOSE_NODE(), + GEO_END(), +}; diff --git a/actors/small_water_splash/model.inc.c b/actors/small_water_splash/model.inc.c new file mode 100644 index 000000000..960cb4fef --- /dev/null +++ b/actors/small_water_splash/model.inc.c @@ -0,0 +1,111 @@ +// Small Water splash + +// 0x040220C8 +static const Vtx small_water_splash_seg4_vertex[] = { + {{{ -32, 0, 32}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xc8}}}, + {{{ 32, 0, 32}, 0, { 62<<5, 0}, {0xff, 0xff, 0xff, 0xc8}}}, + {{{ 32, 0, -32}, 0, { 62<<5, 62<<5}, {0xff, 0xff, 0xff, 0xc8}}}, + {{{ -32, 0, -32}, 0, { 0, 62<<5}, {0xff, 0xff, 0xff, 0xc8}}}, +}; + +// 0x04022148 +ALIGNED8 static const Texture small_water_splash_seg4_texture_0[] = { +#include "actors/small_water_splash/small_water_splash_0.ia16.inc.c" +}; + +// 0x04022948 +ALIGNED8 static const Texture small_water_splash_seg4_texture_1[] = { +#include "actors/small_water_splash/small_water_splash_1.ia16.inc.c" +}; + +// 0x04023148 +ALIGNED8 static const Texture small_water_splash_seg4_texture_2[] = { +#include "actors/small_water_splash/small_water_splash_2.ia16.inc.c" +}; + +// 0x04023948 +ALIGNED8 static const Texture small_water_splash_seg4_texture_3[] = { +#include "actors/small_water_splash/small_water_splash_3.ia16.inc.c" +}; + +// 0x04024148 +ALIGNED8 static const Texture small_water_splash_seg4_texture_4[] = { +#include "actors/small_water_splash/small_water_splash_4.ia16.inc.c" +}; + +// 0x04024948 +ALIGNED8 static const Texture small_water_splash_seg4_texture_5[] = { +#include "actors/small_water_splash/small_water_splash_5.ia16.inc.c" +}; + +// 0x04025148 - 0x04025190 +const Gfx small_water_splash_seg4_sub_dl_start[] = { + gsSPClearGeometryMode(G_LIGHTING), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsSPTexture(0x8000, 0x8000, 0, G_TX_RENDERTILE, G_ON), + gsDPSetTile(G_IM_FMT_IA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_CLAMP, 5, G_TX_NOLOD), + gsDPLoadSync(), + gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), + gsDPSetTile(G_IM_FMT_IA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_CLAMP, 5, G_TX_NOLOD), + gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC), + gsSPEndDisplayList(), +}; + +// 0x04025190 - 0x040251C8 +const Gfx small_water_splash_seg4_sub_dl_end[] = { + gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + gsDPPipeSync(), + gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF), + gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), + gsSPSetGeometryMode(G_LIGHTING), + gsSPEndDisplayList(), +}; + +// 0x040251C8 - 0x040251E0 +const Gfx small_water_splash_seg4_sub_dl_model[] = { + gsSPDisplayList(small_water_splash_seg4_sub_dl_start), + gsSPVertex(small_water_splash_seg4_vertex, 4, 0), + gsSPBranchList(small_water_splash_seg4_sub_dl_end), +}; + +// 0x040251F8 - 0x04025210 +const Gfx small_water_splash_seg4_dl_0[] = { + gsDPPipeSync(), + gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b, 1, small_water_splash_seg4_texture_0), + gsSPBranchList(small_water_splash_seg4_sub_dl_model), +}; + +// 0x04025210 - 0x04025228 +const Gfx small_water_splash_seg4_dl_1[] = { + gsDPPipeSync(), + gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b, 1, small_water_splash_seg4_texture_1), + gsSPBranchList(small_water_splash_seg4_sub_dl_model), +}; + +// 0x04025228 - 0x04025240 +const Gfx small_water_splash_seg4_dl_2[] = { + gsDPPipeSync(), + gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b, 1, small_water_splash_seg4_texture_2), + gsSPBranchList(small_water_splash_seg4_sub_dl_model), +}; + +// 0x04025240 - 0x04025258 +const Gfx small_water_splash_seg4_dl_3[] = { + gsDPPipeSync(), + gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b, 1, small_water_splash_seg4_texture_3), + gsSPBranchList(small_water_splash_seg4_sub_dl_model), +}; + +// 0x04025258 - 0x04025270 +const Gfx small_water_splash_seg4_dl_4[] = { + gsDPPipeSync(), + gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b, 1, small_water_splash_seg4_texture_4), + gsSPBranchList(small_water_splash_seg4_sub_dl_model), +}; + +// 0x04025270 - 0x04025288 +const Gfx small_water_splash_seg4_dl_5[] = { + gsDPPipeSync(), + gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b, 1, small_water_splash_seg4_texture_5), + gsSPBranchList(small_water_splash_seg4_sub_dl_model), +}; diff --git a/actors/stomp_smoke/geo.inc.c b/actors/stomp_smoke/geo.inc.c deleted file mode 100644 index 1fc0a468e..000000000 --- a/actors/stomp_smoke/geo.inc.c +++ /dev/null @@ -1,28 +0,0 @@ -// 0x1700009C -const GeoLayout small_water_splash_geo[] = { - GEO_SWITCH_CASE(6, geo_switch_anim_state), - GEO_OPEN_NODE(), - // TODO: Rename these display lists - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, stomp_smoke_seg4_dl_040251F8), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, stomp_smoke_seg4_dl_04025210), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, stomp_smoke_seg4_dl_04025228), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, stomp_smoke_seg4_dl_04025240), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, stomp_smoke_seg4_dl_04025258), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, stomp_smoke_seg4_dl_04025270), - GEO_CLOSE_NODE(), - GEO_END(), -}; - -// 0x170000E0 -const GeoLayout mario_TODO_geo_0000E0[] = { - GEO_SWITCH_CASE(6, geo_switch_anim_state), - GEO_OPEN_NODE(), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, stomp_smoke_seg4_dl_04025288), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, stomp_smoke_seg4_dl_040252A0), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, stomp_smoke_seg4_dl_040252B8), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, stomp_smoke_seg4_dl_040252D0), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, stomp_smoke_seg4_dl_040252E8), - GEO_DISPLAY_LIST(LAYER_TRANSPARENT, stomp_smoke_seg4_dl_04025300), - GEO_CLOSE_NODE(), - GEO_END(), -}; diff --git a/actors/stomp_smoke/model.inc.c b/actors/stomp_smoke/model.inc.c deleted file mode 100644 index 8f5bcd265..000000000 --- a/actors/stomp_smoke/model.inc.c +++ /dev/null @@ -1,168 +0,0 @@ -// Stomp Smoke - -// 0x040220C8 -static const Vtx stomp_smoke_seg4_vertex_040220C8[] = { - {{{ -32, 0, 32}, 0, { 0, 0}, {0xff, 0xff, 0xff, 0xc8}}}, - {{{ 32, 0, 32}, 0, { 1984, 0}, {0xff, 0xff, 0xff, 0xc8}}}, - {{{ 32, 0, -32}, 0, { 1984, 1984}, {0xff, 0xff, 0xff, 0xc8}}}, - {{{ -32, 0, -32}, 0, { 0, 1984}, {0xff, 0xff, 0xff, 0xc8}}}, -}; - -// 0x04022108 -static const Vtx stomp_smoke_seg4_vertex_04022108[] = { - {{{ -32, 0, 32}, 0, { 0, 0}, {0xff, 0x00, 0x00, 0xc8}}}, - {{{ 32, 0, 32}, 0, { 1984, 0}, {0xff, 0x00, 0x00, 0xc8}}}, - {{{ 32, 0, -32}, 0, { 1984, 1984}, {0xff, 0x00, 0x00, 0xc8}}}, - {{{ -32, 0, -32}, 0, { 0, 1984}, {0xff, 0x00, 0x00, 0xc8}}}, -}; - -// 0x04022148 -ALIGNED8 static const Texture stomp_smoke_seg4_texture_04022148[] = { -#include "actors/stomp_smoke/stomp_smoke_0.ia16.inc.c" -}; - -// 0x04022948 -ALIGNED8 static const Texture stomp_smoke_seg4_texture_04022948[] = { -#include "actors/stomp_smoke/stomp_smoke_1.ia16.inc.c" -}; - -// 0x04023148 -ALIGNED8 static const Texture stomp_smoke_seg4_texture_04023148[] = { -#include "actors/stomp_smoke/stomp_smoke_2.ia16.inc.c" -}; - -// 0x04023948 -ALIGNED8 static const Texture stomp_smoke_seg4_texture_04023948[] = { -#include "actors/stomp_smoke/stomp_smoke_3.ia16.inc.c" -}; - -// 0x04024148 -ALIGNED8 static const Texture stomp_smoke_seg4_texture_04024148[] = { -#include "actors/stomp_smoke/stomp_smoke_4.ia16.inc.c" -}; - -// 0x04024948 -ALIGNED8 static const Texture stomp_smoke_seg4_texture_04024948[] = { -#include "actors/stomp_smoke/stomp_smoke_5.ia16.inc.c" -}; - -// 0x04025148 - 0x04025190 -const Gfx stomp_smoke_seg4_dl_04025148[] = { - gsSPClearGeometryMode(G_LIGHTING), - gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), - gsSPTexture(0x8000, 0x8000, 0, G_TX_RENDERTILE, G_ON), - gsDPSetTile(G_IM_FMT_IA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_CLAMP, 5, G_TX_NOLOD), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsDPSetTile(G_IM_FMT_IA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_CLAMP, 5, G_TX_NOLOD), - gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC), - gsSPEndDisplayList(), -}; - -// 0x04025190 - 0x040251C8 -const Gfx stomp_smoke_seg4_dl_04025190[] = { - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - gsDPPipeSync(), - gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF), - gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), - gsSPSetGeometryMode(G_LIGHTING), - gsSPEndDisplayList(), -}; - -// 0x040251C8 - 0x040251E0 -const Gfx stomp_smoke_seg4_dl_040251C8[] = { - gsSPDisplayList(stomp_smoke_seg4_dl_04025148), - gsSPVertex(stomp_smoke_seg4_vertex_040220C8, 4, 0), - gsSPBranchList(stomp_smoke_seg4_dl_04025190), -}; - -// 0x040251E0 - 0x040251F8 -const Gfx stomp_smoke_seg4_dl_040251E0[] = { - gsSPDisplayList(stomp_smoke_seg4_dl_04025148), - gsSPVertex(stomp_smoke_seg4_vertex_04022108, 4, 0), - gsSPBranchList(stomp_smoke_seg4_dl_04025190), -}; - -// 0x040251F8 - 0x04025210 -const Gfx stomp_smoke_seg4_dl_040251F8[] = { - gsDPPipeSync(), - gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b, 1, stomp_smoke_seg4_texture_04022148), - gsSPBranchList(stomp_smoke_seg4_dl_040251C8), -}; - -// 0x04025210 - 0x04025228 -const Gfx stomp_smoke_seg4_dl_04025210[] = { - gsDPPipeSync(), - gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b, 1, stomp_smoke_seg4_texture_04022948), - gsSPBranchList(stomp_smoke_seg4_dl_040251C8), -}; - -// 0x04025228 - 0x04025240 -const Gfx stomp_smoke_seg4_dl_04025228[] = { - gsDPPipeSync(), - gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b, 1, stomp_smoke_seg4_texture_04023148), - gsSPBranchList(stomp_smoke_seg4_dl_040251C8), -}; - -// 0x04025240 - 0x04025258 -const Gfx stomp_smoke_seg4_dl_04025240[] = { - gsDPPipeSync(), - gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b, 1, stomp_smoke_seg4_texture_04023948), - gsSPBranchList(stomp_smoke_seg4_dl_040251C8), -}; - -// 0x04025258 - 0x04025270 -const Gfx stomp_smoke_seg4_dl_04025258[] = { - gsDPPipeSync(), - gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b, 1, stomp_smoke_seg4_texture_04024148), - gsSPBranchList(stomp_smoke_seg4_dl_040251C8), -}; - -// 0x04025270 - 0x04025288 -const Gfx stomp_smoke_seg4_dl_04025270[] = { - gsDPPipeSync(), - gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b, 1, stomp_smoke_seg4_texture_04024948), - gsSPBranchList(stomp_smoke_seg4_dl_040251C8), -}; - -// 0x04025288 - 0x040252A0 -const Gfx stomp_smoke_seg4_dl_04025288[] = { - gsDPPipeSync(), - gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b, 1, stomp_smoke_seg4_texture_04022148), - gsSPBranchList(stomp_smoke_seg4_dl_040251E0), -}; - -// 0x040252A0 - 0x040252B8 -const Gfx stomp_smoke_seg4_dl_040252A0[] = { - gsDPPipeSync(), - gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b, 1, stomp_smoke_seg4_texture_04022948), - gsSPBranchList(stomp_smoke_seg4_dl_040251E0), -}; - -// 0x040252B8 - 0x040252D0 -const Gfx stomp_smoke_seg4_dl_040252B8[] = { - gsDPPipeSync(), - gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b, 1, stomp_smoke_seg4_texture_04023148), - gsSPBranchList(stomp_smoke_seg4_dl_040251E0), -}; - -// 0x040252D0 - 0x040252E8 -const Gfx stomp_smoke_seg4_dl_040252D0[] = { - gsDPPipeSync(), - gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b, 1, stomp_smoke_seg4_texture_04023948), - gsSPBranchList(stomp_smoke_seg4_dl_040251E0), -}; - -// 0x040252E8 - 0x04025300 -const Gfx stomp_smoke_seg4_dl_040252E8[] = { - gsDPPipeSync(), - gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b, 1, stomp_smoke_seg4_texture_04024148), - gsSPBranchList(stomp_smoke_seg4_dl_040251E0), -}; - -// 0x04025300 - 0x04025318 -const Gfx stomp_smoke_seg4_dl_04025300[] = { - gsDPPipeSync(), - gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b, 1, stomp_smoke_seg4_texture_04024948), - gsSPBranchList(stomp_smoke_seg4_dl_040251E0), -}; diff --git a/assets.json b/assets.json index 691735f2c..9ceab3345 100644 --- a/assets.json +++ b/assets.json @@ -433,12 +433,12 @@ "actors/springboard/springboard_top_unused.rgba16.png": [32,32,2048,{"jp":[1457744,24],"us":[1464912,24],"eu":[1336880,24],"sh":[1313392,24]}], "actors/star/star_eye.rgba16.png": [32,32,2048,{"jp":[1568640,31280],"us":[1575856,31280],"eu":[1447824,31280],"sh":[1424336,31280]}], "actors/star/star_surface.rgba16.png": [32,32,2048,{"jp":[2094912,173808],"us":[2102288,173808],"eu":[1974256,173808],"sh":[1950768,173808]}], -"actors/stomp_smoke/stomp_smoke_0.ia16.png": [32,32,2048,{"jp":[1125200,139592],"us":[1132368,139592],"eu":[1004336,139592],"sh":[980848,139592]}], -"actors/stomp_smoke/stomp_smoke_1.ia16.png": [32,32,2048,{"jp":[1125200,141640],"us":[1132368,141640],"eu":[1004336,141640],"sh":[980848,141640]}], -"actors/stomp_smoke/stomp_smoke_2.ia16.png": [32,32,2048,{"jp":[1125200,143688],"us":[1132368,143688],"eu":[1004336,143688],"sh":[980848,143688]}], -"actors/stomp_smoke/stomp_smoke_3.ia16.png": [32,32,2048,{"jp":[1125200,145736],"us":[1132368,145736],"eu":[1004336,145736],"sh":[980848,145736]}], -"actors/stomp_smoke/stomp_smoke_4.ia16.png": [32,32,2048,{"jp":[1125200,147784],"us":[1132368,147784],"eu":[1004336,147784],"sh":[980848,147784]}], -"actors/stomp_smoke/stomp_smoke_5.ia16.png": [32,32,2048,{"jp":[1125200,149832],"us":[1132368,149832],"eu":[1004336,149832],"sh":[980848,149832]}], +"actors/small_water_splash/small_water_splash_0.ia16.png": [32,32,2048,{"jp":[1125200,139592],"us":[1132368,139592],"eu":[1004336,139592],"sh":[980848,139592]}], +"actors/small_water_splash/small_water_splash_1.ia16.png": [32,32,2048,{"jp":[1125200,141640],"us":[1132368,141640],"eu":[1004336,141640],"sh":[980848,141640]}], +"actors/small_water_splash/small_water_splash_2.ia16.png": [32,32,2048,{"jp":[1125200,143688],"us":[1132368,143688],"eu":[1004336,143688],"sh":[980848,143688]}], +"actors/small_water_splash/small_water_splash_3.ia16.png": [32,32,2048,{"jp":[1125200,145736],"us":[1132368,145736],"eu":[1004336,145736],"sh":[980848,145736]}], +"actors/small_water_splash/small_water_splash_4.ia16.png": [32,32,2048,{"jp":[1125200,147784],"us":[1132368,147784],"eu":[1004336,147784],"sh":[980848,147784]}], +"actors/small_water_splash/small_water_splash_5.ia16.png": [32,32,2048,{"jp":[1125200,149832],"us":[1132368,149832],"eu":[1004336,149832],"sh":[980848,149832]}], "actors/sushi/sushi_eye.rgba16.png": [32,16,1024,{"jp":[1285392,38608],"us":[1292560,38608],"eu":[1164528,38608],"sh":[1141040,38608]}], "actors/sushi/sushi_snout.rgba16.png": [32,32,2048,{"jp":[1285392,36560],"us":[1292560,36560],"eu":[1164528,36560],"sh":[1141040,36560]}], "actors/sushi/sushi_tooth.rgba16.png": [8,8,128,{"jp":[1285392,39632],"us":[1292560,39632],"eu":[1164528,39632],"sh":[1141040,39632]}],