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/Route23.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/Route23.asm (renamed from scripts/route23.asm) | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/scripts/route23.asm b/scripts/Route23.asm index c2863f89..34d95b84 100755 --- a/scripts/route23.asm +++ b/scripts/Route23.asm @@ -1,9 +1,9 @@ -Route23Script: +Route23_Script: call Route23Script_511e9 call EnableAutoTextBoxDrawing - ld hl, Route23ScriptPointers + ld hl, Route23_ScriptPointers ld a, [wRoute23CurScript] - jp JumpTable + jp CallFunctionInTable Route23Script_511e9: ld hl, wCurrentMapScriptFlags @@ -12,14 +12,14 @@ Route23Script_511e9: ret z ResetEvents EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH1, EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH2 ResetEvents EVENT_VICTORY_ROAD_3_BOULDER_ON_SWITCH1, EVENT_VICTORY_ROAD_3_BOULDER_ON_SWITCH2 - ld a, HS_VICTORY_ROAD_3_BOULDER + ld a, HS_VICTORY_ROAD_3F_BOULDER ld [wMissableObjectIndex], a predef ShowObject - ld a, HS_VICTORY_ROAD_2_BOULDER + ld a, HS_VICTORY_ROAD_2F_BOULDER ld [wMissableObjectIndex], a predef_jump HideObject -Route23ScriptPointers: +Route23_ScriptPointers: dw Route23Script0 dw Route23Script1 dw Route23Script2 @@ -131,7 +131,7 @@ Route23Script2: ld [wRoute23CurScript], a ret -Route23TextPointers: +Route23_TextPointers: dw Route23Text1 dw Route23Text2 dw Route23Text3 @@ -227,7 +227,7 @@ VictoryRoadGuardText1: VictoryRoadGuardText2: TX_FAR _VictoryRoadGuardText2 - db $b + TX_SFX_ITEM_1 TX_FAR _VictoryRoadGuardText_513a3 db "@" |