Merge pull request #271 from yenatch/master

incbins
This commit is contained in:
Bryan Bishop 2015-02-06 16:03:45 -06:00
commit f8acaf69f0
32 changed files with 22473 additions and 1264 deletions

View File

@ -4,9 +4,7 @@ Music_DancingHall: ; ef9bc
dbw $02, Music_DancingHall_Ch3
; ef9c5
INCBIN "baserom.gbc", $ef9c5, $ef9c6 - $ef9c5
db $3
Music_DancingHall_Ch1: ; ef9c6
tempo 208

View File

@ -4,9 +4,7 @@ Music_KantoTrainerBattle: ; ec9fa
dbw $02, Music_KantoTrainerBattle_Ch3
; eca03
INCBIN "baserom.gbc", $eca03, $eca04 - $eca03
db $3
Music_KantoTrainerBattle_Ch1: ; eca04
tempo 114

View File

@ -4,9 +4,7 @@ Music_KantoWildBattle: ; ed06d
dbw $02, Music_KantoWildBattle_Ch3
; ed076
INCBIN "baserom.gbc", $ed076, $ed077 - $ed076
db $3
Music_KantoWildBattle_Ch1: ; ed077
tempo 112

View File

@ -4,9 +4,7 @@ Music_LavenderTown: ; ef72f
dbw $02, Music_LavenderTown_Ch3
; ef738
INCBIN "baserom.gbc", $ef738, $ef739 - $ef738
db $3
Music_LavenderTown_Ch1: ; ef739
tempo 160

View File

@ -4,9 +4,7 @@ Music_LookKimonoGirl: ; f79b8
dbw $02, Music_LookKimonoGirl_Ch3
; f79c1
INCBIN "baserom.gbc", $f79c1, $f79c2 - $f79c1
db $3
Music_LookKimonoGirl_Ch1: ; f79c2
tempo 160

View File

@ -61,9 +61,7 @@ Music_LookYoungster_branch_f66ea: ; f66ea
loopchannel 0, Music_LookYoungster_branch_f66ea
; f670e
INCBIN "baserom.gbc", $f670e, $f670f - $f670e
db $ff
Music_LookYoungster_Ch2: ; f670f
stereopanning $f0
@ -162,9 +160,7 @@ Music_LookYoungster_branch_f672f: ; f672f
loopchannel 0, Music_LookYoungster_branch_f672f
; f6783
INCBIN "baserom.gbc", $f6783, $f6784 - $f6783
db $ff
Music_LookYoungster_Ch3: ; f6784
stereopanning $ff
@ -300,8 +296,6 @@ Music_LookYoungster_branch_f67ae: ; f67ae
loopchannel 0, Music_LookYoungster_branch_f67ae
; f6810
INCBIN "baserom.gbc", $f6810, $f6811 - $f6810
db $ff

View File

@ -4,9 +4,7 @@ Music_NewBarkTown: ; eb2d3
dbw $02, Music_NewBarkTown_Ch3
; eb2dc
INCBIN "baserom.gbc", $eb2dc, $eb2dd - $eb2dc
db $3
Music_NewBarkTown_Ch1: ; eb2dd
tempo 187

View File

@ -3,9 +3,7 @@ Music_PostCredits: ; cfd9e
dbw $01, Music_PostCredits_Ch2
; cfda4
INCBIN "baserom.gbc", $cfda4, $cfda5 - $cfda4
db $2
Music_PostCredits_Ch1: ; cfda5
tempo 271

View File

@ -4,9 +4,7 @@ Music_ProfOaksPokemonTalk: ; f4c9f
dbw $02, Music_ProfOaksPokemonTalk_Ch3
; f4ca8
INCBIN "baserom.gbc", $f4ca8, $f4ca9 - $f4ca8
db $3
Music_ProfOaksPokemonTalk_Ch1: ; f4ca9
tempo 164

View File

@ -4,9 +4,7 @@ Music_Route1: ; ec000
dbw $02, Music_Route1_Ch3
; ec009
INCBIN "baserom.gbc", $ec009, $ec00a - $ec009
db $3
Music_Route1_Ch1: ; ec00a
stereopanning $f

View File

