endm -> ENDM

This commit is contained in:
xCrystal 2017-12-28 22:31:16 +01:00
parent 43a1e5b5ba
commit 50fc9c3389
42 changed files with 464 additions and 464 deletions

View File

@ -57,7 +57,7 @@ const_value = 1
deco: MACRO deco: MACRO
const DECO_\1 const DECO_\1
enum DECOFLAG_\1 enum DECOFLAG_\1
endm ENDM
; decorations: ; decorations:
; - DecorationAttributes (see data/decorations/attributes.asm) ; - DecorationAttributes (see data/decorations/attributes.asm)

View File

@ -1,7 +1,7 @@
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
@ -11,7 +11,7 @@ GROUP_\1 EQU const_value
enum MAP_\1 enum MAP_\1
\1_HEIGHT EQU \2 \1_HEIGHT EQU \2
\1_WIDTH EQU \3 \1_WIDTH EQU \3
endm ENDM
; map group ids ; map group ids
; `newgroup` indexes are for: ; `newgroup` indexes are for:

View File

@ -14,7 +14,7 @@ battleanimobj: MACRO
db \4 ; callback db \4 ; callback
db \5 ; palette db \5 ; palette
db \6 ; tile offset db \6 ; tile offset
endm ENDM
BattleAnimObjects: ; ccb56 BattleAnimObjects: ; ccb56
; entries correspond to ANIM_OBJ_* constants ; entries correspond to ANIM_OBJ_* constants

View File

@ -1,7 +1,7 @@
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
SpriteMovementData:: ; 4273 SpriteMovementData:: ; 4273
; entries correspond to SPRITEMOVEDATA_* constants ; entries correspond to SPRITEMOVEDATA_* constants

View File

@ -1,7 +1,7 @@
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
OddEggProbabilities: OddEggProbabilities:
prob_total = 0 prob_total = 0

View File

@ -12,7 +12,7 @@ rept _NARG / 2
shift shift
shift shift
endr endr
endm ENDM
; gfx/pokegear/town_map.png ; gfx/pokegear/town_map.png
townmappals EARTH, EARTH, EARTH, MOUNTAIN, MOUNTAIN, MOUNTAIN townmappals EARTH, EARTH, EARTH, MOUNTAIN, MOUNTAIN, MOUNTAIN

View File

@ -6,7 +6,7 @@ phone: MACRO
dba \5 dba \5
db \6 db \6
dba \7 dba \7
endm ENDM
PhoneContacts: ; 9045f PhoneContacts: ; 9045f
; entries correspond to PHONE_* constants ; entries correspond to PHONE_* constants

View File

@ -3,7 +3,7 @@ specialcall: MACRO
dw \1 dw \1
db \2 db \2
dba \3 dba \3
endm ENDM
SpecialPhoneCallList: ; 90627 SpecialPhoneCallList: ; 90627
; entries correspond to SPECIALCALL_* constants ; entries correspond to SPECIALCALL_* constants

View File

@ -5,7 +5,7 @@ x = 1
x = x + 1 x = x + 1
endr endr
db -1 db -1
endm ENDM
UnownWords: ; fba5a UnownWords: ; fba5a
; entries correspond to Unown forms ; entries correspond to Unown forms

View File

@ -10,7 +10,7 @@ rept \2
shift shift
endr endr
db 0 db 0
endm ENDM
RoamMaps: ; 2a40f RoamMaps: ; 2a40f
roam_map ROUTE_29, 2, ROUTE_30, ROUTE_46 roam_map ROUTE_29, 2, ROUTE_30, ROUTE_46

View File

@ -1,7 +1,7 @@
treemon_map: MACRO treemon_map: MACRO
map \1 map \1
db \2 ; treemon set db \2 ; treemon set
endm ENDM
TreeMonMaps: ; b825e TreeMonMaps: ; b825e
treemon_map ROUTE_26, 4 treemon_map ROUTE_26, 4

View File

@ -832,7 +832,7 @@ 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
endm ENDM
zoombox 4, 2, 8, 8 zoombox 4, 2, 8, 8
zoombox 6, 4, 7, 7 zoombox 6, 4, 7, 7
zoombox 8, 6, 6, 6 zoombox 8, 6, 6, 6

