summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2015-11-02 14:37:02 -0500
committerPikalaxALT <PikalaxALT@gmail.com>2015-11-02 14:37:02 -0500
commit72af3337fd8746c51aac273b6c056209e73c7ae0 (patch)
tree661d1515bcee017ce4652bc02d0691e00992ec9a /data
parente0d6e9ca7acf8a23ad70fad405ddf1073dcd4291 (diff)
No more NONE
Diffstat (limited to 'data')
-rw-r--r--data/battle_tower.asm2
-rw-r--r--data/odd_eggs.asm28
2 files changed, 15 insertions, 15 deletions
diff --git a/data/battle_tower.asm b/data/battle_tower.asm
index 281c359d7..b0455eb10 100644
--- a/data/battle_tower.asm
+++ b/data/battle_tower.asm
@@ -773,7 +773,7 @@ BattleTowerMons1:
db UNOWN
db BERRY
- db HIDDEN_POWER, NONE, NONE, NONE
+ db HIDDEN_POWER, 0, 0, 0
dw 0 ; OT ID
dt 1000 ; Exp
; Stat exp
diff --git a/data/odd_eggs.asm b/data/odd_eggs.asm
index 37a63f476..96a6717b9 100644
--- a/data/odd_eggs.asm
+++ b/data/odd_eggs.asm
@@ -125,7 +125,7 @@ OddEggs: ; 1fb56e
OddEgg1:
db PICHU
db NO_ITEM
- db THUNDERSHOCK, CHARM, DIZZY_PUNCH, NONE
+ db THUNDERSHOCK, CHARM, DIZZY_PUNCH, 0
dw 02048 ; OT ID
dt 125 ; Exp
; Stat exp
@@ -152,7 +152,7 @@ OddEgg1:
OddEgg2:
db PICHU
db NO_ITEM
- db THUNDERSHOCK, CHARM, DIZZY_PUNCH, NONE
+ db THUNDERSHOCK, CHARM, DIZZY_PUNCH, 0
dw 00256 ; OT ID
dt 125 ; Exp
; Stat exp
@@ -178,7 +178,7 @@ OddEgg2:
db CLEFFA
db NO_ITEM
- db POUND, CHARM, DIZZY_PUNCH, NONE
+ db POUND, CHARM, DIZZY_PUNCH, 0
dw 04096 ; OT ID
dt 125 ; Exp
; Stat exp
@@ -204,7 +204,7 @@ OddEgg2:
db CLEFFA
db NO_ITEM
- db POUND, CHARM, DIZZY_PUNCH, NONE
+ db POUND, CHARM, DIZZY_PUNCH, 0
dw 00768 ; OT ID
dt 125 ; Exp
; Stat exp
@@ -230,7 +230,7 @@ OddEgg2:
db IGGLYBUFF
db NO_ITEM
- db SING, CHARM, DIZZY_PUNCH, NONE
+ db SING, CHARM, DIZZY_PUNCH, 0
dw 04096 ; OT ID
dt 125 ; Exp
; Stat exp
@@ -256,7 +256,7 @@ OddEgg2:
db IGGLYBUFF
db NO_ITEM
- db SING, CHARM, DIZZY_PUNCH, NONE
+ db SING, CHARM, DIZZY_PUNCH, 0
dw 00768 ; OT ID
dt 125 ; Exp
; Stat exp
@@ -282,7 +282,7 @@ OddEgg2:
db SMOOCHUM
db NO_ITEM
- db POUND, LICK, DIZZY_PUNCH, NONE
+ db POUND, LICK, DIZZY_PUNCH, 0
dw 03584 ; OT ID
dt 125 ; Exp
; Stat exp
@@ -308,7 +308,7 @@ OddEgg2:
db SMOOCHUM
db NO_ITEM
- db POUND, LICK, DIZZY_PUNCH, NONE
+ db POUND, LICK, DIZZY_PUNCH, 0
dw 00512 ; OT ID
dt 125 ; Exp
; Stat exp
@@ -334,7 +334,7 @@ OddEgg2:
db MAGBY
db NO_ITEM
- db EMBER, DIZZY_PUNCH, NONE, NONE
+ db EMBER, DIZZY_PUNCH, 0, 0
dw 02560 ; OT ID
dt 125 ; Exp
; Stat exp
@@ -360,7 +360,7 @@ OddEgg2:
db MAGBY
db NO_ITEM
- db EMBER, DIZZY_PUNCH, NONE, NONE
+ db EMBER, DIZZY_PUNCH, 0, 0
dw 00512 ; OT ID
dt 125 ; Exp
; Stat exp
@@ -386,7 +386,7 @@ OddEgg2:
db ELEKID
db NO_ITEM
- db QUICK_ATTACK, LEER, DIZZY_PUNCH, NONE
+ db QUICK_ATTACK, LEER, DIZZY_PUNCH, 0
dw 03072 ; OT ID
dt 125 ; Exp
; Stat exp
@@ -412,7 +412,7 @@ OddEgg2:
db ELEKID
db NO_ITEM
- db QUICK_ATTACK, LEER, DIZZY_PUNCH, NONE
+ db QUICK_ATTACK, LEER, DIZZY_PUNCH, 0
dw 00512 ; OT ID
dt 125 ; Exp
; Stat exp
@@ -438,7 +438,7 @@ OddEgg2:
db TYROGUE
db NO_ITEM
- db TACKLE, DIZZY_PUNCH, NONE, NONE
+ db TACKLE, DIZZY_PUNCH, 0, 0
dw 02560 ; OT ID
dt 125 ; Exp
; Stat exp
@@ -464,7 +464,7 @@ OddEgg2:
db TYROGUE
db NO_ITEM
- db TACKLE, DIZZY_PUNCH, NONE, NONE
+ db TACKLE, DIZZY_PUNCH, 0, 0
dw 00256 ; OT ID
dt 125 ; Exp
; Stat exp