From 79ab2c4ed7b9da260b66982529ff7e1938c9abc7 Mon Sep 17 00:00:00 2001 From: Rohmer Maxime Date: Fri, 14 Jun 2024 09:34:54 +0200 Subject: [PATCH] Now the ship can flawlessly cross the doomed 0/320 barrier --- Debug/MyProject.axf | Bin 307872 -> 307876 bytes Debug/MyProject.map | 88 +++++++++++++++---------------- Debug/MyProject_Debug.ld | 2 +- Debug/MyProject_Debug_library.ld | 2 +- Debug/MyProject_Debug_memory.ld | 2 +- Debug/src/main.o | Bin 49852 -> 49852 bytes Debug/src/main.su | 2 +- src/main.c | 5 +- 8 files changed, 52 insertions(+), 49 deletions(-) diff --git a/Debug/MyProject.axf b/Debug/MyProject.axf index a0a31b0a6172230ba956f3c9f8b4c27fbec39464..000aac7cb9b12b388792a7c6d2f6a793a5506c77 100755 GIT binary patch delta 1419 zcmXw3eN0nV6u;-)`&yWM6yfnvA+{8l0xDHEC5;)KO=EZ{EbPOmnLLciBg!Alj4kp< zosy`@Vtl^LtD}s9A7dXXh}k1y2H9|9G0SEUCpx2XA!n1}#ufRrWQt^GIBvgrk16bM$=H{?7F zm@OV9^oF`!zu_ErZa|;>(Dx#z64`pysr&H!>(!YJuc5tG?LanLXufH?H(TgMHtq!9 zDvYjFm*}KSx?8T2LT3Z<_!^0)t#O$e#`C#BGP~^=4SE8;#v=7k>_~XtN_g5DiQhA% z5l>7jP;>SC#D(L|ykI=~Nt_0Uv|M$oo|9;4!P|=7m=XwEc-mJR?vpOXqZRY>(Sz~%=w;L&;$OSw zqbuUA)%Lj>dg2Kshfw#`_=36E!e8b{QKqask4Njx$)W;qnbD#q@S0k29xOB4iZ#eF z?-y^({PekRFEL|#_BY$-%7Ok8kM1|ulx)t}HNWohR{Yw;{Z)t!hm4ZLMhT!wmQg}K zI&JhZUNc0KEXOrk$Do&MqqG$UtvjQ1Y!QrE-M>>VK^3nYr(-b8rCT%vC;7o!v?+92 zuE0$=l0`_Cg!>ZCWrQfD8k${6=P@D~0R;s8(k2omV~6r=2h!d|lp5cMl%w^?zp_8T zFg31(vS+c_G2A?5`h5&surHk3n$x;_7lDh(qAE4M4Q1CUgw#AjmNvB=6Ni~dyp8Lb zPLvDcjvtd2j=rs|-idTHSu{tD8kXQMU9st>GDFEx#YZ6^756k+a;&CWVc6_{+6LjvJn8;L1al>L{C{8ma-0jur=vo zri7g|d)QEOvFOpCmeNiSOUJ;Uw#lDjUoUl}rT9}*$uexM+%9I=Y%rgk7?`&lVVOK) zuu&|r`vm((a)@rvqXMZD&}-?RvHv7*FWL(NWHlOsJK8Cx0m0`agP$k1VUU17e z#kz3AEN=%}1yIMeFspU9WA_UJBp(ei%}XxI9N;&@Og!)$0-p`D6rSJ7vS5sRJF!eB z*E(4obgq5DcA|4cfNr_FSS{c(w?r^U=iL$31?`rQv7uxv(R_(L0NBDe_cITa@|J$~D#-k_fNDM>;A8$&z#X1(8Q}o06i~r6 Sgxu9&T1pavRNplG5&rB@s zj)q>n$@)4Bp83gI!C>@EdTNM5rM^OaCVjK^hP%aWDJJ%qE9Lk7jW0jKvBfWyR@5fl z*rYeAig$yy)qTl2W_s9D_(>@O&_)IN)TzSe>0ZifD1)YRRKwTQ;7 z;K;*luJ*W_*rh8u8p*KM64g;h)RwxZwNC6$c9Of*52#ZucGTIltH?-1D&`|Cb!4MD z;38_swNguVub4k@%$nki1V4>X=YT6kt8ypLQ(A~NV>ILnHQ;sL*F$r&5R&FPth#em zhS#KdoC%j&ZzT}ZY&1={6bYURk@MLF=bQ)5k@IQzbUC+Amv^3)PDO&N!{Oj3k#O)d z>QLlFS~zHrG?$uY%jm&dlRpxLeBaPp~Hs^Y0!f3*X>bBRur-`|ihmqixe?V<{ z8*jOtr~}*IEj7i@uK%w&99*g2Th#!$`kS^C$kcb+T%hQawvCoA9y&Zk5AFD9r)f4D z=#P=$hk9=2=B2K1!JpOm4-1;bXt(ca&)nOd38<3Mo=JCqWke6rDh9pWHB6gf(D-eb zUW|oNu|wNhDIgYZI(AV+;=QA(k} zKRmWDD&SQ{MENlPeuCPegx{Q?uYhi>xlD(pv0># z09Phy7Q`AGCh0B)0psj7dNf`xLH_&r))|@#e%>-eYcMl4LpMq(;;Dp+8H*zP057;h zwWt8Py@`Co9hznI-=WM7e;9_9xtLA1q|0iWoVZ$!t&-C-WNA)@ZplOdWHXT^F_RuL zic(nzfZw>5#&ih}ZB*I7PMe@p6u+dE?v?gKQG7|!64N@VGk!@?TpW1{S!A08-7P-m zK)UTdHiexH2iZNzEcl#21@fvey@uxy`&(Mmi~fQDS&NRq=2nVjK=8rH;MenC67+zq z6WBQPCF{l=GV(iEEW5yoTKx>-5k4mbI+#>0F3tQ*>lO-Gm)uw~>Z z+IGI_7&`_f#_eNF18C#+*KTG--amldX diff --git a/Debug/MyProject.map b/Debug/MyProject.map index b8f69ef..8ceb84c 100644 --- a/Debug/MyProject.map +++ b/Debug/MyProject.map @@ -680,7 +680,7 @@ END GROUP 0x20084000 __top_RamAHB32 = 0x20084000 0x20084000 __top_RAM2 = 0x20084000 -.text 0x00000000 0x3ab6c +.text 0x00000000 0x3ab68 FILL mask 0xff 0x00000000 __vectors_start__ = ABSOLUTE (.) *(.isr_vector) @@ -689,10 +689,10 @@ END GROUP 0x000000cc . = ALIGN (0x4) 0x000000cc __section_table_start = . 0x000000cc __data_section_table = . - 0x000000cc 0x4 LONG 0x3ab6c LOADADDR (.data) + 0x000000cc 0x4 LONG 0x3ab68 LOADADDR (.data) 0x000000d0 0x4 LONG 0x10000000 ADDR (.data) 0x000000d4 0x4 LONG 0x1c SIZEOF (.data) - 0x000000d8 0x4 LONG 0x3ab6c LOADADDR (.data_RAM2) + 0x000000d8 0x4 LONG 0x3ab68 LOADADDR (.data_RAM2) 0x000000dc 0x4 LONG 0x2007c000 ADDR (.data_RAM2) 0x000000e0 0x4 LONG 0x0 SIZEOF (.data_RAM2) 0x000000e4 __data_section_table_end = . @@ -880,57 +880,57 @@ END GROUP 0x00001320 min *fill* 0x00001342 0x2 ff .text.RefreshPlayer - 0x00001344 0x148 ./src/main.o + 0x00001344 0x144 ./src/main.o 0x00001344 RefreshPlayer - .text.main 0x0000148c 0x214 ./src/main.o - 0x0000148c main + .text.main 0x00001488 0x214 ./src/main.o + 0x00001488 main .text.__weak_main - 0x000016a0 0x4 /Applications/MCUXpressoIDE_11.9.0_2144/ide/plugins/com.nxp.mcuxpresso.tools.macosx_11.9.0.202307121226/tools/bin/../lib/gcc/arm-none-eabi/12.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libcr_c.a(__weak__main.o) - 0x000016a0 __main - 0x000016a0 __weak_main - .text.abs 0x000016a4 0x8 /Applications/MCUXpressoIDE_11.9.0_2144/ide/plugins/com.nxp.mcuxpresso.tools.macosx_11.9.0.202307121226/tools/bin/../lib/gcc/arm-none-eabi/12.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libcr_c.a(stdlib.o) - 0x000016a4 abs + 0x0000169c 0x4 /Applications/MCUXpressoIDE_11.9.0_2144/ide/plugins/com.nxp.mcuxpresso.tools.macosx_11.9.0.202307121226/tools/bin/../lib/gcc/arm-none-eabi/12.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libcr_c.a(__weak__main.o) + 0x0000169c __main + 0x0000169c __weak_main + .text.abs 0x000016a0 0x8 /Applications/MCUXpressoIDE_11.9.0_2144/ide/plugins/com.nxp.mcuxpresso.tools.macosx_11.9.0.202307121226/tools/bin/../lib/gcc/arm-none-eabi/12.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libcr_c.a(stdlib.o) + 0x000016a0 abs *(.rodata .rodata.* .constdata .constdata.*) - .rodata.SMPTE 0x000016ac 0x38410 ./src/SPI.o + .rodata.SMPTE 0x000016a8 0x38410 ./src/SPI.o .rodata.ShipSprite1 - 0x00039abc 0xc10 ./src/SPI.o + 0x00039ab8 0xc10 ./src/SPI.o .rodata.SmallFont - 0x0003a6cc 0x478 ./src/fonts.o - 0x0003a6cc SmallFont + 0x0003a6c8 0x478 ./src/fonts.o + 0x0003a6c8 SmallFont .rodata.SCREEN - 0x0003ab44 0x10 ./src/main.o - 0x0003ab44 SCREEN - .rodata 0x0003ab54 0x18 ./src/main.o - 0x0003ab6c . = ALIGN (0x4) + 0x0003ab40 0x10 ./src/main.o + 0x0003ab40 SCREEN + .rodata 0x0003ab50 0x18 ./src/main.o + 0x0003ab68 . = ALIGN (0x4) -.glue_7 0x0003ab6c 0x0 - .glue_7 0x0003ab6c 0x0 linker stubs +.glue_7 0x0003ab68 0x0 + .glue_7 0x0003ab68 0x0 linker stubs -.glue_7t 0x0003ab6c 0x0 - .glue_7t 0x0003ab6c 0x0 linker stubs +.glue_7t 0x0003ab68 0x0 + .glue_7t 0x0003ab68 0x0 linker stubs -.vfp11_veneer 0x0003ab6c 0x0 - .vfp11_veneer 0x0003ab6c 0x0 linker stubs +.vfp11_veneer 0x0003ab68 0x0 + .vfp11_veneer 0x0003ab68 0x0 linker stubs -.v4_bx 0x0003ab6c 0x0 - .v4_bx 0x0003ab6c 0x0 linker stubs +.v4_bx 0x0003ab68 0x0 + .v4_bx 0x0003ab68 0x0 linker stubs -.iplt 0x0003ab6c 0x0 - .iplt 0x0003ab6c 0x0 ./src/SPI.o +.iplt 0x0003ab68 0x0 + .iplt 0x0003ab68 0x0 ./src/SPI.o -.rel.dyn 0x0003ab6c 0x0 - .rel.iplt 0x0003ab6c 0x0 ./src/SPI.o +.rel.dyn 0x0003ab68 0x0 + .rel.iplt 0x0003ab68 0x0 ./src/SPI.o .ARM.extab *(.ARM.extab* .gnu.linkonce.armextab.*) -.ARM.exidx 0x0003ab6c 0x0 - 0x0003ab6c __exidx_start = . +.ARM.exidx 0x0003ab68 0x0 + 0x0003ab68 __exidx_start = . *(.ARM.exidx* .gnu.linkonce.armexidx.*) - 0x0003ab6c __exidx_end = . - 0x0003ab6c _etext = . + 0x0003ab68 __exidx_end = . + 0x0003ab68 _etext = . -.data_RAM2 0x2007c000 0x0 load address 0x0003ab6c +.data_RAM2 0x2007c000 0x0 load address 0x0003ab68 FILL mask 0xff [!provide] PROVIDE (__start_data_RAM2 = .) [!provide] PROVIDE (__start_data_RamAHB32 = .) @@ -951,7 +951,7 @@ END GROUP 0x10000000 . = ALIGN (0x4) 0x10000000 _end_uninit_RESERVED = . -.data 0x10000000 0x1c load address 0x0003ab6c +.data 0x10000000 0x1c load address 0x0003ab68 FILL mask 0xff 0x10000000 _data = . [!provide] PROVIDE (__start_data_RAM = .) @@ -979,7 +979,7 @@ END GROUP [!provide] PROVIDE (__end_data_RAM = .) [!provide] PROVIDE (__end_data_RamLoc32 = .) -.igot.plt 0x1000001c 0x0 load address 0x0003ab88 +.igot.plt 0x1000001c 0x0 load address 0x0003ab84 .igot.plt 0x1000001c 0x0 ./src/SPI.o .bss_RAM2 0x2007c000 0x0 @@ -1044,8 +1044,8 @@ END GROUP 0x10008000 PROVIDE (_vStackTop = DEFINED (__user_stack_top)?__user_stack_top:(__top_RamLoc32 - 0x0)) 0xefff74b2 PROVIDE (__valid_user_code_checksum = (0x0 - ((((((_vStackTop + (ResetISR + 0x1)) + (NMI_Handler + 0x1)) + (HardFault_Handler + 0x1)) + (DEFINED (MemManage_Handler)?MemManage_Handler:0x0 + 0x1)) + (DEFINED (BusFault_Handler)?BusFault_Handler:0x0 + 0x1)) + (DEFINED (UsageFault_Handler)?UsageFault_Handler:0x0 + 0x1)))) 0x00000000 _image_start = LOADADDR (.text) - 0x0003ab88 _image_end = (LOADADDR (.data) + SIZEOF (.data)) - 0x0003ab88 _image_size = (_image_end - _image_start) + 0x0003ab84 _image_end = (LOADADDR (.data) + SIZEOF (.data)) + 0x0003ab84 _image_size = (_image_end - _image_start) OUTPUT(MyProject.axf elf32-littlearm) LOAD linker stubs @@ -1118,16 +1118,16 @@ LOAD linker stubs .debug_macro 0x000015f3 0x6b ./src/main.o .debug_macro 0x0000165e 0xc4 ./src/main.o -.debug_line 0x00000000 0x1d4a +.debug_line 0x00000000 0x1d4e .debug_line 0x00000000 0x358 ./src/GPIO.o .debug_line 0x00000358 0xa66 ./src/SPI.o .debug_line 0x00000dbe 0x161 ./src/cr_startup_lpc175x_6x.o .debug_line 0x00000f1f 0xb9 ./src/crp.o .debug_line 0x00000fd8 0x3a ./src/fonts.o .debug_line 0x00001012 0x3c8 ./src/init_clk.o - .debug_line 0x000013da 0x5e7 ./src/main.o - .debug_line 0x000019c1 0x4a /Applications/MCUXpressoIDE_11.9.0_2144/ide/plugins/com.nxp.mcuxpresso.tools.macosx_11.9.0.202307121226/tools/bin/../lib/gcc/arm-none-eabi/12.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libcr_c.a(__weak__main.o) - .debug_line 0x00001a0b 0x33f /Applications/MCUXpressoIDE_11.9.0_2144/ide/plugins/com.nxp.mcuxpresso.tools.macosx_11.9.0.202307121226/tools/bin/../lib/gcc/arm-none-eabi/12.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libcr_c.a(stdlib.o) + .debug_line 0x000013da 0x5eb ./src/main.o + .debug_line 0x000019c5 0x4a /Applications/MCUXpressoIDE_11.9.0_2144/ide/plugins/com.nxp.mcuxpresso.tools.macosx_11.9.0.202307121226/tools/bin/../lib/gcc/arm-none-eabi/12.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libcr_c.a(__weak__main.o) + .debug_line 0x00001a0f 0x33f /Applications/MCUXpressoIDE_11.9.0_2144/ide/plugins/com.nxp.mcuxpresso.tools.macosx_11.9.0.202307121226/tools/bin/../lib/gcc/arm-none-eabi/12.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libcr_c.a(stdlib.o) .debug_str 0x00000000 0x63db .debug_str 0x00000000 0x5145 ./src/GPIO.o diff --git a/Debug/MyProject_Debug.ld b/Debug/MyProject_Debug.ld index bbdaf8b..2b7737f 100644 --- a/Debug/MyProject_Debug.ld +++ b/Debug/MyProject_Debug.ld @@ -5,7 +5,7 @@ * Generated linker script file for LPC1769 * Created from linkscript.ldt by FMCreateLinkLibraries * Using Freemarker v2.3.30 - * MCUXpresso IDE v11.9.0 [Build 2144] [2024-01-05] on Jun 14, 2024, 9:19:59 AM + * MCUXpresso IDE v11.9.0 [Build 2144] [2024-01-05] on Jun 14, 2024, 9:33:19 AM */ INCLUDE "MyProject_Debug_library.ld" diff --git a/Debug/MyProject_Debug_library.ld b/Debug/MyProject_Debug_library.ld index 4c48ab1..e4c42d9 100644 --- a/Debug/MyProject_Debug_library.ld +++ b/Debug/MyProject_Debug_library.ld @@ -5,7 +5,7 @@ * Generated linker script file for LPC1769 * Created from library.ldt by FMCreateLinkLibraries * Using Freemarker v2.3.30 - * MCUXpresso IDE v11.9.0 [Build 2144] [2024-01-05] on Jun 14, 2024, 9:19:59 AM + * MCUXpresso IDE v11.9.0 [Build 2144] [2024-01-05] on Jun 14, 2024, 9:33:19 AM */ GROUP ( diff --git a/Debug/MyProject_Debug_memory.ld b/Debug/MyProject_Debug_memory.ld index 1ec8a14..74ad1ce 100644 --- a/Debug/MyProject_Debug_memory.ld +++ b/Debug/MyProject_Debug_memory.ld @@ -5,7 +5,7 @@ * Generated linker script file for LPC1769 * Created from memory.ldt by FMCreateLinkMemory * Using Freemarker v2.3.30 - * MCUXpresso IDE v11.9.0 [Build 2144] [2024-01-05] on Jun 14, 2024, 9:19:59 AM + * MCUXpresso IDE v11.9.0 [Build 2144] [2024-01-05] on Jun 14, 2024, 9:33:19 AM */ MEMORY diff --git a/Debug/src/main.o b/Debug/src/main.o index 3a7f7748380715dcf9dbba714ac9d3c48e51e09e..3551edd76eaa1c1f6c0095f3c88408156d1ed57a 100644 GIT binary patch delta 753 zcmYLFUr19?96slsdp56In=$X4Ys%cjvWYIzGDqa>x`x+Uk&%>vNImF7tA`3I&@g7!ct^y{8~8AO;V`sWOqqc%5%{ASc|ZHQ_)?AJdBw8_*rF2$>OifPcPOaR$1T;!$m8rr-ar(2 z1aN12-a>Co-8mgTSVIKz$$Djs6*gqS)^{U~>e zIfU@2gGWdl?|^cw;1LL1QWB5Yfj&0qMlRVUrd&WLwp5Z#sUqGB{E6`+$Rs(X+7&1U zF~t060%6jayVqHA8dQ4dscU7zp`<4ry+F~8{;9@11(KQ&1(hJIi-wwe&xbWs>f zTJQF;V*FJzSM~7K9?H9EX&tSur4?>!cGC(k<$h5-#u*UCv3j-yS8)~5!5@W7upN^13?g&6b7U0xoyzFeR)2=@AtmH=i&omd_a71 zUyQctCyj{V(wJXf4F8q!MoGGSK`qL<&%2BC4#Sha{{LyJJJp+BH?{f$ zQo`zpier)&?3k2_Vb=U0U6vq@t#T9)-^#tscX$=cJOu({FzS&QQzqK2F=v_#A*Lx! zZo)~M6%=BfO1zkGD(#A~cvOMC#M5{q*K_fKJrn9Eymsy^gBjVX5MvLc?$VU@$UU}pe)6XW!|bi-|P zc>DQIcL*2@I`jI)L174j&QLJVUMq~6&cRnAXy&_H^CETM9eOOuHI&S~%9v&z#WQ7a z(|l^4kZF~VNf#C;YT*kWPlVw&PLX=?S7IxSW66s!6yhb)C?-h1;fC2TjNxh0efWq} d!#|{b*ftl23cN?!gx}}F+)>HcS2LK5z(3y-)3^Wt diff --git a/Debug/src/main.su b/Debug/src/main.su index c0ccdb4..5e78c77 100644 --- a/Debug/src/main.su +++ b/Debug/src/main.su @@ -9,4 +9,4 @@ ../src/main.c:103:8:CreatePlayer 80 static ../src/main.c:112:5:min 16 static ../src/main.c:120:6:RefreshPlayer 72 static -../src/main.c:150:5:main 144 dynamic +../src/main.c:153:5:main 144 dynamic diff --git a/src/main.c b/src/main.c index 947121c..8fc5875 100644 --- a/src/main.c +++ b/src/main.c @@ -142,7 +142,10 @@ void RefreshPlayer(Point vector){ Point bigPos = {0,0}; bigPos.X = min(player.Hitbox.Position.X, player.Hitbox.Position.X - vector.X); bigPos.Y = min(player.Hitbox.Position.Y, player.Hitbox.Position.Y - vector.Y); - bigPos.Y = bigPos.Y % SCREEN_SIZE.Height; + + if(bigPos.Y < 0) + bigPos.Y = SCREEN_SIZE.Height + bigPos.Y; + //bigPos.Y = bigPos.Y % SCREEN_SIZE.Height; Refresh_Player_Area((Rectangle){bigPos,bigSize},player.Hitbox); }