ref: 351146024bdd386c328af0f2abdb04e728e4c133
parent: 4c5c791264be9d3d59a067eb3f8cab4cfac91bdc
author: dannye <corrnondacqb@yahoo.com>
date: Mon Dec 14 17:09:30 EST 2015
Fewer underscores in constants
--- a/constants/item_constants.asm
+++ b/constants/item_constants.asm
@@ -56,7 +56,7 @@
const FULL_HEAL ; $34
const REVIVE ; $35
const MAX_REVIVE ; $36
- const GUARD_SPEC_ ; $37
+ const GUARD_SPEC ; $37
const SUPER_REPEL ; $38
const MAX_REPEL ; $39
const DIRE_HIT ; $3A
@@ -64,7 +64,7 @@
const FRESH_WATER ; $3C
const SODA_POP ; $3D
const LEMONADE ; $3E
- const S_S__TICKET ; $3F
+ const S_S_TICKET ; $3F
const GOLD_TEETH ; $40
const X_ATTACK ; $41
const X_DEFEND ; $42
@@ -76,7 +76,7 @@
const SILPH_SCOPE ; $48
const POKE_FLUTE ; $49
const LIFT_KEY ; $4A
- const EXP__ALL ; $4B
+ const EXP_ALL ; $4B
const OLD_ROD ; $4C
const GOOD_ROD ; $4D
const SUPER_ROD ; $4E
--- a/constants/pokedex_constants.asm
+++ b/constants/pokedex_constants.asm
@@ -82,7 +82,7 @@
const DEX_SLOWBRO ; 80
const DEX_MAGNEMITE ; 81
const DEX_MAGNETON ; 82
- const DEX_FARFETCH_D ; 83
+ const DEX_FARFETCHD ; 83
const DEX_DODUO ; 84
const DEX_DODRIO ; 85
const DEX_SEEL ; 86
--- a/constants/pokemon_constants.asm
+++ b/constants/pokemon_constants.asm
@@ -63,7 +63,7 @@
const MISSINGNO_3D ; $3D
const MISSINGNO_3E ; $3E
const MISSINGNO_3F ; $3F
- const FARFETCH_D ; $40
+ const FARFETCHD ; $40
const VENONAT ; $41
const DRAGONITE ; $42
const MISSINGNO_43 ; $43
--- a/constants/trainer_constants.asm
+++ b/constants/trainer_constants.asm
@@ -10,8 +10,8 @@
trainer_const BUG_CATCHER ; $02
trainer_const LASS ; $03
trainer_const SAILOR ; $04
- trainer_const JR__TRAINER_M ; $05
- trainer_const JR__TRAINER_F ; $06
+ trainer_const JR_TRAINER_M ; $05
+ trainer_const JR_TRAINER_F ; $06
trainer_const POKEMANIAC ; $07
trainer_const SUPER_NERD ; $08
trainer_const HIKER ; $09
@@ -41,7 +41,7 @@
trainer_const BRUNO ; $21
trainer_const BROCK ; $22
trainer_const MISTY ; $23
- trainer_const LT__SURGE ; $24
+ trainer_const LT_SURGE ; $24
trainer_const ERIKA ; $25
trainer_const KOGA ; $26
trainer_const BLAINE ; $27
--- a/data/baseStats/farfetchd.asm
+++ b/data/baseStats/farfetchd.asm
@@ -1,5 +1,5 @@
FarfetchdBaseStats: ; 38cd6 (e:4cd6)
-db DEX_FARFETCH_D ; pokedex id
+db DEX_FARFETCHD ; pokedex id
db 52 ; base hp
db 65 ; base attack
db 55 ; base defense
--- a/data/evos_moves.asm
+++ b/data/evos_moves.asm
@@ -943,7 +943,7 @@
db 0
Mon083_EvosMoves: ; 3b4e3 (e:74e3)
-;FARFETCH_D
+;FARFETCHD
;Evolutions
db 0
;Learnset
--- a/data/item_prices.asm
+++ b/data/item_prices.asm
@@ -53,7 +53,7 @@
money 600 ; FULL_HEAL
money 1500 ; REVIVE
money 4000 ; MAX_REVIVE
- money 700 ; GUARD_SPEC_
+ money 700 ; GUARD_SPEC
money 500 ; SUPER_REPEL
money 700 ; MAX_REPEL
money 650 ; DIRE_HIT
@@ -61,7 +61,7 @@
money 200 ; FRESH_WATER
money 300 ; SODA_POP
money 350 ; LEMONADE
- money 0 ; S_S__TICKET
+ money 0 ; S_S_TICKET
money 0 ; GOLD_TEETH
money 500 ; X_ATTACK
money 550 ; X_DEFEND
@@ -73,7 +73,7 @@
money 0 ; SILPH_SCOPE
money 0 ; POKE_FLUTE
money 0 ; LIFT_KEY
- money 0 ; EXP__ALL
+ money 0 ; EXP_ALL
money 0 ; OLD_ROD
money 0 ; GOOD_ROD
money 0 ; SUPER_ROD
--- a/data/mapObjects/celadongym.asm
+++ b/data/mapObjects/celadongym.asm
@@ -11,7 +11,7 @@
object SPRITE_ERIKA, $4, $3, STAY, DOWN, $1, OPP_ERIKA, $1
object SPRITE_LASS, $2, $b, STAY, RIGHT, $2, OPP_LASS, $11
object SPRITE_FOULARD_WOMAN, $7, $a, STAY, LEFT, $3, OPP_BEAUTY, $1
- object SPRITE_LASS, $9, $5, STAY, DOWN, $4, OPP_JR__TRAINER_F, $b
+ object SPRITE_LASS, $9, $5, STAY, DOWN, $4, OPP_JR_TRAINER_F, $b
object SPRITE_FOULARD_WOMAN, $1, $5, STAY, DOWN, $5, OPP_BEAUTY, $2
object SPRITE_LASS, $6, $3, STAY, DOWN, $6, OPP_LASS, $12
object SPRITE_FOULARD_WOMAN, $3, $3, STAY, DOWN, $7, OPP_BEAUTY, $3
--- a/data/mapObjects/ceruleangym.asm
+++ b/data/mapObjects/ceruleangym.asm
@@ -9,7 +9,7 @@
db $4 ; objects
object SPRITE_BRUNETTE_GIRL, $4, $2, STAY, DOWN, $1, OPP_MISTY, $1
- object SPRITE_LASS, $2, $3, STAY, RIGHT, $2, OPP_JR__TRAINER_F, $1
+ object SPRITE_LASS, $2, $3, STAY, RIGHT, $2, OPP_JR_TRAINER_F, $1
object SPRITE_SWIMMER, $8, $7, STAY, LEFT, $3, OPP_SWIMMER, $1
object SPRITE_GYM_HELPER, $7, $a, STAY, DOWN, $4 ; person
--- a/data/mapObjects/pewtergym.asm
+++ b/data/mapObjects/pewtergym.asm
@@ -9,7 +9,7 @@
db $3 ; objects
object SPRITE_BLACK_HAIR_BOY_2, $4, $1, STAY, DOWN, $1, OPP_BROCK, $1
- object SPRITE_BLACK_HAIR_BOY_1, $3, $6, STAY, RIGHT, $2, OPP_JR__TRAINER_M, $1
+ object SPRITE_BLACK_HAIR_BOY_1, $3, $6, STAY, RIGHT, $2, OPP_JR_TRAINER_M, $1
object SPRITE_GYM_HELPER, $7, $a, STAY, DOWN, $3 ; person
; warp-to
--- a/data/mapObjects/rocktunnel1.asm
+++ b/data/mapObjects/rocktunnel1.asm
@@ -19,9 +19,9 @@
object SPRITE_HIKER, $5, $10, STAY, DOWN, $2, OPP_HIKER, $d
object SPRITE_HIKER, $11, $f, STAY, LEFT, $3, OPP_HIKER, $e
object SPRITE_BLACK_HAIR_BOY_2, $17, $8, STAY, LEFT, $4, OPP_POKEMANIAC, $7
- object SPRITE_LASS, $25, $15, STAY, LEFT, $5, OPP_JR__TRAINER_F, $11
- object SPRITE_LASS, $16, $18, STAY, DOWN, $6, OPP_JR__TRAINER_F, $12
- object SPRITE_LASS, $20, $18, STAY, RIGHT, $7, OPP_JR__TRAINER_F, $13
+ object SPRITE_LASS, $25, $15, STAY, LEFT, $5, OPP_JR_TRAINER_F, $11
+ object SPRITE_LASS, $16, $18, STAY, DOWN, $6, OPP_JR_TRAINER_F, $12
+ object SPRITE_LASS, $20, $18, STAY, RIGHT, $7, OPP_JR_TRAINER_F, $13
; warp-to
EVENT_DISP ROCK_TUNNEL_1_WIDTH, $3, $f
--- a/data/mapObjects/rocktunnel2.asm
+++ b/data/mapObjects/rocktunnel2.asm
@@ -10,12 +10,12 @@
db $0 ; signs
db $8 ; objects
- object SPRITE_LASS, $b, $d, STAY, DOWN, $1, OPP_JR__TRAINER_F, $9
+ object SPRITE_LASS, $b, $d, STAY, DOWN, $1, OPP_JR_TRAINER_F, $9
object SPRITE_HIKER, $6, $a, STAY, DOWN, $2, OPP_HIKER, $9
object SPRITE_BLACK_HAIR_BOY_2, $3, $5, STAY, DOWN, $3, OPP_POKEMANIAC, $3
object SPRITE_BLACK_HAIR_BOY_2, $14, $15, STAY, RIGHT, $4, OPP_POKEMANIAC, $4
object SPRITE_HIKER, $1e, $a, STAY, DOWN, $5, OPP_HIKER, $a
- object SPRITE_LASS, $e, $1c, STAY, RIGHT, $6, OPP_JR__TRAINER_F, $a
+ object SPRITE_LASS, $e, $1c, STAY, RIGHT, $6, OPP_JR_TRAINER_F, $a
object SPRITE_HIKER, $21, $5, STAY, RIGHT, $7, OPP_HIKER, $b
object SPRITE_BLACK_HAIR_BOY_2, $1a, $1e, STAY, DOWN, $8, OPP_POKEMANIAC, $5
--- a/data/mapObjects/route10.asm
+++ b/data/mapObjects/route10.asm
@@ -17,9 +17,9 @@
object SPRITE_BLACK_HAIR_BOY_2, $a, $2c, STAY, LEFT, $1, OPP_POKEMANIAC, $1
object SPRITE_HIKER, $3, $39, STAY, UP, $2, OPP_HIKER, $7
object SPRITE_BLACK_HAIR_BOY_2, $e, $40, STAY, LEFT, $3, OPP_POKEMANIAC, $2
- object SPRITE_LASS, $7, $19, STAY, LEFT, $4, OPP_JR__TRAINER_F, $7
+ object SPRITE_LASS, $7, $19, STAY, LEFT, $4, OPP_JR_TRAINER_F, $7
object SPRITE_HIKER, $3, $3d, STAY, DOWN, $5, OPP_HIKER, $8
- object SPRITE_LASS, $7, $36, STAY, DOWN, $6, OPP_JR__TRAINER_F, $8
+ object SPRITE_LASS, $7, $36, STAY, DOWN, $6, OPP_JR_TRAINER_F, $8
; warp-to
EVENT_DISP ROUTE_10_WIDTH, $13, $b ; ROCK_TUNNEL_POKECENTER
--- a/data/mapObjects/route12.asm
+++ b/data/mapObjects/route12.asm
@@ -15,7 +15,7 @@
object SPRITE_SNORLAX, $a, $3e, STAY, DOWN, $1 ; person
object SPRITE_FISHER2, $e, $1f, STAY, LEFT, $2, OPP_FISHER, $3
object SPRITE_FISHER2, $5, $27, STAY, UP, $3, OPP_FISHER, $4
- object SPRITE_BLACK_HAIR_BOY_1, $b, $5c, STAY, LEFT, $4, OPP_JR__TRAINER_M, $9
+ object SPRITE_BLACK_HAIR_BOY_1, $b, $5c, STAY, LEFT, $4, OPP_JR_TRAINER_M, $9
object SPRITE_BLACK_HAIR_BOY_2, $e, $4c, STAY, UP, $5, OPP_ROCKER, $2
object SPRITE_FISHER2, $c, $28, STAY, LEFT, $6, OPP_FISHER, $5
object SPRITE_FISHER2, $9, $34, STAY, RIGHT, $7, OPP_FISHER, $6
--- a/data/mapObjects/route13.asm
+++ b/data/mapObjects/route13.asm
@@ -10,10 +10,10 @@
db $a ; objects
object SPRITE_BLACK_HAIR_BOY_1, $31, $a, STAY, RIGHT, $1, OPP_BIRD_KEEPER, $1
- object SPRITE_LASS, $30, $a, STAY, DOWN, $2, OPP_JR__TRAINER_F, $c
- object SPRITE_LASS, $1b, $9, STAY, DOWN, $3, OPP_JR__TRAINER_F, $d
- object SPRITE_LASS, $17, $a, STAY, LEFT, $4, OPP_JR__TRAINER_F, $e
- object SPRITE_LASS, $32, $5, STAY, DOWN, $5, OPP_JR__TRAINER_F, $f
+ object SPRITE_LASS, $30, $a, STAY, DOWN, $2, OPP_JR_TRAINER_F, $c
+ object SPRITE_LASS, $1b, $9, STAY, DOWN, $3, OPP_JR_TRAINER_F, $d
+ object SPRITE_LASS, $17, $a, STAY, LEFT, $4, OPP_JR_TRAINER_F, $e
+ object SPRITE_LASS, $32, $5, STAY, DOWN, $5, OPP_JR_TRAINER_F, $f
object SPRITE_BLACK_HAIR_BOY_1, $c, $4, STAY, RIGHT, $6, OPP_BIRD_KEEPER, $2
object SPRITE_FOULARD_WOMAN, $21, $6, STAY, DOWN, $7, OPP_BEAUTY, $4
object SPRITE_FOULARD_WOMAN, $20, $6, STAY, DOWN, $8, OPP_BEAUTY, $5
--- a/data/mapObjects/route15.asm
+++ b/data/mapObjects/route15.asm
@@ -11,8 +11,8 @@
db $9, $27, $c ; Route15Text12
db $b ; objects
- object SPRITE_LASS, $29, $b, STAY, DOWN, $1, OPP_JR__TRAINER_F, $14
- object SPRITE_LASS, $35, $a, STAY, LEFT, $2, OPP_JR__TRAINER_F, $15
+ object SPRITE_LASS, $29, $b, STAY, DOWN, $1, OPP_JR_TRAINER_F, $14
+ object SPRITE_LASS, $35, $a, STAY, LEFT, $2, OPP_JR_TRAINER_F, $15
object SPRITE_BLACK_HAIR_BOY_1, $1f, $d, STAY, UP, $3, OPP_BIRD_KEEPER, $6
object SPRITE_BLACK_HAIR_BOY_1, $23, $d, STAY, UP, $4, OPP_BIRD_KEEPER, $7
object SPRITE_FOULARD_WOMAN, $35, $b, STAY, DOWN, $5, OPP_BEAUTY, $9
@@ -19,8 +19,8 @@
object SPRITE_FOULARD_WOMAN, $29, $a, STAY, RIGHT, $6, OPP_BEAUTY, $a
object SPRITE_BIKER, $30, $a, STAY, DOWN, $7, OPP_BIKER, $3
object SPRITE_BIKER, $2e, $a, STAY, DOWN, $8, OPP_BIKER, $4
- object SPRITE_LASS, $25, $5, STAY, RIGHT, $9, OPP_JR__TRAINER_F, $16
- object SPRITE_LASS, $12, $d, STAY, UP, $a, OPP_JR__TRAINER_F, $17
+ object SPRITE_LASS, $25, $5, STAY, RIGHT, $9, OPP_JR_TRAINER_F, $16
+ object SPRITE_LASS, $12, $d, STAY, UP, $a, OPP_JR_TRAINER_F, $17
object SPRITE_BALL, $12, $5, STAY, NONE, $b, TM_20
; warp-to
--- a/data/mapObjects/route20.asm
+++ b/data/mapObjects/route20.asm
@@ -13,12 +13,12 @@
object SPRITE_SWIMMER, $57, $8, STAY, UP, $1, OPP_SWIMMER, $9
object SPRITE_SWIMMER, $44, $b, STAY, UP, $2, OPP_BEAUTY, $f
object SPRITE_SWIMMER, $2d, $a, STAY, DOWN, $3, OPP_BEAUTY, $6
- object SPRITE_SWIMMER, $37, $e, STAY, RIGHT, $4, OPP_JR__TRAINER_F, $18
+ object SPRITE_SWIMMER, $37, $e, STAY, RIGHT, $4, OPP_JR_TRAINER_F, $18
object SPRITE_SWIMMER, $26, $d, STAY, DOWN, $5, OPP_SWIMMER, $a
object SPRITE_SWIMMER, $57, $d, STAY, UP, $6, OPP_SWIMMER, $b
object SPRITE_BLACK_HAIR_BOY_1, $22, $9, STAY, UP, $7, OPP_BIRD_KEEPER, $b
object SPRITE_SWIMMER, $19, $7, STAY, UP, $8, OPP_BEAUTY, $7
- object SPRITE_SWIMMER, $18, $c, STAY, DOWN, $9, OPP_JR__TRAINER_F, $10
+ object SPRITE_SWIMMER, $18, $c, STAY, DOWN, $9, OPP_JR_TRAINER_F, $10
object SPRITE_SWIMMER, $f, $8, STAY, UP, $a, OPP_BEAUTY, $8
; warp-to
--- a/data/mapObjects/route24.asm
+++ b/data/mapObjects/route24.asm
@@ -7,8 +7,8 @@
db $8 ; objects
object SPRITE_BLACK_HAIR_BOY_1, $b, $f, STAY, LEFT, $1, OPP_ROCKET, $6
- object SPRITE_BLACK_HAIR_BOY_1, $5, $14, STAY, UP, $2, OPP_JR__TRAINER_M, $2
- object SPRITE_BLACK_HAIR_BOY_1, $b, $13, STAY, LEFT, $3, OPP_JR__TRAINER_M, $3
+ object SPRITE_BLACK_HAIR_BOY_1, $5, $14, STAY, UP, $2, OPP_JR_TRAINER_M, $2
+ object SPRITE_BLACK_HAIR_BOY_1, $b, $13, STAY, LEFT, $3, OPP_JR_TRAINER_M, $3
object SPRITE_LASS, $a, $16, STAY, RIGHT, $4, OPP_LASS, $7
object SPRITE_BUG_CATCHER, $b, $19, STAY, LEFT, $5, OPP_YOUNGSTER, $4
object SPRITE_LASS, $a, $1c, STAY, RIGHT, $6, OPP_LASS, $8
--- a/data/mapObjects/route25.asm
+++ b/data/mapObjects/route25.asm
@@ -10,7 +10,7 @@
db $a ; objects
object SPRITE_BUG_CATCHER, $e, $2, STAY, DOWN, $1, OPP_YOUNGSTER, $5
object SPRITE_BUG_CATCHER, $12, $5, STAY, UP, $2, OPP_YOUNGSTER, $6
- object SPRITE_BLACK_HAIR_BOY_1, $18, $4, STAY, DOWN, $3, OPP_JR__TRAINER_M, $2
+ object SPRITE_BLACK_HAIR_BOY_1, $18, $4, STAY, DOWN, $3, OPP_JR_TRAINER_M, $2
object SPRITE_LASS, $12, $8, STAY, RIGHT, $4, OPP_LASS, $9
object SPRITE_BUG_CATCHER, $20, $3, STAY, LEFT, $5, OPP_YOUNGSTER, $7
object SPRITE_LASS, $25, $4, STAY, DOWN, $6, OPP_LASS, $a
--- a/data/mapObjects/route6.asm
+++ b/data/mapObjects/route6.asm
@@ -11,11 +11,11 @@
db $f, $13, $7 ; Route6Text7
db $6 ; objects
- object SPRITE_BLACK_HAIR_BOY_1, $a, $15, STAY, RIGHT, $1, OPP_JR__TRAINER_M, $4
- object SPRITE_LASS, $b, $15, STAY, LEFT, $2, OPP_JR__TRAINER_F, $2
+ object SPRITE_BLACK_HAIR_BOY_1, $a, $15, STAY, RIGHT, $1, OPP_JR_TRAINER_M, $4
+ object SPRITE_LASS, $b, $15, STAY, LEFT, $2, OPP_JR_TRAINER_F, $2
object SPRITE_BUG_CATCHER, $0, $f, STAY, RIGHT, $3, OPP_BUG_CATCHER, $a
- object SPRITE_BLACK_HAIR_BOY_1, $b, $1f, STAY, LEFT, $4, OPP_JR__TRAINER_M, $5
- object SPRITE_LASS, $b, $1e, STAY, LEFT, $5, OPP_JR__TRAINER_F, $3
+ object SPRITE_BLACK_HAIR_BOY_1, $b, $1f, STAY, LEFT, $4, OPP_JR_TRAINER_M, $5
+ object SPRITE_LASS, $b, $1e, STAY, LEFT, $5, OPP_JR_TRAINER_F, $3
object SPRITE_BUG_CATCHER, $13, $1a, STAY, LEFT, $6, OPP_BUG_CATCHER, $b
; warp-to
--- a/data/mapObjects/route9.asm
+++ b/data/mapObjects/route9.asm
@@ -7,10 +7,10 @@
db $7, $19, $b ; Route9Text11
db $a ; objects
- object SPRITE_LASS, $d, $a, STAY, LEFT, $1, OPP_JR__TRAINER_F, $5
- object SPRITE_BLACK_HAIR_BOY_1, $18, $7, STAY, LEFT, $2, OPP_JR__TRAINER_M, $7
- object SPRITE_BLACK_HAIR_BOY_1, $1f, $7, STAY, RIGHT, $3, OPP_JR__TRAINER_M, $8
- object SPRITE_LASS, $30, $8, STAY, RIGHT, $4, OPP_JR__TRAINER_F, $6
+ object SPRITE_LASS, $d, $a, STAY, LEFT, $1, OPP_JR_TRAINER_F, $5
+ object SPRITE_BLACK_HAIR_BOY_1, $18, $7, STAY, LEFT, $2, OPP_JR_TRAINER_M, $7
+ object SPRITE_BLACK_HAIR_BOY_1, $1f, $7, STAY, RIGHT, $3, OPP_JR_TRAINER_M, $8
+ object SPRITE_LASS, $30, $8, STAY, RIGHT, $4, OPP_JR_TRAINER_F, $6
object SPRITE_HIKER, $10, $f, STAY, LEFT, $5, OPP_HIKER, $b
object SPRITE_HIKER, $2b, $3, STAY, LEFT, $6, OPP_HIKER, $6
object SPRITE_BUG_CATCHER, $16, $2, STAY, DOWN, $7, OPP_BUG_CATCHER, $d
--- a/data/mapObjects/vermiliongym.asm
+++ b/data/mapObjects/vermiliongym.asm
@@ -8,7 +8,7 @@
db $0 ; signs
db $5 ; objects
- object SPRITE_ROCKER, $5, $1, STAY, DOWN, $1, OPP_LT__SURGE, $1
+ object SPRITE_ROCKER, $5, $1, STAY, DOWN, $1, OPP_LT_SURGE, $1
object SPRITE_GENTLEMAN, $9, $6, STAY, LEFT, $2, OPP_GENTLEMAN, $3
object SPRITE_BLACK_HAIR_BOY_2, $3, $8, STAY, LEFT, $3, OPP_ROCKER, $1
object SPRITE_SAILOR, $0, $a, STAY, RIGHT, $4, OPP_SAILOR, $8
--- a/data/mapObjects/victoryroad2.asm
+++ b/data/mapObjects/victoryroad2.asm
@@ -22,7 +22,7 @@
object SPRITE_BALL, $1b, $5, STAY, NONE, $7, TM_17
object SPRITE_BALL, $12, $9, STAY, NONE, $8, FULL_HEAL
object SPRITE_BALL, $9, $b, STAY, NONE, $9, TM_05
- object SPRITE_BALL, $b, $0, STAY, NONE, $a, GUARD_SPEC_
+ object SPRITE_BALL, $b, $0, STAY, NONE, $a, GUARD_SPEC
object SPRITE_BOULDER, $4, $e, STAY, BOULDER_MOVEMENT_BYTE_2, $b ; person
object SPRITE_BOULDER, $5, $5, STAY, BOULDER_MOVEMENT_BYTE_2, $c ; person
object SPRITE_BOULDER, $17, $10, STAY, BOULDER_MOVEMENT_BYTE_2, $d ; person
--- a/data/mart_inventories.asm
+++ b/data/mart_inventories.asm
@@ -44,7 +44,7 @@
; Celadon Dept. Store 5F (1)
CeladonMart5Text3:: ; 2496 (0:2496)
- db $FE,7,X_ACCURACY,GUARD_SPEC_,DIRE_HIT,X_ATTACK,X_DEFEND,X_SPEED
+ db $FE,7,X_ACCURACY,GUARD_SPEC,DIRE_HIT,X_ATTACK,X_DEFEND,X_SPEED
db X_SPECIAL,$FF
; Celadon Dept. Store 5F (2)
--- a/data/mon_palettes.asm
+++ b/data/mon_palettes.asm
@@ -82,7 +82,7 @@
db PAL_PINKMON ; SLOWBRO
db PAL_GREYMON ; MAGNEMITE
db PAL_GREYMON ; MAGNETON
- db PAL_BROWNMON ; FARFETCH_D
+ db PAL_BROWNMON ; FARFETCHD
db PAL_BROWNMON ; DODUO
db PAL_BROWNMON ; DODRIO
db PAL_BLUEMON ; SEEL
--- a/data/pokedex_order.asm
+++ b/data/pokedex_order.asm
@@ -62,7 +62,7 @@
db 0 ; MISSINGNO.
db 0 ; MISSINGNO.
db 0 ; MISSINGNO.
- db DEX_FARFETCH_D
+ db DEX_FARFETCHD
db DEX_VENONAT
db DEX_DRAGONITE
db 0 ; MISSINGNO.
--- a/data/trades.asm
+++ b/data/trades.asm
@@ -1,25 +1,25 @@
TradeMons: ; 71b7b (1c:5b7b)
; givemonster, getmonster, textstring, nickname (11 bytes), 14 bytes total
IF DEF(_YELLOW)
- db LICKITUNG, DUGTRIO, 0,"GURIO@@@@@@"
- db CLEFAIRY, MR_MIME, 0,"MILES@@@@@@"
- db BUTTERFREE,BEEDRILL, 2,"STINGER@@@@"
- db KANGASKHAN,MUK, 0,"STICKY@@@@@"
- db MEW, MEW, 2,"BART@@@@@@@"
- db TANGELA, PARASECT, 0,"SPIKE@@@@@@"
- db PIDGEOT, PIDGEOT, 1,"MARTY@@@@@@"
- db GOLDUCK, RHYDON, 1,"BUFFY@@@@@@"
- db GROWLITHE, DEWGONG, 2,"CEZANNE@@@@"
- db CUBONE, MACHOKE, 2,"RICKY@@@@@@"
+ db LICKITUNG, DUGTRIO, 0,"GURIO@@@@@@"
+ db CLEFAIRY, MR_MIME, 0,"MILES@@@@@@"
+ db BUTTERFREE,BEEDRILL, 2,"STINGER@@@@"
+ db KANGASKHAN,MUK, 0,"STICKY@@@@@"
+ db MEW, MEW, 2,"BART@@@@@@@"
+ db TANGELA, PARASECT, 0,"SPIKE@@@@@@"
+ db PIDGEOT, PIDGEOT, 1,"MARTY@@@@@@"
+ db GOLDUCK, RHYDON, 1,"BUFFY@@@@@@"
+ db GROWLITHE, DEWGONG, 2,"CEZANNE@@@@"
+ db CUBONE, MACHOKE, 2,"RICKY@@@@@@"
ELSE
- db NIDORINO, NIDORINA, 0,"TERRY@@@@@@"
- db ABRA, MR_MIME, 0,"MARCEL@@@@@"
- db BUTTERFREE,BEEDRILL, 2,"CHIKUCHIKU@"
- db PONYTA, SEEL, 0,"SAILOR@@@@@"
- db SPEAROW, FARFETCH_D,2,"DUX@@@@@@@@"
- db SLOWBRO, LICKITUNG, 0,"MARC@@@@@@@"
- db POLIWHIRL, JYNX, 1,"LOLA@@@@@@@"
- db RAICHU, ELECTRODE, 1,"DORIS@@@@@@"
- db VENONAT, TANGELA, 2,"CRINKLES@@@"
- db NIDORAN_M, NIDORAN_F, 2,"SPOT@@@@@@@"
+ db NIDORINO, NIDORINA, 0,"TERRY@@@@@@"
+ db ABRA, MR_MIME, 0,"MARCEL@@@@@"
+ db BUTTERFREE,BEEDRILL, 2,"CHIKUCHIKU@"
+ db PONYTA, SEEL, 0,"SAILOR@@@@@"
+ db SPEAROW, FARFETCHD,2,"DUX@@@@@@@@"
+ db SLOWBRO, LICKITUNG,0,"MARC@@@@@@@"
+ db POLIWHIRL, JYNX, 1,"LOLA@@@@@@@"
+ db RAICHU, ELECTRODE,1,"DORIS@@@@@@"
+ db VENONAT, TANGELA, 2,"CRINKLES@@@"
+ db NIDORAN_M, NIDORAN_F,2,"SPOT@@@@@@@"
ENDC
--- a/data/trainer_moves.asm
+++ b/data/trainer_moves.asm
@@ -58,7 +58,7 @@
db 2,4,BUBBLEBEAM
db 0
- db LT__SURGE,$1
+ db LT_SURGE,$1
db 1,1,THUNDERBOLT
db 1,2,MEGA_PUNCH
db 1,3,MEGA_KICK
--- a/data/trainer_parties.asm
+++ b/data/trainer_parties.asm
@@ -306,9 +306,9 @@
db 29,PIDGEY,PIDGEOTTO,0
db 25,SPEAROW,PIDGEY,PIDGEY,SPEAROW,SPEAROW,0
db 26,PIDGEY,PIDGEOTTO,SPEAROW,FEAROW,0
- db 33,FARFETCH_D,0
+ db 33,FARFETCHD,0
db 29,SPEAROW,FEAROW,0
- db 26,PIDGEOTTO,FARFETCH_D,DODUO,PIDGEY,0
+ db 26,PIDGEOTTO,FARFETCHD,DODUO,PIDGEY,0
db 28,DODRIO,DODUO,DODUO,0
db 29,SPEAROW,FEAROW,0
db 34,DODRIO,0
@@ -315,7 +315,7 @@
db 26,SPEAROW,SPEAROW,FEAROW,SPEAROW,0
db 30,FEAROW,FEAROW,PIDGEOTTO,0
db 39,PIDGEOTTO,PIDGEOTTO,PIDGEY,PIDGEOTTO,0
- db 42,FARFETCH_D,FEAROW,0
+ db 42,FARFETCHD,FEAROW,0
db 28,PIDGEY,DODUO,PIDGEOTTO,0
db 26,PIDGEY,SPEAROW,PIDGEY,FEAROW,0
db 29,PIDGEOTTO,FEAROW,0
--- a/data/trainer_types.asm
+++ b/data/trainer_types.asm
@@ -1,6 +1,6 @@
FemaleTrainerList:: ; 3434 (0:3434)
db OPP_LASS
- db OPP_JR__TRAINER_F
+ db OPP_JR_TRAINER_F
db OPP_BEAUTY
db OPP_COOLTRAINER_F
db $FF
--- a/data/wildPokemon/route12.asm
+++ b/data/wildPokemon/route12.asm
@@ -38,8 +38,8 @@
db 27,BELLSPROUT
db 29,GLOOM
db 29,WEEPINBELL
- db 26,FARFETCH_D
- db 31,FARFETCH_D
+ db 26,FARFETCHD
+ db 31,FARFETCHD
db $03
db 15,SLOWPOKE
--- a/data/wildPokemon/route13.asm
+++ b/data/wildPokemon/route13.asm
@@ -39,8 +39,8 @@
db 27,BELLSPROUT
db 29,GLOOM
db 29,WEEPINBELL
- db 26,FARFETCH_D
- db 31,FARFETCH_D
+ db 26,FARFETCHD
+ db 31,FARFETCHD
db $03
db 15,SLOWPOKE
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -903,7 +903,7 @@
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
--- 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
--- a/engine/battle/trainer_ai.asm
+++ b/engine/battle/trainer_ai.asm
@@ -280,8 +280,8 @@
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 @@
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 @@
call AIPlayRestoringSFX
ld hl,wEnemyBattleStatus2
set 1,[hl]
- ld a,GUARD_SPEC_
+ ld a,GUARD_SPEC
jp AIPrintItemUse
AIUseDireHit: ; 0x3a7c2 unused
--- a/engine/items/items.asm
+++ b/engine/items/items.asm
@@ -70,7 +70,7 @@
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 @@
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 @@
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
--- a/scripts/billshouse.asm
+++ b/scripts/billshouse.asm
@@ -163,7 +163,7 @@
jr nz, .asm_1e8a9
ld hl, BillThankYouText
call PrintText
- lb bc, S_S__TICKET, 1
+ lb bc, S_S_TICKET, 1
call GiveItem
jr nc, .BagFull
ld hl, SSTicketReceivedText
--- a/scripts/route15gateupstairs.asm
+++ b/scripts/route15gateupstairs.asm
@@ -11,7 +11,7 @@
jr nz, .asm_49683
ld a, 50 ; pokemon needed
ld [hOaksAideRequirement], a
- ld a, EXP__ALL ; oak's aide reward
+ ld a, EXP_ALL ; oak's aide reward
ld [hOaksAideRewardItem], a
ld [wd11e], a
call GetItemName
--- a/scripts/vermilioncity.asm
+++ b/scripts/vermilioncity.asm
@@ -52,7 +52,7 @@
call DisplayTextID
CheckEvent EVENT_SS_ANNE_LEFT
jr nz, .asm_19810
- ld b, S_S__TICKET
+ ld b, S_S_TICKET
predef GetQuantityOfItemInBag
ld a, b
and a
@@ -170,7 +170,7 @@
.asm_198d0
ld hl, SSAnneWelcomeText9
call PrintText
- ld b, S_S__TICKET
+ ld b, S_S_TICKET
predef GetQuantityOfItemInBag
ld a, b
and a