pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix some constants surrounding sprite animations

Browse Source 
Also commented the use of the field surrounding the struct
initialization functions.

SPRITEANIMSTRUCT_0C -> SPRITEANIMSTRUCT_VAR1
SPRITEANIMSTRUCT_0D -> SPRITEANIMSTRUCT_VAR2
SPRITEANIMSTRUCT_0E -> SPRITEANIMSTRUCT_VAR3
SPRITEANIMSTRUCT_0F -> SPRITEANIMSTRUCT_VAR4

BATTLEANIMSTRUCT_01 -> BATTLEANIMSTRUCT_OAMFLAGS
BATTLEANIMSTRUCT_ANON_JT_INDEX -> BATTLEANIMSTRUCT_JUMPTABLE_INDEX
BATTLEANIMSTRUCT_0F -> BATTLEANIMSTRUCT_VAR1
BATTLEANIMSTRUCT_10 -> BATTLEANIMSTRUCT_VAR2
This commit is contained in:
mid-kid
2020-08-22 16:22:37 +02:00
parent 733664b18f
commit 13c4a93cea
19 changed files with 378 additions and 378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
engine/menus/naming_screen.asm
View File

@@ -385,7 +385,7 @@ NamingScreenJoypadLoop:
ld hl, SPRITEANIMSTRUCT_FRAMESET_ID
add hl, bc
ld a, [hl]
ld hl, SPRITEANIMSTRUCT_0E
ld hl, SPRITEANIMSTRUCT_VAR3
add hl, bc
ld [hl], a
ld hl, wJumptableIndex
@@ -425,10 +425,10 @@ NamingScreenJoypadLoop:
ld c, [hl]
inc hl
ld b, [hl]
ld hl, SPRITEANIMSTRUCT_0C
ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld [hl], $8
ld hl, SPRITEANIMSTRUCT_0D
ld hl, SPRITEANIMSTRUCT_VAR2
add hl, bc
ld [hl], $4
call NamingScreen_IsTargetBox
@@ -468,7 +468,7 @@ NamingScreenJoypadLoop:
ld b, [hl]
NamingScreen_GetCursorPosition:
ld hl, SPRITEANIMSTRUCT_0D
ld hl, SPRITEANIMSTRUCT_VAR2
add hl, bc
ld a, [hl]
push bc
@@ -480,7 +480,7 @@ NamingScreen_GetCursorPosition:
cp b
pop bc
jr nz, .not_bottom_row
ld hl, SPRITEANIMSTRUCT_0C
ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld a, [hl]
cp $3
@@ -504,7 +504,7 @@ NamingScreen_GetCursorPosition:
NamingScreen_AnimateCursor:
call .GetDPad
ld hl, SPRITEANIMSTRUCT_0D
ld hl, SPRITEANIMSTRUCT_VAR2
add hl, bc
ld a, [hl]
ld e, a
@@ -524,13 +524,13 @@ NamingScreen_AnimateCursor:
ld de, .CaseDelEnd
ld a, SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR_BIG - SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR ; 1
.ok2
ld hl, SPRITEANIMSTRUCT_0E
ld hl, SPRITEANIMSTRUCT_VAR3
add hl, bc
add [hl] ; default SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR
ld hl, SPRITEANIMSTRUCT_FRAMESET_ID
add hl, bc
ld [hl], a
ld hl, SPRITEANIMSTRUCT_0C
ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld l, [hl]
ld h, $0
@@ -567,7 +567,7 @@ NamingScreen_AnimateCursor:
call NamingScreen_GetCursorPosition
and a
jr nz, .asm_11ab7
ld hl, SPRITEANIMSTRUCT_0C
ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld a, [hl]
cp $8
@@ -587,7 +587,7 @@ NamingScreen_AnimateCursor:
ld e, a
add a
add e
ld hl, SPRITEANIMSTRUCT_0C
ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld [hl], a
ret
@@ -596,7 +596,7 @@ NamingScreen_AnimateCursor:
call NamingScreen_GetCursorPosition
and a
jr nz, .asm_11ad8
ld hl, SPRITEANIMSTRUCT_0C
ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld a, [hl]
and a
@@ -618,13 +618,13 @@ NamingScreen_AnimateCursor:
ld e, a
add a
add e
ld hl, SPRITEANIMSTRUCT_0C
ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld [hl], a
ret
.down
ld hl, SPRITEANIMSTRUCT_0D
ld hl, SPRITEANIMSTRUCT_VAR2
add hl, bc
ld a, [hl]
call NamingScreen_IsTargetBox
@@ -645,7 +645,7 @@ NamingScreen_AnimateCursor:
ret
.up
ld hl, SPRITEANIMSTRUCT_0D
ld hl, SPRITEANIMSTRUCT_VAR2
add hl, bc
ld a, [hl]
and a
@@ -1059,7 +1059,7 @@ INCBIN "gfx/icons/mail_big.2bpp"
ld hl, SPRITEANIMSTRUCT_FRAMESET_ID
add hl, bc
ld a, [hl]
ld hl, SPRITEANIMSTRUCT_0E
ld hl, SPRITEANIMSTRUCT_VAR3
add hl, bc
ld [hl], a
ld hl, wJumptableIndex
@@ -1109,10 +1109,10 @@ INCBIN "gfx/icons/mail_big.2bpp"
ld c, [hl]
inc hl
ld b, [hl]
ld hl, SPRITEANIMSTRUCT_0C
ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld [hl], $9
ld hl, SPRITEANIMSTRUCT_0D
ld hl, SPRITEANIMSTRUCT_VAR2
add hl, bc
ld [hl], $5
ret
@@ -1155,7 +1155,7 @@ INCBIN "gfx/icons/mail_big.2bpp"
ComposeMail_AnimateCursor:
call .GetDPad
ld hl, SPRITEANIMSTRUCT_0D
ld hl, SPRITEANIMSTRUCT_VAR2
add hl, bc
ld a, [hl]
ld e, a
@@ -1170,13 +1170,13 @@ ComposeMail_AnimateCursor:
ld de, .CaseDelEnd
ld a, 1
.got_pointer
ld hl, SPRITEANIMSTRUCT_0E
ld hl, SPRITEANIMSTRUCT_VAR3
add hl, bc
add [hl]
ld hl, SPRITEANIMSTRUCT_FRAMESET_ID
add hl, bc
ld [hl], a
ld hl, SPRITEANIMSTRUCT_0C
ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld l, [hl]
ld h, 0
@@ -1213,7 +1213,7 @@ ComposeMail_AnimateCursor:
call ComposeMail_GetCursorPosition
and a
jr nz, .case_del_done_right
ld hl, SPRITEANIMSTRUCT_0C
ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld a, [hl]
cp $9
@@ -1233,7 +1233,7 @@ ComposeMail_AnimateCursor:
ld e, a
add a
add e
ld hl, SPRITEANIMSTRUCT_0C
ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld [hl], a
ret
@@ -1242,7 +1242,7 @@ ComposeMail_AnimateCursor:
call ComposeMail_GetCursorPosition
and a
jr nz, .caps_del_done_left
ld hl, SPRITEANIMSTRUCT_0C
ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld a, [hl]
and a
@@ -1264,13 +1264,13 @@ ComposeMail_AnimateCursor:
ld e, a
add a
add e
ld hl, SPRITEANIMSTRUCT_0C
ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld [hl], a
ret
.down
ld hl, SPRITEANIMSTRUCT_0D
ld hl, SPRITEANIMSTRUCT_VAR2
add hl, bc
ld a, [hl]
cp $5
@@ -1283,7 +1283,7 @@ ComposeMail_AnimateCursor:
ret
.up
ld hl, SPRITEANIMSTRUCT_0D
ld hl, SPRITEANIMSTRUCT_VAR2
add hl, bc
ld a, [hl]
and a
@@ -1302,12 +1302,12 @@ NamingScreen_PressedA_GetCursorCommand:
ld b, [hl]
ComposeMail_GetCursorPosition:
ld hl, SPRITEANIMSTRUCT_0D
ld hl, SPRITEANIMSTRUCT_VAR2
add hl, bc
ld a, [hl]
cp $5
jr nz, .letter
ld hl, SPRITEANIMSTRUCT_0C
ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld a, [hl]
cp $3