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/agatha.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/AgathasRoom.asm (renamed from scripts/agatha.asm) | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/scripts/agatha.asm b/scripts/AgathasRoom.asm index 6f611071..20245166 100755 --- a/scripts/agatha.asm +++ b/scripts/AgathasRoom.asm @@ -1,11 +1,11 @@ -AgathaScript: +AgathasRoom_Script: call AgathaShowOrHideExitBlock call EnableAutoTextBoxDrawing - ld hl, AgathaTrainerHeaders - ld de, AgathaScriptPointers - ld a, [wAgathaCurScript] + ld hl, AgathaTrainerHeader0 + ld de, AgathasRoom_ScriptPointers + ld a, [wAgathasRoomCurScript] call ExecuteCurMapScriptInTable - ld [wAgathaCurScript], a + ld [wAgathasRoomCurScript], a ret AgathaShowOrHideExitBlock: @@ -28,10 +28,10 @@ AgathaShowOrHideExitBlock: ResetAgathaScript: xor a - ld [wAgathaCurScript], a + ld [wAgathasRoomCurScript], a ret -AgathaScriptPointers: +AgathasRoom_ScriptPointers: dw AgathaScript0 dw DisplayEnemyTrainerTextAndStartBattle dw AgathaScript2 @@ -55,7 +55,7 @@ AgathaScriptWalkIntoRoom: ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $3 - ld [wAgathaCurScript], a + ld [wAgathasRoomCurScript], a ld [wCurMapScript], a ret @@ -83,7 +83,7 @@ AgathaScript0: ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $3 - ld [wAgathaCurScript], a + ld [wAgathasRoomCurScript], a ld [wCurMapScript], a ret @@ -101,7 +101,7 @@ AgathaScript3: call Delay3 xor a ld [wJoyIgnore], a - ld [wAgathaCurScript], a + ld [wAgathasRoomCurScript], a ld [wCurMapScript], a ret @@ -114,14 +114,13 @@ AgathaScript2: ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $1 - ld [wGaryCurScript], a + ld [wChampionsRoomCurScript], a ret -AgathaTextPointers: +AgathasRoom_TextPointers: dw AgathaText1 dw AgathaDontRunAwayText -AgathaTrainerHeaders: AgathaTrainerHeader0: dbEventFlagBit EVENT_BEAT_AGATHAS_ROOM_TRAINER_0 db ($0 << 4) ; trainer's view range |