ref: 5a5f5ececdde2c4c62bdee649d8b1d3edba96fed
parent: 624864307e4e7a5055c01d7f06145feec35527a7
author: Rangi <[email protected]>
date: Sat Mar 21 09:07:18 EDT 2020
Miscellaneous fixes from #694
--- a/data/items/descriptions.asm
+++ b/data/items/descriptions.asm
@@ -188,7 +188,7 @@
dw MorphMailDesc
dw BlueSkyMailDesc
dw MusicMailDesc
- dw MewMailDesc
+ dw MirageMailDesc
dw TeruSama25Desc
dw TeruSama26Desc
dw TeruSama26Desc
@@ -978,7 +978,7 @@
db "NATU-print MAIL."
next "(HOLD)@"
-MewMailDesc:
+MirageMailDesc:
db "MEW-print MAIL."
next "(HOLD)@"
--- a/engine/battle_anims/anim_commands.asm
+++ b/engine/battle_anims/anim_commands.asm
@@ -237,12 +237,12 @@
bit BATTLEANIM_KEEPSPRITES_F, a
jr z, .delete
- ; Instead of deleting the sprites, make them all use palette 0 (monochrome)
+ ; Instead of deleting the sprites, make them all use PAL_BATTLE_OB_ENEMY
ld hl, wVirtualOAMSprite00Attributes
ld c, NUM_SPRITE_OAM_STRUCTS
.loop
ld a, [hl]
- and $ff ^ (PALETTE_MASK | VRAM_BANK_1)
+ and $ff ^ (PALETTE_MASK | VRAM_BANK_1) ; PAL_BATTLE_OB_ENEMY (0)
ld [hli], a
rept SPRITEOAMSTRUCT_LENGTH + -1
inc hl
--- a/engine/pokemon/stats_screen.asm
+++ b/engine/pokemon/stats_screen.asm
@@ -4,6 +4,8 @@
const BLUE_PAGE ; 3
NUM_STAT_PAGES EQU const_value + -1
+STAT_PAGE_MASK EQU %00000011
+
BattleStatsScreenInit:
ld a, [wLinkMode]
cp LINK_MOBILE
@@ -63,8 +65,8 @@
; ???
ld [wcf64], a
ld a, [wcf64]
- and %11111100
- or 1
+ and $ff ^ STAT_PAGE_MASK
+ or PINK_PAGE ; first_page
ld [wcf64], a
.loop
ld a, [wJumptableIndex]
@@ -71,7 +73,7 @@
and $ff ^ (1 << 7)
ld hl, StatsScreenPointerTable
rst JumpTable
- call StatsScreen_WaitAnim ; check for keys?
+ call StatsScreen_WaitAnim
ld a, [wJumptableIndex]
bit 7, a
jr z, .loop
@@ -83,13 +85,13 @@
; ???
ld [wcf64], a
ld a, [wcf64]
- and %11111100
- or 1
+ and $ff ^ STAT_PAGE_MASK
+ or PINK_PAGE ; first_page
ld [wcf64], a
.loop
farcall Mobile_SetOverworldDelay
ld a, [wJumptableIndex]
- and $ff ^ (1 << 7)
+ and $7f
ld hl, StatsScreenPointerTable
rst JumpTable
call StatsScreen_WaitAnim
@@ -355,7 +357,7 @@
.set_page
ld a, [wcf64]
- and %11111100
+ and $ff ^ STAT_PAGE_MASK
or c
ld [wcf64], a
ld h, 4
@@ -759,7 +761,7 @@
jr z, .done
cp $7f
jr z, .done
- and $80
+ and CAUGHT_GENDER_MASK
ld a, "♂"
jr z, .got_gender
ld a, "♀"
--- a/macros/enum.asm
+++ b/macros/enum.asm
@@ -9,7 +9,7 @@
if _NARG >= 2
__enumdir__ = \2
else
-__enumdir__ = +1
+__enumdir__ = 1
endc
ENDM
--- a/macros/scripts/audio.asm
+++ b/macros/scripts/audio.asm
@@ -41,7 +41,7 @@
ENDM
; MusicCommands indexes (see audio/engine.asm)
- enum_start $d0, +8
+ enum_start $d0, 8
FIRST_MUSIC_CMD EQU __enum__
enum octave_cmd ; $d0
@@ -49,7 +49,7 @@
db octave_cmd | 8 - (\1) ; octave
ENDM
-__enumdir__ = +1
+__enumdir__ = 1
enum note_type_cmd ; $d8
note_type: MACRO
--- a/macros/scripts/movement.asm
+++ b/macros/scripts/movement.asm
@@ -1,5 +1,5 @@
; MovementPointers indexes (see engine/overworld/movement.asm)
- enum_start 0, +4
+ enum_start 0, 4
; Directional movements
@@ -73,7 +73,7 @@
db movement_fast_jump_step | \1
ENDM
-__enumdir__ = +1
+__enumdir__ = 1
; Control
enum movement_remove_sliding ; $38