diff --git a/makefile.gaz b/makefile.gaz index fc9eaaa39..8af81566f 100644 --- a/makefile.gaz +++ b/makefile.gaz @@ -545,11 +545,13 @@ BOOTSTRAP_MAP := $(TEMP_DIR)/PsxBoot.map BOOTSTRAP_SYM := $(TEMP_DIR)/PsxBoot.sym BOOTSTRAP_EXE := $(TEMP_DIR)/PsxBoot.exe -USA_BOOTSTRAP_OUT :=$(CD_DIR)/BOOTUSA.EXE +USA_BOOTSTRAP_OUT :=$(CD_DIR)/SLUS_013.52 USA_CPE2X_PARAM :=/CA EUR_BOOTSTRAP_OUT :=$(CD_DIR)/BOOTEUR.EXE EUR_CPE2X_PARAM :=/CE + + cddata: ifeq ($(USER_NAME),CDBUILD) @$(MKDIR) -p $(CD_DIR) @@ -563,7 +565,6 @@ ifeq ($(USER_NAME),CDBUILD) @$(CP) -u Data/CdData/intro.str $(CD_DIR)/intro.str @$(CP) -u Data/CdData/track1.ixa $(CD_DIR)/track1.ixa @$(RAR) x data/CDData/ZZZZZZZ.RAR $(CD_DIR)/ -y >nul - @$(ECHO) HERE # Compile bootstrap @ccpsx -O2 -g $(BOOTSTRAP_IN) -c -Xo$801c0000 $(COMMON_CCFLAGS) -oPsxBoot.o diff --git a/makefile.gfx b/makefile.gfx index 21e30edf2..197b29e99 100644 --- a/makefile.gfx +++ b/makefile.gfx @@ -251,7 +251,7 @@ UI_GFX_TRANS := +bambootopleft.bmp +bamboobotleft.bmp +bambootopright.bmp +ba +mappointer.bmp +speechbubblecorner.bmp \ faces/mr_krabs.bmp faces/patrick.bmp faces/plankton.bmp \ faces/sandy.bmp faces/spongebob.bmp faces/squidward.bmp \ - faces/mermaidman.bmp faces/barnacleboy.bmp faces/jack_custard.bmp faces/gary.bmp \ + faces/mermaidman.bmp faces/barnacleboy.bmp faces/gary.bmp \ +helpbox1.bmp +helpbox2.bmp +helpbox3.bmp +helpbox4.bmp UI_GFX_TRANS_IN := $(foreach FILE,$(UI_GFX_TRANS),$(UI_GFX_DIR)/$(FILE))