diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-08-18 18:25:44 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-08-18 18:25:44 +0200 |
| commit | 6ce3827987f48f4ba13f67d38382decd8206d00d (patch) | |
| tree | c78380a475d588dc772c226b1dc7f15a8a0a8a94 /src | |
| parent | e9ec2a1a561d3041b8df2cb512a0e03ff5bca74b (diff) | |
cam fixed a function yay
Diffstat (limited to 'src')
| -rw-r--r-- | src/battle_transition.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_transition.c b/src/battle_transition.c index 35d3baf0c..47adccf21 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -41,7 +41,7 @@ struct TransitionData s16 field_18; }; -#define TRANSITION_STRUCT (*(struct TransitionData *) (&ewram[0xC000])) +#define TRANSITION_STRUCT (*(struct TransitionData *) (ewram + 0xC000)) // this file's functions static void LaunchBattleTransitionTask(u8 transitionID); @@ -291,7 +291,7 @@ bool8 Phase2_Transition2_Func2(struct Task* task) for (i = 0; i < 160; i++, r4 += 4224) { u16 var = r4 / 256; - gUnknown_03004DE0[0][i] = Sin(var, r3) + TRANSITION_STRUCT.field_16; + gUnknown_03004DE0[0][i] = TRANSITION_STRUCT.field_16 + Sin(var, r3); } if (!gPaletteFade.active) |