diff options
| -rw-r--r-- | Makefile | 17 | ||||
| -rw-r--r-- | data/phone/text/buena.asm | 5 | ||||
| -rw-r--r-- | main.asm | 4 | ||||
| -rw-r--r-- | maps/CeladonCity.asm | 13 | ||||
| -rw-r--r-- | maps/CeladonGameCorner.asm | 42 | ||||
| -rw-r--r-- | maps/CeladonGameCornerPrizeRoom.asm | 6 | ||||
| -rw-r--r-- | maps/GoldenrodGameCorner.asm | 35 | ||||
| -rw-r--r-- | mobile/stadium/stadium2_3.bin | bin | 0 -> 544 bytes | |||
| -rw-r--r-- | roms.sha1 | 1 |
9 files changed, 118 insertions, 5 deletions
@@ -1,4 +1,4 @@ -roms := pokecrystal.gbc pokecrystal11.gbc +roms := pokecrystal.gbc pokecrystal11.gbc pokecrystal-au.gbc crystal_obj := \ audio.o \ @@ -17,6 +17,7 @@ gfx/sprites.o \ lib/mobile/main.o crystal11_obj := $(crystal_obj:.o=11.o) +crystal_au_obj := $(crystal_obj:.o=_au.o) ### Build tools @@ -37,7 +38,7 @@ RGBLINK ?= $(RGBDS)rgblink ### Build targets .SUFFIXES: -.PHONY: all crystal crystal11 clean tidy compare tools +.PHONY: all crystal crystal11 crystal_au clean tidy compare tools .SECONDEXPANSION: .PRECIOUS: .SECONDARY: @@ -45,15 +46,16 @@ RGBLINK ?= $(RGBDS)rgblink all: crystal crystal: pokecrystal.gbc crystal11: pokecrystal11.gbc +crystal-au: pokecrystal-au.gbc 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/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/ 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/ compare: $(roms) @@ -65,6 +67,7 @@ tools: $(crystal_obj): RGBASMFLAGS = -D _CRYSTAL $(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. # 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)) +$(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, $(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 $@ 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. # If the hash of the uncompressed file matches, use this .lz instead. diff --git a/data/phone/text/buena.asm b/data/phone/text/buena.asm index 951a0a9b8..2503ae73c 100644 --- a/data/phone/text/buena.asm +++ b/data/phone/text/buena.asm @@ -469,11 +469,16 @@ UnknownText_0xa1c88: para "CORNER tomorrow." 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" line "favorite machine…" para "It pays out a lot," line "I kid you not!" +endc para "Huh? Nuh-uh, it's" line "my secret!" @@ -711,7 +711,9 @@ INCLUDE "engine/events/odd_egg.asm" 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" else INCBIN "mobile/stadium/stadium2_1.bin" diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm index 36ff6b714..491791264 100644 --- a/maps/CeladonCity.asm +++ b/maps/CeladonCity.asm @@ -89,6 +89,11 @@ CeladonCityPoliwrathText: done CeladonCityTeacher1Text: +if DEF(_CRYSTAL_AU) + text "I lost at the" + line "machines." + done +else text "I lost at the slot" line "machines again…" @@ -98,6 +103,7 @@ CeladonCityTeacher1Text: para "You should check" line "them out too." done +endc CeladonCityGramps1Text: text "GRIMER have been" @@ -212,10 +218,17 @@ CeladonCityMansionSignText: done CeladonCityGameCornerSignText: +if DEF(_CRYSTAL_AU) + text "The Game Area for" + line "Grown-ups--CELADON" + cont "GAME CORNER" + done +else text "The Playground for" line "Everybody--CELADON" cont "GAME CORNER" done +endc CeladonCityTrainerTipsText: text "TRAINER TIPS" diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm index c1e3ced8f..0325be7be 100644 --- a/maps/CeladonGameCorner.asm +++ b/maps/CeladonGameCorner.asm @@ -164,6 +164,12 @@ CeladonGameCornerPokefanMText: done CeladonGameCornerTeacherText: +if DEF(_CRYSTAL_AU) + text "The weather" + line "outside is very" + cont "nice." + done +else text "It's this machine" line "I want." @@ -173,8 +179,15 @@ CeladonGameCornerTeacherText: para "should pay out" line "today." done +endc CeladonGameCornerFishingGuruText: +if DEF(_CRYSTAL_AU) + text "This machine looks" + line "the same as the" + cont "others." + done +else text "I think this slot" line "machine will pay" cont "out…" @@ -182,8 +195,19 @@ CeladonGameCornerFishingGuruText: para "The odds vary" line "among machines." done +endc 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!" para "The coins just" @@ -195,6 +219,7 @@ CeladonGameCornerFisherText1: para "I'll share my luck" line "with you!" done +endc CeladonGameCornerFisherText2: text "Gahahaha!" @@ -216,6 +241,11 @@ CeladonGameCornerFisherNoCoinCaseText: done CeladonGameCornerFisherFullCoinCaseText: +if DEF(_CRYSTAL_AU) + text "Your COIN CASE is" + line "full." + done +else text "Hey, your COIN" line "CASE is full, kid." @@ -223,13 +253,18 @@ CeladonGameCornerFisherFullCoinCaseText: line "a winning streak" cont "too." done +endc CeladonGymGuyText: text "Hey! CHAMP in" line "making!" para "Are you playing" +if DEF(_CRYSTAL_AU) + line "too?" +else line "the slots too?" +endc para "I'm trying to get" line "enough coins for a" @@ -240,12 +275,19 @@ CeladonGymGuyText: done CeladonGameCornerGrampsText: +if DEF(_CRYSTAL_AU) + text "Is there any" + line "difference between" + cont "these lines?" + done +else text "Hmmm… The odds are" line "surely better for" para "PIKACHU's line," line "but… What to do?" done +endc CeladonGameCornerPoster1Text: text "Hey!" diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm index ea7ecc5b2..018573798 100644 --- a/maps/CeladonGameCornerPrizeRoom.asm +++ b/maps/CeladonGameCornerPrizeRoom.asm @@ -214,6 +214,11 @@ CeladonGameCornerPrizeRoomGentlemanText: done CeladonGameCornerPrizeRoomPharmacistText: +if DEF(_CRYSTAL_AU) + text "I don't want to" + line "lose my coins." + done +else text "Whew…" para "I've got to stay" @@ -223,6 +228,7 @@ CeladonGameCornerPrizeRoomPharmacistText: line "cool, or I'll lose" cont "all my money…" done +endc CeladonPrizeRoom_PrizeVendorIntroText: text "Welcome!" diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index 6cc8317c9..6dd9b6326 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -364,14 +364,29 @@ GoldenrodGameCornerPrizeVendorNoCoinCaseText: done GoldenrodGameCornerPharmacistText: +if DEF(_CRYSTAL_AU) + text "This machine looks" + line "the same as the" + cont "others." + done +else text "I always play this" line "slot machine. It" para "pays out more than" line "others, I think." done +endc 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" line "new slot machine." @@ -379,16 +394,28 @@ GoldenrodGameCornerPokefanM1Text: line "challenge than the" cont "ones in CELADON." done +endc GoldenrodGameCornerCooltrainerMText: +if DEF(_CRYSTAL_AU) + text "Nothing is certain" + line "in this area." + done +else text "Life is a gamble." line "I'm going to flip" cont "cards till I drop!" done +endc GoldenrodGameCornerPokefanFText: text "Card flip…" +if DEF(_CRYSTAL_AU) + para "Different from the" + line "other machines." + done +else para "I prefer it over" line "the slots because" @@ -398,6 +425,7 @@ GoldenrodGameCornerPokefanFText: para "But the payout is" line "much lower." done +endc GoldenrodGameCornerCooltrainerFText: text "I won't quit until" @@ -416,6 +444,12 @@ GoldenrodGameCornerGentlemanText: done 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" line "the slots, and I" @@ -428,6 +462,7 @@ GoldenrodGameCornerPokefanM2Text: para "COIN CASE in the" line "UNDERGROUND." done +endc MoveTutorInsideText: text "Wahahah! The coins" diff --git a/mobile/stadium/stadium2_3.bin b/mobile/stadium/stadium2_3.bin Binary files differnew file mode 100644 index 000000000..79cb83ac0 --- /dev/null +++ b/mobile/stadium/stadium2_3.bin @@ -1,2 +1,3 @@ f4cd194bdee0d04ca4eac29e09b8e4e9d818c133 *pokecrystal.gbc f2f52230b536214ef7c9924f483392993e226cfb *pokecrystal11.gbc +a0fc810f1d4e124434f7be2c989ab5b5892ddf36 *pokecrystal-au.gbc |