diff options
| author | YamaArashi <YamaArashi@users.noreply.github.com> | 2017-01-05 20:16:57 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-05 20:16:57 -0800 |
| commit | 30e676b149a3a3a6ab65a371e636df8260b52b9c (patch) | |
| tree | 621e6f7ace55b16a6e0c39fdae25c05cb248de9d /src | |
| parent | 94fb9ab2a9ed111c72a80693d8f29ea4bc531898 (diff) | |
| parent | dc2d1251f1453049b9caadb5bb955083a7e54028 (diff) | |
Merge pull request #166 from ProjectRevoTPP/master
quick fix to make ROM build again
Diffstat (limited to 'src')
| -rw-r--r-- | src/battle_ai.c | 10 | ||||
| -rw-r--r-- | src/rom_800D42C.c | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/battle_ai.c b/src/battle_ai.c index 1bb57cc59..d4bb61336 100644 --- a/src/battle_ai.c +++ b/src/battle_ai.c @@ -1253,11 +1253,11 @@ void BattleAICmd_unk_30(void) s32 i; gUnknown_02024DEC = 0; - unk_2000000.unk.unk1 = 0; - unk_2000000.unk.unk4 = 1; + battle_2000000.unk.unk1 = 0; + battle_2000000.unk.unk4 = 1; gUnknown_02024C68 = 0; gCritMultiplier = 1; - unk_2000000.ai.unk0 = 0; + battle_2000000.ai.unk0 = 0; for(i = 0; i < 4; i++) { @@ -1281,8 +1281,8 @@ void BattleAICmd_unk_30(void) if(gUnknown_02024C68 & 8) gUnknown_02024BEC = 0; - if (unk_2000000.ai.unk0 < gUnknown_02024BEC) - unk_2000000.ai.unk0 = gUnknown_02024BEC; + if (battle_2000000.ai.unk0 < gUnknown_02024BEC) + battle_2000000.ai.unk0 = gUnknown_02024BEC; } } gAIScriptPtr += 1; diff --git a/src/rom_800D42C.c b/src/rom_800D42C.c index 3df2ee5e3..e9c816818 100644 --- a/src/rom_800D42C.c +++ b/src/rom_800D42C.c @@ -39,7 +39,7 @@ void sub_800DC24(void) { if (gUnknown_02024D26 == 1) { // lp_field_18 = player position? - switch (gLinkPlayers[unk_2000000.linkPlayerIndex].lp_field_18) { + switch (gLinkPlayers[battle_2000000.linkPlayerIndex].lp_field_18) { case 0: case 2: PRINT_MESSAGE_LEFT(BattleText_Win, 160); PRINT_MESSAGE_RIGHT(BattleText_Loss, 168); @@ -52,7 +52,7 @@ void sub_800DC24(void) { } } else { - switch (gLinkPlayers[unk_2000000.linkPlayerIndex].lp_field_18) { + switch (gLinkPlayers[battle_2000000.linkPlayerIndex].lp_field_18) { case 1: case 3: PRINT_MESSAGE_LEFT(BattleText_Win, 160); PRINT_MESSAGE_RIGHT(BattleText_Loss, 168); @@ -70,7 +70,7 @@ void sub_800DC24(void) { if (gUnknown_02024D26 == 1) { - if (gLinkPlayers[unk_2000000.linkPlayerIndex].lp_field_18 != 0) { + if (gLinkPlayers[battle_2000000.linkPlayerIndex].lp_field_18 != 0) { PRINT_MESSAGE_RIGHT(BattleText_Win, 160); PRINT_MESSAGE_LEFT(BattleText_Loss, 168); } else { @@ -78,7 +78,7 @@ void sub_800DC24(void) { PRINT_MESSAGE_RIGHT(BattleText_Loss, 168); } } else { - if (gLinkPlayers[unk_2000000.linkPlayerIndex].lp_field_18 != 0) { + if (gLinkPlayers[battle_2000000.linkPlayerIndex].lp_field_18 != 0) { PRINT_MESSAGE_LEFT(BattleText_Win, 160); PRINT_MESSAGE_RIGHT(BattleText_Loss, 168); } else { |