View File

@ -871,7 +871,7 @@ BattleBGEffect_RunPicResizeScript: ; c83ed (32:43ed)
bgsquare: MACRO bgsquare: MACRO
dn \1, \2 dn \1, \2
dw \3 dw \3
endm ENDM
bgsquare 6, 6, .SixBySix bgsquare 6, 6, .SixBySix
bgsquare 4, 4, .FourByFour bgsquare 4, 4, .FourByFour

View File

@ -1450,7 +1450,7 @@ ENDC
ld a, [wd004] ld a, [wd004]
inc a inc a
ld [wBillsPC_NumMonsInBox], a ld [wBillsPC_NumMonsInBox], a
endm ENDM
CopyBoxmonSpecies: ; e2d30 (38:6d30) CopyBoxmonSpecies: ; e2d30 (38:6d30)
xor a xor a

View File

@ -1413,7 +1413,7 @@ else
dbpixel \1, \2 dbpixel \1, \2
dw \3 dw \3
endc endc
endm ENDM
cardflip_cursor 11, 2, .Impossible cardflip_cursor 11, 2, .Impossible
cardflip_cursor 12, 2, .Impossible cardflip_cursor 12, 2, .Impossible

View File

@ -178,7 +178,7 @@ endc
shift shift
endr endr
db $ff db $ff
endm ENDM
.UnownText_Escape: .UnownText_Escape:
; db $08, $44, $04, $00, $2e, $08, $ff ; db $08, $44, $04, $00, $2e, $08, $ff

View File

@ -105,7 +105,7 @@ x = x +- \2
endr endr
y = y + 1 y = y + 1
endr endr
endm ENDM
UnownPrinter_OverworldMapRectangle: ; e008b UnownPrinter_OverworldMapRectangle: ; e008b
overworldmaprect 7, 7 overworldmaprect 7, 7

View File

@ -144,7 +144,7 @@ SetUpPokeAnim: ; d00b4
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
setup_command PokeAnim_BasePic setup_command PokeAnim_BasePic
setup_command PokeAnim_SetWait setup_command PokeAnim_SetWait
@ -586,7 +586,7 @@ x = x + 1
endr endr
y = y + 7 y = y + 7
endr endr
endm ENDM
PokeAnim_ConvertAndApplyBitmask: ; d036b PokeAnim_ConvertAndApplyBitmask: ; d036b
xor a xor a

View File

@ -120,7 +120,7 @@ rept _NARG / 2
shift shift
shift shift
endr endr
endm ENDM
initpuzcoord 0,0, 0,1, 0,2, 0,3, 0,4, 0,5 initpuzcoord 0,0, 0,1, 0,2, 0,3, 0,4, 0,5
initpuzcoord 1,0, 1,5 initpuzcoord 1,0, 1,5
initpuzcoord 2,0, 2,5 initpuzcoord 2,0, 2,5
@ -603,7 +603,7 @@ 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
endm ENDM
; OAM coords, tilemap coords, vacant tile, filler ; OAM coords, tilemap coords, vacant tile, filler
puzzle_coords 3, 3, 4, 4, 1, 0, PUZZLE_BORDER, 0 puzzle_coords 3, 3, 4, 4, 1, 0, PUZZLE_BORDER, 0
puzzle_coords 6, 3, 4, 4, 4, 0, PUZZLE_BORDER, 0 puzzle_coords 6, 3, 4, 4, 4, 0, PUZZLE_BORDER, 0

View File

@ -207,14 +207,14 @@ else
cp \1 cp \1
endc 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
._\@: ._\@:
endm ENDM
dict "<DAY>", Char15 dict "<DAY>", Char15
dict "<LINE>", LineChar dict "<LINE>", LineChar
@ -313,7 +313,7 @@ print_name: MACRO
push de push de
ld de, \1 ld de, \1
jp PlaceCommandCharacter jp PlaceCommandCharacter
endm ENDM
PrintMomsName: print_name MomsName ; 1186 PrintMomsName: print_name MomsName ; 1186
PrintPlayerName: print_name PlayerName ; 118d PrintPlayerName: print_name PlayerName ; 118d

