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

3 new changes

Browse source 
Change 0x0E geo bank lvl location to 0x1A

Use extenstion difference so tools can be used in MinGW and WSL

Fix segment2 build
This commit is contained in:
AloXado320 2020-12-26 22:43:43 -05:00
parent e375d9167a
commit b78b99dd19
4 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Makefile
View file

@ -998,17 +998,23 @@ endif
####################### Other Tools #########################
ifeq ($(WINDOWS_BUILD),1)
EXT_PREFIX := .exe
else
EXT_PREFIX :=
endif
# N64 conversion tools
TOOLS_DIR = tools
MIO0TOOL = $(TOOLS_DIR)/mio0
N64CKSUM = $(TOOLS_DIR)/n64cksum
N64GRAPHICS = $(TOOLS_DIR)/n64graphics
N64GRAPHICS_CI = $(TOOLS_DIR)/n64graphics_ci
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
SKYCONV = $(TOOLS_DIR)/skyconv
MIO0TOOL = $(TOOLS_DIR)/mio0$(EXT_PREFIX)
N64CKSUM = $(TOOLS_DIR)/n64cksum$(EXT_PREFIX)
N64GRAPHICS = $(TOOLS_DIR)/n64graphics$(EXT_PREFIX)
N64GRAPHICS_CI = $(TOOLS_DIR)/n64graphics_ci$(EXT_PREFIX)
TEXTCONV = $(TOOLS_DIR)/textconv$(EXT_PREFIX)
AIFF_EXTRACT_CODEBOOK = $(TOOLS_DIR)/aiff_extract_codebook$(EXT_PREFIX)
VADPCM_ENC = $(TOOLS_DIR)/vadpcm_enc$(EXT_PREFIX)
EXTRACT_DATA_FOR_MIO = $(TOOLS_DIR)/extract_data_for_mio$(EXT_PREFIX)
SKYCONV = $(TOOLS_DIR)/skyconv$(EXT_PREFIX)
EMULATOR = mupen64plus
EMU_FLAGS = --noosd
LOADER = loader64
@ -1023,7 +1029,7 @@ define print
endef
ifeq (, $(shell which armips 2>/dev/null))
RSPASM := $(TOOLS_DIR)/armips
RSPASM := $(TOOLS_DIR)/armips$(EXT_PREFIX)
else
RSPASM = armips
endif

4
bin/segment2.c
View file

@ -143,7 +143,7 @@ ALIGNED8 static const Texture texture_hud_char_W[] = {
};
ALIGNED8 static const Texture texture_hud_char_X[] = {
#include "textures/segment2/segment2.04200.rgba16.inc.c"
#include "textures/segment2/segment2.04200_custom.rgba16.inc.c"
};
ALIGNED8 static const Texture texture_hud_char_Y[] = {
@ -151,7 +151,7 @@ ALIGNED8 static const Texture texture_hud_char_Y[] = {
};
ALIGNED8 static const Texture texture_hud_char_Z[] = {
#include "textures/segment2/segment2.04600.rgba16.inc.c"
#include "textures/segment2/segment2.04200_custom.rgba16.inc.c"
};
ALIGNED8 static const Texture texture_hud_char_apostrophe[] = {

4
levels/scripts.c
View file

@ -131,7 +131,7 @@ static const LevelScript script_L1[] = {
};
static const LevelScript script_L2[] = {
EXIT_AND_EXECUTE(/*seg*/ 0x0E, _endingSegmentRomStart, _endingSegmentRomEnd, level_ending_entry),
EXIT_AND_EXECUTE(/*seg*/ 0x1A, _endingSegmentRomStart, _endingSegmentRomEnd, level_ending_entry),
};
static const LevelScript goto_mario_head_regular[] = {
@ -161,7 +161,7 @@ static const LevelScript script_exec_level_table[] = {
#define DEFINE_LEVEL(_0, _1, _2, folder, _4, _5, _6, _7, _8, _9, _10) \
static const LevelScript script_exec_ ## folder [] = { \
EXECUTE(0x0E, _ ## folder ## SegmentRomStart, _ ## folder ## SegmentRomEnd, level_ ## folder ## _entry), \
EXECUTE(0x1A, _ ## folder ## SegmentRomStart, _ ## folder ## SegmentRomEnd, level_ ## folder ## _entry), \
RETURN(), \
};

2
sm64.ld
View file

@ -44,7 +44,7 @@ OUTPUT_ARCH (mips)
. = ALIGN(0x10); \
} \
END_SEG(name##_segment_7) \
BEGIN_SEG(name, 0x0E000000) \
BEGIN_SEG(name, 0x1A000000) \
{ \
BUILD_DIR/levels/name/script.o(.data); \
BUILD_DIR/levels/name/geo.o(.data); \