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
engine/delete_save_change_clock.asm
View File

@@ -61,12 +61,12 @@ _ResetClock: ; 4d3b1
ClockResetPassword: ; 4d41e
call .CalculatePassword
push de
ld hl, StringBuffer2
ld hl, wStringBuffer2
ld bc, 5
xor a
call ByteFill
ld a, $4
ld [StringBuffer2 + 5], a
ld [wStringBuffer2 + 5], a
ld hl, .pleaseenterpasswordtext
call PrintText
.loop
@@ -108,7 +108,7 @@ ClockResetPassword: ; 4d41e
.updateIDdisplay ; 4d468
hlcoord 14, 15
ld de, StringBuffer2
ld de, wStringBuffer2
ld c, 5
.loop3
ld a, [de]
@@ -122,7 +122,7 @@ ClockResetPassword: ; 4d41e
ld a, " "
call ByteFill
hlcoord 14, 16
ld a, [StringBuffer2 + 5]
ld a, [wStringBuffer2 + 5]
ld e, a
ld d, $0
add hl, de
@@ -145,19 +145,19 @@ ClockResetPassword: ; 4d41e
ret
.left
ld a, [StringBuffer2 + 5]
ld a, [wStringBuffer2 + 5]
and a
ret z
dec a
ld [StringBuffer2 + 5], a
ld [wStringBuffer2 + 5], a
ret
.right
ld a, [StringBuffer2 + 5]
ld a, [wStringBuffer2 + 5]
cp $4
ret z
inc a
ld [StringBuffer2 + 5], a
ld [wStringBuffer2 + 5], a
ret
.up
@@ -187,16 +187,16 @@ ClockResetPassword: ; 4d41e
ret
.getcurrentdigit ; 4d4d5
ld a, [StringBuffer2 + 5]
ld a, [wStringBuffer2 + 5]
ld e, a
ld d, $0
ld hl, StringBuffer2
ld hl, wStringBuffer2
add hl, de
ret
.ConvertDecIDToBytes: ; 4d4e0
ld hl, 0
ld de, StringBuffer2 + 4
ld de, wStringBuffer2 + 4
ld bc, 1
call .ConvertToBytes
ld bc, 10
@@ -222,13 +222,13 @@ ClockResetPassword: ; 4d41e
ld a, BANK(sPlayerData)
call GetSRAMBank
ld de, 0
ld hl, sPlayerData + (PlayerID - wPlayerData)
ld hl, sPlayerData + (wPlayerID - wPlayerData)
ld c, $2
call .ComponentFromNumber
ld hl, sPlayerData + (PlayerName - wPlayerData)
ld hl, sPlayerData + (wPlayerName - wPlayerData)
ld c, NAME_LENGTH_JAPANESE - 1
call .ComponentFromString
ld hl, sPlayerData + (Money - wPlayerData)
ld hl, sPlayerData + (wMoney - wPlayerData)
ld c, $3
call .ComponentFromNumber
call CloseSRAM