Clean up more Yellow ifdefs.

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

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

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@"

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 "@"

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

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 "@"

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