dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge upstream

Browse Source
This commit is contained in:
Paul Sander
2018-11-30 22:16:04 +01:00
parent 308e60da31 63c205e7d0
commit fc1fd9c983
69 changed files with 4784 additions and 5137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/berry_pouch.s
+2 -2
View File
@@ -948,7 +948,7 @@ sub_813D4D0: @ 813D4D0
bl CopyWindowToVram
b _0813D52A
_0813D514:
ldr r2, _0813D534 @ =gUnknown_841623B
ldr r2, _0813D534 @ =gFameCheckerText_ListMenuCursor
str r5, [sp]
movs r0, 0
str r0, [sp, 0x4]
@@ -964,7 +964,7 @@ _0813D52A:
pop {r0}
bx r0
.align 2, 0
_0813D534: .4byte gUnknown_841623B
_0813D534: .4byte gFameCheckerText_ListMenuCursor
thumb_func_end sub_813D4D0
thumb_func_start sub_813D538
asm/crt0.s
+11 -11
View File
@@ -88,22 +88,22 @@ GPIOPortReadEnable: @ 80000C8
.4byte 0x30BB
.4byte 0x30A7
.4byte 0
.4byte 0x8254784
.4byte 0x824FC40
.4byte 0x824FB08
.4byte 0x83DB028
.4byte 0x8250C04
.4byte 0x826056C
.4byte 0x82605CC
.4byte 0x8254784 @ gBaseStats
.4byte 0x824FC40 @ gAbilityNames
.4byte 0x824FB08 @ gAbilityDescriptionPointers
.4byte 0x83DB028 @ gItems
.4byte 0x8250C04 @ gBattleMoves
.4byte 0x826056C @ gBallSpriteSheets
.4byte 0x82605CC @ gBallSpritePalettes
.4byte 0xA8
.4byte 0x82C
.4byte 0x83B
.4byte 0x3A0D1E2A
.4byte 0x1E2B
.4byte 0x298
.4byte 0x309C
.4byte 0x30EC
.4byte 0x34
.4byte 0x298 @ offsetof(struct SaveBlock1, pcItems) // maybe all items were in a struct together?
.4byte 0x309C @ offsetof(struct SaveBlock1, giftRibbons)
.4byte 0x30EC @ offsetof(struct SaveBlock1, enigmaBerry)
.4byte 0x34 @ size of SaveBlock1 map header reconstruction data?
.4byte 0
.4byte 0xFFFFFFFF
asm/fame_checker.s
-4171
View File
File diff suppressed because it is too large Load Diff
asm/help_system.s
+2 -2
View File
@@ -2040,14 +2040,14 @@ sub_813C828: @ 813C828
adds r2, r3
lsls r2, 24
lsrs r2, 24
ldr r0, _0813C85C @ =gUnknown_841623B
ldr r0, _0813C85C @ =gFameCheckerText_ListMenuCursor
bl sub_813C4CC
pop {r4}
pop {r0}
bx r0
.align 2, 0
_0813C858: .4byte gUnknown_203F190
_0813C85C: .4byte gUnknown_841623B
_0813C85C: .4byte gFameCheckerText_ListMenuCursor
thumb_func_end sub_813C828
thumb_func_start sub_813C860
asm/item_menu.s
+7 -7
View File
@@ -138,8 +138,8 @@ _08107EB0: .4byte gUnknown_203AD10
_08107EB4: .4byte gUnknown_203ACFC
thumb_func_end sub_8107DB4
thumb_func_start sub_8107EB8
sub_8107EB8: @ 8107EB8
thumb_func_start UseFameCheckerFromMenu
UseFameCheckerFromMenu: @ 8107EB8
push {lr}
ldr r2, _08107EC8 @ =sub_80568A8
movs r0, 0
@@ -149,7 +149,7 @@ sub_8107EB8: @ 8107EB8
bx r0
.align 2, 0
_08107EC8: .4byte sub_80568A8
thumb_func_end sub_8107EB8
thumb_func_end UseFameCheckerFromMenu
thumb_func_start sub_8107ECC
sub_8107ECC: @ 8107ECC
@@ -871,7 +871,7 @@ _0810848C:
bl StringCopy
ldr r0, [r5]
adds r0, r4
ldr r1, _08108550 @ =gUnknown_84161C1
ldr r1, _08108550 @ =gFameCheckerText_Cancel
bl StringAppend
ldr r0, _08108548 @ =gUnknown_203AD18
ldr r2, [r0]
@@ -951,7 +951,7 @@ _08108540: .4byte gUnknown_203AD10
_08108544: .4byte gUnknown_203AD1C
_08108548: .4byte gUnknown_203AD18
_0810854C: .4byte gUnknown_8452F60
_08108550: .4byte gUnknown_84161C1
_08108550: .4byte gFameCheckerText_Cancel
_08108554: .4byte gUnknown_3005E70
_08108558: .4byte sub_81085A4
_0810855C: .4byte sub_8108654
@@ -1257,7 +1257,7 @@ bag_menu_print_cursor: @ 810878C
bl FillWindowPixelRect
b _081087DE
_081087C8:
ldr r2, _081087E8 @ =gUnknown_841623B
ldr r2, _081087E8 @ =gFameCheckerText_ListMenuCursor
str r5, [sp]
movs r0, 0
str r0, [sp, 0x4]
@@ -1273,7 +1273,7 @@ _081087DE:
pop {r0}
bx r0
.align 2, 0
_081087E8: .4byte gUnknown_841623B
_081087E8: .4byte gFameCheckerText_ListMenuCursor
thumb_func_end bag_menu_print_cursor
thumb_func_start sub_81087EC
asm/item_pc.s
+4 -4
View File
@@ -589,7 +589,7 @@ _0810D8A4:
ldr r3, [r0]
lsls r0, r4, 3
adds r0, r3
ldr r1, _0810D944 @ =gUnknown_84161C1
ldr r1, _0810D944 @ =gFameCheckerText_Cancel
str r1, [r0]
movs r1, 0x2
negs r1, r1
@@ -657,7 +657,7 @@ _0810D8A4:
_0810D938: .4byte gSaveBlock1Ptr
_0810D93C: .4byte gUnknown_203ADC4
_0810D940: .4byte gUnknown_203ADBC
_0810D944: .4byte gUnknown_84161C1
_0810D944: .4byte gFameCheckerText_Cancel
_0810D948: .4byte gUnknown_3005E70
_0810D94C: .4byte sub_810D954
_0810D950: .4byte sub_810DA20
@@ -879,7 +879,7 @@ sub_810DAD4: @ 810DAD4
bl FillWindowPixelRect
b _0810DB26
_0810DB10:
ldr r2, _0810DB30 @ =gUnknown_841623B
ldr r2, _0810DB30 @ =gFameCheckerText_ListMenuCursor
str r5, [sp]
movs r0, 0
str r0, [sp, 0x4]
@@ -895,7 +895,7 @@ _0810DB26:
pop {r0}
bx r0
.align 2, 0
_0810DB30: .4byte gUnknown_841623B
_0810DB30: .4byte gFameCheckerText_ListMenuCursor
thumb_func_end sub_810DAD4
thumb_func_start sub_810DB34
asm/item_use.s
+14 -14
View File
@@ -320,7 +320,7 @@ sub_80A1208: @ 80A1208
ldr r0, _080A1224 @ =gUnknown_203AD30
ldrh r0, [r0]
strh r0, [r1, 0x20]
ldr r1, _080A1228 @ =sub_8107EB8
ldr r1, _080A1228 @ =UseFameCheckerFromMenu
mov r0, sp
movs r2, 0
bl sub_80BEBEC
@@ -329,7 +329,7 @@ sub_80A1208: @ 80A1208
bx r0
.align 2, 0
_080A1224: .4byte gUnknown_203AD30
_080A1228: .4byte sub_8107EB8
_080A1228: .4byte UseFameCheckerFromMenu
thumb_func_end sub_80A1208
thumb_func_start sub_80A122C
@@ -1045,14 +1045,14 @@ _080A17D0: .4byte sub_80A17E8
thumb_func_start sub_80A17D4
sub_80A17D4: @ 80A17D4
push {lr}
ldr r1, _080A17E4 @ =sub_8107EB8
ldr r1, _080A17E4 @ =UseFameCheckerFromMenu
movs r0, 0
movs r2, 0
bl sub_81317F8
pop {r0}
bx r0
.align 2, 0
_080A17E4: .4byte sub_8107EB8
_080A17E4: .4byte UseFameCheckerFromMenu
thumb_func_end sub_80A17D4
thumb_func_start sub_80A17E8
@@ -1123,14 +1123,14 @@ _080A1868: .4byte sub_80A1880
thumb_func_start sub_80A186C
sub_80A186C: @ 80A186C
push {lr}
ldr r1, _080A187C @ =sub_8107EB8
ldr r1, _080A187C @ =UseFameCheckerFromMenu
movs r0, 0
movs r2, 0
bl sub_813CD50
pop {r0}
bx r0
.align 2, 0
_080A187C: .4byte sub_8107EB8
_080A187C: .4byte UseFameCheckerFromMenu
thumb_func_end sub_80A186C
thumb_func_start sub_80A1880
@@ -1239,13 +1239,13 @@ _080A1948: .4byte sub_80A1960
thumb_func_start sub_80A194C
sub_80A194C: @ 80A194C
push {lr}
ldr r1, _080A195C @ =sub_8107EB8
ldr r1, _080A195C @ =UseFameCheckerFromMenu
movs r0, 0
bl sub_815ABC4
pop {r0}
bx r0
.align 2, 0
_080A195C: .4byte sub_8107EB8
_080A195C: .4byte UseFameCheckerFromMenu
thumb_func_end sub_80A194C
thumb_func_start sub_80A1960
@@ -1646,13 +1646,13 @@ _080A1CA8: .4byte sub_80A1CC0
thumb_func_start sub_80A1CAC
sub_80A1CAC: @ 80A1CAC
push {lr}
ldr r1, _080A1CBC @ =sub_8107EB8
ldr r1, _080A1CBC @ =UseFameCheckerFromMenu
movs r0, 0
bl sub_80BFF50
pop {r0}
bx r0
.align 2, 0
_080A1CBC: .4byte sub_8107EB8
_080A1CBC: .4byte UseFameCheckerFromMenu
thumb_func_end sub_80A1CAC
thumb_func_start sub_80A1CC0
@@ -1730,12 +1730,12 @@ _080A1D54: .4byte sub_80A1D68
thumb_func_start sub_80A1D58
sub_80A1D58: @ 80A1D58
push {lr}
ldr r0, _080A1D64 @ =sub_8107EB8
bl sub_812C3AC
ldr r0, _080A1D64 @ =UseFameCheckerFromMenu
bl UseFameChecker
pop {r0}
bx r0
.align 2, 0
_080A1D64: .4byte sub_8107EB8
_080A1D64: .4byte UseFameCheckerFromMenu
thumb_func_end sub_80A1D58
thumb_func_start sub_80A1D68
@@ -1752,7 +1752,7 @@ sub_80A1D68: @ 80A1D68
bl sub_80563F0
bl sub_80A1184
ldr r0, _080A1D98 @ =c2_exit_to_overworld_2_switch
bl sub_812C3AC
bl UseFameChecker
adds r0, r4, 0
bl DestroyTask
_080A1D8E:
asm/learn_move.s
+3 -3
View File
@@ -1331,7 +1331,7 @@ _080E513C:
lsls r7, 1
adds r1, r7
adds r0, r1
ldr r1, _080E51F8 @ =gUnknown_84161C1
ldr r1, _080E51F8 @ =gFameCheckerText_Cancel
bl StringCopy
ldr r1, [r4]
ldrb r0, [r1, 0x1A]
@@ -1367,7 +1367,7 @@ _080E51AA:
adds r0, r2, 0
adds r0, 0x20
adds r0, r3
ldr r1, _080E51F8 @ =gUnknown_84161C1
ldr r1, _080E51F8 @ =gFameCheckerText_Cancel
str r1, [r0]
adds r2, 0x24
adds r2, r3
@@ -1396,7 +1396,7 @@ _080E51E8: .4byte gUnknown_203AAB4
_080E51EC: .4byte gPlayerParty
_080E51F0: .4byte gMoveNames
_080E51F4: .4byte gStringVar1
_080E51F8: .4byte gUnknown_84161C1
_080E51F8: .4byte gFameCheckerText_Cancel
_080E51FC: .4byte gUnknown_3005E70
_080E5200: .4byte gUnknown_83FFA94
thumb_func_end sub_80E50CC
asm/list_menu.s
+2 -2
View File
@@ -969,14 +969,14 @@ _081075DA:
beq _08107640
b _08107680
_081075E4:
ldr r1, _081075F4 @ =gUnknown_841623B
ldr r1, _081075F4 @ =gFameCheckerText_ListMenuCursor
adds r0, r6, 0
mov r2, r8
adds r3, r7, 0
bl ListMenuPrint
b _08107680
.align 2, 0
_081075F4: .4byte gUnknown_841623B
_081075F4: .4byte gFameCheckerText_ListMenuCursor
_081075F8:
ldrb r0, [r6, 0x1E]
cmp r0, 0xFF
asm/mailbox_pc.s
+2 -2
View File
@@ -174,7 +174,7 @@ sub_810EC98: @ 810EC98
adds r6, r0, 0
movs r3, 0
ldr r7, _0810ED50 @ =gUnknown_203ADE0
ldr r0, _0810ED54 @ =gUnknown_84161C1
ldr r0, _0810ED54 @ =gFameCheckerText_Cancel
mov r12, r0
ldr r5, _0810ED58 @ =gUnknown_3005E70
ldr r1, _0810ED5C @ =gUnknown_203ADDC
@@ -262,7 +262,7 @@ _0810ECCE:
bx r1
.align 2, 0
_0810ED50: .4byte gUnknown_203ADE0
_0810ED54: .4byte gUnknown_84161C1
_0810ED54: .4byte gFameCheckerText_Cancel
_0810ED58: .4byte gUnknown_3005E70
_0810ED5C: .4byte gUnknown_203ADDC
_0810ED60: .4byte gUnknown_8454003
asm/menu.s
+4 -4
View File
@@ -1391,7 +1391,7 @@ RedrawMenuCursor: @ 810F874
bl FillWindowPixelRect
ldrb r0, [r5, 0x5]
ldrb r1, [r5, 0x6]
ldr r2, _0810F900 @ =gUnknown_841623B
ldr r2, _0810F900 @ =gFameCheckerText_ListMenuCursor
ldrb r3, [r5]
ldrb r4, [r5, 0x8]
mov r6, r8
@@ -1415,7 +1415,7 @@ RedrawMenuCursor: @ 810F874
bx r0
.align 2, 0
_0810F8FC: .4byte gUnknown_203ADE4
_0810F900: .4byte gUnknown_841623B
_0810F900: .4byte gFameCheckerText_ListMenuCursor
thumb_func_end RedrawMenuCursor
thumb_func_start MoveMenuCursor
@@ -2893,7 +2893,7 @@ sub_811037C: @ 811037C
lsrs r3, 24
ldrb r0, [r5, 0x5]
ldrb r1, [r5, 0x6]
ldr r2, _0811044C @ =gUnknown_841623B
ldr r2, _0811044C @ =gFameCheckerText_ListMenuCursor
str r3, [sp]
movs r3, 0
str r3, [sp, 0x4]
@@ -2910,7 +2910,7 @@ sub_811037C: @ 811037C
bx r0
.align 2, 0
_08110448: .4byte gUnknown_203ADE4
_0811044C: .4byte gUnknown_841623B
_0811044C: .4byte gFameCheckerText_ListMenuCursor
thumb_func_end sub_811037C
thumb_func_start sub_8110450
asm/new_game.s
+1 -1
View File
@@ -241,7 +241,7 @@ sub_8054A60: @ 8054A60
bl PlayTimeCounter_Reset
bl sub_80549AC
bl sub_806E0D0
bl sub_812D304
bl ResetFameChecker
ldr r0, [r6]
movs r1, 0xA4
lsls r1, 2
asm/party_menu.s
+2 -2
View File
@@ -5118,7 +5118,7 @@ _08121194:
ands r0, r1
cmp r0, 0xA
beq _081211F0
ldr r4, _081211E8 @ =gUnknown_84161C1
ldr r4, _081211E8 @ =gFameCheckerText_Cancel
movs r0, 0
adds r1, r4, 0
movs r2, 0
@@ -5146,7 +5146,7 @@ _08121194:
.align 2, 0
_081211E0: .4byte gUnknown_845A108
_081211E4: .4byte gUnknown_203B0A0
_081211E8: .4byte gUnknown_84161C1
_081211E8: .4byte gFameCheckerText_Cancel
_081211EC: .4byte gUnknown_8459FFC
_081211F0:
ldr r4, _08121240 @ =gUnknown_84161C8
asm/pokemon_summary_screen.s
+2 -2
View File
@@ -5401,7 +5401,7 @@ _081372B0:
movs r1, 0x1
negs r1, r1
str r1, [sp, 0x4]
ldr r1, _081372E0 @ =gUnknown_84161C1
ldr r1, _081372E0 @ =gFameCheckerText_Cancel
str r1, [sp, 0x8]
movs r1, 0x2
movs r2, 0x3
@@ -5415,7 +5415,7 @@ _081372CE:
.align 2, 0
_081372D8: .4byte 0x00003003
_081372DC: .4byte gUnknown_8463EF0
_081372E0: .4byte gUnknown_84161C1
_081372E0: .4byte gFameCheckerText_Cancel
thumb_func_end sub_8137270
thumb_func_start sub_81372E4
asm/shop.s
+4 -4
View File
@@ -892,7 +892,7 @@ _0809B1F2:
muls r4, r0
ldr r0, [r5]
adds r0, r4
ldr r1, _0809B2CC @ =gUnknown_84161C1
ldr r1, _0809B2CC @ =gFameCheckerText_Cancel
bl StringCopy
ldr r0, _0809B2D0 @ =gUnknown_2039964
ldr r2, [r0]
@@ -990,7 +990,7 @@ _0809B2BC:
b _0809B2E6
.align 2, 0
_0809B2C8: .4byte gUnknown_2039968
_0809B2CC: .4byte gUnknown_84161C1
_0809B2CC: .4byte gFameCheckerText_Cancel
_0809B2D0: .4byte gUnknown_2039964
_0809B2D4: .4byte gUnknown_3005E70
_0809B2D8: .4byte gUnknown_2039934
@@ -1378,7 +1378,7 @@ sub_809B59C: @ 809B59C
bl CopyWindowToVram
b _0809B5F8
_0809B5E0:
ldr r2, _0809B600 @ =gUnknown_841623B
ldr r2, _0809B600 @ =gFameCheckerText_ListMenuCursor
str r5, [sp]
movs r0, 0
str r0, [sp, 0x4]
@@ -1395,7 +1395,7 @@ _0809B5F8:
pop {r0}
bx r0
.align 2, 0
_0809B600: .4byte gUnknown_841623B
_0809B600: .4byte gFameCheckerText_ListMenuCursor
thumb_func_end sub_809B59C
thumb_func_start sub_809B604
asm/start_menu.s
+2 -2
View File
@@ -911,14 +911,14 @@ _0806F498:
bl play_some_sound
bl sub_806EF18
bl sub_80563F0
ldr r0, _0806F4B0 @ =sub_8107EB8
ldr r0, _0806F4B0 @ =UseFameCheckerFromMenu
bl SetMainCallback2
movs r0, 0x1
_0806F4AC:
pop {r1}
bx r1
.align 2, 0
_0806F4B0: .4byte sub_8107EB8
_0806F4B0: .4byte UseFameCheckerFromMenu
thumb_func_end sub_806F480
thumb_func_start sub_806F4B4
asm/teachy_tv.s
+2 -2
View File
@@ -915,7 +915,7 @@ sub_815B2C0: @ 815B2C0
beq _0815B30A
subs r0, r4, 0x6
ldr r1, [r0]
ldr r0, _0815B32C @ =sub_8107EB8
ldr r0, _0815B32C @ =UseFameCheckerFromMenu
cmp r1, r0
bne _0815B330
_0815B30A:
@@ -932,7 +932,7 @@ _0815B31C: .4byte gTasks+0x8
_0815B320: .4byte gPaletteFade
_0815B324: .4byte gUnknown_203F44A
_0815B328: .4byte gMain
_0815B32C: .4byte sub_8107EB8
_0815B32C: .4byte UseFameCheckerFromMenu
_0815B330:
movs r0, 0x5
bl PlaySE
asm/tm_case.s
+2 -2
View File
@@ -963,7 +963,7 @@ sub_8131FB0: @ 8131FB0
bl CopyWindowToVram
b _0813200A
_08131FF4:
ldr r2, _08132014 @ =gUnknown_841623B
ldr r2, _08132014 @ =gFameCheckerText_ListMenuCursor
str r5, [sp]
movs r0, 0
str r0, [sp, 0x4]
@@ -979,7 +979,7 @@ _0813200A:
pop {r0}
bx r0
.align 2, 0
_08132014: .4byte gUnknown_841623B
_08132014: .4byte gFameCheckerText_ListMenuCursor
thumb_func_end sub_8131FB0
thumb_func_start sub_8132018
asm/unk_81507FC.s
+4 -4
View File
@@ -10348,7 +10348,7 @@ _0815579C:
ldr r0, [r3]
adds r0, r7
ldrb r0, [r0]
ldr r2, _08155860 @ =gUnknown_841623B
ldr r2, _08155860 @ =gFameCheckerText_ListMenuCursor
mov r1, r9
str r1, [sp]
str r5, [sp, 0x4]
@@ -10379,7 +10379,7 @@ _08155850: .4byte 0x00003009
_08155854: .4byte gUnknown_841CDD7
_08155858: .4byte gUnknown_8417938
_0815585C: .4byte gUnknown_841793C
_08155860: .4byte gUnknown_841623B
_08155860: .4byte gFameCheckerText_ListMenuCursor
_08155864: .4byte 0x00003014
_08155868:
bl IsDma3ManagerBusyWithBgCopy
@@ -10453,7 +10453,7 @@ _081558B0:
ldr r0, [r1]
adds r0, r4
ldrb r1, [r0]
ldr r2, _0815591C @ =gUnknown_841623B
ldr r2, _0815591C @ =gFameCheckerText_ListMenuCursor
cmp r7, 0x1
bne _08155920
mov r3, r8
@@ -10464,7 +10464,7 @@ _0815590C: .4byte 0x00003020
_08155910: .4byte 0x00003009
_08155914: .4byte gUnknown_8417938
_08155918: .4byte gUnknown_841793C
_0815591C: .4byte gUnknown_841623B
_0815591C: .4byte gFameCheckerText_ListMenuCursor
_08155920:
str r6, [sp]
_08155922:
charmap.txt
+13 -1
View File
@@ -323,8 +323,15 @@ TALL_PLUS = FC 0C FB
@ TODO: Identify and declare F7 control codes
UNKNOWN_F7 = F7
UNKNOWN_F8 = F8
UNKNOWN_F9 = F9
KEYGFX_A_BUTTON = F8 00
KEYGFX_B_BUTTON = F8 01
KEYGFX_START_BUTTON = F8 04
KEYGFX_DPAD_UP_DOWN = F8 0A
KEYGFX_DPAD_ANY = F8 0C
STRING = FD
@ string placeholders
@@ -383,6 +390,11 @@ ENG = FC 16
PAUSE_MUSIC = FC 17
RESUME_MUSIC = FC 18
@ font sizes
SMALL = FC 06 00
BIG = FC 06 04
@ colors
TRANSPARENT = 00
@@ -393,7 +405,7 @@ BLUE = 04
YELLOW = 05
CYAN = 06
MAGENTA = 07
LIGHT_GREY = 08
LIGHT_GRAY = 08
BLACK = 09
BLACK2 = 0A @ duplicate of black?
SILVER = 0B
common_syms/fame_checker.txt
+2
View File
@@ -0,0 +1,2 @@
gFameChecker_ListMenuTemplate
gIconDescriptionBoxIsOpen
data/data_83FECCC.s
+41 -787
View File
@@ -721,8 +721,8 @@ gUnknown_8416188:: @ 8416188
gUnknown_8416190:: @ 8416190
.incbin "baserom.gba", 0x416190, 0x31
gUnknown_84161C1:: @ 84161C1
.incbin "baserom.gba", 0x4161C1, 0x7
gFameCheckerText_Cancel:: @ 84161C1
.string "CANCEL$"
gUnknown_84161C8:: @ 84161C8
.incbin "baserom.gba", 0x4161C8, 0x5
@@ -766,8 +766,8 @@ gUnknown_8416226:: @ 8416226
gUnknown_8416238:: @ 8416238
.incbin "baserom.gba", 0x416238, 0x3
gUnknown_841623B:: @ 841623B
.incbin "baserom.gba", 0x41623B, 0x2
gFameCheckerText_ListMenuCursor:: @ 841623B
.string "▶$"
gUnknown_841623D:: @ 841623D
.incbin "baserom.gba", 0x41623D, 0x25
@@ -1237,11 +1237,14 @@ gUnknown_84181B6:: @ 84181B6
gUnknown_84181BE:: @ 84181BE
.incbin "baserom.gba", 0x4181BE, 0x5
gUnknown_84181C3:: @ 84181C3
.incbin "baserom.gba", 0x4181C3, 0x21
gFameCheckerText_FameCheckerWillBeClosed:: @ 84181C3
.string "The FAME CHECKER will be closed.$"
gUnknown_84181E4:: @ 84181E4
.incbin "baserom.gba", 0x4181E4, 0x4AC
gFameCheckerText_ClearTextbox:: @ 84181E4
.string "\n $"
gUnknown_8418204:: @ 8418204
.incbin "baserom.gba", 0x00418204, 0x48c
gUnknown_8418690:: @ 8418690
.incbin "baserom.gba", 0x418690, 0x20
@@ -2090,14 +2093,38 @@ gUnknown_841E572:: @ 841E572
gUnknown_841E58D:: @ 841E58D
.incbin "baserom.gba", 0x41E58D, 0x17
gUnknown_841E5A4:: @ 841E5A4
.incbin "baserom.gba", 0x41E5A4, 0x15
gFameCheckerText_MainScreenUI:: @ 841E5A4
.string "{KEYGFX_START_BUTTON}PICK {KEYGFX_DPAD_UP_DOWN}SELECT {KEYGFX_A_BUTTON}OK$"
gUnknown_841E5B9:: @ 841E5B9
.incbin "baserom.gba", 0x41E5B9, 0x19
gFameCheckerText_PickScreenUI:: @ 841E5B9
.string "{KEYGFX_START_BUTTON}PICK {KEYGFX_DPAD_UP_DOWN}SELECT {KEYGFX_B_BUTTON}CANCEL$"
gUnknown_841E5D2:: @ 841E5D2
.incbin "baserom.gba", 0x41E5D2, 0xCF
gFameCheckerText_FlavorTextUI:: @ 841E5D2
.string "{KEYGFX_DPAD_ANY}PICK {KEYGFX_A_BUTTON}READ {UNKNOWN_F8 0x01}CANCEL$"
gFameCheckerOakName:: @ 841E5E9
.string "OAK$"
gFameCheckerDaisyName:: @ 841E5ED
.string "DAISY$"
gFameCheckerBillName:: @ 841E5F3
.string "BILL$"
gFameCheckerMrFujiName:: @ 841E5F8
.string "FUJI$"
gUnknown_841E5FD:: @ 841E5FD
.string "A variety of events will be imported\nover Wireless Communication.$"
gUnknown_841E63F:: @ 841E63F
.string "Read the WONDER CARDS in your\npossession.$"
gUnknown_841E669:: @ 841E669
.string "Read the NEWS that arrived.$"
gUnknown_841E685:: @ 841E685
.string "Return to the title screen.$"
gUnknown_841E6A1:: @ 841E6A1
.incbin "baserom.gba", 0x41E6A1, 0x3B
@@ -3549,776 +3576,3 @@ gUnknown_845C5BC:: @ 845C5BC
gUnknown_845C5CE:: @ 845C5CE
.incbin "baserom.gba", 0x45C5CE, 0x32
gUnknown_845C600:: @ 845C600
.incbin "baserom.gba", 0x45C600, 0x1720
gUnknown_845DD20:: @ 845DD20
.incbin "baserom.gba", 0x45DD20, 0x820
gUnknown_845E540:: @ 845E540
.incbin "baserom.gba", 0x45E540, 0x820
gUnknown_845ED60:: @ 845ED60
.incbin "baserom.gba", 0x45ED60, 0x820
gUnknown_845F580:: @ 845F580
.incbin "baserom.gba", 0x45F580, 0x40
gUnknown_845F5C0:: @ 845F5C0
.incbin "baserom.gba", 0x45F5C0, 0x20
gUnknown_845F5E0:: @ 845F5E0
.incbin "baserom.gba", 0x45F5E0, 0x3
gUnknown_845F5E3:: @ 845F5E3
.incbin "baserom.gba", 0x45F5E3, 0x3
gUnknown_845F5E6:: @ 845F5E6
.incbin "baserom.gba", 0x45F5E6, 0x4
gUnknown_845F5EA:: @ 845F5EA
.incbin "baserom.gba", 0x45F5EA, 0x22
gUnknown_845F60C:: @ 845F60C
.incbin "baserom.gba", 0x45F60C, 0x10
gUnknown_845F61C:: @ 845F61C
.incbin "baserom.gba", 0x45F61C, 0x20
gUnknown_845F63C:: @ 845F63C
.incbin "baserom.gba", 0x45F63C, 0x80
gUnknown_845F6BC:: @ 845F6BC
.incbin "baserom.gba", 0x45F6BC, 0x180
gUnknown_845F83C:: @ 845F83C
.incbin "baserom.gba", 0x45F83C, 0x60
gUnknown_845F89C:: @ 845F89C
.incbin "baserom.gba", 0x45F89C, 0x180
gUnknown_845FA1C:: @ 845FA1C
.incbin "baserom.gba", 0x45FA1C, 0x180
gUnknown_845FB9C:: @ 845FB9C
.incbin "baserom.gba", 0x45FB9C, 0x40
gUnknown_845FBDC:: @ 845FBDC
.incbin "baserom.gba", 0x45FBDC, 0x18
gUnknown_845FBF4:: @ 845FBF4
.incbin "baserom.gba", 0x45FBF4, 0x10
gUnknown_845FC04:: @ 845FC04
.incbin "baserom.gba", 0x45FC04, 0x40
gUnknown_845FC44:: @ 845FC44
.incbin "baserom.gba", 0x45FC44, 0x34
gUnknown_845FC78:: @ 845FC78
.incbin "baserom.gba", 0x45FC78, 0x40
gUnknown_845FCB8:: @ 845FCB8
.incbin "baserom.gba", 0x45FCB8, 0x2C
gUnknown_845FCE4:: @ 845FCE4
.incbin "baserom.gba", 0x45FCE4, 0x18
gUnknown_845FCFC:: @ 845FCFC
.incbin "baserom.gba", 0x45FCFC, 0x18
gUnknown_845FD14:: @ 845FD14
.incbin "baserom.gba", 0x45FD14, 0x18
gUnknown_845FD2C:: @ 845FD2C
.incbin "baserom.gba", 0x45FD2C, 0x18
gUnknown_845FD44:: @ 845FD44
.incbin "baserom.gba", 0x45FD44, 0x10
gUnknown_845FD54:: @ 845FD54
.incbin "baserom.gba", 0x45FD54, 0x814
gUnknown_8460568:: @ 8460568
.incbin "baserom.gba", 0x460568, 0x80
gUnknown_84605E8:: @ 84605E8
.incbin "baserom.gba", 0x4605E8, 0x5C0
gUnknown_8460BA8:: @ 8460BA8
.incbin "baserom.gba", 0x460BA8, 0xFC
gUnknown_8460CA4:: @ 8460CA4
.incbin "baserom.gba", 0x460CA4, 0x44
gUnknown_8460CE8:: @ 8460CE8
.incbin "baserom.gba", 0x460CE8, 0xAC
gUnknown_8460D94:: @ 8460D94
.incbin "baserom.gba", 0x460D94, 0xA0
gUnknown_8460E34:: @ 8460E34
.incbin "baserom.gba", 0x460E34, 0xA0
gUnknown_8460ED4:: @ 8460ED4
.incbin "baserom.gba", 0x460ED4, 0x40
gUnknown_8460F14:: @ 8460F14
.incbin "baserom.gba", 0x460F14, 0x6E8
gUnknown_84615FC:: @ 84615FC
.incbin "baserom.gba", 0x4615FC, 0x40
gUnknown_846163C:: @ 846163C
.incbin "baserom.gba", 0x46163C, 0x698
gUnknown_8461CD4:: @ 8461CD4
.incbin "baserom.gba", 0x461CD4, 0x40
gUnknown_8461D14:: @ 8461D14
.incbin "baserom.gba", 0x461D14, 0x698
gUnknown_84623AC:: @ 84623AC
.incbin "baserom.gba", 0x4623AC, 0x40
gUnknown_84623EC:: @ 84623EC
.incbin "baserom.gba", 0x4623EC, 0xA6C
gUnknown_8462E58:: @ 8462E58
.incbin "baserom.gba", 0x462E58, 0x5C
gUnknown_8462EB4:: @ 8462EB4
.incbin "baserom.gba", 0x462EB4, 0xC
gUnknown_8462EC0:: @ 8462EC0
.incbin "baserom.gba", 0x462EC0, 0x8
gUnknown_8462EC8:: @ 8462EC8
.incbin "baserom.gba", 0x462EC8, 0x8
gUnknown_8462ED0:: @ 8462ED0
.incbin "baserom.gba", 0x462ED0, 0x8
gUnknown_8462ED8:: @ 8462ED8
.incbin "baserom.gba", 0x462ED8, 0x10
gUnknown_8462EE8:: @ 8462EE8
.incbin "baserom.gba", 0x462EE8, 0x4
gUnknown_8462EEC:: @ 8462EEC
.incbin "baserom.gba", 0x462EEC, 0x4
gUnknown_8462EF0:: @ 8462EF0
.incbin "baserom.gba", 0x462EF0, 0xC
gUnknown_8462EFC:: @ 8462EFC
.incbin "baserom.gba", 0x462EFC, 0x18
gUnknown_8462F14:: @ 8462F14
.incbin "baserom.gba", 0x462F14, 0x8
gUnknown_8462F1C:: @ 8462F1C
.incbin "baserom.gba", 0x462F1C, 0x8
gUnknown_8462F24:: @ 8462F24
.incbin "baserom.gba", 0x462F24, 0x2C
gUnknown_8462F50:: @ 8462F50
.incbin "baserom.gba", 0x462F50, 0xDC
gUnknown_846302C:: @ 846302C
.incbin "baserom.gba", 0x46302C, 0x48
gUnknown_8463074:: @ 8463074
.incbin "baserom.gba", 0x463074, 0x18
gUnknown_846308C:: @ 846308C
.incbin "baserom.gba", 0x46308C, 0x4C
gUnknown_84630D8:: @ 84630D8
.incbin "baserom.gba", 0x4630D8, 0x4C
gUnknown_8463124:: @ 8463124
.incbin "baserom.gba", 0x463124, 0x10
gUnknown_8463134:: @ 8463134
.incbin "baserom.gba", 0x463134, 0xC
gUnknown_8463140:: @ 8463140
.incbin "baserom.gba", 0x463140, 0x10
gUnknown_8463150:: @ 8463150
.incbin "baserom.gba", 0x463150, 0x18
gUnknown_8463168:: @ 8463168
.incbin "baserom.gba", 0x463168, 0x3
gUnknown_846316B:: @ 846316B
.incbin "baserom.gba", 0x46316B, 0x5
gUnknown_8463170:: @ 8463170
.incbin "baserom.gba", 0x463170, 0x8
gUnknown_8463178:: @ 8463178
.incbin "baserom.gba", 0x463178, 0x4
gUnknown_846317C:: @ 846317C
.incbin "baserom.gba", 0x46317C, 0x4
gUnknown_8463180:: @ 8463180
.incbin "baserom.gba", 0x463180, 0x4
gUnknown_8463184:: @ 8463184
.incbin "baserom.gba", 0x463184, 0xC
gUnknown_8463190:: @ 8463190
.incbin "baserom.gba", 0x463190, 0x50
gUnknown_84631E0:: @ 84631E0
.incbin "baserom.gba", 0x4631E0, 0x8
gUnknown_84631E8:: @ 84631E8
.incbin "baserom.gba", 0x4631E8, 0x30
gUnknown_8463218:: @ 8463218
.incbin "baserom.gba", 0x463218, 0x8
gUnknown_8463220:: @ 8463220
.incbin "baserom.gba", 0x463220, 0x18
gUnknown_8463238:: @ 8463238
.incbin "baserom.gba", 0x463238, 0x24
gUnknown_846325C:: @ 846325C
.incbin "baserom.gba", 0x46325C, 0x48
gUnknown_84632A4:: @ 84632A4
.incbin "baserom.gba", 0x4632A4, 0x18
gUnknown_84632BC:: @ 84632BC
.incbin "baserom.gba", 0x4632BC, 0x4
gUnknown_84632C0:: @ 84632C0
.incbin "baserom.gba", 0x4632C0, 0x4
gUnknown_84632C4:: @ 84632C4
.incbin "baserom.gba", 0x4632C4, 0x4
gUnknown_84632C8:: @ 84632C8
.incbin "baserom.gba", 0x4632C8, 0x4
gUnknown_84632CC:: @ 84632CC
.incbin "baserom.gba", 0x4632CC, 0x4
gUnknown_84632D0:: @ 84632D0
.incbin "baserom.gba", 0x4632D0, 0x4
gUnknown_84632D4:: @ 84632D4
.incbin "baserom.gba", 0x4632D4, 0x4
gUnknown_84632D8:: @ 84632D8
.incbin "baserom.gba", 0x4632D8, 0x18
gUnknown_84632F0:: @ 84632F0
.incbin "baserom.gba", 0x4632F0, 0x18
gUnknown_8463308:: @ 8463308
.incbin "baserom.gba", 0x463308, 0x20
gUnknown_8463328:: @ 8463328
.incbin "baserom.gba", 0x463328, 0x70
gUnknown_8463398:: @ 8463398
.incbin "baserom.gba", 0x463398, 0x40
gUnknown_84633D8:: @ 84633D8
.incbin "baserom.gba", 0x4633D8, 0x44
gUnknown_846341C:: @ 846341C
.incbin "baserom.gba", 0x46341C, 0x20
gUnknown_846343C:: @ 846343C
.incbin "baserom.gba", 0x46343C, 0x128
gUnknown_8463564:: @ 8463564
.incbin "baserom.gba", 0x463564, 0x1C
gUnknown_8463580:: @ 8463580
.incbin "baserom.gba", 0x463580, 0x140
gUnknown_84636C0:: @ 84636C0
.incbin "baserom.gba", 0x4636C0, 0x20
gUnknown_84636E0:: @ 84636E0
.incbin "baserom.gba", 0x4636E0, 0x20
gUnknown_8463700:: @ 8463700
.incbin "baserom.gba", 0x463700, 0x20
gUnknown_8463720:: @ 8463720
.incbin "baserom.gba", 0x463720, 0x20
gUnknown_8463740:: @ 8463740
.incbin "baserom.gba", 0x463740, 0x12C
gUnknown_846386C:: @ 846386C
.incbin "baserom.gba", 0x46386C, 0x120
gUnknown_846398C:: @ 846398C
.incbin "baserom.gba", 0x46398C, 0x18
gUnknown_84639A4:: @ 84639A4
.incbin "baserom.gba", 0x4639A4, 0x8
gUnknown_84639AC:: @ 84639AC
.incbin "baserom.gba", 0x4639AC, 0x48
gUnknown_84639F4:: @ 84639F4
.incbin "baserom.gba", 0x4639F4, 0x20
gUnknown_8463A14:: @ 8463A14
.incbin "baserom.gba", 0x463A14, 0x68
gUnknown_8463A7C:: @ 8463A7C
.incbin "baserom.gba", 0x463A7C, 0x70
gUnknown_8463AEC:: @ 8463AEC
.incbin "baserom.gba", 0x463AEC, 0x10
gUnknown_8463AFC:: @ 8463AFC
.incbin "baserom.gba", 0x463AFC, 0x4
gUnknown_8463B00:: @ 8463B00
.incbin "baserom.gba", 0x463B00, 0x20
gUnknown_8463B20:: @ 8463B20
.incbin "baserom.gba", 0x463B20, 0x10
gUnknown_8463B30:: @ 8463B30
.incbin "baserom.gba", 0x463B30, 0x10
gUnknown_8463B40:: @ 8463B40
.incbin "baserom.gba", 0x463B40, 0x4
gUnknown_8463B44:: @ 8463B44
.incbin "baserom.gba", 0x463B44, 0x20
gUnknown_8463B64:: @ 8463B64
.incbin "baserom.gba", 0x463B64, 0x24
gUnknown_8463B88:: @ 8463B88
.incbin "baserom.gba", 0x463B88, 0xF8
gUnknown_8463C80:: @ 8463C80
.incbin "baserom.gba", 0x463C80, 0x1E0
gUnknown_8463E60:: @ 8463E60
.incbin "baserom.gba", 0x463E60, 0x64
gUnknown_8463EC4:: @ 8463EC4
.incbin "baserom.gba", 0x463EC4, 0x10
gUnknown_8463ED4:: @ 8463ED4
.incbin "baserom.gba", 0x463ED4, 0x1C
gUnknown_8463EF0:: @ 8463EF0
.incbin "baserom.gba", 0x463EF0, 0xC
gUnknown_8463EFC:: @ 8463EFC
.incbin "baserom.gba", 0x463EFC, 0x10
gUnknown_8463F0C:: @ 8463F0C
.incbin "baserom.gba", 0x463F0C, 0x18
gUnknown_8463F24:: @ 8463F24
.incbin "baserom.gba", 0x463F24, 0x18
gUnknown_8463F3C:: @ 8463F3C
.incbin "baserom.gba", 0x463F3C, 0x20
gUnknown_8463F5C:: @ 8463F5C
.incbin "baserom.gba", 0x463F5C, 0x20
gUnknown_8463F7C:: @ 8463F7C
.incbin "baserom.gba", 0x463F7C, 0x20
gUnknown_8463F9C:: @ 8463F9C
.incbin "baserom.gba", 0x463F9C, 0x8
gUnknown_8463FA4:: @ 8463FA4
.incbin "baserom.gba", 0x463FA4, 0x3
gUnknown_8463FA7:: @ 8463FA7
.incbin "baserom.gba", 0x463FA7, 0x11
gUnknown_8463FB8:: @ 8463FB8
.incbin "baserom.gba", 0x463FB8, 0x6
gUnknown_8463FBE:: @ 8463FBE
.incbin "baserom.gba", 0x463FBE, 0x3
gUnknown_8463FC1:: @ 8463FC1
.incbin "baserom.gba", 0x463FC1, 0x5
gUnknown_8463FC6:: @ 8463FC6
.incbin "baserom.gba", 0x463FC6, 0x7
gUnknown_8463FCD:: @ 8463FCD
.incbin "baserom.gba", 0x463FCD, 0x7
gUnknown_8463FD4:: @ 8463FD4
.incbin "baserom.gba", 0x463FD4, 0xB
gUnknown_8463FDF:: @ 8463FDF
.incbin "baserom.gba", 0x463FDF, 0xB
gUnknown_8463FEA:: @ 8463FEA
.incbin "baserom.gba", 0x463FEA, 0x12
gUnknown_8463FFC:: @ 8463FFC
.incbin "baserom.gba", 0x463FFC, 0xC
gUnknown_8464008:: @ 8464008
.incbin "baserom.gba", 0x464008, 0x120
gUnknown_8464128:: @ 8464128
.incbin "baserom.gba", 0x464128, 0x20
gUnknown_8464148:: @ 8464148
.incbin "baserom.gba", 0x464148, 0x174
gUnknown_84642BC:: @ 84642BC
.incbin "baserom.gba", 0x4642BC, 0x4
gUnknown_84642C0:: @ 84642C0
.incbin "baserom.gba", 0x4642C0, 0x34
gUnknown_84642F4:: @ 84642F4
.incbin "baserom.gba", 0x4642F4, 0xC
gUnknown_8464300:: @ 8464300
.incbin "baserom.gba", 0x464300, 0x4C
gUnknown_846434C:: @ 846434C
.incbin "baserom.gba", 0x46434C, 0xC
gUnknown_8464358:: @ 8464358
.incbin "baserom.gba", 0x464358, 0x14
gUnknown_846436C:: @ 846436C
.incbin "baserom.gba", 0x46436C, 0x8
gUnknown_8464374:: @ 8464374
.incbin "baserom.gba", 0x464374, 0x8
gUnknown_846437C:: @ 846437C
.incbin "baserom.gba", 0x46437C, 0x28
gUnknown_84643A4:: @ 84643A4
.incbin "baserom.gba", 0x4643A4, 0x4
gUnknown_84643A8:: @ 84643A8
.incbin "baserom.gba", 0x4643A8, 0x4
gUnknown_84643AC:: @ 84643AC
.incbin "baserom.gba", 0x4643AC, 0x4
gUnknown_84643B0:: @ 84643B0
.incbin "baserom.gba", 0x4643B0, 0x4
gUnknown_84643B4:: @ 84643B4
.incbin "baserom.gba", 0x4643B4, 0x4
gUnknown_84643B8:: @ 84643B8
.incbin "baserom.gba", 0x4643B8, 0x20
gUnknown_84643D8:: @ 84643D8
.incbin "baserom.gba", 0x4643D8, 0x18
gUnknown_84643F0:: @ 84643F0
.incbin "baserom.gba", 0x4643F0, 0x8
gUnknown_84643F8:: @ 84643F8
.incbin "baserom.gba", 0x4643F8, 0x8
gUnknown_8464400:: @ 8464400
.incbin "baserom.gba", 0x464400, 0x48
gUnknown_8464448:: @ 8464448
.incbin "baserom.gba", 0x464448, 0x60
gUnknown_84644A8:: @ 84644A8
.incbin "baserom.gba", 0x4644A8, 0x8
gUnknown_84644B0:: @ 84644B0
.incbin "baserom.gba", 0x4644B0, 0x8
gUnknown_84644B8:: @ 84644B8
.incbin "baserom.gba", 0x4644B8, 0x32C
gUnknown_84647E4:: @ 84647E4
.incbin "baserom.gba", 0x4647E4, 0x18
gUnknown_84647FC:: @ 84647FC
.incbin "baserom.gba", 0x4647FC, 0x8
gUnknown_8464804:: @ 8464804
.incbin "baserom.gba", 0x464804, 0x38
gUnknown_846483C:: @ 846483C
.incbin "baserom.gba", 0x46483C, 0x40
gUnknown_846487C:: @ 846487C
.incbin "baserom.gba", 0x46487C, 0x8
gUnknown_8464884:: @ 8464884
.incbin "baserom.gba", 0x464884, 0xC
gUnknown_8464890:: @ 8464890
.incbin "baserom.gba", 0x464890, 0x1E
gUnknown_84648AE:: @ 84648AE
.incbin "baserom.gba", 0x4648AE, 0xF
gUnknown_84648BD:: @ 84648BD
.incbin "baserom.gba", 0x4648BD, 0x15
gUnknown_84648D2:: @ 84648D2
.incbin "baserom.gba", 0x4648D2, 0x54
gUnknown_8464926:: @ 8464926
.incbin "baserom.gba", 0x464926, 0x40
gUnknown_8464966:: @ 8464966
.incbin "baserom.gba", 0x464966, 0xC4A
gUnknown_84655B0:: @ 84655B0
.incbin "baserom.gba", 0x4655B0, 0x18
gUnknown_84655C8:: @ 84655C8
.incbin "baserom.gba", 0x4655C8, 0x40
gUnknown_8465608:: @ 8465608
.incbin "baserom.gba", 0x465608, 0xE
gUnknown_8465616:: @ 8465616
.incbin "baserom.gba", 0x465616, 0xC0
gUnknown_84656D6:: @ 84656D6
.incbin "baserom.gba", 0x4656D6, 0x10E
gUnknown_84657E4:: @ 84657E4
.incbin "baserom.gba", 0x4657E4, 0x98
gUnknown_846587C:: @ 846587C
.incbin "baserom.gba", 0x46587C, 0x5C
gUnknown_84658D8:: @ 84658D8
.incbin "baserom.gba", 0x4658D8, 0x18
gUnknown_84658F0:: @ 84658F0
.incbin "baserom.gba", 0x4658F0, 0x40
gUnknown_8465930:: @ 8465930
.incbin "baserom.gba", 0x465930, 0x20
gUnknown_8465950:: @ 8465950
.incbin "baserom.gba", 0x465950, 0x80
gUnknown_84659D0:: @ 84659D0
.incbin "baserom.gba", 0x4659D0, 0x804
gUnknown_84661D4:: @ 84661D4
.incbin "baserom.gba", 0x4661D4, 0x2E8
gUnknown_84664BC:: @ 84664BC
.incbin "baserom.gba", 0x4664BC, 0x20
gUnknown_84664DC:: @ 84664DC
.incbin "baserom.gba", 0x4664DC, 0x60
gUnknown_846653C:: @ 846653C
.incbin "baserom.gba", 0x46653C, 0x84
gUnknown_84665C0:: @ 84665C0
.incbin "baserom.gba", 0x4665C0, 0x60
gUnknown_8466620:: @ 8466620
.incbin "baserom.gba", 0x466620, 0x378
gUnknown_8466998:: @ 8466998
.incbin "baserom.gba", 0x466998, 0x178
gUnknown_8466B10:: @ 8466B10
.incbin "baserom.gba", 0x466B10, 0x10
gUnknown_8466B20:: @ 8466B20
.incbin "baserom.gba", 0x466B20, 0xEC
gUnknown_8466C0C:: @ 8466C0C
.incbin "baserom.gba", 0x466C0C, 0x28
gUnknown_8466C34:: @ 8466C34
.incbin "baserom.gba", 0x466C34, 0x4
gUnknown_8466C38:: @ 8466C38
.incbin "baserom.gba", 0x466C38, 0x8
gUnknown_8466C40:: @ 8466C40
.incbin "baserom.gba", 0x466C40, 0x18
gUnknown_8466C58:: @ 8466C58
.incbin "baserom.gba", 0x466C58, 0xB8
gUnknown_8466D10:: @ 8466D10
.incbin "baserom.gba", 0x466D10, 0x20
gUnknown_8466D30:: @ 8466D30
.incbin "baserom.gba", 0x466D30, 0x30
gUnknown_8466D60:: @ 8466D60
.incbin "baserom.gba", 0x466D60, 0x10
gUnknown_8466D70:: @ 8466D70
.incbin "baserom.gba", 0x466D70, 0x20
gUnknown_8466D90:: @ 8466D90
.incbin "baserom.gba", 0x466D90, 0x8
gUnknown_8466D98:: @ 8466D98
.incbin "baserom.gba", 0x466D98, 0x8
gUnknown_8466DA0:: @ 8466DA0
.incbin "baserom.gba", 0x466DA0, 0x8
gUnknown_8466DA8:: @ 8466DA8
.incbin "baserom.gba", 0x466DA8, 0x8
gUnknown_8466DB0:: @ 8466DB0
.incbin "baserom.gba", 0x466DB0, 0x8
gUnknown_8466DB8:: @ 8466DB8
.incbin "baserom.gba", 0x466DB8, 0x8
gUnknown_8466DC0:: @ 8466DC0
.incbin "baserom.gba", 0x466DC0, 0x8
gUnknown_8466DC8:: @ 8466DC8
.incbin "baserom.gba", 0x466DC8, 0x8
gUnknown_8466DD0:: @ 8466DD0
.incbin "baserom.gba", 0x466DD0, 0x18
gUnknown_8466DE8:: @ 8466DE8
.incbin "baserom.gba", 0x466DE8, 0x18
gUnknown_8466E00:: @ 8466E00
.incbin "baserom.gba", 0x466E00, 0x78
gUnknown_8466E78:: @ 8466E78
.incbin "baserom.gba", 0x466E78, 0x18
gUnknown_8466E90:: @ 8466E90
.incbin "baserom.gba", 0x466E90, 0x18
gUnknown_8466EA8:: @ 8466EA8
.incbin "baserom.gba", 0x466EA8, 0x18
gUnknown_8466EC0:: @ 8466EC0
.incbin "baserom.gba", 0x466EC0, 0x28
gUnknown_8466EE8:: @ 8466EE8
.incbin "baserom.gba", 0x466EE8, 0x8
gUnknown_8466EF0:: @ 8466EF0
.incbin "baserom.gba", 0x466EF0, 0x10
gUnknown_8466F00:: @ 8466F00
.incbin "baserom.gba", 0x466F00, 0x28
.align 2
gUnknown_8466F28:: @ 8466F28
.asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent.c"
.align 2
gUnknown_8466F5C:: @ 8466F5C
.asciz "0"
.align 2
gUnknown_8466F60:: @ 8466F60
.incbin "baserom.gba", 0x466F60, 0x20
.align 2
gUnknown_8466F80:: @ 8466F80
.asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c"
.align 2
gUnknown_8466FB8:: @ 8466FB8
.asciz "size <= ME_SEND_BUF_SIZE"
.align 2
gUnknown_8466FD4:: @ 8466FD4
.asciz "cmd->parameter == NULL"
.align 2
gUnknown_8466FEC:: @ 8466FEC
.asciz "cmd->flag == FALSE"
.align 2
gUnknown_8467000:: @ 8467000
.asciz "cmd->flag == FALSE && cmd->parameter == NULL"
.align 2
gUnknown_8467030:: @ 8467030
.incbin "baserom.gba", 0x467030, 0x14
.align 2
gUnknown_8467044:: @ 8467044
.asciz "svr->mainseqno < NELEMS(func_tbl)"
.align 2
gUnknown_8467068:: @ 8467068
.incbin "baserom.gba", 0x467068, 0x8
gUnknown_8467070:: @ 8467070
.incbin "baserom.gba", 0x467070, 0x4
gUnknown_8467074:: @ 8467074
.incbin "baserom.gba", 0x467074, 0xEE4
gUnknown_8467F58:: @ 8467F58
.incbin "baserom.gba", 0x467F58, 0x8
gUnknown_8467F60:: @ 8467F60
.incbin "baserom.gba", 0x467F60, 0x40
gUnknown_8467FA0:: @ 8467FA0
.incbin "baserom.gba", 0x467FA0, 0x18
gUnknown_8467FB8:: @ 8467FB8
.incbin "baserom.gba", 0x467FB8, 0x80
gUnknown_8468038:: @ 8468038
.incbin "baserom.gba", 0x468038, 0x8
gUnknown_8468040:: @ 8468040
.incbin "baserom.gba", 0x468040, 0x10
gUnknown_8468050:: @ 8468050
.incbin "baserom.gba", 0x468050, 0x6D0
gUnknown_8468720:: @ 8468720
.incbin "baserom.gba", 0x468720, 0xC0
gUnknown_84687E0:: @ 84687E0
.incbin "baserom.gba", 0x4687E0, 0x38C
gUnknown_8468B6C:: @ 8468B6C
.incbin "baserom.gba", 0x468B6C, 0x60
gUnknown_8468BCC:: @ 8468BCC
.incbin "baserom.gba", 0x468BCC, 0x90
data/data_845FD54.s
+686
View File
@@ -0,0 +1,686 @@
.section .rodata
.align 2
// oak_speech
gUnknown_845FD54:: @ 845FD54
.incbin "baserom.gba", 0x45FD54, 0x814
gUnknown_8460568:: @ 8460568
.incbin "baserom.gba", 0x460568, 0x80
gUnknown_84605E8:: @ 84605E8
.incbin "baserom.gba", 0x4605E8, 0x5C0
gUnknown_8460BA8:: @ 8460BA8
.incbin "baserom.gba", 0x460BA8, 0xFC
gUnknown_8460CA4:: @ 8460CA4
.incbin "baserom.gba", 0x460CA4, 0x44
gUnknown_8460CE8:: @ 8460CE8
.incbin "baserom.gba", 0x460CE8, 0xAC
gUnknown_8460D94:: @ 8460D94
.incbin "baserom.gba", 0x460D94, 0xA0
gUnknown_8460E34:: @ 8460E34
.incbin "baserom.gba", 0x460E34, 0xA0
gUnknown_8460ED4:: @ 8460ED4
.incbin "baserom.gba", 0x460ED4, 0x40
gUnknown_8460F14:: @ 8460F14
.incbin "baserom.gba", 0x460F14, 0x6E8
gUnknown_84615FC:: @ 84615FC
.incbin "baserom.gba", 0x4615FC, 0x40
gUnknown_846163C:: @ 846163C
.incbin "baserom.gba", 0x46163C, 0x698
gUnknown_8461CD4:: @ 8461CD4
.incbin "baserom.gba", 0x461CD4, 0x40
gUnknown_8461D14:: @ 8461D14
.incbin "baserom.gba", 0x461D14, 0x698
gUnknown_84623AC:: @ 84623AC
.incbin "baserom.gba", 0x4623AC, 0x40
gUnknown_84623EC:: @ 84623EC
.incbin "baserom.gba", 0x4623EC, 0xA6C
gUnknown_8462E58:: @ 8462E58
.incbin "baserom.gba", 0x462E58, 0x5C
gUnknown_8462EB4:: @ 8462EB4
.incbin "baserom.gba", 0x462EB4, 0xC
gUnknown_8462EC0:: @ 8462EC0
.incbin "baserom.gba", 0x462EC0, 0x8
gUnknown_8462EC8:: @ 8462EC8
.incbin "baserom.gba", 0x462EC8, 0x8
gUnknown_8462ED0:: @ 8462ED0
.incbin "baserom.gba", 0x462ED0, 0x8
gUnknown_8462ED8:: @ 8462ED8
.incbin "baserom.gba", 0x462ED8, 0x10
gUnknown_8462EE8:: @ 8462EE8
.incbin "baserom.gba", 0x462EE8, 0x4
gUnknown_8462EEC:: @ 8462EEC
.incbin "baserom.gba", 0x462EEC, 0x4
gUnknown_8462EF0:: @ 8462EF0
.incbin "baserom.gba", 0x462EF0, 0xC
gUnknown_8462EFC:: @ 8462EFC
.incbin "baserom.gba", 0x462EFC, 0x18
gUnknown_8462F14:: @ 8462F14
.incbin "baserom.gba", 0x462F14, 0x8
gUnknown_8462F1C:: @ 8462F1C
.incbin "baserom.gba", 0x462F1C, 0x8
gUnknown_8462F24:: @ 8462F24
.incbin "baserom.gba", 0x462F24, 0x2C
gUnknown_8462F50:: @ 8462F50
.incbin "baserom.gba", 0x462F50, 0xDC
gUnknown_846302C:: @ 846302C
.incbin "baserom.gba", 0x46302C, 0x48
gUnknown_8463074:: @ 8463074
.incbin "baserom.gba", 0x463074, 0x18
gUnknown_846308C:: @ 846308C
.incbin "baserom.gba", 0x46308C, 0x4C
gUnknown_84630D8:: @ 84630D8
.incbin "baserom.gba", 0x4630D8, 0x4C
gUnknown_8463124:: @ 8463124
.incbin "baserom.gba", 0x463124, 0x10
gUnknown_8463134:: @ 8463134
.incbin "baserom.gba", 0x463134, 0xC
gUnknown_8463140:: @ 8463140
.incbin "baserom.gba", 0x463140, 0x10
gUnknown_8463150:: @ 8463150
.incbin "baserom.gba", 0x463150, 0x18
gUnknown_8463168:: @ 8463168
.incbin "baserom.gba", 0x463168, 0x3
gUnknown_846316B:: @ 846316B
.incbin "baserom.gba", 0x46316B, 0x5
gUnknown_8463170:: @ 8463170
.incbin "baserom.gba", 0x463170, 0x8
gUnknown_8463178:: @ 8463178
.incbin "baserom.gba", 0x463178, 0x4
gUnknown_846317C:: @ 846317C
.incbin "baserom.gba", 0x46317C, 0x4
gUnknown_8463180:: @ 8463180
.incbin "baserom.gba", 0x463180, 0x4
gUnknown_8463184:: @ 8463184
.incbin "baserom.gba", 0x463184, 0xC
gUnknown_8463190:: @ 8463190
.incbin "baserom.gba", 0x463190, 0x50
gUnknown_84631E0:: @ 84631E0
.incbin "baserom.gba", 0x4631E0, 0x8
gUnknown_84631E8:: @ 84631E8
.incbin "baserom.gba", 0x4631E8, 0x30
gUnknown_8463218:: @ 8463218
.incbin "baserom.gba", 0x463218, 0x8
gUnknown_8463220:: @ 8463220
.incbin "baserom.gba", 0x463220, 0x18
gUnknown_8463238:: @ 8463238
.incbin "baserom.gba", 0x463238, 0x24
gUnknown_846325C:: @ 846325C
.incbin "baserom.gba", 0x46325C, 0x48
gUnknown_84632A4:: @ 84632A4
.incbin "baserom.gba", 0x4632A4, 0x18
gUnknown_84632BC:: @ 84632BC
.incbin "baserom.gba", 0x4632BC, 0x4
gUnknown_84632C0:: @ 84632C0
.incbin "baserom.gba", 0x4632C0, 0x4
gUnknown_84632C4:: @ 84632C4
.incbin "baserom.gba", 0x4632C4, 0x4
gUnknown_84632C8:: @ 84632C8
.incbin "baserom.gba", 0x4632C8, 0x4
gUnknown_84632CC:: @ 84632CC
.incbin "baserom.gba", 0x4632CC, 0x4
gUnknown_84632D0:: @ 84632D0
.incbin "baserom.gba", 0x4632D0, 0x4
gUnknown_84632D4:: @ 84632D4
.incbin "baserom.gba", 0x4632D4, 0x4
gUnknown_84632D8:: @ 84632D8
.incbin "baserom.gba", 0x4632D8, 0x18
gUnknown_84632F0:: @ 84632F0
.incbin "baserom.gba", 0x4632F0, 0x18
gUnknown_8463308:: @ 8463308
.incbin "baserom.gba", 0x463308, 0x20
gUnknown_8463328:: @ 8463328
.incbin "baserom.gba", 0x463328, 0x70
gUnknown_8463398:: @ 8463398
.incbin "baserom.gba", 0x463398, 0x40
gUnknown_84633D8:: @ 84633D8
.incbin "baserom.gba", 0x4633D8, 0x44
gUnknown_846341C:: @ 846341C
.incbin "baserom.gba", 0x46341C, 0x20
gUnknown_846343C:: @ 846343C
.incbin "baserom.gba", 0x46343C, 0x128
gUnknown_8463564:: @ 8463564
.incbin "baserom.gba", 0x463564, 0x1C
gUnknown_8463580:: @ 8463580
.incbin "baserom.gba", 0x463580, 0x140
gUnknown_84636C0:: @ 84636C0
.incbin "baserom.gba", 0x4636C0, 0x20
gUnknown_84636E0:: @ 84636E0
.incbin "baserom.gba", 0x4636E0, 0x20
gUnknown_8463700:: @ 8463700
.incbin "baserom.gba", 0x463700, 0x20
gUnknown_8463720:: @ 8463720
.incbin "baserom.gba", 0x463720, 0x20
gUnknown_8463740:: @ 8463740
.incbin "baserom.gba", 0x463740, 0x12C
gUnknown_846386C:: @ 846386C
.incbin "baserom.gba", 0x46386C, 0x120
gUnknown_846398C:: @ 846398C
.incbin "baserom.gba", 0x46398C, 0x18
gUnknown_84639A4:: @ 84639A4
.incbin "baserom.gba", 0x4639A4, 0x8
gUnknown_84639AC:: @ 84639AC
.incbin "baserom.gba", 0x4639AC, 0x48
gUnknown_84639F4:: @ 84639F4
.incbin "baserom.gba", 0x4639F4, 0x20
gUnknown_8463A14:: @ 8463A14
.incbin "baserom.gba", 0x463A14, 0x68
gUnknown_8463A7C:: @ 8463A7C
.incbin "baserom.gba", 0x463A7C, 0x70
gUnknown_8463AEC:: @ 8463AEC
.incbin "baserom.gba", 0x463AEC, 0x10
gUnknown_8463AFC:: @ 8463AFC
.incbin "baserom.gba", 0x463AFC, 0x4
gUnknown_8463B00:: @ 8463B00
.incbin "baserom.gba", 0x463B00, 0x20
gUnknown_8463B20:: @ 8463B20
.incbin "baserom.gba", 0x463B20, 0x10
gUnknown_8463B30:: @ 8463B30
.incbin "baserom.gba", 0x463B30, 0x10
gUnknown_8463B40:: @ 8463B40
.incbin "baserom.gba", 0x463B40, 0x4
gUnknown_8463B44:: @ 8463B44
.incbin "baserom.gba", 0x463B44, 0x20
gUnknown_8463B64:: @ 8463B64
.incbin "baserom.gba", 0x463B64, 0x24
gUnknown_8463B88:: @ 8463B88
.incbin "baserom.gba", 0x463B88, 0xF8
gUnknown_8463C80:: @ 8463C80
.incbin "baserom.gba", 0x463C80, 0x1E0
gUnknown_8463E60:: @ 8463E60
.incbin "baserom.gba", 0x463E60, 0x64
gUnknown_8463EC4:: @ 8463EC4
.incbin "baserom.gba", 0x463EC4, 0x10
gUnknown_8463ED4:: @ 8463ED4
.incbin "baserom.gba", 0x463ED4, 0x1C
gUnknown_8463EF0:: @ 8463EF0
.incbin "baserom.gba", 0x463EF0, 0xC
gUnknown_8463EFC:: @ 8463EFC
.incbin "baserom.gba", 0x463EFC, 0x10
gUnknown_8463F0C:: @ 8463F0C
.incbin "baserom.gba", 0x463F0C, 0x18
gUnknown_8463F24:: @ 8463F24
.incbin "baserom.gba", 0x463F24, 0x18
gUnknown_8463F3C:: @ 8463F3C
.incbin "baserom.gba", 0x463F3C, 0x20
gUnknown_8463F5C:: @ 8463F5C
.incbin "baserom.gba", 0x463F5C, 0x20
gUnknown_8463F7C:: @ 8463F7C
.incbin "baserom.gba", 0x463F7C, 0x20
gUnknown_8463F9C:: @ 8463F9C
.incbin "baserom.gba", 0x463F9C, 0x8
gUnknown_8463FA4:: @ 8463FA4
.incbin "baserom.gba", 0x463FA4, 0x3
gUnknown_8463FA7:: @ 8463FA7
.incbin "baserom.gba", 0x463FA7, 0x11
gUnknown_8463FB8:: @ 8463FB8
.incbin "baserom.gba", 0x463FB8, 0x6
gUnknown_8463FBE:: @ 8463FBE
.incbin "baserom.gba", 0x463FBE, 0x3
gUnknown_8463FC1:: @ 8463FC1
.incbin "baserom.gba", 0x463FC1, 0x5
gUnknown_8463FC6:: @ 8463FC6
.incbin "baserom.gba", 0x463FC6, 0x7
gUnknown_8463FCD:: @ 8463FCD
.incbin "baserom.gba", 0x463FCD, 0x7
gUnknown_8463FD4:: @ 8463FD4
.incbin "baserom.gba", 0x463FD4, 0xB
gUnknown_8463FDF:: @ 8463FDF
.incbin "baserom.gba", 0x463FDF, 0xB
gUnknown_8463FEA:: @ 8463FEA
.incbin "baserom.gba", 0x463FEA, 0x12
gUnknown_8463FFC:: @ 8463FFC
.incbin "baserom.gba", 0x463FFC, 0xC
gUnknown_8464008:: @ 8464008
.incbin "baserom.gba", 0x464008, 0x120
gUnknown_8464128:: @ 8464128
.incbin "baserom.gba", 0x464128, 0x20
gUnknown_8464148:: @ 8464148
.incbin "baserom.gba", 0x464148, 0x174
gUnknown_84642BC:: @ 84642BC
.incbin "baserom.gba", 0x4642BC, 0x4
gUnknown_84642C0:: @ 84642C0
.incbin "baserom.gba", 0x4642C0, 0x34
gUnknown_84642F4:: @ 84642F4
.incbin "baserom.gba", 0x4642F4, 0xC
gUnknown_8464300:: @ 8464300
.incbin "baserom.gba", 0x464300, 0x4C
gUnknown_846434C:: @ 846434C
.incbin "baserom.gba", 0x46434C, 0xC
gUnknown_8464358:: @ 8464358
.incbin "baserom.gba", 0x464358, 0x14
gUnknown_846436C:: @ 846436C
.incbin "baserom.gba", 0x46436C, 0x8
gUnknown_8464374:: @ 8464374
.incbin "baserom.gba", 0x464374, 0x8
gUnknown_846437C:: @ 846437C
.incbin "baserom.gba", 0x46437C, 0x28
gUnknown_84643A4:: @ 84643A4
.incbin "baserom.gba", 0x4643A4, 0x4
gUnknown_84643A8:: @ 84643A8
.incbin "baserom.gba", 0x4643A8, 0x4
gUnknown_84643AC:: @ 84643AC
.incbin "baserom.gba", 0x4643AC, 0x4
gUnknown_84643B0:: @ 84643B0
.incbin "baserom.gba", 0x4643B0, 0x4
gUnknown_84643B4:: @ 84643B4
.incbin "baserom.gba", 0x4643B4, 0x4
gUnknown_84643B8:: @ 84643B8
.incbin "baserom.gba", 0x4643B8, 0x20
gUnknown_84643D8:: @ 84643D8
.incbin "baserom.gba", 0x4643D8, 0x18
gUnknown_84643F0:: @ 84643F0
.incbin "baserom.gba", 0x4643F0, 0x8
gUnknown_84643F8:: @ 84643F8
.incbin "baserom.gba", 0x4643F8, 0x8
gUnknown_8464400:: @ 8464400
.incbin "baserom.gba", 0x464400, 0x48
gUnknown_8464448:: @ 8464448
.incbin "baserom.gba", 0x464448, 0x60
gUnknown_84644A8:: @ 84644A8
.incbin "baserom.gba", 0x4644A8, 0x8
gUnknown_84644B0:: @ 84644B0
.incbin "baserom.gba", 0x4644B0, 0x8
gUnknown_84644B8:: @ 84644B8
.incbin "baserom.gba", 0x4644B8, 0x32C
gUnknown_84647E4:: @ 84647E4
.incbin "baserom.gba", 0x4647E4, 0x18
gUnknown_84647FC:: @ 84647FC
.incbin "baserom.gba", 0x4647FC, 0x8
gUnknown_8464804:: @ 8464804
.incbin "baserom.gba", 0x464804, 0x38
gUnknown_846483C:: @ 846483C
.incbin "baserom.gba", 0x46483C, 0x40
gUnknown_846487C:: @ 846487C
.incbin "baserom.gba", 0x46487C, 0x8
gUnknown_8464884:: @ 8464884
.incbin "baserom.gba", 0x464884, 0xC
gUnknown_8464890:: @ 8464890
.incbin "baserom.gba", 0x464890, 0x1E
gUnknown_84648AE:: @ 84648AE
.incbin "baserom.gba", 0x4648AE, 0xF
gUnknown_84648BD:: @ 84648BD
.incbin "baserom.gba", 0x4648BD, 0x15
gUnknown_84648D2:: @ 84648D2
.incbin "baserom.gba", 0x4648D2, 0x54
gUnknown_8464926:: @ 8464926
.incbin "baserom.gba", 0x464926, 0x40
gUnknown_8464966:: @ 8464966
.incbin "baserom.gba", 0x464966, 0xC4A
gUnknown_84655B0:: @ 84655B0
.incbin "baserom.gba", 0x4655B0, 0x18
gUnknown_84655C8:: @ 84655C8
.incbin "baserom.gba", 0x4655C8, 0x40
gUnknown_8465608:: @ 8465608
.incbin "baserom.gba", 0x465608, 0xE
gUnknown_8465616:: @ 8465616
.incbin "baserom.gba", 0x465616, 0xC0
gUnknown_84656D6:: @ 84656D6
.incbin "baserom.gba", 0x4656D6, 0x10E
gUnknown_84657E4:: @ 84657E4
.incbin "baserom.gba", 0x4657E4, 0x98
gUnknown_846587C:: @ 846587C
.incbin "baserom.gba", 0x46587C, 0x5C
gUnknown_84658D8:: @ 84658D8
.incbin "baserom.gba", 0x4658D8, 0x18
gUnknown_84658F0:: @ 84658F0
.incbin "baserom.gba", 0x4658F0, 0x40
gUnknown_8465930:: @ 8465930
.incbin "baserom.gba", 0x465930, 0x20
gUnknown_8465950:: @ 8465950
.incbin "baserom.gba", 0x465950, 0x80
gUnknown_84659D0:: @ 84659D0
.incbin "baserom.gba", 0x4659D0, 0x804
gUnknown_84661D4:: @ 84661D4
.incbin "baserom.gba", 0x4661D4, 0x2E8
gUnknown_84664BC:: @ 84664BC
.incbin "baserom.gba", 0x4664BC, 0x20
gUnknown_84664DC:: @ 84664DC
.incbin "baserom.gba", 0x4664DC, 0x60
gUnknown_846653C:: @ 846653C
.incbin "baserom.gba", 0x46653C, 0x84
gUnknown_84665C0:: @ 84665C0
.incbin "baserom.gba", 0x4665C0, 0x60
gUnknown_8466620:: @ 8466620
.incbin "baserom.gba", 0x466620, 0x378
gUnknown_8466998:: @ 8466998
.incbin "baserom.gba", 0x466998, 0x178
gUnknown_8466B10:: @ 8466B10
.incbin "baserom.gba", 0x466B10, 0x10
gUnknown_8466B20:: @ 8466B20
.incbin "baserom.gba", 0x466B20, 0xEC
gUnknown_8466C0C:: @ 8466C0C
.incbin "baserom.gba", 0x466C0C, 0x28
gUnknown_8466C34:: @ 8466C34
.incbin "baserom.gba", 0x466C34, 0x4
gUnknown_8466C38:: @ 8466C38
.incbin "baserom.gba", 0x466C38, 0x8
gUnknown_8466C40:: @ 8466C40
.incbin "baserom.gba", 0x466C40, 0x18
gUnknown_8466C58:: @ 8466C58
.incbin "baserom.gba", 0x466C58, 0xB8
gUnknown_8466D10:: @ 8466D10
.incbin "baserom.gba", 0x466D10, 0x20
gUnknown_8466D30:: @ 8466D30
.incbin "baserom.gba", 0x466D30, 0x30
gUnknown_8466D60:: @ 8466D60
.incbin "baserom.gba", 0x466D60, 0x10
gUnknown_8466D70:: @ 8466D70
.incbin "baserom.gba", 0x466D70, 0x20
gUnknown_8466D90:: @ 8466D90
.incbin "baserom.gba", 0x466D90, 0x8
gUnknown_8466D98:: @ 8466D98
.incbin "baserom.gba", 0x466D98, 0x8
gUnknown_8466DA0:: @ 8466DA0
.incbin "baserom.gba", 0x466DA0, 0x8
gUnknown_8466DA8:: @ 8466DA8
.incbin "baserom.gba", 0x466DA8, 0x8
gUnknown_8466DB0:: @ 8466DB0
.incbin "baserom.gba", 0x466DB0, 0x8
gUnknown_8466DB8:: @ 8466DB8
.incbin "baserom.gba", 0x466DB8, 0x8
gUnknown_8466DC0:: @ 8466DC0
.incbin "baserom.gba", 0x466DC0, 0x8
gUnknown_8466DC8:: @ 8466DC8
.incbin "baserom.gba", 0x466DC8, 0x8
gUnknown_8466DD0:: @ 8466DD0
.incbin "baserom.gba", 0x466DD0, 0x18
gUnknown_8466DE8:: @ 8466DE8
.incbin "baserom.gba", 0x466DE8, 0x18
gUnknown_8466E00:: @ 8466E00
.incbin "baserom.gba", 0x466E00, 0x78
gUnknown_8466E78:: @ 8466E78
.incbin "baserom.gba", 0x466E78, 0x18
gUnknown_8466E90:: @ 8466E90
.incbin "baserom.gba", 0x466E90, 0x18
gUnknown_8466EA8:: @ 8466EA8
.incbin "baserom.gba", 0x466EA8, 0x18
gUnknown_8466EC0:: @ 8466EC0
.incbin "baserom.gba", 0x466EC0, 0x28
gUnknown_8466EE8:: @ 8466EE8
.incbin "baserom.gba", 0x466EE8, 0x8
gUnknown_8466EF0:: @ 8466EF0
.incbin "baserom.gba", 0x466EF0, 0x10
gUnknown_8466F00:: @ 8466F00
.incbin "baserom.gba", 0x466F00, 0x28
.align 2
gUnknown_8466F28:: @ 8466F28
.asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent.c"
.align 2
gUnknown_8466F5C:: @ 8466F5C
.asciz "0"
.align 2
gUnknown_8466F60:: @ 8466F60
.incbin "baserom.gba", 0x466F60, 0x20
.align 2
gUnknown_8466F80:: @ 8466F80
.asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c"
.align 2
gUnknown_8466FB8:: @ 8466FB8
.asciz "size <= ME_SEND_BUF_SIZE"
.align 2
gUnknown_8466FD4:: @ 8466FD4
.asciz "cmd->parameter == NULL"
.align 2
gUnknown_8466FEC:: @ 8466FEC
.asciz "cmd->flag == FALSE"
.align 2
gUnknown_8467000:: @ 8467000
.asciz "cmd->flag == FALSE && cmd->parameter == NULL"
.align 2
gUnknown_8467030:: @ 8467030
.incbin "baserom.gba", 0x467030, 0x14
.align 2
gUnknown_8467044:: @ 8467044
.asciz "svr->mainseqno < NELEMS(func_tbl)"
.align 2
gUnknown_8467068:: @ 8467068
.incbin "baserom.gba", 0x467068, 0x8
gUnknown_8467070:: @ 8467070
.incbin "baserom.gba", 0x467070, 0x4
gUnknown_8467074:: @ 8467074
.incbin "baserom.gba", 0x467074, 0xEE4
gUnknown_8467F58:: @ 8467F58
.incbin "baserom.gba", 0x467F58, 0x8
gUnknown_8467F60:: @ 8467F60
.incbin "baserom.gba", 0x467F60, 0x40
gUnknown_8467FA0:: @ 8467FA0
.incbin "baserom.gba", 0x467FA0, 0x18
gUnknown_8467FB8:: @ 8467FB8
.incbin "baserom.gba", 0x467FB8, 0x80
gUnknown_8468038:: @ 8468038
.incbin "baserom.gba", 0x468038, 0x8
gUnknown_8468040:: @ 8468040
.incbin "baserom.gba", 0x468040, 0x10
gUnknown_8468050:: @ 8468050
.incbin "baserom.gba", 0x468050, 0x6D0
gUnknown_8468720:: @ 8468720
.incbin "baserom.gba", 0x468720, 0xC0
gUnknown_84687E0:: @ 84687E0
.incbin "baserom.gba", 0x4687E0, 0x38C
gUnknown_8468B6C:: @ 8468B6C
.incbin "baserom.gba", 0x468B6C, 0x60
gUnknown_8468BCC:: @ 8468BCC
.incbin "baserom.gba", 0x468BCC, 0x90
data/event_scripts.s
+3 -1
View File
@@ -226,7 +226,9 @@ gUnknown_81A8DD8:: @ 81A8DD8
.incbin "baserom.gba", 0x1A8DD8, 0x25
gUnknown_81A8DFD:: @ 81A8DFD
.incbin "baserom.gba", 0x1A8DFD, 0xA072
.incbin "baserom.gba", 0x1A8DFD, 0x4309
.include "data/text/fame_checker.inc"
gUnknown_81B2E6F:: @ 81B2E6F
.incbin "baserom.gba", 0x1B2E6F, 0x15A
data/fame_checker/img_845ce00.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 129 B

