diff options
Diffstat (limited to 'macros/wram.asm')
-rwxr-xr-x | macros/wram.asm | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/macros/wram.asm b/macros/wram.asm index e47e0a2f4..f4a08c3a3 100755 --- a/macros/wram.asm +++ b/macros/wram.asm @@ -189,7 +189,7 @@ battle_tower_struct: MACRO \1Pkmn3NameEnd:: \1TrainerData:: ds BATTLETOWER_TRAINERDATALENGTH \1TrainerEnd:: -endm +ENDM mailmsg: MACRO \1Message:: ds MAIL_MSG_LENGTH @@ -200,7 +200,7 @@ mailmsg: MACRO \1Species:: db \1Type:: db \1End:: -endm +ENDM roam_struct: MACRO \1Species:: db @@ -211,11 +211,11 @@ roam_struct: MACRO \1DVs:: dw ENDM -bugcontestwinner: macro +bugcontestwinner: MACRO \1WinnerID:: db \1Mon:: db \1Score:: dw -endm +ENDM hof_mon: MACRO \1Species:: db @@ -224,7 +224,7 @@ hof_mon: MACRO \1Level:: db \1Nickname:: ds PKMN_NAME_LENGTH +- 1 \1End:: -endm +ENDM hall_of_fame: MACRO \1WinCount:: db @@ -265,7 +265,7 @@ move_struct: MACRO \1Accuracy:: db \1PP:: db \1EffectChance:: db -endm +ENDM slot_reel: MACRO \1ReelAction:: db @@ -275,14 +275,14 @@ slot_reel: MACRO \1SpinRate:: db \1OAMAddr:: dw \1XCoord:: db -\1Slot09:: ds 1 -\1Slot0a:: ds 1 +\1ManipCounter:: db +\1ManipDelay:: db \1Slot0b:: ds 1 \1Slot0c:: ds 1 \1Slot0d:: ds 1 \1Slot0e:: ds 1 -\1Slot0f:: ds 1 -endm +\1StopDelay:: db +ENDM object_struct: MACRO \1Struct:: @@ -337,7 +337,7 @@ map_object: MACRO \1ObjectScript:: dw \1ObjectEventFlag:: dw ds 2 -endm +ENDM sprite_anim_struct: MACRO \1Index:: db @@ -384,11 +384,11 @@ battle_anim_struct: MACRO \1_Anim15:: ds 1 \1_Anim16:: ds 1 \1_Anim17:: ds 1 -endm +ENDM battle_bg_effect: MACRO \1_Function:: db \1_01:: ds 1 \1_02:: ds 1 \1_03:: ds 1 -endm +ENDM |