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

src/effects/chapter_change.c

@@ -18,6 +18,12 @@ 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[];
@@ -25,6 +31,7 @@ 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 },

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"

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_802A79C0_7A5900),
+    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),

src/starpoint.c

@@ -3,6 +3,67 @@
 #include "include_asset.h"
 
 Lights1 starpoint_lights1 = gdSPDefLights1(0, 0, 0, 0, 0, 0, 0, 0, 0);
+
+#if VERSION_JP
+INCLUDE_IMG("starpoint/text_get.png", D_802A1018_7B0A88);
+INCLUDE_IMG("starpoint/text_point.png", D_802A1818_7B1288);
+INCLUDE_IMG("starpoint/text_star.png", D_802A2018_7B1A88);
+#include "starpoint/load_text_get.gfx.inc.c"
+#include "starpoint/load_text_point.gfx.inc.c"
+#include "starpoint/load_text_star.gfx.inc.c"
+#include "starpoint/text_star.vtx.inc.c"
+#include "starpoint/text_point.vtx.inc.c"
+#include "starpoint/text_get.vtx.inc.c"
+
+Gfx D_802A2A40_7B24B0[] = {
+    gsSPSetLights1(starpoint_lights1),
+    gsDPPipeSync(),
+    gsDPSetCycleType(G_CYC_1CYCLE),
+    gsDPSetRenderMode(G_RM_XLU_SURF, G_RM_XLU_SURF2),
+    gsSPDisplayList(D_802A2818_7B2288),
+    gsSPClearGeometryMode(G_LIGHTING),
+    gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH),
+    gsSPVertex(D_802A2A00_7B2470, 4, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSPEndDisplayList()
+};
+Gfx D_802A2AA0_7B2510[] = {
+    gsSPSetLights1(starpoint_lights1),
+    gsDPPipeSync(),
+    gsDPSetCycleType(G_CYC_1CYCLE),
+    gsDPSetRenderMode(G_RM_XLU_SURF, G_RM_XLU_SURF2),
+    gsSPDisplayList(D_802A2890_7B2300),
+    gsSPClearGeometryMode(G_LIGHTING),
+    gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH),
+    gsSPVertex(D_802A29C0_7B2430, 4, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSPEndDisplayList()
+};
+Gfx D_802A2B00_7B2570[] = {
+    gsSPSetLights1(starpoint_lights1),
+    gsDPPipeSync(),
+    gsDPSetCycleType(G_CYC_1CYCLE),
+    gsDPSetRenderMode(G_RM_XLU_SURF, G_RM_XLU_SURF2),
+    gsSPDisplayList(D_802A2908_7B2378),
+    gsSPClearGeometryMode(G_LIGHTING),
+    gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH),
+    gsSPVertex(D_802A2980_7B23F0, 4, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSPEndDisplayList()
+};
+Gfx D_802A2B60_7B25D0[] = {
+    gsSPSetLights1(starpoint_lights1),
+    gsSPDisplayList(D_802A2B00_7B2570),
+    gsSPDisplayList(D_802A2AA0_7B2510),
+    gsSPDisplayList(D_802A2A40_7B24B0),
+    gsSPEndDisplayList()
+};
+Gfx D_802A2B98_7B2608[] = {
+    gsSPSetLights1(starpoint_lights1),
+    gsSPDisplayList(D_802A2B60_7B25D0),
+    gsSPEndDisplayList()
+};
+#else
 INCLUDE_IMG("starpoint/starpoint.png", D_802A1018_7A89B8);
 #include "starpoint/load_starpoint.gfx.inc.c"
 #include "starpoint/starpoint.vtx.inc.c"
@@ -56,6 +117,7 @@ Gfx D_802A32D8_7AAC78[] = {
     gsSPDisplayList(D_802A32B0_7AAC50),
     gsSPEndDisplayList(),
 };
+#endif
 
 #include "starpoint/digit_0.vtx.inc.c"
 INCLUDE_IMG("starpoint/digit_0.png", D_802A3340_7AACE0);
@@ -127,8 +189,13 @@ INCLUDE_IMG("starpoint/digit_9.png", D_802ACD60_7B4700);
 #include "starpoint/_render_digit_9.gfx.inc.c"
 #include "starpoint/render_digit_9.gfx.inc.c"
 
