Bug fixes

- Fixes a bug where the Game Corner poster would pretend to be an Arbok. Very effective disguise.
- Fixes some text in Celadon University that would simply look odd. I need to use hyphens more, the rest of the game does it!
- Decapitalised the "normal-type" in Viridian Pre-Gym to match the rest of the game.
- Changed some SFX cues to use the level-up sound, but it's clearly crysaudio that causes this. Will talk with Dannye.
This commit is contained in:
Llinos Evans 2023-06-12 12:48:08 +01:00
parent 98110eddc8
commit 62059aafd5
7 changed files with 14 additions and 15 deletions

View file

@ -7,7 +7,7 @@ GameCorner_Object:
warp_event 17, 4, ROCKET_HIDEOUT_B1F, 2
def_bg_events
bg_event 9, 4, 12 ; CeladonGameCornerText12
bg_event 9, 4, 13 ; CeladonGameCornerText12
def_object_events
object_event 2, 6, SPRITE_BEAUTY, STAY, DOWN, 1 ; person
@ -21,6 +21,6 @@ GameCorner_Object:
object_event 14, 11, SPRITE_CLERK, STAY, LEFT, 9 ; person
object_event 17, 13, SPRITE_GENTLEMAN, STAY, RIGHT, 10 ; person
object_event 9, 5, SPRITE_ROCKET, STAY, UP, 11, OPP_ROCKET, 7
object_event 6, 6, SPRITE_ARBOK, STAY, DOWN, 14 ; Arbok attendant
object_event 6, 6, SPRITE_ARBOK, STAY, DOWN, 12 ; Arbok attendant
def_warps_to GAME_CORNER

View file

@ -334,7 +334,7 @@ ReviveText:
RareCandyText:
text_far _RareCandyText
sound_get_item_1 ; probably supposed to play SFX_LEVEL_UP but the wrong music bank is loaded
sound_level_up ; probably supposed to play SFX_LEVEL_UP but the wrong music bank is loaded
text_promptbutton
text_end

View file

@ -185,7 +185,7 @@ TryingToLearn:
LearnedMove1Text:
text_far _LearnedMove1Text
sound_get_item_1 ; plays SFX_GET_ITEM_1 in the party menu (rare candy) and plays SFX_LEVEL_UP in battle
sound_level_up ; plays SFX_GET_ITEM_1 in the party menu (rare candy) and plays SFX_LEVEL_UP in battle
text_promptbutton
text_end

View file

@ -56,7 +56,7 @@ CeladonGameCornerScript1:
jp z, CeladonGameCornerScript_48c07
ld a, $f0
ld [wJoyIgnore], a
ld a, $d
ld a, $e ; was d, accounting for arbok
ldh [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, $b
@ -128,9 +128,9 @@ GameCorner_TextPointers:
dw CeladonGameCornerText9
dw CeladonGameCornerText10
dw CeladonGameCornerText11
dw GameCornerArbok
dw CeladonGameCornerText12
dw CeladonGameCornerText13
dw GameCornerArbok
CeladonGameCornerText1:
text_far _CeladonGameCornerText1

View file

@ -63,8 +63,8 @@ _BookcaseText1::
_BookcaseText2::
text "In 1899, PROF."
line "WESTWOOD of Japan"
cont "discovered"
cont "#MON evolution,"
cont "discovered #-"
cont "MON evolution,"
cont "documenting 50"
cont "species."
@ -90,9 +90,8 @@ _BookcaseText3::
text "The modern #"
line "BALL was made by"
cont "researchers at"
cont "CELADON"
cont "UNIVERSITY"
cont "in 1925."
cont "CELADON UNIVER-"
cont "SITY in 1925."
done

View file

@ -44,8 +44,8 @@ _CeladonUniversityOutsideLoseText3::
_CeladonUniversityOutsideLoseText4::
text "One"
line "day I'll"
cont "beat you!"
line "day I'll beat"
cont "you!"
prompt
_CeladonUniversityOutsideWinText::

View file

@ -65,7 +65,7 @@ _YujirouAfterBattleText2::
para "..."
para "I had all the"
line "best NORMAL-"
line "best normal-"
cont "type #MON."
para "Maybe it's me?"
@ -75,7 +75,7 @@ _YujirouAfterBattleText2::
_ViridianPreGymBattleText1::
text "Did you know that"
line "the best #MON"
cont "are NORMAL-type?"
cont "are normal-type?"
done
_ViridianPreGymEndBattleText1::