diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-07-25 20:18:59 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-07-25 20:18:59 -0400 |
| commit | 594253eb30e8e2ee8b4b9e0cfe7442eba0e3d3b4 (patch) | |
| tree | a2e0a3d80436e1d2279beb1aa07bf8217a586c32 /main.asm | |
| parent | 6c3000efd2818f8d5cb0a01770d1b92991b80340 (diff) | |
| parent | ec10d9dd6f8db685270529b49f0b3007a7242dcc (diff) | |
Merge yenatch:map-objects
Diffstat (limited to 'main.asm')
| -rw-r--r-- | main.asm | 36 |
1 files changed, 18 insertions, 18 deletions
@@ -3672,14 +3672,14 @@ Function830d: ; 830d ; 831e Function831e: ; 831e - ld a, [$ffe0] + ld a, [hLastTalked] call Function1b1e ld a, $3e call Function1b3f ld a, [wd03f] dec a jr z, Function833b - ld a, [$ffe0] + ld a, [hLastTalked] ld b, a ld c, 0 ld d, 1 @@ -5010,7 +5010,7 @@ UsedSurfScript: ; c986 special PlayMapMusic ; step into the water special Function8379 ; (slow_step_x, step_end) - applymovement $0, MovementBuffer ; PLAYER, MovementBuffer + applymovement PLAYER, MovementBuffer ; PLAYER, MovementBuffer end ; c9a2 @@ -5302,7 +5302,7 @@ Script_UsedWaterfall: ; 0xcb20 loadmovesprites playsound SFX_BUBBLEBEAM .loop - applymovement $0, WaterfallStep + applymovement PLAYER, WaterfallStep callasm CheckContinueWaterfall iffalse .loop end @@ -5498,13 +5498,13 @@ UsedDigOrEscapeRopeScript: ; 0xcc3c closetext loadmovesprites playsound SFX_WARP_TO - applymovement $0, MovementData_0xcc59 + applymovement PLAYER, MovementData_0xcc59 farscall UnknownScript_0x122c1 special WarpToSpawnPoint writecode VAR_MOVEMENT, $0 newloadmap -11 playsound SFX_WARP_FROM - applymovement $0, MovementData_0xcc5d + applymovement PLAYER, MovementData_0xcc5d end ; 0xcc59 @@ -5596,13 +5596,13 @@ Script_UsedTeleport: ; 0xccbb reloadmappart loadmovesprites playsound SFX_WARP_TO - applymovement $0, MovementData_0xcce1 + applymovement PLAYER, MovementData_0xcce1 farscall UnknownScript_0x122c1 special WarpToSpawnPoint writecode VAR_MOVEMENT, $0 newloadmap -12 playsound SFX_WARP_FROM - applymovement $0, MovementData_0xcce3 + applymovement PLAYER, MovementData_0xcce3 end ; 0xcce1 @@ -6058,7 +6058,7 @@ GetFacingObject: ; cf0d ld hl, OBJECT_MAP_OBJECT_INDEX add hl, bc ld a, [hl] - ld [$ffe0], a + ld [hLastTalked], a call GetMapObject ld hl, MAPOBJECT_FACING add hl, bc @@ -6265,16 +6265,16 @@ Script_GotABite: ; 0xd035 scall Script_FishCastRod callasm Fishing_CheckFacingUp iffalse .FacingUp - applymovement $0, MovementData_0xd062 + applymovement PLAYER, MovementData_0xd062 jump .FightTheHookedPokemon ; 0xd046 .FacingUp: ; 0xd046 - applymovement $0, MovementData_0xd05c + applymovement PLAYER, MovementData_0xd05c .FightTheHookedPokemon: ; 0xd04a pause 40 - applymovement $0, MovementData_0xd069 + applymovement PLAYER, MovementData_0xd069 writetext UnknownText_0xd0a4 callasm PutTheRodAway loadmovesprites @@ -6329,7 +6329,7 @@ Script_FishCastRod: ; 0xd07c loademote $9 callasm Functionb84b3 loademote $0 - applymovement $0, MovementData_0xd093 + applymovement PLAYER, MovementData_0xd093 pause 40 end ; 0xd093 @@ -12318,7 +12318,7 @@ UnknownScript_0x122c1: ; 0x122c1 FindItemInBallScript:: ; 0x122ce callasm Function122f8 iffalse NoRoomForItemInBallScript - disappear $fe + disappear LAST_TALKED loadfont writetext UnknownText_0x122ee playsound SFX_ITEM @@ -12730,22 +12730,22 @@ Script_ForcedMovement:: ; 0x1253d ; 0x12550 UnknownScript_0x12550: ; 0x12550 - applymovement $0, MovementData_0x12564 + applymovement PLAYER, MovementData_0x12564 end ; 0x12555 UnknownScript_0x12555: ; 0x12555 - applymovement $0, MovementData_0x1256b + applymovement PLAYER, MovementData_0x1256b end ; 0x1255a UnknownScript_0x1255a: ; 0x1255a - applymovement $0, MovementData_0x12572 + applymovement PLAYER, MovementData_0x12572 end ; 0x1255f UnknownScript_0x1255f: ; 0x1255f - applymovement $0, MovementData_0x12579 + applymovement PLAYER, MovementData_0x12579 end ; 0x12564 |