diff --git a/field/pack/fd007_001/f007.flow b/field/pack/fd007_001/f007.flow index 5ea2e44..d5ebef3 100644 --- a/field/pack/fd007_001/f007.flow +++ b/field/pack/fd007_001/f007.flow @@ -333,7 +333,7 @@ void call_velvet_room() FLD_FUNCTION_0008( 10243, 1, 0, 0, 1 ); WAIT( 15 ); FADE( 1, 10 ); - FUNCTION_0024( 255, 255, 255 ); + SET_FADE_COLOUR( 255, 255, 255 ); FADE_SYNC(); eve_0320_velvetroom(); FUNCTION_006B( 1 ); @@ -348,7 +348,7 @@ void call_velvet_room() FLD_FUNCTION_0008( 10243, 1, 0, 0, 1 ); WAIT( 15 ); FADE( 1, 10 ); - FUNCTION_0024( 255, 255, 255 ); + SET_FADE_COLOUR( 255, 255, 255 ); FADE_SYNC(); eve_0320_vs_marguerite(); CALL_FIELD( 8, 2, 4, 0 ); @@ -386,7 +386,7 @@ void call_velvet_room() FLD_FUNCTION_0008( 10243, 1, 0, 0, 1 ); WAIT( 15 ); FADE( 1, 10 ); - FUNCTION_0024( 255, 255, 255 ); + SET_FADE_COLOUR( 255, 255, 255 ); FADE_SYNC(); BIT_ON( 0 + 0x0400 + 655 ); diff --git a/field/pack/fd010_002/f010.flow b/field/pack/fd010_002/f010.flow index b154d76..03206d8 100644 --- a/field/pack/fd010_002/f010.flow +++ b/field/pack/fd010_002/f010.flow @@ -51,7 +51,7 @@ void up_embankment_hook() { FADE( 1, 5 ); FADE_SYNC(); - FUNCTION_0023( 1, 24 ); + PLAY_SYS_SOUNDEFFECT( 1, 24 ); CALL_FIELD( 10, 1, 1, 0 ); } @@ -220,7 +220,7 @@ void call_velvet_room() FLD_FUNCTION_0008( 10243, 1, 0, 0, 1 ); WAIT( 15 ); FADE( 1, 10 ); - FUNCTION_0024( 255, 255, 255 ); + SET_FADE_COLOUR( 255, 255, 255 ); FADE_SYNC(); eve_0320_velvetroom(); FUNCTION_006B( 1 ); @@ -235,7 +235,7 @@ void call_velvet_room() FLD_FUNCTION_0008( 10243, 1, 0, 0, 1 ); WAIT( 15 ); FADE( 1, 10 ); - FUNCTION_0024( 255, 255, 255 ); + SET_FADE_COLOUR( 255, 255, 255 ); FADE_SYNC(); eve_0320_vs_marguerite(); CALL_FIELD( 8, 2, 4, 0 ); @@ -273,7 +273,7 @@ void call_velvet_room() FLD_FUNCTION_0008( 10243, 1, 0, 0, 1 ); WAIT( 15 ); FADE( 1, 10 ); - FUNCTION_0024( 255, 255, 255 ); + SET_FADE_COLOUR( 255, 255, 255 ); FADE_SYNC(); BIT_ON( 0 + 0x0400 + 655 ); diff --git a/field/script/lmap.flow b/field/script/lmap.flow index 504f38e..9d2f193 100644 --- a/field/script/lmap.flow +++ b/field/script/lmap.flow @@ -313,7 +313,7 @@ void call_velvet_room() FLD_FUNCTION_0008( 10243, 1, 0, 0, 1 ); WAIT( 15 ); FADE( 1, 10 ); - FUNCTION_0024( 255, 255, 255 ); + SET_FADE_COLOUR( 255, 255, 255 ); FADE_SYNC(); eve_0320_velvetroom(); FUNCTION_006B( 1 ); @@ -328,7 +328,7 @@ void call_velvet_room() FLD_FUNCTION_0008( 10243, 1, 0, 0, 1 ); WAIT( 15 ); FADE( 1, 10 ); - FUNCTION_0024( 255, 255, 255 ); + SET_FADE_COLOUR( 255, 255, 255 ); FADE_SYNC(); eve_0320_vs_marguerite(); CALL_FIELD( 8, 2, 4, 0 ); @@ -366,7 +366,7 @@ void call_velvet_room() FLD_FUNCTION_0008( 10243, 1, 0, 0, 1 ); WAIT( 15 ); FADE( 1, 10 ); - FUNCTION_0024( 255, 255, 255 ); + SET_FADE_COLOUR( 255, 255, 255 ); FADE_SYNC(); BIT_ON( 0 + 0x0400 + 655 ); diff --git a/scheduler/scheduler_04.flow b/scheduler/scheduler_04.flow index 2203eed..1985b9c 100644 --- a/scheduler/scheduler_04.flow +++ b/scheduler/scheduler_04.flow @@ -19,7 +19,7 @@ void sdl04_10_PM_D_hook() PLAY_CUTSCENE( 1 ); FUNCTION_0065(); CALL_EVENT( 101, 1, 0 ); - FUNCTION_0051(); + SET_NAME(); CALL_EVENT( 102, 1, 0 ); PLAY_CUTSCENE( 2 ); FUNCTION_0065();