diff --git a/Makefile b/Makefile index 9fa039d..6759c9f 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.PHONY: all tools clean tidy tpp +.PHONY: all tools clean tidy .SUFFIXES: .SECONDEXPANSION: @@ -17,8 +17,6 @@ endif COMPILE_FLAGS := all: $(ROM) -tpp: COMPILE_FLAGS += -D _TPP -tpp: all ifeq (,$(filter tools clean tidy,$(MAKECMDGOALS))) Makefile: tools diff --git a/engine/pinball_game/evolution_mode.asm b/engine/pinball_game/evolution_mode.asm index c9d6b30..ac2fc34 100644 --- a/engine/pinball_game/evolution_mode.asm +++ b/engine/pinball_game/evolution_mode.asm @@ -115,16 +115,9 @@ ShowStartEvolutionModeText: IsBreedingAllowed: ; Sets carry flag if not allowed. -IF DEF(_TPP) ; Allow breeding on every stage. and a - ret -ELSE -; Don't breed on Red/Blue stages - ld a, [wCurrentStage] - cp STAGE_BLUE_FIELD_BOTTOM + 1 ret -ENDC InitEvolutionSelectionMenu: ; Initializes the list menu, which the player uses to select which pokemon to evolve.