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

Identify more bit flags (#1153)

Browse Source
This commit is contained in:
Sylvie
2024-11-29 19:29:30 -05:00
committed by GitHub
parent 8894e29da2
commit 644bd42fb0
78 changed files with 539 additions and 472 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
engine/pokemon/bills_pc.asm
View File

@@ -1918,6 +1918,10 @@ ReleasePKMN_ByePKMN:
call DelayFrames
ret
; move pkmn w/o mail jumptable bits
DEF MOVE_MON_FROM_PARTY_F EQU 0
DEF MOVE_MON_TO_PARTY_F EQU 1
MovePKMNWithoutMail_InsertMon:
push hl
push de
@@ -1941,13 +1945,13 @@ MovePKMNWithoutMail_InsertMon:
ld a, [wBillsPC_BackupLoadedBox]
and a
jr nz, .moving_from_box
set 0, c
set MOVE_MON_FROM_PARTY_F, c
.moving_from_box
ld a, [wBillsPC_LoadedBox]
and a
jr nz, .moving_to_box
set 1, c
set MOVE_MON_TO_PARTY_F, c
.moving_to_box
ld hl, .Jumptable

2
engine/pokemon/learn.asm
View File

@@ -169,7 +169,7 @@ ForgetMove:
call SafeLoadTempTilemapToTilemap
pop af
pop hl
bit 1, a
bit B_BUTTON_F, a
jr nz, .cancel
push hl
ld a, [wMenuCursorY]

24
engine/pokemon/mon_menu.asm
View File

@@ -177,7 +177,7 @@ SwitchPartyMons:
call DelayFrame
farcall PartyMenuSelect
bit 1, b
bit B_BUTTON_F, b
jr c, .DontSwitch
farcall _SwitchPartyMons
@@ -815,7 +815,7 @@ ChooseMoveToDelete:
call Load2DMenuData
call SetUpMoveList
ld hl, w2DMenuFlags1
set 6, [hl]
set _2DMENU_ENABLE_SPRITE_ANIMS_F, [hl]
jr .enter_loop
.loop
@@ -842,7 +842,7 @@ ChooseMoveToDelete:
xor a
ld [wSwitchMon], a
ld hl, w2DMenuFlags1
res 6, [hl]
res _2DMENU_ENABLE_SPRITE_ANIMS_F, [hl]
call ClearSprites
call ClearTilemap
pop af
@@ -851,7 +851,8 @@ ChooseMoveToDelete:
DeleteMoveScreen2DMenuData:
db 3, 1 ; cursor start y, x
db 3, 1 ; rows, columns
db $40, $00 ; flags
db _2DMENU_ENABLE_SPRITE_ANIMS ; flags 1
db 0 ; flags 2
dn 2, 0 ; cursor offset
db D_UP | D_DOWN | A_BUTTON | B_BUTTON ; accepted buttons
@@ -883,18 +884,18 @@ MoveScreenLoop:
.loop
call SetUpMoveList
ld hl, w2DMenuFlags1
set 6, [hl]
set _2DMENU_ENABLE_SPRITE_ANIMS_F, [hl]
jr .skip_joy
.joy_loop
call ScrollingMenuJoypad
bit 1, a
bit B_BUTTON_F, a
jp nz, .b_button
bit 0, a
bit A_BUTTON_F, a
jp nz, .a_button
bit 4, a
bit D_RIGHT_F, a
jp nz, .d_right
bit 5, a
bit D_LEFT_F, a
jp nz, .d_left
.skip_joy
@@ -1073,14 +1074,15 @@ MoveScreenLoop:
xor a
ld [wSwappingMove], a
ld hl, w2DMenuFlags1
res 6, [hl]
res _2DMENU_ENABLE_SPRITE_ANIMS_F, [hl]
call ClearSprites
jp ClearTilemap
MoveScreen2DMenuData:
db 3, 1 ; cursor start y, x
db 3, 1 ; rows, columns
db $40, $00 ; flags
db _2DMENU_ENABLE_SPRITE_ANIMS ; flags 1
db 0 ; flags 2
dn 2, 0 ; cursor offsets
db D_UP | D_DOWN | D_LEFT | D_RIGHT | A_BUTTON | B_BUTTON ; accepted buttons

8
engine/pokemon/mon_submenu.asm
View File

@@ -39,13 +39,13 @@ MonSubmenu:
MonMenuLoop:
.loop
ld a, MENU_UNUSED_3 | MENU_BACKUP_TILES_2 ; flags
ld a, MENU_UNUSED | MENU_BACKUP_TILES_2 ; flags
ld [wMenuDataFlags], a
ld a, [wMonSubmenuCount]
ld [wMenuDataItems], a
call InitVerticalMenuCursor
ld hl, w2DMenuFlags1
set 6, [hl]
set _2DMENU_ENABLE_SPRITE_ANIMS_F, [hl]
call StaticMenuJoypad
ld de, SFX_READ_TEXT_2
call PlaySFX
@@ -255,11 +255,11 @@ BattleMonMenu:
call WaitBGMap
call CopyMenuData
ld a, [wMenuDataFlags]
bit 7, a
bit STATICMENU_CURSOR_F, a
jr z, .set_carry
call InitVerticalMenuCursor
ld hl, w2DMenuFlags1
set 6, [hl]
set _2DMENU_ENABLE_SPRITE_ANIMS_F, [hl]
call StaticMenuJoypad
ld de, SFX_READ_TEXT_2
call PlaySFX

3
engine/pokemon/party_menu.asm
View File

@@ -661,7 +661,8 @@ InitPartyMenuNoCancel:
PartyMenu2DMenuData:
db 1, 0 ; cursor start y, x
db 0, 1 ; rows, columns
db $60, $00 ; flags
db _2DMENU_WRAP_UP_DOWN | _2DMENU_ENABLE_SPRITE_ANIMS ; flags 1
db 0 ; flags 2
dn 2, 0 ; cursor offset
db 0 ; accepted buttons

32
engine/pokemon/stats_screen.asm
View File

@@ -5,6 +5,10 @@
DEF NUM_STAT_PAGES EQU const_value - 1
DEF STAT_PAGE_MASK EQU %00000011
const_def 4
const STATS_SCREEN_PLACE_FRONTPIC ; 4
const STATS_SCREEN_ANIMATE_MON ; 5
const STATS_SCREEN_ANIMATE_EGG ; 6
BattleStatsScreenInit:
ld a, [wLinkMode]
@@ -118,9 +122,9 @@ StatsScreenPointerTable:
StatsScreen_WaitAnim:
ld hl, wStatsScreenFlags
bit 6, [hl]
bit STATS_SCREEN_ANIMATE_EGG, [hl]
jr nz, .try_anim
bit 5, [hl]
bit STATS_SCREEN_ANIMATE_MON, [hl]
jr nz, .finish
call DelayFrame
ret
@@ -129,10 +133,10 @@ StatsScreen_WaitAnim:
farcall SetUpPokeAnim
jr nc, .finish
ld hl, wStatsScreenFlags
res 6, [hl]
res STATS_SCREEN_ANIMATE_EGG, [hl]
.finish
ld hl, wStatsScreenFlags
res 5, [hl]
res STATS_SCREEN_ANIMATE_MON, [hl]
farcall HDMATransferTilemapToWRAMBank3
ret
@@ -150,7 +154,7 @@ StatsScreen_Exit:
MonStatsInit:
ld hl, wStatsScreenFlags
res 6, [hl]
res STATS_SCREEN_ANIMATE_EGG, [hl]
call ClearBGPalettes
call ClearTilemap
farcall HDMATransferTilemapToWRAMBank3
@@ -160,7 +164,7 @@ MonStatsInit:
jr z, .egg
call StatsScreen_InitUpperHalf
ld hl, wStatsScreenFlags
set 4, [hl]
set STATS_SCREEN_PLACE_FRONTPIC, [hl]
ld h, 4
call StatsScreen_SetJumptableIndex
ret
@@ -220,7 +224,7 @@ if DEF(_DEBUG)
hlcoord 8, 17
call PlaceString
ld hl, wStatsScreenFlags
set 5, [hl]
set STATS_SCREEN_ANIMATE_MON, [hl]
pop hl
pop de
pop bc
@@ -235,7 +239,7 @@ endc
StatsScreen_LoadPage:
call StatsScreen_LoadGFX
ld hl, wStatsScreenFlags
res 4, [hl]
res STATS_SCREEN_PLACE_FRONTPIC, [hl]
ld a, [wJumptableIndex]
inc a
ld [wJumptableIndex], a
@@ -533,7 +537,7 @@ StatsScreen_LoadGFX:
call .PageTilemap
call .LoadPals
ld hl, wStatsScreenFlags
bit 4, [hl]
bit STATS_SCREEN_PLACE_FRONTPIC, [hl]
jr nz, .place_frontpic
call SetDefaultBGPAndOBP
ret
@@ -559,7 +563,7 @@ StatsScreen_LoadGFX:
farcall LoadStatsScreenPals
call DelayFrame
ld hl, wStatsScreenFlags
set 5, [hl]
set STATS_SCREEN_ANIMATE_MON, [hl]
ret
.PageTilemap:
@@ -853,7 +857,7 @@ StatsScreen_PlaceFrontpic:
.AnimateMon:
ld hl, wStatsScreenFlags
set 5, [hl]
set STATS_SCREEN_ANIMATE_MON, [hl]
ld a, [wCurPartySpecies]
cp UNOWN
jr z, .unown
@@ -895,7 +899,7 @@ StatsScreen_PlaceFrontpic:
ld e, ANIM_MON_MENU
predef LoadMonAnimation
ld hl, wStatsScreenFlags
set 6, [hl]
set STATS_SCREEN_ANIMATE_EGG, [hl]
ret
StatsScreen_GetAnimationParam:
@@ -1038,7 +1042,7 @@ endc
hlcoord 1, 9
call PlaceString
ld hl, wStatsScreenFlags
set 5, [hl]
set STATS_SCREEN_ANIMATE_MON, [hl]
call SetDefaultBGPAndOBP
call DelayFrame
hlcoord 0, 0
@@ -1104,7 +1108,7 @@ StatsScreen_AnimateEgg:
ld d, $0
predef LoadMonAnimation
ld hl, wStatsScreenFlags
set 6, [hl]
set STATS_SCREEN_ANIMATE_EGG, [hl]
ret
StatsScreen_LoadPageIndicators: