More battle data in data/battle/

This commit is contained in:
Rangi
2018-01-25 21:34:42 -05:00
parent d504fb8852
commit 87514598be
24 changed files with 213 additions and 184 deletions

View File

@@ -1749,6 +1749,7 @@ Functioncd9f4: ; cd9f4 (33:59f4)
Unknown_cda01: ; cda01
db 8, 6, 5, 4, 5, 6, 8, 12, 16
; cda0a
BattleAnimFunction_1C: ; cda0a (33:5a0a)
ld hl, BATTLEANIMSTRUCT_XCOORD
add hl, bc
@@ -2476,6 +2477,7 @@ Functioncde21: ; cde21 (33:5e21)
Unknown_cde25: ; cde25
db $ec, $f8, $00
; cde28
BattleAnimFunction_25: ; cde28 (33:5e28)
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
@@ -3279,6 +3281,7 @@ Unknown_ce2c4: ; ce2c4
Unknown_ce2c8: ; ce2c8
db $ff, $ff, $00, $00
; ce2cc
BattleAnimFunction_33: ; ce2cc (33:62cc)
ld hl, BATTLEANIMSTRUCT_0B
add hl, bc

View File

@@ -24,7 +24,7 @@ GetPokeBallWobble: ; f971 (3:7971)
ld c, 0 ; next
jr nz, .done
ld hl, .WobbleProbabilities
ld hl, WobbleProbabilities
ld a, [Buffer1]
ld b, a
.loop
@@ -59,30 +59,4 @@ GetPokeBallWobble: ; f971 (3:7971)
pop de
ret
.WobbleProbabilities: ; f9ba
; catch rate, chance of wobbling / 255
; nLeft/255 = (nRight/255) ** 4
db 1, 63
db 2, 75
db 3, 84
db 4, 90
db 5, 95
db 7, 103
db 10, 113
db 15, 126
db 20, 134
db 30, 149
db 40, 160
db 50, 169
db 60, 177
db 80, 191
db 100, 201
db 120, 211
db 140, 220
db 160, 227
db 180, 234
db 200, 240
db 220, 246
db 240, 251
db 254, 253
db 255, 255
INCLUDE "data/battle/wobble_probabilities.asm"