Skip to content

Commit

Permalink
Merge branch '84-add-appliance-store-and-functionality' into 'master'
Browse files Browse the repository at this point in the history 
Resolve "Add appliance store and functionality"

Closes #30 and #84

See merge request mjc/gameboygamedev!93-e 
Original/build commit ID: 9349d6278e2be940a710ebe796e36d99b526e2cb
  • Loading branch information
@MatthewJohn
MatthewJohn committed Apr 11, 2023
2 parents 5d44737 + 84bf106 commit 59cbec2
Show file tree
Hide file tree
Showing 24 changed files with 1,056 additions and 120 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ROMUSAGE = ../../tools/romusage.exe
BGB = "../../bgb(1)/bgb.exe"
CFLAGS = -v -c -o

SOURCE := main main_game main_map building_menu_map main_map_boundaries building_menu_tiles building_menu_tiles_2 main_map_tileset window building_menu_palette main_map_palette main_map_sprite_tileset menu_config main_map_sprite_palette sprite background_time_colors joy opening_screen_map opening_screen_tiles opening_screen_palette opening_screen logic_functions window_text window_text_data window_text_tiles splash_screen_tiles splash_screen_map splash_screen_palette endgame_tiles endgame_map endgame_palette endgame bar_fight_map bar_fight_tiles bar_fight bar_fight_palette
SOURCE := main main_game main_map building_menu_map main_map_boundaries building_menu_tiles building_menu_tiles_2 main_map_tileset window building_menu_palette main_map_palette main_map_sprite_tileset menu_config main_map_sprite_palette sprite background_time_colors joy opening_screen_map opening_screen_tiles opening_screen_palette opening_screen logic_functions window_text window_text_data window_text_tiles splash_screen_tiles splash_screen_map splash_screen_palette endgame_tiles endgame_map endgame_palette endgame bar_fight_map bar_fight_tiles bar_fight bar_fight_palette cheat
C_FILES = $(addsuffix .c,$(SOURCE))
OBJ_FILES = $(addsuffix .o,$(SOURCE))
I_FILE = lcc25200.i
Expand Down
136 changes: 68 additions & 68 deletions building_menu_tiles_2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,74 +150,74 @@ const unsigned char buildingmenutiles2[] =
0xC0,0x00,0xA0,0x00,0xA0,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0xC0,0x00,0xA0,0x00,
0xE0,0x00,0xA0,0x00,0xC0,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0xCE,0x00,0xA8,0x00,
0xEC,0x00,0xA8,0x00,0xCE,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0xC0,0x00,0xA0,0x00,
0xA0,0x00,0xA0,0x00,0xC0,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0xEA,0x00,0x4A,0x00,
0x4A,0x00,0x4A,0x00,0x44,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0xC6,0x00,0xA8,0x00,
0xC8,0x00,0x88,0x00,0x86,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0xEC,0x00,0x8A,0x00,
0xCC,0x00,0x88,0x00,0xE8,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0xEC,0x00,0x8A,0x00,
0xCC,0x00,0x8A,0x00,0x8A,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0xEE,0x00,0x88,0x00,
0xCC,0x00,0x88,0x00,0xEE,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0xEE,0x00,0x28,0x00,
0x4C,0x00,0x88,0x00,0xEE,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x6E,0x00,0x8A,0x00,
0xEE,0x00,0x2A,0x00,0xCA,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0xEE,0x00,0x48,0x00,
0x4C,0x00,0x48,0x00,0x4E,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0xEE,0x00,0x44,0x00,
0x44,0x00,0x44,0x00,0xE4,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0xE0,0x00,0x80,0x00,
0xC0,0x00,0x80,0x00,0xE0,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x6E,0x00,0x84,0x00,
0xE4,0x00,0x24,0x00,0xC4,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x80,0x00,0xA0,0x00,
0xC0,0x00,0xA0,0x00,0xA0,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x38,0x00,0x28,0x00,
0xAA,0x00,0x28,0x00,0x38,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0xCE,0x00,0xA8,0x00,
0xCC,0x00,0x88,0x00,0x8E,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0xCE,0x00,0xA4,0x00,
0xA4,0x00,0xA4,0x00,0xCE,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0xF4,0x00,0xF4,0x00,
0x94,0x00,0x94,0x00,0x94,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0xEE,0x00,0xA4,0x00,
0xA4,0x00,0xA4,0x00,0xAE,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0xCE,0x00,0xAA,0x00,
0xCE,0x00,0xAA,0x00,0xCA,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0xEE,0x00,0x8A,0x00,
0xCE,0x00,0x8A,0x00,0xEA,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0xCE,0x00,0xAE,0x00,
0xAA,0x00,0xAA,0x00,0xCA,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0xE8,0x00,0x48,0x00,
0x48,0x00,0x48,0x00,0xEE,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x80,0x00,0x80,0x00,
0x80,0x00,0x80,0x00,0xE0,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0xEC,0x00,0xAA,0x00,
0xEC,0x00,0xA8,0x00,0xA8,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0xEC,0x00,0xAA,0x00,
0xEC,0x00,0xAA,0x00,0xAA,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0xEE,0x00,0x4E,0x00,
0x4A,0x00,0x4A,0x00,0x4A,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0xE0,0x00,0x40,0x00,
0x40,0x00,0x40,0x00,0x40,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0xAE,0x00,0xAA,0x00,
0xEA,0x00,0xAA,0x00,0xAE,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0xA6,0x00,0xA8,0x00,
0xAE,0x00,0xA2,0x00,0xEC,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0xEE,0x00,0xEA,0x00,
0xAE,0x00,0xAA,0x00,0xAA,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0xE6,0x00,0xA8,0x00,
0xAE,0x00,0xA2,0x00,0xAC,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0xEE,0x00,0x4A,0x00,
0x4A,0x00,0x4A,0x00,0xEE,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0xE0,0x00,0xA0,0x00,
0xA0,0x00,0xA0,0x00,0xA0,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
Expand Down
13 changes: 13 additions & 0 deletions cheat.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/*
* StickGBC by Matt Comben is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
* To view a copy of this license, visit
* http://creativecommons.org/licenses/by-nc-nd/4.0/.
*/


