Skip to content

Commit

Permalink
More changes suitable for 1.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
roukaour committed Jul 30, 2016
1 parent 9b0522d commit 7b776ee
Show file tree
Hide file tree
Showing 23 changed files with 179 additions and 144 deletions.
1 change: 1 addition & 0 deletions CREDITS.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
* ShantyTown for the Rock Tunnel music
* Serious Senator for some trainer dialogs
* comet for fixing the bug with loading Pokémon overworld sprites
* tonyism for the in-battle shiny icon code
* jpmac26 for editing the Pokémon Center signs
* Twilir for Lyra's sprite
* Danny-E for Lorelei's sprite
Expand Down
10 changes: 10 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -159,11 +159,14 @@ There are two patches for Polished Crystal. The "faithful" patch does not change
* Fly has 100% accuracy
* Rock Smash has 75 power
* Pain Split is Ghost-type
* Blastoise is Water/Steel
* Butterfree is Bug/Psychic
* Persian is Normal/Dark
* Farfetch'd is Fighting/Flying
* Ninetales is Fire/Ghost
* Golduck is Water/Psychic
* Typhlosion is Fire/Ground
* Feraligatr is Water/Dark
* Noctowl is Flying/Psychic
* Ledian is Bug/Fighting
* Dunsparce is Normal/Ground
Expand Down Expand Up @@ -274,7 +277,13 @@ These changes have been made since the previous 1.1.0 release. If you build the

