Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #503 from Rangi42/master

Browse Source 
Factor wMisc into meaningful parts; move most code out of home.asm
This commit is contained in:
yenatch
2018-04-09 21:30:24 -04:00
committed by GitHub
parent e4b41fad4f 53ff57ca66
commit 40b537d45b
59 changed files with 1652 additions and 1610 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
engine/overworld/scripting.asm
View File

@@ -1359,7 +1359,7 @@ Script_startbattle:
call BufferScreen
predef StartBattle
ld a, [wBattleResult]
and $3f
and $ff ^ BATTLERESULT_BITMASK
ld [wScriptVar], a
ret
@@ -1378,10 +1378,10 @@ Script_reloadmapafterbattle:
ld hl, wBattleScriptFlags
ld d, [hl]
ld [hl], $0
ld [hl], 0
ld a, [wBattleResult]
and $3f
cp $1
and $ff ^ BATTLERESULT_BITMASK
cp LOSE
jr nz, .notblackedout
ld b, BANK(Script_BattleWhiteout)
ld hl, Script_BattleWhiteout
@@ -1395,7 +1395,7 @@ Script_reloadmapafterbattle:
.was_wild
ld a, [wBattleResult]
bit 7, a
bit BATTLERESULT_BOX_FULL, a
jr z, .done
ld b, BANK(Script_SpecialBillCall)
ld de, Script_SpecialBillCall