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

12
home/menu.asm
View File

@@ -315,7 +315,7 @@ RunMenuItemPrintingFunction:: ; 1eda
ld a, [de]
cp -1
ret z
ld [MenuSelection], a
ld [wMenuSelection], a
push de
push hl
ld d, h
@@ -405,7 +405,7 @@ ContinueGettingMenuJoypad:
ld h, $0
add hl, de
ld a, [hl]
ld [MenuSelection], a
ld [wMenuSelection], a
ld a, [wMenuCursorY]
ld [wMenuCursorBuffer], a
and a
@@ -415,7 +415,7 @@ ContinueGettingMenuJoypad:
ld a, B_BUTTON
ld [wMenuJoypad], a
ld a, -1
ld [MenuSelection], a
ld [wMenuSelection], a
scf
ret
; 1f79
@@ -426,7 +426,7 @@ PlaceMenuStrings:: ; 1f79
ld a, [hli]
ld h, [hl]
ld l, a
ld a, [MenuSelection]
ld a, [wMenuSelection]
call GetNthString
ld d, h
ld e, l
@@ -437,7 +437,7 @@ PlaceMenuStrings:: ; 1f79
PlaceNthMenuStrings:: ; 1f8d
push de
ld a, [MenuSelection]
ld a, [wMenuSelection]
call GetMenuDataPointerTableEntry
inc hl
inc hl
@@ -460,7 +460,7 @@ Unreferenced_Function1f9e:: ; 1f9e
; 1fa7
MenuJumptable:: ; 1fa7
ld a, [MenuSelection]
ld a, [wMenuSelection]
call GetMenuDataPointerTableEntry
ld a, [hli]
ld h, [hl]