diff options
| -rw-r--r-- | data/events/happiness_probabilities.asm | 8 | ||||
| -rw-r--r-- | data/pokemon/unown_words.asm | 2 | ||||
| -rw-r--r-- | home/text.asm | 3 | ||||
| -rw-r--r-- | maps/PlayersHouse2F.asm | 2 | ||||
| -rw-r--r-- | mobile/news/news.asm | 2 |
5 files changed, 9 insertions, 8 deletions
diff --git a/data/events/happiness_probabilities.asm b/data/events/happiness_probabilities.asm index 7a80f989e..fe4392aa6 100644 --- a/data/events/happiness_probabilities.asm +++ b/data/events/happiness_probabilities.asm @@ -1,12 +1,12 @@ HappinessData_OlderHaircutBrother: db $4c, 2, HAPPINESS_OLDERCUT1 ; 30% chance - db $80, 3, HAPPINESS_OLDERCUT2 ; 20% chance - db $ff, 4, HAPPINESS_OLDERCUT3 ; 50% chance + db $80, 3, HAPPINESS_OLDERCUT2 ; 50% chance + db $ff, 4, HAPPINESS_OLDERCUT3 ; 20% chance HappinessData_YoungerHaircutBrother: db $9a, 2, HAPPINESS_YOUNGCUT1 ; 60% chance - db $4c, 3, HAPPINESS_YOUNGCUT2 ; 10% chance - db $ff, 4, HAPPINESS_YOUNGCUT3 ; 30% chance + db $4c, 3, HAPPINESS_YOUNGCUT2 ; 30% chance + db $ff, 4, HAPPINESS_YOUNGCUT3 ; 10% chance HappinessData_DaisysGrooming: db $ff, 2, HAPPINESS_GROOMING ; 99.6% chance diff --git a/data/pokemon/unown_words.asm b/data/pokemon/unown_words.asm index 5b54b84ed..444c48d88 100644 --- a/data/pokemon/unown_words.asm +++ b/data/pokemon/unown_words.asm @@ -1,7 +1,7 @@ unownword: MACRO x = 1 rept STRLEN(\1) - db STRSUB(\1, x, 1) - $40 + db STRSUB(\1, x, 1) - "A" + $40 x = x + 1 endr db -1 diff --git a/home/text.asm b/home/text.asm index 82fdd7111..102209624 100644 --- a/home/text.asm +++ b/home/text.asm @@ -172,7 +172,8 @@ PlaceNextChar:: ld c, l pop hl ret - pop de + + pop de ; unused NextChar:: inc de diff --git a/maps/PlayersHouse2F.asm b/maps/PlayersHouse2F.asm index 02659d55b..4ea22f8f8 100644 --- a/maps/PlayersHouse2F.asm +++ b/maps/PlayersHouse2F.asm @@ -32,7 +32,7 @@ PlayersHouse2F_MapScripts: db 0, 0, 0 ; filler -Doll1Script: +Doll1Script:: describedecoration DECODESC_LEFT_DOLL Doll2Script: diff --git a/mobile/news/news.asm b/mobile/news/news.asm index 8875b0871..0aec6a35e 100644 --- a/mobile/news/news.asm +++ b/mobile/news/news.asm @@ -1,6 +1,6 @@ ; 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: ld a, BANK(s6_a000) |