pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

More labels, including fns responsible for partymon generation

Browse Source
This commit is contained in:
PikalaxALT 2015-10-07 13:19:41 -04:00
parent 7176eff7aa
commit edf42a54d5
20 changed files with 340 additions and 326 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
battle/ai/items.asm
View File

@ -787,17 +787,17 @@ Function38511: ; 38511
; 3851e ; 3851e
Function3851e: ; 3851e Function3851e: ; 3851e
ld [hMultiplier], a ld [hDivisor], a
ld hl, EnemyMonMaxHP ld hl, EnemyMonMaxHP
ld a, [hli] ld a, [hli]
ld [hProduct], a ld [hDividend], a
ld a, [hl] ld a, [hl]
ld [hMultiplicand], a ld [hDividend + 1], a
ld b, $2 ld b, $2
call Divide call Divide
ld a, [$ffb6] ld a, [hQuotient + 2]
ld c, a ld c, a
ld a, [$ffb5] ld a, [hQuotient + 1]
ld b, a ld b, a
ld hl, EnemyMonHP + 1 ld hl, EnemyMonHP + 1
ld a, [hld] ld a, [hld]

4
battle/anim_commands.asm
View File

@ -240,14 +240,14 @@ Functioncc220: ; cc220
ld a, $80 ld a, $80
ld [hBGMapAddress], a ld [hBGMapAddress], a
ld a, $9a ld a, $9a
ld [$ffd7], a ld [hBGMapAddress + 1], a
call Function3200 call Function3200
ld a, $60 ld a, $60
ld [hWY], a ld [hWY], a
xor a xor a
ld [hBGMapAddress], a ld [hBGMapAddress], a
ld a, $98 ld a, $98
ld [$ffd7], a ld [hBGMapAddress + 1], a
call BattleAnimDelayFrame call BattleAnimDelayFrame
ret ret
; cc23d ; cc23d

14
battle/anim_objects.asm
View File

@ -1696,9 +1696,9 @@ Functioncd677: ; cd677 (33:5677)
ld a, $42 ld a, $42
ld [hLCDStatCustom], a ; $ff00+$c6 ld [hLCDStatCustom], a ; $ff00+$c6
ld a, $58 ld a, $58
ld [$ffc7], a ld [hLCDStatCustom + 1], a
ld a, $5e ld a, $5e
ld [$ffc8], a ld [hLCDStatCustom + 2], a
ret ret
Functioncd687: ; cd687 (33:5687) Functioncd687: ; cd687 (33:5687)
@ -1712,7 +1712,7 @@ Functioncd687: ; cd687 (33:5687)
jr nc, .asm_cd69b jr nc, .asm_cd69b
call Functionce72c call Functionce72c
xor a xor a
ld [$ffc7], a ld [hLCDStatCustom + 1], a
ret ret
.asm_cd69b .asm_cd69b
dec a dec a
@ -1730,7 +1730,7 @@ Functioncd687: ; cd687 (33:5687)
add [hl] add [hl]
sub $10 sub $10
ret c ret c
ld [$ffc7], a ld [hLCDStatCustom + 1], a
ld hl, $9 ld hl, $9
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
@ -1754,8 +1754,8 @@ Functioncd6c6: ; cd6c6 (33:56c6)
jr c, asm_cd6da jr c, asm_cd6da
xor a xor a
ld [hLCDStatCustom], a ; $ff00+$c6 ld [hLCDStatCustom], a ; $ff00+$c6
ld [$ffc7], a ld [hLCDStatCustom + 1], a
ld [$ffc8], a ld [hLCDStatCustom + 2], a
Functioncd6d6: ; cd6d6 (33:56d6) Functioncd6d6: ; cd6d6 (33:56d6)
call Functioncc9bd call Functioncc9bd
@ -1767,7 +1767,7 @@ endr
ld [hl], a ld [hl], a
sub $10 sub $10
ret c ret c
ld [$ffc7], a ld [hLCDStatCustom + 1], a
ret ret
Functioncd6e3: ; cd6e3 (33:56e3) Functioncd6e3: ; cd6e3 (33:56e3)

146
battle/bg_effects.asm
View File

