summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2019-01-20 18:24:35 +0100
committerDizzyEggg <jajkodizzy@wp.pl>2019-01-20 18:24:35 +0100
commit4e396207d3f09772f0f073b5a945bb1fafe1fcdd (patch)
tree9d0f3e2fd027b6da5d0c6bb4faf0822df5231dd6 /data
parent576d1b3474e9ebec6a16d3ca68378d0f92fb4026 (diff)
document more of trainer card
Diffstat (limited to 'data')
-rw-r--r--data/event_scripts.s2
-rw-r--r--data/frontier_pass.s (renamed from data/trainer_card.s)173
-rw-r--r--data/specials.inc2
3 files changed, 2 insertions, 175 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s
index d52f4f1ba..031e82c00 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -1262,7 +1262,7 @@ VerdanturfTown_PokemonCenter_1F_EventScript_27191E:: @ 827191E
lock
faceplayer
setvar VAR_0x8004, 0
- specialvar VAR_RESULT, sub_80C2E40
+ specialvar VAR_RESULT, CountPlayerTrainerStars
compare VAR_RESULT, 4
goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_271A68
msgbox gUnknown_082726EB, MSGBOX_YESNO
diff --git a/data/trainer_card.s b/data/frontier_pass.s
index f57973200..411c5c69d 100644
--- a/data/trainer_card.s
+++ b/data/frontier_pass.s
@@ -13,179 +13,6 @@
.endm
.align 2
-gUnknown_0856F018:: @ 856F018
- .incbin "graphics/trainer_card/stickers_fr.4bpp.lz"
-
- .align 2
-gUnknown_0856F18C:: @ 856F18C
- .incbin "graphics/trainer_card/unknown_56F18C.gbapal"
-
- .align 2
-gEmeraldTrainerCard1Star_Pal:: @ 856F1AC
- .incbin "graphics/trainer_card/one_star.gbapal"
-
- .align 2
-gFireRedTrainerCard1Star_Pal:: @ 856F20C
- .incbin "graphics/trainer_card/one_star_fr.gbapal"
-
- .align 2
-gEmeraldTrainerCard2Star_Pal:: @ 856F26C
- .incbin "graphics/trainer_card/two_stars.gbapal"
-
- .align 2
-gFireRedTrainerCard2Star_Pal:: @ 856F2CC
- .incbin "graphics/trainer_card/two_stars_fr.gbapal"
-
- .align 2
-gEmeraldTrainerCard3Star_Pal:: @ 856F32C
- .incbin "graphics/trainer_card/three_stars.gbapal"
-
- .align 2
-gFireRedTrainerCard3Star_Pal:: @ 856F38C
- .incbin "graphics/trainer_card/three_stars_fr.gbapal"
-
- .align 2
-gEmeraldTrainerCard4Star_Pal:: @ 856F3EC
- .incbin "graphics/trainer_card/four_stars.gbapal"
-
- .align 2
-gFireRedTrainerCard4Star_Pal:: @ 856F44C
- .incbin "graphics/trainer_card/four_stars_fr.gbapal"
-
- .align 2
-gUnknown_0856F4AC:: @ 856F4AC
- .incbin "graphics/trainer_card/female_bg.gbapal"
-
- .align 2
-gUnknown_0856F4CC:: @ 856F4CC
- .incbin "graphics/trainer_card/female_bg_fr.gbapal"
-
- .align 2
-gUnknown_0856F4EC:: @ 856F4EC
- .incbin "graphics/trainer_card/badges.gbapal"
-
- .align 2
-gUnknown_0856F50C:: @ 856F50C
- .incbin "graphics/trainer_card/badges_fr.gbapal"
-
- .align 2
-gUnknown_0856F52C:: @ 856F52C
- .incbin "graphics/trainer_card/gold.gbapal"
-
- .align 2
-gUnknown_0856F54C:: @ 856F54C
- .incbin "graphics/trainer_card/stickers_fr1.gbapal"
-
- .align 2
-gUnknown_0856F56C:: @ 856F56C
- .incbin "graphics/trainer_card/stickers_fr2.gbapal"
-
- .align 2
-gUnknown_0856F58C:: @ 856F58C
- .incbin "graphics/trainer_card/stickers_fr3.gbapal"
-
- .align 2
-gUnknown_0856F5AC:: @ 856F5AC
- .incbin "graphics/trainer_card/stickers_fr4.gbapal"
-
- .align 2
-gUnknown_0856F5CC:: @ 856F5CC
- .incbin "graphics/trainer_card/badges.4bpp.lz"
-
- .align 2
-gUnknown_0856F814:: @ 856F814
- .incbin "graphics/trainer_card/badges_fr.4bpp.lz"
-
- .align 2
-gUnknown_0856FAB4:: @ 856FAB4
- .4byte 0x000025b0, 0x000001d9, 0x000031e2, 0x003011f3
-
- .align 2
-gUnknown_0856FAC4:: @ 856FAC4
- window_template 0x01, 0x02, 0x0f, 0x1b, 0x04, 0x0f, 0x0253
- window_template 0x01, 0x01, 0x01, 0x1c, 0x12, 0x0f, 0x0001
- window_template 0x03, 0x13, 0x05, 0x09, 0x0a, 0x08, 0x0150
- null_window_template
-
- .align 2
-gEmeraldTrainerCardStarPals:: @ 856FAE4
- .4byte gEmeraldTrainerCard0Star_Pal
- .4byte gEmeraldTrainerCard1Star_Pal
- .4byte gEmeraldTrainerCard2Star_Pal
- .4byte gEmeraldTrainerCard3Star_Pal
- .4byte gEmeraldTrainerCard4Star_Pal
-
- .align 2
-gFireRedTrainerCardStarPals:: @ 856FAF8
- .4byte gFireRedTrainerCard0Star_Pal
- .4byte gFireRedTrainerCard1Star_Pal
- .4byte gFireRedTrainerCard2Star_Pal
- .4byte gFireRedTrainerCard3Star_Pal
- .4byte gFireRedTrainerCard4Star_Pal
-
-gUnknown_0856FB0C:: @ 856FB0C
- .byte 0x00, 0x02, 0x03
-
-gUnknown_0856FB0F:: @ 856FB0F
- .byte 0x00, 0x04, 0x05
-
-gUnknown_0856FB12:: @ 856FB12
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-
-gUnknown_0856FB18:: @ 856FB18
- .byte 0x0d, 0x04, 0x0d, 0x04, 0x01, 0x00, 0x01, 0x00
-
-gUnknown_0856FB20:: @ 856FB20
- .byte 0x4e, 0x4f, 0x50, 0x51, 0x3c, 0x3f
-
- .align 2
-gUnknown_0856FB28:: @ 856FB28
- .4byte sub_80C4998
- .4byte sub_80C49D8
- .4byte sub_80C4B08
- .4byte sub_80C4C1C
- .4byte sub_80C4C84
- .4byte sub_80C4DB0
-
- .align 2
-gUnknown_0856FB40:: @ 856FB40
- .4byte gUnknown_0856FB0C
- .4byte gUnknown_0856FB12
-
-gUnknown_0856FB48:: @ 856FB48
- .byte 0x71, 0x68
-
-gUnknown_0856FB4A:: @ 856FB4A
- .byte 0x81, 0x78
-
-gUnknown_0856FB4C:: @ 856FB4C
- .byte 0xfd, 0x02, 0xf0, 0xfd, 0x03, 0xf0, 0xfd, 0x04, 0xff
-
-gUnknown_0856FB55:: @ 856FB55
- .byte 0x08, 0x10
-
-gUnknown_0856FB57:: @ 856FB57
- .byte 0xd8, 0xd8
-
- .align 2
-gUnknown_0856FB5C:: @ 856FB5C
- .4byte gText_LinkBattles
- .4byte gText_LinkCableBattles
- .4byte gText_LinkBattles
-
-gUnknown_0856FB68:: @ 856FB68
- .byte 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a
-
-gUnknown_0856FB6E:: @ 856FB6E
- .byte 0x00, 0x04, 0x08, 0x0c, 0x10, 0x14
-
-gUnknown_0856FB74:: @ 856FB74
- .byte 0x0b, 0x0c, 0x0d, 0x0e
-
-gUnknown_0856FB78:: @ 856FB78
- .byte 0x07, 0x07
-
- .align 2
gUnknown_0856FB7C:: @ 856FB7C
.incbin "graphics/frontier_pass/map_heads.gbapal"
diff --git a/data/specials.inc b/data/specials.inc
index 83e56106f..b3ca15ed1 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -481,7 +481,7 @@ gSpecials:: @ 81DBA64
def_special sub_813B7D8
def_special sub_81C72A4
def_special sp106_CreateStartMenu
- def_special sub_80C2E40
+ def_special CountPlayerTrainerStars
def_special sub_813AC7C
def_special sub_813ADB8
def_special sub_813ADD4