pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Correct the older+younger haircut brothers' labels and constants

Browse Source
This commit is contained in:
Rangi
2019-05-18 13:27:32 -04:00
parent 7db6c59211
commit b24cd55f96
6 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
data/events/happiness_changes.asm
View File

@@ -9,12 +9,12 @@ HappinessChanges:
db -1, -1, -1 ; Lost to an enemy
db -5, -5, -10 ; Fainted due to poison
db -5, -5, -10 ; Lost to a much stronger enemy
db +1, +1, +1 ; Haircut (Y1)
db +3, +3, +1 ; Haircut (Y2)
db +5, +5, +2 ; Haircut (Y3)
db +1, +1, +1 ; Haircut (O1)
db +3, +3, +1 ; Haircut (O2)
db +10, +10, +4 ; Haircut (O3)
db +1, +1, +1 ; Haircut (older brother) 1
db +3, +3, +1 ; Haircut (older brother) 2
db +5, +5, +2 ; Haircut (older brother) 3
db +1, +1, +1 ; Haircut (younger brother) 1
db +3, +3, +1 ; Haircut (younger brother) 2
db +10, +10, +4 ; Haircut (younger brother) 3
db -5, -5, -10 ; Used Heal Powder or Energypowder (bitter)
db -10, -10, -15 ; Used Energy Root (bitter)
db -15, -15, -20 ; Used Revival Herb (bitter)

16
data/events/happiness_probabilities.asm
View File

@@ -1,12 +1,12 @@
HappinessData_YoungerHaircutBrother:
db $4c, 2, HAPPINESS_YOUNGCUT1 ; 30% chance
db $80, 3, HAPPINESS_YOUNGCUT2 ; 20% chance
db $ff, 4, HAPPINESS_YOUNGCUT3 ; 50% chance
HappinessData_OlderHaircutBrother:
db $9a, 2, HAPPINESS_OLDERCUT1 ; 60% chance
db $4c, 3, HAPPINESS_OLDERCUT2 ; 10% chance
db $ff, 4, HAPPINESS_OLDERCUT3 ; 30% chance
db $4c, 2, HAPPINESS_OLDERCUT1 ; 30% chance
db $80, 3, HAPPINESS_OLDERCUT2 ; 20% chance
db $ff, 4, HAPPINESS_OLDERCUT3 ; 50% chance
HappinessData_YoungerHaircutBrother:
db $9a, 2, HAPPINESS_YOUNGCUT1 ; 60% chance
db $4c, 3, HAPPINESS_YOUNGCUT2 ; 10% chance
db $ff, 4, HAPPINESS_YOUNGCUT3 ; 30% chance
HappinessData_DaisysGrooming:
db $ff, 2, HAPPINESS_GROOMING ; 99.6% chance