// This code has been removed to keep cheats a surprise.
// These were mainly implemented for CI smoke tests.
void check_cheat() {
return;
};

11 changes: 11 additions & 0 deletions cheat.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/*
* StickGBC by Matt Comben is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
* To view a copy of this license, visit
* http://creativecommons.org/licenses/by-nc-nd/4.0/.
*/


#ifndef CHEAT_DEF
#define CHEAT_DEF 1

void check_cheat();
12 changes: 12 additions & 0 deletions game_state.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,16 @@
// Items hidden from inventory menu
const UINT8 hidden_inventory_items[HIDDEN_ITEM_COUNT] = {
S_INVENTORY_ALARM_CLOCK,
S_INVENTORY_BED,
S_INVENTORY_TV,
S_INVENTORY_PC,
S_INVENTORY_DEEP_FREEZE,
S_INVENTORY_SATELLITE,
S_INVENTORY_TREADMILL,
S_INVENTORY_STICKOPEDIA,
S_INVENTORY_MINIBAR,
S_INVENTORY_APARTMENT,
S_INVENTORY_PENTHOUSE,
S_INVENTORY_MANSION,
S_INVENTORY_CASTLE,
};
18 changes: 16 additions & 2 deletions game_state.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@
#define S_B_INVENTORY 0x0DU
#define S_B_BUS_STATION 0x0E
#define S_B_BANK 0x0F
#define S_B_APPLIANCE_STORE 0x10
#define S_B_REAL_ESTATE 0x11

#define S_M_NO_SUBMENU 0x00U;
#define S_M_WITHDRAW 0x01U;
Expand All @@ -48,7 +50,7 @@
// but rely on the functionality to remove the item from the menu
// after purchase
#define S_MAX_INVENTORY_ITEM 99U
#define S_INVENTORY_ITEM_COUNT 0xAU
#define S_INVENTORY_ITEM_COUNT 0x16U

// Inventory items array index
#define S_INVENTORY_SMOKES 0x0U
Expand All @@ -61,6 +63,18 @@
#define S_INVENTORY_COCAINE 0x7U
#define S_INVENTORY_BOTTLE_OF_BEER 0x8U
#define S_INVENTORY_AMMO 0x9U
#define S_INVENTORY_BED 0xAU
#define S_INVENTORY_TV 0xBU
#define S_INVENTORY_PC 0xCU
#define S_INVENTORY_DEEP_FREEZE 0xDU
#define S_INVENTORY_SATELLITE 0xEU
#define S_INVENTORY_TREADMILL 0xFU
#define S_INVENTORY_STICKOPEDIA 0x10U
#define S_INVENTORY_MINIBAR 0x11U
#define S_INVENTORY_APARTMENT 0x12U
#define S_INVENTORY_PENTHOUSE 0x13U
#define S_INVENTORY_MANSION 0x14U
#define S_INVENTORY_CASTLE 0x15U

// Maximum intelligence/strenth
#define S_MAX_INTELLIGENCE 999U
Expand Down Expand Up @@ -174,7 +188,7 @@ typedef struct {
} ai_sprite;

// Items hidden from inventory menu
#define HIDDEN_ITEM_COUNT 1U
#define HIDDEN_ITEM_COUNT 0xDU
extern const UINT8 hidden_inventory_items[];

#endif
2 changes: 2 additions & 0 deletions gb.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@
#define GB_DEF

#include <gb/gb.h>
#include <types.h>

Loading

0 comments on commit 59cbec2

Please sign in to comment.