data/fame_checker/img_845cf00.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 297 B

data/fame_checker/img_845d100.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 177 B

data/fame_checker/img_845d520.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 726 B

data/fame_checker/img_845dd40.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 629 B

data/fame_checker/img_845e560.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 517 B

data/fame_checker/img_845ed80.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 761 B

data/fame_checker/pal_845d0e0.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
106 106 106
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
139 139 139
189 189 189
205 205 205
238 238 238
230 230 230
222 222 222
180 180 180
255 255 255
106 106 106
data/fame_checker/pal_845d500.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
246 222 82
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
246 148 41
255 82 0
data/fame_checker/pal_845dd20.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
115 197 164
255 222 205
238 180 148
197 139 106
115 90 65
222 164 82
180 139 65
148 106 57
172 164 189
255 230 131
230 205 106
238 131 90
90 90 106
213 205 213
255 255 255
0 0 0
data/fame_checker/pal_845e540.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
115 197 164
255 230 205
230 189 156
205 156 115
106 74 57
180 139 213
139 98 172
98 65 106
213 189 131
189 164 98
139 123 74
180 139 115
156 106 82
90 74 49
255 255 255
0 0 0
data/fame_checker/pal_845ed60.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
115 197 164
255 222 205
238 180 148
197 139 106
172 123 98
213 172 115
156 123 74
90 82 65
205 115 98
164 213 156
115 172 106
90 123 82
222 230 255
164 172 197
255 255 255
0 0 0
data/fame_checker/pal_845f580.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
115 197 164
255 222 205
238 180 148
197 139 106
106 74 74
139 156 164
205 164 205
164 123 164
82 82 57
213 213 222
123 123 82
115 115 115
197 189 131
156 156 90
255 255 255
0 0 0
data/fame_checker/pal_845f5a0.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
255 255 255
255 255 255
98 98 98
213 213 205
230 8 8
255 189 115
32 156 8
148 246 148
49 82 205
164 197 246
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
data/fame_checker/pal_845f5c0.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
data/fame_checker/tilemap_845c600.bin
BIN
View File
Binary file not shown.
data/graphics.s
+8 -8
View File
@@ -16185,17 +16185,17 @@ gUnknown_8E9E9FC:: @ 8E9E9FC
gUnknown_8E9F1FC:: @ 8E9F1FC
.incbin "baserom.gba", 0xE9F1FC, 0x24 @UNKNOWN
gUnknown_8E9F220:: @ 8E9F220
.incbin "baserom.gba", 0xE9F220, 0x40 @UNKNOWN
gFameCheckerBgPals:: @ 8E9F220
.incbin "data/graphics/fame_checker_bg.gbapal"
gUnknown_8E9F260:: @ 8E9F260
.incbin "baserom.gba", 0xE9F260, 0x14A0 @UNKNOWN
gFameCheckerBgTiles:: @ 8E9F260
.incbin "data/graphics/fame_checker_bg.4bpp"
gUnknown_8EA0700:: @ 8EA0700
.incbin "baserom.gba", 0xEA0700, 0x800 @UNKNOWN
gFameCheckerBg3Tilemap:: @ 8EA0700
.incbin "data/graphics/fame_checker_tilemap3.bin"
gUnknown_8EA0F00:: @ 8EA0F00
.incbin "baserom.gba", 0xEA0F00, 0x800 @UNKNOWN
gFameCheckerBg2Tilemap:: @ 8EA0F00
.incbin "data/graphics/fame_checker_tilemap2.bin"
gUnknown_8EA1700:: @ 8EA1700
.incbin "baserom.gba", 0xEA1700, 0x20 @UNKNOWN
data/graphics/fame_checker_bg.pal
+35
View File
@@ -0,0 +1,35 @@
JASC-PAL
0100
32
246 222 82
255 255 156
246 222 82
255 238 98
255 255 213
255 172 106
222 148 74
255 246 222
156 148 164
238 230 180
255 255 213
123 123 123
213 213 213
255 255 255
106 106 106
24 98 197
246 222 82
172 164 90
148 156 230
98 106 180
123 131 205
255 255 255
213 213 213
0 0 0
0 0 0
0 0 0
0 0 0
115 0 0
0 255 0
205 213 213
238 238 246
106 106 106
data/graphics/fame_checker_bg.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 906 B