* Add: Wild Sneasel may hold a Razor Claw.
* Add: Wild Gligar may hold a Razor Fang.
* Add: Wild Oddish are rare in Ilex Forest during the day.
* Add: Pokémon Go character names as possible Wonder Trade OTs.
* Add: Buy Exp. Share in Celadon Dept. Store.
* Add: Buff rival's teams.
* Add: Typhlosion is Fire/Ground, Feraligatr is Water/Dark, and Blastoise is Water/Steel.
* Add: Goldenrod City move tutor is no longer once per day.
* Add: Show shiny icon in battle (thanks to tonyism).
* Edit: Encounter rival in Azalea Town after beating Bugsy.
* Edit: Buff Qwilfish, Stantler, Corsola, Rhydon, Electabuzz, Magby, Elekid, Jynx, Mr. Mime
* Edit: Better in-game trade DVs.
Expand All @@ -283,6 +292,7 @@ These changes have been made since the previous 1.1.0 release. If you build the
* Edit: Lower Pokédex requirements for items from Prof. Oak's aides.
* Edit: Get False Swipe TM as a gift, not Calm Mind.
* Fix: Pokémon overworld sprites are sometimes loaded from the wrong bank (thanks to [comet](https://hax.iimarck.us/post/42512/#p42512))
* Fix: Bill's team is broken.
* Fix: Falkner says TMs are one use only.
* Fix: Slightly debuff Bugsy, Whitney, and two trainers.
* Fix: Buff Kimono Girls.
Expand Down
5 changes: 4 additions & 1 deletion TODO.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,13 @@
* Add Young Couple and Double Team trainer classes
* Lt. Surge's traps from RBY
* Unown ? and ! from Gen III
* More held items (some of: Life Orb, Light Clay, Damp Rock, Heat Rock, Smooth Rock, Expert Belt, Muscle Band, Wise Glasses, Wide Lens, Zoom Lens)
* More held items (some of: Life Orb, Expert Belt, Muscle Band, Wise Glasses, Wide Lens, Zoom Lens, Light Clay, Damp Rock, Heat Rock, Smooth Rock)
* Aurora Orb boosts Suicune's Defense and Special Defense
* Battle with Tower Tycoon Palmer as the last battle of every 5th and 10th 7-battle set in the Battle Tower
* Battle with Giovanni either in Radio Tower or with Celebi time traveling
* Battle with Cynthia in the Sinjoh Ruins after catching all 26 Unown (reward: Aurora Orb)
* Battle with Steven in some southern ruins ("Hojo Ruins"?), or in Mt. Quena (north of Olivine City?) (reward: ?)
* Battle Caitlin and Darach somewhere, possibly around the Battle Tower
* Cameo battle with Valerie on the Bellchime Trail after the Suicune event (Clefable, Mr. Mime, Wigglytuff, Azumarill, Togekiss, Sylveon) (reward: TM for DazzlinGleam)
* Battle with [Shigeki Morimoto](http://bulbapedia.bulbagarden.net/wiki/Shigeki_Morimoto) (game designer and programmer), [Kōji Nishino](http://bulbapedia.bulbagarden.net/wiki/K%C5%8Dji_Nishino) (planner), [Tsunekazu Ishihara](https://tcrf.net/Pok%C3%A9mon_Red_and_Blue#Deleted_Maps) (president and CEO), and/or Satoshi Tajiri (creator) in Celadon Mansion once a day

Expand Down
8 changes: 8 additions & 0 deletions battle/core.asm
Original file line number Diff line number Diff line change
Expand Up @@ -5028,6 +5028,14 @@ DrawEnemyHUD: ; 3e043
ld a, [hl]
ld [de], a

ld bc, EnemyMonDVs
farcall CheckShininess
jr nc, .not_shiny
ld a, "<SHINYB>"
hlcoord 10, 1
ld [hl], a

.not_shiny
ld a, BREEDMON
ld [MonType], a
callab GetGender
Expand Down
2 changes: 1 addition & 1 deletion constants/engine_flags.asm
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
const ENGINE_GOLDENROD_MALL_5F_HAPPINESS_EVENT
const ENGINE_TEA_IN_BLUES_HOUSE
const ENGINE_INDIGO_PLATEAU_RIVAL_FIGHT
const ENGINE_DAILY_MOVE_TUTOR
const ENGINE_5E
const ENGINE_BUENAS_PASSWORD
const ENGINE_BUENAS_PASSWORD_2 ; 60
const ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON
Expand Down
2 changes: 1 addition & 1 deletion constants/event_flags.asm
Original file line number Diff line number Diff line change
Expand Up @@ -1516,7 +1516,7 @@
const EVENT_FLORIA_AT_FLOWER_SHOP
const EVENT_FLORIA_AT_SUDOWOODO
const EVENT_GOLDENROD_CITY_MOVE_TUTOR
const EVENT_GOLDENROD_GAME_CORNER_MOVE_TUTOR
const EVENT_UNUSED_1 ; TODO: use or remove
const EVENT_ROUTE_48_JESSIE
const EVENT_ROUTE_48_JAMES
; Kanto items
Expand Down
4 changes: 4 additions & 0 deletions data/base_stats/blastoise.asm
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
db 79, 83, 100, 78, 85, 105
; hp atk def spd sat sdf

if DEF(FAITHFUL)
db WATER, WATER
else
db WATER, STEEL
endc
db 45 ; catch rate
db 210 ; base exp
db NO_ITEM ; item 1
Expand Down
4 changes: 4 additions & 0 deletions data/base_stats/feraligatr.asm
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
db 85, 105, 100, 78, 79, 83
; hp atk def spd sat sdf

if DEF(FAITHFUL)
db WATER, WATER
else
db WATER, DARK
endc
db 45 ; catch rate
db 210 ; base exp
db NO_ITEM ; item 1
Expand Down
6 changes: 5 additions & 1 deletion data/base_stats/typhlosion.asm
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
db 78, 84, 78, 100, 109, 85
; hp atk def spd sat sdf

if DEF(FAITHFUL)
db FIRE, FIRE
else
db FIRE, GROUND
endc
db 45 ; catch rate
db 209 ; base exp
db NO_ITEM ; item 1
Expand All @@ -18,5 +22,5 @@
dn FIELD, FIELD ; egg groups

; tmhm
tmhm DYNAMICPUNCH, CURSE, ROAR, TOXIC, ROLLOUT, HIDDEN_POWER, SUNNY_DAY, HYPER_BEAM, PROTECT, SOLAR_BEAM, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, FLAMETHROWER, FIRE_BLAST, SWIFT, DEFENSE_CURL, WILD_CHARGE, REST, ATTRACT, BODY_SLAM, ROCK_SLIDE, FURY_CUTTER, SUBSTITUTE, FOCUS_BLAST, ENDURE, WILL_O_WISP, SHADOW_CLAW, CUT, STRENGTH, ROCK_SMASH, COUNTER, DOUBLE_EDGE, FIRE_PUNCH, HEADBUTT, SEISMIC_TOSS, SLEEP_TALK, THUNDERPUNCH
tmhm DYNAMICPUNCH, CURSE, ROAR, TOXIC, ROLLOUT, HIDDEN_POWER, SUNNY_DAY, HYPER_BEAM, PROTECT, SOLAR_BEAM, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, FLAMETHROWER, FIRE_BLAST, SWIFT, DEFENSE_CURL, WILD_CHARGE, REST, ATTRACT, BODY_SLAM, ROCK_SLIDE, FURY_CUTTER, SUBSTITUTE, FOCUS_BLAST, ENDURE, WILL_O_WISP, SHADOW_CLAW, CUT, STRENGTH, ROCK_SMASH, COUNTER, DOUBLE_EDGE, EARTH_POWER, FIRE_PUNCH, HEADBUTT, SEISMIC_TOSS, SLEEP_TALK, THUNDERPUNCH
; end
2 changes: 1 addition & 1 deletion data/evos_attacks.asm
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,6 @@ WartortleEvosAttacks:
BlastoiseEvosAttacks:
db 0 ; no more evolutions
db 1, ZAP_CANNON ; event move
db 1, FLASH_CANNON
db 1, OUTRAGE ; HGSS tutor move
db 1, TACKLE
db 4, TAIL_WHIP
Expand All @@ -181,6 +180,7 @@ BlastoiseEvosAttacks:
db 24, PROTECT
db 28, BUBBLE_BEAM ; Water Pulse → similar move
db 32, AQUA_TAIL
db 36, FLASH_CANNON
db 39, SUBMISSION ; Skull Bash → RBY TM move
db 46, MIRROR_COAT ; Iron Defense → egg move
db 53, RAIN_DANCE
Expand Down
10 changes: 5 additions & 5 deletions data/wild/johto_grass.asm
Original file line number Diff line number Diff line change
Expand Up @@ -306,23 +306,23 @@
db 15, ZUBAT
db 12, SLUGMA
db 16, WEEZING
db 16, MAGMAR
db 16, MAGBY
; day
db 14, RATTATA
db 14, KOFFING
db 16, KOFFING
db 15, ZUBAT
db 12, SLUGMA
db 16, WEEZING
db 16, MAGMAR
db 16, MAGBY
; nite
db 14, RATTATA
db 14, KOFFING
db 16, KOFFING
db 15, ZUBAT
db 12, SLUGMA
db 16, WEEZING
db 16, MAGMAR
db 16, MAGBY

map NATIONAL_PARK
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
Expand Down Expand Up @@ -555,9 +555,9 @@
db 5, WEEDLE
db 7, METAPOD
db 7, KAKUNA
db 7, PIDGEY
db 6, PARAS
db 6, PARAS
db 5, ODDISH
db 7, PIDGEY
; nite
db 5, ODDISH
db 5, VENONAT
Expand Down
6 changes: 3 additions & 3 deletions engine/namingscreen.asm
Original file line number Diff line number Diff line change
Expand Up @@ -960,7 +960,7 @@ NameInputLower:
db "a b c d e f g h i"
db "j k l m n o p q r"
db "s t u v w x y z "
db "× ( ) : ; [ ] <PK> <MN>"
db "× ( ) : ; <PK> <MN> ¥ <SHINYB>"
db "Upper Del End "

BoxNameInputLower:
Expand All @@ -975,14 +975,14 @@ NameInputUpper:
db "A B C D E F G H I"
db "J K L M N O P Q R"
db "S T U V W X Y Z "
db "- ? ! / . , "
db "- ? ! ♂ ♀ / . , &"
db "Lower Del End "

BoxNameInputUpper:
db "A B C D E F G H I"
db "J K L M N O P Q R"
db "S T U V W X Y Z "
db "× ( ) : ; [ ] <PK> <MN>"
db "× ( ) : ; <PK> <MN> ¥ <SHINYB>"
db "- ? ! ♂ ♀ / . , &"
db "Lower Del End "

Expand Down
Empty file modified gfx.py
100644 → 100755
Empty file.
Binary file modified gfx/font/english.1bpp
Binary file not shown.
Binary file modified gfx/misc/font.1bpp
Binary file not shown.
2 changes: 1 addition & 1 deletion gfx/misc/font_inversed.1bpp
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ُطط؛ƒ}}�{{}}�أ��أ�{}}}{���أ�a}�أ�}}}}}}�ƒُُُُُƒ���www�{woO7{}��}9Um}}}�}=]muy}�ا؛}}}؛ا�}}�ا؛}}u؛إ�}}w{}�‡{ƒ�}ƒ�ُُُُُُ�}}}}}�ء�}}؛؛ططُ�}}mU99}�9؛طُط؛9�}؛طُُُُ���ُ�؟��ُ���ُ��Ÿُ���ُŸ��هه��هه��هه�هه�ُكُُُُُك�ُُُُُ���ا�أ؛ء�؟؟؟ƒ��ƒ���ء؟؟؟ء����ء��ء���أ�؟ء��ٍُُُُ���ء�ء�ƒ؟؟؟‡؛؛؛��ُ�ُُُُ�������د�؟؟��Ÿ���ُُُُُُُ���mmmm���أ�������أ���أ���ƒ�ƒ؟؟؟��ء�ء������Ÿ؟؟���أ؟أ�ƒ��ُƒُُُ����؛؛؛؛أ���؛؛؛طُ���}mmU؛���;طُط����؛؛أ�‡���ه��������������������������������������������������طُط؛ƒ}}�طا؛}}؛ا�ط}}}}�ء�ط�ا�أ؛ء�ط�أ���أ�ط�؛؛؛؛أ���������������������������������������������������������������������������������=�}ء��ء�7�w�����?؟iضضضض�?؟lًهُُ�?؟a�ف�ء�?�A�����?؟]��ً��������������������������������������������������������������������������هه�ُ����ouu���'Wwwٍمىٍ�����������������������1ه�هه�هأأهه�ه������دد�د——ح�3…�د?أ�؟ء���������Ÿ��؛��Ÿ�Ÿ‡ƒ‡Ÿ��ƒاُ��ُا�mا؛؛اأ�أ�����؛طُط؛������دد����ُ�؟�����ددُ�ا؛؛اُƒُُ�ا�99›ا��هاههه��ƒ9ّƒ���ا�9ƒ��كأ“3����9ƒ��ƒ?99ƒ��9�هدد��ƒ9ƒ99ƒ��ƒ99�ƒ�
ُطط؛ƒ}}�{{}}�أ��أ�{}}}{���أ�a}�أ�}}}}}}�ƒُُُُُƒ���www�{woO7{}��}9Um}}}�}=]muy}�ا؛}}}؛ا�}}�ا؛}}u؛إ�}}w{}�‡{ƒ�}ƒ�ُُُُُُ�}}}}}�ء�}}؛؛ططُ�}}mU99}�9؛طُط؛9�}؛طُُُُ���ُ�؟��ُ���ُ��Ÿُ���ُŸ��هه��هه��هه�هه�ُكُُُُُك�ُُُُُ���ا�أ؛ء�؟؟؟ƒ��ƒ���ء؟؟؟ء����ء��ء���أ�؟ء��ٍُُُُ���ء�ء�ƒ؟؟؟‡؛؛؛��ُ�ُُُُ��������د؟؟��Ÿ���ُُُُُُُ���mmmm���أ�������أ���أ���ƒ�ƒ؟؟��ء�ء������Ÿ؟؟���أ؟أ�ƒ��ُƒُُُ����؛؛؛؛أ���؛؛؛طُ���}mmU؛���;طُط����؛؛؛أ�‡���ه��������������������������������������������������طُط؛ƒ}}�طا؛}}؛ا�ط}}}}�ء�ط�ا�أ؛ء�ط�أ���أ�ط�؛؛؛؛أ�؟���ُاُ������������������������������������������������������������������������=�}ء��ء�7�w�����?؟iضضضض�?؟lًهُُ�?؟a�ف�ء�?�A�����?؟]��ً������������������������������������������������������������������ُددُ�هه�ُ����ouu���'Wwwٍمىٍ�����������������������1ه�هه�هأأهه�ه������دد�د——ح�3…�د?أ�؟ء�ُههُ�Ÿ��؛��Ÿ�Ÿ‡ƒ‡Ÿ��ƒاُ��ُا�mا؛؛اأ�أ�����؛طُط؛������دد����ُ�؟�����ددُ�ا؛؛اُƒُُ�ا�99›ا��هاههه��ƒ9ّƒ���ا�9ƒ��كأ“3����9ƒ��ƒ?99ƒ��9�هدد��ƒ9ƒ99ƒ��ƒ99�ƒ�
3 changes: 2 additions & 1 deletion items/marts.asm
Original file line number Diff line number Diff line change
Expand Up @@ -363,12 +363,13 @@ Mart25: ; 161ce
; 161d5

