pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-09-09 09:51:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of _CRYSTAL

Browse Source 
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:
mid-kid 2019-05-12 16:45:41 +02:00
parent 13cfe356d6
commit 649c8d38da
6 changed files with 3 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -65,9 +65,9 @@ tools:
$(MAKE) -C tools/ $(MAKE) -C tools/
$(crystal_obj): RGBASMFLAGS = -D _CRYSTAL $(crystal_obj): RGBASMFLAGS =
$(crystal11_obj): RGBASMFLAGS = -D _CRYSTAL -D _CRYSTAL11 $(crystal11_obj): RGBASMFLAGS = -D _CRYSTAL11
$(crystal_au_obj): RGBASMFLAGS = -D _CRYSTAL -D _CRYSTAL11 -D _CRYSTAL_AU $(crystal_au_obj): RGBASMFLAGS = -D _CRYSTAL11 -D _CRYSTAL_AU
# The dep rules have to be explicit or else missing files won't be reported. # 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. # As a side effect, they're evaluated immediately instead of when the rule is invoked.

4
data/pokemon/egg_move_pointers.asm
View File

@ -118,11 +118,7 @@ EggMovePointers::
dw NoEggMoves dw NoEggMoves
dw GoldeenEggMoves dw GoldeenEggMoves
dw NoEggMoves dw NoEggMoves
if _CRYSTAL
dw NoEggMoves dw NoEggMoves
else
dw StaryuEggMoves
endc
dw NoEggMoves dw NoEggMoves
dw MrMimeEggMoves dw MrMimeEggMoves
dw ScytherEggMoves dw ScytherEggMoves

56
data/pokemon/egg_moves.asm
View File