@ -4,9 +4,7 @@ Music_Surf: ; f518a
dbw $02, Music_Surf_Ch3
; f5193
INCBIN "baserom.gbc", $f5193, $f5194 - $f5193
db $3
Music_Surf_Ch1: ; f5194
tempo 108

View File

@ -4,9 +4,7 @@ Music_VermilionCity: ; eb676
dbw $02, Music_VermilionCity_Ch3
; eb67f
INCBIN "baserom.gbc", $eb67f, $eb680 - $eb67f
db $3
Music_VermilionCity_Ch1: ; eb680
stereopanning $f

View File

@ -1088,9 +1088,7 @@ Sfx_RegisterPhoneNumber_Ch5: ; f0dd3
endchannel
; f0def
INCBIN "baserom.gbc", $f0def, $f0df0 - $f0def
db $df
Sfx_RegisterPhoneNumber_Ch6: ; f0df0
togglesfx
@ -1115,9 +1113,7 @@ Sfx_RegisterPhoneNumber_Ch6: ; f0df0
endchannel
; f0e07
INCBIN "baserom.gbc", $f0e07, $f0e08 - $f0e07
db $df
Sfx_RegisterPhoneNumber_Ch7: ; f0e08
togglesfx
@ -1139,9 +1135,7 @@ Sfx_RegisterPhoneNumber_Ch7: ; f0e08
endchannel
; f0e1b
INCBIN "baserom.gbc", $f0e1b, $f0e1c - $f0e1b
db $df
Sfx_RegisterPhoneNumber_Ch8: ; f0e1c
togglesfx
@ -1153,9 +1147,7 @@ Sfx_RegisterPhoneNumber_Ch8: ; f0e1c
endchannel
; f0e25
INCBIN "baserom.gbc", $f0e25, $f0e26 - $f0e25
db $df
Sfx_3RdPlace: ; f0e26
dbw $84, Sfx_3RdPlace_Ch5
@ -1181,9 +1173,7 @@ Sfx_3RdPlace_Ch5: ; f0e2f
endchannel
; f0e44
INCBIN "baserom.gbc", $f0e44, $f0e45 - $f0e44
db $df
Sfx_3RdPlace_Ch6: ; f0e45
togglesfx
@ -1201,9 +1191,7 @@ Sfx_3RdPlace_Ch6: ; f0e45
endchannel
; f0e55
INCBIN "baserom.gbc", $f0e55, $f0e56 - $f0e55
db $df
Sfx_3RdPlace_Ch7: ; f0e56
togglesfx
@ -1221,9 +1209,7 @@ Sfx_3RdPlace_Ch7: ; f0e56
endchannel
; f0e65
INCBIN "baserom.gbc", $f0e65, $f0e66 - $f0e65
db $df
Sfx_GetEggFromDaycareLady: ; f0e66
Sfx_GetEggFromDaycareMan: ; f0e66
@ -1265,9 +1251,7 @@ Sfx_GetEggFromDaycareMan_Ch5: ; f0e72
endchannel
; f0e9a
INCBIN "baserom.gbc", $f0e9a, $f0e9b - $f0e9a
db $df
Sfx_GetEggFromDaycareLady_Ch6: ; f0e9b
Sfx_GetEggFromDaycareMan_Ch6: ; f0e9b
@ -1298,9 +1282,7 @@ Sfx_GetEggFromDaycareMan_Ch6: ; f0e9b
endchannel
; f0ebd
INCBIN "baserom.gbc", $f0ebd, $f0ebe - $f0ebd
db $df
Sfx_GetEggFromDaycareLady_Ch7: ; f0ebe
Sfx_GetEggFromDaycareMan_Ch7: ; f0ebe
@ -1321,9 +1303,7 @@ Sfx_GetEggFromDaycareMan_Ch7: ; f0ebe
endchannel
; f0ecf
INCBIN "baserom.gbc", $f0ecf, $f0ed0 - $f0ecf
db $df
Sfx_GetEggFromDaycareLady_Ch8: ; f0ed0
Sfx_GetEggFromDaycareMan_Ch8: ; f0ed0
@ -1337,9 +1317,7 @@ Sfx_GetEggFromDaycareMan_Ch8: ; f0ed0
endchannel
; f0edb
INCBIN "baserom.gbc", $f0edb, $f0edc - $f0edb
db $df
Sfx_MoveDeleted: ; f0edc
dbw $c4, Sfx_MoveDeleted_Ch5
@ -1377,9 +1355,7 @@ Sfx_MoveDeleted_Ch5: ; f0ee8
endchannel
; f0f0c
INCBIN "baserom.gbc", $f0f0c, $f0f0d - $f0f0c
db $df
Sfx_MoveDeleted_Ch6: ; f0f0d
togglesfx
@ -1416,9 +1392,7 @@ Sfx_MoveDeleted_Ch6: ; f0f0d
endchannel
; f0f36
INCBIN "baserom.gbc", $f0f36, $f0f37 - $f0f36
db $df
Sfx_MoveDeleted_Ch7: ; f0f37
togglesfx
@ -1446,9 +1420,7 @@ Sfx_MoveDeleted_Ch7: ; f0f37
endchannel
; f0f52
INCBIN "baserom.gbc", $f0f52, $f0f53 - $f0f52
db $df
Sfx_MoveDeleted_Ch8: ; f0f53
togglesfx
@ -1461,9 +1433,7 @@ Sfx_MoveDeleted_Ch8: ; f0f53
endchannel
; f0f5d
INCBIN "baserom.gbc", $f0f5d, $f0f5e - $f0f5d
db $df
Sfx_2ndPlace: ; f0f5e
dbw $c4, Sfx_2ndPlace_Ch5
@ -1505,9 +1475,7 @@ Sfx_2ndPlace_Ch5: ; f0f6a
endchannel
; f0f91
INCBIN "baserom.gbc", $f0f91, $f0f92 - $f0f91
db $df
Sfx_2ndPlace_Ch6: ; f0f92
togglesfx
@ -1532,9 +1500,7 @@ Sfx_2ndPlace_Ch6: ; f0f92
endchannel
; f0fac
INCBIN "baserom.gbc", $f0fac, $f0fad - $f0fac
db $df
Sfx_2ndPlace_Ch7: ; f0fad
togglesfx
@ -1573,9 +1539,7 @@ Sfx_2ndPlace_Ch7: ; f0fad
endchannel
; f0fd1
INCBIN "baserom.gbc", $f0fd1, $f0fd2 - $f0fd1
db $df
Sfx_2ndPlace_Ch8: ; f0fd2
togglesfx
@ -1591,9 +1555,7 @@ Sfx_2ndPlace_branch_f0fd7: ; f0fd7
endchannel
; f0fe1
INCBIN "baserom.gbc", $f0fe1, $f0fe2 - $f0fe1
db $df
Sfx_1stPlace: ; f0fe2
dbw $c4, Sfx_1stPlace_Ch5
@ -1642,9 +1604,7 @@ Sfx_1stPlace_Ch5: ; f0fee
endchannel
; f101f
INCBIN "baserom.gbc", $f101f, $f1020 - $f101f
db $df
Sfx_1stPlace_Ch6: ; f1020
togglesfx
@ -1669,9 +1629,7 @@ Sfx_1stPlace_Ch6: ; f1020
endchannel
; f103c
INCBIN "baserom.gbc", $f103c, $f103d - $f103c
db $df
Sfx_1stPlace_Ch7: ; f103d
togglesfx
@ -1696,9 +1654,7 @@ Sfx_1stPlace_Ch7: ; f103d
endchannel
; f1053
INCBIN "baserom.gbc", $f1053, $f1054 - $f1053
db $df
Sfx_1stPlace_Ch8: ; f1054
togglesfx
@ -1720,9 +1676,7 @@ Sfx_1stPlace_Ch8: ; f1054
endchannel
; f1068
INCBIN "baserom.gbc", $f1068, $f1069 - $f1068
db $df
Sfx_ChooseACard: ; f1069
dbw $c4, Sfx_ChooseACard_Ch5
@ -1776,9 +1730,7 @@ Sfx_ChooseACard_Ch5: ; f1075
endchannel
; f10a8
INCBIN "baserom.gbc", $f10a8, $f10a9 - $f10a8
db $df
Sfx_ChooseACard_Ch6: ; f10a9
togglesfx
@ -1811,9 +1763,7 @@ Sfx_ChooseACard_Ch6: ; f10a9
endchannel
; f10c8
INCBIN "baserom.gbc", $f10c8, $f10c9 - $f10c8
db $df
Sfx_ChooseACard_Ch7: ; f10c9
togglesfx
@ -1850,9 +1800,7 @@ Sfx_ChooseACard_Ch7: ; f10c9
endchannel
; f10eb
INCBIN "baserom.gbc", $f10eb, $f10ec - $f10eb
db $df
Sfx_ChooseACard_Ch8: ; f10ec
togglesfx
@ -1878,9 +1826,7 @@ Sfx_ChooseACard_Ch8: ; f10ec
endchannel
; f1103
INCBIN "baserom.gbc", $f1103, $f1104 - $f1103
db $df
Sfx_GetTm: ; f1104
dbw $c4, Sfx_GetTm_Ch5
@ -1914,9 +1860,7 @@ Sfx_GetTm_Ch5: ; f1110
endchannel
; f1130
INCBIN "baserom.gbc", $f1130, $f1131 - $f1130
db $df
Sfx_GetTm_Ch6: ; f1131
togglesfx
@ -1940,9 +1884,7 @@ Sfx_GetTm_Ch6: ; f1131
endchannel
; f114b
INCBIN "baserom.gbc", $f114b, $f114c - $f114b
db $df
Sfx_GetTm_Ch7: ; f114c
togglesfx
@ -1974,9 +1916,7 @@ Sfx_GetTm_Ch7: ; f114c
endchannel
; f1169
INCBIN "baserom.gbc", $f1169, $f116a - $f1169
db $df
Sfx_GetTm_Ch8: ; f116a
togglesfx
@ -1997,9 +1937,7 @@ Sfx_GetTm_Ch8: ; f116a
endchannel
; f117c
INCBIN "baserom.gbc", $f117c, $f117d - $f117c
db $df
Sfx_GetBadge: ; f117d
dbw $c4, Sfx_GetBadge_Ch5
@ -2028,9 +1966,7 @@ Sfx_GetBadge_Ch5: ; f1189
endchannel
; f11a9
INCBIN "baserom.gbc", $f11a9, $f11aa - $f11a9
db $df
Sfx_GetBadge_branch_f11aa: ; f11aa
note __, 5
@ -2103,9 +2039,7 @@ Sfx_GetBadge_Ch6: ; f11be
endchannel
; f11f4
INCBIN "baserom.gbc", $f11f4, $f11f5 - $f11f4
db $df
Sfx_GetBadge_Ch7: ; f11f5
togglesfx
@ -2145,9 +2079,7 @@ Sfx_GetBadge_Ch7: ; f11f5
endchannel
; f121a
INCBIN "baserom.gbc", $f121a, $f121b - $f121a
db $df
Sfx_GetBadge_Ch8: ; f121b
togglesfx
@ -2174,9 +2106,7 @@ Sfx_GetBadge_branch_f1220: ; f1220
endchannel
; f1235
INCBIN "baserom.gbc", $f1235, $f1236 - $f1235
db $df
Sfx_QuitSlots: ; f1236
dbw $c4, Sfx_QuitSlots_Ch5
@ -2216,9 +2146,7 @@ Sfx_QuitSlots_Ch5: ; f1242
endchannel
; f1265
INCBIN "baserom.gbc", $f1265, $f1266 - $f1265
db $df
Sfx_QuitSlots_Ch6: ; f1266
togglesfx
@ -2246,9 +2174,7 @@ Sfx_QuitSlots_Ch6: ; f1266
endchannel
; f1282
INCBIN "baserom.gbc", $f1282, $f1283 - $f1282
db $df
Sfx_QuitSlots_Ch7: ; f1283
togglesfx
@ -2280,9 +2206,7 @@ Sfx_QuitSlots_Ch7: ; f1283
endchannel
; f12a0
INCBIN "baserom.gbc", $f12a0, $f12a1 - $f12a0
db $df
Sfx_QuitSlots_Ch8: ; f12a1
togglesfx
@ -2303,9 +2227,7 @@ Sfx_QuitSlots_Ch8: ; f12a1
endchannel
; f12b3
INCBIN "baserom.gbc", $f12b3, $f12b4 - $f12b3
db $df
Sfx_Protect: ; f12b4
dbw $44, Sfx_Protect_Ch5
@ -3259,9 +3181,7 @@ Sfx_DexFanfareLessThan20_Ch5: ; f1884
endchannel
; f189a
INCBIN "baserom.gbc", $f189a, $f189b - $f189a
db $df
Sfx_DexFanfareLessThan20_Ch6: ; f189b
togglesfx
@ -3281,9 +3201,7 @@ Sfx_DexFanfareLessThan20_Ch6: ; f189b
endchannel
; f18ac
INCBIN "baserom.gbc", $f18ac, $f18ad - $f18ac
db $df
Sfx_DexFanfareLessThan20_Ch7: ; f18ad
togglesfx
@ -3312,9 +3230,7 @@ Sfx_DexFanfareLessThan20_Ch7: ; f18ad
endchannel
; f18c7
INCBIN "baserom.gbc", $f18c7, $f18c8 - $f18c7
db $df
Sfx_DexFanfareLessThan20_Ch8: ; f18c8
togglesfx
@ -3326,9 +3242,7 @@ Sfx_DexFanfareLessThan20_Ch8: ; f18c8
endchannel
; f18d1
INCBIN "baserom.gbc", $f18d1, $f18d2 - $f18d1
db $df
Sfx_DexFanfare140169: ; f18d2
dbw $c4, Sfx_DexFanfare140169_Ch5
@ -3365,9 +3279,7 @@ Sfx_DexFanfare140169_Ch5: ; f18de
endchannel
; f1900
INCBIN "baserom.gbc", $f1900, $f1901 - $f1900
db $df
Sfx_DexFanfare140169_Ch6: ; f1901
togglesfx
@ -3394,9 +3306,7 @@ Sfx_DexFanfare140169_Ch6: ; f1901
endchannel
; f191d
INCBIN "baserom.gbc", $f191d, $f191e - $f191d
db $df
Sfx_DexFanfare140169_Ch7: ; f191e
togglesfx
@ -3431,9 +3341,7 @@ Sfx_DexFanfare140169_Ch7: ; f191e
endchannel
; f193e
INCBIN "baserom.gbc", $f193e, $f193f - $f193e
db $df
Sfx_DexFanfare140169_Ch8: ; f193f
togglesfx
@ -3451,9 +3359,7 @@ Sfx_DexFanfare140169_branch_f1945: ; f1945
endchannel
; f1950
INCBIN "baserom.gbc", $f1950, $f1951 - $f1950
db $df
Sfx_DexFanfare170199: ; f1951
dbw $c4, Sfx_DexFanfare170199_Ch5
@ -3490,9 +3396,7 @@ Sfx_DexFanfare170199_Ch5: ; f195d
endchannel
; f1981
INCBIN "baserom.gbc", $f1981, $f1982 - $f1981
db $df
Sfx_DexFanfare170199_Ch6: ; f1982
togglesfx
@ -3521,9 +3425,7 @@ Sfx_DexFanfare170199_Ch6: ; f1982
endchannel
; f19a2
INCBIN "baserom.gbc", $f19a2, $f19a3 - $f19a2
db $df
Sfx_DexFanfare170199_Ch7: ; f19a3
togglesfx
@ -3552,9 +3454,7 @@ Sfx_DexFanfare170199_Ch7: ; f19a3
endchannel
; f19bf
INCBIN "baserom.gbc", $f19bf, $f19c0 - $f19bf
db $df
Sfx_DexFanfare170199_Ch8: ; f19c0
togglesfx
@ -3577,9 +3477,7 @@ Sfx_DexFanfare170199_Ch8: ; f19c0
endchannel
; f19d5
INCBIN "baserom.gbc", $f19d5, $f19d6 - $f19d5
db $fd
Sfx_DexFanfare200229: ; f19d6
dbw $c4, Sfx_DexFanfare200229_Ch5
@ -3614,9 +3512,7 @@ Sfx_DexFanfare200229_Ch5: ; f19e2
endchannel
; f1a03
INCBIN "baserom.gbc", $f1a03, $f1a04 - $f1a03
db $df
Sfx_DexFanfare200229_Ch6: ; f1a04
togglesfx
@ -3640,9 +3536,7 @@ Sfx_DexFanfare200229_Ch6: ; f1a04
endchannel
; f1a1e
INCBIN "baserom.gbc", $f1a1e, $f1a1f - $f1a1e
db $df
Sfx_DexFanfare200229_Ch7: ; f1a1f
togglesfx
@ -3687,9 +3581,7 @@ Sfx_DexFanfare200229_Ch7: ; f1a1f
endchannel
; f1a49
INCBIN "baserom.gbc", $f1a49, $f1a4a - $f1a49
db $df
Sfx_DexFanfare200229_Ch8: ; f1a4a
togglesfx
@ -3719,9 +3611,7 @@ Sfx_DexFanfare200229_Ch8: ; f1a4a
endchannel
; f1a65
INCBIN "baserom.gbc", $f1a65, $f1a66 - $f1a65
db $df
Sfx_DexFanfare230Plus: ; f1a66
dbw $c4, Sfx_DexFanfare230Plus_Ch5
@ -3777,9 +3667,7 @@ Sfx_DexFanfare230Plus_Ch5: ; f1a72
endchannel
; f1ab1
INCBIN "baserom.gbc", $f1ab1, $f1ab2 - $f1ab1
db $df
Sfx_DexFanfare230Plus_Ch6: ; f1ab2
togglesfx
@ -3815,9 +3703,7 @@ Sfx_DexFanfare230Plus_Ch6: ; f1ab2
endchannel
; f1ad9
INCBIN "baserom.gbc", $f1ad9, $f1ada - $f1ad9
db $df
Sfx_DexFanfare230Plus_Ch7: ; f1ada
togglesfx
@ -3867,9 +3753,7 @@ Sfx_DexFanfare230Plus_Ch7: ; f1ada
endchannel
; f1b0b
INCBIN "baserom.gbc", $f1b0b, $f1b0c - $f1b0b
db $df
Sfx_DexFanfare230Plus_Ch8: ; f1b0c
togglesfx
@ -3906,9 +3790,7 @@ Sfx_DexFanfare230Plus_branch_f1b2b: ; f1b2b
endchannel
; f1b32
INCBIN "baserom.gbc", $f1b32, $f1b33 - $f1b32
db $df
Sfx_NotVeryEffective: ; f1b33
dbw $07, Sfx_NotVeryEffective_Ch8

