diff options
| author | YamaArashi <YamaArashi@users.noreply.github.com> | 2016-09-03 13:45:05 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-03 13:45:05 -0700 |
| commit | dbaf6e125020cac5d897983dc9dfbf8d3d74e589 (patch) | |
| tree | 2cf7c01a63ac97fc9e18e2b31bef0668ce72c92d /asm/rom4.s | |
| parent | fc23707dc64abdc3219f72e7cb7992890737d00d (diff) | |
| parent | 48711cdf9aed3512b7229e7c8488b3c05ff64ff9 (diff) | |
Merge pull request #38 from TwitchPlaysPokemon/master
Diffstat (limited to 'asm/rom4.s')
| -rw-r--r-- | asm/rom4.s | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/asm/rom4.s b/asm/rom4.s index 14fe79e77..f125cead0 100644 --- a/asm/rom4.s +++ b/asm/rom4.s @@ -41238,7 +41238,7 @@ sub_8065348: @ 8065348 pop {r0} bx r0 .align 2, 0 -_08065364: .4byte gUnknown_08EA0108 +_08065364: .4byte gTextWindowMainFrame_Gfx _08065368: .4byte 0x030005ae thumb_func_end sub_8065348 @@ -58703,14 +58703,14 @@ _0806D7BA: bx r1 .align 2, 0 _0806D7C4: .4byte 0x00007fff -_0806D7C8: .4byte gUnknown_08E71354 -_0806D7CC: .4byte gUnknown_08E71788 +_0806D7C8: .4byte gPartyMenuMisc_Gfx +_0806D7CC: .4byte gPartyMenuMisc_Tilemap _0806D7D0: .4byte 0x06003800 -_0806D7D4: .4byte gUnknown_08E716A0 +_0806D7D4: .4byte gPartyMenuMisc_Pal _0806D7D8: .4byte gFontDefaultPalette -_0806D7DC: .4byte gUnknown_08E71894 +_0806D7DC: .4byte gPartyMenuHpBar_Gfx _0806D7E0: .4byte 0x06006000 -_0806D7E4: .4byte gUnknown_08E71934 +_0806D7E4: .4byte gPartyMenuOrderText_Gfx _0806D7E8: .4byte 0x06006180 _0806D7EC: .4byte gStatusGfx_Icons _0806D7F0: .4byte 0x06007180 |