pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-01-23 09:16:20 -08:00
Code Issues Packages Projects Releases Wiki Activity

Uppercase MACRO and EQU(S) according to the style guide

Browse Source
This commit is contained in:
xCrystal 2017-12-28 13:23:44 +01:00
parent 9457679af8
commit 7beb497d3a
33 changed files with 425 additions and 425 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
constants/map_constants.asm
View File

@ -1,9 +1,9 @@
newgroup: macro newgroup: MACRO
const_value = const_value + 1 const_value = const_value + 1
enum_start 1 enum_start 1
endm endm
mapgroup: macro mapgroup: MACRO
;\1: map id ;\1: map id
;\2: height: in blocks ;\2: height: in blocks
;\3: width: in blocks ;\3: width: in blocks

2
data/items/mom_phone.asm
View File

@ -1,4 +1,4 @@
momitem: macro momitem: MACRO
; money to trigger, cost, kind, item ; money to trigger, cost, kind, item
dt \1 dt \1
dt \2 dt \2

2
data/map_objects.asm
View File

@ -1,4 +1,4 @@
sprite_movement_data: macro sprite_movement_data: MACRO
db \1, \2, \3, \4, \5 db \1, \2, \3, \4, \5
dn \6, 0 dn \6, 0
endm endm

2
data/odd_eggs.asm
View File

@ -1,4 +1,4 @@
prob: macro prob: MACRO
prob_total = prob_total + (\1) prob_total = prob_total + (\1)
dw prob_total * $ffff / 100 dw prob_total * $ffff / 100
endm endm

2
data/palettes/town_map.asm
View File

@ -6,7 +6,7 @@
const PAL_TOWNMAP_POI ; 4 const PAL_TOWNMAP_POI ; 4
const PAL_TOWNMAP_POI_MTN ; 5 const PAL_TOWNMAP_POI_MTN ; 5
townmappals: macro townmappals: MACRO
rept _NARG / 2 rept _NARG / 2
dn PAL_TOWNMAP_\2, PAL_TOWNMAP_\1 dn PAL_TOWNMAP_\2, PAL_TOWNMAP_\1
shift shift

2
data/phone_contacts.asm
View File

@ -1,4 +1,4 @@
phone: macro phone: MACRO
; trainer class, trainer id, map, ?, script 1, ?, script 2 ; trainer class, trainer id, map, ?, script 1, ?, script 2
db \1, \2 db \1, \2
map \3 map \3

2
data/phone_special.asm
View File

@ -1,4 +1,4 @@
specialcall: macro specialcall: MACRO
; condition, contact, script ; condition, contact, script
dw \1 dw \1
db \2 db \2

2
data/unown_words.asm
View File

@ -1,4 +1,4 @@
unownword: macro unownword: MACRO
x = 1 x = 1
rept STRLEN(\1) rept STRLEN(\1)
db STRSUB(\1, x, 1) - $40 db STRSUB(\1, x, 1) - $40

2
data/wild/roammon_maps.asm
View File

@ -1,7 +1,7 @@
; Maps that roaming monsters can be on, and possible maps they can jump to. ; Maps that roaming monsters can be on, and possible maps they can jump to.
; Notably missing are Route 40 and Route 41, which are water routes. ; Notably missing are Route 40 and Route 41, which are water routes.
roam_map: macro roam_map: MACRO
; map, # of other maps, other maps ; map, # of other maps, other maps
map \1 map \1
db \2 db \2

2
data/wild/treemon_maps.asm
View File

@ -1,4 +1,4 @@
treemon_map: macro treemon_map: MACRO
map \1 map \1
db \2 ; treemon set db \2 ; treemon set
endm endm

2
engine/battle/battle_transition.asm
View File

@ -828,7 +828,7 @@ StartTrainerBattle_ZoomToBlack: ; 8c768 (23:4768)
; 8c792 (23:4792) ; 8c792 (23:4792)
.boxes ; 8c792 .boxes ; 8c792
zoombox: macro zoombox: MACRO
; width, height, start y, start x ; width, height, start y, start x
db \1, \2 db \1, \2
dwcoord \3, \4 dwcoord \3, \4

4
engine/pic_animation.asm
View File

@ -56,7 +56,7 @@ pokeanim: MACRO
rept _NARG rept _NARG
; Workaround for a bug where macro args can't come after the start of a symbol ; Workaround for a bug where macro args can't come after the start of a symbol
if !def(\1_POKEANIM) if !def(\1_POKEANIM)
\1_POKEANIM equs "PokeAnim_\1_" \1_POKEANIM EQUS "PokeAnim_\1_"
endc endc
db (\1_POKEANIM - PokeAnim_SetupCommands) / 2 db (\1_POKEANIM - PokeAnim_SetupCommands) / 2
shift shift
@ -142,7 +142,7 @@ SetUpPokeAnim: ; d00b4
; d00da ; d00da
PokeAnim_SetupCommands: ; d00da PokeAnim_SetupCommands: ; d00da
setup_command: macro setup_command: MACRO
\1_: dw \1 \1_: dw \1
endm endm
setup_command PokeAnim_Finish setup_command PokeAnim_Finish

4
engine/unown_puzzle.asm
View File

@ -114,7 +114,7 @@ InitUnownPuzzlePiecePositions: ; e124e
; e126d ; e126d
.PuzzlePieceInitialPositions: ; e126d .PuzzlePieceInitialPositions: ; e126d
initpuzcoord: macro initpuzcoord: MACRO
rept _NARG / 2 rept _NARG / 2
db \1 puzcoord \2 db \1 puzcoord \2
shift shift
@ -599,7 +599,7 @@ RedrawUnownPuzzlePieces: ; e14d9
UnownPuzzleCoordData: ; e1559 UnownPuzzleCoordData: ; e1559
puzzle_coords: macro puzzle_coords: MACRO
dbpixel \1, \2, \3, \4 dbpixel \1, \2, \3, \4
dwcoord \5, \6 dwcoord \5, \6
db \7, \8 db \7, \8

6
home/text.asm
View File

@ -200,7 +200,7 @@ NextChar:: ; 1083
jp PlaceNextChar jp PlaceNextChar
CheckDict:: ; 1087 CheckDict:: ; 1087
dict: macro dict: MACRO
if \1 == 0 if \1 == 0
and a and a
else else
@ -209,7 +209,7 @@ endc
jp z, \2 jp z, \2
endm endm
dict2: macro dict2: MACRO
cp \1 cp \1
jr nz, ._\@ jr nz, ._\@
ld a, \2 ld a, \2
@ -309,7 +309,7 @@ Char15:: ; 117b
; 1186 ; 1186
print_name: macro print_name: MACRO
push de push de
ld de, \1 ld de, \1
jp PlaceCommandCharacter jp PlaceCommandCharacter

4
macros/base_stats.asm
View File

