diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-02-03 18:21:53 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-02-03 19:42:56 -0500 |
| commit | 32ed487a476e01759d3d9dbc818d8566ae2c9cb7 (patch) | |
| tree | 669e90b56d36f17efff5f673235193f5298c0ceb /engine/npc_movement.asm | |
| parent | 6ff2cb20e67db2054486fc5dc48eb9263298d4ad (diff) | |
| parent | b35eb72290b964b98844afbe741bb7ede34b9ef3 (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# audio/engine.asm
# constants/gfx_constants.asm
# constants/map_data_constants.asm
# constants/pokemon_data_constants.asm
# constants/sprite_constants.asm
# constants/wram_constants.asm
# data/maps/data.asm
# engine/battle/ai/scoring.asm
# engine/battle/core.asm
# engine/battle/effect_commands.asm
# engine/battle/misc.asm
# engine/battle_anims/getpokeballwobble.asm
# engine/breeding.asm
# engine/buy_sell_toss.asm
# engine/decorations.asm
# engine/events/battle_tower/battle_tower.asm
# engine/events/battle_tower/rules.asm
# engine/events/buena.asm
# engine/events/bug_contest/contest_2.asm
# engine/events/daycare.asm
# engine/events/dratini.asm
# engine/events/halloffame.asm
# engine/events/happiness_egg.asm
# engine/events/kurt.asm
# engine/events/lucky_number.asm
# engine/events/magnet_train.asm
# engine/events/overworld.asm
# engine/events/pokerus/pokerus.asm
# engine/events/print_unown.asm
# engine/events/print_unown_2.asm
# engine/events/unown_walls.asm
# engine/item_effects.asm
# engine/link.asm
# engine/mon_menu.asm
# engine/player_object.asm
# engine/routines/playslowcry.asm
# engine/scripting.asm
# engine/search.asm
# engine/search2.asm
# engine/specials.asm
# engine/start_menu.asm
# engine/timeset.asm
# home/battle_vars.asm
# home/map.asm
# maps/GoldenrodUndergroundSwitchRoomEntrances.asm
# maps/IlexForest.asm
# maps/KrissHouse2F.asm
# maps/Route39Barn.asm
# mobile/mobile_12_2.asm
# mobile/mobile_40.asm
# mobile/mobile_5f.asm
# wram.asm
Diffstat (limited to 'engine/npc_movement.asm')
| -rwxr-xr-x | engine/npc_movement.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/engine/npc_movement.asm b/engine/npc_movement.asm index 2144ae61e..5670935e8 100755 --- a/engine/npc_movement.asm +++ b/engine/npc_movement.asm @@ -235,14 +235,14 @@ CheckFacingObject:: ; 6fd9 call CheckCounterTile jr nz, .asm_6ff1 - ld a, [PlayerStandingMapX] + ld a, [wPlayerStandingMapX] sub d cpl inc a add d ld d, a - ld a, [PlayerStandingMapY] + ld a, [wPlayerStandingMapY] sub e cpl inc a @@ -250,7 +250,7 @@ CheckFacingObject:: ; 6fd9 ld e, a .asm_6ff1 - ld bc, ObjectStructs ; redundant + ld bc, wObjectStructs ; redundant ld a, 0 ld [hMapObjectIndexBuffer], a call IsNPCAtCoord @@ -317,7 +317,7 @@ Unreferenced_Function7015: ; 7041 IsNPCAtCoord: ; 7041 - ld bc, ObjectStructs + ld bc, wObjectStructs xor a .loop ld [hObjectStructIndexBuffer], a @@ -454,7 +454,7 @@ HasObjectReachedMovementLimit: ; 70a4 IsObjectMovingOffEdgeOfScreen: ; 70ed ld hl, OBJECT_NEXT_MAP_X add hl, bc - ld a, [XCoord] + ld a, [wXCoord] cp [hl] jr z, .check_y jr nc, .yes @@ -465,7 +465,7 @@ IsObjectMovingOffEdgeOfScreen: ; 70ed .check_y ld hl, OBJECT_NEXT_MAP_Y add hl, bc - ld a, [YCoord] + ld a, [wYCoord] cp [hl] jr z, .nope jr nc, .yes @@ -483,11 +483,11 @@ IsObjectMovingOffEdgeOfScreen: ; 70ed ; 7113 Unreferenced_Function7113: - ld a, [PlayerStandingMapX] + ld a, [wPlayerStandingMapX] ld d, a - ld a, [PlayerStandingMapY] + ld a, [wPlayerStandingMapY] ld e, a - ld bc, ObjectStructs + ld bc, wObjectStructs xor a .loop ld [hObjectStructIndexBuffer], a |