@ -932,7 +932,7 @@ Functionc8565: ; c8565 (32:4565)
ld hl, w5_d422 ld hl, w5_d422
ld bc, $0 ld bc, $0
.asm_c8580 .asm_c8580
ld a, [$ffc7] ld a, [hLCDStatCustom + 1]
cp e cp e
jr nc, .asm_c858b jr nc, .asm_c858b
push hl push hl
@ -969,9 +969,9 @@ Functionc85a2: ; c85a2 (32:45a2)
ld a, $42 ld a, $42
ld [hLCDStatCustom], a ; $ff00+$c6 ld [hLCDStatCustom], a ; $ff00+$c6
xor a xor a
ld [$ffc7], a ld [hLCDStatCustom + 1], a
ld a, $5e ld a, $5e
ld [$ffc8], a ld [hLCDStatCustom + 2], a
ld de, $202 ld de, $202
call Functionc8f2e call Functionc8f2e
ret ret
@ -1044,9 +1044,9 @@ Functionc8610: ; c8610 (32:4610)
ld a, $43 ld a, $43
ld [hLCDStatCustom], a ; $ff00+$c6 ld [hLCDStatCustom], a ; $ff00+$c6
xor a xor a
ld [$ffc7], a ld [hLCDStatCustom + 1], a
ld a, $5f ld a, $5f
ld [$ffc8], a ld [hLCDStatCustom + 2], a
ld de, $605 ld de, $605
call Functionc8f2e call Functionc8f2e
ld hl, $3 ld hl, $3
@ -1140,9 +1140,9 @@ Functionc8698: ; c8698 (32:4698)
call Functionc8eca call Functionc8eca
ld a, $43 ld a, $43
call Functionc8ede call Functionc8ede
ld a, [$ffc8] ld a, [hLCDStatCustom + 2]
inc a inc a
ld [$ffc8], a ld [hLCDStatCustom + 2], a
ld hl, $2 ld hl, $2
add hl, bc add hl, bc
ld [hl], $0 ld [hl], $0
@ -1196,9 +1196,9 @@ Functionc86ea: ; c86ea (32:46ea)
inc a inc a
ld d, a ld d, a
ld h, $d2 ld h, $d2
ld a, [$ffc7] ld a, [hLCDStatCustom + 1]
ld l, a ld l, a
ld a, [$ffc8] ld a, [hLCDStatCustom + 2]
sub l sub l
srl a srl a
push af push af
@ -1238,7 +1238,7 @@ Functionc8712: ; c8712 (32:4712)
ld d, $2 ld d, $2
call Functionc8f2e call Functionc8f2e
ld h, $d2 ld h, $d2
ld a, [$ffc8] ld a, [hLCDStatCustom + 2]
ld l, a ld l, a
ld [hl], $0 ld [hl], $0
dec l dec l
@ -1246,7 +1246,7 @@ Functionc8712: ; c8712 (32:4712)
ret ret
Functionc8732: ; c8732 (32:4732) Functionc8732: ; c8732 (32:4732)
ld a, [$ffc8] ld a, [hLCDStatCustom + 2]
ld l, a ld l, a
ld h, $d2 ld h, $d2
ld e, l ld e, l
@ -1256,11 +1256,11 @@ Functionc8732: ; c8732 (32:4732)
ld a, [de] ld a, [de]
dec de dec de
ld [hld], a ld [hld], a
ld a, [$ffc7] ld a, [hLCDStatCustom + 1]
cp l cp l
jr nz, .asm_c873a jr nz, .asm_c873a
ld [hl], $90 ld [hl], $90
ld a, [$ffc8] ld a, [hLCDStatCustom + 2]
ld l, a ld l, a
ld a, [hl] ld a, [hl]
cp $1 cp $1
@ -1296,9 +1296,9 @@ Functionc876a: ; c876a (32:476a)
call Functionc8eca call Functionc8eca
ld a, $42 ld a, $42
call Functionc8ede call Functionc8ede
ld a, [$ffc8] ld a, [hLCDStatCustom + 2]
inc a inc a
ld [$ffc8], a ld [hLCDStatCustom + 2], a
ld hl, $2 ld hl, $2
add hl, bc add hl, bc
ld [hl], $1 ld [hl], $1
@ -1347,9 +1347,9 @@ Functionc87b2: ; c87b2 (32:47b2)
call Functionc8eca call Functionc8eca
ld a, $42 ld a, $42
call Functionc8ede call Functionc8ede
ld a, [$ffc8] ld a, [hLCDStatCustom + 2]
inc a inc a
ld [$ffc8], a ld [hLCDStatCustom + 2], a
ld hl, $2 ld hl, $2
add hl, bc add hl, bc
ld [hl], $2 ld [hl], $2
@ -1371,9 +1371,9 @@ Functionc87cf: ; c87cf (32:47cf)
call Functionc80e5 call Functionc80e5
Functionc87de: ; c87de (32:47de) Functionc87de: ; c87de (32:47de)
ld a, [$ffc7] ld a, [hLCDStatCustom + 1]
ld l, a ld l, a
ld a, [$ffc8] ld a, [hLCDStatCustom + 2]
sub l sub l
dec a dec a
ld hl, $2 ld hl, $2
@ -1416,9 +1416,9 @@ Functionc8810: ; c8810 (32:4810)
call Functionc8eca call Functionc8eca
ld a, $43 ld a, $43
call Functionc8ede call Functionc8ede
ld a, [$ffc8] ld a, [hLCDStatCustom + 2]
inc a inc a
ld [$ffc8], a ld [hLCDStatCustom + 2], a
ld hl, $3 ld hl, $3
add hl, bc add hl, bc
ld [hl], $0 ld [hl], $0
@ -1451,9 +1451,9 @@ Functionc8842: ; c8842 (32:4842)
call Functionc8eca call Functionc8eca
ld a, $43 ld a, $43
call Functionc8ef4 call Functionc8ef4
ld a, [$ffc8] ld a, [hLCDStatCustom + 2]
inc a inc a
ld [$ffc8], a ld [hLCDStatCustom + 2], a
ld hl, $3 ld hl, $3
add hl, bc add hl, bc
ld [hl], $0 ld [hl], $0
@ -1524,16 +1524,16 @@ Functionc88a5: ; c88a5 (32:48a5)
pop af pop af
jp Functionc900b jp Functionc900b
.asm_c88b7 .asm_c88b7
ld a, [$ffc7] ld a, [hLCDStatCustom + 1]
ld d, a ld d, a
ld a, [$ffc8] ld a, [hLCDStatCustom + 2]
sub d sub d
ld d, a ld d, a
ld h, LYOverridesBackup / $100 ld h, LYOverridesBackup / $100
ld a, [hSCY] ; $ff00+$d0 ld a, [hSCY] ; $ff00+$d0
or a or a
jr nz, .asm_c88d0 jr nz, .asm_c88d0
ld a, [$ffc7] ld a, [hLCDStatCustom + 1]
or a or a
jr z, .asm_c88d6 jr z, .asm_c88d6
dec a dec a
@ -1541,14 +1541,14 @@ Functionc88a5: ; c88a5 (32:48a5)
ld [hl], $0 ld [hl], $0
jr .asm_c88d6 jr .asm_c88d6
.asm_c88d0 .asm_c88d0
ld a, [$ffc8] ld a, [hLCDStatCustom + 2]
dec a dec a
ld l, a ld l, a
ld [hl], $0 ld [hl], $0
.asm_c88d6 .asm_c88d6
ld a, [hSCY] ; $ff00+$d0 ld a, [hSCY] ; $ff00+$d0
ld l, a ld l, a
ld a, [$ffc7] ld a, [hLCDStatCustom + 1]
sub l sub l
jr nc, .asm_c88e0 jr nc, .asm_c88e0
xor a xor a
@ -1581,9 +1581,9 @@ Functionc88f6: ; c88f6 (32:48f6)
call Functionc8eca call Functionc8eca
ld a, $43 ld a, $43
call Functionc8ede call Functionc8ede
ld a, [$ffc8] ld a, [hLCDStatCustom + 2]
inc a inc a
ld [$ffc8], a ld [hLCDStatCustom + 2], a
ld hl, $3 ld hl, $3
add hl, bc add hl, bc
ld [hl], $0 ld [hl], $0
@ -1628,9 +1628,9 @@ Functionc8933: ; c8933 (32:4933)
call Functionc8eca call Functionc8eca
ld a, $43 ld a, $43
call Functionc8ede call Functionc8ede
ld a, [$ffc8] ld a, [hLCDStatCustom + 2]
inc a inc a
ld [$ffc8], a ld [hLCDStatCustom + 2], a
ld hl, $3 ld hl, $3
add hl, bc add hl, bc
ld [hl], $0 ld [hl], $0
@ -1668,9 +1668,9 @@ Functionc896d: ; c896d (32:496d)
call Functionc8eca call Functionc8eca
ld a, $43 ld a, $43
call Functionc8ede call Functionc8ede
ld a, [$ffc8] ld a, [hLCDStatCustom + 2]
inc a inc a
ld [$ffc8], a ld [hLCDStatCustom + 2], a
xor a xor a
ld hl, $2 ld hl, $2
add hl, bc add hl, bc
@ -1767,9 +1767,9 @@ Functionc89f7: ; c89f7 (32:49f7)
call Functionc8eca call Functionc8eca
ld a, $42 ld a, $42
call Functionc8ef4 call Functionc8ef4
ld a, [$ffc8] ld a, [hLCDStatCustom + 2]
inc a inc a
ld [$ffc8], a ld [hLCDStatCustom + 2], a
ld hl, $2 ld hl, $2
add hl, bc add hl, bc
ld [hl], $1 ld [hl], $1
@ -1824,14 +1824,14 @@ Functionc8a49: ; c8a49 (32:4a49)
call Functionc8ecb call Functionc8ecb
ld a, $47 ld a, $47
call Functionc8ede call Functionc8ede
ld a, [$ffc8] ld a, [hLCDStatCustom + 2]
inc a inc a
ld [$ffc8], a ld [hLCDStatCustom + 2], a
ld a, [$ffc7] ld a, [hLCDStatCustom + 1]
ld l, a ld l, a
ld h, $d2 ld h, $d2
.asm_c8a60 .asm_c8a60
ld a, [$ffc8] ld a, [hLCDStatCustom + 2]
cp l cp l
jr z, .asm_c8a69 jr z, .asm_c8a69
xor a xor a
@ -1854,9 +1854,9 @@ Functionc8a70: ; c8a70 (32:4a70)
ld hl, $3 ld hl, $3
add hl, bc add hl, bc
ld [hl], $0 ld [hl], $0
ld a, [$ffc7] ld a, [hLCDStatCustom + 1]
inc a inc a
ld [$ffc7], a ld [hLCDStatCustom + 1], a
call Functionc80e5 call Functionc80e5
ret ret
@ -1864,7 +1864,7 @@ Functionc8a88: ; c8a88 (32:4a88)
call Functionc8ab0 call Functionc8ab0
jr nc, .asm_c8a96 jr nc, .asm_c8a96
call Functionc8a9a call Functionc8a9a
ld a, [$ffc8] ld a, [hLCDStatCustom + 2]
dec a dec a
ld l, a ld l, a
ld [hl], e ld [hl], e
@ -1875,9 +1875,9 @@ Functionc8a88: ; c8a88 (32:4a88)
Functionc8a9a: ; c8a9a (32:4a9a) Functionc8a9a: ; c8a9a (32:4a9a)
ld e, a ld e, a
ld a, [$ffc7] ld a, [hLCDStatCustom + 1]
ld l, a ld l, a
ld a, [$ffc8] ld a, [hLCDStatCustom + 2]
sub l sub l
srl a srl a
ld h, $d2 ld h, $d2
@ -1971,9 +1971,9 @@ Functionc8b0e: ; c8b0e (32:4b0e)
ld a, $47 ld a, $47
ld [hLCDStatCustom], a ; $ff00+$c6 ld [hLCDStatCustom], a ; $ff00+$c6
xor a xor a
ld [$ffc7], a ld [hLCDStatCustom + 1], a
ld a, $60 ld a, $60
ld [$ffc8], a ld [hLCDStatCustom + 2], a
ret ret
Functionc8b22: ; c8b22 (32:4b22) Functionc8b22: ; c8b22 (32:4b22)
@ -2221,9 +2221,9 @@ Functionc8c68: ; c8c68 (32:4c68)
call Functionc8eca call Functionc8eca
ld a, $43 ld a, $43
call Functionc8ede call Functionc8ede
ld a, [$ffc8] ld a, [hLCDStatCustom + 2]
inc a inc a
ld [$ffc8], a ld [hLCDStatCustom + 2], a
ld hl, $2 ld hl, $2
add hl, bc add hl, bc
ld [hl], $1 ld [hl], $1
@ -2268,9 +2268,9 @@ Functionc8cab: ; c8cab (32:4cab)
ld a, $43 ld a, $43
ld [hLCDStatCustom], a ; $ff00+$c6 ld [hLCDStatCustom], a ; $ff00+$c6
xor a xor a
ld [$ffc7], a ld [hLCDStatCustom + 1], a
ld a, $37 ld a, $37
ld [$ffc8], a ld [hLCDStatCustom + 2], a
ld hl, $3 ld hl, $3
add hl, bc add hl, bc
ld [hl], $0 ld [hl], $0
@ -2431,9 +2431,9 @@ Functionc8d8b: ; c8d8b (32:4d8b)
call Functionc8ecb call Functionc8ecb
ld a, $47 ld a, $47
call Functionc8ede call Functionc8ede
ld a, [$ffc8] ld a, [hLCDStatCustom + 2]
inc a inc a
ld [$ffc8], a ld [hLCDStatCustom + 2], a
ld hl, $3 ld hl, $3
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
@ -2669,9 +2669,9 @@ Functionc8ede: ; c8ede (32:4ede)
ld de, $2f5e ld de, $2f5e
.asm_c8eed .asm_c8eed
ld a, d ld a, d
ld [$ffc7], a ld [hLCDStatCustom + 1], a
ld a, e ld a, e
ld [$ffc8], a ld [hLCDStatCustom + 2], a
ret ret
Functionc8ef4: ; c8ef4 (32:4ef4) Functionc8ef4: ; c8ef4 (32:4ef4)
@ -2684,15 +2684,15 @@ Functionc8ef4: ; c8ef4 (32:4ef4)
ld de, $2d5e ld de, $2d5e
.asm_c8f03 .asm_c8f03
ld a, d ld a, d
ld [$ffc7], a ld [hLCDStatCustom + 1], a
ld a, e ld a, e
ld [$ffc8], a ld [hLCDStatCustom + 2], a
ret ret
Functionc8f0a: ; c8f0a (32:4f0a) Functionc8f0a: ; c8f0a (32:4f0a)
xor a xor a
ld [$ffc7], a ld [hLCDStatCustom + 1], a
ld [$ffc8], a ld [hLCDStatCustom + 2], a
call Functionc8eca call Functionc8eca
xor a xor a
ld [hLCDStatCustom], a ; $ff00+$c6 ld [hLCDStatCustom], a ; $ff00+$c6
@ -2706,8 +2706,8 @@ Functionc8f19: ; c8f19 (32:4f19)
ld [rBGP], a ; $ff00+$47 ld [rBGP], a ; $ff00+$47
ld [wcfc7], a ld [wcfc7], a
ld [wcfc9], a ld [wcfc9], a
ld [$ffc7], a ld [hLCDStatCustom + 1], a
ld [$ffc8], a ld [hLCDStatCustom + 2], a
call Functionc8eca call Functionc8eca
ret ret
@ -2723,10 +2723,10 @@ Functionc8f2e: ; c8f2e (32:4f2e)
ld [BattleAnimTemps + 3], a ld [BattleAnimTemps + 3], a
ld bc, LYOverridesBackup ld bc, LYOverridesBackup
.asm_c8f43 .asm_c8f43
ld a, [$ffc7] ld a, [hLCDStatCustom + 1]
cp c cp c
jr nc, .asm_c8f58 jr nc, .asm_c8f58
ld a, [$ffc8] ld a, [hLCDStatCustom + 2]
cp c cp c
jr c, .asm_c8f58 jr c, .asm_c8f58
ld a, [BattleAnimTemps + 2] ld a, [BattleAnimTemps + 2]
@ -2800,14 +2800,14 @@ Functionc8f9a: ; c8f9a (32:4f9a)
call Functionc905d call Functionc905d
ld e, a ld e, a
pop hl pop hl
ld a, [$ffc8] ld a, [hLCDStatCustom + 2]
cp c cp c
jr c, .asm_c8fcf jr c, .asm_c8fcf
ld a, e ld a, e
ld [bc], a ld [bc], a
inc bc inc bc
.asm_c8fcf .asm_c8fcf
ld a, [$ffc7] ld a, [hLCDStatCustom + 1]
cp l cp l
jr nc, .asm_c8fd6 jr nc, .asm_c8fd6
ld [hl], e ld [hl], e
@ -2824,7 +2824,7 @@ Functionc8f9a: ; c8f9a (32:4f9a)
ret ret
Functionc8fe4: ; c8fe4 (32:4fe4) Functionc8fe4: ; c8fe4 (32:4fe4)
ld a, [$ffc7] ld a, [hLCDStatCustom + 1]
ld e, a ld e, a
ld a, [BattleAnimTemps] ld a, [BattleAnimTemps]
add e add e
@ -2834,13 +2834,13 @@ Functionc8fe4: ; c8fe4 (32:4fe4)
Functionc8fef: ; c8fef (32:4fef) Functionc8fef: ; c8fef (32:4fef)
push bc push bc
ld a, [$ffc7] ld a, [hLCDStatCustom + 1]
ld l, a ld l, a
inc a inc a
ld e, a ld e, a
ld h, $d2 ld h, $d2
ld d, h ld d, h
ld a, [$ffc8] ld a, [hLCDStatCustom + 2]
sub l sub l
and a and a
jr z, .asm_c9009 jr z, .asm_c9009
@ -2862,9 +2862,9 @@ Functionc8fef: ; c8fef (32:4fef)
Functionc900b: ; c900b (32:500b) Functionc900b: ; c900b (32:500b)
push af push af
ld h, $d2 ld h, $d2
ld a, [$ffc7] ld a, [hLCDStatCustom + 1]
ld l, a ld l, a
ld a, [$ffc8] ld a, [hLCDStatCustom + 2]
sub l sub l
ld d, a ld d, a
pop af pop af
@ -2877,14 +2877,14 @@ Functionc900b: ; c900b (32:500b)
Functionc901b: ; c901b (32:501b) Functionc901b: ; c901b (32:501b)
push af push af
ld e, a ld e, a
ld a, [$ffc7] ld a, [hLCDStatCustom + 1]
ld l, a ld l, a
ld a, [$ffc8] ld a, [hLCDStatCustom + 2]
sub l sub l
sub e sub e
ld d, a ld d, a
ld h, $d2 ld h, $d2
ld a, [$ffc7] ld a, [hLCDStatCustom + 1]
ld l, a ld l, a
ld a, $90 ld a, $90
.asm_c902c .asm_c902c

