ref: b24cd55f968909c3ec29c6455a32463c987f3063
parent: 7db6c5921185f139a78f1c290ffb1a2a538b1b01
author: Rangi <[email protected]>
date: Sat May 18 09:27:32 EDT 2019
Correct the older+younger haircut brothers' labels and constants
--- a/constants/pokemon_data_constants.asm
+++ b/constants/pokemon_data_constants.asm
@@ -187,12 +187,12 @@
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
--- a/data/events/happiness_changes.asm
+++ b/data/events/happiness_changes.asm
@@ -9,12 +9,12 @@
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)
--- a/data/events/happiness_probabilities.asm
+++ b/data/events/happiness_probabilities.asm
@@ -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
--- a/data/special_pointers.asm
+++ b/data/special_pointers.asm
@@ -108,8 +108,8 @@
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
--- a/engine/events/haircut.asm
+++ b/engine/events/haircut.asm
@@ -12,12 +12,12 @@
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:
--- a/maps/GoldenrodUnderground.asm
+++ b/maps/GoldenrodUnderground.asm
@@ -201,7 +201,7 @@
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 @@
ifequal HAVE_LESS, .NotEnoughMoney
writetext GoldenrodUndergroundYoungerHaircutBrotherAskWhichMonText
buttonsound
- special OlderHaircutBrother
+ special YoungerHaircutBrother
ifequal $0, .Refused
ifequal $1, .Refused
setflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT