ref: 7b12060e6a6c276f3c044c04f131befa28749da5
parent: 406ac7afbbf93161db1ade9706fc802a3bf97e5f
author: Rangi <remy.oukaour+rangi42@gmail.com>
date: Mon Oct 19 16:27:19 EDT 2020
Battle transition spin quadrants are like pokered's half circles
--- a/engine/battle/battle_transition.asm
+++ b/engine/battle/battle_transition.asm
@@ -152,7 +152,7 @@
BattleTransitionJumptable:
jumptable .Jumptable, wJumptableIndex
-.Jumptable
+.Jumptable:
dw StartTrainerBattle_DetermineWhichAnimation ; 00
; BATTLETRANSITION_CAVE
@@ -294,7 +294,7 @@
scf
ret
-.pals
+.pals:
dc 3, 3, 2, 1
dc 3, 3, 3, 2
dc 3, 3, 3, 3
@@ -381,7 +381,7 @@
ld a, [wcf64]
ld e, a
ld d, 0
- ld hl, .spintable
+ ld hl, .spin_quadrants
rept 5
add hl, de
endr
@@ -421,32 +421,32 @@
RIGHT_QUADRANT_F EQU 0 ; bit set in UPPER_RIGHT and LOWER_RIGHT
LOWER_QUADRANT_F EQU 1 ; bit set in LOWER_LEFT and LOWER_RIGHT
-.spintable
-spintable_entry: MACRO
+.spin_quadrants:
+spin_quadrant: MACRO
db \1
- dw .wedge\2
+ dw \2
dwcoord \3, \4
ENDM
- spintable_entry UPPER_LEFT, 1, 1, 6
- spintable_entry UPPER_LEFT, 2, 0, 3
- spintable_entry UPPER_LEFT, 3, 1, 0
- spintable_entry UPPER_LEFT, 4, 5, 0
- spintable_entry UPPER_LEFT, 5, 9, 0
- spintable_entry UPPER_RIGHT, 5, 10, 0
- spintable_entry UPPER_RIGHT, 4, 14, 0
- spintable_entry UPPER_RIGHT, 3, 18, 0
- spintable_entry UPPER_RIGHT, 2, 19, 3
- spintable_entry UPPER_RIGHT, 1, 18, 6
- spintable_entry LOWER_RIGHT, 1, 18, 11
- spintable_entry LOWER_RIGHT, 2, 19, 14
- spintable_entry LOWER_RIGHT, 3, 18, 17
- spintable_entry LOWER_RIGHT, 4, 14, 17
- spintable_entry LOWER_RIGHT, 5, 10, 17
- spintable_entry LOWER_LEFT, 5, 9, 17
- spintable_entry LOWER_LEFT, 4, 5, 17
- spintable_entry LOWER_LEFT, 3, 1, 17
- spintable_entry LOWER_LEFT, 2, 0, 14
- spintable_entry LOWER_LEFT, 1, 1, 11
+ spin_quadrant UPPER_LEFT, .wedge1, 1, 6
+ spin_quadrant UPPER_LEFT, .wedge2, 0, 3
+ spin_quadrant UPPER_LEFT, .wedge3, 1, 0
+ spin_quadrant UPPER_LEFT, .wedge4, 5, 0
+ spin_quadrant UPPER_LEFT, .wedge5, 9, 0
+ spin_quadrant UPPER_RIGHT, .wedge5, 10, 0
+ spin_quadrant UPPER_RIGHT, .wedge4, 14, 0
+ spin_quadrant UPPER_RIGHT, .wedge3, 18, 0
+ spin_quadrant UPPER_RIGHT, .wedge2, 19, 3
+ spin_quadrant UPPER_RIGHT, .wedge1, 18, 6
+ spin_quadrant LOWER_RIGHT, .wedge1, 18, 11
+ spin_quadrant LOWER_RIGHT, .wedge2, 19, 14
+ spin_quadrant LOWER_RIGHT, .wedge3, 18, 17
+ spin_quadrant LOWER_RIGHT, .wedge4, 14, 17
+ spin_quadrant LOWER_RIGHT, .wedge5, 10, 17
+ spin_quadrant LOWER_LEFT, .wedge5, 9, 17
+ spin_quadrant LOWER_LEFT, .wedge4, 5, 17
+ spin_quadrant LOWER_LEFT, .wedge3, 1, 17
+ spin_quadrant LOWER_LEFT, .wedge2, 0, 14
+ spin_quadrant LOWER_LEFT, .wedge1, 1, 11
db -1
.load
@@ -502,11 +502,11 @@
jr nz, .loop2
jr .loop
-.wedge1 db 2, 3, 5, 4, 9, -1
-.wedge2 db 1, 1, 2, 2, 4, 2, 4, 2, 3, -1
-.wedge3 db 2, 1, 3, 1, 4, 1, 4, 1, 4, 1, 3, 1, 2, 1, 1, 1, 1, -1
-.wedge4 db 4, 1, 4, 0, 3, 1, 3, 0, 2, 1, 2, 0, 1, -1
-.wedge5 db 4, 0, 3, 0, 3, 0, 2, 0, 2, 0, 1, 0, 1, 0, 1, -1
+.wedge1: db 2, 3, 5, 4, 9, -1
+.wedge2: db 1, 1, 2, 2, 4, 2, 4, 2, 3, -1
+.wedge3: db 2, 1, 3, 1, 4, 1, 4, 1, 4, 1, 3, 1, 2, 1, 1, 1, 1, -1
+.wedge4: db 4, 1, 4, 0, 3, 1, 3, 0, 2, 1, 2, 0, 1, -1
+.wedge5: db 4, 0, 3, 0, 3, 0, 2, 0, 2, 0, 1, 0, 1, 0, 1, -1
StartTrainerBattle_SetUpForRandomScatterOutro:
farcall Function5602
@@ -702,13 +702,13 @@
pop hl
ret
-.pals
+.pals:
INCLUDE "gfx/overworld/trainer_battle.pal"
-.darkpals
+.darkpals:
INCLUDE "gfx/overworld/trainer_battle_dark.pal"
-.loadpokeballgfx
+.loadpokeballgfx:
ld a, [wOtherTrainerClass]
ld de, PokeBallTransition
ret