diff options
Diffstat (limited to 'battle')
| -rw-r--r-- | battle/ai/items.asm | 2 | ||||
| -rwxr-xr-x | battle/ai/redundant.asm | 2 | ||||
| -rw-r--r-- | battle/anim_commands.asm | 2 | ||||
| -rw-r--r-- | battle/bg_effects.asm | 10 | ||||
| -rw-r--r-- | battle/core.asm | 20 | ||||
| -rw-r--r-- | battle/effect_commands.asm | 6 | ||||
| -rwxr-xr-x | battle/objects/functions.asm | 4 |
7 files changed, 23 insertions, 23 deletions
diff --git a/battle/ai/items.asm b/battle/ai/items.asm index 155e0bd3b..325c7b555 100644 --- a/battle/ai/items.asm +++ b/battle/ai/items.asm @@ -211,7 +211,7 @@ AI_TryItem: ; 38105 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .callback pop de pop hl diff --git a/battle/ai/redundant.asm b/battle/ai/redundant.asm index da71d0ece..e3dda8c4b 100755 --- a/battle/ai/redundant.asm +++ b/battle/ai/redundant.asm @@ -11,7 +11,7 @@ AI_Redundant: ; 2c41a ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .Moves: ; 2c42c dbw EFFECT_DREAM_EATER, .DreamEater diff --git a/battle/anim_commands.asm b/battle/anim_commands.asm index 957b2a066..958dcfe40 100644 --- a/battle/anim_commands.asm +++ b/battle/anim_commands.asm @@ -347,7 +347,7 @@ RunBattleAnimCommand: ; cc25f ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; cc2a4 diff --git a/battle/bg_effects.asm b/battle/bg_effects.asm index b7f415770..22807f77d 100644 --- a/battle/bg_effects.asm +++ b/battle/bg_effects.asm @@ -75,7 +75,7 @@ DoBattleBGEffectFunction: ; c804a (32:404a) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl BattleBGEffects: ; c805a (32:405a) dw BattleBGEffect_End @@ -161,7 +161,7 @@ BattleBGEffects_AnonJumptable: ; c80d7 (32:40d7) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl BattleBGEffects_IncrementJumptable: ; c80e5 (32:40e5) ld hl, BG_EFFECT_STRUCT_JT_INDEX @@ -2059,7 +2059,7 @@ BattleBGEffect_1c: ; c8b00 (32:4b00) .cgb ld de, .Jumptable call BatttleBGEffects_GetNamedJumptablePointer - jp [hl] + jp hl .Jumptable: dw .cgb_zero @@ -2421,7 +2421,7 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77) ld de, .Jumptable_DMG call BatttleBGEffects_GetNamedJumptablePointer pop de - jp [hl] + jp hl .Jumptable_DMG: dw .zero_dmg @@ -2484,7 +2484,7 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77) ld de, .Jumptable_CGB call BatttleBGEffects_GetNamedJumptablePointer pop de - jp [hl] + jp hl .Jumptable_CGB: ; c8ddd (32:4ddd) dw .zero_cgb diff --git a/battle/core.asm b/battle/core.asm index 89a8c4c10..cb709e08d 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -2623,7 +2623,7 @@ AddBattleMoneyToAccount: ; 3d0be push bc ld b, h ld c, l - callba MobileFn_106008 + callba TrainerRankings_AddToBattlePayouts pop bc pop hl .loop @@ -4331,7 +4331,7 @@ SpikesDamage: ; 3dc23 jp WaitBGMap .hl - jp [hl] + jp hl ; 3dc5b PursuitSwitch: ; 3dc5b @@ -8401,7 +8401,7 @@ _DoBattle: ; 3f4d9 ; 3f4dd BattleIntro: ; 3f4dd - callba MobileFn_106050 ; mobile + callba TrainerRankings_Battles ; mobile call LoadTrainerOrWildMonPic xor a ld [TempBattleMonSpecies], a @@ -8486,7 +8486,7 @@ BackUpVBGMap2: ; 3f568 InitEnemyTrainer: ; 3f594 ld [TrainerClass], a - callba MobileFn_10606a + callba TrainerRankings_TrainerBattles xor a ld [TempEnemyMonSpecies], a callab GetTrainerAttributes @@ -8542,7 +8542,7 @@ InitEnemyTrainer: ; 3f594 InitEnemyWildmon: ; 3f607 ld a, WILD_BATTLE ld [wBattleMode], a - callba MobileFn_10605d + callba TrainerRankings_WildBattles call LoadEnemyMon ld hl, EnemyMonMoves ld de, wWildMonMoves @@ -8725,7 +8725,7 @@ CheckPayDay: ; 3f71d ; 3f759 ShowLinkBattleParticipantsAfterEnd: ; 3f759 - callba MobileFn_1060df + callba TrainerRankings_LinkBattles callba BackupMobileEventIndex ld a, [CurOTMon] ld hl, OTPartyMon1Status @@ -8755,17 +8755,17 @@ DetermineMobileBattleResult: ; 3f77c cp $1 jr c, .victory jr z, .loss - callba MobileFn_SaveBattleResult_Draw + callba TrainerRankings_ColosseumDraws ld de, .Draw jr .store_result .victory - callba MobileFn_SaveBattleResult_Win + callba TrainerRankings_ColosseumWins ld de, .Win jr .store_result .loss - callba MobileFn_SaveBattleResult_Lose + callba TrainerRankings_ColosseumLosses ld de, .Lose jr .store_result @@ -9513,7 +9513,7 @@ BattleStartMessage: ; 3fc8b cp BATTLETYPE_FISH jr nz, .NotFishing - callba MobileFn_106086 ; update fishing records? + callba TrainerRankings_HookedEncounters ld hl, HookedPokemonAttackedText jr .PlaceBattleStartText diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index 9ebf26209..221570d76 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -113,7 +113,7 @@ DoMove: ; 3402c jr .ReadMoveEffectCommand .DoMoveEffectCommand: - jp [hl] + jp hl ; 34084 @@ -8079,7 +8079,7 @@ BattleCommand_LeechSeed: ; 36f9d BattleCommand_Splash: ; 36fe1 call AnimateCurrentMove - callba MobileFn_1060e5 + callba TrainerRankings_Splash jp PrintNothingHappened ; 36fed @@ -8606,7 +8606,7 @@ CheckSubstituteOpp: ; 37378 BattleCommand_SelfDestruct: ; 37380 - callba MobileFn_10610d + callba TrainerRankings_SelfDestruct ld a, BATTLEANIM_PLAYER_DAMAGE ld [wNumHits], a ld c, 3 diff --git a/battle/objects/functions.asm b/battle/objects/functions.asm index 4ed9b67b7..debfcf04d 100755 --- a/battle/objects/functions.asm +++ b/battle/objects/functions.asm @@ -9,7 +9,7 @@ DoBattleAnimFrame: ; ccfbe ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; ccfce .Jumptable: @@ -4085,7 +4085,7 @@ BattleAnim_AnonJumptable: ; ce71e (33:671e) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl BattleAnim_IncAnonJumptableIndex: ; ce72c (33:672c) ld hl, BATTLEANIMSTRUCT_ANON_JT_INDEX |