diff options
| author | dannye <corrnondacqb@yahoo.com> | 2015-12-14 22:09:30 -0600 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2015-12-14 22:09:30 -0600 |
| commit | 351146024bdd386c328af0f2abdb04e728e4c133 (patch) | |
| tree | 302778584b45ba74080ca893fbc94c81e825118b /engine | |
| parent | 4c5c791264be9d3d59a067eb3f8cab4cfac91bdc (diff) | |
Fewer underscores in constants
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/battle/core.asm | 2 | ||||
| -rw-r--r-- | engine/battle/moveEffects/pay_day_effect.asm | 2 | ||||
| -rw-r--r-- | engine/battle/trainer_ai.asm | 8 | ||||
| -rwxr-xr-x | engine/items/items.asm | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 2dc34e52..c5c3774f 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/moveEffects/pay_day_effect.asm b/engine/battle/moveEffects/pay_day_effect.asm index 26e69ef5..eb228615 100644 --- a/engine/battle/moveEffects/pay_day_effect.asm +++ b/engine/battle/moveEffects/pay_day_effect.asm @@ -1,4 +1,4 @@ -PayDayEffect_ ; 2feb8 (b:7eb8) +PayDayEffect_: ; 2feb8 (b:7eb8) xor a ld hl, wcd6d ld [hli], a diff --git a/engine/battle/trainer_ai.asm b/engine/battle/trainer_ai.asm index 40a115b9..bab4c253 100644 --- a/engine/battle/trainer_ai.asm +++ b/engine/battle/trainer_ai.asm @@ -280,8 +280,8 @@ TrainerClassMoveChoiceModifications: ; 3989b (e:589b) 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: ; 3989b (e:589b) db 1,0 ; BRUNO db 1,0 ; BROCK db 1,3,0 ; MISTY - db 1,3,0 ; LT__SURGE + db 1,3,0 ; LT_SURGE db 1,3,0 ; ERIKA db 1,3,0 ; KOGA db 1,3,0 ; BLAINE @@ -742,7 +742,7 @@ AIUseGuardSpec: ; 3a7b5 (e:67b5) call AIPlayRestoringSFX ld hl,wEnemyBattleStatus2 set 1,[hl] - ld a,GUARD_SPEC_ + ld a,GUARD_SPEC jp AIPrintItemUse AIUseDireHit: ; 0x3a7c2 unused diff --git a/engine/items/items.asm b/engine/items/items.asm index 9e022ae8..55dcb53e 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -70,7 +70,7 @@ ItemUsePtrTable: ; d5e1 (3:55e1) dw ItemUseMedicine ; FULL_HEAL dw ItemUseMedicine ; REVIVE dw ItemUseMedicine ; MAX_REVIVE - dw ItemUseGuardSpec ; GUARD_SPEC_ + dw ItemUseGuardSpec ; GUARD_SPEC dw ItemUseSuperRepel ; SUPER_REPL dw ItemUseMaxRepel ; MAX_REPEL dw ItemUseDireHit ; DIRE_HIT @@ -78,7 +78,7 @@ ItemUsePtrTable: ; d5e1 (3:55e1) dw ItemUseMedicine ; FRESH_WATER dw ItemUseMedicine ; SODA_POP dw ItemUseMedicine ; LEMONADE - dw UnusableItem ; S_S__TICKET + dw UnusableItem ; S_S_TICKET dw UnusableItem ; GOLD_TEETH dw ItemUseXStat ; X_ATTACK dw ItemUseXStat ; X_DEFEND @@ -90,7 +90,7 @@ ItemUsePtrTable: ; d5e1 (3:55e1) dw UnusableItem ; SILPH_SCOPE dw ItemUsePokeflute ; POKE_FLUTE dw UnusableItem ; LIFT_KEY - dw UnusableItem ; EXP__ALL + dw UnusableItem ; EXP_ALL dw ItemUseOldRod ; OLD_ROD dw ItemUseGoodRod ; GOOD_ROD dw ItemUseSuperRod ; SUPER_ROD |