View File

@ -9335,7 +9335,7 @@ Function3fbd6: ; 3fbd6
call ByteFill
ld de, $d000
ld hl, VBGMap0
ld bc, $0f40
lb bc, BANK(Function3fbd6), $40
call Request2bpp
pop af
ld [rSVBK], a

View File

@ -1,3 +1,5 @@
NONE EQU 0
PARTY_LENGTH EQU 6
MAX_ITEMS EQU 20

View File

@ -0,0 +1 @@
ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz

View File

@ -0,0 +1 @@
0123456789 !"#$%&'()*+ ,-./:;<=>?@ [\]^_`{|}~

View File

@ -0,0 +1 @@
X-Game-code:

BIN
data/mobile/x-game-code.txt Normal file

Binary file not shown.

View File

@ -0,0 +1 @@
X-Game-result:

Binary file not shown.

View File

@ -253,8 +253,9 @@ Function8bbd: ; 8bbd
ld a, [TrainerClass]
call Function976b
ld a, e
jr .asm_8bd7
jr asm_8bd7
Function8bc6:
ld a, [CurPartySpecies]
call Function97ee
ld a, e
@ -265,8 +266,9 @@ Function8bbd: ; 8bbd
inc hl
inc hl
inc hl
.asm_8bd7
asm_8bd7
push hl
ld hl, Unkn1Pals
ld de, $0008

