diff --git a/Bin/AIRPORT.bin b/Bin/AIRPORT.bin index 7cdbcab..33e4085 100644 Binary files a/Bin/AIRPORT.bin and b/Bin/AIRPORT.bin differ diff --git a/Source/Airport.geany b/Source/Airport.geany index 79f5340..0d1df5e 100644 --- a/Source/Airport.geany +++ b/Source/Airport.geany @@ -30,12 +30,12 @@ long_line_column=120 [files] current_page=5 FILE_NAME_0=8700;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FAircraft.c;0;4 -FILE_NAME_1=5265;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FCamera.c;0;4 +FILE_NAME_1=5507;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FCamera.c;0;4 FILE_NAME_2=4555;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FEndAnimation.c;0;4 FILE_NAME_3=6794;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FFont.c;0;4 -FILE_NAME_4=15748;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FGame.c;0;4 -FILE_NAME_5=21375;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FGameGui.c;0;4 -FILE_NAME_6=3129;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FGfx.c;0;4 +FILE_NAME_4=96128;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FGame.c;0;4 +FILE_NAME_5=18131;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FGameGui.c;0;4 +FILE_NAME_6=19913;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FGfx.c;0;4 FILE_NAME_7=11629;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FLoadMenu.c;0;4 FILE_NAME_8=717;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2Fmain.c;0;4 FILE_NAME_9=745;C;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FMainMenuBtnAni.c;0;4 @@ -54,9 +54,9 @@ FILE_NAME_21=392;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FCamera FILE_NAME_22=529;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FEndAnimation.h;0;4 FILE_NAME_23=1145;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FFont.h;0;4 FILE_NAME_24=1682;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FGameGui.h;0;4 -FILE_NAME_25=1610;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FGame.h;0;4 -FILE_NAME_26=6047;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FGameStructures.h;0;4 -FILE_NAME_27=3576;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FGfx.h;0;4 +FILE_NAME_25=1451;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FGame.h;0;4 +FILE_NAME_26=4657;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FGameStructures.h;0;4 +FILE_NAME_27=3436;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FGfx.h;0;4 FILE_NAME_28=300;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FGlobal_Inc.h;0;4 FILE_NAME_29=630;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FLoadMenu.h;0;4 FILE_NAME_30=559;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FMainMenuBtnAni.h;0;4 @@ -70,7 +70,7 @@ FILE_NAME_37=490;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FSerial FILE_NAME_38=815;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FSfx.h;0;4 FILE_NAME_39=4207;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FSystem.h;0;4 FILE_NAME_40=1066;C++;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FTimer.h;0;4 -FILE_NAME_41=2489;Make;0;EUTF-8;1;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FMakefile;0;4 +FILE_NAME_41=264;Make;0;EUTF-8;1;1;0;%2Fhome%2Fxavier%2FAirport%2FSource%2FMakefile;0;4 FILE_NAME_42=319;None;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FLevels%2FLEVEL3.PLT;0;4 FILE_NAME_43=319;None;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FLevels%2FEASY.PLT;0;4 FILE_NAME_44=319;None;0;EUTF-8;0;1;0;%2Fhome%2Fxavier%2FAirport%2FLevels%2FLEVEL1.PLT;0;4 diff --git a/Source/Exe/AIRPORT.elf b/Source/Exe/AIRPORT.elf index b4e899a..df7d354 100755 Binary files a/Source/Exe/AIRPORT.elf and b/Source/Exe/AIRPORT.elf differ diff --git a/Source/Exe/AIRPORT.exe b/Source/Exe/AIRPORT.exe index 621d266..199925c 100644 Binary files a/Source/Exe/AIRPORT.exe and b/Source/Exe/AIRPORT.exe differ diff --git a/Source/Exe/AIRPORT.iso b/Source/Exe/AIRPORT.iso index 9d8cefc..96f3c57 100644 Binary files a/Source/Exe/AIRPORT.iso and b/Source/Exe/AIRPORT.iso differ diff --git a/Source/Makefile b/Source/Makefile index 09a1185..6ac841a 100644 --- a/Source/Makefile +++ b/Source/Makefile @@ -13,7 +13,7 @@ GNU_SIZE = mipsel-unknown-elf-size DEFINE= -DFIXMATH_FAST_SIN -D_PAL_MODE_ #DEFINE += -DPSXSDK_DEBUG DEFINE += -DNO_CDDA -DEFINE += -DNO_INTRO +#DEFINE += -DNO_INTRO # Compiler flags LIBS= -lfixmath @@ -27,7 +27,7 @@ CDROM_ROOT=$(PROJECT_DIR)/cdimg BIN_TARGET_PATH = $(PROJECT_DIR)/Bin #Uncomment this DEFINE below to use Airport together with OpenSend + QPSXSerial toolchain. -#DEFINE += -DSERIAL_INTERFACE +DEFINE += -DSERIAL_INTERFACE # PSXSDK tools definitions # ELF2EXE: diff --git a/Source/Menu.c b/Source/Menu.c index f3651e2..dd000fd 100644 --- a/Source/Menu.c +++ b/Source/Menu.c @@ -143,7 +143,6 @@ static void MainMenuRenderLevelList(void); * **************************************/ static GsSprite MenuSpr; -static GsSprite MenuStarSpr; static SsVag BellSnd; static SsVag AcceptSnd; static TYPE_CHEAT TestCheat; @@ -257,7 +256,6 @@ static void MainMenuInit(void) "DATA\\SOUNDS\\BELL.VAG", "DATA\\SOUNDS\\ACCEPT.VAG", "DATA\\SPRITES\\BUTTONS.TIM", - "DATA\\SPRITES\\MENUSTAR.TIM", #ifndef NO_INTRO "DATA\\SPRITES\\PSXDISK.TIM", "DATA\\FONTS\\INTROFNT.TIM", @@ -274,7 +272,6 @@ static void MainMenuInit(void) &BellSnd, &AcceptSnd, &PSXButtons, - &MenuStarSpr, #ifndef NO_INTRO &PsxDisk, &PSXSDKIntroFont, @@ -318,21 +315,6 @@ static void MainMenuInit(void) MainMenuMinimumBtn = PLAY_BUTTON_INDEX; - { - enum - { - MENU_STAR_X = 32, - MENU_STAR_Y = Y_SCREEN_RESOLUTION - 32, - }; - - MenuStarSpr.x = MENU_STAR_X; - MenuStarSpr.y = MENU_STAR_Y; - } - - MenuStarSpr.mx = MenuStarSpr.w >> 1; - MenuStarSpr.my = MenuStarSpr.h >> 1; - MenuStarSpr.rotate = 0; - SelectedLevel = LEVEL1; MenuCheatInit(); @@ -419,8 +401,6 @@ void MainMenu(void) GsSortCls(MAIN_MENU_BG_R, MAIN_MENU_BG_G, MAIN_MENU_BG_B); - MenuStarSpr.rotate += ROTATE_ONE; - switch(menuLevel) { case PLAY_OPTIONS_LEVEL: diff --git a/cdimg/AIRPORT.exe b/cdimg/AIRPORT.exe index 621d266..199925c 100644 Binary files a/cdimg/AIRPORT.exe and b/cdimg/AIRPORT.exe differ