From b0d194f333ff686d0ba658499c1486a0d1a4275d Mon Sep 17 00:00:00 2001 From: maxluli Date: Sat, 15 Jun 2024 11:36:36 +0200 Subject: [PATCH] The game is now 'playable' --- Debug/MyProject.axf | Bin 408420 -> 409344 bytes Debug/MyProject.map | 233 ++++++++++++++++--------------- Debug/MyProject_Debug.ld | 2 +- Debug/MyProject_Debug_library.ld | 2 +- Debug/MyProject_Debug_memory.ld | 2 +- Debug/src/main.o | Bin 149100 -> 150972 bytes Debug/src/main.su | 29 ++-- src/main.c | 69 ++++++--- 8 files changed, 191 insertions(+), 146 deletions(-) diff --git a/Debug/MyProject.axf b/Debug/MyProject.axf index 65ff1747d9e3b0e1237d38f27ddb8138f8137158..a47378bf67cbc827865c28e099424b3155a32aa5 100755 GIT binary patch delta 9590 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 Rt}Ai8WM_1u@jwFT?LPug1f2i? diff --git a/Debug/MyProject.map b/Debug/MyProject.map index 613e682..069e2b8 100644 --- a/Debug/MyProject.map +++ b/Debug/MyProject.map @@ -675,7 +675,7 @@ END GROUP 0x20084000 __top_RamAHB32 = 0x20084000 0x20084000 __top_RAM2 = 0x20084000 -.text 0x00000000 0x524f0 +.text 0x00000000 0x52620 FILL mask 0xff 0x00000000 __vectors_start__ = ABSOLUTE (.) *(.isr_vector) @@ -684,16 +684,16 @@ END GROUP 0x000000cc . = ALIGN (0x4) 0x000000cc __section_table_start = . 0x000000cc __data_section_table = . - 0x000000cc 0x4 LONG 0x524f0 LOADADDR (.data) + 0x000000cc 0x4 LONG 0x52620 LOADADDR (.data) 0x000000d0 0x4 LONG 0x10000000 ADDR (.data) 0x000000d4 0x4 LONG 0x110 SIZEOF (.data) - 0x000000d8 0x4 LONG 0x524f0 LOADADDR (.data_RAM2) + 0x000000d8 0x4 LONG 0x52620 LOADADDR (.data_RAM2) 0x000000dc 0x4 LONG 0x2007c000 ADDR (.data_RAM2) 0x000000e0 0x4 LONG 0x0 SIZEOF (.data_RAM2) 0x000000e4 __data_section_table_end = . 0x000000e4 __bss_section_table = . 0x000000e4 0x4 LONG 0x10000110 ADDR (.bss) - 0x000000e8 0x4 LONG 0x90 SIZEOF (.bss) + 0x000000e8 0x4 LONG 0x94 SIZEOF (.bss) 0x000000ec 0x4 LONG 0x2007c000 ADDR (.bss_RAM2) 0x000000f0 0x4 LONG 0x0 SIZEOF (.bss_RAM2) 0x000000f4 __bss_section_table_end = . @@ -860,85 +860,92 @@ END GROUP 0x000011ec 0x30 ./src/main.o 0x000011ec EINT3_IRQHandler .text.increment_scroll - 0x0000121c 0x44 ./src/main.o + 0x0000121c 0x50 ./src/main.o 0x0000121c increment_scroll .text.SysTick_Handler - 0x00001260 0x48 ./src/main.o - 0x00001260 SysTick_Handler + 0x0000126c 0x48 ./src/main.o + 0x0000126c SysTick_Handler .text.number_of_digits - 0x000012a8 0x40 ./src/main.o - 0x000012a8 number_of_digits + 0x000012b4 0x40 ./src/main.o + 0x000012b4 number_of_digits .text.convert_to_string - 0x000012e8 0x7c ./src/main.o - 0x000012e8 convert_to_string + 0x000012f4 0x7c ./src/main.o + 0x000012f4 convert_to_string + .text.min 0x00001370 0x22 ./src/main.o + 0x00001370 min + .text.max 0x00001392 0x22 ./src/main.o + 0x00001392 max .text.CreatePlayer - 0x00001364 0x9c ./src/main.o - 0x00001364 CreatePlayer + 0x000013b4 0xac ./src/main.o + 0x000013b4 CreatePlayer .text.CreateWalls - 0x00001400 0xc0 ./src/main.o - 0x00001400 CreateWalls - .text.min 0x000014c0 0x22 ./src/main.o - 0x000014c0 min - *fill* 0x000014e2 0x2 ff + 0x00001460 0xd0 ./src/main.o + 0x00001460 CreateWalls + .text.checkCollision + 0x00001530 0x50 ./src/main.o + 0x00001530 checkCollision .text.RefreshPlayer - 0x000014e4 0x154 ./src/main.o - 0x000014e4 RefreshPlayer - .text.main 0x00001638 0x264 ./src/main.o - 0x00001638 main + 0x00001580 0x198 ./src/main.o + 0x00001580 RefreshPlayer + .text.InitGame + 0x00001718 0x64 ./src/main.o + 0x00001718 InitGame + .text.main 0x0000177c 0x258 ./src/main.o + 0x0000177c main .text.__weak_main - 0x0000189c 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) - 0x0000189c __main - 0x0000189c __weak_main - .text.rand 0x000018a0 0x48 /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) - 0x000018a0 rand - .text.srand 0x000018e8 0x40 /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) - 0x000018e8 srand - .text.abs 0x00001928 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) - 0x00001928 abs + 0x000019d4 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) + 0x000019d4 __main + 0x000019d4 __weak_main + .text.rand 0x000019d8 0x48 /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) + 0x000019d8 rand + .text.srand 0x00001a20 0x40 /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) + 0x00001a20 srand + .text.abs 0x00001a60 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) + 0x00001a60 abs *(.rodata .rodata.* .constdata .constdata.*) - .rodata.SMPTE 0x00001930 0x38410 ./src/SPI.o + .rodata.SMPTE 0x00001a68 0x38410 ./src/SPI.o .rodata.ShipSprite1 - 0x00039d40 0xc10 ./src/SPI.o + 0x00039e78 0xc10 ./src/SPI.o .rodata.SmallFont - 0x0003a950 0x478 ./src/fonts.o - 0x0003a950 SmallFont + 0x0003aa88 0x478 ./src/fonts.o + 0x0003aa88 SmallFont .rodata.AllMyFellas_wav - 0x0003adc8 0x17700 ./src/main.o - 0x0003adc8 AllMyFellas_wav + 0x0003af00 0x17700 ./src/main.o + 0x0003af00 AllMyFellas_wav .rodata.SCREEN - 0x000524c8 0x10 ./src/main.o - 0x000524c8 SCREEN - .rodata 0x000524d8 0x18 ./src/main.o - 0x000524f0 . = ALIGN (0x4) + 0x00052600 0x10 ./src/main.o + 0x00052600 SCREEN + .rodata 0x00052610 0x10 ./src/main.o + 0x00052620 . = ALIGN (0x4) -.glue_7 0x000524f0 0x0 - .glue_7 0x000524f0 0x0 linker stubs +.glue_7 0x00052620 0x0 + .glue_7 0x00052620 0x0 linker stubs -.glue_7t 0x000524f0 0x0 - .glue_7t 0x000524f0 0x0 linker stubs +.glue_7t 0x00052620 0x0 + .glue_7t 0x00052620 0x0 linker stubs -.vfp11_veneer 0x000524f0 0x0 - .vfp11_veneer 0x000524f0 0x0 linker stubs +.vfp11_veneer 0x00052620 0x0 + .vfp11_veneer 0x00052620 0x0 linker stubs -.v4_bx 0x000524f0 0x0 - .v4_bx 0x000524f0 0x0 linker stubs +.v4_bx 0x00052620 0x0 + .v4_bx 0x00052620 0x0 linker stubs -.iplt 0x000524f0 0x0 - .iplt 0x000524f0 0x0 ./src/SPI.o +.iplt 0x00052620 0x0 + .iplt 0x00052620 0x0 ./src/SPI.o -.rel.dyn 0x000524f0 0x0 - .rel.iplt 0x000524f0 0x0 ./src/SPI.o +.rel.dyn 0x00052620 0x0 + .rel.iplt 0x00052620 0x0 ./src/SPI.o .ARM.extab *(.ARM.extab* .gnu.linkonce.armextab.*) -.ARM.exidx 0x000524f0 0x0 - 0x000524f0 __exidx_start = . +.ARM.exidx 0x00052620 0x0 + 0x00052620 __exidx_start = . *(.ARM.exidx* .gnu.linkonce.armexidx.*) - 0x000524f0 __exidx_end = . - 0x000524f0 _etext = . + 0x00052620 __exidx_end = . + 0x00052620 _etext = . -.data_RAM2 0x2007c000 0x0 load address 0x000524f0 +.data_RAM2 0x2007c000 0x0 load address 0x00052620 FILL mask 0xff [!provide] PROVIDE (__start_data_RAM2 = .) [!provide] PROVIDE (__start_data_RamAHB32 = .) @@ -959,7 +966,7 @@ END GROUP 0x10000000 . = ALIGN (0x4) 0x10000000 _end_uninit_RESERVED = . -.data 0x10000000 0x110 load address 0x000524f0 +.data 0x10000000 0x110 load address 0x00052620 FILL mask 0xff 0x10000000 _data = . [!provide] PROVIDE (__start_data_RAM = .) @@ -1001,7 +1008,7 @@ END GROUP [!provide] PROVIDE (__end_data_RAM = .) [!provide] PROVIDE (__end_data_RamLoc32 = .) -.igot.plt 0x10000110 0x0 load address 0x00052600 +.igot.plt 0x10000110 0x0 load address 0x00052730 .igot.plt 0x10000110 0x0 ./src/SPI.o .bss_RAM2 0x2007c000 0x0 @@ -1015,7 +1022,7 @@ END GROUP [!provide] PROVIDE (__end_bss_RAM2 = .) [!provide] PROVIDE (__end_bss_RamAHB32 = .) -.bss 0x10000110 0x90 +.bss 0x10000110 0x94 0x10000110 _bss = . [!provide] PROVIDE (__start_bss_RAM = .) [!provide] PROVIDE (__start_bss_RamLoc32 = .) @@ -1027,24 +1034,26 @@ END GROUP 0x10000114 momentum .bss.walls 0x1000011c 0x60 ./src/main.o 0x1000011c walls - .bss.player 0x1000017c 0x14 ./src/main.o - 0x1000017c player + .bss.score 0x1000017c 0x4 ./src/main.o + 0x1000017c score + .bss.player 0x10000180 0x14 ./src/main.o + 0x10000180 player .bss.scrolling - 0x10000190 0x4 ./src/main.o - 0x10000190 scrolling + 0x10000194 0x4 ./src/main.o + 0x10000194 scrolling .bss.need_to_scroll - 0x10000194 0x1 ./src/main.o - 0x10000194 need_to_scroll - *fill* 0x10000195 0x3 + 0x10000198 0x1 ./src/main.o + 0x10000198 need_to_scroll + *fill* 0x10000199 0x3 .bss.audioValue - 0x10000198 0x4 ./src/main.o - 0x10000198 audioValue - .bss.timer_count 0x1000019c 0x4 ./src/main.o - 0x1000019c timer_count + 0x1000019c audioValue + .bss.timer_count + 0x100001a0 0x4 ./src/main.o + 0x100001a0 timer_count *(COMMON) - 0x100001a0 . = ALIGN (0x4) - 0x100001a0 _ebss = . + 0x100001a4 . = ALIGN (0x4) + 0x100001a4 _ebss = . [!provide] PROVIDE (__end_bss_RAM = .) [!provide] PROVIDE (__end_bss_RamLoc32 = .) [!provide] PROVIDE (end = .) @@ -1060,47 +1069,47 @@ END GROUP [!provide] PROVIDE (__end_noinit_RAM2 = .) [!provide] PROVIDE (__end_noinit_RamAHB32 = .) -.noinit 0x100001a0 0x0 - 0x100001a0 _noinit = . +.noinit 0x100001a4 0x0 + 0x100001a4 _noinit = . [!provide] PROVIDE (__start_noinit_RAM = .) [!provide] PROVIDE (__start_noinit_RamLoc32 = .) *(.noinit*) - 0x100001a0 . = ALIGN (0x4) - 0x100001a0 _end_noinit = . + 0x100001a4 . = ALIGN (0x4) + 0x100001a4 _end_noinit = . [!provide] PROVIDE (__end_noinit_RAM = .) [!provide] PROVIDE (__end_noinit_RamLoc32 = .) - 0x100001a0 PROVIDE (_pvHeapStart = DEFINED (__user_heap_base)?__user_heap_base:.) + 0x100001a4 PROVIDE (_pvHeapStart = DEFINED (__user_heap_base)?__user_heap_base:.) 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) - 0x00052600 _image_end = (LOADADDR (.data) + SIZEOF (.data)) - 0x00052600 _image_size = (_image_end - _image_start) + 0x00052730 _image_end = (LOADADDR (.data) + SIZEOF (.data)) + 0x00052730 _image_size = (_image_end - _image_start) OUTPUT(MyProject.axf elf32-littlearm) LOAD linker stubs -.debug_info 0x00000000 0x1fc1 +.debug_info 0x00000000 0x207f .debug_info 0x00000000 0x208 ./src/GPIO.o .debug_info 0x00000208 0xbe8 ./src/SPI.o .debug_info 0x00000df0 0x29d ./src/cr_startup_lpc175x_6x.o .debug_info 0x0000108d 0x40 ./src/crp.o .debug_info 0x000010cd 0xc9 ./src/fonts.o .debug_info 0x00001196 0xb5 ./src/init_clk.o - .debug_info 0x0000124b 0x871 ./src/main.o - .debug_info 0x00001abc 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_info 0x00001b06 0x4bb /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_info 0x0000124b 0x92f ./src/main.o + .debug_info 0x00001b7a 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_info 0x00001bc4 0x4bb /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_abbrev 0x00000000 0xbf9 +.debug_abbrev 0x00000000 0xc0c .debug_abbrev 0x00000000 0x12b ./src/GPIO.o .debug_abbrev 0x0000012b 0x2c8 ./src/SPI.o .debug_abbrev 0x000003f3 0x14d ./src/cr_startup_lpc175x_6x.o .debug_abbrev 0x00000540 0x38 ./src/crp.o .debug_abbrev 0x00000578 0x73 ./src/fonts.o .debug_abbrev 0x000005eb 0x83 ./src/init_clk.o - .debug_abbrev 0x0000066e 0x285 ./src/main.o - .debug_abbrev 0x000008f3 0x4f /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_abbrev 0x00000942 0x2b7 /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_abbrev 0x0000066e 0x298 ./src/main.o + .debug_abbrev 0x00000906 0x4f /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_abbrev 0x00000955 0x2b7 /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_aranges 0x00000000 0x358 +.debug_aranges 0x00000000 0x370 .debug_aranges 0x00000000 0x78 ./src/GPIO.o .debug_aranges @@ -1114,20 +1123,20 @@ LOAD linker stubs .debug_aranges 0x00000208 0x28 ./src/init_clk.o .debug_aranges - 0x00000230 0x80 ./src/main.o + 0x00000230 0x98 ./src/main.o .debug_aranges - 0x000002b0 0x20 /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) + 0x000002c8 0x20 /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_aranges - 0x000002d0 0x88 /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) + 0x000002e8 0x88 /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_ranges 0x00000000 0x2b8 +.debug_ranges 0x00000000 0x2d0 .debug_ranges 0x00000000 0x68 ./src/GPIO.o .debug_ranges 0x00000068 0xd0 ./src/SPI.o .debug_ranges 0x00000138 0x70 ./src/cr_startup_lpc175x_6x.o .debug_ranges 0x000001a8 0x18 ./src/init_clk.o - .debug_ranges 0x000001c0 0x70 ./src/main.o - .debug_ranges 0x00000230 0x10 /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_ranges 0x00000240 0x78 /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_ranges 0x000001c0 0x88 ./src/main.o + .debug_ranges 0x00000248 0x10 /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_ranges 0x00000258 0x78 /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_macro 0x00000000 0x1767 .debug_macro 0x00000000 0x58 ./src/GPIO.o @@ -1148,18 +1157,18 @@ LOAD linker stubs .debug_macro 0x0000167b 0xc4 ./src/main.o .debug_macro 0x0000173f 0x28 ./src/main.o -.debug_line 0x00000000 0x1e95 +.debug_line 0x00000000 0x1fe2 .debug_line 0x00000000 0x358 ./src/GPIO.o .debug_line 0x00000358 0xade ./src/SPI.o .debug_line 0x00000e36 0x161 ./src/cr_startup_lpc175x_6x.o .debug_line 0x00000f97 0xb9 ./src/crp.o .debug_line 0x00001050 0x3a ./src/fonts.o .debug_line 0x0000108a 0x3c8 ./src/init_clk.o - .debug_line 0x00001452 0x6ba ./src/main.o - .debug_line 0x00001b0c 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 0x00001b56 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 0x00001452 0x807 ./src/main.o + .debug_line 0x00001c59 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 0x00001ca3 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 0x64ff +.debug_str 0x00000000 0x651d .debug_str 0x00000000 0x5145 ./src/GPIO.o 0x51c4 (size before relaxing) .debug_str 0x00005145 0x446 ./src/SPI.o @@ -1172,11 +1181,11 @@ LOAD linker stubs 0x2e69 (size before relaxing) .debug_str 0x0000588a 0x2e1 ./src/init_clk.o 0x53e9 (size before relaxing) - .debug_str 0x00005b6b 0x785 ./src/main.o - 0x5a5d (size before relaxing) - .debug_str 0x000062f0 0x125 /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_str 0x00005b6b 0x7a3 ./src/main.o + 0x5a7b (size before relaxing) + .debug_str 0x0000630e 0x125 /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) 0x12a (size before relaxing) - .debug_str 0x00006415 0xea /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 0x00006433 0xea /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) 0x27b (size before relaxing) .comment 0x00000000 0x45 @@ -1212,14 +1221,14 @@ LOAD linker stubs .ARM.attributes 0x00000168 0x2d /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_frame 0x00000000 0xaac +.debug_frame 0x00000000 0xb28 .debug_frame 0x00000000 0x1b4 ./src/GPIO.o .debug_frame 0x000001b4 0x3cc ./src/SPI.o .debug_frame 0x00000580 0x170 ./src/cr_startup_lpc175x_6x.o .debug_frame 0x000006f0 0x64 ./src/init_clk.o - .debug_frame 0x00000754 0x1f4 ./src/main.o - .debug_frame 0x00000948 0x20 /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_frame 0x00000968 0x144 /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_frame 0x00000754 0x270 ./src/main.o + .debug_frame 0x000009c4 0x20 /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_frame 0x000009e4 0x144 /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_loc 0x00000000 0x2a5 .debug_loc 0x00000000 0x2a5 /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) @@ -1280,6 +1289,7 @@ InitAudio ./src/GPIO.o ./src/main.o InitButtons ./src/GPIO.o ./src/main.o +InitGame ./src/main.o InitTimer ./src/GPIO.o ./src/main.o Init_SPI ./src/SPI.o @@ -1465,6 +1475,7 @@ audioValue ./src/main.o auto_screen_roloff ./src/SPI.o bss_init ./src/cr_startup_lpc175x_6x.o calloc /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(alloc.o) +checkCollision ./src/main.o convert_to_string ./src/main.o data_init ./src/cr_startup_lpc175x_6x.o div /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) @@ -1496,6 +1507,7 @@ lldiv /Applications/MCUXpressoIDE_11 main ./src/main.o /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) malloc /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(alloc.o) +max ./src/main.o maxPlayerSpeed ./src/main.o maxWallSize ./src/main.o memcpy /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(memcpy.o) @@ -1518,6 +1530,7 @@ realloc /Applications/MCUXpressoIDE_11 remove /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(remove.o) /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(fclose.o) rename /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(remove.o) +score ./src/main.o scroll ./src/SPI.o ./src/main.o scroll_array ./src/main.o diff --git a/Debug/MyProject_Debug.ld b/Debug/MyProject_Debug.ld index dbbde68..b5a0b44 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 15, 2024, 11:05:06 AM + * MCUXpresso IDE v11.9.0 [Build 2144] [2024-01-05] on Jun 15, 2024, 11:32:54 AM */ INCLUDE "MyProject_Debug_library.ld" diff --git a/Debug/MyProject_Debug_library.ld b/Debug/MyProject_Debug_library.ld index 12a1bbb..e31b0bf 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 15, 2024, 11:05:06 AM + * MCUXpresso IDE v11.9.0 [Build 2144] [2024-01-05] on Jun 15, 2024, 11:32:54 AM */ GROUP ( diff --git a/Debug/MyProject_Debug_memory.ld b/Debug/MyProject_Debug_memory.ld index 11f62b5..96b5367 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 15, 2024, 11:05:06 AM + * MCUXpresso IDE v11.9.0 [Build 2144] [2024-01-05] on Jun 15, 2024, 11:32:54 AM */ MEMORY diff --git a/Debug/src/main.o b/Debug/src/main.o index 5964401c51e8b7b916df7064b83082e5a7759c22..118f3539881b85d16cc325e6c9b985ad7458fa09 100644 GIT binary patch delta 24835 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 P&DXLFHPuQlG(!Fl0&|W! delta 22757 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 diff --git a/Debug/src/main.su b/Debug/src/main.su index 6afeb79..2901ad2 100644 --- a/Debug/src/main.su +++ b/Debug/src/main.su @@ -1,13 +1,16 @@ -../src/main.c:34:6:init 8 static -../src/main.c:45:6:TIMER0_IRQHandler 8 static -../src/main.c:54:6:EINT3_IRQHandler 24 static -../src/main.c:68:6:increment_scroll 16 static -../src/main.c:75:6:SysTick_Handler 8 static -../src/main.c:85:5:number_of_digits 24 static -../src/main.c:95:6:convert_to_string 40 static -../src/main.c:106:6:scroll_array 32 static -../src/main.c:115:8:CreatePlayer 80 static -../src/main.c:123:6:CreateWalls 80 static -../src/main.c:133:5:min 16 static -../src/main.c:141:6:RefreshPlayer 72 static -../src/main.c:179:5:main 136 dynamic +../src/main.c:35:6:init 8 static +../src/main.c:46:6:TIMER0_IRQHandler 8 static +../src/main.c:55:6:EINT3_IRQHandler 24 static +../src/main.c:69:6:increment_scroll 16 static +../src/main.c:78:6:SysTick_Handler 8 static +../src/main.c:88:5:number_of_digits 24 static +../src/main.c:98:6:convert_to_string 40 static +../src/main.c:109:6:scroll_array 32 static +../src/main.c:118:5:min 16 static +../src/main.c:125:5:max 16 static +../src/main.c:133:8:CreatePlayer 88 static +../src/main.c:142:6:CreateWalls 88 static +../src/main.c:151:5:checkCollision 24 static +../src/main.c:158:6:RefreshPlayer 80 static +../src/main.c:202:6:InitGame 40 static +../src/main.c:212:5:main 112 dynamic diff --git a/src/main.c b/src/main.c index 585b241..ac59297 100644 --- a/src/main.c +++ b/src/main.c @@ -28,6 +28,7 @@ Size maxWallSize = {50,50}; Obstacle walls[6]; int seed = 1234567; int maxPlayerSpeed = 7; +int score = 0; Player player; @@ -71,6 +72,8 @@ void increment_scroll(int value){ scrolling = 319; if(scrolling >= 320) scrolling = 1; + + score += 1; } void SysTick_Handler(){ timer_count += 1; @@ -112,12 +115,28 @@ void scroll_array(int **array,int **newArray,int width,int height){ } } +int min(int x,int y){ + if(x > y){ + return y; + }else{ + return x; + } +} +int max(int x, int y){ + if(x > y){ + return x; + }else{ + return y; + } +} + Player CreatePlayer(){ int HP = 100; Size playerSize = {32,32}; Point position = {SCREEN_SIZE.Width / 2 - playerSize.Width /2,SCREEN_SIZE.Height / 2 - playerSize.Height/2}; Rectangle playerHitbox = {position,playerSize}; Player player = {playerHitbox,HP}; + momentum = (Point){0,0}; return player; } void CreateWalls(){ @@ -126,18 +145,16 @@ void CreateWalls(){ int y = rand() % SCREEN_SIZE.Height; int width = rand() % maxWallSize.Width; int height = rand() % maxWallSize.Height; - walls[i] = (Obstacle){(Rectangle){(Point){x,y},(Size){width,height}}}; + walls[i] = (Obstacle){(Rectangle){(Point){x,y},(Size){max(width,height),max(width,height)}}}; } } - -int min(int x,int y){ - if(x > y){ - return y; - }else{ - return x; - } +int checkCollision(Rectangle A, Rectangle B) { + if (A.Position.X + A.Size.Width < B.Position.X || B.Position.X + B.Size.Width < A.Position.X) + return 0; + if (A.Position.Y + A.Size.Height < B.Position.Y || B.Position.Y + B.Size.Height < A.Position.Y) + return 0; + return 1; } - void RefreshPlayer(Point vector){ if(player.Hitbox.Position.Y + vector.Y < 0){ player.Hitbox.Position.Y = SCREEN_SIZE.Height + (player.Hitbox.Position.Y - (0-vector.Y)); @@ -172,30 +189,41 @@ void RefreshPlayer(Point vector){ bigPos.Y = SCREEN_SIZE.Height + bigPos.Y; //bigPos.Y = bigPos.Y % SCREEN_SIZE.Height; + + for(int i = 0; i < numberOfWalls; i++){ + if(checkCollision(player.Hitbox,walls[i].Hitbox)) + InitGame(); + } + Refresh_Player_Area((Rectangle){bigPos,bigSize},player.Hitbox); } +void InitGame(){ + scrolling = 0; + score = 0; + Resize_Window(SCREEN); + Draw_stars(); + player = CreatePlayer(); + CreateWalls(); + Draw_Walls(&walls,numberOfWalls); +} + int main(void) { init(); InitButtons(); InitTimer(); InitAudio(); LedSetState8(128+32+8+2); - Point text_origin = {240 / 2 - 8/2,(320 / 6) * 5 - 4}; - - Resize_Window(SCREEN); - Draw_stars(); - - player = CreatePlayer(); - CreateWalls(); - Draw_Walls(&walls,numberOfWalls); int increment = 1; Size charSize = {7,11}; + InitGame(); + while (true) { + int JoystickState = JoystickGetState(); Point vec = {0,0}; @@ -213,14 +241,15 @@ int main(void) { } if(need_to_scroll){ - //Refresh_Area((Rectangle){text_origin,(Size){charSize.Width * 3,charSize.Height}}); scroll(scrolling); player.Hitbox.Position.Y -= 1; need_to_scroll = false; - int digits = number_of_digits(scrolling); + int digits = number_of_digits(score); char newStr[digits+1]; - convert_to_string(scrolling,digits,&newStr); + convert_to_string(score,digits,&newStr); + + Point text_origin = {SCREEN_SIZE.Width / 2 - (digits*charSize.Width)/2,SCREEN_SIZE.Height / 10 * 9 - (charSize.Height/2)}; Point new_origin = {text_origin.X,(text_origin.Y + scrolling)%320}; Rectangle areaToRefresh = {{new_origin.X,new_origin.Y+3},{charSize.Width* 4,charSize.Height+5}};