diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2014-06-27 21:33:08 -0500 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2014-06-27 21:33:08 -0500 |
| commit | 1ecfe6bd23bb9b4e1886342c082bd5c3a108abbb (patch) | |
| tree | 8190d5b11ebec4505c5494baf74b339ae9c82078 /home/battle.asm | |
| parent | 1fbe471b74908be6e89777857bf7407ef427225b (diff) | |
| parent | d6fbdfb8decf6231d6b43fbfcba63f9ce60308dc (diff) | |
Merge pull request #256 from yenatch/master
Fix predefs and battle code.
Diffstat (limited to 'home/battle.asm')
| -rw-r--r-- | home/battle.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/home/battle.asm b/home/battle.asm index fc670d927..d1f59ad81 100644 --- a/home/battle.asm +++ b/home/battle.asm @@ -130,8 +130,8 @@ RefreshBattleHuds:: ; 39c9 ; 39d4 UpdateBattleHuds:: ; 39d4 - callba Function3df48 - callba Function3e036 + callba UpdatePlayerHUD + callba UpdateEnemyHUD ret ; 39e1 @@ -139,12 +139,12 @@ UpdateBattleHuds:: ; 39d4 GetBattleVar:: ; 39e1 ; Preserves hl. push hl - call _GetBattleVar + call GetBattleVarAddr pop hl ret ; 39e7 -_GetBattleVar:: ; 39e7 +GetBattleVarAddr:: ; 39e7 ; Get variable from pair a, depending on whose turn it is. ; There are 21 variable pairs. @@ -250,10 +250,10 @@ _GetBattleVar:: ; 39e7 dw PlayerSubStatus4, EnemySubStatus4 dw PlayerSubStatus5, EnemySubStatus5 dw BattleMonStatus, EnemyMonStatus - dw PlayerMoveAnimation, EnemyMoveAnimation - dw PlayerMoveEffect, EnemyMoveEffect - dw PlayerMovePower, EnemyMovePower - dw PlayerMoveType, EnemyMoveType + dw wPlayerMoveStruct + MOVE_ANIM, wEnemyMoveStruct + MOVE_ANIM + dw wPlayerMoveStruct + MOVE_EFFECT, wEnemyMoveStruct + MOVE_EFFECT + dw wPlayerMoveStruct + MOVE_POWER, wEnemyMoveStruct + MOVE_POWER + dw wPlayerMoveStruct + MOVE_TYPE, wEnemyMoveStruct + MOVE_TYPE dw CurPlayerMove, CurEnemyMove dw LastEnemyCounterMove, LastPlayerCounterMove dw LastPlayerMove, LastEnemyMove |