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

Merge remote-tracking branch 'kanzure/master' into gfx-script

Browse Source
This commit is contained in:
yenatch
2015-07-20 23:05:28 -07:00
parent a3c6931fa8 0b5471f385
commit 973721491c
504 changed files with 32011 additions and 45776 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
audio/engine.asm
View File

@@ -413,10 +413,9 @@ UpdateChannels: ; e8125
; hl << 4 ; hl << 4
; each wavepattern is $0f bytes long ; each wavepattern is $0f bytes long
; so seeking is done in $10s ; so seeking is done in $10s
rept 4
add hl, hl add hl, hl
add hl, hl endr
add hl, hl
add hl, hl
ld de, WaveSamples ld de, WaveSamples
add hl, de add hl, de
; load wavepattern into $ff30-$ff3f ; load wavepattern into $ff30-$ff3f
@@ -1292,8 +1291,9 @@ GetNoiseSample: ; e86c5
ld d, $00 ld d, $00
; load ptr to noise sample set in hl ; load ptr to noise sample set in hl
ld hl, Drumkits ld hl, Drumkits
rept 2
add hl, de add hl, de
add hl, de endr
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
@@ -1306,8 +1306,9 @@ GetNoiseSample: ; e86c5
; use 'pitch' to seek noise sample set ; use 'pitch' to seek noise sample set
ld e, a ld e, a
ld d, $00 ld d, $00
rept 2
add hl, de add hl, de
add hl, de endr
; load sample pointer into NoiseSampleAddress ; load sample pointer into NoiseSampleAddress
ld a, [hli] ld a, [hli]
ld [NoiseSampleAddressLo], a ld [NoiseSampleAddressLo], a
@@ -1328,8 +1329,9 @@ ParseMusicCommand: ; e870f
ld d, $00 ld d, $00
; seek command pointer ; seek command pointer
ld hl, MusicCommands ld hl, MusicCommands
rept 2
add hl, de add hl, de
add hl, de endr
; jump to the new pointer ; jump to the new pointer
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
@@ -1572,8 +1574,9 @@ MusicFB: ; e8817
inc hl inc hl
ld d, [hl] ld d, [hl]
; skip pointer ; skip pointer
rept 2
inc de inc de
inc de endr
; update address ; update address
ld [hl], d ld [hl], d
dec hl dec hl
@@ -1623,8 +1626,9 @@ MusicEE; e883e
inc hl inc hl
ld d, [hl] ld d, [hl]
; skip pointer ; skip pointer
rept 2
inc de inc de
inc de endr
; update address ; update address
ld [hl], d ld [hl], d
dec hl dec hl
@@ -2378,9 +2382,9 @@ _PlayCryHeader:: ; e8b79
; 3-byte pointers (bank, address) ; 3-byte pointers (bank, address)
ld hl, Cries ld hl, Cries
rept 3
add hl, de add hl, de
add hl, de endr
add hl, de
ld a, [hli] ld a, [hli]
ld [MusicBank], a ld [MusicBank], a
@@ -2595,9 +2599,9 @@ PlayStereoSFX:: ; e8ca6
; get sfx ptr ; get sfx ptr
ld hl, SFX ld hl, SFX
rept 3
add hl, de add hl, de
add hl, de endr
add hl, de
; bank ; bank
ld a, [hli] ld a, [hli]
@@ -2692,8 +2696,9 @@ LoadChannel: ; e8d1b
ld c, a ld c, a
ld b, $00 ld b, $00
ld hl, ChannelPointers ld hl, ChannelPointers
rept 2
add hl, bc add hl, bc
add hl, bc endr
ld c, [hl] ld c, [hl]
inc hl inc hl
ld b, [hl] ; bc = channel pointer ld b, [hl] ; bc = channel pointer
@@ -3157,8 +3162,9 @@ ClearChannels:: ; e8fe9
; doesn't seem to be used, but functionally identical to SoundRestart ; doesn't seem to be used, but functionally identical to SoundRestart
ld hl, rNR50 ld hl, rNR50
xor a xor a
rept 2
ld [hli], a ld [hli], a
ld [hli], a endr
ld a, $80 ld a, $80
ld [hli], a ld [hli], a
ld hl, rNR10 ld hl, rNR10

3
audio/music/goldenrodcity.asm
View File

@@ -275,8 +275,9 @@ Music_GoldenrodCity_Ch3: ; eb584
vibrato $8, $23 vibrato $8, $23
notetype $c, $25 notetype $c, $25
Music_GoldenrodCity_branch_eb58c: ; eb58c Music_GoldenrodCity_branch_eb58c: ; eb58c
rept 2
callchannel Music_GoldenrodCity_branch_eb5aa callchannel Music_GoldenrodCity_branch_eb5aa
callchannel Music_GoldenrodCity_branch_eb5aa endr
callchannel Music_GoldenrodCity_branch_eb5d2 callchannel Music_GoldenrodCity_branch_eb5d2
note __, 3 note __, 3
octave 3 octave 3

3
audio/music/johtowildbattle.asm
View File

@@ -492,8 +492,9 @@ Music_JohtoWildBattle_branch_f5fdb: ; f5fdb
note G_, 2 note G_, 2
loopchannel 7, Music_JohtoWildBattle_branch_f5fdb loopchannel 7, Music_JohtoWildBattle_branch_f5fdb
note F#, 4 note F#, 4
rept 2
callchannel Music_JohtoWildBattle_branch_f6055 callchannel Music_JohtoWildBattle_branch_f6055
callchannel Music_JohtoWildBattle_branch_f6055 endr
Music_JohtoWildBattle_branch_f5fe8: ; f5fe8 Music_JohtoWildBattle_branch_f5fe8: ; f5fe8
note D_, 2 note D_, 2
note G_, 2 note G_, 2

17
audio/music/kantowildbattle.asm
View File

@@ -325,22 +325,25 @@ Music_KantoWildBattle_branch_ed1c8: ; ed1c8
note F_, 1 note F_, 1
note F#, 1 note F#, 1
notetype $6, $b7 notetype $6, $b7
rept 2
callchannel Music_KantoWildBattle_branch_ed307 callchannel Music_KantoWildBattle_branch_ed307
callchannel Music_KantoWildBattle_branch_ed307 endr
forceoctave $1 forceoctave $1
rept 2
callchannel Music_KantoWildBattle_branch_ed307 callchannel Music_KantoWildBattle_branch_ed307
callchannel Music_KantoWildBattle_branch_ed307 endr
forceoctave $0 forceoctave $0
rept 4
callchannel Music_KantoWildBattle_branch_ed307 callchannel Music_KantoWildBattle_branch_ed307
callchannel Music_KantoWildBattle_branch_ed307 endr
callchannel Music_KantoWildBattle_branch_ed307
callchannel Music_KantoWildBattle_branch_ed307
forceoctave $1 forceoctave $1
rept 2
callchannel Music_KantoWildBattle_branch_ed307 callchannel Music_KantoWildBattle_branch_ed307
callchannel Music_KantoWildBattle_branch_ed307 endr
forceoctave $0 forceoctave $0
rept 2
callchannel Music_KantoWildBattle_branch_ed307 callchannel Music_KantoWildBattle_branch_ed307
callchannel Music_KantoWildBattle_branch_ed307 endr
note __, 16 note __, 16
octave 3 octave 3
note A#, 16 note A#, 16

7
battle/ai/items.asm
View File

@@ -193,9 +193,9 @@ AI_TryItem: ; 38105
jr z, .has_item jr z, .has_item
dec de dec de
rept 3
inc hl inc hl
inc hl endr
inc hl
jr .loop jr .loop
.has_item .has_item
@@ -213,8 +213,9 @@ AI_TryItem: ; 38105
pop de pop de
pop hl pop hl
rept 2
inc hl inc hl
inc hl endr
jr c, .loop jr c, .loop
.used_item .used_item

202
battle/ai/scoring.asm
View File

File diff suppressed because it is too large Load Diff

41
battle/anim_commands.asm
View File

