diff options
| author | yenatch <yenatch@gmail.com> | 2014-09-20 00:57:27 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2014-09-20 00:57:27 -0400 |
| commit | dff0cdeb5a2f901dc8d1a05847d09d7faf1654ad (patch) | |
| tree | 3618582f76f4183b6bc22c5d4743b6d171d11128 /scripts/rockethideout3.asm | |
| parent | 1185d69819af3493fe8ace9f576fee4b420db55e (diff) | |
| parent | 2ed65d9c3e3ba60939ebe2928ffddc06a90b1876 (diff) | |
Merge remote-tracking branch 'YamaArashi/master'
Conflicts:
constants/misc_constants.asm
engine/battle/core.asm
engine/menu/pokedex.asm
engine/town_map.asm
home.asm
hram.asm
Diffstat (limited to 'scripts/rockethideout3.asm')
| -rwxr-xr-x | scripts/rockethideout3.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/rockethideout3.asm b/scripts/rockethideout3.asm index e3223a85..6dc467ab 100755 --- a/scripts/rockethideout3.asm +++ b/scripts/rockethideout3.asm @@ -9,7 +9,7 @@ RocketHideout3Script: ; 45225 (11:5225) RocketHideout3ScriptPointers: ; 45238 (11:5238) dw RocketHideout3Script0 - dw Func_324c + dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle dw RocketHideout3Script3 @@ -19,12 +19,12 @@ RocketHideout3Script0: ; 45240 (11:5240) ld a, [W_XCOORD] ld c, a ld hl, RocketHideout3ArrowTilePlayerMovement - call Func_3442 + call DecodeArrowMovementRLE cp $ff jp z, CheckFightingMapTrainers ld hl, wd736 set 7, [hl] - call Func_3486 + call StartSimulatingJoypadStates ld a, (SFX_02_52 - SFX_Headers_02) / 3 call PlaySound ld a, $ff @@ -136,7 +136,7 @@ RocketHideout3ArrowMovement12: ; 452e1 (11:52e1) db $FF RocketHideout3Script3 ; 452e4 (11:452e4) - ld a, [wcd38] + ld a, [wSimulatedJoypadStatesIndex] and a jp nz, LoadSpinnerArrowTiles xor a |