diff options
Diffstat (limited to '')
| -rwxr-xr-x | scripts/LancesRoom.asm (renamed from scripts/lance.asm) | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/scripts/lance.asm b/scripts/LancesRoom.asm index 7d67f6cd..aec555a3 100755 --- a/scripts/lance.asm +++ b/scripts/LancesRoom.asm @@ -1,11 +1,11 @@ -LanceScript: +LancesRoom_Script: call LanceShowOrHideEntranceBlocks call EnableAutoTextBoxDrawing - ld hl, LanceTrainerHeaders - ld de, LanceScriptPointers - ld a, [wLanceCurScript] + ld hl, LanceTrainerHeader0 + ld de, LancesRoom_ScriptPointers + ld a, [wLancesRoomCurScript] call ExecuteCurMapScriptInTable - ld [wLanceCurScript], a + ld [wLancesRoomCurScript], a ret LanceShowOrHideEntranceBlocks: @@ -38,10 +38,10 @@ LanceShowOrHideEntranceBlocks: ResetLanceScript: xor a - ld [wLanceCurScript], a + ld [wLancesRoomCurScript], a ret -LanceScriptPointers: +LancesRoom_ScriptPointers: dw LanceScript0 dw DisplayEnemyTrainerTextAndStartBattle dw LanceScript2 @@ -104,7 +104,7 @@ WalkToLance: ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $3 - ld [wLanceCurScript], a + ld [wLancesRoomCurScript], a ld [wCurMapScript], a ret @@ -122,14 +122,13 @@ LanceScript3: call Delay3 xor a ld [wJoyIgnore], a - ld [wLanceCurScript], a + ld [wLancesRoomCurScript], a ld [wCurMapScript], a ret -LanceTextPointers: +LancesRoom_TextPointers: dw LanceText1 -LanceTrainerHeaders: LanceTrainerHeader0: dbEventFlagBit EVENT_BEAT_LANCES_ROOM_TRAINER_0 db ($0 << 4) ; trainer's view range |