diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-12 23:02:08 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-12 23:02:08 +0200 |
| commit | c9603c40d86053a571023845b5c32c8ff381cabe (patch) | |
| tree | d79f28da3ffd3c2eff489c62072204395cccfc2b /data/data3.s | |
| parent | 8731a8caa5602a516972329f7aa0624794b29ff2 (diff) | |
| parent | 0918cadae3c2ab22993099bd474d40f93a893d5d (diff) | |
Merge branch 'master' into decomp_pokemon
Diffstat (limited to 'data/data3.s')
| -rw-r--r-- | data/data3.s | 2 |
1 files changed, 1 insertions, 1 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 |