pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Miscellaneous fixes from #694

Browse Source
This commit is contained in:
Rangi 2020-03-21 13:07:18 -04:00
parent 624864307e
commit 5a5f5ececd
6 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/items/descriptions.asm
View File

@ -188,7 +188,7 @@ ItemDescriptions:
dw MorphMailDesc dw MorphMailDesc
dw BlueSkyMailDesc dw BlueSkyMailDesc
dw MusicMailDesc dw MusicMailDesc
dw MewMailDesc dw MirageMailDesc
dw TeruSama25Desc dw TeruSama25Desc
dw TeruSama26Desc dw TeruSama26Desc
dw TeruSama26Desc dw TeruSama26Desc
@ -978,7 +978,7 @@ MusicMailDesc:
db "NATU-print MAIL." db "NATU-print MAIL."
next "(HOLD)@" next "(HOLD)@"
MewMailDesc: MirageMailDesc:
db "MEW-print MAIL." db "MEW-print MAIL."
next "(HOLD)@" next "(HOLD)@"

4
engine/battle_anims/anim_commands.asm
View File

@ -237,12 +237,12 @@ BattleAnim_ClearOAM:
bit BATTLEANIM_KEEPSPRITES_F, a bit BATTLEANIM_KEEPSPRITES_F, a
jr z, .delete 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 hl, wVirtualOAMSprite00Attributes
ld c, NUM_SPRITE_OAM_STRUCTS ld c, NUM_SPRITE_OAM_STRUCTS
.loop .loop
ld a, [hl] 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 ld [hli], a
rept SPRITEOAMSTRUCT_LENGTH + -1 rept SPRITEOAMSTRUCT_LENGTH + -1
inc hl inc hl

18
engine/pokemon/stats_screen.asm
View File

@ -4,6 +4,8 @@
const BLUE_PAGE ; 3 const BLUE_PAGE ; 3
NUM_STAT_PAGES EQU const_value + -1 NUM_STAT_PAGES EQU const_value + -1
STAT_PAGE_MASK EQU %00000011
BattleStatsScreenInit: BattleStatsScreenInit:
ld a, [wLinkMode] ld a, [wLinkMode]
cp LINK_MOBILE cp LINK_MOBILE
@ -63,15 +65,15 @@ StatsScreenMain:
; ??? ; ???
ld [wcf64], a ld [wcf64], a
ld a, [wcf64] ld a, [wcf64]
and %11111100 and $ff ^ STAT_PAGE_MASK
or 1 or PINK_PAGE ; first_page
ld [wcf64], a ld [wcf64], a
.loop .loop
ld a, [wJumptableIndex] ld a, [wJumptableIndex]
and $ff ^ (1 << 7) and $ff ^ (1 << 7)
ld hl, StatsScreenPointerTable ld hl, StatsScreenPointerTable
rst JumpTable rst JumpTable
call StatsScreen_WaitAnim ; check for keys? call StatsScreen_WaitAnim
ld a, [wJumptableIndex] ld a, [wJumptableIndex]
bit 7, a bit 7, a
jr z, .loop jr z, .loop
@ -83,13 +85,13 @@ StatsScreenMobile:
; ??? ; ???
ld [wcf64], a ld [wcf64], a
ld a, [wcf64] ld a, [wcf64]
and %11111100 and $ff ^ STAT_PAGE_MASK
or 1 or PINK_PAGE ; first_page
ld [wcf64], a ld [wcf64], a
.loop .loop
farcall Mobile_SetOverworldDelay farcall Mobile_SetOverworldDelay
ld a, [wJumptableIndex] ld a, [wJumptableIndex]
and $ff ^ (1 << 7) and $7f
ld hl, StatsScreenPointerTable ld hl, StatsScreenPointerTable
rst JumpTable rst JumpTable
call StatsScreen_WaitAnim call StatsScreen_WaitAnim
@ -355,7 +357,7 @@ StatsScreen_JoypadAction:
.set_page .set_page
ld a, [wcf64] ld a, [wcf64]
and %11111100 and $ff ^ STAT_PAGE_MASK
or c or c
ld [wcf64], a ld [wcf64], a
ld h, 4 ld h, 4
@ -759,7 +761,7 @@ StatsScreen_LoadGFX:
jr z, .done jr z, .done
cp $7f cp $7f
jr z, .done jr z, .done
and $80 and CAUGHT_GENDER_MASK
ld a, "♂" ld a, "♂"
jr z, .got_gender jr z, .got_gender
ld a, "♀" ld a, "♀"

2
macros/enum.asm
View File

@ -9,7 +9,7 @@ endc
if _NARG >= 2 if _NARG >= 2
__enumdir__ = \2 __enumdir__ = \2
else else
__enumdir__ = +1 __enumdir__ = 1
endc endc
ENDM ENDM

4
macros/scripts/audio.asm
View File

@ -41,7 +41,7 @@ noise_note: MACRO
ENDM ENDM
; MusicCommands indexes (see audio/engine.asm) ; MusicCommands indexes (see audio/engine.asm)
enum_start $d0, +8 enum_start $d0, 8
FIRST_MUSIC_CMD EQU __enum__ FIRST_MUSIC_CMD EQU __enum__
enum octave_cmd ; $d0 enum octave_cmd ; $d0
@ -49,7 +49,7 @@ octave: MACRO
db octave_cmd | 8 - (\1) ; octave db octave_cmd | 8 - (\1) ; octave
ENDM ENDM
__enumdir__ = +1 __enumdir__ = 1
enum note_type_cmd ; $d8 enum note_type_cmd ; $d8
note_type: MACRO note_type: MACRO

4
macros/scripts/movement.asm
View File

@ -1,5 +1,5 @@
; MovementPointers indexes (see engine/overworld/movement.asm) ; MovementPointers indexes (see engine/overworld/movement.asm)
enum_start 0, +4 enum_start 0, 4
; Directional movements ; Directional movements
@ -73,7 +73,7 @@ fast_jump_step: MACRO
db movement_fast_jump_step | \1 db movement_fast_jump_step | \1
ENDM ENDM
__enumdir__ = +1 __enumdir__ = 1
; Control ; Control
enum movement_remove_sliding ; $38 enum movement_remove_sliding ; $38