diff options
| author | YamaArashi <YamaArashi@users.noreply.github.com> | 2017-05-01 06:12:10 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-01 06:12:10 -0700 |
| commit | b9007ffbbff624499737452884c08b960d4f7b3e (patch) | |
| tree | dec3629b7e46c3b61d4a5502442786514c758541 /asm | |
| parent | 0e479f7e0b0301fbf37bd4bf9c7ff39dae815050 (diff) | |
| parent | 825d40ea7d8a15e0c5af4dbc18e81519060d6dad (diff) | |
Merge pull request #251 from marijnvdwerf/include/baserom-1
Various includes
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/region_map.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/region_map.s b/asm/region_map.s index c6953705c..8113afe64 100644 --- a/asm/region_map.s +++ b/asm/region_map.s @@ -2623,9 +2623,9 @@ sub_80FBCF0: @ 80FBCF0 movs r2, 0 strh r3, [r0] strh r1, [r0, 0x2] - ldr r0, _080FBDA4 @ =gUnknown_083E7708 + ldr r0, _080FBDA4 @ =gOamData_083E7708 str r0, [sp, 0x4] - ldr r0, _080FBDA8 @ =gUnknown_083E7718 + ldr r0, _080FBDA8 @ =gSpriteAnimTable_083E7718 str r0, [sp, 0x8] str r2, [sp, 0xC] ldr r0, _080FBDAC @ =gDummySpriteAffineAnimTable @@ -2685,8 +2685,8 @@ _080FBD42: _080FBD98: .4byte gRegionMapBrendanIconTiles _080FBD9C: .4byte gRegionMapBrendanIconPalette _080FBDA0: .4byte 0xffff0000 -_080FBDA4: .4byte gUnknown_083E7708 -_080FBDA8: .4byte gUnknown_083E7718 +_080FBDA4: .4byte gOamData_083E7708 +_080FBDA8: .4byte gSpriteAnimTable_083E7718 _080FBDAC: .4byte gDummySpriteAffineAnimTable _080FBDB0: .4byte SpriteCallbackDummy _080FBDB4: .4byte gSaveBlock2 |