+#if VERSION_JP
+EntityModelScript EMS_starpoint_starpoint = STANDARD_ENTITY_MODEL_SCRIPT(D_802A2B98_7B2608, RENDER_MODE_CLOUD_NO_ZCMP);
+EntityModelScript EMS_starpoint_starpoints = STANDARD_ENTITY_MODEL_SCRIPT(D_802A2B98_7B2608, RENDER_MODE_CLOUD_NO_ZCMP);
+#else
 EntityModelScript EMS_starpoint_starpoint = STANDARD_ENTITY_MODEL_SCRIPT(D_802A2158_7A9AF8, RENDER_MODE_CLOUD_NO_ZCMP);
 EntityModelScript EMS_starpoint_starpoints = STANDARD_ENTITY_MODEL_SCRIPT(D_802A32D8_7AAC78, RENDER_MODE_CLOUD_NO_ZCMP);
+#endif
 EntityModelScript EMS_starpoint_digit_0 = STANDARD_ENTITY_MODEL_SCRIPT(D_802A4410_7ABDB0, RENDER_MODE_CLOUD_NO_ZCMP);
 EntityModelScript EMS_starpoint_digit_1 = STANDARD_ENTITY_MODEL_SCRIPT(D_802A5530_7ACED0, RENDER_MODE_CLOUD_NO_ZCMP);
 EntityModelScript EMS_starpoint_digit_2 = STANDARD_ENTITY_MODEL_SCRIPT(D_802A6650_7ADFF0, RENDER_MODE_CLOUD_NO_ZCMP);

src/world/action/spin_jump.c