@ -17,9 +17,6 @@ BulbasaurEggMoves:
db LIGHT_SCREEN db LIGHT_SCREEN
db SKULL_BASH db SKULL_BASH
db SAFEGUARD db SAFEGUARD
if !_CRYSTAL
db CHARM
endc
db RAZOR_WIND db RAZOR_WIND
db PETAL_DANCE db PETAL_DANCE
db -1 ; end db -1 ; end
@ -46,9 +43,6 @@ PidgeyEggMoves:
db PURSUIT db PURSUIT
db FAINT_ATTACK db FAINT_ATTACK
db FORESIGHT db FORESIGHT
if !_CRYSTAL
db STEEL_WING
endc
db -1 ; end db -1 ; end
RattataEggMoves: RattataEggMoves:
@ -73,9 +67,7 @@ EkansEggMoves:
db SLAM db SLAM
db SPITE db SPITE
db BEAT_UP db BEAT_UP
if _CRYSTAL
db CRUNCH db CRUNCH
endc
db -1 ; end db -1 ; end
SandshrewEggMoves: SandshrewEggMoves:
@ -83,9 +75,7 @@ SandshrewEggMoves:
db SAFEGUARD db SAFEGUARD
db COUNTER db COUNTER
db RAPID_SPIN db RAPID_SPIN
if _CRYSTAL
db METAL_CLAW db METAL_CLAW
endc
db -1 ; end db -1 ; end
NidoranFEggMoves: NidoranFEggMoves:
@ -129,9 +119,6 @@ OddishEggMoves:
db RAZOR_LEAF db RAZOR_LEAF
db FLAIL db FLAIL
db SYNTHESIS db SYNTHESIS
if !_CRYSTAL
db CHARM
endc
db -1 ; end db -1 ; end
ParasEggMoves: ParasEggMoves:
@ -140,9 +127,6 @@ ParasEggMoves:
db COUNTER db COUNTER
db PSYBEAM db PSYBEAM
db FLAIL db FLAIL
if !_CRYSTAL
db SWEET_SCENT
endc
db LIGHT_SCREEN db LIGHT_SCREEN
db PURSUIT db PURSUIT
db -1 ; end db -1 ; end
@ -176,9 +160,7 @@ PsyduckEggMoves:
db LIGHT_SCREEN db LIGHT_SCREEN
db FUTURE_SIGHT db FUTURE_SIGHT
db PSYCHIC_M db PSYCHIC_M
if _CRYSTAL
db CROSS_CHOP db CROSS_CHOP
endc
db -1 ; end db -1 ; end
MankeyEggMoves: MankeyEggMoves:
@ -257,9 +239,6 @@ SlowpokeEggMoves:
db -1 ; end db -1 ; end
FarfetchDEggMoves: FarfetchDEggMoves:
if !_CRYSTAL
db STEEL_WING
endc
db FORESIGHT db FORESIGHT
db MIRROR_MOVE db MIRROR_MOVE
db GUST db GUST
@ -337,9 +316,7 @@ CuboneEggMoves:
db SCREECH db SCREECH
db SKULL_BASH db SKULL_BASH
db PERISH_SONG db PERISH_SONG
if _CRYSTAL
db SWORDS_DANCE db SWORDS_DANCE
endc
db -1 ; end db -1 ; end
LickitungEggMoves: LickitungEggMoves:
@ -403,14 +380,6 @@ GoldeenEggMoves:
db HYDRO_PUMP db HYDRO_PUMP
db -1 ; end db -1 ; end
if !_CRYSTAL
StaryuEggMoves:
db AURORA_BEAM
db BARRIER
db SUPERSONIC
db -1 ; end
endc
MrMimeEggMoves: MrMimeEggMoves:
db FUTURE_SIGHT db FUTURE_SIGHT
db HYPNOSIS db HYPNOSIS
@ -461,16 +430,10 @@ AerodactylEggMoves:
db WHIRLWIND db WHIRLWIND
db PURSUIT db PURSUIT
db FORESIGHT db FORESIGHT
if !_CRYSTAL
db STEEL_WING
endc
db -1 ; end db -1 ; end
SnorlaxEggMoves: SnorlaxEggMoves:
db LICK db LICK
if !_CRYSTAL
db CHARM
endc
db -1 ; end db -1 ; end
DratiniEggMoves: DratiniEggMoves:
@ -495,9 +458,7 @@ CyndaquilEggMoves:
db REVERSAL db REVERSAL
db THRASH db THRASH
db FORESIGHT db FORESIGHT
if _CRYSTAL
db SUBMISSION db SUBMISSION
endc
db -1 ; end db -1 ; end
TotodileEggMoves: TotodileEggMoves:
@ -523,9 +484,7 @@ HoothootEggMoves:
db FAINT_ATTACK db FAINT_ATTACK
db WING_ATTACK db WING_ATTACK
db WHIRLWIND db WHIRLWIND
if _CRYSTAL
db SKY_ATTACK db SKY_ATTACK
endc
db -1 ; end db -1 ; end
LedybaEggMoves: LedybaEggMoves:
@ -650,9 +609,7 @@ MurkrowEggMoves:
db QUICK_ATTACK db QUICK_ATTACK
db MIRROR_MOVE db MIRROR_MOVE
db WING_ATTACK db WING_ATTACK
if _CRYSTAL
db SKY_ATTACK db SKY_ATTACK
endc
db -1 ; end db -1 ; end
MisdreavusEggMoves: MisdreavusEggMoves:
@ -732,9 +689,7 @@ TeddiursaEggMoves:
db SEISMIC_TOSS db SEISMIC_TOSS
db FOCUS_ENERGY db FOCUS_ENERGY
db COUNTER db COUNTER
if _CRYSTAL
db METAL_CLAW db METAL_CLAW
endc
db -1 ; end db -1 ; end
SlugmaEggMoves: SlugmaEggMoves:
@ -784,9 +739,7 @@ SkarmoryEggMoves:
db DRILL_PECK db DRILL_PECK
db PURSUIT db PURSUIT
db WHIRLWIND db WHIRLWIND
if _CRYSTAL
db SKY_ATTACK db SKY_ATTACK
endc
db -1 ; end db -1 ; end
HoundourEggMoves: HoundourEggMoves:
@ -803,9 +756,7 @@ PhanpyEggMoves:
db FOCUS_ENERGY db FOCUS_ENERGY
db BODY_SLAM db BODY_SLAM
db ANCIENTPOWER db ANCIENTPOWER
if _CRYSTAL
db WATER_GUN db WATER_GUN
endc
db -1 ; end db -1 ; end
StantlerEggMoves: StantlerEggMoves:
@ -824,9 +775,6 @@ TyrogueEggMoves:
db -1 ; end db -1 ; end
SmoochumEggMoves: SmoochumEggMoves:
if !_CRYSTAL
db LOVELY_KISS
endc
db MEDITATE db MEDITATE
db -1 ; end db -1 ; end
@ -835,9 +783,7 @@ ElekidEggMoves:
db BARRIER db BARRIER
db ROLLING_KICK db ROLLING_KICK
db MEDITATE db MEDITATE
if _CRYSTAL
db CROSS_CHOP db CROSS_CHOP
endc
db -1 ; end db -1 ; end
MagbyEggMoves: MagbyEggMoves:
@ -845,9 +791,7 @@ MagbyEggMoves:
db MEGA_PUNCH db MEGA_PUNCH
db BARRIER db BARRIER
db SCREECH db SCREECH
if _CRYSTAL
db CROSS_CHOP db CROSS_CHOP
endc
db -1 ; end db -1 ; end
MiltankEggMoves: MiltankEggMoves:

47
data/pokemon/evos_attacks.asm
View File

