diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/events/crystal_unown.asm | 25 | ||||
| -rwxr-xr-x | engine/items.asm | 6 | ||||
| -rw-r--r-- | engine/pic_animation.asm | 44 | ||||
| -rwxr-xr-x | engine/player_object.asm | 2 |
4 files changed, 34 insertions, 43 deletions
diff --git a/engine/events/crystal_unown.asm b/engine/events/crystal_unown.asm index 352306055..09d44bb9a 100644 --- a/engine/events/crystal_unown.asm +++ b/engine/events/crystal_unown.asm @@ -105,7 +105,7 @@ SpecialKabutoChamber: ; 8ae4e Special_DisplayUnownWords: ; 8ae68 ld a, [ScriptVar] - ld hl, .MenuDataHeader_Escape + ld hl, .MenuDataHeaders_UnownWalls and a jr z, .load @@ -153,8 +153,6 @@ Special_DisplayUnownWords: ; 8ae68 ret ; 8aebc -.UnownText: ; 8aebc - unownwall: MACRO rept _NARG if \1 == "-" @@ -180,36 +178,35 @@ endr db $ff ENDM -.UnownText_Escape: +.UnownText: ; 8aebc +;.UnownText_Escape: ; db $08, $44, $04, $00, $2e, $08, $ff unownwall "E", "S", "C", "A", "P", "E" -.UnownText_Light: +;.UnownText_Light: ; db $26, $20, $0c, $0e, $46, $ff unownwall "L", "I", "G", "H", "T" -.UnownText_Water: +;.UnownText_Water: ; db $4c, $00, $46, $08, $42, $ff unownwall "W", "A", "T", "E", "R" -.UnownText_Ho_Oh: +;.UnownText_Ho_Oh: ; db $0e, $2c, $64, $2c, $0e, $ff unownwall "H", "O", "-", "O", "H" ; 8aed5 -.MenuDataHeader_Escape: ; 0x8aed5 +.MenuDataHeaders_UnownWalls: ; 0x8aed5 +;.MenuDataHeader_Escape: db $40 ; flags db 04, 03 ; start coords db 09, 16 ; end coords - -.MenuDataHeader_Light: ; 0x8aeda +;.MenuDataHeader_Light: db $40 ; flags db 04, 04 ; start coords db 09, 15 ; end coords - -.MenuDataHeader_Water: ; 0x8aedf +;.MenuDataHeader_Water: db $40 ; flags db 04, 04 ; start coords db 09, 15 ; end coords - -.MenuDataHeader_Ho_Oh: ; 0x8aee4 +;.MenuDataHeader_Ho_Oh: db $40 ; flags db 04, 04 ; start coords db 09, 15 ; end coords diff --git a/engine/items.asm b/engine/items.asm index dcaf10356..503a76c6b 100755 --- a/engine/items.asm +++ b/engine/items.asm @@ -455,15 +455,12 @@ CheckTMHM: ; d3fb GetTMHMNumber:: ; d407 ; Return the number of a TM/HM by item id c. - ld a, c - ; Skip any dummy items. cp ITEM_C3 ; TM04-05 jr c, .done cp ITEM_DC ; TM28-29 jr c, .skip - dec a .skip dec a @@ -475,15 +472,12 @@ GetTMHMNumber:: ; d407 GetNumberedTMHM: ; d417 ; Return the item id of a TM/HM by number c. - ld a, c - ; Skip any gaps. cp ITEM_C3 - (TM01 - 1) jr c, .done cp ITEM_DC - (TM01 - 1) - 1 jr c, .skip_one - .skip_two inc a .skip_one diff --git a/engine/pic_animation.asm b/engine/pic_animation.asm index b060f5b4b..3c826b8b7 100644 --- a/engine/pic_animation.asm +++ b/engine/pic_animation.asm @@ -77,13 +77,13 @@ PokeAnims: ; d0042 .Slow: pokeanim StereoCry, Setup2, Play .Normal: pokeanim StereoCry, Setup, Play -.Menu: pokeanim CryNoWait, Setup, Play, SetWait, Wait, Extra, Play -.Trade: pokeanim Extra, Play2, Extra, Play, SetWait, Wait, Cry, Setup, Play -.Evolve: pokeanim Extra, Play, SetWait, Wait, CryNoWait, Setup, Play -.Hatch: pokeanim Extra, Play, CryNoWait, Setup, Play, SetWait, Wait, Extra, Play -.Unused: pokeanim CryNoWait, Setup, Play, SetWait, Wait, Extra, Play +.Menu: pokeanim CryNoWait, Setup, Play, SetWait, Wait, Idle, Play +.Trade: pokeanim Idle, Play2, Idle, Play, SetWait, Wait, Cry, Setup, Play +.Evolve: pokeanim Idle, Play, SetWait, Wait, CryNoWait, Setup, Play +.Hatch: pokeanim Idle, Play, CryNoWait, Setup, Play, SetWait, Wait, Idle, Play +.Unused: pokeanim CryNoWait, Setup, Play, SetWait, Wait, Idle, Play .Egg1: pokeanim Setup, Play -.Egg2: pokeanim Extra, Play +.Egg2: pokeanim Idle, Play AnimateFrontpic: ; d008e @@ -151,7 +151,7 @@ ENDM setup_command PokeAnim_Wait setup_command PokeAnim_Setup setup_command PokeAnim_Setup2 - setup_command PokeAnim_Extra + setup_command PokeAnim_Idle setup_command PokeAnim_Play setup_command PokeAnim_Play2 setup_command PokeAnim_Cry @@ -198,7 +198,7 @@ PokeAnim_Setup2: ; d011d ret ; d012f -PokeAnim_Extra: ; d012f +PokeAnim_Idle: ; d012f ld c, TRUE ld b, 0 call PokeAnim_InitAnim @@ -360,18 +360,18 @@ PokeAnim_InitPicAttributes: ; d01d6 PokeAnim_InitAnim: ; d0228 ld a, [rSVBK] push af - ld a, BANK(wPokeAnimExtraFlag) + ld a, BANK(wPokeAnimIdleFlag) ld [rSVBK], a push bc - ld hl, wPokeAnimExtraFlag - ld bc, wPokeAnimStructEnd - wPokeAnimExtraFlag + ld hl, wPokeAnimIdleFlag + ld bc, wPokeAnimStructEnd - wPokeAnimIdleFlag xor a call ByteFill pop bc ld a, b ld [wPokeAnimSpeed], a ld a, c - ld [wPokeAnimExtraFlag], a + ld [wPokeAnimIdleFlag], a call GetMonAnimPointer call GetMonFramesPointer call GetMonBitmaskPointer @@ -949,20 +949,20 @@ GetMonAnimPointer: ; d055c ld c, BANK(UnownAnimations) ld hl, UnownAnimationPointers - ld de, UnownAnimationExtraPointers + ld de, UnownAnimationIdlePointers call PokeAnim_IsUnown jr z, .unown ld c, BANK(PicAnimations) ld hl, AnimationPointers - ld de, AnimationExtraPointers + ld de, AnimationIdlePointers .unown - ld a, [wPokeAnimExtraFlag] + ld a, [wPokeAnimIdleFlag] and a - jr z, .extras + jr z, .idles ld h, d ld l, e -.extras +.idles ld a, [wPokeAnimSpeciesOrUnown] dec a @@ -982,12 +982,12 @@ GetMonAnimPointer: ; d055c .egg ld hl, EggAnimation ld c, BANK(EggAnimation) - ld a, [wPokeAnimExtraFlag] + ld a, [wPokeAnimIdleFlag] and a - jr z, .extras_egg - ld hl, EggAnimationExtra - ld c, BANK(EggAnimationExtra) -.extras_egg + jr z, .idles_egg + ld hl, EggAnimationIdle + ld c, BANK(EggAnimationIdle) +.idles_egg ld a, c ld [wPokeAnimPointerBank], a diff --git a/engine/player_object.asm b/engine/player_object.asm index e11a30036..6d5cb7e84 100755 --- a/engine/player_object.asm +++ b/engine/player_object.asm @@ -55,7 +55,7 @@ PlayerObjectTemplate: ; 8071 ; A dummy map object used to initialize the player object. ; Shorter than the actual amount copied by two bytes. ; Said bytes seem to be unused. - object_event SPRITE_CHRIS, -4, -4, SPRITEMOVEDATA_PLAYER, 15, 15, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, 0, -1 + object_event -4, -4, SPRITE_CHRIS, SPRITEMOVEDATA_PLAYER, 15, 15, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, 0, -1 CopyDECoordsToMapObject:: ; 807e push de |