diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-10-01 21:38:28 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-01 21:38:28 -0700 |
| commit | 3776a9fb4f0531535b0b5879dab7b3b6bd231736 (patch) | |
| tree | 8361facfccf7a68ff6b13c6a7b22771a4cf9d585 /src/scene/egg_hatch.c | |
| parent | 50dc4f429d4aa68e0365adc71d17e43a0dd7b843 (diff) | |
| parent | 97d2b14422fae0c8bc30440d136e86778a122964 (diff) | |
Merge pull request #427 from PikalaxALT/trade
decompile trade.s
Diffstat (limited to 'src/scene/egg_hatch.c')
| -rw-r--r-- | src/scene/egg_hatch.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/scene/egg_hatch.c b/src/scene/egg_hatch.c index f77c477ae..032dcd284 100644 --- a/src/scene/egg_hatch.c +++ b/src/scene/egg_hatch.c @@ -19,6 +19,7 @@ #include "naming_screen.h" #include "trig.h" #include "rng.h" +#include "trade.h" extern u8 ewram[]; extern struct SpriteTemplate gUnknown_02024E8C; @@ -40,10 +41,7 @@ struct EggHatchData* gEggHatchData; extern const u32 gUnknown_08D00000[]; extern const u32 gUnknown_08D00524[]; -extern const u32 gUnknown_0820CA98[]; -extern const u32 gUnknown_0820F798[]; extern const u16 gUnknown_08D004E0[]; //palette -extern const u16 gUnknown_0820C9F8[]; //palette extern const struct SpriteSheet sUnknown_0820A3B0; extern const struct SpriteSheet sUnknown_0820A3B8; extern const struct SpritePalette sUnknown_0820A3C0; @@ -512,7 +510,7 @@ static void CB2_EggHatch_0(void) u32 size; REG_BG2CNT = 0x4C06; - LoadPalette(&gUnknown_0820C9F8, 0x10, 0xA0); + LoadPalette(gUnknown_0820C9F8, 0x10, 0xA0); offsetRead = (u32)(&gUnknown_0820CA98); offsetWrite = (VRAM + 0x4000); |