diff options
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/charmap.asm | 10 | ||||
| -rw-r--r-- | macros/event.asm | 18 | ||||
| -rw-r--r-- | macros/move_anim.asm | 146 | ||||
| -rw-r--r-- | macros/move_effect.asm | 22 | ||||
| -rw-r--r-- | macros/movement.asm | 53 | ||||
| -rw-r--r-- | macros/text.asm | 1 |
6 files changed, 177 insertions, 73 deletions
diff --git a/macros/charmap.asm b/macros/charmap.asm index 93710003a..73446d8e7 100644 --- a/macros/charmap.asm +++ b/macros/charmap.asm @@ -2,11 +2,14 @@ charmap "<START>", $00 charmap "<PLAY_G>", $14 ; <PLAYER> + gender charmap "<DAY>", $15 + charmap "¯", $1f charmap "<LNBRK>", $22 charmap "<POKE>", $24 + charmap "%", $25 charmap "<RED>", $38 charmap "<GREEN>", $39 charmap "<ENEMY>", $3f + charmap "<SHINY>", $3f charmap "<MOM>", $49 charmap "<PKMN>", $4a charmap "<NEXT>", $4e @@ -30,12 +33,18 @@ charmap "<DEXEND>", $5f ; Actual characters + charmap "▲", $61 + charmap "_", $62 charmap "′", $6e charmap "<LV>", $6e charmap "″", $6f charmap "<PO>", $70 charmap "<KE>", $71 + charmap "◀", $71 + charmap "<``>", $72 + charmap "<''>", $73 + charmap "<ID>", $73 charmap "№", $74 charmap "…", $75 @@ -123,6 +132,7 @@ charmap "'t", $d5 charmap "'v", $d6 + charmap "←", $df charmap "'", $e0 charmap "<PK>", $e1 charmap "<MN>", $e2 diff --git a/macros/event.asm b/macros/event.asm index 22652abbd..c51f798c5 100644 --- a/macros/event.asm +++ b/macros/event.asm @@ -206,14 +206,22 @@ writecode: macro giveitem: macro db giveitem_command db \1 ; item +if _NARG == 2 db \2 ; quantity +else + db 1 +endc endm enum takeitem_command takeitem: macro db takeitem_command db \1 ; item +if _NARG == 2 db \2 ; quantity +else + db 1 +endc endm enum checkitem_command @@ -986,7 +994,11 @@ checkphonecall: macro verbosegiveitem: macro db verbosegiveitem_command db \1 ; item +if _NARG == 2 db \2 ; quantity +else + db 1 +endc endm enum verbosegiveitem2_command @@ -1022,9 +1034,9 @@ warpfacing: macro db \4 ; y endm - enum storetext_command -storetext: macro - db storetext_command + enum battletowertext_command +battletowertext: macro + db battletowertext_command db \1 ; memory endm diff --git a/macros/move_anim.asm b/macros/move_anim.asm index f14fea7b7..e8f918a29 100644 --- a/macros/move_anim.asm +++ b/macros/move_anim.asm @@ -5,42 +5,50 @@ endc db \1 endm + enum_start $d0 + + enum anim_obj_command ; d0 anim_obj: macro - db $d0 + db anim_obj_command db \1 ; obj db \2 ; x db \3 ; y db \4 ; param endm + enum anim_1gfx_command ; d1 anim_1gfx: macro - db $d1 + db anim_1gfx_command db \1 ; gfx1 endm + enum anim_2gfx_command ; d2 anim_2gfx: macro - db $d2 + db anim_2gfx_command db \1 ; gfx1 db \2 ; gfx2 endm + enum anim_3gfx_command ; d3 anim_3gfx: macro - db $d3 + db anim_3gfx_command db \1 ; gfx1 db \2 ; gfx2 db \3 ; gfx3 endm + enum anim_4gfx_command ; d4 anim_4gfx: macro - db $d4 + db anim_4gfx_command db \1 ; gfx1 db \2 ; gfx2 db \3 ; gfx3 db \4 ; gfx4 endm + enum anim_5gfx_command ; d5 anim_5gfx: macro - db $d5 + db anim_5gfx_command db \1 ; gfx1 db \2 ; gfx2 db \3 ; gfx3 @@ -48,196 +56,238 @@ anim_5gfx: macro db \5 ; gfx5 endm + enum anim_incobj_command ; d6 anim_incobj: macro - db $d6 + db anim_incobj_command db \1 ; id endm + enum anim_setobj_command ; d7 anim_setobj: macro - db $d7 + db anim_setobj_command db \1 ; id db \2 ; obj endm + enum anim_incbgeffect_command ; d8 anim_incbgeffect: macro - db $d8 + db anim_incbgeffect_command db \1 ; effect endm + enum anim_enemyfeetobj_command ; d9 anim_enemyfeetobj: macro - db $d9 + db anim_enemyfeetobj_command endm + enum anim_playerheadobj_command ; da anim_playerheadobj: macro - db $da + db anim_playerheadobj_command endm + enum anim_checkpokeball_command ; db anim_checkpokeball: macro - db $db + db anim_checkpokeball_command endm + enum anim_transform_command ; dc anim_transform: macro - db $dc + db anim_transform_command endm + enum anim_raisesub_command ; dd anim_raisesub: macro - db $dd + db anim_raisesub_command endm + enum anim_dropsub_command ; de anim_dropsub: macro - db $de + db anim_dropsub_command endm + enum anim_resetobp0_command ; df anim_resetobp0: macro - db $df + db anim_resetobp0_command endm + enum anim_sound_command ; e0 anim_sound: macro - db $e0 + db anim_sound_command db \1 ; tracks db \2 ; id endm + enum anim_cry_command ; e1 anim_cry: macro - db $e1 + db anim_cry_command db \1 ; pitch endm + enum anim_minimizeopp_command ; e2 anim_minimizeopp: macro - db $e2 + db anim_minimizeopp_command endm + enum anim_oamon_command ; e3 anim_oamon: macro - db $e3 + db anim_oamon_command endm + enum anim_oamoff_command ; e4 anim_oamoff: macro - db $e4 + db anim_oamoff_command endm + enum anim_clearobjs_command ; e5 anim_clearobjs: macro - db $e5 + db anim_clearobjs_command endm + enum anim_beatup_command ; e6 anim_beatup: macro - db $e6 + db anim_beatup_command endm + enum anim_0xe7_command ; e7 anim_0xe7: macro - db $e7 + db anim_0xe7_command endm + enum anim_updateactorpic_command ; e8 anim_updateactorpic: macro - db $e8 + db anim_updateactorpic_command endm + enum anim_minimize_command ; e9 anim_minimize: macro - db $e9 + db anim_minimize_command endm + enum anim_0xea_command ; ea anim_0xea: macro - db $ea + db anim_0xea_command endm + enum anim_0xeb_command ; eb anim_0xeb: macro - db $eb + db anim_0xeb_command endm + enum anim_0xec_command ; ec anim_0xec: macro - db $ec + db anim_0xec_command endm + enum anim_0xed_command ; ed anim_0xed: macro - db $ed + db anim_0xed_command endm + enum anim_jumpand_command ; ee anim_jumpand: macro - db $ee + db anim_jumpand_command db \1 ; value dw \2 ; address endm + enum anim_jumpuntil_command ; ef anim_jumpuntil: macro - db $ef + db anim_jumpuntil_command dw \1 ; address endm + enum anim_bgeffect_command ; f0 anim_bgeffect: macro - db $f0 + db anim_bgeffect_command db \1 ; effect db \2 ; unknown db \3 ; unknown db \4 ; unknown endm + enum anim_bgp_command ; f1 anim_bgp: macro - db $f1 + db anim_bgp_command db \1 ; colors endm + enum anim_obp0_command ; f2 anim_obp0: macro - db $f2 + db anim_obp0_command db \1 ; colors endm + enum anim_obp1_command ; f3 anim_obp1: macro - db $f3 + db anim_obp1_command db \1 ; colors endm + enum anim_clearsprites_command ; f4 anim_clearsprites: macro - db $f4 + db anim_clearsprites_command endm + enum anim_0xf5_command ; f5 anim_0xf5: macro - db $f5 + db anim_0xf5_command endm + enum anim_0xf6_command ; f6 anim_0xf6: macro - db $f6 + db anim_0xf6_command endm + enum anim_0xf7_command ; f7 anim_0xf7: macro - db $f7 + db anim_0xf7_command endm + enum anim_jumpif_command ; f8 anim_jumpif: macro - db $f8 + db anim_jumpif_command db \1 ; value dw \2 ; address endm + enum anim_setvar_command ; f9 anim_setvar: macro - db $f9 + db anim_setvar_command db \1 ; value endm + enum anim_incvar_command ; fa anim_incvar: macro - db $fa + db anim_incvar_command endm + enum anim_jumpvar_command ; fb anim_jumpvar: macro - db $fb + db anim_jumpvar_command db \1 ; value dw \2 ; address endm + enum anim_jump_command ; fc anim_jump: macro - db $fc + db anim_jump_command dw \1 ; address endm + enum anim_loop_command ; fd anim_loop: macro - db $fd + db anim_loop_command db \1 ; count dw \2 ; address endm + enum anim_call_command ; fe anim_call: macro - db $fe + db anim_call_command dw \1 ; address endm + enum anim_ret_command ; ff anim_ret: macro - db $ff + db anim_ret_command endm diff --git a/macros/move_effect.asm b/macros/move_effect.asm index 6cca15b2d..d25db45bd 100644 --- a/macros/move_effect.asm +++ b/macros/move_effect.asm @@ -14,10 +14,10 @@ endm command stab command damagevariation command checkhit - command effect0x0a - command effect0x0b - command effect0x0c - command resulttext + command lowersub + command hittargetnosub + command raisesub + command failuretext command checkfaint command criticaltext command supereffectivetext @@ -144,13 +144,13 @@ endm command specialdefensedown2 command accuracydown2 command evasiondown2 - command statmessageuser - command statmessagetarget + command statupmessage + command statdownmessage command statupfailtext command statdownfailtext command effectchance - command effect0x91 - command effect0x92 + command statdownanim + command statupanim command switchturn command fakeout command bellydrum @@ -167,11 +167,11 @@ endm command teleport command beatup command ragedamage - command effect0xa3 + command resettypematchup command allstatsup command effect0xa5 - command effect0xa6 - command effect0xa7 + command raisesubnoanim + command lowersubnoanim command effect0xa8 command clearmissdamage command movedelay diff --git a/macros/movement.asm b/macros/movement.asm index d0b97fb8c..2b5720832 100644 --- a/macros/movement.asm +++ b/macros/movement.asm @@ -303,16 +303,44 @@ hide_person: macro db movement_hide_person ; $3d endm - enum movement_show_person -show_person: macro - db movement_show_person ; $3e + enum movement_step_sleep_1 +step_sleep_1: macro + db movement_step_sleep_1 ; $3e endm -__enum__ = $45 + enum movement_step_sleep_2 +step_sleep_2: macro + db movement_step_sleep_2 ; $3f + endm + + enum movement_step_sleep_3 +step_sleep_3: macro + db movement_step_sleep_3 ; $40 + endm + + enum movement_step_sleep_4 +step_sleep_4: macro + db movement_step_sleep_4 ; $41 + endm + + enum movement_step_sleep_5 +step_sleep_5: macro + db movement_step_sleep_5 ; $42 + endm - enum movement_accelerate_last -accelerate_last: macro - db movement_accelerate_last ; $45 + enum movement_step_sleep_6 +step_sleep_6: macro + db movement_step_sleep_6 ; $43 + endm + + enum movement_step_sleep_7 +step_sleep_7: macro + db movement_step_sleep_7 ; $44 + endm + + enum movement_step_sleep_8 +step_sleep_8: macro + db movement_step_sleep_8 ; $45 endm enum movement_step_sleep @@ -333,6 +361,11 @@ remove_person: macro db movement_remove_person ; $49 endm + enum movement_step_loop +step_loop: macro + db movement_step_loop ; $4a + endm + __enum__ = $4c enum movement_teleport_from @@ -362,9 +395,9 @@ fish_got_bite: macro db movement_fish_got_bite ; $51 endm - enum movement_fish_got_bite_2 -fish_got_bite_2: macro - db movement_fish_got_bite_2 ; $52 + enum movement_fish_cast_rod +fish_cast_rod: macro + db movement_fish_cast_rod ; $52 endm enum movement_hide_emote diff --git a/macros/text.asm b/macros/text.asm index d8b6fc717..6af4d109b 100644 --- a/macros/text.asm +++ b/macros/text.asm @@ -11,7 +11,6 @@ prompt EQUS "db $58" ; Prompt the player to end a text box (initiating some oth page EQUS "db $50," ; Start a new Pokedex page. dex EQUS "db $e8, $50" ; End a Pokedex entry. - ; TX_RAM EQU $01 ; TX_FAR EQU $16 enum_start 1 |