From b69526a90818e0ac103274c6d8d3f424f49f207c Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 5 May 2020 09:55:19 -0400 Subject: [PATCH 1/2] Miscellaneous fixes Addresses the haircut brothers' probability comments in #709 --- data/events/happiness_probabilities.asm | 8 ++++---- data/pokemon/unown_words.asm | 2 +- home/text.asm | 3 ++- maps/PlayersHouse2F.asm | 2 +- 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) From 905833ef8c4ffeffffdafb3a23628521279e87e0 Mon Sep 17 00:00:00 2001 From: Rangi Date: Wed, 6 May 2020 10:34:51 -0400 Subject: [PATCH 2/2] Use a FIRST_UNOWN_CHAR constant for the Unown font --- constants/text_constants.asm | 3 +++ data/pokemon/unown_words.asm | 2 +- engine/pokedex/pokedex.asm | 6 +++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/constants/text_constants.asm b/constants/text_constants.asm index f1c3a0bf7..dbe06a36b 100644 --- a/constants/text_constants.asm +++ b/constants/text_constants.asm @@ -44,3 +44,6 @@ PRINTNUM_LEADINGZEROS EQU 1 << PRINTNUM_LEADINGZEROS_F ; character sets (see charmap.asm) FIRST_REGULAR_TEXT_CHAR EQU $60 FIRST_HIRAGANA_DAKUTEN_CHAR EQU $20 + +; gfx/font/unown_font.png +FIRST_UNOWN_CHAR EQU $40 diff --git a/data/pokemon/unown_words.asm b/data/pokemon/unown_words.asm index 444c48d88..6ddd0f466 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) - "A" + $40 + db STRSUB(\1, x, 1) - "A" + FIRST_UNOWN_CHAR x = x + 1 endr db -1 diff --git a/engine/pokedex/pokedex.asm b/engine/pokedex/pokedex.asm index 6f500bc37..e60ba1450 100644 --- a/engine/pokedex/pokedex.asm +++ b/engine/pokedex/pokedex.asm @@ -887,7 +887,7 @@ Pokedex_UnownModeEraseCursor: Pokedex_UnownModePlaceCursor: ld a, [wDexCurUnownIndex] - ld c, $5a ; diamond cursor + ld c, FIRST_UNOWN_CHAR + NUM_UNOWN ; diamond cursor Pokedex_UnownModeUpdateCursorGfx: ld e, a @@ -1333,7 +1333,7 @@ endr ld h, [hl] ld l, a pop af - add $40 - 1 ; Unown A + add FIRST_UNOWN_CHAR - 1 ; Unown A ld [hl], a inc de inc b @@ -2489,7 +2489,7 @@ Pokedex_LoadUnownFont: ld bc, (NUM_UNOWN + 1) tiles call Pokedex_InvertTiles ld de, sScratch + $188 - ld hl, vTiles2 tile $40 + ld hl, vTiles2 tile FIRST_UNOWN_CHAR lb bc, BANK(Pokedex_LoadUnownFont), NUM_UNOWN + 1 call Request2bpp call CloseSRAM