summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorCameron Hall <camthesaxman@users.noreply.github.com>2017-09-12 11:45:32 -0500
committerGitHub <noreply@github.com>2017-09-12 11:45:32 -0500
commit0918cadae3c2ab22993099bd474d40f93a893d5d (patch)
treef7cc1a8648ea5aa1016eafa8e560362ffd3bd1f9 /data
parent6292b82503bf2eb611e5fea6f1710b25578d4fc8 (diff)
parent4d84618732acd1a67f8e15d5464ed20056ba5641 (diff)
Merge pull request #27 from DizzyEggg/decomp_script
decompile script.s
Diffstat (limited to 'data')
-rw-r--r--data/data3.s2
-rw-r--r--data/event_script_command_function_table.inc2
-rw-r--r--data/event_scripts.s2
3 files changed, 3 insertions, 3 deletions
diff --git a/data/data3.s b/data/data3.s
index 8e223c9f6..dac15b02e 100644
--- 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
diff --git a/data/event_script_command_function_table.inc b/data/event_script_command_function_table.inc
index 835e58f05..f44cdb7db 100644
--- 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
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 3bfd9fdfd..cef599407 100644
--- 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