From 8749ebda17e6d31d79e94950f3432706bc3a3aa8 Mon Sep 17 00:00:00 2001 From: fgsfds Date: Sun, 14 Jun 2020 13:37:57 +0300 Subject: [PATCH] give the correct textures a different name instead --- actors/exclamation_box/model.inc.c | 4 ++-- assets.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/actors/exclamation_box/model.inc.c b/actors/exclamation_box/model.inc.c index e50b8c5d..70dd506d 100644 --- a/actors/exclamation_box/model.inc.c +++ b/actors/exclamation_box/model.inc.c @@ -13,7 +13,7 @@ ALIGNED8 static const u8 exclamation_box_seg8_texture_08012E28[] = { // 0x08013628 ALIGNED8 static const u8 exclamation_box_seg8_texture_08013628[] = { -#include "actors/exclamation_box/vanish_cap_box_sides.rgba16.inc.c" +#include "actors/exclamation_box/vanish_cap_box_side.rgba16.inc.c" }; // 0x08014628 @@ -33,7 +33,7 @@ ALIGNED8 static const u8 exclamation_box_seg8_texture_08015E28[] = { // 0x08016628 ALIGNED8 static const u8 exclamation_box_seg8_texture_08016628[] = { -#include "actors/exclamation_box/wing_cap_box_sides.rgba16.inc.c" +#include "actors/exclamation_box/wing_cap_box_side.rgba16.inc.c" }; // 0x08017628 diff --git a/assets.json b/assets.json index 3faab45b..b2ebf99e 100644 --- a/assets.json +++ b/assets.json @@ -151,9 +151,9 @@ "actors/exclamation_box/metal_cap_box_front.rgba16.png": [32,32,2048,{"jp":[2032944,83496],"us":[2040320,83496],"eu":[1912288,83496],"sh":[1888800,83496]}], "actors/exclamation_box/metal_cap_box_side.rgba16.png": [64,32,4096,{"jp":[2032944,85544],"us":[2040320,85544],"eu":[1912288,85544],"sh":[1888800,85544]}], "actors/exclamation_box/vanish_cap_box_front.rgba16.png": [32,32,2048,{"jp":[2032944,77352],"us":[2040320,77352],"eu":[1912288,77352],"sh":[1888800,77352]}], -"actors/exclamation_box/vanish_cap_box_sides.rgba16.png": [64,32,4096,{"jp":[2032944,79400],"us":[2040320,79400],"eu":[1912288,79400],"sh":[1888800,79400]}], +"actors/exclamation_box/vanish_cap_box_side.rgba16.png": [32,64,4096,{"jp":[2032944,79400],"us":[2040320,79400],"eu":[1912288,79400],"sh":[1888800,79400]}], "actors/exclamation_box/wing_cap_box_front.rgba16.png": [32,32,2048,{"jp":[2032944,89640],"us":[2040320,89640],"eu":[1912288,89640],"sh":[1888800,89640]}], -"actors/exclamation_box/wing_cap_box_sides.rgba16.png": [64,32,4096,{"jp":[2032944,91688],"us":[2040320,91688],"eu":[1912288,91688],"sh":[1888800,91688]}], +"actors/exclamation_box/wing_cap_box_side.rgba16.png": [32,64,4096,{"jp":[2032944,91688],"us":[2040320,91688],"eu":[1912288,91688],"sh":[1888800,91688]}], "actors/exclamation_box_outline/exclamation_box_outline.rgba16.png": [32,32,2048,{"jp":[2032944,151912],"us":[2040320,151912],"eu":[1912288,151912],"sh":[1888800,151912]}], "actors/exclamation_box_outline/exclamation_point.rgba16.png": [16,32,1024,{"jp":[2032944,154240],"us":[2040320,154240],"eu":[1912288,154240],"sh":[1888800,154240]}], "actors/explosion/explosion_0.rgba16.png": [32,32,2048,{"jp":[2094912,2568],"us":[2102288,2568],"eu":[1974256,2568],"sh":[1950768,2568]}],