Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_item_menu

2018-02-12 14:00:47 -05:00
parent f81c52b56e a4787bc06a
commit 4ac064bbaf
130 changed files with 17694 additions and 29503 deletions
@@ -1,206 +1,11 @@
 	.space 0x8
-
-gKeyRepeatStartDelay: @ 30022B0
-	.space 0x4
-
-gUnknown_030022B4: @ 30022B4
-	.space 0xC
-
-gMain: @ 30022C0
-	.space 0x2C
-
-gUnknown_030022EC: @ 30022EC
-	.space 0xC
-
-gUnknown_030022F8: @ 30022F8
-	.space 0x200
-
-gUnknown_030024F8: @ 30024F8
-	.space 0x200
-
-gUnknown_030026F8: @ 30026F8
-	.space 0x4
-
-gKeyRepeatContinueDelay: @ 30026FC
-	.space 0x4
-
-gSoftResetDisabled: @ 3002700
-	.space 0x10
-
-gIntrTable: @ 3002710
-	.space 0x38
-
-gUnknown_03002748: @ 3002748
-	.space 0x8
-
-IntrMain_Buffer: @ 3002750
-	.space 0x800
-
-gPcmDmaCounter: @ 3002F50
-	.space 0x4
-
+	.include "main.o"
 	.include "bg.o"
-
-    .align 4
-gUnknown_03002F60: @ 3002F60
-	.space 0x10
-
-gUnknown_03002F70: @ 3002F70
-	.space 0x10
-
+	.include "window.o"
 	.include "text.o"
 	.include "sprite.o"
-
-gUnknown_03003020: @ 3003020
-	.space 0xC
-
-gUnknown_0300302C: @ 300302C
-	.space 0x4
-
-gUnknown_03003030: @ 3003030
-	.space 0x3C
-
-gUnknown_0300306C: @ 300306C
-	.space 0x4
-
-gUnknown_03003070: @ 3003070
-	.space 0x8
-
-gUnknown_03003078: @ 3003078
-	.space 0x4
-
-gUnknown_0300307C: @ 300307C
-	.space 0x8
-
-gUnknown_03003084: @ 3003084
-	.space 0xC
-
-gRecvCmds: @ 3003090
-	.space 0x2
-
-gUnknown_03003092: @ 3003092
-	.space 0x2
-
-gUnknown_03003094: @ 3003094
-	.space 0x4C
-
-gLinkStatus: @ 30030E0
-	.space 0x4
-
-gUnknown_030030E4: @ 30030E4
-	.space 0x4
-
-gUnknown_030030E8: @ 30030E8
-	.space 0x4
-
-gUnknown_030030EC: @ 30030EC
-	.space 0x4
-
-gUnknown_030030F0: @ 30030F0
-	.space 0x4
-
-gUnknown_030030F4: @ 30030F4
-	.space 0x4
-
-gUnknown_030030F8: @ 30030F8
-	.space 0x4
-
-gLinkVSyncDisabled: @ 30030FC
-	.space 0x4
-
-gUnknown_03003100: @ 3003100
-	.space 0x10
-
-gSendCmd: @ 3003110
-	.space 0x10
-
-gUnknown_03003120: @ 3003120
-	.space 0x4
-
-gReceivedRemoteLinkPlayers: @ 3003124
-	.space 0xC
-
-gUnknown_03003130: @ 3003130
-	.space 0x10
-
-gUnknown_03003140: @ 3003140
-	.space 0x4
-
-gUnknown_03003144: @ 3003144
-	.space 0x4
-
-gUnknown_03003148: @ 3003148
-	.space 0x8
-
-gUnknown_03003150: @ 3003150
-	.space 0x10
-
-gUnknown_03003160: @ 3003160
-	.space 0x10
-
-gUnknown_03003170: @ 3003170
-	.space 0x4
-
-gUnknown_03003174: @ 3003174
-	.space 0xFBC
-
-gUnknown_03004130: @ 3004130
-	.space 0x4
-
-gUnknown_03004134: @ 3004134
-	.space 0xC
-
-gUnknown_03004140: @ 3004140
-	.space 0x10
-
-gUnknown_03004150: @ 3004150
-	.space 0x40
-
-gUnknown_03004190: @ 3004190
-	.space 0xE70
-
-gUnknown_03005000: @ 3005000
-	.space 0x14
-
-gUnknown_03005014: @ 3005014
-	.space 0x58
-
-gUnknown_0300506C: @ 300506C
-	.space 0x2
-
-gUnknown_0300506E: @ 300506E
-	.space 0x76
-
-gUnknown_030050E4: @ 30050E4
-	.space 0xE
-
-gUnknown_030050F2: @ 30050F2
-	.space 0x18
-
-gUnknown_0300510A: @ 300510A
-	.space 0x1A
-
-gUnknown_03005124: @ 3005124
-	.space 0x8C4
-
-gUnknown_030059E8: @ 30059E8
-	.space 0x29F
-
-gUnknown_03005C87: @ 3005C87
-	.space 0x47
-
-gUnknown_03005CCE: @ 3005CCE
-	.space 0x3
-
-gUnknown_03005CD1: @ 3005CD1
-	.space 0x4
-
-gUnknown_03005CD5: @ 3005CD5
-	.space 0x9
-
-gUnknown_03005CDE: @ 3005CDE
-	.space 0x1A
-
+	.include "link.o"
+	.include "link_rfu.o"
    .include "rtc.o"
    .include "battle_main.o"