Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/pokemonFlags

# Conflicts:
#	src/pokemon.c

README.md

@@ -22,12 +22,16 @@ The Pokeemerald Expansion is a collection of feature branches that can be integr
 
 Certain mechanics, moves, abilities and species sprites are missing. For more information, see [the project's milestones](https://github.com/rh-hideout/pokeemerald-expansion/milestones).
 
+### [Documentation on features can be found here](https://github.com/rh-hideout/pokeemerald-expansion/wiki)
+
 ## Who maintains the project?
 
 The project was originally started by DizzyEgg alongside other contributors.
 
 The project has now gotten larger and DizzyEgg is now maintaining the project as part of the ROM Hacking Hideout community. Some members of this community are taking on larger roles to help maintain the project.
 
+### Please consider crediting the entire [list of contributors](https://github.com/rh-hideout/pokeemerald-expansion/wiki/Credits) in your project, as they have all worked hard to develop this project :)
+
 ## Can I contribute even if I'm not a member of ROM Hacking Hideout?
 
 Yes! Contributions are welcome via Pull Requests and they will be reviewed by maintainers. Don't feel discouraged if we take a bit to review your PR, we'll get to it.

asm/macros/battle_script.inc

@@ -1186,11 +1186,11 @@
 	.byte 0xe5
 	.endm
 
-	.macro docastformchangeanimation
+	.macro doweatherformchangeanimation
 	.byte 0xe6
 	.endm
 
-	.macro trycastformdatachange
+	.macro tryweatherformdatachange
 	.byte 0xe7
 	.endm
 

data/battle_anim_scripts.s

@@ -1,3 +1,4 @@
+#include "config.h"
 #include "constants/battle.h"
 #include "constants/battle_anim.h"
 #include "constants/rgb.h"
@@ -858,7 +859,7 @@ gBattleAnims_StatusConditions::
 
 	.align 2
 gBattleAnims_General::
-	.4byte General_CastformChange           @ B_ANIM_CASTFORM_CHANGE
+	.4byte General_WeatherFormChange        @ B_ANIM_CASTFORM_CHANGE
 	.4byte General_StatsChange              @ B_ANIM_STATS_CHANGE
 	.4byte General_SubstituteFade           @ B_ANIM_SUBSTITUTE_FADE
 	.4byte General_SubstituteAppear         @ B_ANIM_SUBSTITUTE_APPEAR
@@ -23570,26 +23571,25 @@ Move_SECRET_POWER:
 	jumpargeq 0, BATTLE_TERRAIN_PUDDLE,         Move_MUD_SHOT
 	jumpargeq 0, BATTLE_TERRAIN_MARSH,          Move_MUD_SHOT
 	jumpargeq 0, BATTLE_TERRAIN_SWAMP,          Move_MUD_SHOT
-.if B_SECRET_POWER_ANIMATION >= GEN_7
-	jumpargeq 0, BATTLE_TERRAIN_SNOW,           Move_ICE_SHARD
-.else
-	jumpargeq 0, BATTLE_TERRAIN_SNOW,           Move_AVALANCHE
-.endif
 	jumpargeq 0, BATTLE_TERRAIN_ICE,            Move_ICE_SHARD
 	jumpargeq 0, BATTLE_TERRAIN_VOLCANO,        Move_INCINERATE
 	jumpargeq 0, BATTLE_TERRAIN_DISTORTION_WORLD, Move_POUND
 	jumpargeq 0, BATTLE_TERRAIN_SPACE,          Move_SWIFT
 	jumpargeq 0, BATTLE_TERRAIN_ULTRA_SPACE,    Move_PSYWAVE
 .if B_SECRET_POWER_ANIMATION >= GEN_7
+	jumpargeq 0, BATTLE_TERRAIN_SNOW,           Move_ICE_SHARD
 	jumpargeq 0, BATTLE_TERRAIN_BUILDING,       Move_SPIT_UP
 	goto Move_SPIT_UP
-.elseif B_SECRET_POWER_ANIMATION == GEN_6
+.elseif B_SECRET_POWER_ANIMATION >= GEN_6
+	jumpargeq 0, BATTLE_TERRAIN_SNOW,           Move_AVALANCHE
 	jumpargeq 0, BATTLE_TERRAIN_BUILDING,       Move_BODY_SLAM
 	goto Move_BODY_SLAM
-.elseif B_SECRET_POWER_ANIMATION == GEN_5 || B_SECRET_POWER_ANIMATION == GEN_4
+.elseif B_SECRET_POWER_ANIMATION >= GEN_4
+	jumpargeq 0, BATTLE_TERRAIN_SNOW,           Move_AVALANCHE
 	jumpargeq 0, BATTLE_TERRAIN_BUILDING,       Move_BODY_SLAM
 	goto Move_MUD_SLAP
 .else
+	jumpargeq 0, BATTLE_TERRAIN_SNOW,           Move_AVALANCHE
 	jumpargeq 0, BATTLE_TERRAIN_BUILDING,       Move_STRENGTH
 	goto Move_SLAM
 .endif
@@ -24247,11 +24247,11 @@ Status_Nightmare:
 Status_Powder:
 	end
 
-General_CastformChange:
+General_WeatherFormChange:
 	createvisualtask AnimTask_IsMonInvisible, 2
-	jumpreteq TRUE, CastformChangeSkipAnim
+	jumpreteq TRUE, WeatherFormChangeSkipAnim
-	goto CastformChangeContinue
+	goto WeatherFormChangeContinue
-CastformChangeContinue:
+WeatherFormChangeContinue:
 	monbg ANIM_ATTACKER
 	playsewithpan SE_M_TELEPORT, SOUND_PAN_ATTACKER
 	waitplaysewithpan SE_M_MINIMIZE, SOUND_PAN_ATTACKER, 48
@@ -24259,7 +24259,7 @@ CastformChangeContinue:
 	waitforvisualfinish
 	clearmonbg ANIM_ATTACKER
 	end
-CastformChangeSkipAnim:
+WeatherFormChangeSkipAnim:
 	createvisualtask AnimTask_CastformGfxDataChange, 2, 1
 	end
 

data/battle_scripts_1.s

@@ -1,3 +1,4 @@
+#include "config.h"
 #include "constants/global.h"
 #include "constants/battle.h"
 #include "constants/pokemon.h"
@@ -6566,11 +6567,9 @@ BattleScript_LearnMoveReturn::
 BattleScript_RainContinuesOrEnds::
 	printfromtable gRainContinuesStringIds
 	waitmessage B_WAIT_TIME_LONG
-	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_RAIN_STOPPED, BattleScript_RainEnds
+	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_RAIN_STOPPED, BattleScript_RainContinuesOrEndsEnd
 	playanimation BS_ATTACKER, B_ANIM_RAIN_CONTINUES
-	end2
+BattleScript_RainContinuesOrEndsEnd::
-BattleScript_RainEnds::
-	call BattleScript_WeatherFormChanges
 	end2
 
 BattleScript_DamagingWeatherContinues::
@@ -6609,7 +6608,6 @@ BattleScript_DamagingWeatherContinuesEnd::
 BattleScript_SandStormHailEnds::
 	printfromtable gSandStormHailEndStringIds
 	waitmessage B_WAIT_TIME_LONG
-	call BattleScript_WeatherFormChanges
 	end2
 
 BattleScript_SunlightContinues::
@@ -6621,7 +6619,6 @@ BattleScript_SunlightContinues::
 BattleScript_SunlightFaded::
 	printstring STRINGID_SUNLIGHTFADED
 	waitmessage B_WAIT_TIME_LONG
-	call BattleScript_WeatherFormChanges
 	end2
 
 BattleScript_OverworldWeatherStarts::
@@ -8227,19 +8224,30 @@ BattleScript_ShedSkinActivates::
 BattleScript_WeatherFormChanges::
 	setbyte sBATTLER, 0
 BattleScript_WeatherFormChangesLoop::
-	trycastformdatachange
+	tryweatherformdatachange
 	addbyte sBATTLER, 1
 	jumpifbytenotequal sBATTLER, gBattlersCount, BattleScript_WeatherFormChangesLoop
 	return
 
-BattleScript_CastformChange::
+BattleScript_WeatherFormChange::
-	call BattleScript_DoCastformChange
+	call BattleScript_DoWeatherFormChange
 	end3
 
-BattleScript_DoCastformChange::
+BattleScript_DoWeatherFormChange::
 	copybyte gBattlerAbility, sBATTLER
+.if B_WEATHER_FORMS >= GEN_5
+	jumpifspecies BS_SCRIPTING, SPECIES_CASTFORM, BattleScript_DoWeatherFormChange_ForecastCheck
+BattleScript_DoWeatherFormChange_FlowerGiftCheck:
+	jumpifability BS_SCRIPTING, ABILITY_FLOWER_GIFT, BattleScript_DoWeatherFormChange_PopUp
+	goto BattleScript_DoWeatherFormChange_AfterPopUp
+.endif
+BattleScript_DoWeatherFormChange_ForecastCheck:
+	jumpifability BS_SCRIPTING, ABILITY_FORECAST, BattleScript_DoWeatherFormChange_PopUp
+	goto BattleScript_DoWeatherFormChange_AfterPopUp
+BattleScript_DoWeatherFormChange_PopUp:
 	call BattleScript_AbilityPopUp
-	docastformchangeanimation
+BattleScript_DoWeatherFormChange_AfterPopUp:
+	doweatherformchangeanimation
 	waitstate
 	printstring STRINGID_PKMNTRANSFORMED
 	waitmessage B_WAIT_TIME_LONG

data/contest_ai_scripts.s

@@ -435,11 +435,15 @@ AI_CGM_BetterWhenAudienceExcited:
 AI_CGM_BetterWhenAudienceExcited_1stUp:
 	@ BUG: Should be if_appeal_num_eq 0
 	@ 1st up on 1st appeal excitement will always be 0
-	if_appeal_num_not_eq 0, AI_CGM_BetterWhenAudienceExcited_Not1stAppeal
+.ifdef BUGFIX
+	if_appeal_num_eq 0, AI_CGM_BetterWhenAudienceExcited_1stAppeal
+.else
+	if_appeal_num_not_eq 0, AI_CGM_BetterWhenAudienceExcited_1stAppeal
+.endif
 	if_excitement_eq 4, AI_CGM_BetterWhenAudienceExcited_1AwayFromMax
 	if_excitement_eq 3, AI_CGM_BetterWhenAudienceExcited_2AwayFromMax
 	end
-AI_CGM_BetterWhenAudienceExcited_Not1stAppeal:
+AI_CGM_BetterWhenAudienceExcited_1stAppeal:
 	if_random_less_than 125, AI_CGM_End
 	score -15
 	end
@@ -542,7 +546,11 @@ AI_CGM_TargetMonWithJudgesAttention:
 	end
 AI_CGM_TargetMonWithJudgesAttention_CheckMon1:
 	if_cannot_participate MON_1, AI_CGM_TargetMonWithJudgesAttention_CheckMon2
+.ifdef BUGFIX
+	if_not_used_combo_starter MON_1, AI_CGM_TargetMonWithJudgesAttention_CheckMon2
+.else
 	if_used_combo_starter MON_1, AI_CGM_TargetMonWithJudgesAttention_CheckMon2
+.endif
 	if_random_less_than 125, AI_CGM_TargetMonWithJudgesAttention_CheckMon2
 	score +2
 	if_not_completed_combo MON_1, AI_CGM_TargetMonWithJudgesAttention_CheckMon2
@@ -551,7 +559,11 @@ AI_CGM_TargetMonWithJudgesAttention_CheckMon1:
 AI_CGM_TargetMonWithJudgesAttention_CheckMon2:
 	if_user_order_eq MON_2, AI_CGM_End
 	if_cannot_participate MON_2, AI_CGM_TargetMonWithJudgesAttention_CheckMon3
+.ifdef BUGFIX
+	if_not_used_combo_starter MON_2, AI_CGM_TargetMonWithJudgesAttention_CheckMon3
+.else
 	if_used_combo_starter MON_2, AI_CGM_TargetMonWithJudgesAttention_CheckMon3
+.endif
 	if_random_less_than 125, AI_CGM_TargetMonWithJudgesAttention_CheckMon3
 	score +2
 	if_not_completed_combo MON_2, AI_CGM_TargetMonWithJudgesAttention_CheckMon3
@@ -560,7 +572,11 @@ AI_CGM_TargetMonWithJudgesAttention_CheckMon2:
 AI_CGM_TargetMonWithJudgesAttention_CheckMon3:
 	if_user_order_eq MON_3, AI_CGM_End
 	if_cannot_participate MON_3, AI_CGM_End
+.ifdef BUGFIX
+	if_not_used_combo_starter MON_3, AI_CGM_End
+.else
 	if_used_combo_starter MON_3, AI_CGM_End
+.endif
 	if_random_less_than 125, AI_CGM_End
 	score +2
 	if_not_completed_combo MON_3, AI_CGM_End

data/event_scripts.s

@@ -577,6 +577,8 @@ gStdScripts_End::
 	.include "data/scripts/new_game.inc"
 	.include "data/scripts/hall_of_fame.inc"
 
+	.include "data/scripts/debug.inc"
+
 EventScript_WhiteOut::
 	call EverGrandeCity_HallOfFame_EventScript_ResetEliteFour
 	goto EventScript_ResetMrBriney

data/maps/AbandonedShip_HiddenFloorRooms/map.json

@@ -51,7 +51,7 @@
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "AbandonedShip_HiddenFloorRooms_EventScript_ItemTM18",
-      "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_18"
+      "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM18"
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",

data/maps/AbandonedShip_Room_B1F/map.json

@@ -25,7 +25,7 @@
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "AbandonedShip_Room_B1F_EventScript_ItemTM13",
-      "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM_13"
+      "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM13"
     }
   ],
   "warp_events": [

data/maps/MeteorFalls_1F_1R/map.json

@@ -25,7 +25,7 @@
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "MeteorFalls_1F_1R_EventScript_ItemTM23",
-      "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_TM_23"
+      "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_TM23"
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",

data/maps/MeteorFalls_B1F_2R/map.json

@@ -25,7 +25,7 @@
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "MeteorFalls_B1F_2R_EventScript_ItemTM02",
-      "flag": "FLAG_ITEM_METEOR_FALLS_B1F_2R_TM_02"
+      "flag": "FLAG_ITEM_METEOR_FALLS_B1F_2R_TM02"
     }
   ],
   "warp_events": [

data/maps/MtPyre_6F/map.json

@@ -38,7 +38,7 @@
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "MtPyre_6F_EventScript_ItemTM30",
-      "flag": "FLAG_ITEM_MT_PYRE_6F_TM_30"
+      "flag": "FLAG_ITEM_MT_PYRE_6F_TM30"
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M",

data/maps/MtPyre_Exterior/map.json

@@ -38,7 +38,7 @@
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "MtPyre_Exterior_EventScript_ItemTM48",
-      "flag": "FLAG_ITEM_MT_PYRE_EXTERIOR_TM_48"
+      "flag": "FLAG_ITEM_MT_PYRE_EXTERIOR_TM48"
     }
   ],
   "warp_events": [

data/maps/Route111/map.json

@@ -262,7 +262,7 @@
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "Route111_EventScript_ItemTM37",
-      "flag": "FLAG_ITEM_ROUTE_111_TM_37"
+      "flag": "FLAG_ITEM_ROUTE_111_TM37"
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE",

data/maps/Route113/map.json

@@ -451,7 +451,7 @@
       "y": 5,
       "elevation": 3,
       "item": "ITEM_TM32",
-      "flag": "FLAG_HIDDEN_ITEM_ROUTE_113_TM_32"
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_113_TM32"
     },
     {
       "type": "hidden_item",

data/maps/Route115/map.json

@@ -166,7 +166,7 @@
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "Route115_EventScript_ItemTM01",
-      "flag": "FLAG_ITEM_ROUTE_115_TM_01"
+      "flag": "FLAG_ITEM_ROUTE_115_TM01"
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",

data/maps/SafariZone_Northwest/map.json

@@ -49,7 +49,7 @@
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "SafariZone_Northwest_EventScript_ItemTM22",
-      "flag": "FLAG_ITEM_SAFARI_ZONE_NORTH_WEST_TM_22"
+      "flag": "FLAG_ITEM_SAFARI_ZONE_NORTH_WEST_TM22"
     }
   ],
   "warp_events": [],

