diff options
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/breeding/egg.asm | 8 | ||||
| -rwxr-xr-x | engine/dummy_game.asm | 2 | ||||
| -rwxr-xr-x | engine/evolution_animation.asm | 2 | ||||
| -rwxr-xr-x | engine/flypoints.asm | 4 | ||||
| -rwxr-xr-x | engine/link.asm | 12 | ||||
| -rwxr-xr-x | engine/namingscreen.asm | 18 | ||||
| -rwxr-xr-x | engine/slot_machine.asm | 18 | ||||
| -rwxr-xr-x | engine/sprites.asm | 93 |
8 files changed, 78 insertions, 79 deletions
diff --git a/engine/breeding/egg.asm b/engine/breeding/egg.asm index 7c4d8ba62..8798233a1 100755 --- a/engine/breeding/egg.asm +++ b/engine/breeding/egg.asm @@ -792,8 +792,8 @@ Function1736d: ; 1736d (5:736d) add $4c ld d, a ld e, $58 - ld a, $19 - call Function3b2a + ld a, SPRITE_ANIM_INDEX_19 + call _InitSpriteAnimStruct ld hl, $3 add hl, bc ld [hl], $0 @@ -821,8 +821,8 @@ Function173b3: ; 173b3 (5:73b3) ld b, a push hl push bc - ld a, $1c - call Function3b2a + ld a, SPRITE_ANIM_INDEX_1C + call _InitSpriteAnimStruct ld hl, $3 add hl, bc ld [hl], $0 diff --git a/engine/dummy_game.asm b/engine/dummy_game.asm index 86d505e0e..72a8e3a80 100755 --- a/engine/dummy_game.asm +++ b/engine/dummy_game.asm @@ -123,7 +123,7 @@ Functione1f1c: ; e1f1c .asm_e1f30 ld de, $341c ld a, $c - call Function3b2a + call _InitSpriteAnimStruct ld a, $5 ld [wc702], a ld hl, wJumptableIndex diff --git a/engine/evolution_animation.asm b/engine/evolution_animation.asm index 69e7aec4c..ce7dbd7f5 100755 --- a/engine/evolution_animation.asm +++ b/engine/evolution_animation.asm @@ -321,7 +321,7 @@ Function4e7e8: ; 4e7e8 push de ld de, $4858 ld a, $13 - call Function3b2a + call _InitSpriteAnimStruct ld hl, $b add hl, bc ld a, [wJumptableIndex] diff --git a/engine/flypoints.asm b/engine/flypoints.asm index 0eb49d70e..f56facf09 100755 --- a/engine/flypoints.asm +++ b/engine/flypoints.asm @@ -828,7 +828,7 @@ TownMapMon: ; 91f7b ; Animation/palette ld de, 0 ld a, $0 - call Function3b2a + call _InitSpriteAnimStruct ld hl, 3 add hl, bc @@ -869,7 +869,7 @@ TownMapPlayerIcon: ; 91fa6 ld b, $1e ; Female .asm_91fd3 ld a, b - call Function3b2a + call _InitSpriteAnimStruct ld hl, $3 add hl, bc diff --git a/engine/link.asm b/engine/link.asm index a1fa0661b..c50a6ff42 100755 --- a/engine/link.asm +++ b/engine/link.asm @@ -2388,14 +2388,14 @@ Function2914e: ; 2914e call Function2985a pop de ld a, $11 - call Function3b2a + call _InitSpriteAnimStruct ld hl, $b add hl, bc pop bc ld [hl], b pop de ld a, $12 - call Function3b2a + call _InitSpriteAnimStruct ld hl, $b add hl, bc pop bc @@ -3082,7 +3082,7 @@ Function29611: ; 29611 Function2961b: ; 2961b lb de, $54, $58 ld a, $e - call Function3b2a + call _InitSpriteAnimStruct call Function29114 ld a, $20 ld [wcf64], a @@ -3092,7 +3092,7 @@ Function2961b: ; 2961b Function2962c: ; 2962c lb de, $54, $58 ld a, $e - call Function3b2a + call _InitSpriteAnimStruct ld hl, $b add hl, bc ld [hl], $1 @@ -3108,7 +3108,7 @@ Function2962c: ; 2962c Function29649: ; 29649 lb de, $54, $58 ld a, $f - call Function3b2a + call _InitSpriteAnimStruct call Function29114 ld a, $10 ld [wcf64], a @@ -3122,7 +3122,7 @@ Function29660: ; 29660 call Functioncf8 lb de, $28, $58 ld a, $10 - call Function3b2a + call _InitSpriteAnimStruct call Function29114 ld a, $40 ld [wcf64], a diff --git a/engine/namingscreen.asm b/engine/namingscreen.asm index 21ec969b4..3b381a016 100755 --- a/engine/namingscreen.asm +++ b/engine/namingscreen.asm @@ -173,9 +173,9 @@ Function117f5: ; 117f5 (4:57f5) ld hl, wc300 ld [hli], a ld [hl], a - ld de, $2420 - ld a, $a - call Function3b2a + lb de, $24, $20 + ld a, SPRITE_ANIM_INDEX_0A + call _InitSpriteAnimStruct ld hl, $1 add hl, bc ld [hl], $0 @@ -220,18 +220,18 @@ Function11847: ; 11847 (4:5847) ld [hli], a ld [hl], a pop de - ld b, $a + ld b, SPRITE_ANIM_INDEX_0A ld a, d cp $7a jr nz, .asm_11873 ld a, e cp $40 jr nz, .asm_11873 - ld b, $1e + ld b, SPRITE_ANIM_INDEX_1E .asm_11873 ld a, b - ld de, $2420 - call Function3b2a + lb de, $24, $20 + call _InitSpriteAnimStruct ret Function1187b: ; 1187b (4:587b) @@ -405,8 +405,8 @@ Function1197b: ; 1197b (4:597b) jr nz, .asm_11985 ld d, $40 .asm_11985 - ld a, $2 - call Function3b2a + ld a, SPRITE_ANIM_INDEX_02 + call _InitSpriteAnimStruct ld a, c ld [wc6d5], a ld a, b diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm index 075b1ba78..8318942fe 100755 --- a/engine/slot_machine.asm +++ b/engine/slot_machine.asm @@ -1037,9 +1037,9 @@ Function92d20: ; 92d20 call Function92fc0 push bc push af - ld de, $6068 - ld a, $6 - call Function3b2a + lb de, $60, $68 + ld a, SPRITE_ANIM_INDEX_06 + call _InitSpriteAnimStruct ld hl, $e add hl, bc pop af @@ -1096,9 +1096,9 @@ Function92d7e: ; 92d7e add hl, bc ld [hl], $0 push bc - ld de, $6000 - ld a, $7 - call Function3b2a + lb de, $60, $00 + ld a, SPRITE_ANIM_INDEX_07 + call _InitSpriteAnimStruct pop bc xor a ld [wcf64], a @@ -2063,9 +2063,9 @@ Function932fc: ; 932fc (24:72fc) add hl, bc dec [hl] push bc - ld de, $606c - ld a, $8 - call Function3b2a + lb de, $60, $6c + ld a, SPRITE_ANIM_INDEX_08 + call _InitSpriteAnimStruct pop bc ret ; 93316 (24:7316) diff --git a/engine/sprites.asm b/engine/sprites.asm index 82c50f743..38b8ed82f 100755 --- a/engine/sprites.asm +++ b/engine/sprites.asm @@ -113,7 +113,7 @@ Function8cfa8: ; 8cfa8 (23:4fa8) .done ret -Function8cfd6:: ; 8cfd6 +InitSpriteAnimStruct:: ; 8cfd6 ; Find if there's any room in the wc314 array, which is 10x16 push de push af @@ -235,7 +235,6 @@ Function8d03d: ; 8d03d (23:503d) Function8d04c: ; 8d04c -; Populate Sprites with the bouncing mon icons call Function8d0ec ; init WRAM call Function8d132 ; read from a memory array cp -3 @@ -539,51 +538,51 @@ endr ; 8d1c4 Unknown_8d1c4: ; 8d1c4 - db $01, JUMPTABLE_8D24B_FUNCTION_01, $00 ; 00 - db $07, JUMPTABLE_8D24B_FUNCTION_04, $00 ; 01 - db $08, JUMPTABLE_8D24B_FUNCTION_05, $05 ; 02 - db $0a, JUMPTABLE_8D24B_FUNCTION_06, $00 ; 03 - db $0b, JUMPTABLE_8D24B_FUNCTION_07, $06 ; 04 - db $0c, JUMPTABLE_8D24B_FUNCTION_08, $06 ; 05 - db $0d, JUMPTABLE_8D24B_FUNCTION_09, $07 ; 06 - db $0e, JUMPTABLE_8D24B_FUNCTION_0A, $07 ; 07 - db $10, JUMPTABLE_8D24B_FUNCTION_0B, $07 ; 08 - db $08, JUMPTABLE_8D24B_FUNCTION_0C, $05 ; 09 - db $11, JUMPTABLE_8D24B_FUNCTION_00, $00 ; 0a - db $12, JUMPTABLE_8D24B_FUNCTION_0D, $08 ; 0b - db $12, JUMPTABLE_8D24B_FUNCTION_0E, $08 ; 0c - db $12, JUMPTABLE_8D24B_FUNCTION_0F, $08 ; 0d - db $13, JUMPTABLE_8D24B_FUNCTION_10, $00 ; 0e - db $15, JUMPTABLE_8D24B_FUNCTION_00, $00 ; 0f - db $16, JUMPTABLE_8D24B_FUNCTION_11, $00 ; 10 - db $17, JUMPTABLE_8D24B_FUNCTION_12, $00 ; 11 - db $18, JUMPTABLE_8D24B_FUNCTION_12, $00 ; 12 - db $19, JUMPTABLE_8D24B_FUNCTION_13, $00 ; 13 - db $1a, JUMPTABLE_8D24B_FUNCTION_14, $00 ; 14 - db $1b, JUMPTABLE_8D24B_FUNCTION_00, $00 ; 15 - db $1d, JUMPTABLE_8D24B_FUNCTION_15, $00 ; 16 - db $1e, JUMPTABLE_8D24B_FUNCTION_00, $00 ; 17 - db $1d, JUMPTABLE_8D24B_FUNCTION_17, $00 ; 18 - db $1f, JUMPTABLE_8D24B_FUNCTION_00, $00 ; 19 - db $24, JUMPTABLE_8D24B_FUNCTION_19, $00 ; 1a - db $25, JUMPTABLE_8D24B_FUNCTION_00, $00 ; 1b - db $20, JUMPTABLE_8D24B_FUNCTION_13, $00 ; 1c - db $26, JUMPTABLE_8D24B_FUNCTION_1A, $00 ; 1d - db $2d, JUMPTABLE_8D24B_FUNCTION_00, $00 ; 1e - db $2e, JUMPTABLE_8D24B_FUNCTION_00, $00 ; 1f - db $2f, JUMPTABLE_8D24B_FUNCTION_00, $00 ; 20 - db $30, JUMPTABLE_8D24B_FUNCTION_00, $00 ; 21 - db $31, JUMPTABLE_8D24B_FUNCTION_00, $00 ; 22 - db $32, JUMPTABLE_8D24B_FUNCTION_1B, $00 ; 23 - db $33, JUMPTABLE_8D24B_FUNCTION_1C, $00 ; 24 - db $34, JUMPTABLE_8D24B_FUNCTION_00, $00 ; 25 - db $35, JUMPTABLE_8D24B_FUNCTION_1D, $00 ; 26 - db $37, JUMPTABLE_8D24B_FUNCTION_1E, $00 ; 27 - db $38, JUMPTABLE_8D24B_FUNCTION_1E, $00 ; 28 - db $39, JUMPTABLE_8D24B_FUNCTION_20, $00 ; 29 - db $3f, JUMPTABLE_8D24B_FUNCTION_21, $00 ; 2a - db $3e, JUMPTABLE_8D24B_FUNCTION_22, $00 ; 2b - db $40, JUMPTABLE_8D24B_FUNCTION_00, $00 ; 2c + db $01, SPRITE_ANIM_SEQ_01, $00 ; 00 + db $07, SPRITE_ANIM_SEQ_04, $00 ; 01 + db $08, SPRITE_ANIM_SEQ_05, $05 ; 02 + db $0a, SPRITE_ANIM_SEQ_06, $00 ; 03 + db $0b, SPRITE_ANIM_SEQ_07, $06 ; 04 + db $0c, SPRITE_ANIM_SEQ_08, $06 ; 05 + db $0d, SPRITE_ANIM_SEQ_09, $07 ; 06 + db $0e, SPRITE_ANIM_SEQ_0A, $07 ; 07 + db $10, SPRITE_ANIM_SEQ_0B, $07 ; 08 + db $08, SPRITE_ANIM_SEQ_0C, $05 ; 09 + db $11, SPRITE_ANIM_SEQ_00, $00 ; 0a + db $12, SPRITE_ANIM_SEQ_0D, $08 ; 0b + db $12, SPRITE_ANIM_SEQ_0E, $08 ; 0c + db $12, SPRITE_ANIM_SEQ_0F, $08 ; 0d + db $13, SPRITE_ANIM_SEQ_10, $00 ; 0e + db $15, SPRITE_ANIM_SEQ_00, $00 ; 0f + db $16, SPRITE_ANIM_SEQ_11, $00 ; 10 + db $17, SPRITE_ANIM_SEQ_12, $00 ; 11 + db $18, SPRITE_ANIM_SEQ_12, $00 ; 12 + db $19, SPRITE_ANIM_SEQ_13, $00 ; 13 + db $1a, SPRITE_ANIM_SEQ_14, $00 ; 14 + db $1b, SPRITE_ANIM_SEQ_00, $00 ; 15 + db $1d, SPRITE_ANIM_SEQ_15, $00 ; 16 + db $1e, SPRITE_ANIM_SEQ_00, $00 ; 17 + db $1d, SPRITE_ANIM_SEQ_17, $00 ; 18 + db $1f, SPRITE_ANIM_SEQ_00, $00 ; 19 + db $24, SPRITE_ANIM_SEQ_19, $00 ; 1a + db $25, SPRITE_ANIM_SEQ_00, $00 ; 1b + db $20, SPRITE_ANIM_SEQ_13, $00 ; 1c + db $26, SPRITE_ANIM_SEQ_1A, $00 ; 1d + db $2d, SPRITE_ANIM_SEQ_00, $00 ; 1e + db $2e, SPRITE_ANIM_SEQ_00, $00 ; 1f + db $2f, SPRITE_ANIM_SEQ_00, $00 ; 20 + db $30, SPRITE_ANIM_SEQ_00, $00 ; 21 + db $31, SPRITE_ANIM_SEQ_00, $00 ; 22 + db $32, SPRITE_ANIM_SEQ_1B, $00 ; 23 + db $33, SPRITE_ANIM_SEQ_1C, $00 ; 24 + db $34, SPRITE_ANIM_SEQ_00, $00 ; 25 + db $35, SPRITE_ANIM_SEQ_1D, $00 ; 26 + db $37, SPRITE_ANIM_SEQ_1E, $00 ; 27 + db $38, SPRITE_ANIM_SEQ_1E, $00 ; 28 + db $39, SPRITE_ANIM_SEQ_20, $00 ; 29 + db $3f, SPRITE_ANIM_SEQ_21, $00 ; 2a + db $3e, SPRITE_ANIM_SEQ_22, $00 ; 2b + db $40, SPRITE_ANIM_SEQ_00, $00 ; 2c ; 8d24b |