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/PewterGym.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/PewterGym.asm (renamed from scripts/pewtergym.asm) | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/scripts/pewtergym.asm b/scripts/PewterGym.asm index f9fc4ed2..4ddec77e 100755 --- a/scripts/pewtergym.asm +++ b/scripts/PewterGym.asm @@ -1,11 +1,11 @@ -PewterGymScript: +PewterGym_Script: ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] call nz, PewterGymScript_5c3a4 call EnableAutoTextBoxDrawing - ld hl, PewterGymTrainerHeaders - ld de, PewterGymScriptPointers + ld hl, PewterGymTrainerHeader0 + ld de, PewterGym_ScriptPointers ld a, [wPewterGymCurScript] call ExecuteCurMapScriptInTable ld [wPewterGymCurScript], a @@ -30,7 +30,7 @@ PewterGymScript_5c3bf: ld [wCurMapScript], a ret -PewterGymScriptPointers: +PewterGym_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -55,7 +55,6 @@ PewterGymScript_5c3df: call DisplayTextID SetEvent EVENT_GOT_TM34 jr .gymVictory - .BagFull ld a, $6 ld [hSpriteIndexOrTextID], a @@ -80,7 +79,7 @@ PewterGymScript_5c3df: jp PewterGymScript_5c3bf -PewterGymTextPointers: +PewterGym_TextPointers: dw PewterGymText1 dw PewterGymText2 dw PewterGymText3 @@ -88,7 +87,6 @@ PewterGymTextPointers: dw PewterGymText5 dw PewterGymText6 -PewterGymTrainerHeaders: PewterGymTrainerHeader0: dbEventFlagBit EVENT_BEAT_PEWTER_GYM_TRAINER_0 db ($5 << 4) ; trainer's view range @@ -105,11 +103,11 @@ PewterGymText1: CheckEvent EVENT_BEAT_BROCK jr z, .beginBattle CheckEventReuseA EVENT_GOT_TM34 - jr nz, .afterVictory + jr nz, .gymVictory call z, PewterGymScript_5c3df call DisableWaitingAfterTextDisplay jr .done -.afterVictory +.gymVictory ld hl, PewterGymText_5c4a3 call PrintText jr .done @@ -150,7 +148,7 @@ PewterGymText4: PewterGymText5: TX_FAR _ReceivedTM34Text - TX_SFX_ITEM + TX_SFX_ITEM_1 TX_FAR _TM34ExplanationText db "@" @@ -160,7 +158,7 @@ PewterGymText6: PewterGymText_5c4bc: TX_FAR _PewterGymText_5c4bc - TX_SFX_ITEM + TX_SFX_ITEM_1 TX_FAR _PewterGymText_5c4c1 db "@" |