Merg brnch 'main' into camra

bates64 · Sep 21, 2024 · aaf8535 · aaf8535
2 parents 5c1b6a0 + c061424
commit aaf8535
Show file tree

Hide file tree

Showing 96 changed files with 16,176 additions and 2,080 deletions.
diff --git a/include/include_asset.h b/include/include_asset.h
@@ -16,7 +16,7 @@
     __asm__( \
         ".globl " #SYMBOLNAME"\n" \
         PUSHSECTION(".data") \
-        ".align 2\n" \
+        ".align 3\n" \
         ".type " #SYMBOLNAME", @object\n" \
         #SYMBOLNAME":\n" \
         ".incbin \"ver/"ASTRINGIFY(VERSION)"/build/" FILENAME ".bin\"\n" \
@@ -32,11 +32,24 @@
     __asm__( \
         ".globl " #SYMBOLNAME"\n" \
         PUSHSECTION(".data") \
-        ".align 2\n" \
+        ".align 3\n" \
         ".type " #SYMBOLNAME", @object\n" \
         #SYMBOLNAME":\n" \
         ".incbin \"ver/"ASTRINGIFY(VERSION)"/build/" FILENAME ".bin\"\n" \
         POPSECTION \
     )
 
+#define INCLUDE_RAW(FILENAME, SYMBOLNAME) \
+    extern unsigned char SYMBOLNAME[]; \
+    __asm__( \
+        ".globl " #SYMBOLNAME"\n" \
+        PUSHSECTION(".data") \
+        ".align 3\n" \
+        ".type " #SYMBOLNAME", @object\n" \
+        #SYMBOLNAME":\n" \
+        ".incbin \"ver/"ASTRINGIFY(VERSION)"/build/assets/"ASTRINGIFY(VERSION)"/" FILENAME "\"\n" \
+        POPSECTION \
+    )
+
+
 #endif // _H_INCLUDE_ASSET
diff --git a/include/mapfs/mac_00_hit.h b/include/mapfs/mac_00_hit.h
@@ -1,3 +1,31 @@
+#if VERSION_JP
+#define COLLIDER_tt             0x70
+#define COLLIDER_deilim         0x6F
+#define COLLIDER_op3            0x67
+#define COLLIDER_op2            0x66
+#define COLLIDER_op_1           0x65
+#define COLLIDER_deilit5u       0x57
+#define COLLIDER_deilit5        0x56
+#define COLLIDER_dummy          0x41
+#define COLLIDER_mono6          0x40
+#define COLLIDER_mono5          0x3F
+#define COLLIDER_mono4          0x3E
+#define COLLIDER_mono3          0x3D
+#define COLLIDER_mono2          0x3C
+#define COLLIDER_mono1          0x3B
+#define COLLIDER_deilinw        0x39
+#define COLLIDER_o484           0x33
+#define COLLIDER_sign           0x32
+#define COLLIDER_deilit3u       0x2D
+#define COLLIDER_deilit3        0x2C
+#define COLLIDER_deilit6u       0x23
+#define COLLIDER_deilit6        0x22
+#define COLLIDER_deilit         0x1E
+#define COLLIDER_water          0x13
+#define COLLIDER_deilie         0x10
+#define COLLIDER_deilit4u       0x8
+#define COLLIDER_deilit4        0x7
+#else
 #define COLLIDER_Root           0x6E
 #define COLLIDER_g74            0x6D
 #define COLLIDER_tt             0x6C
@@ -109,6 +137,7 @@
 #define COLLIDER_min2mawari     0x2
 #define COLLIDER_o259           0x1
 #define COLLIDER_o258           0x0
+#endif
 
 #define ZONE_Root               0x12
 #define ZONE_g64                0x11

diff --git a/include/saved_flag_names.h b/include/saved_flag_names.h
@@ -247,7 +247,7 @@ enum GameFlags {
     GF_MAC00_DictionaryStolen                   = GameFlag(0x0F3),
     GF_MAC00_DictionaryReturned                 = GameFlag(0x0F4),
     GF_MAC00_TranslatedMysteryNote              = GameFlag(0x0F5),
-    GF_Unused_MAC_74                            = GameFlag(0x0F6), ///< presumably for translating the unused SuspiciousNote
+    GF_MAC00_TranslatedSuspiciousNote           = GameFlag(0x0F6),
     GF_MAC01_ShyGuyTookOverShop                 = GameFlag(0x0F7),
     GF_MAC00_ShyGuyChasedFromShop               = GameFlag(0x0F8),
     GF_MAC01_Merlon_Shoo1                       = GameFlag(0x0F9),

diff --git a/requirements.txt b/requirements.txt
@@ -11,6 +11,6 @@ intervaltree
 n64img
 python-githooks
 crunch64>=0.5.1
-spimdisasm>=1.28.1
-splat64>=0.27.0
+spimdisasm>=1.30.0
+splat64>=0.27.2
 requests
diff --git a/src/7E9D0.c b/src/7E9D0.c
@@ -11,9 +11,12 @@
 #include "sprite/npc/WorldClubba.h"
 #include "sprite/npc/WorldKoopatrol.h"
 #include "sprite/npc/HammerBros.h"
-
-//TODO memory layout?
-#define PLAYER_ACTION_VRAM_DEF texture_memory_VRAM_END
+#ifdef SHIFT
+extern Addr world_action_CLASS_VRAM;
+#define PLAYER_ACTION_VRAM_DEF world_action_CLASS_VRAM
+#else
+#define PLAYER_ACTION_VRAM_DEF (void*) 0x802B6000
+#endif
 
 void* LastLoadedActionOffset;
 s32 PeachDisguiseReapplyDelay;

diff --git a/src/battle/16C8E0.c b/src/battle/16C8E0.c
@@ -64,7 +64,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
@@ -86,7 +90,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
 };