diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-05-30 17:34:50 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-05-30 17:34:50 -0400 |
| commit | b3eadb3508d97f48bda3f14c15378df24942719a (patch) | |
| tree | 93e9c3fa4cb0e821dfe5e430c1b3246b371fb51e /scripts | |
| parent | bb9c72cbc5f2d02ab38764ece3583ee093b60b2d (diff) | |
| parent | ce62dca69be6c316f0cd549a498ff04aaeef8d4d (diff) | |
Merge remote-tracking branch 'remotes/pokered/master'
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/CeladonMansion1F_2.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/scripts/CeladonMansion1F_2.asm b/scripts/CeladonMansion1F_2.asm index 70bf6c88..4cddf268 100644 --- a/scripts/CeladonMansion1F_2.asm +++ b/scripts/CeladonMansion1F_2.asm @@ -45,13 +45,13 @@ Func_f1ea2: ret PikachuHappinessThresholds_f1eb9: - dw 51, CeladonMansion1Text_f1ed5 - dw 101, CeladonMansion1Text_f1eda - dw 131, CeladonMansion1Text_f1edf - dw 161, CeladonMansion1Text_f1ee4 - dw 201, CeladonMansion1Text_f1ee9 - dw 255, CeladonMansion1Text_f1eee - dbbw 0, $ff, CeladonMansion1Text_f1eee + dw 51, CeladonMansion1Text_f1ed5 + dw 101, CeladonMansion1Text_f1eda + dw 131, CeladonMansion1Text_f1edf + dw 161, CeladonMansion1Text_f1ee4 + dw 201, CeladonMansion1Text_f1ee9 + dw 255, CeladonMansion1Text_f1eee + dw -256, CeladonMansion1Text_f1eee CeladonMansion1Text_f1ed5: text_far _CeladonMansion1Text7 |