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/SSAnne2FRooms.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/SSAnne2FRooms.asm (renamed from scripts/ssanne9.asm) | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/scripts/ssanne9.asm b/scripts/SSAnne2FRooms.asm index 6e658e5f..fb57cf37 100755 --- a/scripts/ssanne9.asm +++ b/scripts/SSAnne2FRooms.asm @@ -1,18 +1,18 @@ -SSAnne9Script: +SSAnne2FRooms_Script: call DisableAutoTextBoxDrawing - ld hl, SSAnne9TrainerHeaders - ld de, SSAnne9ScriptPointers - ld a, [wSSAnne9CurScript] + ld hl, SSAnne9TrainerHeader0 + ld de, SSAnne2FRooms_ScriptPointers + ld a, [wSSAnne2FRoomsCurScript] call ExecuteCurMapScriptInTable - ld [wSSAnne9CurScript], a + ld [wSSAnne2FRoomsCurScript], a ret -SSAnne9ScriptPointers: +SSAnne2FRooms_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -SSAnne9TextPointers: +SSAnne2FRooms_TextPointers: dw SSAnne9Text1 dw SSAnne9Text2 dw SSAnne9Text3 @@ -27,7 +27,6 @@ SSAnne9TextPointers: dw SSAnne9Text12 dw SSAnne9Text13 -SSAnne9TrainerHeaders: SSAnne9TrainerHeader0: dbEventFlagBit EVENT_BEAT_SS_ANNE_9_TRAINER_0 db ($2 << 4) ; trainer's view range |