diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2019-01-03 19:00:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-03 19:00:46 -0500 |
| commit | 3650232398d6d75a5bcdfc99c3c3bb73ddd54751 (patch) | |
| tree | 548641f7d227b731bb67b0cecc45994d6cc54c5c /data | |
| parent | 583838a39d0c9ddd2440f9c12747a616b377e7ec (diff) | |
| parent | 36ebcdd8fe5c8191e1d59a15259654862de64193 (diff) | |
Merge pull request #590 from Rangi42/master
Clean up some Odd Egg and Battle Tower code and data
Diffstat (limited to 'data')
| -rw-r--r-- | data/events/odd_eggs.asm | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/data/events/odd_eggs.asm b/data/events/odd_eggs.asm index a3c942ff7..5b251645a 100644 --- a/data/events/odd_eggs.asm +++ b/data/events/odd_eggs.asm @@ -29,7 +29,6 @@ prob_total = 0 OddEggs: -OddEgg1: db PICHU db NO_ITEM db THUNDERSHOCK, CHARM, DIZZY_PUNCH, 0 @@ -43,7 +42,7 @@ OddEgg1: bigdw 0 dn 0, 0, 0, 0 ; DVs db 30, 20, 10, 0 ; PP - db 20 ; Happiness + db 20 ; Step cycles to hatch db 0, 0, 0 ; Pokerus, Caught data db 5 ; Level db 0, 0 ; Status @@ -55,7 +54,6 @@ OddEgg1: bigdw 8 ; SAtk bigdw 8 ; SDef db "EGG@@@@@@@@" -OddEgg1End: db PICHU db NO_ITEM @@ -70,7 +68,7 @@ OddEgg1End: bigdw 0 dn 2, 10, 10, 10 ; DVs db 30, 20, 10, 0 ; PP - db 20 ; Happiness + db 20 ; Step cycles to hatch db 0, 0, 0 ; Pokerus, Caught data db 5 ; Level db 0, 0 ; Status @@ -96,7 +94,7 @@ OddEgg1End: bigdw 0 dn 0, 0, 0, 0 ; DVs db 35, 20, 10, 0 ; PP - db 20 ; Happiness + db 20 ; Step cycles to hatch db 0, 0, 0 ; Pokerus, Caught data db 5 ; Level db 0, 0 ; Status @@ -122,7 +120,7 @@ OddEgg1End: bigdw 0 dn 2, 10, 10, 10 ; DVs db 35, 20, 10, 0 ; PP - db 20 ; Happiness + db 20 ; Step cycles to hatch db 0, 0, 0 ; Pokerus, Caught data db 5 ; Level db 0, 0 ; Status @@ -148,7 +146,7 @@ OddEgg1End: bigdw 0 dn 0, 0, 0, 0 ; DVs db 15, 20, 10, 0 ; PP - db 20 ; Happiness + db 20 ; Step cycles to hatch db 0, 0, 0 ; Pokerus, Caught data db 5 ; Level db 0, 0 ; Status @@ -174,7 +172,7 @@ OddEgg1End: bigdw 0 dn 2, 10, 10, 10 ; DVs db 15, 20, 10, 0 ; PP - db 20 ; Happiness + db 20 ; Step cycles to hatch db 0, 0, 0 ; Pokerus, Caught data db 5 ; Level db 0, 0 ; Status @@ -200,7 +198,7 @@ OddEgg1End: bigdw 0 dn 0, 0, 0, 0 ; DVs db 35, 30, 10, 0 ; PP - db 20 ; Happiness + db 20 ; Step cycles to hatch db 0, 0, 0 ; Pokerus, Caught data db 5 ; Level db 0, 0 ; Status @@ -226,7 +224,7 @@ OddEgg1End: bigdw 0 dn 2, 10, 10, 10 ; DVs db 35, 30, 10, 0 ; PP - db 20 ; Happiness + db 20 ; Step cycles to hatch db 0, 0, 0 ; Pokerus, Caught data db 5 ; Level db 0, 0 ; Status @@ -252,7 +250,7 @@ OddEgg1End: bigdw 0 dn 0, 0, 0, 0 ; DVs db 25, 10, 0, 0 ; PP - db 20 ; Happiness + db 20 ; Step cycles to hatch db 0, 0, 0 ; Pokerus, Caught data db 5 ; Level db 0, 0 ; Status @@ -278,7 +276,7 @@ OddEgg1End: bigdw 0 dn 2, 10, 10, 10 ; DVs db 25, 10, 0, 0 ; PP - db 20 ; Happiness + db 20 ; Step cycles to hatch db 0, 0, 0 ; Pokerus, Caught data db 5 ; Level db 0, 0 ; Status @@ -304,7 +302,7 @@ OddEgg1End: bigdw 0 dn 0, 0, 0, 0 ; DVs db 30, 30, 10, 0 ; PP - db 20 ; Happiness + db 20 ; Step cycles to hatch db 0, 0, 0 ; Pokerus, Caught data db 5 ; Level db 0, 0 ; Status @@ -330,7 +328,7 @@ OddEgg1End: bigdw 0 dn 2, 10, 10, 10 ; DVs db 30, 30, 10, 0 ; PP - db 20 ; Happiness + db 20 ; Step cycles to hatch db 0, 0, 0 ; Pokerus, Caught data db 5 ; Level db 0, 0 ; Status @@ -356,7 +354,7 @@ OddEgg1End: bigdw 0 dn 0, 0, 0, 0 ; DVs db 35, 10, 0, 0 ; PP - db 20 ; Happiness + db 20 ; Step cycles to hatch db 0, 0, 0 ; Pokerus, Caught data db 5 ; Level db 0, 0 ; Status @@ -382,7 +380,7 @@ OddEgg1End: bigdw 0 dn 2, 10, 10, 10 ; DVs db 35, 10, 0, 0 ; PP - db 20 ; Happiness + db 20 ; Step cycles to hatch db 0, 0, 0 ; Pokerus, Caught data db 5 ; Level db 0, 0 ; Status |