ref: 105ef872dd87e3eb0aa73feacac5f1a9f8481973
parent: a9f8aeb94efa833c562b435854ca169f81184db8
author: Remy Oukaour <remy.oukaour@gmail.com>
date: Thu Jan 18 17:06:51 EST 2018
Better TX_SOUND_* names
--- a/charmap.asm
+++ b/charmap.asm
@@ -9,8 +9,8 @@
charmap "%", $25
charmap "<RED>", $38 ; RedsName
charmap "<GREEN>", $39 ; GreensName
- charmap "<MOM>", $49 ; MomsName
charmap "<ENEMY>", $3f
+ charmap "<MOM>", $49 ; MomsName
charmap "<PKMN>", $4a ; "<PK><MN>"
charmap "<_CONT>", $4b ; implements "<CONT>"
charmap "<SCROLL>", $4c
@@ -29,7 +29,7 @@
charmap "<USER>", $5a
charmap "<PC>", $5b ; "PC"
charmap "<TM>", $5c ; "TM"
- charmap "<TRNER>", $5d ; "TRAINER"
+ charmap "<TRAINER>", $5d ; "TRAINER"
charmap "<ROCKET>", $5e ; "ROCKET"
charmap "<DEXEND>", $5f
--- a/home/text.asm
+++ b/home/text.asm
@@ -234,7 +234,7 @@
dict "<PC>", PCChar
dict "<ROCKET>", RocketChar
dict "<TM>", TMChar
- dict "<TRNER>", TrainerChar
+ dict "<TRAINER>", TrainerChar
dict "<KOUGEKI>", PlaceKougeki
dict "<LNBRK>", LineBreakChar
dict "<CONT>", ContText
@@ -735,30 +735,30 @@
; 1410
TextCommands:: ; 1410
-; entries correspond to macros/text.asm enumeration
- dw Text_TX
- dw Text_TX_RAM
- dw Text_TX_BCD
- dw Text_TX_MOVE
- dw Text_TX_BOX
- dw Text_TX_LOW
- dw Text_WAIT_BUTTON
- dw Text_TX_SCROLL
- dw Text_START_ASM
- dw Text_TX_NUM
- dw Text_TX_EXIT
- dw Text_PlaySound ; $0b
- dw Text_TX_DOTS
- dw Text_0D
- dw Text_PlaySound ; $0e
- dw Text_PlaySound ; $0f
- dw Text_PlaySound ; $10
- dw Text_PlaySound ; $11
- dw Text_PlaySound ; $12
- dw Text_PlaySound ; $13
- dw Text_TX_STRINGBUFFER
- dw Text_TX_DAY
- dw Text_TX_FAR
+; entries correspond to TX_* constants (see macros/scripts/text.asm)
+ dw Text_TX ; TX_START
+ dw Text_TX_RAM ; TX_RAM
+ dw Text_TX_BCD ; TX_BCD
+ dw Text_TX_MOVE ; TX_MOVE
+ dw Text_TX_BOX ; TX_BOX
+ dw Text_TX_LOW ; TX_LOW
+ dw Text_WAIT_BUTTON ; WAIT_BUTTON
+ dw Text_TX_SCROLL ; TX_SCROLL
+ dw Text_START_ASM ; START_ASM
+ dw Text_TX_NUM ; TX_NUM
+ dw Text_TX_EXIT ; TX_EXIT
+ dw Text_PlaySound ; TX_SOUND_DEX_FANFARE_50_79
+ dw Text_TX_DOTS ; TX_DOTS
+ dw Text_LINK_WAIT_BUTTON ; TX_LINK_WAIT_BUTTON
+ dw Text_PlaySound ; TX_SOUND_DEX_FANFARE_20_49
+ dw Text_PlaySound ; TX_SOUND_ITEM
+ dw Text_PlaySound ; TX_SOUND_CAUGHT_MON
+ dw Text_PlaySound ; TX_SOUND_DEX_FANFARE_80_109
+ dw Text_PlaySound ; TX_SOUND_FANFARE
+ dw Text_PlaySound ; TX_SOUND_SLOT_MACHINE_START
+ dw Text_TX_STRINGBUFFER ; TX_STRINGBUFFER
+ dw Text_TX_DAY ; TX_DAY
+ dw Text_TX_FAR ; TX_FAR
; 143e
Text_TX:: ; 143e
@@ -900,9 +900,9 @@
ld a, [wLinkMode]
cp LINK_COLOSSEUM
- jp z, Text_0D
+ jp z, Text_LINK_WAIT_BUTTON
cp LINK_MOBILE
- jp z, Text_0D
+ jp z, Text_LINK_WAIT_BUTTON
push hl
call LoadBlinkingCursor
@@ -1030,13 +1030,13 @@
; 152d
TextSFX:: ; 152d
- dbw TX_SOUND_0B, SFX_DEX_FANFARE_50_79
- dbw TX_SOUND_12, SFX_FANFARE
- dbw TX_SOUND_0E, SFX_DEX_FANFARE_20_49
- dbw TX_SOUND_0F, SFX_ITEM
- dbw TX_SOUND_10, SFX_CAUGHT_MON
- dbw TX_SOUND_11, SFX_DEX_FANFARE_80_109
- dbw TX_SOUND_13, SFX_SLOT_MACHINE_START
+ dbw TX_SOUND_DEX_FANFARE_50_79, SFX_DEX_FANFARE_50_79
+ dbw TX_SOUND_FANFARE, SFX_FANFARE
+ dbw TX_SOUND_DEX_FANFARE_20_49, SFX_DEX_FANFARE_20_49
+ dbw TX_SOUND_ITEM, SFX_ITEM
+ dbw TX_SOUND_CAUGHT_MON, SFX_CAUGHT_MON
+ dbw TX_SOUND_DEX_FANFARE_80_109, SFX_DEX_FANFARE_80_109
+ dbw TX_SOUND_SLOT_MACHINE_START, SFX_SLOT_MACHINE_START
db -1
; 1543
@@ -1069,7 +1069,7 @@
ret
; 1562
-Text_0D:: ; 1562
+Text_LINK_WAIT_BUTTON:: ; 1562
; wait for key down
; display arrow
push hl
--- a/macros/scripts/text.asm
+++ b/macros/scripts/text.asm
@@ -73,9 +73,9 @@
db TX_EXIT
ENDM
- enum TX_SOUND_0B ; $0b
+ enum TX_SOUND_DEX_FANFARE_50_79 ; $0b
sound_dex_fanfare_50_79: MACRO
- db TX_SOUND_0B
+ db TX_SOUND_DEX_FANFARE_50_79
ENDM
enum TX_DOTS ; $0c
@@ -89,34 +89,34 @@
db TX_LINK_WAIT_BUTTON
ENDM
- enum TX_SOUND_0E ; $0e
+ enum TX_SOUND_DEX_FANFARE_20_49 ; $0e
sound_dex_fanfare_20_49: MACRO
- db TX_SOUND_0E
+ db TX_SOUND_DEX_FANFARE_20_49
ENDM
- enum TX_SOUND_0F ; $0f
+ enum TX_SOUND_ITEM ; $0f
sound_item: MACRO
- db TX_SOUND_0F
+ db TX_SOUND_ITEM
ENDM
- enum TX_SOUND_10 ; $10
+ enum TX_SOUND_CAUGHT_MON ; $10
sound_caught_mon: MACRO
- db TX_SOUND_10
+ db TX_SOUND_CAUGHT_MON
ENDM
- enum TX_SOUND_11 ; $11
+ enum TX_SOUND_DEX_FANFARE_80_109 ; $11
sound_dex_fanfare_80_109: MACRO
- db TX_SOUND_11
+ db TX_SOUND_DEX_FANFARE_80_109
ENDM
- enum TX_SOUND_12 ; $12
+ enum TX_SOUND_FANFARE ; $12
sound_fanfare: MACRO
- db TX_SOUND_12
+ db TX_SOUND_FANFARE
ENDM
- enum TX_SOUND_13 ; $13
+ enum TX_SOUND_SLOT_MACHINE_START ; $13
sound_slot_machine_start: MACRO
- db TX_SOUND_13
+ db TX_SOUND_SLOT_MACHINE_START
ENDM
enum TX_STRINGBUFFER ; $14