diff options
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/intro_menu.asm | 6 | ||||
| -rwxr-xr-x | engine/mon_icons.asm | 9 | ||||
| -rw-r--r-- | engine/movement.asm | 1 | ||||
| -rwxr-xr-x | engine/player_object.asm | 2 | ||||
| -rwxr-xr-x | engine/pokegear.asm | 4 | ||||
| -rw-r--r-- | engine/scripting.asm | 1 | ||||
| -rwxr-xr-x | engine/sprite_anims.asm | 20 | ||||
| -rwxr-xr-x | engine/trade/animation.asm | 1 |
8 files changed, 22 insertions, 22 deletions
diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm index e0ecd41fe..5127a9895 100755 --- a/engine/intro_menu.asm +++ b/engine/intro_menu.asm @@ -1341,7 +1341,7 @@ Function639b: ; unreferenced ld h, 0 add hl, hl add hl, hl - ld de, Data63ca + ld de, .Data63ca add hl, de ; If bit 2 of [wTitleScreenTimer] is set, get the second dw; else, get the first dw ld a, [wTitleScreenTimer] @@ -1357,12 +1357,12 @@ Function639b: ; unreferenced ret z ld e, a ld d, [hl] - ld a, SPRITE_ANIM_INDEX_01 + ld a, SPRITE_ANIM_INDEX_GS_TITLE_TRAIL call _InitSpriteAnimStruct ret ; 63ca -Data63ca: ; 63ca +.Data63ca: ; 63ca ; frame 0 y, x; frame 1 y, x db 11 * 8 + 4, 10 * 8, 0 * 8, 0 * 8 db 11 * 8 + 4, 13 * 8, 11 * 8 + 4, 11 * 8 diff --git a/engine/mon_icons.asm b/engine/mon_icons.asm index 0aade6985..70c439863 100755 --- a/engine/mon_icons.asm +++ b/engine/mon_icons.asm @@ -144,11 +144,11 @@ PartyMenu_InitAnimatedMonIcon: ; 8e8d5 (23:68d5) pop bc pop hl jr c, .mail - ld a, SPRITE_ANIM_FRAMESET_03 + ld a, SPRITE_ANIM_FRAMESET_PARTY_MON_WITH_ITEM jr .okay .mail - ld a, SPRITE_ANIM_FRAMESET_02 + ld a, SPRITE_ANIM_FRAMESET_PARTY_MON_WITH_MAIL .okay ld hl, SPRITEANIMSTRUCT_FRAMESET_ID add hl, bc @@ -297,7 +297,7 @@ GetMemIconGFX: ; 8e9db (23:69db) ld a, [wCurIconTile] GetIconGFX: ; 8e9de call GetIcon_a - ld de, $80 ; 8 tiles + ld de, 8 tiles add hl, de ld de, HeldItemIcons lb bc, BANK(HeldItemIcons), 2 @@ -468,9 +468,6 @@ ReadMonMenuIcon: ; 8eab3 INCLUDE "data/mon_menu_icons.asm" - INCLUDE "gfx/icon_pointers.asm" -Icons: INCLUDE "gfx/icons.asm" - diff --git a/engine/movement.asm b/engine/movement.asm index 7b58e4023..ea661abbb 100644 --- a/engine/movement.asm +++ b/engine/movement.asm @@ -1,4 +1,5 @@ MovementPointers: ; 5075 +; entries correspond to macros/movement.asm enumeration dw Movement_turn_head_down ; 00 dw Movement_turn_head_up ; 01 dw Movement_turn_head_left ; 02 diff --git a/engine/player_object.asm b/engine/player_object.asm index a4796043b..232d31bc2 100755 --- a/engine/player_object.asm +++ b/engine/player_object.asm @@ -193,7 +193,7 @@ CopyMapObjectToObjectStruct: ; 8116 and $f0 jr z, .skip_color_override swap a - and $7 ; OAM_PALETTE + and PALETTE_MASK ld [wTempObjectCopyPalette], a .skip_color_override diff --git a/engine/pokegear.asm b/engine/pokegear.asm index 901053c9f..561ece400 100755 --- a/engine/pokegear.asm +++ b/engine/pokegear.asm @@ -141,7 +141,7 @@ INCBIN "gfx/pokegear/fast_ship.2bpp" InitPokegearModeIndicatorArrow: ; 90d32 (24:4d32) depixel 4, 2, 4, 0 - ld a, SPRITE_ANIM_INDEX_0D + ld a, SPRITE_ANIM_INDEX_POKEGEAR_ARROW call _InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_TILE_ID add hl, bc @@ -685,7 +685,7 @@ PokegearMap_InitPlayerIcon: ; 9106a PokegearMap_InitCursor: ; 91098 push af depixel 0, 0 - ld a, SPRITE_ANIM_INDEX_0D + ld a, SPRITE_ANIM_INDEX_POKEGEAR_ARROW call _InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_TILE_ID add hl, bc diff --git a/engine/scripting.asm b/engine/scripting.asm index df22995b5..ed6221d6e 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -64,6 +64,7 @@ RunScriptCommand: ScriptCommandTable: +; entries correspond to macros/event.asm enumeration dw Script_scall ; 00 dw Script_farscall ; 01 dw Script_ptcall ; 02 diff --git a/engine/sprite_anims.asm b/engine/sprite_anims.asm index e6681c8ac..32c91b07f 100755 --- a/engine/sprite_anims.asm +++ b/engine/sprite_anims.asm @@ -18,8 +18,8 @@ DoAnimFrame: ; 8d24b dw .PartyMon dw .PartyMonSwitch dw .PartyMonSelected - dw .sprite_anim_seq_04 - dw .namingscreencursor + dw .GSTitleTrail + dw .NamingScreenCursor dw .GameFreakLogo dw .GSIntroStar dw .GSIntroSparkle @@ -27,9 +27,9 @@ DoAnimFrame: ; 8d24b dw .SlotsChansey dw .SlotsChanseyEgg dw .MailCursor - dw .sprite_anim_seq_0D - dw .sprite_anim_seq_0E - dw .sprite_anim_seq_0F + dw .ForUnusedCursor + dw .DummyGameCursor + dw .PokegearArrow dw .TradePokeBall dw .TradeTubeBulge dw .TrademonInTube @@ -132,7 +132,7 @@ DoAnimFrame: ; 8d24b ld [hl], 8 * 3 ret -.sprite_anim_seq_04 ; 8d302 (23:5302) +.GSTitleTrail ; 8d302 (23:5302) call .AnonymousJumptable jp hl ; 8d306 (23:5306) @@ -217,7 +217,7 @@ DoAnimFrame: ; 8d24b ld [hl], a ret -.namingscreencursor ; 8d36c (23:536c) +.NamingScreenCursor ; 8d36c (23:536c) callab NamingScreen_AnimateCursor ret @@ -404,15 +404,15 @@ DoAnimFrame: ; 8d24b ld [hl], a ret -.sprite_anim_seq_0D ; 8d46e (23:546e) +.ForUnusedCursor ; 8d46e (23:546e) callab ret_e00ed ret -.sprite_anim_seq_0F ; 8d475 (23:5475) +.PokegearArrow ; 8d475 (23:5475) callab AnimatePokegearModeIndicatorArrow ret -.sprite_anim_seq_0E ; 8d47c (23:547c) +.DummyGameCursor ; 8d47c (23:547c) callab DummyGame_InterpretJoypad_AnimateCursor ret diff --git a/engine/trade/animation.asm b/engine/trade/animation.asm index 31c1578c2..7100bd558 100755 --- a/engine/trade/animation.asm +++ b/engine/trade/animation.asm @@ -236,6 +236,7 @@ DoTradeAnimation: ; 29082 ; 290af .JumpTable: ; 290af +; entries correspond to macros/trade_anim.asm enumeration dw TradeAnim_AdvanceScriptPointer ; 00 dw TradeAnim_ShowGivemonData ; 01 dw TradeAnim_ShowGetmonData ; 02 |