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/SaffronGym.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/SaffronGym.asm (renamed from scripts/saffrongym.asm) | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/scripts/saffrongym.asm b/scripts/SaffronGym.asm index f82b5ccd..0539d613 100755 --- a/scripts/saffrongym.asm +++ b/scripts/SaffronGym.asm @@ -1,11 +1,11 @@ -SaffronGymScript: +SaffronGym_Script: ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] call nz, .extra call EnableAutoTextBoxDrawing ld hl, SaffronGymTrainerHeader0 - ld de, SaffronGymScriptPointers + ld de, SaffronGym_ScriptPointers ld a, [wSaffronGymCurScript] call ExecuteCurMapScriptInTable ld [wSaffronGymCurScript], a @@ -29,7 +29,7 @@ SaffronGymText_5d048: ld [wCurMapScript], a ret -SaffronGymScriptPointers: +SaffronGym_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -70,7 +70,7 @@ SaffronGymText_5d068: jp SaffronGymText_5d048 -SaffronGymTextPointers: +SaffronGym_TextPointers: dw SaffronGymText1 dw SaffronGymText2 dw SaffronGymText3 @@ -84,7 +84,6 @@ SaffronGymTextPointers: dw SaffronGymText11 dw SaffronGymText12 -SaffronGymTrainerHeaders: SaffronGymTrainerHeader0: dbEventFlagBit EVENT_BEAT_SAFFRON_GYM_TRAINER_0 db ($3 << 4) ; trainer's view range @@ -189,8 +188,8 @@ SaffronGymText_5d162: SaffronGymText_5d167: TX_FAR _SaffronGymText_5d167 - db $11 ; play same sound as red giving oak parcel - db $6 ; wait for keypress + TX_SFX_KEY_ITEM ; actually plays the second channel of SFX_BALL_POOF due to the wrong music bank being loaded + TX_BLINK db "@" SaffronGymText_5d16e: @@ -203,7 +202,7 @@ SaffronGymText10: SaffronGymText11: TX_FAR ReceivedTM46Text - db $b + TX_SFX_ITEM_1 TX_FAR _TM46ExplanationText db "@" |