WIP: sa1 merge

.github/workflows/build.yml

@@ -109,6 +109,69 @@ jobs:
           path: |
             gh-pages
 
+  build-sa1-gba:
+    if: ${{ github.event_name == 'push' || github.event_name == 'pull_request' && !github.event.pull_request.head.repo.fork || github.event_name == 'pull_request_target' && github.event.pull_request.head.repo.fork}}
+    runs-on: ubuntu-22.04
+    name: Build SA1 GBA (Europe)
+    steps:
+      - name: Checkout PR
+        if: ${{ github.event_name == 'pull_request' || github.event_name == 'pull_request_target'}}
+        uses: actions/checkout@master
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+
+      - name: Checkout
+        if: ${{ github.event_name == 'push' }}
+        uses: actions/checkout@master
+
+      - name: Checkout agbcc
+        uses: actions/checkout@master
+        with:
+          path: agbcc
+          repository: SAT-R/agbcc
+
+      - name: Install tools
+        run: |
+          sudo apt update && sudo apt install gcc-arm-none-eabi binutils-arm-none-eabi xorg-dev
+          python3 -m pip install gitpython
+        # build-essential, git, and libpng-dev are already installed
+        # gcc-arm-none-eabi is only needed for the modern build
+        # as an alternative to dkP
+
+      - name: Install agbcc
+        run: |
+          ./build.sh
+          ./install.sh ../
+        working-directory: agbcc
+
+      - name: Fetch assets
+        run: curl -o sa1/baserom_sa1.gba -u ${{ secrets.STORAGE_USERNAME }}:${{ secrets.STORAGE_PASSWORD }} ${{ secrets.STORAGE_BASE_URL }}/sa1/baserom.gba
+
+      - name: Compare
+        run: make sa1 -j${nproc}
+
+      # - name: Progress
+      #   run: |
+      #     python3 scripts/progress.py text
+
+      # - name: Generate reports
+      #   run: |
+      #     mkdir -p gh-pages/reports
+      #     mkdir -p gh-pages/maps
+      #     python3 sa1/scripts/progress.py csv >> gh-pages/reports/progress-sa1-nonmatching.csv
+      #     python3 sa1/scripts/progress.py csv -m >> gh-pages/reports/progress-sa1-matching.csv
+      #     python3 sa1/scripts/progress.py shield-json > gh-pages/reports/progress-sa1-shield.json
+      #     python3 sa1/scripts/progress.py shield-json -m > gh-pages/reports/progress-sa1-shield-matching.json
+      #     echo "REPORTS_COMMIT_MSG=$( git log --format=%s ${GITHUB_SHA} )" >> $GITHUB_ENV
+      #     cp sa1.map gh-pages/maps/${GITHUB_SHA}.map
+
+      # - name: Upload progress
+      #   if: ${{ github.event_name == 'push' || github.event_name == 'pull_request' }}
+      #   uses: actions/upload-artifact@v7
+      #   with:
+      #     path: |
+      #       gh-pages
+
   publish-progress:
     name: Publish progress
     runs-on: ubuntu-24.04

Makefile

@@ -369,7 +369,7 @@ endif
 #### MAIN TARGETS ####
 
 # these commands will run regardless of deps being completed
-.PHONY: clean tools tidy clean-tools $(TOOLDIRS) libagbsyscall ps2
+.PHONY: clean tools tidy clean-tools $(TOOLDIRS) libagbsyscall ps2 sa1
 
 # Ensure required directories exist
 $(shell mkdir -p $(C_BUILDDIR) $(ASM_BUILDDIR) $(DATA_ASM_BUILDDIR) $(SOUND_ASM_BUILDDIR) $(SONG_BUILDDIR) $(MID_BUILDDIR))
@@ -436,6 +436,7 @@ tool_libs:
 clean: tidy clean-tools
 	@$(MAKE) clean -C tools/BriBaSA_ex
 	@$(MAKE) clean -C chao_garden
