Build Australian Crystal.

This commit is contained in:
IIMarckus 2019-04-12 09:18:35 -06:00
parent 2184b60a0c
commit 9f7d30439e
9 changed files with 118 additions and 5 deletions

View File

@ -1,4 +1,4 @@
roms := pokecrystal.gbc pokecrystal11.gbc roms := pokecrystal.gbc pokecrystal11.gbc pokecrystal-au.gbc
crystal_obj := \ crystal_obj := \
audio.o \ audio.o \
@ -17,6 +17,7 @@ gfx/sprites.o \
lib/mobile/main.o lib/mobile/main.o
crystal11_obj := $(crystal_obj:.o=11.o) crystal11_obj := $(crystal_obj:.o=11.o)
crystal_au_obj := $(crystal_obj:.o=_au.o)
### Build tools ### Build tools
@ -37,7 +38,7 @@ RGBLINK ?= $(RGBDS)rgblink
### Build targets ### Build targets
.SUFFIXES: .SUFFIXES:
.PHONY: all crystal crystal11 clean tidy compare tools .PHONY: all crystal crystal11 crystal_au clean tidy compare tools
.SECONDEXPANSION: .SECONDEXPANSION:
.PRECIOUS: .PRECIOUS:
.SECONDARY: .SECONDARY:
@ -45,15 +46,16 @@ RGBLINK ?= $(RGBDS)rgblink
all: crystal all: crystal
crystal: pokecrystal.gbc crystal: pokecrystal.gbc
crystal11: pokecrystal11.gbc crystal11: pokecrystal11.gbc
crystal-au: pokecrystal-au.gbc
clean: clean:
rm -f $(roms) $(crystal_obj) $(crystal11_obj) $(roms:.gbc=.map) $(roms:.gbc=.sym) rm -f $(roms) $(crystal_obj) $(crystal11_obj) $(crystal_au_obj) $(roms:.gbc=.map) $(roms:.gbc=.sym)
find gfx \( -name "*.[12]bpp" -o -name "*.lz" -o -name "*.gbcpal" \) -delete find gfx \( -name "*.[12]bpp" -o -name "*.lz" -o -name "*.gbcpal" \) -delete
find gfx/pokemon -mindepth 1 ! -path "gfx/pokemon/unown/*" \( -name "bitmask.asm" -o -name "frames.asm" -o -name "front.animated.tilemap" -o -name "front.dimensions" \) -delete find gfx/pokemon -mindepth 1 ! -path "gfx/pokemon/unown/*" \( -name "bitmask.asm" -o -name "frames.asm" -o -name "front.animated.tilemap" -o -name "front.dimensions" \) -delete
$(MAKE) clean -C tools/ $(MAKE) clean -C tools/
tidy: tidy:
rm -f $(roms) $(crystal_obj) $(crystal11_obj) $(roms:.gbc=.map) $(roms:.gbc=.sym) rm -f $(roms) $(crystal_obj) $(crystal11_obj) $(crystal_au_obj) $(roms:.gbc=.map) $(roms:.gbc=.sym)
$(MAKE) clean -C tools/ $(MAKE) clean -C tools/
compare: $(roms) compare: $(roms)
@ -65,6 +67,7 @@ tools:
$(crystal_obj): RGBASMFLAGS = -D _CRYSTAL $(crystal_obj): RGBASMFLAGS = -D _CRYSTAL
$(crystal11_obj): RGBASMFLAGS = -D _CRYSTAL -D _CRYSTAL11 $(crystal11_obj): RGBASMFLAGS = -D _CRYSTAL -D _CRYSTAL11
$(crystal_au_obj): RGBASMFLAGS = -D _CRYSTAL -D _CRYSTAL11 -D _CRYSTAL_AU
# The dep rules have to be explicit or else missing files won't be reported. # The dep rules have to be explicit or else missing files won't be reported.
# As a side effect, they're evaluated immediately instead of when the rule is invoked. # As a side effect, they're evaluated immediately instead of when the rule is invoked.
@ -80,6 +83,7 @@ ifeq (,$(filter clean tools,$(MAKECMDGOALS)))
$(info $(shell $(MAKE) -C tools)) $(info $(shell $(MAKE) -C tools))
$(foreach obj, $(crystal_au_obj), $(eval $(call DEP,$(obj),$(obj:_au.o=.asm))))
$(foreach obj, $(crystal11_obj), $(eval $(call DEP,$(obj),$(obj:11.o=.asm)))) $(foreach obj, $(crystal11_obj), $(eval $(call DEP,$(obj),$(obj:11.o=.asm))))
$(foreach obj, $(crystal_obj), $(eval $(call DEP,$(obj),$(obj:.o=.asm)))) $(foreach obj, $(crystal_obj), $(eval $(call DEP,$(obj),$(obj:.o=.asm))))
@ -96,6 +100,11 @@ pokecrystal11.gbc: $(crystal11_obj) pokecrystal.link
$(RGBFIX) -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -n 1 -p 0 -r 3 -t PM_CRYSTAL $@ $(RGBFIX) -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -n 1 -p 0 -r 3 -t PM_CRYSTAL $@
tools/sort_symfile.sh pokecrystal11.sym tools/sort_symfile.sh pokecrystal11.sym
pokecrystal-au.gbc: $(crystal_au_obj) pokecrystal.link
$(RGBLINK) -n pokecrystal-au.sym -m pokecrystal-au.map -l pokecrystal.link -o $@ $(crystal_au_obj)
$(RGBFIX) -Cjv -i BYTU -k 01 -l 0x33 -m 0x10 -p 0 -r 3 -t PM_CRYSTAL $@
tools/sort_symfile.sh pokecrystal-au.sym
# For files that the compressor can't match, there will be a .lz file suffixed with the md5 hash of the correct uncompressed file. # For files that the compressor can't match, there will be a .lz file suffixed with the md5 hash of the correct uncompressed file.
# If the hash of the uncompressed file matches, use this .lz instead. # If the hash of the uncompressed file matches, use this .lz instead.

