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

18
engine/events/print_unown.asm
View File

@@ -1,5 +1,5 @@
_UnownPrinter: ; 16be4
ld a, [UnownDex]
ld a, [wUnownDex]
and a
ret z
@@ -7,10 +7,10 @@ _UnownPrinter: ; 16be4
push af
ld a, $1
ld [hInMenu], a
ld a, [Options]
ld a, [wOptions]
push af
set NO_TEXT_SCROLL, a
ld [Options], a
ld [wOptions], a
call ClearBGPalettes
call ClearTileMap
@@ -54,10 +54,10 @@ _UnownPrinter: ; 16be4
call WaitBGMap
ld a, UNOWN
ld [CurPartySpecies], a
ld [wCurPartySpecies], a
xor a
ld [TempMonDVs], a
ld [TempMonDVs + 1], a
ld [wTempMonDVs], a
ld [wTempMonDVs + 1], a
ld b, SCGB_TRAINER_OR_MON_FRONTPIC_PALS
call GetSGBLayout
@@ -89,7 +89,7 @@ _UnownPrinter: ; 16be4
.pressed_b
pop af
ld [Options], a
ld [wOptions], a
pop af
ld [hInMenu], a
call ReturnToMapFromSubmenu
@@ -134,9 +134,9 @@ _UnownPrinter: ; 16be4
cp 26
jr z, .vacant
inc a
ld [UnownLetter], a
ld [wUnownLetter], a
ld a, UNOWN
ld [CurPartySpecies], a
ld [wCurPartySpecies], a
xor a
ld [wBoxAlignment], a
ld de, vTiles2