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/lorelei.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/LoreleisRoom.asm (renamed from scripts/lorelei.asm) | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/scripts/lorelei.asm b/scripts/LoreleisRoom.asm index ec29847a..81142377 100755 --- a/scripts/lorelei.asm +++ b/scripts/LoreleisRoom.asm @@ -1,11 +1,11 @@ -LoreleiScript: +LoreleisRoom_Script: call LoreleiShowOrHideExitBlock call EnableAutoTextBoxDrawing ld hl, LoreleiTrainerHeader0 - ld de, LoreleiScriptPointers - ld a, [wLoreleiCurScript] + ld de, LoreleisRoom_ScriptPointers + ld a, [wLoreleisRoomCurScript] call ExecuteCurMapScriptInTable - ld [wLoreleiCurScript], a + ld [wLoreleisRoomCurScript], a ret LoreleiShowOrHideExitBlock: @@ -29,10 +29,10 @@ LoreleiShowOrHideExitBlock: ResetLoreleiScript: xor a - ld [wLoreleiCurScript], a + ld [wLoreleisRoomCurScript], a ret -LoreleiScriptPointers: +LoreleisRoom_ScriptPointers: dw LoreleiScript0 dw DisplayEnemyTrainerTextAndStartBattle dw LoreleiScript2 @@ -56,7 +56,7 @@ LoreleiScriptWalkIntoRoom: ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $3 - ld [wLoreleiCurScript], a + ld [wLoreleisRoomCurScript], a ld [wCurMapScript], a ret @@ -84,7 +84,7 @@ LoreleiScript0: ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $3 - ld [wLoreleiCurScript], a + ld [wLoreleisRoomCurScript], a ld [wCurMapScript], a ret @@ -102,7 +102,7 @@ LoreleiScript3: call Delay3 xor a ld [wJoyIgnore], a - ld [wLoreleiCurScript], a + ld [wLoreleisRoomCurScript], a ld [wCurMapScript], a ret @@ -115,7 +115,7 @@ LoreleiScript2: ld [hSpriteIndexOrTextID], a jp DisplayTextID -LoreleiTextPointers: +LoreleisRoom_TextPointers: dw LoreleiText1 dw LoreleiDontRunAwayText |