From c0fb4214ca622516a14671d92094a35365782bd0 Mon Sep 17 00:00:00 2001 From: Oliver Bell Date: Sat, 13 May 2023 12:58:29 +0100 Subject: [PATCH] get closer to europe match --- Makefile | 4 ++-- README.md | 5 ++++- config.mk | 2 +- graphics/obj_tiles/4bpp/anim_1117_europe/f029.png | Bin 0 -> 880 bytes graphics/obj_tiles/4bpp/anim_1117_europe/f030.png | Bin 0 -> 518 bytes graphics/obj_tiles/4bpp/anim_1117_europe/f031.png | Bin 0 -> 618 bytes graphics/obj_tiles/4bpp/anim_1117_europe/f032.png | Bin 0 -> 837 bytes graphics/obj_tiles_4bpp.inc | 12 ++++++++++-- checksum.sha1 => sa2.sha1 | 0 sa2_europe.sha1 | 1 + 10 files changed, 18 insertions(+), 6 deletions(-) create mode 100644 graphics/obj_tiles/4bpp/anim_1117_europe/f029.png create mode 100644 graphics/obj_tiles/4bpp/anim_1117_europe/f030.png create mode 100644 graphics/obj_tiles/4bpp/anim_1117_europe/f031.png create mode 100644 graphics/obj_tiles/4bpp/anim_1117_europe/f032.png rename checksum.sha1 => sa2.sha1 (100%) create mode 100644 sa2_europe.sha1 diff --git a/Makefile b/Makefile index ecfdc94dc..9c89293bf 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/README.md b/README.md index 35cab547a..2570e9ebe 100644 --- a/README.md +++ b/README.md @@ -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` + ### Code formatting All C code in this repo is formatted with `clang-format-13`. If using the Dev Container this is installed automatically. diff --git a/config.mk b/config.mk index f200d23f4..33aec288a 100644 --- a/config.mk +++ b/config.mk @@ -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 diff --git a/graphics/obj_tiles/4bpp/anim_1117_europe/f029.png b/graphics/obj_tiles/4bpp/anim_1117_europe/f029.png new file mode 100644 index 0000000000000000000000000000000000000000..a459619e13d176070222c52d0c7fb21e9cf48be8 GIT binary patch literal 880 zcmV-$1CRWPP)^*00001 zbW%=J06^y0W&i*J?ny*JR5*=wlif>GaTv$7zo6%wot;e~I8JYTx!5uV)4^sM=2F&7 zNpjI_488R?bCU_I*s2h#uVzP@syU`?^6T!I>UoXNr$@C)6rfEC<&Y8n( z?z#BgeE2@U=li^*!1a{m0Vt9}T*2cca`K~DM88d#Xq`FUR#sme>tB|R@SLqI^g!ld!Y1^9E8BBLEG!a!w5W=Kg_t0!+992va$}B z%3$p(Z^fx|c^u|W0$}&unn^=@fb6+R339+|1e?+$^pIi6O3CmZ8SJtdQFSRGn;vUK z--yEqio)WsbZ$E9L?7KBH|vlU2N%3+uE9@uy_c95vlg|l0964E)SqqH2UUG$6+?GF@K(AR6Y$Lus&%wS%3BR43pb;*>aG2c z{K~h20|DxLBLI1mh0dLHkH*bBVY62*VDZX=9MXP)%t#(dzAJ}AWH=5n zZSH;6@hx>+N$jEuGI=lJ)3SLoIG|q0@tQLz0b=tFZvcE~;^djinHg%KM=Q8!Q#%hS z7^z1U3~Eu@ZMs|SZLl*hnjM~{SmT*G7R|+k+Rd04dZ6B~9D<_2hZw9vUNEKm-dJP$ z=g0PzS~h1Eq!CLD=6DtW(w3{aAbBM9m-K#ppyOT9*fNRBIAmxH4smKNXB4*|9zVj0?XXG->JlXj^3p@Z8(@61hwY}TK@0%T@f%t}A)1m&`nWt>tOeH_B z+p{2M|6OlUV|LrFlqEtn3Xp_B6uNX8skpkC_zI4VcWs5JD^m$~1x--2#r>Q{Ny0000^*00001 zbW%=J06^y0W&i*Igh@m}R49>SU?3d`Vh9Kd3ZMuSg&G0HkOZ#w?kG`KL{c_2_y14# z_Ebfwcm{}@so1x3Ea7lQag^Hb7iGrYYjD74#WF<3=?qM$Ov*_VQX^LrkH z1^g!gZ7E4N6pa7>4J;t@87KhKt-j|vSU}<{P+&92G?O%t(*;F-00q7XB7n$k;S`4N zNCLwBMtd1WZ9|-j(2dK2llVvK1GJ9FM*1MZum}w+RJd|tf8QZ(HyVM z5dStZ6lXgMS}k86@dauxgOIABpw<8XZNEc6F(~;391$X&d#3Eavjk-CH*jPz3Yi8) zo%;#$-Y<9}5Dx1w1d8lM#5$u8$g%k-NrO>P&=NiU2oX+m0NEmbPN-2vIRF3v07*qo IM6N<$f{?S?XaE2J literal 0 HcmV?d00001 diff --git a/graphics/obj_tiles/4bpp/anim_1117_europe/f031.png b/graphics/obj_tiles/4bpp/anim_1117_europe/f031.png new file mode 100644 index 0000000000000000000000000000000000000000..e4cd9b3ccfdca314a0be8fb0d7aafcb30fdd7c74 GIT binary patch literal 618 zcmV-w0+s!VP)^*00001 zbW%=J06^y0W&i*I=t)FDR49>SU_b`~=mLU*f~W#1hCm@?Wp_Fh1qG3no&6hV7Gflb zQ06+n(fZDcGG|4YGC|wLGXLKHI|bCK2v#O2`9^4he|wU_NNA7Yd`F<}`o#LO%02HHb_Lc4<|hIL{1f9F zl}yqZ{%`b8vY!YPkXdNAQBY8bp<=V_LYYItih>f4CBJ~2B4{M}NaBmc@)WUeV&A|5 zf@0r9zl;C>qx?en7eqkhyU=ars&j$6oz4n6g9HRm3$8a5G7GGCtaqH<4icDeSP!+g zu>L8u?&gzUZ3p?br1T7eUo~k^~jdN zP{Zx2)D@}6x=UV)1ML-IU|>`V5j`yaUGnl-m7k*DAu%ZEBz#irTYu0U#WS!dWpqn3W2v5DfpkW&Vun4|D{^yK4?k;KRV03n;OG#{f>kN^Mx07*qoM6N<$ Ef)lYGpa1{> literal 0 HcmV?d00001 diff --git a/graphics/obj_tiles/4bpp/anim_1117_europe/f032.png b/graphics/obj_tiles/4bpp/anim_1117_europe/f032.png new file mode 100644 index 0000000000000000000000000000000000000000..470aa7e5a378352ed04210c9a480a8447b782988 GIT binary patch literal 837 zcmV-L1G@Z)P)^*00001 zbW%=J06^y0W&i*J!%0LzR5*=wlh11tQ4q)1`VTm}>E?&_uqFo)d)SyF9%`r|J$PA` z#>P{_LP8V|VJVFP!4Q!~A{gqyDiK4_gF-J=FO{Z6bJ3Kv`0F4^E0}^9k_OV4rmf97 zZq1_Qo=MB7nx+E(ZuoV6?|W04E>%NB%z@K)8n=2A=@v8jb9qr?BKS-;pyYL4W%^aSA%Di zr&-2rrsvUVP$UAz8A+BEnLv9W6*VVciv+l)RI@0*Jd-C7fcHsvm03XoI5!KeMO(f$ zAy}sd0x$a#&6M|-Pi(^eHvne+cK~gTojBiuLZ}IKM8MWa%4{h;sb&SI-XcUt>=wRg zaHE%*Oj${3Jt#Mzf_m?_84JYJ5)dx~-q=swUV73&B2h{smslV$jz(SR&Uj-4px z;Y0KKK~vxNqPC{K+V`$b1e%@G9MHd2IQ9{!X}1|Y8Y&qR@v@knc5si?ZVOg0+uWSr zw!>DV{3?FCT2?mXphUvCwt$Lc%8ge^)3zW-5t^Kl1hd(j=#qb$3BF)oVXE0ns zkpH&maYt_oy*%*PI68}eSVZgWKka=8YeBDI%|;f7NOVKKZ8qRavfRiPEoAPrwf4E{ z!J4fVdedlz+3qlu#?fmG7V_Cdu>(XoT)KmU(Mj2o2a-R!L2|mMJH+(|hw2oxgjl1D P00000NkvXXu0mjfkM4xa literal 0 HcmV?d00001 diff --git a/graphics/obj_tiles_4bpp.inc b/graphics/obj_tiles_4bpp.inc index a57f68177..b9389abf2 100644 --- a/graphics/obj_tiles_4bpp.inc +++ b/graphics/obj_tiles_4bpp.inc @@ -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" diff --git a/checksum.sha1 b/sa2.sha1 similarity index 100% rename from checksum.sha1 rename to sa2.sha1 diff --git a/sa2_europe.sha1 b/sa2_europe.sha1 new file mode 100644 index 000000000..9d3157663 --- /dev/null +++ b/sa2_europe.sha1 @@ -0,0 +1 @@ +725ac63883901d03c954d0ecadd0b37b00961cac sa2_europe.gba