@ -670,9 +670,7 @@ DiglettEvosAttacks:
DugtrioEvosAttacks: DugtrioEvosAttacks:
db 0 ; no more evolutions db 0 ; no more evolutions
if _CRYSTAL
db 1, TRI_ATTACK db 1, TRI_ATTACK
endc
db 1, SCRATCH db 1, SCRATCH
db 1, GROWL db 1, GROWL
db 1, MAGNITUDE db 1, MAGNITUDE
@ -1115,11 +1113,7 @@ MagnetonEvosAttacks:
db 16, SONICBOOM db 16, SONICBOOM
db 21, THUNDER_WAVE db 21, THUNDER_WAVE
db 27, LOCK_ON db 27, LOCK_ON
if _CRYSTAL
db 35, TRI_ATTACK db 35, TRI_ATTACK
else
db 35, SWIFT
endc
db 43, SCREECH db 43, SCREECH
db 53, ZAP_CANNON db 53, ZAP_CANNON
db 0 ; no more level-up moves db 0 ; no more level-up moves
@ -1235,9 +1229,7 @@ CloysterEvosAttacks:
db 1, SUPERSONIC db 1, SUPERSONIC
db 1, AURORA_BEAM db 1, AURORA_BEAM
db 1, PROTECT db 1, PROTECT
if _CRYSTAL
db 33, SPIKES db 33, SPIKES
endc
db 41, SPIKE_CANNON db 41, SPIKE_CANNON
db 0 ; no more level-up moves db 0 ; no more level-up moves
@ -1814,11 +1806,7 @@ EeveeEvosAttacks:
db 16, GROWL db 16, GROWL
db 23, QUICK_ATTACK db 23, QUICK_ATTACK
db 30, BITE db 30, BITE
if _CRYSTAL
db 36, BATON_PASS db 36, BATON_PASS
else
db 36, FOCUS_ENERGY
endc
db 42, TAKE_DOWN db 42, TAKE_DOWN
db 0 ; no more level-up moves db 0 ; no more level-up moves
@ -2297,11 +2285,7 @@ SpinarakEvosAttacks:
db 23, LEECH_LIFE db 23, LEECH_LIFE
db 30, FURY_SWIPES db 30, FURY_SWIPES
db 37, SPIDER_WEB db 37, SPIDER_WEB
if _CRYSTAL
db 45, AGILITY db 45, AGILITY
else
db 45, SCREECH
endc
db 53, PSYCHIC_M db 53, PSYCHIC_M
db 0 ; no more level-up moves db 0 ; no more level-up moves
@ -2317,11 +2301,7 @@ AriadosEvosAttacks:
db 25, LEECH_LIFE db 25, LEECH_LIFE
db 34, FURY_SWIPES db 34, FURY_SWIPES
db 43, SPIDER_WEB db 43, SPIDER_WEB
if _CRYSTAL
db 53, AGILITY db 53, AGILITY
else
db 53, SCREECH
endc
db 63, PSYCHIC_M db 63, PSYCHIC_M
db 0 ; no more level-up moves db 0 ; no more level-up moves
@ -2544,11 +2524,7 @@ HoppipEvosAttacks:
db EVOLVE_LEVEL, 18, SKIPLOOM db EVOLVE_LEVEL, 18, SKIPLOOM
db 0 ; no more evolutions db 0 ; no more evolutions
db 1, SPLASH db 1, SPLASH
if _CRYSTAL
db 5, SYNTHESIS db 5, SYNTHESIS
else
db 1, SYNTHESIS
endc
db 5, TAIL_WHIP db 5, TAIL_WHIP
db 10, TACKLE db 10, TACKLE
db 13, POISONPOWDER db 13, POISONPOWDER
@ -2566,9 +2542,7 @@ SkiploomEvosAttacks:
db 1, SYNTHESIS db 1, SYNTHESIS
db 1, TAIL_WHIP db 1, TAIL_WHIP
db 1, TACKLE db 1, TACKLE
if _CRYSTAL
db 5, SYNTHESIS db 5, SYNTHESIS
endc
db 5, TAIL_WHIP db 5, TAIL_WHIP
db 10, TACKLE db 10, TACKLE
db 13, POISONPOWDER db 13, POISONPOWDER
@ -2585,9 +2559,7 @@ JumpluffEvosAttacks:
db 1, SYNTHESIS db 1, SYNTHESIS
db 1, TAIL_WHIP db 1, TAIL_WHIP
db 1, TACKLE db 1, TACKLE
if _CRYSTAL
db 5, SYNTHESIS db 5, SYNTHESIS
endc
db 5, TAIL_WHIP db 5, TAIL_WHIP
db 10, TACKLE db 10, TACKLE
db 13, POISONPOWDER db 13, POISONPOWDER
@ -2641,11 +2613,7 @@ YanmaEvosAttacks:
db 19, SONICBOOM db 19, SONICBOOM
db 25, DETECT db 25, DETECT
db 31, SUPERSONIC db 31, SUPERSONIC
if _CRYSTAL
db 37, WING_ATTACK db 37, WING_ATTACK
else
db 37, SWIFT
endc
db 43, SCREECH db 43, SCREECH
db 0 ; no more level-up moves db 0 ; no more level-up moves
@ -2857,9 +2825,7 @@ GranbullEvosAttacks:
QwilfishEvosAttacks: QwilfishEvosAttacks:
db 0 ; no more evolutions db 0 ; no more evolutions
if _CRYSTAL
db 1, SPIKES db 1, SPIKES
endc
db 1, TACKLE db 1, TACKLE
db 1, POISON_STING db 1, POISON_STING
db 10, HARDEN db 10, HARDEN
@ -2919,9 +2885,7 @@ SneaselEvosAttacks:
db 41, AGILITY db 41, AGILITY
db 49, SLASH db 49, SLASH
db 57, BEAT_UP db 57, BEAT_UP
if _CRYSTAL
db 65, METAL_CLAW db 65, METAL_CLAW
endc
db 0 ; no more level-up moves db 0 ; no more level-up moves
TeddiursaEvosAttacks: TeddiursaEvosAttacks:
@ -2989,9 +2953,7 @@ SwinubEvosAttacks:
db 28, TAKE_DOWN db 28, TAKE_DOWN
db 37, MIST db 37, MIST
db 46, BLIZZARD db 46, BLIZZARD
if _CRYSTAL
db 55, AMNESIA db 55, AMNESIA
endc
db 0 ; no more level-up moves db 0 ; no more level-up moves
PiloswineEvosAttacks: PiloswineEvosAttacks:
@ -3005,9 +2967,7 @@ PiloswineEvosAttacks:
db 33, FURY_ATTACK db 33, FURY_ATTACK
db 42, MIST db 42, MIST
db 56, BLIZZARD db 56, BLIZZARD
if _CRYSTAL
db 70, AMNESIA db 70, AMNESIA
endc
db 0 ; no more level-up moves db 0 ; no more level-up moves
CorsolaEvosAttacks: CorsolaEvosAttacks:
@ -3300,17 +3260,10 @@ SuicuneEvosAttacks:
db 0 ; no more evolutions db 0 ; no more evolutions
db 1, BITE db 1, BITE
db 1, LEER db 1, LEER
if _CRYSTAL
db 11, BUBBLEBEAM db 11, BUBBLEBEAM
db 21, RAIN_DANCE db 21, RAIN_DANCE
db 31, GUST db 31, GUST
db 41, AURORA_BEAM db 41, AURORA_BEAM
else
db 11, WATER_GUN
db 21, ROAR
db 31, GUST
db 41, BUBBLEBEAM
endc
db 51, MIST db 51, MIST
db 61, MIRROR_COAT db 61, MIRROR_COAT
db 71, HYDRO_PUMP db 71, HYDRO_PUMP

