ref: 3fd678769231b76c17e4aab2f306892bd6988dc8
parent: 6057f285ad1a930315d1a45fa3d1aa08efe6801d
author: IIMarckus <iimarckus@gmail.com>
date: Mon Mar 21 20:10:23 EDT 2016
Clean up more Yellow ifdefs.
--- a/data/baseStats/alakazam.asm
+++ b/data/baseStats/alakazam.asm
@@ -13,13 +13,8 @@
dw AlakazamPicBack
; attacks known at lvl 0
db TELEPORT
-IF DEF(_YELLOW)
- db KINESIS
- db 0
-ELSE
- db CONFUSION
- db DISABLE
-ENDC
+db CONFUSION
+db DISABLE
db 0
db 3 ; growth rate
; learnset
--- a/data/baseStats/butterfree.asm
+++ b/data/baseStats/butterfree.asm
@@ -24,9 +24,5 @@
tmlearn 29,30,31,32
tmlearn 33,34,39
tmlearn 44,46
-IF DEF(_YELLOW)
- tmlearn 50,55
-ELSE
tmlearn 50
-ENDC
db 0 ; padding
--- a/data/baseStats/chansey.asm
+++ b/data/baseStats/chansey.asm
@@ -13,11 +13,7 @@
dw ChanseyPicBack
; attacks known at lvl 0
db POUND
-IF DEF(_YELLOW)
- db TAIL_WHIP
-ELSE
- db DOUBLESLAP
-ENDC
+db DOUBLESLAP
db 0
db 0
db 4 ; growth rate
--- a/data/baseStats/charizard.asm
+++ b/data/baseStats/charizard.asm
@@ -24,9 +24,5 @@
tmlearn 26,27,28,31,32
tmlearn 33,34,38,39,40
tmlearn 44
-IF DEF(_YELLOW)
- tmlearn 50,51,52,54
-ELSE
tmlearn 50,51,54
-ENDC
db 0 ; padding
--- a/data/baseStats/diglett.asm
+++ b/data/baseStats/diglett.asm
@@ -24,9 +24,5 @@
tmlearn 26,27,28,31,32
tmlearn 34
tmlearn 44,48
-IF DEF(_YELLOW)
- tmlearn 50,51
-ELSE
tmlearn 50
-ENDC
db 0 ; padding
--- a/data/baseStats/dugtrio.asm
+++ b/data/baseStats/dugtrio.asm
@@ -24,9 +24,5 @@
tmlearn 26,27,28,31,32
tmlearn 34
tmlearn 44,48
-IF DEF(_YELLOW)
- tmlearn 50,51
-ELSE
tmlearn 50
-ENDC
db 0 ; padding
--- a/data/baseStats/eevee.asm
+++ b/data/baseStats/eevee.asm
@@ -13,11 +13,7 @@
dw EeveePicBack
; attacks known at lvl 0
db TACKLE
-IF DEF(_YELLOW)
- db TAIL_WHIP
-ELSE
- db SAND_ATTACK
-ENDC
+db SAND_ATTACK
db 0
db 0
db 0 ; growth rate
--- a/data/baseStats/flareon.asm
+++ b/data/baseStats/flareon.asm
@@ -13,11 +13,7 @@
dw FlareonPicBack
; attacks known at lvl 0
db TACKLE
-IF DEF(_YELLOW)
- db TAIL_WHIP
-ELSE
- db SAND_ATTACK
-ENDC
+db SAND_ATTACK
db QUICK_ATTACK
db EMBER
db 0 ; growth rate
--- a/data/baseStats/gyarados.asm
+++ b/data/baseStats/gyarados.asm
@@ -12,17 +12,10 @@
dw GyaradosPicFront
dw GyaradosPicBack
; attacks known at lvl 0
-IF DEF(_YELLOW)
-db TACKLE
-db 0
-db 0
-db 0
-ELSE
db BITE
db DRAGON_RAGE
db LEER
db HYDRO_PUMP
-ENDC
db 5 ; growth rate
; learnset
tmlearn 6,8
--- a/data/baseStats/jolteon.asm
+++ b/data/baseStats/jolteon.asm
@@ -13,11 +13,7 @@
dw JolteonPicBack
; attacks known at lvl 0
db TACKLE
-IF DEF(_YELLOW)
- db TAIL_WHIP
-ELSE
- db SAND_ATTACK
-ENDC
+db SAND_ATTACK
db QUICK_ATTACK
db THUNDERSHOCK
db 0 ; growth rate
--- a/data/baseStats/kadabra.asm
+++ b/data/baseStats/kadabra.asm
@@ -13,13 +13,8 @@
dw KadabraPicBack
; attacks known at lvl 0
db TELEPORT
-IF DEF(_YELLOW)
- DB KINESIS
- db 0
-ELSE
- db CONFUSION
- db DISABLE
-ENDC
+db CONFUSION
+db DISABLE
db 0
db 3 ; growth rate
; learnset
--- a/data/baseStats/marowak.asm
+++ b/data/baseStats/marowak.asm
@@ -13,15 +13,9 @@
dw MarowakPicBack
; attacks known at lvl 0
db BONE_CLUB
-IF DEF(_YELLOW)
- db TAIL_WHIP
- db 0
- db 0
-ELSE
- db GROWL
- db LEER
- db FOCUS_ENERGY
-ENDC
+db GROWL
+db LEER
+db FOCUS_ENERGY
db 0 ; growth rate
; learnset
tmlearn 1,5,6,8
--- a/data/baseStats/primeape.asm
+++ b/data/baseStats/primeape.asm
@@ -13,14 +13,9 @@
dw PrimeapePicBack
; attacks known at lvl 0
db SCRATCH
-IF !DEF(_YELLOW)
- db LEER
-ENDC
+db LEER
db KARATE_CHOP
db FURY_SWIPES
-IF DEF(_YELLOW)
- db LOW_KICK
-ENDC
db 0 ; growth rate
; learnset
tmlearn 1,5,6,8
--- a/data/baseStats/vaporeon.asm
+++ b/data/baseStats/vaporeon.asm
@@ -13,11 +13,7 @@
dw VaporeonPicBack
; attacks known at lvl 0
db TACKLE
-IF DEF(_YELLOW)
- db TAIL_WHIP
-ELSE
- db SAND_ATTACK
-ENDC
+db SAND_ATTACK
db QUICK_ATTACK
db WATER_GUN
db 0 ; growth rate
--- a/data/baseStats/venomoth.asm
+++ b/data/baseStats/venomoth.asm
@@ -14,13 +14,8 @@
; attacks known at lvl 0
db TACKLE
db DISABLE
-IF DEF(_YELLOW)
- db SUPERSONIC
- db CONFUSION
-ELSE
- db POISONPOWDER
- db LEECH_LIFE
-ENDC
+db POISONPOWDER
+db LEECH_LIFE
db 0 ; growth rate
; learnset
tmlearn 2,4,6
--- a/data/baseStats/venonat.asm
+++ b/data/baseStats/venonat.asm
@@ -21,15 +21,8 @@
tmlearn 6
tmlearn 9,10
tmlearn 20,21,22
-IF DEF(_YELLOW)
- tmlearn 29,30,31,32
- tmlearn 33,34,39
- tmlearn 44,46
- tmlearn 50,55
-ELSE
tmlearn 29,31,32
tmlearn 33,34
tmlearn 44,46
tmlearn 50
-ENDC
db 0 ; padding
--- a/data/trades.asm
+++ b/data/trades.asm
@@ -1,17 +1,5 @@
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@@@@@@"
-ELSE
db NIDORINO, NIDORINA, 0,"TERRY@@@@@@"
db ABRA, MR_MIME, 0,"MARCEL@@@@@"
db BUTTERFREE,BEEDRILL, 2,"CHIKUCHIKU@"
@@ -22,4 +10,3 @@
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
@@ -1,4 +1,3 @@
-IF !DEF(YELLOW)
LoneMoves: ; 39d22 (e:5d22)
; these are used for gym leaders.
; this is not automatic! you have to write the number you want to wLoneAttackNo
@@ -31,167 +30,3 @@
db AGATHA,TOXIC
db LANCE,BARRIER
db $FF
-
-ELSE
-; yellow has its own format.
-
-; entry ≔ trainerclass, trainerid, moveset+, 0
-; moveset ≔ partymon, partymon'smove, moveid
-
-LoneMoves:
-TeamMoves:
- db BUG_CATCHER,$f
- db 2,2,TACKLE
- db 2,3,STRING_SHOT
- db 0
-
- db YOUNGSTER,$e
- db 1,4,FISSURE
- db 0
-
- db BROCK,$1
- db 2,3,BIND
- db 2,4,BIDE
- db 0
-
- db MISTY,$1
- db 2,4,BUBBLEBEAM
- db 0
-
- db LT_SURGE,$1
- db 1,1,THUNDERBOLT
- db 1,2,MEGA_PUNCH
- db 1,3,MEGA_KICK
- db 1,4,GROWL
- db 0
-
- db ERIKA,$1
- db 1,3,MEGA_DRAIN
- db 2,1,RAZOR_LEAF
- db 3,1,PETAL_DANCE
- db 0
-
- db KOGA,$1
- db 1,1,TOXIC
- db 1,2,TACKLE
- db 2,1,TOXIC
- db 2,3,SUPERSONIC
- db 3,1,TOXIC
- db 3,2,DOUBLE_EDGE
- db 4,1,LEECH_LIFE
- db 4,2,DOUBLE_TEAM
- db 4,3,PSYCHIC_M
- db 4,4,TOXIC
- db 0
-
- db BLAINE,$1
- db 1,1,FLAMETHROWER
- db 1,4,CONFUSE_RAY
- db 3,1,FLAMETHROWER
- db 3,2,FIRE_BLAST
- db 3,3,REFLECT
- db 0
-
- db SABRINA,$1
- db 1,1,FLASH
- db 2,1,KINESIS
- db 2,4,PSYWAVE
- db 3,1,PSYWAVE
- db 0
-
- db GIOVANNI,$3
- db 1,3,FISSURE
- db 2,2,DOUBLE_TEAM
- db 3,1,EARTHQUAKE
- db 3,3,THUNDER
- db 4,1,EARTHQUAKE
- db 4,2,LEER
- db 4,3,THUNDER
- db 5,1,ROCK_SLIDE
- db 5,4,EARTHQUAKE
- db 0
-
- db LORELEI,$1
- db 1,1,BUBBLEBEAM
- db 2,3,ICE_BEAM
- db 3,1,PSYCHIC_M
- db 3,2,SURF
- db 4,3,LOVELY_KISS
- db 5,3,BLIZZARD
- db 0
-
- db BRUNO,$1
- db 1,1,ROCK_SLIDE
- db 1,2,SCREECH
- db 1,4,DIG
- db 2,3,FIRE_PUNCH
- db 2,4,DOUBLE_TEAM
- db 3,1,DOUBLE_KICK
- db 3,2,MEGA_KICK
- db 3,4,DOUBLE_TEAM
- db 4,1,ROCK_SLIDE
- db 4,2,SCREECH
- db 4,4,EARTHQUAKE
- db 5,2,KARATE_CHOP
- db 5,3,STRENGTH
- db 0
-
- db AGATHA,$1
- db 1,2,SUBSTITUTE
- db 1,3,LICK
- db 1,4,MEGA_DRAIN
- db 2,2,TOXIC
- db 2,4,LEECH_LIFE
- db 3,2,LICK
- db 4,1,WRAP
- db 5,2,PSYCHIC_M
- db 0
-
- db LANCE,$1
- db 1,1,DRAGON_RAGE
- db 2,1,THUNDER_WAVE
- db 2,3,THUNDERBOLT
- db 3,1,BUBBLEBEAM
- db 3,2,WRAP
- db 3,3,ICE_BEAM
- db 4,1,WING_ATTACK
- db 4,2,SWIFT
- db 4,3,FLY
- db 5,1,BLIZZARD
- db 5,2,FIRE_BLAST
- db 5,3,THUNDER
- db 0
-
- db SONY3,$1
- db 1,3,EARTHQUAKE
- db 2,4,KINESIS
- db 3,4,LEECH_SEED
- db 4,1,ICE_BEAM
- db 5,1,CONFUSE_RAY
- db 5,4,FIRE_SPIN
- db 6,3,QUICK_ATTACK
- db 0
-
- db SONY3,$2
- db 1,3,EARTHQUAKE
- db 2,4,KINESIS
- db 3,4,LEECH_SEED
- db 4,1,THUNDERBOLT
- db 5,1,ICE_BEAM
- db 6,2,REFLECT
- db 6,3,QUICK_ATTACK
- db 0
-
- db SONY3,$3
- db 1,3,EARTHQUAKE
- db 2,4,KINESIS
- db 3,4,LEECH_SEED
- db 4,1,CONFUSE_RAY
- db 4,4,FIRE_SPIN
- db 5,1,THUNDERBOLT
- db 6,1,AURORA_BEAM
- db 6,3,QUICK_ATTACK
- db 0
-
- db $ff
-endc
--- a/data/wildPokemon/route22.asm
+++ b/data/wildPokemon/route22.asm
@@ -24,16 +24,4 @@
db 3,NIDORAN_M
db 4,NIDORAN_M
ENDC
- IF DEF(_YELLOW)
- db 2,NIDORAN_M
- db 2,NIDORAN_F
- db 3,MANKEY
- db 3,RATTATA
- db 4,NIDORAN_M
- db 4,NIDORAN_F
- db 5,MANKEY
- db 2,SPEAROW
- db 4,SPEAROW
- db 6,SPEAROW
- ENDC
db $00
--- a/engine/battle/animations.asm
+++ b/engine/battle/animations.asm
@@ -373,9 +373,6 @@
IF DEF(_BLUE)
INCBIN "gfx/blue/slotmachine2.2bpp"
ENDC
-IF DEF(_YELLOW)
- INCBIN "gfx/yellow/slotmachine2.2bpp"
-ENDC
MoveAnimation: ; 78d5e (1e:4d5e)
push hl
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -2982,11 +2982,7 @@
jp Delay3
DisabledText: ; 3d555 (f:5555)
-IF DEF(_YELLOW)
- db "Disabled!@"
-ELSE
db "disabled!@"
-ENDC
TypeText: ; 3d55f (f:555f)
db "TYPE@"
--- a/engine/menu/bills_pc.asm
+++ b/engine/menu/bills_pc.asm
@@ -343,9 +343,6 @@
next "DEPOSIT ", $4a
next "RELEASE ", $4a
next "CHANGE BOX"
-IF DEF(_YELLOW)
- next "PRINT BOX"
-ENDC
next "SEE YA!"
db "@"
--- a/engine/menu/pokedex.asm
+++ b/engine/menu/pokedex.asm
@@ -367,9 +367,6 @@
db "DATA"
next "CRY"
next "AREA"
-IF DEF(_YELLOW)
- next "PRNT"
-ENDC
next "QUIT@"
; tests if a pokemon's bit is set in the seen or owned pokemon bit fields
--- a/engine/oak_speech2.asm
+++ b/engine/oak_speech2.asm
@@ -219,22 +219,6 @@
db "@"
ENDC
-IF DEF(_YELLOW)
-DefaultNamesPlayer:
- db "NEW NAME"
- next "YELLOW"
- next "ASH"
- next "JACK"
- db "@"
-
-DefaultNamesRival:
- db "NEW NAME"
- next "BLUE"
- next "GARY"
- next "JOHN"
- db "@"
-ENDC
-
GetDefaultName: ; 6ad6 (1:6ad6)
; a = name index
; hl = name list
@@ -270,12 +254,6 @@
db "NEW NAME@BLUE@GARY@JOHN@"
DefaultNamesRivalList: ; 6b08 (1:6b08)
db "NEW NAME@RED@ASH@JACK@"
-ENDC
-IF DEF(_YELLOW)
-DefaultNamesPlayerList:
- db "NEW NAME@YELLOW@ASH@JACK@"
-DefaultNamesRivalList:
- db "NEW NAME@BLUE@GARY@JOHN@"
ENDC
TextTerminator_6b20: ; 6b20 (1:6b20)
--- a/engine/slot_machine.asm
+++ b/engine/slot_machine.asm
@@ -888,6 +888,3 @@
IF DEF(_BLUE)
INCBIN "gfx/blue/slotmachine1.2bpp"
ENDC
-IF DEF(_YELLOW)
- INCBIN "gfx/yellow/slotmachine1.2bpp"
-ENDC