No more NONE

This commit is contained in:
PikalaxALT
2015-11-02 14:37:02 -05:00
parent e0d6e9ca7a
commit 72af3337fd
185 changed files with 1343 additions and 1345 deletions

View File

@@ -1,43 +1,43 @@
TrainerClassAttributes: ; 3959c
; Falkner
db NONE, NONE ; items
db 0, 0 ; items
db 25 ; base reward
dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
dw CONTEXT_USE + SWITCH_SOMETIMES
; Whitney
db NONE, NONE ; items
db 0, 0 ; items
db 25 ; base reward
dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
dw CONTEXT_USE + SWITCH_SOMETIMES
; Bugsy
db NONE, NONE ; items
db 0, 0 ; items
db 25 ; base reward
dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
dw CONTEXT_USE + SWITCH_SOMETIMES
; Morty
db NONE, NONE ; items
db 0, 0 ; items
db 25 ; base reward
dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
dw CONTEXT_USE + SWITCH_SOMETIMES
; Pryce
db HYPER_POTION, NONE ; items
db HYPER_POTION, 0 ; items
db 25 ; base reward
dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
dw CONTEXT_USE + SWITCH_SOMETIMES
; Jasmine
db HYPER_POTION, NONE ; items
db HYPER_POTION, 0 ; items
db 25 ; base reward
dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
dw CONTEXT_USE + SWITCH_SOMETIMES
; Chuck
db FULL_HEAL, NONE ; items
db FULL_HEAL, 0 ; items
db 25 ; base reward
dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
dw CONTEXT_USE + SWITCH_SOMETIMES
@@ -49,31 +49,31 @@ TrainerClassAttributes: ; 3959c
dw CONTEXT_USE + SWITCH_SOMETIMES
; Rival1
db NONE, NONE ; items
db 0, 0 ; items
db 15 ; base reward
dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
dw CONTEXT_USE + SWITCH_SOMETIMES
; Pokemon Prof
db NONE, NONE ; items
db 0, 0 ; items
db 25 ; base reward
dw AI_BASIC + AI_AGGRESSIVE + AI_STATUS
dw CONTEXT_USE + SWITCH_SOMETIMES
; Will
db MAX_POTION, NONE ; items
db MAX_POTION, 0 ; items
db 25 ; base reward
dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
dw CONTEXT_USE + SWITCH_SOMETIMES
; Cal
db NONE, NONE ; items
db 0, 0 ; items
db 25 ; base reward
dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
dw CONTEXT_USE + SWITCH_SOMETIMES
; Bruno
db MAX_POTION, NONE ; items
db MAX_POTION, 0 ; items
db 25 ; base reward
dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
dw CONTEXT_USE + SWITCH_SOMETIMES
@@ -97,175 +97,175 @@ TrainerClassAttributes: ; 3959c
dw CONTEXT_USE + SWITCH_SOMETIMES
; Brock
db HYPER_POTION, NONE ; items
db HYPER_POTION, 0 ; items
db 25 ; base reward
dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
dw CONTEXT_USE + SWITCH_SOMETIMES
; Misty
db FULL_HEAL, NONE ; items
db FULL_HEAL, 0 ; items
db 25 ; base reward
dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
dw CONTEXT_USE + SWITCH_SOMETIMES
; Lt Surge
db HYPER_POTION, NONE ; items
db HYPER_POTION, 0 ; items
db 25 ; base reward
dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
dw CONTEXT_USE + SWITCH_SOMETIMES
; Scientist
db NONE, NONE ; items
db 0, 0 ; items
db 25 ; base reward
dw AI_BASIC + AI_SETUP + AI_TYPES + AI_STATUS + AI_RISKY
dw CONTEXT_USE + SWITCH_SOMETIMES
; Erika
db HYPER_POTION, NONE ; items
db HYPER_POTION, 0 ; items
db 25 ; base reward
dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
dw CONTEXT_USE + SWITCH_SOMETIMES
; Youngster
db NONE, NONE ; items
db 0, 0 ; items
db 4 ; base reward
dw AI_BASIC + AI_STATUS
dw CONTEXT_USE + SWITCH_SOMETIMES
; Schoolboy
db NONE, NONE ; items
db 0, 0 ; items
db 8 ; base reward
dw AI_BASIC + AI_SETUP + AI_TYPES + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS
dw CONTEXT_USE + SWITCH_OFTEN
; Bird Keeper
db NONE, NONE ; items
db 0, 0 ; items
db 6 ; base reward
dw AI_BASIC + AI_TYPES + AI_OFFENSIVE + AI_OPPORTUNIST + AI_STATUS
dw CONTEXT_USE + SWITCH_SOMETIMES
; Lass
db NONE, NONE ; items
db 0, 0 ; items
db 6 ; base reward
dw AI_BASIC + AI_CAUTIOUS + AI_STATUS
dw CONTEXT_USE + SWITCH_OFTEN
; Janine
db DIRE_HIT, NONE ; items
db DIRE_HIT, 0 ; items
db 25 ; base reward
dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
dw CONTEXT_USE + SWITCH_SOMETIMES
; Cooltrainerm
db NONE, NONE ; items
db 0, 0 ; items
db 12 ; base reward
dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
dw CONTEXT_USE + SWITCH_SOMETIMES
; Cooltrainerf
db NONE, NONE ; items
db 0, 0 ; items
db 12 ; base reward
dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
dw CONTEXT_USE + SWITCH_SOMETIMES
; Beauty
db NONE, NONE ; items
db 0, 0 ; items
db 22 ; base reward
dw AI_BASIC + AI_TYPES + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS
dw CONTEXT_USE + SWITCH_SOMETIMES
; Pokemaniac
db NONE, NONE ; items
db 0, 0 ; items
db 15 ; base reward
dw AI_BASIC + AI_SETUP + AI_OFFENSIVE + AI_AGGRESSIVE + AI_STATUS
dw CONTEXT_USE + SWITCH_SOMETIMES
; Gruntm
db NONE, NONE ; items
db 0, 0 ; items
db 10 ; base reward
dw AI_BASIC + AI_SETUP + AI_TYPES + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS + AI_RISKY
dw CONTEXT_USE + SWITCH_SOMETIMES
; Gentleman
db NONE, NONE ; items
db 0, 0 ; items
db 18 ; base reward
dw AI_BASIC + AI_SETUP + AI_AGGRESSIVE + AI_STATUS
dw CONTEXT_USE + SWITCH_SOMETIMES
; Skier
db NONE, NONE ; items
db 0, 0 ; items
db 18 ; base reward
dw AI_BASIC + AI_SETUP + AI_TYPES + AI_STATUS + AI_RISKY
dw CONTEXT_USE + SWITCH_SOMETIMES
; Teacher
db NONE, NONE ; items
db 0, 0 ; items
db 18 ; base reward
dw AI_BASIC + AI_OPPORTUNIST + AI_AGGRESSIVE + AI_STATUS
dw CONTEXT_USE + SWITCH_SOMETIMES
; Sabrina
db HYPER_POTION, NONE ; items
db HYPER_POTION, 0 ; items
db 25 ; base reward
dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
dw CONTEXT_USE + SWITCH_SOMETIMES
; Bug Catcher
db NONE, NONE ; items
db 0, 0 ; items
db 4 ; base reward
dw AI_BASIC + AI_SETUP + AI_STATUS
dw CONTEXT_USE + SWITCH_SOMETIMES
; Fisher
db NONE, NONE ; items
db 0, 0 ; items
db 10 ; base reward
dw AI_BASIC + AI_TYPES + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS
dw CONTEXT_USE + SWITCH_OFTEN
; Swimmerm
db NONE, NONE ; items
db 0, 0 ; items
db 2 ; base reward
dw AI_BASIC + AI_SETUP + AI_TYPES + AI_OFFENSIVE + AI_STATUS
dw CONTEXT_USE + SWITCH_SOMETIMES
; Swimmerf
db NONE, NONE ; items
db 0, 0 ; items
db 5 ; base reward
dw AI_BASIC + AI_SETUP + AI_TYPES + AI_CAUTIOUS + AI_STATUS
dw CONTEXT_USE + SWITCH_SOMETIMES
; Sailor
db NONE, NONE ; items
db 0, 0 ; items
db 10 ; base reward
dw AI_BASIC + AI_OFFENSIVE + AI_OPPORTUNIST + AI_STATUS
dw CONTEXT_USE + SWITCH_SOMETIMES
; Super Nerd
db NONE, NONE ; items
db 0, 0 ; items
db 8 ; base reward
dw AI_BASIC + AI_TYPES + AI_SMART + AI_STATUS
dw CONTEXT_USE + SWITCH_SOMETIMES
; Rival2
db NONE, NONE ; items
db 0, 0 ; items
db 25 ; base reward
dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
dw CONTEXT_USE + SWITCH_SOMETIMES
; Guitarist
db NONE, NONE ; items
db 0, 0 ; items
db 8 ; base reward
dw AI_BASIC + AI_SETUP + AI_TYPES + AI_CAUTIOUS + AI_STATUS
dw CONTEXT_USE + SWITCH_SOMETIMES
; Hiker
db NONE, NONE ; items
db 0, 0 ; items
db 8 ; base reward
dw AI_BASIC + AI_OFFENSIVE + AI_STATUS
dw CONTEXT_USE + SWITCH_SOMETIMES
; Biker
db NONE, NONE ; items
db 0, 0 ; items
db 8 ; base reward
dw AI_BASIC + AI_TYPES + AI_STATUS + AI_RISKY
dw CONTEXT_USE + SWITCH_SOMETIMES
@@ -277,97 +277,97 @@ TrainerClassAttributes: ; 3959c
dw CONTEXT_USE + SWITCH_SOMETIMES
; Burglar
db NONE, NONE ; items
db 0, 0 ; items
db 22 ; base reward
dw AI_BASIC + AI_OFFENSIVE + AI_CAUTIOUS + AI_STATUS
dw CONTEXT_USE + SWITCH_SOMETIMES
; Firebreather
db NONE, NONE ; items
db 0, 0 ; items
db 12 ; base reward
dw AI_BASIC + AI_SETUP + AI_OFFENSIVE + AI_OPPORTUNIST + AI_STATUS
dw CONTEXT_USE + SWITCH_SOMETIMES
; Juggler
db NONE, NONE ; items
db 0, 0 ; items
db 10 ; base reward
dw AI_BASIC + AI_TYPES + AI_SMART + AI_STATUS
dw CONTEXT_USE + SWITCH_SOMETIMES
; Blackbelt T
db NONE, NONE ; items
db 0, 0 ; items
db 6 ; base reward
dw AI_BASIC + AI_OFFENSIVE + AI_STATUS + AI_RISKY
dw CONTEXT_USE + SWITCH_SOMETIMES
; Executivem
db NONE, NONE ; items
db 0, 0 ; items
db 18 ; base reward
dw AI_BASIC + AI_SETUP + AI_TYPES + AI_SMART + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS + AI_RISKY
dw CONTEXT_USE + SWITCH_SOMETIMES
; Psychic T
db NONE, NONE ; items
db 0, 0 ; items
db 8 ; base reward
dw AI_BASIC + AI_TYPES + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS
dw CONTEXT_USE + SWITCH_SOMETIMES
; Picnicker
db NONE, NONE ; items
db 0, 0 ; items
db 5 ; base reward
dw AI_BASIC + AI_CAUTIOUS + AI_STATUS
dw CONTEXT_USE + SWITCH_SOMETIMES
; Camper
db NONE, NONE ; items
db 0, 0 ; items
db 5 ; base reward
dw AI_BASIC + AI_CAUTIOUS + AI_STATUS
dw CONTEXT_USE + SWITCH_SOMETIMES
; Executivef
db NONE, NONE ; items
db 0, 0 ; items
db 18 ; base reward
dw AI_BASIC + AI_SETUP + AI_TYPES + AI_SMART + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS + AI_RISKY
dw CONTEXT_USE + SWITCH_SOMETIMES
; Sage
db NONE, NONE ; items
db 0, 0 ; items
db 8 ; base reward
dw AI_BASIC + AI_SETUP + AI_TYPES + AI_CAUTIOUS + AI_STATUS + AI_RISKY
dw CONTEXT_USE + SWITCH_SOMETIMES
; Medium
db NONE, NONE ; items
db 0, 0 ; items
db 10 ; base reward
dw AI_BASIC + AI_SETUP + AI_TYPES + AI_CAUTIOUS + AI_STATUS + AI_RISKY
dw CONTEXT_USE + SWITCH_SOMETIMES
; Boarder
db NONE, NONE ; items
db 0, 0 ; items
db 18 ; base reward
dw AI_BASIC + AI_TYPES + AI_OPPORTUNIST + AI_STATUS
dw CONTEXT_USE + SWITCH_SOMETIMES
; Pokefanm
db NONE, NONE ; items
db 0, 0 ; items
db 20 ; base reward
dw AI_BASIC + AI_TYPES + AI_SMART + AI_STATUS
dw CONTEXT_USE + SWITCH_SOMETIMES
; Kimono Girl
db NONE, NONE ; items
db 0, 0 ; items
db 18 ; base reward
dw AI_BASIC + AI_TYPES + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS
dw CONTEXT_USE + SWITCH_SOMETIMES
; Twins
db NONE, NONE ; items
db 0, 0 ; items
db 5 ; base reward
dw NO_AI
dw CONTEXT_USE + SWITCH_OFTEN
; Pokefanf
db NONE, NONE ; items
db 0, 0 ; items
db 20 ; base reward
dw AI_BASIC + AI_TYPES + AI_SMART + AI_STATUS
dw CONTEXT_USE + SWITCH_SOMETIMES
@@ -385,19 +385,19 @@ TrainerClassAttributes: ; 3959c
dw CONTEXT_USE + SWITCH_SOMETIMES
; Officer
db NONE, NONE ; items
db 0, 0 ; items
db 10 ; base reward
dw AI_BASIC + AI_TYPES + AI_OPPORTUNIST + AI_STATUS
dw CONTEXT_USE + SWITCH_SOMETIMES
; Gruntf
db NONE, NONE ; items
db 0, 0 ; items
db 10 ; base reward
dw AI_BASIC + AI_TYPES + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS + AI_RISKY
dw CONTEXT_USE + SWITCH_SOMETIMES
; Mysticalman
db NONE, NONE ; items
db 0, 0 ; items
db 25 ; base reward
dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY
dw CONTEXT_USE + SWITCH_SOMETIMES

