More SA1 alignment

Author: JaceCear

include/core.h

@@ -1,8 +1,8 @@
 #ifndef GUARD_MAIN_H
 #define GUARD_MAIN_H
-// for memcpy
+
 #ifndef GEN_CTX
-#include <string.h>
+#include <string.h> // for memcpy
 #endif
 
 #include "global.h"

src/core.c

@@ -23,7 +23,7 @@ typedef bool32 (*VBlankProcessFunc)(void);
 IntrFunc gIntrTable[] = {};
 u32 gIntrMainBuf[] = {};
 struct Task gTasks[] = {};
-u16 gUnknown_030017F0 ALIGNED(4) = 0;
+u16 SA2_LABEL(gUnknown_030017F0) ALIGNED(4) = 0;
 Vec2_16 gSpriteOffset ALIGNED(4) = {};
 Background *gBackgroundsCopyQueue[] ALIGNED(16) = {};
 u32 gFlags = 0;
@@ -45,11 +45,11 @@ struct Task gEmptyTask ALIGNED(16) = {};
 // NOTE: gNextFreeAffineIndex introduced in SA3, unused before.
 u8 gNextFreeAffineIndex = 0;
 #endif
-BgAffineReg gBgAffineRegs[NUM_AFFINE_BACKGROUNDS] ALIGNED(8) = {};
+BgAffineReg gBgAffineRegs[NUM_AFFINE_BACKGROUNDS] ALIGNED(16) = {};
 void *gVramHeapStartAddr = NULL;
-u16 gUnknown_03001944 ALIGNED(4) = 0;
+u16 SA2_LABEL(gUnknown_03001944) ALIGNED(4) = 0;
 u8 gNumVBlankIntrs ALIGNED(4) = 0;
-s16 gUnknown_0300194C ALIGNED(4) = 0;
+s16 SA2_LABEL(gUnknown_0300194C) ALIGNED(4) = 0;
 
 u32 gMultiSioStatusFlags = 0;
 bool8 gMultiSioEnabled = FALSE;

src/game/sa1_sa2_shared/unused_level_select.c

@@ -87,10 +87,10 @@ static void Task_Poll(void)
         m4aSongNumStop(MUS_CHARACTER_SELECTION);
 
         sa2__gUnknown_03004D80[0] = 0;
-        sa2__gUnknown_03002280[0][0] = 0;
-        sa2__gUnknown_03002280[0][1] = 0;
-        sa2__gUnknown_03002280[0][2] = 0xFF;
-        sa2__gUnknown_03002280[0][3] = 0x20;
+        gBgSprites_Unknown2[0][0] = 0;
+        gBgSprites_Unknown2[0][1] = 0;
+        gBgSprites_Unknown2[0][2] = 0xFF;
+        gBgSprites_Unknown2[0][3] = 0x20;
 
         if (IS_MULTI_PLAYER) {
             gCurTask->main = Task_CreateMultiplayer;
@@ -110,10 +110,10 @@ static void Task_Poll(void)
         CreateCharacterSelectionScreen(0);
 
         sa2__gUnknown_03004D80[0] = 0;
-        sa2__gUnknown_03002280[0][0] = 0;
-        sa2__gUnknown_03002280[0][1] = 0;
-        sa2__gUnknown_03002280[0][2] = 0xFF;
-        sa2__gUnknown_03002280[0][3] = 0x20;
+        gBgSprites_Unknown2[0][0] = 0;
+        gBgSprites_Unknown2[0][1] = 0;
+        gBgSprites_Unknown2[0][2] = 0xFF;
+        gBgSprites_Unknown2[0][3] = 0x20;
 #elif (GAME == GAME_SA2)
         INIT_BG_SPRITES_LAYER_32(0);
 #endif

src/sprite.c

@@ -661,8 +661,8 @@ void DisplaySprite(Sprite *sprite)
         y = sprite->y;
 
         if (sprite->frameFlags & SPRITE_FLAG_GLOBAL_OFFSET) {
-            x -= SA2_LABEL(gSpriteOffset).x;
-            y -= SA2_LABEL(gSpriteOffset).y;
+            x -= gSpriteOffset.x;
+            y -= gSpriteOffset.y;
         }
 
         sprWidth = sprDims->width;