[JP] Effects, World Actions and some more (#1197)

pmret · Sep 4, 2024 · 41685b3 · 41685b3
1 parent 3526fa4
commit 41685b3
Show file tree

Hide file tree

Showing 12 changed files with 5,789 additions and 469 deletions.
diff --git a/src/effects/chapter_change.c b/src/effects/chapter_change.c
@@ -18,13 +18,20 @@ extern Gfx D_0900BF60_3F7DC0[];
 extern Gfx D_0900BFA8_3F7E08[];
 extern Gfx D_0900BFF0_3F7E50[];
 extern Gfx D_0900C038_3F7E98[];
+#if VERSION_JP
+extern Gfx D_0900B900_3FFA20[];
+extern Gfx D_0900B9E8_3FFB08[];
+extern Gfx D_0900BA30_3FFB50[];
+extern Gfx D_0900BB18_3FFC38[];
+#else
 extern Gfx D_0900C080_3F7EE0[];
 extern Gfx D_0900C168_3F7FC8[];
 extern Gfx D_0900C1B0_3F8010[];
 extern Gfx D_0900C1F8_3F8058[];
 extern Gfx D_0900C240_3F80A0[];
 extern Gfx D_0900C328_3F8188[];
 extern Gfx D_0900C370_3F81D0[];
+#endif
 extern Gfx D_0900C458_3F82B8[];
 extern Gfx D_0900C540_3F83A0[];
 
@@ -37,10 +44,15 @@ s32 D_E010E750[] = {
 };
 
 UnkStruct D_E010E79C[] = {
+#if VERSION_JP
+    { D_0900B900_3FFA20,   0,  0, 104, 20 },
+    { D_0900B9E8_3FFB08,   0, 20, 104, 20 },
+#else
     { D_0900C080_3F7EE0, 104,  0, 128, 10 },
     { D_0900C168_3F7FC8, 104, 10, 128, 10 },
     { D_0900C1B0_3F8010, 104, 20, 128, 10 },
     { D_0900C1F8_3F8058, 104, 30, 128, 10 },
+#endif
     {              NULL,   0,  0,   0,  0 }
 };
 
@@ -51,10 +63,15 @@ UnkStruct D_E010E7D8[] = {
 };
 
 UnkStruct D_E010E7FC[] = {
+#if VERSION_JP
+    { D_0900B900_3FFA20,  24, -6, 104, 20 },
+    { D_0900B9E8_3FFB08,  24, 14, 104, 20 },
+#else
     { D_0900C080_3F7EE0, 0, -6, 128, 10 },
     { D_0900C168_3F7FC8, 0,  4, 128, 10 },
     { D_0900C1B0_3F8010, 0, 14, 128, 10 },
     { D_0900C1F8_3F8058, 0, 24, 128, 10 },
+#endif
     {              NULL, 0,  0,   0,  0 }
 };
 
@@ -63,6 +80,9 @@ UnkStruct D_E010E838[] = {
     { D_0900C240_3F80A0,  70,  0, 104, 20 },
     { D_0900C328_3F8188,  70, 20, 104, 20 },
     { D_0900C370_3F81D0, 172,  0,  16, 40 },
+#elif VERSION_JP
+    { D_0900BA30_3FFB50,  96,  0,  96, 20 },
+    { D_0900BB18_3FFC38,  96, 20,  96, 20 },
 #else
     { D_0900C240_3F80A0,   0,  0, 104, 20 },
     { D_0900C328_3F8188,   0, 20, 104, 20 },

diff --git a/src/effects/gfx/chapter_change.c b/src/effects/gfx/chapter_change.c
@@ -1,5 +1,22 @@
 #include "include_asset.h"
 
+#if VERSION_JP
+INCLUDE_IMG("effects/gfx/world/ch1.png", D_09000000_3F4120);
+INCLUDE_IMG("effects/gfx/world/ch2.png", D_09001000_3F5120);
+INCLUDE_IMG("effects/gfx/world/ch3.png", D_09002000_3F6120);
+INCLUDE_IMG("effects/gfx/world/ch4.png", D_09003000_3F7120);
+INCLUDE_IMG("effects/gfx/world/ch5.png", D_09004000_3F8120);
+INCLUDE_IMG("effects/gfx/world/ch6.png", D_09005000_3F9120);
+INCLUDE_IMG("effects/gfx/world/ch7.png", D_09006000_3FA120);
+INCLUDE_IMG("effects/gfx/world/ch8.png", D_09007000_3FB120);
+INCLUDE_IMG("effects/gfx/world/ch0.png", D_09008000_3FC120);
+INCLUDE_IMG("effects/gfx/D_09000B40_3EC9A0.png", D_09008B40_3FCC60);
+INCLUDE_IMG("effects/gfx/world/chapter_rainbow.png", D_09009680_3FD7A0);
+INCLUDE_IMG("effects/gfx/world/text_stage.png", D_09009780_3FD8A0);
+INCLUDE_IMG("effects/gfx/world/D_09009FA0_3FE0C0.png", D_09009FA0_3FE0C0);
+INCLUDE_IMG("effects/gfx/world/text_clear.png", D_0900A7C0_3FE8E0);
+INCLUDE_IMG("effects/gfx/world/D_0900AF40_3FF060.png", D_0900AF40_3FF060);
+#else
 INCLUDE_IMG("effects/gfx/world/ch0.png", D_09000000_3EBE60);
 INCLUDE_IMG("effects/gfx/D_09000B40_3EC9A0.png", D_09000B40_3EC9A0);
 INCLUDE_IMG("effects/gfx/world/text_chapter.png", D_09001680_3ED4E0);
@@ -17,6 +34,7 @@ INCLUDE_IMG("effects/gfx/world/ch6.png", D_09008D40_3F4BA0);
 INCLUDE_IMG("effects/gfx/world/ch7.png", D_09009D40_3F5BA0);
 INCLUDE_IMG("effects/gfx/world/ch8.png", D_0900AD40_3F6BA0);
 INCLUDE_IMG("effects/gfx/world/chapter_rainbow.png", D_0900BD40_3F7BA0);
+#endif
 
 #include "effects/gfx/D_0900BE40_3F7CA0.gfx.inc.c"
 #include "effects/gfx/D_0900BE88_3F7CE8.gfx.inc.c"
@@ -26,6 +44,13 @@ INCLUDE_IMG("effects/gfx/world/chapter_rainbow.png", D_0900BD40_3F7BA0);
 #include "effects/gfx/D_0900BFA8_3F7E08.gfx.inc.c"
 #include "effects/gfx/D_0900BFF0_3F7E50.gfx.inc.c"
 #include "effects/gfx/D_0900C038_3F7E98.gfx.inc.c"
+
+#if VERSION_JP
+#include "effects/gfx/D_0900B900_3FFA20.gfx.inc.c"
+#include "effects/gfx/D_0900B9E8_3FFB08.gfx.inc.c"
+#include "effects/gfx/D_0900BA30_3FFB50.gfx.inc.c"
+#include "effects/gfx/D_0900BB18_3FFC38.gfx.inc.c"
+#else
 #include "effects/gfx/D_0900C080_3F7EE0.gfx.inc.c"
 #include "effects/gfx/D_0900C168_3F7FC8.gfx.inc.c"
 #include "effects/gfx/D_0900C1B0_3F8010.gfx.inc.c"
@@ -41,5 +66,7 @@ Gfx D_0900C328_3F8188[] = {
 };
 
 #include "effects/gfx/D_0900C370_3F81D0.gfx.inc.c"
+#endif
+
 #include "effects/gfx/D_0900C458_3F82B8.gfx.inc.c"
 #include "effects/gfx/D_0900C540_3F83A0.gfx.inc.c"
diff --git a/src/level_up.c b/src/level_up.c
@@ -5,6 +5,30 @@
 
 Lights1 level_up_lights = gdSPDefLights1(0, 0, 0, 0, 0, 0, 0, 0, 0);
 
+#if VERSION_JP
+#include "level_up/draw_RE.vtx.inc.c"
+#include "level_up/draw_BE.vtx.inc.c"
+#include "level_up/draw_RU.vtx.inc.c"
+#include "level_up/draw_A.vtx.inc.c"
+#include "level_up/draw_LTSU.vtx.inc.c"
+#include "level_up/draw_PU.vtx.inc.c"
+#include "level_up/draw_exclamation_mark.vtx.inc.c"
+
+INCLUDE_IMG("level_up/big_A.png", D_802A1398_7A6C18);
+#include "level_up/big_A.gfx.inc.c"
+INCLUDE_IMG("level_up/big_BE.png", D_802A2410_7A7C90);
+#include "level_up/big_BE.gfx.inc.c"
+INCLUDE_IMG("level_up/big_exclamation_mark.png", D_802A3488_7A8D08);
+#include "level_up/big_exclamation_mark.gfx.inc.c"
+INCLUDE_IMG("level_up/big_PU.png", D_802A3D00_7A9580);
+#include "level_up/big_PU.gfx.inc.c"
+INCLUDE_IMG("level_up/big_RE.png", D_802A4D78_7AA5F8);
+#include "level_up/big_RE.gfx.inc.c"
+INCLUDE_IMG("level_up/big_RU.png", D_802A5DF0_7AB670);
+#include "level_up/big_RU.gfx.inc.c"
+INCLUDE_IMG("level_up/big_LTSU.png", D_802A6E68_7AC6E8);
+#include "level_up/big_LTSU.gfx.inc.c"
+#else
 #include "level_up/draw_second_E.vtx.inc.c"
 #include "level_up/draw_V.vtx.inc.c"
 #include "level_up/draw_E.vtx.inc.c"
@@ -26,17 +50,24 @@ INCLUDE_IMG("level_up/big_L.png", D_802A55F8_7A3538);
 #include "level_up/big_L.gfx.inc.c"
 INCLUDE_IMG("level_up/big_E.png", D_802A6670_7A45B0);
 #include "level_up/big_E.gfx.inc.c"
+#endif
 
 Gfx D_802A76E8_7A5628[] = {
     gsSPSetLights1(level_up_lights),
     gsDPPipeSync(),
     gsDPSetCycleType(G_CYC_1CYCLE),
     gsDPSetRenderMode(G_RM_XLU_SURF, G_RM_XLU_SURF2),
+#if VERSION_JP
+    gsSPDisplayList(D_802A3C88_7A9508),
+#else
     gsSPDisplayList(D_802A4508_7A2448),
+#endif
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH),
 #if VERSION_IQUE
     gsSPVertex(&D_802A1218_79F158[0], 8, 0),
+#elif VERSION_JP
+    gsSPVertex(&D_802A1318_7A6B98[0], 8, 0),
 #else
     gsSPVertex(&D_802A1398_79F2D8[0], 8, 0),
 #endif
@@ -50,10 +81,18 @@ Gfx D_802A7750_7A5690[] = {
     gsDPPipeSync(),
     gsDPSetCycleType(G_CYC_1CYCLE),
     gsDPSetRenderMode(G_RM_XLU_SURF, G_RM_XLU_SURF2),
+#if VERSION_JP
+    gsSPDisplayList(D_802A4D00_7AA580),
+#else
     gsSPDisplayList(D_802A5580_7A34C0),
+#endif
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH),
+#if VERSION_JP
+    gsSPVertex(&D_802A1298_7A6B18[0], 8, 0),
+#else
     gsSPVertex(&D_802A1318_79F258[0], 8, 0),
+#endif
     gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
@@ -64,10 +103,18 @@ Gfx D_802A77B8_7A56F8[] = {
     gsDPPipeSync(),
     gsDPSetCycleType(G_CYC_1CYCLE),
     gsDPSetRenderMode(G_RM_XLU_SURF, G_RM_XLU_SURF2),
+#if VERSION_JP
+    gsSPDisplayList(D_802A7E68_7AD6E8),
+#else
     gsSPDisplayList(D_802A3490_7A13D0),
+#endif
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH),
+#if VERSION_JP
+    gsSPVertex(&D_802A1218_7A6A98[0], 8, 0),
+#else
     gsSPVertex(&D_802A1298_79F1D8[0], 8, 0),
+#endif
     gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
@@ -78,10 +125,18 @@ Gfx D_802A7820_7A5760[] = {
     gsDPPipeSync(),
     gsDPSetCycleType(G_CYC_1CYCLE),
     gsDPSetRenderMode(G_RM_XLU_SURF, G_RM_XLU_SURF2),
+#if VERSION_JP
+    gsSPDisplayList(D_802A2398_7A7C18),
+#else
     gsSPDisplayList(D_802A65F8_7A4538),
+#endif
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH),
+#if VERSION_JP
+    gsSPVertex(&D_802A1198_7A6A18[0], 8, 0),
+#else
     gsSPVertex(&D_802A1218_79F158[0], 8, 0),
+#endif
     gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
@@ -92,11 +147,17 @@ Gfx D_802A7888_7A57C8[] = {
     gsDPPipeSync(),
     gsDPSetCycleType(G_CYC_1CYCLE),
     gsDPSetRenderMode(G_RM_XLU_SURF, G_RM_XLU_SURF2),
+#if VERSION_JP
+    gsSPDisplayList(D_802A6DF0_7AC670),
+#else
     gsSPDisplayList(D_802A65F8_7A4538),
+#endif
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH),
 #if VERSION_IQUE
     gsSPVertex(&D_802A1098_79EFD8[0], 8, 0),
+#elif VERSION_JP
+    gsSPVertex(&D_802A1118_7A6998[0], 8, 0),
 #else
     gsSPVertex(&D_802A1198_79F0D8[0], 8, 0),
 #endif
@@ -110,10 +171,18 @@ Gfx D_802A78F0_7A5830[] = {
     gsDPPipeSync(),
     gsDPSetCycleType(G_CYC_1CYCLE),
     gsDPSetRenderMode(G_RM_XLU_SURF, G_RM_XLU_SURF2),
+#if VERSION_JP
+    gsSPDisplayList(D_802A3410_7A8C90),
+#else
     gsSPDisplayList(D_802A7670_7A55B0),
+#endif
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH),
+#if VERSION_JP
+    gsSPVertex(&D_802A1098_7A6918[0], 8, 0),
+#else
     gsSPVertex(&D_802A1118_79F058[0], 8, 0),
+#endif
     gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
@@ -124,15 +193,24 @@ Gfx D_802A7958_7A5898[] = {
     gsDPPipeSync(),
     gsDPSetCycleType(G_CYC_1CYCLE),
     gsDPSetRenderMode(G_RM_XLU_SURF, G_RM_XLU_SURF2),
+#if VERSION_JP
+    gsSPDisplayList(D_802A5D78_7AB5F8),
+#else
     gsSPDisplayList(D_802A2418_7A0358),
+#endif
     gsSPClearGeometryMode(G_LIGHTING),
     gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH),
+#if VERSION_JP
+    gsSPVertex(&D_802A1018_7A6898[0], 8, 0),
+#else
     gsSPVertex(&D_802A1098_79EFD8[0], 8, 0),
+#endif
     gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
     gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
 
+#if !VERSION_JP
 Gfx D_802A79C0_7A5900[] = {
     gsSPSetLights1(level_up_lights),
     gsDPPipeSync(),
@@ -146,16 +224,25 @@ Gfx D_802A79C0_7A5900[] = {
     gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0),
     gsSPEndDisplayList(),
 };
+#endif
 
 Gfx D_802A7A28_7A5968[] = {
     gsSPSetLights1(level_up_lights),
-#if !VERSION_IQUE
+#if VERSION_JP
+    gsSPDisplayList(D_802A7958_7A5898),
+    gsSPDisplayList(D_802A78F0_7A5830),
+    gsSPDisplayList(D_802A7888_7A57C8),
+    gsSPDisplayList(D_802A7820_7A5760),
+    gsSPDisplayList(D_802A77B8_7A56F8),
+    gsSPDisplayList(D_802A7750_7A5690),
+#elif VERSION_IQUE
+    gsSPDisplayList(D_802A78F0_7A5830),
+    gsSPDisplayList(D_802A7888_7A57C8),
+#else
     gsSPDisplayList(D_802A79C0_7A5900),
     gsSPDisplayList(D_802A7958_7A5898),
-#endif
     gsSPDisplayList(D_802A78F0_7A5830),
     gsSPDisplayList(D_802A7888_7A57C8),
-#if !VERSION_IQUE
     gsSPDisplayList(D_802A7820_7A5760),
     gsSPDisplayList(D_802A77B8_7A56F8),
     gsSPDisplayList(D_802A7750_7A5690),