dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Change language stuff based on the french decomp

Browse Source
This commit is contained in:
DizzyEggg
2022-08-04 11:53:16 +02:00
parent 79384ec9f3
commit c991131b75
10 changed files with 56 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/battle_script_commands.c
View File

@@ -5369,7 +5369,7 @@ static void Cmd_yesnoboxlearnmove(void)
switch (gBattleScripting.learnMoveState)
{
case 0:
HandleBattleWindow(24, 8, 29, 13, 0);
HandleBattleWindow(YESNOBOX_X_Y, 0);
BattlePutTextOnWindow(gText_BattleYesNoChoice, B_WIN_YESNO);
gBattleScripting.learnMoveState++;
gBattleCommunication[CURSOR_POSITION] = 0;
@@ -5395,7 +5395,7 @@ static void Cmd_yesnoboxlearnmove(void)
PlaySE(SE_SELECT);
if (gBattleCommunication[1] == 0)
{
HandleBattleWindow(24, 8, 29, 13, WINDOW_CLEAR);
HandleBattleWindow(YESNOBOX_X_Y, WINDOW_CLEAR);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
gBattleScripting.learnMoveState++;
}
@@ -5466,7 +5466,7 @@ static void Cmd_yesnoboxlearnmove(void)
}
break;
case 5:
HandleBattleWindow(24, 8, 29, 13, WINDOW_CLEAR);
HandleBattleWindow(YESNOBOX_X_Y, WINDOW_CLEAR);
gBattlescriptCurrInstr += 5;
break;
case 6:
@@ -5483,7 +5483,7 @@ static void Cmd_yesnoboxstoplearningmove(void)
switch (gBattleScripting.learnMoveState)
{
case 0:
HandleBattleWindow(24, 8, 29, 13, 0);
HandleBattleWindow(YESNOBOX_X_Y, 0);
BattlePutTextOnWindow(gText_BattleYesNoChoice, B_WIN_YESNO);
gBattleScripting.learnMoveState++;
gBattleCommunication[CURSOR_POSITION] = 0;
@@ -5513,13 +5513,13 @@ static void Cmd_yesnoboxstoplearningmove(void)
else
gBattlescriptCurrInstr += 5;
HandleBattleWindow(24, 8, 29, 13, WINDOW_CLEAR);
HandleBattleWindow(YESNOBOX_X_Y, WINDOW_CLEAR);
}
else if (JOY_NEW(B_BUTTON))
{
PlaySE(SE_SELECT);
gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
HandleBattleWindow(24, 8, 29, 13, WINDOW_CLEAR);
HandleBattleWindow(YESNOBOX_X_Y, WINDOW_CLEAR);
}
break;
}
@@ -5779,7 +5779,7 @@ static void Cmd_yesnobox(void)
switch (gBattleCommunication[0])
{
case 0:
HandleBattleWindow(24, 8, 29, 13, 0);
HandleBattleWindow(YESNOBOX_X_Y, 0);
BattlePutTextOnWindow(gText_BattleYesNoChoice, B_WIN_YESNO);
gBattleCommunication[0]++;
gBattleCommunication[CURSOR_POSITION] = 0;
@@ -5804,13 +5804,13 @@ static void Cmd_yesnobox(void)
{
gBattleCommunication[CURSOR_POSITION] = 1;
PlaySE(SE_SELECT);
HandleBattleWindow(24, 8, 29, 13, WINDOW_CLEAR);
HandleBattleWindow(YESNOBOX_X_Y, WINDOW_CLEAR);
gBattlescriptCurrInstr++;
}
else if (JOY_NEW(A_BUTTON))
{
PlaySE(SE_SELECT);
HandleBattleWindow(24, 8, 29, 13, WINDOW_CLEAR);
HandleBattleWindow(YESNOBOX_X_Y, WINDOW_CLEAR);
gBattlescriptCurrInstr++;
}
break;
@@ -10116,7 +10116,7 @@ static void Cmd_trygivecaughtmonnick(void)
switch (gBattleCommunication[MULTIUSE_STATE])
{
case 0:
HandleBattleWindow(24, 8, 29, 13, 0);
HandleBattleWindow(YESNOBOX_X_Y, 0);
BattlePutTextOnWindow(gText_BattleYesNoChoice, B_WIN_YESNO);
gBattleCommunication[MULTIUSE_STATE]++;
gBattleCommunication[CURSOR_POSITION] = 0;