More comments for macros

This commit is contained in:
Remy Oukaour 2017-12-15 00:38:52 -05:00
parent 28aec67f6e
commit fecc5c339a
10 changed files with 687 additions and 687 deletions

View File

@ -227,42 +227,42 @@ dict2: macro
._\@: ._\@:
endm endm
dict "<DAY>", Char15 dict "<DAY>", Char15
dict "<LINE>", LineChar dict "<LINE>", LineChar
dict "<NEXT>", NextLineChar dict "<NEXT>", NextLineChar
dict TX_FAR, TextFar dict TX_FAR, TextFar
dict $00, NullChar dict $00, NullChar
dict $4c, Char4C dict $4c, Char4C
dict $4b, Char4B dict $4b, Char4B
dict "<PARA>", Paragraph dict "<PARA>", Paragraph
dict "<MOM>", PrintMomsName dict "<MOM>", PrintMomsName
dict "<PLAYER>", PrintPlayerName dict "<PLAYER>", PrintPlayerName
dict "<RIVAL>", PrintRivalName dict "<RIVAL>", PrintRivalName
dict $35, Char35 dict $35, Char35
dict $36, Char36 dict $36, Char36
dict $37, Char37 dict $37, Char37
dict "<RED>", PrintRedsName dict "<RED>", PrintRedsName
dict "<GREEN>", PrintGreensName dict "<GREEN>", PrintGreensName
dict "#", PlacePOKe dict "#", PlacePOKe
dict "<PC>", PCChar dict "<PC>", PCChar
dict "<ROCKET>", RocketChar dict "<ROCKET>", RocketChar
dict "<TM>", TMChar dict "<TM>", TMChar
dict "<TRNER>", TrainerChar dict "<TRNER>", TrainerChar
dict $23, PlaceKougeki dict "<KOUGEKI>", PlaceKougeki
dict "<LNBRK>", Char22 dict "<LNBRK>", Char22
dict "<CONT>", ContText dict "<CONT>", ContText
dict "<......>", SixDotsChar dict "<......>", SixDotsChar
dict "<DONE>", DoneText dict "<DONE>", DoneText
dict "<PROMPT>", PromptText dict "<PROMPT>", PromptText
dict "<PKMN>", PlacePKMN dict "<PKMN>", PlacePKMN
dict "<POKE>", PlacePOKE dict "<POKE>", PlacePOKE
dict $25, NextChar dict "%", NextChar
dict2 $1f, " " dict2 "¯", " "
dict "<DEXEND>", PlaceDexEnd dict "<DEXEND>", PlaceDexEnd
dict "<TARGET>", PlaceMoveTargetsName dict "<TARGET>", PlaceMoveTargetsName
dict "<USER>", PlaceMoveUsersName dict "<USER>", PlaceMoveUsersName
dict "<ENEMY>", PlaceEnemysName dict "<ENEMY>", PlaceEnemysName
dict "<PLAY_G>", PlaceGenderedPlayerName dict "<PLAY_G>", PlaceGenderedPlayerName
cp "゚" cp "゚"
jr z, .place ; should be .diacritic jr z, .place ; should be .diacritic

View File