View File

@ -0,0 +1 @@
<EFBFBD><EFBFBD>殚怂墘崓屯殚<EFBFBD><EFBFBD><EFBFBD><EFBFBD>,,mm,,mmmm$$<24><><EFBFBD><EFBFBD>憫换换换换洓<E68DA2><E6B493><EFBFBD><EFBFBD>憫换洓圹圹洓<E59CB9><E6B493><EFBFBD><EFBFBD>北UUUUUUUU<55><55><EFBFBD><EFBFBD>吵北北吵贩<E590B5><E8B4A9>

Binary file not shown.

View File

@ -6,32 +6,19 @@ INCLUDE "macros/move_effect.asm"
INCLUDE "macros/move_anim.asm"
INCLUDE "macros/movement.asm"
INCLUDE "macros/map.asm"
INCLUDE "macros/predef.asm"
INCLUDE "macros/rst.asm"
INCLUDE "macros/mobile.asm"
text EQUS "db $00," ; Start writing text.
next EQUS "db $4e," ; Move a line down.
line EQUS "db $4f," ; Start writing at the bottom line.
para EQUS "db $51," ; Start a new paragraph.
cont EQUS "db $55," ; Scroll to the next line.
done EQUS "db $57" ; End a text box.
prompt EQUS "db $58" ; Prompt the player to end a text box (initiating some other event).
; Pokedex text commands are only used with pokered.
; They are included for compatibility.
page EQUS "db $50," ; Start a new Pokedex page.
dex EQUS "db $e8, $50" ; End a Pokedex entry.
RGB: MACRO
dw ((\3) << 10) + ((\2) << 5) + (\1)
ENDM
percent EQUS "* $ff / 100"
; macros require rst vectors to be defined
FarCall EQU $08
Bankswitch EQU $10
JumpTable EQU $28
NONE EQU 0
dwb: MACRO
dw \1
@ -54,29 +41,31 @@ dbwww: MACRO
ENDM
dn: MACRO
rept _NARG / 2
db (\1) << 4 + (\2)
shift
shift
endr
ENDM
dx: MACRO
x = 8 * ((\1) - 1)
rept \1
db ((\2) >> x) & $ff
x = x + -8
endr
ENDM
dt: MACRO ; three-byte (big-endian)
db (\1 >> 16) & $ff
db (\1 >> 8) & $ff
db \1 & $ff
dx 3, \1
ENDM
dd: MACRO ; four-byte (big-endian)
dx 4, \1
ENDM
bigdw: MACRO ; big-endian word
dw ((\1)/$100) + (((\1)&$ff)*$100)
ENDM
callab: MACRO ; address, bank
ld hl, \1
ld a, BANK(\1)
rst FarCall
ENDM
callba: MACRO ; bank, address
ld a, BANK(\1)
ld hl, \1
rst FarCall
dx 2, \1
ENDM
@ -85,76 +74,28 @@ lb: MACRO ; r, hi, lo
ENDM
; Constant enumeration
const_def: MACRO
const_value SET 0
ENDM
const: MACRO
\1 EQU const_value
const_value SET const_value + 1
ENDM
TX_RAM: MACRO
db 1
dw \1
ENDM
TX_FAR: MACRO
db $16
dw \1
db BANK(\1)
ENDM
RGB: MACRO
dw (((\3) << 10) | ((\2) << 5) | (\1))
ENDM
note: MACRO
db (\1) << 4 + ((\2) - 1)
ENDM
sound: macro
db \1 ; duration
db \2 ; intensity
dw \3 ; frequency
endm
noise: macro
db \1 ; duration
db \2 ; intensity
db \3 ; frequency
endm
; pitch
__ EQU 0
C_ EQU 1
C# EQU 2
D_ EQU 3
D# EQU 4
E_ EQU 5
F_ EQU 6
F# EQU 7
G_ EQU 8
G# EQU 9
A_ EQU 10
A# EQU 11
B_ EQU 12
bccoord: MACRO
ld bc, TileMap + SCREEN_WIDTH * (\2) + (\1)
coord bc, \1, \2
ENDM
decoord: MACRO
ld de, TileMap + SCREEN_WIDTH * (\2) + (\1)
coord de, \1, \2
ENDM
hlcoord: MACRO
ld hl, TileMap + SCREEN_WIDTH * (\2) + (\1)
coord hl, \1, \2
ENDM
coord: MACRO
ld \1, TileMap + SCREEN_WIDTH * (\3) + (\2)
ENDM
dwcoord: MACRO
rept _NARG / 2
dw TileMap + SCREEN_WIDTH * (\2) + (\1)
shift
shift
endr
ENDM
@ -176,38 +117,15 @@ endanim: MACRO
ENDM
; maps
; Constant enumeration
map: MACRO
; This is a really silly hack to get around an rgbds bug.
; Ideally:
; db GROUP_\1, MAP_\1
\1\@ EQUS "GROUP_\1"
\1\@2 EQUS "MAP_\1"
db \1\@, \1\@2
const_def: MACRO
const_value SET 0
ENDM
roam_map: MACRO
; A map and an arbitrary number of some more maps.
map \1
db \2
IF \2 > 0
map \3
ENDC
IF \2 > 1
map \4
ENDC
IF \2 > 2
map \5
ENDC
IF \2 > 3
map \6
ENDC
db 0
const: MACRO
\1 EQU const_value
const_value SET const_value + 1
ENDM
@ -223,24 +141,9 @@ x = x + (\1) * $40000
ENDM
add_predef: MACRO
\1Predef::
dw \1
db BANK(\1)
ENDM
predef_id: MACRO
; Some functions load the predef id
; without immediately calling Predef.
ld a, (\1Predef - PredefPointers) / 3
ENDM
predef: MACRO
predef_id \1
call Predef
ENDM
predef_jump: MACRO
predef_id \1
jp Predef
bcd: MACRO
rept _NARG
dn ((\1) % 100) / 10, (\1) % 10
shift
endr
ENDM

