diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-13 10:03:07 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-13 10:03:07 +0200 |
| commit | a83d07e1b3134ff7c23a3ac39552f8285a0c09b4 (patch) | |
| tree | 0feb901cc447f2b76c006e54affa906977be8ab9 /data | |
| parent | 625b1b69493313224277dcfd957269cc9945eb84 (diff) | |
| parent | 0918cadae3c2ab22993099bd474d40f93a893d5d (diff) | |
Merge branch 'master' into decomp_berry
Diffstat (limited to 'data')
| -rw-r--r-- | data/data3.s | 2 | ||||
| -rw-r--r-- | data/event_script_command_function_table.inc | 2 | ||||
| -rw-r--r-- | data/event_scripts.s | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/data/data3.s b/data/data3.s index 9e326ea81..1d0d42668 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 |