Merge decomp/main (#142)

* Merge remote-tracking branch 'decomp/main' into decomp_update

* remove useless files

Makefile

@@ -232,6 +232,14 @@ CFLAGS += $(CPP_DEFINES)
 CPPFLAGS += $(CPP_DEFINES)
 CFLAGS_IDO += $(CPP_DEFINES)
 
+# TODO PL and DOWHILE should be disabled for non-gamecube
+GBI_DEFINES := -DF3DEX_GBI_2 -DF3DEX_GBI_PL -DGBI_DOWHILE
+ifeq ($(DEBUG),1)
+  GBI_DEFINES += -DGBI_DEBUG
+endif
+
+CFLAGS += $(GBI_DEFINES)
+
 ASFLAGS := -march=vr4300 -32 -no-pad-sections -Iinclude
 
 ifeq ($(COMPILER),gcc)
@@ -420,7 +428,7 @@ setup: venv
 	$(call print,Tools: Done!)
 	$(V)$(PYTHON) tools/decompress_baserom.py $(VERSION)
 	$(call print,Decompressing baserom: Done!)
-	$(V)$(PYTHON) tools/extract_baserom.py $(BASEROM_DIR)/baserom-decompressed.z64 -o $(EXTRACTED_DIR)/baserom --dmadata-start `cat $(BASEROM_DIR)/dmadata_start.txt` --dmadata-names $(BASEROM_DIR)/dmadata_names.txt
+	$(V)$(PYTHON) tools/extract_baserom.py $(BASEROM_DIR)/baserom-decompressed.z64 --oot-version $(VERSION) -o $(EXTRACTED_DIR)/baserom
 	$(V)$(PYTHON) tools/msgdis.py --oot-version $(VERSION) --text-out $(EXTRACTED_DIR)/text/message_data.h --staff-text-out $(EXTRACTED_DIR)/text/message_data_staff.h
 # TODO: for now, we only extract assets from the Debug ROM
 ifneq ($(VERSION),gc-eu-mq)

baseroms/gc-eu-mq-dbg/config.yml

@@ -0,0 +1,7 @@
+dmadata_start: 0x12F70
+variables:
+  gMtxClear: 0x8012DB20
+  sNesMessageEntryTable: 0x8014B320
+  sGerMessageEntryTable: 0x8014F548
+  sFraMessageEntryTable: 0x80151658
+  sStaffMessageEntryTable: 0x80153768