Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pret/pokecrystal

Browse Source 
# 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
This commit is contained in:
Rangi
2018-02-03 18:21:53 -05:00
parent 6ff2cb20e6 b35eb72290
commit 32ed487a47
367 changed files with 8920 additions and 8922 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mobile/mobile_5c.asm
View File

@@ -131,7 +131,7 @@ Function170c06: ; 170c06
xor a
ld [wd265], a
.asm_170c30
ld hl, PartyMon1HP
ld hl, wPartyMon1HP
ld a, [wd265]
call GetPartyLocation
ld a, [hli]
@@ -181,7 +181,7 @@ Function170c06: ; 170c06
ld b, $0
ld c, $0
.asm_170c6f
ld hl, PartyMon1HP
ld hl, wPartyMon1HP
ld a, b
push bc
call GetPartyLocation
@@ -206,7 +206,7 @@ Function170c06: ; 170c06
; 170c8b
Function170c8b: ; 170c8b
ld hl, LastEnemyCounterMove
ld hl, wLastEnemyCounterMove
ld b, $5
.asm_170c90
ld a, [hl]
@@ -698,7 +698,7 @@ Function171c87: ; 171c87 (5c:5c87)
ld bc, $168
call CopyBytes
ld hl, Attrmap_1727ed
decoord 0, 0, AttrMap
decoord 0, 0, wAttrMap
ld bc, $168
call CopyBytes
hlcoord 3, 2
@@ -718,7 +718,7 @@ Function171ccd: ; 171ccd (5c:5ccd)
ld de, wBGPals1
ld bc, 8 palettes
call CopyBytes
ld hl, EngineBuffer5
ld hl, wEngineBuffer5
ld a, $ff
ld [hli], a
ld a, $7f
@@ -770,7 +770,7 @@ Function171d2b: ; 171d2b (5c:5d2b)
ld bc, $168
call CopyBytes
ld hl, Attrmap_172955
decoord 0, 0, AttrMap
decoord 0, 0, wAttrMap
ld bc, $168
call CopyBytes
hlcoord 2, 2
@@ -856,7 +856,7 @@ Function172e78: ; 172e78 (5c:6e78)
ld bc, $168
call ByteFill
ld a, $7
hlcoord 0, 0, AttrMap
hlcoord 0, 0, wAttrMap
ld bc, $168
call ByteFill
call DisableLCD
@@ -870,7 +870,7 @@ Function172e78: ; 172e78 (5c:6e78)
ld bc, $168
call CopyBytes
ld hl, Attrmap_173517
decoord 0, 0, AttrMap
decoord 0, 0, wAttrMap
ld bc, $168
call CopyBytes
ret