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

46
mobile/mobile_45_sprite_engine.asm
View File

@@ -22,7 +22,7 @@ Function115dc3: ; 115dc3
xor a
ld [wc305], a
ld a, $a0
ld hl, Sprite32
ld hl, wVirtualOAMSprite31
ld bc, 8 * SPRITEOAMSTRUCT_LENGTH
call ByteFill
ret
@@ -34,7 +34,7 @@ Function115dd3: ; 115dd3
and a
ret z
ld a, $a0
ld hl, Sprite32
ld hl, wVirtualOAMSprite31
ld bc, 8 * SPRITEOAMSTRUCT_LENGTH
call ByteFill
call Function115e22
@@ -50,7 +50,7 @@ Function115dd3: ; 115dd3
ld d, a
push de
pop hl
ld de, Sprite32
ld de, wVirtualOAMSprite31
ld a, [wc307]
ld c, a
ld a, [wc308]
@@ -360,7 +360,7 @@ Function11619d: ; 11619d
cp $2
jr c, .asm_1161b4
ld a, $a0
ld hl, Sprites
ld hl, wVirtualOAM
ld bc, 25 * SPRITEOAMSTRUCT_LENGTH
call ByteFill
@@ -493,12 +493,12 @@ Function1161d5: ; 1161d5
farcall ReloadMapPart
ld a, $8
ld [MusicFade], a
ld [wMusicFade], a
ld de, MUSIC_MOBILE_ADAPTER
ld a, e
ld [MusicFadeID], a
ld [wMusicFadeID], a
ld a, d
ld [MusicFadeID + 1], a
ld [wMusicFadeID + 1], a
ld a, [$c319]
inc a
ld [$c319], a
@@ -585,7 +585,7 @@ Function1162f2: ; 1162f2
ld e, a
ld a, [hli]
sub e
ld de, Sprite10
ld de, wVirtualOAMSprite09
.asm_116321
push af
ld a, [hli]
@@ -626,7 +626,7 @@ Function1162f2: ; 1162f2
ld e, a
ld a, [hli]
sub e
ld de, Sprite01
ld de, wVirtualOAMSprite00
.asm_11635a
push af
ld a, [hli]
@@ -667,7 +667,7 @@ Function11636e: ; 11636e
ld a, $1
ld [rSVBK], a
ld a, $a0
ld hl, Sprites
ld hl, wVirtualOAM
ld bc, 16 * SPRITEOAMSTRUCT_LENGTH
call ByteFill
ld a, $90
@@ -677,11 +677,11 @@ Function11636e: ; 11636e
ld [rSVBK], a
farcall ReloadMapPart
ld a, $8
ld [MusicFade], a
ld [wMusicFade], a
ld a, [wMapMusic]
ld [MusicFadeID], a
ld [wMusicFadeID], a
xor a
ld [MusicFadeID + 1], a
ld [wMusicFadeID + 1], a
xor a
ld [$c319], a
ld [wc30d], a
@@ -695,7 +695,7 @@ Function1163c0: ; 1163c0
ld a, $1
ld [rSVBK], a
ld a, $a0
ld hl, Sprites
ld hl, wVirtualOAM
ld bc, 16 * SPRITEOAMSTRUCT_LENGTH
call ByteFill
call DelayFrame
@@ -725,20 +725,20 @@ Function1163c0: ; 1163c0
cp $4
jr z, .asm_11642a
ld a, $8
ld [MusicFade], a
ld [wMusicFade], a
ld a, [wMapMusic]
ld [MusicFadeID], a
ld [wMusicFadeID], a
xor a
ld [MusicFadeID + 1], a
ld [wMusicFadeID + 1], a
jr .asm_116439
.asm_11642a
ld a, $8
ld [MusicFade], a
ld [wMusicFade], a
ld a, $0
ld [MusicFadeID], a
ld [wMusicFadeID], a
ld a, $0
ld [MusicFadeID + 1], a
ld [wMusicFadeID + 1], a
.asm_116439
xor a
@@ -754,11 +754,11 @@ Function116441: ; 116441
ld [hWY], a
farcall ReloadMapPart
ld a, $8
ld [MusicFade], a
ld [wMusicFade], a
ld a, [wMapMusic]
ld [MusicFadeID], a
ld [wMusicFadeID], a
xor a
ld [MusicFadeID + 1], a
ld [wMusicFadeID + 1], a
xor a
ld [$c319], a
ld [wc30d], a