Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
*vs/*
backup/*
build/*
generated*
*.txt
*.bin
*.elf
Expand Down
12 changes: 9 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ endif
TOPDIR ?= $(CURDIR)
include $(DEVKITARM)/3ds_rules

# Generate data-driven source files before SOURCES is evaluated
ifneq ($(MAKECMDGOALS),clean)
$(shell python3 ./tools/gen_all_tables.py)
endif

#---------------------------------------------------------------------------------
# TARGET is the name of the output
# BUILD is the directory where object files & intermediate files will be placed
Expand Down Expand Up @@ -36,8 +41,8 @@ APP_AUTHOR := Gamestabled
APP_DESCRIPTION := A different Ocarina of Time experience
TARGET := $(notdir $(CURDIR))
BUILD := build
SOURCES := $(sort $(dir $(wildcard source/*/ source/)))
DATA := data
SOURCES := $(sort $(dir $(filter-out %.jsonc, $(filter-out %.json, $(wildcard source/*/ source/*)))))
# DATA := data # Data files aren't built into the project
INCLUDES := include $(SOURCES)
GRAPHICS := gfx
GFXBUILD := $(BUILD)
Expand Down Expand Up @@ -206,7 +211,8 @@ endif
clean:
@echo clean ...
@rm -fr $(BUILD) $(TARGET).3dsx $(OUTPUT).smdh $(TARGET).elf $(GFXBUILD) \
$(ROMFS)/basecode.ips $(ROMFS)/basecode_USA.ips $(ROMFS)/basecode_EUR.ips
$(ROMFS)/basecode.ips $(ROMFS)/basecode_USA.ips $(ROMFS)/basecode_EUR.ips \
source/generated/generated*
$(MAKE) clean -C code

#---------------------------------------------------------------------------------
Expand Down
2,173 changes: 2,173 additions & 0 deletions data/description_table.jsonc

Large diffs are not rendered by default.

322 changes: 322 additions & 0 deletions data/item_table.jsonc

Large diffs are not rendered by default.

1,029 changes: 1,029 additions & 0 deletions data/location_table.jsonc

Large diffs are not rendered by default.

721 changes: 721 additions & 0 deletions data/settings_table.jsonc

Large diffs are not rendered by default.

2,151 changes: 0 additions & 2,151 deletions source/descriptions.cpp

This file was deleted.

332 changes: 1 addition & 331 deletions source/item_list.cpp

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions source/item_list.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@
void ItemTable_Init();
Item& ItemTable(ItemKey itemKey);
void NewItem(ItemKey itemKey, Item item);

extern std::array<Item, KEY_ENUM_MAX> itemTable;
1,034 changes: 1 addition & 1,033 deletions source/item_location.cpp

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion source/item_location.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,9 @@ class ItemOverride_Compare {
}
};

void LocationTable_Init();
extern void LocationTable_Init();

extern std::array<ItemLocation, KEY_ENUM_MAX> locationTable;

ItemLocation* Location(LocationKey locKey);

Expand Down
1,201 changes: 14 additions & 1,187 deletions source/settings.cpp

Large diffs are not rendered by default.

Loading