diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-03-02 10:26:39 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-03-02 10:34:35 -0500 |
| commit | 8ff7977b8962e0373cb3c34bda25645082149170 (patch) | |
| tree | a64c2302bc6c6163b57249d46f7264a6c994229d /data | |
| parent | 968ac4742adbc86148e344c7c0cb9b9f27addc6c (diff) | |
| parent | fc51c579d4a422b168a4efb88b5f15164fbb7db0 (diff) | |
Merge branch 'master' into doc-fourisland
Diffstat (limited to 'data')
| -rw-r--r-- | data/cable_club.s | 15 | ||||
| -rw-r--r-- | data/specials.inc | 6 |
2 files changed, 3 insertions, 18 deletions
diff --git a/data/cable_club.s b/data/cable_club.s deleted file mode 100644 index 8ea8b9167..000000000 --- a/data/cable_club.s +++ /dev/null @@ -1,15 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnknown_83C6AB0:: @ 83C6AB0 - .byte 0, 16, 11, 11, 2, 15 - .2byte 0x125 - -gUnknown_83C6AB8:: @ 83C6AB8 - .4byte gUnknown_841DF8B - .4byte gUnknown_841DF92 - .4byte gUnknown_841DF99 - .4byte gUnknown_841DFA0 diff --git a/data/specials.inc b/data/specials.inc index 3689ebd5f..cdb14147e 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -38,12 +38,12 @@ gSpecials:: @ 815FD60 def_special nullsub_75 def_special TryBattleLinkup def_special TryTradeLinkup - def_special sub_80810F4 + def_special TryRecordMixLinkup def_special CloseLink def_special EnterColosseumPlayerSpot def_special EnterTradeSeat - def_special sub_80819B8 - def_special sub_808130C + def_special Special_WiredCableClubTrade + def_special Special_CableClub_AskSaveTheGame def_special nullsub_75 def_special nullsub_75 def_special nullsub_75 |