@ -1,208 +1,209 @@
; Control characters ; Control characters
charmap "<START>", $00 charmap "<START>", $00
charmap "<PLAY_G>", $14 ; gendered PlayerName; same as "<PLAYER>" in English charmap "<PLAY_G>", $14 ; gendered PlayerName; same as "<PLAYER>" in English
charmap "<DAY>", $15 charmap "<DAY>", $15
charmap "¯", $1f ; soft linebreak charmap "¯", $1f ; soft linebreak
charmap "<LNBRK>", $22 charmap "<LNBRK>", $22
charmap "<POKE>", $24 ; "<PO><KE>" charmap "<KOUGEKI>", $23 ; "こうげき"
charmap "%", $25 charmap "<POKE>", $24 ; "<PO><KE>"
charmap "<RED>", $38 ; RedsName charmap "%", $25
charmap "<GREEN>", $39 ; GreensName charmap "<RED>", $38 ; RedsName
charmap "<ENEMY>", $3f charmap "<GREEN>", $39 ; GreensName
charmap "<MOM>", $49 ; MomsName charmap "<ENEMY>", $3f
charmap "<PKMN>", $4a ; "<PK><MN>" charmap "<MOM>", $49 ; MomsName
charmap "<NEXT>", $4e charmap "<PKMN>", $4a ; "<PK><MN>"
charmap "<LINE>", $4f charmap "<NEXT>", $4e
charmap "<LINE>", $4f
charmap "@", $50 charmap "@", $50 ; string terminator
charmap "<PARA>", $51 charmap "<PARA>", $51
charmap "<PLAYER>", $52 ; PlayerName charmap "<PLAYER>", $52 ; PlayerName
charmap "<RIVAL>", $53 charmap "<RIVAL>", $53
charmap "#", $54 charmap "#", $54 ; "POKé"
charmap "<CONT>", $55 charmap "<CONT>", $55
charmap "<......>", $56 ; "……" charmap "<......>", $56 ; "……"
charmap "<DONE>", $57 charmap "<DONE>", $57
charmap "<PROMPT>", $58 charmap "<PROMPT>", $58
charmap "<TARGET>", $59 charmap "<TARGET>", $59
charmap "<USER>", $5a charmap "<USER>", $5a
charmap "<PC>", $5b ; "PC" charmap "<PC>", $5b ; "PC"
charmap "<TM>", $5c ; "TM" charmap "<TM>", $5c ; "TM"
charmap "<TRNER>", $5d ; "TRAINER" charmap "<TRNER>", $5d ; "TRAINER"
charmap "<ROCKET>", $5e ; "ROCKET" charmap "<ROCKET>", $5e ; "ROCKET"
charmap "<DEXEND>", $5f charmap "<DEXEND>", $5f
; Actual characters (from gfx/misc/font_extra.png) ; Actual characters (from gfx/misc/font_extra.png)
charmap "<BOLD_A>", $60 ; unused charmap "<BOLD_A>", $60 ; unused
charmap "<BOLD_B>", $61 ; unused charmap "<BOLD_B>", $61 ; unused
charmap "<BOLD_C>", $62 ; unused charmap "<BOLD_C>", $62 ; unused
charmap "<BOLD_D>", $63 ; unused charmap "<BOLD_D>", $63 ; unused
charmap "<BOLD_E>", $64 ; unused charmap "<BOLD_E>", $64 ; unused
charmap "<BOLD_F>", $65 ; unused charmap "<BOLD_F>", $65 ; unused
charmap "<BOLD_G>", $66 ; unused charmap "<BOLD_G>", $66 ; unused
charmap "<BOLD_H>", $67 ; unused charmap "<BOLD_H>", $67 ; unused
charmap "<BOLD_I>", $68 ; unused charmap "<BOLD_I>", $68 ; unused
charmap "<BOLD_V>", $69 charmap "<BOLD_V>", $69
charmap "<BOLD_S>", $6a charmap "<BOLD_S>", $6a
charmap "<BOLD_L>", $6b ; unused charmap "<BOLD_L>", $6b ; unused
charmap "<BOLD_M>", $6c ; unused charmap "<BOLD_M>", $6c ; unused
charmap "<COLON>", $6d ; colon with tinier dots than ":" charmap "<COLON>", $6d ; colon with tinier dots than ":"
charmap "ぃ", $6e ; hiragana small i, unused charmap "ぃ", $6e ; hiragana small i, unused
charmap "ぅ", $6f ; hiragana small u, unused charmap "ぅ", $6f ; hiragana small u, unused
charmap "<PO>", $70 charmap "<PO>", $70
charmap "<KE>", $71 charmap "<KE>", $71
charmap "<``>", $72 ; opening quote charmap "<``>", $72 ; opening quote
charmap "<''>", $73 ; closing quote charmap "<''>", $73 ; closing quote
charmap "·", $74 ; middle dot, unused charmap "·", $74 ; middle dot, unused
charmap "…", $75 ; ellipsis charmap "…", $75 ; ellipsis
charmap "ぁ", $76 ; hiragana small a, unused charmap "ぁ", $76 ; hiragana small a, unused
charmap "ぇ", $77 ; hiragana small e, unused charmap "ぇ", $77 ; hiragana small e, unused
charmap "ぉ", $78 ; hiragana small o, unused charmap "ぉ", $78 ; hiragana small o, unused
charmap "┌", $79 charmap "┌", $79
charmap "─", $7a charmap "─", $7a
charmap "┐", $7b charmap "┐", $7b
charmap "│", $7c charmap "│", $7c
charmap "└", $7d charmap "└", $7d
charmap "┘", $7e charmap "┘", $7e
charmap " ", $7f charmap " ", $7f
; Actual characters (from gfx/misc/font_battle_extra.png) ; Actual characters (from gfx/misc/font_battle_extra.png)
charmap "<LV>", $6e charmap "<LV>", $6e
charmap "<ど>", $70 ; hiragana small do, unused charmap "<ど>", $70 ; hiragana small do, unused
charmap "◀", $71 charmap "◀", $71
charmap "『", $72 ; Japanese opening quote, unused charmap "『", $72 ; Japanese opening quote, unused
charmap "<ID>", $73 charmap "<ID>", $73
charmap "№", $74 charmap "№", $74
; Actual characters (from other graphics files) ; Actual characters (from other graphics files)
charmap "|", $31 ; from gfx/stats/stats_tiles charmap "|", $31 ; from gfx/stats/stats_tiles
charmap "<SHINY>", $3f ; gfx/stats/shiny charmap "<SHINY>", $3f ; gfx/stats/shiny
charmap "<BLACK>", $60 ; from gfx/mobile/phone_tiles.2bpp charmap "<BLACK>", $60 ; from gfx/mobile/phone_tiles.2bpp
charmap "▲", $61 ; gfx/font/up_arrow.png charmap "▲", $61 ; gfx/font/up_arrow.png
charmap "<PHONE>", $62 ; gfx/mobile/overworld_phone_icon.2bpp charmap "<PHONE>", $62 ; gfx/mobile/overworld_phone_icon.2bpp
charmap "_", $62 ; from gfx/battle/hp_exp_bar_border.1bpp charmap "_", $62 ; from gfx/battle/hp_exp_bar_border.1bpp
charmap "", $6e ; gfx/font/feet_inches.png charmap "", $6e ; gfx/font/feet_inches.png
charmap "″", $6f ; gfx/font/feet_inches.png charmap "″", $6f ; gfx/font/feet_inches.png
; Actual characters (from gfx/misc/font.png) ; Actual characters (from gfx/misc/font.png)
charmap "A", $80 charmap "A", $80
charmap "B", $81 charmap "B", $81
charmap "C", $82 charmap "C", $82
charmap "D", $83 charmap "D", $83
charmap "E", $84 charmap "E", $84
charmap "F", $85 charmap "F", $85
charmap "G", $86 charmap "G", $86
charmap "H", $87 charmap "H", $87
charmap "I", $88 charmap "I", $88
charmap "J", $89 charmap "J", $89
charmap "K", $8a charmap "K", $8a
charmap "L", $8b charmap "L", $8b
charmap "M", $8c charmap "M", $8c
charmap "N", $8d charmap "N", $8d
charmap "O", $8e charmap "O", $8e
charmap "P", $8f charmap "P", $8f
charmap "Q", $90 charmap "Q", $90
charmap "R", $91 charmap "R", $91
charmap "S", $92 charmap "S", $92
charmap "T", $93 charmap "T", $93
charmap "U", $94 charmap "U", $94
charmap "V", $95 charmap "V", $95
charmap "W", $96 charmap "W", $96
charmap "X", $97 charmap "X", $97
charmap "Y", $98 charmap "Y", $98
charmap "Z", $99 charmap "Z", $99
charmap "(", $9a charmap "(", $9a
charmap ")", $9b charmap ")", $9b
charmap ":", $9c charmap ":", $9c
charmap ";", $9d charmap ";", $9d
charmap "[", $9e charmap "[", $9e
charmap "]", $9f charmap "]", $9f
charmap "a", $a0 charmap "a", $a0
charmap "b", $a1 charmap "b", $a1
charmap "c", $a2 charmap "c", $a2
charmap "d", $a3 charmap "d", $a3
charmap "e", $a4 charmap "e", $a4
charmap "f", $a5 charmap "f", $a5
charmap "g", $a6 charmap "g", $a6
charmap "h", $a7 charmap "h", $a7
charmap "i", $a8 charmap "i", $a8
charmap "j", $a9 charmap "j", $a9
charmap "k", $aa charmap "k", $aa
charmap "l", $ab charmap "l", $ab
charmap "m", $ac charmap "m", $ac
charmap "n", $ad charmap "n", $ad
charmap "o", $ae charmap "o", $ae
charmap "p", $af charmap "p", $af
charmap "q", $b0 charmap "q", $b0
charmap "r", $b1 charmap "r", $b1
charmap "s", $b2 charmap "s", $b2
charmap "t", $b3 charmap "t", $b3
charmap "u", $b4 charmap "u", $b4
charmap "v", $b5 charmap "v", $b5
charmap "w", $b6 charmap "w", $b6
charmap "x", $b7 charmap "x", $b7
charmap "y", $b8 charmap "y", $b8
charmap "z", $b9 charmap "z", $b9
charmap "Ä", $c0 charmap "Ä", $c0
charmap "Ö", $c1 charmap "Ö", $c1
charmap "Ü", $c2 charmap "Ü", $c2
charmap "ä", $c3 charmap "ä", $c3
charmap "ö", $c4 charmap "ö", $c4
charmap "ü", $c5 charmap "ü", $c5
charmap "'d", $d0 charmap "'d", $d0
charmap "'l", $d1 charmap "'l", $d1
charmap "'m", $d2 charmap "'m", $d2
charmap "'r", $d3 charmap "'r", $d3
charmap "'s", $d4 charmap "'s", $d4
charmap "'t", $d5 charmap "'t", $d5
charmap "'v", $d6 charmap "'v", $d6
charmap "←", $df charmap "←", $df
charmap "'", $e0 charmap "'", $e0
charmap "<PK>", $e1 charmap "<PK>", $e1
charmap "<MN>", $e2 charmap "<MN>", $e2
charmap "-", $e3 charmap "-", $e3
charmap "?", $e6 charmap "?", $e6
charmap "!", $e7 charmap "!", $e7
charmap ".", $e8 charmap ".", $e8
charmap "&", $e9 charmap "&", $e9
charmap "é", $ea charmap "é", $ea
charmap "→", $eb charmap "→", $eb
charmap "▷", $ec charmap "▷", $ec
charmap "▶", $ed charmap "▶", $ed
charmap "▼", $ee charmap "▼", $ee
charmap "♂", $ef charmap "♂", $ef
charmap "¥", $f0 charmap "¥", $f0
charmap "×", $f1 charmap "×", $f1
charmap "<DOT>", $f2 ; same as "." in English charmap "<DOT>", $f2 ; same as "." in English
charmap "/", $f3 charmap "/", $f3
charmap ",", $f4 charmap ",", $f4
charmap "♀", $f5 charmap "♀", $f5
charmap "0", $f6 charmap "0", $f6
charmap "1", $f7 charmap "1", $f7
charmap "2", $f8 charmap "2", $f8
charmap "3", $f9 charmap "3", $f9
charmap "4", $fa charmap "4", $fa
charmap "5", $fb charmap "5", $fb
charmap "6", $fc charmap "6", $fc
charmap "7", $fd charmap "7", $fd
charmap "8", $fe charmap "8", $fe
charmap "9", $ff charmap "9", $ff
; Japanese kana, for those bits of text that were not translated to English ; Japanese kana, for those bits of text that were not translated to English