View File

@ -1,3 +1,29 @@
map: MACRO
; This is a silly hack to get around an rgbds bug.
; Ideally:
; db GROUP_\1, MAP_\1
\1\@ EQUS "GROUP_\1"
\1\@2 EQUS "MAP_\1"
db \1\@, \1\@2
ENDM
roam_map: MACRO
; A map and an arbitrary number of some more maps.
map \1
db \2
rept \2
map \3
shift
endr
db 0
ENDM
person_event: macro
db \1 ; sprite
db \2 ; y

2
macros/mobile.asm Normal file
View File

@ -0,0 +1,2 @@
; Many mobile functions were dummied out in localization.
mobile EQUS "ret"

21
macros/predef.asm Normal file
View File

@ -0,0 +1,21 @@
add_predef: MACRO
\1Predef::
dw \1
db BANK(\1)
ENDM
predef_id: MACRO
; Some functions load the predef id
; without immediately calling Predef.
ld a, (\1Predef - PredefPointers) / 3
ENDM
predef: MACRO
predef_id \1
call Predef
ENDM
predef_jump: MACRO
predef_id \1
jp Predef
ENDM

17
macros/rst.asm Normal file
View File

@ -0,0 +1,17 @@
FarCall EQU $08
Bankswitch EQU $10
JumpTable EQU $28
farcall: MACRO ; bank, address
ld a, BANK(\1)
ld hl, \1
rst FarCall
ENDM
callba EQUS "farcall"
callab: MACRO ; address, bank
ld hl, \1
ld a, BANK(\1)
rst FarCall
ENDM

