sm64-mirrors/sm64ex-alo
1
0
Fork 0
mirror of https://github.com/AloUltraExt/sm64ex-alo.git synced 2025-01-22 15:43:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

iQue fixes

Browse source 
Move iQue segment2 textures to a separate folder

Fix course complete screen crash

Hacky fix for options menu label
This commit is contained in:
AloXado320 2024-05-17 22:28:22 -05:00
parent 46cd1f0ddb
commit fd1ea7bccd
7 changed files with 4559 additions and 4547 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Makefile.split
View file

@ -14,6 +14,10 @@ TEXTURE_DIRS := \
$(wildcard textures/*/custom/) \ $(wildcard textures/*/custom/) \
$(filter %/,$(wildcard actors/*/)) $(filter %/,$(wildcard actors/*/))
ifeq ($(VERSION),cn)
TEXTURE_DIRS += $(wildcard textures/segment2/cn/)
endif
ifeq ($(PORT_MOP_OBJS),1) ifeq ($(PORT_MOP_OBJS),1)
TEXTURE_DIRS += $(filter %/,$(wildcard src/extras/mop/actors/*/)) TEXTURE_DIRS += $(filter %/,$(wildcard src/extras/mop/actors/*/))
endif endif
@ -216,6 +220,9 @@ $(BUILD_DIR)/levels/ending/cake.inc.c: levels/ending/cake.png
# Others # Others
SEGMENT2_TEXTURES := $(wildcard $(TEXTURE_DIR)/segment2/*.png) $(wildcard $(TEXTURE_DIR)/segment2/custom/*.png) SEGMENT2_TEXTURES := $(wildcard $(TEXTURE_DIR)/segment2/*.png) $(wildcard $(TEXTURE_DIR)/segment2/custom/*.png)
ifeq ($(VERSION),cn)
SEGMENT2_TEXTURES += $(wildcard $(TEXTURE_DIR)/segment2/cn/*.png)
endif
TITLE_SCREEN_BG_TEXTURES := $(wildcard $(TEXTURE_DIR)/title_screen_bg/*.png) TITLE_SCREEN_BG_TEXTURES := $(wildcard $(TEXTURE_DIR)/title_screen_bg/*.png)
SPOOKY_TEXTURES := $(wildcard $(TEXTURE_DIR)/spooky/*.png) SPOOKY_TEXTURES := $(wildcard $(TEXTURE_DIR)/spooky/*.png)
GENERIC_TEXTURES := $(wildcard $(TEXTURE_DIR)/generic/*.png) GENERIC_TEXTURES := $(wildcard $(TEXTURE_DIR)/generic/*.png)

4540
assets.json
View file

File diff suppressed because it is too large Load diff

4540
bin/segment2.c
View file

File diff suppressed because it is too large Load diff

2
src/extras/options_menu.c
View file

@ -480,7 +480,7 @@ void optmenu_draw(void) {
const s16 labelX = get_hudstr_centered_x(SCREEN_WIDTH / 2, currentMenu->label); const s16 labelX = get_hudstr_centered_x(SCREEN_WIDTH / 2, currentMenu->label);
gSPDisplayList(gDisplayListHead++, dl_rgba16_text_begin); gSPDisplayList(gDisplayListHead++, dl_rgba16_text_begin);
gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, 255); gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, 255);
print_hud_lut_string(HUD_LUT_GLOBAL, labelX, 40, currentMenu->label); print_hud_lut_string(HUD_LUT_CNDIFF, labelX, 40, currentMenu->label);
gSPDisplayList(gDisplayListHead++, dl_rgba16_text_end); gSPDisplayList(gDisplayListHead++, dl_rgba16_text_end);
if (currentMenu->numOpts > 4) if (currentMenu->numOpts > 4)

9
src/game/ingame_menu.c
View file

@ -274,7 +274,7 @@ void create_dl_ortho_matrix(void) {
// Should produce G_RDPHALF_1 in Fast3D // Should produce G_RDPHALF_1 in Fast3D
gSPPerspNormalize(gDisplayListHead++, 0xFFFF); gSPPerspNormalize(gDisplayListHead++, 0xFFFF);
gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(matrix), G_MTX_PROJECTION | G_MTX_MUL | G_MTX_NOPUSH) gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(matrix), G_MTX_PROJECTION | G_MTX_MUL | G_MTX_NOPUSH);
} }
#if defined(VERSION_JP) || defined(VERSION_SH) || defined(VERSION_CN) #if defined(VERSION_JP) || defined(VERSION_SH) || defined(VERSION_CN)
@ -750,6 +750,11 @@ void print_hud_lut_string(s8 hudLUT, s16 x, s16 y, const u8 *str) {
case GLOBAL_CHAR_SPACE: case GLOBAL_CHAR_SPACE:
curX += 8; curX += 8;
break; break;
#endif
#ifdef VERSION_CN
// Hack, still broken but better than before
case 0x00:
if (hudLUT == HUD_LUT_CNFIX) break;
#endif #endif
default: default:
#endif #endif
@ -3330,7 +3335,7 @@ void render_course_complete_lvl_info_and_hud_str(void) {
// Print course number // Print course number
gSPDisplayList(gDisplayListHead++, dl_ia_text_begin); gSPDisplayList(gDisplayListHead++, dl_ia_text_begin);
int_to_str(gLastCompletedCourseNum, strCourseNum); INT_TO_STR_DIFF(gLastCompletedCourseNum, strCourseNum);
gDPSetEnvColor(gDisplayListHead++, 0, 0, 0, gMenuTextAlpha); gDPSetEnvColor(gDisplayListHead++, 0, 0, 0, gMenuTextAlpha);
print_generic_string(65, 165, LANGUAGE_ARRAY(textCourse)); print_generic_string(65, 165, LANGUAGE_ARRAY(textCourse));

6
src/game/ingame_menu.h
View file

@ -19,6 +19,7 @@
// to print specific Japanese HUD chars // to print specific Japanese HUD chars
#define HUD_LUT_JPMENU 1 #define HUD_LUT_JPMENU 1
#define HUD_LUT_GLOBAL 2 #define HUD_LUT_GLOBAL 2
#define HUD_LUT_CNFIX 3
// For file select JP HUD difference // For file select JP HUD difference
#if defined(VERSION_JP) || defined(VERSION_SH) #if defined(VERSION_JP) || defined(VERSION_SH)
@ -27,11 +28,10 @@
#define HUD_LUT_DIFF HUD_LUT_GLOBAL #define HUD_LUT_DIFF HUD_LUT_GLOBAL
#endif #endif
// They didn't change it everywhere in iQue
#ifdef VERSION_CN #ifdef VERSION_CN
#define HUD_LUT_DIFF2 HUD_LUT_JPMENU #define HUD_LUT_CNDIFF HUD_LUT_CNFIX
#else #else
#define HUD_LUT_DIFF2 HUD_LUT_DIFF #define HUD_LUT_CNDIFF HUD_LUT_GLOBAL
#endif #endif
// Japanese font use the same width string size // Japanese font use the same width string size

2
src/menu/file_select.c
View file

@ -1952,7 +1952,7 @@ void print_main_menu_strings(void) {
gSPDisplayList(gDisplayListHead++, dl_rgba16_text_begin); gSPDisplayList(gDisplayListHead++, dl_rgba16_text_begin);
gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, sTextBaseAlpha); gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, sTextBaseAlpha);
#ifndef VERSION_EU #ifndef VERSION_EU
print_hud_lut_string(HUD_LUT_DIFF2, SELECT_FILE_X, SELECT_FILE_Y, textSelectFile); print_hud_lut_string(HUD_LUT_DIFF, SELECT_FILE_X, SELECT_FILE_Y, textSelectFile);
#endif #endif
// Print file star counts // Print file star counts
print_save_file_star_count(SAVE_FILE_A, SAVEFILE_X1, 78); print_save_file_star_count(SAVE_FILE_A, SAVEFILE_X1, 78);