14
battle/core.asm
View File

@ -3233,7 +3233,7 @@ Function3d444: ; 3d444
Function3d490: ; 3d490 Function3d490: ; 3d490
ld [$ffaf], a ld [hConnectionStripLength], a
ld c, a ld c, a
.asm_3d493 .asm_3d493
push bc push bc
@ -3257,7 +3257,7 @@ Function3d490: ; 3d490
; 3d4ae ; 3d4ae
Function3d4ae: ; 3d4ae Function3d4ae: ; 3d4ae
ld a, [$ffaf] ld a, [hConnectionStripLength]
ld c, a ld c, a
cp $8 cp $8
jr nz, .back jr nz, .back
@ -9442,7 +9442,7 @@ Function3fc30: ; 3fc30
Function3fc5b: ; 3fc5b Function3fc5b: ; 3fc5b
ld hl, Sprites ld hl, Sprites
xor a xor a
ld [$ffaf], a ld [hConnectionStripLength], a
ld b, $6 ld b, $6
ld e, $a8 ld e, $a8
.asm_3fc65 .asm_3fc65
@ -9453,10 +9453,10 @@ Function3fc5b: ; 3fc5b
inc hl inc hl
ld [hl], e ld [hl], e
inc hl inc hl
ld a, [$ffaf] ld a, [hConnectionStripLength]
ld [hli], a ld [hli], a
inc a inc a
ld [$ffaf], a ld [hConnectionStripLength], a
ld a, $1 ld a, $1
ld [hli], a ld [hli], a
ld a, d ld a, d
@ -9464,9 +9464,9 @@ Function3fc5b: ; 3fc5b
ld d, a ld d, a
dec c dec c
jr nz, .asm_3fc69 jr nz, .asm_3fc69
ld a, [$ffaf] ld a, [hConnectionStripLength]
add $3 add $3
ld [$ffaf], a ld [hConnectionStripLength], a
ld a, e ld a, e
add $8 add $8
ld e, a ld e, a

