diff options
Diffstat (limited to '')
| -rwxr-xr-x | scripts/Route20.asm (renamed from scripts/route20.asm) | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/scripts/route20.asm b/scripts/Route20.asm index 53ff5e55..081a723e 100755 --- a/scripts/route20.asm +++ b/scripts/Route20.asm @@ -1,9 +1,9 @@ -Route20Script: +Route20_Script: CheckAndResetEvent EVENT_IN_SEAFOAM_ISLANDS call nz, Route20Script_50cc6 call EnableAutoTextBoxDrawing ld hl, Route20TrainerHeader0 - ld de, Route20ScriptPointers + ld de, Route20_ScriptPointers ld a, [wRoute20CurScript] call ExecuteCurMapScriptInTable ld [wRoute20CurScript], a @@ -12,9 +12,9 @@ Route20Script: Route20Script_50cc6: CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE jr z, .asm_50cef - ld a, HS_SEAFOAM_ISLANDS_1_BOULDER_1 + ld a, HS_SEAFOAM_ISLANDS_1F_BOULDER_1 call Route20Script_50d0c - ld a, HS_SEAFOAM_ISLANDS_1_BOULDER_2 + ld a, HS_SEAFOAM_ISLANDS_1F_BOULDER_2 call Route20Script_50d0c ld hl, .MissableObjectIDs .asm_50cdc @@ -27,24 +27,24 @@ Route20Script_50cc6: jr .asm_50cdc .MissableObjectIDs: - db HS_SEAFOAM_ISLANDS_2_BOULDER_1 - db HS_SEAFOAM_ISLANDS_2_BOULDER_2 - db HS_SEAFOAM_ISLANDS_3_BOULDER_1 - db HS_SEAFOAM_ISLANDS_3_BOULDER_2 - db HS_SEAFOAM_ISLANDS_4_BOULDER_3 - db HS_SEAFOAM_ISLANDS_4_BOULDER_4 + db HS_SEAFOAM_ISLANDS_B1F_BOULDER_1 + db HS_SEAFOAM_ISLANDS_B1F_BOULDER_2 + db HS_SEAFOAM_ISLANDS_B2F_BOULDER_1 + db HS_SEAFOAM_ISLANDS_B2F_BOULDER_2 + db HS_SEAFOAM_ISLANDS_B3F_BOULDER_3 + db HS_SEAFOAM_ISLANDS_B3F_BOULDER_4 db $FF .asm_50cef CheckBothEventsSet EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM4_BOULDER2_DOWN_HOLE ret z - ld a, HS_SEAFOAM_ISLANDS_4_BOULDER_1 + ld a, HS_SEAFOAM_ISLANDS_B3F_BOULDER_1 call Route20Script_50d0c - ld a, HS_SEAFOAM_ISLANDS_4_BOULDER_2 + ld a, HS_SEAFOAM_ISLANDS_B3F_BOULDER_2 call Route20Script_50d0c - ld a, HS_SEAFOAM_ISLANDS_5_BOULDER_1 + ld a, HS_SEAFOAM_ISLANDS_B4F_BOULDER_1 call Route20Script_50d14 - ld a, HS_SEAFOAM_ISLANDS_5_BOULDER_2 + ld a, HS_SEAFOAM_ISLANDS_B4F_BOULDER_2 call Route20Script_50d14 ret @@ -56,12 +56,12 @@ Route20Script_50d14: ld [wMissableObjectIndex], a predef_jump HideObject -Route20ScriptPointers: +Route20_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route20TextPointers: +Route20_TextPointers: dw Route20Text1 dw Route20Text2 dw Route20Text3 |