View File

@ -469,11 +469,16 @@ UnknownText_0xa1c88:
para "CORNER tomorrow." para "CORNER tomorrow."
line "It's been a while." line "It's been a while."
if DEF(_CRYSTAL_AU)
para "Some machines pays"
line "out a lot."
else
para "You see, I have my" para "You see, I have my"
line "favorite machine…" line "favorite machine…"
para "It pays out a lot," para "It pays out a lot,"
line "I kid you not!" line "I kid you not!"
endc
para "Huh? Nuh-uh, it's" para "Huh? Nuh-uh, it's"
line "my secret!" line "my secret!"

View File

@ -711,7 +711,9 @@ INCLUDE "engine/events/odd_egg.asm"
SECTION "Mobile Stadium 2", ROMX SECTION "Mobile Stadium 2", ROMX
if DEF(_CRYSTAL11) if DEF(_CRYSTAL_AU)
INCBIN "mobile/stadium/stadium2_3.bin"
elif DEF(_CRYSTAL11)
INCBIN "mobile/stadium/stadium2_2.bin" INCBIN "mobile/stadium/stadium2_2.bin"
else else
INCBIN "mobile/stadium/stadium2_1.bin" INCBIN "mobile/stadium/stadium2_1.bin"

View File

@ -89,6 +89,11 @@ CeladonCityPoliwrathText:
done done
CeladonCityTeacher1Text: CeladonCityTeacher1Text:
if DEF(_CRYSTAL_AU)
text "I lost at the"
line "machines."
done
else
text "I lost at the slot" text "I lost at the slot"
line "machines again…" line "machines again…"
@ -98,6 +103,7 @@ CeladonCityTeacher1Text:
para "You should check" para "You should check"
line "them out too." line "them out too."
done done
endc
CeladonCityGramps1Text: CeladonCityGramps1Text:
text "GRIMER have been" text "GRIMER have been"
@ -212,10 +218,17 @@ CeladonCityMansionSignText:
done done
CeladonCityGameCornerSignText: CeladonCityGameCornerSignText:
if DEF(_CRYSTAL_AU)
text "The Game Area for"
line "Grown-ups--CELADON"
cont "GAME CORNER"
done
else
text "The Playground for" text "The Playground for"
line "Everybody--CELADON" line "Everybody--CELADON"
cont "GAME CORNER" cont "GAME CORNER"
done done
endc
CeladonCityTrainerTipsText: CeladonCityTrainerTipsText:
text "TRAINER TIPS" text "TRAINER TIPS"

