diff options
| author | Daniel Harding <33dannye@gmail.com> | 2021-05-30 11:07:54 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-30 11:07:54 -0500 |
| commit | e8cbcea8e76004a9cef04499301cec5755dcc942 (patch) | |
| tree | c8ed944e6ea43d03cee5367603e40881b6ac17bb /src/macros/scripts.asm | |
| parent | 0a3b84155b53785c974a2b352a6473124c56631b (diff) | |
| parent | 63f0559573cbec5a199645263a36b51b503d4ed1 (diff) | |
Merge pull request #105 from ElectroDeoxys/master
Work on Bank $7 (NPCs, Start Menu and Opening/Credits sequences)
Diffstat (limited to 'src/macros/scripts.asm')
| -rw-r--r-- | src/macros/scripts.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/macros/scripts.asm b/src/macros/scripts.asm index 10336ef..b8976fe 100644 --- a/src/macros/scripts.asm +++ b/src/macros/scripts.asm @@ -334,9 +334,9 @@ ENDM ; Sets some NPC sprite attributes set_sprite_attributes: MACRO run_command ScriptCommand_SetSpriteAttributes - db \1 ; Relates to LOADED_NPC_FIELD_06 - db \2 ; Relates to LOADED_NPC_FIELD_06 - db \3 ; Relates to LOADED_NPC_FIELD_05 + db \1 ; Relates to LOADED_NPC_ANIM + db \2 ; Relates to LOADED_NPC_ANIM + db \3 ; Relates to LOADED_NPC_FLAGS ENDM ; Sets the active NPC's coords @@ -603,7 +603,7 @@ wait_for_song_to_finish: MACRO ENDM ; Records when the player defeats a master (the 8 Club Masters or the Ronald Grand Master duel) -; the order of wins is stored in wd3bb +; the order of wins is stored in wMastersBeatenList ; the purpose of this is still unknown record_master_win: MACRO run_command ScriptCommand_RecordMasterWin |