Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/ShrineFox/Persona-4-Golden-…
Browse files Browse the repository at this point in the history 
…Mod-Menu
  • Loading branch information
@TekkaGB
TekkaGB committed Sep 26, 2022
2 parents eedf844 + f05322c commit cc86d43
Show file tree
Hide file tree
Showing 7 changed files with 1,073 additions and 53 deletions.
5 changes: 4 additions & 1 deletion OtherMods/ConsistentReaper.flow
View file
Original file line number Diff line number Diff line change
Expand Up @@ -499,5 +499,8 @@ void dng_escape_hook()
{
CALL_DUNGEON( 160, 1 );
}

else
{
CALL_DUNGEON( 5, 1 ); // Yukiko's castle entrance in case we can't find the dungeon
}
}
3 changes: 3 additions & 0 deletions OtherMods/DungeonOptions/DungeonError.msg
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[msg GOHOM_ERROR]
[f 0 5 65278][f 2 1]Unable to determine what dungeon you are in[n]going to Yukiko's Castle as a fallback.[n][f 1 1][e]
[f 0 5 65278][f 2 1]Please report this bug with the information[n]that the floor number was [f 2 4 1].[n][f 1 1][e]
12 changes: 10 additions & 2 deletions OtherMods/DungeonOptions/GohoM.flow
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import("GohoM.msg");
import("DungeonError.msg");

void use_gohom()
{
Expand Down Expand Up @@ -132,7 +133,7 @@ void use_gohom()
}

TRAESTO_VISUAL();

if ( var17 > 5 && var17 < 20 )
{
CALL_DUNGEON( 5, 1 );
Expand Down Expand Up @@ -169,6 +170,13 @@ void use_gohom()
{
CALL_DUNGEON( 160, 1 );
}

else
{
SET_MSG_VAR(1, var17, 0);
OPEN_MSG_WIN();
MSG(GOHOM_ERROR);
CLOSE_MSG_WIN();
CALL_DUNGEON( 5, 1 ); // Yukiko's castle entrance in case we can't find the dungeon
}
}

