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

28
mobile/mobile_5b.asm
View File

@@ -83,7 +83,7 @@ Unreferenced_Function16c000: ; 16c000
Function16c089: ; 16c089
ld a, $1
ld [Buffer2], a
ld [wBuffer2], a
ld [wd1f1], a
xor a
ld [hWY], a
@@ -103,7 +103,7 @@ Function16c09e: ; 16c09e
Function16c0a8: ; 16c0a8
xor a
ld [Buffer2], a
ld [wBuffer2], a
ld [wd1f1], a
call ClearSprites
ld a, $90
@@ -200,7 +200,7 @@ MobileSystemSplashScreen_InitGFX: ; 16c108
ld bc, 20
xor a
call ByteFill
ld hl, .TileMap
ld hl, .wTileMap
decoord 0, 1
ld bc, $0154
call CopyBytes
@@ -208,12 +208,12 @@ MobileSystemSplashScreen_InitGFX: ; 16c108
; 16c15c
.LoadAttrMap: ; 16c15c
hlcoord 0, 0, AttrMap
hlcoord 0, 0, wAttrMap
ld bc, SCREEN_WIDTH
xor a
call ByteFill
ld hl, .AttrMap
decoord 0, 1, AttrMap
ld hl, .wAttrMap
decoord 0, 1, wAttrMap
ld bc, 17 * SCREEN_WIDTH
call CopyBytes
ret
@@ -222,10 +222,10 @@ MobileSystemSplashScreen_InitGFX: ; 16c108
.Tiles:
INCBIN "gfx/mobile/mobile_splash.2bpp"
.TileMap:
.wTileMap:
INCBIN "gfx/mobile/mobile_splash.tilemap"
.AttrMap:
.wAttrMap:
INCBIN "gfx/mobile/mobile_splash.attrmap"
UnknownMobilePalettes_16c903: ; 16c903
@@ -543,8 +543,8 @@ Function16cb08: ; 16cb08
Function16cb0f: ; 16cb0f
xor a
ld [Buffer1], a
ld [Buffer2], a
ld [wBuffer1], a
ld [wBuffer2], a
xor a
ld [wd1ec], a
ld a, $70
@@ -559,12 +559,12 @@ Function16cb0f: ; 16cb0f
; 16cb2e
Function16cb2e: ; 16cb2e
ld a, [Buffer2]
ld a, [wBuffer2]
and a
ret z
call Function16cb40
ld hl, Unknown_16cb86
ld de, Sprites
ld de, wVirtualOAM
call Function16cb5d
ret
; 16cb40
@@ -754,7 +754,7 @@ Function16cc5a: ; 16cc5a
; 16cc62
Function16cc62: ; 16cc62
hlcoord 0, 15, AttrMap
hlcoord 0, 15, wAttrMap
ld bc, $0028
ld a, $1
call ByteFill
@@ -776,7 +776,7 @@ Function16cc73:
pop hl
ld a, $1
ld [rVBK], a
decoord 0, 0, AttrMap
decoord 0, 0, wAttrMap
call Function16cc90
pop af
ld [rVBK], a