View File

@ -164,6 +164,12 @@ CeladonGameCornerPokefanMText:
done done
CeladonGameCornerTeacherText: CeladonGameCornerTeacherText:
if DEF(_CRYSTAL_AU)
text "The weather"
line "outside is very"
cont "nice."
done
else
text "It's this machine" text "It's this machine"
line "I want." line "I want."
@ -173,8 +179,15 @@ CeladonGameCornerTeacherText:
para "should pay out" para "should pay out"
line "today." line "today."
done done
endc
CeladonGameCornerFishingGuruText: CeladonGameCornerFishingGuruText:
if DEF(_CRYSTAL_AU)
text "This machine looks"
line "the same as the"
cont "others."
done
else
text "I think this slot" text "I think this slot"
line "machine will pay" line "machine will pay"
cont "out…" cont "out…"
@ -182,8 +195,19 @@ CeladonGameCornerFishingGuruText:
para "The odds vary" para "The odds vary"
line "among machines." line "among machines."
done done
endc
CeladonGameCornerFisherText1: CeladonGameCornerFisherText1:
if DEF(_CRYSTAL_AU)
text "Whoa!"
para "What? You want to"
line "play this machine?"
para "Here, take my"
line "coins."
done
else
text "Gahahaha!" text "Gahahaha!"
para "The coins just" para "The coins just"
@ -195,6 +219,7 @@ CeladonGameCornerFisherText1:
para "I'll share my luck" para "I'll share my luck"
line "with you!" line "with you!"
done done
endc
CeladonGameCornerFisherText2: CeladonGameCornerFisherText2:
text "Gahahaha!" text "Gahahaha!"
@ -216,6 +241,11 @@ CeladonGameCornerFisherNoCoinCaseText:
done done
CeladonGameCornerFisherFullCoinCaseText: CeladonGameCornerFisherFullCoinCaseText:
if DEF(_CRYSTAL_AU)
text "Your COIN CASE is"
line "full."
done
else
text "Hey, your COIN" text "Hey, your COIN"
line "CASE is full, kid." line "CASE is full, kid."
@ -223,13 +253,18 @@ CeladonGameCornerFisherFullCoinCaseText:
line "a winning streak" line "a winning streak"
cont "too." cont "too."
done done
endc
CeladonGymGuyText: CeladonGymGuyText:
text "Hey! CHAMP in" text "Hey! CHAMP in"
line "making!" line "making!"
para "Are you playing" para "Are you playing"
if DEF(_CRYSTAL_AU)
line "too?"
else
line "the slots too?" line "the slots too?"
endc
para "I'm trying to get" para "I'm trying to get"
line "enough coins for a" line "enough coins for a"
@ -240,12 +275,19 @@ CeladonGymGuyText:
done done
CeladonGameCornerGrampsText: CeladonGameCornerGrampsText:
if DEF(_CRYSTAL_AU)
text "Is there any"
line "difference between"
cont "these lines?"
done
else
text "Hmmm… The odds are" text "Hmmm… The odds are"
line "surely better for" line "surely better for"
para "PIKACHU's line," para "PIKACHU's line,"
line "but… What to do?" line "but… What to do?"
done done
endc
CeladonGameCornerPoster1Text: CeladonGameCornerPoster1Text:
text "Hey!" text "Hey!"

View File