Mart26: ; 161d5
db 7 ; # items
db 8 ; # items
db POKE_DOLL
db FIRE_STONE
db WATER_STONE
db THUNDERSTONE
db LEAF_STONE
db EXP_SHARE
db LOVELY_MAIL
db SURF_MAIL
db $ff
Expand Down
1 change: 1 addition & 0 deletions macros/charmap.asm
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@
charmap "ä", $c3
charmap "ö", $c4
charmap "ü", $c5
charmap "<SHINYB>", $c6

charmap "'d", $d0
charmap "'l", $d1
Expand Down
8 changes: 8 additions & 0 deletions maps/GoldenrodBillsHouse.asm
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ BillsHouseBill:
playsound SFX_CAUGHT_MON
waitsfx
givepoke EEVEE, 20
givepokeitem GiftEeveeMail
setevent EVENT_GOT_EEVEE
writetext UnknownText_0x54dc1
waitbutton
Expand All @@ -47,6 +48,13 @@ UnknownScript_0x54c19:
closetext
end

GiftEeveeMail:
db EON_MAIL
db "Greetings from"
next "Kanto! - Oak@"

db 0

BattleBillScript:
writetext BillEeveelutionLegendText
waitbutton
Expand Down
32 changes: 1 addition & 31 deletions maps/GoldenrodCity.asm
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,6 @@ GoldenrodCity_MapScriptHeader:
iffalse .MoveTutorDone
checkitem COIN_CASE
iffalse .MoveTutorDisappear
.MoveTutorAppear:
checkflag ENGINE_DAILY_MOVE_TUTOR
iftrue .MoveTutorDone
appear GOLDENRODCITY_POKEFAN_M2
.MoveTutorDone:
return
Expand Down Expand Up @@ -133,19 +130,6 @@ MoveTutor:
writetext UnknownText_0x19918b
waitbutton
closetext
checkcode VAR_FACING
if_equal LEFT, .WalkAroundPlayer
applymovement GOLDENRODCITY_POKEFAN_M2, MovementData_0x198a5f
jump .GoInside

