summaryrefslogtreecommitdiff
path: root/src/battle/battle_4.c
diff options
context:
space:
mode:
authorProjectRevoTPP <projectrevotpp@hotmail.com>2018-01-11 14:55:51 -0500
committerProjectRevoTPP <projectrevotpp@hotmail.com>2018-01-11 14:55:51 -0500
commit8b41179e9349ac3dcc98f2436be2fa70f5040a33 (patch)
treebe57f4b91ef966980e0ed8cee40cd920bb70c473 /src/battle/battle_4.c
parent2e713e820ac25a6a68a150c4f07d4865609985f6 (diff)
parente7672a1aeb5e42d6f4e416ede9f6220122d11743 (diff)
merge
Diffstat (limited to 'src/battle/battle_4.c')
-rw-r--r--src/battle/battle_4.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle/battle_4.c b/src/battle/battle_4.c
index 164329c1b..ae8f94130 100644
--- a/src/battle/battle_4.c
+++ b/src/battle/battle_4.c
@@ -93,7 +93,7 @@ extern u16 gChosenMove; //last used move in battle
extern u8 gBankInMenu;
extern u8 gActionForBanks[4];
extern u16 gUnknown_02024C2C[4]; //last used moves 2, used by sketch
-extern u16 gUnknown_030041B0;
+extern u16 gBattle_BG3_X;
extern u16 gUnknown_02024C4C[4]; //last used moves by banks, another one
extern u8 gCurrentTurnActionNumber;
extern u16 gTrappingMoves[];
@@ -17229,7 +17229,7 @@ static void atkF2_displaydexinfo(void)
LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(0x0600d000));
LoadCompressedPalette(gBattleTerrainPalette_BattleTower, 0x20, 0x60);
REG_BG3CNT = 0x5a0b;
- gUnknown_030041B0 = 0x100;
+ gBattle_BG3_X = 0x100;
BeginNormalPaletteFade(0xfffc, 0, 0x10, 0, 0);
gBattleCommunication[0]++;
}