diff options
| author | U-Daniel-PC\Daniel <corrnondacqb@yahoo.com> | 2015-06-06 13:51:06 -0500 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-01 17:32:39 -0400 |
| commit | 8f2edd9c413d09c4ec74abab7e2af0a2fcc5d951 (patch) | |
| tree | 08106f9eec9cff1137269c20ccf848cfeffa71c6 /engine/battle | |
| parent | 10af88ddd712415f2a0a2b6124187d51075c95d5 (diff) | |
Build only Yellow
Conflicts:
gfx/intro_nido_1.6x6.png
gfx/intro_nido_2.6x6.png
gfx/intro_nido_3.6x6.png
gfx/redgreenversion.png
text.asm
text/maps/cerulean_trade_house.asm
text/maps/copycats_house_1f.asm
text/maps/daycare_2.asm
text/maps/museum_2f.asm
text/maps/oaks_lab.asm
text/maps/pewter_gym.asm
text/maps/route_9_1.asm
text/maps/school.asm
text/maps/vermilion_gym_1.asm
yellow/main.asm
Diffstat (limited to 'engine/battle')
| -rwxr-xr-x | engine/battle/animations.asm | 10 | ||||
| -rwxr-xr-x | engine/battle/core.asm | 4 |
2 files changed, 1 insertions, 13 deletions
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index dc08e0e1..8791d538 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -367,15 +367,7 @@ AnimationTileset2: ; 786ee (1e:46ee) INCBIN "gfx/attack_anim_2.2bpp" SlotMachineTiles2: ; 78bde (1e:4bde) -IF DEF(_RED) - INCBIN "gfx/red/slotmachine2.2bpp" -ENDC -IF DEF(_BLUE) - INCBIN "gfx/blue/slotmachine2.2bpp" -ENDC -IF DEF(_YELLOW) - INCBIN "gfx/yellow/slotmachine2.2bpp" -ENDC + INCBIN "gfx/slotmachine2.2bpp" MoveAnimation: ; 78d5e (1e:4d5e) push hl diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 8775604e..1b8203b1 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -2972,11 +2972,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@" |