Kill version.asm.

This commit is contained in:
IIMarckus 2014-10-17 02:42:32 -06:00
parent 008cface52
commit a3d3f8324a
93 changed files with 662 additions and 730 deletions

View file

@ -367,10 +367,10 @@ AnimationTileset2: ; 786ee (1e:46ee)
INCBIN "gfx/attack_anim_2.2bpp"
SlotMachineTiles2: ; 78bde (1e:4bde)
IF _RED
IF DEF(_RED)
INCBIN "gfx/red/slotmachine2.2bpp"
ENDC
IF _BLUE
IF DEF(_BLUE)
INCBIN "gfx/blue/slotmachine2.2bpp"
ENDC

View file

@ -2954,7 +2954,7 @@ Func_3d4b6: ; 3d4b6 (f:54b6)
jp Delay3
DisabledText: ; 3d555 (f:5555)
IF _YELLOW
IF DEF(_YELLOW)
db "Disabled!@"
ELSE
db "disabled!@"

View file

@ -429,13 +429,13 @@ FightIntroBackMon: ; 41a99 (10:5a99)
FightIntroFrontMon: ; 42099 (10:6099)
IF _RED
IF DEF(_RED)
INCBIN "gfx/red/intro_nido_1.6x6.2bpp"
INCBIN "gfx/red/intro_nido_2.6x6.2bpp"
INCBIN "gfx/red/intro_nido_3.6x6.2bpp"
ds $10 ; blank tile
ENDC
IF _BLUE
IF DEF(_BLUE)
INCBIN "gfx/blue/intro_purin_1.6x6.2bpp"
INCBIN "gfx/blue/intro_purin_2.6x6.2bpp"
INCBIN "gfx/blue/intro_purin_3.6x6.2bpp"

View file

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

View file

@ -366,7 +366,7 @@ PokedexMenuItemsText: ; 402af (10:42af)
db "DATA"
next "CRY"
next "AREA"
IF _YELLOW
IF DEF(_YELLOW)
next "PRNT"
ENDC
next "QUIT@"

View file

@ -181,7 +181,7 @@ DisplayIntroNameTextBox: ; 6a6c (1:6a6c)
.namestring ; 6aa3 (1:6aa3)
db "NAME@"
IF _RED
IF DEF(_RED)
DefaultNamesPlayer: ; 6aa8 (1:6aa8)
db "NEW NAME"
next "RED"
@ -197,7 +197,7 @@ DefaultNamesRival: ; 6abe (1:6abe)
db "@"
ENDC
IF _BLUE
IF DEF(_BLUE)
DefaultNamesPlayer: ; 6aa8 (1:6aa8)
db "NEW NAME"
next "BLUE"
@ -213,7 +213,7 @@ DefaultNamesRival: ; 6abe (1:6abe)
db "@"
ENDC
IF _YELLOW
IF DEF(_YELLOW)
DefaultNamesPlayer:
db "NEW NAME"
next "YELLOW"
@ -250,19 +250,19 @@ Func_6ad6: ; 6ad6 (1:6ad6)
ld de, wcd6d
ld bc, $14
jp CopyData
IF _RED
IF DEF(_RED)
DefaultNamesPlayerList: ; 6af2 (1:6af2)
db "NEW NAME@RED@ASH@JACK@"
DefaultNamesRivalList: ; 6b08 (1:6b08)
db "NEW NAME@BLUE@GARY@JOHN@"
ENDC
IF _BLUE
IF DEF(_BLUE)
DefaultNamesPlayerList: ; 6af2 (1:6af2)
db "NEW NAME@BLUE@GARY@JOHN@"
DefaultNamesRivalList: ; 6b08 (1:6b08)
db "NEW NAME@RED@ASH@JACK@"
ENDC
IF _YELLOW
IF DEF(_YELLOW)
DefaultNamesPlayerList:
db "NEW NAME@YELLOW@ASH@JACK@"
DefaultNamesRivalList:

View file

@ -862,9 +862,9 @@ SLOTSMOUSE EQU $1614
INCLUDE "data/slot_machine_wheels.asm"
SlotMachineTiles1: ; 37a51 (d:7a51)
IF _RED
IF DEF(_RED)
INCBIN "gfx/red/slotmachine1.2bpp"
ENDC
IF _BLUE
IF DEF(_BLUE)
INCBIN "gfx/blue/slotmachine1.2bpp"
ENDC

View file

@ -56,11 +56,11 @@ LoadTitlescreenGraphics: ; 42dd (1:42dd)
ld a, BANK(PokemonLogoGraphics)
call FarCopyData2 ; second chunk
ld hl, Version_GFX ; $402f
IF _RED
IF DEF(_RED)
ld de,vChars2 + $600
ld bc,$50
ENDC
IF _BLUE
IF DEF(_BLUE)
ld de,vChars2 + $600 + $10
ld bc,$50 - $10
ENDC
@ -114,10 +114,10 @@ ENDC
call SaveScreenTilesToBuffer2
call LoadScreenTilesFromBuffer2
call EnableLCD
IF _RED
IF DEF(_RED)
ld a,CHARMANDER ; which Pokemon to show first on the title screen
ENDC
IF _BLUE
IF DEF(_BLUE)
ld a,SQUIRTLE ; which Pokemon to show first on the title screen
ENDC
@ -382,9 +382,9 @@ PrintGameVersionOnTitleScreen: ; 4598 (1:4598)
; these point to special tiles specifically loaded for that purpose and are not usual text
VersionOnTitleScreenText: ; 45a1 (1:45a1)
IF _RED
IF DEF(_RED)
db $60,$61,$7F,$65,$66,$67,$68,$69,"@" ; "Red Version"
ENDC
IF _BLUE
IF DEF(_BLUE)
db $61,$62,$63,$64,$65,$66,$67,$68,"@" ; "Blue Version"
ENDC