Changed Starter, added many move animations.

Author: Dakorias

constants/battle_anim_constants.asm

@@ -103,6 +103,7 @@ DEF BATTLEANIM_BASE_TILE EQU 7 * 7  ; Maximum size of a pokemon picture
 	const ANIM_OBJ_ABSORB
 	const ANIM_OBJ_EGG
 	const ANIM_OBJ_FOCUS
+  const ANIM_OBJ_STONE_EDGE
 	const ANIM_OBJ_BIND1
 	const ANIM_OBJ_BIND2
 	const ANIM_OBJ_LEECH_SEED
@@ -124,6 +125,7 @@ DEF BATTLEANIM_BASE_TILE EQU 7 * 7  ; Maximum size of a pokemon picture
 	const ANIM_OBJ_STRING_SHOT
 	const ANIM_OBJ_HAZE
 	const ANIM_OBJ_MIST
+  const ANIM_OBJ_DEFOG
 	const ANIM_OBJ_SMOG
 	const ANIM_OBJ_POISON_GAS
 	const ANIM_OBJ_HORN
@@ -139,6 +141,7 @@ DEF BATTLEANIM_BASE_TILE EQU 7 * 7  ; Maximum size of a pokemon picture
 	const ANIM_OBJ_BONE_CLUB
 	const ANIM_OBJ_BONE_RUSH
 	const ANIM_OBJ_SWIFT
+  const ANIM_OBJ_SILVER_WIND
 	const ANIM_OBJ_KINESIS
 	const ANIM_OBJ_FLASH
 	const ANIM_OBJ_SHINY

constants/script_constants.asm

@@ -208,11 +208,11 @@ DEF EMOTE_LENGTH EQU 6
 ; FruitTreeItems indexes (see data/items/fruit_trees.asm)
 	const_def 1
 	const FRUITTREE_SCENIC_BLUFF  ; 01
-	const FRUITTREE_ROUTE_30_1    ; 02
-	const FRUITTREE_ROUTE_38      ; 03
-	const FRUITTREE_ROUTE_46_1    ; 04
-	const FRUITTREE_ROUTE_30_2    ; 05
-	const FRUITTREE_ROUTE_33      ; 06
+	const FRUITTREE_BERRY_FOREST_1 ; 02
+	const FRUITTREE_BERRY_FOREST_2      ; 03
+	const FRUITTREE_BERRY_FOREST_3    ; 04
+	const FRUITTREE_BERRY_FOREST_4    ; 05
+	const FRUITTREE_BERRY_FOREST_5      ; 06
 	const FRUITTREE_ROUTE_31      ; 07
 	const FRUITTREE_ROUTE_43      ; 08
 	const FRUITTREE_VIOLET_CITY   ; 09

constants/trainer_constants.asm

@@ -225,8 +225,10 @@ DEF NUM_NONTRAINER_PHONECONTACTS EQU const_value - 1
 	const PERCY_2_BALTOY
 
 	trainerclass BREEDER ; 46
+	const DAWN
 
 	trainerclass BUG_MANIAC ; 47
+	const EDWIN
 
 	trainerclass CLOWN ; 48
 
@@ -263,6 +265,7 @@ DEF NUM_NONTRAINER_PHONECONTACTS EQU const_value - 1
 	trainerclass FARMER ; 58
 
 	trainerclass GARDENER ; 59
+	const LILY
 
 	trainerclass DANCER ; 5a
 

data/battle_anims/objects.asm

@@ -165,6 +165,8 @@ BattleAnimObjects:
 	battleanimobj RELATIVE_X | X_FLIP, $b0, BATTLEANIMFRAMESET_4D, BATTLEANIMFUNC_EGG, PAL_BATTLE_OB_GRAY, ANIM_GFX_EGG
 ; ANIM_OBJ_FOCUS
 	battleanimobj RELATIVE_X, $b0, BATTLEANIMFRAMESET_51, BATTLEANIMFUNC_MOVE_UP, PAL_BATTLE_OB_YELLOW, ANIM_GFX_SPEED
+; ANIM_OBJ_STONE_EDGE
+	battleanimobj RELATIVE_X, $b0, BATTLEANIMFRAMESET_19, BATTLEANIMFUNC_MOVE_UP, PAL_BATTLE_OB_BROWN, ANIM_GFX_ROCKS
 ; ANIM_OBJ_BIND1
 	battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_52, BATTLEANIMFUNC_WRAP, PAL_BATTLE_OB_GREEN, ANIM_GFX_ROPE
 ; ANIM_OBJ_BIND2