@ -214,6 +214,11 @@ CeladonGameCornerPrizeRoomGentlemanText:
done done
CeladonGameCornerPrizeRoomPharmacistText: CeladonGameCornerPrizeRoomPharmacistText:
if DEF(_CRYSTAL_AU)
text "I don't want to"
line "lose my coins."
done
else
text "Whew…" text "Whew…"
para "I've got to stay" para "I've got to stay"
@ -223,6 +228,7 @@ CeladonGameCornerPrizeRoomPharmacistText:
line "cool, or I'll lose" line "cool, or I'll lose"
cont "all my money…" cont "all my money…"
done done
endc
CeladonPrizeRoom_PrizeVendorIntroText: CeladonPrizeRoom_PrizeVendorIntroText:
text "Welcome!" text "Welcome!"

View File

@ -364,14 +364,29 @@ GoldenrodGameCornerPrizeVendorNoCoinCaseText:
done done
GoldenrodGameCornerPharmacistText: GoldenrodGameCornerPharmacistText:
if DEF(_CRYSTAL_AU)
text "This machine looks"
line "the same as the"
cont "others."
done
else
text "I always play this" text "I always play this"
line "slot machine. It" line "slot machine. It"
para "pays out more than" para "pays out more than"
line "others, I think." line "others, I think."
done done
endc
GoldenrodGameCornerPokefanM1Text: GoldenrodGameCornerPokefanM1Text:
if DEF(_CRYSTAL_AU)
text "These machines"
line "seem different"
para "from the ones at"
line "CELADON CITY!"
done
else
text "I just love this" text "I just love this"
line "new slot machine." line "new slot machine."
@ -379,16 +394,28 @@ GoldenrodGameCornerPokefanM1Text:
line "challenge than the" line "challenge than the"
cont "ones in CELADON." cont "ones in CELADON."
done done
endc
GoldenrodGameCornerCooltrainerMText: GoldenrodGameCornerCooltrainerMText:
if DEF(_CRYSTAL_AU)
text "Nothing is certain"
line "in this area."
done
else
text "Life is a gamble." text "Life is a gamble."
line "I'm going to flip" line "I'm going to flip"
cont "cards till I drop!" cont "cards till I drop!"
done done
endc
GoldenrodGameCornerPokefanFText: GoldenrodGameCornerPokefanFText:
text "Card flip…" text "Card flip…"
if DEF(_CRYSTAL_AU)
para "Different from the"
line "other machines."
done
else
para "I prefer it over" para "I prefer it over"
line "the slots because" line "the slots because"
@ -398,6 +425,7 @@ GoldenrodGameCornerPokefanFText:
para "But the payout is" para "But the payout is"
line "much lower." line "much lower."
done done
endc
GoldenrodGameCornerCooltrainerFText: GoldenrodGameCornerCooltrainerFText:
text "I won't quit until" text "I won't quit until"
@ -416,6 +444,12 @@ GoldenrodGameCornerGentlemanText:
done done
GoldenrodGameCornerPokefanM2Text: GoldenrodGameCornerPokefanM2Text:
if DEF(_CRYSTAL_AU)
text "COIN CASE? I threw"
line "it away in the"
cont "UNDERGROUND."
done
else
text "I couldn't win at" text "I couldn't win at"
line "the slots, and I" line "the slots, and I"
@ -428,6 +462,7 @@ GoldenrodGameCornerPokefanM2Text:
para "COIN CASE in the" para "COIN CASE in the"
line "UNDERGROUND." line "UNDERGROUND."
done done
endc
MoveTutorInsideText: MoveTutorInsideText:
text "Wahahah! The coins" text "Wahahah! The coins"

Binary file not shown.

View File

@ -1,2 +1,3 @@
f4cd194bdee0d04ca4eac29e09b8e4e9d818c133 *pokecrystal.gbc f4cd194bdee0d04ca4eac29e09b8e4e9d818c133 *pokecrystal.gbc
f2f52230b536214ef7c9924f483392993e226cfb *pokecrystal11.gbc f2f52230b536214ef7c9924f483392993e226cfb *pokecrystal11.gbc
a0fc810f1d4e124434f7be2c989ab5b5892ddf36 *pokecrystal-au.gbc