View File

@ -26,7 +26,7 @@ cry_header: macro
; MusicCommands indexes (see audio/engine.asm) ; MusicCommands indexes (see audio/engine.asm)
enum_start $d8 enum_start $d8
enum notetype_cmd enum notetype_cmd ; $d8
octave: macro octave: macro
db notetype_cmd - (\1) db notetype_cmd - (\1)
endm endm
@ -39,227 +39,227 @@ notetype: macro
endc endc
endm endm
enum pitchoffset_cmd 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 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 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 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 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 enum sound_duty_cmd ; $de
sound_duty: macro sound_duty: macro
db sound_duty_cmd db sound_duty_cmd
db \1 | (\2 << 2) | (\3 << 4) | (\4 << 6) ; duty sequence db \1 | (\2 << 2) | (\3 << 4) | (\4 << 6) ; duty sequence
endm endm
enum togglesfx_cmd enum togglesfx_cmd ; $df
togglesfx: macro togglesfx: macro
db togglesfx_cmd db togglesfx_cmd
endm endm
enum slidepitchto_cmd 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 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 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 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 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 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 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 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 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 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 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 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 enum sfxpriorityon_cmd ; $ec
sfxpriorityon: macro sfxpriorityon: macro
db sfxpriorityon_cmd db sfxpriorityon_cmd
endm endm
enum sfxpriorityoff_cmd enum sfxpriorityoff_cmd ; $ed
sfxpriorityoff: macro sfxpriorityoff: macro
db sfxpriorityoff_cmd db sfxpriorityoff_cmd
endm endm
enum unknownmusic0xee_cmd 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 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 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 enum music0xf1_cmd ; $f1
music0xf1: macro music0xf1: macro
db music0xf1_cmd db music0xf1_cmd
endm endm
enum music0xf2_cmd enum music0xf2_cmd ; $f2
music0xf2: macro music0xf2: macro
db music0xf2_cmd db music0xf2_cmd
endm endm
enum music0xf3_cmd enum music0xf3_cmd ; $f3
music0xf3: macro music0xf3: macro
db music0xf3_cmd db music0xf3_cmd
endm endm
enum music0xf4_cmd enum music0xf4_cmd ; $f4
music0xf4: macro music0xf4: macro
db music0xf4_cmd db music0xf4_cmd
endm endm
enum music0xf5_cmd enum music0xf5_cmd ; $f5
music0xf5: macro music0xf5: macro
db music0xf5_cmd db music0xf5_cmd
endm endm
enum music0xf6_cmd enum music0xf6_cmd ; $f6
music0xf6: macro music0xf6: macro
db music0xf6_cmd db music0xf6_cmd
endm endm
enum music0xf7_cmd enum music0xf7_cmd ; $f7
music0xf7: macro music0xf7: macro
db music0xf7_cmd db music0xf7_cmd
endm endm
enum music0xf8_cmd enum music0xf8_cmd ; $f8
music0xf8: macro music0xf8: macro
db music0xf8_cmd db music0xf8_cmd
endm endm
enum unknownmusic0xf9_cmd enum unknownmusic0xf9_cmd ; $f9
unknownmusic0xf9: macro unknownmusic0xf9: macro
db unknownmusic0xf9_cmd db unknownmusic0xf9_cmd
endm endm
enum setcondition_cmd 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 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 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 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 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 enum endchannel_cmd ; $ff
endchannel: macro endchannel: macro
db endchannel_cmd db endchannel_cmd
endm endm

