diff options
| author | mid-kid <esteve.varela@gmail.com> | 2017-11-18 17:28:12 +0100 |
|---|---|---|
| committer | mid-kid <esteve.varela@gmail.com> | 2017-11-18 17:28:12 +0100 |
| commit | 1bf12455e4ad9cb9a0fde0d1ac5fa29a48c63590 (patch) | |
| tree | 7e7552e3354c1f1b6232063b7eebeb74b88cb2f2 | |
| parent | 23445ba4beed3e02f21f0cb348036c236743454d (diff) | |
SelfDestruct -> Selfdestruct
Just keeping things consistent. Nobody's going to write SELF_DESTRUCT.
Kind of subjective, and we could do it the other way around, if anybody
really cares.
| -rw-r--r-- | battle/effect_command_pointers.asm | 2 | ||||
| -rw-r--r-- | battle/effect_commands.asm | 4 | ||||
| -rwxr-xr-x | constants/sram_constants.asm | 2 | ||||
| -rwxr-xr-x | misc/mobile_41.asm | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/battle/effect_command_pointers.asm b/battle/effect_command_pointers.asm index 1113f968f..8a9014fa5 100644 --- a/battle/effect_command_pointers.asm +++ b/battle/effect_command_pointers.asm @@ -26,7 +26,7 @@ BattleCommandPointers: ; 3fd28 dw BattleCommand_BurnTarget ; 3608c dw BattleCommand_FreezeTarget ; 36102 dw BattleCommand_ParalyzeTarget ; 36165 - dw BattleCommand_SelfDestruct ; 37380 + dw BattleCommand_Selfdestruct ; 37380 dw BattleCommand_MirrorMove ; 373c9 dw BattleCommand_StatUp ; 361e4 dw BattleCommand_StatDown ; 362e3 diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index 9eefdbc50..23ff3deaf 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -8605,8 +8605,8 @@ CheckSubstituteOpp: ; 37378 ; 37380 -BattleCommand_SelfDestruct: ; 37380 - callba TrainerRankings_SelfDestruct +BattleCommand_Selfdestruct: ; 37380 + callba TrainerRankings_Selfdestruct ld a, BATTLEANIM_PLAYER_DAMAGE ld [wNumHits], a ld c, 3 diff --git a/constants/sram_constants.asm b/constants/sram_constants.asm index c2d112b7d..f89343213 100755 --- a/constants/sram_constants.asm +++ b/constants/sram_constants.asm @@ -36,7 +36,7 @@ sTrainerRankingUnused3 EQU $a060 sTrainerRankingColosseumWins EQU $a063 sTrainerRankingColosseumLosses EQU $a066 sTrainerRankingColosseumDraws EQU $a069 -sTrainerRankingSelfDestruct EQU $a06c +sTrainerRankingSelfdestruct EQU $a06c sTrainerRankingCurrentSlotsStreak EQU $a06f sTrainerRankingLongestSlotsStreak EQU $a071 sTrainerRankingTotalSlotsPayouts EQU $a073 diff --git a/misc/mobile_41.asm b/misc/mobile_41.asm index 169107978..955682863 100755 --- a/misc/mobile_41.asm +++ b/misc/mobile_41.asm @@ -381,13 +381,13 @@ TrainerRankings_ColosseumDraws: mobile ; draw jr TrainerRankings_Increment3Byte ; 10610d -; Counts uses of both SelfDestruct and Explosion. -TrainerRankings_SelfDestruct: mobile ; 10610d +; Counts uses of both Selfdestruct and Explosion. +TrainerRankings_Selfdestruct: mobile ; 10610d ; Only counts if it’s the player’s turn ld a, [hBattleTurn] and a ret nz - ld hl, sTrainerRankingSelfDestruct + ld hl, sTrainerRankingSelfdestruct jr TrainerRankings_Increment3Byte ; 106117 |