@@ -265,9 +265,9 @@ Functioncc23d: ; cc23d
ld a, [hl] ld a, [hl]
and $f0 and $f0
ld [hli], a ld [hli], a
rept 3
inc hl inc hl
inc hl endr
inc hl
dec c dec c
jr nz, .asm_cc249 jr nz, .asm_cc249
ret ret
@@ -341,8 +341,9 @@ Functioncc293: ; cc293
ld e, a ld e, a
ld d, 0 ld d, 0
ld hl, BattleAnimCommands ld hl, BattleAnimCommands
rept 2
add hl, de add hl, de
add hl, de endr
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
@@ -488,8 +489,9 @@ BattleAnimCmd_FD: ; cc348 (33:4348)
ld e, [hl] ld e, [hl]
inc hl inc hl
ld d, [hl] ld d, [hl]
rept 2
inc de inc de
inc de endr
ld [hl], d ld [hl], d
dec hl dec hl
ld [hl], e ld [hl], e
@@ -517,8 +519,9 @@ BattleAnimCmd_EF: ; cc383 (33:4383)
ld e, [hl] ld e, [hl]
inc hl inc hl
ld d, [hl] ld d, [hl]
rept 2
inc de inc de
inc de endr
ld [hl], d ld [hl], d
dec hl dec hl
ld [hl], e ld [hl], e
@@ -544,8 +547,9 @@ BattleAnimCmd_FB: ; cc3b2 (33:43b2)
ld e, [hl] ld e, [hl]
inc hl inc hl
ld d, [hl] ld d, [hl]
rept 2
inc de inc de
inc de endr
ld [hl], d ld [hl], d
dec hl dec hl
ld [hl], e ld [hl], e
@@ -572,8 +576,9 @@ BattleAnimCmd_F8: ; cc3d6 (33:43d6)
ld e, [hl] ld e, [hl]
inc hl inc hl
ld d, [hl] ld d, [hl]
rept 2
inc de inc de
inc de endr
ld [hl], d ld [hl], d
dec hl dec hl
ld [hl], e ld [hl], e
@@ -601,8 +606,9 @@ BattleAnimCmd_EE: ; cc3fa (33:43fa)
ld e, [hl] ld e, [hl]
inc hl inc hl
ld d, [hl] ld d, [hl]
rept 2
inc de inc de
inc de endr
ld [hl], d ld [hl], d
dec hl dec hl
ld [hl], e ld [hl], e
@@ -700,10 +706,9 @@ BattleAnimCmd_D5: ; cc485 (33:4485)
push hl push hl
ld l, a ld l, a
ld h, $0 ld h, $0
rept 4
add hl, hl add hl, hl
add hl, hl endr
add hl, hl
add hl, hl
ld de, $8310 ld de, $8310
add hl, de add hl, de
ld a, [BattleAnimByte] ld a, [BattleAnimByte]
@@ -797,8 +802,9 @@ BattleAnimCmd_D9: ; cc52c (33:452c)
ld a, [hl] ld a, [hl]
and a and a
jr z, .asm_cc537 jr z, .asm_cc537
rept 2
inc hl inc hl
inc hl endr
jr .asm_cc52f jr .asm_cc52f
.asm_cc537 .asm_cc537
@@ -852,8 +858,9 @@ BattleAnimCmd_DA: ; cc57e (33:457e)
ld a, [hl] ld a, [hl]
and a and a
jr z, .asm_cc589 jr z, .asm_cc589
rept 2
inc hl inc hl
inc hl endr
jr .asm_cc581 jr .asm_cc581
.asm_cc589 .asm_cc589
@@ -1243,10 +1250,9 @@ BattleAnimCmd_E1: ; cc807 (33:4807)
ld e, a ld e, a
ld d, 0 ld d, 0
ld hl, Datacc871 ld hl, Datacc871
rept 4
add hl, de add hl, de
add hl, de endr
add hl, de
add hl, de
ld a, [rSVBK] ; $ff00+$70 ld a, [rSVBK] ; $ff00+$70
push af push af
@@ -1392,8 +1398,9 @@ Functioncc8d3: ; cc8d3
inc hl inc hl
ld d, [hl] ld d, [hl]
ld hl, BattleAnimations ld hl, BattleAnimations
rept 2
add hl, de add hl, de
add hl, de endr
call Function3ae1 call Function3ae1
call BattleAnimAssignPals call BattleAnimAssignPals
call BattleAnimDelayFrame call BattleAnimDelayFrame

111
battle/anim_objects.asm
View File

