diff options
| author | yenatch <yenatch@gmail.com> | 2014-02-01 20:26:39 -0500 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2014-02-01 20:26:39 -0500 |
| commit | cf2acc100193f599b4521a961c9bff6a78be8217 (patch) | |
| tree | 8d79a8a8f7f192ecabdd7a6c9fbfcdab7b5dffb8 /text | |
| parent | adb3b29b4dcd8330df1b4cbe7ff24cd9aa614c14 (diff) | |
Use :: to export labels between objects.
This fixes the build.
Diffstat (limited to 'text')
| -rw-r--r-- | text/battle.asm | 4 | ||||
| -rw-r--r-- | text/common_4.asm | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/text/battle.asm b/text/battle.asm index dae8c1c3b..fa4e8c47b 100644 --- a/text/battle.asm +++ b/text/battle.asm @@ -33,7 +33,7 @@ WildPokemonAppearedText2: ; 0x80793 db "appeared!", $58 ; 0x807a9 -WantsToBattleText: ; 0x807a9 +WantsToBattleText:: ; 0x807a9 db $0, $3f, $4f db "wants to battle!", $58 ; 0x807bd @@ -745,7 +745,7 @@ WontDropAnymoreText: ; 0x8128f db "drop anymore!", $58 ; 0x812ac -FledFromBattleText: ; 0x812ac +FledFromBattleText:: ; 0x812ac db $0, $5a, $4f db "fled from battle!", $58 ; 0x812c1 diff --git a/text/common_4.asm b/text/common_4.asm index 38a532e4a..76a225d17 100644 --- a/text/common_4.asm +++ b/text/common_4.asm @@ -222,26 +222,26 @@ UnknownText_0x1c46dc: ; 0x1c46dc db $0, "Corrupted event!", $58 ; 0x1c46ee -_ObjectEventText: ; 0x1c46ee +_ObjectEventText:: ; 0x1c46ee db $0, "Object event", $57 ; 0x1c46fc -UnknownText_0x1c46fc: ; 0x1c46fc +UnknownText_0x1c46fc:: ; 0x1c46fc db $0, "BG event", $57 ; 0x1c4706 -UnknownText_0x1c4706: ; 0x1c4706 +UnknownText_0x1c4706:: ; 0x1c4706 db $0, "Coordinates event", $57 ; 0x1c4719 -UnknownText_0x1c4719: ; 0x1c4719 +UnknownText_0x1c4719:: ; 0x1c4719 db $0, $52, " received", $4f db "@" text_from_ram $d0ac db $0, ".", $57 ; 0x1c472c -UnknownText_0x1c472c: ; 0x1c472c +UnknownText_0x1c472c:: ; 0x1c472c db $0, $52, " put the", $4f db "@" text_from_ram $d073 @@ -251,7 +251,7 @@ UnknownText_0x1c472c: ; 0x1c472c db $0, ".", $58 ; 0x1c474b -UnknownText_0x1c474b: ; 0x1c474b +UnknownText_0x1c474b:: ; 0x1c474b db $0, "The @" text_from_ram $d099 db $0, $4f |