.WalkAroundPlayer:
applymovement GOLDENRODCITY_POKEFAN_M2, MovementData_0x198a63
.GoInside:
playsound SFX_ENTER_DOOR
disappear GOLDENRODCITY_POKEFAN_M2
clearevent EVENT_GOLDENROD_GAME_CORNER_MOVE_TUTOR
setflag ENGINE_DAILY_MOVE_TUTOR
waitsfx
end

.Incompatible:
Expand Down Expand Up @@ -272,20 +256,6 @@ GoldenrodCityPokeCenterSign:
GoldenrodCityFlowerShopSign:
jumptext GoldenrodCityFlowerShopSignText

MovementData_0x198a5f:
step_right
step_right
step_up
step_end

MovementData_0x198a63:
step_down
step_right
step_right
step_up
step_up
step_end

UnknownText_0x198a69:
text "They built the new"
line "Radio Tower to"
Expand Down Expand Up @@ -537,7 +507,7 @@ UnknownText_0x19913a:

UnknownText_0x19918b:
text "Wahahah!"
line "Farewell, kid!"
line "Good day, kid!"
done

UnknownText_0x1991a4:
Expand Down
27 changes: 2 additions & 25 deletions maps/GoldenrodGameCorner.asm
Original file line number Diff line number Diff line change
Expand Up @@ -17,30 +17,7 @@ GoldenrodGameCorner_MapScriptHeader:
db 0