86
battle/effect_commands.asm
View File

@ -1390,7 +1390,7 @@ BattleCommand07: ; 346d2
cp c cp c
jr z, .stab jr z, .stab
jr .asm_3473a jr .SkipStab
.stab .stab
ld hl, CurDamage + 1 ld hl, CurDamage + 1
@ -1412,13 +1412,13 @@ BattleCommand07: ; 346d2
ld hl, TypeModifier ld hl, TypeModifier
set 7, [hl] set 7, [hl]
.asm_3473a .SkipStab
ld a, BATTLE_VARS_MOVE_TYPE ld a, BATTLE_VARS_MOVE_TYPE
call GetBattleVar call GetBattleVar
ld b, a ld b, a
ld hl, TypeMatchup ld hl, TypeMatchup
.asm_34743 .TypesLoop
ld a, [hli] ld a, [hli]
cp $ff cp $ff
@ -1426,38 +1426,39 @@ BattleCommand07: ; 346d2
; foresight ; foresight
cp $fe cp $fe
jr nz, .asm_34757 jr nz, .SkipForesightCheck
ld a, BATTLE_VARS_SUBSTATUS1_OPP ld a, BATTLE_VARS_SUBSTATUS1_OPP
call GetBattleVar call GetBattleVar
bit SUBSTATUS_IDENTIFIED, a bit SUBSTATUS_IDENTIFIED, a
jr nz, .end jr nz, .end
jr .asm_34743 jr .TypesLoop
.asm_34757 .SkipForesightCheck
cp b cp b
jr nz, .asm_347b3 jr nz, .SkipType
ld a, [hl] ld a, [hl]
cp d cp d
jr z, .asm_34763 jr z, .GotMatchup
cp e cp e
jr z, .asm_34763 jr z, .GotMatchup
jr .asm_347b3 jr .SkipType
.asm_34763 .GotMatchup
push hl push hl
push bc push bc
inc hl inc hl
ld a, [TypeModifier] ld a, [TypeModifier]
and %10000000 and %10000000
ld b, a ld b, a
; If the target is immune to the move, treat it as a miss and calculate the damage as 0
ld a, [hl] ld a, [hl]
and a and a
jr nz, .asm_34775 jr nz, .NotImmune
inc a inc a
ld [AttackMissed], a ld [AttackMissed], a
xor a xor a
.asm_34775 .NotImmune
ld [hMultiplier], a ld [hMultiplier], a
add b add b
ld [TypeModifier], a ld [TypeModifier], a
@ -1480,34 +1481,35 @@ BattleCommand07: ; 346d2
ld b, a ld b, a
ld a, [hProduct + 3] ld a, [hProduct + 3]
or b or b
jr z, .asm_347ab jr z, .ok ; This is a very convoluted way to get back that we've essentially dealt no damage.
ld a, $a ; Take the product and divide it by 10.
ld a, 10
ld [hDivisor], a ld [hDivisor], a
ld b, $4 ld b, 4
call Divide call Divide
ld a, [hQuotient + 1] ld a, [hQuotient + 1]
ld b, a ld b, a
ld a, [hQuotient + 2] ld a, [hQuotient + 2]
or b or b
jr nz, .asm_347ab jr nz, .ok
ld a, $1 ld a, 1
ld [$ffb6], a ld [hMultiplicand + 2], a
.asm_347ab .ok
ld a, [$ffb5] ld a, [hMultiplicand + 1]
ld [hli], a ld [hli], a
ld a, [$ffb6] ld a, [hMultiplicand + 2]
ld [hl], a ld [hl], a
pop bc pop bc
pop hl pop hl
.asm_347b3 .SkipType
rept 2 rept 2
inc hl inc hl
endr endr
jr .asm_34743 jr .TypesLoop
.end .end
call Function347c8 call Function347c8
@ -1545,32 +1547,32 @@ Function347d3: ; 347d3
ld a, 10 ; 1.0 ld a, 10 ; 1.0
ld [wd265], a ld [wd265], a
ld hl, TypeMatchup ld hl, TypeMatchup
.asm_347e7 .TypesLoop
ld a, [hli] ld a, [hli]
cp $ff cp $ff
jr z, .asm_3482f jr z, .End
cp $fe cp $fe
jr nz, .asm_347fb jr nz, .Next
ld a, BATTLE_VARS_SUBSTATUS1_OPP ld a, BATTLE_VARS_SUBSTATUS1_OPP
call GetBattleVar call GetBattleVar
bit SUBSTATUS_IDENTIFIED, a bit SUBSTATUS_IDENTIFIED, a
jr nz, .asm_3482f jr nz, .End
jr .asm_347e7 jr .TypesLoop
.asm_347fb .Next
cp d cp d
jr nz, .asm_34807 jr nz, .Nope
ld a, [hli] ld a, [hli]
cp b cp b
jr z, .asm_3480b jr z, .Yup
cp c cp c
jr z, .asm_3480b jr z, .Yup
jr .asm_34808 jr .Nope2
.asm_34807 .Nope
inc hl inc hl
.asm_34808 .Nope2
inc hl inc hl
jr .asm_347e7 jr .TypesLoop
.asm_3480b .Yup
xor a xor a
ld [hDividend + 0], a ld [hDividend + 0], a
ld [hMultiplicand + 0], a ld [hMultiplicand + 0], a
@ -1588,9 +1590,9 @@ Function347d3: ; 347d3
pop bc pop bc
ld a, [hQuotient + 2] ld a, [hQuotient + 2]
ld [wd265], a ld [wd265], a
jr .asm_347e7 jr .TypesLoop
.asm_3482f .End
pop bc pop bc
pop de pop de
pop hl pop hl
@ -1603,14 +1605,14 @@ BattleCommanda3: ; 34833
ld a, [wd265] ld a, [wd265]
and a and a
ld a, 10 ; 1.0 ld a, 10 ; 1.0
jr nz, .asm_3484a jr nz, .skip
call ResetDamage call ResetDamage
xor a xor a
ld [TypeModifier], a ld [TypeModifier], a
inc a inc a
ld [AttackMissed], a ld [AttackMissed], a
ret ret
.asm_3484a .skip
ld [wd265], a ld [wd265], a
ret ret
; 3484e ; 3484e

