Game-Decompilation/2ship2harkinian
1
0
Fork 0
mirror of https://github.com/HarbourMasters/2ship2harkinian.git synced 2024-11-23 05:59:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add extra days to file choose owl saves (#431)

Browse Source 
* Add extra days

* New textures from purple

Co-authored-by: PurpleHato <47987542+PurpleHato@users.noreply.github.com>

* Move strings to header.

* More new textures from purple

Co-authored-by: PurpleHato <47987542+PurpleHato@users.noreply.github.com>

---------

Co-authored-by: PurpleHato <47987542+PurpleHato@users.noreply.github.com>
This commit is contained in:
louist103 2024-05-19 21:07:03 -04:00 committed by Garrett Cox
parent b131806acb
commit e7e87f4215
4 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mm/assets/2s2h_assets.h
View File

@ -73,3 +73,9 @@ static const ALIGN_ASSET(2) char gPauseSaveConfirmationENGTex[] = dgPauseSaveCon
#define dgContinuePlayingENGTex "__OTR__textures/icon_item_static/gContinuePlayingENGTex"
static const ALIGN_ASSET(2) char gContinuePlayingENGTex[] = dgContinuePlayingENGTex;
#define dgFileSelFourthDayTex "__OTR__misc/title_static/gFileSelFourthDayTex"
static const ALIGN_ASSET(2) char gFileSelFourthDayTex[] = dgFileSelFourthDayTex;
#define dgFileSelCheatingDayTex "__OTR__misc/title_static/gFileSelCheatingDayTex"
static const ALIGN_ASSET(2) char gFileSelCheatingDayTex[] = dgFileSelCheatingDayTex;

BIN
mm/assets/custom/misc/title_static/gFileSelCheatingDayTex.i4.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
mm/assets/custom/misc/title_static/gFileSelFourthDayTex.i4.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

13
mm/src/overlays/gamestates/ovl_file_choose/z_file_choose_NES.c
View File

@ -13,6 +13,7 @@
#include "interface/parameter_static/parameter_static.h"
#include "misc/title_static/title_static.h"
#include "2s2h/Enhancements/FrameInterpolation/FrameInterpolation.h"
#include "2s2h_assets.h"
#include <string.h>
s32 D_808144F10 = 100;
@ -1314,18 +1315,26 @@ u16 D_80814654[] = {
0x194,
0x2A0,
};
TexturePtr sFileSelRemainsTextures[] = {
gFileSelOdolwasRemainsTex,
gFileSelGohtsRemainsTex,
gFileSelGyorgsRemainsTex,
gFileSelTwinmoldsRemainsTex,
};
// 2S2H [Port] When making an owl save on day 4 the texture was currupt. We also decided to add a texture for going past
// day 4.
TexturePtr sFileSelDayENGTextures[] = {
gFileSelFirstDayENGTex,
gFileSelFirstDayENGTex,
gFileSelSecondDayENGTex,
gFileSelFinalDayENGTex,
gFileSelFourthDayTex,
gFileSelCheatingDayTex,
};
TexturePtr sFileSelHeartPieceTextures[] = {
gFileSel0QuarterHeartENGTex,
gFileSel1QuarterHeartENGTex,
@ -1573,8 +1582,10 @@ void FileSelect_DrawFileInfo(GameState* thisx, s16 fileIndex) {
gSPVertex(POLY_OPA_DISP++, &this->windowContentVtx[D_80814654[fileIndex] + 0xDC], 8, 0);
gDPSetPrimColor(POLY_OPA_DISP++, 0x00, 0x00, 0, 0, 0, this->fileInfoAlpha[fileIndex]);
// 2S2H [Port] When making an owl save on day 4 the texture was currupt. We also decided to add a texture for going past day 4.
uint32_t dayIndex = CLAMP_MAX(this->day[sp20C], 5);
gDPLoadTextureBlock_4b(POLY_OPA_DISP++, sFileSelDayENGTextures[this->day[sp20C]], G_IM_FMT_I, 48, 24, 0,
gDPLoadTextureBlock_4b(POLY_OPA_DISP++, sFileSelDayENGTextures[dayIndex], G_IM_FMT_I, 48, 24, 0,
G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOLOD);
gSP1Quadrangle(POLY_OPA_DISP++, 4, 6, 7, 5, 0);