@ -1,8 +1,8 @@
; Used in data/pokemon/base_stats/*.asm ; Used in data/pokemon/base_stats/*.asm
define: macro define: MACRO
if !def(\1) if !def(\1)
\1 equs \2 \1 EQUS \2
endc endc
endm endm

2
macros/code.asm
View File

@ -38,7 +38,7 @@ jumptable: MACRO
; Many mobile functions were dummied out in localization. ; Many mobile functions were dummied out in localization.
mobile EQUS "ret" mobile EQUS "ret"
maskbits: macro maskbits: MACRO
; example usage in rejection sampling: ; example usage in rejection sampling:
; .loop ; .loop
; call Random ; call Random

6
macros/coords.asm
View File

@ -1,6 +1,6 @@
bccoord equs "coord bc," bccoord EQUS "coord bc,"
decoord equs "coord de," decoord EQUS "coord de,"
hlcoord equs "coord hl," hlcoord EQUS "coord hl,"
coord: MACRO coord: MACRO
; register, x, y[, origin] ; register, x, y[, origin]

6
macros/enum.asm
View File

@ -1,6 +1,6 @@
; Enumerate variables ; Enumerate variables
enum_start: macro enum_start: MACRO
if _NARG >= 1 if _NARG >= 1
__enum__ = \1 __enum__ = \1
else else
@ -13,12 +13,12 @@ __enumdir__ = +1
endc endc
endm endm
enum: macro enum: MACRO
\1 = __enum__ \1 = __enum__
__enum__ = __enum__ + __enumdir__ __enum__ = __enum__ + __enumdir__
endm endm
enum_set: macro enum_set: MACRO
__enum__ = \1 __enum__ = \1
endm endm

88
macros/scripts/audio.asm
View File

@ -1,4 +1,4 @@
musicheader: macro musicheader: MACRO
; number of tracks, track idx, address ; number of tracks, track idx, address
dbw ((\1 - 1) << 6) + (\2 - 1), \3 dbw ((\1 - 1) << 6) + (\2 - 1), \3
endm endm
@ -7,13 +7,13 @@ note: MACRO
dn (\1), (\2) - 1 dn (\1), (\2) - 1
ENDM ENDM
sound: macro sound: MACRO
note \1, \2 note \1, \2
db \3 ; intensity db \3 ; intensity
dw \4 ; frequency dw \4 ; frequency
endm endm
noise: macro noise: MACRO
note \1, \2 ; duration note \1, \2 ; duration
db \3 ; intensity db \3 ; intensity
db \4 ; frequency db \4 ; frequency
@ -23,11 +23,11 @@ noise: macro
enum_start $d8 enum_start $d8
enum notetype_cmd ; $d8 enum notetype_cmd ; $d8
octave: macro octave: MACRO
db notetype_cmd - (\1) db notetype_cmd - (\1)
endm endm
notetype: macro notetype: MACRO
db notetype_cmd db notetype_cmd
db \1 ; note_length db \1 ; note_length
if _NARG >= 2 if _NARG >= 2
@ -36,37 +36,37 @@ notetype: macro
endm endm
enum pitchoffset_cmd ; $d9 enum pitchoffset_cmd ; $d9
pitchoffset: macro pitchoffset: MACRO
db pitchoffset_cmd db pitchoffset_cmd
dn \1, \2 - 1 ; octave, key dn \1, \2 - 1 ; octave, key
endm endm
enum tempo_cmd ; $da enum tempo_cmd ; $da
tempo: macro tempo: MACRO
db tempo_cmd db tempo_cmd
bigdw \1 ; tempo bigdw \1 ; tempo
endm endm
enum dutycycle_cmd ; $db enum dutycycle_cmd ; $db
dutycycle: macro dutycycle: MACRO
db dutycycle_cmd db dutycycle_cmd
db \1 ; duty_cycle db \1 ; duty_cycle
endm endm
enum intensity_cmd ; $dc enum intensity_cmd ; $dc
intensity: macro intensity: MACRO
db intensity_cmd db intensity_cmd
db \1 ; intensity db \1 ; intensity
endm endm
enum soundinput_cmd ; $dd enum soundinput_cmd ; $dd
soundinput: macro soundinput: MACRO
db soundinput_cmd db soundinput_cmd
db \1 ; input db \1 ; input
endm endm
enum sound_duty_cmd ; $de enum sound_duty_cmd ; $de
sound_duty: macro sound_duty: MACRO
db sound_duty_cmd db sound_duty_cmd
if _NARG == 4 if _NARG == 4
db \1 | (\2 << 2) | (\3 << 4) | (\4 << 6) ; duty sequence db \1 | (\2 << 2) | (\3 << 4) | (\4 << 6) ; duty sequence
@ -76,190 +76,190 @@ sound_duty: macro
endm endm
enum togglesfx_cmd ; $df enum togglesfx_cmd ; $df
togglesfx: macro togglesfx: MACRO
db togglesfx_cmd db togglesfx_cmd
endm endm
enum slidepitchto_cmd ; $e0 enum slidepitchto_cmd ; $e0
slidepitchto: macro slidepitchto: MACRO
db slidepitchto_cmd db slidepitchto_cmd
db \1 - 1 ; duration db \1 - 1 ; duration
dn \2, \3 ; octave, pitch dn \2, \3 ; octave, pitch
endm endm
enum vibrato_cmd ; $e1 enum vibrato_cmd ; $e1
vibrato: macro vibrato: MACRO
db vibrato_cmd db vibrato_cmd
db \1 ; delay db \1 ; delay
db \2 ; extent db \2 ; extent
endm endm
enum unknownmusic0xe2_cmd ; $e2 enum unknownmusic0xe2_cmd ; $e2
unknownmusic0xe2: macro unknownmusic0xe2: MACRO
db unknownmusic0xe2_cmd db unknownmusic0xe2_cmd
db \1 ; unknown db \1 ; unknown
endm endm
enum togglenoise_cmd ; $e3 enum togglenoise_cmd ; $e3
togglenoise: macro togglenoise: MACRO
db togglenoise_cmd db togglenoise_cmd
db \1 ; id db \1 ; id
endm endm
enum panning_cmd ; $e4 enum panning_cmd ; $e4
panning: macro panning: MACRO
db panning_cmd db panning_cmd
db \1 ; tracks db \1 ; tracks
endm endm
enum volume_cmd ; $e5 enum volume_cmd ; $e5
volume: macro volume: MACRO
db volume_cmd db volume_cmd
db \1 ; volume db \1 ; volume
endm endm
enum tone_cmd ; $e6 enum tone_cmd ; $e6
tone: macro tone: MACRO
db tone_cmd db tone_cmd
bigdw \1 ; tone bigdw \1 ; tone
endm endm
enum unknownmusic0xe7_cmd ; $e7 enum unknownmusic0xe7_cmd ; $e7
unknownmusic0xe7: macro unknownmusic0xe7: MACRO
db unknownmusic0xe7_cmd db unknownmusic0xe7_cmd
db \1 ; unknown db \1 ; unknown
endm endm
enum unknownmusic0xe8_cmd ; $e8 enum unknownmusic0xe8_cmd ; $e8
unknownmusic0xe8: macro unknownmusic0xe8: MACRO
db unknownmusic0xe8_cmd db unknownmusic0xe8_cmd
db \1 ; unknown db \1 ; unknown
endm endm
enum tempo_relative_cmd ; $e9 enum tempo_relative_cmd ; $e9
tempo_relative: macro tempo_relative: MACRO
db tempo_relative_cmd db tempo_relative_cmd
bigdw \1 ; value bigdw \1 ; value
endm endm
enum restartchannel_cmd ; $ea enum restartchannel_cmd ; $ea
restartchannel: macro restartchannel: MACRO
db restartchannel_cmd db restartchannel_cmd
dw \1 ; address dw \1 ; address
endm endm
enum newsong_cmd ; $eb enum newsong_cmd ; $eb
newsong: macro newsong: MACRO
db newsong_cmd db newsong_cmd
bigdw \1 ; id bigdw \1 ; id
endm endm
enum sfxpriorityon_cmd ; $ec enum sfxpriorityon_cmd ; $ec
sfxpriorityon: macro sfxpriorityon: MACRO
db sfxpriorityon_cmd db sfxpriorityon_cmd
endm endm
enum sfxpriorityoff_cmd ; $ed enum sfxpriorityoff_cmd ; $ed
sfxpriorityoff: macro sfxpriorityoff: MACRO
db sfxpriorityoff_cmd db sfxpriorityoff_cmd
endm endm
enum unknownmusic0xee_cmd ; $ee enum unknownmusic0xee_cmd ; $ee
unknownmusic0xee: macro unknownmusic0xee: MACRO
db unknownmusic0xee_cmd db unknownmusic0xee_cmd
dw \1 ; address dw \1 ; address
endm endm
enum stereopanning_cmd ; $ef enum stereopanning_cmd ; $ef
stereopanning: macro stereopanning: MACRO
db stereopanning_cmd db stereopanning_cmd
db \1 ; tracks db \1 ; tracks
endm endm
enum sfxtogglenoise_cmd ; $f0 enum sfxtogglenoise_cmd ; $f0
sfxtogglenoise: macro sfxtogglenoise: MACRO
db sfxtogglenoise_cmd db sfxtogglenoise_cmd
db \1 ; id db \1 ; id
endm endm
enum music0xf1_cmd ; $f1 enum music0xf1_cmd ; $f1
music0xf1: macro music0xf1: MACRO
db music0xf1_cmd db music0xf1_cmd
endm endm
enum music0xf2_cmd ; $f2 enum music0xf2_cmd ; $f2
music0xf2: macro music0xf2: MACRO
db music0xf2_cmd db music0xf2_cmd
endm endm
enum music0xf3_cmd ; $f3 enum music0xf3_cmd ; $f3
music0xf3: macro music0xf3: MACRO
db music0xf3_cmd db music0xf3_cmd
endm endm
enum music0xf4_cmd ; $f4 enum music0xf4_cmd ; $f4
music0xf4: macro music0xf4: MACRO
db music0xf4_cmd db music0xf4_cmd
endm endm
enum music0xf5_cmd ; $f5 enum music0xf5_cmd ; $f5
music0xf5: macro music0xf5: MACRO
db music0xf5_cmd db music0xf5_cmd
endm endm
enum music0xf6_cmd ; $f6 enum music0xf6_cmd ; $f6
music0xf6: macro music0xf6: MACRO
db music0xf6_cmd db music0xf6_cmd
endm endm
enum music0xf7_cmd ; $f7 enum music0xf7_cmd ; $f7
music0xf7: macro music0xf7: MACRO
db music0xf7_cmd db music0xf7_cmd
endm endm
enum music0xf8_cmd ; $f8 enum music0xf8_cmd ; $f8
music0xf8: macro music0xf8: MACRO
db music0xf8_cmd db music0xf8_cmd
endm endm
enum unknownmusic0xf9_cmd ; $f9 enum unknownmusic0xf9_cmd ; $f9
unknownmusic0xf9: macro unknownmusic0xf9: MACRO
db unknownmusic0xf9_cmd db unknownmusic0xf9_cmd
endm endm
enum setcondition_cmd ; $fa enum setcondition_cmd ; $fa
setcondition: macro setcondition: MACRO
db setcondition_cmd db setcondition_cmd
db \1 ; condition db \1 ; condition
endm endm
enum jumpif_cmd ; $fb enum jumpif_cmd ; $fb
jumpif: macro jumpif: MACRO
db jumpif_cmd db jumpif_cmd
db \1 ; condition db \1 ; condition
dw \2 ; address dw \2 ; address
endm endm
enum jumpchannel_cmd ; $fc enum jumpchannel_cmd ; $fc
jumpchannel: macro jumpchannel: MACRO
db jumpchannel_cmd db jumpchannel_cmd
dw \1 ; address dw \1 ; address
endm endm
enum loopchannel_cmd ; $fd enum loopchannel_cmd ; $fd
loopchannel: macro loopchannel: MACRO
db loopchannel_cmd db loopchannel_cmd
db \1 ; count db \1 ; count
dw \2 ; address dw \2 ; address
endm endm
enum callchannel_cmd ; $fe enum callchannel_cmd ; $fe
callchannel: macro callchannel: MACRO
db callchannel_cmd db callchannel_cmd
dw \1 ; address dw \1 ; address
endm endm
enum endchannel_cmd ; $ff enum endchannel_cmd ; $ff
endchannel: macro endchannel: MACRO
db endchannel_cmd db endchannel_cmd
endm endm

98
macros/scripts/battle_anims.asm
View File

@ -1,4 +1,4 @@
anim_wait: macro anim_wait: MACRO
if \1 >= $d0 if \1 >= $d0
flip out flip out
endc endc
@ -9,7 +9,7 @@ endc
enum_start $d0 enum_start $d0
enum anim_obj_command ; $d0 enum anim_obj_command ; $d0
anim_obj: macro anim_obj: MACRO
db anim_obj_command db anim_obj_command
db \1 ; obj db \1 ; obj
db (\2 << 3) + \3 ; x db (\2 << 3) + \3 ; x
@ -18,20 +18,20 @@ anim_obj: macro
endm endm
enum anim_1gfx_command ; $d1 enum anim_1gfx_command ; $d1
anim_1gfx: macro anim_1gfx: MACRO
db anim_1gfx_command db anim_1gfx_command
db \1 ; gfx1 db \1 ; gfx1
endm endm
enum anim_2gfx_command ; $d2 enum anim_2gfx_command ; $d2
anim_2gfx: macro anim_2gfx: MACRO
db anim_2gfx_command db anim_2gfx_command
db \1 ; gfx1 db \1 ; gfx1
db \2 ; gfx2 db \2 ; gfx2
endm endm
enum anim_3gfx_command ; $d3 enum anim_3gfx_command ; $d3
anim_3gfx: macro anim_3gfx: MACRO
db anim_3gfx_command db anim_3gfx_command
db \1 ; gfx1 db \1 ; gfx1
db \2 ; gfx2 db \2 ; gfx2
@ -39,7 +39,7 @@ anim_3gfx: macro
endm endm
enum anim_4gfx_command ; $d4 enum anim_4gfx_command ; $d4
anim_4gfx: macro anim_4gfx: MACRO
db anim_4gfx_command db anim_4gfx_command
db \1 ; gfx1 db \1 ; gfx1
db \2 ; gfx2 db \2 ; gfx2
@ -48,7 +48,7 @@ anim_4gfx: macro
endm endm
enum anim_5gfx_command ; $d5 enum anim_5gfx_command ; $d5
anim_5gfx: macro anim_5gfx: MACRO
db anim_5gfx_command db anim_5gfx_command
db \1 ; gfx1 db \1 ; gfx1
db \2 ; gfx2 db \2 ; gfx2
@ -58,147 +58,147 @@ anim_5gfx: macro
endm endm
enum anim_incobj_command ; $d6 enum anim_incobj_command ; $d6
anim_incobj: macro anim_incobj: MACRO
db anim_incobj_command db anim_incobj_command
db \1 ; id db \1 ; id
endm endm
enum anim_setobj_command ; $d7 enum anim_setobj_command ; $d7
anim_setobj: macro anim_setobj: MACRO
db anim_setobj_command db anim_setobj_command
db \1 ; id db \1 ; id
db \2 ; obj db \2 ; obj
endm endm
enum anim_incbgeffect_command ; $d8 enum anim_incbgeffect_command ; $d8
anim_incbgeffect: macro anim_incbgeffect: MACRO
db anim_incbgeffect_command db anim_incbgeffect_command
db \1 ; effect db \1 ; effect
endm endm
enum anim_enemyfeetobj_command ; $d9 enum anim_enemyfeetobj_command ; $d9
anim_enemyfeetobj: macro anim_enemyfeetobj: MACRO
db anim_enemyfeetobj_command db anim_enemyfeetobj_command
endm endm
enum anim_playerheadobj_command ; $da enum anim_playerheadobj_command ; $da
anim_playerheadobj: macro anim_playerheadobj: MACRO
db anim_playerheadobj_command db anim_playerheadobj_command
endm endm
enum anim_checkpokeball_command ; $db enum anim_checkpokeball_command ; $db
anim_checkpokeball: macro anim_checkpokeball: MACRO
db anim_checkpokeball_command db anim_checkpokeball_command
endm endm
enum anim_transform_command ; $dc enum anim_transform_command ; $dc
anim_transform: macro anim_transform: MACRO
db anim_transform_command db anim_transform_command
endm endm
enum anim_raisesub_command ; $dd enum anim_raisesub_command ; $dd
anim_raisesub: macro anim_raisesub: MACRO
db anim_raisesub_command db anim_raisesub_command
endm endm
enum anim_dropsub_command ; $de enum anim_dropsub_command ; $de
anim_dropsub: macro anim_dropsub: MACRO
db anim_dropsub_command db anim_dropsub_command
endm endm
enum anim_resetobp0_command ; $df enum anim_resetobp0_command ; $df
anim_resetobp0: macro anim_resetobp0: MACRO
db anim_resetobp0_command db anim_resetobp0_command
endm endm
enum anim_sound_command ; $e0 enum anim_sound_command ; $e0
anim_sound: macro anim_sound: MACRO
db anim_sound_command db anim_sound_command
db (\1 << 2) | \2 ; duration, tracks db (\1 << 2) | \2 ; duration, tracks
db \3 ; id db \3 ; id
endm endm
enum anim_cry_command ; $e1 enum anim_cry_command ; $e1
anim_cry: macro anim_cry: MACRO
db anim_cry_command db anim_cry_command
db \1 ; pitch db \1 ; pitch
endm endm
enum anim_minimizeopp_command ; $e2 enum anim_minimizeopp_command ; $e2
anim_minimizeopp: macro anim_minimizeopp: MACRO
db anim_minimizeopp_command db anim_minimizeopp_command
endm endm
enum anim_oamon_command ; $e3 enum anim_oamon_command ; $e3
anim_oamon: macro anim_oamon: MACRO
db anim_oamon_command db anim_oamon_command
endm endm
enum anim_oamoff_command ; $e4 enum anim_oamoff_command ; $e4
anim_oamoff: macro anim_oamoff: MACRO
db anim_oamoff_command db anim_oamoff_command
endm endm
enum anim_clearobjs_command ; $e5 enum anim_clearobjs_command ; $e5
anim_clearobjs: macro anim_clearobjs: MACRO
db anim_clearobjs_command db anim_clearobjs_command
endm endm
enum anim_beatup_command ; $e6 enum anim_beatup_command ; $e6
anim_beatup: macro anim_beatup: MACRO
db anim_beatup_command db anim_beatup_command
endm endm
enum anim_0xe7_command ; $e7 enum anim_0xe7_command ; $e7
anim_0xe7: macro anim_0xe7: MACRO
db anim_0xe7_command db anim_0xe7_command
endm endm
enum anim_updateactorpic_command ; $e8 enum anim_updateactorpic_command ; $e8
anim_updateactorpic: macro anim_updateactorpic: MACRO
db anim_updateactorpic_command db anim_updateactorpic_command
endm endm
enum anim_minimize_command ; $e9 enum anim_minimize_command ; $e9
anim_minimize: macro anim_minimize: MACRO
db anim_minimize_command db anim_minimize_command
endm endm
enum anim_0xea_command ; $ea enum anim_0xea_command ; $ea
anim_0xea: macro anim_0xea: MACRO
db anim_0xea_command db anim_0xea_command
endm endm
enum anim_0xeb_command ; $eb enum anim_0xeb_command ; $eb
anim_0xeb: macro anim_0xeb: MACRO
db anim_0xeb_command db anim_0xeb_command
endm endm
enum anim_0xec_command ; $ec enum anim_0xec_command ; $ec
anim_0xec: macro anim_0xec: MACRO
db anim_0xec_command db anim_0xec_command
endm endm
enum anim_0xed_command ; $ed enum anim_0xed_command ; $ed
anim_0xed: macro anim_0xed: MACRO
db anim_0xed_command db anim_0xed_command
endm endm
enum anim_if_param_and_command ; $ee enum anim_if_param_and_command ; $ee
anim_if_param_and: macro anim_if_param_and: MACRO
db anim_if_param_and_command db anim_if_param_and_command
db \1 ; value db \1 ; value
dw \2 ; address dw \2 ; address
endm endm
enum anim_jumpuntil_command ; $ef enum anim_jumpuntil_command ; $ef
anim_jumpuntil: macro anim_jumpuntil: MACRO
db anim_jumpuntil_command db anim_jumpuntil_command
dw \1 ; address dw \1 ; address
endm endm
enum anim_bgeffect_command ; $f0 enum anim_bgeffect_command ; $f0
anim_bgeffect: macro anim_bgeffect: MACRO
db anim_bgeffect_command db anim_bgeffect_command
db \1 ; effect db \1 ; effect
db \2 ; unknown db \2 ; unknown
@ -207,88 +207,88 @@ anim_bgeffect: macro
endm endm
enum anim_bgp_command ; $f1 enum anim_bgp_command ; $f1
anim_bgp: macro anim_bgp: MACRO
db anim_bgp_command db anim_bgp_command
db \1 ; colors db \1 ; colors
endm endm
enum anim_obp0_command ; $f2 enum anim_obp0_command ; $f2
anim_obp0: macro anim_obp0: MACRO
db anim_obp0_command db anim_obp0_command
db \1 ; colors db \1 ; colors
endm endm
enum anim_obp1_command ; $f3 enum anim_obp1_command ; $f3
anim_obp1: macro anim_obp1: MACRO
db anim_obp1_command db anim_obp1_command
db \1 ; colors db \1 ; colors
endm endm
enum anim_clearsprites_command ; $f4 enum anim_clearsprites_command ; $f4
anim_clearsprites: macro anim_clearsprites: MACRO
db anim_clearsprites_command db anim_clearsprites_command
endm endm
enum anim_0xf5_command ; $f5 enum anim_0xf5_command ; $f5
anim_0xf5: macro anim_0xf5: MACRO
db anim_0xf5_command db anim_0xf5_command
endm endm
enum anim_0xf6_command ; $f6 enum anim_0xf6_command ; $f6
anim_0xf6: macro anim_0xf6: MACRO
db anim_0xf6_command db anim_0xf6_command
endm endm
enum anim_0xf7_command ; $f7 enum anim_0xf7_command ; $f7
anim_0xf7: macro anim_0xf7: MACRO
db anim_0xf7_command db anim_0xf7_command
endm endm
enum anim_if_param_equal_command ; $f8 enum anim_if_param_equal_command ; $f8
anim_if_param_equal: macro anim_if_param_equal: MACRO
db anim_if_param_equal_command db anim_if_param_equal_command
db \1 ; value db \1 ; value
dw \2 ; address dw \2 ; address
endm endm
enum anim_setvar_command ; $f9 enum anim_setvar_command ; $f9
anim_setvar: macro anim_setvar: MACRO
db anim_setvar_command db anim_setvar_command
db \1 ; value db \1 ; value
endm endm
enum anim_incvar_command ; $fa enum anim_incvar_command ; $fa
anim_incvar: macro anim_incvar: MACRO
db anim_incvar_command db anim_incvar_command
endm endm
enum anim_if_var_equal_command ; $fb enum anim_if_var_equal_command ; $fb
anim_if_var_equal: macro anim_if_var_equal: MACRO
db anim_if_var_equal_command db anim_if_var_equal_command
db \1 ; value db \1 ; value
dw \2 ; address dw \2 ; address
endm endm
enum anim_jump_command ; $fc enum anim_jump_command ; $fc
anim_jump: macro anim_jump: MACRO
db anim_jump_command db anim_jump_command
dw \1 ; address dw \1 ; address
endm endm
enum anim_loop_command ; $fd enum anim_loop_command ; $fd
anim_loop: macro anim_loop: MACRO
db anim_loop_command db anim_loop_command
db \1 ; count db \1 ; count
dw \2 ; address dw \2 ; address
endm endm
enum anim_call_command ; $fe enum anim_call_command ; $fe
anim_call: macro anim_call: MACRO
db anim_call_command db anim_call_command
dw \1 ; address dw \1 ; address
endm endm
enum anim_ret_command ; $ff enum anim_ret_command ; $ff
anim_ret: macro anim_ret: MACRO
db anim_ret_command db anim_ret_command
endm endm

4
macros/scripts/battle_commands.asm
View File

@ -1,6 +1,6 @@
command: macro command: MACRO
enum \1_command enum \1_command
\1 equs "db \1_command" \1 EQUS "db \1_command"
endm endm
; BattleCommandPointers indexes (see data/battle_command_pointers.asm) ; BattleCommandPointers indexes (see data/battle_command_pointers.asm)

340
macros/scripts/events.asm
View File

File diff suppressed because it is too large Load Diff

12
macros/scripts/gfx_anims.asm
View File

@ -1,6 +1,6 @@
; pic + oam animations ; pic + oam animations
frame: macro frame: MACRO
db \1 db \1
x = \2 x = \2
if _NARG > 2 if _NARG > 2
@ -15,30 +15,30 @@ endc
enum_start $fc enum_start $fc
enum delanim_command ; $fc enum delanim_command ; $fc
delanim: macro ; used for oam delanim: MACRO ; used for oam
db delanim_command db delanim_command
endm endm
enum dorepeat_command ; $fd enum dorepeat_command ; $fd
dorepeat: macro dorepeat: MACRO
db dorepeat_command db dorepeat_command
db \1 ; # db \1 ; #
endm endm
enum setrepeat_command ; $fe enum setrepeat_command ; $fe
setrepeat: macro setrepeat: MACRO
db setrepeat_command db setrepeat_command
db \1 ; # db \1 ; #
endm endm
enum endanim_command ; $ff enum endanim_command ; $ff
endanim: macro endanim: MACRO
db endanim_command db endanim_command
endm endm
__enum__ = $fe __enum__ = $fe
enum dorestart_command ; $fe enum dorestart_command ; $fe
dorestart: macro ; used for oam dorestart: MACRO ; used for oam
db dorestart_command db dorestart_command
endm endm

20
macros/scripts/maps.asm
View File

@ -1,15 +1,15 @@
map: macro map: MACRO
;\1: map id ;\1: map id
db GROUP_\1, MAP_\1 db GROUP_\1, MAP_\1
endm endm
scene_script: macro scene_script: MACRO
;\1: script pointer ;\1: script pointer
dw \1, 0 dw \1, 0
endm endm
warp_def: macro warp_def: MACRO
;\1: y: top to bottom, starts at 0 ;\1: y: top to bottom, starts at 0
;\2: x: left to right, starts at 0 ;\2: x: left to right, starts at 0
;\3: warp destination: starts at 1 ;\3: warp destination: starts at 1
@ -18,7 +18,7 @@ warp_def: macro
map \4 map \4
endm endm
coord_event: macro coord_event: MACRO
;\1: scene id: controlled by setscene/setmapscene ;\1: scene id: controlled by setscene/setmapscene
;\2: y: top to bottom, starts at 0 ;\2: y: top to bottom, starts at 0
;\3: x: left to right, starts at 0 ;\3: x: left to right, starts at 0
@ -28,7 +28,7 @@ coord_event: macro
db $0, $0 db $0, $0
endm endm
bg_event: macro bg_event: MACRO
;\1: y: top to bottom, starts at 0 ;\1: y: top to bottom, starts at 0
;\2: x: left to right, starts at 0 ;\2: x: left to right, starts at 0
;\3: function: a BGEVENT_* constant ;\3: function: a BGEVENT_* constant
@ -37,7 +37,7 @@ bg_event: macro
dw \4 dw \4
endm endm
object_event: macro object_event: MACRO
;\1: sprite: a SPRITE_* constant ;\1: sprite: a SPRITE_* constant
;\2: y: top to bottom, starts at 0 ;\2: y: top to bottom, starts at 0
;\3: x: left to right, starts at 0 ;\3: x: left to right, starts at 0
@ -68,7 +68,7 @@ object_event: macro
endm endm
trainer: macro trainer: MACRO
;\1: flag: an EVENT_BEAT_* constant ;\1: flag: an EVENT_BEAT_* constant
;\2: trainer group ;\2: trainer group
;\3: trainer id ;\3: trainer id
@ -81,7 +81,7 @@ trainer: macro
dw \4, \5, \6, \7 dw \4, \5, \6, \7
endm endm
itemball: macro itemball: MACRO
;\1: item: from constants/item_constants.asm ;\1: item: from constants/item_constants.asm
;\2: quantity: default 1 ;\2: quantity: default 1
if _NARG == 2 if _NARG == 2
@ -91,7 +91,7 @@ else
endc endc
endm endm
elevfloor: macro elevfloor: MACRO
;\1: floor: a FLOOR_* constant ;\1: floor: a FLOOR_* constant
;\2: warp destination: starts at 1 ;\2: warp destination: starts at 1
;\3: map id ;\3: map id
@ -99,7 +99,7 @@ elevfloor: macro
map \3 map \3
ENDM ENDM
stonetable: macro stonetable: MACRO
;\1: warp id ;\1: warp id
;\2: object_event id ;\2: object_event id
;\3: script pointer ;\3: script pointer

80
macros/scripts/movement.asm
View File

@ -4,98 +4,98 @@
; Directional movements ; Directional movements
enum movement_turn_head ; $00 enum movement_turn_head ; $00
turn_head: macro turn_head: MACRO
db movement_turn_head | \1 db movement_turn_head | \1
endm endm
__enum__ = __enum__ + 3 __enum__ = __enum__ + 3
enum movement_turn_step ; $04 enum movement_turn_step ; $04
turn_step: macro turn_step: MACRO
db movement_turn_step | \1 db movement_turn_step | \1
endm endm
__enum__ = __enum__ + 3 __enum__ = __enum__ + 3
enum movement_slow_step ; $08 enum movement_slow_step ; $08
slow_step: macro slow_step: MACRO
db movement_slow_step | \1 db movement_slow_step | \1
endm endm
__enum__ = __enum__ + 3 __enum__ = __enum__ + 3
enum movement_step ; $0c enum movement_step ; $0c
step: macro step: MACRO
db movement_step | \1 db movement_step | \1
endm endm
__enum__ = __enum__ + 3 __enum__ = __enum__ + 3
enum movement_big_step ; $10 enum movement_big_step ; $10
big_step: macro big_step: MACRO
db movement_big_step | \1 db movement_big_step | \1
endm endm
__enum__ = __enum__ + 3 __enum__ = __enum__ + 3
enum movement_slow_slide_step ; $14 enum movement_slow_slide_step ; $14
slow_slide_step: macro slow_slide_step: MACRO
db movement_slow_slide_step | \1 db movement_slow_slide_step | \1
endm endm
__enum__ = __enum__ + 3 __enum__ = __enum__ + 3
enum movement_slide_step ; $18 enum movement_slide_step ; $18
slide_step: macro slide_step: MACRO
db movement_slide_step | \1 db movement_slide_step | \1
endm endm
__enum__ = __enum__ + 3 __enum__ = __enum__ + 3
enum movement_fast_slide_step ; $1c enum movement_fast_slide_step ; $1c
fast_slide_step: macro fast_slide_step: MACRO
db movement_fast_slide_step | \1 db movement_fast_slide_step | \1
endm endm
__enum__ = __enum__ + 3 __enum__ = __enum__ + 3
enum movement_turn_away ; $20 enum movement_turn_away ; $20
turn_away: macro turn_away: MACRO
db movement_turn_away | \1 db movement_turn_away | \1
endm endm
__enum__ = __enum__ + 3 __enum__ = __enum__ + 3
enum movement_turn_in ; $24 enum movement_turn_in ; $24
turn_in: macro turn_in: MACRO
db movement_turn_in | \1 db movement_turn_in | \1
endm endm
__enum__ = __enum__ + 3 __enum__ = __enum__ + 3
enum movement_turn_waterfall ; $28 enum movement_turn_waterfall ; $28
turn_waterfall: macro turn_waterfall: MACRO
db movement_turn_waterfall | \1 db movement_turn_waterfall | \1
endm endm
__enum__ = __enum__ + 3 __enum__ = __enum__ + 3
enum movement_slow_jump_step ; $2c enum movement_slow_jump_step ; $2c
slow_jump_step: macro slow_jump_step: MACRO
db movement_slow_jump_step | \1 db movement_slow_jump_step | \1
endm endm
__enum__ = __enum__ + 3 __enum__ = __enum__ + 3
enum movement_jump_step ; $30 enum movement_jump_step ; $30
jump_step: macro jump_step: MACRO
db movement_jump_step | \1 db movement_jump_step | \1
endm endm
__enum__ = __enum__ + 3 __enum__ = __enum__ + 3
enum movement_fast_jump_step ; $34 enum movement_fast_jump_step ; $34
fast_jump_step: macro fast_jump_step: MACRO
db movement_fast_jump_step | \1 db movement_fast_jump_step | \1
endm endm
@ -103,39 +103,39 @@ __enum__ = __enum__ + 3
; Control ; Control
enum movement_remove_sliding ; $38 enum movement_remove_sliding ; $38
remove_sliding: macro remove_sliding: MACRO
db movement_remove_sliding db movement_remove_sliding
endm endm
enum movement_set_sliding ; $39 enum movement_set_sliding ; $39
set_sliding: macro set_sliding: MACRO
db movement_set_sliding db movement_set_sliding
endm endm
enum movement_remove_fixed_facing ; $3a enum movement_remove_fixed_facing ; $3a
remove_fixed_facing: macro remove_fixed_facing: MACRO
db movement_remove_fixed_facing db movement_remove_fixed_facing
endm endm
enum movement_fix_facing ; $3b enum movement_fix_facing ; $3b
fix_facing: macro fix_facing: MACRO
db movement_fix_facing db movement_fix_facing
endm endm
enum movement_show_object ; $3c enum movement_show_object ; $3c
show_object: macro show_object: MACRO
db movement_show_object db movement_show_object
endm endm
enum movement_hide_object ; $3d enum movement_hide_object ; $3d
hide_object: macro hide_object: MACRO
db movement_hide_object db movement_hide_object
endm endm
; Sleep ; Sleep
enum movement_step_sleep ; $3e enum movement_step_sleep ; $3e
step_sleep: macro step_sleep: MACRO
if \1 <= 8 if \1 <= 8
db movement_step_sleep + \1 - 1 db movement_step_sleep + \1 - 1
else else
@ -146,101 +146,101 @@ endm
__enum__ = __enum__ + 8 __enum__ = __enum__ + 8
enum movement_step_end ; $47 enum movement_step_end ; $47
step_end: macro step_end: MACRO
db movement_step_end db movement_step_end
endm endm
enum movement_step_48 ; $48 enum movement_step_48 ; $48
step_48: macro step_48: MACRO
db movement_step_48 db movement_step_48
db \1 ; ??? db \1 ; ???
endm endm
enum movement_remove_object ; $49 enum movement_remove_object ; $49
remove_object: macro remove_object: MACRO
db movement_remove_object db movement_remove_object
endm endm
enum movement_step_loop ; $4a enum movement_step_loop ; $4a
step_loop: macro step_loop: MACRO
db movement_step_loop db movement_step_loop
endm endm
enum movement_step_4b ; $4b enum movement_step_4b ; $4b
step_4b: macro step_4b: MACRO
db movement_step_4b db movement_step_4b
endm endm
enum movement_teleport_from ; $4c enum movement_teleport_from ; $4c
teleport_from: macro teleport_from: MACRO
db movement_teleport_from db movement_teleport_from
endm endm
enum movement_teleport_to ; $4d enum movement_teleport_to ; $4d
teleport_to: macro teleport_to: MACRO
db movement_teleport_to db movement_teleport_to
endm endm
enum movement_skyfall ; $4e enum movement_skyfall ; $4e
skyfall: macro skyfall: MACRO
db movement_skyfall db movement_skyfall
endm endm
enum movement_step_dig ; $4f enum movement_step_dig ; $4f
step_dig: macro step_dig: MACRO
db movement_step_dig db movement_step_dig
db \1 ; length db \1 ; length
endm endm
enum movement_step_bump ; $50 enum movement_step_bump ; $50
step_bump: macro step_bump: MACRO
db movement_step_bump db movement_step_bump
endm endm
enum movement_fish_got_bite ; $51 enum movement_fish_got_bite ; $51
fish_got_bite: macro fish_got_bite: MACRO
db movement_fish_got_bite db movement_fish_got_bite
endm endm
enum movement_fish_cast_rod ; $52 enum movement_fish_cast_rod ; $52
fish_cast_rod: macro fish_cast_rod: MACRO
db movement_fish_cast_rod db movement_fish_cast_rod
endm endm
enum movement_hide_emote ; $53 enum movement_hide_emote ; $53
hide_emote: macro hide_emote: MACRO
db movement_hide_emote db movement_hide_emote
endm endm
enum movement_show_emote ; $54 enum movement_show_emote ; $54
show_emote: macro show_emote: MACRO
db movement_show_emote db movement_show_emote
endm endm
enum movement_step_shake ; $55 enum movement_step_shake ; $55
step_shake: macro step_shake: MACRO
db movement_step_shake db movement_step_shake
db \1 ; displacement db \1 ; displacement
endm endm
enum movement_tree_shake ; $56 enum movement_tree_shake ; $56
tree_shake: macro tree_shake: MACRO
db movement_tree_shake db movement_tree_shake
endm endm
enum movement_rock_smash ; $57 enum movement_rock_smash ; $57
rock_smash: macro rock_smash: MACRO
db movement_rock_smash db movement_rock_smash
db \1 ; length db \1 ; length
endm endm
enum movement_return_dig ; $58 enum movement_return_dig ; $58
return_dig: macro return_dig: MACRO
db movement_return_dig db movement_return_dig
db \1 ; length db \1 ; length
endm endm
enum movement_skyfall_top ; $59 enum movement_skyfall_top ; $59
skyfall_top: macro skyfall_top: MACRO
db movement_skyfall_top db movement_skyfall_top
endm endm

40
macros/scripts/text.asm
View File

@ -17,111 +17,111 @@ text_from_ram: MACRO
ENDM ENDM
enum TX_BCD ; $02 enum TX_BCD ; $02
text_bcd: macro text_bcd: MACRO
db TX_BCD db TX_BCD
dw \1 dw \1
db \2 db \2
ENDM ENDM
enum TX_MOVE ; $03 enum TX_MOVE ; $03
text_move: macro text_move: MACRO
db TX_MOVE db TX_MOVE
dw \1 dw \1
ENDM ENDM
enum TX_BOX ; $04 enum TX_BOX ; $04
text_box: macro text_box: MACRO
db TX_BOX db TX_BOX
dw \1 dw \1
db \2, \3 db \2, \3
ENDM ENDM
enum TX_LOW ; $05 enum TX_LOW ; $05
text_low: macro text_low: MACRO
db TX_LOW db TX_LOW
endm endm
enum WAIT_BUTTON ; $06 enum WAIT_BUTTON ; $06
text_waitbutton: macro text_waitbutton: MACRO
db WAIT_BUTTON db WAIT_BUTTON
endm endm
enum TX_SCROLL ; $07 enum TX_SCROLL ; $07
text_scroll: macro text_scroll: MACRO
db TX_SCROLL db TX_SCROLL
endm endm
enum START_ASM ; $08 enum START_ASM ; $08
start_asm: macro start_asm: MACRO
db START_ASM db START_ASM
endm endm
enum TX_NUM ; $09 enum TX_NUM ; $09
deciram: macro deciram: MACRO
db TX_NUM db TX_NUM
dw \1 ; address dw \1 ; address
dn \2, \3 ; bytes, digits dn \2, \3 ; bytes, digits
endm endm
enum TX_EXIT ; $0a enum TX_EXIT ; $0a
interpret_data: macro interpret_data: MACRO
db TX_EXIT db TX_EXIT
endm endm
enum TX_SOUND_0B ; $0b enum TX_SOUND_0B ; $0b
sound_dex_fanfare_50_79: macro sound_dex_fanfare_50_79: MACRO
db TX_SOUND_0B db TX_SOUND_0B
endm endm
enum TX_DOTS ; $0c enum TX_DOTS ; $0c
limited_interpret_data: macro limited_interpret_data: MACRO
db TX_DOTS db TX_DOTS
db \1 db \1
endm endm
enum TX_LINK_WAIT_BUTTON ; $0d enum TX_LINK_WAIT_BUTTON ; $0d
link_wait_button: macro link_wait_button: MACRO
db TX_LINK_WAIT_BUTTON db TX_LINK_WAIT_BUTTON
endm endm
enum TX_SOUND_0E ; $0e enum TX_SOUND_0E ; $0e
sound_dex_fanfare_20_49: macro sound_dex_fanfare_20_49: MACRO
db TX_SOUND_0E db TX_SOUND_0E
endm endm
enum TX_SOUND_0F ; $0f enum TX_SOUND_0F ; $0f
sound_item: macro sound_item: MACRO
db TX_SOUND_0F db TX_SOUND_0F
endm endm
enum TX_SOUND_10 ; $10 enum TX_SOUND_10 ; $10
sound_caught_mon: macro sound_caught_mon: MACRO
db TX_SOUND_10 db TX_SOUND_10
endm endm
enum TX_SOUND_11 ; $11 enum TX_SOUND_11 ; $11
sound_dex_fanfare_80_109: macro sound_dex_fanfare_80_109: MACRO
db TX_SOUND_11 db TX_SOUND_11
endm endm
enum TX_SOUND_12 ; $12 enum TX_SOUND_12 ; $12
sound_fanfare: macro sound_fanfare: MACRO
db TX_SOUND_12 db TX_SOUND_12
endm endm
enum TX_SOUND_13 ; $13 enum TX_SOUND_13 ; $13
sound_slot_machine_start: macro sound_slot_machine_start: MACRO
db TX_SOUND_13 db TX_SOUND_13
endm endm
enum TX_STRINGBUFFER ; $14 enum TX_STRINGBUFFER ; $14
text_buffer: macro text_buffer: MACRO
db TX_STRINGBUFFER db TX_STRINGBUFFER
db \1 db \1
endm endm
enum TX_DAY ; $15 enum TX_DAY ; $15
current_day: macro current_day: MACRO
db TX_DAY db TX_DAY
endm endm

94
macros/scripts/trade_anims.asm
View File

@ -2,167 +2,167 @@
enum_start enum_start
enum tradeanim_next_command ; $00 enum tradeanim_next_command ; $00
tradeanim_next: macro tradeanim_next: MACRO
db tradeanim_next_command db tradeanim_next_command
endm endm
enum tradeanim_show_givemon_data_command ; $01 enum tradeanim_show_givemon_data_command ; $01
tradeanim_show_givemon_data: macro tradeanim_show_givemon_data: MACRO
db tradeanim_show_givemon_data_command db tradeanim_show_givemon_data_command
endm endm
enum tradeanim_show_getmon_data_command ; $02 enum tradeanim_show_getmon_data_command ; $02
tradeanim_show_getmon_data: macro tradeanim_show_getmon_data: MACRO
db tradeanim_show_getmon_data_command db tradeanim_show_getmon_data_command
endm endm
enum tradeanim_enter_link_tube_command ; $03 enum tradeanim_enter_link_tube_command ; $03
tradeanim_enter_link_tube: macro tradeanim_enter_link_tube: MACRO
db tradeanim_enter_link_tube_command db tradeanim_enter_link_tube_command
endm endm
__enum__ set $5 __enum__ set $5
enum tradeanim_exit_link_tube_command ; $05 enum tradeanim_exit_link_tube_command ; $05
tradeanim_exit_link_tube: macro tradeanim_exit_link_tube: MACRO
db tradeanim_exit_link_tube_command db tradeanim_exit_link_tube_command
endm endm
enum tradeanim_tube_to_ot_command ; $06 enum tradeanim_tube_to_ot_command ; $06
tradeanim_tube_to_ot: macro tradeanim_tube_to_ot: MACRO
db tradeanim_tube_to_ot_command db tradeanim_tube_to_ot_command
endm endm
__enum__ set $0e __enum__ set $0e
enum tradeanim_tube_to_player_command ; $0e enum tradeanim_tube_to_player_command ; $0e
tradeanim_tube_to_player: macro tradeanim_tube_to_player: MACRO
db tradeanim_tube_to_player_command db tradeanim_tube_to_player_command
endm endm
__enum__ set $16 __enum__ set $16
enum tradeanim_sent_to_ot_text_command ; $16 enum tradeanim_sent_to_ot_text_command ; $16
tradeanim_sent_to_ot_text: macro tradeanim_sent_to_ot_text: MACRO
db tradeanim_sent_to_ot_text_command db tradeanim_sent_to_ot_text_command
endm endm
enum tradeanim_ot_bids_farewell_command ; $17 enum tradeanim_ot_bids_farewell_command ; $17
tradeanim_ot_bids_farewell: macro tradeanim_ot_bids_farewell: MACRO
db tradeanim_ot_bids_farewell_command db tradeanim_ot_bids_farewell_command
endm endm
enum tradeanim_take_care_of_text_command ; $18 enum tradeanim_take_care_of_text_command ; $18
tradeanim_take_care_of_text: macro tradeanim_take_care_of_text: MACRO
db tradeanim_take_care_of_text_command db tradeanim_take_care_of_text_command
endm endm
enum tradeanim_ot_sends_text_1_command ; $19 enum tradeanim_ot_sends_text_1_command ; $19
tradeanim_ot_sends_text_1: macro tradeanim_ot_sends_text_1: MACRO
db tradeanim_ot_sends_text_1_command db tradeanim_ot_sends_text_1_command
endm endm
enum tradeanim_ot_sends_text_2_command ; $1a enum tradeanim_ot_sends_text_2_command ; $1a
tradeanim_ot_sends_text_2: macro tradeanim_ot_sends_text_2: MACRO
db tradeanim_ot_sends_text_2_command db tradeanim_ot_sends_text_2_command
endm endm
enum tradeanim_setup_givemon_scroll_command ; $1b enum tradeanim_setup_givemon_scroll_command ; $1b
tradeanim_setup_givemon_scroll: macro tradeanim_setup_givemon_scroll: MACRO
db tradeanim_setup_givemon_scroll_command db tradeanim_setup_givemon_scroll_command
endm endm
enum tradeanim_do_givemon_scroll_command ; $1c enum tradeanim_do_givemon_scroll_command ; $1c
tradeanim_do_givemon_scroll: macro tradeanim_do_givemon_scroll: MACRO
db tradeanim_do_givemon_scroll_command db tradeanim_do_givemon_scroll_command
endm endm
enum tradeanim_frontpic_scroll_command ; $1d enum tradeanim_frontpic_scroll_command ; $1d
tradeanim_frontpic_scroll: macro tradeanim_frontpic_scroll: MACRO
db tradeanim_frontpic_scroll_command db tradeanim_frontpic_scroll_command
endm endm
enum tradeanim_textbox_scroll_command ; $1e enum tradeanim_textbox_scroll_command ; $1e
tradeanim_textbox_scroll: macro tradeanim_textbox_scroll: MACRO
db tradeanim_textbox_scroll_command db tradeanim_textbox_scroll_command
endm endm
enum tradeanim_scroll_out_right_command ; $1f enum tradeanim_scroll_out_right_command ; $1f
tradeanim_scroll_out_right: macro tradeanim_scroll_out_right: MACRO
db tradeanim_scroll_out_right_command db tradeanim_scroll_out_right_command
endm endm
__enum__ set $21 __enum__ set $21
enum tradeanim_wait_80_command ; $21 enum tradeanim_wait_80_command ; $21
tradeanim_wait_80: macro tradeanim_wait_80: MACRO
db tradeanim_wait_80_command db tradeanim_wait_80_command
endm endm
enum tradeanim_wait_40_command ; $22 enum tradeanim_wait_40_command ; $22
tradeanim_wait_40: macro tradeanim_wait_40: MACRO
db tradeanim_wait_40_command db tradeanim_wait_40_command
endm endm
enum tradeanim_rocking_ball_command ; $23 enum tradeanim_rocking_ball_command ; $23
tradeanim_rocking_ball: macro tradeanim_rocking_ball: MACRO
db tradeanim_rocking_ball_command db tradeanim_rocking_ball_command
endm endm
enum tradeanim_drop_ball_command ; $24 enum tradeanim_drop_ball_command ; $24
tradeanim_drop_ball: macro tradeanim_drop_ball: MACRO
db tradeanim_drop_ball_command db tradeanim_drop_ball_command
endm endm
enum tradeanim_wait_anim_command ; $25 enum tradeanim_wait_anim_command ; $25
tradeanim_wait_anim: macro tradeanim_wait_anim: MACRO
db tradeanim_wait_anim_command db tradeanim_wait_anim_command
endm endm
__enum__ set $27 __enum__ set $27
enum tradeanim_poof_command ; $27 enum tradeanim_poof_command ; $27
tradeanim_poof: macro tradeanim_poof: MACRO
db tradeanim_poof_command db tradeanim_poof_command
endm endm
enum tradeanim_bulge_through_tube_command ; $28 enum tradeanim_bulge_through_tube_command ; $28
tradeanim_bulge_through_tube: macro tradeanim_bulge_through_tube: MACRO
db tradeanim_bulge_through_tube_command db tradeanim_bulge_through_tube_command
endm endm
enum tradeanim_give_trademon_sfx_command ; $29 enum tradeanim_give_trademon_sfx_command ; $29
tradeanim_give_trademon_sfx: macro tradeanim_give_trademon_sfx: MACRO
db tradeanim_give_trademon_sfx_command db tradeanim_give_trademon_sfx_command
endm endm
enum tradeanim_get_trademon_sfx_command ; $2a enum tradeanim_get_trademon_sfx_command ; $2a
tradeanim_get_trademon_sfx: macro tradeanim_get_trademon_sfx: MACRO
db tradeanim_get_trademon_sfx_command db tradeanim_get_trademon_sfx_command
endm endm
enum tradeanim_end_command ; $2b enum tradeanim_end_command ; $2b
tradeanim_end: macro tradeanim_end: MACRO
db tradeanim_end_command db tradeanim_end_command
endm endm
enum tradeanim_animate_frontpic_command ; $2c enum tradeanim_animate_frontpic_command ; $2c
tradeanim_animate_frontpic: macro tradeanim_animate_frontpic: MACRO
db tradeanim_animate_frontpic_command db tradeanim_animate_frontpic_command
endm endm
enum tradeanim_wait_96_command ; $2d enum tradeanim_wait_96_command ; $2d
tradeanim_wait_96: macro tradeanim_wait_96: MACRO
db tradeanim_wait_96_command db tradeanim_wait_96_command
endm endm
enum tradeanim_wait_80_if_ot_egg_command ; $2e enum tradeanim_wait_80_if_ot_egg_command ; $2e
tradeanim_wait_80_if_ot_egg: macro tradeanim_wait_80_if_ot_egg: MACRO
db tradeanim_wait_80_if_ot_egg_command db tradeanim_wait_80_if_ot_egg_command
endm endm
enum tradeanim_wait_180_if_ot_egg_command ; $2f enum tradeanim_wait_180_if_ot_egg_command ; $2f
tradeanim_wait_180_if_ot_egg: macro tradeanim_wait_180_if_ot_egg: MACRO
db tradeanim_wait_180_if_ot_egg_command db tradeanim_wait_180_if_ot_egg_command
endm endm
@ -171,85 +171,85 @@ endm
enum_start $01 enum_start $01
enum mobiletradeanim_showgivemon_command ; $01 enum mobiletradeanim_showgivemon_command ; $01
mobiletradeanim_showgivemon: macro mobiletradeanim_showgivemon: MACRO
db mobiletradeanim_showgivemon_command db mobiletradeanim_showgivemon_command
endm endm
enum mobiletradeanim_02_command ; $02 enum mobiletradeanim_02_command ; $02
mobiletradeanim_02: macro mobiletradeanim_02: MACRO
db mobiletradeanim_02_command db mobiletradeanim_02_command
endm endm
enum mobiletradeanim_sendmon_command ; $03 enum mobiletradeanim_sendmon_command ; $03
mobiletradeanim_sendmon: macro mobiletradeanim_sendmon: MACRO
db mobiletradeanim_sendmon_command db mobiletradeanim_sendmon_command
endm endm
__enum__ set $05 __enum__ set $05
enum mobiletradeanim_05_command ; $05 enum mobiletradeanim_05_command ; $05
mobiletradeanim_05: macro mobiletradeanim_05: MACRO
db mobiletradeanim_05_command db mobiletradeanim_05_command
endm endm
enum mobiletradeanim_06_command ; $06 enum mobiletradeanim_06_command ; $06
mobiletradeanim_06: macro mobiletradeanim_06: MACRO
db mobiletradeanim_06_command db mobiletradeanim_06_command
endm endm
enum mobiletradeanim_07_command ; $07 enum mobiletradeanim_07_command ; $07
mobiletradeanim_07: macro mobiletradeanim_07: MACRO
db mobiletradeanim_07_command db mobiletradeanim_07_command
endm endm
enum mobiletradeanim_receivemon_command ; $08 enum mobiletradeanim_receivemon_command ; $08
mobiletradeanim_receivemon: macro mobiletradeanim_receivemon: MACRO
db mobiletradeanim_receivemon_command db mobiletradeanim_receivemon_command
endm endm
__enum__ set $0b __enum__ set $0b
enum mobiletradeanim_showgetmon_command ; $0b enum mobiletradeanim_showgetmon_command ; $0b
mobiletradeanim_showgetmon: macro mobiletradeanim_showgetmon: MACRO
db mobiletradeanim_showgetmon_command db mobiletradeanim_showgetmon_command
endm endm
enum mobiletradeanim_end_command ; $0c enum mobiletradeanim_end_command ; $0c
mobiletradeanim_end: macro mobiletradeanim_end: MACRO
db mobiletradeanim_end_command db mobiletradeanim_end_command
endm endm
enum mobiletradeanim_showgtsgivemon_command ; $0d enum mobiletradeanim_showgtsgivemon_command ; $0d
mobiletradeanim_showgtsgivemon: macro mobiletradeanim_showgtsgivemon: MACRO
db mobiletradeanim_showgtsgivemon_command db mobiletradeanim_showgtsgivemon_command
endm endm
enum mobiletradeanim_showgtsgetmon_command ; $0e enum mobiletradeanim_showgtsgetmon_command ; $0e
mobiletradeanim_showgtsgetmon: macro mobiletradeanim_showgtsgetmon: MACRO
db mobiletradeanim_showgtsgetmon_command db mobiletradeanim_showgtsgetmon_command
endm endm
enum mobiletradeanim_0f_command ; $0f enum mobiletradeanim_0f_command ; $0f
mobiletradeanim_0f: macro mobiletradeanim_0f: MACRO
db mobiletradeanim_0f_command db mobiletradeanim_0f_command
endm endm
enum mobiletradeanim_10_command ; $10 enum mobiletradeanim_10_command ; $10
mobiletradeanim_10: macro mobiletradeanim_10: MACRO
db mobiletradeanim_10_command db mobiletradeanim_10_command
endm endm
enum mobiletradeanim_11_command ; $11 enum mobiletradeanim_11_command ; $11
mobiletradeanim_11: macro mobiletradeanim_11: MACRO
db mobiletradeanim_11_command db mobiletradeanim_11_command
endm endm
enum mobiletradeanim_12_command ; $12 enum mobiletradeanim_12_command ; $12
mobiletradeanim_12: macro mobiletradeanim_12: MACRO
db mobiletradeanim_12_command db mobiletradeanim_12_command
endm endm
enum mobiletradeanim_showoddegg_command ; $13 enum mobiletradeanim_showoddegg_command ; $13
mobiletradeanim_showoddegg: macro mobiletradeanim_showoddegg: MACRO
db mobiletradeanim_showoddegg_command db mobiletradeanim_showoddegg_command
endm endm

2
macros/wram.asm
View File

@ -211,7 +211,7 @@ roam_struct: MACRO
\1DVs:: dw \1DVs:: dw
ENDM ENDM
bugcontestwinner: macro bugcontestwinner: MACRO
\1WinnerID:: db \1WinnerID:: db
\1Mon:: db \1Mon:: db
\1Score:: dw \1Score:: dw

4
maps/GoldenrodUndergroundSwitchRoomEntrances.asm
View File

@ -4,7 +4,7 @@ UNDERGROUND_DOOR_CLOSED3 EQU $3f
UNDERGROUND_DOOR_OPEN1 EQU $2d UNDERGROUND_DOOR_OPEN1 EQU $2d
UNDERGROUND_DOOR_OPEN2 EQU $3d UNDERGROUND_DOOR_OPEN2 EQU $3d
ugdoor: macro ugdoor: MACRO
\1_YCOORD EQU \2 \1_YCOORD EQU \2
\1_XCOORD EQU \3 \1_XCOORD EQU \3
endm endm
@ -26,7 +26,7 @@ endm
ugdoor UGDOOR_15, $12, $0a ugdoor UGDOOR_15, $12, $0a
ugdoor UGDOOR_16, $12, $0c ugdoor UGDOOR_16, $12, $0c
doorstate: macro doorstate: MACRO
changeblock UGDOOR_\1_YCOORD, UGDOOR_\1_XCOORD, UNDERGROUND_DOOR_\2 changeblock UGDOOR_\1_YCOORD, UGDOOR_\1_XCOORD, UNDERGROUND_DOOR_\2
endm endm

2
maps/map_headers.asm
View File

@ -1,4 +1,4 @@
map_header: macro map_header: MACRO
;\1: map label ;\1: map label
;\2: tileset: a TILESET_* constant ;\2: tileset: a TILESET_* constant
;\3: environment: TOWN, ROUTE, INDOOR, CAVE, ENVIRONMENT_5, GATE, or DUNGEON ;\3: environment: TOWN, ROUTE, INDOOR, CAVE, ENVIRONMENT_5, GATE, or DUNGEON

4
maps/second_map_headers.asm
View File

@ -1,4 +1,4 @@
map_header_2: macro map_header_2: MACRO
;\1: map label ;\1: map label
;\2: map id ;\2: map id
;\3: border block ;\3: border block
@ -14,7 +14,7 @@ map_header_2: macro
db \4 db \4
endm endm
connection: macro connection: MACRO
if "\1" == "north" if "\1" == "north"
;\2: map id ;\2: map id
;\3: map label (eventually will be rolled into map id) ;\3: map label (eventually will be rolled into map id)

4
mobile/fixed_words.asm
View File

@ -4209,7 +4209,7 @@ MobileEZChatCategoryPointers: ; 11daac
; 11f220 ; 11f220
MobileEZChatData_WordAndPageCounts: MobileEZChatData_WordAndPageCounts:
macro_11f220: macro macro_11f220: MACRO
; parameter: number of words ; parameter: number of words
db \1 db \1
; 12 words per page (0-based indexing) ; 12 words per page (0-based indexing)
@ -4240,7 +4240,7 @@ EZChat_SortedWords:
; allocated size for each. ; allocated size for each.
; These arrays are expanded dynamically to accomodate ; These arrays are expanded dynamically to accomodate
; any Pokemon you've seen that starts with each kana.\ ; any Pokemon you've seen that starts with each kana.\
macro_11f23c: macro macro_11f23c: MACRO
dw x - w3_d000, \1 dw x - w3_d000, \1
x = x + 2 * \1 x = x + 2 * \1
endm endm

2
tilesets/tilesets.asm
View File

@ -1,4 +1,4 @@
tileset: macro tileset: MACRO
dba \1GFX, \1Meta, \1Coll dba \1GFX, \1Meta, \1Coll
dw \1Anim dw \1Anim
dw NULL dw NULL