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

More SA1 alignment (#230)

Browse Source 
* SA1 alignment

* Rename SpriteBase::spriteX -> meX

* Rename FLAGS_10 -> FLAGS_EXECUTE_VBLANK_CALLBACKS

* Align task.h with SA3

* Align core.c more with SA3

* Align core.c data with SA3

* Align task.h with SA1

* Align more with SA3

* Align task.h with SA1

* Align task.h with SA3

* Align task.c with SA1|SA3

* Align core.c with SA3

* Align EngineMainLoop with SA3

* Align core.c with SA3

* Some tools alignment with SA1

* Align Makefile with SA1

* Make BG_PLTT and OBJ_PLTT u16*

* Align with SA3

* Make BG_PLTT|OBJ_PLTT accessible as an array. Fix erroneous #if.

* Address USE_SA2_TASK_SYSTEM use from commit comments
This commit is contained in:
JaceCear authored and GitHub committed 2025-12-19 16:32:46 +01:00
1 parent 981955eaae
commit 293787148b
108 files changed
+747 -446
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Makefile
+6 -6
View File
@@ -86,7 +86,7 @@ FORMAT := clang-format-13
### TOOLS ###
GFX := tools/gbagfx/gbagfx$(EXE)
EPOS := tools/entity_positions/epos$(EXE)
ENT_POS := tools/entity_positions/entity_positions$(EXE)
AIF := tools/aif2pcm/aif2pcm$(EXE)
MID2AGB := tools/mid2agb/mid2agb$(EXE)
SCANINC := tools/scaninc/scaninc$(EXE)
@@ -203,7 +203,7 @@ FORMAT_H_PATHS := $(shell find . -name "*.h" ! -path '*/build/*' ! -path '*/ex
CPPFLAGS ?= $(INCLUDE_CPP_ARGS) -D $(GAME_REGION)
CC1FLAGS ?= -Wimplicit -Wparentheses -Werror
ifneq ($(GAME_VARIANT), 0)
ifneq ($(GAME_VARIANT), DEFAULT)
CPPFLAGS += -D $(GAME_VARIANT)
endif
@@ -438,16 +438,16 @@ data/mb_chao_garden_japan.gba.lz: data/mb_chao_garden_japan.gba
$(GFX) $< $@ -search 1
%interactables.bin: %interactables.csv
$(EPOS) $< $@ -entities INTERACTABLES -header "./include/constants/interactables.h"
$(ENT_POS) $< $@ -entities INTERACTABLES -header "./include/constants/interactables.h"
%itemboxes.bin: %itemboxes.csv
$(EPOS) $< $@ -entities ITEMS -header "./include/constants/items.h"
$(ENT_POS) $< $@ -entities ITEMS -header "./include/constants/items.h"
%enemies.bin: %enemies.csv
$(EPOS) $< $@ -entities ENEMIES -header "./include/constants/enemies.h"
$(ENT_POS) $< $@ -entities ENEMIES -header "./include/constants/enemies.h"
%rings.bin: %rings.csv
$(EPOS) $< $@ -entities RINGS
$(ENT_POS) $< $@ -entities RINGS
%.gba.lz: %.gba
$(GFX) $< $@