+	@$(MAKE) clean -C sa1
 	@$(MAKE) clean -C multi_boot/subgame_bootstrap
 	@$(MAKE) clean -C multi_boot/programs/subgame_loader
 	@$(MAKE) clean -C multi_boot/collect_rings
@@ -663,6 +664,9 @@ libagbsyscall:
 bribasa:
 	@$(MAKE) -C tools/BriBaSA_ex
 
+sa1:
+	@$(MAKE) -C sa1
+
 $(TOOLDIRS): tool_libs
 	@$(MAKE) -C $@
 

graphics.mk

@@ -1,25 +1,3 @@
-
-%_tiles_1.4bpp: %_tiles_1.png
-	$(GFX) $< $@ -num_tiles 1
-
-%_tiles_2.4bpp: %_tiles_2.png
-	$(GFX) $< $@ -num_tiles 2
-
-%_tiles_4.4bpp: %_tiles_4.png
-	$(GFX) $< $@ -num_tiles 4
-
-%_tiles_8.4bpp: %_tiles_8.png
-	$(GFX) $< $@ -num_tiles 8
-
-%_tiles_16.4bpp: %_tiles_16.png
-	$(GFX) $< $@ -num_tiles 16
-
-%_tiles_32.4bpp: %_tiles_32.png
-	$(GFX) $< $@ -num_tiles 32
-
-%_tiles_64.4bpp: %_tiles_64.png
-	$(GFX) $< $@ -num_tiles 64
-
 tileset_%.4bpp: tileset_%.png
 	$(GFX) $< $@ -ignore_trailing
 
@@ -30,12 +8,7 @@ ifeq ($(PLATFORM),win32)
     # For experimental OpenGL renderer
     GFX_CVT_FLAGS :=
 else
-# Japan rom compiled without split into oam shapes
-ifeq ($(GAME_REGION),JAPAN)
     GFX_CVT_FLAGS := -split_into_oam_shapes
-else
-    GFX_CVT_FLAGS := -split_into_oam_shapes
-endif
 endif
 
 graphics/obj_tiles/4bpp/%.4bpp: graphics/obj_tiles/4bpp/%.png

include/bg_triangles.h

@@ -23,9 +23,12 @@ typedef struct {
 #endif
 } TriParam1;
 
-extern void sub_800724C(u8 bg, TriParam1 *param1);
-extern void sub_80075D0(u8 bg, int_vcount param1, int_vcount param2, s16 param3, s16 param4, u16 param5);
-extern void sub_8007858(u8 param0, int_vcount minY, int_vcount maxY, u16 param3, u16 param4);
-extern void sub_80078D4(u8 bg, int_vcount minY, int_vcount maxY, u16 offsetEven, u16 offsetOdd);
-
+extern void SA2_LABEL(sub_8006DB4)(u8 bg, TriParam1 *arg1, s32 unused, s32 arg3);
+extern void SA2_LABEL(sub_800724C)(u8 bg, TriParam1 *param1);
+extern void SA2_LABEL(sub_80075D0)(u8 bg, int_vcount param1, int_vcount param2, s16 param3, s16 param4, u16 param5);
+extern void SA2_LABEL(sub_8007738)(u8 bg, int_vcount minY, int_vcount maxY, u16 param3, u8 param4, u8 param5, u16 param6, u8 param7,
+                                   u8 param8, s16 param9, s16 param10);
+extern void SA2_LABEL(sub_8007858)(u8 param0, int_vcount minY, int_vcount maxY, u16 param3, u16 param4);
+extern void SA2_LABEL(sub_80078D4)(u8 bg, int_vcount minY, int_vcount maxY, u16 offsetEven, u16 offsetOdd);
+void SA2_LABEL(sub_8007958)(u8 bg, int_vcount minY, int_vcount maxY, s16 param3, s8 param4, u16 param5, u16 param6);
 #endif

include/lib/agb_flash/flash_internal.h

@@ -57,7 +57,7 @@ extern u8 (*PollFlashStatus)(u8 *);
 extern u16 (*WaitForFlashWrite)(u8, u8 *, u8);
 
 extern const struct FlashSetupInfo LE39FW512;
