diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-01 17:42:36 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-01 17:42:36 -0400 |
| commit | d42e9f5b72de3d505622b0eb360f5fdfd388e26b (patch) | |
| tree | 1cda7f9f3fef65c6dfce63c5baf3d9dc705a6242 /text.asm | |
| parent | 1d63499fa73f028a5409ff358caedc8972a57552 (diff) | |
Attempt to make yellow buildable, part 3
Diffstat (limited to 'text.asm')
| -rw-r--r-- | text.asm | 12 |
1 files changed, 0 insertions, 12 deletions
@@ -2089,11 +2089,7 @@ _ColosseumVersionText:: prompt _Char00Text:: -<<<<<<< HEAD TX_NUM hSpriteIndexOrTextID,1,2 -======= - TX_NUM $FF8C,1,2 ->>>>>>> 6bdf0c5... Remove (incorrect) address comments text " error." done @@ -2493,19 +2489,11 @@ _DreamWasEatenText:: line "dream was eaten!" prompt -<<<<<<< HEAD _TradeCenterText1:: text "!" done _ColosseumText1:: -======= -_BattleCenterMText1:: - text "!" - done - -_TradeCenterMText1:: ->>>>>>> 6bdf0c5... Remove (incorrect) address comments text "!" done |