git.y1.nz

commit 89feb8944f41e627802aea9bc0336ce0695bb3b2
parent 85deced26a09e7d6df7b77745efb6a446a082307
Author: Toxa <untoxa@mail.ru>
Date:   Thu,  9 Feb 2023 00:37:57 +0300

GB: fix SWITCH_ROM macro

Diffstat:
M
gbdk-lib/examples/cross-platform/banks_autobank/src/banks.c
2
+-
M
gbdk-lib/examples/cross-platform/banks_autobank/src/srcfile_1.c
2
+-
M
gbdk-lib/examples/cross-platform/banks_autobank/src/srcfile_2.c
2
+-
M
gbdk-lib/examples/cross-platform/banks_autobank/src/srcfile_3.c
2
+-
M
gbdk-lib/examples/cross-platform/banks_autobank/src/srcfile_4_not-autobanked.c
2
+-
M
gbdk-lib/examples/gb/wav_sample/src/samples_bank2.c
2
+-
M
gbdk-lib/examples/gb/wav_sample/src/samples_bank3.c
2
+-
M
gbdk-lib/include/gb/gb.h
2
+-

8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/gbdk-lib/examples/cross-platform/banks_autobank/src/banks.c b/gbdk-lib/examples/cross-platform/banks_autobank/src/banks.c
@@ -53,7 +53,7 @@ void main(void)
   //
 
   // Save the currently active bank
-  _saved_bank = _current_bank;
+  _saved_bank = CURRENT_BANK;
 
   // Switch to the desired one
   SWITCH_ROM(BANK(some_const_var_4));
diff --git a/gbdk-lib/examples/cross-platform/banks_autobank/src/srcfile_1.c b/gbdk-lib/examples/cross-platform/banks_autobank/src/srcfile_1.c
@@ -13,7 +13,7 @@ const uint8_t some_const_var_1 = 1;
 BANKREF(func_1)
 void func_1() BANKED
 {
-    printf("Func1 in ROM bank %u\n", _current_bank);
+    printf("Func1 in ROM bank %u\n", CURRENT_BANK);
 }
 
 // A big constant array to take up space
diff --git a/gbdk-lib/examples/cross-platform/banks_autobank/src/srcfile_2.c b/gbdk-lib/examples/cross-platform/banks_autobank/src/srcfile_2.c
@@ -13,7 +13,7 @@ const uint8_t some_const_var_2 = 2;
 BANKREF(func_2)
 void func_2() BANKED
 {
-    printf("Func2 in ROM bank %u\n", _current_bank);
+    printf("Func2 in ROM bank %u\n", CURRENT_BANK);
 }
 
 // A big constant array to take up space
diff --git a/gbdk-lib/examples/cross-platform/banks_autobank/src/srcfile_3.c b/gbdk-lib/examples/cross-platform/banks_autobank/src/srcfile_3.c
@@ -12,7 +12,7 @@ const uint8_t some_const_var_3 = 3;
 BANKREF(func_3)
 void func_3() BANKED
 {
-    printf("Func3 in ROM bank %u\n", _current_bank);
+    printf("Func3 in ROM bank %u\n", CURRENT_BANK);
 }
 
 // A big constant array to take up space
diff --git a/gbdk-lib/examples/cross-platform/banks_autobank/src/srcfile_4_not-autobanked.c b/gbdk-lib/examples/cross-platform/banks_autobank/src/srcfile_4_not-autobanked.c
@@ -12,7 +12,7 @@ BANKREF(some_const_var_4)
 void func_4() BANKED
 {
     printf("Func4 not autobank\n"
-           " is in ROM bank %u\n", _current_bank);
+           " is in ROM bank %u\n", CURRENT_BANK);
 }
 BANKREF(func_4)
 
diff --git a/gbdk-lib/examples/gb/wav_sample/src/samples_bank2.c b/gbdk-lib/examples/gb/wav_sample/src/samples_bank2.c
@@ -6,5 +6,5 @@
 #include "sample_data_1.h"
 
 void play_sample1() __banked {
-  set_sample(_current_bank, sample1, sizeof(sample1)); 
+  set_sample(CURRENT_BANK, sample1, sizeof(sample1)); 
 }
diff --git a/gbdk-lib/examples/gb/wav_sample/src/samples_bank3.c b/gbdk-lib/examples/gb/wav_sample/src/samples_bank3.c
@@ -6,5 +6,5 @@
 #include "sample_data_2.h"
 
 void play_sample2() __banked {
-  set_sample(_current_bank, sample2, sizeof(sample2)); 
+  set_sample(CURRENT_BANK, sample2, sizeof(sample2)); 
 }
diff --git a/gbdk-lib/include/gb/gb.h b/gbdk-lib/include/gb/gb.h
@@ -533,7 +533,7 @@ __endasm; \
 
     @see SWITCH_ROM_MBC1, SWITCH_ROM_MBC5, SWITCH_ROM_MEGADUCK
 */
-#define SWITCH_ROM (_current_bank = (b), rROMB0 = (b))
+#define SWITCH_ROM(b) (_current_bank = (b), rROMB0 = (b))
 
 #define SWITCH_RAM(b) (rRAMB = (b))
 

This webpage is intended to be an accessible preview of this repository. To get a fuller picture, clone it and use the git CLI.