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

fetch some graphics

Browse Source
This commit is contained in:
paul
2018-10-03 19:34:04 +02:00
parent 3cb2afce7e
commit d60d4a03bc
6 changed files with 161 additions and 26 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
lsls r1, 19
bl LZDecompressVram
ldr r1, _0800F458 @ =gUnknown_8D0051C
ldr r1, _0800F458 @ =gMenuMapBin
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 gUnknown_8D0051C
_0800F458: .4byte gMenuMapBin
_0800F45C: .4byte gUnknown_8D004D8
thumb_func_end LoadBattleTextboxAndBackground
@@ -1393,7 +1393,7 @@ _0800FCEC:
.align 2, 0
_0800FCF8: .4byte gUnknown_8D00000
_0800FCFC:
ldr r1, _0800FD10 @ =gUnknown_8D0051C
ldr r1, _0800FD10 @ =gMenuMapBin
movs r0, 0
movs r2, 0
movs r3, 0
@@ -1402,7 +1402,7 @@ _0800FCFC:
bl CopyBgTilemapBufferToVram
b _0800FD94
.align 2, 0
_0800FD10: .4byte gUnknown_8D0051C
_0800FD10: .4byte gMenuMapBin
_0800FD14:
ldr r0, _0800FD20 @ =gUnknown_8D004D8
movs r1, 0
asm/egg_hatch.s
+2 -2
View File
@@ -648,7 +648,7 @@ _08047174:
movs r2, 0
movs r3, 0
bl sub_80F696C
ldr r1, _080471A0 @ =gUnknown_8D0051C
ldr r1, _080471A0 @ =gMenuMapBin
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 gUnknown_8D0051C
_080471A0: .4byte gMenuMapBin
_080471A4: .4byte gUnknown_8D004D8
_080471A8:
ldr r0, _080471BC @ =gUnknown_826011C
asm/link.s
+4 -4
View File
@@ -3354,14 +3354,14 @@ _0800AE18: .4byte sub_800AF2C
sub_800AE1C: @ 800AE1C
push {r4,r5,lr}
sub sp, 0xC
ldr r1, _0800AEB8 @ =gUnknown_8231EE4
ldr r1, _0800AEB8 @ =gWirelessLinkDisplay4bpp
movs r5, 0
str r5, [sp]
movs r0, 0x1
movs r2, 0
movs r3, 0
bl sub_80F696C
ldr r1, _0800AEBC @ =gUnknown_823238C
ldr r1, _0800AEBC @ =gWirelessLinkDisplayBin
movs r0, 0x1
movs r2, 0
movs r3, 0
@@ -3416,8 +3416,8 @@ sub_800AE1C: @ 800AE1C
pop {r0}
bx r0
.align 2, 0
_0800AEB8: .4byte gUnknown_8231EE4
_0800AEBC: .4byte gUnknown_823238C
_0800AEB8: .4byte gWirelessLinkDisplay4bpp
_0800AEBC: .4byte gWirelessLinkDisplayBin
_0800AEC0: .4byte gUnknown_8231EC4
_0800AEC4: .4byte gUnknown_8234610
_0800AEC8: .4byte gUnknown_841DEF0
asm/trade.s
+6 -6
View File
@@ -7850,7 +7850,7 @@ sub_80504CC: @ 80504CC
movs r2, 0
movs r3, 0
bl sub_80F696C
ldr r0, _080505BC @ =gUnknown_8D0051C
ldr r0, _080505BC @ =gMenuMapBin
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 gUnknown_8D0051C
_080505BC: .4byte gMenuMapBin
_080505C0: .4byte gUnknown_201C000
_080505C4: .4byte gUnknown_8D004D8
_080505C8: .4byte gUnknown_826D1BC
@@ -8490,7 +8490,7 @@ _08050AC4:
ldr r1, _08050AF8 @ =0x00001241
movs r0, 0
bl SetGpuReg
ldr r0, _08050AFC @ =gUnknown_826BA5C
ldr r0, _08050AFC @ =gUnknown_3379A0Bin
ldr r1, _08050B00 @ =0x06002800
bl LZ77UnCompVram
movs r0, 0x8
@@ -8498,7 +8498,7 @@ _08050AC4:
.align 2, 0
_08050AF4: .4byte gUnknown_2031DAC
_08050AF8: .4byte 0x00001241
_08050AFC: .4byte gUnknown_826BA5C
_08050AFC: .4byte gUnknown_3379A0Bin
_08050B00: .4byte 0x06002800
_08050B04:
ldr r1, _08050B28 @ =0x00001241
@@ -8529,7 +8529,7 @@ _08050B3C:
movs r1, 0x30
movs r2, 0x20
bl LoadPalette
ldr r0, _08050B70 @ =gUnknown_826BF7C
ldr r0, _08050B70 @ =gWirelessSignal4bpp
ldr r1, _08050B74 @ =0x06004000
bl LZ77UnCompVram
ldr r0, _08050B78 @ =gUnknown_826C60C
@@ -8548,7 +8548,7 @@ _08050B64:
b _08050DB4
.align 2, 0
_08050B6C: .4byte gUnknown_826BF5C
_08050B70: .4byte gUnknown_826BF7C
_08050B70: .4byte gWirelessSignal4bpp
_08050B74: .4byte 0x06004000
_08050B78: .4byte gUnknown_826C60C
_08050B7C: .4byte 0x06009000
data/data.s
+11 -8
View File
@@ -4,11 +4,13 @@
gUnknown_8231EC4:: @ 8231EC4
.incbin "baserom.gba", 0x231EC4, 0x20
gUnknown_8231EE4:: @ 8231EE4
.incbin "baserom.gba", 0x231EE4, 0x4A8
.align 2
gWirelessLinkDisplay4bpp:: @ 8231EE4
.incbin "graphics/interface/wireless_link_display.4bpp.lz"
gUnknown_823238C:: @ 823238C
.incbin "baserom.gba", 0x23238C, 0x1EC
.align 2
gWirelessLinkDisplayBin:: @ 823238C
.incbin "graphics/interface/wireless_link_display.bin.lz"
gUnknown_8232578:: @ 8232578
.incbin "baserom.gba", 0x232578, 0x20
@@ -667,8 +669,9 @@ gUnknown_8269A5C:: @ 8269A5C
gUnknown_826AA5C:: @ 826AA5C
.incbin "baserom.gba", 0x26AA5C, 0x1000
gUnknown_826BA5C:: @ 826BA5C
.incbin "baserom.gba", 0x26BA5C, 0x100
.align 2
gUnknown_3379A0Bin:: @ 826BA5C
.incbin "graphics/trade/unknown_3379A0.bin.lz"
gUnknown_826BB5C:: @ 826BB5C
.incbin "baserom.gba", 0x26BB5C, 0x200
@@ -679,8 +682,8 @@ gUnknown_826BD5C:: @ 826BD5C
gUnknown_826BF5C:: @ 826BF5C
.incbin "baserom.gba", 0x26BF5C, 0x20
gUnknown_826BF7C:: @ 826BF7C
.incbin "baserom.gba", 0x26BF7C, 0x690
gWirelessSignal4bpp:: @ 826BF7C
.incbin "graphics/trade/wireless_signal.4bpp.lz"
gUnknown_826C60C:: @ 826C60C
.incbin "baserom.gba", 0x26C60C, 0x7C8
data/graphics.s
+134 -2
View File
@@ -6,8 +6,140 @@ gUnknown_8D00000:: @ 8D00000
gUnknown_8D004D8:: @ 8D004D8
.incbin "baserom.gba", 0xD004D8, 0x44
gUnknown_8D0051C:: @ 8D0051C
.incbin "baserom.gba", 0xD0051C, 0x1DCC
.align 2
gMenuMapBin:: @ 8D0051C
.incbin "graphics/interface/menu_map.bin.lz"
gUnknown_8D00748:: @ 8D00748
.incbin "baserom.gba", 0xD00748, 0x488
@ circled questionmark normal palette, different locations in ruby/emerald
gUnknown_8D00BD0:: @ 8D00BD0
.incbin "baserom.gba", 0xD00BD0, 0x18
@ circled questionmark shiny palette, different locations in ruby/emerald
gUnknown_8D00BE8:: @ 8D00BE8
.incbin "baserom.gba", 0xD00BE8, 0x18
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
.align 2
gOldCharmap4bpp:: @ 8D00C00
.incbin "graphics/unused/old_charmap.4bpp.lz" @from ruby
.align 2
gOldCharmapBin:: @ 8D013D8
.incbin "graphics/unused/old_charmap.bin.lz" @from ruby
.align 2
gOldCharmapGbapal:: @ 8D01604
.incbin "graphics/unused/old_charmap.gbapal.lz" @from ruby
.align 2
gSmokescreenImpact4bpp:: @ 8D0162C
.incbin "graphics/battle_anims/sprites/smokescreen_impact.4bpp.lz"
.align 2
gSmokescreenImpactGbapal:: @ 8D0170C
.incbin "graphics/battle_anims/sprites/smokescreen_impact.gbapal.lz"
.align 2
gBallPoke4bpp:: @ 8D01724
.incbin "graphics/interface/ball/poke.4bpp.lz"
.align 2
gBallPokeGbaPal:: @ 8D017E0
.incbin "graphics/interface/ball/poke.gbapal.lz"
.align 2
gBallGreat4bpp:: @ 8D01800
.incbin "graphics/interface/ball/great.4bpp.lz"
.align 2
gBallGreatGbapal:: @ 8D018BC
.incbin "graphics/interface/ball/great.gbapal.lz"
.align 2
gBallSafari4bpp:: @ 8D018E0
.incbin "graphics/interface/ball/safari.4bpp.lz"
.align 2
gBallSafariGbapal:: @ 8D019A4
.incbin "graphics/interface/ball/safari.gbapal.lz"
.align 2
gBallUltra4bpp:: @ 8D019C8
.incbin "graphics/interface/ball/ultra.4bpp.lz"
.align 2
gBallUltraGbapal:: @ 8D01A7C
.incbin "graphics/interface/ball/ultra.gbapal.lz"
.align 2
gBallMaster4bpp:: @ 8D01A9C
.incbin "graphics/interface/ball/master.4bpp.lz"
.align 2
gBallMasterGbapal:: @ 8D01B5C
.incbin "graphics/interface/ball/master.gbapal.lz"
.align 2
gBallNet4bpp:: @ 8D01B80
.incbin "graphics/interface/ball/net.4bpp.lz"
.align 2
gBallNetGbapal:: @ 8D01C40
.incbin "graphics/interface/ball/net.gbapal.lz"
.align 2
gBallDive4bpp:: @ 8D01C60
.incbin "graphics/interface/ball/dive.4bpp.lz"
.align 2
gBallDiveGbapal:: @ 8D01D74
.incbin "graphics/interface/ball/dive.gbapal.lz"
.align 2
gBallNest4bpp:: @ 8D01D9C
.incbin "graphics/interface/ball/nest.4bpp.lz"
.align 2
gBallNestGbapal:: @ 8D01E60
.incbin "graphics/interface/ball/nest.gbapal.lz"
.align 2
gBallRepeat4bpp:: @ 8D01E84
.incbin "graphics/interface/ball/repeat.4bpp.lz"
.align 2
gBallRepeatGbapal:: @ 8D01F44
.incbin "graphics/interface/ball/repeat.gbapal.lz"
.align 2
gBallTimer4bpp:: @ 8D01F68
.incbin "graphics/interface/ball/timer.4bpp.lz"
.align 2
gBallTimerGbapal:: @ 8D02060
.incbin "graphics/interface/ball/timer.gbapal.lz"
.align 2
gBallLuxury4bpp:: @ 8D02084
.incbin "graphics/interface/ball/luxury.4bpp.lz"
.align 2
gBallLuxuryGbapal:: @ 8D021B0
.incbin "graphics/interface/ball/luxury.gbapal.lz"
.align 2
gBallPremier4bpp:: @ 8D021D8
.incbin "graphics/interface/ball/premier.4bpp.lz"
.align 2
gBallPremierGbapal:: @ 8D022C8
.incbin "graphics/interface/ball/premier.gbapal.lz"
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
gUnknown_8D022E8:: @ 8D022E8
.incbin "baserom.gba", 0xD022E8, 0x70F0