diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2016-09-03 00:41:00 +0100 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2016-09-03 00:41:00 +0100 |
| commit | f627b8161b1db9b8b66bdf11b6fb2ef6df898c1c (patch) | |
| tree | d9e928b02f1d8e115b2a100baafe2093a5193ed0 /asm | |
| parent | a8274ed560fb70760526dee2bc735c9aefd0c191 (diff) | |
| parent | f795204024c4c88f2c494682bd6468bcb24ebfae (diff) | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/rom5.s | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/asm/rom5.s b/asm/rom5.s index 96fa15924..816c5f0a8 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -18434,7 +18434,7 @@ _08083C34: .4byte 0x0202e8d0 _08083C38: .4byte 0x020231cc _08083C3C: .4byte 0x03002978 _08083C40: .4byte 0x020232cc -_08083C44: .4byte gUnknown_0839B21C +_08083C44: .4byte gTrainerCardColorNames _08083C48: movs r0, 0 _08083C4A: @@ -186102,7 +186102,7 @@ _080D58E4: .4byte gSpriteTemplate_83D96C4 _080D58E8: .4byte 0x02020004 _080D58EC: .4byte 0x000003ff _080D58F0: .4byte 0xfffffc00 -_080D58F4: .4byte gUnknown_083D96DE +_080D58F4: .4byte gUnknown_083D96DC + 0x2 _080D58F8: .4byte 0x03004b28 thumb_func_end sub_80D57C4 @@ -224362,7 +224362,7 @@ _080E809E: .align 2, 0 _080E80C4: .4byte 0x0200ae14 _080E80C8: .4byte 0xffff61f8 -_080E80CC: .4byte gUnknown_083DB678 +_080E80CC: .4byte gMysteryEventPhrase _080E80D0: adds r4, 0x1 adds r3, 0x1 @@ -224474,8 +224474,8 @@ _080E818A: .align 2, 0 _080E8198: .4byte 0x0200ae6e _080E819C: .4byte 0xffff6192 -_080E81A0: .4byte gUnknown_083DB680 -_080E81A4: .4byte gUnknown_083DB682 +_080E81A0: .4byte gBerryMasterWifePhrases +_080E81A4: .4byte gBerryMasterWifePhrases + 0x2 _080E81A8: lsls r0, r4, 16 lsrs r5, r0, 16 |