diff options
| author | dannye <33dannye@gmail.com> | 2020-12-20 13:02:16 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2020-12-20 13:02:16 -0600 |
| commit | 614af9729f8b3fe30d52bace28eae083e1bc6127 (patch) | |
| tree | 65d13c1041593dad9ba34c9acb5cbca476894227 /src/engine/home.asm | |
| parent | b02e5e9cf9e424eacfa8dfffc769b35a3dadfee2 (diff) | |
| parent | f13ddf25bf61c79200c56666184fe84b579ad1cc (diff) | |
Merge branch 'master' of https://github.com/xCrystal/poketcg
Diffstat (limited to 'src/engine/home.asm')
| -rw-r--r-- | src/engine/home.asm | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/engine/home.asm b/src/engine/home.asm index c3c1024..11a7c37 100644 --- a/src/engine/home.asm +++ b/src/engine/home.asm @@ -2778,7 +2778,7 @@ ExchangeRNG: ; 0f58 (0:0f58) ; send 10 bytes of data to the other game from hOppActionTableIndex, hTempCardIndex_ff9f, ; hTemp_ffa0, and hTempPlayAreaLocation_ffa1, and hTempRetreatCostCards. ; finally exchange RNG data. -; the receiving side will use this data to read the OPP_ACTION_* value in +; the receiving side will use this data to read the OPPACTION_* value in ; [hOppActionTableIndex] and match it by calling the correspoding OppAction* function SetOppAction_SerialSendDuelData: ; 0f7f (0:0f7f) push hl @@ -4386,7 +4386,7 @@ Func_16f6: ; 16f6 (0:16f6) ld [wIsDamageToSelf], a ld [wccef], a ld [wMetronomeEnergyCost], a - ld [wNoEffectFromStatus], a + ld [wNoEffectFromWhichStatus], a bank1call ClearNonTurnTemporaryDuelvars_CopyStatus ret @@ -4522,7 +4522,7 @@ ClearNonTurnTemporaryDuelvars_ResetCarry: ; 1823 (0:1823) ret ; called when attacker deals damage to itself due to confusion -; display the corresponding animation and deal damage to self +; display the corresponding animation and deal 20 damage to self HandleConfusionDamageToSelf: ; 1828 (0:1828) bank1call DrawDuelMainScene ld a, 1 @@ -4696,9 +4696,8 @@ LoadNonPokemonCardEffectCommands: ; 1944 (0:1944) ld [de], a ret -; inflict recoil damage to self -; input: -; a = damage to deal +; Make turn holder deal A damage to self due to recoil (e.g. Thrash, Selfdestruct) +; display recoil animation DealRecoilDamageToSelf: ; 1955 (0:1955) push af ld a, $7a @@ -4706,6 +4705,8 @@ DealRecoilDamageToSelf: ; 1955 (0:1955) pop af ; fallthrough +; Make turn holder deal A damage to self due to confusion +; display animation at wLoadedMoveAnimation DealConfusionDamageToSelf: ; 195c (0:195c) ld hl, wDamage ld [hli], a @@ -11483,7 +11484,7 @@ DrawSpriteAnimationFrame: ; 3cc4 (0:3cc4) call BankswitchROM ret -; Loads a pointer to the current animation frame into SPRITE_ANIM_FRAME_DATA_POINTER using +; Loads a pointer to the current animation frame into SPRITE_ANIM_FRAME_DATA_POINTER using ; the current frame's offset ; [wd4ca] - current frame offset ; wTempPointer* - Pointer to current Animation |