You've already forked HackerSM64
mirror of
https://github.com/HackerN64/HackerSM64.git
synced 2026-01-21 10:35:32 -08:00
Merge branch 'develop/2.1.0-new-crash-screen' of https://github.com/Reonu/HackerSM64 into develop/2.1.0-new-crash-screen
This commit is contained in:
Arceveti
@@ -2,9 +2,7 @@
|
||||
# Each line is a file pattern followed by one or more owners.
|
||||
|
||||
# These owners will be the default owners for everything in the repo.
|
||||
* @Reonu
|
||||
* @thecozies
|
||||
* @gheskett
|
||||
* @Reonu @gheskett @arthurtilly
|
||||
|
||||
# Order is important. The last matching pattern has the most precedence.
|
||||
# So if a pull request only touches javascript files, only these owners
|
||||
|
||||
58
Makefile
58
Makefile
@@ -456,6 +456,8 @@ else ifneq ($(call find-command,mips-linux-gnu-ld),)
|
||||
CROSS := mips-linux-gnu-
|
||||
else ifneq ($(call find-command,mips64-linux-gnu-ld),)
|
||||
CROSS := mips64-linux-gnu-
|
||||
else ifneq ($(call find-command,mips64-none-elf-ld),)
|
||||
CROSS := mips64-none-elf-
|
||||
else ifneq ($(call find-command,mips-ld),)
|
||||
CROSS := mips-
|
||||
else
|
||||
@@ -516,15 +518,15 @@ DEF_INC_CFLAGS := $(foreach i,$(INCLUDE_DIRS),-I$(i)) $(C_DEFINES)
|
||||
# C compiler options
|
||||
CFLAGS = -G 0 $(OPT_FLAGS) $(TARGET_CFLAGS) $(MIPSISET) $(DEF_INC_CFLAGS)
|
||||
ifeq ($(COMPILER),gcc)
|
||||
CFLAGS += -mno-shared -march=vr4300 -mfix4300 -mabi=32 -mhard-float -mdivide-breaks -fno-stack-protector -fno-common -fno-zero-initialized-in-bss -fno-PIC -mno-abicalls -fno-strict-aliasing -fno-inline-functions -ffreestanding -fwrapv -Wall -Wextra
|
||||
CFLAGS += -mno-shared -march=vr4300 -mfix4300 -mabi=32 -mhard-float -mdivide-breaks -fno-stack-protector -fno-common -fno-zero-initialized-in-bss -fno-PIC -mno-abicalls -fno-strict-aliasing -fno-inline-functions -ffreestanding -fwrapv -Wall -Wextra -Wno-trigraphs
|
||||
CFLAGS += -Wno-missing-braces
|
||||
else ifeq ($(COMPILER),clang)
|
||||
CFLAGS += -mfpxx -target mips -mabi=32 -G 0 -mhard-float -fomit-frame-pointer -fno-stack-protector -fno-common -I include -I src/ -I $(BUILD_DIR)/include -fno-PIC -mno-abicalls -fno-strict-aliasing -fno-inline-functions -ffreestanding -fwrapv -Wall -Wextra
|
||||
CFLAGS += -mfpxx -target mips -mabi=32 -G 0 -mhard-float -fomit-frame-pointer -fno-stack-protector -fno-common -I include -I src/ -I $(BUILD_DIR)/include -fno-PIC -mno-abicalls -fno-strict-aliasing -fno-inline-functions -ffreestanding -fwrapv -Wall -Wextra -Wno-trigraphs
|
||||
CFLAGS += -Wno-missing-braces
|
||||
else
|
||||
CFLAGS += -non_shared -Wab,-r4300_mul -Xcpluscomm -Xfullwarn -signed -32
|
||||
endif
|
||||
ASMFLAGS = -G 0 $(OPT_FLAGS) $(TARGET_CFLAGS) -mips3 $(DEF_INC_CFLAGS) -mno-shared -march=vr4300 -mfix4300 -mabi=32 -mhard-float -mdivide-breaks -fno-stack-protector -fno-common -fno-zero-initialized-in-bss -fno-PIC -mno-abicalls -fno-strict-aliasing -fno-inline-functions -ffreestanding -fwrapv -Wall -Wextra
|
||||
ASMFLAGS = -G 0 $(OPT_FLAGS) $(TARGET_CFLAGS) -mips3 $(DEF_INC_CFLAGS) -mno-shared -march=vr4300 -mfix4300 -mabi=32 -mhard-float -mdivide-breaks -fno-stack-protector -fno-common -fno-zero-initialized-in-bss -fno-PIC -mno-abicalls -fno-strict-aliasing -fno-inline-functions -ffreestanding -fwrapv -Wall -Wextra -Wno-trigraphs
|
||||
|
||||
ASFLAGS := -march=vr4300 -mabi=32 $(foreach i,$(INCLUDE_DIRS),-I$(i)) $(foreach d,$(DEFINES),--defsym $(d))
|
||||
RSPASMFLAGS := $(foreach d,$(DEFINES),-definelabel $(subst =, ,$(d)))
|
||||
@@ -552,7 +554,6 @@ N64CKSUM := $(TOOLS_DIR)/n64cksum
|
||||
N64GRAPHICS := $(TOOLS_DIR)/n64graphics
|
||||
N64GRAPHICS_CI := $(TOOLS_DIR)/n64graphics_ci
|
||||
BINPNG := $(TOOLS_DIR)/BinPNG.py
|
||||
TEXTCONV := $(TOOLS_DIR)/textconv
|
||||
AIFF_EXTRACT_CODEBOOK := $(TOOLS_DIR)/aiff_extract_codebook
|
||||
VADPCM_ENC := $(TOOLS_DIR)/vadpcm_enc
|
||||
EXTRACT_DATA_FOR_MIO := $(TOOLS_DIR)/extract_data_for_mio
|
||||
@@ -599,7 +600,7 @@ endif
|
||||
|
||||
# For non-IDO, use objcopy instead of extract_data_for_mio
|
||||
ifneq ($(COMPILER),ido)
|
||||
EXTRACT_DATA_FOR_MIO := $(OBJCOPY) -O binary --only-section=.data
|
||||
EXTRACT_DATA_FOR_MIO := $(OBJCOPY) -O binary --only-section=.data --only-section=.rodata
|
||||
endif
|
||||
|
||||
# Common build print status function
|
||||
@@ -672,29 +673,6 @@ $(BUILD_DIR)/src/libz/%.o: OPT_FLAGS := -Os
|
||||
$(BUILD_DIR)/src/libz/%.o: CFLAGS += -Wno-implicit-fallthrough -Wno-unused-parameter -Wno-pointer-sign
|
||||
endif
|
||||
|
||||
ifeq ($(VERSION),eu)
|
||||
TEXT_DIRS := text/de text/us text/fr
|
||||
|
||||
# EU encoded text inserted into individual segment 0x19 files,
|
||||
# and course data also duplicated in leveldata.c
|
||||
$(BUILD_DIR)/bin/eu/translation_en.o: $(BUILD_DIR)/text/us/define_text.inc.c
|
||||
$(BUILD_DIR)/bin/eu/translation_de.o: $(BUILD_DIR)/text/de/define_text.inc.c
|
||||
$(BUILD_DIR)/bin/eu/translation_fr.o: $(BUILD_DIR)/text/fr/define_text.inc.c
|
||||
$(BUILD_DIR)/levels/menu/leveldata.o: $(BUILD_DIR)/include/text_strings.h
|
||||
$(BUILD_DIR)/levels/menu/leveldata.o: $(BUILD_DIR)/text/us/define_courses.inc.c
|
||||
$(BUILD_DIR)/levels/menu/leveldata.o: $(BUILD_DIR)/text/de/define_courses.inc.c
|
||||
$(BUILD_DIR)/levels/menu/leveldata.o: $(BUILD_DIR)/text/fr/define_courses.inc.c
|
||||
else
|
||||
ifeq ($(VERSION),sh)
|
||||
TEXT_DIRS := text/jp
|
||||
$(BUILD_DIR)/bin/segment2.o: $(BUILD_DIR)/text/jp/define_text.inc.c
|
||||
else
|
||||
TEXT_DIRS := text/$(VERSION)
|
||||
# non-EU encoded text inserted into segment 0x02
|
||||
$(BUILD_DIR)/bin/segment2.o: $(BUILD_DIR)/text/$(VERSION)/define_text.inc.c
|
||||
endif
|
||||
endif
|
||||
|
||||
$(BUILD_DIR)/src/usb/usb.o: OPT_FLAGS := -O0
|
||||
$(BUILD_DIR)/src/usb/usb.o: CFLAGS += -Wno-unused-variable -Wno-sign-compare -Wno-unused-function
|
||||
$(BUILD_DIR)/src/usb/debug.o: OPT_FLAGS := -O0
|
||||
@@ -712,17 +690,11 @@ $(BUILD_DIR)/src/game/rendering_graph_node.o: OPT_FLAGS := $(GRAPH_NODE_OPT_FLAG
|
||||
# $(info MATH_UTIL_OPT_FLAGS: $(MATH_UTIL_OPT_FLAGS))
|
||||
# $(info GRAPH_NODE_OPT_FLAGS: $(GRAPH_NODE_OPT_FLAGS))
|
||||
|
||||
ALL_DIRS := $(BUILD_DIR) $(addprefix $(BUILD_DIR)/,$(SRC_DIRS) asm/debug $(GODDARD_SRC_DIRS) $(LIBZ_SRC_DIRS) $(ULTRA_BIN_DIRS) $(BIN_DIRS) $(TEXTURE_DIRS) $(TEXT_DIRS) $(SOUND_SAMPLE_DIRS) $(addprefix levels/,$(LEVEL_DIRS)) rsp include) $(YAY0_DIR) $(addprefix $(YAY0_DIR)/,$(VERSION)) $(SOUND_BIN_DIR) $(SOUND_BIN_DIR)/sequences/$(VERSION)
|
||||
ALL_DIRS := $(BUILD_DIR) $(addprefix $(BUILD_DIR)/,$(SRC_DIRS) asm/debug $(GODDARD_SRC_DIRS) $(LIBZ_SRC_DIRS) $(ULTRA_BIN_DIRS) $(BIN_DIRS) $(TEXTURE_DIRS) $(SOUND_SAMPLE_DIRS) $(addprefix levels/,$(LEVEL_DIRS)) rsp include) $(YAY0_DIR) $(addprefix $(YAY0_DIR)/,$(VERSION)) $(SOUND_BIN_DIR) $(SOUND_BIN_DIR)/sequences/$(VERSION)
|
||||
|
||||
# Make sure build directory exists before compiling anything
|
||||
DUMMY != mkdir -p $(ALL_DIRS)
|
||||
|
||||
$(BUILD_DIR)/include/text_strings.h: $(BUILD_DIR)/include/text_menu_strings.h
|
||||
$(BUILD_DIR)/src/menu/file_select.o: $(BUILD_DIR)/include/text_strings.h
|
||||
$(BUILD_DIR)/src/menu/star_select.o: $(BUILD_DIR)/include/text_strings.h
|
||||
$(BUILD_DIR)/src/game/ingame_menu.o: $(BUILD_DIR)/include/text_strings.h
|
||||
$(BUILD_DIR)/src/game/puppycam2.o: $(BUILD_DIR)/include/text_strings.h
|
||||
|
||||
|
||||
|
||||
#==============================================================================#
|
||||
@@ -795,7 +767,7 @@ endif
|
||||
|
||||
$(BUILD_DIR)/%.table: %.aiff
|
||||
$(call print,Extracting codebook:,$<,$@)
|
||||
$(V)$(AIFF_EXTRACT_CODEBOOK) $< >$@
|
||||
$(V)$(AIFF_EXTRACT_CODEBOOK) $< $@
|
||||
|
||||
$(BUILD_DIR)/%.aifc: $(BUILD_DIR)/%.table %.aiff
|
||||
$(call print,Encoding ADPCM:,$(word 2,$^),$@)
|
||||
@@ -849,20 +821,6 @@ $(BUILD_DIR)/assets/demo_data.c: assets/demo_data.json $(wildcard assets/demos/*
|
||||
@$(PRINT) "$(GREEN)Generating demo data $(NO_COL)\n"
|
||||
$(V)$(PYTHON) $(TOOLS_DIR)/demo_data_converter.py assets/demo_data.json $(DEF_INC_CFLAGS) > $@
|
||||
|
||||
# Encode in-game text strings
|
||||
$(BUILD_DIR)/include/text_strings.h: include/text_strings.h.in
|
||||
$(call print,Encoding:,$<,$@)
|
||||
$(V)$(TEXTCONV) charmap.txt $< $@
|
||||
$(BUILD_DIR)/include/text_menu_strings.h: include/text_menu_strings.h.in
|
||||
$(call print,Encoding:,$<,$@)
|
||||
$(V)$(TEXTCONV) charmap_menu.txt $< $@
|
||||
$(BUILD_DIR)/text/%/define_courses.inc.c: text/define_courses.inc.c text/%/courses.h
|
||||
@$(PRINT) "$(GREEN)Preprocessing: $(BLUE)$@ $(NO_COL)\n"
|
||||
$(V)$(CPP) $(CPPFLAGS) $< -o - -I text/$*/ | $(TEXTCONV) charmap.txt - $@
|
||||
$(BUILD_DIR)/text/%/define_text.inc.c: text/define_text.inc.c text/%/courses.h text/%/dialogs.h
|
||||
@$(PRINT) "$(GREEN)Preprocessing: $(BLUE)$@ $(NO_COL)\n"
|
||||
$(V)$(CPP) $(CPPFLAGS) $< -o - -I text/$*/ | $(TEXTCONV) charmap.txt - $@
|
||||
|
||||
# Level headers
|
||||
$(BUILD_DIR)/include/level_headers.h: levels/level_headers.h.in
|
||||
$(call print,Preprocessing level headers:,$<,$@)
|
||||
|
||||
@@ -243,9 +243,11 @@ $(BUILD_DIR)/bin/machine.elf: SEGMENT_ADDRESS := 0x09000000
|
||||
$(BUILD_DIR)/bin/mountain.elf: SEGMENT_ADDRESS := 0x09000000
|
||||
$(BUILD_DIR)/bin/grass.elf: SEGMENT_ADDRESS := 0x09000000
|
||||
# EU segment 19 translations
|
||||
$(BUILD_DIR)/bin/eu/translation_de.elf: SEGMENT_ADDRESS := 0x19000000
|
||||
$(BUILD_DIR)/bin/eu/translation_en.elf: SEGMENT_ADDRESS := 0x19000000
|
||||
$(BUILD_DIR)/bin/eu/translation_fr.elf: SEGMENT_ADDRESS := 0x19000000
|
||||
$(BUILD_DIR)/bin/translation_de.elf: SEGMENT_ADDRESS := 0x19000000
|
||||
$(BUILD_DIR)/bin/translation_en.elf: SEGMENT_ADDRESS := 0x19000000
|
||||
$(BUILD_DIR)/bin/translation_fr.elf: SEGMENT_ADDRESS := 0x19000000
|
||||
$(BUILD_DIR)/bin/translation_jp.elf: SEGMENT_ADDRESS := 0x19000000
|
||||
$(BUILD_DIR)/bin/translation_es.elf: SEGMENT_ADDRESS := 0x19000000
|
||||
|
||||
# --------------------------------------
|
||||
# Skybox Rules
|
||||
|
||||
10
README.md
10
README.md
@@ -17,9 +17,9 @@ This is a fork of the ultrasm64 repo by CrashOveride which includes the followin
|
||||
- **MrComit**: General use object defines, JUMP_KICK_FIX
|
||||
- **aglab2**: Bugfixes (particularly puppycam), refactor stuff
|
||||
- **someone2639**: math.s and crash screen disam, stack trace, map packing, shiftable segments 2, S2DEX engine
|
||||
- **Arthurtilly**: Platform Displacement 2
|
||||
- **Arthurtilly**: ASCII / UTF-8 support, Multilang, Platform Displacement 2
|
||||
- **Fazana**: PuppyLib, ucode swapping, audio load time optimisations (with Arctic), general hacker qol improvements, visual debug
|
||||
- **Reonu**: Starting the project/repo, widescreen, reonucam, various defines for hacker QoL
|
||||
- **Reonu**: Starting the project + widescreen, reonucam, various defines for hacker QoL, and a custom Spanish (Spain) translation of the game.
|
||||
- **JoshDuMan**: Decomp guy, general assistance
|
||||
- **Arceveti**: Naming unknown symbols, new crash screen, silhouette, shadow optimizations, breath meter, 4 controller support, implementations of rounded corners, slope fix, exposed ceiling fix, other bugfixes
|
||||
- **axollyon**: Console testing, bugfixes, idea-guying, and had a hand in silhouettes
|
||||
@@ -87,9 +87,9 @@ Thanks to Frame#5375 and AloXado320 for also helping with silhouette stuff
|
||||
- You can set a test level in `config/config_debug.h` in order to boot straight into it, so you can quickly test the level you're working on. *
|
||||
- Allow all surfaces in the game to have a `force` parameter. Activating this doesn't REQUIRE you to set `force` for every surface: If you don't set, it will default to 0x0000 rather than crashing. Increases RAM usage of collision. *
|
||||
- The clown font includes the entire English alphabet.
|
||||
- Colored ia4 text support. Format: `"@XXXXXXXX[YOUR TEXT]@--------"` (By ArcticJaguar725)
|
||||
- Example Text: `"@FF0000FFRED @00FF00FFGREEN @0000FFFFBLUE @FFFFFF00INVISIBLE @--------NORMAL"`
|
||||
- NOTE: It is not mandatory to reset the text color with `"@--------"`, but text will need to be recolored each time it scrolls in a dialog box, or the custom color will reset.
|
||||
- Colored ia4 text support. Format: `"@XXXXXX[YOUR TEXT]@--------"` (By Arthurtilly)
|
||||
- Example Text: `"@FF0000RED @00FF00GREEN @0000FFBLUE @FFFFFFWHITE"`
|
||||
- NOTE: Text will need to be recolored each time it scrolls in a dialog box, or the custom color will reset. The text will use gDialogTextAlpha as the alpha value when changing the color.
|
||||
- Toggle visiblity of collision surfaces and object hitboxes with Visual Surface Debug. `config/config_debug.h` has VISUAL_DEBUG which can be turned on to enable this feature.
|
||||
- Workaround for infinite death loops caused by using the wrong warp type for death warps. Mario's HP will be restored when being warped to any warp if (and only if) he was warped while dead. *
|
||||
|
||||
|
||||
@@ -1 +1 @@
|
||||
v2.2.0
|
||||
v2.3.0
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
// SM64 (EU) Segment 19 - Deutsch
|
||||
|
||||
#include "macros.h"
|
||||
|
||||
#include "game/ingame_menu.h"
|
||||
|
||||
#include "make_const_nonconst.h"
|
||||
|
||||
// Include text/define_text.inc.c, preprocessed with -I text/de/ to get the
|
||||
// right translation strings, with symbols renamed as below.
|
||||
#define seg2_course_name_table course_name_table_eu_de
|
||||
#define seg2_act_name_table act_name_table_eu_de
|
||||
#define seg2_dialog_table dialog_table_eu_de
|
||||
|
||||
#include "text/de/define_text.inc.c"
|
||||
@@ -1,15 +0,0 @@
|
||||
// SM64 (EU) Segment 19 - English
|
||||
|
||||
#include "macros.h"
|
||||
|
||||
#include "game/ingame_menu.h"
|
||||
|
||||
#include "make_const_nonconst.h"
|
||||
|
||||
// Include text/define_text.inc.c, preprocessed with -I text/us/ to get the
|
||||
// right translation strings, with symbols renamed as below.
|
||||
#define seg2_course_name_table course_name_table_eu_en
|
||||
#define seg2_act_name_table act_name_table_eu_en
|
||||
#define seg2_dialog_table dialog_table_eu_en
|
||||
|
||||
#include "text/us/define_text.inc.c"
|
||||
@@ -1,15 +0,0 @@
|
||||
// SM64 (EU) Segment 19 - Français
|
||||
|
||||
#include "macros.h"
|
||||
|
||||
#include "game/ingame_menu.h"
|
||||
|
||||
#include "make_const_nonconst.h"
|
||||
|
||||
// Include text/define_text.inc.c, preprocessed with -I text/fr/ to get the
|
||||
// right translation strings, with symbols renamed as below.
|
||||
#define seg2_course_name_table course_name_table_eu_fr
|
||||
#define seg2_act_name_table act_name_table_eu_fr
|
||||
#define seg2_dialog_table dialog_table_eu_fr
|
||||
|
||||
#include "text/fr/define_text.inc.c"
|
||||
1748
bin/segment2.c
1748
bin/segment2.c
File diff suppressed because it is too large
Load Diff
17
bin/translation_de.c
Normal file
17
bin/translation_de.c
Normal file
@@ -0,0 +1,17 @@
|
||||
// SM64 (EU) Segment 19 - Deutsch
|
||||
|
||||
#include "macros.h"
|
||||
|
||||
#include "game/ingame_menu.h"
|
||||
#include "sounds.h"
|
||||
#include "seq_ids.h"
|
||||
|
||||
#define COURSE_NAME_TABLE course_name_table_de
|
||||
#define ACT_NAME_TABLE act_name_table_de
|
||||
#define DIALOG_TABLE dialog_table_de
|
||||
|
||||
#define DIALOG_FILE "de/dialogs.h"
|
||||
#define COURSE_FILE "de/courses.h"
|
||||
#include "text/define_text.inc.c"
|
||||
#undef DIALOG_FILE
|
||||
#undef COURSE_FILE
|
||||
17
bin/translation_en.c
Normal file
17
bin/translation_en.c
Normal file
@@ -0,0 +1,17 @@
|
||||
// SM64 (EU) Segment 19 - English
|
||||
|
||||
#include "macros.h"
|
||||
|
||||
#include "game/ingame_menu.h"
|
||||
#include "sounds.h"
|
||||
#include "seq_ids.h"
|
||||
|
||||
#define COURSE_NAME_TABLE course_name_table_en
|
||||
#define ACT_NAME_TABLE act_name_table_en
|
||||
#define DIALOG_TABLE dialog_table_en
|
||||
|
||||
#define DIALOG_FILE "us/dialogs.h"
|
||||
#define COURSE_FILE "us/courses.h"
|
||||
#include "text/define_text.inc.c"
|
||||
#undef DIALOG_FILE
|
||||
#undef COURSE_FILE
|
||||
17
bin/translation_es.c
Normal file
17
bin/translation_es.c
Normal file
@@ -0,0 +1,17 @@
|
||||
// SM64 (EU) Segment 19 - Español (España) (Not vanilla: Translation created and added by Reonu)
|
||||
|
||||
#include "macros.h"
|
||||
|
||||
#include "game/ingame_menu.h"
|
||||
#include "sounds.h"
|
||||
#include "seq_ids.h"
|
||||
|
||||
#define COURSE_NAME_TABLE course_name_table_es
|
||||
#define ACT_NAME_TABLE act_name_table_es
|
||||
#define DIALOG_TABLE dialog_table_es
|
||||
|
||||
#define DIALOG_FILE "es/dialogs.h"
|
||||
#define COURSE_FILE "es/courses.h"
|
||||
#include "text/define_text.inc.c"
|
||||
#undef DIALOG_FILE
|
||||
#undef COURSE_FILE
|
||||
17
bin/translation_fr.c
Normal file
17
bin/translation_fr.c
Normal file
@@ -0,0 +1,17 @@
|
||||
// SM64 (EU) Segment 19 - Français
|
||||
|
||||
#include "macros.h"
|
||||
|
||||
#include "game/ingame_menu.h"
|
||||
#include "sounds.h"
|
||||
#include "seq_ids.h"
|
||||
|
||||
#define COURSE_NAME_TABLE course_name_table_fr
|
||||
#define ACT_NAME_TABLE act_name_table_fr
|
||||
#define DIALOG_TABLE dialog_table_fr
|
||||
|
||||
#define DIALOG_FILE "fr/dialogs.h"
|
||||
#define COURSE_FILE "fr/courses.h"
|
||||
#include "text/define_text.inc.c"
|
||||
#undef DIALOG_FILE
|
||||
#undef COURSE_FILE
|
||||
17
bin/translation_jp.c
Normal file
17
bin/translation_jp.c
Normal file
@@ -0,0 +1,17 @@
|
||||
// SM64 (EU) Segment 19 - 日本語 (Japanese)
|
||||
|
||||
#include "macros.h"
|
||||
|
||||
#include "game/ingame_menu.h"
|
||||
#include "sounds.h"
|
||||
#include "seq_ids.h"
|
||||
|
||||
#define COURSE_NAME_TABLE course_name_table_jp
|
||||
#define ACT_NAME_TABLE act_name_table_jp
|
||||
#define DIALOG_TABLE dialog_table_jp
|
||||
|
||||
#define DIALOG_FILE "jp/dialogs.h"
|
||||
#define COURSE_FILE "jp/courses.h"
|
||||
#include "text/define_text.inc.c"
|
||||
#undef DIALOG_FILE
|
||||
#undef COURSE_FILE
|
||||
357
charmap.txt
357
charmap.txt
@@ -1,357 +0,0 @@
|
||||
'0' = 0x00
|
||||
'０' = 0x00
|
||||
'1' = 0x01
|
||||
'１' = 0x01
|
||||
'2' = 0x02
|
||||
'２' = 0x02
|
||||
'3' = 0x03
|
||||
'３' = 0x03
|
||||
'4' = 0x04
|
||||
'４' = 0x04
|
||||
'5' = 0x05
|
||||
'５' = 0x05
|
||||
'6' = 0x06
|
||||
'６' = 0x06
|
||||
'7' = 0x07
|
||||
'７' = 0x07
|
||||
'8' = 0x08
|
||||
'８' = 0x08
|
||||
'9' = 0x09
|
||||
'９' = 0x09
|
||||
'A' = 0x0A
|
||||
'Ａ' = 0x0A
|
||||
'B' = 0x0B
|
||||
'Ｂ' = 0x0B
|
||||
'C' = 0x0C
|
||||
'Ｃ' = 0x0C
|
||||
'D' = 0x0D
|
||||
'Ｄ' = 0x0D
|
||||
'E' = 0x0E
|
||||
'Ｅ' = 0x0E
|
||||
'F' = 0x0F
|
||||
'Ｆ' = 0x0F
|
||||
'G' = 0x10
|
||||
'Ｇ' = 0x10
|
||||
'H' = 0x11
|
||||
'Ｈ' = 0x11
|
||||
'I' = 0x12
|
||||
'Ｉ' = 0x12
|
||||
'J' = 0x13
|
||||
'Ｊ' = 0x13
|
||||
'K' = 0x14
|
||||
'Ｋ' = 0x14
|
||||
'L' = 0x15
|
||||
'Ｌ' = 0x15
|
||||
'M' = 0x16
|
||||
'Ｍ' = 0x16
|
||||
'N' = 0x17
|
||||
'Ｎ' = 0x17
|
||||
'O' = 0x18
|
||||
'Ｏ' = 0x18
|
||||
'P' = 0x19
|
||||
'Ｐ' = 0x19
|
||||
'Q' = 0x1A
|
||||
'Ｑ' = 0x1A
|
||||
'R' = 0x1B
|
||||
'Ｒ' = 0x1B
|
||||
'S' = 0x1C
|
||||
'Ｓ' = 0x1C
|
||||
'T' = 0x1D
|
||||
'Ｔ' = 0x1D
|
||||
'U' = 0x1E
|
||||
'Ｕ' = 0x1E
|
||||
'V' = 0x1F
|
||||
'Ｖ' = 0x1F
|
||||
'W' = 0x20
|
||||
'Ｗ' = 0x20
|
||||
'X' = 0x21
|
||||
'Ｘ' = 0x21
|
||||
'Y' = 0x22
|
||||
'Ｙ' = 0x22
|
||||
'Z' = 0x23
|
||||
'Ｚ' = 0x23
|
||||
'a' = 0x24
|
||||
'b' = 0x25
|
||||
'c' = 0x26
|
||||
'd' = 0x27
|
||||
'e' = 0x28
|
||||
'f' = 0x29
|
||||
'g' = 0x2A
|
||||
'h' = 0x2B
|
||||
'i' = 0x2C
|
||||
'j' = 0x2D
|
||||
'k' = 0x2E
|
||||
'l' = 0x2F
|
||||
'm' = 0x30
|
||||
'n' = 0x31
|
||||
'o' = 0x32
|
||||
'p' = 0x33
|
||||
'q' = 0x34
|
||||
'r' = 0x35
|
||||
's' = 0x36
|
||||
't' = 0x37
|
||||
'u' = 0x38
|
||||
'v' = 0x39
|
||||
'w' = 0x3A
|
||||
'x' = 0x3B
|
||||
'y' = 0x3C
|
||||
'z' = 0x3D
|
||||
'\'' = 0x3E
|
||||
'.' = 0x3F
|
||||
|
||||
# Mario face US/EU menu string (Note: NOT multi-text, each char has a part of the face)
|
||||
'☺' = 0x40, 0x41
|
||||
|
||||
'あ' = 0x40
|
||||
'い' = 0x41
|
||||
'う' = 0x42
|
||||
'え' = 0x43
|
||||
'お' = 0x44
|
||||
'か' = 0x45
|
||||
'き' = 0x46
|
||||
'く' = 0x47
|
||||
'け' = 0x48
|
||||
'こ' = 0x49
|
||||
'さ' = 0x4A
|
||||
'し' = 0x4B
|
||||
'す' = 0x4C
|
||||
'せ' = 0x4D
|
||||
'そ' = 0x4E
|
||||
'た' = 0x4F
|
||||
'ち' = 0x50
|
||||
'つ' = 0x51
|
||||
'て' = 0x52
|
||||
'と' = 0x53
|
||||
'な' = 0x54
|
||||
'に' = 0x55
|
||||
'ぬ' = 0x56
|
||||
'ね' = 0x57
|
||||
'の' = 0x58
|
||||
'は' = 0x59
|
||||
'ひ' = 0x5A
|
||||
'ふ' = 0x5B
|
||||
'へ' = 0x5C
|
||||
'ほ' = 0x5D
|
||||
'ま' = 0x5E
|
||||
'み' = 0x5F
|
||||
'む' = 0x60
|
||||
'め' = 0x61
|
||||
'も' = 0x62
|
||||
'や' = 0x63
|
||||
'ゆ' = 0x64
|
||||
'よ' = 0x65
|
||||
'ら' = 0x66
|
||||
'り' = 0x67
|
||||
'る' = 0x68
|
||||
'れ' = 0x69
|
||||
'ろ' = 0x6A
|
||||
'わ' = 0x6B
|
||||
'を' = 0x6C
|
||||
'ん' = 0x6D
|
||||
'。' = 0x6E
|
||||
',' = 0x6F
|
||||
'、' = 0x6F
|
||||
'ア' = 0x70
|
||||
'イ' = 0x71
|
||||
'ウ' = 0x72
|
||||
'エ' = 0x73
|
||||
'オ' = 0x74
|
||||
'カ' = 0x75
|
||||
'キ' = 0x76
|
||||
'ク' = 0x77
|
||||
'ケ' = 0x78
|
||||
'コ' = 0x79
|
||||
'サ' = 0x7A
|
||||
'シ' = 0x7B
|
||||
'ス' = 0x7C
|
||||
'セ' = 0x7D
|
||||
'ソ' = 0x7E
|
||||
'タ' = 0x7F
|
||||
'チ' = 0x80
|
||||
'ツ' = 0x81
|
||||
'テ' = 0x82
|
||||
'ト' = 0x83
|
||||
'ナ' = 0x84
|
||||
'ニ' = 0x85
|
||||
'ヌ' = 0x86
|
||||
'ネ' = 0x87
|
||||
'ノ' = 0x88
|
||||
'ハ' = 0x89
|
||||
'ヒ' = 0x8A
|
||||
'フ' = 0x8B
|
||||
'ヘ' = 0x8C
|
||||
'ホ' = 0x8D
|
||||
'マ' = 0x8E
|
||||
'ミ' = 0x8F
|
||||
'ム' = 0x90
|
||||
'メ' = 0x91
|
||||
'モ' = 0x92
|
||||
'ヤ' = 0x93
|
||||
'ユ' = 0x94
|
||||
'ヨ' = 0x95
|
||||
'ラ' = 0x96
|
||||
'リ' = 0x97
|
||||
'ル' = 0x98
|
||||
'レ' = 0x99
|
||||
'ロ' = 0x9A
|
||||
'ワ' = 0x9B
|
||||
# 0x9C is unused, only defined in jp menu char lut
|
||||
'ヲ' = 0x9C
|
||||
'ン' = 0x9D
|
||||
' ' = 0x9E
|
||||
' ' = 0x9E
|
||||
'-' = 0x9F
|
||||
'ー' = 0x9F
|
||||
'ぇ' = 0xA0
|
||||
'っ' = 0xA1
|
||||
'ゃ' = 0xA2
|
||||
'ゅ' = 0xA3
|
||||
'ょ' = 0xA4
|
||||
'ぁ' = 0xA5
|
||||
'ぃ' = 0xA6
|
||||
'ぅ' = 0xA7
|
||||
'ぉ' = 0xA8
|
||||
'ェ' = 0xD0
|
||||
'ッ' = 0xD1
|
||||
'ャ' = 0xD2
|
||||
'ュ' = 0xD3
|
||||
'ョ' = 0xD4
|
||||
'ァ' = 0xD5
|
||||
'ィ' = 0xD6
|
||||
'ゥ' = 0xD7
|
||||
'ォ' = 0xD8
|
||||
'@' = 0xDF
|
||||
'[%]' = 0xE0
|
||||
'(' = 0xE1
|
||||
'（' = 0xE1
|
||||
')(' = 0xE2
|
||||
'）（' = 0xE2
|
||||
')' = 0xE3
|
||||
'）' = 0xE3
|
||||
'+' = 0xE4
|
||||
'↔' = 0xE4
|
||||
'&' = 0xE5
|
||||
':' = 0xE6
|
||||
'゛' = 0xF0
|
||||
'゜' = 0xF1
|
||||
'!' = 0xF2
|
||||
'！' = 0xF2
|
||||
'%' = 0xF3
|
||||
'％' = 0xF3
|
||||
'?' = 0xF4
|
||||
'？' = 0xF4
|
||||
'『' = 0xF5
|
||||
'』' = 0xF6
|
||||
'~' = 0xF7
|
||||
'～' = 0xF7
|
||||
'…' = 0xF8
|
||||
'$' = 0xF9
|
||||
'★' = 0xFA
|
||||
'×' = 0xFB
|
||||
'・' = 0xFC
|
||||
'☆' = 0xFD
|
||||
'\n' = 0xFE
|
||||
|
||||
# hiragana or katakana with dakuten
|
||||
'が' = 0xF0, 0x45
|
||||
'ぎ' = 0xF0, 0x46
|
||||
'ぐ' = 0xF0, 0x47
|
||||
'げ' = 0xF0, 0x48
|
||||
'ご' = 0xF0, 0x49
|
||||
'ざ' = 0xF0, 0x4A
|
||||
'じ' = 0xF0, 0x4B
|
||||
'ず' = 0xF0, 0x4C
|
||||
'ぜ' = 0xF0, 0x4D
|
||||
'ぞ' = 0xF0, 0x4E
|
||||
'だ' = 0xF0, 0x4F
|
||||
'ぢ' = 0xF0, 0x50
|
||||
'づ' = 0xF0, 0x51
|
||||
'で' = 0xF0, 0x52
|
||||
'ど' = 0xF0, 0x53
|
||||
'ば' = 0xF0, 0x59
|
||||
'び' = 0xF0, 0x5A
|
||||
'ぶ' = 0xF0, 0x5B
|
||||
'べ' = 0xF0, 0x5C
|
||||
'ぼ' = 0xF0, 0x5D
|
||||
'ガ' = 0xF0, 0x75
|
||||
'ギ' = 0xF0, 0x76
|
||||
'グ' = 0xF0, 0x77
|
||||
'ゲ' = 0xF0, 0x78
|
||||
'ゴ' = 0xF0, 0x79
|
||||
'ザ' = 0xF0, 0x7A
|
||||
'ジ' = 0xF0, 0x7B
|
||||
'ズ' = 0xF0, 0x7C
|
||||
'ゼ' = 0xF0, 0x7D
|
||||
'ゾ' = 0xF0, 0x7E
|
||||
'ダ' = 0xF0, 0x7F
|
||||
'ヂ' = 0xF0, 0x80
|
||||
'ヅ' = 0xF0, 0x81
|
||||
'デ' = 0xF0, 0x82
|
||||
'ド' = 0xF0, 0x83
|
||||
'バ' = 0xF0, 0x89
|
||||
'ビ' = 0xF0, 0x8A
|
||||
'ブ' = 0xF0, 0x8B
|
||||
'ベ' = 0xF0, 0x8C
|
||||
'ボ' = 0xF0, 0x8D
|
||||
|
||||
# hiragana or katakana with handakuten
|
||||
'ぱ' = 0xF1, 0x59
|
||||
'ぴ' = 0xF1, 0x5A
|
||||
'ぷ' = 0xF1, 0x5B
|
||||
'ぺ' = 0xF1, 0x5C
|
||||
'ぽ' = 0xF1, 0x5D
|
||||
'パ' = 0xF1, 0x89
|
||||
'ピ' = 0xF1, 0x8A
|
||||
'プ' = 0xF1, 0x8B
|
||||
'ペ' = 0xF1, 0x8C
|
||||
'ポ' = 0xF1, 0x8D
|
||||
|
||||
# overwritten US symbols
|
||||
# these symbols overwrite
|
||||
# a previous symbol.
|
||||
'^' = 0x50
|
||||
'|' = 0x51
|
||||
'<' = 0x52
|
||||
'>' = 0x53
|
||||
'[A]' = 0x54
|
||||
'[B]' = 0x55
|
||||
'[C]' = 0x56
|
||||
'[Z]' = 0x57
|
||||
'[R]' = 0x58
|
||||
'/' = 0xD0
|
||||
|
||||
# multi-text US symbols
|
||||
'the' = 0xD1
|
||||
'you' = 0xD2
|
||||
|
||||
# EU ROM symbols
|
||||
'à' = 0x60
|
||||
'â' = 0x61
|
||||
'ä' = 0x62
|
||||
'À' = 0x64
|
||||
'Â' = 0x65
|
||||
'Ä' = 0x66
|
||||
'è' = 0x70
|
||||
'ê' = 0x71
|
||||
'ë' = 0x72
|
||||
'é' = 0x73
|
||||
'È' = 0x74
|
||||
'Ê' = 0x75
|
||||
'Ë' = 0x76
|
||||
'É' = 0x77
|
||||
'ù' = 0x80
|
||||
'û' = 0x81
|
||||
'ü' = 0x82
|
||||
'Ù' = 0x84
|
||||
'Û' = 0x85
|
||||
'Ü' = 0x86
|
||||
'ô' = 0x91
|
||||
'ö' = 0x92
|
||||
'Ô' = 0x95
|
||||
'Ö' = 0x96
|
||||
'î' = 0xA1
|
||||
'ï' = 0xA2
|
||||
'ß' = 0xEC
|
||||
'Ç' = 0xED
|
||||
'ç' = 0xEE
|
||||
'„' = 0xF0
|
||||
@@ -1,30 +0,0 @@
|
||||
# Menu HUD chars, only used in JP
|
||||
# Char values used by text_menu_strings.h.in
|
||||
'フ' = 0x00
|
||||
'ァ' = 0x01
|
||||
'イ' = 0x02
|
||||
'ル' = 0x03
|
||||
'セ' = 0x04
|
||||
'レ' = 0x05
|
||||
'ク' = 0x06
|
||||
'ト' = 0x07
|
||||
'を' = 0x08
|
||||
'コ' = 0x09
|
||||
'ピ' = 0x0A
|
||||
'ー' = 0x0B
|
||||
'す' = 0x0C
|
||||
'る' = 0x0D
|
||||
'け' = 0x0E
|
||||
'マ' = 0x0F
|
||||
'リ' = 0x10
|
||||
'オ' = 0x11
|
||||
'ス' = 0x12
|
||||
'ア' = 0x13
|
||||
'み' = 0x14
|
||||
'ど' = 0x15
|
||||
'の' = 0x16
|
||||
'？' = 0x17
|
||||
'サ' = 0x18
|
||||
'ウ' = 0x19
|
||||
'ン' = 0x1A
|
||||
'ド' = 0x1B
|
||||
File diff suppressed because it is too large
Load Diff
@@ -177,9 +177,15 @@ def main():
|
||||
# presence of the correct roms automatically
|
||||
|
||||
# Make sure tools exist
|
||||
subprocess.check_call(
|
||||
["make", "-s", "-C", "tools/", "n64graphics", "skyconv", "mio0", "aifc_decode"]
|
||||
)
|
||||
tools = [ "n64graphics", "skyconv", "mio0", "aifc_decode" ]
|
||||
if os.name == 'nt':
|
||||
tools = [tool + ".exe" for tool in tools]
|
||||
make = "mingw32-make"
|
||||
else:
|
||||
make = "make"
|
||||
|
||||
cmd = [make, "-s", "-C", "tools/"] + tools
|
||||
subprocess.check_call(cmd)
|
||||
|
||||
# Go through the assets in roughly alphabetical order (but assets in the same
|
||||
# mio0 file still go together).
|
||||
|
||||
28
fast64.json
Normal file
28
fast64.json
Normal file
@@ -0,0 +1,28 @@
|
||||
{
|
||||
"version": 1.0,
|
||||
"autoLoad": true,
|
||||
"microcode": "F3DEX2/LX2",
|
||||
"rdpDefaults": {
|
||||
"geometryMode": {
|
||||
"zBuffer": true,
|
||||
"shade": true,
|
||||
"cullBack": true,
|
||||
"lighting": true,
|
||||
"shadeSmooth": true
|
||||
},
|
||||
"otherModeH": {
|
||||
"textureConvert": "G_TC_FILT",
|
||||
"textureFilter": "G_TF_BILERP",
|
||||
"perspectiveCorrection": "G_TP_PERSP",
|
||||
"pipelineMode": "G_PM_1PRIMITIVE"
|
||||
},
|
||||
"otherModeL": {},
|
||||
"other": {}
|
||||
},
|
||||
"sm64": {
|
||||
"refresh_version": "HackerSM64 2.3.0",
|
||||
"compression_format": "yay0",
|
||||
"force_extended_ram": false,
|
||||
"matstack_fix": true
|
||||
}
|
||||
}
|
||||
@@ -71,22 +71,24 @@
|
||||
// #define DIALOG_INDICATOR
|
||||
|
||||
/**
|
||||
* Include the English characters that were missing from US segment2 and the rumble pak texture if using rumble.
|
||||
* J, Q, V, X, Z, ¨, !, !!, ?, &, %, ., and the beta key.
|
||||
* [MAKE SURE TO INCLUDE EU AND JP/SH BASEROMS IN THE REPO TO OBTAIN THE ASSETS]
|
||||
* If this is disabled, backup assets will be used.
|
||||
* Adds support for multiple languages to the game.
|
||||
*/
|
||||
// #define COMPLETE_EN_US_SEGMENT2
|
||||
// #define MULTILANG
|
||||
|
||||
/**
|
||||
* Removes multi-language cake screen.
|
||||
* Toggles for individual languages. Only works when MULTILANG is enabled.
|
||||
* Note that English will always be enabled.
|
||||
*/
|
||||
#define EU_CUSTOM_CAKE_FIX
|
||||
#define ENABLE_FRENCH
|
||||
#define ENABLE_GERMAN
|
||||
// #define ENABLE_JAPANESE
|
||||
#define ENABLE_SPANISH
|
||||
|
||||
/**
|
||||
* Adds multiple languages to the game. Just a placeholder for the most part, because it only works with EU, and must be enabled with EU.
|
||||
* This define enables support for Japanese characters even when multilang or Japanese is not enabled.
|
||||
* Requires a Japanese baserom.
|
||||
*/
|
||||
#define MULTILANG (0 || VERSION_EU)
|
||||
// #define JAPANESE_CHARACTERS
|
||||
|
||||
/**
|
||||
* Prevents infinite death loops by always restoring Mario's health when he's warped to any kind of warp while dead.
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user