mirror of
https://github.com/SAT-R/sa2.git
synced 2026-10-28 09:43:38 +00:00
get closer to europe match
This commit is contained in:
1 parent
f30b7356ce
commit
c0fb4214ca
10 files changed
+18
-6
No files matched your search
@@ -82,7 +82,7 @@ endif
|
||||
|
||||
#### Files ####
|
||||
OBJ_DIR:= build/sa2
|
||||
ROM := sa2.gba
|
||||
ROM := $(BUILD_NAME).gba
|
||||
ELF := $(ROM:.gba=.elf)
|
||||
MAP := $(ROM:.gba=.map)
|
||||
LDSCRIPT := ldscript.txt
|
||||
@@ -169,7 +169,7 @@ $(TOOLDIRS):
|
||||
@$(MAKE) -C $@
|
||||
|
||||
compare: rom
|
||||
$(SHA1) checksum.sha1
|
||||
$(SHA1) $(BUILD_NAME).sha1
|
||||
|
||||
clean: tidy clean-tools
|
||||
@$(MAKE) clean -C chao_garden
|
||||
|
||||
@@ -15,8 +15,9 @@
|
||||
|
||||
This is a work in progress matching decompilation of Sonic Advance 2
|
||||
|
||||
It so far builds the following ROM:
|
||||
It so far builds the following ROMs:
|
||||
* [**sa2.gba**](https://datomatic.no-intro.org/index.php?page=show_record&s=23&n=0890) `sha1: 7bcd6a07af7c894746fa28073fe0c0e34408022d`
|
||||
* [**sa2_europe.gba**](https://datomatic.no-intro.org/index.php?page=show_record&s=23&n=0900) `sha1: b0f64bdca097f2de8f05ac4c8caea2b80c5faeb1` (:warning: Work In Progress)
|
||||
|
||||
### Current state
|
||||
|
||||
@@ -73,6 +74,8 @@ If the rom built successfully you will see this output
|
||||
sa2.gba: OK
|
||||
```
|
||||
|
||||
**NOTE**: You can significantly speed up initial build times by passing the number of processes you wish to use for the build `make -j<number>`
|
||||
|
||||
### Code formatting
|
||||
|
||||
All C code in this repo is formatted with `clang-format-13`. If using the Dev Container this is installed automatically.
|
||||
|
||||
@@ -28,7 +28,7 @@ ifeq ($(GAME_REGION), USA)
|
||||
GAME_CODE := $(GAME_CODE)E
|
||||
else
|
||||
ifeq ($(GAME_REGION), EUROPE)
|
||||
BUILD_NAME := $(BUILD_NAME)
|
||||
BUILD_NAME := $(BUILD_NAME)_europe
|
||||
GAME_CODE := $(GAME_CODE)P
|
||||
MAKER_CODE := 8P
|
||||
TITLE := SONIC ADVANC
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 880 B |
Binary file not shown.
|
After Width: | Height: | Size: 518 B |
Binary file not shown.
|
After Width: | Height: | Size: 618 B |
Binary file not shown.
|
After Width: | Height: | Size: 837 B |
@@ -7230,7 +7230,7 @@
|
||||
.incbin "graphics/obj_tiles/4bpp/anim_1116/f007.4bpp"
|
||||
.incbin "graphics/obj_tiles/4bpp/anim_1116/f008.4bpp"
|
||||
|
||||
@; Anim 1117 is different in PAL
|
||||
|
||||
.incbin "graphics/obj_tiles/4bpp/anim_1117/f000.4bpp"
|
||||
.incbin "graphics/obj_tiles/4bpp/anim_1117/f001.4bpp"
|
||||
.incbin "graphics/obj_tiles/4bpp/anim_1117/f002.4bpp"
|
||||
@@ -7260,15 +7260,23 @@
|
||||
.incbin "graphics/obj_tiles/4bpp/anim_1117/f026.4bpp"
|
||||
.incbin "graphics/obj_tiles/4bpp/anim_1117/f027.4bpp"
|
||||
.incbin "graphics/obj_tiles/4bpp/anim_1117/f028.4bpp"
|
||||
|
||||
#ifdef EUROPE
|
||||
.incbin "graphics/obj_tiles/4bpp/anim_1117_europe/f029.4bpp"
|
||||
.incbin "graphics/obj_tiles/4bpp/anim_1117_europe/f030.4bpp"
|
||||
.incbin "graphics/obj_tiles/4bpp/anim_1117_europe/f031.4bpp"
|
||||
.incbin "graphics/obj_tiles/4bpp/anim_1117_europe/f032.4bpp"
|
||||
#else
|
||||
.incbin "graphics/obj_tiles/4bpp/anim_1117/f029.4bpp"
|
||||
.incbin "graphics/obj_tiles/4bpp/anim_1117/f030.4bpp"
|
||||
.incbin "graphics/obj_tiles/4bpp/anim_1117/f031.4bpp"
|
||||
.incbin "graphics/obj_tiles/4bpp/anim_1117/f032.4bpp"
|
||||
#endif
|
||||
|
||||
.incbin "graphics/obj_tiles/4bpp/anim_1117/f033.4bpp"
|
||||
.incbin "graphics/obj_tiles/4bpp/anim_1117/f034.4bpp"
|
||||
.incbin "graphics/obj_tiles/4bpp/anim_1117/f035.4bpp"
|
||||
.incbin "graphics/obj_tiles/4bpp/anim_1117/f036.4bpp"
|
||||
|
||||
.incbin "graphics/obj_tiles/4bpp/anim_1118/f000.4bpp"
|
||||
.incbin "graphics/obj_tiles/4bpp/anim_1118/f001.4bpp"
|
||||
.incbin "graphics/obj_tiles/4bpp/anim_1118/f002.4bpp"
|
||||
|
||||
File renamed without changes.
@@ -0,0 +1 @@
|
||||
725ac63883901d03c954d0ecadd0b37b00961cac sa2_europe.gba
|
||||
Reference in new issue
Block a user