diff options
Diffstat (limited to 'battle/core.asm')
| -rw-r--r-- | battle/core.asm | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/battle/core.asm b/battle/core.asm index eb73f77a2..888b32497 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -183,7 +183,7 @@ BattleTurn: ; 3c12f call IsMobileBattle jr nz, .not_disconnected callba Function100da5 - callba Function100641 + callba StartMobileInactivityTimer callba Function100dd8 jp c, .quit .not_disconnected @@ -2503,8 +2503,8 @@ WinTrainerBattle: ; 3cfa4 call BattleWinSlideInEnemyTrainerFrontpic ld c, 40 call DelayFrames - ld c, $4 - callba Function4ea0a + ld c, $4 ; win + callba Mobile_PrintOpponentBattleMessage ret .battle_tower @@ -3176,8 +3176,8 @@ LostBattle: ; 3d38e ld c, 40 call DelayFrames - ld c, $3 - callba Function4ea0a + ld c, $3 ; lost + callba Mobile_PrintOpponentBattleMessage scf ret ; 3d432 @@ -4080,9 +4080,9 @@ InitBattleMon: ; 3da0d ld de, BattleMonDVs ld bc, MON_PKRUS - MON_DVS call CopyBytes -rept 3 inc hl -endr + inc hl + inc hl ld de, BattleMonLevel ld bc, PARTYMON_STRUCT_LENGTH - MON_LEVEL call CopyBytes @@ -4172,9 +4172,9 @@ InitEnemyMon: ; 3dabd ld de, EnemyMonDVs ld bc, MON_PKRUS - MON_DVS call CopyBytes -rept 3 inc hl -endr + inc hl + inc hl ld de, EnemyMonLevel ld bc, PARTYMON_STRUCT_LENGTH - MON_LEVEL call CopyBytes @@ -4302,9 +4302,9 @@ rept 4 endr ld [hl], a ld hl, PlayerUsedMoves -rept 3 ld [hli], a -endr + ld [hli], a + ld [hli], a ld [hl], a ld [PlayerDisableCount], a ld [PlayerFuryCutterCount], a @@ -4939,7 +4939,7 @@ PrintPlayerHUD: ; 3dfbf pop hl dec hl - ld a, BREEDMON + ld a, TEMPMON ld [MonType], a callab GetGender ld a, " " @@ -5017,7 +5017,7 @@ DrawEnemyHUD: ; 3e043 ld a, [hl] ld [de], a - ld a, BREEDMON + ld a, TEMPMON ld [MonType], a callab GetGender ld a, " " @@ -6048,7 +6048,7 @@ CheckPlayerHasUsableMoves: ; 3e786 jr .loop .done - and a + and a ; This is probably a bug, and will result in a move with PP Up confusing the game. ret nz .force_struggle @@ -6526,7 +6526,7 @@ LoadEnemyMon: ; 3e8eb ; Fill stats ld de, EnemyMonMaxHP ld b, FALSE - ld hl, LinkBattleRNs + 7 ; ? + ld hl, EnemyMonDVs - (MON_DVS - MON_STAT_EXP + 1) ; LinkBattleRNs + 7 ; ? predef CalcPkmnStats ; If we're in a trainer battle, @@ -6637,9 +6637,9 @@ LoadEnemyMon: ; 3e8eb xor a ld h, d ld l, e -rept 3 ld [hli], a -endr + ld [hli], a + ld [hli], a ld [hl], a ; Make sure the predef knows this isn't a partymon ld [MagikarpLength], a @@ -9429,7 +9429,7 @@ InitBattleDisplay: ; 3fb6c ld [rSVBK], a ld hl, wDecompressScratch - ld bc, wBackupAttrMap - wDecompressScratch + ld bc, wScratchAttrMap - wDecompressScratch ld a, " " call ByteFill @@ -9621,8 +9621,8 @@ BattleStartMessage: ; 3fc8b call IsMobileBattle2 ret nz - ld c, $2 - callba Function4ea0a + ld c, $2 ; start + callba Mobile_PrintOpponentBattleMessage ret ; 3fd26 |