github-mirror/sa2
1
0 Fork 0
mirror of https://github.com/SAT-R/sa2.git synced 2026-10-28 09:43:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make palettes format-independent, and other improvments (#242)

Browse Source 
* Remove unused RED|GREEN|BLUE_VALUE macros

* preproc: Add basic support for loading .pal files directly via INCPAL()

* Some potential boss_8 render fixes and misc. stuff

* Use INCPAL macro in src/data/sprite_animation.c (but that file's is unused rn?)

* Fix non-main-Makefiles not using preproc properly

* Remove all INCBIN(.gbapal) uses with INCPAL(.pal) in ./src

* Move gSpritePalettes to C

* Rename palette to time_display_singlepak.pal

* Remove obj_palettes.inc

* Use ColorRaw for known palettes

* Fix time_display match

* Rename palette to sound_test_bg.pal

* Add comment and scratch to sub_80236C8

* Use PALETTE_LEN_4BPP

* Document a vocal sample name. Thanks 'Asal (in Harmony)' for letting us know!

* Document palette names in /graphics

* Fix boss palette names

* Renmae to sBoss7Palettes

* Some Boss 7 documentation

* Add ShredWindowsGarbage to win32

* Make PLTT a Color[] in non-vanilla builds

* Make Tilemap use INCPAL
This commit is contained in:
JaceCear authored and GitHub committed 2026-03-17 23:00:00 +00:00
1 parent 1485bca6ac
commit 9da592bb8e
438 files changed
+3014 -2596
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

multi_boot/collect_rings/Makefile
+1 -1
View File
@@ -126,7 +126,7 @@ endif
$(DATA_ASM_BUILDDIR)/%.o: $(DATA_ASM_SUBDIR)/%.s $$(data_dep)
@echo "$(AS) <flags> -o $@ $<"
@$(PREPROC) $< | $(CPP) $(CPPFLAGS) - | $(AS) $(ASFLAGS) -o $@
@$(PREPROC) $< $(PLATFORM) "" | $(CPP) $(CPPFLAGS) - | $(AS) $(ASFLAGS) -o $@
../roms/collect_rings/collect_rings.gba:
$(MAKE) -C ../roms/collect_rings
multi_boot/collect_rings/config.mk
+1
View File
@@ -1,6 +1,7 @@
### Build Configuration ###
# Default variables
PLATFORM ?= gba
GAME_REVISION ?= 0
GAME_REGION ?= USA
DEBUG ?= 0
multi_boot/programs/subgame_loader/Makefile
+2 -2
View File
@@ -170,7 +170,7 @@ endif
$(C_BUILDDIR)/%.o : $(C_SUBDIR)/%.c $$(c_dep)
@echo "$(CC1) <flags> -o $@ $<"
@$(CPP) $(CPPFLAGS) $< -o $(C_BUILDDIR)/$*.i
@$(PREPROC) $(C_BUILDDIR)/$*.i | $(CC1) $(CC1FLAGS) -o $(C_BUILDDIR)/$*.s
@$(PREPROC) $(C_BUILDDIR)/$*.i $(PLATFORM) "" | $(CC1) $(CC1FLAGS) -o $(C_BUILDDIR)/$*.s
@printf ".text\n\t.align\t2, 0\n" >> $(C_BUILDDIR)/$*.s
@$(AS) $(ASFLAGS) -o $@ $(C_BUILDDIR)/$*.s
@@ -193,7 +193,7 @@ endif
$(DATA_ASM_BUILDDIR)/%.o: $(DATA_ASM_SUBDIR)/%.s $$(data_dep)
@echo "$(AS) <flags> -o $@ $<"
@$(PREPROC) $< | $(CPP) $(CPPFLAGS) - | $(AS) $(ASFLAGS) -o $@
@$(PREPROC) $< $(PLATFORM) "" | $(CPP) $(CPPFLAGS) - | $(AS) $(ASFLAGS) -o $@
$(SONG_BUILDDIR)/%.o: $(SONG_SUBDIR)/%.s
@echo "$(AS) <flags> -I sound -o $@ $<"
multi_boot/programs/subgame_loader/config.mk
+1
View File
@@ -1,6 +1,7 @@
### Build Configuration ###
# Default variables
PLATFORM ?= gba
GAME_REVISION ?= 0
GAME_REGION ?= USA
DEBUG ?= 0
multi_boot/programs/subgame_loader/include/global.h
-4
View File
@@ -72,10 +72,6 @@
// Converts a Q24.8 fixed-point format number to a regular integer
#define Q_24_8_TO_INT(n) ((int)((n) >> 8))
#define RED_VALUE(color) ((color)&0x1F)
#define GREEN_VALUE(color) (((color) >> 5) & 0x1F)
#define BLUE_VALUE(color) (((color) >> 10) & 0x1F)
#define ABS(aValue) ((aValue) >= 0 ? (aValue) : -(aValue))
#define RECT_DISTANCE(aXA, aYA, aXB, aYB) (ABS((aXA) - (aXB)) + ABS((aYA) - (aYB)))
multi_boot/roms/collect_rings/Makefile
+3 -3
View File
@@ -308,7 +308,7 @@ $(C_BUILDDIR)/sa2/%.o: $(C_BUILDDIR)/sa2/%.c
@echo "$(CC1) <flags> -o $@ $<"
@$(shell mkdir -p $(shell dirname '$(C_BUILDDIR)/sa2/$*.i'))
@$(CPP) $(CPPFLAGS) $(SA2_INCLUDE_CPP_ARGS) $< -o $(C_BUILDDIR)/sa2/$*.i
@$(PREPROC) $(C_BUILDDIR)/sa2/$*.i | $(CC1) $(PROLOGUE_FIX) $(CC1FLAGS) -o $(C_BUILDDIR)/sa2/$*.s -
@$(PREPROC) $(C_BUILDDIR)/sa2/$*.i $(PLATFORM) "" | $(CC1) $(PROLOGUE_FIX) $(CC1FLAGS) -o $(C_BUILDDIR)/sa2/$*.s -
@printf ".text\n\t.align\t2, 0\n" >> $(C_BUILDDIR)/sa2/$*.s
@$(AS) $(ASFLAGS) -I ../../../ $(C_BUILDDIR)/sa2/$*.s -o $@
@@ -326,7 +326,7 @@ $(ASM_BUILDDIR)/%.o: $(ASM_SUBDIR)/%.s
$(DATA_ASM_BUILDDIR)/%.o: $(DATA_ASM_SUBDIR)/%.s
@echo "$(AS) <flags> -o $@ $<"
@$(PREPROC) $< "" | $(CPP) $(CPPFLAGS) - | $(AS) $(ASFLAGS) -o $@ -
@$(PREPROC) $< $(PLATFORM) "" | $(CPP) $(CPPFLAGS) - | $(AS) $(ASFLAGS) -o $@ -
# Scan the ASM data dependencies to determine if any .inc files have changed
$(DATA_ASM_BUILDDIR)/%.d: $(DATA_ASM_SUBDIR)/%.s
@@ -340,7 +340,7 @@ endif
$(SONG_BUILDDIR)/%.o: $(SONG_SUBDIR)/%.s
@echo "$(AS) <flags> -o $@ $<"
@$(PREPROC) $< "" | $(CPP) $(CPPFLAGS) - | $(AS) $(ASFLAGS) -o $@ -
@$(PREPROC) $< $(PLATFORM) "" | $(CPP) $(CPPFLAGS) - | $(AS) $(ASFLAGS) -o $@ -
libagbsyscall:
@$(MAKE) -C ../../../libagbsyscall MODERN=0 PLATFORM=gba CPU_ARCH=arm
multi_boot/roms/collect_rings/config.mk
+1
View File
@@ -3,6 +3,7 @@
# Default variables
MIDI_COMMENTS := "arm"
PLATFORM ?= gba
GAME_REVISION ?= 0
GAME_REGION ?= USA
DEBUG ?= 0
multi_boot/roms/collect_rings/songs.mk
+1 -1
View File
@@ -2,7 +2,7 @@ STD_REVERB = 0
$(MID_BUILDDIR)/%.o: $(MID_SUBDIR)/%.s
@echo "$(AS) <flags> -I sound -o $@ $<"
@$(PREPROC) $< "" | $(CPP) $(CPPFLAGS) - | $(AS) $(ASFLAGS) -o $@ -
@$(PREPROC) $< $(PLATFORM) "" | $(CPP) $(CPPFLAGS) - | $(AS) $(ASFLAGS) -o $@ -
$(MID_SUBDIR)/mus_vs_2.s: %.s: %.mid
$(MID2AGB) $< $@ -C $(MIDI_COMMENTS) -E -R$(STD_REVERB) -G0 -V105
multi_boot/roms/subgame_loader/Makefile
+1 -1
View File
@@ -127,7 +127,7 @@ endif
$(DATA_ASM_BUILDDIR)/%.o: $(DATA_ASM_SUBDIR)/%.s $$(data_dep)
@echo "$(AS) <flags> -o $@ $<"
@$(PREPROC) $< | $(CPP) $(CPPFLAGS) - | $(AS) $(ASFLAGS) -o $@
@$(PREPROC) $< $(PLATFORM) "" | $(CPP) $(CPPFLAGS) - | $(AS) $(ASFLAGS) -o $@
../../programs/subgame_loader/subgame_loader.bin:
$(MAKE) -C ../../programs/subgame_loader
multi_boot/roms/subgame_loader/config.mk
+1
View File
@@ -1,6 +1,7 @@
### Build Configuration ###
# Default variables
PLATFORM ?= gba
GAME_REVISION ?= 0
GAME_REGION ?= USA
DEBUG ?= 0
multi_boot/subgame_bootstrap/Makefile
+1 -1
View File
@@ -126,7 +126,7 @@ endif
$(DATA_ASM_BUILDDIR)/%.o: $(DATA_ASM_SUBDIR)/%.s $$(data_dep)
@echo "$(AS) <flags> -o $@ $<"
@$(PREPROC) $< | $(CPP) $(CPPFLAGS) - | $(AS) $(ASFLAGS) -o $@
@$(PREPROC) $< $(PLATFORM) "" | $(CPP) $(CPPFLAGS) - | $(AS) $(ASFLAGS) -o $@
../roms/subgame_loader/subgame_loader.gba:
$(MAKE) -C ../roms/subgame_loader
multi_boot/subgame_bootstrap/config.mk
+1
View File
@@ -1,6 +1,7 @@
### Build Configuration ###
# Default variables
PLATFORM ?= gba
GAME_REVISION ?= 0
GAME_REGION ?= USA
DEBUG ?= 0