Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2

2020-04-15 13:31:52 +02:00 · 2020-04-15 13:31:52 +02:00 · e00b76b8da
commit e00b76b8da
parent 83b251a69c a12de6e480
244 changed files with 538 additions and 386 deletions
--- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
@ -584,7 +584,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_ReceivePokedex:: @ 81FA3AC
 	message LittlerootTown_ProfessorBirchsLab_Text_ReceivedPokedex
 	waitfanfare
 	setflag FLAG_SYS_POKEDEX_GET
-	special sub_81AFDA0  @ sets flags that are never read
+	special SetUnlockedPokedexFlags
 	setflag FLAG_RECEIVED_POKEDEX_FROM_BIRCH
 	setvar VAR_CABLE_CLUB_TUTORIAL_STATE, 1
 	return
--- a/data/specials.inc
+++ b/data/specials.inc
@ -504,7 +504,7 @@ gSpecials:: @ 81DBA64
 	def_special GetMartEmployeeObjectEventId
 	def_special sub_80A08CC
 	def_special Unused_SetWeatherSunny
-	def_special sub_81AFDA0
+	def_special SetUnlockedPokedexFlags
 	def_special IsTrainerRegistered
 	def_special ShouldDoBrailleRegicePuzzle
 	def_special EnableNationalPokedex
