diff options
Diffstat (limited to 'src/macros')
| -rw-r--r-- | src/macros/data.asm | 4 | ||||
| -rw-r--r-- | src/macros/scripts.asm | 9 | ||||
| -rw-r--r-- | src/macros/text.asm | 2 | ||||
| -rw-r--r-- | src/macros/wram.asm | 30 |
4 files changed, 20 insertions, 25 deletions
diff --git a/src/macros/data.asm b/src/macros/data.asm index f2a2210..d08ec4e 100644 --- a/src/macros/data.asm +++ b/src/macros/data.asm @@ -56,7 +56,7 @@ textpointer: MACRO dw ((\1 + ($4000 * (BANK(\1) - 1))) - (TextOffsets + ($4000 * (BANK(TextOffsets) - 1)))) & $ffff db ((\1 + ($4000 * (BANK(\1) - 1))) - (TextOffsets + ($4000 * (BANK(TextOffsets) - 1)))) >> 16 const \1_ -GLOBAL \1_ +EXPORT \1_ ENDM energy: MACRO @@ -99,4 +99,4 @@ cursor_transition: MACRO db \4 shift endr -ENDM
\ No newline at end of file +ENDM diff --git a/src/macros/scripts.asm b/src/macros/scripts.asm index bd1a58f..ed7b30d 100644 --- a/src/macros/scripts.asm +++ b/src/macros/scripts.asm @@ -27,14 +27,14 @@ ENDM const ScriptCommand_MoveActiveNPCByDirection_index ; $0a const ScriptCommand_CloseTextBox_index ; $0b const ScriptCommand_GiveBoosterPacks_index ; $0c - const Func_cf0c_index ; $0d - const Func_cf12_index ; $0e + const ScriptCommand_CheckIfCardInCollectionOrDecks_index ; $0d + const ScriptCommand_CheckIfCardInCollection_index ; $0e const ScriptCommand_GiveCard_index ; $0f const ScriptCommand_TakeCard_index ; $10 const Func_cf53_index ; $11 const Func_cf7b_index ; $12 - const Func_cf2d_index ; $13 - const Func_cf96_index ; $14 + const ScriptCommand_CheckRawAmountOfCardsOwned_index ; $13 + const ScriptCommand_JumpBasedOnFightingClubPupilStatus_index ; $14 const Func_cfc6_index ; $15 const Func_cfd4_index ; $16 const Func_d00b_index ; $17 @@ -118,4 +118,3 @@ ENDM const ScriptCommand_EndScriptLoop8_index ; $65 const ScriptCommand_EndScriptLoop9_index ; $66 const ScriptCommand_EndScriptLoop10_index ; $67 - diff --git a/src/macros/text.asm b/src/macros/text.asm index 8ad94e8..2b29afe 100644 --- a/src/macros/text.asm +++ b/src/macros/text.asm @@ -85,4 +85,4 @@ ENDM ldfw3: MACRO ld \1, (TX_FULLWIDTH3 << 8) | STRCAT("FW3_", \2) -ENDM
\ No newline at end of file +ENDM diff --git a/src/macros/wram.asm b/src/macros/wram.asm index c8b9a88..8545972 100644 --- a/src/macros/wram.asm +++ b/src/macros/wram.asm @@ -46,24 +46,20 @@ text_header: MACRO \1RomBank:: ds 1 ENDM -; TODO: Figure out what the rest are for sprite_anim_struct: MACRO -\1Field0x00:: ds 1 -\1Field0x01:: ds 1 ; movement handling / palette -\1CoordX:: ds 1 -\1CoordY:: ds 1 -\1TileID:: ds 1 -\1Field0x05:: ds 1 -\1Field0x06:: ds 1 -\1Field0x07:: ds 1 -\1Field0x08:: ds 1 -\1Field0x09:: ds 1 -\1Field0x0a:: ds 1 -\1Field0x0b:: ds 1 -\1Field0x0c:: ds 1 -\1Field0x0d:: ds 1 -\1MovementCounter:: ds 1 -\1Field0x0f:: ds 1 +\1Enabled:: ds 1 +\1Attributes:: ds 1 +\1CoordX:: ds 1 +\1CoordY:: ds 1 +\1TileID:: ds 1 +\1ID:: ds 1 +\1Bank:: ds 1 +\1Pointer:: ds 2 +\1FrameOffsetPointer:: ds 2 +\1FrameBank:: ds 1 +\1FrameDataPointer:: ds 2 +\1Counter:: ds 1 +\1Flags:: ds 1 ENDM loaded_npc_struct: MACRO |