diff --git a/battle/anim_commands.asm b/battle/anim_commands.asm index ebc6a8a43..c3006abdb 100644 --- a/battle/anim_commands.asm +++ b/battle/anim_commands.asm @@ -106,7 +106,7 @@ RunBattleAnimScript: ; cc163 .playframe call Functioncc25f - call Functionccb48 + call _ExecuteBGEffects call Functioncc96e call Function3b0c call BattleAnimRequestPals @@ -633,7 +633,7 @@ BattleAnimCmd_Obj: ; cc41f (33:441f) ld [BattleAnimTemps + 2], a call GetBattleAnimByte ld [BattleAnimTemps + 3], a - call Functioncc9a1 + call QueueBattleAnimation ret BattleAnimCmd_BGEffect: ; cc43b (33:443b) @@ -645,7 +645,7 @@ BattleAnimCmd_BGEffect: ; cc43b (33:443b) ld [BattleAnimTemps + 2], a call GetBattleAnimByte ld [BattleAnimTemps + 3], a - call Functionccb4f + call _QueueBGEffect ret BattleAnimCmd_BGP: ; cc457 (33:4457) @@ -667,20 +667,20 @@ BattleAnimCmd_ResetObp0: ; cc46c (33:446c) ld a, [hSGB] and a ld a, $e0 - jr z, .asm_cc475 + jr z, .not_sgb ld a, $f0 -.asm_cc475 +.not_sgb ld [wcfc8], a ret BattleAnimCmd_ClearObjs: ; cc479 (33:4479) - ld hl, OTPartyMon3HP + ld hl, ActiveAnimObjects ld a, $a0 -.asm_cc47e +.loop ld [hl], $0 inc hl dec a - jr nz, .asm_cc47e + jr nz, .loop ret BattleAnimCmd_1GFX: @@ -725,7 +725,7 @@ endr BattleAnimCmd_IncObj: ; cc4c0 (33:44c0) call GetBattleAnimByte ld e, $a - ld bc, OTPartyMon3HP + ld bc, ActiveAnimObjects .asm_cc4c8 ld hl, $0 add hl, bc @@ -773,7 +773,7 @@ BattleAnimCmd_IncBGEffect: ; cc4e3 (33:44e3) BattleAnimCmd_SetObj: ; cc506 (33:4506) call GetBattleAnimByte ld e, $a - ld bc, OTPartyMon3HP + ld bc, ActiveAnimObjects .asm_cc50e ld hl, $0 add hl, bc @@ -1480,12 +1480,12 @@ Functioncc94b: ; cc94b Functioncc96e: ; cc96e ld a, $0 ld [w5_d418], a - ld hl, OTPartyMon3HP - ld e, $a -.asm_cc978 + ld hl, ActiveAnimObjects + ld e, 10 +.loop ld a, [hl] and a - jr z, .asm_cc98a + jr z, .next ld c, l ld b, h push hl @@ -1494,24 +1494,24 @@ Functioncc96e: ; cc96e call Functioncca09 pop de pop hl - jr c, .asm_cc9a0 + jr c, .done -.asm_cc98a +.next ld bc, $0018 add hl, bc dec e - jr nz, .asm_cc978 + jr nz, .loop ld a, [w5_d418] ld l, a - ld h, $c4 -.asm_cc997 + ld h, Sprites / $100 +.loop2 ld a, l - cp $a0 - jr nc, .asm_cc9a0 + cp SpritesEnd % $100 + jr nc, .done xor a ld [hli], a - jr .asm_cc997 + jr .loop2 -.asm_cc9a0 +.done ret ; cc9a1 diff --git a/battle/anim_objects.asm b/battle/anim_objects.asm index 3fc6e7c7d..4d71fa314 100644 --- a/battle/anim_objects.asm +++ b/battle/anim_objects.asm @@ -1,20 +1,20 @@ ; Objects used in battle animations. - -Functioncc9a1: ; cc9a1 (33:49a1) - ld hl, OTPartyMon3HP - ld e, $a -.asm_cc9a6 +QueueBattleAnimation: ; cc9a1 (33:49a1) + ld hl, ActiveAnimObjects + ld e, 10 +.loop ld a, [hl] and a - jr z, .asm_cc9b3 + jr z, .done ld bc, $18 add hl, bc dec e - jr nz, .asm_cc9a6 + jr nz, .loop scf ret -.asm_cc9b3 + +.done ld c, l ld b, h ld hl, w5_d40e @@ -22,14 +22,13 @@ Functioncc9a1: ; cc9a1 (33:49a1) call Functioncc9c4 ret - Functioncc9bd: ; cc9bd - ld hl, 0 + ld hl, $0 add hl, bc ld [hl], $0 ret -; cc9c4 +; cc9c4 Functioncc9c4: ; cc9c4 (33:49c4) ld a, [BattleAnimTemps] @@ -84,13 +83,12 @@ endr ld [hl], a ret - Functioncca09: ; cca09 call Functionccaaa call Functionce7d1 - cp $fd + cp -3 jp z, .asm_ccaa5 - cp $fc + cp -4 jp z, .asm_ccaa2 push af ld hl, BattleAnimTemps @@ -196,25 +194,26 @@ Functioncca09: ; cca09 pop bc scf ret + ; ccaaa Functionccaaa: ; ccaaa - ld hl, $0001 + ld hl, $1 add hl, bc ld a, [hl] and $80 ld [BattleAnimTemps], a xor a ld [BattleAnimTemps + 7], a - ld hl, $0005 + ld hl, $5 add hl, bc ld a, [hl] ld [BattleAnimTemps + 8], a - ld hl, $0002 + ld hl, $2 add hl, bc ld a, [hl] ld [BattleAnimTemps + 1], a - ld hl, $0006 + ld hl, $6 add hl, bc ld a, [hli] ld [BattleAnimTemps + 2], a @@ -229,13 +228,13 @@ Functionccaaa: ; ccaaa ld a, [hBattleTurn] and a ret z - ld hl, $0001 + ld hl, $1 add hl, bc ld a, [hl] ld [BattleAnimTemps], a bit 0, [hl] ret z - ld hl, $0007 + ld hl, $7 add hl, bc ld a, [hli] ld d, a @@ -280,8 +279,8 @@ Functionccaaa: ; ccaaa inc a ld [BattleAnimTemps + 5], a ret -; ccb31 +; ccb31 Functionccb31: ; ccb31 (33:4b31) push hl @@ -298,6 +297,7 @@ Functionccb31: ; ccb31 (33:4b31) jr nz, .asm_ccb39 xor a jr .asm_ccb45 + .asm_ccb44 ld a, [hl] .asm_ccb45 @@ -305,16 +305,16 @@ Functionccb31: ; ccb31 (33:4b31) pop hl ret - -Functionccb48: ; ccb48 - callab Functionc8000 +_ExecuteBGEffects: ; ccb48 + callab ExecuteBGEffects ret + ; ccb4f - -Functionccb4f: ; ccb4f (33:4b4f) - callab Functionc801a +_QueueBGEffect: ; ccb4f (33:4b4f) + callab QueueBGEffect ret + ; ccb56 (33:4b56) BattleAnimObjects: ; ccb56 @@ -508,13 +508,12 @@ BattleAnimObjects: ; ccb56 db $00, $00, $b8, $00, $01, $29 ; ccfbe - Functionccfbe: ; ccfbe - ld hl, $0004 + ld hl, $4 add hl, bc ld e, [hl] ld d, 0 - ld hl, Jumptable_ccfce + ld hl, .Jumptable rept 2 add hl, de endr @@ -522,10 +521,10 @@ endr ld h, [hl] ld l, a jp [hl] + ; ccfce - -Jumptable_ccfce: ; ccfce (33:4fce) +.Jumptable: ; ccfce (33:4fce) dw Functioncd06e dw Functioncd12a dw Functioncd146 @@ -607,15 +606,12 @@ Jumptable_ccfce: ; ccfce (33:4fce) dw Functioncd58a dw Functionce6bf - Functioncd06e: ; cd06e (33:506e) - call Functionce71e ; ; ; call does not return - -Jumptable_cd071: ; cd071 (33:5071) + call BattleAnim_AnonJumptable +.anon_jumptable dw Functioncd078 dw Functioncd075 - Functioncd075: ; cd075 (33:5075) call Functioncc9bd @@ -646,7 +642,7 @@ Functioncd081: ; cd081 (33:5081) ld hl, $b add hl, bc ld d, [hl] - call Functionce734 + call BattleAnim_Sine ld hl, $a add hl, bc ld [hl], a @@ -661,6 +657,7 @@ Functioncd0a6: ; cd0a6 (33:50a6) jr c, .asm_cd0b3 call Functioncc9bd ret + .asm_cd0b3 add $2 ld [hl], a @@ -676,13 +673,13 @@ endr ld d, $10 push af push de - call Functionce734 + call BattleAnim_Sine ld hl, $a add hl, bc ld [hl], a pop de pop af - call Functionce732 + call BattleAnim_Cosine ld hl, $9 add hl, bc sra a @@ -693,13 +690,11 @@ endr ret Functioncd0e3: ; cd0e3 (33:50e3) - call Functionce71e ; ; ; call does not return - -Jumptable_cd0e6: ; cd0e6 (33:50e6) + call BattleAnim_AnonJumptable +.anon_jumptable dw Functioncd0ea dw Functioncd106 - Functioncd0ea: ; cd0ea (33:50ea) call Functionce72c ld hl, $b @@ -727,13 +722,13 @@ Functioncd106: ; cd106 (33:5106) ld d, [hl] push af push de - call Functionce734 + call BattleAnim_Sine ld hl, $a add hl, bc ld [hl], a pop de pop af - call Functionce732 + call BattleAnim_Cosine ld hl, $9 add hl, bc ld [hl], a @@ -743,13 +738,11 @@ Functioncd106: ; cd106 (33:5106) ret Functioncd12a: ; cd12a (33:512a) - call Functionce71e ; ; ; call does not return - -Jumptable_cd12d: ; cd12d (33:512d) + call BattleAnim_AnonJumptable +.anon_jumptable dw Functioncd135 dw Functioncd131 - Functioncd131: ; cd131 (33:5131) call Functioncc9bd ret @@ -777,14 +770,14 @@ Functioncd146: ; cd146 (33:5146) ld a, [hl] call Functionce70a ret + .asm_cd158 call Functioncc9bd ret Functioncd15c: ; cd15c (33:515c) - call Functionce71e ; ; ; call does not return - -Jumptable_cd15f: ; cd15f (33:515f) + call BattleAnim_AnonJumptable +.anon_jumptable dw Functioncd177 dw Functioncd17e dw Functioncd1dc @@ -798,7 +791,6 @@ Jumptable_cd15f: ; cd15f (33:515f) dw Functioncd1ee dw Functioncd20e - Functioncd177: ; cd177 (33:5177) call Functioncd249 call Functionce72c @@ -834,7 +826,7 @@ Functioncd1a7: ; cd1a7 (33:51a7) add hl, bc ld a, [hli] ld d, [hl] - call Functionce734 + call BattleAnim_Sine ld hl, $a add hl, bc ld [hl], a @@ -881,7 +873,7 @@ Functioncd1ee: ; cd1ee (33:51ee) add hl, bc ld a, [hli] ld d, [hl] - call Functionce734 + call BattleAnim_Sine ld hl, $a add hl, bc ld [hl], a @@ -902,14 +894,12 @@ Functioncd20e: ; cd20e (33:520e) ret Functioncd212: ; cd212 (33:5212) - call Functionce71e ; ; ; call does not return - -Jumptable_cd215: ; cd215 (33:5215) + call BattleAnim_AnonJumptable +.anon_jumptable dw Functioncd21b dw Functioncd222 dw Functioncd232 - Functioncd21b: ; cd21b (33:521b) call Functioncd249 call Functionce72c @@ -923,6 +913,7 @@ Functioncd222: ; cd222 (33:5222) jr nc, .asm_cd22f call Functioncd081 ret + .asm_cd22f call Functionce72c @@ -940,6 +931,7 @@ rept 2 dec [hl] endr ret + .asm_cd245 call Functioncc9bd ret @@ -962,12 +954,14 @@ Functioncd249: ; cd249 (33:5249) jr z, .asm_cd265 inc hl jr .asm_cd25a + .asm_cd265 ld a, [hl] - ld hl, $5 + ld hl, SPRITEANIMSTRUCT_YCOORD add hl, bc ld [hl], a ret + ; cd26c (33:526c) Unknown_cd26c: ; cd26c @@ -986,16 +980,14 @@ Unknown_cd26c: ; cd26c ; cd284 Functioncd284: ; cd284 (33:5284) - call Functionce71e ; ; ; call does not return - -Jumptable_cd287: ; cd287 (33:5287) + call BattleAnim_AnonJumptable +.anon_jumptable dw Functioncd291 dw Functioncd2a0 dw Functioncd2b1 dw Functioncd2b5 dw Functioncd2bd - Functioncd291: ; cd291 (33:5291) ld hl, $b add hl, bc @@ -1032,13 +1024,11 @@ Functioncd2bd: ; cd2bd (33:52bd) ret Functioncd2be: ; cd2be (33:52be) - call Functionce71e ; ; ; call does not return - -Jumptable_cd2c1: ; cd2c1 (33:52c1) + call BattleAnim_AnonJumptable +.anon_jumptable dw Functioncd2c5 dw Functioncd2d1 - Functioncd2c5: ; cd2c5 (33:52c5) call Functionce72c ld hl, $f @@ -1052,7 +1042,7 @@ Functioncd2d1: ; cd2d1 (33:52d1) add hl, bc ld a, [hli] ld d, [hl] - call Functionce734 + call BattleAnim_Sine ld hl, $a add hl, bc ld [hl], a @@ -1077,20 +1067,19 @@ Functioncd2d1: ; cd2d1 (33:52d1) add hl, bc ld [hl], a ret + .asm_cd302 call Functioncc9bd ret Functioncd306: ; cd306 (33:5306) - call Functionce71e ; ; ; call does not return - -Jumptable_cd309: ; cd309 (33:5309) + call BattleAnim_AnonJumptable +.anon_jumptable dw Functioncd311 dw Functioncd321 dw Functioncd32a dw Functioncd37d - Functioncd311: ; cd311 (33:5311) ld hl, $7 add hl, bc @@ -1099,6 +1088,7 @@ Functioncd311: ; cd311 (33:5311) jr nc, .asm_cd31e call Functioncd38e ret + .asm_cd31e call Functionce72c @@ -1118,7 +1108,7 @@ Functioncd32a: ; cd32a (33:532a) add hl, bc ld a, [hl] ld d, $18 - call Functionce732 + call BattleAnim_Cosine sub $18 sra a ld hl, $a @@ -1128,7 +1118,7 @@ Functioncd32a: ; cd32a (33:532a) add hl, bc ld a, [hl] ld d, $18 - call Functionce734 + call BattleAnim_Sine ld hl, $9 add hl, bc ld [hl], a @@ -1141,6 +1131,7 @@ Functioncd32a: ; cd32a (33:532a) add [hl] ld [hl], a ret + .asm_cd363 ld hl, $b add hl, bc @@ -1157,6 +1148,7 @@ Functioncd32a: ; cd32a (33:532a) add hl, bc dec [hl] ret + .asm_cd37a call Functionce72c @@ -1168,6 +1160,7 @@ Functioncd37d: ; cd37d (33:537d) jr c, .asm_cd38a call Functioncc9bd ret + .asm_cd38a call Functioncd38e ret @@ -1196,14 +1189,12 @@ Functioncd38e: ; cd38e (33:538e) ret Functioncd3ae: ; cd3ae (33:53ae) - call Functionce71e ; ; ; call does not return - -Jumptable_cd3b1: ; cd3b1 (33:53b1) + call BattleAnim_AnonJumptable +.anon_jumptable dw Functioncd3b7 dw Functioncd3cc dw Functioncd3ee - Functioncd3b7: ; cd3b7 (33:53b7) call Functionce72c ld hl, $f @@ -1225,6 +1216,7 @@ Functioncd3cc: ; cd3cc (33:53cc) jr z, .asm_cd3d6 dec [hl] ret + .asm_cd3d6 ld hl, $b add hl, bc @@ -1247,9 +1239,8 @@ Functioncd3ee: ; cd3ee (33:53ee) ret Functioncd3f2: ; cd3f2 (33:53f2) - call Functionce71e ; ; ; call does not return - -Jumptable_cd3f5: ; cd3f5 (33:53f5) + call BattleAnim_AnonJumptable +.anon_jumptable dw Functioncd409 dw Functioncd45c dw Functioncd467 @@ -1261,7 +1252,6 @@ Jumptable_cd3f5: ; cd3f5 (33:53f5) dw Functioncd437 dw Functioncd458 - Functioncd409: ; cd409 (33:5409) ld hl, $b add hl, bc @@ -1287,6 +1277,7 @@ Functioncd41d: ; cd41d (33:541d) add hl, bc dec [hl] ret + .asm_cd42f call Functionce72c ld a, $10 @@ -1299,13 +1290,13 @@ Functioncd437: ; cd437 (33:5437) ld d, $10 push af push de - call Functionce734 + call BattleAnim_Sine ld hl, $a add hl, bc ld [hl], a pop de pop af - call Functionce732 + call BattleAnim_Cosine ld hl, $9 add hl, bc ld [hl], a @@ -1349,9 +1340,8 @@ Functioncd477: ; cd477 (33:5477) ret Functioncd478: ; cd478 (33:5478) - call Functionce71e ; ; ; call does not return - -Jumptable_cd47b: ; cd47b (33:547b) + call BattleAnim_AnonJumptable +.anon_jumptable dw Functioncd48d dw Functioncd496 dw Functioncd4ee @@ -1362,7 +1352,6 @@ Jumptable_cd47b: ; cd47b (33:547b) dw Functioncd545 dw Functioncd549 - Functioncd48d: ; cd48d (33:548d) call Functionce72c ld hl, $f @@ -1391,6 +1380,7 @@ Functioncd496: ; cd496 (33:5496) add hl, bc ld [hl], $5 ret + .asm_cd4bc ld hl, $b add hl, bc @@ -1401,7 +1391,7 @@ Functioncd496: ; cd496 (33:5496) add hl, bc ld a, [hl] dec [hl] - call Functionce734 + call BattleAnim_Sine ld hl, $a add hl, bc ld [hl], a @@ -1432,12 +1422,13 @@ Functioncd4ee: ; cd4ee (33:54ee) jr nz, .asm_cd4fb call Functioncc9bd ret + .asm_cd4fb ld hl, $f add hl, bc ld a, [hl] ld d, $10 - call Functionce734 + call BattleAnim_Sine ld hl, $9 add hl, bc ld [hl], a @@ -1449,6 +1440,7 @@ Functioncd4ee: ; cd4ee (33:54ee) add hl, bc inc [hl] jr .asm_cd51e + .asm_cd519 ld hl, $f add hl, bc @@ -1499,42 +1491,45 @@ Functioncd557: ; cd557 (33:5557) add hl, bc ld a, [hl] bit 7, a - jr nz, .asm_cd574 + jr nz, .negative cp $20 - jr nc, .asm_cd570 + jr nc, .plus_256 cp $18 - jr nc, .asm_cd56c + jr nc, .plus_384 ld de, $200 ret -.asm_cd56c + +.plus_384 ld de, $180 ret -.asm_cd570 + +.plus_256 ld de, $100 ret -.asm_cd574 + +.negative and $3f cp $20 - jr nc, .asm_cd586 + jr nc, .minus_256 cp $18 - jr nc, .asm_cd582 - ld de, $fe00 + jr nc, .minus_384 + ld de, -$200 ret -.asm_cd582 - ld de, $fe80 + +.minus_384 + ld de, -$180 ret -.asm_cd586 - ld de, rJOYP ; $ff00 + +.minus_256 + ld de, -$100 ret Functioncd58a: ; cd58a (33:558a) - call Functionce71e ; ; ; call does not return - -Jumptable_cd58d: ; cd58d (33:558d) + call BattleAnim_AnonJumptable +.anon_jumptable dw Functioncd591 dw Functioncd5aa - Functioncd591: ; cd591 (33:5591) ld hl, $b add hl, bc @@ -1550,7 +1545,6 @@ Functioncd591: ; cd591 (33:5591) ld hl, $f add hl, bc ld [hl], $40 - Functioncd5aa: ; cd5aa (33:55aa) ld hl, $f add hl, bc @@ -1559,6 +1553,7 @@ Functioncd5aa: ; cd5aa (33:55aa) jr nc, .asm_cd5b7 call Functioncc9bd ret + .asm_cd5b7 ld hl, $b add hl, bc @@ -1569,7 +1564,7 @@ Functioncd5aa: ; cd5aa (33:55aa) add hl, bc ld a, [hl] dec [hl] - call Functionce734 + call BattleAnim_Sine ld hl, $a add hl, bc ld [hl], a @@ -1593,14 +1588,12 @@ Functioncd5aa: ; cd5aa (33:55aa) ret Functioncd5e9: ; cd5e9 (33:55e9) - call Functionce71e ; ; ; call does not return - -Jumptable_cd5ec: ; cd5ec (33:55ec) + call BattleAnim_AnonJumptable +.anon_jumptable dw Functioncd5f2 dw Functioncd5fb dw Functioncd61b - Functioncd5f2: ; cd5f2 (33:55f2) call Functionce72c ld hl, $f @@ -1619,6 +1612,7 @@ Functioncd5fb: ; cd5fb (33:55fb) ld a, [hl] call Functionce70a ret + .asm_cd60d call Functionce72c ld hl, $f @@ -1681,16 +1675,14 @@ Functioncd61b: ; cd61b (33:561b) ret Functioncd66a: ; cd66a (33:566a) - call Functionce71e ; ; ; call does not return - -Jumptable_cd66d: ; cd66d (33:566d) + call BattleAnim_AnonJumptable +.anon_jumptable dw Functioncd677 dw Functioncd687 dw Functioncd6c5 dw Functioncd6c6 dw Functioncd6d6 - Functioncd677: ; cd677 (33:5677) call Functionce72c ld a, $42 @@ -1714,6 +1706,7 @@ Functioncd687: ; cd687 (33:5687) xor a ld [hLCDStatCustom + 1], a ret + .asm_cd69b dec a ld [hl], a @@ -1721,7 +1714,7 @@ Functioncd687: ; cd687 (33:5687) add hl, bc ld a, [hl] ld d, $10 - call Functionce734 + call BattleAnim_Sine ld hl, $a add hl, bc ld [hl], a @@ -1760,6 +1753,7 @@ Functioncd6c6: ; cd6c6 (33:56c6) Functioncd6d6: ; cd6d6 (33:56d6) call Functioncc9bd ret + asm_cd6da: ; cd6da (33:56da) rept 2 inc a @@ -1771,13 +1765,11 @@ endr ret Functioncd6e3: ; cd6e3 (33:56e3) - call Functionce71e ; ; ; call does not return - -Jumptable_cd6e6: ; cd6e6 (33:56e6) + call BattleAnim_AnonJumptable +.anon_jumptable dw Functioncd6ea dw Functioncd6f7 - Functioncd6ea: ; cd6ea (33:56ea) call Functionce72c ld hl, $b @@ -1794,6 +1786,7 @@ Functioncd6f7: ; cd6f7 (33:56f7) jr c, .asm_cd704 call Functioncc9bd ret + .asm_cd704 ld a, $2 call Functionce70a @@ -1802,22 +1795,20 @@ Functioncd6f7: ; cd6f7 (33:56f7) ld a, [hl] dec [hl] ld d, $8 - call Functionce734 + call BattleAnim_Sine ld hl, $a add hl, bc ld [hl], a ret Functioncd71a: ; cd71a (33:571a) - call Functionce71e ; ; ; call does not return - -Jumptable_cd71d: ; cd71d (33:571d) + call BattleAnim_AnonJumptable +.anon_jumptable dw Functioncd725 dw Functioncd728 dw Functioncd763 dw Functioncd776 - Functioncd725: ; cd725 (33:5725) call Functionce72c @@ -1834,11 +1825,12 @@ Functioncd728: ; cd728 (33:5728) ld a, [hl] dec [hl] ld d, $8 - call Functionce734 + call BattleAnim_Sine ld hl, $a add hl, bc ld [hl], a ret + .asm_cd747 call Functionce72c ld a, $28 @@ -1863,6 +1855,7 @@ Functioncd763: ; cd763 (33:5763) jr nc, .asm_cd76e inc [hl] ret + .asm_cd76e call Functionce72c ld a, $29 @@ -1879,6 +1872,7 @@ Functioncd777: ; cd777 (33:5777) jr c, .asm_cd784 call Functioncc9bd ret + .asm_cd784 ld a, [hl] ld hl, $f @@ -1903,13 +1897,11 @@ Functioncd777: ; cd777 (33:5777) ret Functioncd7a4: ; cd7a4 (33:57a4) - call Functionce71e ; ; ; call does not return - -Jumptable_cd7a7: ; cd7a7 (33:57a7) + call BattleAnim_AnonJumptable +.anon_jumptable dw Functioncd7ab dw Functioncd7d2 - Functioncd7ab: ; cd7ab (33:57ab) call Functionce72c ld hl, $b @@ -1941,6 +1933,7 @@ Functioncd7d2: ; cd7d2 (33:57d2) jr nz, .asm_cd7de call Functioncc9bd ret + .asm_cd7de ld hl, $f add hl, bc @@ -1951,13 +1944,13 @@ Functioncd7d2: ; cd7d2 (33:57d2) ld d, [hl] push af push de - call Functionce734 + call BattleAnim_Sine ld hl, $a add hl, bc ld [hl], a pop de pop af - call Functionce732 + call BattleAnim_Cosine ld hl, $9 add hl, bc ld [hl], a @@ -1973,15 +1966,13 @@ Functioncd7d2: ; cd7d2 (33:57d2) ret Functioncd80c: ; cd80c (33:580c) - call Functionce71e ; ; ; call does not return - -Jumptable_cd80f: ; cd80f (33:580f) + call BattleAnim_AnonJumptable +.anon_jumptable dw Functioncd81f dw Functioncd817 dw Functioncd81f dw Functioncd820 - Functioncd817: ; cd817 (33:5817) call Functionce72c ld a, $35 @@ -1995,9 +1986,8 @@ Functioncd820: ; cd820 (33:5820) ret Functioncd824: ; cd824 (33:5824) - call Functionce71e ; ; ; call does not return - -Jumptable_cd827: ; cd827 (33:5827) + call BattleAnim_AnonJumptable +.anon_jumptable dw Functioncd835 dw Functioncd860 dw Functioncd88f @@ -2006,7 +1996,6 @@ Jumptable_cd827: ; cd827 (33:5827) dw Functioncd88f dw Functioncd893 - Functioncd835: ; cd835 (33:5835) call Functionce72c ld hl, $3 @@ -2023,6 +2012,7 @@ Functioncd835: ; cd835 (33:5835) add hl, bc ld [hl], $10 jr .asm_cd858 + .asm_cd852 ld hl, $f add hl, bc @@ -2041,7 +2031,7 @@ Functioncd860: ; cd860 (33:5860) ld hl, $b add hl, bc ld d, [hl] - call Functionce734 + call BattleAnim_Sine ld hl, $9 add hl, bc ld [hl], a @@ -2052,6 +2042,7 @@ Functioncd860: ; cd860 (33:5860) ld a, [hl] inc a jr .asm_cd883 + .asm_cd87e ld hl, $10 add hl, bc @@ -2076,9 +2067,8 @@ Functioncd893: ; cd893 (33:5893) ret Functioncd89a: ; cd89a (33:589a) - call Functionce71e ; ; ; call does not return - -Jumptable_cd89d: ; cd89d (33:589d) + call BattleAnim_AnonJumptable +.anon_jumptable dw Functioncd8ab dw Functioncd8cc dw Functioncd8f5 @@ -2087,7 +2077,6 @@ Jumptable_cd89d: ; cd89d (33:589d) dw Functioncd8f5 dw Functioncd8f9 - Functioncd8ab: ; cd8ab (33:58ab) call Functionce72c ld hl, $b @@ -2098,6 +2087,7 @@ Functioncd8ab: ; cd8ab (33:58ab) add hl, bc ld [hl], $10 jr .asm_cd8c4 + .asm_cd8be ld hl, $f add hl, bc @@ -2116,7 +2106,7 @@ Functioncd8cc: ; cd8cc (33:58cc) ld hl, $b add hl, bc ld d, [hl] - call Functionce734 + call BattleAnim_Sine ld hl, $a add hl, bc ld [hl], a @@ -2124,6 +2114,7 @@ Functioncd8cc: ; cd8cc (33:58cc) jr nz, .asm_cd8e6 ld a, $3d jr .asm_cd8e8 + .asm_cd8e6 ld a, $3c .asm_cd8e8 @@ -2148,13 +2139,11 @@ Functioncd8f9: ; cd8f9 (33:58f9) ret Functioncd900: ; cd900 (33:5900) - call Functionce71e ; ; ; call does not return - -Jumptable_cd903: ; cd903 (33:5903) + call BattleAnim_AnonJumptable +.anon_jumptable dw Functioncd907 dw Functioncd913 - Functioncd907: ; cd907 (33:5907) call Functionce72c ld hl, $f @@ -2172,13 +2161,13 @@ Functioncd913: ; cd913 (33:5913) ld d, [hl] push af push de - call Functionce734 + call BattleAnim_Sine ld hl, $a add hl, bc ld [hl], a pop de pop af - call Functionce732 + call BattleAnim_Cosine ld hl, $9 add hl, bc ld [hl], a @@ -2202,21 +2191,20 @@ Functioncd913: ; cd913 (33:5913) add hl, bc ld [hl], d ret + .asm_cd950 call Functioncc9bd ret Functioncd954: ; cd954 (33:5954) - call Functionce71e ; ; ; call does not return - -Jumptable_cd957: ; cd957 (33:5957) + call BattleAnim_AnonJumptable +.anon_jumptable dw Functioncd961 dw Functioncd96a dw Functioncd96e dw Functioncd96a dw Functioncd97b - Functioncd961: ; cd961 (33:5961) call Functionce72c ld hl, $b @@ -2265,7 +2253,7 @@ Functioncd99a: ; cd99a (33:599a) ld a, [hl] push af push de - call Functionce734 + call BattleAnim_Sine sra a sra a sra a @@ -2278,7 +2266,7 @@ Functioncd99a: ; cd99a (33:599a) ld [hl], a pop de pop af - call Functionce732 + call BattleAnim_Cosine ld hl, $9 add hl, bc ld [hl], a @@ -2303,6 +2291,7 @@ Functioncd99a: ; cd99a (33:599a) add hl, bc inc [hl] ret + .asm_cd9e2 xor a ld hl, $10 @@ -2326,6 +2315,7 @@ Functioncd9f4: ; cd9f4 (33:59f4) add hl, de ld d, [hl] ret + ; cda01 (33:5a01) Unknown_cda01: ; cda01 @@ -2340,6 +2330,7 @@ Functioncda0a: ; cda0a (33:5a0a) jr nc, .asm_cda17 call Functioncc9bd ret + .asm_cda17 ld hl, $b add hl, bc @@ -2361,14 +2352,12 @@ Functioncda0a: ; cda0a (33:5a0a) ret Functioncda31: ; cda31 (33:5a31) - call Functionce71e ; ; ; call does not return - -Jumptable_cda34: ; cda34 (33:5a34) + call BattleAnim_AnonJumptable +.anon_jumptable dw Functioncda4c dw Functioncda3a dw Functioncda4c - Functioncda3a: ; cda3a (33:5a3a) ld hl, $3 add hl, bc @@ -2384,15 +2373,13 @@ Functioncda4c: ; cda4c (33:5a4c) ret Functioncda4d: ; cda4d (33:5a4d) - call Functionce71e ; ; ; call does not return - -Jumptable_cda50: ; cda50 (33:5a50) + call BattleAnim_AnonJumptable +.anon_jumptable dw Functioncda58 dw Functioncda62 dw Functioncda7a dw Functioncda8c - Functioncda58: ; cda58 (33:5a58) call Functionce72c ld hl, $10 @@ -2408,6 +2395,7 @@ Functioncda62: ; cda62 (33:5a62) jr c, .asm_cda6f call Functioncda8d ret + .asm_cda6f ld [hl], $40 ld a, $57 @@ -2423,6 +2411,7 @@ Functioncda7a: ; cda7a (33:5a7a) jr z, .asm_cda84 dec [hl] ret + .asm_cda84 call Functionce72c ld a, $58 @@ -2434,11 +2423,11 @@ Functioncda8c: ; cda8c (33:5a8c) Functioncda8d: ; cda8d (33:5a8d) dec [hl] ld d, $20 - call Functionce734 + call BattleAnim_Sine ld hl, $a add hl, bc ld [hl], a - ld hl, $2 + ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID add hl, bc ld a, [hl] add $2 @@ -2480,14 +2469,12 @@ Functioncda8d: ; cda8d (33:5a8d) ret Functioncdad6: ; cdad6 (33:5ad6) - call Functionce71e ; ; ; call does not return - -Jumptable_cdad9: ; cdad9 (33:5ad9) + call BattleAnim_AnonJumptable +.anon_jumptable dw Functioncdadf dw Functioncdae9 dw Functioncdaf9 - Functioncdadf: ; cdadf (33:5adf) call Functionce72c ld hl, $10 @@ -2503,6 +2490,7 @@ Functioncdae9: ; cdae9 (33:5ae9) jr c, .asm_cdaf6 call Functioncda8d ret + .asm_cdaf6 call Functionce72c @@ -2519,16 +2507,14 @@ Functioncdafa: ; cdafa (33:5afa) ret Functioncdb06: ; cdb06 (33:5b06) - call Functionce71e ; ; ; call does not return - -Jumptable_cdb09: ; cdb09 (33:5b09) + call BattleAnim_AnonJumptable +.anon_jumptable dw Functioncdb13 dw Functioncdb14 dw Functioncdb28 dw Functioncdb50 dw Functioncdb65 - Functioncdb13: ; cdb13 (33:5b13) ret @@ -2542,6 +2528,7 @@ Functioncdb14: ; cdb14 (33:5b14) add hl, bc ld [hl], $0 ret + .asm_cdb24 add $4 ld [hl], a @@ -2559,7 +2546,7 @@ endr ld hl, $1 add hl, bc set 0, [hl] - ld hl, $2 + ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID add hl, bc ld [hl], $90 ld hl, $d @@ -2599,16 +2586,15 @@ endr ld a, [hl] inc [hl] ld d, $8 - call Functionce734 + call BattleAnim_Sine ld hl, $a add hl, bc ld [hl], a ret Functioncdb80: ; cdb80 (33:5b80) - call Functionce71e ; ; ; call does not return - -Jumptable_cdb83: ; cdb83 (33:5b83) + call BattleAnim_AnonJumptable +.anon_jumptable dw Functioncdb9f dw Functioncdbb3 dw Functioncdbcf @@ -2624,7 +2610,6 @@ Jumptable_cdb83: ; cdb83 (33:5b83) dw Functioncdc57 dw Functioncdc74 - Functioncdb9f: ; cdb9f (33:5b9f) ld hl, $f add hl, bc @@ -2674,6 +2659,7 @@ Functioncdbcf: ; cdbcf (33:5bcf) ld [hl], $10 call Functionce72c ret + .asm_cdbe6 call Functionce72c inc [hl] @@ -2687,6 +2673,7 @@ Functioncdbeb: ; cdbeb (33:5beb) jr z, .asm_cdbf5 dec [hl] ret + .asm_cdbf5 ld hl, $e add hl, bc @@ -2731,7 +2718,7 @@ rept 2 inc [hl] endr ld d, $2 - call Functionce734 + call BattleAnim_Sine ld hl, $9 add hl, bc ld [hl], a @@ -2760,7 +2747,7 @@ Functioncdc57: ; cdc57 (33:5c57) add hl, bc ld a, [hl] ld d, $20 - call Functionce734 + call BattleAnim_Sine ld hl, $a add hl, bc ld [hl], a @@ -2771,6 +2758,7 @@ Functioncdc57: ; cdc57 (33:5c57) jr c, .asm_cdc71 dec [hl] ret + .asm_cdc71 call Functionce72c @@ -2782,7 +2770,7 @@ Functioncdc75: ; cdc75 (33:5c75) add hl, bc ld a, [hli] ld d, [hl] - call Functionce734 + call BattleAnim_Sine ld hl, $a add hl, bc ld [hl], a @@ -2819,6 +2807,7 @@ Functioncdca6: ; cdca6 (33:5ca6) jr nc, .asm_cdcb6 call Functioncc9bd ret + .asm_cdcb6 ld hl, $b add hl, bc @@ -2831,13 +2820,11 @@ Functioncdca6: ; cdca6 (33:5ca6) ret Functioncdcc3: ; cdcc3 (33:5cc3) - call Functionce71e ; ; ; call does not return - -Jumptable_cdcc6: ; cdcc6 (33:5cc6) + call BattleAnim_AnonJumptable +.anon_jumptable dw Functioncdcca dw Functioncdced - Functioncdcca: ; cdcca (33:5cca) ld a, [hBattleTurn] and a @@ -2869,6 +2856,7 @@ Functioncdced: ; cdced (33:5ced) dec [hl] call Functioncdcfe ret + .asm_cdcfa call Functioncc9bd ret @@ -2881,7 +2869,7 @@ rept 2 inc [hl] endr ld d, $10 - call Functionce734 + call BattleAnim_Sine ld d, a ld hl, $9 add hl, bc @@ -2897,6 +2885,7 @@ endr add hl, bc ld [hl], d ret + .asm_cdd20 ld hl, $a add hl, bc @@ -2907,13 +2896,11 @@ endr ret Functioncdd2a: ; cdd2a (33:5d2a) - call Functionce71e ; ; ; call does not return - -Jumptable_cdd2d: ; cdd2d (33:5d2d) + call BattleAnim_AnonJumptable +.anon_jumptable dw Functioncdd31 dw Functioncdd4f - Functioncdd31: ; cdd31 (33:5d31) call Functionce72c ld hl, $b @@ -2945,13 +2932,13 @@ Functioncdd4f: ; cdd4f (33:5d4f) inc [hl] push af push de - call Functionce734 + call BattleAnim_Sine ld hl, $a add hl, bc ld [hl], a pop de pop af - call Functionce732 + call BattleAnim_Cosine ld hl, $9 add hl, bc ld [hl], a @@ -2977,13 +2964,11 @@ Functioncdd4f: ; cdd4f (33:5d4f) ret Functioncdd90: ; cdd90 (33:5d90) - call Functionce71e ; ; ; call does not return - -Jumptable_cdd93: ; cdd93 (33:5d93) + call BattleAnim_AnonJumptable +.anon_jumptable dw Functioncdd97 dw Functioncddbc - Functioncdd97: ; cdd97 (33:5d97) call Functionce72c ld hl, $3 @@ -3014,7 +2999,7 @@ Functioncddbc: ; cddbc (33:5dbc) ld d, $10 push af push de - call Functionce734 + call BattleAnim_Sine sra a sra a ld hl, $a @@ -3022,7 +3007,7 @@ Functioncddbc: ; cddbc (33:5dbc) ld [hl], a pop de pop af - call Functionce732 + call BattleAnim_Cosine ld hl, $9 add hl, bc ld [hl], a @@ -3039,6 +3024,7 @@ Functioncddbc: ; cddbc (33:5dbc) ld a, [hl] inc a jr .asm_cddf5 + .asm_cddf0 ld hl, $f add hl, bc @@ -3048,14 +3034,12 @@ Functioncddbc: ; cddbc (33:5dbc) ret Functioncddf9: ; cddf9 (33:5df9) - call Functionce71e ; ; ; call does not return - -Jumptable_cddfc: ; cddfc (33:5dfc) + call BattleAnim_AnonJumptable +.anon_jumptable dw Functioncde02 dw Functioncde20 dw Functioncde21 - Functioncde02: ; cde02 (33:5e02) call Functionce72c ld hl, $b @@ -3080,6 +3064,7 @@ Functioncde20: ; cde20 (33:5e20) Functioncde21: ; cde21 (33:5e21) call Functioncc9bd ret + ; cde25 (33:5e25) Unknown_cde25: ; cde25 @@ -3094,7 +3079,7 @@ rept 2 inc [hl] endr ld d, $4 - call Functionce734 + call BattleAnim_Sine ld hl, $9 add hl, bc ld [hl], a @@ -3124,7 +3109,7 @@ rept 2 dec [hl] endr ld d, $10 - call Functionce734 + call BattleAnim_Sine ld hl, $a add hl, bc ld [hl], a @@ -3134,13 +3119,11 @@ endr ret Functioncde6b: ; cde6b (33:5e6b) - call Functionce71e ; ; ; call does not return - -Jumptable_cde6e: ; cde6e (33:5e6e) + call BattleAnim_AnonJumptable +.anon_jumptable dw Functioncde72 dw Functioncde88 - Functioncde72: ; cde72 (33:5e72) call Functionce72c ld hl, $b @@ -3159,13 +3142,11 @@ Functioncde88: ; cde88 (33:5e88) ret Functioncde89: ; cde89 (33:5e89) - call Functionce71e ; ; ; call does not return - -Jumptable_cde8c: ; cde8c (33:5e8c) + call BattleAnim_AnonJumptable +.anon_jumptable dw Functioncde90 dw Functioncdebf - Functioncde90: ; cde90 (33:5e90) call Functionce72c ld hl, $f @@ -3187,6 +3168,7 @@ Functioncde90: ; cde90 (33:5e90) and $f ld [hl], a ret + .asm_cdeb2 ld a, e and $f @@ -3205,6 +3187,7 @@ Functioncdebf: ; cdebf (33:5ebf) jr z, .asm_cdec9 dec [hl] ret + .asm_cdec9 ld hl, $b add hl, bc @@ -3227,7 +3210,7 @@ Functioncdedd: ; cdedd (33:5edd) ld d, $18 push af push de - call Functionce734 + call BattleAnim_Sine sra a sra a sra a @@ -3239,7 +3222,7 @@ Functioncdedd: ; cdedd (33:5edd) ld [hl], a pop de pop af - call Functionce732 + call BattleAnim_Cosine ld hl, $9 add hl, bc ld [hl], a @@ -3256,6 +3239,7 @@ Functioncdedd: ; cdedd (33:5edd) jr nc, .asm_cdf17 inc [hl] ret + .asm_cdf17 call Functioncc9bd ret @@ -3267,7 +3251,7 @@ Functioncdf1b: ; cdf1b (33:5f1b) ld d, $18 push af push de - call Functionce734 + call BattleAnim_Sine sra a sra a sra a @@ -3279,7 +3263,7 @@ Functioncdf1b: ; cdf1b (33:5f1b) ld [hl], a pop de pop af - call Functionce732 + call BattleAnim_Cosine ld hl, $9 add hl, bc ld [hl], a @@ -3296,18 +3280,17 @@ Functioncdf1b: ; cdf1b (33:5f1b) jr nc, .asm_cdf55 inc [hl] ret + .asm_cdf55 call Functioncc9bd ret Functioncdf59: ; cdf59 (33:5f59) - call Functionce71e ; ; ; call does not return - -Jumptable_cdf5c: ; cdf5c (33:5f5c) + call BattleAnim_AnonJumptable +.anon_jumptable dw Functioncdf60 dw Functioncdedd - Functioncdf60: ; cdf60 (33:5f60) ld hl, $7 add hl, bc @@ -3320,7 +3303,7 @@ Functioncdf60: ; cdf60 (33:5f60) ld a, [hl] inc [hl] ld d, $18 - call Functionce732 + call BattleAnim_Cosine ld hl, $9 add hl, bc ld [hl], a @@ -3333,6 +3316,7 @@ Functioncdf60: ; cdf60 (33:5f60) add hl, bc dec [hl] ret + .asm_cdf88 call Functionce72c ret @@ -3344,7 +3328,7 @@ Functioncdf8c: ; cdf8c (33:5f8c) ld d, $18 push af push de - call Functionce734 + call BattleAnim_Sine sra a sra a sra a @@ -3356,7 +3340,7 @@ Functioncdf8c: ; cdf8c (33:5f8c) ld [hl], a pop de pop af - call Functionce732 + call BattleAnim_Cosine ld hl, $9 add hl, bc ld [hl], a @@ -3375,6 +3359,7 @@ endr jr z, .asm_cdfc7 dec [hl] ret + .asm_cdfc7 call Functioncc9bd ret @@ -3386,7 +3371,7 @@ Functioncdfcb: ; cdfcb (33:5fcb) ld d, $18 push af push de - call Functionce734 + call BattleAnim_Sine sra a sra a sra a @@ -3398,7 +3383,7 @@ Functioncdfcb: ; cdfcb (33:5fcb) ld [hl], a pop de pop af - call Functionce732 + call BattleAnim_Cosine ld hl, $9 add hl, bc ld [hl], a @@ -3419,19 +3404,18 @@ rept 2 dec [hl] endr ret + .asm_ce007 call Functioncc9bd ret Functionce00b: ; ce00b (33:600b) - call Functionce71e ; ; ; call does not return - -Jumptable_ce00e: ; ce00e (33:600e) + call BattleAnim_AnonJumptable +.anon_jumptable dw Functionce014 dw Functionce023 dw Functionce05f - Functionce014: ; ce014 (33:6014) call Functionce72c ld hl, $f @@ -3448,6 +3432,7 @@ Functionce023: ; ce023 (33:6023) cp $6c jr c, .asm_ce02d ret + .asm_ce02d ld a, $2 call Functionce70a @@ -3457,7 +3442,7 @@ Functionce023: ; ce023 (33:6023) ld hl, $10 add hl, bc ld d, [hl] - call Functionce734 + call BattleAnim_Sine bit 7, a jr nz, .asm_ce046 xor $ff @@ -3484,15 +3469,13 @@ Functionce05f: ; ce05f (33:605f) ret Functionce063: ; ce063 (33:6063) - call Functionce71e ; ; ; call does not return - -Jumptable_ce066: ; ce066 (33:6066) + call BattleAnim_AnonJumptable +.anon_jumptable dw Functionce06e dw Functionce083 dw Functionce091 dw Functionce09e - Functionce06e: ; ce06e (33:606e) ld hl, $b add hl, bc @@ -3532,7 +3515,7 @@ Functionce09e: ; ce09e (33:609e) add hl, bc ld a, [hl] ld d, $8 - call Functionce734 + call BattleAnim_Sine ld hl, $9 add hl, bc ld [hl], a @@ -3553,14 +3536,12 @@ Functionce09e: ; ce09e (33:609e) ret Functionce0c5: ; ce0c5 (33:60c5) - call Functionce71e ; ; ; call does not return - -Jumptable_ce0c8: ; ce0c8 (33:60c8) + call BattleAnim_AnonJumptable +.anon_jumptable dw Functionce0ce dw Functionce0f8 dw Functionce0dd - Functionce0ce: ; ce0ce (33:60ce) ld hl, $b add hl, bc @@ -3577,7 +3558,7 @@ Functionce0dd: ; ce0dd (33:60dd) add hl, bc ld a, [hl] ld d, $10 - call Functionce734 + call BattleAnim_Sine ld hl, $a add hl, bc bit 7, a @@ -3598,6 +3579,7 @@ Functionce0f8: ; ce0f8 (33:60f8) jr c, .asm_ce105 call Functioncc9bd ret + .asm_ce105 ld hl, $b add hl, bc @@ -3606,13 +3588,11 @@ Functionce0f8: ; ce0f8 (33:60f8) ret Functionce10e: ; ce10e (33:610e) - call Functionce71e ; ; ; call does not return - -Jumptable_ce111: ; ce111 (33:6111) + call BattleAnim_AnonJumptable +.anon_jumptable dw Functionce115 dw Functionce12a - Functionce115: ; ce115 (33:6115) call Functionce72c ld hl, $f @@ -3631,7 +3611,7 @@ Functionce12a: ; ce12a (33:612a) add hl, bc ld a, [hli] ld d, [hl] - call Functionce734 + call BattleAnim_Sine ld hl, $a add hl, bc ld [hl], a @@ -3668,13 +3648,13 @@ Functionce15c: ; ce15c (33:615c) ld d, [hl] push af push de - call Functionce734 + call BattleAnim_Sine ld hl, $a add hl, bc ld [hl], a pop de pop af - call Functionce732 + call BattleAnim_Cosine ld hl, $9 add hl, bc ld [hl], a @@ -3709,9 +3689,11 @@ Functionce15c: ; ce15c (33:615c) jr z, .asm_ce1ac dec [hl] ret + .asm_ce1aa inc [hl] ret + .asm_ce1ac call Functioncc9bd ret @@ -3726,13 +3708,13 @@ Functionce1b0: ; ce1b0 (33:61b0) ld d, [hl] push af push de - call Functionce734 + call BattleAnim_Sine ld hl, $a add hl, bc ld [hl], a pop de pop af - call Functionce732 + call BattleAnim_Cosine ld hl, $9 add hl, bc ld [hl], a @@ -3746,6 +3728,7 @@ Functionce1b0: ; ce1b0 (33:61b0) jr nc, .asm_ce1df inc [hl] ret + .asm_ce1df ld a, [hl] dec [hl] @@ -3755,13 +3738,11 @@ Functionce1b0: ; ce1b0 (33:61b0) ret Functionce1e7: ; ce1e7 (33:61e7) - call Functionce71e ; ; ; call does not return - -Jumptable_ce1ea: ; ce1ea (33:61ea) + call BattleAnim_AnonJumptable +.anon_jumptable dw Functionce1ee dw Functionce1fb - Functionce1ee: ; ce1ee (33:61ee) call Functionce72c ld hl, $8 @@ -3776,7 +3757,7 @@ Functionce1fb: ; ce1fb (33:61fb) add hl, bc ld a, [hl] ld d, $30 - call Functionce734 + call BattleAnim_Sine ld hl, $10 add hl, bc add [hl] @@ -3788,7 +3769,7 @@ Functionce1fb: ; ce1fb (33:61fb) ld a, [hl] add $8 ld d, $30 - call Functionce732 + call BattleAnim_Cosine ld hl, $9 add hl, bc ld [hl], a @@ -3798,20 +3779,18 @@ Functionce1fb: ; ce1fb (33:61fb) ret Functionce226: ; ce226 (33:6226) - call Functionce71e ; ; ; call does not return - -Jumptable_ce229: ; ce229 (33:6229) + call BattleAnim_AnonJumptable +.anon_jumptable dw Functionce22d dw Functionce254 - Functionce22d: ; ce22d (33:622d) call Functionce72c ld hl, $b add hl, bc ld a, [hl] ld d, $10 - call Functionce734 + call BattleAnim_Sine ld hl, $a add hl, bc ld [hl], a @@ -3819,7 +3798,7 @@ Functionce22d: ; ce22d (33:622d) add hl, bc ld a, [hl] ld d, $10 - call Functionce732 + call BattleAnim_Cosine ld hl, $9 add hl, bc ld [hl], a @@ -3831,15 +3810,13 @@ Functionce254: ; ce254 (33:6254) ret Functionce255: ; ce255 (33:6255) - call Functionce71e ; ; ; call does not return - -Jumptable_ce258: ; ce258 (33:6258) + call BattleAnim_AnonJumptable +.anon_jumptable dw Functionce260 dw Functionce274 dw Functionce278 dw Functionce289 - Functionce260: ; ce260 (33:6260) call Functionce72c ld a, [hBattleTurn] @@ -3847,6 +3824,7 @@ Functionce260: ; ce260 (33:6260) jr nz, .asm_ce26c ld a, $f0 jr .asm_ce26e + .asm_ce26c ld a, $cc .asm_ce26e @@ -3880,6 +3858,7 @@ Functionce289: ; ce289 (33:6289) ld a, $4 call Functionce70a ret + .asm_ce29b call Functioncc9bd ret @@ -3898,6 +3877,7 @@ Functionce29f: ; ce29f (33:629f) jr nz, .asm_ce2b6 ld hl, Unknown_ce2c4 jr .asm_ce2b9 + .asm_ce2b6 ld hl, Unknown_ce2c8 .asm_ce2b9 @@ -3908,6 +3888,7 @@ Functionce29f: ; ce29f (33:629f) and [hl] ld [wcfc8], a ret + ; ce2c4 (33:62c4) Unknown_ce2c4: ; ce2c4 @@ -3921,7 +3902,7 @@ Functionce2cc: ; ce2cc (33:62cc) add hl, bc ld a, [hl] ld d, $18 - call Functionce734 + call BattleAnim_Sine sra a sra a sra a @@ -3936,7 +3917,7 @@ Functionce2cc: ; ce2cc (33:62cc) ld a, [hl] inc [hl] ld d, $18 - call Functionce732 + call BattleAnim_Cosine ld hl, $9 add hl, bc ld [hl], a @@ -3948,14 +3929,12 @@ endr ret Functionce2fd: ; ce2fd (33:62fd) - call Functionce71e ; ; ; call does not return - -Jumptable_ce300: ; ce300 (33:6300) + call BattleAnim_AnonJumptable +.anon_jumptable dw Functionce306 dw Functionce330 dw Functionce34c - Functionce306: ; ce306 (33:6306) ld hl, $a add hl, bc @@ -3967,6 +3946,7 @@ Functionce306: ; ce306 (33:6306) add hl, bc ld [hl], $2 ret + .asm_ce319 ld d, a ld hl, $f @@ -3992,6 +3972,7 @@ Functionce330: ; ce330 (33:6330) jr z, .asm_ce33a dec [hl] ret + .asm_ce33a ld [hl], $4 ld hl, $f @@ -4015,18 +3996,17 @@ Functionce34c: ; ce34c (33:634c) ld a, $4 call Functionce70a ret + .asm_ce35b call Functioncc9bd ret Functionce35f: ; ce35f (33:635f) - call Functionce71e ; ; ; call does not return - -Jumptable_ce362: ; ce362 (33:6362) + call BattleAnim_AnonJumptable +.anon_jumptable dw Functionce366 dw Functionce375 - Functionce366: ; ce366 (33:6366) call Functionce72c ld hl, $b @@ -4045,6 +4025,7 @@ Functionce375: ; ce375 (33:6375) add hl, bc inc [hl] ret + .asm_ce383 ld hl, $9 add hl, bc @@ -4052,14 +4033,12 @@ Functionce375: ; ce375 (33:6375) ret Functionce389: ; ce389 (33:6389) - call Functionce71e ; ; ; call does not return - -Jumptable_ce38c: ; ce38c (33:638c) + call BattleAnim_AnonJumptable +.anon_jumptable dw Functionce392 dw Functionce39c dw Functionce3ae - Functionce392: ; ce392 (33:6392) call Functionce72c ld hl, $f @@ -4075,6 +4054,7 @@ Functionce39c: ; ce39c (33:639c) jr z, .asm_ce3a6 dec [hl] ret + .asm_ce3a6 call Functionce72c ld a, $20 @@ -4095,13 +4075,13 @@ rept 2 endr push af ld d, $2 - call Functionce734 + call BattleAnim_Sine ld hl, $a add hl, bc ld [hl], a pop af ld d, $8 - call Functionce732 + call BattleAnim_Cosine ld hl, $9 add hl, bc ld [hl], a @@ -4115,12 +4095,13 @@ Functionce3d2: ; ce3d2 (33:63d2) jr c, .asm_ce3df call Functioncc9bd ret + .asm_ce3df ld hl, $b add hl, bc ld a, [hl] ld d, $8 - call Functionce732 + call BattleAnim_Cosine ld hl, $9 add hl, bc ld [hl], a @@ -4137,13 +4118,11 @@ Functionce3d2: ; ce3d2 (33:63d2) ret Functionce3ff: ; ce3ff (33:63ff) - call Functionce71e ; ; ; call does not return - -Jumptable_ce402: ; ce402 (33:6402) + call BattleAnim_AnonJumptable +.anon_jumptable dw Functionce406 dw Functionce412 - Functionce406: ; ce406 (33:6406) ld hl, $b add hl, bc @@ -4165,13 +4144,13 @@ Functionce416: ; ce416 (33:6416) ld d, $18 push af push de - call Functionce734 + call BattleAnim_Sine ld hl, $a add hl, bc ld [hl], a pop de pop af - call Functionce732 + call BattleAnim_Cosine ld hl, $9 add hl, bc sra a @@ -4183,14 +4162,12 @@ Functionce416: ; ce416 (33:6416) ret Functionce43a: ; ce43a (33:643a) - call Functionce71e ; ; ; call does not return - -Jumptable_ce43d: ; ce43d (33:643d) + call BattleAnim_AnonJumptable +.anon_jumptable dw Functionce443 dw Functionce465 dw Functionce490 - Functionce443: ; ce443 (33:6443) call Functionce72c ld hl, $f @@ -4225,17 +4202,18 @@ Functionce465: ; ce465 (33:6465) ld a, [hl] push af push de - call Functionce734 + call BattleAnim_Sine ld hl, $a add hl, bc ld [hl], a pop de pop af - call Functionce732 + call BattleAnim_Cosine ld hl, $9 add hl, bc ld [hl], a ret + .asm_ce48b ld [hl], $10 call Functionce72c @@ -4251,13 +4229,11 @@ Functionce490: ; ce490 (33:6490) ret Functionce49c: ; ce49c (33:649c) - call Functionce71e ; ; ; call does not return - -Jumptable_ce49f: ; ce49f (33:649f) + call BattleAnim_AnonJumptable +.anon_jumptable dw Functionce4a3 dw Functionce4b0 - Functionce4a3: ; ce4a3 (33:64a3) call Functionce72c ld hl, $b @@ -4278,7 +4254,7 @@ Functionce4b0: ; ce4b0 (33:64b0) ld a, [hl] inc [hl] ld d, $18 - call Functionce732 + call BattleAnim_Cosine ld hl, $9 add hl, bc ld [hl], a @@ -4291,6 +4267,7 @@ Functionce4b0: ; ce4b0 (33:64b0) add hl, bc dec [hl] ret + .asm_ce4d8 call Functioncc9bd ret @@ -4306,7 +4283,7 @@ Functionce4dc: ; ce4dc (33:64dc) add hl, bc ld a, [hl] inc [hl] - call Functionce734 + call BattleAnim_Sine bit 7, a jr nz, .asm_ce4f4 xor $ff @@ -4340,17 +4317,18 @@ endr ld a, [hl] push af push de - call Functionce734 + call BattleAnim_Sine ld hl, $a add hl, bc ld [hl], a pop de pop af - call Functionce732 + call BattleAnim_Cosine ld hl, $9 add hl, bc ld [hl], a ret + .asm_ce52e call Functioncc9bd ret @@ -4372,27 +4350,25 @@ Functionce532: ; ce532 (33:6532) and $3f push af push de - call Functionce734 + call BattleAnim_Sine ld hl, $a add hl, bc ld [hl], a pop de pop af - call Functionce732 + call BattleAnim_Cosine ld hl, $9 add hl, bc ld [hl], a ret Functionce55b: ; ce55b (33:655b) - call Functionce71e ; ; ; call does not return - -Jumptable_ce55e: ; ce55e (33:655e) + call BattleAnim_AnonJumptable +.anon_jumptable dw Functionce564 dw Functionce56e dw Functionce577 - Functionce564: ; ce564 (33:6564) ld d, $18 ld hl, $b @@ -4420,21 +4396,21 @@ Functionce577: ; ce577 (33:6577) add hl, bc ld a, [hl] jr asm_ce58f + .asm_ce58b call Functioncc9bd ret + asm_ce58f: ; ce58f (33:658f) call Functionce6f1 ret Functionce593: ; ce593 (33:6593) - call Functionce71e ; ; ; call does not return - -Jumptable_ce596: ; ce596 (33:6596) + call BattleAnim_AnonJumptable +.anon_jumptable dw Functionce5b3 dw Functionce59a - Functionce59a: ; ce59a (33:659a) ld hl, $7 add hl, bc @@ -4452,6 +4428,7 @@ rept 2 inc [hl] endr ret + .asm_ce5b0 call Functioncc9bd @@ -4468,7 +4445,7 @@ rept 2 endr push af push de - call Functionce734 + call BattleAnim_Sine sra a sra a ld hl, $f @@ -4480,7 +4457,7 @@ endr ld [hl], a pop de pop af - call Functionce732 + call BattleAnim_Cosine ld hl, $9 add hl, bc ld [hl], a @@ -4496,20 +4473,19 @@ rept 4 dec [hl] endr ret + .asm_ce5ea call Functioncc9bd ret Functionce5ee: ; ce5ee (33:65ee) - call Functionce71e ; ; ; call does not return - -Jumptable_ce5f1: ; ce5f1 (33:65f1) + call BattleAnim_AnonJumptable +.anon_jumptable dw Functionce5f9 dw Functionce60a dw Functionce622 dw Functionce618 - Functionce5f9: ; ce5f9 (33:65f9) ld hl, $b add hl, bc @@ -4535,6 +4511,7 @@ endr Functionce618: ; ce618 (33:6618) call Functioncc9bd ret + asm_ce61c: ; ce61c (33:661c) call Functionce72c call Functionce72c @@ -4551,15 +4528,13 @@ endr ret Functionce62f: ; ce62f (33:662f) - call Functionce71e ; ; ; call does not return - -Jumptable_ce632: ; ce632 (33:6632) + call BattleAnim_AnonJumptable +.anon_jumptable dw Functionce63a dw Functionce648 dw Functionce65c dw Functionce672 - Functionce63a: ; ce63a (33:663a) ld hl, $b add hl, bc @@ -4684,13 +4659,14 @@ Functionce6d2: ; ce6d2 (33:66d2) ld hl, $b add hl, bc ld d, [hl] - call Functionce734 + call BattleAnim_Sine xor $ff inc a ld hl, $a add hl, bc ld [hl], a ret + .asm_ce6ed call Functioncc9bd ret @@ -4698,7 +4674,7 @@ Functionce6d2: ; ce6d2 (33:66d2) Functionce6f1: ; ce6f1 (33:66f1) push af push de - call Functionce734 + call BattleAnim_Sine sra a sra a ld hl, $a @@ -4706,7 +4682,7 @@ Functionce6f1: ; ce6f1 (33:66f1) ld [hl], a pop de pop af - call Functionce732 + call BattleAnim_Cosine ld hl, $9 add hl, bc ld [hl], a @@ -4728,7 +4704,7 @@ Functionce70a: ; ce70a (33:670a) jr nz, .asm_ce719 ret -Functionce71e: ; ce71e (33:671e) +BattleAnim_AnonJumptable: ; ce71e (33:671e) pop de ld hl, $e add hl, bc @@ -4747,29 +4723,29 @@ Functionce72c: ; ce72c (33:672c) inc [hl] ret -Functionce732: ; ce732 (33:6732) +BattleAnim_Cosine: ; ce732 (33:6732) add $10 - -Functionce734: ; ce734 (33:6734) +BattleAnim_Sine: ; ce734 (33:6734) and $3f cp $20 - jr nc, .asm_ce73f - call Functionce749 + jr nc, .negative + call .ApplySineWave ld a, h ret -.asm_ce73f + +.negative and $1f - call Functionce749 + call .ApplySineWave ld a, h xor $ff inc a ret -Functionce749: ; ce749 (33:6749) +.ApplySineWave: ; ce749 (33:6749) ld e, a ld a, d ld d, 0 - ld hl, Unknown_ce77f + ld hl, BattleAnimSineWave rept 2 add hl, de endr @@ -4777,47 +4753,50 @@ endr inc hl ld d, [hl] ld hl, $0 -.asm_ce758 +.multiply srl a - jr nc, .asm_ce75d + jr nc, .even add hl, de -.asm_ce75d +.even sla e rl d and a - jr nz, .asm_ce758 + jr nz, .multiply ret Functionce765: ; ce765 (33:6765) ld a, e - call Functionce734 + call BattleAnim_Sine ld e, a ret Functionce76b: ; ce76b (33:676b) ld a, e - call Functionce732 + call BattleAnim_Cosine ld e, a ret + ; ce771 (33:6771) Functionce771: ; ce771 ld a, e - call Functionce734 + call BattleAnim_Sine ld e, l ld d, h ret + ; ce778 Functionce778: ; ce778 ld a, e - call Functionce732 + call BattleAnim_Cosine ld e, l ld d, h ret + ; ce77f -Unknown_ce77f: ; ce77f +BattleAnimSineWave: ; ce77f sine_wave $100 ; ce7bf @@ -4833,10 +4812,9 @@ Functionce7bf: ; ce7bf (33:67bf) ld [hl], $ff ret - Functionce7d1: ; ce7d1 .asm_ce7d1 - ld hl, $000c + ld hl, $c add hl, bc ld a, [hl] and a @@ -4848,7 +4826,7 @@ Functionce7d1: ; ce7d1 jr .asm_ce7fd .asm_ce7e1 - ld hl, $000d + ld hl, $d add hl, bc inc [hl] call Functionce823 @@ -4861,7 +4839,7 @@ Functionce7d1: ; ce7d1 ld a, [hl] push hl and $3f - ld hl, $000c + ld hl, $c add hl, bc ld [hl], a pop hl @@ -4876,10 +4854,10 @@ Functionce7d1: ; ce7d1 .asm_ce807 xor a - ld hl, $000c + ld hl, $c add hl, bc ld [hl], a - ld hl, $000d + ld hl, $d add hl, bc rept 2 dec [hl] @@ -4888,18 +4866,19 @@ endr .asm_ce815 xor a - ld hl, $000c + ld hl, $c add hl, bc ld [hl], a dec a - ld hl, $000d + ld hl, $d add hl, bc ld [hl], a jr .asm_ce7d1 + ; ce823 Functionce823: ; ce823 - ld hl, $0003 + ld hl, $3 add hl, bc ld e, [hl] ld d, 0 @@ -4910,13 +4889,14 @@ endr ld e, [hl] inc hl ld d, [hl] - ld hl, $000d + ld hl, $d add hl, bc ld l, [hl] ld h, $0 add hl, hl add hl, de ret + ; ce83c Functionce83c: ; ce83c @@ -4928,8 +4908,8 @@ rept 2 endr add hl, de ret -; ce846 +; ce846 Functionce846: ; ce846 (33:6846) push hl @@ -4952,10 +4932,11 @@ endr call DecompressRequest2bpp pop bc ret + ; ce85e (33:685e) - Unknown_ce85e: ; ce85e +; ANIM_OBJ constants dw Unknown_ce9d0 dw Unknown_ce9d3 dw Unknown_ce9d6 @@ -5143,194 +5124,375 @@ Unknown_ce85e: ; ce85e dw Unknown_ceeab ; ce9d0 -Unknown_ce9d0: db $00,$06, $fc -Unknown_ce9d3: db $01,$06, $fc -Unknown_ce9d6: db $02,$06, $fc -Unknown_ce9d9: db $03,$06, $fc -Unknown_ce9dc: db $04,$06, $fc -Unknown_ce9df: db $05,$06, $fc -Unknown_ce9e2: db $06,$06, $fc -Unknown_ce9e5: db $03,$04, $01,$01, $03,$04, $01,$01, $03,$04, $01,$01, $03,$04, $01,$01, $fc -Unknown_ce9f6: db $4b,$02, $4c,$02, $4d,$04, $4e,$02, $fd,$02, $4e,$02, $fd,$02, $4e,$02, $fd,$02, $4e,$02, $fc -Unknown_cea0b: db $4b,$42, $4c,$42, $4d,$44, $4e,$42, $fd,$02, $4e,$42, $fd,$02, $4e,$42, $fd,$02, $4e,$42, $fc -Unknown_cea20: db $4b,$c2, $4c,$c2, $4d,$c4, $4e,$c2, $fd,$02, $4e,$c2, $fd,$02, $4e,$c2, $fd,$02, $4e,$c2, $fc -Unknown_cea35: db $4b,$01, $4c,$01, $4d,$01, $4f,$01, $50,$01, $51,$01, $52,$02, $fd,$02, $52,$02, $fd,$02, $52,$02, $fd,$02, $52,$02, $fc -Unknown_cea50: db $4b,$41, $4c,$41, $4d,$41, $4f,$41, $50,$41, $51,$41, $52,$42, $fd,$02, $52,$42, $fd,$02, $52,$42, $fd,$02, $52,$42, $fc -Unknown_cea6b: db $00,$03, $07,$03, $08,$03, $09,$03, $fc -Unknown_cea74: db $0a,$07, $0b,$07, $0a,$07, $0b,$47, $fe -Unknown_cea7d: db $0c,$08, $ff -Unknown_cea80: db $0d,$08, $ff -Unknown_cea83: db $0a,$08, $ff -Unknown_cea86: db $0a,$07, $0b,$07, $0a,$07, $0b,$47, $0a,$07, $ff -Unknown_cea91: db $0a,$08, $ff -Unknown_cea94: db $0a,$04, $0e,$04, $fe -Unknown_cea99: db $0f,$04, $10,$04, $fe -Unknown_cea9e: db $10,$04, $0f,$04, $0e,$04, $0a,$04, $0e,$04, $0a,$04, $0e,$04, $0a,$04, $fc -Unknown_ceaaf: db $10,$01, $0f,$01, $12,$01, $11,$01, $12,$01, $0f,$01, $fe -Unknown_ceabc: db $10,$03, $0f,$03, $12,$01, $fd,$01, $12,$01, $fd,$01, $12,$01, $fd,$01, $12,$01, $fd,$01, $12,$03, $fc -Unknown_cead3: db $13,$14, $fc -Unknown_cead6: db $10,$01, $0f,$01, $fe -Unknown_ceadb: db $14,$08, $ff -Unknown_ceade: db $17,$04, $16,$08, $15,$08, $16,$08, $17,$04, $17,$04, $16,$48, $15,$48, $16,$48, $17,$04, $fe -Unknown_ceaf3: db $69,$08, $ff -Unknown_ceaf6: db $69,$20, $6a,$04, $6b,$04, $6d,$04, $6c,$04, $ff -Unknown_ceb01: db $6c,$08, $6d,$08, $fe -Unknown_ceb06: db $18,$04, $19,$04, $1a,$04, $fc -Unknown_ceb0d: db $1b,$08, $ff -Unknown_ceb10: db $0f,$08, $ff -Unknown_ceb13: db $1c,$08, $ff -Unknown_ceb16: db $0a,$08, $fc -Unknown_ceb19: db $1d,$08, $ff -Unknown_ceb1c: db $17,$08, $ff -Unknown_ceb1f: db $0f,$03, $10,$03, $1e,$03, $ff -Unknown_ceb26: db $1f,$10, $20,$03, $fc -Unknown_ceb2b: db $20,$08, $ff -Unknown_ceb2e: db $20,$08, $21,$08, $1b,$08, $21,$08, $fe -Unknown_ceb37: db $22,$08, $ff -Unknown_ceb3a: db $1b,$08, $ff -Unknown_ceb3d: db $23,$08, $ff -Unknown_ceb40: db $24,$08, $ff -Unknown_ceb43: db $25,$08, $ff -Unknown_ceb46: db $26,$08, $27,$08, $ff -Unknown_ceb4b: db $28,$08, $29,$08, $fc -Unknown_ceb50: db $2a,$01, $2b,$01, $2c,$01, $2d,$01, $2e,$01, $2d,$01, $2c,$01, $2b,$01, $2a,$01, $fc -Unknown_ceb63: db $14,$01, $15,$01, $fe -Unknown_ceb68: db $2f,$04, $30,$28, $fc -Unknown_ceb6d: db $31,$08, $ff +Unknown_ce9d0: db $00,$06 + db -4 +Unknown_ce9d3: db $01,$06 + db -4 +Unknown_ce9d6: db $02,$06 + db -4 +Unknown_ce9d9: db $03,$06 + db -4 +Unknown_ce9dc: db $04,$06 + db -4 +Unknown_ce9df: db $05,$06 + db -4 +Unknown_ce9e2: db $06,$06 + db -4 +Unknown_ce9e5: db $03,$04, $01,$01, $03,$04, $01,$01, $03,$04, $01,$01, $03,$04, $01,$01 + db -4 +Unknown_ce9f6: db $4b,$02, $4c,$02, $4d,$04, $4e,$02, $fd,$02, $4e,$02, $fd,$02, $4e,$02, $fd,$02, $4e,$02 + db -4 +Unknown_cea0b: db $4b,$42, $4c,$42, $4d,$44, $4e,$42, $fd,$02, $4e,$42, $fd,$02, $4e,$42, $fd,$02, $4e,$42 + db -4 +Unknown_cea20: db $4b,$c2, $4c,$c2, $4d,$c4, $4e,$c2, $fd,$02, $4e,$c2, $fd,$02, $4e,$c2, $fd,$02, $4e,$c2 + db -4 +Unknown_cea35: db $4b,$01, $4c,$01, $4d,$01, $4f,$01, $50,$01, $51,$01, $52,$02, $fd,$02, $52,$02, $fd,$02, $52,$02, $fd,$02, $52,$02 + db -4 +Unknown_cea50: db $4b,$41, $4c,$41, $4d,$41, $4f,$41, $50,$41, $51,$41, $52,$42, $fd,$02, $52,$42, $fd,$02, $52,$42, $fd,$02, $52,$42 + db -4 +Unknown_cea6b: db $00,$03, $07,$03, $08,$03, $09,$03 + db -4 +Unknown_cea74: db $0a,$07, $0b,$07, $0a,$07, $0b,$47 + db -2 +Unknown_cea7d: db $0c,$08 + db -1 +Unknown_cea80: db $0d,$08 + db -1 +Unknown_cea83: db $0a,$08 + db -1 +Unknown_cea86: db $0a,$07, $0b,$07, $0a,$07, $0b,$47, $0a,$07 + db -1 +Unknown_cea91: db $0a,$08 + db -1 +Unknown_cea94: db $0a,$04, $0e,$04 + db -2 +Unknown_cea99: db $0f,$04, $10,$04 + db -2 +Unknown_cea9e: db $10,$04, $0f,$04, $0e,$04, $0a,$04, $0e,$04, $0a,$04, $0e,$04, $0a,$04 + db -4 +Unknown_ceaaf: db $10,$01, $0f,$01, $12,$01, $11,$01, $12,$01, $0f,$01 + db -2 +Unknown_ceabc: db $10,$03, $0f,$03, $12,$01, $fd,$01, $12,$01, $fd,$01, $12,$01, $fd,$01, $12,$01, $fd,$01, $12,$03 + db -4 +Unknown_cead3: db $13,$14 + db -4 +Unknown_cead6: db $10,$01, $0f,$01 + db -2 +Unknown_ceadb: db $14,$08 + db -1 +Unknown_ceade: db $17,$04, $16,$08, $15,$08, $16,$08, $17,$04, $17,$04, $16,$48, $15,$48, $16,$48, $17,$04 + db -2 +Unknown_ceaf3: db $69,$08 + db -1 +Unknown_ceaf6: db $69,$20, $6a,$04, $6b,$04, $6d,$04, $6c,$04 + db -1 +Unknown_ceb01: db $6c,$08, $6d,$08 + db -2 +Unknown_ceb06: db $18,$04, $19,$04, $1a,$04 + db -4 +Unknown_ceb0d: db $1b,$08 + db -1 +Unknown_ceb10: db $0f,$08 + db -1 +Unknown_ceb13: db $1c,$08 + db -1 +Unknown_ceb16: db $0a,$08 + db -4 +Unknown_ceb19: db $1d,$08 + db -1 +Unknown_ceb1c: db $17,$08 + db -1 +Unknown_ceb1f: db $0f,$03, $10,$03, $1e,$03 + db -1 +Unknown_ceb26: db $1f,$10, $20,$03 + db -4 +Unknown_ceb2b: db $20,$08 + db -1 +Unknown_ceb2e: db $20,$08, $21,$08, $1b,$08, $21,$08 + db -2 +Unknown_ceb37: db $22,$08 + db -1 +Unknown_ceb3a: db $1b,$08 + db -1 +Unknown_ceb3d: db $23,$08 + db -1 +Unknown_ceb40: db $24,$08 + db -1 +Unknown_ceb43: db $25,$08 + db -1 +Unknown_ceb46: db $26,$08, $27,$08 + db -1 +Unknown_ceb4b: db $28,$08, $29,$08 + db -4 +Unknown_ceb50: db $2a,$01, $2b,$01, $2c,$01, $2d,$01, $2e,$01, $2d,$01, $2c,$01, $2b,$01, $2a,$01 + db -4 +Unknown_ceb63: db $14,$01, $15,$01 + db -2 +Unknown_ceb68: db $2f,$04, $30,$28 + db -4 +Unknown_ceb6d: db $31,$08 + db -1 Unknown_ceb70: db $32,$20, $33,$20, $34,$20, $35,$20 ; fallthrough -Unknown_ceb78: db $fd,$02, $35,$04, $fd,$02, $35,$04, $fd,$02, $35,$04, $fd,$02, $35,$04, $fc -Unknown_ceb89: db $14,$04, $15,$04, $fe -Unknown_ceb8e: db $36,$02, $37,$02, $38,$02, $39,$20, $fc -Unknown_ceb97: db $3a,$02, $3b,$02, $3c,$02, $3d,$20, $fc -Unknown_ceba0: db $3a,$42, $3b,$42, $3c,$42, $3d,$60, $fc -Unknown_ceba9: db $3e,$08, $3f,$08, $40,$08, $ff -Unknown_cebb0: db $40,$02, $fd,$02, $40,$02, $fd,$02, $41,$02, $fd,$02, $41,$02, $fd,$02, $fe -Unknown_cebc1: db $42,$02, $43,$02, $44,$02, $45,$02, $fe -Unknown_cebca: db $19,$02, $fd,$02, $fe -Unknown_cebcf: db $46,$04, $47,$04, $fe -Unknown_cebd4: db $18,$02, $fd,$02, $fe -Unknown_cebd9: db $48,$08, $ff -Unknown_cebdc: db $48,$48, $ff -Unknown_cebdf: db $49,$08, $ff -Unknown_cebe2: db $4a,$08, $ff -Unknown_cebe5: db $20,$10, $1f,$10, $1e,$10, $ff -Unknown_cebec: db $20,$08, $1f,$08, $1e,$08, $ff -Unknown_cebf3: db $fd,$14, $55,$28, $54,$28, $53,$14, $fd,$04, $53,$04, $fd,$04, $53,$04, $fd,$04, $53,$04, $fc -Unknown_cec08: db $1e,$08, $1f,$08, $20,$08, $fc -Unknown_cec0f: db $fd,$00, $14,$00, $15,$00, $14,$40, $fd,$00, $16,$40, $15,$00, $16,$00, $fe -Unknown_cec20: db $56,$02, $57,$04, $fc -Unknown_cec25: db $56,$c2, $57,$c4, $fc -Unknown_cec2a: db $56,$01, $57,$01, $58,$01, $57,$c1, $58,$c1, $57,$02, $fc -Unknown_cec37: db $56,$c1, $57,$c1, $58,$c1, $57,$01, $58,$01, $57,$c2, $fc -Unknown_cec44: db $57,$c1, $58,$c1, $57,$01, $58,$01, $fe -Unknown_cec4d: db $59,$01, $5a,$01, $5b,$01, $5c,$02, $fc -Unknown_cec56: db $0a,$0a, $0b,$43, $5d,$43, $0b,$c3, $0a,$82, $0b,$81, $5d,$01, $0b,$01, $fe -Unknown_cec67: db $0a,$03, $0b,$47, $0a,$07, $0b,$07, $0a,$03, $fe -Unknown_cec72: db $5e,$20, $5e,$20, $fc -Unknown_cec77: db $5f,$20, $5f,$20, $fc -Unknown_cec7c: db $60,$08, $ff -Unknown_cec7f: db $61,$01, $62,$01, $63,$01, $ff -Unknown_cec86: db $63,$07, $64,$07, $fe -Unknown_cec8b: db $65,$01, $66,$01, $67,$01, $ff -Unknown_cec92: db $67,$07, $68,$07, $fe -Unknown_cec97: db $6e,$08, $ff -Unknown_cec9a: db $6f,$08, $ff -Unknown_cec9d: db $6e,$88, $ff -Unknown_ceca0: db $18,$04, $70,$04, $71,$04, $72,$04, $73,$04, $fc -Unknown_cecab: db $74,$04, $75,$04, $fe -Unknown_cecb0: db $14,$08, $ff -Unknown_cecb3: db $74,$03, $14,$03, $15,$03, $14,$03, $15,$03, $fc -Unknown_cecbe: db $14,$00, $15,$00, $14,$00, $15,$00, $74,$0c, $fc -Unknown_cecc9: db $76,$08, $ff -Unknown_ceccc: db $77,$01, $78,$01, $79,$01, $7a,$01, $7b,$01, $7c,$01, $7d,$01, $7c,$c1, $7b,$c1, $7a,$c1, $79,$c1, $78,$c1, $77,$c1, $fc -Unknown_cece7: db $1b,$04, $7e,$04, $fe -Unknown_cecec: db $1b,$44, $7e,$44, $fe -Unknown_cecf1: db $7f,$08, $ff -Unknown_cecf4: db $25,$08, $ff -Unknown_cecf7: db $80,$08, $ff -Unknown_cecfa: db $83,$07, $82,$07, $81,$07, $82,$07, $83,$07, $82,$07, $81,$07, $fc -Unknown_ced09: db $1b,$10, $fc -Unknown_ced0c: db $fd,$0f, $84,$0f, $85,$0f, $29,$0f, $28,$0f, $86,$20, $fc -Unknown_ced19: db $1b,$03, $87,$03, $88,$03, $89,$03, $fc -Unknown_ced22: db $8a,$02, $8b,$02, $8c,$02, $8d,$02, $fc -Unknown_ced2b: db $61,$02, $62,$02, $63,$02, $ff -Unknown_ced32: db $65,$02, $66,$02, $67,$02, $ff -Unknown_ced39: db $8e,$08, $ff -Unknown_ced3c: db $8e,$48, $ff -Unknown_ced3f: db $8f,$10, $90,$10, $fe -Unknown_ced44: db $91,$10, $92,$10, $fe -Unknown_ced49: db $93,$08, $ff -Unknown_ced4c: db $1e,$08, $ff -Unknown_ced4f: db $1b,$07, $94,$07, $fe -Unknown_ced54: db $95,$08, $ff -Unknown_ced57: db $96,$08, $ff -Unknown_ced5a: db $95,$08, $ff -Unknown_ced5d: db $97,$01, $97,$41, $fe -Unknown_ced62: db $98,$08, $ff -Unknown_ced65: db $99,$20, $99,$20, $99,$20, $99,$20, $99,$20, $9a,$08, $ff -Unknown_ced72: db $9b,$08, $ff -Unknown_ced75: db $9c,$02, $9d,$02, $9e,$08, $fd,$02, $9e,$02, $fd,$02, $9e,$02, $fd,$02, $9e,$02, $fc -Unknown_ced88: db $9f,$08, $ff -Unknown_ced8b: db $0f,$08, $ff -Unknown_ced8e: db $6b,$18, $fc +Unknown_ceb78: db $fd,$02, $35,$04, $fd,$02, $35,$04, $fd,$02, $35,$04, $fd,$02, $35,$04 + db -4 +Unknown_ceb89: db $14,$04, $15,$04 + db -2 +Unknown_ceb8e: db $36,$02, $37,$02, $38,$02, $39,$20 + db -4 +Unknown_ceb97: db $3a,$02, $3b,$02, $3c,$02, $3d,$20 + db -4 +Unknown_ceba0: db $3a,$42, $3b,$42, $3c,$42, $3d,$60 + db -4 +Unknown_ceba9: db $3e,$08, $3f,$08, $40,$08 + db -1 +Unknown_cebb0: db $40,$02, $fd,$02, $40,$02, $fd,$02, $41,$02, $fd,$02, $41,$02, $fd,$02 + db -2 +Unknown_cebc1: db $42,$02, $43,$02, $44,$02, $45,$02 + db -2 +Unknown_cebca: db $19,$02, $fd,$02 + db -2 +Unknown_cebcf: db $46,$04, $47,$04 + db -2 +Unknown_cebd4: db $18,$02, $fd,$02 + db -2 +Unknown_cebd9: db $48,$08 + db -1 +Unknown_cebdc: db $48,$48 + db -1 +Unknown_cebdf: db $49,$08 + db -1 +Unknown_cebe2: db $4a,$08 + db -1 +Unknown_cebe5: db $20,$10, $1f,$10, $1e,$10 + db -1 +Unknown_cebec: db $20,$08, $1f,$08, $1e,$08 + db -1 +Unknown_cebf3: db $fd,$14, $55,$28, $54,$28, $53,$14, $fd,$04, $53,$04, $fd,$04, $53,$04, $fd,$04, $53,$04 + db -4 +Unknown_cec08: db $1e,$08, $1f,$08, $20,$08 + db -4 +Unknown_cec0f: db $fd,$00, $14,$00, $15,$00, $14,$40, $fd,$00, $16,$40, $15,$00, $16,$00 + db -2 +Unknown_cec20: db $56,$02, $57,$04 + db -4 +Unknown_cec25: db $56,$c2, $57,$c4 + db -4 +Unknown_cec2a: db $56,$01, $57,$01, $58,$01, $57,$c1, $58,$c1, $57,$02 + db -4 +Unknown_cec37: db $56,$c1, $57,$c1, $58,$c1, $57,$01, $58,$01, $57,$c2 + db -4 +Unknown_cec44: db $57,$c1, $58,$c1, $57,$01, $58,$01 + db -2 +Unknown_cec4d: db $59,$01, $5a,$01, $5b,$01, $5c,$02 + db -4 +Unknown_cec56: db $0a,$0a, $0b,$43, $5d,$43, $0b,$c3, $0a,$82, $0b,$81, $5d,$01, $0b,$01 + db -2 +Unknown_cec67: db $0a,$03, $0b,$47, $0a,$07, $0b,$07, $0a,$03 + db -2 +Unknown_cec72: db $5e,$20, $5e,$20 + db -4 +Unknown_cec77: db $5f,$20, $5f,$20 + db -4 +Unknown_cec7c: db $60,$08 + db -1 +Unknown_cec7f: db $61,$01, $62,$01, $63,$01 + db -1 +Unknown_cec86: db $63,$07, $64,$07 + db -2 +Unknown_cec8b: db $65,$01, $66,$01, $67,$01 + db -1 +Unknown_cec92: db $67,$07, $68,$07 + db -2 +Unknown_cec97: db $6e,$08 + db -1 +Unknown_cec9a: db $6f,$08 + db -1 +Unknown_cec9d: db $6e,$88 + db -1 +Unknown_ceca0: db $18,$04, $70,$04, $71,$04, $72,$04, $73,$04 + db -4 +Unknown_cecab: db $74,$04, $75,$04 + db -2 +Unknown_cecb0: db $14,$08 + db -1 +Unknown_cecb3: db $74,$03, $14,$03, $15,$03, $14,$03, $15,$03 + db -4 +Unknown_cecbe: db $14,$00, $15,$00, $14,$00, $15,$00, $74,$0c + db -4 +Unknown_cecc9: db $76,$08 + db -1 +Unknown_ceccc: db $77,$01, $78,$01, $79,$01, $7a,$01, $7b,$01, $7c,$01, $7d,$01, $7c,$c1, $7b,$c1, $7a,$c1, $79,$c1, $78,$c1, $77,$c1 + db -4 +Unknown_cece7: db $1b,$04, $7e,$04 + db -2 +Unknown_cecec: db $1b,$44, $7e,$44 + db -2 +Unknown_cecf1: db $7f,$08 + db -1 +Unknown_cecf4: db $25,$08 + db -1 +Unknown_cecf7: db $80,$08 + db -1 +Unknown_cecfa: db $83,$07, $82,$07, $81,$07, $82,$07, $83,$07, $82,$07, $81,$07 + db -4 +Unknown_ced09: db $1b,$10 + db -4 +Unknown_ced0c: db $fd,$0f, $84,$0f, $85,$0f, $29,$0f, $28,$0f, $86,$20 + db -4 +Unknown_ced19: db $1b,$03, $87,$03, $88,$03, $89,$03 + db -4 +Unknown_ced22: db $8a,$02, $8b,$02, $8c,$02, $8d,$02 + db -4 +Unknown_ced2b: db $61,$02, $62,$02, $63,$02 + db -1 +Unknown_ced32: db $65,$02, $66,$02, $67,$02 + db -1 +Unknown_ced39: db $8e,$08 + db -1 +Unknown_ced3c: db $8e,$48 + db -1 +Unknown_ced3f: db $8f,$10, $90,$10 + db -2 +Unknown_ced44: db $91,$10, $92,$10 + db -2 +Unknown_ced49: db $93,$08 + db -1 +Unknown_ced4c: db $1e,$08 + db -1 +Unknown_ced4f: db $1b,$07, $94,$07 + db -2 +Unknown_ced54: db $95,$08 + db -1 +Unknown_ced57: db $96,$08 + db -1 +Unknown_ced5a: db $95,$08 + db -1 +Unknown_ced5d: db $97,$01, $97,$41 + db -2 +Unknown_ced62: db $98,$08 + db -1 +Unknown_ced65: db $99,$20, $99,$20, $99,$20, $99,$20, $99,$20, $9a,$08 + db -1 +Unknown_ced72: db $9b,$08 + db -1 +Unknown_ced75: db $9c,$02, $9d,$02, $9e,$08, $fd,$02, $9e,$02, $fd,$02, $9e,$02, $fd,$02, $9e,$02 + db -4 +Unknown_ced88: db $9f,$08 + db -1 +Unknown_ced8b: db $0f,$08 + db -1 +Unknown_ced8e: db $6b,$18 + db -4 Unknown_ced91: db $a0,$01 ; fallthrough Unknown_ced93: db $a1,$01 ; fallthrough -Unknown_ced95: db $a2,$01, $fc -Unknown_ced98: db $a3,$08, $ff -Unknown_ced9b: db $a4,$04, $a5,$04, $a6,$04, $a7,$04, $a6,$44, $a5,$44, $fe -Unknown_ceda8: db $a8,$04, $a9,$04, $aa,$04, $ab,$04, $aa,$44, $a9,$44, $fe -Unknown_cedb5: db $1b,$08, $ff -Unknown_cedb8: db $ac,$08, $ff -Unknown_cedbb: db $ad,$08, $ff -Unknown_cedbe: db $ae,$08, $ff -Unknown_cedc1: db $af,$08, $ff -Unknown_cedc4: db $b0,$20, $fc -Unknown_cedc7: db $b1,$07, $b1,$47, $fe -Unknown_cedcc: db $b2,$08, $ff -Unknown_cedcf: db $b3,$08, $ff -Unknown_cedd2: db $b3,$48, $ff -Unknown_cedd5: db $b3,$88, $ff -Unknown_cedd8: db $b3,$c8, $ff -Unknown_ceddb: db $b5,$08, $ff -Unknown_cedde: db $b5,$48, $ff -Unknown_cede1: db $b5,$88, $ff -Unknown_cede4: db $b5,$c8, $ff -Unknown_cede7: db $b4,$08, $ff -Unknown_cedea: db $6b,$08, $ff -Unknown_ceded: db $b6,$08, $ff -Unknown_cedf0: db $b7,$20, $ff -Unknown_cedf3: db $1b,$20, $ff -Unknown_cedf6: db $b8,$20, $ff -Unknown_cedf9: db $b8,$60, $ff -Unknown_cedfc: db $b9,$20, $ff -Unknown_cedff: db $ba,$20, $ff -Unknown_cee02: db $bb,$60, $ff -Unknown_cee05: db $bb,$20, $ff -Unknown_cee08: db $bc,$20, $ff -Unknown_cee0b: db $bd,$0b, $be,$0b, $1b,$0b, $fc -Unknown_cee12: db $bf,$04, $c0,$04, $c1,$04, $fc -Unknown_cee19: db $c2,$20, $c2,$20, $fc -Unknown_cee1e: db $4b,$02, $4c,$02, $4d,$20, $4d,$20, $4d,$20, $4f,$01, $50,$01, $51,$01, $52,$02, $fd,$02, $52,$02, $fd,$02, $52,$02, $fd,$02, $52,$02, $fc -Unknown_cee3d: db $4b,$c2, $4c,$c2, $4d,$e0, $4d,$e0, $4d,$e0, $4f,$c1, $50,$c1, $51,$c1, $52,$c2, $fd,$02, $52,$c2, $fd,$02, $52,$c2, $fd,$02, $52,$c2, $fc -Unknown_cee5c: db $c3,$01, $c3,$c1, $fe -Unknown_cee61: db $c4,$20, $ff -Unknown_cee64: db $c5,$04, $c6,$04, $c7,$04, $fc -Unknown_cee6b: db $c8,$01, $c8,$41, $fe -Unknown_cee70: db $c9,$03, $05,$03, $fc -Unknown_cee75: db $ca,$20, $cb,$03, $ca,$03, $cb,$03, $fe -Unknown_cee7e: db $03,$a0, $ff -Unknown_cee81: db $cc,$20, $ff -Unknown_cee84: db $7f,$02, $25,$02, $80,$02, $25,$02, $fe -Unknown_cee8d: db $cd,$04, $ce,$04, $cd,$c4, $ce,$c4, $fe -Unknown_cee96: db $cf,$04, $d0,$04, $d1,$04, $d2,$04, $fc -Unknown_cee9f: db $d3,$20, $ff -Unknown_ceea2: db $d4,$08, $ff -Unknown_ceea5: db $d5,$08, $ff -Unknown_ceea8: db $d6,$08, $ff -Unknown_ceeab: db $d7,$08, $ff +Unknown_ced95: db $a2,$01 + db -4 +Unknown_ced98: db $a3,$08 + db -1 +Unknown_ced9b: db $a4,$04, $a5,$04, $a6,$04, $a7,$04, $a6,$44, $a5,$44 + db -2 +Unknown_ceda8: db $a8,$04, $a9,$04, $aa,$04, $ab,$04, $aa,$44, $a9,$44 + db -2 +Unknown_cedb5: db $1b,$08 + db -1 +Unknown_cedb8: db $ac,$08 + db -1 +Unknown_cedbb: db $ad,$08 + db -1 +Unknown_cedbe: db $ae,$08 + db -1 +Unknown_cedc1: db $af,$08 + db -1 +Unknown_cedc4: db $b0,$20 + db -4 +Unknown_cedc7: db $b1,$07, $b1,$47 + db -2 +Unknown_cedcc: db $b2,$08 + db -1 +Unknown_cedcf: db $b3,$08 + db -1 +Unknown_cedd2: db $b3,$48 + db -1 +Unknown_cedd5: db $b3,$88 + db -1 +Unknown_cedd8: db $b3,$c8 + db -1 +Unknown_ceddb: db $b5,$08 + db -1 +Unknown_cedde: db $b5,$48 + db -1 +Unknown_cede1: db $b5,$88 + db -1 +Unknown_cede4: db $b5,$c8 + db -1 +Unknown_cede7: db $b4,$08 + db -1 +Unknown_cedea: db $6b,$08 + db -1 +Unknown_ceded: db $b6,$08 + db -1 +Unknown_cedf0: db $b7,$20 + db -1 +Unknown_cedf3: db $1b,$20 + db -1 +Unknown_cedf6: db $b8,$20 + db -1 +Unknown_cedf9: db $b8,$60 + db -1 +Unknown_cedfc: db $b9,$20 + db -1 +Unknown_cedff: db $ba,$20 + db -1 +Unknown_cee02: db $bb,$60 + db -1 +Unknown_cee05: db $bb,$20 + db -1 +Unknown_cee08: db $bc,$20 + db -1 +Unknown_cee0b: db $bd,$0b, $be,$0b, $1b,$0b + db -4 +Unknown_cee12: db $bf,$04, $c0,$04, $c1,$04 + db -4 +Unknown_cee19: db $c2,$20, $c2,$20 + db -4 +Unknown_cee1e: db $4b,$02, $4c,$02, $4d,$20, $4d,$20, $4d,$20, $4f,$01, $50,$01, $51,$01, $52,$02, $fd,$02, $52,$02, $fd,$02, $52,$02, $fd,$02, $52,$02 + db -4 +Unknown_cee3d: db $4b,$c2, $4c,$c2, $4d,$e0, $4d,$e0, $4d,$e0, $4f,$c1, $50,$c1, $51,$c1, $52,$c2, $fd,$02, $52,$c2, $fd,$02, $52,$c2, $fd,$02, $52,$c2 + db -4 +Unknown_cee5c: db $c3,$01, $c3,$c1 + db -2 +Unknown_cee61: db $c4,$20 + db -1 +Unknown_cee64: db $c5,$04, $c6,$04, $c7,$04 + db -4 +Unknown_cee6b: db $c8,$01, $c8,$41 + db -2 +Unknown_cee70: db $c9,$03, $05,$03 + db -4 +Unknown_cee75: db $ca,$20, $cb,$03, $ca,$03, $cb,$03 + db -2 +Unknown_cee7e: db $03,$a0 + db -1 +Unknown_cee81: db $cc,$20 + db -1 +Unknown_cee84: db $7f,$02, $25,$02, $80,$02, $25,$02 + db -2 +Unknown_cee8d: db $cd,$04, $ce,$04, $cd,$c4, $ce,$c4 + db -2 +Unknown_cee96: db $cf,$04, $d0,$04, $d1,$04, $d2,$04 + db -4 +Unknown_cee9f: db $d3,$20 + db -1 +Unknown_ceea2: db $d4,$08 + db -1 +Unknown_ceea5: db $d5,$08 + db -1 +Unknown_ceea8: db $d6,$08 + db -1 +Unknown_ceeab: db $d7,$08 + db -1 ; ceeae - Unknown_ceeae: ; ceeae ; ?, length, address dbbw $00, $10, Unknown_cf2f6 @@ -5551,7 +5713,6 @@ Unknown_ceeae: ; ceeae dbbw $00, $0c, Unknown_cf8c6 ; cf20e - Unknown_cf20e: db $f8, $fc, $00, $00 db $00, $fc, $01, $00 @@ -6419,7 +6580,6 @@ Unknown_cfcc2: db $f0, $54, $00, $00 ; cfcf6 - AnimObjGFX: ; cfcf6 object_gfx: MACRO diff --git a/battle/bg_effects.asm b/battle/bg_effects.asm index b6b1901da..fa98177e7 100644 --- a/battle/bg_effects.asm +++ b/battle/bg_effects.asm @@ -1,12 +1,12 @@ ; BG effects for use in battle animations. -Functionc8000: ; c8000 (32:4000) +ExecuteBGEffects: ; c8000 (32:4000) ld hl, ActiveBGEffects ld e, $5 -.asm_c8005 +.loop ld a, [hl] and a - jr z, .asm_c8012 + jr z, .next ld c, l ld b, h push hl @@ -14,27 +14,28 @@ Functionc8000: ; c8000 (32:4000) call Functionc804a pop de pop hl -.asm_c8012 +.next ld bc, $4 add hl, bc dec e - jr nz, .asm_c8005 + jr nz, .loop ret -Functionc801a: ; c801a (32:401a) +QueueBGEffect: ; c801a (32:401a) ld hl, ActiveBGEffects ld e, $5 -.asm_c801f +.loop ld a, [hl] and a - jr z, .asm_c802c + jr z, .load ld bc, $4 add hl, bc dec e - jr nz, .asm_c801f + jr nz, .loop scf ret -.asm_c802c + +.load ld c, l ld b, h ld hl, $0 @@ -70,63 +71,63 @@ endr jp [hl] BattleBGEffects: ; c805a (32:405a) - dw BattleBGEffect_0 - dw Functionc80eb - dw Functionc80f3 - dw Functionc812d - dw Functionc8141 - dw Functionc8155 - dw Functionc8171 - dw Functionc818b - dw Functionc81a5 - dw Functionc81b3 - dw Functionc81ea - dw Functionc837b - dw Functionc83a8 - dw Functionc8545 - dw Functionc8599 - dw Functionc863f - dw Functionc8662 - dw Functionc8214 - dw Functionc8281 - dw Functionc8689 - dw Functionc8709 - dw Functionc8be8 - dw Functionc8bf2 - dw Functionc8bfd - dw Functionc8c08 - dw Functionc8c14 - dw Functionc8c20 - dw Functionc8c30 - dw Functionc8b00 - dw Functionc8c3c - dw Functionc8c55 - dw Functionc8cf9 - dw Functionc8d02 - dw Functionc8761 - dw Functionc89ee - dw Functionc87a7 - dw Functionc8805 - dw Functionc8837 - dw Functionc892a - dw Functionc82f5 - dw Functionc89b5 - dw Functionc8607 - dw Functionc8a3a - dw Functionc8acc - dw Functionc8964 - dw Functionc88e7 - dw Functionc8ce1 - dw Functionc8919 - dw Functionc85c2 - dw Functionc85ce - dw Functionc8603 - dw Functionc8c61 - dw Functionc8ca2 - dw Functionc8d3a + dw BattleBGEffect_End + dw BattleBGEffect_FlashInverted + dw BattleBGEffect_FlashWhite + dw BattleBGEffect_WhiteHues + dw BattleBGEffect_BlackHues + dw BattleBGEffect_AlternateHues + dw BattleBGEffect_06 + dw BattleBGEffect_07 + dw BattleBGEffect_08 + dw BattleBGEffect_HideMon + dw BattleBGEffect_ShowMon + dw BattleBGEffect_EnterMon + dw BattleBGEffect_ReturnMon + dw BattleBGEffect_Surf + dw BattleBGEffect_Whirlpool + dw BattleBGEffect_Teleport + dw BattleBGEffect_NightShade + dw BattleBGEffect_FeetFollow + dw BattleBGEffect_HeadFollow + dw BattleBGEffect_DoubleTeam + dw BattleBGEffect_AcidArmor + dw BattleBGEffect_RapidFlash + dw BattleBGEffect_16 + dw BattleBGEffect_17 + dw BattleBGEffect_18 + dw BattleBGEffect_19 + dw BattleBGEffect_1a + dw BattleBGEffect_1b + dw BattleBGEffect_1c + dw BattleBGEffect_1d + dw BattleBGEffect_1e + dw BattleBGEffect_1f + dw BattleBGEffect_20 + dw BattleBGEffect_21 + dw BattleBGEffect_22 + dw BattleBGEffect_23 + dw BattleBGEffect_Tackle + dw BattleBGEffect_25 + dw BattleBGEffect_26 + dw BattleBGEffect_27 + dw BattleBGEffect_28 + dw BattleBGEffect_Psychic + dw BattleBGEffect_2a + dw BattleBGEffect_2b + dw BattleBGEffect_2c + dw BattleBGEffect_2d + dw BattleBGEffect_2e + dw BattleBGEffect_2f + dw BattleBGEffect_30 + dw BattleBGEffect_31 + dw BattleBGEffect_32 + dw BattleBGEffect_VibrateMon + dw BattleBGEffect_WobbleMon + dw BattleBGEffect_35 -BattleBGEffect_0: ; c80c6 (32:40c6) +BattleBGEffect_End: ; c80c6 (32:40c6) call EndBattleBGEffect ret @@ -142,7 +143,7 @@ Functionc80ca: ; c80ca (32:40ca) ld l, a ret -Functionc80d7: ; c80d7 (32:40d7) +BattleBGEffects_AnonJumptable: ; c80d7 (32:40d7) pop de ld hl, $1 add hl, bc @@ -161,9 +162,10 @@ Functionc80e5: ; c80e5 (32:40e5) inc [hl] ret -Functionc80eb: ; c80eb (32:40eb) +BattleBGEffect_FlashInverted: ; c80eb (32:40eb) ld de, .inverted jp Functionc80fb + ; c80f1 (32:40f1) .inverted @@ -171,9 +173,10 @@ Functionc80eb: ; c80eb (32:40eb) db %00011011 ; 0123 ; c80f3 -Functionc80f3: ; c80f3 (32:40f3) +BattleBGEffect_FlashWhite: ; c80f3 (32:40f3) ld de, .white jp Functionc80fb + ; c80f9 (32:40f9) .white @@ -218,53 +221,59 @@ Functionc80fb: ; c80fb (32:40fb) ld [wcfc7], a ret -Functionc812d: ; c812d (32:412d) +BattleBGEffect_WhiteHues: ; c812d (32:412d) ld de, Unknown_c813d call Functionc8d57 jr c, .asm_c8139 ld [wcfc7], a ret + .asm_c8139 call EndBattleBGEffect ret + ; c813d (32:413d) Unknown_c813d: db $e4, $e0, $d0, $ff ; c8141 -Functionc8141: ; c8141 (32:4141) +BattleBGEffect_BlackHues: ; c8141 (32:4141) ld de, Unknown_c8151 call Functionc8d57 jr c, .asm_c814d ld [wcfc7], a ret + .asm_c814d call EndBattleBGEffect ret + ; c8151 (32:4151) Unknown_c8151: db $e4, $f4, $f8, $ff ; c8155 -Functionc8155: ; c8155 (32:4155) +BattleBGEffect_AlternateHues: ; c8155 (32:4155) ld de, Unknown_c8168 call Functionc8d57 jr c, .asm_c8164 ld [wcfc7], a ld [wcfc9], a ret + .asm_c8164 call EndBattleBGEffect ret + ; c8168 (32:4168) Unknown_c8168: db $e4, $f8, $fc, $f8, $e4, $90, $40, $90, $fe ; c8171 -Functionc8171: ; c8171 (32:4171) +BattleBGEffect_06: ; c8171 (32:4171) call Functionc9059 jr nz, .asm_c817b ld de, Unknown_c8185 @@ -275,6 +284,7 @@ Functionc8171: ; c8171 (32:4171) call Functionc8d57 ld [wcfc8], a ret + ; c8185 (32:4185) Unknown_c8185: @@ -285,7 +295,7 @@ Unknown_c8188: db $f0, $c0, $fe ; c818b -Functionc818b: ; c818b (32:418b) +BattleBGEffect_07: ; c818b (32:418b) call Functionc9059 jr nz, .asm_c8195 ld de, Unknown_c819f @@ -296,6 +306,7 @@ Functionc818b: ; c818b (32:418b) call Functionc8d57 ld [wcfc8], a ret + ; c819f (32:419f) Unknown_c819f: @@ -306,21 +317,21 @@ Unknown_c81a2: db $f0, $cc, $fe ; c81a5 -Functionc81a5: ; c81a5 (32:41a5) +BattleBGEffect_08: ; c81a5 (32:41a5) ld de, Unknown_c81af call Functionc8d57 ld [wcfc7], a ret + ; c81af (32:41af) Unknown_c81af: db $1b, $63, $87, $fe ; c81b3 -Functionc81b3: ; c81b3 (32:41b3) - call Functionc80d7 ; ; ; call does not return - -Jumptable_c81b6: ; c81b6 (32:41b6) +BattleBGEffect_HideMon: ; c81b3 (32:41b3) + call BattleBGEffects_AnonJumptable +.anon_jumptable dw Functionc81c0 dw Functionc80e5 dw Functionc80e5 @@ -332,14 +343,14 @@ Functionc81c0: ; c81c0 (32:41c0) call Functionc80e5 push bc call Functionc9038 - jr nz, .asm_c81d1 + jr nz, .six_by_six hlcoord 12, 0 - ld bc, $707 - jr .asm_c81d7 -.asm_c81d1 + lb bc, 7, 7 + jr .got_dims +.six_by_six hlcoord 2, 6 lb bc, 6, 6 -.asm_c81d7 +.got_dims call ClearBox pop bc xor a @@ -354,25 +365,27 @@ Functionc81e3: ; c81e3 (32:41e3) call EndBattleBGEffect ret -Functionc81ea: ; c81ea (32:41ea) +BattleBGEffect_ShowMon: ; c81ea (32:41ea) call Functionc9042 jr z, .asm_c81f3 call EndBattleBGEffect ret + .asm_c81f3 call Functionc9038 - jr nz, .asm_c81fd + jr nz, .six_by_six ld de, Unknown_c8210 - jr .asm_c8200 -.asm_c81fd + jr .got_dims +.six_by_six ld de, Unknown_c820c -.asm_c8200 +.got_dims ld a, e ld [BattleAnimTemps + 1], a ld a, d ld [BattleAnimTemps + 2], a call Functionc83ed ret + ; c820c (32:420c) Unknown_c820c: @@ -385,10 +398,9 @@ Unknown_c8210: db $ff ; c8214 -Functionc8214: ; c8214 (32:4214) - call Functionc80d7 ; ; ; call does not return - -Jumptable_c8217: ; c8217 (32:4217) +BattleBGEffect_FeetFollow: ; c8214 (32:4214) + call BattleBGEffects_AnonJumptable +.anon_jumptable dw Functionc8223 dw Functionc825a dw Functionc80e5 @@ -404,6 +416,7 @@ Functionc8223: ; c8223 (32:4223) inc [hl] call EndBattleBGEffect ret + .asm_c8230 call Functionc80e5 push bc @@ -423,7 +436,7 @@ Functionc8223: ; c8223 (32:4223) ld [BattleAnimTemps + 2], a xor a ld [BattleAnimTemps + 3], a - call Functionc82ee + call _QueueBattleAnimation pop bc ret @@ -451,10 +464,9 @@ Functionc827a: ; c827a (32:427a) call EndBattleBGEffect ret -Functionc8281: ; c8281 (32:4281) - call Functionc80d7 ; ; ; call does not return - -Jumptable_c8284: ; c8284 (32:4284) +BattleBGEffect_HeadFollow: ; c8281 (32:4281) + call BattleBGEffects_AnonJumptable +.anon_jumptable dw Functionc8290 dw Functionc82c7 dw Functionc80e5 @@ -470,6 +482,7 @@ Functionc8290: ; c8290 (32:4290) inc [hl] call EndBattleBGEffect ret + .asm_c829d call Functionc80e5 push bc @@ -489,7 +502,7 @@ Functionc8290: ; c8290 (32:4290) ld [BattleAnimTemps + 2], a xor a ld [BattleAnimTemps + 3], a - call Functionc82ee + call _QueueBattleAnimation pop bc ret @@ -517,14 +530,13 @@ Functionc82e7: ; c82e7 (32:42e7) call EndBattleBGEffect ret -Functionc82ee: ; c82ee (32:42ee) - callab Functioncc9a1 +_QueueBattleAnimation: ; c82ee (32:42ee) + callab QueueBattleAnimation ret -Functionc82f5: ; c82f5 (32:42f5) - call Functionc80d7 ; ; ; call does not return - -Jumptable_c82f8: ; c82f8 (32:42f8) +BattleBGEffect_27: ; c82f5 (32:42f5) + call BattleBGEffects_AnonJumptable +.anon_jumptable dw Functionc8302 dw Functionc831d dw Functionc80e5 @@ -616,11 +628,12 @@ Functionc8365: ; c8365 (32:4365) add hl, bc ld [hl], $1 ret + .asm_c8377 call EndBattleBGEffect ret -Functionc837b: ; c837b (32:437b) +BattleBGEffect_EnterMon: ; c837b (32:437b) call Functionc9038 jr nz, .asm_c8385 ld de, Unknown_c839e @@ -634,6 +647,7 @@ Functionc837b: ; c837b (32:437b) ld [BattleAnimTemps + 2], a call Functionc83ed ret + ; c8394 (32:4394) Unknown_c8394: @@ -650,7 +664,7 @@ Unknown_c839e: db $ff ; c83a8 -Functionc83a8: ; c83a8 (32:43a8) +BattleBGEffect_ReturnMon: ; c83a8 (32:43a8) call Functionc9038 jr nz, .asm_c83b2 ld de, Unknown_c83d7 @@ -664,6 +678,7 @@ Functionc83a8: ; c83a8 (32:43a8) ld [BattleAnimTemps + 2], a call Functionc83ed ret + ; c83c1 (32:43c1) Unknown_c83c1: @@ -689,9 +704,8 @@ Unknown_c83d7: ; c83ed Functionc83ed: ; c83ed (32:43ed) - call Functionc80d7 ; ; ; call does not return - -Jumptable_c83f0: ; c83f0 (32:43f0) + call BattleBGEffects_AnonJumptable +.anon_jumptable dw Functionc83fa dw Functionc80e5 dw Functionc80e5 @@ -725,6 +739,7 @@ endr ld a, $1 ld [hBGMapMode], a ret + .asm_c8425 call Functionc843b jr Functionc83fa @@ -822,6 +837,7 @@ endr jr nz, .asm_c8484 pop bc ret + ; c849c (32:449c) Unknown_c849c: ; c849c @@ -887,10 +903,9 @@ Unknown_c853c: ; c853c db $06, $1b, $30 ; c8545 -Functionc8545: ; c8545 (32:4545) - call Functionc80d7 ; ; ; call does not return - -Jumptable_c8548: ; c8548 (32:4548) +BattleBGEffect_Surf: ; c8545 (32:4545) + call BattleBGEffects_AnonJumptable +.anon_jumptable dw Functionc854e dw Functionc8557 dw Functionc8561 @@ -954,10 +969,9 @@ Functionc8565: ; c8565 (32:4565) jr c, .asm_c8580 ret -Functionc8599: ; c8599 (32:4599) - call Functionc80d7 ; ; ; call does not return - -Jumptable_c859c: ; c859c (32:459c) +BattleBGEffect_Whirlpool: ; c8599 (32:4599) + call BattleBGEffects_AnonJumptable +.anon_jumptable dw Functionc85a2 dw Functionc85ba dw Functionc85be @@ -984,14 +998,14 @@ Functionc85be: ; c85be (32:45be) call Functionc8f0a ret -Functionc85c2: ; c85c2 (32:45c2) +BattleBGEffect_30: ; c85c2 (32:45c2) call Functionc8eca ld a, $42 call Functionc8ede call EndBattleBGEffect ret -Functionc85ce: ; c85ce (32:45ce) +BattleBGEffect_31: ; c85ce (32:45ce) ld hl, $3 add hl, bc ld a, [hl] @@ -1020,19 +1034,19 @@ rept 2 endr call Functionc8f9a ret + .asm_c85fc call Functionc8eca call EndBattleBGEffect ret -Functionc8603: ; c8603 (32:4603) +BattleBGEffect_32: ; c8603 (32:4603) call Functionc8f0a ret -Functionc8607: ; c8607 (32:4607) - call Functionc80d7 ; ; ; call does not return - -Jumptable_c860a: ; c860a (32:460a) +BattleBGEffect_Psychic: ; c8607 (32:4607) + call BattleBGEffects_AnonJumptable +.anon_jumptable dw Functionc8610 dw Functionc862e dw Functionc863b @@ -1068,10 +1082,9 @@ Functionc863b: ; c863b (32:463b) call Functionc8f0a ret -Functionc863f: ; c863f (32:463f) - call Functionc80d7 ; ; ; call does not return - -Jumptable_c8642: ; c8642 (32:4642) +BattleBGEffect_Teleport: ; c863f (32:463f) + call BattleBGEffects_AnonJumptable +.anon_jumptable dw Functionc8648 dw Functionc865a dw Functionc865e @@ -1094,10 +1107,9 @@ Functionc865e: ; c865e (32:465e) call Functionc8f0a ret -Functionc8662: ; c8662 (32:4662) - call Functionc80d7 ; ; ; call does not return - -Jumptable_c8665: ; c8665 (32:4665) +BattleBGEffect_NightShade: ; c8662 (32:4662) + call BattleBGEffects_AnonJumptable +.anon_jumptable dw Functionc866b dw Functionc8681 dw Functionc8685 @@ -1123,10 +1135,9 @@ Functionc8685: ; c8685 (32:4685) call Functionc8f0a ret -Functionc8689: ; c8689 (32:4689) - call Functionc80d7 ; ; ; call does not return - -Jumptable_c868c: ; c868c (32:468c) +BattleBGEffect_DoubleTeam: ; c8689 (32:4689) + call BattleBGEffects_AnonJumptable +.anon_jumptable dw Functionc8698 dw Functionc86af dw Functionc86cf @@ -1167,6 +1178,7 @@ Functionc86bd: ; c86bd (32:46bd) dec [hl] call Functionc86ea ret + asm_c86cb: ; c86cb (32:46cb) call Functionc80e5 ret @@ -1218,10 +1230,9 @@ Functionc8705: ; c8705 (32:4705) call Functionc8f0a ret -Functionc8709: ; c8709 (32:4709) - call Functionc80d7 ; ; ; call does not return - -Jumptable_c870c: ; c870c (32:470c) +BattleBGEffect_AcidArmor: ; c8709 (32:4709) + call BattleBGEffects_AnonJumptable +.anon_jumptable dw Functionc8712 dw Functionc8732 dw Functionc875d @@ -1282,10 +1293,9 @@ Functionc875d: ; c875d (32:475d) call Functionc8f0a ret -Functionc8761: ; c8761 (32:4761) - call Functionc80d7 ; ; ; call does not return - -Jumptable_c8764: ; c8764 (32:4764) +BattleBGEffect_21: ; c8761 (32:4761) + call BattleBGEffects_AnonJumptable +.anon_jumptable dw Functionc876a dw Functionc8781 dw Functionc87a3 @@ -1332,10 +1342,9 @@ Functionc87a3: ; c87a3 (32:47a3) call Functionc8f0a ret -Functionc87a7: ; c87a7 (32:47a7) - call Functionc80d7 ; ; ; call does not return - -Jumptable_c87aa: ; c87aa (32:47aa) +BattleBGEffect_23: ; c87a7 (32:47a7) + call BattleBGEffects_AnonJumptable +.anon_jumptable dw Functionc87b2 dw Functionc87cf dw Functionc87de @@ -1366,6 +1375,7 @@ Functionc87cf: ; c87cf (32:47cf) jr z, .asm_c87d9 dec [hl] ret + .asm_c87d9 ld [hl], $10 call Functionc80e5 @@ -1401,10 +1411,9 @@ Functionc8801: ; c8801 (32:4801) call Functionc8f0a ret -Functionc8805: ; c8805 (32:4805) - call Functionc80d7 ; ; ; call does not return - -Jumptable_c8808: ; c8808 (32:4808) +BattleBGEffect_Tackle: ; c8805 (32:4805) + call BattleBGEffects_AnonJumptable +.anon_jumptable dw Functionc8810 dw Functionc8869 dw Functionc8888 @@ -1436,10 +1445,9 @@ Functionc8833: ; c8833 (32:4833) call Functionc8f0a ret -Functionc8837: ; c8837 (32:4837) - call Functionc80d7 ; ; ; call does not return - -Jumptable_c883a: ; c883a (32:483a) +BattleBGEffect_25: ; c8837 (32:4837) + call BattleBGEffects_AnonJumptable +.anon_jumptable dw Functionc8842 dw Functionc8869 dw Functionc8888 @@ -1523,6 +1531,7 @@ Functionc88a5: ; c88a5 (32:48a5) .asm_c88b3 pop af jp Functionc900b + .asm_c88b7 ld a, [hLCDStatCustom + 1] ld d, a @@ -1562,10 +1571,9 @@ Functionc88a5: ; c88a5 (32:48a5) jr nz, .asm_c88e2 ret -Functionc88e7: ; c88e7 (32:48e7) - call Functionc80d7 ; ; ; call does not return - -Jumptable_c88ea: ; c88ea (32:48ea) +BattleBGEffect_2d: ; c88e7 (32:48e7) + call BattleBGEffects_AnonJumptable +.anon_jumptable dw Functionc88f6 dw Functionc8869 dw Functionc8888 @@ -1597,10 +1605,9 @@ Functionc88f6: ; c88f6 (32:48f6) ld [hl], a ret -Functionc8919: ; c8919 (32:4919) - call Functionc80d7 ; ; ; call does not return - -Jumptable_c891c: ; c891c (32:491c) +BattleBGEffect_2f: ; c8919 (32:4919) + call BattleBGEffects_AnonJumptable +.anon_jumptable dw Functionc88f6 dw Functionc8869 dw Functionc8929 @@ -1614,10 +1621,9 @@ Functionc8926: ; c8926 (32:4926) Functionc8929: ; c8929 (32:4929) ret -Functionc892a: ; c892a (32:492a) - call Functionc80d7 ; ; ; call does not return - -Jumptable_c892d: ; c892d (32:492d) +BattleBGEffect_26: ; c892a (32:492a) + call BattleBGEffects_AnonJumptable +.anon_jumptable dw Functionc8933 dw Functionc894a dw Functionc8960 @@ -1654,10 +1660,9 @@ Functionc8960: ; c8960 (32:4960) call Functionc8f0a ret -Functionc8964: ; c8964 (32:4964) - call Functionc80d7 ; ; ; call does not return - -Jumptable_c8967: ; c8967 (32:4967) +BattleBGEffect_2c: ; c8964 (32:4964) + call BattleBGEffects_AnonJumptable +.anon_jumptable dw Functionc896d dw Functionc8985 dw Functionc89b1 @@ -1710,10 +1715,9 @@ Functionc89b1: ; c89b1 (32:49b1) call Functionc8f0a ret -Functionc89b5: ; c89b5 (32:49b5) - call Functionc80d7 ; ; ; call does not return - -Jumptable_c89b8: ; c89b8 (32:49b8) +BattleBGEffect_28: ; c89b5 (32:49b5) + call BattleBGEffects_AnonJumptable +.anon_jumptable dw Functionc89be dw Functionc89ca dw Functionc89da @@ -1749,14 +1753,14 @@ Functionc89da: ; c89da (32:49da) ld e, $4 call Functionc8f2e ret + .asm_c89ea call Functionc8f0a ret -Functionc89ee: ; c89ee (32:49ee) - call Functionc80d7 ; ; ; call does not return - -Jumptable_c89f1: ; c89f1 (32:49f1) +BattleBGEffect_22: ; c89ee (32:49ee) + call BattleBGEffects_AnonJumptable +.anon_jumptable dw Functionc89f7 dw Functionc8a14 dw Functionc8a36 @@ -1806,10 +1810,9 @@ Functionc8a36: ; c8a36 (32:4a36) call Functionc8f0a ret -Functionc8a3a: ; c8a3a (32:4a3a) - call Functionc80d7 ; ; ; call does not return - -Jumptable_c8a3d: ; c8a3d (32:4a3d) +BattleBGEffect_2a: ; c8a3a (32:4a3a) + call BattleBGEffects_AnonJumptable +.anon_jumptable dw Functionc8a49 dw Functionc8a6f dw Functionc8a70 @@ -1850,6 +1853,7 @@ Functionc8a70: ; c8a70 (32:4a70) jr nc, .asm_c8a79 call Functionc8a9a ret + .asm_c8a79 ld hl, $3 add hl, bc @@ -1869,6 +1873,7 @@ Functionc8a88: ; c8a88 (32:4a88) ld l, a ld [hl], e ret + .asm_c8a96 call Functionc80e5 ret @@ -1909,16 +1914,16 @@ Functionc8ab0: ; c8ab0 (32:4ab0) ld a, [hl] cp $ff ret + ; c8ac7 (32:4ac7) Unknown_c8ac7: db $00, $40, $90, $e4, $ff ; c8acc -Functionc8acc: ; c8acc (32:4acc) - call Functionc80d7 ; ; ; call does not return - -Jumptable_c8acf: ; c8acf (32:4acf) +BattleBGEffect_2b: ; c8acc (32:4acc) + call BattleBGEffects_AnonJumptable +.anon_jumptable dw Functionc8ad3 dw Functionc8ae5 @@ -1948,17 +1953,17 @@ Functionc8ae5: ; c8ae5 (32:4ae5) ld e, a call Functionc8f2e ret + .asm_c8afc call Functionc8f0a ret -Functionc8b00: ; c8b00 (32:4b00) +BattleBGEffect_1c: ; c8b00 (32:4b00) ld a, [hCGB] and a jr nz, asm_c8b7a - call Functionc80d7 ; ; ; call does not return - -Jumptable_c8b08: ; c8b08 (32:4b08) + call BattleBGEffects_AnonJumptable +.anon_jumptable dw Functionc8b0e dw Functionc8b22 dw Functionc8b60 @@ -2036,10 +2041,12 @@ Functionc8b6c: ; c8b6c (32:4b6c) dec c jr nz, .asm_c8b74 ret + asm_c8b7a: ; c8b7a (32:4b7a) ld de, Jumptable_c8b81 call Functionc80ca jp [hl] + ; c8b81 (32:4b81) Jumptable_c8b81: ; c8b81 @@ -2050,14 +2057,15 @@ Jumptable_c8b81: ; c8b81 Functionc8b87: ; c8b87 call Functionc80e5 - ld hl, $0003 + ld hl, $3 add hl, bc ld [hl], $0 ret + ; c8b91 Functionc8b91: ; c8b91 - ld hl, $0003 + ld hl, $3 add hl, bc ld a, [hl] inc [hl] @@ -2093,6 +2101,7 @@ Functionc8b91: ; c8b91 ld a, [hl] call Functionc8e7f ret + ; c8bca Functionc8bca: ; c8bca @@ -2102,6 +2111,7 @@ Functionc8bca: ; c8bca call Functionc8e7f call EndBattleBGEffect ret + ; c8bd8 Unknown_c8bd8: ; c8bd8 @@ -2118,100 +2128,108 @@ Unknown_c8be0: ; c8be0 db $90, $f8 ; c8be8 -Functionc8be8: ; c8be8 (32:4be8) +BattleBGEffect_RapidFlash: ; c8be8 (32:4be8) ld de, Unknown_c8bef call Functionc8d77 ret + ; c8bef (32:4bef) Unknown_c8bef: ; c8bef db $e4, $6c, $fe ; c8bf2 -Functionc8bf2: ; c8bf2 (32:4bf2) +BattleBGEffect_16: ; c8bf2 (32:4bf2) ld de, Unknown_c8bf9 call Functionc8d77 ret + ; c8bf9 (32:4bf9) Unknown_c8bf9: ; c8bf9 db $e4, $90, $40, $ff ; c8bfd -Functionc8bfd: ; c8bfd (32:4bfd) +BattleBGEffect_17: ; c8bfd (32:4bfd) ld de, Unknown_c8c04 call Functionc8d77 ret + ; c8c04 (32:4c04) Unknown_c8c04: ; c8c04 db $e4, $f8, $fc, $ff ; c8c08 -Functionc8c08: ; c8c08 (32:4c08) +BattleBGEffect_18: ; c8c08 (32:4c08) ld de, Unknown_c8c0f call Functionc8d77 ret + ; c8c0f (32:4c0f) Unknown_c8c0f: ; c8c0f db $e4, $90, $40, $90, $fe ; c8c14 -Functionc8c14: ; c8c14 (32:4c14) +BattleBGEffect_19: ; c8c14 (32:4c14) ld de, Unknown_c8c1b call Functionc8d77 ret + ; c8c1b (32:4c1b) Unknown_c8c1b: ; c8c1b db $e4, $f8, $fc, $f8, $fe ; c8c20 -Functionc8c20: ; c8c20 (32:4c20) +BattleBGEffect_1a: ; c8c20 (32:4c20) ld de, Unknown_c8c27 call Functionc8d77 ret + ; c8c27 (32:4c27) Unknown_c8c27: ; c8c27 db $e4, $f8, $fc, $f8, $e4, $90, $40, $90, $fe ; c8c30 -Functionc8c30: ; c8c30 (32:4c30) +BattleBGEffect_1b: ; c8c30 (32:4c30) ld de, Unknown_c8c37 call Functionc8d77 ret + ; c8c37 (32:4c37) Unknown_c8c37: db $e4, $fc, $e4, $00, $fe ; c8c3c -Functionc8c3c: ; c8c3c (32:4c3c) +BattleBGEffect_1d: ; c8c3c (32:4c3c) ld de, Unknown_c8c43 call Functionc8d77 ret + ; c8c43 (32:4c43) Unknown_c8c43: db $e4, $90, $40, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $40, $90, $e4, $ff ; c8c55 -Functionc8c55: ; c8c55 (32:4c55) +BattleBGEffect_1e: ; c8c55 (32:4c55) ld de, Unknown_c8c5c call Functionc8d77 ret + ; c8c5c (32:4c5c) Unknown_c8c5c: db $00, $40, $90, $e4, $ff ; c8c61 -Functionc8c61: ; c8c61 (32:4c61) - call Functionc80d7 ; ; ; call does not return - -Jumptable_c8c64: ; c8c64 (32:4c64) +BattleBGEffect_VibrateMon: ; c8c61 (32:4c61) + call BattleBGEffects_AnonJumptable +.anon_jumptable dw Functionc8c68 dw Functionc8c85 @@ -2249,14 +2267,14 @@ Functionc8c85: ; c8c85 (32:4c85) ld [hl], a call Functionc900b ret + .asm_c8c9e call Functionc8f0a ret -Functionc8ca2: ; c8ca2 (32:4ca2) - call Functionc80d7 ; ; ; call does not return - -Jumptable_c8ca5: ; c8ca5 (32:4ca5) +BattleBGEffect_WobbleMon: ; c8ca2 (32:4ca2) + call BattleBGEffects_AnonJumptable +.anon_jumptable dw Functionc8cab dw Functionc8cc3 dw Functionc8cdd @@ -2296,7 +2314,7 @@ Functionc8cdd: ; c8cdd (32:4cdd) call Functionc8f0a ret -Functionc8ce1: ; c8ce1 (32:4ce1) +BattleBGEffect_2e: ; c8ce1 (32:4ce1) call Functionc8d0b jr c, .asm_c8cea bit 7, a @@ -2313,7 +2331,7 @@ Functionc8ce1: ; c8ce1 (32:4ce1) ld [OTPartyMon3SpclAtk], a ret -Functionc8cf9: ; c8cf9 (32:4cf9) +BattleBGEffect_1f: ; c8cf9 (32:4cf9) call Functionc8d0b jr nc, .asm_c8cff xor a @@ -2321,7 +2339,7 @@ Functionc8cf9: ; c8cf9 (32:4cf9) ld [hSCX], a ret -Functionc8d02: ; c8d02 (32:4d02) +BattleBGEffect_20: ; c8d02 (32:4d02) call Functionc8d0b jr nc, .asm_c8d08 xor a @@ -2338,6 +2356,7 @@ Functionc8d0b: ; c8d0b (32:4d0b) call EndBattleBGEffect scf ret + .asm_c8d18 dec [hl] ld hl, $3 @@ -2351,6 +2370,7 @@ Functionc8d0b: ; c8d0b (32:4d0b) ld a, [hl] and a ret + .asm_c8d2a ld a, [hl] swap a @@ -2365,7 +2385,7 @@ Functionc8d0b: ; c8d0b (32:4d0b) and a ret -Functionc8d3a: ; c8d3a (32:4d3a) +BattleBGEffect_35: ; c8d3a (32:4d3a) ld hl, $3 add hl, bc ld a, [hl] @@ -2380,6 +2400,7 @@ Functionc8d3a: ; c8d3a (32:4d3a) add $2 ld [hl], a ret + .asm_c8d53 xor a ld [hSCX], a @@ -2451,6 +2472,7 @@ Functionc8daa: ; c8daa (32:4daa) jr z, .asm_c8db5 dec [hl] ret + .asm_c8db5 ld a, [hl] swap a @@ -2460,6 +2482,7 @@ Functionc8daa: ; c8daa (32:4daa) jr c, .asm_c8dc3 call Functionc900b ret + .asm_c8dc3 ld hl, $3 add hl, bc @@ -2472,6 +2495,7 @@ Functionc8dc9: ; c8dc9 (32:4dc9) ld [rBGP], a call EndBattleBGEffect ret + asm_c8dd4: ; c8dd4 (32:4dd4) push de ld de, Jumptable_c8ddd @@ -2511,6 +2535,7 @@ Functionc8e02: ; c8e02 (32:4e02) jr z, .asm_c8e0d dec [hl] ret + .asm_c8e0d ld a, [hl] swap a @@ -2520,6 +2545,7 @@ Functionc8e02: ; c8e02 (32:4e02) jr c, .asm_c8e1b call Functionc8e52 ret + .asm_c8e1b ld hl, $3 add hl, bc @@ -2540,6 +2566,7 @@ Functionc8e2a: ; c8e2a (32:4e2a) jr z, .asm_c8e35 dec [hl] ret + .asm_c8e35 ld a, [hl] swap a @@ -2549,6 +2576,7 @@ Functionc8e2a: ; c8e2a (32:4e2a) jr c, .asm_c8e43 call Functionc8e7f ret + .asm_c8e43 ld hl, $3 add hl, bc @@ -2637,6 +2665,7 @@ Functionc8eb2: ; c8eb2 (32:4eb2) .asm_c8ec6 and a ret + .asm_c8ec8 scf ret @@ -2917,6 +2946,7 @@ Functionc9042: ; c9042 (32:5042) ld a, [EnemySubStatus3] ; EnemySubStatus3 and 1 << SUBSTATUS_FLYING | 1 << SUBSTATUS_UNDERGROUND ret + .asm_c9053 ld a, [PlayerSubStatus3] ; PlayerSubStatus3 and 1 << SUBSTATUS_FLYING | 1 << SUBSTATUS_UNDERGROUND @@ -2938,4 +2968,5 @@ Functionc9066: ; c9066 (32:5066) callab Functionce76b ld a, e ret + ; c906f (32:506f) diff --git a/engine/sprite_anims.asm b/engine/sprite_anims.asm index 3f6187275..93e77192d 100755 --- a/engine/sprite_anims.asm +++ b/engine/sprite_anims.asm @@ -192,7 +192,7 @@ endr ld a, [hl] add $3 ld [hl], a - call .ApplySineWaveY + call .Sprites_Sine ld hl, SPRITEANIMSTRUCT_YOFFSET add hl, bc @@ -211,7 +211,7 @@ endr inc a ld [hl], a ld d, $2 - call .ApplySineWaveY + call .Sprites_Sine ld hl, SPRITEANIMSTRUCT_YOFFSET add hl, bc @@ -252,14 +252,14 @@ endr ld a, [hl] push af push de - call .ApplySineWaveY + call .Sprites_Sine ld hl, SPRITEANIMSTRUCT_YOFFSET add hl, bc ld [hl], a pop de pop af - call .ApplySineWaveX + call .Sprites_Cosine ld hl, SPRITEANIMSTRUCT_XOFFSET add hl, bc @@ -297,14 +297,14 @@ endr ld a, [hl] push af push de - call .ApplySineWaveY + call .Sprites_Sine ld hl, SPRITEANIMSTRUCT_YOFFSET add hl, bc ld [hl], a pop de pop af - call .ApplySineWaveX + call .Sprites_Cosine ld hl, SPRITEANIMSTRUCT_XOFFSET add hl, bc @@ -399,7 +399,7 @@ endr .asm_8d462 ld a, e ld d, $20 - call .ApplySineWaveY + call .Sprites_Sine ld hl, SPRITEANIMSTRUCT_YOFFSET add hl, bc @@ -470,7 +470,7 @@ endr jr c, .asm_8d4cd dec [hl] ld d, $28 - call .ApplySineWaveY + call .Sprites_Sine ld hl, SPRITEANIMSTRUCT_YOFFSET add hl, bc @@ -509,7 +509,7 @@ endr ld hl, SPRITEANIMSTRUCT_0C add hl, bc ld a, [hl] - call ApplySineWaveY + call Sprites_Sine ld hl, SPRITEANIMSTRUCT_YOFFSET add hl, bc @@ -590,7 +590,7 @@ endr push af push de - call .ApplySineWaveY + call .Sprites_Sine ld hl, SPRITEANIMSTRUCT_YOFFSET add hl, bc @@ -598,7 +598,7 @@ endr pop de pop af - call .ApplySineWaveX + call .Sprites_Cosine ld hl, SPRITEANIMSTRUCT_XOFFSET add hl, bc @@ -638,14 +638,14 @@ rept 3 endr push af push de - call .ApplySineWaveY + call .Sprites_Sine ld hl, SPRITEANIMSTRUCT_YOFFSET add hl, bc ld [hl], a pop de pop af - call .ApplySineWaveX + call .Sprites_Cosine ld hl, SPRITEANIMSTRUCT_XOFFSET add hl, bc @@ -685,7 +685,7 @@ endr add hl, bc ld a, [hl] inc [hl] - call .ApplySineWaveX + call .Sprites_Cosine ld hl, SPRITEANIMSTRUCT_XOFFSET add hl, bc @@ -711,7 +711,7 @@ endr add hl, bc ld a, [hl] inc [hl] - call .ApplySineWaveX + call .Sprites_Cosine ld hl, SPRITEANIMSTRUCT_XOFFSET add hl, bc @@ -747,7 +747,7 @@ endr add hl, bc ld a, [hl] inc [hl] - call .ApplySineWaveX + call .Sprites_Cosine ld hl, SPRITEANIMSTRUCT_XOFFSET add hl, bc @@ -780,7 +780,7 @@ endr xor $ff inc a ld d, $20 - call .ApplySineWaveY + call .Sprites_Sine ld hl, SPRITEANIMSTRUCT_YOFFSET add hl, bc @@ -800,7 +800,7 @@ endr xor $ff inc a ld d, $20 - call .ApplySineWaveY + call .Sprites_Sine ld hl, SPRITEANIMSTRUCT_YOFFSET add hl, bc @@ -821,14 +821,14 @@ endr ld a, [hl] push af push de - call .ApplySineWaveY + call .Sprites_Sine ld hl, SPRITEANIMSTRUCT_YOFFSET add hl, bc ld [hl], a pop de pop af - call .ApplySineWaveX + call .Sprites_Cosine ld hl, SPRITEANIMSTRUCT_XOFFSET add hl, bc @@ -885,11 +885,11 @@ endr ret ; 8d6de -.ApplySineWaveY: ; 8d6de (23:56de) - call ApplySineWaveY +.Sprites_Sine: ; 8d6de (23:56de) + call Sprites_Sine ret -.ApplySineWaveX: ; 8d6e2 (23:56e2) - call ApplySineWaveX +.Sprites_Cosine: ; 8d6e2 (23:56e2) + call Sprites_Cosine ret ; 8d6e6 (23:56e6) diff --git a/engine/sprites.asm b/engine/sprites.asm index c00d1e9fc..7953cb433 100755 --- a/engine/sprites.asm +++ b/engine/sprites.asm @@ -610,26 +610,26 @@ INCLUDE "data/sprite_engine.asm" ; Unknown_8d6e6 ; Unknown_8d94d -ApplySineWaveX: ; 8e72a +Sprites_Cosine: ; 8e72a add $10 -ApplySineWaveY: ; 8e72c +Sprites_Sine: ; 8e72c and $3f cp $20 - jr nc, .flip - call .ApplyOffset + jr nc, .negative + call .ApplySineWave ld a, h ret -.flip +.negative and $1f - call .ApplyOffset + call .ApplySineWave ld a, h xor $ff ; cpl inc a ret ; 8e741 -.ApplyOffset: ; 8e741 +.ApplySineWave: ; 8e741 ld e, a ld a, d ld d, 0 @@ -641,16 +641,16 @@ endr inc hl ld d, [hl] ld hl, 0 -.loop +.multiply srl a - jr nc, .skip_add + jr nc, .even add hl, de -.skip_add +.even sla e rl d and a - jr nz, .loop + jr nz, .multiply ret ; 8e75d @@ -701,7 +701,7 @@ endr push de push hl - call ApplySineWaveY + call Sprites_Sine pop hl pop de add 13 * 8 @@ -710,7 +710,7 @@ endr pop af push de push hl - call ApplySineWaveX + call Sprites_Cosine pop hl pop de add 10 * 8 + 4 diff --git a/event/celebi.asm b/event/celebi.asm index e6453835c..df31e0776 100755 --- a/event/celebi.asm +++ b/event/celebi.asm @@ -151,7 +151,7 @@ Function49aa2: ; 49aa2 (12:5aa2) add hl, bc ld a, [hl] inc [hl] - call Function49b3b + call CelebiEvent_Cosine ld hl, $6 add hl, bc ld [hl], a @@ -223,27 +223,27 @@ Function49b30: ; 49b30 (12:5b30) call Function3b3c ret -Function49b3b: ; 49b3b (12:5b3b) +CelebiEvent_Cosine: ; 49b3b (12:5b3b) add $10 and $3f cp $20 jr nc, .asm_49b48 - call Function49b52 + call .SineFunction ld a, h ret .asm_49b48 and $1f - call Function49b52 + call .SineFunction ld a, h xor $ff inc a ret -Function49b52: ; 49b52 (12:5b52) +.SineFunction: ; 49b52 (12:5b52) ld e, a ld a, d ld d, $0 - ld hl, Unknown_49b6e + ld hl, .sinewave rept 2 add hl, de endr @@ -251,19 +251,19 @@ endr inc hl ld d, [hl] ld hl, 0 -.asm_49b61 +.multiply srl a - jr nc, .asm_49b66 + jr nc, .even add hl, de -.asm_49b66 +.even sla e rl d and a - jr nz, .asm_49b61 + jr nz, .multiply ret ; 49b6e (12:5b6e) -Unknown_49b6e: ; 49b6e +.sinewave: ; 49b6e sine_wave $100 ; 49bae diff --git a/main.asm b/main.asm index 7d1b88ee3..b009ee400 100644 --- a/main.asm +++ b/main.asm @@ -2230,24 +2230,24 @@ _Sine:: ; 84d9 cp %100000 jr nc, .negative - call Function84ef + call .ApplySineWave ld a, h ret .negative and %011111 - call Function84ef + call .ApplySineWave ld a, h xor -1 inc a ret ; 84ef -Function84ef: ; 84ef +.ApplySineWave: ; 84ef ld e, a ld a, d ld d, 0 - ld hl, SineWave + ld hl, .sinewave rept 2 add hl, de endr @@ -2269,7 +2269,7 @@ endr ret ; 850b -SineWave: ; 850b +.sinewave: ; 850b ; A $20-word table representing a sine wave. ; 90 degrees is index $10 at a base amplitude of $100. sine_wave $100 diff --git a/wram.asm b/wram.asm index 48f8d3314..abb378165 100644 --- a/wram.asm +++ b/wram.asm @@ -3053,24 +3053,34 @@ w5_d192:: ds 1 w5_d193:: ds 1 w5_d194:: ds 1 w5_d195:: ds 1 - ds 106 LYOverridesBackup:: ; d200 ds SCREEN_HEIGHT_PX LYOverridesBackupEnd:: - ds $100 - SCREEN_HEIGHT_PX - -SECTION "Battle Animations", WRAMX, BANK [5] +SECTION "Battle Animations", WRAMX [$d300], BANK [5] w5_d300:: ds 10 -ActiveAnimObjects:: ; d30a - ds 4 * 40 +battle_anim_struct: MACRO +; Placeholder until we can figure out what it all means + ds $18 +endm - ds 80 +ActiveAnimObjects:: ; d30a +AnimObject01:: battle_anim_struct AnimObject01 +AnimObject02:: battle_anim_struct AnimObject02 +AnimObject03:: battle_anim_struct AnimObject03 +AnimObject04:: battle_anim_struct AnimObject04 +AnimObject05:: battle_anim_struct AnimObject05 +AnimObject06:: battle_anim_struct AnimObject06 +AnimObject07:: battle_anim_struct AnimObject07 +AnimObject08:: battle_anim_struct AnimObject08 +AnimObject09:: battle_anim_struct AnimObject09 +AnimObject10:: battle_anim_struct AnimObject10 +ActiveAnimObjectsEnd:: ; d3aa ActiveBGEffects:: ; d3fa ds 4 * 5