changes

a bunch

constants/battle_constants.asm

@@ -266,4 +266,4 @@ DEF BATTLERESULT_BITMASK EQU (1 << BATTLERESULT_CAUGHT_CELEBI) | (1 << BATTLERES
 
 ; link_battle_record struct
 DEF LINK_BATTLE_RECORD_LENGTH EQU 2 + (NAME_LENGTH - 1) + 2 * 3
-DEF NUM_LINK_BATTLE_RECORDS EQU 5
+DEF NUM_LINK_BATTLE_RECORDS EQU 5

constants/item_data_constants.asm

@@ -130,6 +130,7 @@ DEF MAIL_STRUCT_LENGTH_JP EQU $2a ; mailmsg_jp struct
 	const HELD_DRAGON_BOOST
 	const HELD_DARK_BOOST
 	const HELD_STEEL_BOOST
+	const HELD_FAIRY_BOOST
 
 	const_next 70
 	const HELD_CATCH_CHANCE

constants/move_constants.asm

@@ -296,4 +296,4 @@ DEF NUM_BATTLE_ANIMS EQU const_value - 1
 	const BATTLEANIM_PLAYER_DAMAGE
 	const BATTLEANIM_WOBBLE
 	const BATTLEANIM_SHAKE
-	const BATTLEANIM_HIT_CONFUSION
+	const BATTLEANIM_HIT_CONFUSION

constants/move_effect_constants.asm

@@ -157,4 +157,4 @@
 	const EFFECT_BEAT_UP
 	const EFFECT_FLY
 	const EFFECT_DEFENSE_CURL
-DEF NUM_MOVE_EFFECTS EQU const_value
+DEF NUM_MOVE_EFFECTS EQU const_value

constants/type_constants.asm

@@ -4,36 +4,40 @@
 ; - PokedexTypeSearchStrings (see data/types/search_strings.asm)
 ; - TypeMatchups (see data/types/type_matchups.asm)
 ; - TypeBoostItems (see data/types/type_boost_items.asm)
-	const_def
+ 	const_def
 
-DEF PHYSICAL EQU const_value
-	const NORMAL
-	const FIGHTING
-	const FLYING
-	const POISON
-	const GROUND
-	const ROCK
-	const BIRD
-	const BUG
-	const GHOST
-	const STEEL
+ 	const NORMAL
+ 	const FIGHTING
+ 	const FLYING
+ 	const POISON
+ 	const GROUND
+ 	const ROCK
+ 	const BIRD
+ 	const BUG
+ 	const GHOST
+ 	const STEEL
 
-DEF UNUSED_TYPES EQU const_value
-	const_next 19
-	const CURSE_TYPE
-DEF UNUSED_TYPES_END EQU const_value
+ DEF UNUSED_TYPES EQU const_value
+ 	const_next 19
+ 	const CURSE_TYPE
+ DEF UNUSED_TYPES_END EQU const_value
 
-DEF SPECIAL EQU const_value
-	const FIRE
-	const WATER
-	const GRASS
-	const ELECTRIC
-	const PSYCHIC_TYPE
-	const ICE
-	const DRAGON
-	const DARK
-DEF TYPES_END EQU const_value
 
+ 	const FIRE
+ 	const WATER
+ 	const GRASS
+ 	const ELECTRIC
+ 	const PSYCHIC_TYPE
+ 	const ICE
+ 	const DRAGON
+ 	const DARK
+	const FAIRY
+ DEF TYPES_END EQU const_value
+
+DEF TYPE_MASK EQU %00111111
+DEF PHYSICAL  EQU %01000000
+DEF SPECIAL   EQU %10000000
+DEF STATUS    EQU %11000000
 DEF NUM_TYPES EQU TYPES_END + UNUSED_TYPES - UNUSED_TYPES_END - 1 ; discount BIRD
 
 DEF POKEDEX_TYPE_STRING_LENGTH EQU 9

data/battle_anims/ball_colors.asm

@@ -1,15 +1,29 @@
-; colors of balls thrown in battle
+ ; colors of balls thrown in battle
 
-BallColors:
-	db MASTER_BALL, PAL_BATTLE_OB_GREEN
-	db ULTRA_BALL,  PAL_BATTLE_OB_YELLOW
-	db GREAT_BALL,  PAL_BATTLE_OB_BLUE
-	db POKE_BALL,   PAL_BATTLE_OB_RED
-	db HEAVY_BALL,  PAL_BATTLE_OB_GRAY
-	db LEVEL_BALL,  PAL_BATTLE_OB_BROWN
-	db LURE_BALL,   PAL_BATTLE_OB_BLUE
-	db FAST_BALL,   PAL_BATTLE_OB_BLUE
-	db FRIEND_BALL, PAL_BATTLE_OB_YELLOW
-	db MOON_BALL,   PAL_BATTLE_OB_GRAY
-	db LOVE_BALL,   PAL_BATTLE_OB_RED
-	db -1,          PAL_BATTLE_OB_GRAY
+ BallColors:
+	db MASTER_BALL
+	RGB 31,31,31, 20,08,23
+	db ULTRA_BALL
+	RGB 31,31,31, 10,10,12
+	db GREAT_BALL
+	RGB 31,31,31, 09,13,30
+	db POKE_BALL
+	RGB 31,31,31, 30,08,05
+	db HEAVY_BALL
+	RGB 31,31,31, 06,10,12
+	db LEVEL_BALL
+	RGB 31,31,31, 30,24,00
+	db LURE_BALL
+	RGB 31,31,31, 04,14,30
+	db FAST_BALL
+	RGB 31,31,31, 31,16,04
+	db FRIEND_BALL
+	RGB 31,31,31, 04,17,04
+	db MOON_BALL
+	RGB 31,31,31, 07,19,25
+	db LOVE_BALL
+	RGB 31,31,31, 30,11,22
+	db PARK_BALL
+	RGB 31,31,31, 18,18,05
+	db -1 ; end
+	RGB 31,31,31, 16,16,16

data/events/special_pointers.asm

@@ -183,3 +183,4 @@ SpecialsPointers::
 	add_special InitialSetDSTFlag
 	add_special InitialClearDSTFlag
 	add_special UnusedDummySpecial ; unused
+	add_special MoveRelearner

data/items/attributes.asm

@@ -348,7 +348,7 @@ ItemAttributes:
 ; SUN_STONE
 	item_attribute 2100, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; POLKADOT_BOW
-	item_attribute 100, HELD_NORMAL_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+	item_attribute 100, HELD_FAIRY_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; ITEM_AB
 	item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; UP_GRADE

data/items/descriptions.asm

@@ -909,7 +909,7 @@ SunStoneDesc:
 	next "kinds of #MON.@"
 
 PolkadotBowDesc:
-	db   "Powers up normal-"
+	db   "Powers up fairy-"
 	next "type moves. (HOLD)@"
 
 TeruSama22Desc:

data/moves/animations.asm

@@ -4823,4 +4823,4 @@ BattleAnim_ShowMon_1:
 	anim_wait 4
 	anim_incobj 1
 	anim_wait 1
-	anim_ret
+	anim_ret

data/moves/critical_hit_moves.asm

@@ -6,4 +6,4 @@ CriticalHitMoves:
 	db SLASH
 	db AEROBLAST
 	db CROSS_CHOP
-	db -1
+	db -1

data/moves/descriptions.asm

@@ -1269,4 +1269,4 @@ WhirlpoolDescription:
 
 BeatUpDescription:
 	db   "Party #MON join"
-	next "in the attack.@"
+	next "in the attack.@"

data/moves/effects.asm

@@ -2076,4 +2076,4 @@ DefenseCurl:
 	raisesub
 	statupmessage
 	statupfailtext
-	endmove
+	endmove

data/moves/effects_pointers.asm

@@ -158,4 +158,4 @@ MoveEffectsPointers:
 	dw BeatUp
 	dw Fly
 	dw DefenseCurl
-	assert_table_length NUM_MOVE_EFFECTS
+	assert_table_length NUM_MOVE_EFFECTS

data/moves/effects_priorities.asm

@@ -5,4 +5,4 @@ MoveEffectPriorities:
 	db EFFECT_FORCE_SWITCH, 0
 	db EFFECT_COUNTER,      0
 	db EFFECT_MIRROR_COAT,  0
-	db -1
+	db -1