diff options
| author | Andrew Martinek <andrewrmartinek@gmail.com> | 2020-12-20 00:52:47 -0500 |
|---|---|---|
| committer | Andrew Martinek <andrewrmartinek@gmail.com> | 2020-12-20 00:52:47 -0500 |
| commit | 3f33b4757c580fec05ec53f647ed6a2a0914aa77 (patch) | |
| tree | c18c208590d5ab3f859b60ba064b7289a912d00e /src/macros/scripts.asm | |
| parent | ef676eb46802db828ec831e95a6d26ae4e977c36 (diff) | |
Added more scripts, fixed some spacing, renamed some scripts
Diffstat (limited to 'src/macros/scripts.asm')
| -rw-r--r-- | src/macros/scripts.asm | 49 |
1 files changed, 46 insertions, 3 deletions
diff --git a/src/macros/scripts.asm b/src/macros/scripts.asm index 77acd84..63d514a 100644 --- a/src/macros/scripts.asm +++ b/src/macros/scripts.asm @@ -24,7 +24,7 @@ ENDM const ScriptCommand_TakeCard_index ; $10 const Func_cf53_index ; $11 const Func_cf7b_index ; $12 - const ScriptCommand_CheckAmountOfCardsOwned_index ; $13 + const ScriptCommand_JumpIfEnoughCardsOwned_index ; $13 const ScriptCommand_JumpBasedOnFightingClubPupilStatus_index ; $14 const Func_cfc6_index ; $15 const Func_cfd4_index ; $16 @@ -37,8 +37,8 @@ ENDM const ScriptCommand_SetPlayerDirection_index ; $1d const ScriptCommand_MovePlayer_index ; $1e const ScriptCommand_ShowCardReceivedScreen_index ; $1f - const ScriptCommand_SetDialogName_index ; $20 - const ScriptCommand_SetNextNPCandScript_index ; $21 + const ScriptCommand_SetDialogNPC_index ; $20 + const ScriptCommand_SetNextNPCAndScript_index ; $21 const Func_d095_index ; $22 const Func_d0be_index ; $23 const ScriptCommand_DoFrames_index ; $24 @@ -167,12 +167,55 @@ jump_if_card_in_collection: MACRO db \1 dw \2 ENDM +give_card: MACRO + run_command ScriptCommand_GiveCard + db \1 +ENDM +take_card: MACRO + run_command ScriptCommand_TakeCard + db \1 +ENDM + +jump_if_enough_cards_owned: MACRO + run_command ScriptCommand_JumpIfEnoughCardsOwned + dw \1 + dw \2 +ENDM +script_jump: MACRO + run_command ScriptCommand_Jump + dw \1 +ENDM +try_give_medal_pc_packs: MACRO + run_command ScriptCommand_TryGiveMedalPCPacks +ENDM +set_player_direction: MACRO + run_command ScriptCommand_SetPlayerDirection + db \1 +ENDM move_player: MACRO run_command ScriptCommand_MovePlayer db \1 db \2 ENDM +show_card_received_screen: MACRO + run_command ScriptCommand_ShowCardReceivedScreen + db \1 +ENDM +set_dialog_npc: MACRO + run_command ScriptCommand_SetDialogNPC + db \1 +ENDM +set_next_npc_and_script: MACRO + run_command ScriptCommand_SetNextNPCAndScript + db \1 + dw \2 +ENDM + +do_frames: MACRO + run_command ScriptCommand_DoFrames + db \1 +ENDM end_script_loop_2: MACRO run_command ScriptCommand_EndScriptLoop2 |