diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-12-20 00:25:54 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-12-20 00:25:54 -0600 |
| commit | 7e6a68a99a832383e7cbf3c91aef321dd46ed61f (patch) | |
| tree | d5b91d2a2497a682bb536bc569c628a60e9ba5ae /src/battle_controller_player.c | |
| parent | fe6c93a4317d2a745375d6b56bbdb1243e73127a (diff) | |
| parent | 314b96af46db86b74203f67f7bdf2d68ff4d4e68 (diff) | |
Merge remote-tracking branch 'Egg/static_to_s'
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) { |