Merge branch '120-endgame-shows-incorrect-negative-karma' into 'master'

Resolve "Endgame shows incorrect negative karma" Closes #120 See merge request mjc/gameboygamedev!81-e Original/build commit ID: 28f3945a3487d379e4e575d140afed2a7fd5cd2c
MatthewJohn · Feb 20, 2022 · 23b721a · 23b721a
2 parents 133ad29 + f5d9700
commit 23b721a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/endgame.c b/endgame.c
@@ -61,7 +61,7 @@ void endgame()
     main_show_number(0xBU, 0xCU, 3, game_state.intelligence, ROM_BANK_ENDGAME);
 
     // Write karma number
-    main_show_number_signed(0x9U, 0xDU, 3, game_state.karma, ROM_BANK_ENDGAME);
+    main_show_signed_number(0x9U, 0xDU, 3, game_state.karma, ROM_BANK_ENDGAME);
 
     tile_data = MENU_TILE_DOLLAR;
     current_x = main_show_number(0xAU, 0xEU, 8, game_state.balance, ROM_BANK_ENDGAME);

diff --git a/main.c b/main.c
@@ -2110,10 +2110,10 @@ UINT8 main_show_number(UINT8 start_x, UINT8 start_y, UINT8 max_digits, unsigned
     return return_val;
 }
 
-void main_show_number_signed(UINT8 start_x, UINT8 start_y, UINT8 max_digits, INT8 value, unsigned int return_bank)
+void main_show_signed_number(UINT8 start_x, UINT8 start_y, UINT8 max_digits, INT8 value, unsigned int return_bank)
 {
     ROM_BANK_BUILDING_MENU_SWITCH;
-    show_number(start_x, start_y, max_digits, value);
+    show_signed_number(start_x, start_y, max_digits, value);
     SWITCH_ROM_MBC5(return_bank);
 }
 

diff --git a/main.h b/main.h
@@ -45,7 +45,7 @@ void main_show_window_text_xy(UINT8 itx_x, UINT8 itx_y, UINT8 *text, unsigned in
 void main_update_window(unsigned int return_bank);
 void main_show_window_character(UINT8 character_number, UINT8 itx, UINT8 ity, unsigned int return_bank);
 UINT8 main_show_number(UINT8 start_x, UINT8 start_y, UINT8 max_digits, unsigned int value, unsigned int return_bank);
-void main_show_number_signed(UINT8 start_x, UINT8 start_y, UINT8 max_digits, INT8 value, unsigned int return_bank);
+void main_show_signed_number(UINT8 start_x, UINT8 start_y, UINT8 max_digits, INT8 value, unsigned int return_bank);
 void setup_building_menu(UINT8 menu_number, unsigned int return_bank);
 void move_to_menu_item(UINT8 new_x, UINT8 new_y, unsigned int return_bank);
 void modify_karma(INT8 karma_change);