diff options
| author | IIMarckus <iimarckus@gmail.com> | 2016-03-22 00:10:23 -0600 |
|---|---|---|
| committer | IIMarckus <iimarckus@gmail.com> | 2016-03-22 00:10:23 -0600 |
| commit | 3fd678769231b76c17e4aab2f306892bd6988dc8 (patch) | |
| tree | 362b426beaceb3747906caf25d1413cf44e9071a /engine | |
| parent | 6057f285ad1a930315d1a45fa3d1aa08efe6801d (diff) | |
Clean up more Yellow ifdefs.
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/battle/animations.asm | 3 | ||||
| -rwxr-xr-x | engine/battle/core.asm | 4 | ||||
| -rw-r--r-- | engine/menu/bills_pc.asm | 3 | ||||
| -rwxr-xr-x | engine/menu/pokedex.asm | 3 | ||||
| -rwxr-xr-x | engine/oak_speech2.asm | 22 | ||||
| -rwxr-xr-x | engine/slot_machine.asm | 3 |
6 files changed, 0 insertions, 38 deletions
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 31b490f3..be8d2b18 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -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 diff --git a/engine/battle/core.asm b/engine/battle/core.asm index ac808a34..fce78717 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -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@" diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm index d367bdb5..0be2e6b0 100644 --- a/engine/menu/bills_pc.asm +++ b/engine/menu/bills_pc.asm @@ -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 "@" diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm index a58523e8..3898ef43 100755 --- a/engine/menu/pokedex.asm +++ b/engine/menu/pokedex.asm @@ -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 diff --git a/engine/oak_speech2.asm b/engine/oak_speech2.asm index 9b5622b8..61775531 100755 --- a/engine/oak_speech2.asm +++ b/engine/oak_speech2.asm @@ -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 "@" diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm index b2917459..eb1cf3c3 100755 --- a/engine/slot_machine.asm +++ b/engine/slot_machine.asm @@ -888,6 +888,3 @@ ENDC IF DEF(_BLUE) INCBIN "gfx/blue/slotmachine1.2bpp" ENDC -IF DEF(_YELLOW) - INCBIN "gfx/yellow/slotmachine1.2bpp" -ENDC |