summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
Diffstat (limited to 'engine')
-rwxr-xr-xengine/battle/animations.asm2
-rw-r--r--engine/battle/battle_transitions.asm4
-rwxr-xr-xengine/battle/core.asm50
-rw-r--r--engine/battle/effects.asm3
-rw-r--r--engine/battle/experience.asm14
-rw-r--r--engine/battle/ghost_marowak_anim.asm2
-rw-r--r--engine/battle/move_effects/heal.asm6
-rw-r--r--engine/battle/move_effects/reflect_light_screen.asm6
-rw-r--r--engine/battle/move_effects/transform.asm2
-rwxr-xr-xengine/battle/safari_zone.asm10
-rw-r--r--engine/battle/scale_sprites.asm10
-rw-r--r--engine/battle/trainer_ai.asm6
-rwxr-xr-xengine/events/card_key.asm3
-rwxr-xr-xengine/gfx/palettes.asm10
14 files changed, 66 insertions, 62 deletions
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm
index 64bdaa00..4110e8b6 100755
--- a/engine/battle/animations.asm
+++ b/engine/battle/animations.asm
@@ -160,7 +160,7 @@ DrawFrameBlock:
.afterDrawingTiles
ld a, [wFBMode]
cp FRAMEBLOCKMODE_02
- jr z, .advanceFrameBlockDestAddr; skip delay and don't clean OAM buffer
+ jr z, .advanceFrameBlockDestAddr ; skip delay and don't clean OAM buffer
ld a, [wSubAnimFrameDelay]
ld c, a
call DelayFrames
diff --git a/engine/battle/battle_transitions.asm b/engine/battle/battle_transitions.asm
index 82c3318c..6d3a4f9c 100644
--- a/engine/battle/battle_transitions.asm
+++ b/engine/battle/battle_transitions.asm
@@ -355,7 +355,7 @@ BattleTransition_FlashScreenPalettes:
; used for low level trainer dungeon battles
BattleTransition_Shrink:
- ld c, 9
+ ld c, SCREEN_HEIGHT / 2
.loop
push bc
xor a
@@ -389,7 +389,7 @@ BattleTransition_Shrink:
; used for high level trainer dungeon battles
BattleTransition_Split:
- ld c, 9
+ ld c, SCREEN_HEIGHT / 2
xor a
ldh [hAutoBGTransferEnabled], a
.loop
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index ac9676ec..abb1c9b4 100755
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -1765,7 +1765,7 @@ SendOutMon:
ld hl, wEnemyMonHP
ld a, [hli]
or [hl] ; is enemy mon HP zero?
- jp z, .skipDrawingEnemyHUDAndHPBar; if HP is zero, skip drawing the HUD and HP bar
+ jp z, .skipDrawingEnemyHUDAndHPBar ; if HP is zero, skip drawing the HUD and HP bar
call DrawEnemyHUDAndHPBar
.skipDrawingEnemyHUDAndHPBar
call DrawPlayerHUDAndHPBar
@@ -2096,16 +2096,17 @@ DisplayBattleMenu::
jp .handleBattleMenuInput
; the following happens for the old man tutorial and prof. oak pikachu battle
.doSimulatedMenuInput
+ ; Temporarily save the player name in wGrassRate,
+ ; which is supposed to get overwritten when entering a
+ ; map with wild Pokémon.
+ ; In Red/Blue, due to an oversight, the data may not get
+ ; overwritten (on Cinnabar and Route 21) and the infamous
+ ; Missingno. glitch can show up.
+ ; However, this has been fixed in Yellow.
ld hl, wPlayerName
ld de, wGrassRate
ld bc, NAME_LENGTH
- call CopyData ; temporarily save the player name in unused space,
- ; which is supposed to get overwritten when entering a
- ; map with wild Pokémon.
- ; In Red/Blue, due to an oversight, the data
- ; may not get overwritten (cinnabar) and the infamous
- ; Missingno. glitch can show up. However,
- ; this has been fixed in yellow
+ call CopyData
ld hl, .oldManName
ld a, [wBattleType]
dec a
@@ -2310,9 +2311,9 @@ BagWasSelected:
jr DisplayBagMenu
SimulatedInputBattleItemList:
- db 1 ; # of items
+ db 1 ; # items
db POKE_BALL, 1
- db $ff
+ db -1 ; end
DisplayPlayerBag:
; get the pointer to player's bag when in a normal battle
@@ -4258,7 +4259,7 @@ CheckForDisobedience:
call GetCurrentMove
.canUseMove
ld a, $1
- and a; clear Z flag
+ and a ; clear Z flag
ret
.cannotUseMove
xor a ; set Z flag
@@ -4731,7 +4732,7 @@ JumpToOHKOMoveEffect:
INCLUDE "data/battle/unused_critical_hit_moves.asm"
; determines if attack is a critical hit
-; azure heights claims "the fastest pokémon (who are, not coincidentally,
+; Azure Heights claims "the fastest pokémon (who are, not coincidentally,
; among the most popular) tend to CH about 20 to 25% of the time."
CriticalHitTest:
xor a
@@ -5442,26 +5443,32 @@ AdjustDamageForMoveType:
.done
ret
+; function to tell how effective the type of an enemy attack is on the player's current pokemon
+; this doesn't take into account the effects that dual types can have
+; (e.g. 4x weakness / resistance, weaknesses and resistances canceling)
+; the result is stored in [wTypeEffectiveness]
+; ($05 is not very effective, $10 is neutral, $14 is super effective)
+; as far is can tell, this is only used once in some AI code to help decide which move to use
AIGetTypeEffectiveness:
ld a, [wEnemyMoveType]
- ld d, a ; d = type of enemy move
+ ld d, a ; d = type of enemy move
ld hl, wBattleMonType
- ld b, [hl] ; b = type 1 of player's pokemon
+ ld b, [hl] ; b = type 1 of player's pokemon
inc hl
- ld c, [hl] ; c = type 2 of player's pokemon
+ ld c, [hl] ; c = type 2 of player's pokemon
ld a, $10
- ld [wd11e], a ; initialize [wd11e] to neutral effectiveness
+ ld [wTypeEffectiveness], a ; initialize to neutral effectiveness
ld hl, TypeEffects
.loop
ld a, [hli]
cp $ff
ret z
- cp d ; match the type of the move
+ cp d ; match the type of the move
jr nz, .nextTypePair1
ld a, [hli]
- cp b ; match with type 1 of pokemon
+ cp b ; match with type 1 of pokemon
jr z, .done
- cp c ; or match with type 2 of pokemon
+ cp c ; or match with type 2 of pokemon
jr z, .done
jr .nextTypePair2
.nextTypePair1
@@ -5469,8 +5476,8 @@ AIGetTypeEffectiveness:
.nextTypePair2
inc hl
jr .loop
-
.done
+ ; 40% chance for Lorelei's Dewgong to ignore type effectiveness?
ld a, [wTrainerClass]
cp LORELEI
jr nz, .ok
@@ -5481,9 +5488,8 @@ AIGetTypeEffectiveness:
cp $66 ; 40 percent
ret c
.ok
-
ld a, [hl]
- ld [wd11e], a ; store damage multiplier
+ ld [wTypeEffectiveness], a ; store damage multiplier
ret
INCLUDE "data/types/type_matchups.asm"
diff --git a/engine/battle/effects.asm b/engine/battle/effects.asm
index 9e5ee19f..7573ce8d 100644
--- a/engine/battle/effects.asm
+++ b/engine/battle/effects.asm
@@ -247,7 +247,7 @@ FreezeBurnParalyzeEffect:
jr z, .burn1
cp FREEZE_SIDE_EFFECT
jr z, .freeze1
-; .paralyze
+; .paralyze1
ld a, 1 << PAR
ld [wEnemyMonStatus], a
call QuarterSpeedDueToParalysis ; quarter speed of affected mon
@@ -309,6 +309,7 @@ FreezeBurnParalyzeEffect:
jr z, .burn2
cp FREEZE_SIDE_EFFECT
jr z, .freeze2
+; .paralyze2
ld a, 1 << PAR
ld [wBattleMonStatus], a
call QuarterSpeedDueToParalysis
diff --git a/engine/battle/experience.asm b/engine/battle/experience.asm
index bab804bb..61fbdfa3 100644
--- a/engine/battle/experience.asm
+++ b/engine/battle/experience.asm
@@ -43,7 +43,7 @@ GainExperience:
inc de
jr .nextBaseStat
.maxStatExp ; if the upper byte also overflowed, then we have hit the max stat exp
- dec a ; a is 0 from previous check
+ dec a ; ld a, $ff; a is 0 from previous check
ld [de], a
inc de
ld [de], a
@@ -234,15 +234,15 @@ GainExperience:
xor a ; battle mon
ld [wCalculateWhoseStats], a
ld hl, CalculateModifiedStats
- call Bankswitch15ToF
+ call CallBattleCore
ld hl, ApplyBurnAndParalysisPenaltiesToPlayer
- call Bankswitch15ToF
+ call CallBattleCore
ld hl, ApplyBadgeStatBoosts
- call Bankswitch15ToF
+ call CallBattleCore
ld hl, DrawPlayerHUDAndHPBar
- call Bankswitch15ToF
+ call CallBattleCore
ld hl, PrintEmptyString
- call Bankswitch15ToF
+ call CallBattleCore
call SaveScreenTilesToBuffer1
.printGrewLevelText
callabd_ModifyPikachuHappiness PIKAHAPPY_LEVELUP
@@ -345,7 +345,7 @@ BoostExp:
ldh [hQuotient + 2], a
ret
-Bankswitch15ToF:
+CallBattleCore:
ld b, BANK(BattleCore)
jp Bankswitch
diff --git a/engine/battle/ghost_marowak_anim.asm b/engine/battle/ghost_marowak_anim.asm
index 03059022..76d89ba9 100644
--- a/engine/battle/ghost_marowak_anim.asm
+++ b/engine/battle/ghost_marowak_anim.asm
@@ -77,7 +77,7 @@ CopyMonPicFromBGToSpriteVRAM:
ld [hli], a
ld a, d
ld [hli], a
- ld a, $14 ; use OBP1
+ ld a, OAM_OBP1 | 4
ld [hli], a
inc d
dec c
diff --git a/engine/battle/move_effects/heal.asm b/engine/battle/move_effects/heal.asm
index 80923a29..c3ffda65 100644
--- a/engine/battle/move_effects/heal.asm
+++ b/engine/battle/move_effects/heal.asm
@@ -86,7 +86,7 @@ HealEffect_:
ld [wHPBarNewHP], a
.playAnim
ld hl, PlayCurrentMoveAnimation
- call Bankswitch3DtoF
+ call EffectCallBattleCore
ldh a, [hWhoseTurn]
and a
hlcoord 10, 9
@@ -98,14 +98,14 @@ HealEffect_:
ld [wHPBarType], a
predef UpdateHPBar2
ld hl, DrawHUDsAndHPBars
- call Bankswitch3DtoF
+ call EffectCallBattleCore
ld hl, RegainedHealthText
jp PrintText
.failed
ld c, 50
call DelayFrames
ld hl, PrintButItFailedText_
- jp Bankswitch3DtoF
+ jp EffectCallBattleCore
StartedSleepingEffect:
text_far _StartedSleepingEffect
diff --git a/engine/battle/move_effects/reflect_light_screen.asm b/engine/battle/move_effects/reflect_light_screen.asm
index c05055fa..46c299e9 100644
--- a/engine/battle/move_effects/reflect_light_screen.asm
+++ b/engine/battle/move_effects/reflect_light_screen.asm
@@ -23,14 +23,14 @@ ReflectLightScreenEffect_:
.playAnim
push hl
ld hl, PlayCurrentMoveAnimation
- call Bankswitch3DtoF
+ call EffectCallBattleCore
pop hl
jp PrintText
.moveFailed
ld c, 50
call DelayFrames
ld hl, PrintButItFailedText_
- jp Bankswitch3DtoF
+ jp EffectCallBattleCore
LightScreenProtectedText:
text_far _LightScreenProtectedText
@@ -40,6 +40,6 @@ ReflectGainedArmorText:
text_far _ReflectGainedArmorText
text_end
-Bankswitch3DtoF:
+EffectCallBattleCore:
ld b, BANK(BattleCore)
jp Bankswitch
diff --git a/engine/battle/move_effects/transform.asm b/engine/battle/move_effects/transform.asm
index d37bd94d..af47ae1b 100644
--- a/engine/battle/move_effects/transform.asm
+++ b/engine/battle/move_effects/transform.asm
@@ -134,7 +134,7 @@ TransformEffect_:
.failed
ld hl, PrintButItFailedText_
- jp Bankswitch3DtoF
+ jp EffectCallBattleCore
TransformedText:
text_far _TransformedText
diff --git a/engine/battle/safari_zone.asm b/engine/battle/safari_zone.asm
index 9362cc3a..a61f402f 100755
--- a/engine/battle/safari_zone.asm
+++ b/engine/battle/safari_zone.asm
@@ -2,18 +2,18 @@ PrintSafariZoneBattleText:
ld hl, wSafariBaitFactor
ld a, [hl]
and a
- jr z, .asm_411e
+ jr z, .no_bait
dec [hl]
ld hl, SafariZoneEatingText
- jr .asm_4138
-.asm_411e
+ jr .done
+.no_bait
dec hl
ld a, [hl]
and a
ret z
dec [hl]
ld hl, SafariZoneAngryText
- jr nz, .asm_4138
+ jr nz, .done
push hl
ld a, [wEnemyMonSpecies]
ld [wd0b5], a
@@ -21,7 +21,7 @@ PrintSafariZoneBattleText:
ld a, [wMonHCatchRate]
ld [wEnemyMonActualCatchRate], a
pop hl
-.asm_4138
+.done
push hl
call LoadScreenTilesFromBuffer1
pop hl
diff --git a/engine/battle/scale_sprites.asm b/engine/battle/scale_sprites.asm
index 794a65ab..38ebff21 100644
--- a/engine/battle/scale_sprites.asm
+++ b/engine/battle/scale_sprites.asm
@@ -4,18 +4,18 @@
ScaleSpriteByTwo:
ld a, $0
call SwitchSRAMBankAndLatchClockData
- call ScaleSpriteByTwo_
+ call .ScaleSpriteByTwo
call PrepareRTCDataAndDisableSRAM
ret
-ScaleSpriteByTwo_:
+.ScaleSpriteByTwo:
ld de, sSpriteBuffer1 + (4*4*8) - 5 ; last byte of input data, last 4 rows already skipped
ld hl, sSpriteBuffer0 + SPRITEBUFFERSIZE - 1 ; end of destination buffer
- call ScaleLastSpriteColumnByTwo ; last tile column is special case
- call ScaleFirstThreeSpriteColumnsByTwo ; scale first 3 tile columns
+ call ScaleLastSpriteColumnByTwo ; last tile column is special case
+ call ScaleFirstThreeSpriteColumnsByTwo ; scale first 3 tile columns
ld de, sSpriteBuffer2 + (4*4*8) - 5 ; last byte of input data, last 4 rows already skipped
ld hl, sSpriteBuffer1 + SPRITEBUFFERSIZE - 1 ; end of destination buffer
- call ScaleLastSpriteColumnByTwo ; last tile column is special case
+ call ScaleLastSpriteColumnByTwo ; last tile column is special case
ScaleFirstThreeSpriteColumnsByTwo:
ld b, $3 ; 3 tile columns
diff --git a/engine/battle/trainer_ai.asm b/engine/battle/trainer_ai.asm
index 17e68e75..94e427a1 100644
--- a/engine/battle/trainer_ai.asm
+++ b/engine/battle/trainer_ai.asm
@@ -295,10 +295,10 @@ TrainerAI:
cp LINK_STATE_BATTLING
jr z, .done ; if in a link battle, we're done as well
ld a, [wEnemyBattleStatus1]
- and 1 << CHARGING_UP | 1 << THRASHING_ABOUT | 1 << STORING_ENERGY ; %10011
+ and 1 << CHARGING_UP | 1 << THRASHING_ABOUT | 1 << STORING_ENERGY
jr nz, .done ; don't follow trainer ai if opponent is in a locked state
ld a, [wEnemyBattleStatus2]
- and 1 << USING_RAGE ; %1000000
+ and 1 << USING_RAGE
jr nz, .done ; don't follow trainer ai if opponent is locked in rage
; note that this doesn't check for hyper beam recharge which can cause problems
ld a, [wTrainerClass] ; what trainer class is this?
@@ -311,7 +311,7 @@ TrainerAI:
add hl, bc
ld a, [wAICount]
and a
- jr z, .done; if no AI uses left, we're done here
+ jr z, .done ; if no AI uses left, we're done here
inc hl
inc a
jr nz, .getpointer
diff --git a/engine/events/card_key.asm b/engine/events/card_key.asm
index de5f402e..10de5ed2 100755
--- a/engine/events/card_key.asm
+++ b/engine/events/card_key.asm
@@ -8,8 +8,7 @@ PrintCardKeyText:
ret z
cp b
jr nz, .silphCoMapListLoop
-; does not check for tile in front of player. This might be buggy
- ;predef GetTileAndCoordsInFrontOfPlayer
+; does not check for tile in front of player. This might be buggy.
ld a, [wTileInFrontOfPlayer]
cp $18
jr z, .cardKeyDoorInFrontOfPlayer
diff --git a/engine/gfx/palettes.asm b/engine/gfx/palettes.asm
index c08992d3..b480c6d0 100755
--- a/engine/gfx/palettes.asm
+++ b/engine/gfx/palettes.asm
@@ -19,7 +19,7 @@ _RunPaletteCommand:
push de
jp hl
-SetPal_Black:
+SetPal_BattleBlack:
ld hl, PalPacket_Black
ld de, BlkPacket_Battle
ret
@@ -30,7 +30,6 @@ SetPal_Battle:
ld de, wPalPacket
ld bc, $10
call CopyData
- ;ld a, [wPlayerBattleStatus3]
ld hl, wBattleMonSpecies
ld a, [hl]
and a
@@ -42,7 +41,6 @@ SetPal_Battle:
.asm_71ef9
call DeterminePaletteID
ld b, a
- ;ld a, [wEnemyBattleStatus3]
ld hl, wEnemyMonSpecies2
call DeterminePaletteID
ld c, a
@@ -118,7 +116,7 @@ SetPal_Slots:
ld de, BlkPacket_Slots
ret
-SetPal_Titlescreen:
+SetPal_TitleScreen:
ld hl, PalPacket_Titlescreen
ld de, BlkPacket_Titlescreen
ret
@@ -267,13 +265,13 @@ SendUnknownPalPacket_72064::
SetPalFunctions:
; entries correspond to SET_PAL_* constants
- dw SetPal_Black
+ dw SetPal_BattleBlack
dw SetPal_Battle
dw SetPal_TownMap
dw SetPal_StatusScreen
dw SetPal_Pokedex
dw SetPal_Slots
- dw SetPal_Titlescreen
+ dw SetPal_TitleScreen
dw SetPal_NidorinoIntro
dw SetPal_Generic
dw SetPal_Overworld
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-26 22:39:25 +0000