You've already forked pokecrystal-board
mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-04-09 05:44:44 -07:00
yenatch
@@ -413,10 +413,9 @@ UpdateChannels: ; e8125
|
||||
; hl << 4
|
||||
; each wavepattern is $0f bytes long
|
||||
; so seeking is done in $10s
|
||||
rept 4
|
||||
add hl, hl
|
||||
add hl, hl
|
||||
add hl, hl
|
||||
add hl, hl
|
||||
endr
|
||||
ld de, WaveSamples
|
||||
add hl, de
|
||||
; load wavepattern into $ff30-$ff3f
|
||||
@@ -1292,8 +1291,9 @@ GetNoiseSample: ; e86c5
|
||||
ld d, $00
|
||||
; load ptr to noise sample set in hl
|
||||
ld hl, Drumkits
|
||||
rept 2
|
||||
add hl, de
|
||||
add hl, de
|
||||
endr
|
||||
ld a, [hli]
|
||||
ld h, [hl]
|
||||
ld l, a
|
||||
@@ -1306,8 +1306,9 @@ GetNoiseSample: ; e86c5
|
||||
; use 'pitch' to seek noise sample set
|
||||
ld e, a
|
||||
ld d, $00
|
||||
rept 2
|
||||
add hl, de
|
||||
add hl, de
|
||||
endr
|
||||
; load sample pointer into NoiseSampleAddress
|
||||
ld a, [hli]
|
||||
ld [NoiseSampleAddressLo], a
|
||||
@@ -1328,8 +1329,9 @@ ParseMusicCommand: ; e870f
|
||||
ld d, $00
|
||||
; seek command pointer
|
||||
ld hl, MusicCommands
|
||||
rept 2
|
||||
add hl, de
|
||||
add hl, de
|
||||
endr
|
||||
; jump to the new pointer
|
||||
ld a, [hli]
|
||||
ld h, [hl]
|
||||
@@ -1572,8 +1574,9 @@ MusicFB: ; e8817
|
||||
inc hl
|
||||
ld d, [hl]
|
||||
; skip pointer
|
||||
rept 2
|
||||
inc de
|
||||
inc de
|
||||
endr
|
||||
; update address
|
||||
ld [hl], d
|
||||
dec hl
|
||||
@@ -1623,8 +1626,9 @@ MusicEE; e883e
|
||||
inc hl
|
||||
ld d, [hl]
|
||||
; skip pointer
|
||||
rept 2
|
||||
inc de
|
||||
inc de
|
||||
endr
|
||||
; update address
|
||||
ld [hl], d
|
||||
dec hl
|
||||
@@ -2378,9 +2382,9 @@ _PlayCryHeader:: ; e8b79
|
||||
|
||||
; 3-byte pointers (bank, address)
|
||||
ld hl, Cries
|
||||
rept 3
|
||||
add hl, de
|
||||
add hl, de
|
||||
add hl, de
|
||||
endr
|
||||
|
||||
ld a, [hli]
|
||||
ld [MusicBank], a
|
||||
@@ -2595,9 +2599,9 @@ PlayStereoSFX:: ; e8ca6
|
||||
|
||||
; get sfx ptr
|
||||
ld hl, SFX
|
||||
rept 3
|
||||
add hl, de
|
||||
add hl, de
|
||||
add hl, de
|
||||
endr
|
||||
|
||||
; bank
|
||||
ld a, [hli]
|
||||
@@ -2692,8 +2696,9 @@ LoadChannel: ; e8d1b
|
||||
ld c, a
|
||||
ld b, $00
|
||||
ld hl, ChannelPointers
|
||||
rept 2
|
||||
add hl, bc
|
||||
add hl, bc
|
||||
endr
|
||||
ld c, [hl]
|
||||
inc hl
|
||||
ld b, [hl] ; bc = channel pointer
|
||||
@@ -3157,8 +3162,9 @@ ClearChannels:: ; e8fe9
|
||||
; doesn't seem to be used, but functionally identical to SoundRestart
|
||||
ld hl, rNR50
|
||||
xor a
|
||||
rept 2
|
||||
ld [hli], a
|
||||
ld [hli], a
|
||||
endr
|
||||
ld a, $80
|
||||
ld [hli], a
|
||||
ld hl, rNR10
|
||||
|
||||
@@ -275,8 +275,9 @@ Music_GoldenrodCity_Ch3: ; eb584
|
||||
vibrato $8, $23
|
||||
notetype $c, $25
|
||||
Music_GoldenrodCity_branch_eb58c: ; eb58c
|
||||
rept 2
|
||||
callchannel Music_GoldenrodCity_branch_eb5aa
|
||||
callchannel Music_GoldenrodCity_branch_eb5aa
|
||||
endr
|
||||
callchannel Music_GoldenrodCity_branch_eb5d2
|
||||
note __, 3
|
||||
octave 3
|
||||
|
||||
@@ -492,8 +492,9 @@ Music_JohtoWildBattle_branch_f5fdb: ; f5fdb
|
||||
note G_, 2
|
||||
loopchannel 7, Music_JohtoWildBattle_branch_f5fdb
|
||||
note F#, 4
|
||||
rept 2
|
||||
callchannel Music_JohtoWildBattle_branch_f6055
|
||||
callchannel Music_JohtoWildBattle_branch_f6055
|
||||
endr
|
||||
Music_JohtoWildBattle_branch_f5fe8: ; f5fe8
|
||||
note D_, 2
|
||||
note G_, 2
|
||||
|
||||
@@ -325,22 +325,25 @@ Music_KantoWildBattle_branch_ed1c8: ; ed1c8
|
||||
note F_, 1
|
||||
note F#, 1
|
||||
notetype $6, $b7
|
||||
rept 2
|
||||
callchannel Music_KantoWildBattle_branch_ed307
|
||||
callchannel Music_KantoWildBattle_branch_ed307
|
||||
endr
|
||||
forceoctave $1
|
||||
rept 2
|
||||
callchannel Music_KantoWildBattle_branch_ed307
|
||||
callchannel Music_KantoWildBattle_branch_ed307
|
||||
endr
|
||||
forceoctave $0
|
||||
rept 4
|
||||
callchannel Music_KantoWildBattle_branch_ed307
|
||||
callchannel Music_KantoWildBattle_branch_ed307
|
||||
callchannel Music_KantoWildBattle_branch_ed307
|
||||
callchannel Music_KantoWildBattle_branch_ed307
|
||||
endr
|
||||
forceoctave $1
|
||||
rept 2
|
||||
callchannel Music_KantoWildBattle_branch_ed307
|
||||
callchannel Music_KantoWildBattle_branch_ed307
|
||||
endr
|
||||
forceoctave $0
|
||||
rept 2
|
||||
callchannel Music_KantoWildBattle_branch_ed307
|
||||
callchannel Music_KantoWildBattle_branch_ed307
|
||||
endr
|
||||
note __, 16
|
||||
octave 3
|
||||
note A#, 16
|
||||
|
||||
@@ -193,9 +193,9 @@ AI_TryItem: ; 38105
|
||||
jr z, .has_item
|
||||
|
||||
dec de
|
||||
rept 3
|
||||
inc hl
|
||||
inc hl
|
||||
inc hl
|
||||
endr
|
||||
jr .loop
|
||||
|
||||
.has_item
|
||||
@@ -213,8 +213,9 @@ AI_TryItem: ; 38105
|
||||
pop de
|
||||
pop hl
|
||||
|
||||
rept 2
|
||||
inc hl
|
||||
inc hl
|
||||
endr
|
||||
jr c, .loop
|
||||
|
||||
.used_item
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -265,9 +265,9 @@ Functioncc23d: ; cc23d
|
||||
ld a, [hl]
|
||||
and $f0
|
||||
ld [hli], a
|
||||
rept 3
|
||||
inc hl
|
||||
inc hl
|
||||
inc hl
|
||||
endr
|
||||
dec c
|
||||
jr nz, .asm_cc249
|
||||
ret
|
||||
@@ -341,8 +341,9 @@ Functioncc293: ; cc293
|
||||
ld e, a
|
||||
ld d, 0
|
||||
ld hl, BattleAnimCommands
|
||||
rept 2
|
||||
add hl, de
|
||||
add hl, de
|
||||
endr
|
||||
|
||||
ld a, [hli]
|
||||
ld h, [hl]
|
||||
@@ -488,8 +489,9 @@ BattleAnimCmd_FD: ; cc348 (33:4348)
|
||||
ld e, [hl]
|
||||
inc hl
|
||||
ld d, [hl]
|
||||
rept 2
|
||||
inc de
|
||||
inc de
|
||||
endr
|
||||
ld [hl], d
|
||||
dec hl
|
||||
ld [hl], e
|
||||
@@ -517,8 +519,9 @@ BattleAnimCmd_EF: ; cc383 (33:4383)
|
||||
ld e, [hl]
|
||||
inc hl
|
||||
ld d, [hl]
|
||||
rept 2
|
||||
inc de
|
||||
inc de
|
||||
endr
|
||||
ld [hl], d
|
||||
dec hl
|
||||
ld [hl], e
|
||||
@@ -544,8 +547,9 @@ BattleAnimCmd_FB: ; cc3b2 (33:43b2)
|
||||
ld e, [hl]
|
||||
inc hl
|
||||
ld d, [hl]
|
||||
rept 2
|
||||
inc de
|
||||
inc de
|
||||
endr
|
||||
ld [hl], d
|
||||
dec hl
|
||||
ld [hl], e
|
||||
@@ -572,8 +576,9 @@ BattleAnimCmd_F8: ; cc3d6 (33:43d6)
|
||||
ld e, [hl]
|
||||
inc hl
|
||||
ld d, [hl]
|
||||
rept 2
|
||||
inc de
|
||||
inc de
|
||||
endr
|
||||
ld [hl], d
|
||||
dec hl
|
||||
ld [hl], e
|
||||
@@ -601,8 +606,9 @@ BattleAnimCmd_EE: ; cc3fa (33:43fa)
|
||||
ld e, [hl]
|
||||
inc hl
|
||||
ld d, [hl]
|
||||
rept 2
|
||||
inc de
|
||||
inc de
|
||||
endr
|
||||
ld [hl], d
|
||||
dec hl
|
||||
ld [hl], e
|
||||
@@ -700,10 +706,9 @@ BattleAnimCmd_D5: ; cc485 (33:4485)
|
||||
push hl
|
||||
ld l, a
|
||||
ld h, $0
|
||||
rept 4
|
||||
add hl, hl
|
||||
add hl, hl
|
||||
add hl, hl
|
||||
add hl, hl
|
||||
endr
|
||||
ld de, $8310
|
||||
add hl, de
|
||||
ld a, [BattleAnimByte]
|
||||
@@ -797,8 +802,9 @@ BattleAnimCmd_D9: ; cc52c (33:452c)
|
||||
ld a, [hl]
|
||||
and a
|
||||
jr z, .asm_cc537
|
||||
rept 2
|
||||
inc hl
|
||||
inc hl
|
||||
endr
|
||||
jr .asm_cc52f
|
||||
|
||||
.asm_cc537
|
||||
@@ -852,8 +858,9 @@ BattleAnimCmd_DA: ; cc57e (33:457e)
|
||||
ld a, [hl]
|
||||
and a
|
||||
jr z, .asm_cc589
|
||||
rept 2
|
||||
inc hl
|
||||
inc hl
|
||||
endr
|
||||
jr .asm_cc581
|
||||
|
||||
.asm_cc589
|
||||
@@ -1243,10 +1250,9 @@ BattleAnimCmd_E1: ; cc807 (33:4807)
|
||||
ld e, a
|
||||
ld d, 0
|
||||
ld hl, Datacc871
|
||||
rept 4
|
||||
add hl, de
|
||||
add hl, de
|
||||
add hl, de
|
||||
add hl, de
|
||||
endr
|
||||
|
||||
ld a, [rSVBK] ; $ff00+$70
|
||||
push af
|
||||
@@ -1392,8 +1398,9 @@ Functioncc8d3: ; cc8d3
|
||||
inc hl
|
||||
ld d, [hl]
|
||||
ld hl, BattleAnimations
|
||||
rept 2
|
||||
add hl, de
|
||||
add hl, de
|
||||
endr
|
||||
call Function3ae1
|
||||
call BattleAnimAssignPals
|
||||
call BattleAnimDelayFrame
|
||||
|
||||
@@ -36,12 +36,9 @@ Functioncc9c4: ; cc9c4 (33:49c4)
|
||||
ld e, a
|
||||
ld d, 0
|
||||
ld hl, BattleAnimObjects
|
||||
rept 6
|
||||
add hl, de
|
||||
add hl, de
|
||||
add hl, de
|
||||
add hl, de
|
||||
add hl, de
|
||||
add hl, de
|
||||
endr
|
||||
ld e, l
|
||||
ld d, h
|
||||
ld hl, $0
|
||||
@@ -71,8 +68,9 @@ Functioncc9c4: ; cc9c4 (33:49c4)
|
||||
ld a, [BattleAnimTemps + 2]
|
||||
ld [hli], a
|
||||
xor a
|
||||
rept 2
|
||||
ld [hli], a
|
||||
ld [hli], a
|
||||
endr
|
||||
ld a, [BattleAnimTemps + 3]
|
||||
ld [hli], a
|
||||
xor a
|
||||
@@ -80,8 +78,9 @@ Functioncc9c4: ; cc9c4 (33:49c4)
|
||||
dec a
|
||||
ld [hli], a
|
||||
xor a
|
||||
rept 2
|
||||
ld [hli], a
|
||||
ld [hli], a
|
||||
endr
|
||||
ld [hl], a
|
||||
ret
|
||||
|
||||
@@ -516,8 +515,9 @@ Functionccfbe: ; ccfbe
|
||||
ld e, [hl]
|
||||
ld d, 0
|
||||
ld hl, Jumptable_ccfce
|
||||
rept 2
|
||||
add hl, de
|
||||
add hl, de
|
||||
endr
|
||||
ld a, [hli]
|
||||
ld h, [hl]
|
||||
ld l, a
|
||||
@@ -670,10 +670,9 @@ Functioncd0a6: ; cd0a6 (33:50a6)
|
||||
ld hl, $f
|
||||
add hl, bc
|
||||
ld a, [hl]
|
||||
rept 4
|
||||
inc [hl]
|
||||
inc [hl]
|
||||
inc [hl]
|
||||
inc [hl]
|
||||
endr
|
||||
ld d, $10
|
||||
push af
|
||||
push de
|
||||
@@ -937,8 +936,9 @@ Functioncd232: ; cd232 (33:5232)
|
||||
ld [hl], a
|
||||
ld hl, $7
|
||||
add hl, bc
|
||||
rept 2
|
||||
dec [hl]
|
||||
dec [hl]
|
||||
endr
|
||||
ret
|
||||
.asm_cd245
|
||||
call Functioncc9bd
|
||||
@@ -1739,8 +1739,9 @@ Functioncd687: ; cd687 (33:5687)
|
||||
ld [hl], a
|
||||
ld hl, $f
|
||||
add hl, bc
|
||||
rept 2
|
||||
inc [hl]
|
||||
inc [hl]
|
||||
endr
|
||||
|
||||
Functioncd6c5: ; cd6c5 (33:56c5)
|
||||
ret
|
||||
@@ -1760,8 +1761,9 @@ Functioncd6d6: ; cd6d6 (33:56d6)
|
||||
call Functioncc9bd
|
||||
ret
|
||||
asm_cd6da: ; cd6da (33:56da)
|
||||
rept 2
|
||||
inc a
|
||||
inc a
|
||||
endr
|
||||
ld [hl], a
|
||||
sub $10
|
||||
ret c
|
||||
@@ -2128,8 +2130,9 @@ Functioncd8cc: ; cd8cc (33:58cc)
|
||||
call Functionce7bf
|
||||
ld hl, $f
|
||||
add hl, bc
|
||||
rept 2
|
||||
inc [hl]
|
||||
inc [hl]
|
||||
endr
|
||||
ld a, [hl]
|
||||
and $1f
|
||||
ret nz
|
||||
@@ -2550,8 +2553,9 @@ Functioncdb28: ; cdb28 (33:5b28)
|
||||
ld a, [hl]
|
||||
cp $98
|
||||
ret nc
|
||||
rept 2
|
||||
inc [hl]
|
||||
inc [hl]
|
||||
endr
|
||||
ld hl, $1
|
||||
add hl, bc
|
||||
set 0, [hl]
|
||||
@@ -2587,8 +2591,9 @@ Functioncdb65: ; cdb65 (33:5b65)
|
||||
ld a, [hl]
|
||||
cp $98
|
||||
ret nc
|
||||
rept 2
|
||||
inc [hl]
|
||||
inc [hl]
|
||||
endr
|
||||
ld hl, $f
|
||||
add hl, bc
|
||||
ld a, [hl]
|
||||
@@ -2722,8 +2727,9 @@ Functioncdc27: ; cdc27 (33:5c27)
|
||||
ld hl, $f
|
||||
add hl, bc
|
||||
ld a, [hl]
|
||||
rept 2
|
||||
inc [hl]
|
||||
inc [hl]
|
||||
endr
|
||||
ld d, $2
|
||||
call Functionce734
|
||||
ld hl, $9
|
||||
@@ -2871,8 +2877,9 @@ Functioncdcfe: ; cdcfe (33:5cfe)
|
||||
ld hl, $10
|
||||
add hl, bc
|
||||
ld a, [hl]
|
||||
rept 2
|
||||
inc [hl]
|
||||
inc [hl]
|
||||
endr
|
||||
ld d, $10
|
||||
call Functionce734
|
||||
ld d, a
|
||||
@@ -3083,8 +3090,9 @@ Functioncde28: ; cde28 (33:5e28)
|
||||
ld hl, $f
|
||||
add hl, bc
|
||||
ld a, [hl]
|
||||
rept 2
|
||||
inc [hl]
|
||||
inc [hl]
|
||||
endr
|
||||
ld d, $4
|
||||
call Functionce734
|
||||
ld hl, $9
|
||||
@@ -3112,8 +3120,9 @@ Functioncde54: ; cde54 (33:5e54)
|
||||
ld hl, $f
|
||||
add hl, bc
|
||||
ld a, [hl]
|
||||
rept 2
|
||||
dec [hl]
|
||||
dec [hl]
|
||||
endr
|
||||
ld d, $10
|
||||
call Functionce734
|
||||
ld hl, $a
|
||||
@@ -3353,8 +3362,9 @@ Functioncdf8c: ; cdf8c (33:5f8c)
|
||||
ld [hl], a
|
||||
ld hl, $b
|
||||
add hl, bc
|
||||
rept 2
|
||||
inc [hl]
|
||||
inc [hl]
|
||||
endr
|
||||
ld a, [hl]
|
||||
and $7
|
||||
ret nz
|
||||
@@ -3394,8 +3404,9 @@ Functioncdfcb: ; cdfcb (33:5fcb)
|
||||
ld [hl], a
|
||||
ld hl, $b
|
||||
add hl, bc
|
||||
rept 2
|
||||
inc [hl]
|
||||
inc [hl]
|
||||
endr
|
||||
ld a, [hl]
|
||||
and $3
|
||||
ret nz
|
||||
@@ -3404,8 +3415,9 @@ Functioncdfcb: ; cdfcb (33:5fcb)
|
||||
ld a, [hl]
|
||||
cp $d0
|
||||
jr z, .asm_ce007
|
||||
rept 2
|
||||
dec [hl]
|
||||
dec [hl]
|
||||
endr
|
||||
ret
|
||||
.asm_ce007
|
||||
call Functioncc9bd
|
||||
@@ -3930,8 +3942,9 @@ Functionce2cc: ; ce2cc (33:62cc)
|
||||
ld [hl], a
|
||||
ld hl, $10
|
||||
add hl, bc
|
||||
rept 2
|
||||
dec [hl]
|
||||
dec [hl]
|
||||
endr
|
||||
ret
|
||||
|
||||
Functionce2fd: ; ce2fd (33:62fd)
|
||||
@@ -4077,8 +4090,9 @@ Functionce3b4: ; ce3b4 (33:63b4)
|
||||
ld hl, $f
|
||||
add hl, bc
|
||||
ld a, [hl]
|
||||
rept 2
|
||||
inc [hl]
|
||||
inc [hl]
|
||||
endr
|
||||
push af
|
||||
ld d, $2
|
||||
call Functionce734
|
||||
@@ -4317,8 +4331,9 @@ Functionce508: ; ce508 (33:6508)
|
||||
ld a, [hl]
|
||||
cp $10
|
||||
jr nc, .asm_ce52e
|
||||
rept 2
|
||||
inc [hl]
|
||||
inc [hl]
|
||||
endr
|
||||
ld d, a
|
||||
ld hl, $b
|
||||
add hl, bc
|
||||
@@ -4428,12 +4443,14 @@ Functionce59a: ; ce59a (33:659a)
|
||||
jr c, .asm_ce5b0
|
||||
ld hl, $7
|
||||
add hl, bc
|
||||
rept 2
|
||||
dec [hl]
|
||||
dec [hl]
|
||||
endr
|
||||
ld hl, $8
|
||||
add hl, bc
|
||||
rept 2
|
||||
inc [hl]
|
||||
inc [hl]
|
||||
endr
|
||||
ret
|
||||
.asm_ce5b0
|
||||
call Functioncc9bd
|
||||
@@ -4446,8 +4463,9 @@ Functionce5b4: ; ce5b4 (33:65b4)
|
||||
ld hl, $b
|
||||
add hl, bc
|
||||
ld a, [hl]
|
||||
rept 2
|
||||
inc [hl]
|
||||
inc [hl]
|
||||
endr
|
||||
push af
|
||||
push de
|
||||
call Functionce734
|
||||
@@ -4474,10 +4492,9 @@ Functionce5dc: ; ce5dc (33:65dc)
|
||||
ld a, [hl]
|
||||
cp $d0
|
||||
jr z, .asm_ce5ea
|
||||
rept 4
|
||||
dec [hl]
|
||||
dec [hl]
|
||||
dec [hl]
|
||||
dec [hl]
|
||||
endr
|
||||
ret
|
||||
.asm_ce5ea
|
||||
call Functioncc9bd
|
||||
@@ -4510,10 +4527,9 @@ Functionce60a: ; ce60a (33:660a)
|
||||
ld a, [hl]
|
||||
cp $4
|
||||
jr z, Functionce618
|
||||
rept 4
|
||||
inc [hl]
|
||||
inc [hl]
|
||||
inc [hl]
|
||||
inc [hl]
|
||||
endr
|
||||
ret
|
||||
|
||||
Functionce618: ; ce618 (33:6618)
|
||||
@@ -4529,10 +4545,9 @@ Functionce622: ; ce622 (33:6622)
|
||||
ld a, [hl]
|
||||
cp $d8
|
||||
ret z
|
||||
rept 4
|
||||
dec [hl]
|
||||
dec [hl]
|
||||
dec [hl]
|
||||
dec [hl]
|
||||
endr
|
||||
ret
|
||||
|
||||
Functionce62f: ; ce62f (33:662f)
|
||||
@@ -4567,8 +4582,9 @@ Functionce648: ; ce648 (33:6648)
|
||||
ld [hl], a
|
||||
ld hl, $9
|
||||
add hl, bc
|
||||
rept 2
|
||||
inc [hl]
|
||||
inc [hl]
|
||||
endr
|
||||
ret
|
||||
|
||||
Functionce65c: ; ce65c (33:665c)
|
||||
@@ -4754,8 +4770,9 @@ Functionce749: ; ce749 (33:6749)
|
||||
ld a, d
|
||||
ld d, 0
|
||||
ld hl, Unknown_ce77f
|
||||
rept 2
|
||||
add hl, de
|
||||
add hl, de
|
||||
endr
|
||||
ld e, [hl]
|
||||
inc hl
|
||||
ld d, [hl]
|
||||
@@ -4864,8 +4881,9 @@ Functionce7d1: ; ce7d1
|
||||
ld [hl], a
|
||||
ld hl, $000d
|
||||
add hl, bc
|
||||
rept 2
|
||||
dec [hl]
|
||||
dec [hl]
|
||||
endr
|
||||
jr .asm_ce7d1
|
||||
|
||||
.asm_ce815
|
||||
@@ -4886,8 +4904,9 @@ Functionce823: ; ce823
|
||||
ld e, [hl]
|
||||
ld d, 0
|
||||
ld hl, Unknown_ce85e
|
||||
rept 2
|
||||
add hl, de
|
||||
add hl, de
|
||||
endr
|
||||
ld e, [hl]
|
||||
inc hl
|
||||
ld d, [hl]
|
||||
@@ -4904,8 +4923,9 @@ Functionce83c: ; ce83c
|
||||
ld l, a
|
||||
ld h, 0
|
||||
ld de, Unknown_ceeae
|
||||
rept 2
|
||||
add hl, hl
|
||||
add hl, hl
|
||||
endr
|
||||
add hl, de
|
||||
ret
|
||||
; ce846
|
||||
@@ -4915,8 +4935,9 @@ Functionce846: ; ce846 (33:6846)
|
||||
push hl
|
||||
ld l, a
|
||||
ld h, 0
|
||||
rept 2
|
||||
add hl, hl
|
||||
add hl, hl
|
||||
endr
|
||||
ld de, AnimObjGFX
|
||||
add hl, de
|
||||
ld c, [hl]
|
||||
|
||||
@@ -61,8 +61,9 @@ Functionc804a: ; c804a (32:404a)
|
||||
ld e, [hl]
|
||||
ld d, 0
|
||||
ld hl, BattleBGEffects
|
||||
rept 2
|
||||
add hl, de
|
||||
add hl, de
|
||||
endr
|
||||
ld a, [hli]
|
||||
ld h, [hl]
|
||||
ld l, a
|
||||
@@ -708,9 +709,9 @@ Functionc83fa: ; c83fa (32:43fa)
|
||||
ld l, a
|
||||
ld a, [BattleAnimTemps + 2]
|
||||
ld h, a
|
||||
rept 3
|
||||
add hl, de
|
||||
add hl, de
|
||||
add hl, de
|
||||
endr
|
||||
ld a, [hl]
|
||||
cp $ff
|
||||
jr z, Functionc8434
|
||||
@@ -756,8 +757,9 @@ Functionc843b: ; c843b (32:443b)
|
||||
ld e, [hl]
|
||||
ld d, 0
|
||||
ld hl, Unknown_c849c
|
||||
rept 2
|
||||
add hl, de
|
||||
add hl, de
|
||||
endr
|
||||
ld a, [hli]
|
||||
ld h, [hl]
|
||||
ld l, a
|
||||
@@ -771,9 +773,9 @@ Functionc8458: ; c8458 (32:4458)
|
||||
ld e, [hl]
|
||||
ld d, 0
|
||||
ld hl, Unknown_c84a8
|
||||
rept 3
|
||||
add hl, de
|
||||
add hl, de
|
||||
add hl, de
|
||||
endr
|
||||
ld a, [hli]
|
||||
ld b, a
|
||||
and $f
|
||||
@@ -793,8 +795,9 @@ Functionc8458: ; c8458 (32:4458)
|
||||
ld e, [hl]
|
||||
ld d, 0
|
||||
ld hl, Unknown_c849c
|
||||
rept 2
|
||||
add hl, de
|
||||
add hl, de
|
||||
endr
|
||||
ld a, [hli]
|
||||
ld h, [hl]
|
||||
ld l, a
|
||||
@@ -1012,8 +1015,9 @@ Functionc85ce: ; c85ce (32:45ce)
|
||||
ld a, [hl]
|
||||
cp $20
|
||||
jr nc, .asm_c85fc
|
||||
rept 2
|
||||
inc [hl]
|
||||
inc [hl]
|
||||
endr
|
||||
call Functionc8f9a
|
||||
ret
|
||||
.asm_c85fc
|
||||
@@ -1388,8 +1392,9 @@ Functionc87de: ; c87de (32:47de)
|
||||
call Functionc901b
|
||||
ld hl, $2
|
||||
add hl, bc
|
||||
rept 2
|
||||
inc [hl]
|
||||
inc [hl]
|
||||
endr
|
||||
ret
|
||||
|
||||
Functionc8801: ; c8801 (32:4801)
|
||||
@@ -1792,8 +1797,9 @@ Functionc8a14: ; c8a14 (32:4a14)
|
||||
call Functionc901b
|
||||
ld hl, $3
|
||||
add hl, bc
|
||||
rept 2
|
||||
inc [hl]
|
||||
inc [hl]
|
||||
endr
|
||||
ret
|
||||
|
||||
Functionc8a36: ; c8a36 (32:4a36)
|
||||
@@ -1877,8 +1883,9 @@ Functionc8a9a: ; c8a9a (32:4a9a)
|
||||
ld h, $d2
|
||||
.asm_c8aa5
|
||||
ld [hl], e
|
||||
rept 2
|
||||
inc hl
|
||||
inc hl
|
||||
endr
|
||||
dec a
|
||||
jr nz, .asm_c8aa5
|
||||
ret
|
||||
|
||||
311
battle/core.asm
311
battle/core.asm
File diff suppressed because it is too large
Load Diff
@@ -50,8 +50,9 @@ DoMove: ; 3402c
|
||||
ld c, a
|
||||
ld b, 0
|
||||
ld hl, MoveEffectsPointers
|
||||
rept 2
|
||||
add hl, bc
|
||||
add hl, bc
|
||||
endr
|
||||
ld a, BANK(MoveEffectsPointers)
|
||||
call GetFarHalfword
|
||||
|
||||
@@ -100,8 +101,9 @@ DoMove: ; 3402c
|
||||
ld c, a
|
||||
ld b, 0
|
||||
ld hl, BattleCommandPointers
|
||||
rept 2
|
||||
add hl, bc
|
||||
add hl, bc
|
||||
endr
|
||||
pop bc
|
||||
|
||||
ld a, BANK(BattleCommandPointers)
|
||||
@@ -1062,8 +1064,9 @@ BattleCommand04: ; 34555
|
||||
jp nz, EndMoveEffect
|
||||
|
||||
; SubStatus5
|
||||
rept 2
|
||||
inc de
|
||||
inc de
|
||||
endr
|
||||
|
||||
ld a, [de]
|
||||
bit SUBSTATUS_TRANSFORMED, a
|
||||
@@ -1259,8 +1262,9 @@ BattleCommand05: ; 34631
|
||||
jr nc, .ScopeLens
|
||||
|
||||
; +2 critical level
|
||||
rept 2
|
||||
inc c
|
||||
inc c
|
||||
endr
|
||||
|
||||
.ScopeLens
|
||||
push bc
|
||||
@@ -1500,8 +1504,9 @@ BattleCommand07: ; 346d2
|
||||
pop hl
|
||||
|
||||
.asm_347b3
|
||||
rept 2
|
||||
inc hl
|
||||
inc hl
|
||||
endr
|
||||
jr .asm_34743
|
||||
|
||||
.end
|
||||
@@ -1746,11 +1751,9 @@ Function348de: ; 348de
|
||||
jr c, .loop
|
||||
|
||||
; neutral
|
||||
rept 5
|
||||
inc c
|
||||
inc c
|
||||
inc c
|
||||
inc c
|
||||
inc c
|
||||
endr
|
||||
cp 10
|
||||
jr z, .loop
|
||||
|
||||
@@ -2239,8 +2242,9 @@ Function34b77: ; 34b77
|
||||
ld b, [hl]
|
||||
inc hl
|
||||
ld c, [hl]
|
||||
rept 2
|
||||
inc hl
|
||||
inc hl
|
||||
endr
|
||||
srl c
|
||||
rl b
|
||||
srl c
|
||||
@@ -3344,8 +3348,9 @@ EndMoveEffect: ; 352a3
|
||||
ld a, [BattleScriptBufferLoc + 1]
|
||||
ld h, a
|
||||
ld a, $ff
|
||||
rept 2
|
||||
ld [hli], a
|
||||
ld [hli], a
|
||||
endr
|
||||
ld [hl], a
|
||||
ret
|
||||
; 352b1
|
||||
@@ -3983,9 +3988,9 @@ Function355dd: ; 355dd
|
||||
sla c
|
||||
rl b
|
||||
.asm_35604
|
||||
rept 3
|
||||
dec hl
|
||||
dec hl
|
||||
dec hl
|
||||
endr
|
||||
ld a, [hli]
|
||||
ld l, [hl]
|
||||
ld h, a
|
||||
@@ -4039,8 +4044,9 @@ BattleCommand62: ; 35612
|
||||
|
||||
xor a
|
||||
ld hl, hDividend
|
||||
rept 2
|
||||
ld [hli], a
|
||||
ld [hli], a
|
||||
endr
|
||||
ld [hl], a
|
||||
|
||||
; Level * 2
|
||||
@@ -4061,8 +4067,9 @@ BattleCommand62: ; 35612
|
||||
pop bc
|
||||
|
||||
; + 2
|
||||
rept 2
|
||||
inc [hl]
|
||||
inc [hl]
|
||||
endr
|
||||
|
||||
; * bp
|
||||
inc hl
|
||||
@@ -4523,9 +4530,9 @@ BattleCommand41: ; 35864
|
||||
set SUBSTATUS_ENCORED, [hl]
|
||||
call BattleRandom
|
||||
and $3
|
||||
rept 3
|
||||
inc a
|
||||
inc a
|
||||
inc a
|
||||
endr
|
||||
ld [de], a
|
||||
call Function36abf
|
||||
jr nz, .asm_3591a
|
||||
@@ -4650,8 +4657,9 @@ BattleCommand42: ; 35926
|
||||
ld [wd1ec], a
|
||||
ld a, [hl]
|
||||
ld [wd1ed], a
|
||||
rept 2
|
||||
dec de
|
||||
dec de
|
||||
endr
|
||||
ld a, [de]
|
||||
dec de
|
||||
add b
|
||||
@@ -4664,12 +4672,12 @@ BattleCommand42: ; 35926
|
||||
ld a, [CurDamage + 1]
|
||||
rr a
|
||||
ld [CurDamage + 1], a
|
||||
rept 3
|
||||
inc hl
|
||||
inc hl
|
||||
inc hl
|
||||
inc de
|
||||
inc de
|
||||
endr
|
||||
rept 3
|
||||
inc de
|
||||
endr
|
||||
|
||||
; fallthrough
|
||||
; 359ac
|
||||
@@ -5142,8 +5150,9 @@ BattleCommand4a: ; 35c0f
|
||||
call GetMoveName
|
||||
call BattleRandom
|
||||
and 3
|
||||
rept 2
|
||||
inc a
|
||||
inc a
|
||||
endr
|
||||
ld b, a
|
||||
ld a, [hl]
|
||||
and $3f
|
||||
@@ -6854,8 +6863,9 @@ Function3661d: ; 3661d
|
||||
dec c
|
||||
ld b, 0
|
||||
ld hl, Table0x364e6
|
||||
rept 2
|
||||
add hl, bc
|
||||
add hl, bc
|
||||
endr
|
||||
|
||||
xor a
|
||||
ld [hMultiplicand], a
|
||||
@@ -7009,8 +7019,9 @@ BattleCommand22: ; 366e5
|
||||
ld [wEnemyMoveStruct + MOVE_EFFECT], a
|
||||
call BattleRandom
|
||||
and 1
|
||||
rept 2
|
||||
inc a
|
||||
inc a
|
||||
endr
|
||||
ld [bc], a
|
||||
ld a, 1
|
||||
ld [wc689], a
|
||||
@@ -7046,8 +7057,9 @@ BattleCommand3e: ; 3671a
|
||||
set 7, [hl]
|
||||
call BattleRandom
|
||||
and $1
|
||||
rept 2
|
||||
inc a
|
||||
inc a
|
||||
endr
|
||||
inc de
|
||||
ld [de], a
|
||||
.asm_3674c
|
||||
@@ -7885,9 +7897,9 @@ BattleCommand3b: ; 36c2d
|
||||
ret nz
|
||||
call BattleRandom
|
||||
and 3
|
||||
rept 3
|
||||
inc a
|
||||
inc a
|
||||
inc a
|
||||
endr
|
||||
ld [hl], a
|
||||
ld a, BATTLE_VARS_MOVE_ANIM
|
||||
call GetBattleVar
|
||||
@@ -7899,8 +7911,9 @@ BattleCommand3b: ; 36c2d
|
||||
ld a, [hli]
|
||||
cp b
|
||||
jr z, .asm_36c69
|
||||
rept 2
|
||||
inc hl
|
||||
inc hl
|
||||
endr
|
||||
jr .asm_36c61
|
||||
|
||||
.asm_36c69
|
||||
@@ -7981,8 +7994,9 @@ BattleCommand27: ; 36cb2
|
||||
ld [Buffer2], a
|
||||
ld a, [hl]
|
||||
ld [Buffer1], a
|
||||
rept 2
|
||||
dec hl
|
||||
dec hl
|
||||
endr
|
||||
ld a, [hl]
|
||||
ld [wd1ec], a
|
||||
sub c
|
||||
@@ -8083,8 +8097,9 @@ Function36d70: ; 36d70
|
||||
set SUBSTATUS_CONFUSED, [hl]
|
||||
call BattleRandom
|
||||
and 3
|
||||
rept 2
|
||||
inc a
|
||||
inc a
|
||||
endr
|
||||
ld [bc], a
|
||||
|
||||
ld a, BATTLE_VARS_MOVE_EFFECT
|
||||
@@ -8263,8 +8278,9 @@ BattleCommand31: ; 36e7c
|
||||
rr b
|
||||
srl a
|
||||
rr b
|
||||
rept 2
|
||||
dec hl
|
||||
dec hl
|
||||
endr
|
||||
ld a, b
|
||||
ld [de], a
|
||||
ld a, [hld]
|
||||
@@ -8853,8 +8869,9 @@ BattleCommand2d: ; 371cd
|
||||
ld a, [hli]
|
||||
ld [de], a
|
||||
inc hl
|
||||
rept 2
|
||||
inc de
|
||||
inc de
|
||||
endr
|
||||
ld bc, NUM_MOVES
|
||||
call CopyBytes
|
||||
ld a, [hBattleTurn]
|
||||
@@ -9655,8 +9672,9 @@ BattleCommand66: ; 37991
|
||||
ld a, [hli]
|
||||
cp b
|
||||
jr nc, .ok
|
||||
rept 2
|
||||
inc hl
|
||||
inc hl
|
||||
endr
|
||||
jr .loop
|
||||
.ok
|
||||
ld d, [hl]
|
||||
@@ -9710,7 +9728,7 @@ BattleCommand67: ; 379c9
|
||||
; Return to battle scene
|
||||
call ClearPalettes
|
||||
callba Function3ed9f
|
||||
call Function1c17
|
||||
call WriteBackup
|
||||
call ClearSprites
|
||||
hlcoord 1, 0
|
||||
lb bc, 4, 10
|
||||
@@ -9779,7 +9797,7 @@ BatonPass_LinkPlayerSwitch: ; 37a67
|
||||
call Function1d6e
|
||||
ld hl, Function3e8e4
|
||||
call CallBattleCore
|
||||
call Function1c17
|
||||
call WriteBackup
|
||||
|
||||
xor a
|
||||
ld [wd0ec], a
|
||||
@@ -9810,7 +9828,7 @@ BatonPass_LinkEnemySwitch: ; 37a82
|
||||
add NUM_MOVES
|
||||
ld [wBattleAction], a
|
||||
.asm_37aa8
|
||||
jp Function1c17
|
||||
jp WriteBackup
|
||||
; 37aab
|
||||
|
||||
|
||||
@@ -10045,14 +10063,16 @@ BattleCommand6a6c: ; 37b7e
|
||||
inc c
|
||||
cp WEATHER_SUN
|
||||
jr z, .Heal
|
||||
rept 2
|
||||
dec c
|
||||
dec c
|
||||
endr
|
||||
|
||||
.Heal
|
||||
ld b, 0
|
||||
ld hl, .Multipliers
|
||||
rept 2
|
||||
add hl, bc
|
||||
add hl, bc
|
||||
endr
|
||||
|
||||
ld a, [hli]
|
||||
ld h, [hl]
|
||||
|
||||
@@ -45,8 +45,9 @@ HiddenPowerDamage: ; fbced
|
||||
|
||||
; Multiply by 5
|
||||
ld b, a
|
||||
rept 2
|
||||
add a
|
||||
add a
|
||||
endr
|
||||
add b
|
||||
|
||||
; Add Special & 3
|
||||
@@ -74,8 +75,9 @@ HiddenPowerDamage: ; fbced
|
||||
ld a, [hl]
|
||||
and 3 << 4
|
||||
swap a
|
||||
rept 2
|
||||
add a
|
||||
add a
|
||||
endr
|
||||
or b
|
||||
|
||||
; Skip Normal
|
||||
|
||||
@@ -141,8 +141,9 @@ CalcMagikarpLength: ; fbbfc
|
||||
; hl = de * 10
|
||||
ld h, d
|
||||
ld l, e
|
||||
rept 2
|
||||
add hl, hl
|
||||
add hl, hl
|
||||
endr
|
||||
add hl, de
|
||||
add hl, hl
|
||||
|
||||
|
||||
@@ -19,7 +19,9 @@ INCLUDE "constants/engine_flags.asm"
|
||||
INCLUDE "constants/music_constants.asm"
|
||||
INCLUDE "constants/sfx_constants.asm"
|
||||
INCLUDE "constants/animation_constants.asm"
|
||||
INCLUDE "constants/phone_constants.asm"
|
||||
INCLUDE "constants/gfx_constants.asm"
|
||||
INCLUDE "constants/pokemon_data_constants.asm"
|
||||
INCLUDE "constants/misc_constants.asm"
|
||||
INCLUDE "constants/std_constants.asm"
|
||||
INCLUDE "constants/deco_constants.asm"
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
105
constants/deco_constants.asm
Normal file
105
constants/deco_constants.asm
Normal file
@@ -0,0 +1,105 @@
|
||||
const_value = 1
|
||||
const DECO_PLANT
|
||||
const DECO_BED
|
||||
const DECO_CARPET
|
||||
const DECO_POSTER
|
||||
const DECO_DOLL
|
||||
const DECO_BIGDOLL
|
||||
|
||||
const_value = 1
|
||||
const PUT_IT_AWAY
|
||||
const MAGNAPLANT
|
||||
const TROPICPLANT
|
||||
const JUMBOPLANT
|
||||
const TOWN_MAP_D
|
||||
const FAMICOM
|
||||
const SUPER_NES
|
||||
const NINTENDO_64
|
||||
const VIRTUAL_BOY
|
||||
const GOLD_TROPHY
|
||||
const SILVER_TROPHY
|
||||
const SURF_PIKA_DOLL
|
||||
const _BED
|
||||
const _CARPET
|
||||
const _POSTER
|
||||
const _DOLL
|
||||
const BIG_
|
||||
const FEATHERY_BED
|
||||
const PIKACHU_BED
|
||||
const PINK_BED
|
||||
const POLKADOT_BED
|
||||
const RED_CARPET
|
||||
const BLUE_CARPET
|
||||
const YELLOW_CARPET
|
||||
const GREEN_CARPET
|
||||
|
||||
const_value = 1
|
||||
const SET_UP_BED
|
||||
const PUT_AWAY_BED
|
||||
const SET_UP_CARPET
|
||||
const PUT_AWAY_CARPET
|
||||
const SET_UP_PLANT
|
||||
const PUT_AWAY_PLANT
|
||||
const SET_UP_POSTER
|
||||
const PUT_AWAY_POSTER
|
||||
const SET_UP_CONSOLE
|
||||
const PUT_AWAY_CONSOLE
|
||||
const SET_UP_BIG_DOLL
|
||||
const PUT_AWAY_BIG_DOLL
|
||||
const SET_UP_DOLL
|
||||
const PUT_AWAY_DOLL
|
||||
const SET_UP_ORNAMENT
|
||||
const PUT_AWAY_ORNAMENT
|
||||
|
||||
const_value = 2
|
||||
const DECO_FEATHERY_BED ; 2
|
||||
const DECO_PINK_BED ; 3
|
||||
const DECO_POLKADOT_BED ; 4
|
||||
const DECO_PIKACHU_BED ; 5
|
||||
const_value = const_value + 1
|
||||
const DECO_RED_CARPET ; 7
|
||||
const DECO_BLUE_CARPET ; 8
|
||||
const DECO_YELLOW_CARPET ; 9
|
||||
const DECO_GREEN_CARPET ; a
|
||||
const_value = const_value + 1
|
||||
const DECO_MAGNAPLANT ; c
|
||||
const DECO_TROPICPLANT ; d
|
||||
const DECO_JUMBOPLANT ; e
|
||||
const_value = const_value + 1
|
||||
const DECO_TOWN_MAP ; 10
|
||||
const DECO_PIKACHU_POSTER ; 11
|
||||
const DECO_CLEFAIRY_POSTER ; 12
|
||||
const DECO_JIGGLYPUFF_POSTER ; 13
|
||||
const_value = const_value + 1
|
||||
const DECO_FAMICOM ; 15
|
||||
const DECO_SNES ; 16
|
||||
const DECO_N64 ; 17
|
||||
const DECO_VIRTUAL_BOY ; 18
|
||||
const_value = const_value + 1
|
||||
const DECO_BIG_SNORLAX_DOLL ; 1a
|
||||
const DECO_BIG_ONIX_DOLL ; 1b
|
||||
const DECO_BIG_LAPRAS_DOLL ; 1c
|
||||
const_value = const_value + 1
|
||||
const DECO_PIKACHU_DOLL ; 1e
|
||||
const DECO_SURF_PIKACHU_DOLL ; 1f
|
||||
const DECO_CLEFAIRY_DOLL ; 20
|
||||
const DECO_JIGGLYPUFF_DOLL ; 21
|
||||
const DECO_BULBASAUR_DOLL ; 22
|
||||
const DECO_CHARMANDER_DOLL ; 23
|
||||
const DECO_SQUIRTLE_DOLL ; 24
|
||||
const DECO_POLIWAG_DOLL ; 25
|
||||
const DECO_DIGLETT_DOLL ; 26
|
||||
const DECO_STARMIE_DOLL ; 27
|
||||
const DECO_MAGIKARP_DOLL ; 28
|
||||
const DECO_ODDISH_DOLL ; 29
|
||||
const DECO_GENGAR_DOLL ; 2a
|
||||
const DECO_SHELLDER_DOLL ; 2b
|
||||
const DECO_GRIMER_DOLL ; 2c
|
||||
const DECO_VOLTORB_DOLL ; 2d
|
||||
const DECO_WEEDLE_DOLL ; 2e
|
||||
const DECO_UNOWN_DOLL ; 2f
|
||||
const DECO_GEODUDE_DOLL ; 30
|
||||
const DECO_MACHOP_DOLL ; 31
|
||||
const DECO_TENTACOOL_DOLL ; 32
|
||||
const DECO_GOLD_TROPHY_DOLL ; 33
|
||||
const DECO_SILVER_TROPHY_DOLL ; 34
|
||||
@@ -16,13 +16,13 @@
|
||||
const ENGINE_POKERUS
|
||||
const ENGINE_ROCKET_SIGNAL_ON_CH20
|
||||
const ENGINE_CREDITS_SKIP
|
||||
const ENGINE_BUG_CONTEST_ON
|
||||
const ENGINE_BUG_CONTEST_ON ; 10
|
||||
const ENGINE_BUG_CONTEST_TIMER
|
||||
const ENGINE_12
|
||||
const ENGINE_ROCKETS_IN_RADIO_TOWER
|
||||
const ENGINE_BIKE_SHOP_CALL_ENABLED
|
||||
const ENGINE_GIVE_POKERUS
|
||||
const ENGINE_16
|
||||
const ENGINE_FLORIA
|
||||
const ENGINE_ROCKETS_IN_MAHOGANY
|
||||
const ENGINE_STRENGTH_ACTIVE
|
||||
const ENGINE_ALWAYS_ON_BIKE
|
||||
@@ -32,7 +32,7 @@
|
||||
const ENGINE_PLAINBADGE
|
||||
const ENGINE_FOGBADGE
|
||||
const ENGINE_MINERALBADGE
|
||||
const ENGINE_STORMBADGE
|
||||
const ENGINE_STORMBADGE ; 20
|
||||
const ENGINE_GLACIERBADGE
|
||||
const ENGINE_RISINGBADGE
|
||||
const ENGINE_BOULDERBADGE
|
||||
@@ -48,7 +48,7 @@
|
||||
const ENGINE_UNLOCKED_UNOWNS_3
|
||||
const ENGINE_UNLOCKED_UNOWNS_4
|
||||
const ENGINE_UNLOCKED_UNOWNS_5
|
||||
const ENGINE_UNLOCKED_UNOWNS_6
|
||||
const ENGINE_UNLOCKED_UNOWNS_6 ; 30
|
||||
const ENGINE_UNLOCKED_UNOWNS_7
|
||||
const ENGINE_UNLOCKED_UNOWNS_8
|
||||
const ENGINE_FLYPOINT_KRISS_HOUSE
|
||||
@@ -64,7 +64,7 @@
|
||||
const ENGINE_FLYPOINT_CELADON
|
||||
const ENGINE_FLYPOINT_FUCHSIA
|
||||
const ENGINE_FLYPOINT_CINNABAR
|
||||
const ENGINE_FLYPOINT_INDIGO_PLATEAU
|
||||
const ENGINE_FLYPOINT_INDIGO_PLATEAU ; 40
|
||||
const ENGINE_FLYPOINT_NEW_BARK
|
||||
const ENGINE_FLYPOINT_CHERRYGROVE
|
||||
const ENGINE_FLYPOINT_VIOLET
|
||||
@@ -80,8 +80,8 @@
|
||||
const ENGINE_FLYPOINT_UNUSED
|
||||
const ENGINE_LUCKY_NUMBER_SHOW
|
||||
const ENGINE_4F
|
||||
const ENGINE_KURT_MAKING_BALLS
|
||||
const ENGINE_51
|
||||
const ENGINE_KURT_MAKING_BALLS ; 50
|
||||
const ENGINE_DAILY_BUG_CONTEST
|
||||
const ENGINE_SPECIAL_WILDDATA
|
||||
const ENGINE_TIME_CAPSULE
|
||||
const ENGINE_ALL_FRUIT_TREES
|
||||
@@ -94,9 +94,9 @@
|
||||
const ENGINE_GOLDENROD_MALL_5F_HAPPINESS_EVENT
|
||||
const ENGINE_TEA_IN_BLUES_HOUSE
|
||||
const ENGINE_INDIGO_PLATEAU_RIVAL_FIGHT
|
||||
const ENGINE_5E
|
||||
const ENGINE_5F
|
||||
const ENGINE_60
|
||||
const ENGINE_DAILY_MOVE_TUTOR
|
||||
const ENGINE_BUENAS_PASSWORD
|
||||
const ENGINE_BUENAS_PASSWORD_2 ; 60
|
||||
const ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON
|
||||
const ENGINE_62
|
||||
const ENGINE_PLAYER_IS_FEMALE
|
||||
@@ -112,7 +112,7 @@
|
||||
const ENGINE_RALPH
|
||||
const ENGINE_LIZ
|
||||
const ENGINE_ANTHONY
|
||||
const ENGINE_TODD
|
||||
const ENGINE_TODD ; 70
|
||||
const ENGINE_GINA
|
||||
const ENGINE_ARNIE
|
||||
const ENGINE_ALAN
|
||||
@@ -128,37 +128,37 @@
|
||||
const ENGINE_BEVERLY_HAS_NUGGET
|
||||
const ENGINE_JOSE_HAS_STAR_PIECE
|
||||
const ENGINE_WADE_HAS_ITEM
|
||||
const ENGINE_GINA_HAS_LEAF_STONE
|
||||
const ENGINE_GINA_HAS_LEAF_STONE ; 80
|
||||
const ENGINE_ALAN_HAS_FIRE_STONE
|
||||
const ENGINE_LIZ_HAS_THUNDERSTONE
|
||||
const ENGINE_DANA_HAS_THUNDERSTONE
|
||||
const ENGINE_DEREK_HAS_NUGGET
|
||||
const ENGINE_TULLY_HAS_WATER_STONE
|
||||
const ENGINE_TIFFANY_HAS_PINK_BOW
|
||||
const ENGINE_WILTON_HAS_ITEM
|
||||
const ENGINE_87
|
||||
const ENGINE_88
|
||||
const ENGINE_89
|
||||
const ENGINE_8A
|
||||
const ENGINE_8B
|
||||
const ENGINE_8C
|
||||
const ENGINE_8D
|
||||
const ENGINE_8E
|
||||
const ENGINE_8F
|
||||
const ENGINE_90
|
||||
const ENGINE_91
|
||||
const ENGINE_92
|
||||
const ENGINE_93
|
||||
const ENGINE_94
|
||||
const ENGINE_95
|
||||
const ENGINE_96
|
||||
const ENGINE_97
|
||||
const ENGINE_98
|
||||
const ENGINE_99
|
||||
const ENGINE_9A
|
||||
const ENGINE_9B
|
||||
const ENGINE_9C
|
||||
const ENGINE_9D
|
||||
const ENGINE_9E
|
||||
const ENGINE_JACK_MONDAY_MORNING
|
||||
const ENGINE_HUEY_WEDNESDAY_NIGHT
|
||||
const ENGINE_GAVEN_THURSDAY_MORNING
|
||||
const ENGINE_BETH_FRIDAY_AFTERNOON
|
||||
const ENGINE_JOSE_SATURDAY_NIGHT
|
||||
const ENGINE_REENA_SUNDAY_MORNING
|
||||
const ENGINE_JOEY_MONDAY_AFTERNOON
|
||||
const ENGINE_WADE_TUESDAY_NIGHT
|
||||
const ENGINE_RALPH_WEDNESDAY_MORNING
|
||||
const ENGINE_LIZ_THURSDAY_AFTERNOON ; 90
|
||||
const ENGINE_ANTHONY_FRIDAY_NIGHT
|
||||
const ENGINE_TODD_SATURDAY_MORNING
|
||||
const ENGINE_GINA_SUNDAY_AFTERNOON
|
||||
const ENGINE_ARNIE_TUESDAY_MORNING
|
||||
const ENGINE_ALAN_WEDNESDAY_AFTERNOON
|
||||
const ENGINE_DANA_THURSDAY_NIGHT
|
||||
const ENGINE_CHAD_FRIDAY_MORNING
|
||||
const ENGINE_TULLY_SUNDAY_NIGHT
|
||||
const ENGINE_BRENT_MONDAY_MORNING
|
||||
const ENGINE_TIFFANY_TUESDAY_AFTERNOON
|
||||
const ENGINE_VANCE_WEDNESDAY_NIGHT
|
||||
const ENGINE_WILTON_THRUSDAY_MORNING
|
||||
const ENGINE_PARRY_FRIDAY_AFTERNOON
|
||||
const ENGINE_ERIN_SATURDAY_NIGHT
|
||||
const ENGINE_KRIS_IN_CABLE_CLUB
|
||||
const ENGINE_DUNSPARCE_SWARM
|
||||
const ENGINE_DUNSPARCE_SWARM ; a0
|
||||
const ENGINE_YANMA_SWARM
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,39 +1,40 @@
|
||||
ANIM_GFX_HIT EQU 1
|
||||
ANIM_GFX_CUT EQU 2
|
||||
ANIM_GFX_FIRE EQU 3
|
||||
ANIM_GFX_WATER EQU 4
|
||||
ANIM_GFX_LIGHTNING EQU 5
|
||||
ANIM_GFX_PLANT EQU 6
|
||||
ANIM_GFX_SMOKE EQU 7
|
||||
ANIM_GFX_EXPLOSION EQU 8
|
||||
ANIM_GFX_ROCKS EQU 9
|
||||
ANIM_GFX_ICE EQU 10
|
||||
ANIM_GFX_POKE_BALL EQU 11
|
||||
ANIM_GFX_POISON EQU 12
|
||||
ANIM_GFX_BUBBLE EQU 13
|
||||
ANIM_GFX_NOISE EQU 14
|
||||
ANIM_GFX_POWDER EQU 15
|
||||
ANIM_GFX_BEAM EQU 16
|
||||
ANIM_GFX_SPEED EQU 17
|
||||
ANIM_GFX_CHARGE EQU 18
|
||||
ANIM_GFX_WIND EQU 19
|
||||
ANIM_GFX_WHIP EQU 20
|
||||
ANIM_GFX_EGG EQU 21
|
||||
ANIM_GFX_ROPE EQU 22
|
||||
ANIM_GFX_PSYCHIC EQU 23
|
||||
ANIM_GFX_REFLECT EQU 24
|
||||
ANIM_GFX_STATUS EQU 25
|
||||
ANIM_GFX_SAND EQU 26
|
||||
ANIM_GFX_WEB EQU 27
|
||||
ANIM_GFX_HAZE EQU 28
|
||||
ANIM_GFX_HORN EQU 29
|
||||
ANIM_GFX_FLOWER EQU 30
|
||||
ANIM_GFX_MISC EQU 31
|
||||
ANIM_GFX_SKY_ATTACK EQU 32
|
||||
ANIM_GFX_GLOBE EQU 33
|
||||
ANIM_GFX_SHAPES EQU 34
|
||||
ANIM_GFX_OBJECTS EQU 35
|
||||
ANIM_GFX_SHINE EQU 36
|
||||
ANIM_GFX_ANGELS EQU 37
|
||||
ANIM_GFX_WAVE EQU 38
|
||||
ANIM_GFX_AEROBLAST EQU 39
|
||||
const_value SET 1
|
||||
const ANIM_GFX_HIT
|
||||
const ANIM_GFX_CUT
|
||||
const ANIM_GFX_FIRE
|
||||
const ANIM_GFX_WATER
|
||||
const ANIM_GFX_LIGHTNING
|
||||
const ANIM_GFX_PLANT
|
||||
const ANIM_GFX_SMOKE
|
||||
const ANIM_GFX_EXPLOSION
|
||||
const ANIM_GFX_ROCKS
|
||||
const ANIM_GFX_ICE
|
||||
const ANIM_GFX_POKE_BALL
|
||||
const ANIM_GFX_POISON
|
||||
const ANIM_GFX_BUBBLE
|
||||
const ANIM_GFX_NOISE
|
||||
const ANIM_GFX_POWDER
|
||||
const ANIM_GFX_BEAM
|
||||
const ANIM_GFX_SPEED
|
||||
const ANIM_GFX_CHARGE
|
||||
const ANIM_GFX_WIND
|
||||
const ANIM_GFX_WHIP
|
||||
const ANIM_GFX_EGG
|
||||
const ANIM_GFX_ROPE
|
||||
const ANIM_GFX_PSYCHIC
|
||||
const ANIM_GFX_REFLECT
|
||||
const ANIM_GFX_STATUS
|
||||
const ANIM_GFX_SAND
|
||||
const ANIM_GFX_WEB
|
||||
const ANIM_GFX_HAZE
|
||||
const ANIM_GFX_HORN
|
||||
const ANIM_GFX_FLOWER
|
||||
const ANIM_GFX_MISC
|
||||
const ANIM_GFX_SKY_ATTACK
|
||||
const ANIM_GFX_GLOBE
|
||||
const ANIM_GFX_SHAPES
|
||||
const ANIM_GFX_OBJECTS
|
||||
const ANIM_GFX_SHINE
|
||||
const ANIM_GFX_ANGELS
|
||||
const ANIM_GFX_WAVE
|
||||
const ANIM_GFX_AEROBLAST
|
||||
|
||||
@@ -266,6 +266,7 @@ SAFARI_BALL EQU 8 ; MOON_STONE
|
||||
MOON_STONE_RED EQU 10 ; BURN_HEAL
|
||||
FULL_HEAL_RED EQU 52 ; X_SPEED
|
||||
|
||||
MAIL_MAX_LENGTH EQU $20
|
||||
|
||||
; pockets
|
||||
ITEM EQU 1
|
||||
@@ -291,7 +292,7 @@ CANT_TOSS EQU 1 << 7
|
||||
const HELD_7
|
||||
const HELD_CLEANSE_TAG
|
||||
|
||||
const_value = 10
|
||||
const_value SET 10
|
||||
const HELD_HEAL_POISON
|
||||
const HELD_HEAL_FREEZE
|
||||
const HELD_HEAL_BURN
|
||||
@@ -300,7 +301,7 @@ const_value = 10
|
||||
const HELD_HEAL_STATUS
|
||||
const HELD_HEAL_CONFUSION
|
||||
|
||||
const_value = 20
|
||||
const_value SET 20
|
||||
const HELD_PREVENT_POISON
|
||||
const HELD_PREVENT_BURN
|
||||
const HELD_PREVENT_FREEZE
|
||||
@@ -308,7 +309,7 @@ const_value = 20
|
||||
const HELD_PREVENT_PARALYZE
|
||||
const HELD_PREVENT_CONFUSE
|
||||
|
||||
const_value = 30
|
||||
const_value SET 30
|
||||
const HELD_30
|
||||
const HELD_ATTACK_UP
|
||||
const HELD_DEFENSE_UP
|
||||
@@ -318,12 +319,12 @@ const_value = 30
|
||||
const HELD_ACCURACY_UP
|
||||
const HELD_EVASION_UP
|
||||
|
||||
const_value = 40
|
||||
const_value SET 40
|
||||
const HELD_40
|
||||
const HELD_41
|
||||
const HELD_METAL_POWDER
|
||||
|
||||
const_value = 50
|
||||
const_value SET 50
|
||||
const HELD_NORMAL_BOOST
|
||||
const HELD_FIGHTING_BOOST
|
||||
const HELD_FLYING_BOOST
|
||||
@@ -342,7 +343,7 @@ const_value = 50
|
||||
const HELD_DARK_BOOST
|
||||
const HELD_STEEL_BOOST
|
||||
|
||||
const_value = 70
|
||||
const_value SET 70
|
||||
const HELD_CATCH_CHANCE
|
||||
const HELD_71
|
||||
const HELD_ESCAPE
|
||||
@@ -353,3 +354,13 @@ const_value = 70
|
||||
const HELD_BRIGHTPOWDER
|
||||
const HELD_4E
|
||||
const HELD_FOCUS_BAND
|
||||
|
||||
const_def
|
||||
const ITEMATTR_PRICE
|
||||
const ITEMATTR_PRICE_HI
|
||||
const ITEMATTR_EFFECT
|
||||
const ITEMATTR_PARAM
|
||||
const ITEMATTR_PERMISSIONS
|
||||
const ITEMATTR_POCKET
|
||||
const ITEMATTR_HELP
|
||||
NUM_ITEMATTRS EQU const_value
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user