4
constants/wram_constants.asm
View File

@ -72,3 +72,7 @@ PLAYER_SURF_PIKA EQU 8
OBJECT_STRUCT_LENGTH EQU 40 OBJECT_STRUCT_LENGTH EQU 40
NUM_OBJECT_STRUCTS EQU 13 NUM_OBJECT_STRUCTS EQU 13
; After-Champion Spawn
SPAWN_LANCE EQU 1
SPAWN_RED EQU 2

8
engine/events.asm
View File

@ -121,7 +121,7 @@ StartMap: ; 96724
xor a xor a
ld [ScriptRunning], a ld [ScriptRunning], a
ld hl, MapStatus ld hl, MapStatus
ld bc, $3e ld bc, $3e ; 62
call ByteFill call ByteFill
callba Function113e5 callba Function113e5
call ClearJoypad call ClearJoypad
@ -137,13 +137,13 @@ EnterMap: ; 9673e
callba RunMapSetupScript callba RunMapSetupScript
call ClearAllScriptFlags3 call ClearAllScriptFlags3
ld a, [$ff9f] ld a, [hMapEntryMethod]
cp $f7 cp $f7
jr nz, .dontset jr nz, .dontset
call SetAll_ScriptFlags3 call SetAll_ScriptFlags3
.dontset .dontset
ld a, [$ff9f] ld a, [hMapEntryMethod]
cp $f3 cp $f3
jr nz, .dontresetpoison jr nz, .dontresetpoison
xor a xor a
@ -151,7 +151,7 @@ EnterMap: ; 9673e
.dontresetpoison .dontresetpoison
xor a xor a
ld [$ff9f], a ld [hMapEntryMethod], a
ld a, 2 ; HandleMap ld a, 2 ; HandleMap
ld [MapStatus], a ld [MapStatus], a
ret ret

