diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-12-22 16:06:11 -0500 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-12-22 16:06:11 -0500 |
| commit | 5aa4d6c777507ff7403f2f14ab602007b17f19ab (patch) | |
| tree | 82fd7aadc36baf46d888b90f3447103d8eaac06f /engine/battle | |
| parent | 9178fc7183b6f43dc901637a7497e9f3084fc668 (diff) | |
Fewer underscores in constants
dannye
Diffstat (limited to 'engine/battle')
| -rwxr-xr-x | engine/battle/core.asm | 2 | ||||
| -rw-r--r-- | engine/battle/trainer_ai.asm | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index e5d1e36f..6066d7ee 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -903,7 +903,7 @@ FaintEnemyPokemon: ; 0x3c567 call SaveScreenTilesToBuffer1 xor a ld [wBattleResult], a - ld b, EXP__ALL + ld b, EXP_ALL call IsItemInBag push af jr z, .giveExpToMonsThatFought ; if no exp all, then jump diff --git a/engine/battle/trainer_ai.asm b/engine/battle/trainer_ai.asm index 0af1b86d..cc7e93db 100644 --- a/engine/battle/trainer_ai.asm +++ b/engine/battle/trainer_ai.asm @@ -280,8 +280,8 @@ TrainerClassMoveChoiceModifications: ; 3981e (e:581e) db 1,0 ; BUG CATCHER db 1,0 ; LASS db 1,3,0 ; SAILOR - db 1,0 ; JR__TRAINER_M - db 1,0 ; JR__TRAINER_F + db 1,0 ; JR_TRAINER_M + db 1,0 ; JR_TRAINER_F db 1,2,3,0; POKEMANIAC db 1,2,0 ; SUPER_NERD db 1,0 ; HIKER @@ -311,7 +311,7 @@ TrainerClassMoveChoiceModifications: ; 3981e (e:581e) db 1,0 ; BRUNO db 1,0 ; BROCK db 1,3,0 ; MISTY - db 1,0 ; LT__SURGE + db 1,0 ; LT_SURGE db 1,3,0 ; ERIKA db 1,3,0 ; KOGA db 1,0 ; BLAINE @@ -752,7 +752,7 @@ AIUseGuardSpec: ; 3a84b (e:684b) call AIPlayRestoringSFX ld hl,wEnemyBattleStatus2 set 1,[hl] - ld a,GUARD_SPEC_ + ld a,GUARD_SPEC jp AIPrintItemUse AIUseDireHit: ; 3a858 (e:6858) |