diff --git a/README.md b/README.md index 0694c957..eda75d23 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ New Types: New Items: ==== -- The Sun, Ice and Shiny Stones have been added +- The Sun, Ice, and Shiny Stones have been added. Improved areas ==== @@ -29,19 +29,20 @@ Improved areas QoL Enhancements ==== - DVs are erased and replaced with perfect 15s. +- The protagonist is referred to in a gender neutral manner. - 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. +- Event moves can now be taught via TM/HM; + - TM16 (Pay Day) can be taught to Fearow and Rapidash ('98 Shogakukan) + - TM23 (Dragon Rage) can be taught to Magikarp (July '98 Shogakukan) + - HM02 (Fly) can be taught to the Pikachu line (Corocoro) + - HM03 (Surf) can be taught to the Pikachu line (Stadium / Corocoro) + - Psyduck learns Amnesia at Lv15 (Stadium) - Yellow learnset changes are imported; eg. Flash Venonat -- Psyduck learns Amnesia at Lv1, removing the need to connect with Pokemon Stadium to obtain the move. - 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 Cherry now gives 100 coins (used to be 8) + - 3x Magikarp/Poliwag/Bird/Diglett/Rattata/Jigglypuff now gives 200 coins (used to be 15) + - 3x BAR now gives 500 coins (used to be 100) - 3x 7s now gives 999 coins (used to be 300) - The Route 5-6 underground path contains a shortcut to Celadon City. - This allows you to skip Route 9 and Rock Tunnel, making them optional areas and opening up central Kanto. diff --git a/data/pokemon/base_stats/psyduck.asm b/data/pokemon/base_stats/psyduck.asm index ba0700d8..51bd916b 100644 --- a/data/pokemon/base_stats/psyduck.asm +++ b/data/pokemon/base_stats/psyduck.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/psyduck.pic", 0, 1 ; sprite dimensions dw PsyduckPicFront, PsyduckPicBack - db SCRATCH, AMNESIA, NO_MOVE, NO_MOVE ; level 1 learnset + db SCRATCH, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/evos_moves.asm b/data/pokemon/evos_moves.asm index 9085aac2..df317fa2 100644 --- a/data/pokemon/evos_moves.asm +++ b/data/pokemon/evos_moves.asm @@ -762,6 +762,7 @@ PsyduckEvosMoves: db 0 ; Learnset db 14, TAIL_WHIP + db 15, AMNESIA db 18, DISABLE db 26, CONFUSION db 32, FURY_SWIPES diff --git a/engine/slots/slot_machine.asm b/engine/slots/slot_machine.asm index b7c8f7a8..2cbf73e3 100644 --- a/engine/slots/slot_machine.asm +++ b/engine/slots/slot_machine.asm @@ -513,13 +513,13 @@ SlotReward300Text: db "999@" SlotReward100Text: - db "300@" + db "500@" SlotReward8Text: - db "40" + db "100@" SlotReward15Text: - db "75@" + db "200@" NotThisTimeText: text_far _NotThisTimeText @@ -573,7 +573,7 @@ SlotReward8Func: dec [hl] .skip ld b, $2 - ld de, 40 ; buffed amounts start here + ld de, 100 ; buffed amounts start here ret SlotReward15Func: @@ -584,7 +584,7 @@ SlotReward15Func: dec [hl] .skip ld b, $4 - ld de, 75 + ld de, 200 ret SlotReward100Func: @@ -593,7 +593,7 @@ SlotReward100Func: xor a ld [wSlotMachineFlags], a ld b, $8 - ld de, 300 + ld de, 500 ret SlotReward300Func: @@ -682,7 +682,7 @@ SlotMachine_PayCoinsToPlayer: ld h, a or l ret z - ld de, -1 + ld de, -5 ; this will not break anything at all - PvK (it was -1 before) add hl, de ld a, l ld [wPayoutCoins + 1], a