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

22
engine/options_menu.asm
View File

@@ -139,10 +139,10 @@ Options_TextSpeed: ; e42f5
.Save:
ld b, a
ld a, [Options]
ld a, [wOptions]
and $f0
or b
ld [Options], a
ld [wOptions], a
.NonePressed:
ld b, 0
@@ -173,7 +173,7 @@ Options_TextSpeed: ; e42f5
GetTextSpeed: ; e4346
; converts TEXT_DELAY_* value in a to OPT_TEXT_SPEED_* value in c,
; with previous/next TEXT_DELAY_* values in d/e
ld a, [Options]
ld a, [wOptions]
and $7
cp TEXT_DELAY_SLOW
jr z, .slow
@@ -197,7 +197,7 @@ GetTextSpeed: ; e4346
Options_BattleScene: ; e4365
ld hl, Options
ld hl, wOptions
ld a, [hJoyPressed]
bit D_LEFT_F, a
jr nz, .LeftPressed
@@ -239,7 +239,7 @@ Options_BattleScene: ; e4365
Options_BattleStyle: ; e43a0
ld hl, Options
ld hl, wOptions
ld a, [hJoyPressed]
bit D_LEFT_F, a
jr nz, .LeftPressed
@@ -280,7 +280,7 @@ Options_BattleStyle: ; e43a0
Options_Sound: ; e43dd
ld hl, Options
ld hl, wOptions
ld a, [hJoyPressed]
bit D_LEFT_F, a
jr nz, .LeftPressed
@@ -363,7 +363,7 @@ Options_Print: ; e4424
.Save:
ld b, a
ld [GBPrinter], a
ld [wGBPrinter], a
.NonePressed:
ld b, $0
@@ -398,7 +398,7 @@ Options_Print: ; e4424
GetPrinterSetting: ; e4491
; converts GBPRINTER_* value in a to OPT_PRINT_* value in c,
; with previous/next GBPRINTER_* values in d/e
ld a, [GBPrinter]
ld a, [wGBPrinter]
and a
jr z, .IsLightest
cp GBPRINTER_LIGHTER
@@ -434,7 +434,7 @@ GetPrinterSetting: ; e4491
; e44c1
Options_MenuAccount: ; e44c1
ld hl, Options2
ld hl, wOptions2
ld a, [hJoyPressed]
bit D_LEFT_F, a
jr nz, .LeftPressed
@@ -475,7 +475,7 @@ Options_MenuAccount: ; e44c1
Options_Frame: ; e44fa
ld hl, TextBoxFrame
ld hl, wTextBoxFrame
ld a, [hJoyPressed]
bit D_LEFT_F, a
jr nz, .LeftPressed
@@ -497,7 +497,7 @@ Options_Frame: ; e44fa
and $7
ld [hl], a
UpdateFrame: ; e4512
ld a, [TextBoxFrame]
ld a, [wTextBoxFrame]
hlcoord 16, 15 ; where on the screen the number is drawn
add "1"
ld [hl], a