mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2024-09-09 09:51:34 -07:00
Correct the older+younger haircut brothers' labels and constants
This commit is contained in:
parent
7db6c59211
commit
b24cd55f96
@ -187,12 +187,12 @@ const_value = 1
|
||||
const HAPPINESS_FAINTED ; 06
|
||||
const HAPPINESS_POISONFAINT ; 07
|
||||
const HAPPINESS_BEATENBYSTRONGFOE ; 08
|
||||
const HAPPINESS_YOUNGCUT1 ; 09
|
||||
const HAPPINESS_YOUNGCUT2 ; 0a
|
||||
const HAPPINESS_YOUNGCUT3 ; 0b
|
||||
const HAPPINESS_OLDERCUT1 ; 0c
|
||||
const HAPPINESS_OLDERCUT2 ; 0d
|
||||
const HAPPINESS_OLDERCUT3 ; 0e
|
||||
const HAPPINESS_OLDERCUT1 ; 09
|
||||
const HAPPINESS_OLDERCUT2 ; 0a
|
||||
const HAPPINESS_OLDERCUT3 ; 0b
|
||||
const HAPPINESS_YOUNGCUT1 ; 0c
|
||||
const HAPPINESS_YOUNGCUT2 ; 0d
|
||||
const HAPPINESS_YOUNGCUT3 ; 0e
|
||||
const HAPPINESS_BITTERPOWDER ; 0f
|
||||
const HAPPINESS_ENERGYROOT ; 10
|
||||
const HAPPINESS_REVIVALHERB ; 11
|
||||
|
@ -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)
|
||||
|
@ -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
|
||||
|
@ -108,8 +108,8 @@ SpecialsPointers::
|
||||
add_special LoadUsedSpritesGFX
|
||||
add_special PlaySlowCry
|
||||
add_special SnorlaxAwake ; $60
|
||||
add_special YoungerHaircutBrother
|
||||
add_special OlderHaircutBrother
|
||||
add_special YoungerHaircutBrother
|
||||
add_special DaisysGrooming
|
||||
add_special PlayCurMonCry
|
||||
add_special ProfOaksPCBoot
|
||||
|
@ -12,14 +12,14 @@ BillsGrandfather:
|
||||
ld [wScriptVar], a
|
||||
ret
|
||||
|
||||
YoungerHaircutBrother:
|
||||
ld hl, HappinessData_YoungerHaircutBrother
|
||||
jr HaircutOrGrooming
|
||||
|
||||
OlderHaircutBrother:
|
||||
ld hl, HappinessData_OlderHaircutBrother
|
||||
jr HaircutOrGrooming
|
||||
|
||||
YoungerHaircutBrother:
|
||||
ld hl, HappinessData_YoungerHaircutBrother
|
||||
jr HaircutOrGrooming
|
||||
|
||||
DaisysGrooming:
|
||||
ld hl, HappinessData_DaisysGrooming
|
||||
; fallthrough
|
||||
|
@ -201,7 +201,7 @@ OlderHaircutBrotherScript:
|
||||
ifequal HAVE_LESS, .NotEnoughMoney
|
||||
writetext GoldenrodUndergroundOlderHaircutBrotherAskWhichMonText
|
||||
buttonsound
|
||||
special YoungerHaircutBrother
|
||||
special OlderHaircutBrother
|
||||
ifequal $0, .Refused
|
||||
ifequal $1, .Refused
|
||||
setflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT
|
||||
@ -284,7 +284,7 @@ YoungerHaircutBrotherScript:
|
||||
ifequal HAVE_LESS, .NotEnoughMoney
|
||||
writetext GoldenrodUndergroundYoungerHaircutBrotherAskWhichMonText
|
||||
buttonsound
|
||||
special OlderHaircutBrother
|
||||
special YoungerHaircutBrother
|
||||
ifequal $0, .Refused
|
||||
ifequal $1, .Refused
|
||||
setflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT
|
||||
|
Loading…
Reference in New Issue
Block a user