diff options
| author | Daniel Harding <33dannye@gmail.com> | 2018-02-10 15:52:58 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-10 15:52:58 -0600 |
| commit | 24f40989d472407dc51653f2a671348126c6e816 (patch) | |
| tree | 3aa0db9181a57a8dd5456955f7957a1950fe1400 /src/text | |
| parent | 9b373dbff462614e484c0a5584e089e668bfd469 (diff) | |
| parent | f541f5e03adadf0b9315cc642da9a5b377b52c12 (diff) | |
Merge pull request #34 from xCrystal/master
Some Home disasm ; Misc style fixes, constants and labeling ; Split macros ; Create linkerscript and arrange Sections ; Bump extras
Diffstat (limited to 'src/text')
| -rwxr-xr-x | src/text/text1.asm | 4 | ||||
| -rw-r--r-- | src/text/text10.asm (renamed from src/text/texta.asm) | 0 | ||||
| -rw-r--r-- | src/text/text11.asm (renamed from src/text/textb.asm) | 0 | ||||
| -rw-r--r-- | src/text/text12.asm (renamed from src/text/textc.asm) | 0 | ||||
| -rw-r--r-- | src/text/text13.asm (renamed from src/text/textd.asm) | 2 | ||||
| -rwxr-xr-x | src/text/text_offsets.asm | 4 |
6 files changed, 5 insertions, 5 deletions
diff --git a/src/text/text1.asm b/src/text/text1.asm index e6b0034..eb11f83 100755 --- a/src/text/text1.asm +++ b/src/text/text1.asm @@ -58,7 +58,7 @@ Text000f: ; 36382 (d:6382) db $03,$4c done -lbsText: ; 36385 (d:6385) +LbsText: ; 36385 (d:6385) text "lbs." done @@ -645,7 +645,7 @@ Text0091: ; 36fca (d:6fca) text "Player 1" done -Player2: ; 36fd4 (d:6fd4) +Player2Text: ; 36fd4 (d:6fd4) text "Player 2" done diff --git a/src/text/texta.asm b/src/text/text10.asm index 385fc69..385fc69 100644 --- a/src/text/texta.asm +++ b/src/text/text10.asm diff --git a/src/text/textb.asm b/src/text/text11.asm index b99e881..b99e881 100644 --- a/src/text/textb.asm +++ b/src/text/text11.asm diff --git a/src/text/textc.asm b/src/text/text12.asm index 37622bb..37622bb 100644 --- a/src/text/textc.asm +++ b/src/text/text12.asm diff --git a/src/text/textd.asm b/src/text/text13.asm index dea889e..6dec01b 100644 --- a/src/text/textd.asm +++ b/src/text/text13.asm @@ -185,5 +185,5 @@ RecycleDescription: ; 6495e (19:495e) done rept $3655 -db $ff + db $ff endr diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm index d2b5709..29fc093 100755 --- a/src/text/text_offsets.asm +++ b/src/text/text_offsets.asm @@ -18,7 +18,7 @@ TextOffsets:: ; 34000 (d:4000) textpointer WeightText textpointer PokemonText textpointer Text000f - textpointer lbsText + textpointer LbsText textpointer Text0011 textpointer Text0012 textpointer Text0013 @@ -148,7 +148,7 @@ TextOffsets:: ; 34000 (d:4000) textpointer Text008f textpointer Text0090 textpointer Text0091 - textpointer Player2 + textpointer Player2Text textpointer Text0093 textpointer Text0094 textpointer Text0095 |