diff options
| author | dannye <33dannye@gmail.com> | 2023-11-20 00:33:27 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2023-11-20 20:23:27 -0600 |
| commit | 298e99d3776580585c3f434e5d93137ae431bdd3 (patch) | |
| tree | a808c4ffd0fd0f9bd28972bae5236e0d3345c8e5 /scripts/CeruleanMelaniesHouse.asm | |
| parent | Add sound bits documentation for wOptions (#110) (diff) | |
| parent | Name 2 unnamed labels I missed in SeafoamIslandsB4F and PokemonMansion3F (#437) (diff) | |
| download | pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.gz pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.xz pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'scripts/CeruleanMelaniesHouse.asm')
| -rw-r--r-- | scripts/CeruleanMelaniesHouse.asm | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/scripts/CeruleanMelaniesHouse.asm b/scripts/CeruleanMelaniesHouse.asm index ca006506..eec62f92 100644 --- a/scripts/CeruleanMelaniesHouse.asm +++ b/scripts/CeruleanMelaniesHouse.asm @@ -3,12 +3,13 @@ CeruleanMelaniesHouse_Script: ret CeruleanMelaniesHouse_TextPointers: - dw CeruleanHouse1Text1 - dw CeruleanHouse1Text2 - dw CeruleanHouse1Text3 - dw CeruleanHouse1Text4 + def_text_pointers + dw_const CeruleanMelanieHouseMelanieText, TEXT_CERULEANMELANIESHOUSE_MELANIE + dw_const CeruleanMelanieHouseBulbasaurText, TEXT_CERULEANMELANIESHOUSE_BULBASAUR + dw_const CeruleanMelanieHouseOddishText, TEXT_CERULEANMELANIESHOUSE_ODDISH + dw_const CeruleanMelanieHouseSandshrewText, TEXT_CERULEANMELANIESHOUSE_SANDSHREW -CeruleanHouse1Text1: +CeruleanMelanieHouseMelanieText: text_asm ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a @@ -84,21 +85,21 @@ CeruleanHouse1Text_1cfdf: text_waitbutton text_end -CeruleanHouse1Text2: +CeruleanMelanieHouseBulbasaurText: text_far MelanieBulbasaurText text_asm ld a, BULBASAUR call PlayCry jp TextScriptEnd -CeruleanHouse1Text3: +CeruleanMelanieHouseOddishText: text_far MelanieOddishText text_asm ld a, ODDISH call PlayCry jp TextScriptEnd -CeruleanHouse1Text4: +CeruleanMelanieHouseSandshrewText: text_far MelanieSandshrewText text_asm ld a, SANDSHREW |