View File

@ -1,3 +1,35 @@
note: MACRO
dn (\1), (\2) - 1
ENDM
sound: macro
db \1 ; duration
db \2 ; intensity
dw \3 ; frequency
endm
noise: macro
db \1 ; duration
db \2 ; intensity
db \3 ; frequency
endm
; pitch
__ EQU 0
C_ EQU 1
C# EQU 2
D_ EQU 3
D# EQU 4
E_ EQU 5
F_ EQU 6
F# EQU 7
G_ EQU 8
G# EQU 9
A_ EQU 10
A# EQU 11
B_ EQU 12
octave: macro
db $d8 - (\1)
endm

View File

@ -1,7 +1,30 @@
text_from_ram: macro
text EQUS "db $00," ; Start writing text.
next EQUS "db $4e," ; Move a line down.
line EQUS "db $4f," ; Start writing at the bottom line.
para EQUS "db $51," ; Start a new paragraph.
cont EQUS "db $55," ; Scroll to the next line.
done EQUS "db $57" ; End a text box.
prompt EQUS "db $58" ; Prompt the player to end a text box (initiating some other event).
; Pokedex text commands are only used with pokered.
; They are included for compatibility.
page EQUS "db $50," ; Start a new Pokedex page.
dex EQUS "db $e8, $50" ; End a Pokedex entry.
TX_RAM: MACRO
db 1
dw \1
endm
ENDM
TX_FAR: MACRO
db $16
dw \1
db BANK(\1)
ENDM
text_from_ram EQUS "TX_RAM"
text_dunno1: macro
db 5
@ -58,8 +81,4 @@ current_day: macro
db $15
endm
text_jump: macro
db $16
dw \1
db BANK(\1)
endm
text_jump EQUS "TX_FAR"

23100
main.asm

File diff suppressed because it is too large Load Diff