diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2016-06-05 16:39:42 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2016-06-05 16:39:42 -0400 |
| commit | 08fb4c22ef11f7ea99abe9c6ff0e73bbcd8fb239 (patch) | |
| tree | 7b5d7d54ed3ce4cebd9b3e2809c5ce54e8eaddfd /scripts/silphco7.asm | |
| parent | 8cdf73265f95e9a55112f373804867244512878d (diff) | |
| parent | 2f0305d80a0f64c093eabceb434a2fd0c122caa2 (diff) | |
Merge pull request #11 from PikalaxALT/master
MILESTONE: Finish disassembly
Diffstat (limited to 'scripts/silphco7.asm')
| -rwxr-xr-x | scripts/silphco7.asm | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/scripts/silphco7.asm b/scripts/silphco7.asm index 0735d437..1634472b 100755 --- a/scripts/silphco7.asm +++ b/scripts/silphco7.asm @@ -130,9 +130,7 @@ SilphCo7Script0: ; 51c23 (14:5c23) ld [wJoyIgnore], a ld a, PLAYER_DIR_DOWN ld [wPlayerMovingDirection], a - ld a, $ff - ld [wNewSoundID], a - call PlaySound + call StopAllMusic ld c, BANK(Music_MeetRival) ld a, MUSIC_MEET_RIVAL call PlayMusic @@ -186,21 +184,11 @@ SilphCo7Script3: ; 51c82 (14:5c82) ld a, OPP_SONY2 ld [wCurOpponent], a ld a, [W_RIVALSTARTER] - cp STARTER2 - jr nz, .asm_51cb6 - ld a, $7 - jr .asm_51cc0 -.asm_51cb6 - cp STARTER3 - jr nz, .asm_51cbe - ld a, $8 - jr .asm_51cc0 -.asm_51cbe - ld a, $9 -.asm_51cc0 + add 4 ld [wTrainerNo], a ld a, $4 - jp SilphCo7Text_51c10 + call SilphCo7Text_51c10 + ret SilphCo7Script4: ; 51cc8 (14:5cc8) ld a, [wIsInBattle] @@ -219,9 +207,7 @@ SilphCo7Script4: ; 51cc8 (14:5cc8) ld a, $f ld [hSpriteIndexOrTextID], a call DisplayTextID - ld a, $ff - ld [wNewSoundID], a - call PlaySound + call StopAllMusic callba Music_RivalAlternateStart ld de, MovementData_51d1d ld a, [wcf0d] |