pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

SelfDestruct -> Selfdestruct

Browse Source 
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.
This commit is contained in:
mid-kid
2017-11-18 17:28:12 +01:00
parent 23445ba4be
commit 1bf12455e4
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
battle/effect_command_pointers.asm
View File

@@ -26,7 +26,7 @@ BattleCommandPointers: ; 3fd28
dw BattleCommand_BurnTarget ; 3608c dw BattleCommand_BurnTarget ; 3608c
dw BattleCommand_FreezeTarget ; 36102 dw BattleCommand_FreezeTarget ; 36102
dw BattleCommand_ParalyzeTarget ; 36165 dw BattleCommand_ParalyzeTarget ; 36165
dw BattleCommand_SelfDestruct ; 37380 dw BattleCommand_Selfdestruct ; 37380
dw BattleCommand_MirrorMove ; 373c9 dw BattleCommand_MirrorMove ; 373c9
dw BattleCommand_StatUp ; 361e4 dw BattleCommand_StatUp ; 361e4
dw BattleCommand_StatDown ; 362e3 dw BattleCommand_StatDown ; 362e3

4
battle/effect_commands.asm
View File

@@ -8605,8 +8605,8 @@ CheckSubstituteOpp: ; 37378
; 37380 ; 37380
BattleCommand_SelfDestruct: ; 37380 BattleCommand_Selfdestruct: ; 37380
callba TrainerRankings_SelfDestruct callba TrainerRankings_Selfdestruct
ld a, BATTLEANIM_PLAYER_DAMAGE ld a, BATTLEANIM_PLAYER_DAMAGE
ld [wNumHits], a ld [wNumHits], a
ld c, 3 ld c, 3

2
constants/sram_constants.asm
View File

@@ -36,7 +36,7 @@ sTrainerRankingUnused3 EQU $a060
sTrainerRankingColosseumWins EQU $a063 sTrainerRankingColosseumWins EQU $a063
sTrainerRankingColosseumLosses EQU $a066 sTrainerRankingColosseumLosses EQU $a066
sTrainerRankingColosseumDraws EQU $a069 sTrainerRankingColosseumDraws EQU $a069
sTrainerRankingSelfDestruct EQU $a06c sTrainerRankingSelfdestruct EQU $a06c
sTrainerRankingCurrentSlotsStreak EQU $a06f sTrainerRankingCurrentSlotsStreak EQU $a06f
sTrainerRankingLongestSlotsStreak EQU $a071 sTrainerRankingLongestSlotsStreak EQU $a071
sTrainerRankingTotalSlotsPayouts EQU $a073 sTrainerRankingTotalSlotsPayouts EQU $a073

6
misc/mobile_41.asm
View File

@@ -381,13 +381,13 @@ TrainerRankings_ColosseumDraws: mobile ; draw
jr TrainerRankings_Increment3Byte jr TrainerRankings_Increment3Byte
; 10610d ; 10610d
; Counts uses of both SelfDestruct and Explosion. ; Counts uses of both Selfdestruct and Explosion.
TrainerRankings_SelfDestruct: mobile ; 10610d TrainerRankings_Selfdestruct: mobile ; 10610d
; Only counts if it’s the player’s turn ; Only counts if it’s the player’s turn
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
ret nz ret nz
ld hl, sTrainerRankingSelfDestruct ld hl, sTrainerRankingSelfdestruct
jr TrainerRankings_Increment3Byte jr TrainerRankings_Increment3Byte
; 106117 ; 106117