--- a/data/tilesets/primary/building/anim/tv_turned_on/0.png
+++ b/data/tilesets/primary/building/anim/tv_turned_on/0.png
--- a/data/tilesets/primary/building/anim/tv_turned_on/1.png
+++ b/data/tilesets/primary/building/anim/tv_turned_on/1.png
--- a/data/tilesets/primary/general/anim/flower/0.png
+++ b/data/tilesets/primary/general/anim/flower/0.png
--- a/data/tilesets/primary/general/anim/flower/1.png
+++ b/data/tilesets/primary/general/anim/flower/1.png
--- a/data/tilesets/primary/general/anim/flower/2.png
+++ b/data/tilesets/primary/general/anim/flower/2.png
--- a/data/tilesets/primary/general/anim/land_water_edge/0.png
+++ b/data/tilesets/primary/general/anim/land_water_edge/0.png
--- a/data/tilesets/primary/general/anim/land_water_edge/1.png
+++ b/data/tilesets/primary/general/anim/land_water_edge/1.png
--- a/data/tilesets/primary/general/anim/land_water_edge/2.png
+++ b/data/tilesets/primary/general/anim/land_water_edge/2.png
--- a/data/tilesets/primary/general/anim/land_water_edge/3.png
+++ b/data/tilesets/primary/general/anim/land_water_edge/3.png
--- a/data/tilesets/primary/general/anim/sand_water_edge/0.png
+++ b/data/tilesets/primary/general/anim/sand_water_edge/0.png
--- a/data/tilesets/primary/general/anim/sand_water_edge/1.png
+++ b/data/tilesets/primary/general/anim/sand_water_edge/1.png
--- a/data/tilesets/primary/general/anim/sand_water_edge/2.png
+++ b/data/tilesets/primary/general/anim/sand_water_edge/2.png
--- a/data/tilesets/primary/general/anim/sand_water_edge/3.png
+++ b/data/tilesets/primary/general/anim/sand_water_edge/3.png
--- a/data/tilesets/primary/general/anim/sand_water_edge/4.png
+++ b/data/tilesets/primary/general/anim/sand_water_edge/4.png
--- a/data/tilesets/primary/general/anim/sand_water_edge/5.png
+++ b/data/tilesets/primary/general/anim/sand_water_edge/5.png
--- a/data/tilesets/primary/general/anim/sand_water_edge/6.png
+++ b/data/tilesets/primary/general/anim/sand_water_edge/6.png
--- a/data/tilesets/primary/general/anim/water/0.png
+++ b/data/tilesets/primary/general/anim/water/0.png
--- a/data/tilesets/primary/general/anim/water/1.png
+++ b/data/tilesets/primary/general/anim/water/1.png
--- a/data/tilesets/primary/general/anim/water/2.png
+++ b/data/tilesets/primary/general/anim/water/2.png
--- a/data/tilesets/primary/general/anim/water/3.png
+++ b/data/tilesets/primary/general/anim/water/3.png
--- a/data/tilesets/primary/general/anim/water/4.png
+++ b/data/tilesets/primary/general/anim/water/4.png
--- a/data/tilesets/primary/general/anim/water/5.png
+++ b/data/tilesets/primary/general/anim/water/5.png
--- a/data/tilesets/primary/general/anim/water/6.png
+++ b/data/tilesets/primary/general/anim/water/6.png
--- a/data/tilesets/primary/general/anim/water/7.png
+++ b/data/tilesets/primary/general/anim/water/7.png
--- a/data/tilesets/primary/general/anim/waterfall/0.png
+++ b/data/tilesets/primary/general/anim/waterfall/0.png
--- a/data/tilesets/primary/general/anim/waterfall/1.png
+++ b/data/tilesets/primary/general/anim/waterfall/1.png
--- a/data/tilesets/primary/general/anim/waterfall/2.png
+++ b/data/tilesets/primary/general/anim/waterfall/2.png
--- a/data/tilesets/primary/general/anim/waterfall/3.png
+++ b/data/tilesets/primary/general/anim/waterfall/3.png
--- a/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/0.png
+++ b/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/0.png
--- a/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/1.png
+++ b/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/1.png
--- a/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/2.png
+++ b/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/2.png
--- a/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/3.png
+++ b/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/3.png
--- a/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/0.png
+++ b/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/0.png
--- a/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/1.png
+++ b/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/1.png
--- a/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/2.png
+++ b/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/2.png
--- a/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/3.png
+++ b/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/3.png
--- a/data/tilesets/secondary/battle_pyramid/anim/statue_shadow/0.png
+++ b/data/tilesets/secondary/battle_pyramid/anim/statue_shadow/0.png
--- a/data/tilesets/secondary/battle_pyramid/anim/statue_shadow/1.png
+++ b/data/tilesets/secondary/battle_pyramid/anim/statue_shadow/1.png
--- a/data/tilesets/secondary/battle_pyramid/anim/statue_shadow/2.png
+++ b/data/tilesets/secondary/battle_pyramid/anim/statue_shadow/2.png
--- a/data/tilesets/secondary/battle_pyramid/anim/torch/0.png
+++ b/data/tilesets/secondary/battle_pyramid/anim/torch/0.png
--- a/data/tilesets/secondary/battle_pyramid/anim/torch/1.png
+++ b/data/tilesets/secondary/battle_pyramid/anim/torch/1.png
--- a/data/tilesets/secondary/battle_pyramid/anim/torch/2.png
+++ b/data/tilesets/secondary/battle_pyramid/anim/torch/2.png
--- a/data/tilesets/secondary/bike_shop/anim/blinking_lights/0.png
+++ b/data/tilesets/secondary/bike_shop/anim/blinking_lights/0.png
--- a/data/tilesets/secondary/bike_shop/anim/blinking_lights/1.png
+++ b/data/tilesets/secondary/bike_shop/anim/blinking_lights/1.png
--- a/data/tilesets/secondary/cave/anim/lava/0.png
+++ b/data/tilesets/secondary/cave/anim/lava/0.png
--- a/data/tilesets/secondary/cave/anim/lava/1.png
+++ b/data/tilesets/secondary/cave/anim/lava/1.png
--- a/data/tilesets/secondary/cave/anim/lava/2.png
+++ b/data/tilesets/secondary/cave/anim/lava/2.png
--- a/data/tilesets/secondary/cave/anim/lava/3.png
+++ b/data/tilesets/secondary/cave/anim/lava/3.png
--- a/data/tilesets/secondary/cave/anim/lava/4.png
+++ b/data/tilesets/secondary/cave/anim/lava/4.png
--- a/data/tilesets/secondary/cave/anim/lava/5.png
+++ b/data/tilesets/secondary/cave/anim/lava/5.png
--- a/data/tilesets/secondary/cave/anim/lava/6.png
+++ b/data/tilesets/secondary/cave/anim/lava/6.png
--- a/data/tilesets/secondary/cave/anim/lava/7.png
+++ b/data/tilesets/secondary/cave/anim/lava/7.png
--- a/data/tilesets/secondary/dewford/anim/flag/0.png
+++ b/data/tilesets/secondary/dewford/anim/flag/0.png
--- a/data/tilesets/secondary/dewford/anim/flag/1.png
+++ b/data/tilesets/secondary/dewford/anim/flag/1.png
--- a/data/tilesets/secondary/dewford/anim/flag/2.png
+++ b/data/tilesets/secondary/dewford/anim/flag/2.png
--- a/data/tilesets/secondary/dewford/anim/flag/3.png
+++ b/data/tilesets/secondary/dewford/anim/flag/3.png
--- a/data/tilesets/secondary/elite_four/anim/floor_light/0.png
+++ b/data/tilesets/secondary/elite_four/anim/floor_light/0.png
--- a/data/tilesets/secondary/elite_four/anim/floor_light/1.png
+++ b/data/tilesets/secondary/elite_four/anim/floor_light/1.png
--- a/data/tilesets/secondary/elite_four/anim/wall_lights/0.png
+++ b/data/tilesets/secondary/elite_four/anim/wall_lights/0.png
--- a/data/tilesets/secondary/elite_four/anim/wall_lights/1.png
+++ b/data/tilesets/secondary/elite_four/anim/wall_lights/1.png
--- a/data/tilesets/secondary/elite_four/anim/wall_lights/2.png
+++ b/data/tilesets/secondary/elite_four/anim/wall_lights/2.png
--- a/data/tilesets/secondary/elite_four/anim/wall_lights/3.png
+++ b/data/tilesets/secondary/elite_four/anim/wall_lights/3.png
--- a/data/tilesets/secondary/ever_grande/anim/flowers/0.png
+++ b/data/tilesets/secondary/ever_grande/anim/flowers/0.png
--- a/data/tilesets/secondary/ever_grande/anim/flowers/1.png
+++ b/data/tilesets/secondary/ever_grande/anim/flowers/1.png
--- a/data/tilesets/secondary/ever_grande/anim/flowers/2.png
+++ b/data/tilesets/secondary/ever_grande/anim/flowers/2.png
--- a/data/tilesets/secondary/ever_grande/anim/flowers/3.png
+++ b/data/tilesets/secondary/ever_grande/anim/flowers/3.png
--- a/data/tilesets/secondary/ever_grande/anim/flowers/4.png
+++ b/data/tilesets/secondary/ever_grande/anim/flowers/4.png
--- a/data/tilesets/secondary/ever_grande/anim/flowers/5.png
+++ b/data/tilesets/secondary/ever_grande/anim/flowers/5.png
--- a/data/tilesets/secondary/ever_grande/anim/flowers/6.png
+++ b/data/tilesets/secondary/ever_grande/anim/flowers/6.png
--- a/data/tilesets/secondary/ever_grande/anim/flowers/7.png
+++ b/data/tilesets/secondary/ever_grande/anim/flowers/7.png
--- a/data/tilesets/secondary/lavaridge/anim/steam/0.png
+++ b/data/tilesets/secondary/lavaridge/anim/steam/0.png
--- a/data/tilesets/secondary/lavaridge/anim/steam/1.png
+++ b/data/tilesets/secondary/lavaridge/anim/steam/1.png
--- a/data/tilesets/secondary/lavaridge/anim/steam/2.png
+++ b/data/tilesets/secondary/lavaridge/anim/steam/2.png
--- a/data/tilesets/secondary/lavaridge/anim/steam/3.png
+++ b/data/tilesets/secondary/lavaridge/anim/steam/3.png
--- a/data/tilesets/secondary/mauville/anim/flower_1/0.png
+++ b/data/tilesets/secondary/mauville/anim/flower_1/0.png
--- a/data/tilesets/secondary/mauville/anim/flower_1/1.png
+++ b/data/tilesets/secondary/mauville/anim/flower_1/1.png
--- a/data/tilesets/secondary/mauville/anim/flower_1/2.png
+++ b/data/tilesets/secondary/mauville/anim/flower_1/2.png
--- a/data/tilesets/secondary/mauville/anim/flower_1/3.png
+++ b/data/tilesets/secondary/mauville/anim/flower_1/3.png
--- a/data/tilesets/secondary/mauville/anim/flower_1/4.png
+++ b/data/tilesets/secondary/mauville/anim/flower_1/4.png
--- a/data/tilesets/secondary/mauville/anim/flower_2/0.png
+++ b/data/tilesets/secondary/mauville/anim/flower_2/0.png
--- a/data/tilesets/secondary/mauville/anim/flower_2/1.png
+++ b/data/tilesets/secondary/mauville/anim/flower_2/1.png
--- a/data/tilesets/secondary/mauville/anim/flower_2/2.png
+++ b/data/tilesets/secondary/mauville/anim/flower_2/2.png
--- a/data/tilesets/secondary/mauville/anim/flower_2/3.png
+++ b/data/tilesets/secondary/mauville/anim/flower_2/3.png
--- a/data/tilesets/secondary/mauville/anim/flower_2/4.png
+++ b/data/tilesets/secondary/mauville/anim/flower_2/4.png
--- a/data/tilesets/secondary/mauville_gym/anim/electric_gates/0.png
+++ b/data/tilesets/secondary/mauville_gym/anim/electric_gates/0.png
--- a/data/tilesets/secondary/mauville_gym/anim/electric_gates/1.png
+++ b/data/tilesets/secondary/mauville_gym/anim/electric_gates/1.png
--- a/data/tilesets/secondary/pacifidlog/anim/log_bridges/0.png
+++ b/data/tilesets/secondary/pacifidlog/anim/log_bridges/0.png
--- a/data/tilesets/secondary/pacifidlog/anim/log_bridges/1.png
+++ b/data/tilesets/secondary/pacifidlog/anim/log_bridges/1.png
--- a/data/tilesets/secondary/pacifidlog/anim/log_bridges/2.png
+++ b/data/tilesets/secondary/pacifidlog/anim/log_bridges/2.png
--- a/data/tilesets/secondary/pacifidlog/anim/water_currents/0.png
+++ b/data/tilesets/secondary/pacifidlog/anim/water_currents/0.png
--- a/data/tilesets/secondary/pacifidlog/anim/water_currents/1.png
+++ b/data/tilesets/secondary/pacifidlog/anim/water_currents/1.png
--- a/data/tilesets/secondary/pacifidlog/anim/water_currents/2.png
+++ b/data/tilesets/secondary/pacifidlog/anim/water_currents/2.png
--- a/data/tilesets/secondary/pacifidlog/anim/water_currents/3.png
+++ b/data/tilesets/secondary/pacifidlog/anim/water_currents/3.png
--- a/data/tilesets/secondary/pacifidlog/anim/water_currents/4.png
+++ b/data/tilesets/secondary/pacifidlog/anim/water_currents/4.png
--- a/data/tilesets/secondary/pacifidlog/anim/water_currents/5.png
+++ b/data/tilesets/secondary/pacifidlog/anim/water_currents/5.png
--- a/data/tilesets/secondary/pacifidlog/anim/water_currents/6.png
+++ b/data/tilesets/secondary/pacifidlog/anim/water_currents/6.png
--- a/data/tilesets/secondary/pacifidlog/anim/water_currents/7.png
+++ b/data/tilesets/secondary/pacifidlog/anim/water_currents/7.png
--- a/data/tilesets/secondary/rustboro/anim/fountain/0.png
+++ b/data/tilesets/secondary/rustboro/anim/fountain/0.png
--- a/Show more
+++ b/Show more