Merge branch 'master' into pokemon
This commit is contained in:
+3
-13
@@ -835,17 +835,8 @@ gFieldEffectArguments: @ 20386E0
|
||||
gUnknown_2039620: @ 2039620
|
||||
.space 0x4
|
||||
|
||||
gUnknown_2039624: @ 2039624
|
||||
.space 0x14
|
||||
|
||||
gUnknown_2039638: @ 2039638
|
||||
.space 0x2
|
||||
|
||||
gUnknown_203963A: @ 203963A
|
||||
.space 0x1A
|
||||
|
||||
gUnknown_2039654: @ 2039654
|
||||
.space 0x150
|
||||
gTrainerCards: @ 2039624
|
||||
.space 0x180
|
||||
|
||||
gUnknown_20397A4: @ 20397A4
|
||||
.space 0x4
|
||||
@@ -1055,8 +1046,7 @@ gUnknown_2039A1A: @ 2039A1A
|
||||
gUnknown_2039A1B: @ 2039A1B
|
||||
.space 0x1
|
||||
|
||||
gUnknown_2039A1C: @ 2039A1C
|
||||
.space 0x4
|
||||
.include "src/battle_records.o"
|
||||
|
||||
gUnknown_2039A20: @ 2039A20
|
||||
.space 0x4
|
||||
|
||||
Reference in New Issue
Block a user