diff options
| author | mid-kid <esteve.varela@gmail.com> | 2020-08-22 16:22:37 +0200 |
|---|---|---|
| committer | mid-kid <esteve.varela@gmail.com> | 2020-08-27 14:51:59 +0200 |
| commit | 0a1eb668d053c9904a5bb8f41dda5f0d1bef21d8 (patch) | |
| tree | 3852f0ea1a78602e3a2c55649259cae8e7e0156d /engine/menus/naming_screen.asm | |
| parent | a7c294371c6514bd6a9fbfa4d2d4a0bb6b12b3a5 (diff) | |
Fix some constants surrounding sprite animations
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
Diffstat (limited to 'engine/menus/naming_screen.asm')
| -rw-r--r-- | engine/menus/naming_screen.asm | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm index 6938dc63..89146914 100644 --- a/engine/menus/naming_screen.asm +++ b/engine/menus/naming_screen.asm @@ -363,7 +363,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 @@ -403,10 +403,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 @@ -446,7 +446,7 @@ NamingScreenJoypadLoop: ld b, [hl] NamingScreen_GetCursorPosition: - ld hl, SPRITEANIMSTRUCT_0D + ld hl, SPRITEANIMSTRUCT_VAR2 add hl, bc ld a, [hl] push bc @@ -458,7 +458,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 @@ -482,7 +482,7 @@ NamingScreen_GetCursorPosition: NamingScreen_AnimateCursor: call .GetDPad - ld hl, SPRITEANIMSTRUCT_0D + ld hl, SPRITEANIMSTRUCT_VAR2 add hl, bc ld a, [hl] ld e, a @@ -502,13 +502,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 @@ -545,7 +545,7 @@ NamingScreen_AnimateCursor: call NamingScreen_GetCursorPosition and a jr nz, .asm_11e76 - ld hl, SPRITEANIMSTRUCT_0C + ld hl, SPRITEANIMSTRUCT_VAR1 add hl, bc ld a, [hl] cp $8 @@ -565,7 +565,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 @@ -574,7 +574,7 @@ NamingScreen_AnimateCursor: call NamingScreen_GetCursorPosition and a jr nz, .asm_11e97 - ld hl, SPRITEANIMSTRUCT_0C + ld hl, SPRITEANIMSTRUCT_VAR1 add hl, bc ld a, [hl] and a @@ -596,13 +596,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 @@ -623,7 +623,7 @@ NamingScreen_AnimateCursor: ret .up - ld hl, SPRITEANIMSTRUCT_0D + ld hl, SPRITEANIMSTRUCT_VAR2 add hl, bc ld a, [hl] and a @@ -1044,7 +1044,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 @@ -1094,10 +1094,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 @@ -1140,7 +1140,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 @@ -1155,13 +1155,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 @@ -1198,7 +1198,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 @@ -1218,7 +1218,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 @@ -1227,7 +1227,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 @@ -1249,13 +1249,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 @@ -1268,7 +1268,7 @@ ComposeMail_AnimateCursor: ret .up - ld hl, SPRITEANIMSTRUCT_0D + ld hl, SPRITEANIMSTRUCT_VAR2 add hl, bc ld a, [hl] and a @@ -1287,12 +1287,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 |