diff options
| author | dannye <33dannye@gmail.com> | 2020-05-20 19:40:33 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2020-05-20 20:02:53 -0500 |
| commit | 10f9559eab8c93b94abb8ae8d1083704ad4e169a (patch) | |
| tree | 7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /scripts/ceruleancity.asm | |
| parent | Merge pull request #39 from TiKevin83/master (diff) | |
| download | pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.gz pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.xz pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.zip | |
Sync with pokered
Diffstat (limited to '')
| -rwxr-xr-x | scripts/CeruleanCity.asm (renamed from scripts/ceruleancity.asm) | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/scripts/ceruleancity.asm b/scripts/CeruleanCity.asm index 4243d35c..c36b3dd6 100755 --- a/scripts/ceruleancity.asm +++ b/scripts/CeruleanCity.asm @@ -1,8 +1,8 @@ -CeruleanCityScript: +CeruleanCity_Script: call EnableAutoTextBoxDrawing - ld hl, CeruleanCityScriptPointers + ld hl, CeruleanCity_ScriptPointers ld a, [wCeruleanCityCurScript] - jp JumpTable + jp CallFunctionInTable CeruleanCityScript_1948c: xor a @@ -12,7 +12,7 @@ CeruleanCityScript_1948c: ld [wMissableObjectIndex], a predef_jump HideObject -CeruleanCityScriptPointers: +CeruleanCity_ScriptPointers: dw CeruleanCityScript0 dw CeruleanCityScript1 dw CeruleanCityScript2 @@ -111,10 +111,10 @@ CeruleanCityMovement1: db $FF CeruleanCityScript_1955d: - ld a,1 - ld [H_SPRITEINDEX],a + ld a, 1 + ld [H_SPRITEINDEX], a xor a ; SPRITE_FACING_DOWN - ld [hSpriteFacingDirection],a + ld [hSpriteFacingDirection], a jp SetSpriteFacingDirectionAndDelay ; face object CeruleanCityScript1: @@ -208,7 +208,7 @@ CeruleanCityScript3: ld [wCeruleanCityCurScript], a ret -CeruleanCityTextPointers: +CeruleanCity_TextPointers: dw CeruleanCityText1 dw CeruleanCityText2 dw CeruleanCityText3 @@ -301,9 +301,10 @@ CeruleanCityText_196d9: ReceivedTM28Text: TX_FAR _ReceivedTM28Text - db $0B + TX_SFX_ITEM_1 TX_FAR _ReceivedTM28Text2 - db $0D, "@" + TX_WAIT + db "@" TM28NoRoomText: TX_FAR _TM28NoRoomText @@ -337,13 +338,13 @@ CeruleanCityText6: CeruleanCityText7: TX_ASM ld a, [hRandomAdd] - cp $b4 + cp 180 jr c, .asm_e9fc9 ld hl, CeruleanCityText_19730 call PrintText jr .asm_d486e .asm_e9fc9 - cp $64 + cp 100 jr c, .asm_df99b ld hl, CeruleanCityText_19735 call PrintText @@ -369,19 +370,19 @@ CeruleanCityText_1973a: CeruleanCityText8: TX_ASM ld a, [hRandomAdd] - cp $b4 + cp 180 jr c, .asm_e28da ld hl, CeruleanCityText_1976f call PrintText jr .asm_f2f38 .asm_e28da - cp $78 + cp 120 jr c, .asm_15d08 ld hl, CeruleanCityText_19774 call PrintText jr .asm_f2f38 .asm_15d08 - cp $3c + cp 60 jr c, .asm_d7fea ld hl, CeruleanCityText_19779 call PrintText |