pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into audio-macros

Browse Source
This commit is contained in:
dannye
2020-01-06 22:07:33 -06:00
parent 99d16d616d 94ebdab6d3
commit e7be25948d
451 changed files with 10496 additions and 10448 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
macros/scripts/events.asm
View File

@@ -553,9 +553,9 @@ waitbutton: MACRO
db waitbutton_command
ENDM
enum buttonsound_command ; $55
buttonsound: MACRO
db buttonsound_command
enum promptbutton_command ; $55
promptbutton: MACRO
db promptbutton_command
ENDM
enum pokepic_command ; $56

12
macros/scripts/text.asm
View File

@@ -46,9 +46,9 @@ text_low: MACRO
db TX_LOW
ENDM
enum TX_WAIT_BUTTON ; $06
text_waitbutton: MACRO
db TX_WAIT_BUTTON
enum TX_PROMPT_BUTTON ; $06
text_promptbutton: MACRO
db TX_PROMPT_BUTTON
ENDM
enum TX_SCROLL ; $07
@@ -84,9 +84,9 @@ text_dots: MACRO
db \1
ENDM
enum TX_LINK_WAIT_BUTTON ; $0d
text_linkwaitbutton: MACRO
db TX_LINK_WAIT_BUTTON
enum TX_LINK_PROMPT_BUTTON ; $0d
text_linkpromptbutton: MACRO
db TX_LINK_PROMPT_BUTTON
ENDM
enum TX_SOUND_DEX_FANFARE_20_49 ; $0e