@@ -115,7 +115,9 @@ void action_update_spin_jump(void) {
                 } else {
                     surfaceType = get_collider_flags(belowColliderID) & COLLIDER_FLAGS_SURFACE_TYPE_MASK;
                     if (surfaceType == SURFACE_TYPE_LAVA) {
+#if !VERSION_JP
                         playerStatus->hazardType = HAZARD_TYPE_LAVA;
+#endif
                         set_action_state(ACTION_STATE_HIT_LAVA);
                         playerStatus->flags |= PS_FLAG_HIT_FIRE;
                         playerStatus->flags &= ~PS_FLAG_FLYING;

src/world/action/step_up.c

@@ -99,9 +99,11 @@ void action_update_step_up_peach(void) {
 
     if (playerStatus->curStateTime != 0) {
         playerStatus->curStateTime--;
+#if !VERSION_JP
         if (playerStatus->curStateTime == 4) {
             try_player_footstep_sounds(1);
         }
+#endif
     } else {
         if (!(playerStatus->flags & PS_FLAG_CUTSCENE_MOVEMENT)) {
             set_action_state(ACTION_STATE_IDLE);

src/world/action/tornado_jump.c

@@ -136,7 +136,9 @@ void action_update_tornado_jump(void) {
 
                 surfaceType = get_collider_flags(colliderBelow) & COLLIDER_FLAGS_SURFACE_TYPE_MASK;
                 if (surfaceType == SURFACE_TYPE_LAVA) {
+#if !VERSION_JP
                     playerStatus->hazardType = HAZARD_TYPE_LAVA;
+#endif
                     playerStatus->flags &= ~(PS_FLAG_SPINNING | PS_FLAG_FLYING);
                     set_action_state(ACTION_STATE_HIT_LAVA);
                     playerStatus->flags |= PS_FLAG_HIT_FIRE;

src/world/action/use_spinning_flower.c

@@ -64,13 +64,16 @@ void action_update_use_spinning_flower(void) {
         disable_player_input();
         playerStatus->flags |= PS_FLAG_ROTATION_LOCKED;
         entityID = gCollisionStatus.curFloor;
+#if VERSION_JP
+        gCollisionStatus.curFloor = -1;
+#endif
 
         TempPointer = &SpinningFlower_EntityIndex;
         if (entityID >= 0){
-            if (!(entityID & COLLISION_WITH_ENTITY_BIT)) {
+            if (entityID & COLLISION_WITH_ENTITY_BIT) {
-                SpinningFlower_EntityIndex = -1;
-            } else {
                 SpinningFlower_EntityIndex = entityID & 0x3FF;
+            } else {
+                SpinningFlower_EntityIndex = -1;
             }
         } else {
             SpinningFlower_EntityIndex = -1;

tools/splat_ext/msg_jp.yaml

@@ -125,6 +125,15 @@
 - [0x20, 0x00EA, Menus_00D0]
 - [0x20, 0x00F0, Menus_00D6]
 - [0x20, 0x00F1, Menus_00D7]
+- [0x20, 0x01BE, Menus_019C]
+- [0x20, 0x01BF, Menus_019D]
+- [0x20, 0x01C0, Menus_019E]
+- [0x20, 0x01C1, Menus_019F]
+- [0x20, 0x01C2, Menus_01A0]
+- [0x20, 0x01C3, Menus_01A1]
+- [0x20, 0x01C4, Menus_01A2]
+- [0x20, 0x01C5, Menus_01A3]
+- [0x20, 0x01C6, Menus_01A4]
 - [0x21, 0x0002, Choice_0001]
 - [0x21, 0x0003, Choice_0002]
 - [0x21, 0x0004, Choice_0003]

ver/jp/undefined_syms.txt

@@ -562,135 +562,6 @@ mgm_02_settings = 0x80242410; // segment:mgm_02
 mgm_03_settings = 0x80240010; // segment:mgm_03
 gv_01_settings = 0x802407D0; // segment:gv_01
 
-
-big_smoke_puff_main = 0xE0002000; // segment:effect_big_smoke_puff
-landing_dust_main = 0xE000C160; // segment:effect_landing_dust
-walking_dust_main = 0xE000E000; // segment:effect_walking_dust
-flower_splash_main = 0xE00101E8; // segment:effect_flower_splash
-flower_trail_main = 0xE0012204; // segment:effect_flower_trail
-cloud_puff_main = 0xE0014000; // segment:effect_cloud_puff
-cloud_trail_main = 0xE0016000; // segment:effect_cloud_trail
-footprint_main = 0xE0018078; // segment:effect_footprint
-floating_flower_main = 0xE001A000; // segment:effect_floating_flower
-snowflake_main = 0xE001C000; // segment:effect_snowflake
-star_main = 0xE001E000; // segment:effect_star
-emote_main = 0xE00202CC; // segment:effect_emote
-sparkles_main = 0xE0022000; // segment:effect_sparkles
-shape_spell_main = 0xE0024000; // segment:effect_shape_spell
-gather_energy_pink_main = 0xE0026000; // segment:effect_gather_energy_pink
-drop_leaves_main = 0xE0028000; // segment:effect_drop_leaves
-dust_main = 0xE002A000; // segment:effect_dust
-shattering_stones_main = 0xE002C000; // segment:effect_shattering_stones
-smoke_ring_main = 0xE002E000; // segment:effect_smoke_ring
-damage_stars_main = 0xE0030000; // segment:effect_damage_stars
-explosion_main = 0xE0032000; // segment:effect_explosion
-lens_flare_main = 0xE0034000; // segment:effect_lens_flare
-got_item_outline_main = 0xE0036000; // segment:effect_got_item_outline
-spiky_white_aura_main = 0xE0038000; // segment:effect_spiky_white_aura
-smoke_impact_main = 0xE003A000; // segment:effect_smoke_impact
-damage_indicator_main = 0xE003C000; // segment:effect_damage_indicator
-purple_ring_main = 0xE003E000; // segment:effect_purple_ring
-flame_main = 0xE0040000; // segment:effect_flame
-stars_burst_main = 0xE0042000; // segment:effect_stars_burst
-stars_shimmer_main = 0xE0044000; // segment:effect_stars_shimmer
-rising_bubble_main = 0xE0046000; // segment:effect_rising_bubble
-ring_blast_main = 0xE0048000; // segment:effect_ring_blast
-shockwave_main = 0xE004A000; // segment:effect_shockwave
-music_note_main = 0xE004C000; // segment:effect_music_note
-smoke_burst_main = 0xE004E000; // segment:effect_smoke_burst
-sweat_main = 0xE0050000; // segment:effect_sweat
-sleep_bubble_main = 0xE0052000; // segment:effect_sleep_bubble
-windy_leaves_main = 0xE0056000; // segment:effect_windy_leaves
-falling_leaves_main = 0xE0058000; // segment:effect_falling_leaves
-stars_spread_main = 0xE005A000; // segment:effect_stars_spread
-steam_burst_main = 0xE005C000; // segment:effect_steam_burst
-stars_orbiting_main = 0xE005E000; // segment:effect_stars_orbiting
-big_snowflakes_main = 0xE0060000; // segment:effect_big_snowflakes
-debuff_main = 0xE0062000; // segment:effect_debuff
-green_impact_main = 0xE0064000; // segment:effect_green_impact
-radial_shimmer_main = 0xE0066000; // segment:effect_radial_shimmer
-ending_decals_main = 0xE0068000; // segment:effect_ending_decals
-light_rays_main = 0xE006A1E8; // segment:effect_light_rays
-lightning_main = 0xE006C000; // segment:effect_lightning
-fire_breath_main = 0xE006E000; // segment:effect_fire_breath
-shimmer_burst_main = 0xE0070000; // segment:effect_shimmer_burst
-energy_shockwave_main = 0xE0072000; // segment:effect_energy_shockwave
-shimmer_wave_main = 0xE0074000; // segment:effect_shimmer_wave
-aura_main = 0xE0076000; // segment:effect_aura
-bulb_glow_main = 0xE0078000; // segment:effect_bulb_glow
-effect_3D_main = 0xE007A000; // segment:effect_effect_3D
-blast_main = 0xE007C000; // segment:effect_blast
-fire_flower_main = 0xE007E000; // segment:effect_fire_flower
-recover_main = 0xE0080000; // segment:effect_recover
-disable_x_main = 0xE0082000; // segment:effect_disable_x
-bombette_breaking_main = 0xE0084084; // segment:effect_bombette_breaking
-firework_main = 0xE0086000; // segment:effect_firework
-confetti_main = 0xE008817C; // segment:effect_confetti
-snowfall_main = 0xE008A188; // segment:effect_snowfall
-effect_46_main = 0xE008C000; // segment:effect_effect_46
-gather_magic_main = 0xE008E000; // segment:effect_gather_magic
-attack_result_text_main = 0xE0090000; // segment:effect_attack_result_text
-small_gold_sparkle_main = 0xE0092000; // segment:effect_small_gold_sparkle
-flashing_box_shockwave_main = 0xE0094000; // segment:effect_flashing_box_shockwave
-balloon_main = 0xE0096000; // segment:effect_balloon
-floating_rock_main = 0xE0098000; // segment:effect_floating_rock
-chomp_drop_main = 0xE009A000; // segment:effect_chomp_drop
-quizmo_stage_main = 0xE009C000; // segment:effect_quizmo_stage
-radiating_energy_orb_main = 0xE009E000; // segment:effect_radiating_energy_orb
-quizmo_answer_main = 0xE00A0000; // segment:effect_quizmo_answer
-motion_blur_flame_main = 0xE00A2000; // segment:effect_motion_blur_flame
-energy_orb_wave_main = 0xE00A4000; // segment:effect_energy_orb_wave
-merlin_house_stars_main = 0xE00A6000; // segment:effect_merlin_house_stars
-quizmo_audience_main = 0xE00A8000; // segment:effect_quizmo_audience
-butterflies_main = 0xE00AA000; // segment:effect_butterflies
-stat_change_main = 0xE00AC000; // segment:effect_stat_change
-snaking_static_main = 0xE00AE000; // segment:effect_snaking_static
-thunderbolt_ring_main = 0xE00B0000; // segment:effect_thunderbolt_ring
-squirt_main = 0xE00B2000; // segment:effect_squirt
-water_block_main = 0xE00B4000; // segment:effect_water_block
-waterfall_main = 0xE00B6000; // segment:effect_waterfall
-water_fountain_main = 0xE00B8000; // segment:effect_water_fountain
-underwater_main = 0xE00BA000; // segment:effect_underwater
-lightning_bolt_main = 0xE00BC000; // segment:effect_lightning_bolt
-water_splash_main = 0xE00BE000; // segment:effect_water_splash
-snowman_doll_main = 0xE00C0000; // segment:effect_snowman_doll
-fright_jar_main = 0xE00C2000; // segment:effect_fright_jar
-stop_watch_main = 0xE00C4000; // segment:effect_stop_watch
-effect_63_main = 0xE00C6000; // segment:effect_effect_63
-throw_spiny_main = 0xE00C8000; // segment:effect_throw_spiny
-effect_65_main = 0xE00CA000; // segment:effect_effect_65
-tubba_heart_attack_main = 0xE00CC000; // segment:effect_tubba_heart_attack
-whirlwind_main = 0xE00CE000; // segment:effect_whirlwind
-red_impact_main = 0xE00D0000; // segment:effect_red_impact
-floating_cloud_puff_main = 0xE00D2000; // segment:effect_floating_cloud_puff
-energy_in_out_main = 0xE00D6000; // segment:effect_energy_in_out
-tattle_window_main = 0xE00D8000; // segment:effect_tattle_window
-shiny_flare_main = 0xE00DA000; // segment:effect_shiny_flare
-huff_puff_breath_main = 0xE00DC000; // segment:effect_huff_puff_breath
-cold_breath_main = 0xE00DE000; // segment:effect_cold_breath
-embers_main = 0xE00E0000; // segment:effect_embers
-hieroglyphs_main = 0xE00E2000; // segment:effect_hieroglyphs
-misc_particles_main = 0xE00E4000; // segment:effect_misc_particles
-static_status_main = 0xE00E6000; // segment:effect_static_status
-moving_cloud_main = 0xE00E8000; // segment:effect_moving_cloud
-effect_75_main = 0xE00EA000; // segment:effect_effect_75
-firework_rocket_main = 0xE010A000; // segment:effect_firework_rocket
-peach_star_beam_main = 0xE010C000; // segment:effect_peach_star_beam
-chapter_change_main = 0xE010E32C; // segment:effect_chapter_change
-ice_shard_main = 0xE0110000; // segment:effect_ice_shard
-spirit_card_main = 0xE0112000; // segment:effect_spirit_card
-lil_oink_main = 0xE0114000; // segment:effect_lil_oink
-something_rotating_main = 0xE0116000; // segment:effect_something_rotating
-breaking_junk_main = 0xE0118000; // segment:effect_breaking_junk
-partner_buff_main = 0xE011A000; // segment:effect_partner_buff
-quizmo_assistant_main = 0xE011C000; // segment:effect_quizmo_assistant
-ice_pillar_main = 0xE011E000; // segment:effect_ice_pillar
-sun_main = 0xE0120000; // segment:effect_sun
-star_spirits_energy_main = 0xE0122000; // segment:effect_star_spirits_energy
-pink_sparkles_main = 0xE0124000; // segment:effect_pink_sparkles
-star_outline_main = 0xE0126000; // segment:effect_star_outline
-effect_86_main = 0xE0128000; // segment:effect_effect_86
-
 b_area_kzn2_dmaTable = 0x8022AA84;
 b_area_kmr_part_1_Formations = 0x802194D4;
 b_area_kmr_part_1_Stages = 0x802195D8;
@@ -773,91 +644,6 @@ b_area_kkj_Stages = 0x802185E4;
 b_area_dig_Formations = 0x8022A7C4;
 b_area_dig_Stages = 0x8022A83C;
 
-inspect_icon_ROM_START = 0xE28FA0;
-inspect_icon_ROM_END = 0xE29D40;
-speech_bubble_ROM_START = 0xE29D40;
-speech_bubble_ROM_END = 0xE2A700;
-pulse_stone_ROM_START = 0xE2A700;
-pulse_stone_ROM_END = 0xE2B440;
-i_spy_ROM_START = 0xE2B440;
-i_spy_ROM_END = 0xE2C0F0;
-
-interact_inspect_setup = 0x802B70B4;
-appendGfx_interact_prompt = 0x802B71E8;
-ispy_notification_setup = 0x802b72c0;
-appendGfx_speech_bubble = 0x802B71C8;
-interact_speech_setup = 0x802B70B4;
-appendGfx_pulse_stone_icon = 0x802B71D4;
-appendGfx_ispy_icon = 0x802b7000;
-pulse_stone_notification_setup = 0x802B7140;
-
-action_update_idle = 0x802B6000;
-world_action_idle_ROM_START = 0xE2C0F0;
-world_action_idle_ROM_END = 0xE2C570;
-action_update_walk = 0x802B6000;
-world_action_walk_ROM_START = 0xE2C570;
-world_action_walk_ROM_END = 0xE2CED0;
-action_update_run = 0x802B6288;
-action_update_jump = 0x802B60B4;
-world_action_jump_ROM_START = 0xE2CED0;
-world_action_jump_ROM_END = 0xE2D460;
-action_update_landing_on_switch = 0x802B6198;
-action_update_falling = 0x802B6294;
-action_update_step_down = 0x802B6348;
-action_update_land = 0x802B6000;
-world_action_land_ROM_START = 0xE2D790;
-world_action_land_ROM_END = 0xE2DD40;
-action_update_step_down_land = 0x802B61C0;
-action_update_talk = 0x802B6638;
-world_action_misc_ROM_START = 0xE318A0;
-world_action_misc_ROM_END = 0xE32010;
-action_update_spin_jump = 0x802B6000;
-world_action_spin_jump_ROM_START = 0xE2FC50;
-world_action_spin_jump_ROM_END = 0xE30380;
-action_update_tornado_jump = 0x802B6000;
-world_action_tornado_jump_ROM_START = 0xE2F580;
-world_action_tornado_jump_ROM_END = 0xE2FC50;
-action_update_sliding = 0x802B6060;
-world_action_slide_ROM_START = 0xE30380;
-world_action_slide_ROM_END = 0xE30B00;
-action_update_hammer = 0x802B66a8;
-world_action_hammer_ROM_START = 0xE2DD40;
-world_action_hammer_ROM_END = 0xE2EBD0;
-action_update_launch = 0x802B6350;
-action_update_pushing_block = 0x802B6508;
-action_update_hit_fire = 0x802B6000;
-world_action_hit_fire_ROM_START = 0xE30B00;
-world_action_hit_fire_ROM_END = 0xE30DB0;
-action_update_knockback = 0x802B6000;
-world_action_knockback_ROM_START = 0xE31660;
-world_action_knockback_ROM_END = 0xE318A0;
-action_update_hit_lava = 0x802B6000;
-world_action_hit_lava_ROM_START = 0xE30DB0;
-world_action_hit_lava_ROM_END = 0xE31660;
-action_update_step_up_peach = 0x802B6230;
-world_action_step_up_ROM_START = 0xE2D460;
-world_action_step_up_ROM_END = 0xE2D790;
-action_update_parasol = 0x802B6120;
-world_action_sneaky_parasol_ROM_START = 0xE33530;
-world_action_sneaky_parasol_ROM_END = 0xE343B0;
-action_update_spin = 0x802B6000;
-world_action_spin_ROM_START = 0xE2EBD0;
-world_action_spin_ROM_END = 0XE2F580;
-action_update_first_strike = 0x802B63D4;
-action_update_raise_arms = 0x802B6478;
-action_update_use_spinning_flower = 0x802B60A4;
-world_action_use_spinning_flower_ROM_START = 0xE322E0;
-world_action_use_spinning_flower_ROM_END = 0xE331C0;
-action_update_use_munchlesia = 0x802B6000;
-world_action_use_munchlesia_ROM_START = 0xE32010;
-world_action_use_munchlesia_ROM_END = 0xE322E0;
-action_update_use_tweester = 0x802B6000;
-world_action_use_tweester_ROM_START = 0xE331C0;
-world_action_use_tweester_ROM_END = 0xE33530;
-action_update_ride = 0x802B6000;
-action_update_step_up = 0x802B6000;
-action_update_state_23 = 0x802B609C;
-
 heap_spriteHead = 0x8034F800;
 Entity_UltraBlockContent_Render = 0x0A000800;
 entity_model_SimpleSpring_gfx_ROM_END = 0x00E72BD0;
@@ -1035,6 +821,11 @@ startle_header = 0x00029458;
 get_in_bed_header = 0x00038988;
 shiver_header = 0x00018200;
 
+// entity/jan_iwa
+FlowerGoalPositionY = 0x802BCE30;
+FlowerGoalPositionZ = 0x802BCE32;
+FlowerGoalPositionX = 0x802BCE34;
+
 // battle
 btl_cam_use_preset = 0x8024E40C;
 btl_cam_move = 0x8024E4D8;
@@ -1297,6 +1088,3 @@ bMarioIdleAnims = 0x802833B8;
 SetPartAlpha = 0x8026F5F0;
 func_80269600 = 0x80269780;
 SetBattleCamParam = 0x8024E748;
-
-// speech_bubble
-SpeechBubblePtr = 0x802B79A8;