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/VermilionCity.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/VermilionCity.asm (renamed from scripts/vermilioncity.asm) | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/scripts/vermilioncity.asm b/scripts/VermilionCity.asm index 7127f814..a9336970 100755 --- a/scripts/vermilioncity.asm +++ b/scripts/VermilionCity.asm @@ -1,4 +1,4 @@ -VermilionCityScript: +VermilionCity_Script: call EnableAutoTextBoxDrawing ld hl, wd492 res 7, [hl] @@ -6,18 +6,18 @@ VermilionCityScript: bit 6, [hl] res 6, [hl] push hl - call nz, InitCityScript + call nz, .initCityScript pop hl bit 5, [hl] res 5, [hl] - call nz, SetFirstLockTrashCanIndex - ld hl, VermilionCityScriptPointers + call nz, .setFirstLockTrashCanIndex + ld hl, VermilionCity_ScriptPointers ld a, [wVermilionCityCurScript] - call JumpTable - call VermilionCityScript_19869 + call CallFunctionInTable + call .vermilionCityScript_19869 ret -VermilionCityScript_19869: +.vermilionCityScript_19869 CheckEventHL EVENT_152 ret nz CheckEventReuseHL EVENT_GOT_BIKE_VOUCHER @@ -25,7 +25,7 @@ VermilionCityScript_19869: SetEventReuseHL EVENT_152 ret -SetFirstLockTrashCanIndex: +.setFirstLockTrashCanIndex call Random ld a, [hRandomAdd] ld b, a @@ -35,7 +35,7 @@ SetFirstLockTrashCanIndex: ld [wFirstLockTrashCanIndex], a ret -InitCityScript: +.initCityScript CheckEventHL EVENT_SS_ANNE_LEFT ret z CheckEventReuseHL EVENT_WALKED_PAST_GUARD_AFTER_SS_ANNE_LEFT @@ -45,7 +45,7 @@ InitCityScript: ld [wVermilionCityCurScript], a ret -VermilionCityScriptPointers: +VermilionCity_ScriptPointers: dw VermilionCityScript0 dw VermilionCityScript1 dw VermilionCityScript2 @@ -131,7 +131,7 @@ VermilionCityScript1: ld [wVermilionCityCurScript], a ret -VermilionCityTextPointers: +VermilionCity_TextPointers: dw VermilionCityText1 dw VermilionCityText2 dw VermilionCityText3 @@ -209,7 +209,7 @@ VermilionCityText3: .end jp TextScriptEnd -.inFrontOfOrBehindGuardCoords: +.inFrontOfOrBehindGuardCoords db $1d,$13 ; y, x of tile in front of guard db $1f,$13 ; y, x of tile behind guard db $ff |