diff options
| author | dannye <33dannye@gmail.com> | 2020-05-20 19:40:33 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2020-05-20 20:02:53 -0500 |
| commit | 10f9559eab8c93b94abb8ae8d1083704ad4e169a (patch) | |
| tree | 7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /scripts/lorelei.asm | |
| parent | Merge pull request #39 from TiKevin83/master (diff) | |
| download | pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.gz pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.xz pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.zip | |
Sync with pokered
Diffstat (limited to '')
| -rwxr-xr-x | scripts/LoreleisRoom.asm (renamed from scripts/lorelei.asm) | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/scripts/lorelei.asm b/scripts/LoreleisRoom.asm index 60be524d..81142377 100755 --- a/scripts/lorelei.asm +++ b/scripts/LoreleisRoom.asm @@ -1,11 +1,11 @@ -LoreleiScript: +LoreleisRoom_Script: call LoreleiShowOrHideExitBlock call EnableAutoTextBoxDrawing - ld hl, LoreleiTrainerHeaders - ld de, LoreleiScriptPointers - ld a, [wLoreleiCurScript] + ld hl, LoreleiTrainerHeader0 + 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,11 +115,10 @@ LoreleiScript2: ld [hSpriteIndexOrTextID], a jp DisplayTextID -LoreleiTextPointers: +LoreleisRoom_TextPointers: dw LoreleiText1 dw LoreleiDontRunAwayText -LoreleiTrainerHeaders: LoreleiTrainerHeader0: dbEventFlagBit EVENT_BEAT_LORELEIS_ROOM_TRAINER_0 db ($0 << 4) ; trainer's view range |