pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Miscellaneous fixes

Browse Source 
Addresses the haircut brothers' probability comments in #709
This commit is contained in:
Rangi 2020-05-05 09:55:19 -04:00
parent d47c560367
commit b69526a908
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
data/events/happiness_probabilities.asm
View File

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

2
data/pokemon/unown_words.asm
View File

@ -1,7 +1,7 @@
unownword: MACRO unownword: MACRO
x = 1 x = 1
rept STRLEN(\1) rept STRLEN(\1)
db STRSUB(\1, x, 1) - $40 db STRSUB(\1, x, 1) - "A" + $40
x = x + 1 x = x + 1
endr endr
db -1 db -1

3
home/text.asm
View File

@ -172,7 +172,8 @@ PlaceNextChar::
ld c, l ld c, l
pop hl pop hl
ret ret
pop de
pop de ; unused
NextChar:: NextChar::
inc de inc de

2
maps/PlayersHouse2F.asm
View File

@ -32,7 +32,7 @@ PlayersHouse2F_MapScripts:
db 0, 0, 0 ; filler db 0, 0, 0 ; filler
Doll1Script: Doll1Script::
describedecoration DECODESC_LEFT_DOLL describedecoration DECODESC_LEFT_DOLL
Doll2Script: Doll2Script:

2
mobile/news/news.asm
View File

@ -1,6 +1,6 @@
; http://forums.glitchcity.info/index.php?topic=7509.msg206449#msg206449 ; http://forums.glitchcity.info/index.php?topic=7509.msg206449#msg206449
db $cc, $6b, $1e ; unused dab Doll1Script ; related to "My Room" in Stadium 2?
Unreferenced_Function1f4003: Unreferenced_Function1f4003:
ld a, BANK(s6_a000) ld a, BANK(s6_a000)