View File

@@ -26,14 +26,14 @@ FalknerGroup:
db 7, PIDGEY
db TACKLE
db MUD_SLAP
db NONE
db NONE
db 0
db 0
db 9, PIDGEOTTO
db TACKLE
db MUD_SLAP
db GUST
db NONE
db 0
db $ff ; end
@@ -83,19 +83,19 @@ BugsyGroup:
db TACKLE
db STRING_SHOT
db HARDEN
db NONE
db 0
db 14, KAKUNA
db POISON_STING
db STRING_SHOT
db HARDEN
db NONE
db 0
db 16, SCYTHER
db QUICK_ATTACK
db LEER
db FURY_CUTTER
db NONE
db 0
db $ff ; end
@@ -3414,7 +3414,7 @@ PokemaniacGroup:
db LICK
db SUPERSONIC
db CUT
db NONE
db 0
db $ff ; end
@@ -6935,7 +6935,7 @@ PsychicGroup:
db HYPNOSIS
db DISABLE
db DREAM_EATER
db NONE
db 0
db $ff ; end
@@ -6951,7 +6951,7 @@ PsychicGroup:
db TACKLE
db GROWL
db WATER_GUN
db NONE
db 0
db 20, SLOWPOKE
db CURSE
@@ -6972,20 +6972,20 @@ PsychicGroup:
db 13, ABRA
db TELEPORT
db FLASH
db NONE
db NONE
db 0
db 0
db 13, ABRA
db TELEPORT
db FLASH
db NONE
db NONE
db 0
db 0
db 15, KADABRA
db TELEPORT
db KINESIS
db CONFUSION
db NONE
db 0
db $ff ; end
@@ -7804,7 +7804,7 @@ ExecutiveFGroup:
db PECK
db PURSUIT
db HAZE
db NONE
db 0
db $ff ; end