@@ -207,6 +209,8 @@ BattleAnimObjects:
 	battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_6F, BATTLEANIMFUNC_SPIRAL_DESCENT, PAL_BATTLE_OB_GRAY, ANIM_GFX_HAZE
 ; ANIM_OBJ_MIST
 	battleanimobj RELATIVE_X | X_FLIP, $48, BATTLEANIMFRAMESET_70, BATTLEANIMFUNC_SPIRAL_DESCENT, PAL_BATTLE_OB_GRAY, ANIM_GFX_HAZE
+; ANIM_OBJ_DEFOG
+	battleanimobj RELATIVE_X | X_FLIP | PRIORITY, $88, BATTLEANIMFRAMESET_70, BATTLEANIMFUNC_AGILITY, PAL_BATTLE_OB_GRAY, ANIM_GFX_HAZE
 ; ANIM_OBJ_SMOG
 	battleanimobj RELATIVE_X | X_FLIP, $48, BATTLEANIMFRAMESET_6F, BATTLEANIMFUNC_SPIRAL_DESCENT, PAL_BATTLE_OB_GRAY, ANIM_GFX_HAZE
 ; ANIM_OBJ_POISON_GAS
@@ -237,6 +241,8 @@ BattleAnimObjects:
 	battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_77, BATTLEANIMFUNC_NULL, PAL_BATTLE_OB_GRAY, ANIM_GFX_MISC
 ; ANIM_OBJ_SWIFT
 	battleanimobj RELATIVE_X, $80, BATTLEANIMFRAMESET_78, BATTLEANIMFUNC_USER_TO_TARGET_SPIN, PAL_BATTLE_OB_YELLOW, ANIM_GFX_OBJECTS
+; ANIM_OBJ_SILVER_WIND
+	battleanimobj RELATIVE_X, $80, BATTLEANIMFRAMESET_30, BATTLEANIMFUNC_USER_TO_TARGET_SPIN, PAL_BATTLE_OB_YELLOW, ANIM_GFX_SPEED
 ; ANIM_OBJ_KINESIS
 	battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_79, BATTLEANIMFUNC_NULL, PAL_BATTLE_OB_GRAY, ANIM_GFX_MISC
 ; ANIM_OBJ_FLASH
@@ -400,5 +406,5 @@ BattleAnimObjects:
 ; ANIM_OBJ_PLAYERHEAD_2ROW
 	battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_B8, BATTLEANIMFUNC_NULL, PAL_BATTLE_OB_PLAYER, ANIM_GFX_ENEMYFEET
 ; ANIM_OBJ_BULLET_SEED
-	battleanimobj RELATIVE_X | X_FLIP | Y_FLIP, $90, BATTLEANIMFRAMESET_56, BATTLEANIMFUNC_LEECH_SEED, PAL_BATTLE_OB_GREEN, ANIM_GFX_PLANT
+	battleanimobj RELATIVE_X | X_FLIP | Y_FLIP, $68, BATTLEANIMFRAMESET_56, BATTLEANIMFUNC_NEEDLE, PAL_BATTLE_OB_GREEN, ANIM_GFX_PLANT
 	assert_table_length NUM_ANIM_OBJS

data/items/fruit_trees.asm

@@ -2,11 +2,12 @@ FruitTreeItems:
 ; entries correspond to FRUITTREE_* constants
 	table_width 1, FruitTreeItems
 	db BERRY        ; SCENIC_BLUFF
-	db BERRY        ; ROUTE_30_1
-	db BERRY        ; ROUTE_38
-	db BERRY        ; ROUTE_46_1
-	db PSNCUREBERRY ; ROUTE_30_2
-	db PSNCUREBERRY ; ROUTE_33
+	db BERRY        ; BERRY_FOREST_1
+	db PRZCUREBERRY ; BERRY_FOREST_2
+	db BITTER_BERRY ; BERRY_FOREST_3
+	db DREAM_BERRY  ; BERRY_FOREST_4
+	db PSNCUREBERRY ; BERRY_FOREST_5
+
 	db BITTER_BERRY ; ROUTE_31
 	db BITTER_BERRY ; ROUTE_43
 	db PRZCUREBERRY ; VIOLET_CITY