Fix reviewed points.
This commit is contained in:
+1
-1
@@ -434,7 +434,7 @@ gUnknown_08615D9C:: @ 8615D9C
|
|||||||
.4byte sub_80D3718, 0x00000007
|
.4byte sub_80D3718, 0x00000007
|
||||||
.4byte SetUpFieldMove_Flash, 0x0000000d
|
.4byte SetUpFieldMove_Flash, 0x0000000d
|
||||||
.4byte sub_8135654, 0x0000000d
|
.4byte sub_8135654, 0x0000000d
|
||||||
.4byte hm_prepare_rocksmash, 0x0000000d
|
.4byte SetUpFieldMove_Strength, 0x0000000d
|
||||||
.4byte sub_81B5820, 0x00000008
|
.4byte sub_81B5820, 0x00000008
|
||||||
.4byte sub_81B5884, 0x0000000d
|
.4byte sub_81B5884, 0x0000000d
|
||||||
.4byte sub_81B5974, 0x0000000d
|
.4byte sub_81B5974, 0x0000000d
|
||||||
|
|||||||
@@ -10,5 +10,7 @@ void pal_fill_black(void);
|
|||||||
bool8 sub_80ABDFC(void);
|
bool8 sub_80ABDFC(void);
|
||||||
void sub_80AF168(void);
|
void sub_80AF168(void);
|
||||||
void UpdateWeatherPerDay(u16 days);
|
void UpdateWeatherPerDay(u16 days);
|
||||||
|
void sub_80AC3D0(void);
|
||||||
|
void sub_80AC3E4(void);
|
||||||
|
|
||||||
#endif //GUARD_FIELD_SCREEN_H
|
#endif //GUARD_FIELD_SCREEN_H
|
||||||
|
|||||||
@@ -0,0 +1,7 @@
|
|||||||
|
#ifndef GUARD_FLDEFF_GROUNDSHAKE_H
|
||||||
|
#define GUARD_FLDEFF_GROUNDSHAKE_H
|
||||||
|
|
||||||
|
void sub_81BE6B8(void);
|
||||||
|
void sub_81BE72C(void);
|
||||||
|
|
||||||
|
#endif // GUARD_FLDEFF_GROUNDSHAKE_H
|
||||||
@@ -7,22 +7,22 @@
|
|||||||
#include "script.h"
|
#include "script.h"
|
||||||
#include "task.h"
|
#include "task.h"
|
||||||
|
|
||||||
void sub_8145E0C(void);
|
void FldEff_UseStrength(void);
|
||||||
void sub_8145E74(void);
|
void sub_8145E74(void);
|
||||||
|
|
||||||
bool8 hm_prepare_rocksmash(void)
|
bool8 SetUpFieldMove_Strength(void)
|
||||||
{
|
{
|
||||||
if (npc_before_player_of_type(87) == TRUE)
|
if (npc_before_player_of_type(87) == TRUE)
|
||||||
{
|
{
|
||||||
gSpecialVar_Result = GetCursorSelectionMonId();
|
gSpecialVar_Result = GetCursorSelectionMonId();
|
||||||
gUnknown_03005DB0 = FieldCallback_Teleport;
|
gUnknown_03005DB0 = FieldCallback_Teleport;
|
||||||
gUnknown_0203CEEC = sub_8145E0C;
|
gUnknown_0203CEEC = FldEff_UseStrength;
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
void sub_8145E0C(void)
|
void FldEff_UseStrength(void)
|
||||||
{
|
{
|
||||||
gFieldEffectArguments[0] = GetCursorSelectionMonId();
|
gFieldEffectArguments[0] = GetCursorSelectionMonId();
|
||||||
ScriptContext1_SetupScript(FieryPath_EventScript_2908FD);
|
ScriptContext1_SetupScript(FieryPath_EventScript_2908FD);
|
||||||
@@ -39,6 +39,6 @@ bool8 sub_8145E2C(void)
|
|||||||
|
|
||||||
void sub_8145E74(void)
|
void sub_8145E74(void)
|
||||||
{
|
{
|
||||||
FieldEffectActiveListRemove(40);
|
FieldEffectActiveListRemove(FLDEFF_USE_STRENGTH);
|
||||||
EnableBothScriptContexts();
|
EnableBothScriptContexts();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,12 @@
|
|||||||
#include "global.h"
|
#include "global.h"
|
||||||
|
#include "constants/rgb.h"
|
||||||
|
#include "constants/songs.h"
|
||||||
#include "event_data.h"
|
#include "event_data.h"
|
||||||
#include "event_scripts.h"
|
#include "event_scripts.h"
|
||||||
#include "field_effect.h"
|
#include "field_effect.h"
|
||||||
#include "field_player_avatar.h"
|
#include "field_player_avatar.h"
|
||||||
|
#include "field_screen.h"
|
||||||
|
#include "fldeff_groundshake.h"
|
||||||
#include "palette.h"
|
#include "palette.h"
|
||||||
#include "party_menu.h"
|
#include "party_menu.h"
|
||||||
#include "rom6.h"
|
#include "rom6.h"
|
||||||
@@ -12,11 +16,6 @@
|
|||||||
#include "task.h"
|
#include "task.h"
|
||||||
#include "wild_encounter.h"
|
#include "wild_encounter.h"
|
||||||
|
|
||||||
extern void sub_81BE72C(void);
|
|
||||||
extern void sub_81BE6B8(void);
|
|
||||||
extern void sub_80AC3D0(void);
|
|
||||||
extern void sub_80AC3E4(void);
|
|
||||||
|
|
||||||
void hm2_sweet_scent(void);
|
void hm2_sweet_scent(void);
|
||||||
void sub_8159F5C(void);
|
void sub_8159F5C(void);
|
||||||
void sub_8159FEC(u8 taskId);
|
void sub_8159FEC(u8 taskId);
|
||||||
@@ -50,10 +49,10 @@ void sub_8159F5C(void)
|
|||||||
{
|
{
|
||||||
u8 taskId;
|
u8 taskId;
|
||||||
|
|
||||||
PlaySE(0xEC);
|
PlaySE(SE_W230);
|
||||||
CpuFastSet(gPlttBufferUnfaded, gPaletteDecompressionBuffer, 0x100);
|
CpuFastSet(gPlttBufferUnfaded, gPaletteDecompressionBuffer, 0x100);
|
||||||
CpuFastSet(gPlttBufferFaded, gPlttBufferUnfaded, 0x100);
|
CpuFastSet(gPlttBufferFaded, gPlttBufferUnfaded, 0x100);
|
||||||
BeginNormalPaletteFade(~(1 << (gSprites[GetPlayerAvatarObjectId()].oam.paletteNum + 16)), 4, 0, 8, 0x1F);
|
BeginNormalPaletteFade(~(1 << (gSprites[GetPlayerAvatarObjectId()].oam.paletteNum + 16)), 4, 0, 8, RGB_RED);
|
||||||
taskId = CreateTask(sub_8159FEC, 0);
|
taskId = CreateTask(sub_8159FEC, 0);
|
||||||
gTasks[taskId].data[0] = 0;
|
gTasks[taskId].data[0] = 0;
|
||||||
FieldEffectActiveListRemove(FLDEFF_SWEET_SCENT);
|
FieldEffectActiveListRemove(FLDEFF_SWEET_SCENT);
|
||||||
@@ -64,7 +63,7 @@ void sub_8159FEC(u8 taskId)
|
|||||||
if (!gPaletteFade.active)
|
if (!gPaletteFade.active)
|
||||||
{
|
{
|
||||||
sub_81BE72C();
|
sub_81BE72C();
|
||||||
BlendPalettes(64, 8, 0x1F);
|
BlendPalettes(0x00000040, 8, RGB_RED);
|
||||||
if (gTasks[taskId].data[0] == 64)
|
if (gTasks[taskId].data[0] == 64)
|
||||||
{
|
{
|
||||||
gTasks[taskId].data[0] = 0;
|
gTasks[taskId].data[0] = 0;
|
||||||
@@ -75,7 +74,7 @@ void sub_8159FEC(u8 taskId)
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
gTasks[taskId].func = sub_815A090;
|
gTasks[taskId].func = sub_815A090;
|
||||||
BeginNormalPaletteFade(~(1 << (gSprites[GetPlayerAvatarObjectId()].oam.paletteNum + 16)), 4, 8, 0, 0x1F);
|
BeginNormalPaletteFade(~(1 << (gSprites[GetPlayerAvatarObjectId()].oam.paletteNum + 16)), 4, 8, 0, RGB_RED);
|
||||||
sub_81BE6B8();
|
sub_81BE6B8();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user