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

@@ -14,7 +14,7 @@ BuenasPassword: ; 8af6b
call DoNthMenu ; menu
farcall Buena_ExitMenu
ld b, $0
ld a, [MenuSelection]
ld a, [wMenuSelection]
ld c, a
ld a, [wBuenasPassword]
maskbits NUM_PASSWORDS_PER_CATEGORY
@@ -24,7 +24,7 @@ BuenasPassword: ; 8af6b
.wrong
ld a, b
ld [ScriptVar], a
ld [wScriptVar], a
ret
; 8afa9
@@ -58,7 +58,7 @@ endr
ld a, [wBuenasPassword]
and $f0
ld c, a
ld a, [MenuSelection]
ld a, [wMenuSelection]
add c
ld c, a
farcall GetBuenasPassword
@@ -71,7 +71,7 @@ BuenaPrize: ; 8afd4
xor a
ld [wMenuScrollPosition], a
ld a, $1
ld [MenuSelection], a
ld [wMenuSelection], a
call Buena_PlacePrizeMenuBox
call Buena_DisplayBlueCardBalance
ld hl, .Text_AskWhichPrize
@@ -88,7 +88,7 @@ BuenaPrize: ; 8afd4
call PrintBlueCardBalance
call Buena_PrizeMenu
jr z, .done
ld [MenuSelectionQuantity], a
ld [wMenuSelectionQuantity], a
call Buena_getprize
ld a, [hl]
ld [wNamedObjectIndexBuffer], a
@@ -98,7 +98,7 @@ BuenaPrize: ; 8afd4
call YesNoBox
jr c, .loop
ld a, [MenuSelectionQuantity]
ld a, [wMenuSelectionQuantity]
call Buena_getprize
inc hl
ld a, [hld]
@@ -109,10 +109,10 @@ BuenaPrize: ; 8afd4
ld a, [hli]
push hl
ld [CurItem], a
ld [wCurItem], a
ld a, $1
ld [wItemQuantityChangeBuffer], a
ld hl, NumItems
ld hl, wNumItems
call ReceiveItem
pop hl
jr nc, .BagFull
@@ -246,7 +246,7 @@ Buena_PlacePrizeMenuBox: ; 8b0d6
Buena_PrizeMenu: ; 8b0e2
ld hl, .MenuHeader
call CopyMenuHeader
ld a, [MenuSelection]
ld a, [wMenuSelection]
ld [wMenuCursorBuffer], a
xor a
ld [wWhichIndexSet], a
@@ -254,10 +254,10 @@ Buena_PrizeMenu: ; 8b0e2
call InitScrollingMenu
call UpdateSprites
call ScrollingMenu
ld a, [MenuSelection]
ld a, [wMenuSelection]
ld c, a
ld a, [wMenuCursorY]
ld [MenuSelection], a
ld [wMenuSelection], a
ld a, [wMenuJoypad]
cp $2
jr z, .cancel
@@ -301,7 +301,7 @@ endr
; 8b134
.prizeitem ; 8b134
ld a, [MenuSelection]
ld a, [wMenuSelection]
call Buena_getprize
ld a, [hl]
push de
@@ -313,7 +313,7 @@ endr
; 8b147
.prizepoints ; 8b147
ld a, [MenuSelection]
ld a, [wMenuSelection]
call Buena_getprize
inc hl
ld a, [hl]