diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-08 13:27:38 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-08 13:27:38 -0400 |
| commit | 399fefb8cfcc3e06f89e9f81f25250c7bab60526 (patch) | |
| tree | 79adbe2f70c1327a84b7caeb428dabbef1ae795e /scripts/vermiliongym.asm | |
| parent | Fix WRAM address comments beyond the former site of wGBC (diff) | |
| download | pokeyellow-399fefb8cfcc3e06f89e9f81f25250c7bab60526.tar.gz pokeyellow-399fefb8cfcc3e06f89e9f81f25250c7bab60526.tar.xz pokeyellow-399fefb8cfcc3e06f89e9f81f25250c7bab60526.zip | |
Pikapic animation function labels
Diffstat (limited to 'scripts/vermiliongym.asm')
| -rwxr-xr-x | scripts/vermiliongym.asm | 41 |
1 files changed, 23 insertions, 18 deletions
diff --git a/scripts/vermiliongym.asm b/scripts/vermiliongym.asm index d672a419..f36071e9 100755 --- a/scripts/vermiliongym.asm +++ b/scripts/vermiliongym.asm @@ -29,14 +29,15 @@ Gym3LeaderName: ; 5ca64 (17:4a64) VermilionGymScript_5ca6d: ; 5ca6d (17:4a6d) CheckEvent EVENT_2ND_LOCK_OPENED - jr nz, .asm_5ca78 + jr nz, .opened_second_lock ld a, $24 - jr .asm_5ca7f -.asm_5ca78 + jr .load_door_tile + +.opened_second_lock ld a, SFX_GO_INSIDE call PlaySound ld a, $5 -.asm_5ca7f +.load_door_tile ld [wNewTileBlockID], a lb bc, 2, 2 predef_jump ReplaceTileBlock @@ -73,12 +74,13 @@ VermilionGymScript_5caaa: ; 5caaa (17:4aaa) ld [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_GOT_TM24 - jr .asm_5cad3 + jr .set_gym_flags + .BagFull ld a, $8 ld [hSpriteIndexOrTextID], a call DisplayTextID -.asm_5cad3 +.set_gym_flags ld hl, wObtainedBadges set 2, [hl] ld hl, wBeatGymFlags @@ -132,17 +134,19 @@ VermilionGymTrainerHeader2: ; 5cb10 (17:4b10) VermilionGymText1: ; 5cb1d (17:4b1d) TX_ASM CheckEvent EVENT_BEAT_LT_SURGE - jr z, .asm_5cb39 + jr z, .engage_surge CheckEventReuseA EVENT_GOT_TM24 - jr nz, .asm_5cb31 + jr nz, .after_win_text call z, VermilionGymScript_5caaa call DisableWaitingAfterTextDisplay - jr .asm_5cb6a -.asm_5cb31 + jr .text_script_end + +.after_win_text ld hl, VermilionGymText_5cb72 call PrintText - jr .asm_5cb6a -.asm_5cb39 + jr .text_script_end + +.engage_surge ld hl, VermilionGymText_5cb6d call PrintText ld hl, wd72d @@ -162,7 +166,7 @@ VermilionGymText1: ; 5cb1d (17:4b1d) ld a, $3 ld [W_VERMILIONGYMCURSCRIPT], a ld [W_CURMAPSCRIPT], a -.asm_5cb6a +.text_script_end jp TextScriptEnd VermilionGymText_5cb6d: ; 5cb6d (17:4b6d) @@ -179,7 +183,7 @@ VermilionGymText6: ; 5cb77 (17:4b77) VermilionGymText7: ; 5cb7c (17:4b7c) TX_FAR _ReceivedTM24Text - db $11 + TX_SFX_KEY_ITEM TX_FAR _TM24ExplanationText db "@" @@ -249,14 +253,15 @@ VermilionGymText5: ; 5cbdb (17:4bdb) TX_ASM ld a, [wBeatGymFlags] bit 2, a - jr nz, .asm_5cbeb + jr nz, .beat_surge ld hl, VermilionGymText_5cbf4 call PrintText - jr .asm_5cbf1 -.asm_5cbeb + jr .text_script_end + +.beat_surge ld hl, VermilionGymText_5cbf9 call PrintText -.asm_5cbf1 +.text_script_end jp TextScriptEnd VermilionGymText_5cbf4: ; 5cbf4 (17:4bf4) |