thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-17 02:40:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clean up more Yellow ifdefs.

Browse source
This commit is contained in:
IIMarckus 2016-03-22 00:10:23 -06:00
parent 6057f285ad
commit 3fd6787692
25 changed files with 15 additions and 319 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
data/baseStats/alakazam.asm
View file

@ -13,13 +13,8 @@ dw AlakazamPicFront
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

4
data/baseStats/butterfree.asm
View file

@ -24,9 +24,5 @@ db 0 ; growth rate
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

6
data/baseStats/chansey.asm
View file

@ -13,11 +13,7 @@ dw ChanseyPicFront
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

4
data/baseStats/charizard.asm
View file

@ -24,9 +24,5 @@ db 3 ; growth rate
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

4
data/baseStats/diglett.asm
View file

@ -24,9 +24,5 @@ db 0 ; growth rate
tmlearn 26,27,28,31,32
tmlearn 34
tmlearn 44,48
IF DEF(_YELLOW)
tmlearn 50,51
ELSE
tmlearn 50
ENDC
db 0 ; padding

4
data/baseStats/dugtrio.asm
View file

@ -24,9 +24,5 @@ db 0 ; growth rate
tmlearn 26,27,28,31,32
tmlearn 34
tmlearn 44,48
IF DEF(_YELLOW)
tmlearn 50,51
ELSE
tmlearn 50
ENDC
db 0 ; padding

6
data/baseStats/eevee.asm
View file

@ -13,11 +13,7 @@ dw EeveePicFront
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

6
data/baseStats/flareon.asm
View file

@ -13,11 +13,7 @@ dw FlareonPicFront
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

7
data/baseStats/gyarados.asm
View file

@ -12,17 +12,10 @@ INCBIN "pic/bmon/gyarados.pic",0,1 ; 77, sprite dimensions
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

6
data/baseStats/jolteon.asm
View file

@ -13,11 +13,7 @@ dw JolteonPicFront
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

9
data/baseStats/kadabra.asm
View file

@ -13,13 +13,8 @@ dw KadabraPicFront
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

12
data/baseStats/marowak.asm
View file

@ -13,15 +13,9 @@ dw MarowakPicFront
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

7
data/baseStats/primeape.asm
View file

@ -13,14 +13,9 @@ dw PrimeapePicFront
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

6
data/baseStats/vaporeon.asm
View file

@ -13,11 +13,7 @@ dw VaporeonPicFront
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

9
data/baseStats/venomoth.asm
View file

@ -14,13 +14,8 @@ dw VenomothPicBack
; 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

7
data/baseStats/venonat.asm
View file

@ -21,15 +21,8 @@ db 0 ; growth rate
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

13
data/trades.asm
View file

@ -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 @@ ELSE
db RAICHU, ELECTRODE,1,"DORIS@@@@@@"
db VENONAT, TANGELA, 2,"CRINKLES@@@"
db NIDORAN_M, NIDORAN_F,2,"SPOT@@@@@@@"
ENDC

165
data/trainer_moves.asm
View file

@ -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 @@ TeamMoves: ; 39d32 (e:5d32)
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

12
data/wildPokemon/route22.asm
View file

@ -24,16 +24,4 @@ Route22Mons:
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

3
engine/battle/animations.asm
View file

@ -373,9 +373,6 @@ ENDC
IF DEF(_BLUE)
INCBIN "gfx/blue/slotmachine2.2bpp"
ENDC
IF DEF(_YELLOW)
INCBIN "gfx/yellow/slotmachine2.2bpp"
ENDC
MoveAnimation: ; 78d5e (1e:4d5e)
push hl

4
engine/battle/core.asm
View file

@ -2982,11 +2982,7 @@ PrintMenuItem: ; 3d4b6 (f:54b6)
jp Delay3
DisabledText: ; 3d555 (f:5555)
IF DEF(_YELLOW)
db "Disabled!@"
ELSE
db "disabled!@"
ENDC
TypeText: ; 3d55f (f:555f)
db "TYPE@"

3
engine/menu/bills_pc.asm
View file

@ -343,9 +343,6 @@ BillsPCMenuText: ; 216e1 (8:56e1)
next "DEPOSIT ", $4a
next "RELEASE ", $4a
next "CHANGE BOX"
IF DEF(_YELLOW)
next "PRINT BOX"
ENDC
next "SEE YA!"
db "@"

3
engine/menu/pokedex.asm
View file

@ -367,9 +367,6 @@ PokedexMenuItemsText: ; 402af (10:42af)
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

22
engine/oak_speech2.asm
View file

@ -219,22 +219,6 @@ DefaultNamesRival: ; 6abe (1:6abe)
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
@ -271,12 +255,6 @@ DefaultNamesPlayerList: ; 6af2 (1:6af2)
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)
db "@"

3
engine/slot_machine.asm
View file

@ -888,6 +888,3 @@ ENDC
IF DEF(_BLUE)
INCBIN "gfx/blue/slotmachine1.2bpp"
ENDC
IF DEF(_YELLOW)
INCBIN "gfx/yellow/slotmachine1.2bpp"
ENDC