diff options
| author | paul <nintendo6496@googlemail.com> | 2018-10-12 23:24:19 +0200 |
|---|---|---|
| committer | paul <nintendo6496@googlemail.com> | 2018-10-12 23:24:19 +0200 |
| commit | 0e8180b9bbf657a1c87d4be3ee559cd4115983c0 (patch) | |
| tree | 7fa6b98e3b3337fff7c69dc5bf9f86118cdaff5d /asm | |
| parent | 7ce6c69138a1de6f6e736a2b73b06cf1e7c889fb (diff) | |
clean up/redo previous labels
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/battle_1.s | 8 | ||||
| -rw-r--r-- | asm/egg_hatch.s | 4 | ||||
| -rw-r--r-- | asm/pokeball.s | 4 | ||||
| -rw-r--r-- | asm/trade.s | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/asm/battle_1.s b/asm/battle_1.s index 7ef803c32..cb1f6817c 100644 --- a/asm/battle_1.s +++ b/asm/battle_1.s @@ -298,7 +298,7 @@ LoadBattleTextboxAndBackground: @ 800F420 movs r1, 0xC0 lsls r1, 19 bl LZDecompressVram - ldr r1, _0800F458 @ =gMenuMapBin + ldr r1, _0800F458 @ =gFile_graphics_interface_menu_map_tilemap movs r0, 0 movs r2, 0 movs r3, 0 @@ -315,7 +315,7 @@ LoadBattleTextboxAndBackground: @ 800F420 bx r0 .align 2, 0 _0800F454: .4byte gUnknown_8D00000 -_0800F458: .4byte gMenuMapBin +_0800F458: .4byte gFile_graphics_interface_menu_map_tilemap _0800F45C: .4byte gUnknown_8D004D8 thumb_func_end LoadBattleTextboxAndBackground @@ -1393,7 +1393,7 @@ _0800FCEC: .align 2, 0 _0800FCF8: .4byte gUnknown_8D00000 _0800FCFC: - ldr r1, _0800FD10 @ =gMenuMapBin + ldr r1, _0800FD10 @ =gFile_graphics_interface_menu_map_tilemap movs r0, 0 movs r2, 0 movs r3, 0 @@ -1402,7 +1402,7 @@ _0800FCFC: bl CopyBgTilemapBufferToVram b _0800FD94 .align 2, 0 -_0800FD10: .4byte gMenuMapBin +_0800FD10: .4byte gFile_graphics_interface_menu_map_tilemap _0800FD14: ldr r0, _0800FD20 @ =gUnknown_8D004D8 movs r1, 0 diff --git a/asm/egg_hatch.s b/asm/egg_hatch.s index 884308c52..f18f3101d 100644 --- a/asm/egg_hatch.s +++ b/asm/egg_hatch.s @@ -648,7 +648,7 @@ _08047174: movs r2, 0 movs r3, 0 bl sub_80F696C - ldr r1, _080471A0 @ =gMenuMapBin + ldr r1, _080471A0 @ =gFile_graphics_interface_menu_map_tilemap movs r0, 0 movs r2, 0 movs r3, 0 @@ -660,7 +660,7 @@ _08047174: b _0804724A .align 2, 0 _0804719C: .4byte gUnknown_8D00000 -_080471A0: .4byte gMenuMapBin +_080471A0: .4byte gFile_graphics_interface_menu_map_tilemap _080471A4: .4byte gUnknown_8D004D8 _080471A8: ldr r0, _080471BC @ =gUnknown_826011C diff --git a/asm/pokeball.s b/asm/pokeball.s index a60a05040..11572c80f 100644 --- a/asm/pokeball.s +++ b/asm/pokeball.s @@ -2811,7 +2811,7 @@ _0804BF2C: bl GetSpriteTileStartByTag adds r1, r0, 0 lsls r1, 16 - ldr r0, _0804BF5C @ =gBallOpen4bpp + ldr r0, _0804BF5C @ =gFile_graphics_interface_ball_Open_sheet lsrs r1, 11 ldr r2, _0804BF60 @ =0x06010100 adds r1, r2 @@ -2824,7 +2824,7 @@ _0804BF48: _0804BF50: .4byte gUnknown_826056C _0804BF54: .4byte 0xffff0000 _0804BF58: .4byte gUnknown_82605CC -_0804BF5C: .4byte gBallOpen4bpp +_0804BF5C: .4byte gFile_graphics_interface_ball_Open_sheet _0804BF60: .4byte 0x06010100 thumb_func_end LoadBallGfx diff --git a/asm/trade.s b/asm/trade.s index 967e0f1fa..8a2041e5e 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -7850,7 +7850,7 @@ sub_80504CC: @ 80504CC movs r2, 0 movs r3, 0 bl sub_80F696C - ldr r0, _080505BC @ =gMenuMapBin + ldr r0, _080505BC @ =gFile_graphics_interface_menu_map_tilemap mov r8, r0 ldr r4, _080505C0 @ =gUnknown_201C000 adds r1, r4, 0 @@ -7897,7 +7897,7 @@ sub_80504CC: @ 80504CC .align 2, 0 _080505B4: .4byte gUnknown_826D1D4 _080505B8: .4byte gUnknown_8D00000 -_080505BC: .4byte gMenuMapBin +_080505BC: .4byte gFile_graphics_interface_menu_map_tilemap _080505C0: .4byte gUnknown_201C000 _080505C4: .4byte gUnknown_8D004D8 _080505C8: .4byte gUnknown_826D1BC |