@@ -36,12 +36,9 @@ Functioncc9c4: ; cc9c4 (33:49c4)
ld e, a ld e, a
ld d, 0 ld d, 0
ld hl, BattleAnimObjects ld hl, BattleAnimObjects
rept 6
add hl, de add hl, de
add hl, de endr
add hl, de
add hl, de
add hl, de
add hl, de
ld e, l ld e, l
ld d, h ld d, h
ld hl, $0 ld hl, $0
@@ -71,8 +68,9 @@ Functioncc9c4: ; cc9c4 (33:49c4)
ld a, [BattleAnimTemps + 2] ld a, [BattleAnimTemps + 2]
ld [hli], a ld [hli], a
xor a xor a
rept 2
ld [hli], a ld [hli], a
ld [hli], a endr
ld a, [BattleAnimTemps + 3] ld a, [BattleAnimTemps + 3]
ld [hli], a ld [hli], a
xor a xor a
@@ -80,8 +78,9 @@ Functioncc9c4: ; cc9c4 (33:49c4)
dec a dec a
ld [hli], a ld [hli], a
xor a xor a
rept 2
ld [hli], a ld [hli], a
ld [hli], a endr
ld [hl], a ld [hl], a
ret ret
@@ -516,8 +515,9 @@ Functionccfbe: ; ccfbe
ld e, [hl] ld e, [hl]
ld d, 0 ld d, 0
ld hl, Jumptable_ccfce ld hl, Jumptable_ccfce
rept 2
add hl, de add hl, de
add hl, de endr
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
@@ -670,10 +670,9 @@ Functioncd0a6: ; cd0a6 (33:50a6)
ld hl, $f ld hl, $f
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
rept 4
inc [hl] inc [hl]
inc [hl] endr
inc [hl]
inc [hl]
ld d, $10 ld d, $10
push af push af
push de push de
@@ -937,8 +936,9 @@ Functioncd232: ; cd232 (33:5232)
ld [hl], a ld [hl], a
ld hl, $7 ld hl, $7
add hl, bc add hl, bc
rept 2
dec [hl] dec [hl]
dec [hl] endr
ret ret
.asm_cd245 .asm_cd245
call Functioncc9bd call Functioncc9bd
@@ -1739,8 +1739,9 @@ Functioncd687: ; cd687 (33:5687)
ld [hl], a ld [hl], a
ld hl, $f ld hl, $f
add hl, bc add hl, bc
rept 2
inc [hl] inc [hl]
inc [hl] endr
Functioncd6c5: ; cd6c5 (33:56c5) Functioncd6c5: ; cd6c5 (33:56c5)
ret ret
@@ -1760,8 +1761,9 @@ Functioncd6d6: ; cd6d6 (33:56d6)
call Functioncc9bd call Functioncc9bd
ret ret
asm_cd6da: ; cd6da (33:56da) asm_cd6da: ; cd6da (33:56da)
rept 2
inc a inc a
inc a endr
ld [hl], a ld [hl], a
sub $10 sub $10
ret c ret c
@@ -2128,8 +2130,9 @@ Functioncd8cc: ; cd8cc (33:58cc)
call Functionce7bf call Functionce7bf
ld hl, $f ld hl, $f
add hl, bc add hl, bc
rept 2
inc [hl] inc [hl]
inc [hl] endr
ld a, [hl] ld a, [hl]
and $1f and $1f
ret nz ret nz
@@ -2550,8 +2553,9 @@ Functioncdb28: ; cdb28 (33:5b28)
ld a, [hl] ld a, [hl]
cp $98 cp $98
ret nc ret nc
rept 2
inc [hl] inc [hl]
inc [hl] endr
ld hl, $1 ld hl, $1
add hl, bc add hl, bc
set 0, [hl] set 0, [hl]
@@ -2587,8 +2591,9 @@ Functioncdb65: ; cdb65 (33:5b65)
ld a, [hl] ld a, [hl]
cp $98 cp $98
ret nc ret nc
rept 2
inc [hl] inc [hl]
inc [hl] endr
ld hl, $f ld hl, $f
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
@@ -2722,8 +2727,9 @@ Functioncdc27: ; cdc27 (33:5c27)
ld hl, $f ld hl, $f
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
rept 2
inc [hl] inc [hl]
inc [hl] endr
ld d, $2 ld d, $2
call Functionce734 call Functionce734
ld hl, $9 ld hl, $9
@@ -2871,8 +2877,9 @@ Functioncdcfe: ; cdcfe (33:5cfe)
ld hl, $10 ld hl, $10
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
rept 2
inc [hl] inc [hl]
inc [hl] endr
ld d, $10 ld d, $10
call Functionce734 call Functionce734
ld d, a ld d, a
@@ -3083,8 +3090,9 @@ Functioncde28: ; cde28 (33:5e28)
ld hl, $f ld hl, $f
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
rept 2
inc [hl] inc [hl]
inc [hl] endr
ld d, $4 ld d, $4
call Functionce734 call Functionce734
ld hl, $9 ld hl, $9
@@ -3112,8 +3120,9 @@ Functioncde54: ; cde54 (33:5e54)
ld hl, $f ld hl, $f
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
rept 2
dec [hl] dec [hl]
dec [hl] endr
ld d, $10 ld d, $10
call Functionce734 call Functionce734
ld hl, $a ld hl, $a
@@ -3353,8 +3362,9 @@ Functioncdf8c: ; cdf8c (33:5f8c)
ld [hl], a ld [hl], a
ld hl, $b ld hl, $b
add hl, bc add hl, bc
rept 2
inc [hl] inc [hl]
inc [hl] endr
ld a, [hl] ld a, [hl]
and $7 and $7
ret nz ret nz
@@ -3394,8 +3404,9 @@ Functioncdfcb: ; cdfcb (33:5fcb)
ld [hl], a ld [hl], a
ld hl, $b ld hl, $b
add hl, bc add hl, bc
rept 2
inc [hl] inc [hl]
inc [hl] endr
ld a, [hl] ld a, [hl]
and $3 and $3
ret nz ret nz
@@ -3404,8 +3415,9 @@ Functioncdfcb: ; cdfcb (33:5fcb)
ld a, [hl] ld a, [hl]
cp $d0 cp $d0
jr z, .asm_ce007 jr z, .asm_ce007
rept 2
dec [hl] dec [hl]
dec [hl] endr
ret ret
.asm_ce007 .asm_ce007
call Functioncc9bd call Functioncc9bd
@@ -3930,8 +3942,9 @@ Functionce2cc: ; ce2cc (33:62cc)
ld [hl], a ld [hl], a
ld hl, $10 ld hl, $10
add hl, bc add hl, bc
rept 2
dec [hl] dec [hl]
dec [hl] endr
ret ret
Functionce2fd: ; ce2fd (33:62fd) Functionce2fd: ; ce2fd (33:62fd)
@@ -4077,8 +4090,9 @@ Functionce3b4: ; ce3b4 (33:63b4)
ld hl, $f ld hl, $f
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
rept 2
inc [hl] inc [hl]
inc [hl] endr
push af push af
ld d, $2 ld d, $2
call Functionce734 call Functionce734
@@ -4317,8 +4331,9 @@ Functionce508: ; ce508 (33:6508)
ld a, [hl] ld a, [hl]
cp $10 cp $10
jr nc, .asm_ce52e jr nc, .asm_ce52e
rept 2
inc [hl] inc [hl]
inc [hl] endr
ld d, a ld d, a
ld hl, $b ld hl, $b
add hl, bc add hl, bc
@@ -4428,12 +4443,14 @@ Functionce59a: ; ce59a (33:659a)
jr c, .asm_ce5b0 jr c, .asm_ce5b0
ld hl, $7 ld hl, $7
add hl, bc add hl, bc
rept 2
dec [hl] dec [hl]
dec [hl] endr
ld hl, $8 ld hl, $8
add hl, bc add hl, bc
rept 2
inc [hl] inc [hl]
inc [hl] endr
ret ret
.asm_ce5b0 .asm_ce5b0
call Functioncc9bd call Functioncc9bd
@@ -4446,8 +4463,9 @@ Functionce5b4: ; ce5b4 (33:65b4)
ld hl, $b ld hl, $b
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
rept 2
inc [hl] inc [hl]
inc [hl] endr
push af push af
push de push de
call Functionce734 call Functionce734
@@ -4474,10 +4492,9 @@ Functionce5dc: ; ce5dc (33:65dc)
ld a, [hl] ld a, [hl]
cp $d0 cp $d0
jr z, .asm_ce5ea jr z, .asm_ce5ea
rept 4
dec [hl] dec [hl]
dec [hl] endr
dec [hl]
dec [hl]
ret ret
.asm_ce5ea .asm_ce5ea
call Functioncc9bd call Functioncc9bd
@@ -4510,10 +4527,9 @@ Functionce60a: ; ce60a (33:660a)
ld a, [hl] ld a, [hl]
cp $4 cp $4
jr z, Functionce618 jr z, Functionce618
rept 4
inc [hl] inc [hl]
inc [hl] endr
inc [hl]
inc [hl]
ret ret
Functionce618: ; ce618 (33:6618) Functionce618: ; ce618 (33:6618)
@@ -4529,10 +4545,9 @@ Functionce622: ; ce622 (33:6622)
ld a, [hl] ld a, [hl]
cp $d8 cp $d8
ret z ret z
rept 4
dec [hl] dec [hl]
dec [hl] endr
dec [hl]
dec [hl]
ret ret
Functionce62f: ; ce62f (33:662f) Functionce62f: ; ce62f (33:662f)
@@ -4567,8 +4582,9 @@ Functionce648: ; ce648 (33:6648)
ld [hl], a ld [hl], a
ld hl, $9 ld hl, $9
add hl, bc add hl, bc
rept 2
inc [hl] inc [hl]
inc [hl] endr
ret ret
Functionce65c: ; ce65c (33:665c) Functionce65c: ; ce65c (33:665c)
@@ -4754,8 +4770,9 @@ Functionce749: ; ce749 (33:6749)
ld a, d ld a, d
ld d, 0 ld d, 0
ld hl, Unknown_ce77f ld hl, Unknown_ce77f
rept 2
add hl, de add hl, de
add hl, de endr
ld e, [hl] ld e, [hl]
inc hl inc hl
ld d, [hl] ld d, [hl]
@@ -4864,8 +4881,9 @@ Functionce7d1: ; ce7d1
ld [hl], a ld [hl], a
ld hl, $000d ld hl, $000d
add hl, bc add hl, bc
rept 2
dec [hl] dec [hl]
dec [hl] endr
jr .asm_ce7d1 jr .asm_ce7d1
.asm_ce815 .asm_ce815
@@ -4886,8 +4904,9 @@ Functionce823: ; ce823
ld e, [hl] ld e, [hl]
ld d, 0 ld d, 0
ld hl, Unknown_ce85e ld hl, Unknown_ce85e
rept 2
add hl, de add hl, de
add hl, de endr
ld e, [hl] ld e, [hl]
inc hl inc hl
ld d, [hl] ld d, [hl]
@@ -4904,8 +4923,9 @@ Functionce83c: ; ce83c
ld l, a ld l, a
ld h, 0 ld h, 0
ld de, Unknown_ceeae ld de, Unknown_ceeae
rept 2
add hl, hl add hl, hl
add hl, hl endr
add hl, de add hl, de
ret ret
; ce846 ; ce846
@@ -4915,8 +4935,9 @@ Functionce846: ; ce846 (33:6846)
push hl push hl
ld l, a ld l, a
ld h, 0 ld h, 0
rept 2
add hl, hl add hl, hl
add hl, hl endr
ld de, AnimObjGFX ld de, AnimObjGFX
add hl, de add hl, de
ld c, [hl] ld c, [hl]

29
battle/bg_effects.asm
View File

