diff options
| -rw-r--r-- | include/battle.h | 2 | ||||
| -rw-r--r-- | shared_syms.txt | 1 | ||||
| -rw-r--r-- | src/battle_ai.c | 10 | ||||
| -rw-r--r-- | src/rom_800D42C.c | 8 |
4 files changed, 11 insertions, 10 deletions
diff --git a/include/battle.h b/include/battle.h index 2f52fd986..d58b234e3 100644 --- a/include/battle.h +++ b/include/battle.h @@ -64,7 +64,7 @@ struct BattleStruct /* 0x2000000 */ struct AI_ThinkingStruct ai; }; -extern struct BattleStruct unk_2000000; +extern struct BattleStruct battle_2000000; extern struct AI_ThinkingStruct gAIThinkingSpace; #endif // GUARD_BATTLE_H diff --git a/shared_syms.txt b/shared_syms.txt index 523f1bd22..815aca4c5 100644 --- a/shared_syms.txt +++ b/shared_syms.txt @@ -1,3 +1,4 @@ +battle_2000000 = 0x2000000; unk_2000000 = 0x2000000; ewram = 0x2000000; 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 { |