252 changes: 208 additions & 44 deletions OtherMods/QuickTravelPlus.flow
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ void StreetOrder(bool calendar, bool friend, bool save)
case 0:
SEL_CHK_PAD(14, 5);
int shopping = ADV_SEL( Street_Text, ShoppingDistrictDay, shoppingMask );
if (shopping < 4)
if (shopping < 2)
{
FADE( 2, 5 );
FADE_SYNC();
Expand All @@ -172,12 +172,10 @@ void StreetOrder(bool calendar, bool friend, bool save)
CALL_FIELD( 8, 2, 0, 0 );
break;
case 2:
DAIDARA_SHOP();
CALL_FIELD(8, 2, 2, 0 );
equip_shop();
break;
case 3:
SHIROKU_SHOP();
CALL_FIELD(8, 2, 3, 0);
item_shop();
break;
case 4:
call_velvet_room();
Expand Down Expand Up @@ -431,7 +429,7 @@ void NightOrder(bool calendar, bool friend, bool save)
case 0:
SEL_CHK_PAD(14, 4);
int shopping = ADV_SEL( Street_Text, ShoppingDistrict, streetMask );
if (shopping < 3)
if (shopping < 2)
{
FADE( 2, 5 );
FADE_SYNC();
Expand All @@ -451,44 +449,7 @@ void NightOrder(bool calendar, bool friend, bool save)
CALL_FIELD( 8, 2, 0, 0 );
break;
case 2:
BIT_ON( 0 + 0x0400 + 844 );
BIT_ON( 0 + 0x0400 + 845 );
BIT_ON( 0 + 0x0400 + 846 );
BIT_ON( 0 + 0x0400 + 847 );

if ( GET_DAY_OF_WEEK() == 1 )
{
BIT_OFF( 0 + 0x0400 + 844 );
}
else if ( GET_DAY_OF_WEEK() == 2 )
{
BIT_OFF( 0 + 0x0400 + 847 );
}
else if ( GET_DAY_OF_WEEK() == 3 )
{
BIT_OFF( 0 + 0x0400 + 846 );
}
else if ( GET_DAY_OF_WEEK() == 4 )
{
BIT_OFF( 0 + 0x0400 + 845 );
}
else
{
BIT_OFF( 0 + 0x0400 + 844 );
BIT_OFF( 0 + 0x0400 + 845 );
BIT_OFF( 0 + 0x0400 + 846 );
BIT_OFF( 0 + 0x0400 + 847 );
}
BIT_ON( 0 + 0x0400 + 1067 );
SHIROKU_PUB();
if ( BIT_CHK( 0 + 0x0400 + 1057 ) == 1 )
{
commu_yoru();
}
else
{
CALL_FIELD( 8, 2, 3, 0 );
}
item_shop();
break;
case 3:
call_velvet_room();
Expand Down Expand Up @@ -797,3 +758,206 @@ void call_velvet_room()

}

void equip_shop()
{

if ( CHECK_TIME_SPAN( 4, 11, 4, 12 ) == 1 )
{
OPEN_MSG_WIN();
MSG( EQUIP_SHOP_STOP );
CLOSE_MSG_WIN();
}
else if ( ( ( GET_TIME_OF_DAY() == 5 ) && ( GET_WEATHER() != 1 ) ) && ( GET_WEATHER() != 7 ) )
{
OPEN_MSG_WIN();
MSG( EQUIP_SHOP_CLOSED );
CLOSE_MSG_WIN();
}
else if ( ( BIT_CHK( 1538 ) == 1 ) && ( BIT_CHK( 131 ) == 0 ) )
{
commu_gojitu();
return;
}
else
{
FADE( 1, 10 );
FADE_SYNC();
DAIDARA_SHOP();
CALL_FIELD( 8, 2, 2, 0 );
}

}


// Procedure Index: 43
void item_shop()
{

if ( CHECK_TIME_SPAN( 4, 11, 4, 12 ) == 1 )
{
OPEN_MSG_WIN();
MSG( MSG_ITEMSHOP_0411 );
CLOSE_MSG_WIN();
}
else if ( GET_TIME_OF_DAY() == 5 )
{
BIT_ON( 1868 );
BIT_ON( 1869 );
BIT_ON( 1870 );
BIT_ON( 1871 );

if ( GET_DAY_OF_WEEK() == 1 )
{
BIT_OFF( 1868 );
}
else if ( GET_DAY_OF_WEEK() == 2 )
{
BIT_OFF( 1871 );
}
else if ( GET_DAY_OF_WEEK() == 3 )
{
BIT_OFF( 1870 );
}
else if ( GET_DAY_OF_WEEK() == 4 )
{
BIT_OFF( 1869 );
}
else
{
BIT_OFF( 1868 );
BIT_OFF( 1869 );
BIT_OFF( 1870 );
BIT_OFF( 1871 );
}

FADE( 1, 10 );
FADE_SYNC();
BIT_ON( 2091 );
SHIROKU_PUB();

if ( BIT_CHK( 2081 ) == 1 )
{
commu_yoru();
}
else
{
CALL_FIELD( 8, 2, 3, 0 );
}

}
else if ( ( BIT_CHK( 1538 ) == 1 ) && ( BIT_CHK( 131 ) == 0 ) )
{
commu_gojitu();
return;
}
else
{
FADE( 1, 10 );
FADE_SYNC();
SHIROKU_SHOP();
CALL_FIELD( 8, 2, 3, 0 );
}

}


void commu_gojitu()
{
int var119;

if ( BIT_CHK( 3405 ) == 1 )
{
OPEN_MSG_WIN();

if ( BIT_CHK( 1591 ) == 1 )
{
MSG( MSG_0320_NOMORE_NEED3 );
CLOSE_MSG_WIN();
return;
}
else if ( BIT_CHK( 1539 ) == 1 )
{

if ( BIT_CHK( 2304 ) == 1 )
{
MSG( MSG_0320_GO_HOME_COMU_AL_2 );
}
else
{
MSG( MSG_0320_GO_HOME_COMU_NO_2 );
CLOSE_MSG_WIN();
return;
}

}
else
{
MSG( MSG_0320_RETURN_HOME2 );
}

SEL_CHK_PAD( 14, 1 );
var119 = SEL( YESNO_SEL );
CLOSE_MSG_WIN();

if ( var119 == 0 )
{

if ( BIT_CHK( 3076 ) == 0 )
{
BIT_ON( 3076 );
}


if ( DATE_CHK( 3, 20 ) )
{
BIT_ON( 46 );
}

FADE( 1, 10 );
FADE_SYNC();
TV_STUDIO();
return;
}
else
{
return;
}

}
else
{
OPEN_MSG_WIN();

if ( BIT_CHK( 1591 ) == 1 )
{
MSG( MSG_0320_NOMORE_NEED3 );
CLOSE_MSG_WIN();
return;
}
else if ( BIT_CHK( 1539 ) == 1 )
{

if ( BIT_CHK( 2304 ) == 1 )
{
MSG( MSG_0320_GO_HOME_COMU_AL_3 );
}
else
{
MSG( MSG_0320_GO_HOME_COMU_NO_2 );
CLOSE_MSG_WIN();
gojitudan_guide();
return;
}

}
else
{
MSG( MSG_0320_RETURN_HOME2 );
}

CLOSE_MSG_WIN();
return;
}

}

40 changes: 39 additions & 1 deletion OtherMods/QuickTravelPlus.msg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,4 +113,42 @@
[msg MSG_0320_GO_HOME_COMU_AL2]
[f 0 5 -258][f 2 1]> You should have no reason to come[n]here anymore...[n][f 1 1][e]
[f 0 5 -258][f 2 1]> You now have said goodbye to everyone[n]who is close to you.[n][f 1 1][e]
[f 0 5 -258][f 2 1]> It's time for you to go back home to[n]prepare for tomorrow...[n][f 1 1][e]
[f 0 5 -258][f 2 1]> It's time for you to go back home to[n]prepare for tomorrow...[n][f 1 1][e]

[msg EQUIP_SHOP_STOP]
[s]> A fierce-looking man is single-mindedly[n]pounding on something in the back of the[n]store...[n][w][e]
[s]> You decide not to enter...[n][w][e]

[msg EQUIP_SHOP_CLOSED]
[s]> The store has closed for today...[n][w][e]

[msg MSG_ITEMSHOP_0411]
[s]> A variety of products lines the[n]shelves...[n][w][e]
[s]> A friendly-looking old lady sits behind[n]the counter...[n][w][e]

[msg MSG_0320_NOMORE_NEED2]
[s]> You should have no reason to come[n]here anymore...[n][w][e]

[msg MSG_0320_GO_HOME_COMU_NO_2]
[s]> You should have no reason to come[n]here anymore...[n][w][e]
[s]> You have yet to speak with some of[n]the people who are close to you.[n][w][e]

[msg MSG_0320_GO_HOME_COMU_AL_2]
[s]> You should have no reason to come[n]here anymore...[n][w][e]
[s]> You now have said goodbye to everyone[n]who is close to you.[n][w][e]
[s]> It's time for you to go back home to[n]prepare for tomorrow...[n][w][e]

[msg MSG_0320_RETURN_HOME2]
[s]> You should have no reason to come[n]here anymore...[n][w][e]
[s]> It's time for you to go back home to[n]prepare for tomorrow...[n][w][e]

[msg MSG_0320_NOMORE_NEED3]
[s]> There's no reason for you to be here...[n][w][e]

[msg MSG_0320_GO_HOME_COMU_AL_3]
[s]> You should have no reason to come[n]here anymore...[n][w][e]
[s]> You now have said goodbye to everyone[n]who is close to you.[n][w][e]
[s]> Is there something that you still[n]have to do here...?[n][w][e]

[msg MSG_0417_VELVET_DONOTENT]
[s]> You have no need to enter here...[n][w][e]
Loading

0 comments on commit cc86d43

Please sign in to comment.