-// extern const struct FlashSetupInfo AT29LV512;
+extern const struct FlashSetupInfo AT29LV512;
 extern const struct FlashSetupInfo MN63F805MNP;
 extern const struct FlashSetupInfo MX29L512;
 extern const struct FlashSetupInfo DefaultFlash512K;
@@ -82,11 +82,18 @@ u16 WaitForFlashWrite_Common(u8 phase, u8 *addr, u8 lastData);
 u16 ProgramByte(u8 *src, u8 *dest);
 
 u16 EraseFlashChip_LE(void);
+u16 EraseFlashChip_AT(void);
 u16 EraseFlashSector_LE(u16 sectorNum);
+u16 EraseFlashSector_AT(u16 sectorNum);
 u16 ProgramFlashSector_LE(u16 sectorNum, void *src);
 u16 ProgramFlashSector_MX(u16 sectorNum, void *src);
+u16 ProgramFlashSector_AT(u16 sectorNum, void *src);
 
 // agb_flash_1m
 u16 IdentifyFlash(void);
 
+/* Manufacturers and chips */
+#define MANUFACTURER_ATMEL   0x1F
+#define CHIP_ATMEL_AT29LV512 0x3D
+
 #endif // GUARD_GBA_FLASH_INTERNAL_H

include/rect.h

