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
This commit is contained in:
Rangi
2018-09-16 13:42:17 -04:00
parent 03cb8c53f1 1564896060
commit 60b09f291d
7 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
engine/battle/core.asm
View File

@@ -2371,8 +2371,8 @@ WinTrainerBattle:
jr nz, .skip_heal
predef HealParty
.skip_heal
ld a, [wMonStatusFlags]
bit 0, a
ld a, [wDebugFlags]
bit DEBUG_BATTLE_F, a
jr nz, .skip_win_loss_text
call PrintWinLossText
@@ -2921,8 +2921,8 @@ LostBattle:
ld c, 40
call DelayFrames
ld a, [wMonStatusFlags]
bit 0, a
ld a, [wDebugFlags]
bit DEBUG_BATTLE_F, a
jr nz, .skip_win_loss_text
call PrintWinLossText
.skip_win_loss_text

2
engine/menus/intro_menu.asm
View File

@@ -60,7 +60,7 @@ OptionsMenu:
NewGame:
xor a
ld [wMonStatusFlags], a
ld [wDebugFlags], a
call ResetWRAM
call NewGame_ClearTileMapEtc
call AreYouABoyOrAreYouAGirl

4
engine/pokemon/move_mon.asm
View File

@@ -1194,8 +1194,8 @@ GiveEgg::
ld hl, wPartyMon1Happiness
ld bc, PARTYMON_STRUCT_LENGTH
call AddNTimes
ld a, [wMonStatusFlags]
bit 1, a
ld a, [wDebugFlags]
bit DEBUG_FIELD_F, a
ld a, 1
jr nz, .got_init_happiness
ld a, [wBaseEggSteps]

4
engine/tilesets/tileset_palettes.asm
View File

@@ -123,12 +123,12 @@ LoadMansionPalette:
call FarCopyWRAM
ld a, BANK(wBGPals1)
ld de, wBGPals1 palette PAL_BG_WATER
ld hl, MansionPalette1 + 6 palettes
ld hl, MansionPalette1 palette 6
ld bc, 1 palettes
call FarCopyWRAM
ld a, BANK(wBGPals1)
ld de, wBGPals1 palette PAL_BG_ROOF
ld hl, MansionPalette1 + 8 palettes
ld hl, MansionPalette1 palette 8
ld bc, 1 palettes
call FarCopyWRAM
ret