@@ -61,8 +61,9 @@ Functionc804a: ; c804a (32:404a)
ld e, [hl] ld e, [hl]
ld d, 0 ld d, 0
ld hl, BattleBGEffects ld hl, BattleBGEffects
rept 2
add hl, de add hl, de
add hl, de endr
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
@@ -708,9 +709,9 @@ Functionc83fa: ; c83fa (32:43fa)
ld l, a ld l, a
ld a, [BattleAnimTemps + 2] ld a, [BattleAnimTemps + 2]
ld h, a ld h, a
rept 3
add hl, de add hl, de
add hl, de endr
add hl, de
ld a, [hl] ld a, [hl]
cp $ff cp $ff
jr z, Functionc8434 jr z, Functionc8434
@@ -756,8 +757,9 @@ Functionc843b: ; c843b (32:443b)
ld e, [hl] ld e, [hl]
ld d, 0 ld d, 0
ld hl, Unknown_c849c ld hl, Unknown_c849c
rept 2
add hl, de add hl, de
add hl, de endr
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
@@ -771,9 +773,9 @@ Functionc8458: ; c8458 (32:4458)
ld e, [hl] ld e, [hl]
ld d, 0 ld d, 0
ld hl, Unknown_c84a8 ld hl, Unknown_c84a8
rept 3
add hl, de add hl, de
add hl, de endr
add hl, de
ld a, [hli] ld a, [hli]
ld b, a ld b, a
and $f and $f
@@ -793,8 +795,9 @@ Functionc8458: ; c8458 (32:4458)
ld e, [hl] ld e, [hl]
ld d, 0 ld d, 0
ld hl, Unknown_c849c ld hl, Unknown_c849c
rept 2
add hl, de add hl, de
add hl, de endr
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
@@ -1012,8 +1015,9 @@ Functionc85ce: ; c85ce (32:45ce)
ld a, [hl] ld a, [hl]
cp $20 cp $20
jr nc, .asm_c85fc jr nc, .asm_c85fc
rept 2
inc [hl] inc [hl]
inc [hl] endr
call Functionc8f9a call Functionc8f9a
ret ret
.asm_c85fc .asm_c85fc
@@ -1388,8 +1392,9 @@ Functionc87de: ; c87de (32:47de)
call Functionc901b call Functionc901b
ld hl, $2 ld hl, $2
add hl, bc add hl, bc
rept 2
inc [hl] inc [hl]
inc [hl] endr
ret ret
Functionc8801: ; c8801 (32:4801) Functionc8801: ; c8801 (32:4801)
@@ -1792,8 +1797,9 @@ Functionc8a14: ; c8a14 (32:4a14)
call Functionc901b call Functionc901b
ld hl, $3 ld hl, $3
add hl, bc add hl, bc
rept 2
inc [hl] inc [hl]
inc [hl] endr
ret ret
Functionc8a36: ; c8a36 (32:4a36) Functionc8a36: ; c8a36 (32:4a36)
@@ -1877,8 +1883,9 @@ Functionc8a9a: ; c8a9a (32:4a9a)
ld h, $d2 ld h, $d2
.asm_c8aa5 .asm_c8aa5
ld [hl], e ld [hl], e
rept 2
inc hl inc hl
inc hl endr
dec a dec a
jr nz, .asm_c8aa5 jr nz, .asm_c8aa5
ret ret

311
battle/core.asm
View File

File diff suppressed because it is too large Load Diff

98
battle/effect_commands.asm
View File

@@ -50,8 +50,9 @@ DoMove: ; 3402c
ld c, a ld c, a
ld b, 0 ld b, 0
ld hl, MoveEffectsPointers ld hl, MoveEffectsPointers
rept 2
add hl, bc add hl, bc
add hl, bc endr
ld a, BANK(MoveEffectsPointers) ld a, BANK(MoveEffectsPointers)
call GetFarHalfword call GetFarHalfword
@@ -100,8 +101,9 @@ DoMove: ; 3402c
ld c, a ld c, a
ld b, 0 ld b, 0
ld hl, BattleCommandPointers ld hl, BattleCommandPointers
rept 2
add hl, bc add hl, bc
add hl, bc endr
pop bc pop bc
ld a, BANK(BattleCommandPointers) ld a, BANK(BattleCommandPointers)
@@ -1062,8 +1064,9 @@ BattleCommand04: ; 34555
jp nz, EndMoveEffect jp nz, EndMoveEffect
; SubStatus5 ; SubStatus5
rept 2
inc de inc de
inc de endr
ld a, [de] ld a, [de]
bit SUBSTATUS_TRANSFORMED, a bit SUBSTATUS_TRANSFORMED, a
@@ -1259,8 +1262,9 @@ BattleCommand05: ; 34631
jr nc, .ScopeLens jr nc, .ScopeLens
; +2 critical level ; +2 critical level
rept 2
inc c inc c
inc c endr
.ScopeLens .ScopeLens
push bc push bc
@@ -1500,8 +1504,9 @@ BattleCommand07: ; 346d2
pop hl pop hl
.asm_347b3 .asm_347b3
rept 2
inc hl inc hl
inc hl endr
jr .asm_34743 jr .asm_34743
.end .end
@@ -1746,11 +1751,9 @@ Function348de: ; 348de
jr c, .loop jr c, .loop
; neutral ; neutral
rept 5
inc c inc c
inc c endr
inc c
inc c
inc c
cp 10 cp 10
jr z, .loop jr z, .loop
@@ -2239,8 +2242,9 @@ Function34b77: ; 34b77
ld b, [hl] ld b, [hl]
inc hl inc hl
ld c, [hl] ld c, [hl]
rept 2
inc hl inc hl
inc hl endr
srl c srl c
rl b rl b
srl c srl c
@@ -3344,8 +3348,9 @@ EndMoveEffect: ; 352a3
ld a, [BattleScriptBufferLoc + 1] ld a, [BattleScriptBufferLoc + 1]
ld h, a ld h, a
ld a, $ff ld a, $ff
rept 2
ld [hli], a ld [hli], a
ld [hli], a endr
ld [hl], a ld [hl], a
ret ret
; 352b1 ; 352b1
@@ -3983,9 +3988,9 @@ Function355dd: ; 355dd
sla c sla c
rl b rl b
.asm_35604 .asm_35604
rept 3
dec hl dec hl
dec hl endr
dec hl
ld a, [hli] ld a, [hli]
ld l, [hl] ld l, [hl]
ld h, a ld h, a
@@ -4039,8 +4044,9 @@ BattleCommand62: ; 35612
xor a xor a
ld hl, hDividend ld hl, hDividend
rept 2
ld [hli], a ld [hli], a
ld [hli], a endr
ld [hl], a ld [hl], a
; Level * 2 ; Level * 2
@@ -4061,8 +4067,9 @@ BattleCommand62: ; 35612
pop bc pop bc
; + 2 ; + 2
rept 2
inc [hl] inc [hl]
inc [hl] endr
; * bp ; * bp
inc hl inc hl
@@ -4523,9 +4530,9 @@ BattleCommand41: ; 35864
set SUBSTATUS_ENCORED, [hl] set SUBSTATUS_ENCORED, [hl]
call BattleRandom call BattleRandom
and $3 and $3
rept 3
inc a inc a
inc a endr
inc a
ld [de], a ld [de], a
call Function36abf call Function36abf
jr nz, .asm_3591a jr nz, .asm_3591a
@@ -4650,8 +4657,9 @@ BattleCommand42: ; 35926
ld [wd1ec], a ld [wd1ec], a
ld a, [hl] ld a, [hl]
ld [wd1ed], a ld [wd1ed], a
rept 2
dec de dec de
dec de endr
ld a, [de] ld a, [de]
dec de dec de
add b add b
@@ -4664,12 +4672,12 @@ BattleCommand42: ; 35926
ld a, [CurDamage + 1] ld a, [CurDamage + 1]
rr a rr a
ld [CurDamage + 1], a ld [CurDamage + 1], a
rept 3
inc hl inc hl
inc hl endr
inc hl rept 3
inc de
inc de
inc de inc de
endr
; fallthrough ; fallthrough
; 359ac ; 359ac
@@ -5142,8 +5150,9 @@ BattleCommand4a: ; 35c0f
call GetMoveName call GetMoveName
call BattleRandom call BattleRandom
and 3 and 3
rept 2
inc a inc a
inc a endr
ld b, a ld b, a
ld a, [hl] ld a, [hl]
and $3f and $3f
@@ -6854,8 +6863,9 @@ Function3661d: ; 3661d
dec c dec c
ld b, 0 ld b, 0
ld hl, Table0x364e6 ld hl, Table0x364e6
rept 2
add hl, bc add hl, bc
add hl, bc endr
xor a xor a
ld [hMultiplicand], a ld [hMultiplicand], a
@@ -7009,8 +7019,9 @@ BattleCommand22: ; 366e5
ld [wEnemyMoveStruct + MOVE_EFFECT], a ld [wEnemyMoveStruct + MOVE_EFFECT], a
call BattleRandom call BattleRandom
and 1 and 1
rept 2
inc a inc a
inc a endr
ld [bc], a ld [bc], a
ld a, 1 ld a, 1
ld [wc689], a ld [wc689], a
@@ -7046,8 +7057,9 @@ BattleCommand3e: ; 3671a
set 7, [hl] set 7, [hl]
call BattleRandom call BattleRandom
and $1 and $1
rept 2
inc a inc a
inc a endr
inc de inc de
ld [de], a ld [de], a
.asm_3674c .asm_3674c
@@ -7885,9 +7897,9 @@ BattleCommand3b: ; 36c2d
ret nz ret nz
call BattleRandom call BattleRandom
and 3 and 3
rept 3
inc a inc a
inc a endr
inc a
ld [hl], a ld [hl], a
ld a, BATTLE_VARS_MOVE_ANIM ld a, BATTLE_VARS_MOVE_ANIM
call GetBattleVar call GetBattleVar
@@ -7899,8 +7911,9 @@ BattleCommand3b: ; 36c2d
ld a, [hli] ld a, [hli]
cp b cp b
jr z, .asm_36c69 jr z, .asm_36c69
rept 2
inc hl inc hl
inc hl endr
jr .asm_36c61 jr .asm_36c61
.asm_36c69 .asm_36c69
@@ -7981,8 +7994,9 @@ BattleCommand27: ; 36cb2
ld [Buffer2], a ld [Buffer2], a
ld a, [hl] ld a, [hl]
ld [Buffer1], a ld [Buffer1], a
rept 2
dec hl dec hl
dec hl endr
ld a, [hl] ld a, [hl]
ld [wd1ec], a ld [wd1ec], a
sub c sub c
@@ -8083,8 +8097,9 @@ Function36d70: ; 36d70
set SUBSTATUS_CONFUSED, [hl] set SUBSTATUS_CONFUSED, [hl]
call BattleRandom call BattleRandom
and 3 and 3
rept 2
inc a inc a
inc a endr
ld [bc], a ld [bc], a
ld a, BATTLE_VARS_MOVE_EFFECT ld a, BATTLE_VARS_MOVE_EFFECT
@@ -8263,8 +8278,9 @@ BattleCommand31: ; 36e7c
rr b rr b
srl a srl a
rr b rr b
rept 2
dec hl dec hl
dec hl endr
ld a, b ld a, b
ld [de], a ld [de], a
ld a, [hld] ld a, [hld]
@@ -8853,8 +8869,9 @@ BattleCommand2d: ; 371cd
ld a, [hli] ld a, [hli]
ld [de], a ld [de], a
inc hl inc hl
rept 2
inc de inc de
inc de endr
ld bc, NUM_MOVES ld bc, NUM_MOVES
call CopyBytes call CopyBytes
ld a, [hBattleTurn] ld a, [hBattleTurn]
@@ -9655,8 +9672,9 @@ BattleCommand66: ; 37991
ld a, [hli] ld a, [hli]
cp b cp b
jr nc, .ok jr nc, .ok
rept 2
inc hl inc hl
inc hl endr
jr .loop jr .loop
.ok .ok
ld d, [hl] ld d, [hl]
@@ -9710,7 +9728,7 @@ BattleCommand67: ; 379c9
; Return to battle scene ; Return to battle scene
call ClearPalettes call ClearPalettes
callba Function3ed9f callba Function3ed9f
call Function1c17 call WriteBackup
call ClearSprites call ClearSprites
hlcoord 1, 0 hlcoord 1, 0
lb bc, 4, 10 lb bc, 4, 10
@@ -9779,7 +9797,7 @@ BatonPass_LinkPlayerSwitch: ; 37a67
call Function1d6e call Function1d6e
ld hl, Function3e8e4 ld hl, Function3e8e4
call CallBattleCore call CallBattleCore
call Function1c17 call WriteBackup
xor a xor a
ld [wd0ec], a ld [wd0ec], a
@@ -9810,7 +9828,7 @@ BatonPass_LinkEnemySwitch: ; 37a82
add NUM_MOVES add NUM_MOVES
ld [wBattleAction], a ld [wBattleAction], a
.asm_37aa8 .asm_37aa8
jp Function1c17 jp WriteBackup
; 37aab ; 37aab
@@ -10045,14 +10063,16 @@ BattleCommand6a6c: ; 37b7e
inc c inc c
cp WEATHER_SUN cp WEATHER_SUN
jr z, .Heal jr z, .Heal
rept 2
dec c dec c
dec c endr
.Heal .Heal
ld b, 0 ld b, 0
ld hl, .Multipliers ld hl, .Multipliers
rept 2
add hl, bc add hl, bc
add hl, bc endr
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]

