diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-08-21 10:34:50 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-08-21 10:34:50 +0200 |
| commit | 9f1842c55f85470646e41611febe798f54d4c7c8 (patch) | |
| tree | 11cb8eefad86cc88f48741456175fff3c8738c66 /sym_common.txt | |
| parent | 705aa9e4568afe77c856066d595e0b219bd78e82 (diff) | |
| parent | e81986cd20dbe0d8a98da646d964310a066f1af5 (diff) | |
Merge branch 'master' into decompile_berry_blender
Diffstat (limited to 'sym_common.txt')
| -rw-r--r-- | sym_common.txt | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sym_common.txt b/sym_common.txt index fe851de25..4dd235faf 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -106,13 +106,7 @@ gUnknown_0300434C: @ 300434C .include "pokemon_1.o" .include "rng.o" - -@ egg_hatch - - .align 2 -gUnknown_0300481C: @ 300481C - .space 0x4 - + .include "egg_hatch.o" .include "load_save.o" @ trade |