Merge remote-tracking branch 'pret/master'
This commit is contained in:
12
data/data3.s
12
data/data3.s
@@ -5,17 +5,7 @@
|
||||
|
||||
.section .rodata
|
||||
|
||||
gBitTable:: @ 832A328
|
||||
.incbin "baserom.gba", 0x32a328, 0x80
|
||||
|
||||
gUnknown_0832A3A8:: @ 832A3A8
|
||||
.incbin "baserom.gba", 0x32a3a8, 0x18
|
||||
|
||||
gUnknown_0832A3C0:: @ 832A3C0
|
||||
.incbin "baserom.gba", 0x32a3c0, 0x18
|
||||
|
||||
gUnknown_0832A3D8:: @ 832A3D8
|
||||
.incbin "baserom.gba", 0x32a3d8, 0xa00
|
||||
|
||||
@ 832ADD8
|
||||
.include "data/egg_moves.inc"
|
||||
@@ -1208,7 +1198,7 @@ gUnknown_0851017C:: @ 851017C
|
||||
gUnknown_0851021C:: @ 851021C
|
||||
.incbin "baserom.gba", 0x51021c, 0xa0
|
||||
|
||||
gUnknown_085102BC:: @ 85102BC
|
||||
gNullScriptPtr:: @ 85102BC
|
||||
.incbin "baserom.gba", 0x5102bc, 0x4
|
||||
|
||||
gUnknown_085102C0:: @ 85102C0
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
.align 2
|
||||
gEventScriptCommandFunctionTable:: @ 81DB67C
|
||||
gScriptCmdTable:: @ 81DB67C
|
||||
.4byte s00_nop
|
||||
.4byte s01_nop
|
||||
.4byte s02_end
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
@ 81DB67C
|
||||
.include "data/event_script_command_function_table.inc"
|
||||
|
||||
gUnknown_081DBA08:: @ 81DBA08
|
||||
gScriptCmdTableEnd:: @ 81DBA08
|
||||
.incbin "baserom.gba", 0x1dba08, 0x4
|
||||
|
||||
gSpecialVars:: @ 81DBA0C
|
||||
|
||||
Reference in New Issue
Block a user