View File

@ -4,7 +4,7 @@ define: MACRO
if !def(\1) if !def(\1)
\1 EQUS \2 \1 EQUS \2
endc endc
endm ENDM
const_value = 0 const_value = 0

View File

@ -89,7 +89,7 @@ if _NARG >= 4
else else
db \1 * 8, \2 * 8 db \1 * 8, \2 * 8
endc endc
endm ENDM
dsprite: MACRO dsprite: MACRO
; conditional segment is there because not every instance of ; conditional segment is there because not every instance of
@ -99,7 +99,7 @@ if _NARG >= 7 ; y tile, y pxl, x tile, x pxl, vtile offset, flags, palette
else else
db (\1 * 8) % $100 + \2, (\3 * 8) % $100 + \4, \5, \6 db (\1 * 8) % $100 + \2, (\3 * 8) % $100 + \4, \5, \6
endc endc
endm ENDM
sine_wave: MACRO sine_wave: MACRO

View File

@ -11,16 +11,16 @@ __enumdir__ = \2
else else
__enumdir__ = +1 __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
; Enumerate constants ; Enumerate constants

View File

@ -1,7 +1,7 @@
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
note: MACRO note: MACRO
dn (\1), (\2) - 1 dn (\1), (\2) - 1
@ -11,13 +11,13 @@ 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
endm ENDM
; MusicCommands indexes (see audio/engine.asm) ; MusicCommands indexes (see audio/engine.asm)
enum_start $d8 enum_start $d8
@ -25,7 +25,7 @@ noise: MACRO
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
@ -33,37 +33,37 @@ notetype: MACRO
if _NARG >= 2 if _NARG >= 2
db \2 ; intensity db \2 ; intensity
endc endc
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
@ -73,193 +73,193 @@ sound_duty: MACRO
else else
db \1 ; one-byte duty value for legacy support db \1 ; one-byte duty value for legacy support
endc endc
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

View File

@ -3,7 +3,7 @@ if \1 >= $d0
flip out flip out
endc endc
db \1 db \1
endm ENDM
; BattleAnimCommands indexes (see engine/battle_anims/anim_commands.asm) ; BattleAnimCommands indexes (see engine/battle_anims/anim_commands.asm)
enum_start $d0 enum_start $d0
@ -15,20 +15,20 @@ anim_obj: MACRO
db (\2 << 3) + \3 ; x db (\2 << 3) + \3 ; x
db (\4 << 3) + \5 ; y db (\4 << 3) + \5 ; y
db \6 ; param db \6 ; param
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
@ -36,7 +36,7 @@ anim_3gfx: MACRO
db \1 ; gfx1 db \1 ; gfx1
db \2 ; gfx2 db \2 ; gfx2
db \3 ; gfx3 db \3 ; gfx3
endm ENDM
enum anim_4gfx_command ; $d4 enum anim_4gfx_command ; $d4
anim_4gfx: MACRO anim_4gfx: MACRO
@ -45,7 +45,7 @@ anim_4gfx: MACRO
db \2 ; gfx2 db \2 ; gfx2
db \3 ; gfx3 db \3 ; gfx3
db \4 ; gfx4 db \4 ; gfx4
endm ENDM
enum anim_5gfx_command ; $d5 enum anim_5gfx_command ; $d5
anim_5gfx: MACRO anim_5gfx: MACRO
@ -55,147 +55,147 @@ anim_5gfx: MACRO
db \3 ; gfx3 db \3 ; gfx3
db \4 ; gfx4 db \4 ; gfx4
db \5 ; gfx5 db \5 ; gfx5
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
@ -204,91 +204,91 @@ anim_bgeffect: MACRO
db \2 ; unknown db \2 ; unknown
db \3 ; unknown db \3 ; unknown
db \4 ; unknown db \4 ; unknown
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

View File

@ -1,7 +1,7 @@
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)
enum_start 1 enum_start 1

File diff suppressed because it is too large Load Diff

View File

@ -10,35 +10,35 @@ x = x | (1 << (\3 + 1))
endr endr
endc endc
db x db x
endm ENDM
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

