diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-20 17:21:46 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-20 17:21:46 +0100 |
| commit | 504363f2a686d3b7381ba0b7917a245ca422f024 (patch) | |
| tree | f9caa860a20c9f8e23a1247b80dfc1748e9d0bb9 /src/battle_controller_player.c | |
| parent | 4abc2eea8aee0efc714df8519533c55fbabae5f1 (diff) | |
| parent | 7e6a68a99a832383e7cbf3c91aef321dd46ed61f (diff) | |
Merge branch 'master' into decompile_trainer_see
Diffstat (limited to 'src/battle_controller_player.c')
| -rw-r--r-- | src/battle_controller_player.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index e497dbfe2..08c666d11 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -234,7 +234,7 @@ static void (*const sPlayerBufferCommands[CONTROLLER_CMDS_COUNT])(void) = static const u8 sTargetIdentities[] = {IDENTITY_PLAYER_MON1, IDENTITY_PLAYER_MON2, IDENTITY_OPPONENT_MON2, IDENTITY_OPPONENT_MON1}; // unknown unused data -static const u8 gUnknown_0831C5FC[] = {0x48, 0x48, 0x20, 0x5a, 0x50, 0x50, 0x50, 0x58}; +static const u8 sUnknown_0831C5FC[] = {0x48, 0x48, 0x20, 0x5a, 0x50, 0x50, 0x50, 0x58}; void nullsub_21(void) { |