6
battle/hidden_power.asm
View File

@@ -45,8 +45,9 @@ HiddenPowerDamage: ; fbced
; Multiply by 5 ; Multiply by 5
ld b, a ld b, a
rept 2
add a add a
add a endr
add b add b
; Add Special & 3 ; Add Special & 3
@@ -74,8 +75,9 @@ HiddenPowerDamage: ; fbced
ld a, [hl] ld a, [hl]
and 3 << 4 and 3 << 4
swap a swap a
rept 2
add a add a
add a endr
or b or b
; Skip Normal ; Skip Normal

3
battle/magikarp_length.asm
View File

@@ -141,8 +141,9 @@ CalcMagikarpLength: ; fbbfc
; hl = de * 10 ; hl = de * 10
ld h, d ld h, d
ld l, e ld l, e
rept 2
add hl, hl add hl, hl
add hl, hl endr
add hl, de add hl, de
add hl, hl add hl, hl

3
constants.asm
View File

@@ -5,7 +5,6 @@ INCLUDE "gbhw.asm"
INCLUDE "hram.asm" INCLUDE "hram.asm"
INCLUDE "constants/wram_constants.asm" INCLUDE "constants/wram_constants.asm"
INCLUDE "constants/pokemon_constants.asm" INCLUDE "constants/pokemon_constants.asm"
INCLUDE "constants/type_constants.asm" INCLUDE "constants/type_constants.asm"
INCLUDE "constants/move_constants.asm" INCLUDE "constants/move_constants.asm"
@@ -20,7 +19,9 @@ INCLUDE "constants/engine_flags.asm"
INCLUDE "constants/music_constants.asm" INCLUDE "constants/music_constants.asm"
INCLUDE "constants/sfx_constants.asm" INCLUDE "constants/sfx_constants.asm"
INCLUDE "constants/animation_constants.asm" INCLUDE "constants/animation_constants.asm"
INCLUDE "constants/phone_constants.asm"
INCLUDE "constants/gfx_constants.asm" INCLUDE "constants/gfx_constants.asm"
INCLUDE "constants/pokemon_data_constants.asm" INCLUDE "constants/pokemon_data_constants.asm"
INCLUDE "constants/misc_constants.asm" INCLUDE "constants/misc_constants.asm"
INCLUDE "constants/std_constants.asm" INCLUDE "constants/std_constants.asm"
INCLUDE "constants/deco_constants.asm"

540
constants/battle_constants.asm
View File

File diff suppressed because it is too large Load Diff

105
constants/deco_constants.asm Normal file
View 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

326
constants/engine_flags.asm
View File