data/graphics/fame_checker_tilemap2.bin
BIN
View File
Binary file not shown.
data/graphics/fame_checker_tilemap3.bin
BIN
View File
Binary file not shown.
data/text/fame_checker.inc
+1700
View File
File diff suppressed because it is too large Load Diff
graphics_file_rules.mk
+9 -1
View File
@@ -3,7 +3,9 @@ MONBACKGFXDIR := graphics/pokemon/back_pics
MONFRONTGFXDIR := graphics/pokemon/anim_front_pics
MONPALDIR := graphics/pokemon/palettes
TILESETGFXDIR := data/tilesets
FONTGFXDIR := data/graphics/fonts
GLOBALGFXDIR := data/graphics
FONTGFXDIR := $(GLOBALGFXDIR)/fonts
FAMECHECKERGFXDIR := data/fame_checker
INTERFACEGFXDIR := graphics/interface
BTLANMSPRGFXDIR := graphics/battle_anims/sprites
UNUSEDGFXDIR := graphics/unused
@@ -651,3 +653,9 @@ $(INTERFACEGFXDIR)/region_map_affine.8bpp: %.8bpp: %.png
$(MISCGFXDIR)/birch_help.4bpp: $(MISCGFXDIR)/birch_bag.4bpp $(MISCGFXDIR)/birch_grass.4bpp
@cat $^ >$@
$(FAMECHECKERGFXDIR)/img_845cf00.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 15
$(GLOBALGFXDIR)/fame_checker_bg.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 165
include/battle_dome_cards.h
+2
View File
@@ -11,5 +11,7 @@ u16 sub_818D8AC(u16 species, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16
u16 sub_818D8F0(u16 spriteId);
u16 sub_818D938(u16 species, bool8 isFrontPic, u16 destX, u16 destY, u8 paletteSlot, u8 windowId);
u8 sub_818D97C(u8 a0, u8 a1);
u8 sub_810C2A4(u16, u8, s16, s16, u8, u16);
void sub_810C2E8(u16);
#endif //GUARD_BATTLE_DOME_CARDS_H
include/bg.h
+3 -3
View File
@@ -77,9 +77,9 @@ void UnsetBgTilemapBuffer(u8 bg);
void* GetBgTilemapBuffer(u8 bg);
void CopyToBgTilemapBuffer(u8 bg, const void *src, u16 mode, u16 destOffset);
void CopyBgTilemapBufferToVram(u8 bg);
void CopyToBgTilemapBufferRect(u8 bg, void* src, u8 destX, u8 destY, u8 width, u8 height);
void CopyToBgTilemapBufferRect_ChangePalette(u8 bg, void *src, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette);
void CopyRectToBgTilemapBufferRect(u8 bg, void* src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette1, u16 tileOffset, u16 palette2);
void CopyToBgTilemapBufferRect(u8 bg, const void* src, u8 destX, u8 destY, u8 width, u8 height);
void CopyToBgTilemapBufferRect_ChangePalette(u8 bg, const void *src, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette);
void CopyRectToBgTilemapBufferRect(u8 bg, const void* src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette1, u16 tileOffset, u16 palette2);
void FillBgTilemapBufferRect_Palette0(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height);
void FillBgTilemapBufferRect(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height, u8 palette);
void WriteSequenceToBgTilemapBuffer(u8 bg, u16 firstTileNum, u8 x, u8 y, u8 width, u8 height, u8 paletteSlot, s16 tileNumDelta);
include/event_scripts.h
+324
View File
@@ -381,4 +381,328 @@ extern const u8 gUnknown_84178DA[];
extern const u8 gUnknown_81C137C[];
extern const u8 gUnknown_81C13D6[];
extern const u8 gUnknown_81C1429[];
// fame_checker
extern const u8 gFameCheckerFlavorText_ProfOak0[];
extern const u8 gFameCheckerFlavorText_ProfOak1[];
extern const u8 gFameCheckerFlavorText_ProfOak2[];
extern const u8 gFameCheckerFlavorText_ProfOak3[];
extern const u8 gFameCheckerFlavorText_ProfOak4[];
extern const u8 gFameCheckerFlavorText_ProfOak5[];
extern const u8 gFameCheckerFlavorText_Daisy0[];
extern const u8 gFameCheckerFlavorText_Daisy1[];
extern const u8 gFameCheckerFlavorText_Daisy2[];
extern const u8 gFameCheckerFlavorText_Daisy3[];
extern const u8 gFameCheckerFlavorText_Daisy4[];
extern const u8 gFameCheckerFlavorText_Daisy5[];
extern const u8 gFameCheckerFlavorText_Brock0[];
extern const u8 gFameCheckerFlavorText_Brock1[];
extern const u8 gFameCheckerFlavorText_Brock2[];
extern const u8 gFameCheckerFlavorText_Brock3[];
extern const u8 gFameCheckerFlavorText_Brock4[];
extern const u8 gFameCheckerFlavorText_Brock5[];
extern const u8 gFameCheckerFlavorText_Misty0[];
extern const u8 gFameCheckerFlavorText_Misty1[];
extern const u8 gFameCheckerFlavorText_Misty2[];
extern const u8 gFameCheckerFlavorText_Misty3[];
extern const u8 gFameCheckerFlavorText_Misty4[];
extern const u8 gFameCheckerFlavorText_Misty5[];
extern const u8 gFameCheckerFlavorText_LtSurge0[];
extern const u8 gFameCheckerFlavorText_LtSurge1[];
extern const u8 gFameCheckerFlavorText_LtSurge2[];
extern const u8 gFameCheckerFlavorText_LtSurge3[];
extern const u8 gFameCheckerFlavorText_LtSurge4[];
extern const u8 gFameCheckerFlavorText_LtSurge5[];
extern const u8 gFameCheckerFlavorText_Erika0[];
extern const u8 gFameCheckerFlavorText_Erika1[];
extern const u8 gFameCheckerFlavorText_Erika2[];
extern const u8 gFameCheckerFlavorText_Erika3[];
extern const u8 gFameCheckerFlavorText_Erika4[];
extern const u8 gFameCheckerFlavorText_Erika5[];
extern const u8 gFameCheckerFlavorText_Koga0[];
extern const u8 gFameCheckerFlavorText_Koga1[];
extern const u8 gFameCheckerFlavorText_Koga2[];
extern const u8 gFameCheckerFlavorText_Koga3[];
extern const u8 gFameCheckerFlavorText_Koga4[];
extern const u8 gFameCheckerFlavorText_Koga5[];
extern const u8 gFameCheckerFlavorText_Sabrina0[];
extern const u8 gFameCheckerFlavorText_Sabrina1[];
extern const u8 gFameCheckerFlavorText_Sabrina2[];
extern const u8 gFameCheckerFlavorText_Sabrina3[];
extern const u8 gFameCheckerFlavorText_Sabrina4[];
extern const u8 gFameCheckerFlavorText_Sabrina5[];
extern const u8 gFameCheckerFlavorText_Blaine0[];
extern const u8 gFameCheckerFlavorText_Blaine1[];
extern const u8 gFameCheckerFlavorText_Blaine2[];
extern const u8 gFameCheckerFlavorText_Blaine3[];
extern const u8 gFameCheckerFlavorText_Blaine4[];
extern const u8 gFameCheckerFlavorText_Blaine5[];
extern const u8 gFameCheckerFlavorText_Lorelei0[];
extern const u8 gFameCheckerFlavorText_Lorelei1[];
extern const u8 gFameCheckerFlavorText_Lorelei2[];
extern const u8 gFameCheckerFlavorText_Lorelei3[];
extern const u8 gFameCheckerFlavorText_Lorelei4[];
extern const u8 gFameCheckerFlavorText_Lorelei5[];
extern const u8 gFameCheckerFlavorText_Bruno0[];
extern const u8 gFameCheckerFlavorText_Bruno1[];
extern const u8 gFameCheckerFlavorText_Bruno2[];
extern const u8 gFameCheckerFlavorText_Bruno3[];
extern const u8 gFameCheckerFlavorText_Bruno4[];
extern const u8 gFameCheckerFlavorText_Bruno5[];
extern const u8 gFameCheckerFlavorText_Agatha0[];
extern const u8 gFameCheckerFlavorText_Agatha1[];
extern const u8 gFameCheckerFlavorText_Agatha2[];
extern const u8 gFameCheckerFlavorText_Agatha3[];
extern const u8 gFameCheckerFlavorText_Agatha4[];
extern const u8 gFameCheckerFlavorText_Agatha5[];
extern const u8 gFameCheckerFlavorText_Lance0[];
extern const u8 gFameCheckerFlavorText_Lance1[];
extern const u8 gFameCheckerFlavorText_Lance2[];
extern const u8 gFameCheckerFlavorText_Lance3[];
extern const u8 gFameCheckerFlavorText_Lance4[];
extern const u8 gFameCheckerFlavorText_Lance5[];
extern const u8 gFameCheckerFlavorText_Bill0[];
extern const u8 gFameCheckerFlavorText_Bill1[];
extern const u8 gFameCheckerFlavorText_Bill2[];
extern const u8 gFameCheckerFlavorText_Bill3[];
extern const u8 gFameCheckerFlavorText_Bill4[];
extern const u8 gFameCheckerFlavorText_Bill5[];
extern const u8 gFameCheckerFlavorText_MrFuji0[];
extern const u8 gFameCheckerFlavorText_MrFuji1[];
extern const u8 gFameCheckerFlavorText_MrFuji2[];
extern const u8 gFameCheckerFlavorText_MrFuji3[];
extern const u8 gFameCheckerFlavorText_MrFuji4[];
extern const u8 gFameCheckerFlavorText_MrFuji5[];
extern const u8 gFameCheckerFlavorText_Giovanni0[];
extern const u8 gFameCheckerFlavorText_Giovanni1[];
extern const u8 gFameCheckerFlavorText_Giovanni2[];
extern const u8 gFameCheckerFlavorText_Giovanni3[];
extern const u8 gFameCheckerFlavorText_Giovanni4[];
extern const u8 gFameCheckerFlavorText_Giovanni5[];
extern const u8 gFameCheckerPersonName_ProfOak[];
extern const u8 gFameCheckerPersonQuote_ProfOak[];
extern const u8 gFameCheckerPersonName_Daisy[];
extern const u8 gFameCheckerPersonQuote_Daisy[];
extern const u8 gFameCheckerPersonName_Brock[];
extern const u8 gFameCheckerPersonQuote_Brock[];
extern const u8 gFameCheckerPersonName_Misty[];
extern const u8 gFameCheckerPersonQuote_Misty[];
extern const u8 gFameCheckerPersonName_LtSurge[];
extern const u8 gFameCheckerPersonQuote_LtSurge[];
extern const u8 gFameCheckerPersonName_Erika[];
extern const u8 gFameCheckerPersonQuote_Erika[];
extern const u8 gFameCheckerPersonName_Koga[];
extern const u8 gFameCheckerPersonQuote_Koga[];
extern const u8 gFameCheckerPersonName_Sabrina[];
extern const u8 gFameCheckerPersonQuote_Sabrina[];
extern const u8 gFameCheckerPersonName_Blaine[];
extern const u8 gFameCheckerPersonQuote_Blaine[];
extern const u8 gFameCheckerPersonName_Lorelei[];
extern const u8 gFameCheckerPersonQuote_Lorelei[];
extern const u8 gFameCheckerPersonName_Bruno[];
extern const u8 gFameCheckerPersonQuote_Bruno[];
extern const u8 gFameCheckerPersonName_Agatha[];
extern const u8 gFameCheckerPersonQuote_Agatha[];
extern const u8 gFameCheckerPersonName_Lance[];
extern const u8 gFameCheckerPersonQuote_Lance[];
extern const u8 gFameCheckerPersonName_Bill[];
extern const u8 gFameCheckerPersonQuote_Bill[];
extern const u8 gFameCheckerPersonName_MrFuji[];
extern const u8 gFameCheckerPersonQuote_MrFuji[];
extern const u8 gFameCheckerPersonName_Giovanni[];
extern const u8 gFameCheckerPersonQuote_Giovanni[];
extern const u8 gFameCheckerFlavorTextOriginLocation_ProfOak0[];
extern const u8 gFameCheckerFlavorTextOriginLocation_ProfOak1[];
extern const u8 gFameCheckerFlavorTextOriginLocation_ProfOak2[];
extern const u8 gFameCheckerFlavorTextOriginLocation_ProfOak3[];
extern const u8 gFameCheckerFlavorTextOriginLocation_ProfOak4[];
extern const u8 gFameCheckerFlavorTextOriginLocation_ProfOak5[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Daisy0[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Daisy1[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Daisy2[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Daisy3[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Daisy4[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Daisy5[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Brock0[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Brock1[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Brock2[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Brock3[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Brock4[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Brock5[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Misty0[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Misty1[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Misty2[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Misty3[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Misty4[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Misty5[];
extern const u8 gFameCheckerFlavorTextOriginLocation_LtSurge0[];
extern const u8 gFameCheckerFlavorTextOriginLocation_LtSurge1[];
extern const u8 gFameCheckerFlavorTextOriginLocation_LtSurge2[];
extern const u8 gFameCheckerFlavorTextOriginLocation_LtSurge3[];
extern const u8 gFameCheckerFlavorTextOriginLocation_LtSurge4[];
extern const u8 gFameCheckerFlavorTextOriginLocation_LtSurge5[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Erika0[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Erika1[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Erika2[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Erika3[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Erika4[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Erika5[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Koga0[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Koga1[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Koga2[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Koga3[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Koga4[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Koga5[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Sabrina0[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Sabrina1[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Sabrina2[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Sabrina3[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Sabrina4[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Sabrina5[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Blaine0[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Blaine1[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Blaine2[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Blaine3[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Blaine4[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Blaine5[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Lorelei0[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Lorelei1[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Lorelei2[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Lorelei3[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Lorelei4[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Lorelei5[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Bruno0[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Bruno1[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Bruno2[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Bruno3[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Bruno4[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Bruno5[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Agatha0[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Agatha1[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Agatha2[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Agatha3[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Agatha4[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Agatha5[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Lance0[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Lance1[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Lance2[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Lance3[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Lance4[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Lance5[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Bill0[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Bill1[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Bill2[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Bill3[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Bill4[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Bill5[];
extern const u8 gFameCheckerFlavorTextOriginLocation_MrFuji0[];
extern const u8 gFameCheckerFlavorTextOriginLocation_MrFuji1[];
extern const u8 gFameCheckerFlavorTextOriginLocation_MrFuji2[];
extern const u8 gFameCheckerFlavorTextOriginLocation_MrFuji3[];
extern const u8 gFameCheckerFlavorTextOriginLocation_MrFuji4[];
extern const u8 gFameCheckerFlavorTextOriginLocation_MrFuji5[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Giovanni0[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Giovanni1[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Giovanni2[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Giovanni3[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Giovanni4[];
extern const u8 gFameCheckerFlavorTextOriginLocation_Giovanni5[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_ProfOak0[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_ProfOak1[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_ProfOak2[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_ProfOak3[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_ProfOak4[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_ProfOak5[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Daisy0[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Daisy1[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Daisy2[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Daisy3[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Daisy4[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Daisy5[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Brock0[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Brock1[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Brock2[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Brock3[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Brock4[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Brock5[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Misty0[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Misty1[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Misty2[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Misty3[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Misty4[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Misty5[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_LtSurge0[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_LtSurge1[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_LtSurge2[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_LtSurge3[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_LtSurge4[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_LtSurge5[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Erika0[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Erika1[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Erika2[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Erika3[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Erika4[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Erika5[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Koga0[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Koga1[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Koga2[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Koga3[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Koga4[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Koga5[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Sabrina0[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Sabrina1[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Sabrina2[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Sabrina3[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Sabrina4[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Sabrina5[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Blaine0[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Blaine1[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Blaine2[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Blaine3[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Blaine4[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Blaine5[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Lorelei0[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Lorelei1[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Lorelei2[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Lorelei3[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Lorelei4[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Lorelei5[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Bruno0[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Bruno1[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Bruno2[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Bruno3[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Bruno4[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Bruno5[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Agatha0[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Agatha1[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Agatha2[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Agatha3[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Agatha4[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Agatha5[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Lance0[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Lance1[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Lance2[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Lance3[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Lance4[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Lance5[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Bill0[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Bill1[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Bill2[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Bill3[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Bill4[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Bill5[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_MrFuji0[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_MrFuji1[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_MrFuji2[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_MrFuji3[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_MrFuji4[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_MrFuji5[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Giovanni0[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Giovanni1[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Giovanni2[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Giovanni3[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Giovanni4[];
extern const u8 gFameCheckerFlavorTextOriginObjectName_Giovanni5[];
#endif //GUARD_EVENT_SCRIPTS_H
include/fame_checker.h
+48
View File
@@ -0,0 +1,48 @@
#ifndef GUARD_FAME_CHECKER_H
#define GUARD_FAME_CHECKER_H
#include "main.h"
enum {
FAMECHECKER_OAK,
FAMECHECKER_DAISY,
FAMECHECKER_BROCK,
FAMECHECKER_MISTY,
FAMECHECKER_LTSURGE,
FAMECHECKER_ERIKA,
FAMECHECKER_KOGA,
FAMECHECKER_SABRINA,
FAMECHECKER_BLAINE,
FAMECHECKER_LORELEI,
FAMECHECKER_BRUNO,
FAMECHECKER_AGATHA,
FAMECHECKER_LANCE,
FAMECHECKER_BILL,
FAMECHECKER_MRFUJI,
FAMECHECKER_GIOVANNI,
NUM_FAMECHECKER_PERSONS
};
enum {
FCPICKSTATE_NO_DRAW,
FCPICKSTATE_SILHOUETTE,
FCPICKSTATE_COLORED
};
enum {
FCWINDOWID_LIST,
FCWINDOWID_UIHELP,
FCWINDOWID_MSGBOX,
FCWINDOWID_ICONDESC
};
extern struct ListMenuTemplate gFameChecker_ListMenuTemplate;
extern u8 gIconDescriptionBoxIsOpen;
void ResetFameChecker(void);
void FullyUnlockFameChecker(void);
void UseFameChecker(MainCallback savedCallback);
void SetFlavorTextFlagFromSpecialVars(void);
void UpdatePickStateFromSpecialVar8005(void);
#endif //GUARD_FAME_CHECKER_H
include/field_map_obj.h
+2
View File
@@ -86,6 +86,8 @@ void npc_set_running_behaviour_etc(struct MapObject *, u8);
u8 sub_80634F0(u8 direction);
u8 sub_8063500(u8 a0);
void sub_805F060(struct MapObject *mapObject, u8 a1);
u8 sub_805EB44(u8, u8, s16, s16);
void npc_paltag_set_load(u8 mode);
// Exported data declarations
include/gba/macro.h
+3
View File
@@ -125,6 +125,9 @@
#define DmaCopyLarge32(dmaNum, src, dest, size, block) DmaCopyLarge(dmaNum, src, dest, size, block, 32)
#define DmaClearLarge16(dmaNum, dest, size, block) DmaClearLarge(dmaNum, dest, size, block, 16)
#define DmaClearLarge32(dmaNum, dest, size, block) DmaClearLarge(dmaNum, dest, size, block, 32)
#define DmaCopyDefvars(dmaNum, src, dest, size, bit) \
{ \
const void *_src = src; \
include/global.berry.h
-2
View File
@@ -1,8 +1,6 @@
#ifndef GUARD_GLOBAL_BERRY_H
#define GUARD_GLOBAL_BERRY_H
#include "global.h"
#define BERRY_NAME_COUNT 7
#define BERRY_ITEM_EFFECT_COUNT 18
include/global.fieldmap.h
-2
View File
@@ -1,8 +1,6 @@
#ifndef GUARD_GLOBAL_FIELDMAP_H
#define GUARD_GLOBAL_FIELDMAP_H
#include "global.h"
#define NUM_FIELD_OBJECTS 16
enum
include/global.h
+42 -22
View File
@@ -62,6 +62,15 @@
#define T2_READ_32(ptr) ((ptr)[0] + ((ptr)[1] << 8) + ((ptr)[2] << 16) + ((ptr)[3] << 24))
#define T2_READ_PTR(ptr) (void*) T2_READ_32(ptr)
// This macro is required to prevent the compiler from optimizing
// a dpad up/down check in sub_812CAD8 (fame_checker.c).
// We suspect it was used globally.
// GameFreak never ceases to amaze.
// TODO: Propagate use of this macro
#define TEST_BUTTON(field, button) ({(field) & (button);})
#define JOY_NEW(button) TEST_BUTTON(gMain.newKeys, button)
#define JOY_HELD(button) TEST_BUTTON(gMain.heldKeys, button)
extern u8 gStringVar1[];
extern u8 gStringVar2[];
extern u8 gStringVar3[];
@@ -88,6 +97,7 @@ enum LanguageId {
#define GAME_LANGUAGE (LANGUAGE_ENGLISH)
#define PC_ITEMS_COUNT 30
#define BAG_ITEMS_COUNT 42
#define BAG_KEYITEMS_COUNT 30
#define BAG_POKEBALLS_COUNT 13
@@ -479,8 +489,8 @@ struct DaycareMon
struct DayCare
{
struct DaycareMon mons[DAYCARE_MON_COUNT];
u32 offspringPersonality;
u8 stepCounter;
u16 unk_118;
u8 unk_11A;
};
struct DayCareMail
@@ -563,12 +573,24 @@ struct QuestLog
/*0x0668*/ u16 end[0];
};
#include "fame_checker.h"
struct FameCheckerSaveData
{
/*3a54*/ u16 pickState:2;
u16 flavorTextFlags:12;
u16 unk_0_E:2;
};
#define MAP_OBJECTS_COUNT 16
#define BERRY_TREES_COUNT 128
#define FLAGS_COUNT 288 // 300
#define VARS_COUNT 256
#define MAIL_COUNT 16
#define NUM_EASY_CHAT_EXTRA_PHRASES 33
#define EASY_CHAT_EXTRA_PHRASES_SIZE ((NUM_EASY_CHAT_EXTRA_PHRASES >> 3) + (NUM_EASY_CHAT_EXTRA_PHRASES % 8 ? 1 : 0))
struct SaveBlock1
{
/*0x0000*/ struct Coords16 pos;
@@ -587,36 +609,33 @@ struct SaveBlock1
/*0x0290*/ u32 money;
/*0x0294*/ u16 coins;
/*0x0296*/ u16 registeredItem; // registered for use with SELECT button
/*0x0298*/ u8 filler298[0x78];
/*0x0298*/ struct ItemSlot pcItems[PC_ITEMS_COUNT];
/*0x0310*/ struct ItemSlot bagPocket_Items[BAG_ITEMS_COUNT];
/*0x03b8*/ struct ItemSlot bagPocket_KeyItems[BAG_KEYITEMS_COUNT];
/*0x0430*/ struct ItemSlot bagPocket_PokeBalls[BAG_POKEBALLS_COUNT];
/*0x0464*/ struct ItemSlot bagPocket_TMHM[BAG_TMHM_COUNT];
/*0x054c*/ struct ItemSlot bagPocket_Berries[BAG_BERRIES_COUNT];
/*0x05F8*/ u8 seen1[DEX_FLAGS_NO];
/*0x062C*/ u8 filler_062c[12];
/*0x062C*/ u16 berryBlenderRecords[3]; // unused
/*0x0632*/ u8 field_632[6]; // unused?
/*0x0638*/ u8 trainerRematchStepCounter;
u8 filler_639;
/*0x063A*/ u8 trainerRematches[100];
/*0x06A0*/ struct MapObject mapObjects[MAP_OBJECTS_COUNT];
/*0x08E0*/ struct MapObjectTemplate mapObjectTemplates[64];
/*0x063A*/ u8 ALIGNED(2) trainerRematches[100];
/*0x06A0*/ struct MapObject mapObjects[MAP_OBJECTS_COUNT];
/*0x08E0*/ struct MapObjectTemplate mapObjectTemplates[64];
/*0x0EE0*/ u8 flags[FLAGS_COUNT];
/*0x1000*/ u16 vars[VARS_COUNT];
/*0x1200*/ u8 filler1200[0x100];
/*0x1200*/ u32 gameStats[NUM_GAME_STATS];
/*0x1300*/ struct QuestLog questLog[4];
/*0x2CA0*/ u8 filler2CA0[0x30];
/*0x2CA0*/ u16 unk2CA0[6];
/*0x2CAC*/ u16 unk2CAC[6];
/*0x2CB8*/ u16 unk2CB8[6];
/*0x2CC4*/ u16 unk2CC4[6];
/*0x2CD0*/ struct MailStruct mail[MAIL_COUNT];
/*0x2F10*/ u8 filler2F10[0x184];
struct {
/*0x3094*/ u8 unknown1[8];
/*0x309C*/ u8 giftRibbons[11];
/*0x30A7*/ u8 unknown2[8];
/*0x30AF*/ u32 currentPokeCoupons;
/*0x30B3*/ u32 totalEarnedPokeCoupons;
/*0x30B7*/ u8 unknown3[6];
/*0x30BD*/ u8 receivedWishmakerJirachi;
/*0x30BE*/ u8 unknown4[18];
} __attribute__((packed)) externalReservedData;
/*0x2F10*/ u8 additionalPhrases[EASY_CHAT_EXTRA_PHRASES_SIZE];
/*0x2F18*/ OldMan oldMan; // unused
/*0x2F54*/ struct EasyChatPair easyChatPairs[5]; // unused
/*0x2F80*/ struct DayCare daycare;
/*0x309C*/ u8 giftRibbons[52];
/*0x30D0*/ struct Roamer roamer;
/*0x30EC*/ struct EnigmaBerry enigmaBerry;
/*0x3120*/ u8 filler3120[0x340];
@@ -627,7 +646,8 @@ struct SaveBlock1
/*0x3A14*/ u8 seen2[DEX_FLAGS_NO];
/*0x3A48*/ u8 filler_3a48[4];
/*0x3A4C*/ u8 rivalName[PLAYER_NAME_LENGTH];
/*0x3A54*/ u8 filler3A54[0x2E4];
/*0x3A54*/ struct FameCheckerSaveData fameChecker[NUM_FAMECHECKER_PERSONS];
/*0x3A94*/ u8 filler3A94[0x2A4];
u32 unkArray[4][3];
};
include/graphics.h
+7
View File
@@ -143,4 +143,11 @@ extern const u8 gUnknown_08DDB020[];
extern const u8 gUnknown_08DDB2C4[];
extern const u16 gUnknown_08DDAFE0[];
// fame_checker
extern const u16 gFameCheckerBgPals[0x30];
extern const u16 gFameCheckerBgTiles[0xa50];
extern const u16 gFameCheckerBg3Tilemap[0x400];
extern const u16 gFameCheckerBg2Tilemap[0x400];
#endif //GUARD_GRAPHICS_H
include/item_menu.h
+1
View File
@@ -12,5 +12,6 @@ extern u16 gUnknown_203AD30;
// Exported ROM declarations
void sub_81AAC50(void);
void sub_81AAC70(void);
void UseFameCheckerFromMenu(void);
#endif //GUARD_ITEM_MENU_H
include/list_menu.h
+17 -14
View File
@@ -18,22 +18,23 @@ struct ListMenu;
struct ListMenuTemplate
{
const struct ListMenuItem *items;
void (* unk_04)(u32, bool8, struct ListMenu *);
void (* unk_08)(u8, s32, u8);
void (* moveCursorFunc)(s32 itemIndex, bool8 onInit, struct ListMenu *list);
void (* itemPrintFunc)(u8 windowId, s32 itemId, u8 y);
u16 totalItems;
u16 maxShowed;
u8 unk_10;
u8 unk_11;
u8 unk_12;
u8 cursor_Y;
u32 upText_Y:4; // x1, x2, x4, x8 = xF
u32 cursorColor:4; // x10, x20, x40, x80 = xF0
u32 fillColor:4; // x100, x200, x400, x800 = xF00
u32 cursorShadowColor:4; // x1000, x2000, x4000, x8000 = xF000
u32 unk_16_0:1; // x10000
u32 spaceBetweenItems:6; // x20000, x40000, x80000, x100000, x200000, x400000 = x7E0000
u32 unk_16_7:1; // x800000
u32 unk_17_0:6; // x1000000, x2000000, x4000000, x8000000, x10000000, x20000000 = x3F000000
u8 windowId;
u8 header_X;
u8 item_X;
u8 cursor_X;
u8 upText_Y:4; // x1, x2, x4, x8 = xF
u8 cursorPal:4; // x10, x20, x40, x80 = xF0
u8 fillValue:4; // x1, x2, x4, x8 = xF
u8 cursorShadowPal:4; // x10, x20, x40, x80 = xF0
u8 lettersSpacing:3;
u8 itemVerticalPadding:3;
u8 scrollMultiple:2; // x40, x80 = xC0
u8 fontId:6; // x1, x2, x4, x8, x10, x20 = x3F
u8 cursorKind:2; // x40, x80
};
struct ListMenu {
@@ -54,5 +55,7 @@ u8 ListMenuInit(struct ListMenuTemplate *template, u16 a1, u16 a2);
s32 ListMenuHandleInput(u8 id);
void get_coro_args_x18_x1A(u8 a0, u16 *a1, u16 *a2);
void sub_81AE6C8(u8 a0, u16 *a1, u16 *a2);
void sub_810713C(u8, u8, u8);
u16 ListMenuGetYCoordForPrintingArrowCursor(u8);
#endif //GUARD_LIST_MENU_H
include/menu_indicators.h
+17
View File
@@ -7,8 +7,25 @@
// Exported RAM declarations
struct ScrollIndicatorArrowPairTemplate
{
u8 unk_00;
u8 unk_01;
u8 unk_02;
u8 unk_03;
u8 unk_04;
u8 unk_05;
u16 unk_06;
u16 unk_08;
u16 unk_0a;
u16 unk_0c;
u16 unk_0e_0:4;
u16 unk_0e_4:12;
};
// Exported ROM declarations
u8 AddScrollIndicatorArrowPairParametrized(u8, u8, u8, u8, s32, u16, u16, u16 *);
u8 AddScrollIndicatorArrowPair(const struct ScrollIndicatorArrowPairTemplate * template, u16 * a1);
void RemoveScrollIndicatorArrowPair(u8);
#endif //GUARD_MENU_INDICATORS_H
include/new_menu_helpers.h
+3
View File
@@ -16,5 +16,8 @@ void SetStandardWindowBorderStyle(u8 a0, u8 a1);
void sub_8197930(void);
u8 GetPlayerTextSpeed(void);
void sub_80F6F54(u8, u8);
u8 sub_80F78A8(void);
void sub_80F6E9C(void);
void sub_80F6EE4(u8 windowId, bool8 transfer);
#endif // GUARD_NEW_MENU_HELPERS_H
include/scanline_effect.h
+6
View File
@@ -0,0 +1,6 @@
#ifndef GUARD_SCANLINE_EFFECT_H
#define GUARD_SCANLINE_EFFECT_H
void remove_some_task(void);
#endif //GUARD_SCANLINE_EFFECT_H
include/text.h
+12 -12
View File
@@ -161,7 +161,7 @@ extern const struct FontInfo *gFonts;
struct GlyphWidthFunc
{
u32 font_id;
u32 (*func)(u16 glyphId, bool32 isJapanese);
s32 (*func)(u16 glyphId, bool32 isJapanese);
};
struct KeypadIcon
@@ -224,9 +224,9 @@ bool16 TextPrinterWaitWithDownArrow(struct TextPrinter *textPrinter);
bool16 TextPrinterWait(struct TextPrinter *textPrinter);
void DrawDownArrow(u8 windowId, u16 x, u16 y, u8 bgColor, bool8 drawArrow, u8 *counter, u8 *yCoordIndex);
u16 RenderText(struct TextPrinter *textPrinter);
u32 GetStringWidthFixedWidthFont(const u8 *str, u8 fontId, u8 letterSpacing);
u32 (*GetFontWidthFunc(u8 glyphId))(u16, bool32);
u32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing);
s32 GetStringWidthFixedWidthFont(const u8 *str, u8 fontId, u8 letterSpacing);
s32 (*GetFontWidthFunc(u8 glyphId))(u16, bool32);
s32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing);
u8 RenderTextFont9(u8 *pixels, u8 fontId, u8 *str);
u8 DrawKeypadIcon(u8 windowId, u8 keypadIconId, u16 x, u16 y);
u8 GetKeypadIconTileOffset(u8 keypadIconId);
@@ -236,19 +236,19 @@ void SetDefaultFontsPointer(void);
u8 GetFontAttribute(u8 fontId, u8 attributeId);
u8 GetMenuCursorDimensionByFont(u8 fontId, u8 whichDimension);
void DecompressGlyphFont0(u16 glyphId, bool32 isJapanese);
u32 GetGlyphWidthFont0(u16 glyphId, bool32 isJapanese);
s32 GetGlyphWidthFont0(u16 glyphId, bool32 isJapanese);
void DecompressGlyphFont7(u16 glyphId, bool32 isJapanese);
u32 GetGlyphWidthFont7(u16 glyphId, bool32 isJapanese);
s32 GetGlyphWidthFont7(u16 glyphId, bool32 isJapanese);
void DecompressGlyphFont8(u16 glyphId, bool32 isJapanese);
u32 GetGlyphWidthFont8(u16 glyphId, bool32 isJapanese);
s32 GetGlyphWidthFont8(u16 glyphId, bool32 isJapanese);
void DecompressGlyphFont2(u16 glyphId, bool32 isJapanese);
u32 GetGlyphWidthFont2(u16 glyphId, bool32 isJapanese);
s32 GetGlyphWidthFont2(u16 glyphId, bool32 isJapanese);
void DecompressGlyphFont1(u16 glyphId, bool32 isJapanese);
u32 GetGlyphWidthFont1(u16 glyphId, bool32 isJapanese);
s32 GetGlyphWidthFont1(u16 glyphId, bool32 isJapanese);
void DecompressGlyphFont9(u16 glyphId);
u32 GetGlyphWidthFont3(u16 glyphId, bool32 isJapanese);
u32 GetGlyphWidthFont4(u16 glyphId, bool32 isJapanese);
u32 GetGlyphWidthFont5(u16 glyphId, bool32 isJapanese);
s32 GetGlyphWidthFont3(u16 glyphId, bool32 isJapanese);
s32 GetGlyphWidthFont4(u16 glyphId, bool32 isJapanese);
s32 GetGlyphWidthFont5(u16 glyphId, bool32 isJapanese);
void sub_80062B0(struct Sprite *sprite);
#endif // GUARD_TEXT_H
ld_script.txt
+3 -1
View File
@@ -226,7 +226,7 @@ SECTIONS {
asm/union_room_chat.o(.text);
asm/help_system_812B1E0.o(.text);
src/quest_log_battle.o(.text);
asm/fame_checker.o(.text);
src/fame_checker.o(.text);
asm/menu2.o(.text);
asm/oak_speech.o(.text);
asm/tm_case.o(.text);
@@ -376,6 +376,8 @@ SECTIONS {
data/data_83FECCC.o(.rodata.8453F6C);
src/quest_log.o(.rodata);
data/data_83FECCC.o(.rodata.8456C74);
src/fame_checker.o(.rodata);
data/data_845FD54.o(.rodata);
src/menews_jisan.o(.rodata);
src/menews_jisan.o(.rodata.str1.4);
data/data_8468C98.o(.rodata);
src/bg.c
+9 -9
View File
@@ -391,7 +391,7 @@ void InitBgsFromTemplates(u8 bgMode, const struct BgTemplate *templates, u8 numT
}
}
#else
__attribute__((naked))
NAKED
void InitBgsFromTemplates(u8 bgMode, const struct BgTemplate *templates, u8 numTemplates)
{
asm(".syntax unified\n\
@@ -634,7 +634,7 @@ bool8 IsDma3ManagerBusyWithBgCopy(void)
return FALSE;
}
#else
__attribute__((naked))
NAKED
bool8 IsDma3ManagerBusyWithBgCopy(void)
{
asm("push {r4-r7,lr}\n\
@@ -1065,7 +1065,7 @@ void CopyBgTilemapBufferToVram(u8 bg)
}
}
void CopyToBgTilemapBufferRect(u8 bg, void* src, u8 destX, u8 destY, u8 width, u8 height)
void CopyToBgTilemapBufferRect(u8 bg, const void* src, u8 destX, u8 destY, u8 width, u8 height)
{
u16 destX16;
u16 destY16;
@@ -1077,7 +1077,7 @@ void CopyToBgTilemapBufferRect(u8 bg, void* src, u8 destX, u8 destY, u8 width, u
{
case 0:
{
u16 * srcCopy = src;
const u16 * srcCopy = src;
for (destY16 = destY; destY16 < (destY + height); destY16++)
{
for (destX16 = destX; destX16 < (destX + width); destX16++)
@@ -1089,7 +1089,7 @@ void CopyToBgTilemapBufferRect(u8 bg, void* src, u8 destX, u8 destY, u8 width, u
}
case 1:
{
u8 * srcCopy = src;
const u8 * srcCopy = src;
mode = GetBgMetricAffineMode(bg, 0x1);
for (destY16 = destY; destY16 < (destY + height); destY16++)
{
@@ -1104,7 +1104,7 @@ void CopyToBgTilemapBufferRect(u8 bg, void* src, u8 destX, u8 destY, u8 width, u
}
}
void CopyToBgTilemapBufferRect_ChangePalette(u8 bg, void *src, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette)
void CopyToBgTilemapBufferRect_ChangePalette(u8 bg, const void *src, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette)
{
CopyRectToBgTilemapBufferRect(bg, src, 0, 0, rectWidth, rectHeight, destX, destY, rectWidth, rectHeight, palette, 0, 0);
}
@@ -1151,8 +1151,8 @@ void CopyRectToBgTilemapBufferRect(u8 bg, void* src, u8 srcX, u8 srcY, u8 srcWid
}
}
}*/
__attribute__((naked))
void CopyRectToBgTilemapBufferRect(u8 bg, void* src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette1, u16 tileOffset, u16 palette2)
NAKED
void CopyRectToBgTilemapBufferRect(u8 bg, const void* src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette1, u16 tileOffset, u16 palette2)
{
asm("push {r4-r7,lr}\n\
mov r7, r10\n\
@@ -1598,7 +1598,7 @@ void CopyTileMapEntry(u16 *src, u16 *dest, s32 palette1, u32 tileOffset, u32 pal
*dest = test;
}
#else
__attribute__((naked))
NAKED
void CopyTileMapEntry(u16 *src, u16 *dest, s32 palette1, u32 tileOffset, u32 palette2)
{
asm("push {r4-r6,lr}\n\
src/fame_checker.c
+1553
View File
File diff suppressed because it is too large Load Diff
src/text.c
+11 -11
View File
@@ -17,7 +17,7 @@ extern void BlitBitmapRectToWindow(u8 windowId, const u8 *pixels, u16 srcX, u16
extern u8 GetKeypadIconWidth(u8 keypadIconId);
extern void CopyWindowToVram(u8 windowId, u8 mode);
extern u16 Font6Func(struct TextPrinter *textPrinter);
extern u32 GetGlyphWidthFont6(u16 glyphId, bool32 isJapanese);
extern s32 GetGlyphWidthFont6(u16 glyphId, bool32 isJapanese);
extern void PlaySE(u16 songNum);
extern u8* UnkTextUtil_GetPtrI(u8 a1);
@@ -1388,7 +1388,7 @@ _08005D6A:\n\
.syntax divided");
}
u32 GetStringWidthFixedWidthFont(const u8 *str, u8 fontId, u8 letterSpacing)
s32 GetStringWidthFixedWidthFont(const u8 *str, u8 fontId, u8 letterSpacing)
{
int i;
u8 width;
@@ -1479,7 +1479,7 @@ u32 GetStringWidthFixedWidthFont(const u8 *str, u8 fontId, u8 letterSpacing)
return (u8)(GetFontAttribute(fontId, 0) + letterSpacing) * width;
}
u32 (*GetFontWidthFunc(u8 glyphId))(u16 _glyphId, bool32 _isJapanese)
s32 (*GetFontWidthFunc(u8 glyphId))(u16 _glyphId, bool32 _isJapanese)
{
u32 i;
@@ -1492,11 +1492,11 @@ u32 (*GetFontWidthFunc(u8 glyphId))(u16 _glyphId, bool32 _isJapanese)
return NULL;
}
u32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing)
s32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing)
{
bool8 isJapanese;
int minGlyphWidth;
u32 (*func)(u16 glyphId, bool32 isJapanese);
s32 (*func)(u16 glyphId, bool32 isJapanese);
int localLetterSpacing;
register u32 lineWidth asm("r5");
u8 *bufferPointer;
@@ -1863,7 +1863,7 @@ void DecompressGlyphFont0(u16 glyphId, bool32 isJapanese)
}
}
u32 GetGlyphWidthFont0(u16 glyphId, bool32 isJapanese)
s32 GetGlyphWidthFont0(u16 glyphId, bool32 isJapanese)
{
if (isJapanese == TRUE)
return 8;
@@ -1896,7 +1896,7 @@ void DecompressGlyphFont1(u16 glyphId, bool32 isJapanese)
}
}
u32 GetGlyphWidthFont1(u16 glyphId, bool32 isJapanese)
s32 GetGlyphWidthFont1(u16 glyphId, bool32 isJapanese)
{
if (isJapanese == TRUE)
return 8;
@@ -1962,7 +1962,7 @@ void DecompressGlyphFont2(u16 glyphId, bool32 isJapanese)
}
}
u32 GetGlyphWidthFont2(u16 glyphId, bool32 isJapanese)
s32 GetGlyphWidthFont2(u16 glyphId, bool32 isJapanese)
{
if (isJapanese == TRUE)
{
@@ -2012,7 +2012,7 @@ void DecompressGlyphFont3(u16 glyphId, bool32 isJapanese)
DecompressGlyphFont2(glyphId, isJapanese);
}
u32 GetGlyphWidthFont3(u16 glyphId, bool32 isJapanese)
s32 GetGlyphWidthFont3(u16 glyphId, bool32 isJapanese)
{
if(isJapanese == TRUE)
return 10;
@@ -2078,7 +2078,7 @@ void DecompressGlyphFont4(u16 glyphId, bool32 isJapanese)
}
}
u32 GetGlyphWidthFont4(u16 glyphId, bool32 isJapanese)
s32 GetGlyphWidthFont4(u16 glyphId, bool32 isJapanese)
{
if(isJapanese == TRUE)
{
@@ -2149,7 +2149,7 @@ void DecompressGlyphFont5(u16 glyphId, bool32 isJapanese)
}
}
u32 GetGlyphWidthFont5(u16 glyphId, bool32 isJapanese)
s32 GetGlyphWidthFont5(u16 glyphId, bool32 isJapanese)
{
if(isJapanese == TRUE)
{
sym_common.txt
+1 -5
View File
@@ -324,11 +324,7 @@ gUnknown_3005E9C: @ 3005E9C
gUnknown_3005EA0: @ 3005EA0
.space 0x10
gUnknown_3005EB0: @ 3005EB0
.space 0x18
gUnknown_3005EC8: @ 3005EC8
.space 0x4
.include "fame_checker.o"
gUnknown_3005ECC: @ 3005ECC
.space 0x4
sym_ewram.txt
+1 -17
View File
@@ -1556,23 +1556,7 @@ gUnknown_203B0EC: @ 203B0EC
gUnknown_203B0EE: @ 203B0EE
.space 0x2
gUnknown_203B0F0: @ 203B0F0
.space 0x4
gUnknown_203B0F4: @ 203B0F4
.space 0x4
gUnknown_203B0F8: @ 203B0F8
.space 0x4
gUnknown_203B0FC: @ 203B0FC
.space 0x4
gUnknown_203B100: @ 203B100
.space 0x4
gUnknown_203B104: @ 203B104
.space 0x4
.include "src/fame_checker.o"
gUnknown_203B108: @ 203B108
.space 0x4