File diff suppressed because it is too large Load Diff

View File

@ -14,31 +14,31 @@ 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

View File

@ -8,7 +8,7 @@ endc
; BattleAnimCommands indexes (see battle/anim_commands.asm) ; BattleAnimCommands indexes (see battle/anim_commands.asm)
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
@ -17,20 +17,20 @@ anim_obj: macro
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
db anim_3gfx_command db anim_3gfx_command
db \1 ; gfx1 db \1 ; gfx1
@ -38,7 +38,7 @@ anim_3gfx: macro
db \3 ; gfx3 db \3 ; gfx3
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
@ -47,7 +47,7 @@ anim_4gfx: macro
db \4 ; gfx4 db \4 ; gfx4
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
@ -57,147 +57,147 @@ anim_5gfx: macro
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
db anim_bgeffect_command db anim_bgeffect_command
db \1 ; effect db \1 ; effect
@ -206,89 +206,89 @@ anim_bgeffect: macro
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

@ -3,138 +3,138 @@
; Directional movements ; Directional movements
enum movement_turn_head enum movement_turn_head ; $00
turn_head: macro turn_head: macro
db movement_turn_head | \1 ; $00 db movement_turn_head | \1
endm endm
__enum__ = __enum__ + 3 __enum__ = __enum__ + 3
enum movement_turn_step enum movement_turn_step ; $04
turn_step: macro turn_step: macro
db movement_turn_step | \1 ; $04 db movement_turn_step | \1
endm endm
__enum__ = __enum__ + 3 __enum__ = __enum__ + 3
enum movement_slow_step enum movement_slow_step ; $08
slow_step: macro slow_step: macro
db movement_slow_step | \1; $08 db movement_slow_step | \1
endm endm
__enum__ = __enum__ + 3 __enum__ = __enum__ + 3
enum movement_step enum movement_step ; $0c
step: macro step: macro
db movement_step | \1 ; $0c db movement_step | \1
endm endm
__enum__ = __enum__ + 3 __enum__ = __enum__ + 3
enum movement_big_step enum movement_big_step ; $10
big_step: macro big_step: macro
db movement_big_step | \1 ; $10 db movement_big_step | \1
endm endm
__enum__ = __enum__ + 3 __enum__ = __enum__ + 3
enum movement_slow_slide_step enum movement_slow_slide_step ; $14
slow_slide_step: macro slow_slide_step: macro
db movement_slow_slide_step | \1 ; $14 db movement_slow_slide_step | \1
endm endm
__enum__ = __enum__ + 3 __enum__ = __enum__ + 3
enum movement_slide_step enum movement_slide_step ; $18
slide_step: macro slide_step: macro
db movement_slide_step | \1 ; $18 db movement_slide_step | \1
endm endm
__enum__ = __enum__ + 3 __enum__ = __enum__ + 3
enum movement_fast_slide_step enum movement_fast_slide_step ; $1c
fast_slide_step: macro fast_slide_step: macro
db movement_fast_slide_step | \1 ; $1c db movement_fast_slide_step | \1
endm endm
__enum__ = __enum__ + 3 __enum__ = __enum__ + 3
enum movement_turn_away enum movement_turn_away ; $20
turn_away: macro turn_away: macro
db movement_turn_away | \1 ; $20 db movement_turn_away | \1
endm endm
__enum__ = __enum__ + 3 __enum__ = __enum__ + 3
enum movement_turn_in enum movement_turn_in ; $24
turn_in: macro turn_in: macro
db movement_turn_in | \1 ; $24 db movement_turn_in | \1
endm endm
__enum__ = __enum__ + 3 __enum__ = __enum__ + 3
enum movement_turn_waterfall enum movement_turn_waterfall ; $28
turn_waterfall: macro turn_waterfall: macro
db movement_turn_waterfall | \1 ; $28 db movement_turn_waterfall | \1
endm endm
__enum__ = __enum__ + 3 __enum__ = __enum__ + 3
enum movement_slow_jump_step enum movement_slow_jump_step ; $2c
slow_jump_step: macro slow_jump_step: macro
db movement_slow_jump_step | \1 ; $2c db movement_slow_jump_step | \1
endm endm
__enum__ = __enum__ + 3 __enum__ = __enum__ + 3
enum movement_jump_step enum movement_jump_step ; $30
jump_step: macro jump_step: macro
db movement_jump_step | \1 ; $30 db movement_jump_step | \1
endm endm
__enum__ = __enum__ + 3 __enum__ = __enum__ + 3
enum movement_fast_jump_step enum movement_fast_jump_step ; $34
fast_jump_step: macro fast_jump_step: macro
db movement_fast_jump_step | \1 ; $34 db movement_fast_jump_step | \1
endm endm
__enum__ = __enum__ + 3 __enum__ = __enum__ + 3
; Control ; Control
enum movement_remove_sliding enum movement_remove_sliding ; $38
remove_sliding: macro remove_sliding: macro
db movement_remove_sliding ; $38 db movement_remove_sliding
endm endm
enum movement_set_sliding enum movement_set_sliding ; $39
set_sliding: macro set_sliding: macro
db movement_set_sliding ; $39 db movement_set_sliding
endm endm
enum movement_remove_fixed_facing enum movement_remove_fixed_facing ; $3a
remove_fixed_facing: macro remove_fixed_facing: macro
db movement_remove_fixed_facing ; $3a db movement_remove_fixed_facing
endm endm
enum movement_fix_facing enum movement_fix_facing ; $3b
fix_facing: macro fix_facing: macro
db movement_fix_facing ; $3b db movement_fix_facing
endm endm
enum movement_show_person enum movement_show_person ; $3c
show_person: macro show_person: macro
db movement_show_person ; $3c db movement_show_person
endm endm
enum movement_hide_person enum movement_hide_person ; $3d
hide_person: macro hide_person: macro
db movement_hide_person ; $3d db movement_hide_person
endm endm
; Sleep ; Sleep
enum movement_step_sleep 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
@ -145,103 +145,102 @@ endm
__enum__ = __enum__ + 8 __enum__ = __enum__ + 8
enum movement_step_end enum movement_step_end ; $47
step_end: macro step_end: macro
db movement_step_end ; $47 db movement_step_end
endm endm
; Whatever Movement_48 is, it takes a one-byte parameter enum movement_step_48 ; $48
enum movement_step_48
step_48: macro step_48: macro
db movement_step_48 db movement_step_48
db \1 db \1 ; ???
endm endm
enum movement_remove_person enum movement_remove_person ; $49
remove_person: macro remove_person: macro
db movement_remove_person ; $49 db movement_remove_person
endm endm
enum movement_step_loop enum movement_step_loop ; $4a
step_loop: macro step_loop: macro
db movement_step_loop ; $4a db movement_step_loop
endm endm
enum movement_step_4b enum movement_step_4b ; $4b
step_4b: macro step_4b: macro
db movement_step_4b ; $4b db movement_step_4b
endm endm
enum movement_teleport_from enum movement_teleport_from ; $4c
teleport_from: macro teleport_from: macro
db movement_teleport_from ; $4c db movement_teleport_from
endm endm
enum movement_teleport_to enum movement_teleport_to ; $4d
teleport_to: macro teleport_to: macro
db movement_teleport_to ; $4d db movement_teleport_to
endm endm
enum movement_skyfall enum movement_skyfall ; $4e
skyfall: macro skyfall: macro
db movement_skyfall ; $4e db movement_skyfall
endm endm
enum movement_step_dig enum movement_step_dig ; $4f
step_dig: macro step_dig: macro
db movement_step_dig ; $4f db movement_step_dig
db \1 db \1 ; length
endm endm
enum movement_step_bump enum movement_step_bump ; $50
step_bump: macro step_bump: macro
db movement_step_bump ; $50 db movement_step_bump
endm endm
enum movement_fish_got_bite enum movement_fish_got_bite ; $51
fish_got_bite: macro fish_got_bite: macro
db movement_fish_got_bite ; $51 db movement_fish_got_bite
endm endm
enum movement_fish_cast_rod enum movement_fish_cast_rod ; $52
fish_cast_rod: macro fish_cast_rod: macro
db movement_fish_cast_rod ; $52 db movement_fish_cast_rod
endm endm
enum movement_hide_emote enum movement_hide_emote ; $53
hide_emote: macro hide_emote: macro
db movement_hide_emote ; $53 db movement_hide_emote
endm endm
enum movement_show_emote enum movement_show_emote ; $54
show_emote: macro show_emote: macro
db movement_show_emote ; $54 db movement_show_emote
endm endm
enum movement_step_shake enum movement_step_shake ; $55
step_shake: macro step_shake: macro
db movement_step_shake ; $55 db movement_step_shake
db \1 ; displacement db \1 ; displacement
endm endm
enum movement_tree_shake 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 enum movement_rock_smash ; $57
rock_smash: macro rock_smash: macro
db movement_rock_smash ; $57 db movement_rock_smash
db \1 db \1 ; length
endm endm
enum movement_return_dig enum movement_return_dig ; $58
return_dig: macro return_dig: macro
db movement_return_dig ; $58 db movement_return_dig
db \1 db \1 ; length
endm endm
enum movement_skyfall_top enum movement_skyfall_top ; $59
skyfall_top: macro skyfall_top: macro
db movement_skyfall_top ; $59 db movement_skyfall_top
endm endm