20
engine/map_objects.asm
View File

@ -1499,7 +1499,7 @@ Function4af0: ; 4af0
add hl, bc add hl, bc
ld [hl], 2 ld [hl], 2
ld hl, wd4cf ld hl, wd4cf
ld a, [$ffaf] ld a, [hConnectionStripLength]
cp [hl] cp [hl]
jr z, .ok jr z, .ok
ld hl, OBJECT_09 ld hl, OBJECT_09
@ -2508,7 +2508,7 @@ Function54b8: ; 54b8
ret z ret z
ld a, [wd4cd] ld a, [wd4cd]
ld d, a ld d, a
ld a, [$ffaf] ld a, [hConnectionStripLength]
cp d cp d
ret nz ret nz
ld a, e ld a, e
@ -2651,7 +2651,7 @@ Function5565: ; 5565
Function5579: ; 5579 Function5579: ; 5579
push bc push bc
ld a, [$ffaf] ld a, [hConnectionStripLength]
ld c, a ld c, a
call Function5582 call Function5582
pop bc pop bc
@ -2712,7 +2712,7 @@ Function55b9: ; 55b9
ld [hli], a ld [hli], a
ld a, [de] ld a, [de]
ld [hli], a ld [hli], a
ld a, [$ffaf] ld a, [hConnectionStripLength]
ld [hli], a ld [hli], a
push hl push hl
ld hl, OBJECT_MAP_X ld hl, OBJECT_MAP_X
@ -2737,7 +2737,7 @@ Function55e0:: ; 55e0
ld bc, ObjectStructs ld bc, ObjectStructs
xor a xor a
.loop .loop
ld [$ffaf], a ld [hConnectionStripLength], a
call GetObjectSprite call GetObjectSprite
jr z, .ok jr z, .ok
call Function565c call Function565c
@ -2747,7 +2747,7 @@ Function55e0:: ; 55e0
add hl, bc add hl, bc
ld b, h ld b, h
ld c, l ld c, l
ld a, [$ffaf] ld a, [hConnectionStripLength]
inc a inc a
cp NUM_OBJECT_STRUCTS cp NUM_OBJECT_STRUCTS
jr nz, .loop jr nz, .loop
@ -2801,13 +2801,13 @@ Function5645: ; 5645
xor a xor a
ld bc, ObjectStructs ld bc, ObjectStructs
.loop .loop
ld [$ffaf], a ld [hConnectionStripLength], a
call Function5680 call Function5680
ld hl, OBJECT_STRUCT_LENGTH ld hl, OBJECT_STRUCT_LENGTH
add hl, bc add hl, bc
ld b, h ld b, h
ld c, l ld c, l
ld a, [$ffaf] ld a, [hConnectionStripLength]
inc a inc a
cp NUM_OBJECT_STRUCTS cp NUM_OBJECT_STRUCTS
jr nz, .loop jr nz, .loop
@ -3032,7 +3032,7 @@ Function5781: ; 5781
ld bc, ObjectStructs ld bc, ObjectStructs
xor a xor a
.loop .loop
ld [$ffaf], a ld [hConnectionStripLength], a
call GetObjectSprite call GetObjectSprite
jr z, .next jr z, .next
call Function437b call Function437b
@ -3042,7 +3042,7 @@ Function5781: ; 5781
add hl, bc add hl, bc
ld b, h ld b, h
ld c, l ld c, l
ld a, [$ffaf] ld a, [hConnectionStripLength]
inc a inc a
cp NUM_OBJECT_STRUCTS cp NUM_OBJECT_STRUCTS
jr nz, .loop jr nz, .loop

