Merge branch 'master' into battle

This commit is contained in:
jiangzhengwenjz
2019-10-24 01:42:52 +08:00
1127 changed files with 79056 additions and 34785 deletions
+5 -66
View File
@@ -159,73 +159,12 @@ gUnknown_203709A: @ 203709A
gUnknown_203709C: @ 203709C
.space 0x4
.include "src/script.o"
.include "src/scrcmd.o"
.align 2
gSpecialVar_0x8000: @ 20370B8
.space 0x2
gSpecialVar_0x8001: @ 20370BA
.space 0x2
gSpecialVar_0x8002: @ 20370BC
.space 0x2
gSpecialVar_0x8003: @ 20370BE
.space 0x2
gSpecialVar_0x8004: @ 20370C0
.space 0x2
gSpecialVar_0x8005: @ 20370C2
.space 0x2
gSpecialVar_0x8006: @ 20370C4
.space 0x2
gSpecialVar_0x8007: @ 20370C6
.space 0x2
gSpecialVar_0x8008: @ 20370C8
.space 0x2
gSpecialVar_0x8009: @ 20370CA
.space 0x2
gSpecialVar_0x800A: @ 20370CC
.space 0x2
gSpecialVar_0x800B: @ 20370CE
.space 0x2
gSpecialVar_Result: @ 20370D0
.space 0x2
gSpecialVar_LastTalked: @ 20370D2
.space 0x2
gSpecialVar_Facing: @ 20370D4
.space 0x2
gSpecialVar_MonBoxId: @ 20370D6
.space 0x2
gSpecialVar_MonBoxPos: @ 20370D8
.space 0x2
gUnknown_20370DA: @ 20370DA
.space 0x2
gUnknown_20370DC: @ 20370DC
.space 0x2
gUnknown_20370DE: @ 20370DE
.space 0x2
gUnknown_20370E0: @ 20370E0
.space 0x10
.include "src/script.o"
.align 2
.include "src/scrcmd.o"
.align 2
.include "src/event_data.o"
.align 2
.include "src/start_menu.o"
.align 2