diff options
| author | Garak <thomastaps194@comcast.net> | 2018-06-26 00:01:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-26 00:01:17 -0400 |
| commit | 1cada74444df875649b239ed488c6ee4deb8a7f1 (patch) | |
| tree | 0cd68b160fa8d4a27cd65d6ffa80159b231f715c /src/battle/battle_4.c | |
| parent | b3dec86071ae7d2eb5c1258ea778f0e823a5f636 (diff) | |
| parent | fa0e1ca4de35c9723a0972efeb6f7de4dca25594 (diff) | |
Merge pull request #3 from pret/master
upstream merge
Diffstat (limited to 'src/battle/battle_4.c')
| -rw-r--r-- | src/battle/battle_4.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle/battle_4.c b/src/battle/battle_4.c index d1435d8ea..54cacd0cb 100644 --- a/src/battle/battle_4.c +++ b/src/battle/battle_4.c @@ -164,7 +164,6 @@ 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 gBattle_BG3_X; extern u16 gUnknown_02024C4C[4]; //last used moves by banks, another one extern u8 gCurrentTurnActionNumber; extern u16 gTrappingMoves[]; @@ -1991,7 +1990,7 @@ static void atk0B_healthbarupdate(void) healthValue = currDmg; else healthValue = maxPossibleDmgValue; - + EmitHealthBarUpdate(0, healthValue); */ @@ -5544,6 +5543,7 @@ static void atk23_getexp(void) gBattleResources_statsBeforeLvlUp->spDef = GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_SPDEF); gActiveBattler = gBattleStruct->expGetterBank; + EmitExpBarUpdate(0, gBattleStruct->expGetterID, gBattleMoveDamage); MarkBufferBankForExecution(gActiveBattler); } |