View File

@ -1,131 +1,131 @@
text EQUS "db $00," ; Start writing text. text EQUS "db \"<START>\"," ; Start writing text.
next EQUS "db $4e," ; Move a line down. next EQUS "db \"<NEXT>\"," ; Move a line down.
line EQUS "db $4f," ; Start writing at the bottom line. line EQUS "db \"<LINE>\"," ; Start writing at the bottom line.
page EQUS "db $50," ; Start a new Pokédex page. page EQUS "db \"@\"," ; Start a new Pokédex page.
para EQUS "db $51," ; Start a new paragraph. para EQUS "db \"<PARA>\"," ; Start a new paragraph.
cont EQUS "db $55," ; Scroll to the next line. cont EQUS "db \"<CONT>\"," ; Scroll to the next line.
done EQUS "db $57" ; End a text box. done EQUS "db \"<DONE>\"" ; End a text box.
prompt EQUS "db $58" ; Prompt the player to end a text box (initiating some other event). prompt EQUS "db \"<PROMPT>\"" ; Prompt the player to end a text box (initiating some other event).
; TextCommands indexes (see home/text.asm) ; TextCommands indexes (see home/text.asm)
enum_start $01 enum_start $01
enum TX_RAM enum TX_RAM ; $01
text_from_ram: MACRO text_from_ram: MACRO
db TX_RAM db TX_RAM
dw \1 dw \1
ENDM ENDM
enum TX_BCD 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 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 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 enum TX_LOW ; $05
text_low: macro text_low: macro
db TX_LOW db TX_LOW
endm endm
enum WAIT_BUTTON enum WAIT_BUTTON ; $06
text_waitbutton: macro text_waitbutton: macro
db WAIT_BUTTON db WAIT_BUTTON
endm endm
enum TX_SCROLL enum TX_SCROLL ; $07
text_scroll: macro text_scroll: macro
db TX_SCROLL db TX_SCROLL
endm endm
enum START_ASM enum START_ASM ; $08
start_asm: macro start_asm: macro
db START_ASM db START_ASM
endm endm
enum TX_NUM 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 enum TX_EXIT ; $0a
interpret_data: macro interpret_data: macro
db TX_EXIT db TX_EXIT
endm endm
enum TX_SOUND_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 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 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 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 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 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 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 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 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 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 enum TX_DAY ; $15
current_day: macro current_day: macro
db TX_DAY db TX_DAY
endm endm
enum TX_FAR enum TX_FAR ; $16
text_jump: MACRO text_jump: MACRO
db TX_FAR db TX_FAR
dw \1 dw \1

View File

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

View File

@ -226,12 +226,12 @@ CheckNickErrors:: ; 669f
; table defining which characters are actually text commands ; table defining which characters are actually text commands
; format: ; format:
; ≥ < ; ≥ <
db "<START>", $04 + 1 db "<START>", TX_BOX + 1
db "<PLAY_G>", $18 + 1 db "<PLAY_G>", $18 + 1
db $1d, "%" + 1 db $1d, "%" + 1
db $35, "<GREEN>" + 1 db $35, "<GREEN>" + 1
db "<ENEMY>", "<ENEMY>" + 1 db "<ENEMY>", "<ENEMY>" + 1
db $49, "<TM>" + 1 db "<MOM>", "<TM>" + 1
db "<ROCKET>", "┘" + 1 db "<ROCKET>", "┘" + 1
db -1 ; end db -1 ; end