diff --git a/README.md b/README.md index 299c9fbd..efff4782 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,23 @@ Improved areas QoL Enhancements ==== -- PC added to Celadon Hotel where the event usually is. Why not? +- PC added to Celadon Hotel where the invisible event usually is. Why not? - Artificial Save Delay has been removed. +- Japanese event moves can now be taught via TM/HM; + - TM16 (Pay Day) can be taught to Fearow and Rapidash. + - TM23 (Dragon Rage) can be taught to Magikarp. + - HM02 (Fly) can be taught to the Pikachu line. + - HM03 (Surf) can be taught to the Pikachu line. +- The Game Corner in general is massively buffed, making everything far more worth going for; + - 3x Cherry now gives 40 coins (used to be 8) + - 3x Magikarp/Poliwag/Bird/Diglett/Rattata/Jigglypuff now gives 75 coins (used to be 15) + - 3x BAR now gives 300 coins (used to be 100) + - 3x 7s now gives 999 coins (used to be 300) +- Game Corner prizes have been altered; + - Version parity is done across prizes, using Blue's superior prices. + - New prizes across both versions include; Cubone, Blastyke, and Cactus. + - Version exclusives are Clefairy for Red and Jigglypuff for Blue. Pinsir and Scyther remain the same. + - The Moon Stone is available over TM23 (Dragon Rage). Dragon Rage has been moved to Celadon Mart, over Take Down, which can still be obtained in Silph Co. Bug Fixes ==== diff --git a/data/events/prize_mon_levels.asm b/data/events/prize_mon_levels.asm index eb30ac80..106306ee 100644 --- a/data/events/prize_mon_levels.asm +++ b/data/events/prize_mon_levels.asm @@ -1,19 +1,19 @@ PrizeMonLevelDictionary: IF DEF(_RED) - db ABRA, 9 - db CLEFAIRY, 8 - db NIDORINA, 17 + db CUBONE, 12 + db CLEFAIRY, 12 + db NIDORINA, 18 - db DRATINI, 18 + db CACTUS, 25 db SCYTHER, 25 - db PORYGON, 26 + db PORYGON, 30 ENDC IF DEF(_BLUE) - db ABRA, 6 + db ABRA, 12 db CLEFAIRY, 12 - db NIDORINO, 17 + db NIDORINO, 18 - db PINSIR, 20 - db DRATINI, 24 - db PORYGON, 18 + db CACTUS, 25 + db PINSIR, 25 + db PORYGON, 30 ENDC diff --git a/data/events/prizes.asm b/data/events/prizes.asm index 34cd75d7..198f0371 100644 --- a/data/events/prizes.asm +++ b/data/events/prizes.asm @@ -7,13 +7,13 @@ NoThanksText: db "NO THANKS@" PrizeMenuMon1Entries: - db ABRA - db CLEFAIRY + db CUBONE + db BLASTYKE IF DEF(_RED) - db NIDORINA + db CLEFAIRY ENDC IF DEF(_BLUE) - db NIDORINO + db JIGGLYPUFF ENDC db "@" @@ -31,21 +31,20 @@ ENDC PrizeMenuMon2Entries: IF DEF(_RED) - db DRATINI db SCYTHER ENDC IF DEF(_BLUE) db PINSIR - db DRATINI ENDC + db CACTUS db PORYGON db "@" PrizeMenuMon2Cost: IF DEF(_RED) - bcd2 2800 - bcd2 5500 - bcd2 9999 + bcd2 2500 + bcd2 4600 + bcd2 6500 ENDC IF DEF(_BLUE) bcd2 2500 @@ -55,7 +54,7 @@ ENDC db "@" PrizeMenuTMsEntries: - db TM_DRAGON_RAGE + db MOON_STONE db TM_HYPER_BEAM db TM_SUBSTITUTE db "@" diff --git a/data/items/marts.asm b/data/items/marts.asm index 00870412..c3202ca0 100644 --- a/data/items/marts.asm +++ b/data/items/marts.asm @@ -23,7 +23,7 @@ CeladonMart2Clerk1Text:: script_mart GREAT_BALL, SUPER_POTION, REVIVE, SUPER_REPEL, ANTIDOTE, BURN_HEAL, ICE_HEAL, AWAKENING, PARLYZ_HEAL CeladonMart2Clerk2Text:: - script_mart TM_DOUBLE_TEAM, TM_REFLECT, TM_RAZOR_WIND, TM_HORN_DRILL, TM_EGG_BOMB, TM_MEGA_PUNCH, TM_MEGA_KICK, TM_TAKE_DOWN, TM_SUBMISSION + script_mart TM_DOUBLE_TEAM, TM_REFLECT, TM_RAZOR_WIND, TM_HORN_DRILL, TM_EGG_BOMB, TM_MEGA_PUNCH, TM_MEGA_KICK, TM_DRAGON_RAGE, TM_SUBMISSION CeladonMart4ClerkText:: script_mart POKE_DOLL, FIRE_STONE, THUNDER_STONE, WATER_STONE, LEAF_STONE, SUN_STONE diff --git a/engine/slots/slot_machine.asm b/engine/slots/slot_machine.asm index 1a171424..b7c8f7a8 100644 --- a/engine/slots/slot_machine.asm +++ b/engine/slots/slot_machine.asm @@ -510,16 +510,16 @@ SlotRewardPointers: dw SlotReward15Text SlotReward300Text: - db "300@" + db "999@" SlotReward100Text: - db "100@" + db "300@" SlotReward8Text: - db "8@" + db "40" SlotReward15Text: - db "15@" + db "75@" NotThisTimeText: text_far _NotThisTimeText @@ -573,7 +573,7 @@ SlotReward8Func: dec [hl] .skip ld b, $2 - ld de, 8 + ld de, 40 ; buffed amounts start here ret SlotReward15Func: @@ -584,7 +584,7 @@ SlotReward15Func: dec [hl] .skip ld b, $4 - ld de, 15 + ld de, 75 ret SlotReward100Func: @@ -593,7 +593,7 @@ SlotReward100Func: xor a ld [wSlotMachineFlags], a ld b, $8 - ld de, 100 + ld de, 300 ret SlotReward300Func: @@ -609,7 +609,7 @@ SlotReward300Func: .skip ld [wSlotMachineAllowMatchesCounter], a ld b, $14 - ld de, 300 + ld de, 999 ret YeahText: