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

Events and some WRAM cleanup

Browse Source
This commit is contained in:
PikalaxALT
2015-12-18 20:07:09 -05:00
parent d644406f61
commit 3d36f1a837
60 changed files with 752 additions and 724 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
text/battle.asm
View File

@@ -1,4 +1,4 @@
BattleText_PlayerPickuedUpPayDayMoney: ; 0x80730
BattleText_PlayerPickedUpPayDayMoney: ; 0x80730
text "<PLAYER> picked up"
line "¥@"
deciram wPayDayMoney, 3, 6

14
text/common_2.asm
View File

@@ -600,7 +600,7 @@ UnknownText_0x1bc83a: ; 0x1bc83a
UnknownText_0x1bc84b: ; 0x1bc84b
text ""
line "OAK: @"
text_from_ram wd050
text_from_ram wMonOrItemNameBuffer
db "@"
; 0x1bc857
@@ -1307,7 +1307,7 @@ Text_EnemyWithdrew: ; 0x1bcf9c
Text_EnemyUsedOn: ; 0x1bcfaf
text "<ENEMY>"
line "used @"
text_from_ram wd050
text_from_ram wMonOrItemNameBuffer
text ""
cont "on @"
text_from_ram EnemyMonNick
@@ -1604,7 +1604,7 @@ UnknownText_0x1bd407: ; 0x1bd407
UnknownText_0x1bd429: ; 0x1bd429
text "<PLAYER> traded"
line "@"
text_from_ram wd050
text_from_ram wMonOrItemNameBuffer
text " for"
cont "@"
text_from_ram StringBuffer2
@@ -1714,7 +1714,7 @@ UnknownText_0x1bd5cc: ; 0x1bd5cc
UnknownText_0x1bd5f4: ; 0x1bd5f4
text "Hi! The @"
text_from_ram wd050
text_from_ram wMonOrItemNameBuffer
text ""
line "you traded me is"
cont "doing great!"
@@ -1722,7 +1722,7 @@ UnknownText_0x1bd5f4: ; 0x1bd5f4
; 0x1bd621
UnknownText_0x1bd621: ; 0x1bd621
text_from_ram wd050
text_from_ram wMonOrItemNameBuffer
text "'s cute,"
line "but I don't have"
@@ -1759,7 +1759,7 @@ UnknownText_0x1bd6cd: ; 0x1bd6cd
text "Wow! Thank you!"
line "I always wanted"
cont "@"
text_from_ram wd050
text_from_ram wMonOrItemNameBuffer
text "!"
done
; 0x1bd6f5
@@ -1772,7 +1772,7 @@ UnknownText_0x1bd6f5: ; 0x1bd6f5
cont "traded you doing?"
para "Your @"
text_from_ram wd050
text_from_ram wMonOrItemNameBuffer
text "'s"
line "so cute!"
done

10
text/common_3.asm
View File

@@ -1641,7 +1641,7 @@ UnknownText_0x1c1b03: ; 1c1b03
UnknownText_0x1c1b2c: ; 1c1b2c
text "Took @"
text_from_ram wd050_MonNick
text_from_ram wMonOrItemNameBuffer
text "'s"
line "@"
text_from_ram StringBuffer1
@@ -1656,7 +1656,7 @@ UnknownText_0x1c1b2c: ; 1c1b2c
UnknownText_0x1c1b57: ; 1c1b57
text "Made @"
text_from_ram wd050_MonNick
text_from_ram wMonOrItemNameBuffer
text ""
line "hold @"
text_from_ram StringBuffer2
@@ -1671,7 +1671,7 @@ UnknownText_0x1c1b6f: ; 1c1b6f
; 1c1b8e
UnknownText_0x1c1b8e: ; 1c1b8e
text_from_ram wd050_MonNick
text_from_ram wMonOrItemNameBuffer
text " isn't"
line "holding anything."
prompt
@@ -1688,13 +1688,13 @@ UnknownText_0x1c1bc4: ; 1c1bc4
text_from_ram StringBuffer1
text ""
line "from @"
text_from_ram wd050_MonNick
text_from_ram wMonOrItemNameBuffer
text "."
prompt
; 1c1bdc
UnknownText_0x1c1bdc: ; 1c1bdc
text_from_ram wd050_MonNick
text_from_ram wMonOrItemNameBuffer
text " is"
line "already holding"

12
text/common_4.asm
View File

@@ -1045,7 +1045,7 @@ UnknownText_0x1c564a: ; 0x1c564a
; 0x1c5660
UnknownText_0x1c5660: ; 0x1c5660
text_from_ram wd050_MonNick
text_from_ram wMonOrItemNameBuffer
text " learned"
line "@"
text_from_ram StringBuffer2
@@ -1074,7 +1074,7 @@ UnknownText_0x1c5699: ; 0x1c5699
; 0x1c56af
UnknownText_0x1c56af: ; 0x1c56af
text_from_ram wd050_MonNick
text_from_ram wMonOrItemNameBuffer
text ""
line "did not learn"
cont "@"
@@ -1084,7 +1084,7 @@ UnknownText_0x1c56af: ; 0x1c56af
; 0x1c56c9
UnknownText_0x1c56c9: ; 0x1c56c9
text_from_ram wd050_MonNick
text_from_ram wMonOrItemNameBuffer
text " is"
line "trying to learn"
cont "@"
@@ -1092,7 +1092,7 @@ UnknownText_0x1c56c9: ; 0x1c56c9
text "."
para "But @"
text_from_ram wd050_MonNick
text_from_ram wMonOrItemNameBuffer
text ""
line "can't learn more"
cont "than four moves."
@@ -1120,7 +1120,7 @@ UnknownText_0x1c574e: ; 0x1c574e
interpret_data
text ""
para "@"
text_from_ram wd050_MonNick
text_from_ram wMonOrItemNameBuffer
text " forgot"
line "@"
text_from_ram StringBuffer1
@@ -1385,7 +1385,7 @@ UnknownText_0x1c5b37: ; 0x1c5b37
; 0x1c5b38
UnknownText_0x1c5b38: ; 0x1c5b38
text_from_ram wd050
text_from_ram wMonOrItemNameBuffer
text " was"
line "sent to BILL's PC."
prompt