@@ -1,162 +1,164 @@
ENGINE_RADIO_CARD EQU $00 const_def
ENGINE_MAP_CARD EQU $01
ENGINE_PHONE_CARD EQU $02 const ENGINE_RADIO_CARD
ENGINE_EXPN_CARD EQU $03 const ENGINE_MAP_CARD
ENGINE_POKEGEAR EQU $04 const ENGINE_PHONE_CARD
ENGINE_DAYCARE_MONS_ARE_COMPATIBLE EQU $05 const ENGINE_EXPN_CARD
ENGINE_DAYCARE_MAN_HAS_MON EQU $06 const ENGINE_POKEGEAR
ENGINE_DAYCARE_LADY_HAS_MON EQU $07 const ENGINE_DAYCARE_MONS_ARE_COMPATIBLE
ENGINE_MOM_SAVING_MONEY EQU $08 const ENGINE_DAYCARE_MAN_HAS_MON
ENGINE_DST EQU $09 const ENGINE_DAYCARE_LADY_HAS_MON
ENGINE_0A EQU $0a const ENGINE_MOM_SAVING_MONEY
ENGINE_POKEDEX EQU $0b const ENGINE_DST
ENGINE_UNOWN_DEX EQU $0c const ENGINE_0A
ENGINE_POKERUS EQU $0d const ENGINE_POKEDEX
ENGINE_ROCKET_SIGNAL_ON_CH20 EQU $0e const ENGINE_UNOWN_DEX
ENGINE_CREDITS_SKIP EQU $0f const ENGINE_POKERUS
ENGINE_BUG_CONTEST_ON EQU $10 const ENGINE_ROCKET_SIGNAL_ON_CH20
ENGINE_BUG_CONTEST_TIMER EQU $11 const ENGINE_CREDITS_SKIP
ENGINE_ROCKETS_IN_RADIO_TOWER EQU $12 const ENGINE_BUG_CONTEST_ON ; 10
ENGINE_BIKE_SHOP_CALL_ENABLED EQU $13 const ENGINE_BUG_CONTEST_TIMER
ENGINE_14 EQU $14 const ENGINE_12
ENGINE_GIVE_POKERUS EQU $15 const ENGINE_ROCKETS_IN_RADIO_TOWER
ENGINE_16 EQU $16 const ENGINE_BIKE_SHOP_CALL_ENABLED
ENGINE_ROCKETS_IN_MAHOGANY EQU $17 const ENGINE_GIVE_POKERUS
ENGINE_STRENGTH_ACTIVE EQU $18 const ENGINE_FLORIA
ENGINE_ALWAYS_ON_BIKE EQU $19 const ENGINE_ROCKETS_IN_MAHOGANY
ENGINE_DOWNHILL EQU $1a const ENGINE_STRENGTH_ACTIVE
ENGINE_ZEPHYRBADGE EQU $1b const ENGINE_ALWAYS_ON_BIKE
ENGINE_HIVEBADGE EQU $1c const ENGINE_DOWNHILL
ENGINE_PLAINBADGE EQU $1d const ENGINE_ZEPHYRBADGE
ENGINE_FOGBADGE EQU $1e const ENGINE_HIVEBADGE
ENGINE_MINERALBADGE EQU $1f const ENGINE_PLAINBADGE
ENGINE_STORMBADGE EQU $20 const ENGINE_FOGBADGE
ENGINE_GLACIERBADGE EQU $21 const ENGINE_MINERALBADGE
ENGINE_RISINGBADGE EQU $22 const ENGINE_STORMBADGE ; 20
ENGINE_BOULDERBADGE EQU $23 const ENGINE_GLACIERBADGE
ENGINE_CASCADEBADGE EQU $24 const ENGINE_RISINGBADGE
ENGINE_THUNDERBADGE EQU $25 const ENGINE_BOULDERBADGE
ENGINE_RAINBOWBADGE EQU $26 const ENGINE_CASCADEBADGE
ENGINE_SOULBADGE EQU $27 const ENGINE_THUNDERBADGE
ENGINE_MARSHBADGE EQU $28 const ENGINE_RAINBOWBADGE
ENGINE_VOLCANOBADGE EQU $29 const ENGINE_SOULBADGE
ENGINE_EARTHBADGE EQU $2a const ENGINE_MARSHBADGE
ENGINE_UNLOCKED_UNOWNS_1 EQU $2b const ENGINE_VOLCANOBADGE
ENGINE_UNLOCKED_UNOWNS_2 EQU $2c const ENGINE_EARTHBADGE
ENGINE_UNLOCKED_UNOWNS_3 EQU $2d const ENGINE_UNLOCKED_UNOWNS_1
ENGINE_UNLOCKED_UNOWNS_4 EQU $2e const ENGINE_UNLOCKED_UNOWNS_2
ENGINE_UNLOCKED_UNOWNS_5 EQU $2f const ENGINE_UNLOCKED_UNOWNS_3
ENGINE_UNLOCKED_UNOWNS_6 EQU $30 const ENGINE_UNLOCKED_UNOWNS_4
ENGINE_UNLOCKED_UNOWNS_7 EQU $31 const ENGINE_UNLOCKED_UNOWNS_5
ENGINE_UNLOCKED_UNOWNS_8 EQU $32 const ENGINE_UNLOCKED_UNOWNS_6 ; 30
ENGINE_FLYPOINT_KRISS_HOUSE EQU $33 const ENGINE_UNLOCKED_UNOWNS_7
ENGINE_FLYPOINT_VIRIDIAN_POKECENTER EQU $34 const ENGINE_UNLOCKED_UNOWNS_8
ENGINE_FLYPOINT_PALLET EQU $35 const ENGINE_FLYPOINT_KRISS_HOUSE
ENGINE_FLYPOINT_VIRIDIAN EQU $36 const ENGINE_FLYPOINT_VIRIDIAN_POKECENTER
ENGINE_FLYPOINT_PEWTER EQU $37 const ENGINE_FLYPOINT_PALLET
ENGINE_FLYPOINT_CERULEAN EQU $38 const ENGINE_FLYPOINT_VIRIDIAN
ENGINE_FLYPOINT_ROCK_TUNNEL EQU $39 const ENGINE_FLYPOINT_PEWTER
ENGINE_FLYPOINT_VERMILION EQU $3a const ENGINE_FLYPOINT_CERULEAN
ENGINE_FLYPOINT_LAVENDER EQU $3b const ENGINE_FLYPOINT_ROCK_TUNNEL
ENGINE_FLYPOINT_SAFFRON EQU $3c const ENGINE_FLYPOINT_VERMILION
ENGINE_FLYPOINT_CELADON EQU $3d const ENGINE_FLYPOINT_LAVENDER
ENGINE_FLYPOINT_FUCHSIA EQU $3e const ENGINE_FLYPOINT_SAFFRON
ENGINE_FLYPOINT_CINNABAR EQU $3f const ENGINE_FLYPOINT_CELADON
ENGINE_FLYPOINT_INDIGO_PLATEAU EQU $40 const ENGINE_FLYPOINT_FUCHSIA
ENGINE_FLYPOINT_NEW_BARK EQU $41 const ENGINE_FLYPOINT_CINNABAR
ENGINE_FLYPOINT_CHERRYGROVE EQU $42 const ENGINE_FLYPOINT_INDIGO_PLATEAU ; 40
ENGINE_FLYPOINT_VIOLET EQU $43 const ENGINE_FLYPOINT_NEW_BARK
ENGINE_FLYPOINT_AZALEA EQU $44 const ENGINE_FLYPOINT_CHERRYGROVE
ENGINE_FLYPOINT_CIANWOOD EQU $45 const ENGINE_FLYPOINT_VIOLET
ENGINE_FLYPOINT_GOLDENROD EQU $46 const ENGINE_FLYPOINT_AZALEA
ENGINE_FLYPOINT_OLIVINE EQU $47 const ENGINE_FLYPOINT_CIANWOOD
ENGINE_FLYPOINT_ECRUTEAK EQU $48 const ENGINE_FLYPOINT_GOLDENROD
ENGINE_FLYPOINT_MAHOGANY EQU $49 const ENGINE_FLYPOINT_OLIVINE
ENGINE_FLYPOINT_LAKE_OF_RAGE EQU $4a const ENGINE_FLYPOINT_ECRUTEAK
ENGINE_FLYPOINT_BLACKTHORN EQU $4b const ENGINE_FLYPOINT_MAHOGANY
ENGINE_FLYPOINT_SILVER_CAVE EQU $4c const ENGINE_FLYPOINT_LAKE_OF_RAGE
ENGINE_FLYPOINT_UNUSED EQU $4d const ENGINE_FLYPOINT_BLACKTHORN
ENGINE_LUCKY_NUMBER_SHOW EQU $4e const ENGINE_FLYPOINT_SILVER_CAVE
ENGINE_4F EQU $4f const ENGINE_FLYPOINT_UNUSED
ENGINE_KURT_MAKING_BALLS EQU $50 const ENGINE_LUCKY_NUMBER_SHOW
ENGINE_51 EQU $51 const ENGINE_4F
ENGINE_SPECIAL_WILDDATA EQU $52 const ENGINE_KURT_MAKING_BALLS ; 50
ENGINE_TIME_CAPSULE EQU $53 const ENGINE_DAILY_BUG_CONTEST
ENGINE_ALL_FRUIT_TREES EQU $54 const ENGINE_SPECIAL_WILDDATA
ENGINE_SHUCKLE_GIVEN EQU $55 const ENGINE_TIME_CAPSULE
ENGINE_GOLDENROD_UNDERGROUND_MERCHANT_CLOSED EQU $56 const ENGINE_ALL_FRUIT_TREES
ENGINE_FOUGHT_IN_TRAINER_HALL_TODAY EQU $57 const ENGINE_SHUCKLE_GIVEN
ENGINE_MT_MOON_SQUARE_CLEFAIRY EQU $58 const ENGINE_GOLDENROD_UNDERGROUND_MERCHANT_CLOSED
ENGINE_UNION_CAVE_LAPRAS EQU $59 const ENGINE_FOUGHT_IN_TRAINER_HALL_TODAY
ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT EQU $5a const ENGINE_MT_MOON_SQUARE_CLEFAIRY
ENGINE_GOLDENROD_MALL_5F_HAPPINESS_EVENT EQU $5b const ENGINE_UNION_CAVE_LAPRAS
ENGINE_TEA_IN_BLUES_HOUSE EQU $5c const ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT
ENGINE_INDIGO_PLATEAU_RIVAL_FIGHT EQU $5d const ENGINE_GOLDENROD_MALL_5F_HAPPINESS_EVENT
ENGINE_5E EQU $5e const ENGINE_TEA_IN_BLUES_HOUSE
ENGINE_5F EQU $5f const ENGINE_INDIGO_PLATEAU_RIVAL_FIGHT
ENGINE_60 EQU $60 const ENGINE_DAILY_MOVE_TUTOR
ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON EQU $61 const ENGINE_BUENAS_PASSWORD
ENGINE_62 EQU $62 const ENGINE_BUENAS_PASSWORD_2 ; 60
ENGINE_PLAYER_IS_FEMALE EQU $63 const ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON
ENGINE_HAVE_EXAMINED_GS_BALL EQU $64 const ENGINE_62
ENGINE_JACK EQU $65 const ENGINE_PLAYER_IS_FEMALE
ENGINE_HUEY EQU $66 const ENGINE_HAVE_EXAMINED_GS_BALL
ENGINE_GAVEN EQU $67 const ENGINE_JACK
ENGINE_BETH EQU $68 const ENGINE_HUEY
ENGINE_JOSE EQU $69 const ENGINE_GAVEN
ENGINE_REENA EQU $6a const ENGINE_BETH
ENGINE_JOEY EQU $6b const ENGINE_JOSE
ENGINE_WADE EQU $6c const ENGINE_REENA
ENGINE_RALPH EQU $6d const ENGINE_JOEY
ENGINE_LIZ EQU $6e const ENGINE_WADE
ENGINE_ANTHONY EQU $6f const ENGINE_RALPH
ENGINE_TODD EQU $70 const ENGINE_LIZ
ENGINE_GINA EQU $71 const ENGINE_ANTHONY
ENGINE_ARNIE EQU $72 const ENGINE_TODD ; 70
ENGINE_ALAN EQU $73 const ENGINE_GINA
ENGINE_DANA EQU $74 const ENGINE_ARNIE
ENGINE_CHAD EQU $75 const ENGINE_ALAN
ENGINE_TULLY EQU $76 const ENGINE_DANA
ENGINE_BRENT EQU $77 const ENGINE_CHAD
ENGINE_TIFFANY EQU $78 const ENGINE_TULLY
ENGINE_VANCE EQU $79 const ENGINE_BRENT
ENGINE_WILTON EQU $7a const ENGINE_TIFFANY
ENGINE_PARRY EQU $7b const ENGINE_VANCE
ENGINE_ERIN EQU $7c const ENGINE_WILTON
ENGINE_BEVERLY_HAS_NUGGET EQU $7d const ENGINE_PARRY
ENGINE_JOSE_HAS_STAR_PIECE EQU $7e const ENGINE_ERIN
ENGINE_WADE_HAS_ITEM EQU $7f const ENGINE_BEVERLY_HAS_NUGGET
ENGINE_GINA_HAS_LEAF_STONE EQU $80 const ENGINE_JOSE_HAS_STAR_PIECE
ENGINE_ALAN_HAS_FIRE_STONE EQU $81 const ENGINE_WADE_HAS_ITEM
ENGINE_LIZ_HAS_THUNDERSTONE EQU $82 const ENGINE_GINA_HAS_LEAF_STONE ; 80
ENGINE_DEREK_HAS_NUGGET EQU $83 const ENGINE_ALAN_HAS_FIRE_STONE
ENGINE_TULLY_HAS_WATER_STONE EQU $84 const ENGINE_DANA_HAS_THUNDERSTONE
ENGINE_TIFFANY_HAS_PINK_BOW EQU $85 const ENGINE_DEREK_HAS_NUGGET
ENGINE_WILTON_HAS_ITEM EQU $86 const ENGINE_TULLY_HAS_WATER_STONE
ENGINE_87 EQU $87 const ENGINE_TIFFANY_HAS_PINK_BOW
ENGINE_88 EQU $88 const ENGINE_WILTON_HAS_ITEM
ENGINE_89 EQU $89 const ENGINE_JACK_MONDAY_MORNING
ENGINE_8A EQU $8a const ENGINE_HUEY_WEDNESDAY_NIGHT
ENGINE_8B EQU $8b const ENGINE_GAVEN_THURSDAY_MORNING
ENGINE_8C EQU $8c const ENGINE_BETH_FRIDAY_AFTERNOON
ENGINE_8D EQU $8d const ENGINE_JOSE_SATURDAY_NIGHT
ENGINE_8E EQU $8e const ENGINE_REENA_SUNDAY_MORNING
ENGINE_8F EQU $8f const ENGINE_JOEY_MONDAY_AFTERNOON
ENGINE_90 EQU $90 const ENGINE_WADE_TUESDAY_NIGHT
ENGINE_91 EQU $91 const ENGINE_RALPH_WEDNESDAY_MORNING
ENGINE_92 EQU $92 const ENGINE_LIZ_THURSDAY_AFTERNOON ; 90
ENGINE_93 EQU $93 const ENGINE_ANTHONY_FRIDAY_NIGHT
ENGINE_94 EQU $94 const ENGINE_TODD_SATURDAY_MORNING
ENGINE_95 EQU $95 const ENGINE_GINA_SUNDAY_AFTERNOON
ENGINE_96 EQU $96 const ENGINE_ARNIE_TUESDAY_MORNING
ENGINE_97 EQU $97 const ENGINE_ALAN_WEDNESDAY_AFTERNOON
ENGINE_98 EQU $98 const ENGINE_DANA_THURSDAY_NIGHT
ENGINE_99 EQU $99 const ENGINE_CHAD_FRIDAY_MORNING
ENGINE_9A EQU $9a const ENGINE_TULLY_SUNDAY_NIGHT
ENGINE_9B EQU $9b const ENGINE_BRENT_MONDAY_MORNING
ENGINE_9C EQU $9c const ENGINE_TIFFANY_TUESDAY_AFTERNOON
ENGINE_9D EQU $9d const ENGINE_VANCE_WEDNESDAY_NIGHT
ENGINE_9E EQU $9e const ENGINE_WILTON_THRUSDAY_MORNING
ENGINE_KRIS_IN_CABLE_CLUB EQU $9f const ENGINE_PARRY_FRIDAY_AFTERNOON
ENGINE_DUNSPARCE_SWARM EQU $a0 const ENGINE_ERIN_SATURDAY_NIGHT
ENGINE_YANMA_SWARM EQU $a1 const ENGINE_KRIS_IN_CABLE_CLUB
const ENGINE_DUNSPARCE_SWARM ; a0
const ENGINE_YANMA_SWARM

