add log severity to settings screen, optimize audio isr

evanbowman · Aug 20, 2020 · c9b7fd8 · c9b7fd8
1 parent 6f04ad9
commit c9b7fd8
Show file tree

Hide file tree

Showing 70 changed files with 356 additions and 223 deletions.
diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt
@@ -145,6 +145,7 @@ if(GAMEBOY_ADVANCE)
     ${SOURCE_DIR}/data/sound_heart.s
     ${SOURCE_DIR}/data/sound_creak.s
     ${SOURCE_DIR}/data/sound_dropitem.s
+    ${SOURCE_DIR}/data/sound_reload.s
     ${SOURCE_DIR}/data/sound_scroll.s
     ${SOURCE_DIR}/data/sound_laser1.s
     ${SOURCE_DIR}/data/sound_select.s

diff --git a/source/bulkAllocator.hpp b/source/bulkAllocator.hpp
@@ -40,7 +40,9 @@ DynamicMemory<T> allocate_dynamic(Platform& pfrm, Args&&... args)
 
     auto deleter = [](T* val) {
         if (val) {
-            val->~T();
+            if constexpr (not std::is_trivial<T>()) {
+                val->~T();
+            }
             // No need to actually deallocate anything, we
             // just need to make sure that we're calling the
             // destructor.

diff --git a/source/data/blaster_info_flattened.s b/source/data/blaster_info_flattened.s
@@ -3,7 +3,7 @@
 
 @=======================================================================
 @
-@	blaster_info_flattened, 3816x8@4, 
+@	blaster_info_flattened, 3816x8@4,
 @	Transparent color : FF,00,FF
 @	+ palette 256 entries, not compressed
 @	+ 477 tiles not compressed
@@ -16,7 +16,7 @@
 @=======================================================================
 
 	.section .rodata
-	.align	2
+	.align	4
 	.global blaster_info_flattenedTiles		@ 15264 bytes
 blaster_info_flattenedTiles:
 	.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
@@ -558,7 +558,7 @@ blaster_info_flattenedTiles:
 	.size	blaster_info_flattenedTiles, .-blaster_info_flattenedTiles
 
 	.section .rodata
-	.align	2
+	.align	4
 	.global blaster_info_flattenedPal		@ 512 bytes
 blaster_info_flattenedPal:
 	.hword 0x7C1F,0x7719,0x255E,0x4567,0x20A2,0x571A,0x0000,0x0000

diff --git a/source/data/charset_en_spn_fr.s b/source/data/charset_en_spn_fr.s
@@ -3,7 +3,7 @@
 
 @=======================================================================
 @
-@	charset_en_spn_fr, 824x8@4, 
+@	charset_en_spn_fr, 824x8@4,
 @	Transparent color : FF,00,FF
 @	+ palette 256 entries, not compressed
 @	+ 103 tiles not compressed
@@ -16,7 +16,7 @@
 @=======================================================================
 
 	.section .rodata
-	.align	2
+	.align	4
 	.global charset_en_spn_frTiles		@ 3296 bytes
 charset_en_spn_frTiles:
 	.word 0x00000002,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
@@ -137,7 +137,7 @@ charset_en_spn_frTiles:
 	.size	charset_en_spn_frTiles, .-charset_en_spn_frTiles
 
 	.section .rodata
-	.align	2
+	.align	4
 	.global charset_en_spn_frPal		@ 512 bytes
 charset_en_spn_frPal:
 	.hword 0x7C1F,0x7719,0x0800,0x0000,0x0000,0x0000,0x0000,0x0000

diff --git a/source/data/clair_de_lune.s b/source/data/clair_de_lune.s
@@ -1,5 +1,5 @@
 	.section .rodata
-	.align	2
+	.align	4
 	.global clair_de_lune		@ 1040792 bytes
 clair_de_lune:
 	.byte 0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0x00,0x00,0xFF,0x00,0xFF,0xFF,0x00,0xFF,0x00
@@ -73184,4 +73184,3 @@ clair_de_lune:
 	.byte 0x03,0x03,0x03,0x04,0x04,0x04,0x04,0x04,0x03,0x03,0x03,0x03,0x02,0x02,0x01,0x01
 	.byte 0x01,0x00,0x00,0xFF,0xFF,0xFF
 	.size	clair_de_lune, .-clair_de_lune
-
diff --git a/source/data/launch_flattened.s b/source/data/launch_flattened.s
@@ -3,7 +3,7 @@
 
 @=======================================================================
 @
-@	launch_flattened, 3368x8@4, 
+@	launch_flattened, 3368x8@4,
 @	Transparent color : FF,00,FF
 @	+ palette 256 entries, not compressed
 @	+ 421 tiles not compressed
@@ -16,7 +16,7 @@
 @=======================================================================
 
 	.section .rodata
-	.align	2
+	.align	4
 	.global launch_flattenedTiles		@ 13472 bytes
 launch_flattenedTiles:
 	.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
@@ -495,7 +495,7 @@ launch_flattenedTiles:
 	.size	launch_flattenedTiles, .-launch_flattenedTiles
 
 	.section .rodata
-	.align	2
+	.align	4
 	.global launch_flattenedPal		@ 512 bytes
 launch_flattenedPal:
 	.hword 0x7C1F,0x1D05,0x664C,0x5A23,0x6A72,0x5E45,0x6AB4,0x6AB2

diff --git a/source/data/old_poster_flattened.s b/source/data/old_poster_flattened.s
@@ -3,7 +3,7 @@
 
 @=======================================================================
 @
-@	old_poster_flattened, 3816x8@4, 
+@	old_poster_flattened, 3816x8@4,
 @	Transparent color : FF,00,FF
 @	+ palette 256 entries, not compressed
 @	+ 477 tiles not compressed
@@ -16,7 +16,7 @@
 @=======================================================================
 
 	.section .rodata
-	.align	2
+	.align	4
 	.global old_poster_flattenedTiles		@ 15264 bytes
 old_poster_flattenedTiles:
 	.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
@@ -558,7 +558,7 @@ old_poster_flattenedTiles:
 	.size	old_poster_flattenedTiles, .-old_poster_flattenedTiles
 
 	.section .rodata
-	.align	2
+	.align	4
 	.global old_poster_flattenedPal		@ 512 bytes
 old_poster_flattenedPal:
 	.hword 0x7C1F,0x0D7F,0x4AFA,0x0800,0x4146,0x0000,0x0000,0x0000

diff --git a/source/data/overlay.s b/source/data/overlay.s
@@ -3,7 +3,7 @@
 
 @=======================================================================
 @
-@	overlay, 4032x8@4, 
+@	overlay, 4032x8@4,
 @	Transparent color : FF,00,FF
 @	+ palette 256 entries, not compressed
 @	+ 504 tiles not compressed
@@ -16,7 +16,7 @@
 @=======================================================================
 
 	.section .rodata
-	.align	2
+	.align	4
 	.global overlayTiles		@ 16128 unsigned chars
 	.hidden overlayTiles
 overlayTiles:
@@ -588,7 +588,7 @@ overlayTiles:
 	.word 0x00000EEE,0x000000EE,0x0000000E,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
 
 	.section .rodata
-	.align	2
+	.align	4
 	.global overlayPal		@ 512 unsigned chars
 	.hidden overlayPal
 overlayPal:

diff --git a/source/data/overlay_cutscene.s b/source/data/overlay_cutscene.s
@@ -3,7 +3,7 @@
 
 @=======================================================================
 @
-@	overlay_cutscene, 904x8@4, 
+@	overlay_cutscene, 904x8@4,
 @	Transparent color : FF,00,FF
 @	+ palette 256 entries, not compressed
 @	+ 113 tiles not compressed
@@ -16,7 +16,7 @@
 @=======================================================================
 
 	.section .rodata
-	.align	2
+	.align	4
 	.global overlay_cutsceneTiles		@ 3616 bytes
 overlay_cutsceneTiles:
 	.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
@@ -149,7 +149,7 @@ overlay_cutsceneTiles:
 	.size	overlay_cutsceneTiles, .-overlay_cutsceneTiles
 
 	.section .rodata
-	.align	2
+	.align	4
 	.global overlay_cutscenePal		@ 512 bytes
 overlay_cutscenePal:
 	.hword 0x7C1F,0x2C7D,0x0800,0x55CE,0x72D8,0x7FFF,0x0000,0x0000

diff --git a/source/data/overlay_journal.s b/source/data/overlay_journal.s
@@ -3,7 +3,7 @@
 
 @=======================================================================
 @
-@	overlay_journal, 664x8@4, 
+@	overlay_journal, 664x8@4,
 @	Transparent color : FF,00,FF
 @	+ palette 256 entries, not compressed
 @	+ 83 tiles not compressed
@@ -16,7 +16,7 @@
 @=======================================================================
 
 	.section .rodata
-	.align	2
+	.align	4
 	.global overlay_journalTiles		@ 2656 bytes
 overlay_journalTiles:
 	.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
@@ -115,7 +115,7 @@ overlay_journalTiles:
 	.size	overlay_journalTiles, .-overlay_journalTiles
 
 	.section .rodata
-	.align	2
+	.align	4
 	.global overlay_journalPal		@ 512 bytes
 overlay_journalPal:
 	.hword 0x7C1F,0x2CC2,0x4B1B,0x0000,0x0000,0x0000,0x0000,0x0000

diff --git a/source/data/overlay_network_flattened.s b/source/data/overlay_network_flattened.s
@@ -3,7 +3,7 @@
 
 @=======================================================================
 @
-@	overlay_network_flattened, 3816x8@4, 
+@	overlay_network_flattened, 3816x8@4,
 @	Transparent color : FF,00,FF
 @	+ palette 256 entries, not compressed
 @	+ 477 tiles not compressed
@@ -16,7 +16,7 @@
 @=======================================================================
 
 	.section .rodata
-	.align	2
+	.align	4
 	.global overlay_network_flattenedTiles		@ 15264 bytes
 overlay_network_flattenedTiles:
 	.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
@@ -558,7 +558,7 @@ overlay_network_flattenedTiles:
 	.size	overlay_network_flattenedTiles, .-overlay_network_flattenedTiles
 
 	.section .rodata
-	.align	2
+	.align	4
 	.global overlay_network_flattenedPal		@ 512 bytes
 overlay_network_flattenedPal:
 	.hword 0x7C1F,0x5AD5,0x3D64,0x4164,0x77BE,0x0000,0x0000,0x0000

diff --git a/source/data/scottbuckley_computations.s b/source/data/scottbuckley_computations.s
@@ -1,5 +1,5 @@
 	.section .rodata
-	.align	2
+	.align	4
 	.global scottbuckley_computations		@ 1468576 bytes
 scottbuckley_computations:
 	.byte 0xFE,0xFE,0xFF,0xFE,0xFC,0xF9,0xF6,0xF3,0xF0,0xF0,0xF0,0xF0,0xEE,0xE9,0xE3,0xDE

diff --git a/source/data/scottbuckley_hiraeth.s b/source/data/scottbuckley_hiraeth.s
@@ -1,5 +1,5 @@
 	.section .rodata
-	.align	2
+	.align	4
 	.global scottbuckley_hiraeth		@ 3526280 bytes
 scottbuckley_hiraeth:
 	.byte 0xFD,0xFC,0xFC,0xFC,0xFC,0xFC,0xFC,0xFC,0xFD,0xFD,0xFD,0xFD,0xFE,0xFE,0xFE,0xFE
@@ -247945,4 +247945,3 @@ scottbuckley_hiraeth:
 
 	.byte 0xFF,0xFE,0xFE,0xFE,0xFE,0xFD
 	.size	scottbuckley_hiraeth, .-scottbuckley_hiraeth
-
diff --git a/source/data/scottbuckley_omega.s b/source/data/scottbuckley_omega.s
@@ -1,5 +1,5 @@
 	.section .rodata
-	.align	2
+	.align	4
 	.global scottbuckley_omega		@ 3924640 bytes
 scottbuckley_omega:
 	.byte 0x00,0x00,0x00,0xFF,0x00,0x00,0xFF,0x00,0xFF,0x00,0x00,0xFF,0x00,0xFF,0x00,0xFF

diff --git a/source/data/seed_packet_flattened.s b/source/data/seed_packet_flattened.s
@@ -3,7 +3,7 @@
 
 @=======================================================================
 @
-@	seed_packet_flattened, 3816x8@4, 
+@	seed_packet_flattened, 3816x8@4,
 @	Transparent color : FF,00,FF
 @	+ palette 256 entries, not compressed
 @	+ 477 tiles not compressed
@@ -16,7 +16,7 @@
 @=======================================================================
 
 	.section .rodata
-	.align	2
+	.align	4
 	.global seed_packet_flattenedTiles		@ 15264 bytes
 seed_packet_flattenedTiles:
 	.word 0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000
@@ -558,7 +558,7 @@ seed_packet_flattenedTiles:
 	.size	seed_packet_flattenedTiles, .-seed_packet_flattenedTiles
 
 	.section .rodata
-	.align	2
+	.align	4
 	.global seed_packet_flattenedPal		@ 512 bytes
 seed_packet_flattenedPal:
 	.hword 0x7C1F,0x5F3B,0x2DB4,0x737B,0x00DF,0x3269,0x0D9F,0x1A5A

diff --git a/source/data/september.s b/source/data/september.s
@@ -1,5 +1,5 @@
 	.section .rodata
-	.align	2
+	.align	4
 	.global september		@ 3201988 bytes
 september:
 	.byte 0x00,0xFF,0x00,0xFF,0x00,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0x00,0xFF

diff --git a/source/data/sound_bell.s b/source/data/sound_bell.s
@@ -1,5 +1,5 @@
 	.section .rodata
-	.align	2
+	.align	4
 	.global sound_bell		@ 96688 bytes
 sound_bell:
 	.byte 0x02,0x03,0x03,0x02,0x00,0x00,0xFE,0xFD,0xFC,0xFC,0xFB,0xFB,0xFC,0xFC,0xFD,0xFD
@@ -6801,4 +6801,3 @@ sound_bell:
 	.byte 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x00,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00
 	.byte 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF
 	.size	sound_bell, .-sound_bell
-
diff --git a/source/data/sound_blaster.s b/source/data/sound_blaster.s
@@ -1,5 +1,5 @@
 	.section .rodata
-	.align	2
+	.align	4
 	.global sound_blaster		@ 3504 bytes
 sound_blaster:
 	.byte 0xFE,0xFA,0xFC,0xFB,0xFB,0xFB,0xFB,0xFB,0xFB,0xFB,0xFB,0xFB,0xFA,0xFB,0xFA,0xFA
@@ -249,4 +249,3 @@ sound_blaster:
 	.byte 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF
 	.byte 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF
 	.size	sound_blaster, .-sound_blaster
-
diff --git a/source/data/sound_click.s b/source/data/sound_click.s
@@ -1,5 +1,5 @@
 	.section .rodata
-	.align	2
+	.align	4
 	.global sound_click		@ 3032 bytes
 sound_click:
 	.byte 0x03,0x06,0x05,0x08,0x05,0x05,0x01,0x04,0x09,0x06,0x0B,0x0F,0x0A,0x00,0xFB,0xF6
@@ -216,4 +216,3 @@ sound_click:
 	.byte 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF
 	.byte 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF
 	.size	sound_click, .-sound_click
-
diff --git a/source/data/sound_coin.s b/source/data/sound_coin.s
@@ -1,5 +1,5 @@
 	.section .rodata
-	.align	2
+	.align	4
 	.global sound_coin		@ 11848 bytes
 sound_coin:
 	.byte 0x00,0x00,0xFF,0x00,0xFF,0xFF,0x00,0xFF,0x00,0xFF,0xFF,0x00,0xFF,0x00,0xFF,0x00
@@ -836,4 +836,3 @@ sound_coin:
 	.byte 0x00,0xFF,0x00,0x00,0xFF,0x00,0x00,0xFF,0x00,0xFF,0x00,0xFF,0x00,0xFF,0x00,0xFF
 	.byte 0x00,0xFF,0x00,0x00,0xFF,0x00,0xFF,0x00
 	.size	sound_coin, .-sound_coin
-
diff --git a/source/data/sound_creak.s b/source/data/sound_creak.s
@@ -1,5 +1,5 @@
 	.section .rodata
-	.align	2
+	.align	4
 	.global sound_creak		@ 11648 bytes
 sound_creak:
 	.byte 0x00,0xFF,0xFF,0x00,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0xFF,0x00,0xFF
@@ -821,4 +821,3 @@ sound_creak:
 	.byte 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x00,0xFF,0x00,0xFF,0x00,0x00,0x00,0x00,0x00,0x00
 	.byte 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF
 	.size	sound_creak, .-sound_creak
-
diff --git a/source/data/sound_dropitem.s b/source/data/sound_dropitem.s
@@ -1,5 +1,5 @@
 	.section .rodata
-	.align	2
+	.align	4
 	.global sound_dropitem		@ 13284 bytes
 sound_dropitem:
 	.byte 0x00,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF
@@ -937,4 +937,3 @@ sound_dropitem:
 	.byte 0x00,0xFF,0x00,0xFF,0xFF,0xFF,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
 	.byte 0x00,0x00,0x00
 	.size	sound_dropitem, .-sound_dropitem
-
diff --git a/source/data/sound_explosion1.s b/source/data/sound_explosion1.s
@@ -1,5 +1,5 @@
 	.section .rodata
-	.align	2
+	.align	4
 	.global sound_explosion1		@ 16484 bytes
 sound_explosion1:
 	.byte 0xFC,0xFC,0xFF,0xFF,0xFF,0xFF,0xFD,0xFD,0xFE,0xFE,0xFF,0xFF,0x00,0x01,0x02,0x01
@@ -1162,4 +1162,3 @@ sound_explosion1:
 	.byte 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF
 	.byte 0xFF,0xFF,0xFF
 	.size	sound_explosion1, .-sound_explosion1
-