Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459)
# Conflicts: # data/items/descriptions.asm # data/sprite_anims/framesets.asm # engine/crystal_colors.asm # engine/events/kurt.asm # engine/events/special.asm # engine/events/std_scripts.asm # engine/events_3.asm # engine/item_effects.asm # engine/namingscreen.asm # engine/scripting.asm # engine/stats_screen.asm # engine/trade_animation.asm # home/audio.asm # main.asm # maps/BattleTower1F.asm # maps/BattleTowerBattleRoom.asm # maps/BurnedTowerB1F.asm # maps/ElmsLab.asm # maps/GoldenrodDeptStore5F.asm # maps/GoldenrodUnderground.asm # maps/HallOfFame.asm # maps/MahoganyTown.asm # maps/ManiasHouse.asm # maps/MobileBattleRoom.asm # maps/MobileTradeRoomMobile.asm # maps/RadioTower2F.asm # maps/Route35NationalParkGate.asm # maps/Route36NationalParkGate.asm # maps/Route39Farmhouse.asm # tilesets/palette_maps.asm
This commit is contained in:
@@ -420,8 +420,7 @@ UpdatePlayerStep: ; 4738
|
||||
ret
|
||||
; 4759
|
||||
|
||||
Function4759: ; 4759
|
||||
; unreferenced
|
||||
Unreferenced_Function4759: ; 4759
|
||||
push bc
|
||||
ld e, a
|
||||
ld d, 0
|
||||
@@ -1573,7 +1572,7 @@ StepType05: ; 4e0c
|
||||
ld [hl], a
|
||||
call IncrementObjectStructField1c
|
||||
StepType04: ; 4e21
|
||||
call MobileFn_4fb2
|
||||
call Stubbed_Function4fb2
|
||||
ld hl, OBJECT_DIRECTION_WALKING
|
||||
add hl, bc
|
||||
ld [hl], STANDING
|
||||
@@ -1581,7 +1580,7 @@ StepType04: ; 4e21
|
||||
; 4e2b
|
||||
|
||||
NPCStep: ; 4e2b
|
||||
call MobileFn_4fb2
|
||||
call Stubbed_Function4fb2
|
||||
call AddStepVector
|
||||
ld hl, OBJECT_STEP_DURATION
|
||||
add hl, bc
|
||||
@@ -1844,7 +1843,8 @@ SkyfallTop: ; 4f83
|
||||
ret
|
||||
; 4fb2
|
||||
|
||||
MobileFn_4fb2: mobile
|
||||
Stubbed_Function4fb2:
|
||||
ret
|
||||
ld hl, OBJECT_1D
|
||||
add hl, bc
|
||||
inc [hl]
|
||||
|
Reference in New Issue
Block a user