get rid of trainer card pointers
This commit is contained in:
+17
-2
@@ -1295,10 +1295,25 @@ gUnknown_08DC0754:: @ 8DC0754
|
|||||||
.incbin "baserom.gba", 0xdc0754, 0x440
|
.incbin "baserom.gba", 0xdc0754, 0x440
|
||||||
|
|
||||||
gUnknown_08DC0B94:: @ 8DC0B94
|
gUnknown_08DC0B94:: @ 8DC0B94
|
||||||
.incbin "baserom.gba", 0xdc0b94, 0xb60
|
.incbin "baserom.gba", 0xdc0b94, 0x800
|
||||||
|
|
||||||
|
gUnknown_08DC1394:: @ 8DC1394
|
||||||
|
.incbin "baserom.gba", 0xdc1394, 0x2E0
|
||||||
|
|
||||||
|
gUnknown_08DC1674:: @ 8DC1674
|
||||||
|
.incbin "baserom.gba", 0xdc1674, 0x20
|
||||||
|
|
||||||
|
gUnknown_08DC1694:: @ 8DC1694
|
||||||
|
.incbin "baserom.gba", 0xdc1694, 0x20
|
||||||
|
|
||||||
|
gUnknown_08DC16B4:: @ 8DC16B4
|
||||||
|
.incbin "baserom.gba", 0xdc16b4, 0x20
|
||||||
|
|
||||||
|
gUnknown_08DC16D4:: @ 8DC16D4
|
||||||
|
.incbin "baserom.gba", 0xdc16d4, 0x20
|
||||||
|
|
||||||
gUnknown_08DC16F4:: @ 8DC16F4
|
gUnknown_08DC16F4:: @ 8DC16F4
|
||||||
.incbin "baserom.gba", 0xdc16f4, 0x62
|
.incbin "baserom.gba", 0xdc16f4, 0x62
|
||||||
|
|
||||||
gUnknown_08DC1756:: @ 8DC1756
|
gUnknown_08DC1756:: @ 8DC1756
|
||||||
.incbin "baserom.gba", 0xdc1756, 0x60
|
.incbin "baserom.gba", 0xdc1756, 0x60
|
||||||
|
|||||||
+100
-9
@@ -4,6 +4,15 @@
|
|||||||
.section .rodata
|
.section .rodata
|
||||||
.align 2, 0
|
.align 2, 0
|
||||||
|
|
||||||
|
.macro unk_trainer_card_struct text1, text2, short1, short2, short3, short4
|
||||||
|
.4byte \text1
|
||||||
|
.4byte \text2
|
||||||
|
.2byte \short1
|
||||||
|
.2byte \short2
|
||||||
|
.2byte \short3
|
||||||
|
.2byte \short4
|
||||||
|
.endm
|
||||||
|
|
||||||
gUnknown_0856F018:: @ 856F018
|
gUnknown_0856F018:: @ 856F018
|
||||||
.incbin "baserom.gba", 0x56f018, 0x194
|
.incbin "baserom.gba", 0x56f018, 0x194
|
||||||
|
|
||||||
@@ -141,10 +150,25 @@ gUnknown_0856FB74:: @ 856FB74
|
|||||||
.incbin "baserom.gba", 0x56fb74, 0x4
|
.incbin "baserom.gba", 0x56fb74, 0x4
|
||||||
|
|
||||||
gUnknown_0856FB78:: @ 856FB78
|
gUnknown_0856FB78:: @ 856FB78
|
||||||
.incbin "baserom.gba", 0x56fb78, 0x44
|
.incbin "baserom.gba", 0x56fb78, 0x4
|
||||||
|
|
||||||
|
gUnknown_0856FB7C:: @ 856FB7C
|
||||||
|
.incbin "baserom.gba", 0x56fb7c, 0x20
|
||||||
|
|
||||||
|
gUnknown_0856FB9C:: @ 856FB9C
|
||||||
|
.incbin "baserom.gba", 0x56fb9c, 0x20
|
||||||
|
|
||||||
gUnknown_0856FBBC:: @ 856FBBC
|
gUnknown_0856FBBC:: @ 856FBBC
|
||||||
.incbin "baserom.gba", 0x56fbbc, 0x1244
|
.incbin "baserom.gba", 0x56fbbc, 0xFEC
|
||||||
|
|
||||||
|
gUnknown_08570BA8:: @ 8570BA8
|
||||||
|
.incbin "baserom.gba", 0x570ba8, 0x9C
|
||||||
|
|
||||||
|
gUnknown_08570C44:: @ 8570C44
|
||||||
|
.incbin "baserom.gba", 0x570c44, 0xBC
|
||||||
|
|
||||||
|
gUnknown_08570D00:: @ 8570D00
|
||||||
|
.incbin "baserom.gba", 0x570d00, 0x100
|
||||||
|
|
||||||
gUnknown_08570E00:: @ 8570E00
|
gUnknown_08570E00:: @ 8570E00
|
||||||
.incbin "baserom.gba", 0x570e00, 0x260
|
.incbin "baserom.gba", 0x570e00, 0x260
|
||||||
@@ -186,22 +210,83 @@ gUnknown_08571454:: @ 8571454
|
|||||||
.incbin "baserom.gba", 0x571454, 0x68
|
.incbin "baserom.gba", 0x571454, 0x68
|
||||||
|
|
||||||
gUnknown_085714BC:: @ 85714BC
|
gUnknown_085714BC:: @ 85714BC
|
||||||
.incbin "baserom.gba", 0x5714bc, 0x18
|
obj_tiles gUnknown_08570BA8, 0x100, 0
|
||||||
|
obj_tiles gUnknown_08570D00, 0x400, 1
|
||||||
|
obj_tiles gUnknown_08DC1394, 0x380, 2
|
||||||
|
|
||||||
gUnknown_085714D4:: @ 85714D4
|
gUnknown_085714D4:: @ 85714D4
|
||||||
.incbin "baserom.gba", 0x5714d4, 0x10
|
obj_tiles gUnknown_08570C44, 0x100, 4
|
||||||
|
obj_tiles NULL, 0, 0
|
||||||
|
|
||||||
gUnknown_085714E4:: @ 85714E4
|
gUnknown_085714E4:: @ 85714E4
|
||||||
.incbin "baserom.gba", 0x5714e4, 0xd0
|
obj_pal gUnknown_08DC1674, 0
|
||||||
|
obj_pal gUnknown_08DC1694, 1
|
||||||
|
obj_pal gUnknown_08DC16B4, 2
|
||||||
|
obj_pal gUnknown_08DC16D4, 3
|
||||||
|
obj_pal gUnknown_0856FB7C, 4
|
||||||
|
obj_pal gUnknown_0856FB9C, 5
|
||||||
|
obj_pal NULL, 0
|
||||||
|
obj_pal NULL, 0xFFFF
|
||||||
|
|
||||||
|
gUnknown_08571524:: @ 8571524
|
||||||
|
.incbin "baserom.gba", 0x571524, 0x8
|
||||||
|
|
||||||
|
gUnknown_0857152C:: @ 857152C
|
||||||
|
.incbin "baserom.gba", 0x57152c, 0x8
|
||||||
|
|
||||||
|
gUnknown_08571534:: @ 8571534
|
||||||
|
.incbin "baserom.gba", 0x571534, 0x8
|
||||||
|
|
||||||
|
gUnknown_0857153C:: @ 857153C
|
||||||
|
.incbin "baserom.gba", 0x57153c, 0x8
|
||||||
|
|
||||||
|
gUnknown_08571544:: @ 8571544
|
||||||
|
.incbin "baserom.gba", 0x571544, 0x8
|
||||||
|
|
||||||
|
gUnknown_0857154C:: @ 857154C
|
||||||
|
.incbin "baserom.gba", 0x57154c, 0x8
|
||||||
|
|
||||||
|
gUnknown_08571554:: @ 8571554
|
||||||
|
.incbin "baserom.gba", 0x571554, 0x8
|
||||||
|
|
||||||
|
gUnknown_0857155C:: @ 857155C
|
||||||
|
.incbin "baserom.gba", 0x57155c, 0xC
|
||||||
|
|
||||||
|
gUnknown_08571568:: @ 8571568
|
||||||
|
.incbin "baserom.gba", 0x571568, 0xC
|
||||||
|
|
||||||
|
gUnknown_08571574:: @ 8571574
|
||||||
|
.4byte gUnknown_08571524
|
||||||
|
.4byte gUnknown_0857152C
|
||||||
|
|
||||||
|
gUnknown_0857157C:: @ 857157C
|
||||||
|
.4byte gUnknown_08571524
|
||||||
|
.4byte gUnknown_0857152C
|
||||||
|
.4byte gUnknown_08571534
|
||||||
|
.4byte gUnknown_0857153C
|
||||||
|
.4byte gUnknown_08571544
|
||||||
|
.4byte gUnknown_0857154C
|
||||||
|
.4byte gUnknown_08571554
|
||||||
|
|
||||||
|
gUnknown_08571598:: @ 8571598
|
||||||
|
.4byte gUnknown_0857155C
|
||||||
|
.4byte gUnknown_08571568
|
||||||
|
|
||||||
|
gUnknown_085715A0:: @ 85715A0
|
||||||
|
.incbin "baserom.gba", 0x5715a0, 0x10
|
||||||
|
|
||||||
|
gUnknown_085715B0:: @ 85715B0
|
||||||
|
.4byte gUnknown_085715A0
|
||||||
|
|
||||||
gUnknown_085715B4:: @ 85715B4
|
gUnknown_085715B4:: @ 85715B4
|
||||||
.incbin "baserom.gba", 0x5715b4, 0x30
|
spr_template 0, 0, gUnknown_0852490C, gUnknown_08571574, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
|
||||||
|
spr_template 1, 1, gUnknown_08524934, gUnknown_08571598, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
|
||||||
|
|
||||||
gUnknown_085715E4:: @ 85715E4
|
gUnknown_085715E4:: @ 85715E4
|
||||||
.incbin "baserom.gba", 0x5715e4, 0x18
|
spr_template 2, 2, gUnknown_0852490C, gUnknown_0857157C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
|
||||||
|
|
||||||
gUnknown_085715FC:: @ 85715FC
|
gUnknown_085715FC:: @ 85715FC
|
||||||
.incbin "baserom.gba", 0x5715fc, 0x18
|
spr_template 4, 4, gUnknown_0852490C, gUnknown_08571574, NULL, gDummySpriteAffineAnimTable, nullsub_39
|
||||||
|
|
||||||
gUnknown_08571614:: @ 8571614
|
gUnknown_08571614:: @ 8571614
|
||||||
.4byte gUnknown_085EDA96
|
.4byte gUnknown_085EDA96
|
||||||
@@ -221,4 +306,10 @@ gUnknown_08571614:: @ 8571614
|
|||||||
.4byte gUnknown_085ED931
|
.4byte gUnknown_085ED931
|
||||||
|
|
||||||
gUnknown_08571650:: @ 8571650
|
gUnknown_08571650:: @ 8571650
|
||||||
.incbin "baserom.gba", 0x571650, 0x70
|
unk_trainer_card_struct gUnknown_085EDAB1, gUnknown_085EDB0F, 0x59, 0x28, 1, 0
|
||||||
|
unk_trainer_card_struct gUnknown_085EDABE, gUnknown_085EDB4E, 0x21, 0x2A, 1, 0
|
||||||
|
unk_trainer_card_struct gUnknown_085EDACA, gUnknown_085EDB8B, 0x78, 0x56, 0, 0
|
||||||
|
unk_trainer_card_struct gUnknown_085EDAD8, gUnknown_085EDBC2, 0x72, 0x3B, 0, 0
|
||||||
|
unk_trainer_card_struct gUnknown_085EDAE5, gUnknown_085EDC00, 0x19, 0x43, 0, 0
|
||||||
|
unk_trainer_card_struct gUnknown_085EDAF4, gUnknown_085EDC45, 0x39, 0x39, 1, 0
|
||||||
|
unk_trainer_card_struct gUnknown_085EDB00, gUnknown_085EDC84, 0x86, 0x29, 1, 0
|
||||||
|
|||||||
Reference in New Issue
Block a user