diff options
| author | yenatch <yenatch@gmail.com> | 2016-01-29 01:00:48 -0500 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2016-01-29 01:00:48 -0500 |
| commit | 11173a3807bde4e2d5b681717258b5b14f5f2d43 (patch) | |
| tree | 8e1692fe02b30ceeb2d797c001e0594175e29b78 /macros | |
| parent | 289d3dea86b82c4ce7eb7268ef33980688306587 (diff) | |
| parent | 5322b56a8357e5e5a8847f3329b52faa3f7016d8 (diff) | |
Merge pull request #333 from PikalaxALT/master
Split base stats, rearrange wram.asm, naming screen
Diffstat (limited to 'macros')
| -rwxr-xr-x | macros/pals.asm | 9 | ||||
| -rwxr-xr-x | macros/wram.asm | 39 |
2 files changed, 48 insertions, 0 deletions
diff --git a/macros/pals.asm b/macros/pals.asm new file mode 100755 index 000000000..44f1f7944 --- /dev/null +++ b/macros/pals.asm @@ -0,0 +1,9 @@ +tilepal: MACRO +; vram bank, pals +x = \1 << 3 +rept (_NARG +- 1) / 2 + dn (x | PAL_BG_\3), (x | PAL_BG_\2) + shift + shift +endr +endm diff --git a/macros/wram.asm b/macros/wram.asm index 8e5e55cba..175fc4dea 100755 --- a/macros/wram.asm +++ b/macros/wram.asm @@ -210,3 +210,42 @@ hall_of_fame: MACRO \1Mon6:: hof_mon \1Mon6 \1End:: ds 1 ENDM + +trademon: MACRO +\1Species:: ds 1 ; wc6d0 | wc702 +\1SpeciesName:: ds PKMN_NAME_LENGTH ; wc6d1 | wc703 +\1Nickname:: ds PKMN_NAME_LENGTH ; wc6dc | wc70e +\1SenderName:: ds NAME_LENGTH ; wc6e7 | wc719 +\1OTName:: ds NAME_LENGTH ; wc6f2 | wc724 +\1DVs:: ds 2 ; wc6fd | wc72f +\1ID:: ds 2 ; wc6ff | wc731 +\1CaughtData:: ds 1 ; wc701 | wc733 +\1End:: +ENDM + +move_struct: MACRO +\1Animation:: ds 1 +\1Effect:: ds 1 +\1Power:: ds 1 +\1Type:: ds 1 +\1Accuracy:: ds 1 +\1PP:: ds 1 +\1EffectChance:: ds 1 +endm + +slot_reel: MACRO +\1ReelAction:: db +\1TilemapAddr:: dw +\1Position:: db +\1SpinDistance:: db +\1SpinRate:: db +\1OAMAddr:: dw +\1XCoord:: db +\1Slot09:: ds 1 +\1Slot0a:: ds 1 +\1Slot0b:: ds 1 +\1Slot0c:: ds 1 +\1Slot0d:: ds 1 +\1Slot0e:: ds 1 +\1Slot0f:: ds 1 +endm
\ No newline at end of file |