diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-09-16 03:21:42 -0500 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-09-16 03:21:42 -0500 |
| commit | 6ba1dc8169f148adc9f7f68fec0490dc017c892a (patch) | |
| tree | 7dfe1cc18efed9adff4c24f279586b369554b434 /data | |
| parent | 448497dfbbc1157c640bc09745454b3c97dc947e (diff) | |
| parent | 78009a835f840864b3d30af00c65a745f75b80fa (diff) | |
Merge remote-tracking branch 'pret/master'
Diffstat (limited to 'data')
| -rw-r--r-- | data/data3.s | 12 | ||||
| -rw-r--r-- | data/event_script_command_function_table.inc | 2 | ||||
| -rw-r--r-- | data/event_scripts.s | 2 |
3 files changed, 3 insertions, 13 deletions
diff --git a/data/data3.s b/data/data3.s index 02f76d210..efb03a954 100644 --- a/data/data3.s +++ b/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 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 |