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

@@ -41,13 +41,13 @@ MomTriesToBuySomething:: ; fcfec
.ok
ld a, PHONE_MOM
ld [wCurrentCaller], a
ld bc, EngineBuffer2
ld bc, wEngineBuffer2
ld hl, 0
add hl, bc
ld [hl], 0
inc hl
ld [hl], 1
ld hl, wPhoneScriptPointer - EngineBuffer2
ld hl, wPhoneScriptPointer - wEngineBuffer2
add hl, bc
ld a, BANK(Mom_GetScriptPointer)
ld [hli], a
@@ -89,7 +89,7 @@ CheckBalance_MomItem2: ; fd044
inc hl
ld [hl], LOW(MOM_MONEY)
.loop
ld de, MomItemTriggerBalance
ld de, wMomItemTriggerBalance
ld bc, wMomsMoney
farcall CompareMoney
jr z, .exact
@@ -111,7 +111,7 @@ CheckBalance_MomItem2: ; fd044
ret
.AddMoney:
ld de, MomItemTriggerBalance
ld de, wMomItemTriggerBalance
ld bc, hMoneyTemp
farcall AddMoney
ret
@@ -150,10 +150,10 @@ Mom_GiveItemOrDoll: ; fd0c3
.not_doll
ld a, [hl]
ld [CurItem], a
ld [wCurItem], a
ld a, 1
ld [wItemQuantityChangeBuffer], a
ld hl, PCItems
ld hl, wPCItems
call ReceiveItem
ret
; fd0eb