diff options
| author | yenatch <yenatch@gmail.com> | 2018-04-09 21:19:51 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-09 21:19:51 -0400 |
| commit | e4b41fad4fd3787ca2e61adb5377ba8f68fca7ef (patch) | |
| tree | 7c087c9f64133de533b2005a818ca6f100e2c62f /engine | |
| parent | f750d4f4185529cfb440ac7825d202ebcf160766 (diff) | |
| parent | 1b12109cb05fc1aa2e91c9be3504c2853c5727fd (diff) | |
Merge pull request #495 from mid-kid/master
Use stadium 2 egg group names
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/battle/core.asm | 6 | ||||
| -rw-r--r-- | engine/battle/move_effects/conversion2.asm | 2 | ||||
| -rw-r--r-- | engine/battle_anims/anim_commands.asm | 2 | ||||
| -rw-r--r-- | engine/overworld/scripting.asm | 17 | ||||
| -rw-r--r-- | engine/pokemon/mon_stats.asm | 2 |
5 files changed, 8 insertions, 21 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index fe20333b5..de4830766 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -289,7 +289,7 @@ HandleBetweenTurnEffects: ; 3c1d6 .NoMoreFaintingConditions: call HandleLeftovers call HandleMysteryberry - call HanleDefrost + call HandleDefrost call HandleSafeguard call HandleScreens call HandleStatBoostingHeldItems @@ -1533,7 +1533,7 @@ HandleFutureSight: ; 3ca26 xor a ld [wAttackMissed], a ld [wAlreadyDisobeyed], a - ld a, 10 + ld a, EFFECTIVE ld [wTypeModifier], a callfar DoMove xor a @@ -1549,7 +1549,7 @@ HandleFutureSight: ; 3ca26 jp UpdateEnemyMonInParty ; 3ca8f -HanleDefrost: ; 3ca8f +HandleDefrost: ; 3ca8f ld a, [hSerialConnectionStatus] cp USING_EXTERNAL_CLOCK jr z, .enemy_first diff --git a/engine/battle/move_effects/conversion2.asm b/engine/battle/move_effects/conversion2.asm index 074ca93ba..c0e390926 100644 --- a/engine/battle/move_effects/conversion2.asm +++ b/engine/battle/move_effects/conversion2.asm @@ -50,7 +50,7 @@ BattleCommand_Conversion2: ; 359e6 ld [hl], a pop hl ld a, [wTypeMatchup] - cp 10 + cp EFFECTIVE jr nc, .loop call BattleCommand_SwitchTurn diff --git a/engine/battle_anims/anim_commands.asm b/engine/battle_anims/anim_commands.asm index 43e28c5db..1f4da606d 100644 --- a/engine/battle_anims/anim_commands.asm +++ b/engine/battle_anims/anim_commands.asm @@ -1338,7 +1338,7 @@ PlayHitSound: ; cc881 and $7f ret z - cp 10 + cp EFFECTIVE ld de, SFX_DAMAGE jr z, .play diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm index f65f2f9c0..e2918a45b 100644 --- a/engine/overworld/scripting.asm +++ b/engine/overworld/scripting.asm @@ -613,7 +613,7 @@ GetPocketName: farcall CheckItemPocket ld a, [wItemAttributeParamBuffer] dec a - ld hl, .Pockets + ld hl, ItemPocketNames maskbits NUM_POCKETS add a ld e, a @@ -626,20 +626,7 @@ GetPocketName: call CopyName2 ret -.Pockets: - dw .Item - dw .Key - dw .Ball - dw .TM - -.Item: - db "ITEM POCKET@" -.Key: - db "KEY POCKET@" -.Ball: - db "BALL POCKET@" -.TM: - db "TM POCKET@" +INCLUDE "data/items/pocket_names.asm" CurItemName: ld a, [wCurItem] diff --git a/engine/pokemon/mon_stats.asm b/engine/pokemon/mon_stats.asm index 2b5586c51..5468d76fe 100644 --- a/engine/pokemon/mon_stats.asm +++ b/engine/pokemon/mon_stats.asm @@ -209,7 +209,7 @@ GetGender: ; 50bdd ; The higher the ratio, the more likely the monster is to be female. - cp GENDERLESS + cp GENDER_UNKNOWN jr z, .Genderless and a ; GENDER_F0? |