2
engine/map_setup.asm
View File

@ -1,6 +1,6 @@
RunMapSetupScript:: ; 15363 RunMapSetupScript:: ; 15363
ld a, [$ff9f] ld a, [hMapEntryMethod]
and $f and $f
dec a dec a
ld c, a ld c, a

2
engine/predef.asm
View File

@ -36,7 +36,7 @@ PredefPointers:: ; 856b
add_predef FlagPredef add_predef FlagPredef
add_predef Functionc699 add_predef Functionc699
add_predef FillPP add_predef FillPP
add_predef Functiond88c add_predef TryAddMonToParty
add_predef Functionda96 add_predef Functionda96
add_predef Functiondb3f ; $8 add_predef Functiondb3f ; $8
add_predef SentPkmnIntoBox add_predef SentPkmnIntoBox

14
engine/scripting.asm
View File

@ -1258,7 +1258,7 @@ Script_appear: ; 0x972dd
call GetScriptByte call GetScriptByte
call GetScriptPerson call GetScriptPerson
call _CopyObjectStruct call _CopyObjectStruct
ld a, [$ffaf] ld a, [hConnectionStripLength]
ld b, 0 ; clear ld b, 0 ; clear
call ApplyEventActionAppearDisappear call ApplyEventActionAppearDisappear
ret ret
@ -1276,7 +1276,7 @@ Script_disappear: ; 0x972ee
ld a, [hLastTalked] ld a, [hLastTalked]
.ok .ok
call DeleteObjectStruct call DeleteObjectStruct
ld a, [$ffaf] ld a, [hConnectionStripLength]
ld b, 1 ; set ld b, 1 ; set
call ApplyEventActionAppearDisappear call ApplyEventActionAppearDisappear
callba RefreshMapAppearDisappear callba RefreshMapAppearDisappear
@ -1584,7 +1584,7 @@ Script_reloadmap: ; 0x97491
xor a xor a
ld [wd459], a ld [wd459], a
ld a, $f3 ld a, $f3
ld [$ff9f], a ld [hMapEntryMethod], a
ld a, $1 ld a, $1
call LoadMapStatus call LoadMapStatus
call StopScript call StopScript
@ -2839,7 +2839,7 @@ Script_warp: ; 0x97a1d
ld a, -1 ld a, -1
ld [wd001], a ld [wd001], a
ld a, -15 ld a, -15
ld [$ff9f], a ld [hMapEntryMethod], a
ld a, 1 ld a, 1
call LoadMapStatus call LoadMapStatus
call StopScript call StopScript
@ -2851,7 +2851,7 @@ Script_warp: ; 0x97a1d
ld a, -1 ld a, -1
ld [wd001], a ld [wd001], a
ld a, -5 ld a, -5
ld [$ff9f], a ld [hMapEntryMethod], a
ld a, 1 ld a, 1
call LoadMapStatus call LoadMapStatus
call StopScript call StopScript
@ -2994,7 +2994,7 @@ Script_newloadmap: ; 0x97b08
; which_method (SingleByteParam) ; which_method (SingleByteParam)
call GetScriptByte call GetScriptByte
ld [$ff9f], a ld [hMapEntryMethod], a
ld a, 1 ld a, 1
call LoadMapStatus call LoadMapStatus
call StopScript call StopScript
@ -3198,7 +3198,7 @@ Script_halloffame: ; 0x97bd5
Script_credits: ; 0x97bf3 Script_credits: ; 0x97bf3
; script command 0xa2 ; script command 0xa2
callba Function86455 callba RedCredits
; fallthrough ; fallthrough
DisplayCredits: DisplayCredits:

