diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-10-13 15:33:19 -0400 |
|---|---|---|
| committer | GriffinR <griffin.richards@comcast.net> | 2019-10-13 15:33:19 -0400 |
| commit | bb23128b77a01d3c39b11aef978acf437ae71974 (patch) | |
| tree | f6de6f5278cc10fba0c7ab159365d3ed16ab6bf9 /include/graphics.h | |
| parent | 144c5888a11115c93ed065c738a8ab395d71a798 (diff) | |
| parent | a081124a20896a0cc2ee4fac2df6d4b5440125ef (diff) | |
Merge conflict resolves into review changes
Diffstat (limited to 'include/graphics.h')
| -rw-r--r-- | include/graphics.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/graphics.h b/include/graphics.h index 5f5c579d2..a08d3760f 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4848,13 +4848,13 @@ extern const u32 gCableCarCord_Gfx[]; extern const u16 gCableCar_Pal[]; // Trade -extern const u16 gUnknown_08DDB3E4[]; -extern const u8 gUnknown_08DDB464[]; +extern const u16 gTradeMenu_Pal[]; +extern const u8 gTradeMenu_Gfx[]; extern const u16 gUnknown_08DDCF04[]; extern const u16 gTradeGba2_Pal[]; extern const u8 gTradeGba_Gfx[]; -extern const u16 gUnknown_08DDD704[]; -extern const u8 gUnknown_08DDC6E4[]; +extern const u16 gTradeMenuMonBox_Tilemap[]; +extern const u8 gTradeButtons_Gfx[]; extern const u16 gUnknown_08DDB444[]; // Party menu |