View File

@ -1,13 +1,13 @@
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
@ -16,7 +16,7 @@ warp_def: MACRO
;\4: map id: from constants/map_constants.asm ;\4: map id: from constants/map_constants.asm
db \1, \2, \3 db \1, \2, \3
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
@ -26,7 +26,7 @@ coord_event: MACRO
db \1, \2, \3, $0 db \1, \2, \3, $0
dw \4 dw \4
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
@ -35,7 +35,7 @@ bg_event: MACRO
;\4: script pointer ;\4: script pointer
db \1, \2, \3 db \1, \2, \3
dw \4 dw \4
endm ENDM
object_event: MACRO object_event: MACRO
;\1: sprite: a SPRITE_* constant ;\1: sprite: a SPRITE_* constant
@ -65,7 +65,7 @@ object_event: MACRO
dw \9 dw \9
shift shift
dw \9 dw \9
endm ENDM
trainer: MACRO trainer: MACRO
@ -79,7 +79,7 @@ trainer: MACRO
dw \1 dw \1
db \2, \3 db \2, \3
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
@ -89,7 +89,7 @@ if _NARG == 2
else else
db \1, 1 db \1, 1
endc endc
endm ENDM
elevfloor: MACRO elevfloor: MACRO
;\1: floor: a FLOOR_* constant ;\1: floor: a FLOOR_* constant
@ -105,4 +105,4 @@ stonetable: MACRO
;\3: script pointer ;\3: script pointer
db \1, \2 db \1, \2
dw \3 dw \3
endm ENDM

View File

@ -6,98 +6,98 @@
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
__enum__ = __enum__ + 3 __enum__ = __enum__ + 3
@ -105,32 +105,32 @@ __enum__ = __enum__ + 3
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
@ -141,106 +141,106 @@ if \1 <= 8
else else
db movement_step_sleep + 8, \1 db movement_step_sleep + 8, \1
endc endc
endm 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

View File

@ -39,91 +39,91 @@ text_box: MACRO
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
enum TX_FAR ; $16 enum TX_FAR ; $16
text_jump: MACRO text_jump: MACRO

View File

@ -4,167 +4,167 @@
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
; Mobile ; Mobile
@ -173,83 +173,83 @@ endm
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

View File

@ -8,8 +8,8 @@ rept (_NARG +- 1) / 2
shift shift
shift shift
endr endr
endm ENDM
tilecoll: MACRO tilecoll: MACRO
db COLL_\1, COLL_\2, COLL_\3, COLL_\4 db COLL_\1, COLL_\2, COLL_\3, COLL_\4
endm ENDM

View File

