diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2019-01-01 15:06:23 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2019-01-01 23:33:10 -0500 |
| commit | c7796024590fec48ac79756793c1a6e3b54daf8f (patch) | |
| tree | 0d61caa7ebe429995a61e800d1d78c3a82aec886 /scripts/lance.asm | |
| parent | Merge pull request #193 from luckytyphlosion/master (diff) | |
| download | pokeyellow-c7796024590fec48ac79756793c1a6e3b54daf8f.tar.gz pokeyellow-c7796024590fec48ac79756793c1a6e3b54daf8f.tar.xz pokeyellow-c7796024590fec48ac79756793c1a6e3b54daf8f.zip | |
Rename map files, labels, and constants to be consistent and work with Polished Map
Diffstat (limited to '')
| -rwxr-xr-x | scripts/LancesRoom.asm (renamed from scripts/lance.asm) | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/scripts/lance.asm b/scripts/LancesRoom.asm index a0b0e6e7..5e19ea7d 100755 --- a/scripts/lance.asm +++ b/scripts/LancesRoom.asm @@ -1,11 +1,11 @@ -LanceScript: +LancesRoom_Script: call LanceShowOrHideEntranceBlocks call EnableAutoTextBoxDrawing ld hl, LanceTrainerHeader0 - ld de, LanceScriptPointers - ld a, [wLanceCurScript] + ld de, LancesRoom_ScriptPointers + ld a, [wLancesRoomCurScript] call ExecuteCurMapScriptInTable - ld [wLanceCurScript], a + ld [wLancesRoomCurScript], a ret LanceShowOrHideEntranceBlocks: @@ -39,10 +39,10 @@ LanceSetEntranceBlock: ResetLanceScript: xor a - ld [wLanceCurScript], a + ld [wLancesRoomCurScript], a ret -LanceScriptPointers: +LancesRoom_ScriptPointers: dw LanceScript0 dw DisplayEnemyTrainerTextAndStartBattle dw LanceScript2 @@ -105,7 +105,7 @@ WalkToLance: ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $3 - ld [wLanceCurScript], a + ld [wLancesRoomCurScript], a ld [wCurMapScript], a ret @@ -123,11 +123,11 @@ LanceScript3: call Delay3 xor a ld [wJoyIgnore], a - ld [wLanceCurScript], a + ld [wLancesRoomCurScript], a ld [wCurMapScript], a ret -LanceTextPointers: +LancesRoom_TextPointers: dw LanceText1 LanceTrainerHeader0: |