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

24
mobile/mobile_5e.asm
View File

@@ -7,7 +7,7 @@ Function17a68f:: ; 17a68f (5e:668f)
ld hl, $d088
bit 5, [hl]
jr z, .asm_17a6a6
ld de, StringBuffer1 ; $d073
ld de, wStringBuffer1 ; $d073
push de
call Function17a721
pop de
@@ -21,11 +21,11 @@ Function17a68f:: ; 17a68f (5e:668f)
Function17a6a8: ; 17a6a8 (5e:66a8)
push de
push bc
ld hl, StringBuffer2 ; $d086
ld hl, wStringBuffer2 ; $d086
ld bc, $a
xor a
call ByteFill
ld hl, Buffer1
ld hl, wBuffer1
ld bc, $10
ld a, $ff
call ByteFill
@@ -50,7 +50,7 @@ Function17a6a8: ; 17a6a8 (5e:66a8)
ret
Function17a6f5: ; 17a6f5 (5e:66f5)
ld hl, Buffer1
ld hl, wBuffer1
ld c, $0
ld b, $8
.asm_17a6fc
@@ -91,7 +91,7 @@ Function17a721: ; 17a721 (5e:6721)
ld a, $ff
call ByteFill
pop de
ld hl, Buffer1
ld hl, wBuffer1
ld b, $8
.asm_17a732
ld c, $0
@@ -443,7 +443,7 @@ Function17a943: ; 17a943 (5e:6943)
ld [$d08c], a
ld c, a
ld b, $0
ld hl, Buffer1
ld hl, wBuffer1
add hl, bc
ld [hl], $ff
ld a, $2
@@ -465,7 +465,7 @@ Function17a964: ; 17a964 (5e:6964)
ld b, $0
inc a
ld [$d08c], a
ld hl, Buffer1
ld hl, wBuffer1
add hl, bc
ld [hl], e
and a
@@ -480,7 +480,7 @@ Function17a97b: ; 17a97b (5e:697b)
lb bc, 2, 18
call ClearBox
hlcoord 3, 2
ld de, Buffer1
ld de, wBuffer1
ld a, [$d08c]
and a
ret z
@@ -517,7 +517,7 @@ String_17a9b2: ; 17a9b2
; 17a9cb
Function17a9cb: ; 17a9cb (5e:69cb)
ld de, Sprites ; $c400
ld de, wVirtualOAM ; $c400
ld hl, $d088
bit 6, [hl]
jr nz, .bit_6_set
@@ -663,7 +663,7 @@ Function17aaa9: ; 17aaa9 (5e:6aa9)
call Function17aae3
ld c, a
ld b, $0
hlcoord 0, 0, AttrMap
hlcoord 0, 0, wAttrMap
add hl, bc
push hl
ld a, $4
@@ -806,10 +806,10 @@ Function17ac1d: ; 17ac1d (5e:6c1d)
Function17ac2a: ; 17ac2a (5e:6c2a)
ld hl, Tilemap_17ae3d
decoord 0, 4, AttrMap
decoord 0, 4, wAttrMap
ld bc, (SCREEN_HEIGHT - 4) * SCREEN_WIDTH
call CopyBytes
hlcoord 0, 4, AttrMap
hlcoord 0, 4, wAttrMap
ld bc, (SCREEN_HEIGHT - 4) * SCREEN_WIDTH
.loop
ld a, [hl]