@@ -56,11 +56,11 @@ typedef struct {
 
 /* Rect collision checks using integer values
    Clones of the RECT_ ,macros that access values directly */
-#define HB_WIDTH(hb)     ((hb).right - (hb).left)
-#define HB_HEIGHT(hb)    ((hb).bottom - (hb).top)
-#define HB_LEFT(x, hb)   ((x) + hb.left)
+#define HB_WIDTH(hb)     ((hb).b.right - (hb).b.left)
+#define HB_HEIGHT(hb)    ((hb).b.bottom - (hb).b.top)
+#define HB_LEFT(x, hb)   ((x) + hb.b.left)
 #define HB_RIGHT(x, hb)  (HB_LEFT((x), (hb)) + HB_WIDTH(hb))
-#define HB_TOP(y, hb)    ((y) + hb.top)
+#define HB_TOP(y, hb)    ((y) + hb.b.top)
 #define HB_BOTTOM(y, hb) (HB_TOP(y, hb) + HB_HEIGHT(hb))
 
 #define HB_COLLISION_A_X(x0, hb0, x1, hb1) (HB_LEFT(x0, hb0) <= HB_LEFT(x1, hb1) && HB_RIGHT(x0, hb0) >= HB_LEFT(x1, hb1))

include/sprite.h

@@ -2,16 +2,17 @@
 #define GUARD_SPRITE_H
 
 #include "global.h"
+#include "rect.h"
 #include "malloc_vram.h"
 
 typedef u16 AnimId;
 
-struct GraphicsData {
+typedef struct GraphicsData {
     /* 0x00 */ const void *src;
     /* 0x04 */ void *dest;
     /* 0x08 */ u16 size;
     /* 0x0A */ AnimId anim;
-};
+} GraphicsData;
 
 // TODO: Put this somewhere else! (or is this already somewhere?)
 #define TileMask_Index   (0x3FF)
@@ -157,12 +158,7 @@ typedef struct {
 typedef struct {
     // index: -1 on init; lower 4 bits = index (in anim-cmds)
     /* 0x00 */ s32 index;
-
-    // TODO: Make this a Rect8, like in SA1 and SA3!
-    /* 0x04 */ s8 left;
-    /* 0x05 */ s8 top;
-    /* 0x06 */ s8 right;
-    /* 0x07 */ s8 bottom;
+    /* 0x04 */ Rect8 b;
 } Hitbox;
 
 #define SPRITE_ANIM_SPEED(speed) ((int)((float)(speed)*0x10))
@@ -267,6 +263,27 @@ PACKED(TileInfo16, {
     /* 0x04 */ u16 variant;
 });
 
+#if (ENGINE == ENGINE_1)
+typedef struct {
+    u32 anim : 16;
+    u32 variant : 8;
+    u32 size : 8;
+} TileInfoBitfield;
+
+// Used in the background code of Casino Paradise
+// TODO: Rename TileInfoFirework!
+typedef struct {
+    /* 0x00 */ AnimId anim;
+    /* 0x04 */ u8 variant;
+    /* 0x06 */ u8 numTiles;
+} TileInfoFirework;
+
+typedef struct {
+    AnimId anim;
+    u16 variant;
+} TileInfoBarrel;
+#endif
+
 extern const u8 gOamShapesSizes[12][2];
 
 typedef enum {
@@ -286,18 +303,19 @@ void ProcessOamBuffers(void);
 OamData *OamMalloc(u8 order);
 
 void TransformSprite(Sprite *, SpriteTransform *);
+// NOTE: Not actually unused in SA1. TODO: Align name with SA2!
 void UnusedTransform(Sprite *, SpriteTransform *);
-void sub_8004E14(Sprite *, SpriteTransform *);
+void SA2_LABEL(sub_8004E14)(Sprite *, SpriteTransform *);
 
-void sub_8003EE4(u16 p0, s16 p1, s16 p2, s16 p3, s16 p4, s16 p5, s16 p6, BgAffineReg *affine);
-void sub_8006228(u8 p0, u8 p1, u8 p2, u8 p3, u8 p4, u8 p5);
-void sub_80064A8(u8 p0, u8 p1, u8 p2, u8 p3, u8 p4, u8 p5);
+void SA2_LABEL(sub_8003EE4)(u16 p0, s16 p1, s16 p2, s16 p3, s16 p4, s16 p5, s16 p6, BgAffineReg *affine);
+void SA2_LABEL(sub_8006228)(u8 p0, u8 p1, u8 p2, u8 p3, u8 p4, u8 p5);
+void SA2_LABEL(sub_80064A8)(u8 p0, u8 p1, u8 p2, u8 p3, u8 p4, u8 p5);
 
 s32 UpdateSpriteAnimation_BG(Sprite *);
 void DisplaySprite_BG(Sprite *);
-void sub_80047A0(u16, s16, s16, u16);
+void SA2_LABEL(sub_80047A0)(u16 angle, s16 p1, s16 p2, u16 affineIndex);
 
-s16 sub_8004418(s16 x, s16 y);
+s16 SA2_LABEL(sub_8004418)(s16 x, s16 y);
 void numToASCII(u8 digits[5], u16 number);
 
 #if ((GAME == GAME_SA1) || (GAME == GAME_SA2))
@@ -326,7 +344,7 @@ void numToASCII(u8 digits[5], u16 number);
 
 #define SPRITE_INIT_SCRIPT(_sprite, _speed)                                                                                                \
     _sprite->animCursor = 0;                                                                                                               \
-    _sprite->qAnimDelay = 0;                                                                                                               \
+    _sprite->qAnimDelay = Q(0);                                                                                                            \
     _sprite->prevVariant = -1;                                                                                                             \
     _sprite->animSpeed = SPRITE_ANIM_SPEED(_speed);                                                                                        \
     _sprite->palId = 0;                                                                                                                    \
@@ -375,6 +393,9 @@ void numToASCII(u8 digits[5], u16 number);
 
 #define SPRITE_FLAG_SET_VALUE(sprite, flagName, value) (sprite)->frameFlags |= SPRITE_FLAG(flagName, value)
 
+#define SPRITE_FLAG_ENABLE_ROTATION(value)                                                                                                 \
+    (SPRITE_FLAG(ROT_SCALE, value) | SPRITE_FLAG_MASK_ROT_SCALE_ENABLE | SPRITE_FLAG_MASK_ROT_SCALE_DOUBLE_SIZE)
+
 #define SPRITE_FLAG_SHIFT_ROT_SCALE             0
 #define SPRITE_FLAG_SHIFT_ROT_SCALE_ENABLE      5
 #define SPRITE_FLAG_SHIFT_ROT_SCALE_DOUBLE_SIZE 6