Create build option for bugfixes

Makefile

@@ -1,11 +1,11 @@
 roms := \
-	pokecrystal.gbc \
-	pokecrystal11.gbc \
-	pokecrystal_au.gbc \
-	pokecrystal_eu.gbc \
-	pokecrystal_debug.gbc \
-	pokecrystal11_debug.gbc
-patches := pokecrystal11.patch
+    pokecrystal_plus.gbc \
+	pokecrystalplus_debug.gbc \
+	pokecrystalplus_au.gbc \
+	pokecrystalplus_eu.gbc \
+	pokecrystalplus_nofix.gbc
+patches := pokecrystalvc.patch \
+		   pokecrystalpink.patch
 
 rom_obj := \
 	audio.o \
@@ -26,14 +26,13 @@ rom_obj := \
 	lib/mobile/main.o \
 	lib/mobile/mail.o
 
-pokecrystal_obj         := $(rom_obj:.o=.o)
-pokecrystal11_obj       := $(rom_obj:.o=11.o)
-pokecrystal_au_obj      := $(rom_obj:.o=_au.o)
-pokecrystal_eu_obj      := $(rom_obj:.o=_eu.o)
-pokecrystal_debug_obj   := $(rom_obj:.o=_debug.o)
-pokecrystal11_debug_obj := $(rom_obj:.o=11_debug.o)
+pokecrystal_plus_obj    := $(rom_obj:.o=plus.o)
+pokecrystalplus_debug_obj := $(rom_obj:.o=plus_debug.o)
+pokecrystalplus_au_obj      := $(rom_obj:.o=_au.o)
+pokecrystalplus_eu_obj      := $(rom_obj:.o=_eu.o)
+pokecrystalplus_nofix_obj    := $(rom_obj:.o=nofix.o)
 pokecrystal11_vc_obj    := $(rom_obj:.o=11_vc.o)
-
+pokecrystal_pink_obj    := $(rom_obj:.o=pink.o)
 
 ### Build tools
 
@@ -50,22 +49,22 @@ RGBGFX  ?= $(RGBDS)rgbgfx
 RGBLINK ?= $(RGBDS)rgblink
 
 
-### Build targets
+### Build targets      
 
 .SUFFIXES:
-.PHONY: all crystal crystal11 crystal_au crystal_eu crystal_debug crystal11_debug clean tidy compare tools
+.PHONY: all plus debug au eu nofix vc clean tidy compare tools
 .SECONDEXPANSION:
 .PRECIOUS:
 .SECONDARY:
 
-all: crystal
-crystal:         pokecrystal.gbc
-crystal11:       pokecrystal11.gbc
-crystal_au:      pokecrystal_au.gbc
-crystal_eu:      pokecrystal_eu.gbc
-crystal_debug:   pokecrystal_debug.gbc
-crystal11_debug: pokecrystal11_debug.gbc
-crystal11_vc:    pokecrystal11.patch
+all: plus
+plus:            pokecrystal_plus.gbc
+debug: 	 		 pokecrystalplus_debug.gbc
+au:      		 pokecrystalplus_au.gbc
+eu:      		 pokecrystalplus_eu.gbc
+nofix:			 pokecrystalplus_nofix.gbc
+vc:				 pokecrystalvc.patch
+#pink:			 pokecrystalpink.patch
 
 clean: tidy
 	find gfx \
@@ -91,13 +90,13 @@ tidy:
 	      $(patches:.patch=_vc.sym) \
 	      $(patches:.patch=_vc.map) \
 	      $(patches:%.patch=vc/%.constants.sym) \
-	      $(pokecrystal_obj) \
-	      $(pokecrystal11_obj) \
-	      $(pokecrystal11_vc_obj) \
-	      $(pokecrystal_au_obj) \
-		  $(pokecrystal_eu_obj) \
-	      $(pokecrystal_debug_obj) \
-	      $(pokecrystal11_debug_obj) \
+          $(pokecrystal_plus_obj) \
+		  $(pokecrystalplus_debug_obj) \
+	      $(pokecrystalplus_au_obj) \
+		  $(pokecrystalplus_eu_obj) \
+		  $(pokecrystalplus_nofix_obj) \
+		  $(pokecrystal11_vc_obj) \
+		  $(pokecrystal_pink_obj) \
 	      rgbdscheck.o
 	$(MAKE) clean -C tools/
 
