diff options
| author | Rangi42 <remy.oukaour+rangi42@gmail.com> | 2023-11-18 19:44:03 -0500 |
|---|---|---|
| committer | Rangi42 <remy.oukaour+rangi42@gmail.com> | 2023-11-18 19:44:03 -0500 |
| commit | 26a342b104e48bede16b9e2324c2f8f57df5bd50 (patch) | |
| tree | 47dc8ca18fa2bbc8aee0f52c99d710d50ef45bd6 /scripts/Route23.asm | |
| parent | .calculateHPBarCoords incorrectly referenced OAM (diff) | |
| download | pokeyellow-26a342b104e48bede16b9e2324c2f8f57df5bd50.tar.gz pokeyellow-26a342b104e48bede16b9e2324c2f8f57df5bd50.tar.xz pokeyellow-26a342b104e48bede16b9e2324c2f8f57df5bd50.zip | |
Identify more map script labels
Diffstat (limited to 'scripts/Route23.asm')
| -rw-r--r-- | scripts/Route23.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/Route23.asm b/scripts/Route23.asm index 7863f8ac..044d5e50 100644 --- a/scripts/Route23.asm +++ b/scripts/Route23.asm @@ -26,25 +26,25 @@ Route23_ScriptPointers: dw_const Route23ResetToDefaultScript, SCRIPT_ROUTE23_RESET_TO_DEFAULT Route23DefaultScript: - ld hl, YCoordsData_51255 + ld hl, Route23GuardsYCoords ld a, [wYCoord] ld b, a ld e, $0 EventFlagBit c, EVENT_PASSED_EARTHBADGE_CHECK + 1, EVENT_PASSED_CASCADEBADGE_CHECK -.asm_51224 +.loop ld a, [hli] cp -1 ret z inc e dec c cp b - jr nz, .asm_51224 + jr nz, .loop cp 35 - jr nz, .asm_51237 + jr nz, .not_past_victory_road ld a, [wXCoord] cp 14 ret nc -.asm_51237 +.not_past_victory_road ld a, e ldh [hSpriteIndexOrTextID], a ld a, c @@ -61,7 +61,7 @@ Route23DefaultScript: ldh [hJoyHeld], a ret -YCoordsData_51255: +Route23GuardsYCoords: db 35 db 56 db 85 |