Leahnaya/pokeruby
1
0
Fork 0
mirror of https://github.com/pret/pokeruby.git synced 2026-09-10 12:07:02 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

menu cursor incbins

Browse Source
This commit is contained in:
YamaArashi
2017-01-07 16:43:31 -08:00
parent 44dfc173df
commit 30dc3d6fbf
2 changed files with 184 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

260
data/menu_cursor.s
View File

@@ -161,68 +161,172 @@ gSpriteTemplate_842F2B0:: @ 842F2B0
spr_template 65521, 0xFFFF, gOamData_842F12C, gSpriteAnimTable_842F13C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
Unknown_842F2C8: @ 842F2C8
.incbin "baserom.gba", 0x0042f2c8, 0x10
Unknown_842F2D8: @ 842F2D8
.incbin "baserom.gba", 0x0042f2d8, 0x18
Unknown_842F2F0: @ 842F2F0
.incbin "baserom.gba", 0x0042f2f0, 0x20
Unknown_842F310: @ 842F310
.incbin "baserom.gba", 0x0042f310, 0x18
Unknown_842F328: @ 842F328
.incbin "baserom.gba", 0x0042f328, 0x18
Unknown_842F340: @ 842F340
.incbin "baserom.gba", 0x0042f340, 0x20
Unknown_842F360: @ 842F360
.incbin "baserom.gba", 0x0042f360, 0x20
Unknown_842F380: @ 842F380
.incbin "baserom.gba", 0x0042f380, 0x20
Unknown_842F3A0: @ 842F3A0
.incbin "baserom.gba", 0x0042f3a0, 0x20
Unknown_842F3C0: @ 842F3C0
.incbin "baserom.gba", 0x0042f3c0, 0x28
Unknown_842F3E8: @ 842F3E8
.incbin "baserom.gba", 0x0042f3e8, 0x28
Unknown_842F410: @ 842F410
.incbin "baserom.gba", 0x0042f410, 0x28
Unknown_842F438: @ 842F438
.incbin "baserom.gba", 0x0042f438, 0x28
Unknown_842F460: @ 842F460
.incbin "baserom.gba", 0x0042f460, 0x30
Unknown_842F490: @ 842F490
.incbin "baserom.gba", 0x0042f490, 0x30
Unknown_842F4C0: @ 842F4C0
.incbin "baserom.gba", 0x0042f4c0, 0x30
Unknown_842F4F0: @ 842F4F0
.incbin "baserom.gba", 0x0042f4f0, 0x30
Unknown_842F520: @ 842F520
.incbin "baserom.gba", 0x0042f520, 0x38
Unknown_842F558: @ 842F558
.incbin "baserom.gba", 0x0042f558, 0x18
gSubspriteTable_842F2C8:: @ 842F2C8
subsprite -1, 0, 0, 0, 8x16
subsprite 1, 0, 0, 4, 8x16
.4byte Unknown_842F2C8
.4byte Unknown_842F2C8
.4byte Unknown_842F2D8
.4byte Unknown_842F2F0
.4byte Unknown_842F310
.4byte Unknown_842F328
.4byte Unknown_842F340
.4byte Unknown_842F360
.4byte Unknown_842F380
.4byte Unknown_842F3A0
.4byte Unknown_842F3C0
.4byte Unknown_842F3E8
.4byte Unknown_842F410
.4byte Unknown_842F438
.4byte Unknown_842F460
.4byte Unknown_842F490
.4byte Unknown_842F4C0
.4byte Unknown_842F4F0
.4byte Unknown_842F520
.align 2
gSubspriteTable_842F2D8:: @ 842F2D8
subsprite -1, 0, 0, 0, 8x16
subsprite 1, 0, 0, 2, 8x16
subsprite 9, 0, 0, 4, 8x16
.align 2
gSubspriteTable_842F2F0:: @ 842F2F0
subsprite -1, 0, 0, 0, 8x16
subsprite 1, 0, 0, 2, 8x16
subsprite 9, 0, 0, 2, 8x16
subsprite 17, 0, 0, 4, 8x16
.align 2
gSubspriteTable_842F310:: @ 842F310
subsprite -1, 0, 0, 0, 8x16
subsprite 1, 0, 0, 6, 32x16
subsprite 25, 0, 0, 4, 8x16
.align 2
gSubspriteTable_842F328:: @ 842F328
subsprite -1, 0, 0, 0, 8x16
subsprite 1, 0, 0, 6, 32x16
subsprite 33, 0, 0, 4, 8x16
.align 2
gSubspriteTable_842F340:: @ 842F340
subsprite -1, 0, 0, 0, 8x16
subsprite 1, 0, 0, 2, 8x16
subsprite 9, 0, 0, 6, 32x16
subsprite 41, 0, 0, 4, 8x16
.align 2
gSubspriteTable_842F360:: @ 842F360
subsprite -1, 0, 0, 0, 8x16
subsprite 1, 0, 0, 6, 32x16
subsprite 17, 0, 0, 6, 32x16
subsprite 49, 0, 0, 4, 8x16
.align 2
gSubspriteTable_842F380:: @ 842F380
subsprite -1, 0, 0, 0, 8x16
subsprite 1, 0, 0, 6, 32x16
subsprite 25, 0, 0, 6, 32x16
subsprite 57, 0, 0, 4, 8x16
.align 2
gSubspriteTable_842F3A0:: @ 842F3A0
subsprite -1, 0, 0, 0, 8x16
subsprite 1, 0, 0, 6, 32x16
subsprite 33, 0, 0, 6, 32x16
subsprite 65, 0, 0, 4, 8x16
.align 2
gSubspriteTable_842F3C0:: @ 842F3C0
subsprite -1, 0, 0, 0, 8x16
subsprite 1, 0, 0, 2, 8x16
subsprite 9, 0, 0, 6, 32x16
subsprite 41, 0, 0, 6, 32x16
subsprite 73, 0, 0, 4, 8x16
.align 2
gSubspriteTable_842F3E8:: @ 842F3E8
subsprite -1, 0, 0, 0, 8x16
subsprite 1, 0, 0, 6, 32x16
subsprite 33, 0, 0, 6, 32x16
subsprite 49, 0, 0, 6, 32x16
subsprite 81, 0, 0, 4, 8x16
.align 2
gSubspriteTable_842F410:: @ 842F410
subsprite -1, 0, 0, 0, 8x16
subsprite 1, 0, 0, 6, 32x16
subsprite 33, 0, 0, 6, 32x16
subsprite 57, 0, 0, 6, 32x16
subsprite 89, 0, 0, 4, 8x16
.align 2
gSubspriteTable_842F438:: @ 842F438
subsprite -1, 0, 0, 0, 8x16
subsprite 1, 0, 0, 6, 32x16
subsprite 33, 0, 0, 6, 32x16
subsprite 65, 0, 0, 6, 32x16
subsprite 97, 0, 0, 4, 8x16
.align 2
gSubspriteTable_842F460:: @ 842F460
subsprite -1, 0, 0, 0, 8x16
subsprite 1, 0, 0, 2, 8x16
subsprite 9, 0, 0, 6, 32x16
subsprite 41, 0, 0, 6, 32x16
subsprite 73, 0, 0, 6, 32x16
subsprite 105, 0, 0, 4, 8x16
.align 2
gSubspriteTable_842F490:: @ 842F490
subsprite -1, 0, 0, 0, 8x16
subsprite 1, 0, 0, 6, 32x16
subsprite 33, 0, 0, 6, 32x16
subsprite 65, 0, 0, 6, 32x16
subsprite 81, 0, 0, 6, 32x16
subsprite 113, 0, 0, 4, 8x16
.align 2
gSubspriteTable_842F4C0:: @ 842F4C0
subsprite -1, 0, 0, 0, 8x16
subsprite 1, 0, 0, 6, 32x16
subsprite 33, 0, 0, 6, 32x16
subsprite 65, 0, 0, 6, 32x16
subsprite 89, 0, 0, 6, 32x16
subsprite 121, 0, 0, 4, 8x16
.align 2
gSubspriteTable_842F4F0:: @ 842F4F0
subsprite -1, 0, 0, 0, 8x16
subsprite 1, 0, 0, 6, 32x16
subsprite 33, 0, 0, 6, 32x16
subsprite 65, 0, 0, 6, 32x16
subsprite 97, 0, 0, 6, 32x16
subsprite 129, 0, 0, 4, 8x16
.align 2
gSubspriteTable_842F520:: @ 842F520
subsprite -1, 0, 0, 0, 8x16
subsprite 1, 0, 0, 2, 8x16
subsprite 9, 0, 0, 6, 32x16
subsprite 41, 0, 0, 6, 32x16
subsprite 73, 0, 0, 6, 32x16
subsprite 105, 0, 0, 6, 32x16
subsprite 137, 0, 0, 4, 8x16
.align 2
gSubspriteTable_842F558:: @ 842F558
subsprite -1, 0, 0, 0, 8x16
subsprite 7, 0, 0, 6, 32x16
subsprite 35, 0, 0, 4, 8x16
.align 2
gUnknown_0842F570:: @ 842F570
.4byte gSubspriteTable_842F2C8
.4byte gSubspriteTable_842F2C8
.4byte gSubspriteTable_842F2D8
.4byte gSubspriteTable_842F2F0
.4byte gSubspriteTable_842F310
.4byte gSubspriteTable_842F328
.4byte gSubspriteTable_842F340
.4byte gSubspriteTable_842F360
.4byte gSubspriteTable_842F380
.4byte gSubspriteTable_842F3A0
.4byte gSubspriteTable_842F3C0
.4byte gSubspriteTable_842F3E8
.4byte gSubspriteTable_842F410
.4byte gSubspriteTable_842F438
.4byte gSubspriteTable_842F460
.4byte gSubspriteTable_842F490
.4byte gSubspriteTable_842F4C0
.4byte gSubspriteTable_842F4F0
.4byte gSubspriteTable_842F520
.align 2
gUnknown_0842F5BC:: @ 842F5BC
.4byte Unknown_842F558
.4byte gSubspriteTable_842F558
.align 2
gSubspriteTables_842F5C0:: @ 842F5C0
@@ -260,26 +364,26 @@ gSubspriteTables_842F5C0:: @ 842F5C0
.4byte 31, gMenuCursorSubsprites
.align 2
gUnknown_0842F6C0:: @ 842F6C0
.4byte 0x2, Unknown_842F2C8
.4byte 0x2, Unknown_842F2C8
.4byte 0x3, Unknown_842F2D8
.4byte 0x4, Unknown_842F2F0
.4byte 0x3, Unknown_842F310
.4byte 0x3, Unknown_842F328
.4byte 0x4, Unknown_842F340
.4byte 0x4, Unknown_842F360
.4byte 0x4, Unknown_842F380
.4byte 0x4, Unknown_842F3A0
.4byte 0x5, Unknown_842F3C0
.4byte 0x5, Unknown_842F3E8
.4byte 0x5, Unknown_842F410
.4byte 0x5, Unknown_842F438
.4byte 0x6, Unknown_842F460
.4byte 0x6, Unknown_842F490
.4byte 0x6, Unknown_842F4C0
.4byte 0x6, Unknown_842F4F0
.4byte 0x7, Unknown_842F520
gSubspriteTables_842F6C0:: @ 842F6C0
.4byte 2, gSubspriteTable_842F2C8
.4byte 2, gSubspriteTable_842F2C8
.4byte 3, gSubspriteTable_842F2D8
.4byte 4, gSubspriteTable_842F2F0
.4byte 3, gSubspriteTable_842F310
.4byte 3, gSubspriteTable_842F328
.4byte 4, gSubspriteTable_842F340
.4byte 4, gSubspriteTable_842F360
.4byte 4, gSubspriteTable_842F380
.4byte 4, gSubspriteTable_842F3A0
.4byte 5, gSubspriteTable_842F3C0
.4byte 5, gSubspriteTable_842F3E8
.4byte 5, gSubspriteTable_842F410
.4byte 5, gSubspriteTable_842F438
.4byte 6, gSubspriteTable_842F460
.4byte 6, gSubspriteTable_842F490
.4byte 6, gSubspriteTable_842F4C0
.4byte 6, gSubspriteTable_842F4F0
.4byte 7, gSubspriteTable_842F520
.align 2
gUnknown_0842F758:: @ 842F758

4
src/menu_cursor.c
View File

@@ -13,7 +13,7 @@ extern struct SpriteTemplate gSpriteTemplate_842F298[];
extern struct Subsprite *gUnknown_0842F5BC[];
extern struct SubspriteTable gSubspriteTables_842F5C0[];
extern struct SubspriteTable gUnknown_0842F6C0[];
extern struct SubspriteTable gSubspriteTables_842F6C0[];
extern struct SubspriteTable gUnknown_0842F758[];
extern struct Subsprite gUnknown_0842F780;
@@ -601,6 +601,6 @@ void sub_814ADF4(u8 a1)
a1 = 0;
if (gUnknown_0203A3D2 != 0x40)
SetSubspriteTables(&gSprites[gUnknown_0203A3D2], &gUnknown_0842F6C0[a1]);
SetSubspriteTables(&gSprites[gUnknown_0203A3D2], &gSubspriteTables_842F6C0[a1]);
return;
}