Merge branch 'master' into decomp_berry

2017-09-13 10:03:07 +02:00
parent 625b1b6949 0918cadae3
commit a83d07e1b3
53 changed files with 1012 additions and 1446 deletions
--- a/data/data3.s
+++ b/data/data3.s
@@ -1208,7 +1208,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
--- a/data/event_script_command_function_table.inc
+++ b/data/event_script_command_function_table.inc
@@ -1,5 +1,5 @@
 	.align 2
-gEventScriptCommandFunctionTable:: @ 81DB67C
+gScriptCmdTable:: @ 81DB67C
 	.4byte s00_nop
 	.4byte s01_nop
 	.4byte s02_end
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -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