mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2025-01-13 15:13:42 +01:00
the unknown Brendan/May image was for base decorating
This commit is contained in:
parent
08210ef39e
commit
a14b654374
@ -527,13 +527,13 @@ gFieldObjectPic_BrendanWatering_5: ; 84A1C58
|
|||||||
|
|
||||||
.align 2, 0
|
.align 2, 0
|
||||||
|
|
||||||
gFieldObjectPic_BrendanUnknown: ; 84A1E58
|
gFieldObjectPic_BrendanDecorating: ; 84A1E58
|
||||||
.incbin "data/graphics/field_objects/pics/people/brendan/unknown.4bpp"
|
.incbin "data/graphics/field_objects/pics/people/brendan/decorating.4bpp"
|
||||||
|
|
||||||
.align 2, 0
|
.align 2, 0
|
||||||
|
|
||||||
gFieldObjectPic_MayUnknown: ; 84A1F58
|
gFieldObjectPic_MayDecorating: ; 84A1F58
|
||||||
.incbin "data/graphics/field_objects/pics/people/may/unknown.4bpp"
|
.incbin "data/graphics/field_objects/pics/people/may/decorating.4bpp"
|
||||||
|
|
||||||
.align 2, 0
|
.align 2, 0
|
||||||
|
|
||||||
|
@ -3492,7 +3492,7 @@ gFieldObjectGraphicsInfo_MayWatering: ; 850B478
|
|||||||
|
|
||||||
.align 2, 0
|
.align 2, 0
|
||||||
|
|
||||||
gFieldObjectGraphicsInfo_BrendanUnknown: ; 850B49C
|
gFieldObjectGraphicsInfo_BrendanDecorating: ; 850B49C
|
||||||
.2byte 0xFFFF ; tiles tag
|
.2byte 0xFFFF ; tiles tag
|
||||||
.2byte 0x1100 ; palette tag
|
.2byte 0x1100 ; palette tag
|
||||||
.2byte 0x1102 ; palette tag 2
|
.2byte 0x1102 ; palette tag 2
|
||||||
@ -3505,12 +3505,12 @@ gFieldObjectGraphicsInfo_BrendanUnknown: ; 850B49C
|
|||||||
.4byte gFieldObjectBaseOam_16x32
|
.4byte gFieldObjectBaseOam_16x32
|
||||||
.4byte gFieldObjectSpriteOamTables_16x32
|
.4byte gFieldObjectSpriteOamTables_16x32
|
||||||
.4byte gFieldObjectImageAnimTable_Inanimate
|
.4byte gFieldObjectImageAnimTable_Inanimate
|
||||||
.4byte gFieldObjectPicTable_BrendanUnknown
|
.4byte gFieldObjectPicTable_BrendanDecorating
|
||||||
.4byte gDummyObjectRotScalAnimTable
|
.4byte gDummyObjectRotScalAnimTable
|
||||||
|
|
||||||
.align 2, 0
|
.align 2, 0
|
||||||
|
|
||||||
gFieldObjectGraphicsInfo_MayUnknown: ; 850B4C0
|
gFieldObjectGraphicsInfo_MayDecorating: ; 850B4C0
|
||||||
.2byte 0xFFFF ; tiles tag
|
.2byte 0xFFFF ; tiles tag
|
||||||
.2byte 0x1110 ; palette tag
|
.2byte 0x1110 ; palette tag
|
||||||
.2byte 0x1102 ; palette tag 2
|
.2byte 0x1102 ; palette tag 2
|
||||||
@ -3523,7 +3523,7 @@ gFieldObjectGraphicsInfo_MayUnknown: ; 850B4C0
|
|||||||
.4byte gFieldObjectBaseOam_16x32
|
.4byte gFieldObjectBaseOam_16x32
|
||||||
.4byte gFieldObjectSpriteOamTables_16x32
|
.4byte gFieldObjectSpriteOamTables_16x32
|
||||||
.4byte gFieldObjectImageAnimTable_Inanimate
|
.4byte gFieldObjectImageAnimTable_Inanimate
|
||||||
.4byte gFieldObjectPicTable_MayUnknown
|
.4byte gFieldObjectPicTable_MayDecorating
|
||||||
.4byte gDummyObjectRotScalAnimTable
|
.4byte gDummyObjectRotScalAnimTable
|
||||||
|
|
||||||
.align 2, 0
|
.align 2, 0
|
||||||
|
@ -194,8 +194,8 @@ gFieldObjectGraphicsInfoPointers: ; 8505620
|
|||||||
.4byte gFieldObjectGraphicsInfo_ContestOldMan
|
.4byte gFieldObjectGraphicsInfo_ContestOldMan
|
||||||
.4byte gFieldObjectGraphicsInfo_BrendanWatering
|
.4byte gFieldObjectGraphicsInfo_BrendanWatering
|
||||||
.4byte gFieldObjectGraphicsInfo_MayWatering
|
.4byte gFieldObjectGraphicsInfo_MayWatering
|
||||||
.4byte gFieldObjectGraphicsInfo_BrendanUnknown
|
.4byte gFieldObjectGraphicsInfo_BrendanDecorating
|
||||||
.4byte gFieldObjectGraphicsInfo_MayUnknown
|
.4byte gFieldObjectGraphicsInfo_MayDecorating
|
||||||
.4byte gFieldObjectGraphicsInfo_Archie
|
.4byte gFieldObjectGraphicsInfo_Archie
|
||||||
.4byte gFieldObjectGraphicsInfo_Maxie
|
.4byte gFieldObjectGraphicsInfo_Maxie
|
||||||
.4byte gFieldObjectGraphicsInfo_Kyogre1
|
.4byte gFieldObjectGraphicsInfo_Kyogre1
|
||||||
|
@ -1853,13 +1853,13 @@ gFieldObjectPicTable_MayWatering: ; 8507E6C
|
|||||||
|
|
||||||
.align 2, 0
|
.align 2, 0
|
||||||
|
|
||||||
gFieldObjectPicTable_BrendanUnknown: ; 8507EB4
|
gFieldObjectPicTable_BrendanDecorating: ; 8507EB4
|
||||||
obj_tiles gFieldObjectPic_BrendanUnknown, 0x100
|
obj_tiles gFieldObjectPic_BrendanDecorating, 0x100
|
||||||
|
|
||||||
.align 2, 0
|
.align 2, 0
|
||||||
|
|
||||||
gFieldObjectPicTable_MayUnknown: ; 8507EBC
|
gFieldObjectPicTable_MayDecorating: ; 8507EBC
|
||||||
obj_tiles gFieldObjectPic_MayUnknown, 0x100
|
obj_tiles gFieldObjectPic_MayDecorating, 0x100
|
||||||
|
|
||||||
.align 2, 0
|
.align 2, 0
|
||||||
|
|
||||||
|
Before Width: | Height: | Size: 283 B After Width: | Height: | Size: 283 B |
Before Width: | Height: | Size: 279 B After Width: | Height: | Size: 279 B |
Loading…
x
Reference in New Issue
Block a user