@@ -114,13 +113,13 @@ ifeq ($(DEBUG),1)
 RGBASMFLAGS += -E
 endif
 
-$(pokecrystal_obj):         RGBASMFLAGS +=
-$(pokecrystal11_obj):       RGBASMFLAGS += -D _CRYSTAL11
-$(pokecrystal_au_obj):      RGBASMFLAGS += -D _CRYSTAL11 -D _CRYSTAL_AU
-$(pokecrystal_eu_obj):      RGBASMFLAGS += -D _CRYSTAL11 -D _CRYSTAL_EU
-$(pokecrystal_debug_obj):   RGBASMFLAGS += -D _DEBUG
-$(pokecrystal11_debug_obj): RGBASMFLAGS += -D _CRYSTAL11 -D _DEBUG
-$(pokecrystal11_vc_obj):    RGBASMFLAGS += -D _CRYSTAL11 -D _CRYSTAL11_VC
+$(pokecrystal_plus_obj):    RGBASMFLAGS += -D _CRYSTALFIX -D _CRYSTAL11
+$(pokecrystalplus_debug_obj):RGBASMFLAGS += -D _CRYSTALFIX -D _CRYSTAL11 -D _DEBUG
+$(pokecrystalplus_au_obj):      RGBASMFLAGS += -D _CRYSTALFIX -D _CRYSTAL11 -D _CRYSTAL_AU
+$(pokecrystalplus_eu_obj):      RGBASMFLAGS += -D _CRYSTALFIX -D _CRYSTAL11 -D _CRYSTAL_EU
+$(pokecrystalplus_nofix_obj):	RGBASMFLAGS += -D _CRYSTAL11
+$(pokecrystal11_vc_obj):    RGBASMFLAGS += -D _CRYSTALFIX -D _CRYSTAL11 -D _CRYSTAL11_VC
+$(pokecrystal_pink_obj):    RGBASMFLAGS += -D _CRYSTALFIX -D _CRYSTAL11 -D _PINK
 
 %.patch: vc/%.constants.sym %_vc.gbc %.gbc vc/%.patch.template
 	tools/make_patch $*_vc.sym $^ $@
@@ -144,28 +143,27 @@ $1: $2 $$(shell tools/scan_includes $2) $(preinclude_deps) | rgbdscheck.o
 endef
 
 # Dependencies for shared objects objects
-$(foreach obj, $(pokecrystal_obj), $(eval $(call DEP,$(obj),$(obj:.o=.asm))))
-$(foreach obj, $(pokecrystal11_obj), $(eval $(call DEP,$(obj),$(obj:11.o=.asm))))
-$(foreach obj, $(pokecrystal_au_obj), $(eval $(call DEP,$(obj),$(obj:_au.o=.asm))))
-$(foreach obj, $(pokecrystal_eu_obj), $(eval $(call DEP,$(obj),$(obj:_eu.o=.asm))))
-$(foreach obj, $(pokecrystal_debug_obj), $(eval $(call DEP,$(obj),$(obj:_debug.o=.asm))))
-$(foreach obj, $(pokecrystal11_debug_obj), $(eval $(call DEP,$(obj),$(obj:11_debug.o=.asm))))
+$(foreach obj, $(pokecrystal_plus_obj), $(eval $(call DEP,$(obj),$(obj:plus.o=.asm))))
+$(foreach obj, $(pokecrystalplus_debug_obj), $(eval $(call DEP,$(obj),$(obj:plus_debug.o=.asm))))
+$(foreach obj, $(pokecrystalplus_au_obj), $(eval $(call DEP,$(obj),$(obj:_au.o=.asm))))
+$(foreach obj, $(pokecrystalplus_eu_obj), $(eval $(call DEP,$(obj),$(obj:_eu.o=.asm))))
+$(foreach obj, $(pokecrystalplus_nofix_obj), $(eval $(call DEP,$(obj),$(obj:nofix.o=.asm))))
 $(foreach obj, $(pokecrystal11_vc_obj), $(eval $(call DEP,$(obj),$(obj:11_vc.o=.asm))))