6
engine/overworld/scripting.asm
View File

@ -145,9 +145,7 @@ ScriptCommandTable:
dw Script_loadmenu ; 4f dw Script_loadmenu ; 4f
dw Script_closewindow ; 50 dw Script_closewindow ; 50
dw Script_jumptextfaceplayer ; 51 dw Script_jumptextfaceplayer ; 51
if _CRYSTAL
dw Script_farjumptext ; 52 dw Script_farjumptext ; 52
endc
dw Script_jumptext ; 53 dw Script_jumptext ; 53
dw Script_waitbutton ; 54 dw Script_waitbutton ; 54
dw Script_buttonsound ; 55 dw Script_buttonsound ; 55
@ -330,8 +328,6 @@ JumpTextScript:
closetext closetext
end end
if _CRYSTAL
Script_farjumptext: Script_farjumptext:
; script command 0x52 ; script command 0x52
; parameters: text_pointer ; parameters: text_pointer
@ -346,8 +342,6 @@ Script_farjumptext:
ld hl, JumpTextScript ld hl, JumpTextScript
jp ScriptJump jp ScriptJump
endc
Script_writetext: Script_writetext:
; script command 0x4c ; script command 0x4c
; parameters: text_pointer ; parameters: text_pointer

2
macros/scripts/events.asm
View File

@ -536,13 +536,11 @@ jumptextfaceplayer: MACRO
dw \1 ; text_pointer dw \1 ; text_pointer
ENDM ENDM
; if _CRYSTAL
enum farjumptext_command ; $52 enum farjumptext_command ; $52
farjumptext: MACRO farjumptext: MACRO
db farjumptext_command db farjumptext_command
dba \1 dba \1
ENDM ENDM
; endc
enum jumptext_command ; $53 enum jumptext_command ; $53
jumptext: MACRO jumptext: MACRO