diff options
| author | YamaArashi <shadow962@live.com> | 2016-09-02 12:21:20 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-09-02 12:21:20 -0700 |
| commit | 4c204e9f41ac2d9f36703ae425b668605f5aedbb (patch) | |
| tree | 3ba6f18daf86577e7a6e135fbe0ee896edc733cf | |
| parent | 5a0b6da393d7543899a74cb7e7695d75696a8b7e (diff) | |
trainer card color names
| -rw-r--r-- | asm/rom5.s | 2 | ||||
| -rw-r--r-- | data/data2.s | 30 |
2 files changed, 16 insertions, 16 deletions
diff --git a/asm/rom5.s b/asm/rom5.s index 7a6d41461..dac9d0f0b 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -18434,7 +18434,7 @@ _08083C34: .4byte 0x0202e8d0 _08083C38: .4byte 0x020231cc _08083C3C: .4byte 0x03002978 _08083C40: .4byte 0x020232cc -_08083C44: .4byte gUnknown_0839B21C +_08083C44: .4byte gTrainerCardColorNames _08083C48: movs r0, 0 _08083C4A: diff --git a/data/data2.s b/data/data2.s index 0f43cac31..dc516b28f 100644 --- a/data/data2.s +++ b/data/data2.s @@ -11774,21 +11774,21 @@ gUnknown_0839AE28:: @ 839AE28 gUnknown_0839B1F0:: @ 839B1F0 .2byte 0x0807, 0x0808, 0x0809, 0x080a, 0x080b, 0x080c, 0x080d, 0x080e -Unknown_839B200: - .incbin "baserom.gba", 0x0039b200, 0x7 -Unknown_839B207: - .incbin "baserom.gba", 0x0039b207, 0x7 -Unknown_839B20E: - .incbin "baserom.gba", 0x0039b20e, 0x7 -Unknown_839B215: - .incbin "baserom.gba", 0x0039b215, 0x7 - - .align 2 -gUnknown_0839B21C:: @ 839B21C - .4byte Unknown_839B200 - .4byte Unknown_839B207 - .4byte Unknown_839B20E - .4byte Unknown_839B215 +TrainerCardColorName_Bronze: + .string "BRONZE$", 7 +TrainerCardColorName_Copper: + .string "COPPER$", 7 +TrainerCardColorName_Silver: + .string "SILVER$", 7 +TrainerCardColorName_Gold: + .string "GOLD$", 7 + + .align 2 +gTrainerCardColorNames:: @ 839B21C + .4byte TrainerCardColorName_Bronze + .4byte TrainerCardColorName_Copper + .4byte TrainerCardColorName_Silver + .4byte TrainerCardColorName_Gold gUnknown_0839B22C:: @ 839B22C .incbin "baserom.gba", 0x0039b22c, 0x1e |