+$(foreach obj, $(pokecrystal_pink_obj), $(eval $(call DEP,$(obj),$(obj:pink.o=.asm))))
 
 # Dependencies for VC files that need to run scan_includes
 %.constants.sym: %.constants.asm $(shell tools/scan_includes %.constants.asm) $(preinclude_deps) | rgbdscheck.o
 	$(RGBASM) $(RGBASMFLAGS) $< > $@
 
 endif
 
-
-pokecrystal_opt         = -Cjv -t PM_CRYSTAL -i BXTE -n 0 -k 01 -l 0x33 -m 0x10 -r 5 -p 0
-pokecrystal11_opt       = -Cjv -t PM_CRYSTAL -i BXTE -n 1 -k 01 -l 0x33 -m 0x10 -r 5 -p 0
-pokecrystal_au_opt      = -Cjv -t PM_CRYSTAL -i BXTU -n 0 -k 01 -l 0x33 -m 0x10 -r 5 -p 0
+pokecrystal_plus_opt    = -Cjv -t PM_CRYSTAL -i BXTE -n 0 -k 01 -l 0x33 -m 0x10 -r 5 -p 0
+pokecrystalplus_debug_opt= -Cjv -t PM_CRYSTAL -i BXTE -n 1 -k 01 -l 0x33 -m 0x10 -r 5 -p 0
+pokecrystalplus_au_opt      = -Cjv -t PM_CRYSTAL -i BXTU -n 0 -k 01 -l 0x33 -m 0x10 -r 5 -p 0
 pokecrystal_eu_opt      = -Cjv -t PM_CRYSTAL -i BXTP -n 0 -k 01 -l 0x33 -m 0x10 -r 5 -p 0
-pokecrystal_debug_opt   = -Cjv -t PM_CRYSTAL -i BXTE -n 0 -k 01 -l 0x33 -m 0x10 -r 5 -p 0
-pokecrystal11_debug_opt = -Cjv -t PM_CRYSTAL -i BXTE -n 1 -k 01 -l 0x33 -m 0x10 -r 5 -p 0
+pokecrystal_nofix_opt   = -Cjv -t PM_CRYSTAL -i BXTE -n 0 -k 01 -l 0x33 -m 0x10 -r 5 -p 0
 pokecrystal11_vc_opt    = -Cjv -t PM_CRYSTAL -i BXTE -n 1 -k 01 -l 0x33 -m 0x10 -r 5 -p 0
+pokecrystal_pink_opt    = -Cjv -t PM_CRYSTAL -i BXTE -n 0 -k 01 -l 0x33 -m 0x10 -r 5 -p 0
 
 %.gbc: $$(%_obj) layout.link
 	$(RGBLINK) -n $*.sym -m $*.map -l layout.link -o $@ $(filter %.o,$^)

README.md

@@ -1,87 +1,57 @@
 ## Information 
 
-A fork of pokecrystal designed to restore and localize Mobile Adapter functionality such as online battles and trades to Crystal using disassembled code from the Japanese ROM designed for use with Mobile System recreation projects like the REON Project.
+This is a project aimed at restoring lost content and features from the second generation of Pokemon games, as well as envisioning what could have been if Pink Version had released alongside Yellow.
 
-The intention of this project is to create a build of pokecrystal with all of the content that was featured in the Japanese version of the game and was cut from the international release(s).
-We've been very strict on ensuring that any decisions made on the localization or presentation of this content match the standards of a hypothetical scenario in which the Mobile Adapter was released outside of Japan and Crystal received a complete English release back in 2001.
+## Features
 
