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: