mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2024-09-09 09:51:34 -07:00
Get rid of _CRYSTAL
Having this here is completely redundant and useless, and doesn't even work since it should use `if DEF(_CRYSTAL)` instead.
This commit is contained in:
parent
13cfe356d6
commit
649c8d38da
6
Makefile
6
Makefile
@ -65,9 +65,9 @@ tools:
|
||||
$(MAKE) -C tools/
|
||||
|
||||
|
||||
$(crystal_obj): RGBASMFLAGS = -D _CRYSTAL
|
||||
$(crystal11_obj): RGBASMFLAGS = -D _CRYSTAL -D _CRYSTAL11
|
||||
$(crystal_au_obj): RGBASMFLAGS = -D _CRYSTAL -D _CRYSTAL11 -D _CRYSTAL_AU
|
||||
$(crystal_obj): RGBASMFLAGS =
|
||||
$(crystal11_obj): RGBASMFLAGS = -D _CRYSTAL11
|
||||
$(crystal_au_obj): RGBASMFLAGS = -D _CRYSTAL11 -D _CRYSTAL_AU
|
||||
|
||||
# The dep rules have to be explicit or else missing files won't be reported.
|
||||
# As a side effect, they're evaluated immediately instead of when the rule is invoked.
|
||||
|
@ -118,11 +118,7 @@ EggMovePointers::
|
||||
dw NoEggMoves
|
||||
dw GoldeenEggMoves
|
||||
dw NoEggMoves
|
||||
if _CRYSTAL
|
||||
dw NoEggMoves
|
||||
else
|
||||
dw StaryuEggMoves
|
||||
endc
|
||||
dw NoEggMoves
|
||||
dw MrMimeEggMoves
|
||||
dw ScytherEggMoves
|
||||
|
@ -17,9 +17,6 @@ BulbasaurEggMoves:
|
||||
db LIGHT_SCREEN
|
||||
db SKULL_BASH
|
||||
db SAFEGUARD
|
||||
if !_CRYSTAL
|
||||
db CHARM
|
||||
endc
|
||||
db RAZOR_WIND
|
||||
db PETAL_DANCE
|
||||
db -1 ; end
|
||||
@ -46,9 +43,6 @@ PidgeyEggMoves:
|
||||
db PURSUIT
|
||||
db FAINT_ATTACK
|
||||
db FORESIGHT
|
||||
if !_CRYSTAL
|
||||
db STEEL_WING
|
||||
endc
|
||||
db -1 ; end
|
||||
|
||||
RattataEggMoves:
|
||||
@ -73,9 +67,7 @@ EkansEggMoves:
|
||||
db SLAM
|
||||
db SPITE
|
||||
db BEAT_UP
|
||||
if _CRYSTAL
|
||||
db CRUNCH
|
||||
endc
|
||||
db -1 ; end
|
||||
|
||||
SandshrewEggMoves:
|
||||
@ -83,9 +75,7 @@ SandshrewEggMoves:
|
||||
db SAFEGUARD
|
||||
db COUNTER
|
||||
db RAPID_SPIN
|
||||
if _CRYSTAL
|
||||
db METAL_CLAW
|
||||
endc
|
||||
db -1 ; end
|
||||
|
||||
NidoranFEggMoves:
|
||||
@ -129,9 +119,6 @@ OddishEggMoves:
|
||||
db RAZOR_LEAF
|
||||
db FLAIL
|
||||
db SYNTHESIS
|
||||
if !_CRYSTAL
|
||||
db CHARM
|
||||
endc
|
||||
db -1 ; end
|
||||
|
||||
ParasEggMoves:
|
||||
@ -140,9 +127,6 @@ ParasEggMoves:
|
||||
db COUNTER
|
||||
db PSYBEAM
|
||||
db FLAIL
|
||||
if !_CRYSTAL
|
||||
db SWEET_SCENT
|
||||
endc
|
||||
db LIGHT_SCREEN
|
||||
db PURSUIT
|
||||
db -1 ; end
|
||||
@ -176,9 +160,7 @@ PsyduckEggMoves:
|
||||
db LIGHT_SCREEN
|
||||
db FUTURE_SIGHT
|
||||
db PSYCHIC_M
|
||||
if _CRYSTAL
|
||||
db CROSS_CHOP
|
||||
endc
|
||||
db -1 ; end
|
||||
|
||||
MankeyEggMoves:
|
||||
@ -257,9 +239,6 @@ SlowpokeEggMoves:
|
||||
db -1 ; end
|
||||
|
||||
FarfetchDEggMoves:
|
||||
if !_CRYSTAL
|
||||
db STEEL_WING
|
||||
endc
|
||||
db FORESIGHT
|
||||
db MIRROR_MOVE
|
||||
db GUST
|
||||
@ -337,9 +316,7 @@ CuboneEggMoves:
|
||||
db SCREECH
|
||||
db SKULL_BASH
|
||||
db PERISH_SONG
|
||||
if _CRYSTAL
|
||||
db SWORDS_DANCE
|
||||
endc
|
||||
db -1 ; end
|
||||
|
||||
LickitungEggMoves:
|
||||
@ -403,14 +380,6 @@ GoldeenEggMoves:
|
||||
db HYDRO_PUMP
|
||||
db -1 ; end
|
||||
|
||||
if !_CRYSTAL
|
||||
StaryuEggMoves:
|
||||
db AURORA_BEAM
|
||||
db BARRIER
|
||||
db SUPERSONIC
|
||||
db -1 ; end
|
||||
endc
|
||||
|
||||
MrMimeEggMoves:
|
||||
db FUTURE_SIGHT
|
||||
db HYPNOSIS
|
||||
@ -461,16 +430,10 @@ AerodactylEggMoves:
|
||||
db WHIRLWIND
|
||||
db PURSUIT
|
||||
db FORESIGHT
|
||||
if !_CRYSTAL
|
||||
db STEEL_WING
|
||||
endc
|
||||
db -1 ; end
|
||||
|
||||
SnorlaxEggMoves:
|
||||
db LICK
|
||||
if !_CRYSTAL
|
||||
db CHARM
|
||||
endc
|
||||
db -1 ; end
|
||||
|
||||
DratiniEggMoves:
|
||||
@ -495,9 +458,7 @@ CyndaquilEggMoves:
|
||||
db REVERSAL
|
||||
db THRASH
|
||||
db FORESIGHT
|
||||
if _CRYSTAL
|
||||
db SUBMISSION
|
||||
endc
|
||||
db -1 ; end
|
||||
|
||||
TotodileEggMoves:
|
||||
@ -523,9 +484,7 @@ HoothootEggMoves:
|
||||
db FAINT_ATTACK
|
||||
db WING_ATTACK
|
||||
db WHIRLWIND
|
||||
if _CRYSTAL
|
||||
db SKY_ATTACK
|
||||
endc
|
||||
db -1 ; end
|
||||
|
||||
LedybaEggMoves:
|
||||
@ -650,9 +609,7 @@ MurkrowEggMoves:
|
||||
db QUICK_ATTACK
|
||||
db MIRROR_MOVE
|
||||
db WING_ATTACK
|
||||
if _CRYSTAL
|
||||
db SKY_ATTACK
|
||||
endc
|
||||
db -1 ; end
|
||||
|
||||
MisdreavusEggMoves:
|
||||
@ -732,9 +689,7 @@ TeddiursaEggMoves:
|
||||
db SEISMIC_TOSS
|
||||
db FOCUS_ENERGY
|
||||
db COUNTER
|
||||
if _CRYSTAL
|
||||
db METAL_CLAW
|
||||
endc
|
||||
db -1 ; end
|
||||
|
||||
SlugmaEggMoves:
|
||||
@ -784,9 +739,7 @@ SkarmoryEggMoves:
|
||||
db DRILL_PECK
|
||||
db PURSUIT
|
||||
db WHIRLWIND
|
||||
if _CRYSTAL
|
||||
db SKY_ATTACK
|
||||
endc
|
||||
db -1 ; end
|
||||
|
||||
HoundourEggMoves:
|
||||
@ -803,9 +756,7 @@ PhanpyEggMoves:
|
||||
db FOCUS_ENERGY
|
||||
db BODY_SLAM
|
||||
db ANCIENTPOWER
|
||||
if _CRYSTAL
|
||||
db WATER_GUN
|
||||
endc
|
||||
db -1 ; end
|
||||
|
||||
StantlerEggMoves:
|
||||
@ -824,9 +775,6 @@ TyrogueEggMoves:
|
||||
db -1 ; end
|
||||
|
||||
SmoochumEggMoves:
|
||||
if !_CRYSTAL
|
||||
db LOVELY_KISS
|
||||
endc
|
||||
db MEDITATE
|
||||
db -1 ; end
|
||||
|
||||
@ -835,9 +783,7 @@ ElekidEggMoves:
|
||||
db BARRIER
|
||||
db ROLLING_KICK
|
||||
db MEDITATE
|
||||
if _CRYSTAL
|
||||
db CROSS_CHOP
|
||||
endc
|
||||
db -1 ; end
|
||||
|
||||
MagbyEggMoves:
|
||||
@ -845,9 +791,7 @@ MagbyEggMoves:
|
||||
db MEGA_PUNCH
|
||||
db BARRIER
|
||||
db SCREECH
|
||||
if _CRYSTAL
|
||||
db CROSS_CHOP
|
||||
endc
|
||||
db -1 ; end
|
||||
|
||||
MiltankEggMoves:
|
||||
|
@ -670,9 +670,7 @@ DiglettEvosAttacks:
|
||||
|
||||
DugtrioEvosAttacks:
|
||||
db 0 ; no more evolutions
|
||||
if _CRYSTAL
|
||||
db 1, TRI_ATTACK
|
||||
endc
|
||||
db 1, SCRATCH
|
||||
db 1, GROWL
|
||||
db 1, MAGNITUDE
|
||||
@ -1115,11 +1113,7 @@ MagnetonEvosAttacks:
|
||||
db 16, SONICBOOM
|
||||
db 21, THUNDER_WAVE
|
||||
db 27, LOCK_ON
|
||||
if _CRYSTAL
|
||||
db 35, TRI_ATTACK
|
||||
else
|
||||
db 35, SWIFT
|
||||
endc
|
||||
db 43, SCREECH
|
||||
db 53, ZAP_CANNON
|
||||
db 0 ; no more level-up moves
|
||||
@ -1235,9 +1229,7 @@ CloysterEvosAttacks:
|
||||
db 1, SUPERSONIC
|
||||
db 1, AURORA_BEAM
|
||||
db 1, PROTECT
|
||||
if _CRYSTAL
|
||||
db 33, SPIKES
|
||||
endc
|
||||
db 41, SPIKE_CANNON
|
||||
db 0 ; no more level-up moves
|
||||
|
||||
@ -1814,11 +1806,7 @@ EeveeEvosAttacks:
|
||||
db 16, GROWL
|
||||
db 23, QUICK_ATTACK
|
||||
db 30, BITE
|
||||
if _CRYSTAL
|
||||
db 36, BATON_PASS
|
||||
else
|
||||
db 36, FOCUS_ENERGY
|
||||
endc
|
||||
db 42, TAKE_DOWN
|
||||
db 0 ; no more level-up moves
|
||||
|
||||
@ -2297,11 +2285,7 @@ SpinarakEvosAttacks:
|
||||
db 23, LEECH_LIFE
|
||||
db 30, FURY_SWIPES
|
||||
db 37, SPIDER_WEB
|
||||
if _CRYSTAL
|
||||
db 45, AGILITY
|
||||
else
|
||||
db 45, SCREECH
|
||||
endc
|
||||
db 53, PSYCHIC_M
|
||||
db 0 ; no more level-up moves
|
||||
|
||||
@ -2317,11 +2301,7 @@ AriadosEvosAttacks:
|
||||
db 25, LEECH_LIFE
|
||||
db 34, FURY_SWIPES
|
||||
db 43, SPIDER_WEB
|
||||
if _CRYSTAL
|
||||
db 53, AGILITY
|
||||
else
|
||||
db 53, SCREECH
|
||||
endc
|
||||
db 63, PSYCHIC_M
|
||||
db 0 ; no more level-up moves
|
||||
|
||||
@ -2544,11 +2524,7 @@ HoppipEvosAttacks:
|
||||
db EVOLVE_LEVEL, 18, SKIPLOOM
|
||||
db 0 ; no more evolutions
|
||||
db 1, SPLASH
|
||||
if _CRYSTAL
|
||||
db 5, SYNTHESIS
|
||||
else
|
||||
db 1, SYNTHESIS
|
||||
endc
|
||||
db 5, TAIL_WHIP
|
||||
db 10, TACKLE
|
||||
db 13, POISONPOWDER
|
||||
@ -2566,9 +2542,7 @@ SkiploomEvosAttacks:
|
||||
db 1, SYNTHESIS
|
||||
db 1, TAIL_WHIP
|
||||
db 1, TACKLE
|
||||
if _CRYSTAL
|
||||
db 5, SYNTHESIS
|
||||
endc
|
||||
db 5, TAIL_WHIP
|
||||
db 10, TACKLE
|
||||
db 13, POISONPOWDER
|
||||
@ -2585,9 +2559,7 @@ JumpluffEvosAttacks:
|
||||
db 1, SYNTHESIS
|
||||
db 1, TAIL_WHIP
|
||||
db 1, TACKLE
|
||||
if _CRYSTAL
|
||||
db 5, SYNTHESIS
|
||||
endc
|
||||
db 5, TAIL_WHIP
|
||||
db 10, TACKLE
|
||||
db 13, POISONPOWDER
|
||||
@ -2641,11 +2613,7 @@ YanmaEvosAttacks:
|
||||
db 19, SONICBOOM
|
||||
db 25, DETECT
|
||||
db 31, SUPERSONIC
|
||||
if _CRYSTAL
|
||||
db 37, WING_ATTACK
|
||||
else
|
||||
db 37, SWIFT
|
||||
endc
|
||||
db 43, SCREECH
|
||||
db 0 ; no more level-up moves
|
||||
|
||||
@ -2857,9 +2825,7 @@ GranbullEvosAttacks:
|
||||
|
||||
QwilfishEvosAttacks:
|
||||
db 0 ; no more evolutions
|
||||
if _CRYSTAL
|
||||
db 1, SPIKES
|
||||
endc
|
||||
db 1, TACKLE
|
||||
db 1, POISON_STING
|
||||
db 10, HARDEN
|
||||
@ -2919,9 +2885,7 @@ SneaselEvosAttacks:
|
||||
db 41, AGILITY
|
||||
db 49, SLASH
|
||||
db 57, BEAT_UP
|
||||
if _CRYSTAL
|
||||
db 65, METAL_CLAW
|
||||
endc
|
||||
db 0 ; no more level-up moves
|
||||
|
||||
TeddiursaEvosAttacks:
|
||||
@ -2989,9 +2953,7 @@ SwinubEvosAttacks:
|
||||
db 28, TAKE_DOWN
|
||||
db 37, MIST
|
||||
db 46, BLIZZARD
|
||||
if _CRYSTAL
|
||||
db 55, AMNESIA
|
||||
endc
|
||||
db 0 ; no more level-up moves
|
||||
|
||||
PiloswineEvosAttacks:
|
||||
@ -3005,9 +2967,7 @@ PiloswineEvosAttacks:
|
||||
db 33, FURY_ATTACK
|
||||
db 42, MIST
|
||||
db 56, BLIZZARD
|
||||
if _CRYSTAL
|
||||
db 70, AMNESIA
|
||||
endc
|
||||
db 0 ; no more level-up moves
|
||||
|
||||
CorsolaEvosAttacks:
|
||||
@ -3300,17 +3260,10 @@ SuicuneEvosAttacks:
|
||||
db 0 ; no more evolutions
|
||||
db 1, BITE
|
||||
db 1, LEER
|
||||
if _CRYSTAL
|
||||
db 11, BUBBLEBEAM
|
||||
db 21, RAIN_DANCE
|
||||
db 31, GUST
|
||||
db 41, AURORA_BEAM
|
||||
else
|
||||
db 11, WATER_GUN
|
||||
db 21, ROAR
|
||||
db 31, GUST
|
||||
db 41, BUBBLEBEAM
|
||||
endc
|
||||
db 51, MIST
|
||||
db 61, MIRROR_COAT
|
||||
db 71, HYDRO_PUMP
|
||||
|
@ -145,9 +145,7 @@ ScriptCommandTable:
|
||||
dw Script_loadmenu ; 4f
|
||||
dw Script_closewindow ; 50
|
||||
dw Script_jumptextfaceplayer ; 51
|
||||
if _CRYSTAL
|
||||
dw Script_farjumptext ; 52
|
||||
endc
|
||||
dw Script_jumptext ; 53
|
||||
dw Script_waitbutton ; 54
|
||||
dw Script_buttonsound ; 55
|
||||
@ -330,8 +328,6 @@ JumpTextScript:
|
||||
closetext
|
||||
end
|
||||
|
||||
if _CRYSTAL
|
||||
|
||||
Script_farjumptext:
|
||||
; script command 0x52
|
||||
; parameters: text_pointer
|
||||
@ -346,8 +342,6 @@ Script_farjumptext:
|
||||
ld hl, JumpTextScript
|
||||
jp ScriptJump
|
||||
|
||||
endc
|
||||
|
||||
Script_writetext:
|
||||
; script command 0x4c
|
||||
; parameters: text_pointer
|
||||
|
@ -536,13 +536,11 @@ jumptextfaceplayer: MACRO
|
||||
dw \1 ; text_pointer
|
||||
ENDM
|
||||
|
||||
; if _CRYSTAL
|
||||
enum farjumptext_command ; $52
|
||||
farjumptext: MACRO
|
||||
db farjumptext_command
|
||||
dba \1
|
||||
ENDM
|
||||
; endc
|
||||
|
||||
enum jumptext_command ; $53
|
||||
jumptext: MACRO
|
||||
|
Loading…
Reference in New Issue
Block a user