2681
constants/event_flags.asm
View File

File diff suppressed because it is too large Load Diff

79
constants/gfx_constants.asm
View File

@@ -1,39 +1,40 @@
ANIM_GFX_HIT EQU 1 const_value SET 1
ANIM_GFX_CUT EQU 2 const ANIM_GFX_HIT
ANIM_GFX_FIRE EQU 3 const ANIM_GFX_CUT
ANIM_GFX_WATER EQU 4 const ANIM_GFX_FIRE
ANIM_GFX_LIGHTNING EQU 5 const ANIM_GFX_WATER
ANIM_GFX_PLANT EQU 6 const ANIM_GFX_LIGHTNING
ANIM_GFX_SMOKE EQU 7 const ANIM_GFX_PLANT
ANIM_GFX_EXPLOSION EQU 8 const ANIM_GFX_SMOKE
ANIM_GFX_ROCKS EQU 9 const ANIM_GFX_EXPLOSION
ANIM_GFX_ICE EQU 10 const ANIM_GFX_ROCKS
ANIM_GFX_POKE_BALL EQU 11 const ANIM_GFX_ICE
ANIM_GFX_POISON EQU 12 const ANIM_GFX_POKE_BALL
ANIM_GFX_BUBBLE EQU 13 const ANIM_GFX_POISON
ANIM_GFX_NOISE EQU 14 const ANIM_GFX_BUBBLE
ANIM_GFX_POWDER EQU 15 const ANIM_GFX_NOISE
ANIM_GFX_BEAM EQU 16 const ANIM_GFX_POWDER
ANIM_GFX_SPEED EQU 17 const ANIM_GFX_BEAM
ANIM_GFX_CHARGE EQU 18 const ANIM_GFX_SPEED
ANIM_GFX_WIND EQU 19 const ANIM_GFX_CHARGE
ANIM_GFX_WHIP EQU 20 const ANIM_GFX_WIND
ANIM_GFX_EGG EQU 21 const ANIM_GFX_WHIP
ANIM_GFX_ROPE EQU 22 const ANIM_GFX_EGG
ANIM_GFX_PSYCHIC EQU 23 const ANIM_GFX_ROPE
ANIM_GFX_REFLECT EQU 24 const ANIM_GFX_PSYCHIC
ANIM_GFX_STATUS EQU 25 const ANIM_GFX_REFLECT
ANIM_GFX_SAND EQU 26 const ANIM_GFX_STATUS
ANIM_GFX_WEB EQU 27 const ANIM_GFX_SAND
ANIM_GFX_HAZE EQU 28 const ANIM_GFX_WEB
ANIM_GFX_HORN EQU 29 const ANIM_GFX_HAZE
ANIM_GFX_FLOWER EQU 30 const ANIM_GFX_HORN
ANIM_GFX_MISC EQU 31 const ANIM_GFX_FLOWER
ANIM_GFX_SKY_ATTACK EQU 32 const ANIM_GFX_MISC
ANIM_GFX_GLOBE EQU 33 const ANIM_GFX_SKY_ATTACK
ANIM_GFX_SHAPES EQU 34 const ANIM_GFX_GLOBE
ANIM_GFX_OBJECTS EQU 35 const ANIM_GFX_SHAPES
ANIM_GFX_SHINE EQU 36 const ANIM_GFX_OBJECTS
ANIM_GFX_ANGELS EQU 37 const ANIM_GFX_SHINE
ANIM_GFX_WAVE EQU 38 const ANIM_GFX_ANGELS
ANIM_GFX_AEROBLAST EQU 39 const ANIM_GFX_WAVE
const ANIM_GFX_AEROBLAST