@ -189,7 +189,7 @@ battle_tower_struct: MACRO
\1Pkmn3NameEnd:: \1Pkmn3NameEnd::
\1TrainerData:: ds BATTLETOWER_TRAINERDATALENGTH \1TrainerData:: ds BATTLETOWER_TRAINERDATALENGTH
\1TrainerEnd:: \1TrainerEnd::
endm ENDM
mailmsg: MACRO mailmsg: MACRO
\1Message:: ds MAIL_MSG_LENGTH \1Message:: ds MAIL_MSG_LENGTH
@ -200,7 +200,7 @@ mailmsg: MACRO
\1Species:: db \1Species:: db
\1Type:: db \1Type:: db
\1End:: \1End::
endm ENDM
roam_struct: MACRO roam_struct: MACRO
\1Species:: db \1Species:: db
@ -215,7 +215,7 @@ bugcontestwinner: MACRO
\1WinnerID:: db \1WinnerID:: db
\1Mon:: db \1Mon:: db
\1Score:: dw \1Score:: dw
endm ENDM
hof_mon: MACRO hof_mon: MACRO
\1Species:: db \1Species:: db
@ -224,7 +224,7 @@ hof_mon: MACRO
\1Level:: db \1Level:: db
\1Nickname:: ds PKMN_NAME_LENGTH +- 1 \1Nickname:: ds PKMN_NAME_LENGTH +- 1
\1End:: \1End::
endm ENDM
hall_of_fame: MACRO hall_of_fame: MACRO
\1WinCount:: db \1WinCount:: db
@ -265,7 +265,7 @@ move_struct: MACRO
\1Accuracy:: db \1Accuracy:: db
\1PP:: db \1PP:: db
\1EffectChance:: db \1EffectChance:: db
endm ENDM
slot_reel: MACRO slot_reel: MACRO
\1ReelAction:: db \1ReelAction:: db
@ -282,7 +282,7 @@ slot_reel: MACRO
\1Slot0d:: ds 1 \1Slot0d:: ds 1
\1Slot0e:: ds 1 \1Slot0e:: ds 1
\1StopDelay:: db \1StopDelay:: db
endm ENDM
object_struct: MACRO object_struct: MACRO
\1Struct:: \1Struct::
@ -337,7 +337,7 @@ map_object: MACRO
\1ObjectScript:: dw \1ObjectScript:: dw
\1ObjectEventFlag:: dw \1ObjectEventFlag:: dw
ds 2 ds 2
endm ENDM
sprite_anim_struct: MACRO sprite_anim_struct: MACRO
\1Index:: db \1Index:: db
@ -384,11 +384,11 @@ battle_anim_struct: MACRO
\1_Anim15:: ds 1 \1_Anim15:: ds 1
\1_Anim16:: ds 1 \1_Anim16:: ds 1
\1_Anim17:: ds 1 \1_Anim17:: ds 1
endm ENDM
battle_bg_effect: MACRO battle_bg_effect: MACRO
\1_Function:: db \1_Function:: db
\1_01:: ds 1 \1_01:: ds 1
\1_02:: ds 1 \1_02:: ds 1
\1_03:: ds 1 \1_03:: ds 1
endm ENDM

View File

@ -7,7 +7,7 @@ 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
ugdoor UGDOOR_1, $10, $06 ugdoor UGDOOR_1, $10, $06
ugdoor UGDOOR_2, $0a, $06 ugdoor UGDOOR_2, $0a, $06
@ -28,7 +28,7 @@ endm
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
const_value set 2 const_value set 2
const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_PHARMACIST1 const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_PHARMACIST1

View File

@ -13,7 +13,7 @@ map_header: MACRO
db \4, \5 db \4, \5
dn \6, \7 dn \6, \7
db \8 db \8
endm ENDM
MapGroupPointers:: MapGroupPointers::
; pointers to the first map header of each map group ; pointers to the first map header of each map group

View File

@ -12,7 +12,7 @@ map_header_2: MACRO
dw \1_MapScriptHeader dw \1_MapScriptHeader
dw \1_MapEventHeader dw \1_MapEventHeader
db \4 db \4
endm ENDM
connection: MACRO connection: MACRO
if "\1" == "north" if "\1" == "north"
@ -82,7 +82,7 @@ if "\1" == "east"
db 0 db 0
dw OverworldMap + \2_WIDTH + 7 dw OverworldMap + \2_WIDTH + 7
endc endc
endm ENDM
map_header_2 NewBarkTown, NEW_BARK_TOWN, $5, WEST | EAST map_header_2 NewBarkTown, NEW_BARK_TOWN, $5, WEST | EAST

View File

@ -4218,7 +4218,7 @@ if \1 % 12 == 0
x = x +- 1 x = x +- 1
endc endc
db x db x
endm ENDM
macro_11f220 18 ; 01: Types macro_11f220 18 ; 01: Types
macro_11f220 36 ; 02: Greetings macro_11f220 36 ; 02: Greetings
macro_11f220 69 ; 03: People macro_11f220 69 ; 03: People
@ -4243,7 +4243,7 @@ EZChat_SortedWords:
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
x = $d012 x = $d012
macro_11f23c $2f ; a macro_11f23c $2f ; a
macro_11f23c $1e ; i macro_11f23c $1e ; i

View File

@ -3,7 +3,7 @@ tileset: MACRO
dw \1Anim dw \1Anim
dw NULL dw NULL
dw \1PalMap dw \1PalMap
endm ENDM
Tilesets:: ; 4d596 Tilesets:: ; 4d596
; entries correspond to TILESET_* constants ; entries correspond to TILESET_* constants