-This repository is built upon a substantial amount of work done by Sudel-Matze.
-
-A link to Matze’s repository can be found here:
-https://github.com/Sudel-Matze/pokecrystal
-
-## Screenshots
+Mobile GB Restoration: Battle and trade online like it's 2001.
 
 ![image](https://github.com/gb-mobile/pokecrystal-mobile-eng/assets/110418063/38f43741-10cb-44e3-adff-2a13f1c1a15c)
-![image](https://github.com/gb-mobile/pokecrystal-mobile-eng/assets/110418063/2dcac8d6-9b58-47d6-9b0a-004d112267d0)
-![image](https://github.com/gb-mobile/pokecrystal-mobile-eng/assets/110418063/ea64d517-1069-4cdb-a68d-3d657613d16e)
-![image](https://github.com/gb-mobile/pokecrystal-mobile-eng/assets/110418063/5959587a-651b-4a45-9511-0977323aaa0a)
 ![image](https://github.com/gb-mobile/pokecrystal-mobile-eng/assets/110418063/42c3949c-ad17-4452-981d-5bb19647e022)
-![image](https://github.com/gb-mobile/pokecrystal-mobile-eng/assets/110418063/a2753b55-920e-4ed9-bcc4-913655fdc87e)
-![image](https://github.com/gb-mobile/pokecrystal-mobile-eng/assets/110418063/6c3f6fe9-9362-4f07-b5bf-f1ae785febf9)
-![image](https://github.com/gb-mobile/pokecrystal-mobile-eng/assets/110418063/3f056306-7409-4c91-8c84-eb046ef6ba11)
-![image](https://github.com/gb-mobile/pokecrystal-mobile-eng/assets/110418063/5cdd65ee-700d-4921-924a-c55ea29bc2ce)
-![image](https://github.com/gb-mobile/pokecrystal-mobile-eng/assets/110418063/4942f0e5-8599-4bfb-a149-b06d487d29c7)
-![image](https://github.com/gb-mobile/pokecrystal-mobile-eng/assets/110418063/1349bf82-7668-4573-8dce-021792013571)
-![image](https://github.com/gb-mobile/pokecrystal-mobile-eng/assets/110418063/46af69c9-da9f-4656-90e4-e46cc5aec4b2)
 ![image](https://github.com/gb-mobile/pokecrystal-mobile-eng/assets/110418063/040a1f18-441b-4bc7-819c-8fc7ef43f949)
-![image](https://user-images.githubusercontent.com/110418063/196129175-eebdad9e-f4a0-44ae-8432-7aa538b3c722.png)
-![image](https://github.com/gb-mobile/pokecrystal-mobile-eng/assets/110418063/bd6ae5da-1994-474a-a21e-4b03b837fff5)
-
 
+(See https://github.com/gb-mobile/pokecrystal-mobile-eng for more information on how to use mobile features.)
 
 
-## Setup [![Build Status][ci-badge]][ci]
+Skateboard functionality: Zip around at high speed! Use the B button to brake.
 
-For more information, please see [INSTALL.md](INSTALL.md)
-
-After setup has been completed, you can choose which version you wish to build.
-To build a specific version, run one of these commands inside the repository directory in cygwin64:
+![bgb00006](https://github.com/user-attachments/assets/49bdce45-59c6-420c-9f9b-949e5a20cbd3)
+![bgb00007](https://github.com/user-attachments/assets/7070055d-41af-43b7-9627-546c856ae863)
+![bgb00008](https://github.com/user-attachments/assets/f45642b4-7f6c-41f9-bed6-8230d005b8e3)
 
-- US Version:   `make`
+Optional tie-in with Pokemon Pink: replace Red with Green for a new twist.
 
-- EUR Version:	`make crystal_eu` 
+![bgb00003](https://github.com/user-attachments/assets/4b2c3121-f0d7-4671-97e0-ef45fd6766b6)
+![bgb00004](https://github.com/user-attachments/assets/2fb650b4-2c70-4fdf-afa9-c20331e6b508)
+![bgb00005](https://github.com/user-attachments/assets/3abc9b46-b68f-49c5-aebb-d26df4727d94)
 
-- AUS Version:	`make crystal_au`
+Also includes a handful of bugfixes to restore intended gameplay flow, and more soon to be revealed!
 
-For a more accurate experience, we advising picking the build version based on where you live as this will make different 'address' options available to you which are selectable for personal information.
+## Setup
 
-The US Version covers the United States and Canada.
-
-The EUR Version covers all countries in Europe (as of 2001).
-
-The AUS Version covers Australia & New Zealand.
+For more information, please see [INSTALL.md](INSTALL.md)
 
-Other languages are being worked on, but are not complete and still require a lot of polish.
+By default, the target will build with both bugfixing and 1.1 revisions. You will need to run one of the following commands:
 
-## Using Mobile Adapter Features
+- US Version:   `make`
 
-To take advantage of the Mobile Adapter features, we currently recommend the GameBoy Emulator BGB:
-https://bgb.bircd.org/
+- US with debugging symbols: `make debug`
 
-and libmobile-bgb:
-https://github.com/REONTeam/libmobile-bgb/releases
+- US without bugfixes:  `make nofix`
 
-Simply open BGB, right click the ‘screen’ and select `Link > Listen`, then accept the port it provides by clicking `OK`.
-Once done, run the latest version of libmobile for your operating system (`mobile-windows.exe` or windows and `mobile-linux` for linux).
-Now right click the ‘screen’ on BGB again and select `Load ROM…`, then choose the pokecrystal-mobile `.gbc` file you have built.
+- EU Version:  `make eu`
+  
+- AU Version:  `make au`
 
 ## Mobile Adapter Features
 
 A full list of Mobile Adapter features for Pokémon Crystal can be found here:
 https://github.com/gb-mobile/pokecrystal-mobile-en/wiki/Pok%C3%A9mon-Crystal-Mobile-Features
 
-## Contributors
-
-- Pret           : Initial disassembly
-- Matze          : Mobile Restoration & Japanese Code Disassembly
-- Damien         : Code
-- DS             : GFX & Code
-- Nob Ogasawara  : Consultation on minor menu translations
-- Ryuzac         : Code & Japanese Translation
-- Vulcandth      : Rebasing and keeping the repo up to date
-- Zumilsawhat?   : Code (Large amounts of work on the EZ Chat system)
-- REON Community : Support and Assistance
+## TO-DO
 
-[ci]: https://github.com/pret/pokecrystal/actions
-[ci-badge]: https://github.com/pret/pokecrystal/actions/workflows/main.yml/badge.svg
+- Finish implementing Green battle
+- Restore cut minigames from GS Spaceworld
+- General polish and bugfixing
+- Implement changes into other languages
+- ???

constants/engine_flags.asm

@@ -35,6 +35,7 @@
 	const ENGINE_STRENGTH_ACTIVE
 	const ENGINE_ALWAYS_ON_BIKE
 	const ENGINE_DOWNHILL
+	const ENGINE_SKATEBOARD
 ; wJohtoBadges
 	const ENGINE_ZEPHYRBADGE
 	const ENGINE_HIVEBADGE

constants/item_constants.asm

@@ -105,7 +105,7 @@
 	const WHT_APRICORN ; 61
 	const BLACKBELT_I  ; 62
 	const BLK_APRICORN ; 63
-	const ITEM_64      ; 64
+	const SKATEBOARD   ; 64
 	const PNK_APRICORN ; 65
 	const BLACKGLASSES ; 66
 	const SLOWPOKETAIL ; 67

constants/sprite_constants.asm

@@ -64,7 +64,7 @@
 	const SPRITE_SCIENTIST ; 3c
 	const SPRITE_KIMONO_GIRL ; 3d
 	const SPRITE_SAGE ; 3e
-	const SPRITE_UNUSED_GUY ; 3f
+	const SPRITE_CHRIS_BOARD ; 3f
 	const SPRITE_GENTLEMAN ; 40
 	const SPRITE_BLACK_BELT ; 41
 	const SPRITE_RECEPTIONIST ; 42
@@ -104,6 +104,7 @@
 	const SPRITE_ENTEI ; 64
 	const SPRITE_RAIKOU ; 65
 	const SPRITE_STANDING_YOUNGSTER ; 66
+	const SPRITE_KRIS_BOARD ; 67
 DEF NUM_OVERWORLD_SPRITES EQU const_value - 1
 
 ; SpriteMons indexes (see data/sprites/sprite_mons.asm)

constants/trainer_data_constants.asm

@@ -20,6 +20,9 @@ DEF NUM_TRAINER_ATTRIBUTES EQU _RS
 	shift_const AI_CAUTIOUS
 	shift_const AI_STATUS
 	shift_const AI_RISKY
+IF DEF (_PINK)
+	shift_const AI_METRONOME
+ENDC
 DEF NO_AI EQU 0
 
 ; TRNATTR_AI_ITEM_SWITCH bit flags

constants/wram_constants.asm

@@ -267,6 +267,7 @@ DEF CELEBIEVENT_FOREST_IS_RESTLESS_F EQU 2
 	const BIKEFLAGS_STRENGTH_ACTIVE_F ; 0
 	const BIKEFLAGS_ALWAYS_ON_BIKE_F  ; 1
 	const BIKEFLAGS_DOWNHILL_F        ; 2
+	const BIKEFLAGS_SKATE_F           ; 3
 
 ; wDailyFlags1::
 	const_def

data/battle/ai/sunny_day_moves.asm

@@ -10,4 +10,9 @@ SunnyDayMoves:
 	db SACRED_FIRE
 	db MORNING_SUN
 	db SYNTHESIS
+IF DEF(_CRYSTALFIX)
+	db SOLARBEAM
+	db FLAME_WHEEL
+	db MOONLIGHT
+ENDC
 	db -1 ; end

data/events/engine_flags.asm

@@ -43,6 +43,7 @@ EngineFlags:
 	engine_flag wBikeFlags, BIKEFLAGS_STRENGTH_ACTIVE_F
 	engine_flag wBikeFlags, BIKEFLAGS_ALWAYS_ON_BIKE_F
 	engine_flag wBikeFlags, BIKEFLAGS_DOWNHILL_F
+	engine_flag wBikeFlags, BIKEFLAGS_SKATE_F
 
 	engine_flag wJohtoBadges, ZEPHYRBADGE
 	engine_flag wJohtoBadges, HIVEBADGE

data/events/happiness_probabilities.asm

@@ -10,4 +10,9 @@ HappinessData_YoungerHaircutBrother:
 
 HappinessData_DaisysGrooming:
 ; BUG: Daisy's grooming doesn't always increase happiness (see docs/bugs_and_glitches.md)
+IF DEF(_CRYSTALFIX)
+	db 50 percent,     2, HAPPINESS_GROOMING
+	db -1,		   2, HAPPINESS_GROOMING
+ELSE
 	db -1,             2, HAPPINESS_GROOMING ; 99.6% chance
+ENDC

data/items/attributes.asm

@@ -206,8 +206,12 @@ ItemAttributes:
 	item_attribute 100, HELD_FIGHTING_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; BLK_APRICORN
 	item_attribute 200, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
-; ITEM_64
-	item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; SKATEBOARD
+;if DEF(_PLUS)
+	item_attribute 0, HELD_NONE, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
+; else
+; 	item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; endc
 ; PNK_APRICORN
 	item_attribute 200, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; BLACKGLASSES

data/items/catch_rate_items.asm

@@ -7,7 +7,7 @@ TimeCapsule_CatchRateItems:
 	db ITEM_2D, BITTER_BERRY
 	db ITEM_32, GOLD_BERRY
 	db ITEM_5A, BERRY
-	db ITEM_64, BERRY
+	db SKATEBOARD, BERRY
 	db ITEM_78, BERRY
 	db ITEM_87, BERRY
 	db ITEM_BE, BERRY

data/items/descriptions.asm

@@ -100,7 +100,7 @@ ItemDescriptions:
 	dw WhtApricornDesc
 	dw BlackbeltDesc
 	dw BlkApricornDesc
-	dw TeruSama7Desc
+	dw SkateBoardDesc
 	dw PnkApricornDesc
 	dw BlackGlassesDesc
 	dw SlowpokeTailDesc
@@ -644,8 +644,13 @@ BlkApricornDesc:
 	db   "A black APRICORN."
 	next "@"
 
-TeruSama7Desc:
-	db   "?@"
+SkateBoardDesc:
+	;if DEF(_PLUS)
+	db   "Ride anywhere at"	;18 max chars per line
+	next "twice the speed.@"
+	; else
+	; db   "?@"
+	; endc
 
 PnkApricornDesc:
 	db   "A pink APRICORN."