Merge branch 'master' of github.com:pret/pokefirered into field_effect
This commit is contained in:
@@ -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
|
||||
+3
-3
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user