diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-10-28 13:35:26 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-10-28 14:39:52 -0400 |
| commit | b47bfbd813cc7981ff3b99baa7913933f28d67b9 (patch) | |
| tree | 0fea9afdc675ac7381e661f6fd344c55dcb32374 /engine/battle/core.asm | |
| parent | 9483cf47dd62d3c513dade49747e868f49f0e374 (diff) | |
Identify more WRAM labels, and start a <X>_DummyFunction label convention
Diffstat (limited to 'engine/battle/core.asm')
| -rw-r--r-- | engine/battle/core.asm | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 830a7a23..a006f376 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -2817,10 +2817,11 @@ PlayerMonFaintedAnimation: jp MonFaintedAnimation MonFaintedAnimation: - ld a, [wd8ba] + ld a, [wJoypadDisable] push af - set 6, a - ld [wd8ba], a + set JOYPAD_DISABLE_MON_FAINT_F, a + ld [wJoypadDisable], a + ld b, 7 .OuterLoop: @@ -2863,7 +2864,7 @@ MonFaintedAnimation: jr nz, .OuterLoop pop af - ld [wd8ba], a + ld [wJoypadDisable], a ret .Spaces: @@ -4403,7 +4404,7 @@ CheckDanger: PrintPlayerHUD: ld de, wBattleMonNick hlcoord 10, 7 - call ret_3df99 + call Battle_DummyFunction call PlaceString push bc @@ -4489,7 +4490,7 @@ DrawEnemyHUD: call GetBaseData ld de, wEnemyMonNick hlcoord 1, 0 - call ret_3df99 + call Battle_DummyFunction call PlaceString ld h, b ld l, c @@ -4618,7 +4619,8 @@ UpdateHPPal: ret z jp FinishBattleAnim -ret_3df99: +Battle_DummyFunction: +; called before placing either battler's nickname in the HUD ret BattleMenu: |