data/maps/ScorchedSlab/map.json

@@ -25,7 +25,7 @@
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "ScorchedSlab_EventScript_ItemTM11",
-      "flag": "FLAG_ITEM_SCORCHED_SLAB_TM_11"
+      "flag": "FLAG_ITEM_SCORCHED_SLAB_TM11"
     }
   ],
   "warp_events": [

data/maps/SeafloorCavern_Room9/map.json

@@ -90,7 +90,7 @@
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "SeafloorCavern_Room9_EventScript_ItemTM26",
-      "flag": "FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_TM_26"
+      "flag": "FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_TM26"
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_KYOGRE_ASLEEP",

data/maps/ShoalCave_LowTideIceRoom/map.json

@@ -25,7 +25,7 @@
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "ShoalCave_LowTideIceRoom_EventScript_ItemTM07",
-      "flag": "FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_TM_07"
+      "flag": "FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_TM07"
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",

data/maps/VictoryRoad_B1F/map.json

@@ -246,7 +246,7 @@
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "VictoryRoad_B1F_EventScript_ItemTM29",
-      "flag": "FLAG_ITEM_VICTORY_ROAD_B1F_TM_29"
+      "flag": "FLAG_ITEM_VICTORY_ROAD_B1F_TM29"
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",

data/scripts/debug.inc

@@ -0,0 +1,79 @@
+Debug_ShowFieldMessageStringVar4::
+	special ShowFieldMessageStringVar4
+	waitmessage
+	waitbuttonpress
+	releaseall
+	end
+
+Debug_CheatStart::
+	lockall
+	setflag FLAG_SYS_POKEMON_GET
+	setflag FLAG_RESCUED_BIRCH
+	setflag FLAG_HIDE_ROUTE_101_BIRCH_ZIGZAGOON_BATTLE
+	setflag FLAG_ADVENTURE_STARTED
+	clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH
+	setflag FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG
+	setvar VAR_BIRCH_LAB_STATE, 2
+	setvar VAR_ROUTE101_STATE, 3
+	givemon SPECIES_TREECKO, 20, ITEM_NONE
+	givemon SPECIES_TORCHIC, 20, ITEM_NONE
+	givemon SPECIES_MUDKIP, 20, ITEM_NONE
+	setflag FLAG_SYS_POKEDEX_GET
+	special SetUnlockedPokedexFlags
+	setflag FLAG_RECEIVED_POKEDEX_FROM_BIRCH
+	setvar VAR_CABLE_CLUB_TUTORIAL_STATE, 1
+	setflag FLAG_SYS_NATIONAL_DEX
+	special EnableNationalPokedex
+	setflag FLAG_RECEIVED_RUNNING_SHOES
+	setflag FLAG_SYS_B_DASH
+	setvar VAR_LITTLEROOT_TOWN_STATE, 4 @ 4: Received Running Shoes
+	setvar VAR_LITTLEROOT_INTRO_STATE, 7 @ 7: Told to go meet rival
+	setvar VAR_LITTLEROOT_HOUSES_STATE_BRENDAN, 2 @ 2: Met Rival's Mom (and is corresponding gender)
+	setvar VAR_LITTLEROOT_HOUSES_STATE_MAY, 2 @ 2: Met Rival's Mom (and is corresponding gender)
+	setvar VAR_LITTLEROOT_RIVAL_STATE, 4 @ 4: Received Pokedex
+	setflag FLAG_RECEIVED_BIKE
+	additem ITEM_ACRO_BIKE
+	setvar VAR_BRINEY_HOUSE_STATE, 1
+	setvar VAR_ROUTE116_STATE, 2
+	setflag FLAG_HIDE_ROUTE_116_MR_BRINEY
+	clearflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY
+	clearflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO
+	release
+	end
+
+Debug_FlagsNotSetMessage::
+	lockall
+	message Debug_FlagsNotSetMessage_Text
+	waitmessage
+	waitbuttonpress
+	releaseall
+	end
+
+Debug_FlagsNotSetMessage_Text:
+	.string "Feature unavailable!\n"
+	.string "Please define a usable flag in:\l"
+	.string "'include/constants/overworld{UNDERSCORE}config.h'!$"
+
+Debug_Script_1::
+	end
+
+Debug_Script_2::
+	end
+
+Debug_Script_3::
+	end
+
+Debug_Script_4::
+	end
+
+Debug_Script_5::
+	end
+
+Debug_Script_6::
+	end
+
+Debug_Script_7::
+	end
+
+Debug_Script_8::
+	end

gflib/sprite.c

@@ -103,7 +103,7 @@ typedef void (*AffineAnimCmdFunc)(u8 matrixNum, struct Sprite *);
 #define DUMMY_OAM_DATA                      \
 {                                           \
     .y = DISPLAY_HEIGHT,                    \
-    .affineMode = 0,                        \
+    .affineMode = ST_OAM_AFFINE_OFF,        \
     .objMode = 0,                           \
     .mosaic = FALSE,                        \
     .bpp = 0,                               \