mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-04-09 05:44:44 -07:00
changed varlabels for multiply- and divide-func, renamed battletext-labels
This commit is contained in:
JimB16
parent
c76a3c6ecd
commit
0d4c2776d9
262
battle/core.asm
262
battle/core.asm
File diff suppressed because it is too large
Load Diff
@ -1458,37 +1458,37 @@ BattleCommand07: ; 346d2
|
||||
ld [AttackMissed], a
|
||||
xor a
|
||||
.asm_34775
|
||||
ld [$ffb7], a
|
||||
ld [hMultiplier], a
|
||||
add b
|
||||
ld [TypeModifier], a
|
||||
|
||||
xor a
|
||||
ld [$ffb4], a
|
||||
ld [hMultiplicand + 0], a
|
||||
|
||||
ld hl, CurDamage
|
||||
ld a, [hli]
|
||||
ld [$ffb5], a
|
||||
ld [hMultiplicand + 1], a
|
||||
ld a, [hld]
|
||||
ld [$ffb6], a
|
||||
ld [hMultiplicand + 2], a
|
||||
|
||||
call Multiply
|
||||
|
||||
ld a, [$ffb4]
|
||||
ld a, [hProduct + 1]
|
||||
ld b, a
|
||||
ld a, [$ffb5]
|
||||
ld a, [hProduct + 2]
|
||||
or b
|
||||
ld b, a
|
||||
ld a, [$ffb6]
|
||||
ld a, [hProduct + 3]
|
||||
or b
|
||||
jr z, .asm_347ab
|
||||
|
||||
ld a, $a
|
||||
ld [$ffb7], a
|
||||
ld [hDivisor], a
|
||||
ld b, $4
|
||||
call Divide
|
||||
ld a, [$ffb5]
|
||||
ld a, [hQuotient + 1]
|
||||
ld b, a
|
||||
ld a, [$ffb6]
|
||||
ld a, [hQuotient + 2]
|
||||
or b
|
||||
jr nz, .asm_347ab
|
||||
|
||||
@ -1572,11 +1572,11 @@ Function347d3: ; 347d3
|
||||
jr .asm_347e7
|
||||
.asm_3480b
|
||||
xor a
|
||||
ld [$ffb3], a
|
||||
ld [$ffb4], a
|
||||
ld [$ffb5], a
|
||||
ld [hDividend + 0], a
|
||||
ld [hMultiplicand + 0], a
|
||||
ld [hMultiplicand + 1], a
|
||||
ld a, [hli]
|
||||
ld [$ffb6], a
|
||||
ld [hMultiplicand + 2], a
|
||||
ld a, [wd265]
|
||||
ld [hMultiplier], a
|
||||
call Multiply
|
||||
@ -1586,7 +1586,7 @@ Function347d3: ; 347d3
|
||||
ld b, 4
|
||||
call Divide
|
||||
pop bc
|
||||
ld a, [$ffb6]
|
||||
ld a, [hQuotient + 2]
|
||||
ld [wd265], a
|
||||
jr .asm_347e7
|
||||
|
||||
@ -2305,12 +2305,12 @@ BattleCommand08: ; 34cfd
|
||||
.go
|
||||
; Start with the maximum damage.
|
||||
xor a
|
||||
ld [$ffb4], a
|
||||
ld [hMultiplicand + 0], a
|
||||
dec hl
|
||||
ld a, [hli]
|
||||
ld [$ffb5], a
|
||||
ld [hMultiplicand + 1], a
|
||||
ld a, [hl]
|
||||
ld [$ffb6], a
|
||||
ld [hMultiplicand + 2], a
|
||||
|
||||
; Multiply by 85-100%...
|
||||
.loop
|
||||
@ -2319,20 +2319,20 @@ BattleCommand08: ; 34cfd
|
||||
cp $d9 ; 85%
|
||||
jr c, .loop
|
||||
|
||||
ld [$ffb7], a
|
||||
ld [hMultiplier], a
|
||||
call Multiply
|
||||
|
||||
; ...divide by 100%...
|
||||
ld a, $ff ; 100%
|
||||
ld [$ffb7], a
|
||||
ld [hDivisor], a
|
||||
ld b, $4
|
||||
call Divide
|
||||
|
||||
; ...to get .85-1.00x damage.
|
||||
ld a, [$ffb5]
|
||||
ld a, [hQuotient + 1]
|
||||
ld hl, CurDamage
|
||||
ld [hli], a
|
||||
ld a, [$ffb6]
|
||||
ld a, [hQuotient + 2]
|
||||
ld [hl], a
|
||||
ret
|
||||
; 34d32
|
||||
@ -2594,10 +2594,10 @@ BattleCommand09: ; 34d32
|
||||
sub c
|
||||
ld c, a
|
||||
xor a
|
||||
ld [$ffb4], a
|
||||
ld [$ffb5], a
|
||||
ld [hMultiplicand + 0], a
|
||||
ld [hMultiplicand + 1], a
|
||||
ld a, [hl]
|
||||
ld [$ffb6], a
|
||||
ld [hMultiplicand + 2], a
|
||||
push hl
|
||||
ld d, $2
|
||||
|
||||
@ -2611,15 +2611,15 @@ BattleCommand09: ; 34d32
|
||||
add hl, bc
|
||||
pop bc
|
||||
ld a, [hli]
|
||||
ld [$ffb7], a
|
||||
ld [hMultiplier], a
|
||||
call Multiply
|
||||
ld a, [hl]
|
||||
ld [$ffb7], a
|
||||
ld [hDivisor], a
|
||||
ld b, $4
|
||||
call Divide
|
||||
ld a, [$ffb6]
|
||||
ld a, [hQuotient + 2]
|
||||
ld b, a
|
||||
ld a, [$ffb5]
|
||||
ld a, [hQuotient + 1]
|
||||
or b
|
||||
jr nz, .asm_34ea2
|
||||
ld [$ffb5], a
|
||||
@ -4344,18 +4344,18 @@ BattleCommand3f: ; 35726
|
||||
.asm_3579d
|
||||
xor a
|
||||
ld [$ffb3], a
|
||||
ld [$ffb4], a
|
||||
ld [hMultiplicand + 0], a
|
||||
ld a, [hli]
|
||||
ld [$ffb5], a
|
||||
ld [hMultiplicand + 1], a
|
||||
ld a, [hli]
|
||||
ld [$ffb6], a
|
||||
ld [hMultiplicand + 2], a
|
||||
ld a, $30
|
||||
ld [$ffb7], a
|
||||
ld [hMultiplier], a
|
||||
call Multiply
|
||||
ld a, [hli]
|
||||
ld b, a
|
||||
ld a, [hl]
|
||||
ld [$ffb7], a
|
||||
ld [hDivisor], a
|
||||
ld a, b
|
||||
and a
|
||||
jr z, .asm_357d6
|
||||
@ -4365,22 +4365,22 @@ BattleCommand3f: ; 35726
|
||||
rr a
|
||||
srl b
|
||||
rr a
|
||||
ld [$ffb7], a
|
||||
ld a, [$ffb5]
|
||||
ld [hDivisor], a
|
||||
ld a, [hProduct + 2]
|
||||
ld b, a
|
||||
srl b
|
||||
ld a, [$ffb6]
|
||||
ld a, [hProduct + 3]
|
||||
rr a
|
||||
srl b
|
||||
rr a
|
||||
ld [$ffb6], a
|
||||
ld [hDividend + 3], a
|
||||
ld a, b
|
||||
ld [$ffb5], a
|
||||
ld [hDividend + 2], a
|
||||
|
||||
.asm_357d6
|
||||
ld b, $4
|
||||
call Divide
|
||||
ld a, [$ffb6]
|
||||
ld a, [hQuotient + 2]
|
||||
ld b, a
|
||||
ld hl, .FlailPower
|
||||
|
||||
@ -6874,7 +6874,7 @@ rept 2
|
||||
endr
|
||||
|
||||
xor a
|
||||
ld [hMultiplicand], a
|
||||
ld [hMultiplicand + 0], a
|
||||
ld a, [de]
|
||||
ld [hMultiplicand + 1], a
|
||||
inc de
|
||||
@ -9470,7 +9470,7 @@ BattleCommand60: ; 3784b
|
||||
ld hl, EnemyMonHappiness
|
||||
.ok
|
||||
xor a
|
||||
ld [hMultiplicand], a
|
||||
ld [hMultiplicand + 0], a
|
||||
ld [hMultiplicand + 1], a
|
||||
ld a, [hl]
|
||||
ld [hMultiplicand + 2], a
|
||||
@ -9595,18 +9595,18 @@ BattleCommand63: ; 3790e
|
||||
.asm_3791a
|
||||
ld a, $ff
|
||||
sub [hl]
|
||||
ld [$ffb6], a
|
||||
ld [hMultiplicand + 2], a
|
||||
xor a
|
||||
ld [$ffb4], a
|
||||
ld [$ffb5], a
|
||||
ld [hMultiplicand + 0], a
|
||||
ld [hMultiplicand + 1], a
|
||||
ld a, 10
|
||||
ld [$ffb7], a
|
||||
ld [hMultiplier], a
|
||||
call Multiply
|
||||
ld a, 25
|
||||
ld [$ffb7], a
|
||||
ld [hDivisor], a
|
||||
ld b, 4
|
||||
call Divide
|
||||
ld a, [$ffb6]
|
||||
ld a, [hQuotient + 2]
|
||||
ld d, a
|
||||
pop bc
|
||||
ret
|
||||
|
||||
15
hram.asm
15
hram.asm
@ -31,13 +31,16 @@ hConnectedMapWidth EQU $ffb0
|
||||
|
||||
hPastLeadingZeroes EQU $ffb3
|
||||
|
||||
hDividend EQU $ffb3
|
||||
hDivisor EQU $ffb7
|
||||
hQuotient EQU $ffb4
|
||||
hStringCmpString1 EQU $ffb1
|
||||
hStringCmpString2 EQU $ffb5
|
||||
|
||||
hMultiplicand EQU $ffb4
|
||||
hMultiplier EQU $ffb7
|
||||
hProduct EQU $ffb3
|
||||
hDividend EQU $ffb3 ; length in b register, before 'call Divide' (max 4 bytes)
|
||||
hDivisor EQU $ffb7 ; 1 byte long
|
||||
hQuotient EQU $ffb4 ; result (3 bytes long)
|
||||
|
||||
hMultiplicand EQU $ffb4 ; 3 bytes long
|
||||
hMultiplier EQU $ffb7 ; 1 byte long
|
||||
hProduct EQU $ffb3 ; result (4 bytes long)
|
||||
|
||||
hMathBuffer EQU $ffb8
|
||||
|
||||
|
||||
@ -273,7 +273,7 @@ endr
|
||||
jp z, .asm_e98e
|
||||
|
||||
ld a, b
|
||||
ld [$ffb6], a
|
||||
ld [hMultiplicand + 2], a
|
||||
|
||||
ld hl, EnemyMonHP
|
||||
ld b, [hl]
|
||||
@ -318,9 +318,9 @@ endr
|
||||
sub c
|
||||
ld [hMultiplier], a
|
||||
xor a
|
||||
ld [hProduct], a
|
||||
ld [hMultiplicand], a
|
||||
ld [$ffb5], a
|
||||
ld [hDividend + 0], a
|
||||
ld [hMultiplicand + 0], a
|
||||
ld [hMultiplicand + 1], a
|
||||
call Multiply
|
||||
pop bc
|
||||
|
||||
@ -329,7 +329,7 @@ endr
|
||||
ld b, $4
|
||||
call Divide
|
||||
|
||||
ld a, [$ffb6]
|
||||
ld a, [hQuotient + 2]
|
||||
and a
|
||||
jr nz, .statuscheck
|
||||
ld a, 1
|
||||
|
||||
116
main.asm
116
main.asm
@ -4464,11 +4464,11 @@ Functionc699: ; c699
|
||||
jr z, .zero
|
||||
push hl
|
||||
xor a
|
||||
ld [hMultiplicand], a
|
||||
ld [hMultiplicand + 0], a
|
||||
ld a, b
|
||||
ld [$ffb5], a
|
||||
ld [hMultiplicand + 1], a
|
||||
ld a, c
|
||||
ld [$ffb6], a
|
||||
ld [hMultiplicand + 2], a
|
||||
ld a, $30
|
||||
ld [hMultiplier], a
|
||||
call Multiply
|
||||
@ -4479,23 +4479,23 @@ Functionc699: ; c699
|
||||
rr e
|
||||
srl d
|
||||
rr e
|
||||
ld a, [$ffb5]
|
||||
ld a, [hProduct + 2]
|
||||
ld b, a
|
||||
ld a, [$ffb6]
|
||||
ld a, [hProduct + 3]
|
||||
srl b
|
||||
rr a
|
||||
srl b
|
||||
rr a
|
||||
ld [$ffb6], a
|
||||
ld [hDividend + 3], a
|
||||
ld a, b
|
||||
ld [$ffb5], a
|
||||
ld [hDividend + 2], a
|
||||
|
||||
.divide
|
||||
ld a, e
|
||||
ld [hMultiplier], a
|
||||
ld [hDivisor], a
|
||||
ld b, $4
|
||||
call Divide
|
||||
ld a, [$ffb6]
|
||||
ld a, [hQuotient + 2]
|
||||
ld e, a
|
||||
pop hl
|
||||
and a
|
||||
@ -9390,22 +9390,22 @@ endr
|
||||
inc d
|
||||
|
||||
.asm_e20f
|
||||
ld [$ffb6], a
|
||||
ld [hMultiplicand + 2], a
|
||||
ld a, d
|
||||
ld [$ffb5], a
|
||||
ld [hMultiplicand + 1], a
|
||||
xor a
|
||||
ld [hMultiplicand], a
|
||||
ld [hMultiplicand + 0], a
|
||||
ld a, [CurPartyLevel]
|
||||
ld [hMultiplier], a
|
||||
call Multiply
|
||||
ld a, [hMultiplicand]
|
||||
ld [hProduct], a
|
||||
ld a, [$ffb5]
|
||||
ld [hMultiplicand], a
|
||||
ld a, [$ffb6]
|
||||
ld [$ffb5], a
|
||||
ld a, [hProduct + 1]
|
||||
ld [hDividend + 0], a
|
||||
ld a, [hProduct + 2]
|
||||
ld [hDividend + 1], a
|
||||
ld a, [hProduct + 3]
|
||||
ld [hDividend + 2], a
|
||||
ld a, $64
|
||||
ld [hMultiplier], a
|
||||
ld [hDivisor], a
|
||||
ld a, $3
|
||||
ld b, a
|
||||
call Divide
|
||||
@ -9415,11 +9415,11 @@ endr
|
||||
jr nz, .asm_e24e
|
||||
ld a, [CurPartyLevel]
|
||||
ld b, a
|
||||
ld a, [$ffb6]
|
||||
ld a, [hQuotient + 2]
|
||||
add b
|
||||
ld [$ffb6], a
|
||||
jr nc, .asm_e24c
|
||||
ld a, [$ffb5]
|
||||
ld a, [hQuotient + 1]
|
||||
inc a
|
||||
ld [$ffb5], a
|
||||
|
||||
@ -25877,11 +25877,11 @@ Function2509f: ; 2509f
|
||||
|
||||
Function250a9: ; 250a9
|
||||
xor a
|
||||
ld [hMultiplicand], a
|
||||
ld [hMultiplicand + 0], a
|
||||
ld a, [Buffer1]
|
||||
ld [$ffb5], a
|
||||
ld [hMultiplicand + 1], a
|
||||
ld a, [Buffer2]
|
||||
ld [$ffb6], a
|
||||
ld [hMultiplicand + 2], a
|
||||
ld a, [wd10c]
|
||||
ld [hMultiplier], a
|
||||
push hl
|
||||
@ -35885,7 +35885,7 @@ TrainerType4: ; 3989d
|
||||
; 3991b
|
||||
|
||||
Function3991b: ; 3991b (e:591b)
|
||||
ld hl, $ffb3
|
||||
ld hl, hMultiplicand - 1
|
||||
xor a
|
||||
rept 3
|
||||
ld [hli], a
|
||||
@ -35898,9 +35898,9 @@ endr
|
||||
ld hl, wc686
|
||||
xor a
|
||||
ld [hli], a
|
||||
ld a, [$ffb5]
|
||||
ld a, [hProduct + 2]
|
||||
ld [hli], a
|
||||
ld a, [$ffb6]
|
||||
ld a, [hProduct + 3]
|
||||
ld [hl], a
|
||||
ret
|
||||
|
||||
@ -39638,8 +39638,8 @@ Function48d4a: ; 48d4a (12:4d4a)
|
||||
add c
|
||||
ld [hld], a
|
||||
xor a
|
||||
ld [hQuotient], a ; $ff00+$b4 (aliases: hMultiplicand)
|
||||
ld [$ffb5], a
|
||||
ld [hMultiplicand + 0], a
|
||||
ld [hMultiplicand + 1], a
|
||||
ld a, [hl]
|
||||
srl a
|
||||
srl a
|
||||
@ -39651,13 +39651,13 @@ Function48d4a: ; 48d4a (12:4d4a)
|
||||
ld a, [hli]
|
||||
and $f
|
||||
add b
|
||||
ld [$ffb6], a
|
||||
ld [hMultiplicand + 2], a
|
||||
ld a, 100
|
||||
ld [hDivisor], a ; $ff00+$b7 (aliases: hMultiplier)
|
||||
ld [hMultiplier], a
|
||||
call Multiply
|
||||
ld a, [$ffb5]
|
||||
ld a, [hProduct + 2]
|
||||
ld b, a
|
||||
ld a, [$ffb6]
|
||||
ld a, [hProduct + 3]
|
||||
ld c, a
|
||||
ld e, [hl]
|
||||
add e
|
||||
@ -39672,10 +39672,10 @@ Function48d4a: ; 48d4a (12:4d4a)
|
||||
|
||||
Function48d94: ; 48d94 (12:4d94)
|
||||
xor a
|
||||
ld [$ffb3], a
|
||||
ld [hDividend + 0], a
|
||||
ld [hQuotient], a ; $ff00+$b4 (aliases: hMultiplicand)
|
||||
ld a, [hli]
|
||||
ld [$ffb3], a
|
||||
ld [hDividend + 0], a
|
||||
ld a, [hl]
|
||||
ld [hQuotient], a ; $ff00+$b4 (aliases: hMultiplicand)
|
||||
ld a, 100
|
||||
@ -39691,7 +39691,7 @@ Function48d94: ; 48d94 (12:4d94)
|
||||
sla b
|
||||
or b
|
||||
ld [hld], a
|
||||
ld a, [$ffb6]
|
||||
ld a, [hQuotient + 2]
|
||||
ld c, 10
|
||||
call SimpleDivide
|
||||
sla b
|
||||
@ -49389,11 +49389,11 @@ endr
|
||||
ld b, $4
|
||||
call Divide
|
||||
|
||||
ld a, [hMultiplicand]
|
||||
ld a, [hMultiplicand + 0]
|
||||
push af
|
||||
ld a, [$ffb5]
|
||||
ld a, [hMultiplicand + 1]
|
||||
push af
|
||||
ld a, [$ffb6]
|
||||
ld a, [hMultiplicand + 2]
|
||||
push af
|
||||
|
||||
call Function50eed
|
||||
@ -49402,33 +49402,33 @@ endr
|
||||
ld [hMultiplier], a
|
||||
call Multiply
|
||||
|
||||
ld a, [hMultiplicand]
|
||||
ld a, [hProduct + 1]
|
||||
push af
|
||||
ld a, [$ffb5]
|
||||
ld a, [hProduct + 2]
|
||||
push af
|
||||
ld a, [$ffb6]
|
||||
ld a, [hProduct + 3]
|
||||
push af
|
||||
ld a, [hli]
|
||||
push af
|
||||
|
||||
xor a
|
||||
ld [hMultiplicand], a
|
||||
ld [$ffb5], a
|
||||
ld [hMultiplicand + 0], a
|
||||
ld [hMultiplicand + 1], a
|
||||
ld a, d
|
||||
ld [$ffb6], a
|
||||
ld [hMultiplicand + 2], a
|
||||
ld a, [hli]
|
||||
ld [hMultiplier], a
|
||||
call Multiply
|
||||
|
||||
ld b, [hl]
|
||||
ld a, [$ffb6]
|
||||
ld a, [hProduct + 3]
|
||||
sub b
|
||||
ld [$ffb6], a
|
||||
ld b, $0
|
||||
ld a, [$ffb5]
|
||||
ld a, [hProduct + 2]
|
||||
sbc b
|
||||
ld [$ffb5], a
|
||||
ld a, [hMultiplicand]
|
||||
ld a, [hProduct + 1]
|
||||
sbc b
|
||||
ld [hMultiplicand], a
|
||||
|
||||
@ -49482,10 +49482,10 @@ endr
|
||||
|
||||
Function50eed: ; 50eed
|
||||
xor a
|
||||
ld [hMultiplicand], a
|
||||
ld [$ffb5], a
|
||||
ld [hMultiplicand + 0], a
|
||||
ld [hMultiplicand + 1], a
|
||||
ld a, d
|
||||
ld [$ffb6], a
|
||||
ld [hMultiplicand + 2], a
|
||||
ld [hMultiplier], a
|
||||
jp Multiply
|
||||
; 50efa
|
||||
@ -87396,12 +87396,12 @@ endr
|
||||
|
||||
.ApplyModifier
|
||||
xor a
|
||||
ld [hMultiplicand], a
|
||||
ld [hMultiplicand + 0], a
|
||||
ld hl, CurDamage
|
||||
ld a, [hli]
|
||||
ld [$ffb5], a
|
||||
ld [hMultiplicand + 1], a
|
||||
ld a, [hl]
|
||||
ld [$ffb6], a
|
||||
ld [hMultiplicand + 2], a
|
||||
|
||||
inc de
|
||||
ld a, [de]
|
||||
@ -87410,18 +87410,18 @@ endr
|
||||
call Multiply
|
||||
|
||||
ld a, 10
|
||||
ld [hMultiplier], a
|
||||
ld [hDivisor], a
|
||||
ld b, $4
|
||||
call Divide
|
||||
|
||||
ld a, [hMultiplicand]
|
||||
ld a, [hQuotient + 0]
|
||||
and a
|
||||
ld bc, $ffff
|
||||
jr nz, .Update
|
||||
|
||||
ld a, [$ffb5]
|
||||
ld a, [hQuotient + 1]
|
||||
ld b, a
|
||||
ld a, [$ffb6]
|
||||
ld a, [hQuotient + 2]
|
||||
ld c, a
|
||||
or b
|
||||
jr nz, .Update
|
||||
|
||||
@ -113,7 +113,7 @@ BattleText_0x80880: ; 0x80880
|
||||
prompt
|
||||
; 0x80899
|
||||
|
||||
BattleText_0x80899: ; 0x80899
|
||||
BattleText_UserRecoveredPPUsing: ; 0x80899
|
||||
text "<USER>"
|
||||
line "recovered PP using"
|
||||
cont "@"
|
||||
@ -129,13 +129,13 @@ BattleText_0x808b6: ; 0x808b6
|
||||
prompt
|
||||
; 0x808d2
|
||||
|
||||
BattleText_0x808d2: ; 0x808d2
|
||||
BattleText_SafeguardFaded: ; 0x808d2
|
||||
text "<USER>'s"
|
||||
line "SAFEGUARD faded!"
|
||||
prompt
|
||||
; 0x808e7
|
||||
|
||||
BattleText_0x808e7: ; 0x808e7
|
||||
BattleText_PkmnnLightScreenFell: ; 0x808e7
|
||||
text_from_ram StringBuffer1
|
||||
text " #MON's"
|
||||
line "LIGHT SCREEN fell!"
|
||||
@ -149,42 +149,42 @@ BattleText_0x80905: ; 0x80905
|
||||
prompt
|
||||
; 0x8091f
|
||||
|
||||
BattleText_0x8091f: ; 0x8091f
|
||||
BattleText_RainContinuesToFall: ; 0x8091f
|
||||
text "Rain continues to"
|
||||
line "fall."
|
||||
prompt
|
||||
; 0x80938
|
||||
|
||||
BattleText_0x80938: ; 0x80938
|
||||
BattleText_TheSunlightIsStrong: ; 0x80938
|
||||
text "The sunlight is"
|
||||
line "strong."
|
||||
prompt
|
||||
; 0x80951
|
||||
|
||||
BattleText_0x80951: ; 0x80951
|
||||
BattleText_TheSandstormRages: ; 0x80951
|
||||
text "The SANDSTORM"
|
||||
line "rages."
|
||||
prompt
|
||||
; 0x80967
|
||||
|
||||
BattleText_0x80967: ; 0x80967
|
||||
BattleText_TheRainStopped: ; 0x80967
|
||||
text "The rain stopped."
|
||||
prompt
|
||||
; 0x8097a
|
||||
|
||||
BattleText_0x8097a: ; 0x8097a
|
||||
BattleText_TheSunlightFaded: ; 0x8097a
|
||||
text "The sunlight"
|
||||
line "faded."
|
||||
prompt
|
||||
; 0x8098f
|
||||
|
||||
BattleText_0x8098f: ; 0x8098f
|
||||
BattleText_TheSandstormSubsided: ; 0x8098f
|
||||
text "The SANDSTORM"
|
||||
line "subsided."
|
||||
prompt
|
||||
; 0x809a8
|
||||
|
||||
BattleText_0x809a8: ; 0x809a8
|
||||
BattleText_EnemyPkmnFainted: ; 0x809a8
|
||||
text "Enemy @"
|
||||
text_from_ram EnemyMonNick
|
||||
text ""
|
||||
@ -199,7 +199,7 @@ GotMoneyForWinningText:
|
||||
line "for winning!"
|
||||
prompt
|
||||
|
||||
BattleText_0x809da: ; 0x809da
|
||||
BattleText_EnemyWasDefeated: ; 0x809da
|
||||
text "<ENEMY>"
|
||||
line "was defeated!"
|
||||
prompt
|
||||
@ -234,14 +234,14 @@ BattleText_0x80a4f: ; 0x80a4f
|
||||
prompt
|
||||
; 0x80a75
|
||||
|
||||
BattleText_0x80a75: ; 0x80a75
|
||||
BattleText_PkmnFainted: ; 0x80a75
|
||||
text_from_ram BattleMonNick
|
||||
text ""
|
||||
line "fainted!"
|
||||
prompt
|
||||
; 0x80a83
|
||||
|
||||
BattleText_0x80a83: ; 0x80a83
|
||||
BattleText_UseNextMon: ; 0x80a83
|
||||
text "Use next #MON?"
|
||||
done
|
||||
; 0x80a93
|
||||
@ -259,7 +259,7 @@ LostAgainstText: ; 0x80ab9
|
||||
prompt
|
||||
; 0x80aca
|
||||
|
||||
BattleText_0x80aca: ; 0x80aca
|
||||
BattleText_EnemyIsAboutToUseWillPlayerChangePkmn: ; 0x80aca
|
||||
text "<ENEMY>"
|
||||
line "is about to use"
|
||||
cont "@"
|
||||
@ -280,34 +280,32 @@ BattleText_EnemySentOut: ; 0x80af8
|
||||
done
|
||||
; 0x80b0b
|
||||
|
||||
BattleText_0x80b0b: ; 0x80b0b
|
||||
BattleText_TheresNoWillToBattle: ; 0x80b0b
|
||||
text "There's no will to"
|
||||
line "battle!"
|
||||
prompt
|
||||
; 0x80b26
|
||||
|
||||
BattleText_0x80b26: ; 0x80b26
|
||||
BattleText_AnEGGCantBattle: ; 0x80b26
|
||||
text "An EGG can't"
|
||||
line "battle!"
|
||||
prompt
|
||||
; 0x80b3b
|
||||
|
||||
BattleText_0x80b3b: ; 0x80b3b
|
||||
BattleText_CantEscape2: ; 0x80b3b
|
||||
text "Can't escape!"
|
||||
prompt
|
||||
; 0x80b49
|
||||
|
||||
BattleText_0x80b49: ; 0x80b49
|
||||
BattleText_TheresNoEscapeFromTrainerBattle: ; 0x80b49
|
||||
text "No! There's no"
|
||||
line "running from a"
|
||||
cont "trainer battle!"
|
||||
prompt
|
||||
; 0x80b77
|
||||
|
||||
BattleText_0x80b77: ; 0x80b77
|
||||
BattleText_GotAwaySafely: ; 0x80b77
|
||||
text "Got away safely!"
|
||||
prompt
|
||||
; 0x80b89
|
||||
|
||||
BattleText_0x80b89: ; 0x80b89
|
||||
text "<USER>"
|
||||
@ -318,7 +316,7 @@ BattleText_0x80b89: ; 0x80b89
|
||||
prompt
|
||||
; 0x80ba0
|
||||
|
||||
BattleText_0x80ba0: ; 0x80ba0
|
||||
BattleText_CantEscape: ; 0x80ba0
|
||||
text "Can't escape!"
|
||||
prompt
|
||||
; 0x80bae
|
||||
|
||||
@ -129,29 +129,29 @@ UnknownText_0x1c02c9: ; 1c02c9
|
||||
prompt
|
||||
; 1c02df
|
||||
|
||||
UnknownText_0x1c02df: ; 1c02df
|
||||
Text_GoPkmn: ; 1c02df
|
||||
text "Go! @"
|
||||
db "@"
|
||||
; 1c02e6
|
||||
|
||||
UnknownText_0x1c02e6: ; 1c02e6
|
||||
Text_DoItPkmn: ; 1c02e6
|
||||
text "Do it! @"
|
||||
db "@"
|
||||
; 1c02f0
|
||||
|
||||
UnknownText_0x1c02f0: ; 1c02f0
|
||||
Text_GoForItPkmn: ; 1c02f0
|
||||
text "Go for it,"
|
||||
line "@"
|
||||
db "@"
|
||||
; 1c02fe
|
||||
|
||||
UnknownText_0x1c02fe: ; 1c02fe
|
||||
Text_YourFoesWeakGetmPkmn: ; 1c02fe
|
||||
text "Your foe's weak!"
|
||||
line "Get'm, @"
|
||||
db "@"
|
||||
; 1c0317
|
||||
|
||||
UnknownText_0x1c0317: ; 1c0317
|
||||
Text_BattleMonNick01: ; 1c0317
|
||||
text_from_ram BattleMonNick
|
||||
text "!"
|
||||
done
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user