.MapCallbacks:
db 1

; callbacks

dbw MAPCALLBACK_OBJECTS, .Callback

.Callback:
checkevent EVENT_BEAT_ELITE_FOUR
iffalse .finish
checkitem COIN_CASE
iffalse .move_tutor_inside
checkcode VAR_WEEKDAY
if_equal WEDNESDAY, .move_tutor_outside
if_equal SATURDAY, .move_tutor_outside
.move_tutor_inside
appear GOLDENRODGAMECORNER_POKEFAN_M3
return

.move_tutor_outside
checkflag ENGINE_DAILY_MOVE_TUTOR
iftrue .finish
disappear GOLDENRODGAMECORNER_POKEFAN_M3
.finish
return
db 0

GoldenrodGameCornerPokefanM3Script:
faceplayer
Expand Down Expand Up @@ -520,4 +497,4 @@ GoldenrodGameCorner_MapEventHeader:
person_event SPRITE_COOLTRAINER_F, 3, 10, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerCooltrainerFScript, -1
person_event SPRITE_GENTLEMAN, 10, 5, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerGentlemanScript, -1
person_event SPRITE_POKEFAN_M, 9, 2, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanM2Script, -1
person_event SPRITE_POKEFAN_M, 10, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanM3Script, EVENT_GOLDENROD_GAME_CORNER_MOVE_TUTOR
person_event SPRITE_POKEFAN_M, 10, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanM3Script, -1
2 changes: 2 additions & 0 deletions maps/Route35Goldenrodgate.asm
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,10 @@ GiftFarfetch_dMail:
db FLOWER_MAIL
db "Dark Cave leads"
next "to another road@"

GiftFarfetch_dName:
db "Kenya@"

GiftFarfetch_dOTName:
db "Randy@"

Expand Down
Loading

0 comments on commit 7b776ee

Please sign in to comment.