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

26
mobile/mobile_menu.asm
View File

@@ -190,8 +190,8 @@ Function4a0c2: ; 4a0c2 (12:60c2)
call MenuClickSound
ld a, BANK(sPlayerData)
call GetSRAMBank
ld hl, sPlayerData + PlayerName - wPlayerData
ld de, PlayerName
ld hl, sPlayerData + wPlayerName - wPlayerData
ld de, wPlayerName
ld bc, NAME_LENGTH_JAPANESE
call CopyBytes
call CloseSRAM
@@ -637,13 +637,13 @@ Function4a492: ; 4a492 (12:6492)
MainMenu_MobileStudium: ; 4a496
ld a, [StartDay]
ld a, [wStartDay]
ld b, a
ld a, [StartHour]
ld a, [wStartHour]
ld c, a
ld a, [StartMinute]
ld a, [wStartMinute]
ld d, a
ld a, [StartSecond]
ld a, [wStartSecond]
ld e, a
push bc
push de
@@ -652,13 +652,13 @@ MainMenu_MobileStudium: ; 4a496
pop de
pop bc
ld a, b
ld [StartDay], a
ld [wStartDay], a
ld a, c
ld [StartHour], a
ld [wStartHour], a
ld a, d
ld [StartMinute], a
ld [wStartMinute], a
ld a, e
ld [StartSecond], a
ld [wStartSecond], a
ret
; 4a4c4
@@ -852,11 +852,11 @@ Function4a6ab: ; 4a6ab (12:66ab)
Function4a6c5: ; 4a6c5 (12:66c5)
ld a, $5
ld [MusicFade], a
ld [wMusicFade], a
ld a, e
ld [MusicFadeID], a
ld [wMusicFadeID], a
ld a, d
ld [MusicFadeID + 1], a
ld [wMusicFadeID + 1], a
ld c, 22
call DelayFrames
ret