diff --git a/battle/core.asm b/battle/core.asm index 51a6ca1..c362557 100755 --- a/battle/core.asm +++ b/battle/core.asm @@ -21,7 +21,7 @@ Func_14430: ; 14430 (5:4430) ret Func_1443b: ; 1443b (5:443b) - ld a, [wd502] + ld a, [wPlayerDenjuu1CurHP] ld [wc955], a ld a, $a ld [wSubroutine], a @@ -129,17 +129,17 @@ Pointers_1448d: dw Func_14f32 dw Func_15810 -String_1450d: - db "たたかう " +BattleString_Fight: + db "たたかう " ; FIGHT -String_14515: - db "にげる " +BattleString_Run: + db "にげる " ; RUN -String_1451d: - db "にげだした! " +BattleString_Escaped: + db "にげだした! " ; Got away safely! -String_14525: - db "とうちゃく! " +BattleString_Arrived: + db "とうちゃく! " ; has arrived! Func_1452d: ; 1452d (5:452d) ld bc, $c @@ -236,9 +236,9 @@ Func_145d6: ; 145d6 (5:45d6) ret Func_145f5: ; 145f5 (5:45f5) - ld a, [wd542] + ld a, [wEnemyDenjuu1] call Func_142df - ld a, [wd500] + ld a, [wPlayerDenjuu1] call Func_142ec ld a, $60 ld [wSCX], a @@ -409,19 +409,19 @@ Func_14707: ; 14707 (5:4707) Func_14721: ; 14721 (5:4721) ld a, [wd474] - call Func_1412b - ld a, [wd584] + call GetNthPlayerDenjuu + ld a, [wCurDenjuuBuffer] ld [wd435], a - ld a, [wd58b] + ld a, [wCurDenjuuBufferField0x07] cp $5 jr nz, .asm_14791 - ld a, [wd584] + ld a, [wCurDenjuuBuffer] call Func_142cd - ld a, [wd584] - ld [wd497], a + ld a, [wCurDenjuuBuffer] + ld [wCurDenjuu], a ld a, $3 call Func_143f9 - ld a, [wd58f] + ld a, [wCurDenjuuBufferField0x0b] ld b, a ld a, [wd477] cp b @@ -434,7 +434,7 @@ Func_14721: ; 14721 (5:4721) jp .asm_1478b .asm_1475d - ld a, [wd58f] + ld a, [wCurDenjuuBufferField0x0b] ld b, a ld a, [wd478] cp b @@ -445,7 +445,7 @@ Func_14721: ; 14721 (5:4721) xor a call Func_04fa .asm_14770 - ld a, [wd58f] + ld a, [wCurDenjuuBufferField0x0b] ld b, a ld a, [wd477] cp b @@ -486,8 +486,8 @@ Func_14721: ; 14721 (5:4721) jp z, Func_14855 Func_147bb: ; 147bb (5:47bb) ld a, [wd474] - call Func_1412b - ld a, [wd596] + call GetNthPlayerDenjuu + ld a, [wCurDenjuuBufferField0x12] cp $0 jp z, Func_1486d cp $1 @@ -501,7 +501,7 @@ Func_147bb: ; 147bb (5:47bb) call Func_16614 cp $1 jr z, Func_147ef - ld a, [wd595] + ld a, [wCurDenjuuBufferSpDef] ld b, a ld a, $cd add b @@ -510,7 +510,7 @@ Func_147bb: ; 147bb (5:47bb) cp $80 jr nc, Func_14855 Func_147ef: ; 147ef (5:47ef) - ld a, [wd596] + ld a, [wCurDenjuuBufferField0x12] call Func_148a3 call Func_3d02 ld a, [wd474] @@ -519,20 +519,20 @@ Func_147ef: ; 147ef (5:47ef) cp $2 jr z, .asm_14815 xor a - ld [wd512], a - ld [wd506], a + ld [wPlayerDenjuu1Field0x12], a + ld [wPlayerDenjuu1Field0x06], a jr .asm_1481c .asm_1480c xor a - ld [wd528], a - ld [wd51c], a + ld [wPlayerDenjuu2Field0x12], a + ld [wPlayerDenjuu2Field0x06], a jr .asm_1481c .asm_14815 xor a - ld [wd53e], a - ld [wd532], a + ld [wPlayerDenjuu3Field0x12], a + ld [wPlayerDenjuu3Field0x06], a .asm_1481c ld hl, VTilesBG tile $18 ld a, $4 @@ -543,7 +543,7 @@ Func_147ef: ; 147ef (5:47ef) ld a, $ee ld [wdc34], a Func_14831: ; 14831 (5:4831) - ld a, [wd596] + ld a, [wCurDenjuuBufferField0x12] cp $5 jr z, .asm_1484f cp $7 @@ -571,7 +571,7 @@ Func_14855: ; 14855 (5:4855) ld [wdc34], a Func_14862: ; 14862 (5:4862) call Func_3f22 - ld a, [wd596] + ld a, [wCurDenjuuBufferField0x12] call Func_1489e jr asm_14890 @@ -622,8 +622,8 @@ Func_148ad: ; 148ad (5:48ad) cp $9 ret nz ld a, [wd474] - call Func_1412b - ld a, [wd596] + call GetNthPlayerDenjuu + ld a, [wCurDenjuuBufferField0x12] cp $4 jr z, .asm_148e3 cp $5 @@ -690,19 +690,19 @@ Func_14911: ; 14911 (5:4911) Func_1492f: ; 1492f (5:492f) ld a, [wd477] - call Func_14131 - ld a, [wd584] + call GetNthEnemyDenjuu + ld a, [wCurDenjuuBuffer] ld [wd435], a - ld a, [wd58b] + ld a, [wCurDenjuuBufferField0x07] cp $5 jr nz, .asm_1499f - ld a, [wd584] + ld a, [wCurDenjuuBuffer] call Func_142cd - ld a, [wd584] - ld [wd497], a + ld a, [wCurDenjuuBuffer] + ld [wCurDenjuu], a ld a, $3 call Func_143f9 - ld a, [wd58f] + ld a, [wCurDenjuuBufferField0x0b] ld b, a ld a, [wd474] cp b @@ -715,7 +715,7 @@ Func_1492f: ; 1492f (5:492f) jp .asm_14999 .asm_1496b - ld a, [wd58f] + ld a, [wCurDenjuuBufferField0x0b] ld b, a ld a, [wd475] cp b @@ -726,7 +726,7 @@ Func_1492f: ; 1492f (5:492f) xor a call Func_04ca .asm_1497e - ld a, [wd58f] + ld a, [wCurDenjuuBufferField0x0b] ld b, a ld a, [wd474] cp b @@ -747,7 +747,7 @@ Func_1492f: ; 1492f (5:492f) ret .asm_1499f - ld a, [wd584] + ld a, [wCurDenjuuBuffer] call Func_142cd ld a, [wcb3f] cp $0 @@ -768,8 +768,8 @@ Func_1492f: ; 1492f (5:492f) jp z, Func_14a67 Func_149cd: ; 149cd (5:49cd) ld a, [wd477] - call Func_14131 - ld a, [wd596] + call GetNthEnemyDenjuu + ld a, [wCurDenjuuBufferField0x12] cp $0 jp z, Func_14a7f cp $1 @@ -783,7 +783,7 @@ Func_149cd: ; 149cd (5:49cd) call Func_16614 cp $1 jr z, Func_14a01 - ld a, [wd595] + ld a, [wCurDenjuuBufferSpDef] ld b, a ld a, $cd add b @@ -792,7 +792,7 @@ Func_149cd: ; 149cd (5:49cd) cp $80 jr nc, Func_14a67 Func_14a01: ; 14a01 (5:4a01) - ld a, [wd596] + ld a, [wCurDenjuuBufferField0x12] call Func_148a3 call Func_3d02 ld a, [wd477] @@ -801,20 +801,20 @@ Func_14a01: ; 14a01 (5:4a01) cp $2 jr z, .asm_14a27 xor a - ld [wd554], a - ld [wd548], a + ld [wEnemyDenjuu1Field0x12], a + ld [wEnemyDenjuu1Field0x06], a jr .asm_14a2e .asm_14a1e xor a - ld [wd56a], a - ld [wd55e], a + ld [wEnemyDenjuu2Field0x12], a + ld [wEnemyDenjuu2Field0x06], a jr .asm_14a2e .asm_14a27 xor a - ld [wd580], a - ld [wd574], a + ld [wEnemyDenjuu3Field0x12], a + ld [wEnemyDenjuu3Field0x06], a .asm_14a2e ld hl, VTilesBG tile $1c ld a, $4 @@ -825,7 +825,7 @@ Func_14a01: ; 14a01 (5:4a01) ld a, $ee ld [wdc34], a Func_14a43: ; 14a43 (5:4a43) - ld a, [wd596] + ld a, [wCurDenjuuBufferField0x12] cp $5 jr z, .asm_14a61 cp $7 @@ -853,7 +853,7 @@ Func_14a67: ; 14a67 (5:4a67) ld [wdc34], a Func_14a74: ; 14a74 (5:4a74) call Func_3f22 - ld a, [wd596] + ld a, [wCurDenjuuBufferField0x12] call Func_1489e jr asm_14a9f @@ -894,8 +894,8 @@ Func_14aad: ; 14aad (5:4aad) ret nz .asm_14ac5 ld a, [wd477] - call Func_14131 - ld a, [wd596] + call GetNthEnemyDenjuu + ld a, [wCurDenjuuBufferField0x12] cp $5 jr z, .asm_14af2 cp $7 @@ -932,13 +932,13 @@ Func_14b07: ; 14b07 (5:4b07) ld a, [wcb3f] cp $1 jr z, .asm_14b35 - ld a, [wd590] + ld a, [wCurDenjuuBufferField0x0c] cp $4 jr z, .asm_14b19 cp $5 jr nz, .asm_14b35 .asm_14b19 - ld a, [wd58e] + ld a, [wCurDenjuuBufferField0x0a] add $9b ld b, a call Func_0d4e @@ -953,13 +953,13 @@ Func_14b07: ; 14b07 (5:4b07) ret .asm_14b35 - ld a, [wd590] + ld a, [wCurDenjuuBufferField0x0c] cp $8 jr z, .asm_14b40 cp $9 jr nz, .asm_14b8d .asm_14b40 - ld a, [wd58e] + ld a, [wCurDenjuuBufferField0x0a] sla a add $37 ld b, a @@ -986,8 +986,8 @@ Func_14b07: ; 14b07 (5:4b07) .asm_14b6c ld a, $0 ld [wd414], a - ld a, [wd584] - ld [wd497], a + ld a, [wCurDenjuuBuffer] + ld [wCurDenjuu], a ld a, [wd414] call Func_143f9 ld a, [wd477] @@ -1003,10 +1003,10 @@ Func_14b07: ; 14b07 (5:4b07) ld e, $80 xor a call Func_04ca - ld de, String_1450d + ld de, BattleString_Fight ld hl, VTilesBG tile $60 call Func_142aa - ld de, String_14515 + ld de, BattleString_Run ld hl, VTilesBG tile $68 call Func_142aa ld bc, $30e @@ -1091,25 +1091,25 @@ Func_14c34: ; 14c34 (5:4c34) xor a ld [wWY], a ld a, [wd474] - call Func_1412b - ld a, [wd584] - ld c, $6 + call GetNthPlayerDenjuu + ld a, [wCurDenjuuBuffer] + ld c, $6 ; move 1 ld hl, VTilesBG tile $40 call Func_14d0f - ld a, [wd584] - ld c, $7 + ld a, [wCurDenjuuBuffer] + ld c, $7 ; move 2 ld hl, VTilesBG tile $48 call Func_14d0f - ld a, [wd584] + ld a, [wCurDenjuuBuffer] ld b, $0 ld c, $e - call Func_058d - ld a, [wd45f] + call GetBaseStat_ + ld a, [wCurBaseStat] ld b, a - ld a, [wd585] + ld a, [wCurDenjuuBufferLevel] cp b jr c, .asm_14c84 - ld a, [wd584] + ld a, [wCurDenjuuBuffer] ld c, $8 ld hl, VTilesBG tile $50 call Func_14d0f @@ -1126,22 +1126,22 @@ Func_14c34: ; 14c34 (5:4c34) jr .asm_14cc7 .asm_14c93 - ld a, [wd584] + ld a, [wCurDenjuuBuffer] ld b, $0 ld c, $f - call Func_058d - ld a, [wd45f] + call GetBaseStat_ + ld a, [wCurBaseStat] ld b, a - ld a, [wd585] + ld a, [wCurDenjuuBufferLevel] cp b jr c, .asm_14cc7 - ld a, [wd584] + ld a, [wCurDenjuuBuffer] ld c, $9 - call Func_058d - ld a, [wd45f] + call GetBaseStat_ + ld a, [wCurBaseStat] or a jr z, .asm_14cc7 - ld a, [wd584] + ld a, [wCurDenjuuBuffer] ld c, $9 ld hl, VTilesBG tile $58 call Func_14d0f @@ -1189,11 +1189,11 @@ Func_14c34: ; 14c34 (5:4c34) Func_14d0f: ; 14d0f (5:4d0f) push hl ld b, $0 - call Func_058d - ld a, [wd45f] - ld de, AttackNames + call GetBaseStat_ + ld a, [wCurBaseStat] + ld de, MoveNames pop bc - jp Func_0565 + jp GetAndPrintName75LeftAlign_ Func_14d1f: ; 14d1f (5:4d1f) call Func_3cd0 @@ -1258,7 +1258,7 @@ Func_14d1f: ; 14d1f (5:4d1f) ld [wc430], a call Func_14062 ld a, [wd474] - call Func_1412b + call GetNthPlayerDenjuu ld a, $5 ld [wd400], a ret @@ -1305,21 +1305,21 @@ Func_14ddd: ; 14ddd (5:4ddd) call Func_04da call Func_142af ld a, [wd474] - call Func_1412b + call GetNthPlayerDenjuu call OpenSRAMBank2 - ld a, [wd591] + ld a, [wCurDenjuuBufferField0x0d] ld hl, $a006 call Func_3d0e push hl pop de call Func_065a - ld a, [wd596] + ld a, [wCurDenjuuBufferField0x12] cp $4 jr nz, .asm_14e23 xor a ld [wd414], a - ld a, [wd584] - ld [wd497], a + ld a, [wCurDenjuuBuffer] + ld [wCurDenjuu], a ld a, [wd414] call Func_143f9 jp Func_14ec6 @@ -1334,23 +1334,23 @@ Func_14ddd: ; 14ddd (5:4ddd) cp $2 jr z, .asm_14e43 ld a, $5 - ld [wd507], a + ld [wPlayerDenjuu1Field0x07], a jr .asm_14e48 .asm_14e3c ld a, $5 - ld [wd51d], a + ld [wPlayerDenjuu2Field0x07], a jr .asm_14e48 .asm_14e43 ld a, $5 - ld [wd533], a + ld [wPlayerDenjuu3Field0x07], a .asm_14e48 jp Func_14e9d .asm_14e4b - ld a, [wd584] - ld [wd497], a + ld a, [wCurDenjuuBuffer] + ld [wCurDenjuu], a ld a, [wd414] call Func_143f9 call Func_143df @@ -1482,8 +1482,8 @@ Func_14f32: ; 14f32 (5:4f32) cp $1 jr z, .asm_14f59 ld a, [wd474] - call Func_1412b - ld a, [wd596] + call GetNthPlayerDenjuu + ld a, [wCurDenjuuBufferField0x12] cp $a jr z, .asm_14f71 ld a, $2d @@ -1492,8 +1492,8 @@ Func_14f32: ; 14f32 (5:4f32) .asm_14f59 ld a, [wd477] - call Func_14131 - ld a, [wd596] + call GetNthEnemyDenjuu + ld a, [wCurDenjuuBufferField0x12] cp $a jr z, .asm_14f71 ld c, $72 @@ -1556,17 +1556,17 @@ Func_14f81: ; 14f81 (5:4f81) .asm_14fd4 ld a, [wd477] - ld [wd50b], a + ld [wPlayerDenjuu1Field0x0b], a jr .asm_14fea .asm_14fdc ld a, [wd477] - ld [wd521], a + ld [wPlayerDenjuu2Field0x0b], a jr .asm_14fea .asm_14fe4 ld a, [wd477] - ld [wd537], a + ld [wPlayerDenjuu3Field0x0b], a .asm_14fea xor a ld [wOAMAnimation01], a @@ -1605,17 +1605,17 @@ Func_14f81: ; 14f81 (5:4f81) cp $2 jr z, .asm_1503d ld a, $3 - ld [wd507], a + ld [wPlayerDenjuu1Field0x07], a jr .asm_15042 .asm_15036 ld a, $3 - ld [wd51d], a + ld [wPlayerDenjuu2Field0x07], a jr .asm_15042 .asm_1503d ld a, $3 - ld [wd533], a + ld [wPlayerDenjuu3Field0x07], a .asm_15042 ld bc, $c ld e, $80 @@ -1750,25 +1750,25 @@ Func_1510a: ; 1510a (5:510a) inc a ld [wdc45], a ld a, [wd477] - call Func_14131 - ld a, [wd584] - ld [wd497], a + call GetNthEnemyDenjuu + ld a, [wCurDenjuuBuffer] + ld [wCurDenjuu], a ld a, [wd414] call Func_143f9 jp Func_1528c .asm_15149 ld a, [wd477] - call Func_14131 - ld a, [wd596] + call GetNthEnemyDenjuu + ld a, [wCurDenjuuBufferField0x12] cp $4 jr nz, .asm_15173 ld a, $0 ld [wd414], a ld a, [wd474] ld [wd415], a - ld a, [wd584] - ld [wd497], a + ld a, [wCurDenjuuBuffer] + ld [wCurDenjuu], a ld a, [wd414] call Func_143f9 ld a, $c @@ -1777,9 +1777,9 @@ Func_1510a: ; 1510a (5:510a) .asm_15173 ld a, [wd477] - call Func_14131 - ld a, [wd584] - ld [wd497], a + call GetNthEnemyDenjuu + ld a, [wCurDenjuuBuffer] + ld [wCurDenjuu], a call Func_0d4e cp $78 jr c, .asm_15190 @@ -1798,32 +1798,32 @@ Func_1510a: ; 1510a (5:510a) jr .asm_151d6 .asm_15197 - ld a, [wd584] + ld a, [wCurDenjuuBuffer] ld b, $0 ld c, $e - call Func_058d - ld a, [wd45f] + call GetBaseStat_ + ld a, [wCurBaseStat] ld b, a - ld a, [wd585] + ld a, [wCurDenjuuBufferLevel] cp b jr c, .asm_151d5 ld a, $2 jr .asm_151d6 .asm_151af - ld a, [wd584] + ld a, [wCurDenjuuBuffer] ld b, $0 ld c, $f - call Func_058d - ld a, [wd45f] + call GetBaseStat_ + ld a, [wCurBaseStat] ld b, a - ld a, [wd585] + ld a, [wCurDenjuuBufferLevel] cp b jr c, .asm_151d5 - ld a, [wd584] + ld a, [wCurDenjuuBuffer] ld c, $9 - call Func_058d - ld a, [wd45f] + call GetBaseStat_ + ld a, [wCurBaseStat] or a jr z, .asm_151d5 ld a, $3 @@ -1834,8 +1834,8 @@ Func_1510a: ; 1510a (5:510a) .asm_151d6 ld [wd414], a ld a, [wd474] - call Func_1412b - ld a, [wd596] + call GetNthPlayerDenjuu + ld a, [wCurDenjuuBufferField0x12] or a jr z, .asm_151e9 xor a @@ -1922,10 +1922,10 @@ Func_1510a: ; 1510a (5:510a) jr nz, Func_1528c .asm_15273 ld a, [wd477] - call Func_14131 - ld a, [wd586] + call GetNthEnemyDenjuu + ld a, [wCurDenjuuBufferCurHP] ld b, a - ld a, [wd587] + ld a, [wCurDenjuuBufferMaxHP] srl a cp b jr nc, Func_1528c @@ -2046,23 +2046,23 @@ Func_15345: ; 15345 (5:5345) cp $2 jr z, .asm_15371 ld a, $5 - ld [wd549], a + ld [wEnemyDenjuu1Field0x07], a ld a, [wd417] - ld [wd54d], a + ld [wEnemyDenjuu1Field0x0b], a jr .asm_1537c .asm_15364 ld a, $5 - ld [wd55f], a + ld [wEnemyDenjuu2Field0x07], a ld a, [wd417] - ld [wd563], a + ld [wEnemyDenjuu2Field0x0b], a jr .asm_1537c .asm_15371 ld a, $5 - ld [wd575], a + ld [wEnemyDenjuu3Field0x07], a ld a, [wd417] - ld [wd579], a + ld [wEnemyDenjuu3Field0x0b], a .asm_1537c ld a, $1 ld [wd4ea], a @@ -2074,15 +2074,15 @@ Func_15345: ; 15345 (5:5345) jr z, .asm_15393 cp $2 jr z, .asm_15398 - ld a, [wd542] + ld a, [wEnemyDenjuu1] jr .asm_1539d .asm_15393 - ld a, [wd558] + ld a, [wEnemyDenjuu2] jr .asm_1539d .asm_15398 - ld a, [wd56e] + ld a, [wEnemyDenjuu3] jr .asm_1539d .asm_1539d diff --git a/constants.asm b/constants.asm index dda2e34..ea8f7c9 100755 --- a/constants.asm +++ b/constants.asm @@ -1 +1,4 @@ INCLUDE "constants/misc_constants.asm" +INCLUDE "constants/move_constants.asm" +INCLUDE "constants/denjuu_constants.asm" +INCLUDE "constants/type_constants.asm" diff --git a/constants/denjuu_constants.asm b/constants/denjuu_constants.asm new file mode 100755 index 0000000..3d6c6bc --- /dev/null +++ b/constants/denjuu_constants.asm @@ -0,0 +1,176 @@ + const_def + + const TSUNONASU + const KOCHIA + const OSHE + const KESHI + const CRYPTO + const MONSTERA + const FUNGUS + const HIOUGI + const PUNICA + const GUMI + const SUGURI + const GANRAIKOU + const BYAKUBU + const TELOPEA + const MANTEA + const IXORA + const MYRTUS + const LYCHNIS + const LAPEIROUSIA + const BUBARIA + const ANGIOS + const GYMNOS + const LIRIOPE + const WARATAH + const SORGHUM + const ERYNGO + const NORIUTSUGI + const PAMPAS + const RHODANTHE + const LICORICE + const VIBURNUM + const FUNNEL + const VANDA + const UIKYOU + const OBANA + const FIREKOKKO + const RAYGOTEN + const DRILARMOR + const CHAMELAN + const CRYPTOARM + const SHELLSTERA + const FUNGEIST + const BALLTAMUS + const BURENICA + const GERON + const BERZELIA + const NIGELLA + const MUSA + const NETARO + const NEJIRO + const GODETIA + const CURCUMA + const TESSEN + const HELIOPSIS + const HAGUMANOKI + const GILERTH + const RAYGIRTH + const ARMARU + const CHAMERAID + const CRYPTORIDE + const WORMITERALA + const FUNGBLADE + const BULLTAMUS + const PUNEEDLE + const KERORIN + const SUGULAI + const CORTOS + const GAIURUS + const MIDOTOR + const OCTOR + const HITODEIGHT + const GHOSBOAR + const RASENMAI + const SCORPIL + const ARMCRAB + const ANGIORN + const GYMRACE + const LIRIONPU + const WHITAH + const POTZAL + const ARANEIDA + const GADHORO + const CLIOGERA + const GUST + const REIGE + const TOGERUKA + const RAIGALEON + const GADORKUMA + const ABIRAS + const ALPHAGOS + const KIYORUKA + const GYMGARTH + const BAIONPU + const WARUTAH + const GUNTZATL + const ARAKUIDA + const BADHORO + const LAMPGERA + const TEMPEST + const ZUDOON + const HIYU + const GAMAZUMI + const PAPAVER + const GAMURU + const BOUVARDI + const GAULTHERIA + const DIPSACUS + const KAYA + const DENFARE + const ANGIEON + const EASYDOG + const TRICERARMOR + const CRYPTOSNIPE + const FUNGBOOST + const VEENICA + const SAIGULIGER + const ARMEDURUS + const OCTORIFLE + const ERASERBOAR + const SPEARNEEDLE + const GILGIERTH + const UNIARMOR + const CRYPTOBURN + const FUNGMACHINE + const PUNISTO + const SUGULINE + const MACHURUS + const OCTAGUN + const MUMMYBOAR + const KINGPIN + const BEEBALM + const SALAL + const ENISHIDA + const TULBAGHIA + const KIRINGIKU + const ANGILANCE + const GYMGANON + const SAIOPE + const WATTAH + const QUETZAKING + const ARAKUDABARAN + const PUNKHORO + const VIKINGURIN + const STORM + const MUTOOM + const GYPSOPHI + const RUSCUS + const MAORAN + const ZEA + const GONUM + const ANGIPOWER + const GYMZYRUS + const CANONOPE + const CALM + const RYUUGUU + const GIGAGIGERTH + const BARRIARM + const CRYPTOKNIGHT + const FUNGWAR + const BASHOU + const ANGIGORGO + const GYMBARON + const LIRIMONARCH + const ENTEIOH + const GOLAKING + const KANZOU + const ORNITHOGALUM + const GENTIANA + const YARROW + const ANGIOROS + const GYMZATAN + const DOOMSDAY + const DENDEL + const TELETEL diff --git a/constants/move_constants.asm b/constants/move_constants.asm new file mode 100755 index 0000000..cdbc768 --- /dev/null +++ b/constants/move_constants.asm @@ -0,0 +1,140 @@ + const_def + + const DUMMY_0 + const CLAW + const RUSH + const STRIKE + const CAT_PUNCH + const BISON_HAMMER + const KICK + const TAIL + const HORN + const BEAK + const POISON_STING + const NUMBING_STING + const SCISSOR + const SABRE + const BITE + const BODY_PRESS + const HORN_DRILL + const BLOODSUCK + const SHURIKEN + const BOWGUN + const BISON_BEAM + const STAG_BEAM + const PULSE_BEAM + const PLASMA_LASER + const MEGA_LAUNCHER + const MEGA_CANNON + const MEGA_RIFLE + const DRILL_MISSILE + const HYPER_MISSILE + const DRAGON_MISSILE + const PENGUIN_MISSILE + const MISSILE_POD + const WAR_CANNON + const HARPOON_MISSILE + const HORN_LAUNCHER + const BIRD_BAZOOKA + const NOSE_MAGNUM + const EAR_VULCAN + const TUSK_VULCAN + const MACHINE_GUN + const FLAMETHROWER + const MINI_FLAME + const MEGA_FLAME + const KAMAITACHI + const HURRICANE + const MINI_SNOW + const BLIZZARD + const EGG_BOMB + const WHIRLPOOL + const TSUNAMI + const MINI_BOLT + const MEGA_BOLT + const EARTHQUAKE + const MEGA_QUAKE + const ROCK + const MEGA_ROCK + const SPEED_UP + const FOCUS + const AVOID + const INVIGORATE + const CHARGE_UP + const HEAL + const RECOVER + const RESTORE + const SHIELD + const PROTECT + const IRON_WALL + const CAMOUFLAGE + const ULTRASONIC + const EM_WAVE + const CURSE_SONG + const LULLABY + const GLARE + const SLEEP_GAS + const SMOKESCREEN + const POISON_GAS + const JUMP + const FLIGHT + const SCREAM + const WINGBEAT + const EM_BARRIER + const FORCE_FIELD + const CHILL + const HEAT_WAVE + const WATER_SHOT + const ACID + const LICK + const TENTACLE + const ICE_BALL + const PARAMETER_DOWN + const STATUS_RESET + const IRON_CLAW + const ASSAULT + const MISSILE_PUNCH + const RAZOR_PUNCH + const HOOF + const HIGH_KICK + const MIDDLE_KICK + const STAB + const TRIPLE_ATTACK + const TOXIC_STING + const ELECTRIC_STING + const CROSS_ATTACK + const VACUUM_SLASH + const FANG_CRUSH + const PUNT + const SCREW_HORN + const DRAIN + const DENMA_SHURIKEN + const NEEDLE + const QUICK_STEP + const AIM + const EVADE + const BRACE + const DUMMY_1 + const FIRST_AID + const REPAIR + const DUMMY_2 + const SHUTTER + const DEFEND + const DUMMY_3 + const CONCEAL + const EM_PULSE + const SHOCKWAVE + const DUMMY_4 + const DUMMY_5 + const STARE + const DUMMY_6 + const DUMMY_7 + const DUMMY_8 + const DUMMY_9 + const DUMMY_10 + const SNARL + const DUST_CLOUD + const ELECTRO_SCREEN + const DENMA_SEAL + const FROST_BREATH + const PETAL_STORM diff --git a/constants/type_constants.asm b/constants/type_constants.asm new file mode 100755 index 0000000..4b53928 --- /dev/null +++ b/constants/type_constants.asm @@ -0,0 +1,8 @@ + const_def + + const MOUNTAIN + const GRASSLAND + const FOREST + const AQUATIC + const SKY + const DESERT diff --git a/data/base_stats.asm b/data/base_stats.asm new file mode 100755 index 0000000..205a0e7 --- /dev/null +++ b/data/base_stats.asm @@ -0,0 +1,2436 @@ +; TSUNONASU + db 30 ; hp + db 8 ; speed + db 8 ; attack + db 12 ; defense + db 5 ; sp.atk + db 5 ; sp.def + db RUSH, PROTECT, FOCUS, 0 + db 150 + db 14, RAYGIRTH ; evolution + db MOUNTAIN ; type + db 8 ; level at which move 3 is learned + db 100 ; level at which move 4 is learned + +; KOCHIA + db 30 ; hp + db 16 ; speed + db 10 ; attack + db 5 ; defense + db 6 ; sp.atk + db 5 ; sp.def + db RUSH, EVADE, STAB, 0 + db 150 + db 30, ARMARU ; evolution + db SKY ; type + db 16 ; level at which move 3 is learned + db 100 ; level at which move 4 is learned + +; OSHE + db 32 ; hp + db 8 ; speed + db 8 ; attack + db 11 ; defense + db 4 ; sp.atk + db 4 ; sp.def + db RUSH, PROTECT, GLARE, 0 + db 150 + db 15, CHAMERAID ; evolution + db MOUNTAIN ; type + db 9 ; level at which move 3 is learned + db 100 ; level at which move 4 is learned + +; KESHI + db 30 ; hp + db 14 ; speed + db 8 ; attack + db 8 ; defense + db 6 ; sp.atk + db 5 ; sp.def + db BITE, SMOKESCREEN, CAMOUFLAGE, 0 + db 150 + db 24, CRYPTORIDE ; evolution + db GRASSLAND ; type + db 13 ; level at which move 3 is learned + db 100 ; level at which move 4 is learned + +; CRYPTO + db 38 ; hp + db 10 ; speed + db 16 ; attack + db 10 ; defense + db 6 ; sp.atk + db 6 ; sp.def + db RUSH, INVIGORATE, CLAW, 0 + db 150 + db 20, WORMITERALA ; evolution + db FOREST ; type + db 11 ; level at which move 3 is learned + db 100 ; level at which move 4 is learned + +; MONSTERA + db 36 ; hp + db 12 ; speed + db 10 ; attack + db 7 ; defense + db 3 ; sp.atk + db 4 ; sp.def + db NEEDLE, DEFEND, POISON_GAS, 0 + db 150 + db 25, FUNGBLADE ; evolution + db GRASSLAND ; type + db 10 ; level at which move 3 is learned + db 100 ; level at which move 4 is learned + +; FUNGUS + db 37 ; hp + db 14 ; speed + db 12 ; attack + db 8 ; defense + db 4 ; sp.atk + db 5 ; sp.def + db STRIKE, SPEED_UP, HORN, 0 + db 150 + db 20, BULLTAMUS ; evolution + db GRASSLAND ; type + db 11 ; level at which move 3 is learned + db 100 ; level at which move 4 is learned + +; HIOUGI + db 38 ; hp + db 8 ; speed + db 12 ; attack + db 8 ; defense + db 3 ; sp.atk + db 4 ; sp.def + db BITE, SCREAM, HEAL, 0 + db 150 + db 23, PUNEEDLE ; evolution + db AQUATIC ; type + db 12 ; level at which move 3 is learned + db 100 ; level at which move 4 is learned + +; PUNICA + db 33 ; hp + db 16 ; speed + db 8 ; attack + db 5 ; defense + db 7 ; sp.atk + db 5 ; sp.def + db RUSH, HEAL, STARE, 0 + db 150 + db 15, KERORIN ; evolution + db GRASSLAND ; type + db 10 ; level at which move 3 is learned + db 100 ; level at which move 4 is learned + +; GUMI + db 33 ; hp + db 12 ; speed + db 10 ; attack + db 6 ; defense + db 6 ; sp.atk + db 5 ; sp.def + db BODY_PRESS, STARE, LULLABY, 0 + db 150 + db 31, SUGULAI ; evolution + db AQUATIC ; type + db 16 ; level at which move 3 is learned + db 100 ; level at which move 4 is learned + +; SUGURI + db 32 ; hp + db 17 ; speed + db 14 ; attack + db 6 ; defense + db 6 ; sp.atk + db 6 ; sp.def + db BITE, AVOID, CLAW, 0 + db 150 + db 24, CORTOS ; evolution + db GRASSLAND ; type + db 13 ; level at which move 3 is learned + db 100 ; level at which move 4 is learned + +; GANRAIKOU + db 33 ; hp + db 18 ; speed + db 12 ; attack + db 7 ; defense + db 5 ; sp.atk + db 5 ; sp.def + db BEAK, QUICK_STEP, PETAL_STORM, 0 + db 150 + db 35, GAIURUS ; evolution + db SKY ; type + db 18 ; level at which move 3 is learned + db 100 ; level at which move 4 is learned + +; BYAKUBU + db 35 ; hp + db 14 ; speed + db 10 ; attack + db 8 ; defense + db 3 ; sp.atk + db 4 ; sp.def + db BITE, SPEED_UP, CLAW, 0 + db 150 + db 26, MIDOTOR ; evolution + db GRASSLAND ; type + db 14 ; level at which move 3 is learned + db 100 ; level at which move 4 is learned + +; TELOPEA + db 40 ; hp + db 8 ; speed + db 8 ; attack + db 7 ; defense + db 5 ; sp.atk + db 6 ; sp.def + db HORN, PROTECT, FIRST_AID, 0 + db 150 + db 32, OCTOR ; evolution + db AQUATIC ; type + db 17 ; level at which move 3 is learned + db 100 ; level at which move 4 is learned + +; MANTEA + db 38 ; hp + db 10 ; speed + db 10 ; attack + db 6 ; defense + db 5 ; sp.atk + db 6 ; sp.def + db RUSH, CONCEAL, SCREAM, 0 + db 150 + db 17, HITODEIGHT ; evolution + db AQUATIC ; type + db 9 ; level at which move 3 is learned + db 100 ; level at which move 4 is learned + +; IXORA + db 33 ; hp + db 10 ; speed + db 12 ; attack + db 5 ; defense + db 6 ; sp.atk + db 6 ; sp.def + db RUSH, PROTECT, RECOVER, 0 + db 150 + db 28, GHOSBOAR ; evolution + db AQUATIC ; type + db 15 ; level at which move 3 is learned + db 100 ; level at which move 4 is learned + +; MYRTUS + db 32 ; hp + db 16 ; speed + db 12 ; attack + db 5 ; defense + db 3 ; sp.atk + db 3 ; sp.def + db RUSH, DEFEND, SPEED_UP, 0 + db 150 + db 15, RASENMAI ; evolution + db GRASSLAND ; type + db 8 ; level at which move 3 is learned + db 100 ; level at which move 4 is learned + +; LYCHNIS + db 35 ; hp + db 12 ; speed + db 10 ; attack + db 12 ; defense + db 3 ; sp.atk + db 3 ; sp.def + db WATER_SHOT, SHUTTER, FIRST_AID, 0 + db 150 + db 28, SCORPIL ; evolution + db AQUATIC ; type + db 15 ; level at which move 3 is learned + db 100 ; level at which move 4 is learned + +; LAPEIROUSIA + db 34 ; hp + db 8 ; speed + db 12 ; attack + db 11 ; defense + db 3 ; sp.atk + db 4 ; sp.def + db SCISSOR, PROTECT, POISON_STING, 0 + db 150 + db 30, ARMCRAB ; evolution + db DESERT ; type + db 16 ; level at which move 3 is learned + db 100 ; level at which move 4 is learned + +; BUBARIA + db 35 ; hp + db 8 ; speed + db 14 ; attack + db 11 ; defense + db 3 ; sp.atk + db 4 ; sp.def + db SCISSOR, PROTECT, INVIGORATE, 0 + db 150 + db 20, ANGIORN ; evolution + db AQUATIC ; type + db 11 ; level at which move 3 is learned + db 100 ; level at which move 4 is learned + +; ANGIOS + db 38 ; hp + db 18 ; speed + db 15 ; attack + db 8 ; defense + db 6 ; sp.atk + db 6 ; sp.def + db RUSH, WINGBEAT, CLAW, 0 + db 150 + db 0, 0 ; no evolution + db SKY ; type + db 8 ; level at which move 3 is learned + db 100 ; level at which move 4 is learned + +; GYMNOS + db 39 ; hp + db 10 ; speed + db 17 ; attack + db 8 ; defense + db 4 ; sp.atk + db 5 ; sp.def + db STRIKE, PROTECT, HORN, 0 + db 150 + db 0, 0 ; no evolution + db MOUNTAIN ; type + db 9 ; level at which move 3 is learned + db 100 ; level at which move 4 is learned + +; LIRIOPE + db 30 ; hp + db 17 ; speed + db 8 ; attack + db 7 ; defense + db 6 ; sp.atk + db 5 ; sp.def + db BITE, CHILL, RECOVER, 0 + db 150 + db 0, 0 ; no evolution + db AQUATIC ; type + db 10 ; level at which move 3 is learned + db 100 ; level at which move 4 is learned + +; WARATAH + db 30 ; hp + db 16 ; speed + db 8 ; attack + db 6 ; defense + db 7 ; sp.atk + db 7 ; sp.def + db BITE, LULLABY, CLAW, 0 + db 150 + db 0, 0 ; no evolution + db FOREST ; type + db 15 ; level at which move 3 is learned + db 100 ; level at which move 4 is learned + +; SORGHUM + db 33 ; hp + db 12 ; speed + db 16 ; attack + db 6 ; defense + db 6 ; sp.atk + db 5 ; sp.def + db BITE, POISON_GAS, CLAW, 0 + db 150 + db 0, 0 ; no evolution + db DESERT ; type + db 11 ; level at which move 3 is learned + db 100 ; level at which move 4 is learned + +; ERYNGO + db 35 ; hp + db 12 ; speed + db 12 ; attack + db 5 ; defense + db 4 ; sp.atk + db 4 ; sp.def + db SCISSOR, CHILL, POISON_STING, 0 + db 150 + db 0, 0 ; no evolution + db FOREST ; type + db 16 ; level at which move 3 is learned + db 100 ; level at which move 4 is learned + +; NORIUTSUGI + db 33 ; hp + db 15 ; speed + db 12 ; attack + db 5 ; defense + db 5 ; sp.atk + db 5 ; sp.def + db BEAK, INVIGORATE, ULTRASONIC, 0 + db 150 + db 0, 0 ; no evolution + db SKY ; type + db 11 ; level at which move 3 is learned + db 100 ; level at which move 4 is learned + +; PAMPAS + db 30 ; hp + db 16 ; speed + db 6 ; attack + db 4 ; defense + db 6 ; sp.atk + db 5 ; sp.def + db HORN, AVOID, RECOVER, 0 + db 150 + db 0, 0 ; no evolution + db AQUATIC ; type + db 16 ; level at which move 3 is learned + db 100 ; level at which move 4 is learned + +; RHODANTHE + db 30 ; hp + db 16 ; speed + db 15 ; attack + db 5 ; defense + db 4 ; sp.atk + db 5 ; sp.def + db VACUUM_SLASH, FLIGHT, DUST_CLOUD, 0 + db 150 + db 0, 0 ; no evolution + db SKY ; type + db 12 ; level at which move 3 is learned + db 100 ; level at which move 4 is learned + +; LICORICE + db 34 ; hp + db 12 ; speed + db 10 ; attack + db 5 ; defense + db 3 ; sp.atk + db 4 ; sp.def + db KICK, QUICK_STEP, EVADE, 0 + db 150 + db 0, 0 ; no evolution + db GRASSLAND ; type + db 8 ; level at which move 3 is learned + db 100 ; level at which move 4 is learned + +; VIBURNUM + db 30 ; hp + db 12 ; speed + db 10 ; attack + db 4 ; defense + db 3 ; sp.atk + db 4 ; sp.def + db TAIL, QUICK_STEP, HEAL, 0 + db 150 + db 0, 0 ; no evolution + db GRASSLAND ; type + db 9 ; level at which move 3 is learned + db 100 ; level at which move 4 is learned + +; FUNNEL + db 34 ; hp + db 12 ; speed + db 18 ; attack + db 7 ; defense + db 3 ; sp.atk + db 3 ; sp.def + db BITE, INVIGORATE, HORN, 0 + db 150 + db 0, 0 ; no evolution + db GRASSLAND ; type + db 15 ; level at which move 3 is learned + db 100 ; level at which move 4 is learned + +; VANDA + db 38 ; hp + db 6 ; speed + db 16 ; attack + db 8 ; defense + db 3 ; sp.atk + db 3 ; sp.def + db STRIKE, SCREAM, CLAW, 0 + db 150 + db 0, 0 ; no evolution + db FOREST ; type + db 18 ; level at which move 3 is learned + db 100 ; level at which move 4 is learned + +; UIKYOU + db 30 ; hp + db 14 ; speed + db 12 ; attack + db 6 ; defense + db 3 ; sp.atk + db 4 ; sp.def + db WATER_SHOT, AVOID, POISON_GAS, 0 + db 150 + db 0, 0 ; no evolution + db AQUATIC ; type + db 12 ; level at which move 3 is learned + db 100 ; level at which move 4 is learned + +; OBANA + db 38 ; hp + db 10 ; speed + db 16 ; attack + db 7 ; defense + db 5 ; sp.atk + db 5 ; sp.def + db RUSH, HEAT_WAVE, CLAW, 0 + db 150 + db 0, 0 ; no evolution + db DESERT ; type + db 20 ; level at which move 3 is learned + db 100 ; level at which move 4 is learned + +; FIREKOKKO + db 35 ; hp + db 18 ; speed + db 15 ; attack + db 10 ; defense + db 10 ; sp.atk + db 5 ; sp.def + db IRON_CLAW, FLIGHT, GLARE, FLAMETHROWER + db 150 + db 0, 0 ; no evolution + db SKY ; type + db 0 ; level at which move 3 is learned + db 0 ; level at which move 4 is learned + +; RAYGOTEN + db 32 ; hp + db 17 ; speed + db 13 ; attack + db 8 ; defense + db 10 ; sp.atk + db 7 ; sp.def + db ASSAULT, ULTRASONIC, HORN_DRILL, DRILL_MISSILE + db 200 + db 0, 0 ; no evolution + db SKY ; type + db 0 ; level at which move 3 is learned + db 0 ; level at which move 4 is learned + +; DRILARMOR + db 32 ; hp + db 10 ; speed + db 13 ; attack + db 12 ; defense + db 10 ; sp.atk + db 9 ; sp.def + db HORN_DRILL, PROTECT, EM_BARRIER, DRILL_MISSILE + db 150 + db 0, 0 ; no evolution + db MOUNTAIN ; type + db 0 ; level at which move 3 is learned + db 0 ; level at which move 4 is learned + +; CHAMELAN + db 32 ; hp + db 14 ; speed + db 10 ; attack + db 10 ; defense + db 9 ; sp.atk + db 9 ; sp.def + db FANG_CRUSH, SLEEP_GAS, CAMOUFLAGE, WAR_CANNON + db 200 + db 0, 0 ; no evolution + db GRASSLAND ; type + db 0 ; level at which move 3 is learned + db 0 ; level at which move 4 is learned + +; CRYPTOARM + db 40 ; hp + db 14 ; speed + db 16 ; attack + db 12 ; defense + db 12 ; sp.atk + db 8 ; sp.def + db HORN, FOCUS, CLAW, HORN_LAUNCHER + db 150 + db 0, 0 ; no evolution + db FOREST ; type + db 0 ; level at which move 3 is learned + db 0 ; level at which move 4 is learned + +; SHELLSTERA + db 36 ; hp + db 13 ; speed + db 12 ; attack + db 10 ; defense + db 7 ; sp.atk + db 8 ; sp.def + db TRIPLE_ATTACK, FLIGHT, DUST_CLOUD, DRILL_MISSILE + db 150 + db 0, 0 ; no evolution + db GRASSLAND ; type + db 0 ; level at which move 3 is learned + db 0 ; level at which move 4 is learned + +; FUNGEIST + db 38 ; hp + db 16 ; speed + db 16 ; attack + db 13 ; defense + db 9 ; sp.atk + db 10 ; sp.def + db MISSILE_PUNCH, PROTECT, ASSAULT, DRAGON_MISSILE + db 200 + db 0, 0 ; no evolution + db GRASSLAND ; type + db 0 ; level at which move 3 is learned + db 0 ; level at which move 4 is learned + +; BALLTAMUS + db 38 ; hp + db 9 ; speed + db 13 ; attack + db 10 ; defense + db 8 ; sp.atk + db 8 ; sp.def + db FANG_CRUSH, SCREAM, SHIELD, EARTHQUAKE + db 150 + db 0, 0 ; no evolution + db AQUATIC ; type + db 0 ; level at which move 3 is learned + db 0 ; level at which move 4 is learned + +; BURENICA + db 33 ; hp + db 17 ; speed + db 10 ; attack + db 10 ; defense + db 12 ; sp.atk + db 10 ; sp.def + db CROSS_ATTACK, RECOVER, FLIGHT, KAMAITACHI + db 150 + db 0, 0 ; no evolution + db GRASSLAND ; type + db 0 ; level at which move 3 is learned + db 0 ; level at which move 4 is learned + +; GERON + db 35 ; hp + db 12 ; speed + db 11 ; attack + db 9 ; defense + db 12 ; sp.atk + db 10 ; sp.def + db ACID, SCREAM, CURSE_SONG, EGG_BOMB + db 150 + db 0, 0 ; no evolution + db AQUATIC ; type + db 0 ; level at which move 3 is learned + db 0 ; level at which move 4 is learned + +; BERZELIA + db 38 ; hp + db 16 ; speed + db 14 ; attack + db 12 ; defense + db 12 ; sp.atk + db 13 ; sp.def + db HOOF, SNARL, RECOVER, HARPOON_MISSILE + db 150 + db 0, 0 ; no evolution + db GRASSLAND ; type + db 0 ; level at which move 3 is learned + db 0 ; level at which move 4 is learned + +; NIGELLA + db 40 ; hp + db 12 ; speed + db 13 ; attack + db 12 ; defense + db 11 ; sp.atk + db 15 ; sp.def + db NEEDLE, LICK, NUMBING_STING, 0 + db 150 + db 0, 0 ; no evolution + db AQUATIC ; type + db 0 ; level at which move 3 is learned + db 100 ; level at which move 4 is learned + +; MUSA + db 42 ; hp + db 11 ; speed + db 18 ; attack + db 10 ; defense + db 20 ; sp.atk + db 18 ; sp.def + db HORN, PROTECT, EM_WAVE, MISSILE_POD + db 200 + db 0, 0 ; no evolution + db MOUNTAIN ; type + db 0 ; level at which move 3 is learned + db 0 ; level at which move 4 is learned + +; NETARO + db 45 ; hp + db 12 ; speed + db 10 ; attack + db 9 ; defense + db 10 ; sp.atk + db 10 ; sp.def + db HORN, ULTRASONIC, EM_WAVE, DRILL_MISSILE + db 150 + db 0, 0 ; no evolution + db MOUNTAIN ; type + db 0 ; level at which move 3 is learned + db 0 ; level at which move 4 is learned + +; NEJIRO + db 33 ; hp + db 18 ; speed + db 14 ; attack + db 10 ; defense + db 8 ; sp.atk + db 5 ; sp.def + db CLAW, FLIGHT, HIGH_KICK, MACHINE_GUN + db 150 + db 0, 0 ; no evolution + db SKY ; type + db 0 ; level at which move 3 is learned + db 0 ; level at which move 4 is learned + +; GODETIA + db 36 ; hp + db 13 ; speed + db 13 ; attack + db 12 ; defense + db 11 ; sp.atk + db 10 ; sp.def + db NUMBING_STING, CAMOUFLAGE, POISON_GAS, EARTHQUAKE + db 150 + db 0, 0 ; no evolution + db GRASSLAND ; type + db 0 ; level at which move 3 is learned + db 0 ; level at which move 4 is learned + +; CURCUMA + db 40 ; hp + db 10 ; speed + db 15 ; attack + db 10 ; defense + db 18 ; sp.atk + db 18 ; sp.def + db NUMBING_STING, AVOID, DEFEND, DRILL_MISSILE + db 150 + db 0, 0 ; no evolution + db AQUATIC ; type + db 0 ; level at which move 3 is learned + db 0 ; level at which move 4 is learned + +; TESSEN + db 34 ; hp + db 17 ; speed + db 13 ; attack + db 12 ; defense + db 12 ; sp.atk + db 10 ; sp.def + db IRON_CLAW, HEAT_WAVE, ASSAULT, FLAMETHROWER + db 150 + db 0, 0 ; no evolution + db MOUNTAIN ; type + db 0 ; level at which move 3 is learned + db 0 ; level at which move 4 is learned + +; HELIOPSIS + db 38 ; hp + db 10 ; speed + db 15 ; attack + db 14 ; defense + db 10 ; sp.atk + db 11 ; sp.def + db BEAK, GLARE, EM_BARRIER, FLAMETHROWER + db 150 + db 0, 0 ; no evolution + db GRASSLAND ; type + db 0 ; level at which move 3 is learned + db 0 ; level at which move 4 is learned + +; HAGUMANOKI + db 35 ; hp + db 10 ; speed + db 20 ; attack + db 15 ; defense + db 10 ; sp.atk + db 13 ; sp.def + db SCISSOR, DEFEND, CLAW, STAG_BEAM + db 150 + db 0, 0 ; no evolution + db FOREST ; type + db 0 ; level at which move 3 is learned + db 0 ; level at which move 4 is learned + +; GILERTH + db 32 ; hp + db 10 ; speed + db 12 ; attack + db 13 ; defense + db 7 ; sp.atk + db 9 ; sp.def + db ASSAULT, PROTECT, FOCUS, MINI_BOLT + db 150 + db 20, UNIARMOR ; evolution + db MOUNTAIN ; type + db 0 ; level at which move 3 is learned + db 18 ; level at which move 4 is learned + +; RAYGIRTH + db 30 ; hp + db 18 ; speed + db 12 ; attack + db 8 ; defense + db 8 ; sp.atk + db 8 ; sp.def + db ASSAULT, EVADE, HORN_DRILL, WHIRLPOOL + db 150 + db 0, 0 ; no evolution + db SKY ; type + db 0 ; level at which move 3 is learned + db 50 ; level at which move 4 is learned + +; ARMARU + db 32 ; hp + db 12 ; speed + db 12 ; attack + db 11 ; defense + db 7 ; sp.atk + db 9 ; sp.def + db ASSAULT, PROTECT, GLARE, ROCK + db 150 + db 30, CRYPTOBURN ; evolution + db MOUNTAIN ; type + db 0 ; level at which move 3 is learned + db 25 ; level at which move 4 is learned + +; CHAMERAID + db 32 ; hp + db 15 ; speed + db 10 ; attack + db 10 ; defense + db 8 ; sp.atk + db 7 ; sp.def + db FANG_CRUSH, LICK, CAMOUFLAGE, 0 + db 150 + db 0, 0 ; no evolution + db GRASSLAND ; type + db 0 ; level at which move 3 is learned + db 100 ; level at which move 4 is learned + +; CRYPTORIDE + db 40 ; hp + db 15 ; speed + db 16 ; attack + db 11 ; defense + db 8 ; sp.atk + db 8 ; sp.def + db ASSAULT, INVIGORATE, CLAW, MINI_FLAME + db 150 + db 40, FUNGMACHINE ; evolution + db FOREST ; type + db 0 ; level at which move 3 is learned + db 32 ; level at which move 4 is learned + +; WORMITERALA + db 36 ; hp + db 14 ; speed + db 10 ; attack + db 8 ; defense + db 8 ; sp.atk + db 9 ; sp.def + db TRIPLE_ATTACK, DEFEND, POISON_GAS, KAMAITACHI + db 150 + db 0, 0 ; no evolution + db GRASSLAND ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; FUNGBLADE + db 38 ; hp + db 16 ; speed + db 15 ; attack + db 10 ; defense + db 8 ; sp.atk + db 10 ; sp.def + db MISSILE_PUNCH, SPEED_UP, HORN, MINI_FLAME + db 150 + db 40, PUNISTO ; evolution + db GRASSLAND ; type + db 0 ; level at which move 3 is learned + db 36 ; level at which move 4 is learned + +; BULLTAMUS + db 38 ; hp + db 10 ; speed + db 13 ; attack + db 10 ; defense + db 6 ; sp.atk + db 8 ; sp.def + db BODY_PRESS, PROTECT, HEAL, EARTHQUAKE + db 150 + db 0, 0 ; no evolution + db AQUATIC ; type + db 0 ; level at which move 3 is learned + db 38 ; level at which move 4 is learned + +; PUNEEDLE + db 33 ; hp + db 18 ; speed + db 10 ; attack + db 8 ; defense + db 10 ; sp.atk + db 9 ; sp.def + db TENTACLE, HEAL, AVOID, MINI_BOLT + db 150 + db 45, SUGULINE ; evolution + db GRASSLAND ; type + db 0 ; level at which move 3 is learned + db 38 ; level at which move 4 is learned + +; KERORIN + db 35 ; hp + db 13 ; speed + db 10 ; attack + db 8 ; defense + db 10 ; sp.atk + db 7 ; sp.def + db BODY_PRESS, LICK, CURSE_SONG, WHIRLPOOL + db 150 + db 0, 0 ; no evolution + db AQUATIC ; type + db 0 ; level at which move 3 is learned + db 50 ; level at which move 4 is learned + +; SUGULAI + db 32 ; hp + db 17 ; speed + db 15 ; attack + db 8 ; defense + db 8 ; sp.atk + db 9 ; sp.def + db FANG_CRUSH, AVOID, CLAW, MINI_BOLT + db 150 + db 46, MACHURUS ; evolution + db GRASSLAND ; type + db 0 ; level at which move 3 is learned + db 40 ; level at which move 4 is learned + +; CORTOS + db 33 ; hp + db 19 ; speed + db 12 ; attack + db 8 ; defense + db 8 ; sp.atk + db 7 ; sp.def + db IRON_CLAW, FLIGHT, PETAL_STORM, KAMAITACHI + db 150 + db 0, 0 ; no evolution + db SKY ; type + db 0 ; level at which move 3 is learned + db 38 ; level at which move 4 is learned + +; GAIURUS + db 35 ; hp + db 14 ; speed + db 14 ; attack + db 9 ; defense + db 5 ; sp.atk + db 5 ; sp.def + db FANG_CRUSH, SPEED_UP, CLAW, KAMAITACHI + db 150 + db 50, OCTAGUN ; evolution + db GRASSLAND ; type + db 0 ; level at which move 3 is learned + db 45 ; level at which move 4 is learned + +; MIDOTOR + db 40 ; hp + db 8 ; speed + db 10 ; attack + db 8 ; defense + db 8 ; sp.atk + db 7 ; sp.def + db HORN, SHIELD, RECOVER, EGG_BOMB + db 150 + db 0, 0 ; no evolution + db AQUATIC ; type + db 0 ; level at which move 3 is learned + db 45 ; level at which move 4 is learned + +; OCTOR + db 38 ; hp + db 11 ; speed + db 10 ; attack + db 8 ; defense + db 8 ; sp.atk + db 7 ; sp.def + db STRIKE, INVIGORATE, SCREAM, WHIRLPOOL + db 150 + db 34, MUMMYBOAR ; evolution + db AQUATIC ; type + db 0 ; level at which move 3 is learned + db 32 ; level at which move 4 is learned + +; HITODEIGHT + db 33 ; hp + db 12 ; speed + db 13 ; attack + db 9 ; defense + db 8 ; sp.atk + db 8 ; sp.def + db ASSAULT, SHUTTER, RECOVER, WHIRLPOOL + db 150 + db 0, 0 ; no evolution + db AQUATIC ; type + db 0 ; level at which move 3 is learned + db 40 ; level at which move 4 is learned + +; GHOSBOAR + db 32 ; hp + db 16 ; speed + db 14 ; attack + db 8 ; defense + db 6 ; sp.atk + db 6 ; sp.def + db ASSAULT, AIM, SPEED_UP, EARTHQUAKE + db 150 + db 33, KINGPIN ; evolution + db GRASSLAND ; type + db 0 ; level at which move 3 is learned + db 25 ; level at which move 4 is learned + +; RASENMAI + db 35 ; hp + db 13 ; speed + db 10 ; attack + db 12 ; defense + db 8 ; sp.atk + db 8 ; sp.def + db NUMBING_STING, LICK, FIRST_AID, WHIRLPOOL + db 150 + db 0, 0 ; no evolution + db AQUATIC ; type + db 0 ; level at which move 3 is learned + db 50 ; level at which move 4 is learned + +; SCORPIL + db 34 ; hp + db 9 ; speed + db 13 ; attack + db 11 ; defense + db 6 ; sp.atk + db 8 ; sp.def + db CROSS_ATTACK, PROTECT, POISON_STING, MINI_BOLT + db 150 + db 40, BEEBALM ; evolution + db DESERT ; type + db 0 ; level at which move 3 is learned + db 38 ; level at which move 4 is learned + +; ARMCRAB + db 35 ; hp + db 8 ; speed + db 15 ; attack + db 12 ; defense + db 6 ; sp.atk + db 8 ; sp.def + db SABRE, PROTECT, INVIGORATE, MINI_SNOW + db 150 + db 0, 0 ; no evolution + db AQUATIC ; type + db 0 ; level at which move 3 is learned + db 40 ; level at which move 4 is learned + +; ANGIORN + db 38 ; hp + db 18 ; speed + db 16 ; attack + db 10 ; defense + db 8 ; sp.atk + db 8 ; sp.def + db ASSAULT, WINGBEAT, SABRE, KAMAITACHI + db 150 + db 0, 0 ; no evolution + db SKY ; type + db 0 ; level at which move 3 is learned + db 20 ; level at which move 4 is learned + +; GYMRACE + db 39 ; hp + db 12 ; speed + db 17 ; attack + db 10 ; defense + db 8 ; sp.atk + db 9 ; sp.def + db MISSILE_PUNCH, PROTECT, HORN, ROCK + db 150 + db 0, 0 ; no evolution + db MOUNTAIN ; type + db 0 ; level at which move 3 is learned + db 20 ; level at which move 4 is learned + +; LIRIONPU + db 32 ; hp + db 18 ; speed + db 10 ; attack + db 10 ; defense + db 8 ; sp.atk + db 12 ; sp.def + db RUSH, CHILL, RECOVER, WHIRLPOOL + db 150 + db 0, 0 ; no evolution + db AQUATIC ; type + db 0 ; level at which move 3 is learned + db 20 ; level at which move 4 is learned + +; WHITAH + db 30 ; hp + db 17 ; speed + db 10 ; attack + db 8 ; defense + db 8 ; sp.atk + db 7 ; sp.def + db KICK, LULLABY, CLAW, MINI_BOLT + db 150 + db 0, 0 ; no evolution + db FOREST ; type + db 0 ; level at which move 3 is learned + db 40 ; level at which move 4 is learned + +; POTZAL + db 33 ; hp + db 14 ; speed + db 17 ; attack + db 10 ; defense + db 10 ; sp.atk + db 8 ; sp.def + db FANG_CRUSH, POISON_GAS, NEEDLE, MINI_BOLT + db 150 + db 0, 0 ; no evolution + db DESERT ; type + db 0 ; level at which move 3 is learned + db 20 ; level at which move 4 is learned + +; ARANEIDA + db 35 ; hp + db 14 ; speed + db 13 ; attack + db 10 ; defense + db 8 ; sp.atk + db 8 ; sp.def + db CROSS_ATTACK, CHILL, POISON_STING, 0 + db 150 + db 0, 0 ; no evolution + db FOREST ; type + db 0 ; level at which move 3 is learned + db 100 ; level at which move 4 is learned + +; GADHORO + db 33 ; hp + db 16 ; speed + db 12 ; attack + db 8 ; defense + db 8 ; sp.atk + db 9 ; sp.def + db CLAW, INVIGORATE, ULTRASONIC, MINI_SNOW + db 150 + db 0, 0 ; no evolution + db SKY ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; CLIOGERA + db 30 ; hp + db 17 ; speed + db 10 ; attack + db 8 ; defense + db 10 ; sp.atk + db 8 ; sp.def + db HORN, CHARGE_UP, RECOVER, MINI_BOLT + db 150 + db 0, 0 ; no evolution + db AQUATIC ; type + db 0 ; level at which move 3 is learned + db 38 ; level at which move 4 is learned + +; GUST + db 32 ; hp + db 17 ; speed + db 15 ; attack + db 8 ; defense + db 10 ; sp.atk + db 8 ; sp.def + db RAZOR_PUNCH, FLIGHT, DUST_CLOUD, KAMAITACHI + db 150 + db 0, 0 ; no evolution + db SKY ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; REIGE + db 34 ; hp + db 14 ; speed + db 12 ; attack + db 8 ; defense + db 6 ; sp.atk + db 8 ; sp.def + db MIDDLE_KICK, QUICK_STEP, EVADE, EARTHQUAKE + db 150 + db 0, 0 ; no evolution + db GRASSLAND ; type + db 0 ; level at which move 3 is learned + db 40 ; level at which move 4 is learned + +; TOGERUKA + db 32 ; hp + db 14 ; speed + db 13 ; attack + db 8 ; defense + db 6 ; sp.atk + db 8 ; sp.def + db TAIL, QUICK_STEP, HEAL, ROCK + db 150 + db 0, 0 ; no evolution + db GRASSLAND ; type + db 0 ; level at which move 3 is learned + db 20 ; level at which move 4 is learned + +; RAIGALEON + db 34 ; hp + db 12 ; speed + db 18 ; attack + db 9 ; defense + db 6 ; sp.atk + db 6 ; sp.def + db IRON_CLAW, INVIGORATE, ASSAULT, MINI_FLAME + db 150 + db 0, 0 ; no evolution + db GRASSLAND ; type + db 0 ; level at which move 3 is learned + db 20 ; level at which move 4 is learned + +; GADORKUMA + db 38 ; hp + db 8 ; speed + db 16 ; attack + db 9 ; defense + db 6 ; sp.atk + db 7 ; sp.def + db MISSILE_PUNCH, INVIGORATE, ASSAULT, EARTHQUAKE + db 150 + db 0, 0 ; no evolution + db FOREST ; type + db 0 ; level at which move 3 is learned + db 38 ; level at which move 4 is learned + +; ABIRAS + db 32 ; hp + db 15 ; speed + db 14 ; attack + db 8 ; defense + db 6 ; sp.atk + db 8 ; sp.def + db MIDDLE_KICK, FLIGHT, POISON_GAS, WHIRLPOOL + db 150 + db 0, 0 ; no evolution + db AQUATIC ; type + db 0 ; level at which move 3 is learned + db 33 ; level at which move 4 is learned + +; ALPHAGOS + db 38 ; hp + db 12 ; speed + db 16 ; attack + db 9 ; defense + db 9 ; sp.atk + db 8 ; sp.def + db ASSAULT, HEAT_WAVE, IRON_CLAW, MINI_FLAME + db 150 + db 0, 0 ; no evolution + db DESERT ; type + db 0 ; level at which move 3 is learned + db 40 ; level at which move 4 is learned + +; KIYORUKA + db 31 ; hp + db 13 ; speed + db 12 ; attack + db 8 ; defense + db 8 ; sp.atk + db 9 ; sp.def + db TAIL, RECOVER, STRIKE, MACHINE_GUN + db 150 + db 0, 0 ; no evolution + db GRASSLAND ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; GYMGARTH + db 39 ; hp + db 10 ; speed + db 17 ; attack + db 10 ; defense + db 9 ; sp.atk + db 10 ; sp.def + db MISSILE_PUNCH, SHIELD, BISON_HAMMER, ROCK + db 150 + db 0, 0 ; no evolution + db MOUNTAIN ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; BAIONPU + db 32 ; hp + db 17 ; speed + db 10 ; attack + db 12 ; defense + db 13 ; sp.atk + db 12 ; sp.def + db CROSS_ATTACK, CHILL, RECOVER, PLASMA_LASER + db 150 + db 0, 0 ; no evolution + db AQUATIC ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; WARUTAH + db 30 ; hp + db 16 ; speed + db 10 ; attack + db 10 ; defense + db 12 ; sp.atk + db 9 ; sp.def + db KICK, EM_PULSE, CLAW, EAR_VULCAN + db 150 + db 0, 0 ; no evolution + db FOREST ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; GUNTZATL + db 33 ; hp + db 13 ; speed + db 18 ; attack + db 10 ; defense + db 12 ; sp.atk + db 8 ; sp.def + db TENTACLE, POISON_GAS, FANG_CRUSH, PLASMA_LASER + db 150 + db 0, 0 ; no evolution + db DESERT ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; ARAKUIDA + db 35 ; hp + db 13 ; speed + db 14 ; attack + db 10 ; defense + db 12 ; sp.atk + db 8 ; sp.def + db CROSS_ATTACK, CHILL, TOXIC_STING, DRILL_MISSILE + db 150 + db 0, 0 ; no evolution + db FOREST ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; BADHORO + db 34 ; hp + db 15 ; speed + db 13 ; attack + db 9 ; defense + db 13 ; sp.atk + db 8 ; sp.def + db CROSS_ATTACK, INVIGORATE, EM_BARRIER, PENGUIN_MISSILE + db 150 + db 0, 0 ; no evolution + db SKY ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; LAMPGERA + db 30 ; hp + db 16 ; speed + db 12 ; attack + db 10 ; defense + db 14 ; sp.atk + db 8 ; sp.def + db NUMBING_STING, CHARGE_UP, RECOVER, PULSE_BEAM + db 150 + db 0, 0 ; no evolution + db AQUATIC ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; TEMPEST + db 30 ; hp + db 16 ; speed + db 15 ; attack + db 9 ; defense + db 13 ; sp.atk + db 9 ; sp.def + db RAZOR_PUNCH, FLIGHT, CHILL, DRILL_MISSILE + db 150 + db 0, 0 ; no evolution + db SKY ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; ZUDOON + db 35 ; hp + db 13 ; speed + db 14 ; attack + db 12 ; defense + db 10 ; sp.atk + db 8 ; sp.def + db MIDDLE_KICK, QUICK_STEP, INVIGORATE, BIRD_BAZOOKA + db 200 + db 0, 0 ; no evolution + db GRASSLAND ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; HIYU + db 42 ; hp + db 10 ; speed + db 16 ; attack + db 14 ; defense + db 15 ; sp.atk + db 15 ; sp.def + db CLAW, HEAT_WAVE, FIRST_AID, WAR_CANNON + db 150 + db 0, 0 ; no evolution + db DESERT ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; GAMAZUMI + db 38 ; hp + db 16 ; speed + db 17 ; attack + db 13 ; defense + db 12 ; sp.atk + db 10 ; sp.def + db BITE, AVOID, POISON_GAS, FLAMETHROWER + db 150 + db 0, 0 ; no evolution + db GRASSLAND ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; PAPAVER + db 45 ; hp + db 10 ; speed + db 18 ; attack + db 15 ; defense + db 12 ; sp.atk + db 11 ; sp.def + db ASSAULT, PROTECT, FIRST_AID, PULSE_BEAM + db 200 + db 0, 0 ; no evolution + db AQUATIC ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; GAMURU + db 37 ; hp + db 10 ; speed + db 19 ; attack + db 18 ; defense + db 14 ; sp.atk + db 12 ; sp.def + db CROSS_ATTACK, POISON_GAS, IRON_CLAW, MACHINE_GUN + db 150 + db 0, 0 ; no evolution + db GRASSLAND ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; BOUVARDI + db 36 ; hp + db 11 ; speed + db 15 ; attack + db 12 ; defense + db 15 ; sp.atk + db 14 ; sp.def + db SABRE, SLEEP_GAS, CURSE_SONG, FLAMETHROWER + db 150 + db 0, 0 ; no evolution + db GRASSLAND ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; GAULTHERIA + db 39 ; hp + db 10 ; speed + db 12 ; attack + db 15 ; defense + db 8 ; sp.atk + db 8 ; sp.def + db ASSAULT, PROTECT, INVIGORATE, HYPER_MISSILE + db 150 + db 0, 0 ; no evolution + db FOREST ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; DIPSACUS + db 41 ; hp + db 19 ; speed + db 16 ; attack + db 16 ; defense + db 15 ; sp.atk + db 15 ; sp.def + db BOWGUN, FLIGHT, VACUUM_SLASH, MEGA_LAUNCHER + db 150 + db 0, 0 ; no evolution + db SKY ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; KAYA + db 33 ; hp + db 18 ; speed + db 15 ; attack + db 14 ; defense + db 13 ; sp.atk + db 12 ; sp.def + db CAT_PUNCH, ELECTRO_SCREEN, PUNT, FLAMETHROWER + db 150 + db 0, 0 ; no evolution + db GRASSLAND ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; DENFARE + db 42 ; hp + db 12 ; speed + db 12 ; attack + db 18 ; defense + db 15 ; sp.atk + db 15 ; sp.def + db MISSILE_PUNCH, CHARGE_UP, RECOVER, MACHINE_GUN + db 150 + db 0, 0 ; no evolution + db GRASSLAND ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; ANGIEON + db 38 ; hp + db 17 ; speed + db 17 ; attack + db 14 ; defense + db 13 ; sp.atk + db 10 ; sp.def + db ASSAULT, INVIGORATE, CLAW, MACHINE_GUN + db 150 + db 0, 0 ; no evolution + db SKY ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; EASYDOG + db 38 ; hp + db 16 ; speed + db 16 ; attack + db 14 ; defense + db 13 ; sp.atk + db 10 ; sp.def + db ASSAULT, SPEED_UP, MISSILE_PUNCH, MACHINE_GUN + db 150 + db 0, 0 ; no evolution + db GRASSLAND ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; TRICERARMOR + db 35 ; hp + db 14 ; speed + db 15 ; attack + db 13 ; defense + db 13 ; sp.atk + db 12 ; sp.def + db ASSAULT, IRON_WALL, EM_BARRIER, MACHINE_GUN + db 150 + db 0, 0 ; no evolution + db MOUNTAIN ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; CRYPTOSNIPE + db 40 ; hp + db 17 ; speed + db 18 ; attack + db 14 ; defense + db 12 ; sp.atk + db 12 ; sp.def + db ASSAULT, FOCUS, IRON_CLAW, MEGA_LAUNCHER + db 150 + db 0, 0 ; no evolution + db FOREST ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; FUNGBOOST + db 38 ; hp + db 16 ; speed + db 16 ; attack + db 13 ; defense + db 12 ; sp.atk + db 10 ; sp.def + db CROSS_ATTACK, FLIGHT, DENMA_SHURIKEN, MACHINE_GUN + db 150 + db 0, 0 ; no evolution + db GRASSLAND ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; VEENICA + db 37 ; hp + db 17 ; speed + db 14 ; attack + db 12 ; defense + db 14 ; sp.atk + db 10 ; sp.def + db TENTACLE, RECOVER, NUMBING_STING, HARPOON_MISSILE + db 200 + db 0, 0 ; no evolution + db GRASSLAND ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; SAIGULIGER + db 38 ; hp + db 18 ; speed + db 16 ; attack + db 13 ; defense + db 15 ; sp.atk + db 10 ; sp.def + db FANG_CRUSH, GLARE, IRON_CLAW, FLAMETHROWER + db 150 + db 0, 0 ; no evolution + db GRASSLAND ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; ARMEDURUS + db 39 ; hp + db 15 ; speed + db 15 ; attack + db 12 ; defense + db 12 ; sp.atk + db 10 ; sp.def + db FANG_CRUSH, SPEED_UP, IRON_CLAW, HARPOON_MISSILE + db 150 + db 0, 0 ; no evolution + db GRASSLAND ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; OCTORIFLE + db 40 ; hp + db 15 ; speed + db 13 ; attack + db 13 ; defense + db 11 ; sp.atk + db 12 ; sp.def + db NOSE_MAGNUM, INVIGORATE, HORN, TSUNAMI + db 150 + db 0, 0 ; no evolution + db AQUATIC ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; ERASERBOAR + db 35 ; hp + db 17 ; speed + db 14 ; attack + db 12 ; defense + db 12 ; sp.atk + db 10 ; sp.def + db FANG_CRUSH, FLIGHT, SHUTTER, TUSK_VULCAN + db 150 + db 0, 0 ; no evolution + db GRASSLAND ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; SPEARNEEDLE + db 36 ; hp + db 17 ; speed + db 16 ; attack + db 14 ; defense + db 11 ; sp.atk + db 12 ; sp.def + db SCREW_HORN, IRON_WALL, TOXIC_STING, HARPOON_MISSILE + db 150 + db 0, 0 ; no evolution + db DESERT ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; GILGIERTH + db 35 ; hp + db 14 ; speed + db 15 ; attack + db 14 ; defense + db 10 ; sp.atk + db 12 ; sp.def + db ASSAULT, PROTECT, EM_BARRIER, MINI_BOLT + db 150 + db 46, BARRIARM ; evolution + db MOUNTAIN ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; UNIARMOR + db 34 ; hp + db 16 ; speed + db 15 ; attack + db 13 ; defense + db 10 ; sp.atk + db 10 ; sp.def + db HORN, IRON_WALL, EM_BARRIER, ROCK + db 150 + db 45, CRYPTOKNIGHT ; evolution + db MOUNTAIN ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; CRYPTOBURN + db 40 ; hp + db 16 ; speed + db 18 ; attack + db 14 ; defense + db 10 ; sp.atk + db 10 ; sp.def + db ASSAULT, INVIGORATE, IRON_CLAW, MINI_FLAME + db 150 + db 60, FUNGWAR ; evolution + db FOREST ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; FUNGMACHINE + db 38 ; hp + db 17 ; speed + db 16 ; attack + db 13 ; defense + db 8 ; sp.atk + db 10 ; sp.def + db MISSILE_PUNCH, FLIGHT, HORN, MINI_FLAME + db 150 + db 60, BASHOU ; evolution + db GRASSLAND ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; PUNISTO + db 34 ; hp + db 18 ; speed + db 12 ; attack + db 12 ; defense + db 13 ; sp.atk + db 12 ; sp.def + db MISSILE_PUNCH, RECOVER, WINGBEAT, MEGA_BOLT + db 150 + db 0, 0 ; no evolution + db GRASSLAND ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; SUGULINE + db 34 ; hp + db 19 ; speed + db 16 ; attack + db 13 ; defense + db 14 ; sp.atk + db 10 ; sp.def + db FANG_CRUSH, GLARE, IRON_CLAW, MINI_BOLT + db 150 + db 0, 0 ; no evolution + db GRASSLAND ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; MACHURUS + db 36 ; hp + db 17 ; speed + db 15 ; attack + db 12 ; defense + db 10 ; sp.atk + db 10 ; sp.def + db FANG_CRUSH, SPEED_UP, IRON_CLAW, KAMAITACHI + db 150 + db 0, 0 ; no evolution + db GRASSLAND ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; OCTAGUN + db 40 ; hp + db 16 ; speed + db 13 ; attack + db 12 ; defense + db 10 ; sp.atk + db 12 ; sp.def + db BODY_PRESS, INVIGORATE, HORN, TSUNAMI + db 150 + db 0, 0 ; no evolution + db AQUATIC ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; MUMMYBOAR + db 35 ; hp + db 18 ; speed + db 14 ; attack + db 12 ; defense + db 10 ; sp.atk + db 10 ; sp.def + db ASSAULT, DEFEND, FIRST_AID, EARTHQUAKE + db 150 + db 0, 0 ; no evolution + db GRASSLAND ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; KINGPIN + db 35 ; hp + db 13 ; speed + db 15 ; attack + db 14 ; defense + db 10 ; sp.atk + db 12 ; sp.def + db CROSS_ATTACK, IRON_WALL, TOXIC_STING, MINI_BOLT + db 150 + db 0, 0 ; no evolution + db DESERT ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; BEEBALM + db 36 ; hp + db 17 ; speed + db 15 ; attack + db 14 ; defense + db 12 ; sp.atk + db 8 ; sp.def + db BITE, SPEED_UP, SHURIKEN, 0 + db 150 + db 0, 0 ; no evolution + db GRASSLAND ; type + db 0 ; level at which move 3 is learned + db 100 ; level at which move 4 is learned + +; SALAL + db 32 ; hp + db 16 ; speed + db 13 ; attack + db 12 ; defense + db 10 ; sp.atk + db 12 ; sp.def + db BITE, JUMP, HIGH_KICK, MINI_BOLT + db 150 + db 0, 0 ; no evolution + db GRASSLAND ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; ENISHIDA + db 35 ; hp + db 10 ; speed + db 20 ; attack + db 12 ; defense + db 8 ; sp.atk + db 8 ; sp.def + db RUSH, SHUTTER, SABRE, ROCK + db 150 + db 0, 0 ; no evolution + db GRASSLAND ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; TULBAGHIA + db 35 ; hp + db 17 ; speed + db 13 ; attack + db 13 ; defense + db 14 ; sp.atk + db 16 ; sp.def + db BEAK, JUMP, IRON_CLAW, MINI_FLAME + db 150 + db 0, 0 ; no evolution + db GRASSLAND ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; KIRINGIKU + db 41 ; hp + db 18 ; speed + db 12 ; attack + db 10 ; defense + db 15 ; sp.atk + db 16 ; sp.def + db CLAW, FLIGHT, CROSS_ATTACK, KAMAITACHI + db 150 + db 0, 0 ; no evolution + db SKY ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; ANGILANCE + db 38 ; hp + db 18 ; speed + db 17 ; attack + db 14 ; defense + db 12 ; sp.atk + db 10 ; sp.def + db ASSAULT, INVIGORATE, SABRE, KAMAITACHI + db 150 + db 0, 0 ; no evolution + db SKY ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; GYMGANON + db 39 ; hp + db 15 ; speed + db 17 ; attack + db 10 ; defense + db 8 ; sp.atk + db 10 ; sp.def + db MISSILE_PUNCH, SHIELD, HORN, ROCK + db 150 + db 0, 0 ; no evolution + db MOUNTAIN ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; SAIOPE + db 38 ; hp + db 19 ; speed + db 12 ; attack + db 12 ; defense + db 10 ; sp.atk + db 12 ; sp.def + db IRON_CLAW, FROST_BREATH, RESTORE, WHIRLPOOL + db 150 + db 0, 0 ; no evolution + db AQUATIC ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; WATTAH + db 34 ; hp + db 18 ; speed + db 13 ; attack + db 12 ; defense + db 10 ; sp.atk + db 13 ; sp.def + db CROSS_ATTACK, LULLABY, IRON_CLAW, MINI_BOLT + db 150 + db 0, 0 ; no evolution + db FOREST ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; QUETZAKING + db 39 ; hp + db 17 ; speed + db 18 ; attack + db 13 ; defense + db 11 ; sp.atk + db 11 ; sp.def + db FANG_CRUSH, POISON_GAS, ELECTRIC_STING, MEGA_BOLT + db 150 + db 0, 0 ; no evolution + db DESERT ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; ARAKUDABARAN + db 38 ; hp + db 17 ; speed + db 15 ; attack + db 12 ; defense + db 10 ; sp.atk + db 12 ; sp.def + db CROSS_ATTACK, CHILL, DRAIN, MEGA_FLAME + db 150 + db 0, 0 ; no evolution + db FOREST ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; PUNKHORO + db 36 ; hp + db 18 ; speed + db 14 ; attack + db 12 ; defense + db 10 ; sp.atk + db 11 ; sp.def + db TRIPLE_ATTACK, INVIGORATE, ULTRASONIC, MINI_SNOW + db 150 + db 0, 0 ; no evolution + db SKY ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; VIKINGURIN + db 35 ; hp + db 17 ; speed + db 12 ; attack + db 12 ; defense + db 12 ; sp.atk + db 13 ; sp.def + db HORN, CHARGE_UP, RECOVER, MEGA_BOLT + db 150 + db 0, 0 ; no evolution + db AQUATIC ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; STORM + db 39 ; hp + db 18 ; speed + db 17 ; attack + db 13 ; defense + db 11 ; sp.atk + db 11 ; sp.def + db MIDDLE_KICK, CHARGE_UP, CURSE_SONG, HURRICANE + db 150 + db 0, 0 ; no evolution + db SKY ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; MUTOOM + db 36 ; hp + db 16 ; speed + db 15 ; attack + db 13 ; defense + db 12 ; sp.atk + db 11 ; sp.def + db HIGH_KICK, QUICK_STEP, EVADE, EARTHQUAKE + db 150 + db 0, 0 ; no evolution + db GRASSLAND ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; GYPSOPHI + db 38 ; hp + db 10 ; speed + db 17 ; attack + db 14 ; defense + db 13 ; sp.atk + db 13 ; sp.def + db MIDDLE_KICK, SCREAM, HEAT_WAVE, MINI_BOLT + db 150 + db 0, 0 ; no evolution + db GRASSLAND ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; RUSCUS + db 40 ; hp + db 12 ; speed + db 20 ; attack + db 18 ; defense + db 16 ; sp.atk + db 16 ; sp.def + db IRON_CLAW, FROST_BREATH, TRIPLE_ATTACK, MEGA_FLAME + db 150 + db 0, 0 ; no evolution + db MOUNTAIN ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; MAORAN + db 41 ; hp + db 10 ; speed + db 18 ; attack + db 17 ; defense + db 15 ; sp.atk + db 15 ; sp.def + db HIGH_KICK, JUMP, FROST_BREATH, BLIZZARD + db 150 + db 0, 0 ; no evolution + db AQUATIC ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; ZEA + db 32 ; hp + db 19 ; speed + db 16 ; attack + db 14 ; defense + db 18 ; sp.atk + db 15 ; sp.def + db BLOODSUCK, FLIGHT, ULTRASONIC, MINI_BOLT + db 150 + db 0, 0 ; no evolution + db SKY ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; GONUM + db 42 ; hp + db 14 ; speed + db 13 ; attack + db 12 ; defense + db 15 ; sp.atk + db 15 ; sp.def + db BODY_PRESS, STARE, CHARGE_UP, MEGA_BOLT + db 150 + db 0, 0 ; no evolution + db AQUATIC ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; ANGIPOWER + db 38 ; hp + db 17 ; speed + db 19 ; attack + db 15 ; defense + db 14 ; sp.atk + db 13 ; sp.def + db ASSAULT, INVIGORATE, VACUUM_SLASH, HYPER_MISSILE + db 200 + db 0, 0 ; no evolution + db SKY ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; GYMZYRUS + db 39 ; hp + db 13 ; speed + db 17 ; attack + db 15 ; defense + db 13 ; sp.atk + db 12 ; sp.def + db IRON_CLAW, SHIELD, BISON_HAMMER, DRILL_MISSILE + db 150 + db 0, 0 ; no evolution + db MOUNTAIN ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; CANONOPE + db 36 ; hp + db 18 ; speed + db 12 ; attack + db 12 ; defense + db 15 ; sp.atk + db 13 ; sp.def + db VACUUM_SLASH, CHARGE_UP, RESTORE, MEGA_RIFLE + db 200 + db 0, 0 ; no evolution + db AQUATIC ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; CALM + db 36 ; hp + db 17 ; speed + db 15 ; attack + db 13 ; defense + db 14 ; sp.atk + db 14 ; sp.def + db VACUUM_SLASH, CHARGE_UP, CURSE_SONG, DRILL_MISSILE + db 200 + db 0, 0 ; no evolution + db SKY ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; RYUUGUU + db 40 ; hp + db 10 ; speed + db 20 ; attack + db 18 ; defense + db 18 ; sp.atk + db 16 ; sp.def + db IRON_CLAW, ULTRASONIC, TRIPLE_ATTACK, DRAGON_MISSILE + db 200 + db 0, 0 ; no evolution + db MOUNTAIN ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; GIGAGIGERTH + db 38 ; hp + db 16 ; speed + db 18 ; attack + db 15 ; defense + db 14 ; sp.atk + db 16 ; sp.def + db ASSAULT, PROTECT, EM_BARRIER, MEGA_BOLT + db 200 + db 0, 0 ; no evolution + db MOUNTAIN ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; BARRIARM + db 37 ; hp + db 18 ; speed + db 18 ; attack + db 14 ; defense + db 13 ; sp.atk + db 14 ; sp.def + db ASSAULT, IRON_WALL, EM_BARRIER, MEGA_ROCK + db 200 + db 0, 0 ; no evolution + db MOUNTAIN ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; CRYPTOKNIGHT + db 40 ; hp + db 18 ; speed + db 19 ; attack + db 15 ; defense + db 16 ; sp.atk + db 14 ; sp.def + db ASSAULT, INVIGORATE, IRON_CLAW, MEGA_FLAME + db 200 + db 0, 0 ; no evolution + db FOREST ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; FUNGWAR + db 40 ; hp + db 19 ; speed + db 17 ; attack + db 14 ; defense + db 16 ; sp.atk + db 14 ; sp.def + db CROSS_ATTACK, FLIGHT, DENMA_SHURIKEN, MEGA_FLAME + db 200 + db 0, 0 ; no evolution + db GRASSLAND ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; BASHOU + db 42 ; hp + db 10 ; speed + db 18 ; attack + db 15 ; defense + db 16 ; sp.atk + db 15 ; sp.def + db ICE_BALL, FROST_BREATH, CROSS_ATTACK, BLIZZARD + db 200 + db 0, 0 ; no evolution + db MOUNTAIN ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; ANGIGORGO + db 40 ; hp + db 18 ; speed + db 19 ; attack + db 15 ; defense + db 13 ; sp.atk + db 13 ; sp.def + db ASSAULT, INVIGORATE, VACUUM_SLASH, HURRICANE + db 200 + db 0, 0 ; no evolution + db SKY ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; GYMBARON + db 39 ; hp + db 17 ; speed + db 17 ; attack + db 14 ; defense + db 13 ; sp.atk + db 10 ; sp.def + db IRON_CLAW, SHIELD, BISON_HAMMER, MEGA_ROCK + db 200 + db 0, 0 ; no evolution + db MOUNTAIN ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; LIRIMONARCH + db 38 ; hp + db 19 ; speed + db 14 ; attack + db 14 ; defense + db 13 ; sp.atk + db 17 ; sp.def + db ICE_BALL, CHARGE_UP, RESTORE, TSUNAMI + db 200 + db 0, 0 ; no evolution + db AQUATIC ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; ENTEIOH + db 37 ; hp + db 16 ; speed + db 16 ; attack + db 14 ; defense + db 14 ; sp.atk + db 13 ; sp.def + db CROSS_ATTACK, CURSE_SONG, IRON_CLAW, MEGA_BOLT + db 200 + db 0, 0 ; no evolution + db FOREST ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; GOLAKING + db 38 ; hp + db 15 ; speed + db 17 ; attack + db 15 ; defense + db 13 ; sp.atk + db 13 ; sp.def + db ASSAULT, IRON_WALL, HEAT_WAVE, MEGA_BOLT + db 200 + db 0, 0 ; no evolution + db GRASSLAND ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; KANZOU + db 38 ; hp + db 10 ; speed + db 22 ; attack + db 18 ; defense + db 15 ; sp.atk + db 14 ; sp.def + db HOOF, FLIGHT, FORCE_FIELD, BLIZZARD + db 150 + db 0, 0 ; no evolution + db SKY ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; ORNITHOGALUM + db 42 ; hp + db 10 ; speed + db 20 ; attack + db 18 ; defense + db 18 ; sp.atk + db 17 ; sp.def + db HOOF, HEAT_WAVE, ASSAULT, MEGA_FLAME + db 200 + db 0, 0 ; no evolution + db MOUNTAIN ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; GENTIANA + db 39 ; hp + db 18 ; speed + db 17 ; attack + db 15 ; defense + db 14 ; sp.atk + db 13 ; sp.def + db IRON_CLAW, FLIGHT, SHOCKWAVE, MEGA_FLAME + db 200 + db 0, 0 ; no evolution + db SKY ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; YARROW + db 40 ; hp + db 10 ; speed + db 20 ; attack + db 16 ; defense + db 14 ; sp.atk + db 15 ; sp.def + db ASSAULT, HEAT_WAVE, MISSILE_PUNCH, MEGA_QUAKE + db 150 + db 0, 0 ; no evolution + db MOUNTAIN ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; ANGIOROS + db 42 ; hp + db 18 ; speed + db 19 ; attack + db 15 ; defense + db 16 ; sp.atk + db 14 ; sp.def + db ASSAULT, INVIGORATE, VACUUM_SLASH, MEGA_CANNON + db 200 + db 0, 0 ; no evolution + db SKY ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; GYMZATAN + db 43 ; hp + db 17 ; speed + db 18 ; attack + db 14 ; defense + db 15 ; sp.atk + db 14 ; sp.def + db HORN_DRILL, SHIELD, BISON_HAMMER, BISON_BEAM + db 150 + db 0, 0 ; no evolution + db MOUNTAIN ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; DOOMSDAY + db 45 ; hp + db 16 ; speed + db 20 ; attack + db 16 ; defense + db 18 ; sp.atk + db 18 ; sp.def + db SCREW_HORN, SHOCKWAVE, MISSILE_PUNCH, MISSILE_POD + db 200 + db 0, 0 ; no evolution + db MOUNTAIN ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; DENDEL + db 45 ; hp + db 12 ; speed + db 18 ; attack + db 20 ; defense + db 22 ; sp.atk + db 20 ; sp.def + db RAZOR_PUNCH, EM_PULSE, ELECTRO_SCREEN, MEGA_BOLT + db 100 + db 0, 0 ; no evolution + db AQUATIC ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + +; TELETEL + db 46 ; hp + db 20 ; speed + db 18 ; attack + db 20 ; defense + db 12 ; sp.atk + db 20 ; sp.def + db ELECTRIC_STING, FORCE_FIELD, PETAL_STORM, MEGA_BOLT + db 100 + db 0, 0 ; no evolution + db AQUATIC ; type + db 0 ; level at which move 3 is learned + db 30 ; level at which move 4 is learned + diff --git a/data/scripted_denjuu.asm b/data/scripted_denjuu.asm new file mode 100755 index 0000000..6cf7301 --- /dev/null +++ b/data/scripted_denjuu.asm @@ -0,0 +1,199 @@ + db NEJIRO, 6, 20, 1, 3 + db PUNICA, 8, 20, 1, 1 + db SUGURI, 12, 20, 1, 7 + db GUMI, 14, 20, 1, 2 + db CORTOS, 28, 30, 1, 1 + db PUNKHORO, 32, 30, 1, 5 + db LAMPGERA, 34, 30, 1, 7 + db WARATAH, 32, 30, 1, 9 + db OCTORIFLE, 50, 30, 1, 2 + db SAIOPE, 53, 30, 1, 4 + db DIPSACUS, 56, 30, 1, 6 + db GAIURUS, 60, 30, 1, 2 + db GYPSOPHI, 62, 30, 1, 1 + db YARROW, 68, 30, 1, 7 + db GOLAKING, 70, 30, 1, 9 + db DOOMSDAY, 72, 30, 1, 2 + db VIBURNUM, 37, 20, 1, 3 + db VIBURNUM, 37, 20, 1, 1 + db VIBURNUM, 38, 20, 1, 3 + db VIBURNUM, 39, 20, 1, 1 + db VIBURNUM, 40, 20, 1, 7 + db MIDOTOR, 37, 20, 1, 3 + db MIDOTOR, 37, 20, 1, 1 +IF DEF(POWER) + db MIDOTOR, 38, 30, 1, 2 + db MIDOTOR, 39, 30, 1, 1 + db MIDOTOR, 40, 30, 1, 7 + db GAIURUS, 37, 30, 1, 9 + db GAIURUS, 37, 30, 1, 2 + db GAIURUS, 38, 30, 1, 1 + db GAIURUS, 39, 30, 1, 2 + db GAIURUS, 40, 30, 1, 1 + db GAIURUS, 40, 30, 1, 7 + db BOUVARDI, 37, 30, 1, 9 + db BOUVARDI, 37, 30, 1, 2 + db BOUVARDI, 38, 30, 1, 1 +ELSE + db MIDOTOR, 38, 20, 1, 7 + db MIDOTOR, 39, 20, 1, 2 + db MIDOTOR, 40, 30, 1, 1 + db ERYNGO, 37, 30, 1, 5 + db ERYNGO, 37, 30, 1, 7 + db ERYNGO, 38, 30, 1, 9 + db ERYNGO, 39, 30, 1, 2 + db ERYNGO, 40, 30, 1, 4 + db ERYNGO, 40, 30, 1, 6 + db BOUVARDI, 37, 30, 1, 2 + db BOUVARDI, 37, 30, 1, 1 + db BOUVARDI, 38, 30, 1, 7 +ENDC + db BOUVARDI, 39, 30, 1, 9 + db BOUVARDI, 40, 30, 1, 2 + db BOUVARDI, 40, 30, 1, 1 + db SCORPIL, 44, 30, 1, 2 + db SCORPIL, 44, 30, 1, 1 + db SCORPIL, 45, 30, 1, 7 + db SCORPIL, 45, 30, 1, 2 + db RAIGALEON, 44, 30, 1, 1 + db RAIGALEON, 44, 30, 1, 7 + db RAIGALEON, 45, 30, 1, 9 + db RAIGALEON, 45, 30, 1, 2 + db RAIGALEON, 45, 30, 1, 1 + db ALPHAGOS, 44, 30, 1, 7 + db ALPHAGOS, 44, 30, 1, 2 + db ALPHAGOS, 45, 30, 1, 1 + db ALPHAGOS, 45, 30, 1, 7 + db ALPHAGOS, 45, 30, 1, 2 + db GAMAZUMI, 44, 30, 1, 1 + db GAMAZUMI, 44, 30, 1, 7 + db GAMAZUMI, 45, 30, 1, 9 + db GAMAZUMI, 45, 30, 1, 2 + db GAMAZUMI, 45, 30, 1, 1 + db WHITAH, 55, 30, 1, 7 + db WHITAH, 55, 30, 1, 2 + db WHITAH, 55, 30, 1, 1 + db GADORKUMA, 55, 30, 1, 5 + db GADORKUMA, 55, 30, 1, 7 + db GADORKUMA, 55, 30, 1, 9 + db PUNEEDLE, 55, 30, 1, 2 + db PUNEEDLE, 55, 30, 1, 4 + db PUNEEDLE, 55, 30, 1, 6 + db DIPSACUS, 55, 30, 1, 2 + db DIPSACUS, 55, 30, 1, 1 +IF DEF(POWER) + db TULBAGHIA, 62, 20, 1, 3 + db TULBAGHIA, 62, 20, 1, 1 + db TULBAGHIA, 62, 20, 1, 7 + db TULBAGHIA, 62, 20, 1, 2 + db TULBAGHIA, 62, 30, 1, 1 + db TULBAGHIA, 62, 30, 1, 5 + db TULBAGHIA, 62, 30, 1, 7 + db KIRINGIKU, 62, 30, 1, 9 + db KIRINGIKU, 62, 30, 1, 2 + db KIRINGIKU, 62, 30, 1, 4 + db KIRINGIKU, 62, 30, 1, 6 + db KIRINGIKU, 62, 30, 1, 2 + db KIRINGIKU, 62, 30, 1, 1 + db KIRINGIKU, 62, 30, 1, 7 + db MACHURUS, 62, 30, 1, 9 + db MACHURUS, 62, 30, 1, 2 + db MACHURUS, 62, 20, 1, 3 + db MACHURUS, 62, 20, 1, 1 + db MACHURUS, 62, 20, 1, 7 + db MACHURUS, 62, 20, 1, 3 + db MUMMYBOAR, 62, 20, 1, 1 + db MUMMYBOAR, 62, 20, 1, 3 + db MUMMYBOAR, 62, 20, 1, 3 + db MUMMYBOAR, 62, 20, 1, 1 + db MUMMYBOAR, 62, 20, 1, 7 + db MUMMYBOAR, 62, 20, 1, 2 + db WARUTAH, 62, 30, 1, 1 + db WARUTAH, 62, 30, 1, 5 + db WARUTAH, 62, 30, 1, 7 + db WARUTAH, 62, 30, 1, 9 + db WARUTAH, 62, 30, 1, 2 + db WARUTAH, 62, 30, 1, 4 +ELSE + db MAORAN, 62, 20, 1, 3 + db MAORAN, 62, 20, 1, 1 + db MAORAN, 62, 20, 1, 7 + db MAORAN, 62, 20, 1, 2 + db MAORAN, 62, 30, 1, 1 + db MAORAN, 62, 30, 1, 5 + db MAORAN, 62, 30, 1, 7 + db GONUM, 62, 30, 1, 9 + db GONUM, 62, 30, 1, 2 + db GONUM, 62, 30, 1, 4 + db GONUM, 62, 30, 1, 6 + db GONUM, 62, 30, 1, 2 + db GONUM, 62, 30, 1, 1 + db GONUM, 62, 30, 1, 7 + db GENTIANA, 62, 30, 1, 9 + db GENTIANA, 62, 30, 1, 2 + db GENTIANA, 62, 20, 1, 3 + db GENTIANA, 62, 20, 1, 1 + db GENTIANA, 62, 20, 1, 7 + db GENTIANA, 62, 20, 1, 3 + db BASHOU, 62, 20, 1, 1 + db BASHOU, 62, 20, 1, 3 + db BASHOU, 62, 20, 1, 3 + db BASHOU, 62, 20, 1, 1 + db BASHOU, 62, 20, 1, 7 + db BASHOU, 62, 20, 1, 2 + db BADHORO, 62, 30, 1, 1 + db BADHORO, 62, 30, 1, 5 + db BADHORO, 62, 30, 1, 7 + db BADHORO, 62, 30, 1, 9 + db BADHORO, 62, 30, 1, 2 + db BADHORO, 62, 30, 1, 4 +ENDC + db GUNTZATL, 62, 30, 1, 6 + db GUNTZATL, 62, 30, 1, 2 + db GUNTZATL, 62, 30, 1, 1 + db GUNTZATL, 62, 30, 1, 7 + db GUNTZATL, 62, 30, 1, 9 + db GUNTZATL, 62, 30, 1, 2 + db MANTEA, 15, 30, 1, 1 + db LYCHNIS, 15, 30, 1, 5 + db PAMPAS, 15, 30, 1, 7 + db UIKYOU, 15, 30, 1, 1 + db MANTEA, 16, 30, 1, 5 + db LYCHNIS, 16, 30, 1, 7 + db PAMPAS, 16, 30, 1, 9 + db UIKYOU, 16, 30, 1, 5 + db MANTEA, 15, 30, 1, 7 + db LYCHNIS, 16, 30, 1, 9 + db OCTOR, 18, 20, 1, 3 + db OBANA, 18, 20, 1, 3 +IF DEF(POWER) + db IXORA, 18, 20, 1, 1 + db MYRTUS, 18, 20, 1, 7 +ELSE + db RHODANTHE, 18, 20, 1, 1 + db LICORICE, 18, 20, 1, 7 +ENDC + db SORGHUM, 18, 20, 1, 2 + db OCTOR, 19, 30, 1, 1 + db OBANA, 19, 30, 1, 5 +IF DEF(POWER) + db IXORA, 19, 30, 1, 7 + db MYRTUS, 19, 30, 1, 9 +ELSE + db RHODANTHE, 19, 30, 1, 7 + db LICORICE, 19, 30, 1, 9 +ENDC + db SORGHUM, 19, 30, 1, 2 +IF DEF(POWER) + db POTZAL, 26, 30, 1, 1 +ELSE + db POTZAL, 16, 30, 1, 1 +ENDC + db WORMITERALA, 38, 30, 3, 2 + db WORMITERALA, 39, 20, 1, 1 + db WORMITERALA, 37, 20, 5, 7 + db WORMITERALA, 35, 20, 6, 2 + db GODETIA, 36, 30, 4, 1 + db GODETIA, 37, 30, 8, 10 + db GODETIA, 36, 30, 1, 1 + db GYPSOPHI, 99, 30, 1, 8 diff --git a/data/tfanger_parties.asm b/data/tfanger_parties.asm new file mode 100755 index 0000000..b7f6949 --- /dev/null +++ b/data/tfanger_parties.asm @@ -0,0 +1,789 @@ +IF DEF(POWER) +; TFanger 01 + db KESHI, 8, 0, 50, 6, 6 + db OSHE, 5, 0, 20, 2, 2 + db 0, 0, 0, 0, 0, 0 +ELSE +; TFanger 01 + db TSUNONASU, 8, 0, 50, 6, 6 + db OSHE, 5, 0, 20, 2, 2 + db 0, 0, 0, 0, 0, 0 +ENDC + +; TFanger 02 + db SUGURI, 8, 0, 50, 3, 3 + db PAMPAS, 7, 0, 20, 1, 1 + db 0, 0, 0, 0, 0, 0 + +; TFanger 03 + db NORIUTSUGI, 10, 0, 50, 1, 1 + db PUNICA, 8, 0, 30, 10, 10 + db MYRTUS, 5, 0, 20, 8, 8 + +; TFanger 04 + db RHODANTHE, 9, 0, 50, 7, 7 + db 0, 0, 0, 0, 0, 0 + db 0, 0, 0, 0, 0, 0 + +; TFanger 05 + db NORIUTSUGI, 10, 0, 50, 9, 9 + db 0, 0, 0, 0, 0, 0 + db 0, 0, 0, 0, 0, 0 + +IF DEF(POWER) +; TFanger 06 + db NORIUTSUGI, 10, 0, 50, 3, 3 + db KESHI, 8, 0, 20, 4, 4 + db 0, 0, 0, 0, 0, 0 + +; TFanger 07 + db IXORA, 11, 0, 50, 1, 1 + db LICORICE, 8, 0, 50, 10, 10 + db 0, 0, 0, 0, 0, 0 +ELSE +; TFanger 06 + db TSUNONASU, 10, 0, 50, 3, 3 + db NORIUTSUGI, 8, 0, 20, 4, 4 + db TSUNONASU, 0, 0, 0, 5, 5 + +; TFanger 07 + db IXORA, 11, 0, 50, 1, 1 + db RHODANTHE, 8, 0, 50, 10, 10 + db 0, 0, 0, 0, 0, 0 +ENDC + +; TFanger 08 + db LICORICE, 9, 0, 50, 9, 9 + db IXORA, 9, 0, 50, 1, 1 + db 0, 0, 0, 0, 0, 0 + +; TFanger 09 + db LAPEIROUSIA, 10, 0, 50, 1, 1 + db PUNICA, 8, 0, 50, 11, 11 + db 0, 0, 0, 0, 0, 0 + +; TFanger 10 + db LAPEIROUSIA, 10, 0, 50, 6, 6 + db PUNICA, 9, 0, 50, 4, 4 + db 0, 0, 0, 0, 0, 0 + +; TFanger 11 + db SORGHUM, 13, 0, 50, 9, 9 + db LICORICE, 10, 0, 50, 3, 3 + db SUGURI, 10, 0, 30, 10, 10 + +IF DEF(POWER) +; TFanger 12 + db ANGIOS, 20, 2, 50, 9, 9 + db 0, 0, 0, 0, 0, 0 + db 0, 0, 0, 0, 0, 0 + +; TFanger 13 + db ANGIOS, 60, 11, 50, 5, 5 + db RAYGIRTH, 56, 11, 50, 3, 3 + db 0, 0, 0, 0, 0, 0 + +ELSE +; TFanger 12 + db GYMNOS, 20, 2, 50, 9, 9 + db 0, 0, 0, 0, 0, 0 + db 0, 0, 0, 0, 0, 0 + +; TFanger 13 + db GYMNOS, 60, 11, 50, 5, 5 + db RAYGIRTH, 56, 11, 50, 3, 3 + db 0, 0, 0, 0, 0, 0 +ENDC + +; TFanger 14 + db GENTIANA, 64, 13, 50, 3, 3 + db DIPSACUS, 62, 13, 50, 3, 3 + db MAORAN, 61, 13, 50, 4, 4 + +; TFanger 15 + db KOCHIA, 18, 2, 50, 9, 9 + db MONSTERA, 18, 0, 50, 10, 10 + db 0, 0, 0, 0, 0, 0 + +; TFanger 16 + db NORIUTSUGI, 19, 2, 50, 11, 11 + db OSHE, 19, 2, 50, 2, 2 + db 0, 0, 0, 0, 0, 0 + +IF DEF(POWER) +; TFanger 17 + db HIOUGI, 20, 2, 50, 3, 3 + db GUMI, 20, 2, 50, 5, 5 + db 0, 0, 0, 0, 0, 0 + +; TFanger 18 + db MYRTUS, 24, 2, 50, 4, 4 + db KOCHIA, 24, 0, 50, 4, 4 + db PUNICA, 24, 2, 50, 0, 0 + +; TFanger 19 + db GANRAIKOU, 25, 2, 50, 1, 1 + db HIOUGI, 25, 3, 50, 3, 3 + db OSHE, 25, 0, 50, 9, 9 + +; TFanger 20 + db DRILARMOR, 26, 4, 50, 8, 8 + db IXORA, 26, 4, 50, 5, 5 + db NORIUTSUGI, 26, 1, 50, 2, 2 + +; TFanger 21 + db DRILARMOR, 32, 17, 50, 1, 1 + db BYAKUBU, 32, 17, 50, 6, 6 + db 0, 0, 0, 0, 0, 0 + +; TFanger 22 + db SHELLSTERA, 32, 17, 50, 7, 7 + db LICORICE, 32, 17, 50, 6, 6 + db 0, 0, 0, 0, 0, 0 +ELSE +; TFanger 17 + db BUBARIA, 20, 2, 50, 3, 3 + db GUMI, 20, 2, 50, 5, 5 + db 0, 0, 0, 0, 0, 0 + +; TFanger 18 + db LICORICE, 24, 2, 50, 4, 4 + db KOCHIA, 24, 0, 50, 4, 4 + db PUNICA, 24, 2, 50, 0, 0 + +; TFanger 19 + db GANRAIKOU, 25, 2, 50, 1, 1 + db BUBARIA, 25, 3, 50, 3, 3 + db OSHE, 25, 0, 50, 9, 9 + +; TFanger 20 + db DRILARMOR, 26, 4, 50, 8, 8 + db RHODANTHE, 26, 4, 50, 5, 5 + db NORIUTSUGI, 26, 1, 50, 2, 2 + +; TFanger 21 + db DRILARMOR, 32, 17, 50, 1, 1 + db ERYNGO, 32, 17, 50, 6, 6 + db TSUNONASU, 0, 17, 0, 6, 6 + +; TFanger 22 + db LICORICE, 32, 17, 50, 7, 7 + db SHELLSTERA, 32, 17, 50, 6, 6 + db 0, 0, 0, 0, 0, 0 +ENDC + +; TFanger 23 + db PAMPAS, 32, 17, 50, 1, 1 + db SHELLSTERA, 32, 17, 50, 2, 2 + db 0, 0, 0, 0, 0, 0 + +IF DEF(POWER) +; TFanger 24 + db BUBARIA, 32, 17, 50, 9, 9 + db BERZELIA, 32, 17, 50, 2, 2 + db 0, 0, 0, 0, 0, 0 +ELSE +; TFanger 24 + db SHELLSTERA, 32, 17, 50, 9, 9 + db BERZELIA, 32, 17, 50, 2, 2 + db 0, 0, 0, 0, 0, 0 +ENDC + +; TFanger 25 + db GERON, 32, 17, 50, 8, 8 + db GANRAIKOU, 32, 17, 50, 9, 9 + db 0, 0, 0, 0, 0, 0 + +IF DEF(POWER) +; TFanger 26 + db WARUTAH, 53, 6, 50, 3, 3 + db FIREKOKKO, 48, 6, 50, 2, 2 + db HITODEIGHT, 47, 6, 50, 2, 2 + +; TFanger 27 + db GUNTZATL, 53, 6, 50, 9, 9 + db SHELLSTERA, 48, 6, 50, 9, 9 + db GHOSBOAR, 47, 6, 50, 1, 1 + +; TFanger 28 + db BALLTAMUS, 53, 6, 50, 2, 2 + db BERZELIA, 50, 6, 50, 5, 5 + db WORMITERALA, 47, 6, 50, 1, 1 + +; TFanger 29 + db ZUDOON, 51, 6, 50, 3, 3 + db HELIOPSIS, 50, 6, 50, 3, 3 + db MIDOTOR, 47, 6, 50, 0, 0 + +; TFanger 30 + db HELIOPSIS, 53, 6, 50, 1, 1 + db CHAMELAN, 47, 6, 50, 10, 10 + db OBANA, 47, 6, 50, 1, 1 + +; TFanger 31 + db CHAMELAN, 49, 9, 50, 7, 7 + db BERZELIA, 50, 9, 50, 5, 5 + db HELIOPSIS, 49, 9, 50, 3, 3 +ELSE +; TFanger 26 + db WARUTAH, 53, 6, 50, 3, 3 + db FIREKOKKO, 48, 6, 50, 2, 2 + db GADHORO, 47, 6, 50, 2, 2 + +; TFanger 27 + db GUNTZATL, 53, 6, 50, 9, 9 + db SHELLSTERA, 48, 6, 50, 9, 9 + db ARANEIDA, 47, 6, 50, 1, 1 + +; TFanger 28 + db BADHORO, 53, 6, 50, 2, 2 + db BERZELIA, 50, 6, 50, 5, 5 + db WORMITERALA, 47, 6, 50, 1, 1 + +; TFanger 29 + db ARAKUIDA, 51, 6, 50, 3, 3 + db HELIOPSIS, 50, 6, 50, 3, 3 + db REIGE, 47, 6, 50, 0, 0 + +; TFanger 30 + db KIYORUKA, 53, 6, 50, 1, 1 + db DRILARMOR, 47, 6, 50, 10, 10 + db OBANA, 47, 6, 50, 1, 1 + +; TFanger 31 + db ZUDOON, 49, 9, 50, 7, 7 + db BERZELIA, 50, 9, 50, 5, 5 + db HELIOPSIS, 49, 9, 50, 3, 3 +ENDC + +; TFanger 32 + db GAMAZUMI, 51, 9, 50, 6, 6 + db WARUTAH, 50, 9, 50, 8, 8 + db BURENICA, 52, 9, 50, 3, 3 + +; TFanger 33 + db GUNTZATL, 50, 9, 50, 5, 5 + db BOUVARDI, 51, 9, 50, 3, 3 + db FIREKOKKO, 50, 9, 50, 1, 1 + +; TFanger 34 + db FIREKOKKO, 48, 11, 50, 10, 10 + db RAYGOTEN, 49, 11, 50, 8, 8 + db SORGHUM, 47, 11, 50, 0, 0 + +IF DEF(POWER) +; TFanger 35 + db CHAMELAN, 46, 11, 50, 0, 0 + db DRILARMOR, 46, 11, 50, 7, 7 + db GODETIA, 46, 11, 50, 3, 3 +ELSE +; TFanger 35 + db ARAKUIDA, 46, 11, 50, 0, 0 + db DRILARMOR, 46, 11, 50, 7, 7 + db GODETIA, 46, 11, 50, 3, 3 +ENDC + +; TFanger 36 + db BURENICA, 47, 11, 50, 11, 11 + db SHELLSTERA, 48, 11, 50, 4, 4 + db NIGELLA, 48, 11, 50, 5, 5 + +; TFanger 37 + db RAYGOTEN, 47, 11, 50, 7, 7 + db GERON, 47, 11, 50, 4, 4 + db OBANA, 47, 11, 50, 10, 10 + +; TFanger 38 + db FIREKOKKO, 49, 11, 50, 4, 4 + db GODETIA, 49, 11, 50, 6, 6 + db ARMARU, 48, 11, 50, 7, 7 + +IF DEF(POWER) +; TFanger 39 + db DIPSACUS, 56, 12, 50, 4, 4 + db CHAMELAN, 54, 12, 50, 3, 3 + db CORTOS, 54, 12, 50, 11, 11 + +; TFanger 40 + db GAMAZUMI, 53, 12, 50, 3, 3 + db BALLTAMUS, 55, 12, 50, 5, 5 + db SCORPIL, 52, 12, 50, 4, 4 + +; TFanger 41 + db KIYORUKA, 54, 11, 50, 8, 8 + db SHELLSTERA, 54, 12, 50, 8, 8 + db POTZAL, 51, 12, 50, 2, 2 + +; TFanger 42 + db PAPAVER, 53, 11, 50, 6, 6 + db RAYGOTEN, 54, 12, 50, 9, 9 + db RAIGALEON, 55, 11, 50, 2, 2 +ELSE +; TFanger 39 + db DIPSACUS, 55, 12, 50, 4, 4 + db TEMPEST, 55, 12, 50, 3, 3 + db CORTOS, 55, 12, 50, 11, 11 + +; TFanger 40 + db GAMAZUMI, 55, 12, 50, 3, 3 + db ZUDOON, 55, 12, 50, 5, 5 + db SCORPIL, 55, 12, 50, 4, 4 + +; TFanger 41 + db KIYORUKA, 55, 11, 50, 8, 8 + db SHELLSTERA, 55, 12, 50, 8, 8 + db POTZAL, 55, 12, 50, 2, 2 + +; TFanger 42 + db PAPAVER, 55, 11, 50, 6, 6 + db RAYGOTEN, 55, 12, 50, 9, 9 + db RAIGALEON, 55, 11, 50, 2, 2 +ENDC + +; TFanger 43 + db DRILARMOR, 32, 17, 50, 1, 1 + db DRILARMOR, 30, 17, 50, 6, 6 + db 0, 0, 0, 0, 0, 0 + +IF DEF(POWER) +; TFanger 44 + db SHELLSTERA, 31, 17, 50, 7, 7 + db SHELLSTERA, 32, 17, 50, 6, 6 + db 0, 0, 0, 0, 0, 0 + +; TFanger 45 + db PAMPAS, 32, 17, 50, 1, 1 + db SHELLSTERA, 29, 17, 50, 2, 2 + db DRILARMOR, 30, 17, 50, 4, 4 + +; TFanger 46 + db BUBARIA, 33, 17, 50, 9, 9 + db BUBARIA, 28, 17, 50, 2, 2 + db 0, 0, 0, 0, 0, 0 + +; TFanger 47 + db GERON, 32, 17, 50, 8, 8 + db GANRAIKOU, 29, 17, 50, 9, 9 + db GODETIA, 29, 17, 50, 9, 9 + +; TFanger 48 + db DRILARMOR, 30, 17, 50, 1, 1 + db DRILARMOR, 30, 17, 50, 6, 6 + db 0, 0, 0, 0, 0, 0 + +; TFanger 49 + db SHELLSTERA, 31, 17, 50, 7, 7 + db LICORICE, 27, 17, 50, 6, 6 + db 0, 0, 0, 0, 0, 0 + +; TFanger 50 + db SHELLSTERA, 30, 17, 50, 1, 1 + db SHELLSTERA, 31, 17, 50, 2, 2 + db 0, 0, 0, 0, 0, 0 + +; TFanger 51 + db BERZELIA, 27, 17, 50, 9, 9 + db BERZELIA, 26, 17, 50, 2, 2 + db 0, 0, 0, 0, 0, 0 + +; TFanger 52 + db GODETIA, 30, 17, 50, 8, 8 + db GODETIA, 29, 17, 50, 9, 9 + db 0, 0, 0, 0, 0, 0 + +; TFanger 53 + db FIREKOKKO, 53, 6, 50, 3, 3 + db FIREKOKKO, 48, 6, 50, 2, 2 + db FIREKOKKO, 47, 6, 50, 2, 2 + +; TFanger 54 + db GHOSBOAR, 53, 6, 50, 9, 9 + db FIREKOKKO, 48, 6, 50, 9, 9 + db GHOSBOAR, 47, 6, 50, 1, 1 + +; TFanger 55 + db BALLTAMUS, 53, 6, 50, 2, 2 + db WORMITERALA, 50, 6, 50, 5, 5 + db WORMITERALA, 47, 6, 50, 1, 1 + +; TFanger 56 + db ZUDOON, 51, 6, 50, 3, 3 + db ZUDOON, 50, 6, 50, 3, 3 + db MIDOTOR, 47, 6, 50, 0, 0 + +; TFanger 57 + db HELIOPSIS, 53, 6, 50, 1, 1 + db HELIOPSIS, 47, 6, 50, 10, 10 + db HELIOPSIS, 47, 6, 50, 1, 1 + +; TFanger 58 + db HITODEIGHT, 53, 6, 50, 3, 3 + db FIREKOKKO, 48, 6, 50, 2, 2 + db HITODEIGHT, 47, 6, 50, 2, 2 + +; TFanger 59 + db SHELLSTERA, 53, 6, 50, 9, 9 + db SHELLSTERA, 48, 6, 50, 9, 9 + db GHOSBOAR, 47, 6, 50, 1, 1 + +; TFanger 60 + db BALLTAMUS, 53, 6, 50, 2, 2 + db BERZELIA, 50, 6, 50, 5, 5 + db BALLTAMUS, 47, 6, 50, 1, 1 + +; TFanger 61 + db ZUDOON, 51, 6, 50, 3, 3 + db HELIOPSIS, 50, 6, 50, 3, 3 + db HELIOPSIS, 47, 6, 50, 0, 0 + +; TFanger 62 + db CHAMELAN, 53, 6, 50, 1, 1 + db CHAMELAN, 47, 6, 50, 10, 10 + db OBANA, 47, 6, 50, 1, 1 + +; TFanger 63 + db CHAMELAN, 49, 9, 50, 7, 7 + db CHAMELAN, 50, 9, 50, 5, 5 + db HELIOPSIS, 49, 9, 50, 3, 3 + +; TFanger 64 + db GAMAZUMI, 51, 9, 50, 6, 6 + db WARUTAH, 50, 9, 50, 8, 8 + db GAMAZUMI, 52, 9, 50, 3, 3 + +; TFanger 65 + db BOUVARDI, 50, 9, 50, 5, 5 + db BOUVARDI, 51, 9, 50, 3, 3 + db BOUVARDI, 50, 9, 50, 1, 1 + +; TFanger 66 + db CHAMELAN, 49, 9, 50, 7, 7 + db BERZELIA, 50, 9, 50, 5, 5 + db BERZELIA, 49, 9, 50, 3, 3 + +; TFanger 67 + db GAMAZUMI, 51, 9, 50, 6, 6 + db BURENICA, 50, 9, 50, 8, 8 + db BURENICA, 52, 9, 50, 3, 3 + +; TFanger 68 + db GUNTZATL, 50, 9, 50, 5, 5 + db BOUVARDI, 51, 9, 50, 3, 3 + db GUNTZATL, 50, 9, 50, 1, 1 + +; TFanger 69 + db FIREKOKKO, 48, 11, 50, 10, 10 + db RAYGOTEN, 49, 11, 50, 8, 8 + db RAYGOTEN, 46, 11, 50, 0, 0 + +; TFanger 70 + db CHAMELAN, 46, 11, 50, 0, 0 + db CHAMELAN, 43, 11, 50, 7, 7 + db GODETIA, 46, 11, 50, 3, 3 + +; TFanger 71 + db BURENICA, 47, 11, 50, 11, 11 + db SHELLSTERA, 46, 11, 50, 4, 4 + db BURENICA, 48, 11, 50, 5, 5 + +; TFanger 72 + db GERON, 47, 11, 50, 7, 7 + db GERON, 45, 11, 50, 4, 4 + db OBANA, 47, 11, 50, 10, 10 + +; TFanger 73 + db GODETIA, 49, 11, 50, 4, 4 + db GODETIA, 48, 11, 50, 6, 6 + db GODETIA, 48, 11, 50, 7, 7 + +; TFanger 74 + db FIREKOKKO, 48, 11, 50, 10, 10 + db RAYGOTEN, 49, 11, 50, 8, 8 + db RAYGOTEN, 47, 11, 50, 0, 0 + +; TFanger 75 + db GODETIA, 46, 11, 50, 0, 0 + db DRILARMOR, 43, 11, 50, 7, 7 + db GODETIA, 47, 11, 50, 3, 3 + +; TFanger 76 + db BURENICA, 47, 11, 50, 11, 11 + db NIGELLA, 48, 11, 50, 4, 4 + db NIGELLA, 46, 11, 50, 5, 5 + +; TFanger 77 + db OBANA, 47, 11, 50, 7, 7 + db GERON, 46, 11, 50, 4, 4 + db OBANA, 45, 11, 50, 10, 10 + +; TFanger 78 + db GERON, 49, 11, 50, 4, 4 + db GODETIA, 48, 11, 50, 6, 6 + db OBANA, 47, 11, 50, 7, 7 + +; TFanger 79 + db DIPSACUS, 56, 12, 50, 4, 4 + db CORTOS, 54, 12, 50, 3, 3 + db CORTOS, 54, 12, 50, 11, 11 + +; TFanger 80 + db GAMAZUMI, 53, 12, 50, 3, 3 + db DIPSACUS, 55, 12, 50, 5, 5 + db GAMAZUMI, 52, 12, 50, 4, 4 + +; TFanger 81 + db SHELLSTERA, 54, 11, 50, 8, 8 + db SHELLSTERA, 54, 12, 50, 8, 8 + db POTZAL, 51, 12, 50, 2, 2 + +; TFanger 82 + db RAIGALEON, 53, 11, 50, 6, 6 + db RAIGALEON, 54, 12, 50, 9, 9 + db RAIGALEON, 55, 11, 50, 2, 2 + +; TFanger 83 + db DIPSACUS, 56, 12, 50, 4, 4 + db CHAMELAN, 54, 12, 50, 3, 3 + db DIPSACUS, 52, 12, 50, 11, 11 + +; TFanger 84 + db GAMAZUMI, 53, 12, 50, 3, 3 + db GAMAZUMI, 56, 12, 50, 5, 5 + db GAMAZUMI, 55, 12, 50, 4, 4 + +; TFanger 85 + db POTZAL, 54, 11, 50, 8, 8 + db SHELLSTERA, 52, 12, 50, 8, 8 + db POTZAL, 55, 12, 50, 2, 2 + +; TFanger 86 + db RAYGOTEN, 57, 11, 50, 6, 6 + db RAYGOTEN, 50, 12, 50, 9, 9 + db RAIGALEON, 50, 11, 50, 2, 2 +ELSE +; TFanger 44 + db LICORICE, 31, 17, 50, 7, 7 + db SHELLSTERA, 32, 17, 50, 6, 6 + db 0, 0, 0, 0, 0, 0 + +; TFanger 45 + db PAMPAS, 32, 17, 50, 1, 1 + db PAMPAS, 29, 17, 50, 2, 2 + db 0, 0, 0, 0, 0, 0 + +; TFanger 46 + db SHELLSTERA, 33, 17, 50, 9, 9 + db BERZELIA, 28, 17, 50, 2, 2 + db BERZELIA, 32, 17, 50, 3, 3 + +; TFanger 47 + db GERON, 32, 17, 50, 8, 8 + db GANRAIKOU, 29, 17, 50, 9, 9 + db GANRAIKOU, 29, 17, 50, 9, 9 + +; TFanger 48 + db ERYNGO, 30, 17, 50, 1, 1 + db ERYNGO, 30, 17, 50, 6, 6 + db 0, 0, 0, 0, 0, 0 + +; TFanger 49 + db LICORICE, 31, 17, 50, 7, 7 + db LICORICE, 27, 17, 50, 6, 6 + db 0, 0, 0, 0, 0, 0 + +; TFanger 50 + db DRILARMOR, 30, 17, 50, 1, 1 + db DRILARMOR, 31, 17, 50, 2, 2 + db 0, 0, 0, 0, 0, 0 + +; TFanger 51 + db SHELLSTERA, 27, 17, 50, 9, 9 + db BERZELIA, 26, 17, 50, 2, 2 + db SHELLSTERA, 33, 17, 50, 3, 3 + +; TFanger 52 + db SHELLSTERA, 30, 17, 50, 8, 8 + db SHELLSTERA, 29, 17, 50, 9, 9 + db 0, 0, 0, 0, 0, 0 + +; TFanger 53 + db WARUTAH, 53, 6, 50, 3, 3 + db WARUTAH, 48, 6, 50, 2, 2 + db WARUTAH, 47, 6, 50, 2, 2 + +; TFanger 54 + db GUNTZATL, 53, 6, 50, 9, 9 + db SHELLSTERA, 48, 6, 50, 9, 9 + db SHELLSTERA, 47, 6, 50, 1, 1 + +; TFanger 55 + db BADHORO, 53, 6, 50, 2, 2 + db BERZELIA, 50, 6, 50, 5, 5 + db BADHORO, 47, 6, 50, 1, 1 + +; TFanger 56 + db ARAKUIDA, 51, 6, 50, 3, 3 + db HELIOPSIS, 50, 6, 50, 3, 3 + db REIGE, 47, 6, 50, 0, 0 + +; TFanger 57 + db KIYORUKA, 53, 6, 50, 1, 1 + db KIYORUKA, 47, 6, 50, 10, 10 + db KIYORUKA, 47, 6, 50, 1, 1 + +; TFanger 58 + db FIREKOKKO, 53, 6, 50, 3, 3 + db KIYORUKA, 48, 6, 50, 2, 2 + db FIREKOKKO, 47, 6, 50, 2, 2 + +; TFanger 59 + db SHELLSTERA, 53, 6, 50, 9, 9 + db GUNTZATL, 48, 6, 50, 9, 9 + db GUNTZATL, 47, 6, 50, 1, 1 + +; TFanger 60 + db BADHORO, 53, 6, 50, 2, 2 + db BERZELIA, 50, 6, 50, 5, 5 + db BERZELIA, 47, 6, 50, 1, 1 + +; TFanger 61 + db REIGE, 51, 6, 50, 3, 3 + db HELIOPSIS, 50, 6, 50, 3, 3 + db REIGE, 47, 6, 50, 0, 0 + +; TFanger 62 + db KIYORUKA, 53, 6, 50, 1, 1 + db KIYORUKA, 47, 6, 50, 10, 10 + db OBANA, 47, 6, 50, 1, 1 + +; TFanger 63 + db BERZELIA, 49, 9, 50, 7, 7 + db BERZELIA, 50, 9, 50, 5, 5 + db ZUDOON, 49, 9, 50, 3, 3 + +; TFanger 64 + db GAMAZUMI, 51, 9, 50, 6, 6 + db GAMAZUMI, 50, 9, 50, 8, 8 + db BURENICA, 52, 9, 50, 3, 3 + +; TFanger 65 + db GUNTZATL, 50, 9, 50, 5, 5 + db GUNTZATL, 51, 9, 50, 3, 3 + db FIREKOKKO, 50, 9, 50, 1, 1 + +; TFanger 66 + db ZUDOON, 49, 9, 50, 7, 7 + db GUNTZATL, 50, 9, 50, 5, 5 + db ZUDOON, 49, 9, 50, 3, 3 + +; TFanger 67 + db WARUTAH, 51, 9, 50, 6, 6 + db GAMAZUMI, 50, 9, 50, 8, 8 + db GAMAZUMI, 52, 9, 50, 3, 3 + +; TFanger 68 + db GUNTZATL, 50, 9, 50, 5, 5 + db GUNTZATL, 51, 9, 50, 3, 3 + db GUNTZATL, 50, 9, 50, 1, 1 + +; TFanger 69 + db RAYGOTEN, 48, 11, 50, 10, 10 + db SORGHUM, 49, 11, 50, 8, 8 + db SORGHUM, 46, 11, 50, 0, 0 + +; TFanger 70 + db GODETIA, 46, 11, 50, 0, 0 + db RAYGOTEN, 43, 11, 50, 7, 7 + db RAYGOTEN, 46, 11, 50, 3, 3 + +; TFanger 71 + db BURENICA, 47, 11, 50, 11, 11 + db BURENICA, 46, 11, 50, 4, 4 + db NIGELLA, 48, 11, 50, 5, 5 + +; TFanger 72 + db OBANA, 47, 11, 50, 7, 7 + db GERON, 45, 11, 50, 4, 4 + db OBANA, 47, 11, 50, 10, 10 + +; TFanger 73 + db GODETIA, 49, 11, 50, 4, 4 + db GODETIA, 48, 11, 50, 6, 6 + db ARMARU, 48, 11, 50, 7, 7 + +; TFanger 74 + db RAYGOTEN, 48, 11, 50, 10, 10 + db RAYGOTEN, 49, 11, 50, 8, 8 + db SORGHUM, 47, 11, 50, 0, 0 + +; TFanger 75 + db DRILARMOR, 46, 11, 50, 0, 0 + db DRILARMOR, 43, 11, 50, 7, 7 + db DRILARMOR, 47, 11, 50, 3, 3 + +; TFanger 76 + db BURENICA, 47, 11, 50, 11, 11 + db BURENICA, 48, 11, 50, 4, 4 + db NIGELLA, 46, 11, 50, 5, 5 + +; TFanger 77 + db RAYGOTEN, 47, 11, 50, 7, 7 + db GERON, 46, 11, 50, 4, 4 + db GERON, 45, 11, 50, 10, 10 + +; TFanger 78 + db FIREKOKKO, 49, 11, 50, 4, 4 + db GODETIA, 48, 11, 50, 6, 6 + db GODETIA, 47, 11, 50, 7, 7 + +; TFanger 79 + db DIPSACUS, 56, 12, 50, 4, 4 + db TEMPEST, 54, 12, 50, 3, 3 + db TEMPEST, 54, 12, 50, 11, 11 + +; TFanger 80 + db GAMAZUMI, 53, 12, 50, 3, 3 + db ZUDOON, 55, 12, 50, 5, 5 + db GAMAZUMI, 52, 12, 50, 4, 4 + +; TFanger 81 + db POTZAL, 54, 11, 50, 8, 8 + db SHELLSTERA, 54, 12, 50, 8, 8 + db POTZAL, 51, 12, 50, 2, 2 + +; TFanger 82 + db PAPAVER, 53, 11, 50, 6, 6 + db RAYGOTEN, 54, 12, 50, 9, 9 + db PAPAVER, 55, 11, 50, 2, 2 + +; TFanger 83 + db CORTOS, 56, 12, 50, 4, 4 + db TEMPEST, 54, 12, 50, 3, 3 + db CORTOS, 52, 12, 50, 11, 11 + +; TFanger 84 + db GAMAZUMI, 53, 12, 50, 3, 3 + db SCORPIL, 56, 12, 50, 5, 5 + db SCORPIL, 55, 12, 50, 4, 4 + +; TFanger 85 + db KIYORUKA, 54, 11, 50, 8, 8 + db SHELLSTERA, 52, 12, 50, 8, 8 + db KIYORUKA, 55, 12, 50, 2, 2 + +; TFanger 86 + db PAPAVER, 57, 11, 50, 6, 6 + db RAYGOTEN, 50, 12, 50, 9, 9 + db RAYGOTEN, 50, 11, 50, 2, 2 +ENDC + +; TFanger 87 + db BASHOU, 99, 15, 100, 11, 11 + db GENTIANA, 99, 15, 100, 11, 11 + db TESSEN, 99, 15, 100, 11, 11 + +; TFanger 88 + db PUNICA, 99, 15, 100, 11, 11 + db LIRIOPE, 99, 15, 100, 11, 11 + db NORIUTSUGI, 99, 15, 100, 11, 11 + diff --git a/home.asm b/home.asm index 9aa2b53..0623dd5 100755 --- a/home.asm +++ b/home.asm @@ -6898,16 +6898,17 @@ Func_3a1d: ; 3a1d (0:3a1d) ld de, wStringBuffer jp CopyData -Func_3a35: ; 3a35 (0:3a35) -; [wd45f] = Data_1d4b48 + ($10 * a) + c - ld hl, Data_1d4b48 - ld [wd497], a +GetBaseStat: ; 3a35 (0:3a35) +; [wCurBaseStat] = BaseStats + ($10 * a) + c +; level in b if applicable + ld hl, BaseStats + ld [wCurDenjuu], a cp $0 jr z, .first_row ld d, $0 ld a, $10 ld e, a - ld a, [wd497] + ld a, [wCurDenjuu] .row add hl, de dec a @@ -6918,7 +6919,7 @@ Func_3a35: ; 3a35 (0:3a35) ld e, a add hl, de ld a, [hl] - ld [wd45f], a + ld [wCurBaseStat], a ; if (c >= 6) or (b < 2): return ld a, c cp $6 @@ -6933,7 +6934,7 @@ Func_3a35: ; 3a35 (0:3a35) push de ld a, c ld b, a - ld a, [wd497] + ld a, [wCurDenjuu] call Func_05ed pop de ld a, e @@ -6953,10 +6954,10 @@ Func_3a35: ; 3a35 (0:3a35) sra d rr e .asm_3a88 - ld a, [wd45f] + ld a, [wCurBaseStat] ld a, a add e - ld [wd45f], a + ld [wCurBaseStat], a ret PlaceString: ; 3a91 (0:3a91) @@ -7057,10 +7058,10 @@ Func_3b09: ; 3b09 (0:3b09) jp PlaceString_ Func_3b22: ; 3b22 (0:3b22) - ld a, [wd497] + ld a, [wCurDenjuu] ld c, $d - call Func_058d - ld a, [wd45f] + call GetBaseStat_ + ld a, [wCurBaseStat] ld de, Data_1d5628 ld bc, VTilesBG tile $38 jp Func_3b09 @@ -7523,60 +7524,60 @@ Func_3e19:: pop hl jp PlaceString_ -Func_3e45: ; 3e45 (0:3e45) - ld hl, Data_9cbfa +LoadScriptedEnemyDenjuu: ; 3e45 (0:3e45) + ld hl, ScriptedEnemyDenjuu ld de, $5 ld a, [wd402] addntimes_hl_de ld a, [hli] - ld [wd542], a + ld [wEnemyDenjuu1Species], a ld a, [hli] - ld [wd543], a + ld [wEnemyDenjuu1Level], a ld a, [hli] - ld [wd54c], a + ld [wEnemyDenjuu1Field0x0a], a inc hl ld a, [hl] - ld [wd54e], a + ld [wEnemyDenjuu1Field0x0c], a ret -Func_3e68: ; 3e68 (0:3e68) - ld hl, Data_9ce9d +LoadEnemyTFangerParty: ; 3e68 (0:3e68) + ld hl, EnemyTFangerParties ld de, $12 ld a, [wd402] addntimes_hl_de ld a, [hli] - ld [wd542], a + ld [wEnemyDenjuu1Species], a ld a, [hli] - ld [wd543], a + ld [wEnemyDenjuu1Level], a ld a, [hli] - ld [wd54a], a + ld [wEnemyDenjuu1Field0x08], a ld a, [hli] - ld [wd54c], a + ld [wEnemyDenjuu1Field0x0a], a inc hl ld a, [hli] - ld [wd54e], a + ld [wEnemyDenjuu1Field0x0c], a ld a, [hli] - ld [wd558], a + ld [wEnemyDenjuu2Species], a ld a, [hli] - ld [wd559], a + ld [wEnemyDenjuu2Level], a ld a, [hli] - ld [wd560], a + ld [wEnemyDenjuu2Field0x08], a ld a, [hli] - ld [wd562], a + ld [wEnemyDenjuu2Field0x0a], a inc hl ld a, [hli] - ld [wd564], a + ld [wEnemyDenjuu2Field0x0c], a ld a, [hli] - ld [wd56e], a + ld [wEnemyDenjuu3Species], a ld a, [hli] - ld [wd56f], a + ld [wEnemyDenjuu3Level], a ld a, [hli] - ld [wd576], a + ld [wEnemyDenjuu3Field0x08], a ld a, [hli] - ld [wd578], a + ld [wEnemyDenjuu3Field0x0a], a inc hl ld a, [hl] - ld [wd57a], a + ld [wEnemyDenjuu3Field0x0c], a ret Func_3eb9 @@ -7653,10 +7654,10 @@ Func_3f22:: ret Func_3f2a:: - ld a, [wd586] + ld a, [wCurDenjuuBufferCurHP] cp $0 jr z, .asm_3f4a - ld a, [wd58b] + ld a, [wCurDenjuuBufferField0x07] cp $1 jr z, .asm_3f47 cp $4 diff --git a/home/farcall.asm b/home/farcall.asm index 2e5e506..2555d8b 100755 --- a/home/farcall.asm +++ b/home/farcall.asm @@ -174,7 +174,7 @@ PlaceString_:: rst MemBankswitch ret -Func_0565:: +GetAndPrintName75LeftAlign_:: call GetAndPrintName75LeftAlign rst MemBankswitch ret @@ -214,12 +214,12 @@ Func_0588:: rst MemBankswitch ret -Func_058d:: +GetBaseStat_:: push af - ld a, BANK(Data_1d4b48) + ld a, BANK(BaseStats) rst Bankswitch pop af - call Func_3a35 + call GetBaseStat rst MemBankswitch ret @@ -395,17 +395,17 @@ Func_0681:: rst MemBankswitch ret -Func_0689:: - ld a, BANK(Data_9cbfa) +LoadScriptedEnemyDenjuu_:: + ld a, BANK(ScriptedEnemyDenjuu) rst Bankswitch - call Func_3e45 + call LoadScriptedEnemyDenjuu rst MemBankswitch ret -Func_0691:: - ld a, BANK(Data_9ce9d) +LoadEnemyTFangerParty_:: + ld a, BANK(EnemyTFangerParties) rst Bankswitch - call Func_3e68 + call LoadEnemyTFangerParty ld hl, wOAMAnimations rst MemBankswitch ret diff --git a/macros.asm b/macros.asm index fb988e3..4ce790b 100755 --- a/macros.asm +++ b/macros.asm @@ -141,3 +141,28 @@ defchar: MACRO charmap \1, cur_char cur_char = cur_char + 1 ENDM + +battle_struct: MACRO +\1Species:: ds 1 +\1Level:: ds 1 +\1CurHP:: ds 1 +\1MaxHP:: ds 1 +\1Speed:: ds 1 +\1Field0x05:: ds 1 +\1Field0x06:: ds 1 +\1Field0x07:: ds 1 +\1Field0x08:: ds 1 +\1Field0x09:: ds 1 +\1Field0x0a:: ds 1 +\1Field0x0b:: ds 1 +\1Field0x0c:: ds 1 +\1Field0x0d:: ds 1 +\1Attack:: ds 1 +\1Defense:: ds 1 +\1SpAtk:: ds 1 +\1SpDef:: ds 1 +\1Field0x12:: ds 1 +\1SpeedCopy1:: ds 1 +\1SpeedCopy2:: ds 1 +\1Field0x15:: ds 1 +ENDM diff --git a/main.asm b/main.asm index c779a72..9a23e0b 100755 --- a/main.asm +++ b/main.asm @@ -791,10 +791,10 @@ String_8baf: Data_8bb7: db "トロンコむら$" db "クリノンむら$" - db "うみのみえるまち イ<リス$" - db "パ<ムかい$" + db "うみのみえるまち イーリス$" + db "パームかい$" db "キカイのまち フリジア$" - db "すなのまち バ<ラン$" + db "すなのまち バーラン$" db "イォンとう$" db "パパルナこ$" db "パンセスむら$" @@ -847,7 +847,7 @@ Func_8cac: ; 8cac (2:4cac) .asm_8cc4 call Func_8fe8 asm_8cc7 - ld a, [wd497] + ld a, [wCurDenjuu] push af ld c, $1 ld de, VTilesShared tile $00 @@ -870,7 +870,7 @@ Func_8cde: ; 8cde (2:4cde) jp Func_3cfd Func_8cf5: ; 8cf5 (2:4cf5) - ld a, [wd497] + ld a, [wCurDenjuu] ld de, VTilesBG tile $20 call Func_3d95 ld a, [wd499] @@ -893,7 +893,7 @@ Func_8cf5: ; 8cf5 (2:4cf5) jr .asm_8d37 .asm_8d2b - ld a, [wd497] + ld a, [wCurDenjuu] ld de, DenjuuNames ld bc, VTilesBG tile $30 call GetAndPrintName75CenterAlign @@ -1097,7 +1097,7 @@ Func_8e98: ; 8e98 (2:4e98) .asm_8eb5 call Func_8fe8 .asm_8eb8 - ld a, [wd497] + ld a, [wCurDenjuu] push af ld c, $1 ld de, VTilesShared tile $00 @@ -1106,7 +1106,7 @@ Func_8e98: ; 8e98 (2:4e98) call Func_175f ld a, $1 ld [wBGPalUpdate], a - ld a, [wd497] + ld a, [wCurDenjuu] ld de, VTilesBG tile $20 call Func_3d95 ld a, [wd499] @@ -1119,7 +1119,7 @@ Func_8e98: ; 8e98 (2:4e98) ld a, [wSubroutine] cp $1 jr nz, .asm_8eff - ld a, [wd497] + ld a, [wCurDenjuu] ld de, DenjuuNames ld bc, VTilesBG tile $30 call GetAndPrintName75CenterAlign @@ -1271,9 +1271,9 @@ Func_8fe8: ; 8fe8 (2:4fe8) ld hl, $a000 call Func_3d0e ld a, [hli] - ld [wd497], a + ld [wCurDenjuu], a ld a, [hli] - ld [wd498], a + ld [wCurDenjuuLevel], a inc hl ld a, [hl] ld [wd499], a @@ -1290,9 +1290,9 @@ Func_9013: ; 9013 (2:5013) ld e, a add hl, de ld a, [hli] - ld [wd497], a + ld [wCurDenjuu], a ld a, [hli] - ld [wd498], a + ld [wCurDenjuuLevel], a ld a, [hl] ld [wd499], a ret @@ -1355,15 +1355,9 @@ Func_904a: ; 904a (2:504a) ret Func_908a: - ld bc, wd584 + ld bc, wCurDenjuuBuffer ld de, $16 - cp $0 - jr z, .asm_9098 -.asm_9094 - add hl, de - dec a - jr nz, .asm_9094 -.asm_9098 + addntimes_hl_de ld d, $10 .asm_909a ld a, [hli] @@ -1402,167 +1396,167 @@ Func_90b1: ; 90b1 (2:50b1) ret Func_90c2: ; 90c2 (2:50c2) - ld a, [wd497] + ld a, [wCurDenjuu] ld b, $0 - ld c, $6 - call Func_058d - ld a, [wd45f] - ld de, $46f8 + ld c, $6 ; move 1 + call GetBaseStat_ + ld a, [wCurBaseStat] + ld de, MoveNames ld bc, VTilesShared tile $38 - call Func_0565 - ld a, [wd497] + call GetAndPrintName75LeftAlign_ + ld a, [wCurDenjuu] ld b, $0 - ld c, $7 - call Func_058d - ld a, [wd45f] - ld de, $46f8 + ld c, $7 ; move 2 + call GetBaseStat_ + ld a, [wCurBaseStat] + ld de, MoveNames ld bc, VTilesShared tile $40 - call Func_0565 - ld a, [wd497] + call GetAndPrintName75LeftAlign_ + ld a, [wCurDenjuu] ld b, $0 - ld c, $e - call Func_058d - ld a, [wd45f] + ld c, $e ; level at which third move is unlocked? + call GetBaseStat_ + ld a, [wCurBaseStat] ld b, a - ld a, [wd498] + ld a, [wCurDenjuuLevel] cp b - jr c, .asm_911a - ld a, [wd497] + jr c, .third_move_unknown + ld a, [wCurDenjuu] ld b, $0 - ld c, $8 - call Func_058d - ld a, [wd45f] - ld de, $46f8 + ld c, $8 ; move 3 + call GetBaseStat_ + ld a, [wCurBaseStat] + ld de, MoveNames ld bc, VTilesShared tile $48 - call Func_0565 - jr .asm_9125 + call GetAndPrintName75LeftAlign_ + jr .done_third_move -.asm_911a +.third_move_unknown ld de, String_8baf ld hl, VTilesShared tile $48 ld b, $8 call PlaceString_ -.asm_9125 - ld a, [wd497] +.done_third_move + ld a, [wCurDenjuu] ld b, $0 ld c, $f - call Func_058d - ld a, [wd45f] + call GetBaseStat_ + ld a, [wCurBaseStat] ld b, a cp $64 - jr z, .asm_9161 - ld a, [wd498] + jr z, .no_last_move + ld a, [wCurDenjuuLevel] cp b - jr c, .asm_9155 - ld a, [wd497] + jr c, .fourth_move_unknown + ld a, [wCurDenjuu] ld b, $0 - ld c, $9 - call Func_058d - ld a, [wd45f] - ld de, $46f8 + ld c, $9 ; move 4 + call GetBaseStat_ + ld a, [wCurBaseStat] + ld de, MoveNames ld bc, VTilesShared tile $50 - call Func_0565 - jr .asm_9160 + call GetAndPrintName75LeftAlign_ + jr .done_fouth_move -.asm_9155 +.fourth_move_unknown ld de, String_8baf ld hl, VTilesShared tile $50 ld b, $8 call PlaceString_ -.asm_9160 +.done_fouth_move ret -.asm_9161 +.no_last_move ld hl, VTilesShared tile $50 ld a, $8 call ClearString ret Func_916a: ; 916a (2:516a) - ld a, [wd497] + ld a, [wCurDenjuu] ld b, $0 ld c, $6 - call Func_058d - ld a, [wd45f] - ld a, [wd497] + call GetBaseStat_ + ld a, [wCurBaseStat] + ld a, [wCurDenjuu] ld b, $0 ld c, $7 - call Func_058d - ld a, [wd45f] - ld a, [wd497] + call GetBaseStat_ + ld a, [wCurBaseStat] + ld a, [wCurDenjuu] ld b, $0 ld c, $e - call Func_058d - ld a, [wd45f] + call GetBaseStat_ + ld a, [wCurBaseStat] ld b, a - ld a, [wd498] + ld a, [wCurDenjuuLevel] cp b - jr c, .asm_91c6 - ld a, [wd497] + jr c, .no_extra_move + ld a, [wCurDenjuu] ld b, $0 ld c, $8 - call Func_058d - ld a, [wd45f] - ld a, [wd497] + call GetBaseStat_ + ld a, [wCurBaseStat] + ld a, [wCurDenjuu] ld b, $0 ld c, $f - call Func_058d - ld a, [wd45f] + call GetBaseStat_ + ld a, [wCurBaseStat] ld b, a - ld a, [wd498] + ld a, [wCurDenjuuLevel] cp b - jr c, .asm_91c6 - ld a, [wd497] + jr c, .no_extra_move + ld a, [wCurDenjuu] ld b, $0 ld c, $9 - call Func_058d - ld a, [wd45f] -.asm_91c6 + call GetBaseStat_ + ld a, [wCurBaseStat] +.no_extra_move ret Func_91c7: ; 91c7 (2:51c7) - ld a, [wd498] + ld a, [wCurDenjuuLevel] ld b, a - ld a, [wd497] + ld a, [wCurDenjuu] ld c, $1 - call Func_058d - ld a, [wd45f] + call GetBaseStat_ + ld a, [wCurBaseStat] hlbgcoord 6, 12 ld c, $0 call Func_1378 - ld a, [wd498] + ld a, [wCurDenjuuLevel] ld b, a - ld a, [wd497] + ld a, [wCurDenjuu] ld c, $2 - call Func_058d - ld a, [wd45f] + call GetBaseStat_ + ld a, [wCurBaseStat] hlbgcoord 6, 14 ld c, $0 call Func_1378 - ld a, [wd498] + ld a, [wCurDenjuuLevel] ld b, a - ld a, [wd497] + ld a, [wCurDenjuu] ld c, $3 - call Func_058d - ld a, [wd45f] + call GetBaseStat_ + ld a, [wCurBaseStat] hlbgcoord 6, 16 ld c, $0 call Func_1378 - ld a, [wd498] + ld a, [wCurDenjuuLevel] ld b, a - ld a, [wd497] + ld a, [wCurDenjuu] ld c, $4 - call Func_058d - ld a, [wd45f] + call GetBaseStat_ + ld a, [wCurBaseStat] hlbgcoord 15, 12 ld c, $0 call Func_1378 - ld a, [wd498] + ld a, [wCurDenjuuLevel] ld b, a - ld a, [wd497] + ld a, [wCurDenjuu] ld c, $5 - call Func_058d - ld a, [wd45f] + call GetBaseStat_ + ld a, [wCurBaseStat] hlbgcoord 15, 14 ld c, $0 call Func_1378 @@ -1573,16 +1567,16 @@ Func_923b: ; 923b (2:523b) ld [MBC3SRamEnable], a ld a, BANK(s2_a002) ld [MBC3SRamBank], a - ld a, [wd498] + ld a, [wCurDenjuuLevel] hlbgcoord 5, 15 ld c, $1 call Func_1378 - ld a, [wd498] + ld a, [wCurDenjuuLevel] ld b, a - ld a, [wd497] + ld a, [wCurDenjuu] ld c, $0 - call Func_058d - ld a, [wd45f] + call GetBaseStat_ + ld a, [wCurBaseStat] hlbgcoord 5, 16 ld c, $0 call Func_1378 @@ -1608,7 +1602,7 @@ asm_928b hlbgcoord 14, 15 ld c, $0 call Func_1378 - ld a, [wd498] + ld a, [wCurDenjuuLevel] cp $63 jp z, Func_92eb ld a, [wcb2b] @@ -1633,13 +1627,13 @@ asm_928b pop hl bcbgcoord 11, 16 call Func_14b1 - ld a, [wd497] + ld a, [wCurDenjuu] ld b, $0 ld c, $d - call Func_058d - ld a, [wd498] + call GetBaseStat_ + ld a, [wCurDenjuuLevel] ld b, a - ld a, [wd45f] + ld a, [wCurBaseStat] call Func_05d9 sra b rr c @@ -5049,7 +5043,7 @@ Func_114ff: ; 114ff (4:54ff) call Func_04da call Func_13e6e ld a, [wcd23] - ld [wd497], a + ld [wCurDenjuu], a call Func_0597 ld a, [wcd23] ld c, $1 @@ -5218,7 +5212,7 @@ Func_11690: ; 11690 (4:5690) Func_1169d: ; 1169d (4:569d) ld a, [wcd23] - ld [wd497], a + ld [wCurDenjuu], a call Func_0597 ld a, [wcd23] ld c, $1 @@ -10954,8 +10948,8 @@ Func_13e81: ld a, [wcd23] ld b, $0 ld c, $d - call Func_058d - ld a, [wd45f] + call GetBaseStat_ + ld a, [wCurBaseStat] ld de, Data_1d5628 ld bc, VTilesBG tile $38 jp Func_056a @@ -11203,34 +11197,34 @@ Func_1402a: ; 1402a (5:402a) Func_1404a: ld a, [wd474] - call Func_1412b + call GetNthPlayerDenjuu call Func_1407d ld a, [wd474] call Func_140d9 - ld a, [wd591] + ld a, [wCurDenjuuBufferField0x0d] ld hl, VTilesBG tile $20 jp Func_142f9 Func_14062: ld a, [wd477] - call Func_14131 + call GetNthEnemyDenjuu call Func_140ab ld a, [wd477] call Func_14102 - ld a, [wd584] + ld a, [wCurDenjuuBuffer] ld de, $4000 ld bc, VTilesBG tile $28 - jp Func_0565 + jp GetAndPrintName75LeftAlign_ Func_1407d: ; 1407d (5:407d) - ld a, [wd587] + ld a, [wCurDenjuuBufferMaxHP] ld e, a - ld a, [wd586] + ld a, [wCurDenjuuBufferCurHP] call Func_3980 ld [wd4e8], a or a jr nz, .asm_14098 - ld a, [wd586] + ld a, [wCurDenjuuBufferCurHP] or a jr z, .asm_14098 ld a, $1 @@ -11245,14 +11239,14 @@ Func_1407d: ; 1407d (5:407d) jp Func_3957 Func_140ab: ; 140ab (5:40ab) - ld a, [wd587] + ld a, [wCurDenjuuBufferMaxHP] ld e, a - ld a, [wd586] + ld a, [wCurDenjuuBufferCurHP] call Func_3980 ld [wd4e9], a or a jr nz, .asm_140c6 - ld a, [wd586] + ld a, [wCurDenjuuBufferCurHP] or a jr z, .asm_140c6 ld a, $1 @@ -11267,15 +11261,15 @@ Func_140ab: ; 140ab (5:40ab) jp Func_3957 Func_140d9: ; 140d9 (5:40d9) - call Func_1412b - ld a, [wd58d] + call GetNthPlayerDenjuu + ld a, [wCurDenjuuBufferField0x09] ld e, a - ld a, [wd589] + ld a, [wCurDenjuuBufferField0x05] call Func_3980 ld [wd4e8], a or a jr nz, .asm_140f7 - ld a, [wd589] + ld a, [wCurDenjuuBufferField0x05] or a jr z, .asm_140f7 ld a, $1 @@ -11287,15 +11281,15 @@ Func_140d9: ; 140d9 (5:40d9) jp Func_3957 Func_14102: ; 14102 (5:4102) - call Func_14131 - ld a, [wd58d] + call GetNthEnemyDenjuu + ld a, [wCurDenjuuBufferField0x09] ld e, a - ld a, [wd589] + ld a, [wCurDenjuuBufferField0x05] call Func_3980 ld [wd4e9], a or a jr nz, .asm_14120 - ld a, [wd589] + ld a, [wCurDenjuuBufferField0x05] or a jr z, .asm_14120 ld a, $1 @@ -11306,24 +11300,18 @@ Func_14102: ; 14102 (5:4102) hlbgcoord 6, 11, VWindow jp Func_3957 -Func_1412b: ; 1412b (5:412b) - ld hl, wd500 - jp Func_14137 +GetNthPlayerDenjuu: ; 1412b (5:412b) + ld hl, wPlayerDenjuu1 + jp GetNthDenjuuAnySide -Func_14131: ; 14131 (5:4131) - ld hl, wd542 - jp Func_14137 +GetNthEnemyDenjuu: ; 14131 (5:4131) + ld hl, wEnemyDenjuu1 + jp GetNthDenjuuAnySide -Func_14137: ; 14137 (5:4137) +GetNthDenjuuAnySide: ; 14137 (5:4137) ld de, $16 - cp $0 - jr z, .asm_14142 -.asm_1413e - add hl, de - dec a - jr nz, .asm_1413e -.asm_14142 - ld de, wd584 + addntimes_hl_de + ld de, wCurDenjuuBuffer ld bc, $16 jp CopyData @@ -11427,15 +11415,15 @@ Func_141d7: ld a, [wd476] Func_141f2: ; 141f2 (5:41f2) push hl - call Func_1412b - ld a, [wd587] + call GetNthPlayerDenjuu + ld a, [wCurDenjuuBufferMaxHP] ld e, a - ld a, [wd586] + ld a, [wCurDenjuuBufferCurHP] call Func_3980 ld [wd4e8], a cp $0 jr nz, .asm_14213 - ld a, [wd586] + ld a, [wCurDenjuuBufferCurHP] cp $0 jr z, .asm_14213 ld a, $1 @@ -11456,15 +11444,15 @@ asm_14225 ld a, [wd479] Func_1422b: ; 1422b (5:422b) push hl - call Func_14131 - ld a, [wd587] + call GetNthEnemyDenjuu + ld a, [wCurDenjuuBufferMaxHP] ld e, a - ld a, [wd586] + ld a, [wCurDenjuuBufferCurHP] call Func_3980 ld [wd4e9], a cp $0 jr nz, .asm_1424c - ld a, [wd586] + ld a, [wCurDenjuuBufferCurHP] cp $0 jr z, .asm_1424c ld a, $1 @@ -11713,10 +11701,10 @@ Func_143f9: ld c, $6 add c ld c, a - ld a, [wd497] - call Func_058d - ld a, [wd45f] - ld hl, AttackNames + ld a, [wCurDenjuu] + call GetBaseStat_ + ld a, [wCurBaseStat] + ld hl, MoveNames ld [wd435], a ld [wd46f], a call GetName75 @@ -12507,7 +12495,10 @@ Func_7048c:: dr $7048c, $70a99 Func_70a99:: - dr $70a99, $7122c + dr $70a99, $711d9 + +LoadAllBattlingDenjuu: + dr $711d9, $7122c Func_7122c:: dr $7122c, $74000 @@ -12573,11 +12564,11 @@ Data_9cb29:: Data_9cbb2:: dr $9cbb2, $9cbfa -Data_9cbfa:: - dr $9cbfa, $9ce9d +ScriptedEnemyDenjuu:: +INCLUDE "data/scripted_denjuu.asm" -Data_9ce9d:: - dr $9ce9d, $a0000 +EnemyTFangerParties:: +INCLUDE "data/tfanger_parties.asm" SECTION "bank 28", ROMX, BANK [$28] dr $a0000, $a4000 @@ -13084,11 +13075,11 @@ DenjuuNames:: INCLUDE "text/denjuu_names.asm" TFangerNames:: ; 1d4580 INCLUDE "text/tfanger_names.asm" -AttackNames:: ; 1d46f8 +MoveNames:: ; 1d46f8 INCLUDE "text/attack_names.asm" -Data_1d4b48:: - dr $1d4b48, $1d5628 +BaseStats:: +INCLUDE "data/base_stats.asm" Data_1d5628:: dr $1d5628, $1d5640 diff --git a/text/attack_names.asm b/text/attack_names.asm index af86963..3338faa 100755 --- a/text/attack_names.asm +++ b/text/attack_names.asm @@ -1,9 +1,9 @@ - db "ダミ<0$$$$" + db "ダミー0$$$$" db "つめ$$$$$$" db "とっしん$$$$" db "なぐる$$$$$" db "ネコパンチ$$$" - db "バイソンハンマ<" + db "バイソンハンマー" db "けリ$$$$$$" db "シッポ$$$$$" db "つの$$$$$$" @@ -11,29 +11,29 @@ db "どくバリ$$$$" db "しびれバリ$$$" db "ハサミ$$$$$" - db "サ<ベル$$$$" + db "サーベル$$$$" db "かみつき$$$$" db "ボディプレス$$" db "つのドリル$$$" db "キュウケツ$$$" db "シュリケン$$$" db "ボウガン$$$$" - db "バイソンビ<ム$" - db "くわがたビ<ム$" - db "はどうビ<ム$$" - db "プラズマレ<ザ<" - db "メガランチャ<$" + db "バイソンビーム$" + db "くわがたビーム$" + db "はどうビーム$$" + db "プラズマレーザー" + db "メガランチャー$" db "メガキャノン$$" db "メガライフル$$" db "ドリルミサイル$" - db "ハイパ<ミサイル" + db "ハイパーミサイル" db "ドラゴンミサイル" db "ぺンギンミサイル" db "ミサイルポッド$" db "クニクズシ$$$" db "もリミサイル$$" - db "ツノランチャ<$" - db "トリバズ<カ$$" + db "ツノランチャー$" + db "トリバズーカ$$" db "ハナマグナム$$" db "ミミバルカン$$" db "キババルカン$$" @@ -42,9 +42,9 @@ db "プチフレイム$$" db "メガフレイム$$" db "カマイタチ$$$" - db "ハリケ<ン$$$" - db "プチザ<ド$$$" - db "ブリザ<ド$$$" + db "ハリケーン$$$" + db "プチザード$$$" + db "ブリザード$$$" db "タマゴバクダン$" db "うずしお$$$$" db "おおつなみ$$$" @@ -54,7 +54,7 @@ db "おおじしん$$$" db "ロック$$$$$" db "メガロック$$$" - db "スピ<ド$$$$" + db "スピード$$$$" db "しゅうちゅう$$" db "よける$$$$$" db "ふんき$$$$$" @@ -62,12 +62,12 @@ db "なおす$$$$$" db "かいふく$$$$" db "だいかいふく$$" - db "シ<ルド$$$$" + db "シールド$$$$" db "まもる$$$$$" db "てっぺき$$$$" - db "カムフラ<ジュ$" + db "カムフラージュ$" db "ちょうおんぱ$$" - db "デンジウエ<ブ$" + db "デンジウエーブ$" db "のろいのうた$$" db "こもリうた$$$" db "にらむ$$$$$" @@ -87,9 +87,9 @@ db "なめる$$$$$" db "しょくしゅ$$$" db "こおリだま$$$" - db "パラメ<タダウン" - db "ステ<タスもどる" - db "アイアンクロ<$" + db "パラメータダウン" + db "ステータスもどる" + db "アイアンクロー$" db "とつげき$$$$" db "ミサイルパンチ$" db "カミソリパンチ$" @@ -104,7 +104,7 @@ db "しんくうぎリ$$" db "キバクラッシュ$" db "あしげ$$$$$" - db "スクリュ<ホ<ン" + db "スクリューホーン" db "ドレイン$$$$" db "デンマシュリケン" db "とげ$$$$$$" @@ -112,24 +112,24 @@ db "ねらう$$$$$" db "かいひ$$$$$" db "ふんばる$$$$" - db "ダミ<1$$$$" + db "ダミー1$$$$" db "ちリょう$$$$" - db "リピア<$$$$" - db "ダミ<2$$$$" - db "シャッタ<$$$" + db "リピアー$$$$" + db "ダミー2$$$$" + db "シャッター$$$" db "ぼうぎょ$$$$" - db "ダミ<3$$$$" + db "ダミー3$$$$" db "かくれる$$$$" db "でんじは$$$$" db "しょうげきは$$" - db "ダミ<4$$$$" - db "ダミ<5$$$$" + db "ダミー4$$$$" + db "ダミー5$$$$" db "みつめる$$$$" - db "ダミ<6$$$$" - db "ダミ<7$$$$" - db "ダミ<8$$$$" - db "ダミ<9$$$$" - db "ダミ<10$$$" + db "ダミー6$$$$" + db "ダミー7$$$$" + db "ダミー8$$$$" + db "ダミー9$$$$" + db "ダミー10$$$" db "はぎしリ$$$$" db "すなぼこリ$$$" db "でんきすだれ$$" diff --git a/text/denjuu_names.asm b/text/denjuu_names.asm index ae7c6df..5137f93 100755 --- a/text/denjuu_names.asm +++ b/text/denjuu_names.asm @@ -1,6 +1,6 @@ db "ツノナス$$$$" db "コキア$$$$$" - db "ォ<シェ$$$$" + db "ォーシェ$$$$" db "ケシ$$$$$$" db "クリプト$$$$" db "モンステラ$$$" @@ -26,24 +26,24 @@ db "エリンゴ$$$$" db "ノリウツギ$$$" db "パンパス$$$$" - db "ロ<ダンセ$$$" + db "ローダンセ$$$" db "リコリス$$$$" - db "ビバ<ナム$$$" + db "ビバーナム$$$" db "ファンネル$$$" db "バンダ$$$$$" db "ウイキョウ$$$" db "ォバナ$$$$$" - db "ファイア<コッコ" - db "レイゴ<テン$$" - db "ドリア<マ$$$" - db "カメラ<ン$$$" - db "クリプトア<ム$" + db "ファイアーコッコ" + db "レイゴーテン$$" + db "ドリアーマ$$$" + db "カメラーン$$$" + db "クリプトアーム$" db "シェルステラ$$" db "ファンガイスト$" db "ボルタマス$$$" db "ブレニカ$$$$" - db "ゲ<ロン$$$$" - db "バ<ゼリア$$$" + db "ゲーロン$$$$" + db "バーゼリア$$$" db "ニゲラ$$$$$" db "ムサ$$$$$$" db "ネタロ$$$$$" @@ -53,43 +53,43 @@ db "テッセン$$$$" db "へリォプシス$$" db "ハグマノキ$$$" - db "ギルア<ス$$$" - db "レイガ<ス$$$" - db "ア<マル$$$$" + db "ギルアース$$$" + db "レイガース$$$" + db "アーマル$$$$" db "カメレイド$$$" db "クリプトライド$" - db "ワ<ミテララ$$" - db "ファンブレ<ド$" + db "ワーミテララ$$" + db "ファンブレード$" db "ブルタマス$$$" - db "プニ<ドル$$$" + db "プニードル$$$" db "ケロリン$$$$" db "スグライ$$$$" - db "コ<トス$$$$" + db "コートス$$$$" db "ガイウルス$$$" - db "ミド<トル$$$" + db "ミドートル$$$" db "ォクトル$$$$" - db "ヒトデ<イト$$" - db "ゴ<スボア$$$" + db "ヒトデーイト$$" + db "ゴースボア$$$" db "ラセンマイ$$$" - db "スコ<ピル$$$" - db "ア<ムクラブ$$" - db "アンヂォ<ン$$" - db "ヂムレ<ス$$$" + db "スコーピル$$$" + db "アームクラブ$$" + db "アンヂォーン$$" + db "ヂムレース$$$" db "リリォンプ$$$" db "ワイタ$$$$$" db "ポッツァル$$$" - db "アラニ<ダ$$$" + db "アラニーダ$$$" db "ガッドホロウ$$" db "クリォゲラ$$$" db "ガスト$$$$$" db "レイゲ$$$$$" - db "トゲ<ルカ$$$" + db "トゲールカ$$$" db "ライガリォン$$" db "ガドルクマ$$$" db "アビラス$$$$" db "アルファゴス$$" - db "キヨ<ルカ$$$" - db "ヂムガ<ス$$$" + db "キヨールカ$$$" + db "ヂムガース$$$" db "バイォンプ$$$" db "ワルタ$$$$$" db "ガンツァトル$$" @@ -97,78 +97,78 @@ db "バッドホロウ$$" db "ランプゲラ$$$" db "テンぺスト$$$" - db "ズド<ン$$$$" + db "ズドーン$$$$" db "ヒユ$$$$$$" db "ビブルナム$$$" db "パパウェル$$$" db "ガムル$$$$$" - db "ブバルディ<$$" - db "ゴ<テリア$$$" + db "ブバルディー$$" + db "ゴーテリア$$$" db "ディプサクス$$" db "カヤ$$$$$$" db "デンファレ$$$" db "アンヂィォン$$" - db "イ<ジ<ドッグ$" - db "トリケラ<マ$$" + db "イージードッグ$" + db "トリケラーマ$$" db "クリプトスナイプ" - db "ファンブ<スト$" - db "ブイ<ニカ$$$" - db "サイグリガ<$$" - db "ア<ムドウルス$" + db "ファンブースト$" + db "ブイーニカ$$$" + db "サイグリガー$$" + db "アームドウルス$" db "ォクトライフル$" - db "イレイザ<ボア$" - db "スピア<ニ<ドル" - db "ギルギア<ス$$" - db "ユニア<マ$$$" - db "クリプトバ<ン$" + db "イレイザーボア$" + db "スピアーニードル" + db "ギルギアース$$" + db "ユニアーマ$$$" + db "クリプトバーン$" db "ファンマシン$$" - db "プニ<スト$$$" + db "プニースト$$$" db "スグライン$$$" db "マッハウルス$$" db "ォクタガン$$$" - db "マミ<ボア$$$" + db "マミーボア$$$" db "キングピン$$$" - db "ビ<バ<ム$$$" - db "サラ<ル$$$$" + db "ビーバーム$$$" + db "サラール$$$$" db "エニシダ$$$$" db "ツルバキア$$$" db "キリンギク$$$" db "アンヂランス$$" db "ヂムガノン$$$" - db "サイォ<ぺ$$$" + db "サイォーぺ$$$" db "ワッタ$$$$$" db "ケッツァキング$" - db "アラク<ダバラン" + db "アラクーダバラン" db "パンクホロウ$$" - db "バイキング<リン" - db "スト<ム$$$$" - db "ムト<ム$$$$" - db "ギプソフィ<$$" + db "バイキングーリン" + db "ストーム$$$$" + db "ムトーム$$$$" + db "ギプソフィー$$" db "ルスカス$$$$" db "マォラン$$$$" db "ゼア$$$$$$" db "ゴヌム$$$$$" - db "アンヂパワ<$$" + db "アンヂパワー$$" db "ヂムザイラス$$" - db "カノンォ<ぺ$$" - db "カ<ム$$$$$" - db "リュ<グ<$$$" - db "ギガギガ<ス$$" - db "バリア<ム$$$" + db "カノンォーぺ$$" + db "カーム$$$$$" + db "リューグー$$$" + db "ギガギガース$$" + db "バリアーム$$$" db "クリプトナイト$" - db "ファングォ<$$" + db "ファングォー$$" db "バショウ$$$$" - db "アンヂゴ<ゴ$$" + db "アンヂゴーゴ$$" db "ヂムバロン$$$" - db "リリモナ<ク$$" - db "エンテイォ<$$" - db "ゴ<ラキング$$" + db "リリモナーク$$" + db "エンテイォー$$" + db "ゴーラキング$$" db "カンゾウ$$$$" db "ォルニソガルム$" db "ゲンティアナ$$" db "ヤロウ$$$$$" db "アンヂォロス$$" db "ヂムザタン$$$" - db "ドゥ<ムズデイ$" + db "ドゥームズデイ$" db "デンデル$$$$" db "テレテル$$$$" diff --git a/text/tfanger_names.asm b/text/tfanger_names.asm index ff484c5..8fa879c 100755 --- a/text/tfanger_names.asm +++ b/text/tfanger_names.asm @@ -1,15 +1,15 @@ - db " <<<<<<$" + db " ーーーーーー$" db "ミキちゃん$$$" db "トシカズくん$$" db "サナエバのてした" db "みつばちゃん$$" - db "ト<ルくん$$$" + db "トールくん$$$" db "サユリさん$$$" db "ユキコさん$$$" db "たんけんか$$$" - db "ジュ<ジュツ$$" + db "ジュージュツ$$" db "おがわ$$$$$" - db "ブ<た$$$$$" + db "ブーた$$$$$" db "クニサダくん$$" db "ワンダさん$$$" db "けんきゅういん$" @@ -18,20 +18,20 @@ db "レポマン$$$$" db "ほしの$$$$$" db "きこリや$$$$" - db "キンダ<ママ$$" - db "ケイブガ<ル$$" + db "キンダーママ$$" + db "ケイブガール$$" db "ファンガリアン$" - db "バ<ド$$$$$" + db "バード$$$$$" db "マニア$$$$$" db "ディアミおばさん" - db "び<じぇ<$$$" + db "びーじぇー$$$" db "ハックルトム$$" - db "スイスイスイマ<" + db "スイスイスイマー" db "カラテマン$$$" - db "ゴ<ゴ<レ<サ<" + db "ゴーゴーレーサー" db "プルこう$$$$" db "ミケ$$$$$$" - db "ベイビ<$$$$" + db "ベイビー$$$$" db "カミナリおやじ$" db "カジおやじ$$$" db "ジシンおやじ$$" diff --git a/wram.asm b/wram.asm index de5d049..48d4955 100755 --- a/wram.asm +++ b/wram.asm @@ -4317,7 +4317,7 @@ wd45b:: ds 1 wd45c:: ds 1 wd45d:: ds 1 wd45e:: ds 1 -wd45f:: ds 1 +wCurBaseStat:: ds 1 wd460:: ds 1 wd461:: ds 1 wd462:: ds 1 @@ -4373,8 +4373,8 @@ wd493:: ds 1 wd494:: ds 1 wd495:: ds 1 wd496:: ds 1 -wd497:: ds 1 -wd498:: ds 1 +wCurDenjuu:: ds 1 +wCurDenjuuLevel:: ds 1 wd499:: ds 1 wd49a:: ds 1 wd49b:: ds 1 @@ -4478,160 +4478,17 @@ wd4fc:: ds 1 wd4fd:: ds 1 wd4fe:: ds 1 wd4ff:: ds 1 -wd500:: ds 1 -wd501:: ds 1 -wd502:: ds 1 -wd503:: ds 1 -wd504:: ds 1 -wd505:: ds 1 -wd506:: ds 1 -wd507:: ds 1 -wd508:: ds 1 -wd509:: ds 1 -wd50a:: ds 1 -wd50b:: ds 1 -wd50c:: ds 1 -wd50d:: ds 1 -wd50e:: ds 1 -wd50f:: ds 1 -wd510:: ds 1 -wd511:: ds 1 -wd512:: ds 1 -wd513:: ds 1 -wd514:: ds 1 -wd515:: ds 1 -wd516:: ds 1 -wd517:: ds 1 -wd518:: ds 1 -wd519:: ds 1 -wd51a:: ds 1 -wd51b:: ds 1 -wd51c:: ds 1 -wd51d:: ds 1 -wd51e:: ds 1 -wd51f:: ds 1 -wd520:: ds 1 -wd521:: ds 1 -wd522:: ds 1 -wd523:: ds 1 -wd524:: ds 1 -wd525:: ds 1 -wd526:: ds 1 -wd527:: ds 1 -wd528:: ds 1 -wd529:: ds 1 -wd52a:: ds 1 -wd52b:: ds 1 -wd52c:: ds 1 -wd52d:: ds 1 -wd52e:: ds 1 -wd52f:: ds 1 -wd530:: ds 1 -wd531:: ds 1 -wd532:: ds 1 -wd533:: ds 1 -wd534:: ds 1 -wd535:: ds 1 -wd536:: ds 1 -wd537:: ds 1 -wd538:: ds 1 -wd539:: ds 1 -wd53a:: ds 1 -wd53b:: ds 1 -wd53c:: ds 1 -wd53d:: ds 1 -wd53e:: ds 1 -wd53f:: ds 1 -wd540:: ds 1 -wd541:: ds 1 -wd542:: ds 1 -wd543:: ds 1 -wd544:: ds 1 -wd545:: ds 1 -wd546:: ds 1 -wd547:: ds 1 -wd548:: ds 1 -wd549:: ds 1 -wd54a:: ds 1 -wd54b:: ds 1 -wd54c:: ds 1 -wd54d:: ds 1 -wd54e:: ds 1 -wd54f:: ds 1 -wd550:: ds 1 -wd551:: ds 1 -wd552:: ds 1 -wd553:: ds 1 -wd554:: ds 1 -wd555:: ds 1 -wd556:: ds 1 -wd557:: ds 1 -wd558:: ds 1 -wd559:: ds 1 -wd55a:: ds 1 -wd55b:: ds 1 -wd55c:: ds 1 -wd55d:: ds 1 -wd55e:: ds 1 -wd55f:: ds 1 -wd560:: ds 1 -wd561:: ds 1 -wd562:: ds 1 -wd563:: ds 1 -wd564:: ds 1 -wd565:: ds 1 -wd566:: ds 1 -wd567:: ds 1 -wd568:: ds 1 -wd569:: ds 1 -wd56a:: ds 1 -wd56b:: ds 1 -wd56c:: ds 1 -wd56d:: ds 1 -wd56e:: ds 1 -wd56f:: ds 1 -wd570:: ds 1 -wd571:: ds 1 -wd572:: ds 1 -wd573:: ds 1 -wd574:: ds 1 -wd575:: ds 1 -wd576:: ds 1 -wd577:: ds 1 -wd578:: ds 1 -wd579:: ds 1 -wd57a:: ds 1 -wd57b:: ds 1 -wd57c:: ds 1 -wd57d:: ds 1 -wd57e:: ds 1 -wd57f:: ds 1 -wd580:: ds 1 -wd581:: ds 1 -wd582:: ds 1 -wd583:: ds 1 -wd584:: ds 1 -wd585:: ds 1 -wd586:: ds 1 -wd587:: ds 1 -wd588:: ds 1 -wd589:: ds 1 -wd58a:: ds 1 -wd58b:: ds 1 -wd58c:: ds 1 -wd58d:: ds 1 -wd58e:: ds 1 -wd58f:: ds 1 -wd590:: ds 1 -wd591:: ds 1 -wd592:: ds 1 -wd593:: ds 1 -wd594:: ds 1 -wd595:: ds 1 -wd596:: ds 1 -wd597:: ds 1 -wd598:: ds 1 -wd599:: ds 1 + +wPlayerDenjuu1:: battle_struct wPlayerDenjuu1 +wPlayerDenjuu2:: battle_struct wPlayerDenjuu2 +wPlayerDenjuu3:: battle_struct wPlayerDenjuu3 + +wEnemyDenjuu1:: battle_struct wEnemyDenjuu1 +wEnemyDenjuu2:: battle_struct wEnemyDenjuu2 +wEnemyDenjuu3:: battle_struct wEnemyDenjuu3 + +wCurDenjuuBuffer:: battle_struct wCurDenjuuBuffer + wd59a:: ds 1 wd59b:: ds 1 wd59c:: ds 1