18
home/joypad.asm
View File

@ -354,12 +354,12 @@ Functiona57:: ; a57
; a80 ; a80
Functiona80:: ; a80 Functiona80:: ; a80
ld a, [$ffaf] ld a, [hConnectionStripLength]
push af push af
ld a, [$ffb0] ld a, [$ffb0]
push af push af
xor a xor a
ld [$ffaf], a ld [hConnectionStripLength], a
ld a, $6 ld a, $6
ld [$ffb0], a ld [$ffb0], a
.asm_a8d .asm_a8d
@ -374,7 +374,7 @@ Functiona80:: ; a80
pop af pop af
ld [$ffb0], a ld [$ffb0], a
pop af pop af
ld [$ffaf], a ld [hConnectionStripLength], a
ret ret
; aa5 ; aa5
@ -452,9 +452,9 @@ Functionb06:: ; b06
cp b cp b
pop bc pop bc
jr nz, .asm_b27 jr nz, .asm_b27
ld a, [$ffaf] ld a, [hConnectionStripLength]
dec a dec a
ld [$ffaf], a ld [hConnectionStripLength], a
ret nz ret nz
ld a, [$ffb0] ld a, [$ffb0]
dec a dec a
@ -463,20 +463,20 @@ Functionb06:: ; b06
ld a, $7a ld a, $7a
ld [hl], a ld [hl], a
ld a, $ff ld a, $ff
ld [$ffaf], a ld [hConnectionStripLength], a
ld a, $6 ld a, $6
ld [$ffb0], a ld [$ffb0], a
ret ret
.asm_b27 .asm_b27
ld a, [$ffaf] ld a, [hConnectionStripLength]
and a and a
ret z ret z
dec a dec a
ld [$ffaf], a ld [hConnectionStripLength], a
ret nz ret nz
dec a dec a
ld [$ffaf], a ld [hConnectionStripLength], a
ld a, [$ffb0] ld a, [$ffb0]
dec a dec a
ld [$ffb0], a ld [$ffb0], a

4
home/map.asm
View File

@ -207,10 +207,10 @@ endr
Function222a:: ; 222a Function222a:: ; 222a
ld a, $fa ld a, $fa
ld [$ff9f], a ld [hMapEntryMethod], a
callba RunMapSetupScript callba RunMapSetupScript
xor a xor a
ld [$ff9f], a ld [hMapEntryMethod], a
ret ret
; 2238 ; 2238

1
hram.asm
View File

@ -17,6 +17,7 @@ hSeconds EQU $ff98
hROMBank EQU $ff9d hROMBank EQU $ff9d
hVBlank EQU $ff9e hVBlank EQU $ff9e
hMapEntryMethod EQU $ff9f
hJoypadReleased EQU $ffa2 hJoypadReleased EQU $ffa2
hJoypadPressed EQU $ffa3 hJoypadPressed EQU $ffa3

4
items/item_effects.asm
View File

@ -562,7 +562,7 @@ endr
ld [MonType], a ld [MonType], a
call ClearSprites call ClearSprites
predef Functiond88c predef TryAddMonToParty
callba Function4db49 callba Function4db49
@ -691,7 +691,7 @@ endr
jr .asm_ebe2 jr .asm_ebe2
.asm_ebd1 .asm_ebd1
callba Functione6ce callba BugContest_SetCaughtContestMon
jr .asm_ebe2 jr .asm_ebe2
.asm_ebd9 .asm_ebd9

305
main.asm
View File

File diff suppressed because it is too large Load Diff

4
misc/mobile_40.asm
View File

@ -407,10 +407,10 @@ Function1002c9: ; 1002c9
Function1002dc: ; 1002dc Function1002dc: ; 1002dc
ld a, $f8 ld a, $f8
ld [$ff9f], a ld [hMapEntryMethod], a
callba RunMapSetupScript callba RunMapSetupScript
xor a xor a
ld [$ff9f], a ld [hMapEntryMethod], a
call Functione51 call Functione51
ret ret
; 1002ed ; 1002ed

2
misc/mobile_5f.asm
View File

@ -2359,7 +2359,7 @@ Function17ded9: ; 17ded9
ld [MonType], a ld [MonType], a
push hl push hl
push bc push bc
predef Functiond88c predef TryAddMonToParty
callba Function4db49 callba Function4db49
pop bc pop bc
pop hl pop hl

4
wram.asm
View File

@ -1842,7 +1842,7 @@ wd25e:: ds 4
wd262:: ds 1 wd262:: ds 1
wd263:: ds 1 wd263:: ds 1
wd264:: ds 1 wd264:: ds 1
GetPokemonName_Parameter:: wNamedObjectIndexBuffer::
wd265:: ds 1 wd265:: ds 1
wd266:: ds 1 wd266:: ds 1
wd267:: ds 1 wd267:: ds 1
@ -1956,7 +1956,7 @@ RedsName:: ds NAME_LENGTH ; d49e
GreensName:: ds NAME_LENGTH ; d4a9 GreensName:: ds NAME_LENGTH ; d4a9
wd4b4:: ds 1 wd4b4:: ds 1
wd4b5:: ds 1 wSpawnAfterChampion:: ds 1
; init time set at newgame ; init time set at newgame
StartDay:: ; d4b6 StartDay:: ; d4b6