152
constants/item_constants.asm
View File

@@ -190,70 +190,75 @@
const MUSIC_MAIL ; $BC const MUSIC_MAIL ; $BC
const MIRAGE_MAIL ; $BD const MIRAGE_MAIL ; $BD
const ITEM_BE ; $BE const ITEM_BE ; $BE
const TM_01 ; $BF
const TM_02 ; $C0
const TM_03 ; $C1
const TM_04 ; $C2
const ITEM_C3 ; $C3
const TM_05 ; $C4
const TM_06 ; $C5
const TM_07 ; $C6
const TM_08 ; $C7
const TM_09 ; $C8
const TM_10 ; $C9
const TM_11 ; $CA
const TM_12 ; $CB
const TM_13 ; $CC
const TM_14 ; $CD
const TM_15 ; $CE
const TM_16 ; $CF
const TM_17 ; $D0
const TM_18 ; $D1
const TM_19 ; $D2
const TM_20 ; $D3
const TM_21 ; $D4
const TM_22 ; $D5
const TM_23 ; $D6
const TM_24 ; $D7
const TM_25 ; $D8
const TM_26 ; $D9
const TM_27 ; $DA
const TM_28 ; $DB
const ITEM_DC ; $DC
const TM_29 ; $DD
const TM_30 ; $DE
const TM_31 ; $DF
const TM_32 ; $E0
const TM_33 ; $E1
const TM_34 ; $E2
const TM_35 ; $E3
const TM_36 ; $E4
const TM_37 ; $E5
const TM_38 ; $E6
const TM_39 ; $E7
const TM_40 ; $E8
const TM_41 ; $E9
const TM_42 ; $EA
const TM_43 ; $EB
const TM_44 ; $EC
const TM_45 ; $ED
const TM_46 ; $EE
const TM_47 ; $EF
const TM_48 ; $F0
const TM_49 ; $F1
const TM_50 ; $F2
const HM_01 ; $F3
const HM_02 ; $F4
const HM_03 ; $F5
const HM_04 ; $F6
const HM_05 ; $F7
const HM_06 ; $F8
const HM_07 ; $F9
const HM_08 ; $FA
add_tm DYNAMICPUNCH
add_tm HEADBUTT
add_tm CURSE
add_tm ROLLOUT
const ITEM_C3
add_tm ROAR
add_tm TOXIC
add_tm ZAP_CANNON
add_tm ROCK_SMASH
add_tm PSYCH_UP
add_tm HIDDEN_POWER
add_tm SUNNY_DAY
add_tm SWEET_SCENT
add_tm SNORE
add_tm BLIZZARD
add_tm HYPER_BEAM
add_tm ICY_WIND
add_tm PROTECT
add_tm RAIN_DANCE
add_tm GIGA_DRAIN
add_tm ENDURE
add_tm FRUSTRATION
add_tm SOLARBEAM
add_tm IRON_TAIL
add_tm DRAGONBREATH
add_tm THUNDER
add_tm EARTHQUAKE
add_tm RETURN
add_tm DIG
const ITEM_DC
add_tm PSYCHIC
add_tm SHADOW_BALL
add_tm MUD_SLAP
add_tm DOUBLE_TEAM
add_tm ICE_PUNCH
add_tm SWAGGER
add_tm SLEEP_TALK
add_tm SLUDGE_BOMB
add_tm SANDSTORM
add_tm FIRE_BLAST
add_tm SWIFT
add_tm DEFENSE_CURL
add_tm THUNDERPUNCH
add_tm DREAM_EATER
add_tm DETECT
add_tm REST
add_tm ATTRACT
add_tm THIEF
add_tm STEEL_WING
add_tm FIRE_PUNCH
add_tm FURY_CUTTER
add_tm NIGHTMARE
NUM_TMS = const_value - TM01 - 2
add_hm CUT
add_hm FLY
add_hm SURF
add_hm STRENGTH
add_hm FLASH
add_hm WHIRLPOOL
add_hm WATERFALL
NUM_HMS = const_value - HM01
const HM_08
add_mt FLAMETHROWER
add_mt THUNDERBOLT
add_mt ICE_BEAM
NUM_TMS EQU 50
NUM_HMS EQU 7
; leftovers from red ; leftovers from red
@@ -261,6 +266,7 @@ SAFARI_BALL EQU 8 ; MOON_STONE
MOON_STONE_RED EQU 10 ; BURN_HEAL MOON_STONE_RED EQU 10 ; BURN_HEAL
FULL_HEAL_RED EQU 52 ; X_SPEED FULL_HEAL_RED EQU 52 ; X_SPEED
MAIL_MAX_LENGTH EQU $20
; pockets ; pockets
ITEM EQU 1 ITEM EQU 1
@@ -286,7 +292,7 @@ CANT_TOSS EQU 1 << 7
const HELD_7 const HELD_7
const HELD_CLEANSE_TAG const HELD_CLEANSE_TAG
const_value = 10 const_value SET 10
const HELD_HEAL_POISON const HELD_HEAL_POISON
const HELD_HEAL_FREEZE const HELD_HEAL_FREEZE
const HELD_HEAL_BURN const HELD_HEAL_BURN
@@ -295,7 +301,7 @@ const_value = 10
const HELD_HEAL_STATUS const HELD_HEAL_STATUS
const HELD_HEAL_CONFUSION const HELD_HEAL_CONFUSION
const_value = 20 const_value SET 20
const HELD_PREVENT_POISON const HELD_PREVENT_POISON
const HELD_PREVENT_BURN const HELD_PREVENT_BURN
const HELD_PREVENT_FREEZE const HELD_PREVENT_FREEZE
@@ -303,7 +309,7 @@ const_value = 20
const HELD_PREVENT_PARALYZE const HELD_PREVENT_PARALYZE
const HELD_PREVENT_CONFUSE const HELD_PREVENT_CONFUSE
const_value = 30 const_value SET 30
const HELD_30 const HELD_30
const HELD_ATTACK_UP const HELD_ATTACK_UP
const HELD_DEFENSE_UP const HELD_DEFENSE_UP
@@ -313,12 +319,12 @@ const_value = 30
const HELD_ACCURACY_UP const HELD_ACCURACY_UP
const HELD_EVASION_UP const HELD_EVASION_UP
const_value = 40 const_value SET 40
const HELD_40 const HELD_40
const HELD_41 const HELD_41
const HELD_METAL_POWDER const HELD_METAL_POWDER
const_value = 50 const_value SET 50
const HELD_NORMAL_BOOST const HELD_NORMAL_BOOST
const HELD_FIGHTING_BOOST const HELD_FIGHTING_BOOST
const HELD_FLYING_BOOST const HELD_FLYING_BOOST
@@ -337,7 +343,7 @@ const_value = 50
const HELD_DARK_BOOST const HELD_DARK_BOOST
const HELD_STEEL_BOOST const HELD_STEEL_BOOST
const_value = 70 const_value SET 70
const HELD_CATCH_CHANCE const HELD_CATCH_CHANCE
const HELD_71 const HELD_71
const HELD_ESCAPE const HELD_ESCAPE
@@ -348,3 +354,13 @@ const_value = 70
const HELD_BRIGHTPOWDER const HELD_BRIGHTPOWDER
const HELD_4E const HELD_4E
const HELD_FOCUS_BAND 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