[JP] Battle Code and Battle Areas

pmret · Sep 5, 2024 · 5e16385 · 5e16385
1 parent 41685b3
commit 5e16385
Show file tree

Hide file tree

Showing 20 changed files with 4,366 additions and 504 deletions.
diff --git a/src/battle/16C8E0.c b/src/battle/16C8E0.c
@@ -66,7 +66,11 @@ EvtScript BtlPutPartnerAway = {
     Add(LVar1, 25)
     Call(SetActorJumpGravity, ACTOR_PARTNER, Float(1.0))
     Call(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2)
+#if VERSION_JP
+    Call(JumpToGoal, ACTOR_PARTNER, 10, 0, 1, 1)
+#else
     Call(JumpToGoal, ACTOR_PARTNER, 10, 0, 0, 1)
+#endif
     Call(DisablePartnerBlur)
     Return
     End
@@ -88,7 +92,11 @@ EvtScript BtlBringPartnerOut = {
     IfEq(LVar1, 0)
         Call(JumpToGoal, ACTOR_PARTNER, 20, 0, 0, 1)
     Else
+#if VERSION_JP
+        Call(JumpToGoal, ACTOR_PARTNER, 20, 0, 1, 1)
+#else
         Call(JumpToGoal, ACTOR_PARTNER, 20, 0, 0, 1)
+#endif
     EndIf
     Call(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2)
     Call(ForceHomePos, ACTOR_PARTNER, LVar0, LVar1, LVar2)

diff --git a/src/battle/actors.c b/src/battle/actors.c
@@ -206,8 +206,11 @@ Vec3s StandardActorHomePositions[] = {
 };
 
 // TODO: what is this, and look into warnings that are silenced via casts
+// Note: check D_8028358C_2 in battle/popup_messages.c (file split might be incorrect)
 s32* D_8028358C[] = {
     (s32*)-1, (s32*)-1, (s32*)-1, (s32*)-1, (s32*)-1, (s32*)-1, (s32*)-1, (s32*)-1,
-    (s32*)D_8028358C, (s32*)D_8028358C, (s32*)D_8028358C, (s32*)D_8028358C, (s32*)D_8028358C, (s32*)D_8028358C,
-    (s32*)D_8028358C, (s32*)D_8028358C, 0
+    (s32*)D_8028358C, (s32*)D_8028358C, (s32*)D_8028358C, (s32*)D_8028358C, (s32*)D_8028358C,
+#if !VERSION_JP
+    (s32*)D_8028358C, (s32*)D_8028358C, (s32*)D_8028358C, 0
+#endif
 };