Update/battle engine to f777f07f9de1e3095527897225d4e93cb0fce02b (#102)

Makefile

@@ -29,8 +29,10 @@ COMPARE     ?= 0
 TEST         ?= 0
 # Enables -fanalyzer C flag to analyze in depth potential UBs
 ANALYZE      ?= 0
-# Count unused warnings as errors. Used by RH-Hideout's repo
+# Count unused warnings as errors. Used by cawtds's repo
 UNUSED_ERROR ?= 0
+# Count deprecated warnings as errors. Used by cawtds's repo
+DEPRECATED_ERROR ?= 0
 # Adds -Og and -g flags, which optimize the build for debugging and include debug info respectively
 DEBUG        ?= 0
 # Adds -flto flag, which increases link time but results in a more efficient binary (especially in audio processing)
@@ -177,6 +179,13 @@ ifeq ($(UNUSED_ERROR),0)
     override CFLAGS += -Wno-error=unused-variable -Wno-error=unused-const-variable -Wno-error=unused-parameter -Wno-error=unused-function -Wno-error=unused-but-set-parameter -Wno-error=unused-but-set-variable -Wno-error=unused-value -Wno-error=unused-local-typedefs
   endif
 endif
+
+ifeq ($(DEPRECATED_ERROR),0)
+  ifneq ($(GITHUB_REPOSITORY_OWNER),cawtds)
+    override CFLAGS += -Wno-error=deprecated-declarations
+  endif
+endif
+
 LIBPATH := -L "$(dir $(shell $(PATH_ARMCC) -mthumb -print-file-name=libgcc.a))" -L "$(dir $(shell $(PATH_ARMCC) -mthumb -print-file-name=libnosys.a))" -L "$(dir $(shell $(PATH_ARMCC) -mthumb -print-file-name=libc.a))"
 LIB := $(LIBPATH) -lc -lnosys -lgcc -L../../libagbsyscall -lagbsyscall
 # Enable debug info if set
@@ -225,7 +234,9 @@ endif
 LEARNSET_HELPERS_DIR := $(TOOLS_DIR)/learnset_helpers
 LEARNSET_HELPERS_DATA_DIR := $(LEARNSET_HELPERS_DIR)/porymoves_files
 LEARNSET_HELPERS_BUILD_DIR := $(LEARNSET_HELPERS_DIR)/build
-ALL_LEARNABLES_JSON := $(LEARNSET_HELPERS_BUILD_DIR)/all_learnables.json
+ALL_LEARNABLES_JSON := $(DATA_SRC_SUBDIR)/pokemon/all_learnables.json
+ALL_TUTORS_JSON := $(LEARNSET_HELPERS_BUILD_DIR)/all_tutors.json
+ALL_TEACHING_TYPES_JSON := $(LEARNSET_HELPERS_BUILD_DIR)/all_teaching_types.json
 
 # wild_encounters.h is generated by a Python script
 WILD_ENCOUNTERS_TOOL_DIR := $(TOOLS_DIR)/wild_encounters
@@ -240,10 +251,6 @@ $(DATA_SRC_SUBDIR)/wild_encounters.h: $(DATA_SRC_SUBDIR)/wild_encounters.json $(
 $(INCLUDE_DIRS)/constants/script_commands.h: $(MISC_TOOL_DIR)/make_scr_cmd_constants.py $(DATA_ASM_SUBDIR)/script_cmd_table.inc
 	python3  $(MISC_TOOL_DIR)/make_scr_cmd_constants.py
 
-$(C_BUILDDIR)/wild_encounter.o: c_dep += $(DATA_SRC_SUBDIR)/wild_encounters.h
-$(C_BUILDDIR)/trainer_see.o: c_dep += $(INCLUDE_DIRS)/constants/script_commands.h
-$(C_BUILDDIR)/vs_seeker.o: c_dep += $(INCLUDE_DIRS)/constants/script_commands.h
-
 PERL := perl
 SHA1 := $(shell { command -v sha1sum || command -v shasum; } 2>/dev/null) -c
 
@@ -256,7 +263,7 @@ MAKEFLAGS += --no-print-directory
 # Delete files that weren't built properly
 .DELETE_ON_ERROR:
 
-RULES_NO_SCAN += libagbsyscall clean clean-assets tidy tidymodern tidycheck tidyrelease generated clean-generated
+RULES_NO_SCAN += libagbsyscall clean clean-assets tidy tidymodern tidycheck tidyrelease generated clean-generated clean-teachables clean-teachables_intermediates
 .PHONY: all rom agbcc modern compare check debug release
 .PHONY: $(RULES_NO_SCAN)
 
@@ -429,11 +436,19 @@ generated: $(AUTO_GEN_TARGETS)
 %.smol:     %      ; $(SMOL) -w $< $@
 %.rl:       %      ; $(GFX) $< $@
 
-clean-generated:
+clean-teachables_intermediates:
+	rm -f $(DATA_SRC_SUBDIR)/tutor_moves.h
+	rm -f $(DATA_SRC_SUBDIR)/pokemon/teachable_learnsets.h
+	@rm -Rf $(LEARNSET_HELPERS_BUILD_DIR)
+	@echo "rm -Rf <LEARNSET_HELPERS_BUILD_DIR>"
+
+clean-generated: clean-teachables_intermediates
 	@rm -f $(AUTO_GEN_TARGETS)
 	@echo "rm -f <AUTO_GEN_TARGETS>"
-	@rm -f $(ALL_LEARNABLES_JSON)
-	@echo "rm -f <ALL_LEARNABLES_JSON>"
+
+clean-teachables: clean-teachables_intermediates
+	rm -f $(ALL_LEARNABLES_JSON)
+	@touch $(C_SUBDIR)/pokemon.c
 
 $(C_BUILDDIR)/librfu_intr.o: CFLAGS := -mthumb-interwork -O2 -mabi=apcs-gnu -mtune=arm7tdmi -march=armv4t -fno-toplevel-reorder -Wno-pointer-to-int-cast
 $(C_BUILDDIR)/berry_crush.o: override CFLAGS += -Wno-address-of-packed-member
@@ -449,6 +464,7 @@ $(TEST_BUILDDIR)/%.o: CFLAGS := -mthumb -mthumb-interwork -O2 -mabi=apcs-gnu -mt
 
 # Dependency rules (for the *.c & *.s sources to .o files)
 # Have to be explicit or else missing files won't be reported.
+$(C_BUILDDIR)/pokemon.o: $(C_SUBDIR)/pokemon.c $(DATA_SRC_SUBDIR)/pokemon/teachable_learnsets.h
 
 # As a side effect, they're evaluated immediately instead of when the rule is invoked.
 # It doesn't look like $(shell) can be deferred so there might not be a better way (Icedude_907: there is soon).
@@ -468,6 +484,7 @@ $(C_BUILDDIR)/%.d: $(C_SUBDIR)/%.c
 	$(SCANINC) -M $@ $(INCLUDE_SCANINC_ARGS) -I tools/agbcc/include $<
 
 ifneq ($(NODEP),1)
+-include $(ALL_TUTORS_JSON), $(ALL_TEACHING_TYPES_JSON),
 -include $(addprefix $(OBJ_DIR)/,$(C_SRCS:.c=.d))
 endif
 
@@ -523,16 +540,25 @@ $(OBJ_DIR)/sym_common.ld: sym_common.txt $(C_OBJS) $(wildcard common_syms/*.txt)
 $(OBJ_DIR)/sym_ewram.ld: sym_ewram.txt
 	$(RAMSCRGEN) ewram_data $< ENGLISH > $@
 
-TEACHABLE_DEPS := $(ALL_LEARNABLES_JSON) $(shell find data/ -type f -name '*.inc') $(INCLUDE_DIRS)/constants/tms_hms.h $(INCLUDE_DIRS)/config/pokemon.h $(C_SUBDIR)/pokemon.c
+TEACHABLE_DEPS := $(ALL_LEARNABLES_JSON) $(INCLUDE_DIRS)/constants/tms_hms.h $(INCLUDE_DIRS)/config/pokemon.h  $(DATA_SRC_SUBDIR)/pokemon/special_movesets.json $(INCLUDE_DIRS)/config/pokedex_plus_hgss.h $(LEARNSET_HELPERS_DIR)/make_teachables.py
 
 $(LEARNSET_HELPERS_BUILD_DIR):
 	@mkdir -p $@
 
-$(ALL_LEARNABLES_JSON): $(wildcard $(LEARNSET_HELPERS_DATA_DIR)/*.json) | $(LEARNSET_HELPERS_BUILD_DIR)
+$(ALL_LEARNABLES_JSON):  | $(wildcard $(LEARNSET_HELPERS_DATA_DIR)/*.json)
 	python3 $(LEARNSET_HELPERS_DIR)/make_learnables.py $(LEARNSET_HELPERS_DATA_DIR) $@
 
-$(DATA_SRC_SUBDIR)/pokemon/teachable_learnsets.h: $(TEACHABLE_DEPS)
-	python3 $(LEARNSET_HELPERS_DIR)/make_teachables.py $<
+$(ALL_TUTORS_JSON): $(shell find data/ -type f -name '*.inc')  $(LEARNSET_HELPERS_DIR)/make_tutors.py | $(LEARNSET_HELPERS_BUILD_DIR)
+	python3 $(LEARNSET_HELPERS_DIR)/make_tutors.py $@
+
+$(ALL_TEACHING_TYPES_JSON): $(wildcard $(DATA_SRC_SUBDIR)/pokemon/species_info/*_families.h)  $(LEARNSET_HELPERS_DIR)/make_teaching_types.py | $(LEARNSET_HELPERS_BUILD_DIR)
+	python3 $(LEARNSET_HELPERS_DIR)/make_teaching_types.py $@
+
+$(DATA_SRC_SUBDIR)/pokemon/teachable_learnsets.h: $(TEACHABLE_DEPS) | $(ALL_TUTORS_JSON) $(ALL_TEACHING_TYPES_JSON)
+	python3 $(LEARNSET_HELPERS_DIR)/make_teachables.py $(LEARNSET_HELPERS_BUILD_DIR)
+
+$(DATA_SRC_SUBDIR)/tutor_moves.h: | $(ALL_TUTORS_JSON)
+	python3 $(LEARNSET_HELPERS_DIR)/make_teachables.py $(LEARNSET_HELPERS_BUILD_DIR)
 
 # Linker script
 LD_SCRIPT := ld_script_modern.ld

constants/constants.inc

@@ -1,3 +1,2 @@
 	.include "constants/gba_constants.inc"
 	.include "constants/global.inc"
-	.include "constants/tms_hms.inc"

constants/tms_hms.inc

@@ -1,22 +0,0 @@
-#ifndef GUARD_CONSTANTS_TMS_HMS_INC
-#define GUARD_CONSTANTS_TMS_HMS_INC
-
-#include "constants/tms_hms.h"
-
-/* Expands to:
-* enum_start ITEM_TM01
-* enum ITEM_TM_FOCUS_PUNCH
-* ...
-* enum_start ITEM_HM01
-* enum ITEM_HM_CUT
-* ... */
-#define EQUIV_TM(id) enum ITEM_TM_ ## id;
-#define EQUIV_HM(id) enum ITEM_HM_ ## id;
-	enum_start ITEM_TM01
-FOREACH_TM(EQUIV_TM)
-	enum_start ITEM_HM01
-FOREACH_HM(EQUIV_HM)
-#undef EQUIV_TM
-#undef EQUIV_HM
-
-#endif @ GUARD_CONSTANTS_TMS_HMS_INC

data/battle_anim_scripts.s

@@ -29344,6 +29344,16 @@ gBattleAnimGeneral_Swamp::
 	blendoff
 	end
 
+gBattleAnimGeneral_SwapToSubstitute::
+	createvisualtask AnimTask_SwapMonSpriteToFromSubstitute, 2, FALSE
+	waitforvisualfinish
+	end
+
+gBattleAnimGeneral_SwapFromSubstitute::
+	createvisualtask AnimTask_SwapMonSpriteToFromSubstitute, 2, TRUE
+	waitforvisualfinish
+	end
+
 SnatchMoveTrySwapFromSubstitute:
 	createvisualtask AnimTask_IsAttackerBehindSubstitute, 2
 	jumprettrue SnatchMoveSwapSubstituteForMon

data/battle_scripts_2.s

@@ -1,4 +1,5 @@
 #include "config/battle.h"
+#include "constants/global.h"
 #include "constants/battle.h"
 #include "constants/battle_script_commands.h"
 #include "constants/battle_anim.h"
@@ -111,21 +112,31 @@ BattleScript_ItemRestoreHP_Party::
 	return
 
 BattleScript_ItemRestoreHP_SendOutRevivedBattler:
+	switchhandleorder BS_SCRIPTING, 0
+	getswitchedmondata BS_SCRIPTING
+	switchindataupdate BS_SCRIPTING
+	trytoclearprimalweather
 	switchinanim BS_SCRIPTING, FALSE, FALSE
 	waitstate
 	switchineffects BS_SCRIPTING
+	switchinevents
 	end
 
 BattleScript_ItemCureStatus::
 	call BattleScript_UseItemMessage
 BattleScript_ItemCureStatusAfterItemMsg:
-	itemcurestatus BattleScript_ItemCureStatusEnd
-	updatestatusicon BS_SCRIPTING
+	itemcurestatus BattleScript_ItemCureStatusEnd, BattleScript_CureStatus_Battler
 	printstring STRINGID_ITEMCUREDSPECIESSTATUS
 	waitmessage B_WAIT_TIME_LONG
 BattleScript_ItemCureStatusEnd:
 	end
 
+BattleScript_CureStatus_Battler::
+	updatestatusicon BS_SCRIPTING
+	printstring STRINGID_ITEMCUREDSPECIESSTATUS
+	waitmessage B_WAIT_TIME_LONG
+	end
+
 BattleScript_ItemHealAndCureStatus::
 	call BattleScript_UseItemMessage
 	itemrestorehp BattleScript_ItemCureStatusAfterItemMsg, BattleScript_ItemHealAndCureStatus_Battler
@@ -175,6 +186,7 @@ BattleScript_ItemSetMist::
 
 BattleScript_ItemSetFocusEnergy::
 	call BattleScript_UseItemMessage
+	itemincreasestat
 	jumpifvolatile BS_ATTACKER, VOLATILE_DRAGON_CHEER, BattleScript_ButItFailed
 	jumpifvolatile BS_ATTACKER, VOLATILE_FOCUS_ENERGY, BattleScript_ButItFailed
 	setfocusenergy BS_ATTACKER
@@ -194,11 +206,12 @@ BattleScript_ItemRestorePP::
 
 BattleScript_ItemIncreaseAllStats::
 	call BattleScript_UseItemMessage
+	itemincreasestat
 	call BattleScript_AllStatsUp
 	end
 
 BattleScript_BallThrow::
-	jumpifbattletype BATTLE_TYPE_OLD_MAN_TUTORIAL, BattleScript_OldManThrowBall
+	jumpifbattletype BATTLE_TYPE_CATCH_TUTORIAL, BattleScript_OldManThrowBall
 	jumpifbattletype BATTLE_TYPE_POKEDUDE, BattleScript_PokedudeThrowBall
 	printstring STRINGID_PLAYERUSEDITEM
 	handleballthrow
@@ -304,6 +317,19 @@ BattleScript_TrainerBSlideMsgEnd2::
 	call BattleScript_TrainerBSlideMsgRet
 	end2
 
+BattleScript_TrainerPartnerSlideMsgRet::
+	trainerslidein BS_PLAYER2
+	handletrainerslidemsg BS_SCRIPTING, PRINT_SLIDE_MESSAGE
+	waitstate
+	trainerslideout BS_PLAYER2
+	waitstate
+	handletrainerslidemsg BS_SCRIPTING, RESTORE_BATTLER_SLIDE_CONTROL
+	return
+
+BattleScript_TrainerPartnerSlideMsgEnd2::
+	call BattleScript_TrainerPartnerSlideMsgRet
+	end2
+
 BattleScript_GhostBallDodge::
 	waitmessage B_WAIT_TIME_LONG
 	printstring STRINGID_ITDODGEDBALL

graphics/items/icon_palettes/premier_ball.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+180 180 180
+49 49 49
+74 82 82
+123 123 131
+164 164 197
+222 205 246
+255 255 255
+156 74 57
+180 82 57
+222 90 57
+255 148 57
+255 213 57
+230 180 106
+255 255 148
+213 156 49
+255 238 82

graphics/pokemon/archeops/overworld_normal.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-16 48 104
-48 80 152
-187 76 72
-212 214 224
-240 200 96
 0 0 0
+255 255 255
+116 49 59
+173 69 77
+213 100 96
+128 87 54
+195 148 76
+240 200 96
+16 48 104
+52 84 181
 48 128 240
-187 76 72
+15 70 74
+29 111 101
 16 160 144
-16 48 104
-66 75 64
-240 200 96
-0 0 0
-0 0 0
-0 0 0
+255 0 0

graphics/pokemon/archeops/overworld_shiny.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-8 64 48
-8 111 95
-216 101 35
-220 220 240
-248 176 96
-0 1 0
-16 160 144
-158 72 47
-48 128 240
-48 80 152
-113 61 35
-241 200 100
-0 0 0
-0 0 0
 0 0 0
+255 255 255
+116 49 59
+173 69 77
+213 100 96
+128 66 54
+195 114 76
+240 159 96
+10 39 30
+47 115 103
+29 188 132
+32 68 123
+51 112 155
+32 135 211
+255 0 0

graphics/pokemon/basculin/white_striped/normal.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-72 80 80
-8 8 8
+240 240 240
 224 224 224
 160 160 160
+72 80 80
+0 0 0
+64 160 80
+40 112 48
+0 64 32
+64 80 80
 32 48 56
 16 16 16
-64 80 80
-120 168 168
-168 216 224
-64 160 80
-0 64 32
-40 112 48
-0 0 0
+211 235 233
+166 216 216
 0 0 0
 0 0 0

graphics/pokemon/basculin/white_striped/shiny.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
+240 240 240
+251 251 216
+186 186 148
 72 80 80
-8 8 8
-224 224 224
-160 160 160
+0 0 0
+120 168 56
+80 112 40
+40 64 0
+64 80 80
 32 48 56
 16 16 16
-64 80 80
-120 168 168
-168 216 224
-120 168 56
-40 64 0
-80 112 40
-0 0 0
+211 235 233
+166 216 216
 0 0 0
 0 0 0

graphics/pokemon/castform/normal_gba.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+197 197 148
+90 82 82
+205 189 189
+230 222 222
+246 246 238
+0 0 0
+255 255 255
+222 222 246
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+148 148 148
+74 82 74
+255 255 255
+24 24 24

graphics/pokemon/castform/rainy/normal_gba.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+197 197 148
+57 65 90
+98 115 189
+115 139 213
+148 180 205
+0 0 0
+205 238 246
+180 197 222
+139 205 222
+131 180 197
+82 98 131
+197 197 197
+148 139 148
+90 90 82
+255 255 255
+24 24 24

graphics/pokemon/castform/rainy/shiny_gba.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+197 197 148
+57 65 90
+98 115 189
+115 139 213
+148 180 205
+0 0 0
+205 238 246
+180 197 222
+139 205 222
+131 180 197
+82 98 131
+197 197 197
+148 139 148
+90 90 82
+255 255 255
+24 24 24

graphics/pokemon/castform/shiny_gba.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+197 197 148
+98 90 90
+205 164 189
+230 197 222
+255 222 255
+0 0 0
+255 246 65
+230 180 32
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+148 148 148
+74 82 74
+255 255 255
+24 24 24

graphics/pokemon/castform/snowy/normal_gba.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+197 197 148
+41 82 57
+123 82 189
+139 115 213
+148 180 205
+0 0 0
+197 180 255
+156 156 197
+139 205 172
+115 164 139
+98 74 115
+189 230 230
+82 115 106
+74 82 74
+255 255 255
+24 24 24

graphics/pokemon/castform/snowy/shiny_gba.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+197 197 148
+41 82 57
+123 82 189
+139 115 213
+148 180 205
+0 0 0
+197 180 255
+156 156 197
+139 205 172
+115 164 139
+98 74 115
+189 230 230
+82 115 106
+74 82 74
+255 255 255
+24 24 24

graphics/pokemon/castform/sunny/normal_gba.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+197 197 148
+98 49 41
+205 90 74
+238 123 74
+255 156 65
+0 0 0
+255 246 106
+230 213 106
+255 156 98
+213 131 74
+148 90 65
+213 205 230
+0 0 0
+90 90 82
+255 255 255
+24 24 24