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/bruno.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/BrunosRoom.asm (renamed from scripts/bruno.asm) | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/scripts/bruno.asm b/scripts/BrunosRoom.asm index a10a1e49..a525e5bb 100755 --- a/scripts/bruno.asm +++ b/scripts/BrunosRoom.asm @@ -1,11 +1,11 @@ -BrunoScript: +BrunosRoom_Script: call BrunoShowOrHideExitBlock call EnableAutoTextBoxDrawing - ld hl, BrunoTrainerHeaders - ld de, BrunoScriptPointers - ld a, [wBrunoCurScript] + ld hl, BrunoTrainerHeader0 + ld de, BrunosRoom_ScriptPointers + ld a, [wBrunosRoomCurScript] call ExecuteCurMapScriptInTable - ld [wBrunoCurScript], a + ld [wBrunosRoomCurScript], a ret BrunoShowOrHideExitBlock: @@ -28,10 +28,10 @@ BrunoShowOrHideExitBlock: ResetBrunoScript: xor a - ld [wBrunoCurScript], a + ld [wBrunosRoomCurScript], a ret -BrunoScriptPointers: +BrunosRoom_ScriptPointers: dw BrunoScript0 dw DisplayEnemyTrainerTextAndStartBattle dw BrunoScript2 @@ -55,7 +55,7 @@ BrunoScriptWalkIntoRoom: ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $3 - ld [wBrunoCurScript], a + ld [wBrunosRoomCurScript], a ld [wCurMapScript], a ret @@ -83,7 +83,7 @@ BrunoScript0: ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $3 - ld [wBrunoCurScript], a + ld [wBrunosRoomCurScript], a ld [wCurMapScript], a ret @@ -101,7 +101,7 @@ BrunoScript3: call Delay3 xor a ld [wJoyIgnore], a - ld [wBrunoCurScript], a + ld [wBrunosRoomCurScript], a ld [wCurMapScript], a ret @@ -114,11 +114,10 @@ BrunoScript2: ld [hSpriteIndexOrTextID], a jp DisplayTextID -BrunoTextPointers: +BrunosRoom_TextPointers: dw BrunoText1 dw BrunoDontRunAwayText -BrunoTrainerHeaders: BrunoTrainerHeader0: dbEventFlagBit EVENT_BEAT_BRUNOS_ROOM_TRAINER_0 db ($0 << 4) ; trainer's view range |