dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clean up/redo previous labels

Browse Source
This commit is contained in:
paul
2018-10-12 23:24:19 +02:00
parent 7ce6c69138
commit 0e8180b9bb
5 changed files with 229 additions and 756 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_1.s
+4 -4
View File
@@ -298,7 +298,7 @@ LoadBattleTextboxAndBackground: @ 800F420
movs r1, 0xC0 movs r1, 0xC0
lsls r1, 19 lsls r1, 19
bl LZDecompressVram bl LZDecompressVram
ldr r1, _0800F458 @ =gMenuMapBin ldr r1, _0800F458 @ =gFile_graphics_interface_menu_map_tilemap
movs r0, 0 movs r0, 0
movs r2, 0 movs r2, 0
movs r3, 0 movs r3, 0
@@ -315,7 +315,7 @@ LoadBattleTextboxAndBackground: @ 800F420
bx r0 bx r0
.align 2, 0 .align 2, 0
_0800F454: .4byte gUnknown_8D00000 _0800F454: .4byte gUnknown_8D00000
_0800F458: .4byte gMenuMapBin _0800F458: .4byte gFile_graphics_interface_menu_map_tilemap
_0800F45C: .4byte gUnknown_8D004D8 _0800F45C: .4byte gUnknown_8D004D8
thumb_func_end LoadBattleTextboxAndBackground thumb_func_end LoadBattleTextboxAndBackground
@@ -1393,7 +1393,7 @@ _0800FCEC:
.align 2, 0 .align 2, 0
_0800FCF8: .4byte gUnknown_8D00000 _0800FCF8: .4byte gUnknown_8D00000
_0800FCFC: _0800FCFC:
ldr r1, _0800FD10 @ =gMenuMapBin ldr r1, _0800FD10 @ =gFile_graphics_interface_menu_map_tilemap
movs r0, 0 movs r0, 0
movs r2, 0 movs r2, 0
movs r3, 0 movs r3, 0
@@ -1402,7 +1402,7 @@ _0800FCFC:
bl CopyBgTilemapBufferToVram bl CopyBgTilemapBufferToVram
b _0800FD94 b _0800FD94
.align 2, 0 .align 2, 0
_0800FD10: .4byte gMenuMapBin _0800FD10: .4byte gFile_graphics_interface_menu_map_tilemap
_0800FD14: _0800FD14:
ldr r0, _0800FD20 @ =gUnknown_8D004D8 ldr r0, _0800FD20 @ =gUnknown_8D004D8
movs r1, 0 movs r1, 0
asm/egg_hatch.s
+2 -2
View File
@@ -648,7 +648,7 @@ _08047174:
movs r2, 0 movs r2, 0
movs r3, 0 movs r3, 0
bl sub_80F696C bl sub_80F696C
ldr r1, _080471A0 @ =gMenuMapBin ldr r1, _080471A0 @ =gFile_graphics_interface_menu_map_tilemap
movs r0, 0 movs r0, 0
movs r2, 0 movs r2, 0
movs r3, 0 movs r3, 0
@@ -660,7 +660,7 @@ _08047174:
b _0804724A b _0804724A
.align 2, 0 .align 2, 0
_0804719C: .4byte gUnknown_8D00000 _0804719C: .4byte gUnknown_8D00000
_080471A0: .4byte gMenuMapBin _080471A0: .4byte gFile_graphics_interface_menu_map_tilemap
_080471A4: .4byte gUnknown_8D004D8 _080471A4: .4byte gUnknown_8D004D8
_080471A8: _080471A8:
ldr r0, _080471BC @ =gUnknown_826011C ldr r0, _080471BC @ =gUnknown_826011C
asm/pokeball.s
+2 -2
View File
@@ -2811,7 +2811,7 @@ _0804BF2C:
bl GetSpriteTileStartByTag bl GetSpriteTileStartByTag
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 16 lsls r1, 16
ldr r0, _0804BF5C @ =gBallOpen4bpp ldr r0, _0804BF5C @ =gFile_graphics_interface_ball_Open_sheet
lsrs r1, 11 lsrs r1, 11
ldr r2, _0804BF60 @ =0x06010100 ldr r2, _0804BF60 @ =0x06010100
adds r1, r2 adds r1, r2
@@ -2824,7 +2824,7 @@ _0804BF48:
_0804BF50: .4byte gUnknown_826056C _0804BF50: .4byte gUnknown_826056C
_0804BF54: .4byte 0xffff0000 _0804BF54: .4byte 0xffff0000
_0804BF58: .4byte gUnknown_82605CC _0804BF58: .4byte gUnknown_82605CC
_0804BF5C: .4byte gBallOpen4bpp _0804BF5C: .4byte gFile_graphics_interface_ball_Open_sheet
_0804BF60: .4byte 0x06010100 _0804BF60: .4byte 0x06010100
thumb_func_end LoadBallGfx thumb_func_end LoadBallGfx
asm/trade.s
+2 -2
View File
@@ -7850,7 +7850,7 @@ sub_80504CC: @ 80504CC
movs r2, 0 movs r2, 0
movs r3, 0 movs r3, 0
bl sub_80F696C bl sub_80F696C
ldr r0, _080505BC @ =gMenuMapBin ldr r0, _080505BC @ =gFile_graphics_interface_menu_map_tilemap
mov r8, r0 mov r8, r0
ldr r4, _080505C0 @ =gUnknown_201C000 ldr r4, _080505C0 @ =gUnknown_201C000
adds r1, r4, 0 adds r1, r4, 0
@@ -7897,7 +7897,7 @@ sub_80504CC: @ 80504CC
.align 2, 0 .align 2, 0
_080505B4: .4byte gUnknown_826D1D4 _080505B4: .4byte gUnknown_826D1D4
_080505B8: .4byte gUnknown_8D00000 _080505B8: .4byte gUnknown_8D00000
_080505BC: .4byte gMenuMapBin _080505BC: .4byte gFile_graphics_interface_menu_map_tilemap
_080505C0: .4byte gUnknown_201C000 _080505C0: .4byte gUnknown_201C000
_080505C4: .4byte gUnknown_8D004D8 _080505C4: .4byte gUnknown_8D004D8
_080505C8: .4byte gUnknown_826D1BC _080505C8: .4byte gUnknown_826D1BC
data/graphics.s
+130 -657
View File
File diff suppressed because it is too large Load Diff