diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/battle/core.asm | 8 | ||||
| -rw-r--r-- | engine/menus/intro_menu.asm | 2 | ||||
| -rw-r--r-- | engine/pokemon/move_mon.asm | 4 | ||||
| -rw-r--r-- | engine/tilesets/tileset_palettes.asm | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 9ac99c587..6f76b6c5c 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -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 diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm index 3068269d1..df0cc4edc 100644 --- a/engine/menus/intro_menu.asm +++ b/engine/menus/intro_menu.asm @@ -60,7 +60,7 @@ OptionsMenu: NewGame: xor a - ld [wMonStatusFlags], a + ld [wDebugFlags], a call ResetWRAM call NewGame_ClearTileMapEtc call AreYouABoyOrAreYouAGirl diff --git a/engine/pokemon/move_mon.asm b/engine/pokemon/move_mon.asm index 6e9d90d36..c67d210b9 100644 --- a/engine/pokemon/move_mon.asm +++ b/engine/pokemon/move_mon.asm @@ -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] diff --git a/engine/tilesets/tileset_palettes.asm b/engine/tilesets/tileset_palettes.asm index 1e433b158..459cd74c2 100644 --- a/engine/tilesets/tileset_palettes.asm +++ b/engine/tilesets/tileset_palettes.asm @@ -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 |