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

Finish main menu decomp

Browse Source
This commit is contained in:
PikalaxALT
2019-10-08 10:31:33 -04:00
parent 0f67a952a3
commit 99bd3d9154
40 changed files with 365 additions and 650 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_setup.s
+2 -2
View File
@@ -28,7 +28,7 @@ _0807F644:
bl FldEffPoison_IsActive
cmp r0, 0
bne _0807F686
bl sub_812B478
bl HelpSystem_Disable
ldrb r0, [r4, 0x2]
bl BT_StartOnField
ldrh r0, [r4]
@@ -41,7 +41,7 @@ _0807F65E:
lsrs r0, 24
cmp r0, 0x1
bne _0807F686
bl sub_812B484
bl HelpSystem_Enable
bl CleanupOverworldWindowsAndTilemaps
ldr r0, _0807F68C @ =sub_800FD9C
bl SetMainCallback2
asm/dodrio_berry_picking.s
+2 -2
View File
@@ -8327,7 +8327,7 @@ sub_81546EC: @ 81546EC
lsls r4, 24
lsrs r4, 24
adds r0, r4, 0
bl sub_8069788
bl GetUserFrameGraphicsInfo
ldr r1, [r0]
movs r2, 0x90
lsls r2, 1
@@ -8335,7 +8335,7 @@ sub_81546EC: @ 81546EC
movs r3, 0x1
bl LoadBgTiles
adds r0, r4, 0
bl sub_8069788
bl GetUserFrameGraphicsInfo
ldr r0, [r0, 0x4]
movs r1, 0xA0
movs r2, 0x20
asm/event_data.s
+3 -3
View File
@@ -248,8 +248,8 @@ sub_806E2AC: @ 806E2AC
_0806E2B8: .4byte 0x00000839
thumb_func_end sub_806E2AC
thumb_func_start sub_806E2BC
sub_806E2BC: @ 806E2BC
thumb_func_start Flag_0x839_IsSet
Flag_0x839_IsSet: @ 806E2BC
push {lr}
ldr r0, _0806E2CC @ =0x00000839
bl FlagGet
@@ -259,7 +259,7 @@ sub_806E2BC: @ 806E2BC
bx r1
.align 2, 0
_0806E2CC: .4byte 0x00000839
thumb_func_end sub_806E2BC
thumb_func_end Flag_0x839_IsSet
thumb_func_start sub_806E2D0
sub_806E2D0: @ 806E2D0
asm/evolution_scene.s
+2 -2
View File
@@ -388,7 +388,7 @@ EvolutionScene: @ 80CDDF4
ldr r0, _080CE0E0 @ =sub_80D0050
bl SetVBlankCallback
bl m4aMPlayAllStop
bl sub_812B478
bl HelpSystem_Disable
ldr r0, _080CE0E4 @ =sub_80CE710
bl SetMainCallback2
add sp, 0x24
@@ -1852,7 +1852,7 @@ _080CEDB8:
beq _080CEDC6
b _080CF528
_080CEDC6:
bl sub_812B484
bl HelpSystem_Enable
ldr r1, _080CEE20 @ =gTasks
mov r2, r8
adds r0, r2, r7
asm/hall_of_fame.s
+2 -2
View File
@@ -56,7 +56,7 @@ _080F1E04:
.4byte _080F1E88
.4byte _080F1EC4
_080F1E18:
ldr r1, _080F1E40 @ =gUnknown_3005ECC
ldr r1, _080F1E40 @ =gHelpSystemEnabled
movs r0, 0
strb r0, [r1]
movs r0, 0
@@ -74,7 +74,7 @@ _080F1E18:
strb r1, [r0]
b _080F1EF0
.align 2, 0
_080F1E40: .4byte gUnknown_3005ECC
_080F1E40: .4byte gHelpSystemEnabled
_080F1E44: .4byte gUnknown_203AB3C
_080F1E48: .4byte 0x00002008
_080F1E4C: .4byte gMain
asm/main_menu.s
-418
View File
@@ -1,418 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_800CED4
sub_800CED4: @ 800CED4
push {r4-r6,lr}
sub sp, 0x2C
ldr r6, _0800CF30 @ =gUnknown_823468B
str r6, [sp]
movs r5, 0x1
negs r5, r5
str r5, [sp, 0x4]
ldr r0, _0800CF34 @ =gText_Time
str r0, [sp, 0x8]
movs r0, 0x1
movs r1, 0x2
movs r2, 0x2
movs r3, 0x22
bl AddTextPrinterParameterized3
ldr r4, _0800CF38 @ =gSaveBlock2Ptr
ldr r0, [r4]
ldrh r1, [r0, 0xE]
add r0, sp, 0xC
movs r2, 0
movs r3, 0x3
bl ConvertIntToDecimalStringN
movs r1, 0xF0
strb r1, [r0]
adds r0, 0x1
ldr r1, [r4]
ldrb r1, [r1, 0x10]
movs r2, 0x2
movs r3, 0x2
bl ConvertIntToDecimalStringN
str r6, [sp]
str r5, [sp, 0x4]
add r0, sp, 0xC
str r0, [sp, 0x8]
movs r0, 0x1
movs r1, 0x2
movs r2, 0x3E
movs r3, 0x22
bl AddTextPrinterParameterized3
add sp, 0x2C
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
_0800CF30: .4byte gUnknown_823468B
_0800CF34: .4byte gText_Time
_0800CF38: .4byte gSaveBlock2Ptr
thumb_func_end sub_800CED4
thumb_func_start sub_800CF3C
sub_800CF3C: @ 800CF3C
push {r4-r6,lr}
sub sp, 0x2C
ldr r0, _0800CF60 @ =0x00000829
bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _0800CFAE
bl IsNationalPokedexEnabled
cmp r0, 0
beq _0800CF64
movs r0, 0x1
bl GetNationalPokedexCount
b _0800CF6A
.align 2, 0
_0800CF60: .4byte 0x00000829
_0800CF64:
movs r0, 0x1
bl GetKantoPokedexCount
_0800CF6A:
lsls r0, 16
lsrs r6, r0, 16
ldr r5, _0800CFB8 @ =gUnknown_823468B
str r5, [sp]
movs r4, 0x1
negs r4, r4
str r4, [sp, 0x4]
ldr r0, _0800CFBC @ =gText_Pokedex
str r0, [sp, 0x8]
movs r0, 0x1
movs r1, 0x2
movs r2, 0x2
movs r3, 0x32
bl AddTextPrinterParameterized3
add r0, sp, 0xC
adds r1, r6, 0
movs r2, 0
movs r3, 0x3
bl ConvertIntToDecimalStringN
ldr r1, _0800CFC0 @ =gUnknown_841B6EB
bl StringAppend
str r5, [sp]
str r4, [sp, 0x4]
add r0, sp, 0xC
str r0, [sp, 0x8]
movs r0, 0x1
movs r1, 0x2
movs r2, 0x3E
movs r3, 0x32
bl AddTextPrinterParameterized3
_0800CFAE:
add sp, 0x2C
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
_0800CFB8: .4byte gUnknown_823468B
_0800CFBC: .4byte gText_Pokedex
_0800CFC0: .4byte gUnknown_841B6EB
thumb_func_end sub_800CF3C
thumb_func_start sub_800CFC4
sub_800CFC4: @ 800CFC4
push {r4-r6,lr}
sub sp, 0x2C
movs r6, 0
movs r4, 0x82
lsls r4, 4
_0800CFCE:
lsls r0, r4, 16
lsrs r0, 16
bl FlagGet
lsls r0, 24
cmp r0, 0
beq _0800CFE2
adds r0, r6, 0x1
lsls r0, 24
lsrs r6, r0, 24
_0800CFE2:
adds r4, 0x1
ldr r0, _0800D034 @ =0x00000827
cmp r4, r0
bls _0800CFCE
ldr r5, _0800D038 @ =gUnknown_823468B
str r5, [sp]
movs r4, 0x1
negs r4, r4
str r4, [sp, 0x4]
ldr r0, _0800D03C @ =gUnknown_841B6EC
str r0, [sp, 0x8]
movs r0, 0x1
movs r1, 0x2
movs r2, 0x2
movs r3, 0x42
bl AddTextPrinterParameterized3
add r0, sp, 0xC
adds r1, r6, 0
movs r2, 0x2
movs r3, 0x1
bl ConvertIntToDecimalStringN
ldr r1, _0800D040 @ =gUnknown_841B6F3
bl StringAppend
str r5, [sp]
str r4, [sp, 0x4]
add r0, sp, 0xC
str r0, [sp, 0x8]
movs r0, 0x1
movs r1, 0x2
movs r2, 0x3E
movs r3, 0x42
bl AddTextPrinterParameterized3
add sp, 0x2C
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
_0800D034: .4byte 0x00000827
_0800D038: .4byte gUnknown_823468B
_0800D03C: .4byte gUnknown_841B6EC
_0800D040: .4byte gUnknown_841B6F3
thumb_func_end sub_800CFC4
thumb_func_start sub_800D044
sub_800D044: @ 800D044
push {r4,r5,lr}
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r5, _0800D088 @ =gSaveBlock2Ptr
ldr r0, [r5]
ldrb r0, [r0, 0x14]
lsrs r0, 3
bl sub_8069788
ldr r1, [r0]
movs r2, 0x90
lsls r2, 1
ldr r3, _0800D08C @ =0x000001b1
adds r0, r4, 0
bl LoadBgTiles
ldr r0, [r5]
ldrb r0, [r0, 0x14]
lsrs r0, 3
bl sub_8069788
ldr r0, [r0, 0x4]
movs r1, 0x20
movs r2, 0x20
bl LoadPalette
ldr r0, _0800D090 @ =gUnknown_8234638
bl sub_800D1E8
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_0800D088: .4byte gSaveBlock2Ptr
_0800D08C: .4byte 0x000001b1
_0800D090: .4byte gUnknown_8234638
thumb_func_end sub_800D044
thumb_func_start sub_800D094
sub_800D094: @ 800D094
push {lr}
ldr r1, _0800D0AC @ =0x000001b1
movs r0, 0
movs r2, 0x20
bl TextWindow_SetStdFrame0_WithPal
ldr r0, _0800D0B0 @ =gUnknown_8234638
bl sub_800D1E8
pop {r0}
bx r0
.align 2, 0
_0800D0AC: .4byte 0x000001b1
_0800D0B0: .4byte gUnknown_8234638
thumb_func_end sub_800D094
thumb_func_start sub_800D0B4
sub_800D0B4: @ 800D0B4
push {r4-r6,lr}
mov r6, r8
push {r6}
sub sp, 0xC
adds r5, r0, 0
ldrb r0, [r5]
ldr r1, _0800D1D8 @ =0x000001b1
ldrb r2, [r5, 0x1]
subs r2, 0x1
lsls r2, 24
lsrs r2, 24
ldrb r3, [r5, 0x2]
subs r3, 0x1
lsls r3, 24
lsrs r3, 24
movs r6, 0x1
str r6, [sp]
str r6, [sp, 0x4]
movs r4, 0x2
mov r8, r4
str r4, [sp, 0x8]
bl FillBgTilemapBufferRect
ldrb r0, [r5]
movs r1, 0xD9
lsls r1, 1
ldrb r2, [r5, 0x1]
ldrb r3, [r5, 0x2]
subs r3, 0x1
lsls r3, 24
lsrs r3, 24
ldrb r4, [r5, 0x3]
str r4, [sp]
ldrb r4, [r5, 0x4]
str r4, [sp, 0x4]
mov r4, r8
str r4, [sp, 0x8]
bl FillBgTilemapBufferRect
ldrb r0, [r5]
ldr r1, _0800D1DC @ =0x000001b3
ldrb r2, [r5, 0x3]
ldrb r3, [r5, 0x1]
adds r2, r3
lsls r2, 24
lsrs r2, 24
ldrb r3, [r5, 0x2]
subs r3, 0x1
lsls r3, 24
lsrs r3, 24
str r6, [sp]
str r6, [sp, 0x4]
str r4, [sp, 0x8]
bl FillBgTilemapBufferRect
ldrb r0, [r5]
movs r1, 0xDA
lsls r1, 1
ldrb r2, [r5, 0x1]
subs r2, 0x1
lsls r2, 24
lsrs r2, 24
ldrb r3, [r5, 0x2]
str r6, [sp]
ldrb r4, [r5, 0x4]
str r4, [sp, 0x4]
mov r4, r8
str r4, [sp, 0x8]
bl FillBgTilemapBufferRect
ldrb r0, [r5]
movs r1, 0xDB
lsls r1, 1
ldrb r2, [r5, 0x3]
ldrb r3, [r5, 0x1]
adds r2, r3
lsls r2, 24
lsrs r2, 24
ldrb r3, [r5, 0x2]
str r6, [sp]
ldrb r4, [r5, 0x4]
str r4, [sp, 0x4]
mov r4, r8
str r4, [sp, 0x8]
bl FillBgTilemapBufferRect
ldrb r0, [r5]
ldr r1, _0800D1E0 @ =0x000001b7
ldrb r2, [r5, 0x1]
subs r2, 0x1
lsls r2, 24
lsrs r2, 24
ldrb r3, [r5, 0x4]
ldrb r4, [r5, 0x2]
adds r3, r4
lsls r3, 24
lsrs r3, 24
str r6, [sp]
str r6, [sp, 0x4]
mov r4, r8
str r4, [sp, 0x8]
bl FillBgTilemapBufferRect
ldrb r0, [r5]
movs r1, 0xDC
lsls r1, 1
ldrb r2, [r5, 0x1]
ldrb r3, [r5, 0x4]
ldrb r4, [r5, 0x2]
adds r3, r4
lsls r3, 24
lsrs r3, 24
ldrb r4, [r5, 0x3]
str r4, [sp]
str r6, [sp, 0x4]
mov r4, r8
str r4, [sp, 0x8]
bl FillBgTilemapBufferRect
ldrb r0, [r5]
ldr r1, _0800D1E4 @ =0x000001b9
ldrb r2, [r5, 0x3]
ldrb r3, [r5, 0x1]
adds r2, r3
lsls r2, 24
lsrs r2, 24
ldrb r3, [r5, 0x4]
ldrb r4, [r5, 0x2]
adds r3, r4
lsls r3, 24
lsrs r3, 24
str r6, [sp]
str r6, [sp, 0x4]
mov r4, r8
str r4, [sp, 0x8]
bl FillBgTilemapBufferRect
ldrb r0, [r5]
bl CopyBgTilemapBufferToVram
add sp, 0xC
pop {r3}
mov r8, r3
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
_0800D1D8: .4byte 0x000001b1
_0800D1DC: .4byte 0x000001b3
_0800D1E0: .4byte 0x000001b7
_0800D1E4: .4byte 0x000001b9
thumb_func_end sub_800D0B4
thumb_func_start sub_800D1E8
sub_800D1E8: @ 800D1E8
push {r4-r6,lr}
sub sp, 0xC
adds r6, r0, 0
ldrb r0, [r6]
ldrb r1, [r6, 0x1]
subs r2, r1, 0x1
lsls r2, 24
lsrs r2, 24
ldrb r4, [r6, 0x2]
subs r3, r4, 0x1
lsls r3, 24
lsrs r3, 24
ldrb r5, [r6, 0x3]
adds r1, r5
adds r1, 0x1
lsls r1, 24
lsrs r1, 24
str r1, [sp]
ldrb r1, [r6, 0x4]
adds r4, r1
adds r4, 0x1
lsls r4, 24
lsrs r4, 24
str r4, [sp, 0x4]
movs r1, 0x2
str r1, [sp, 0x8]
movs r1, 0
bl FillBgTilemapBufferRect
ldrb r0, [r6]
bl CopyBgTilemapBufferToVram
add sp, 0xC
pop {r4-r6}
pop {r0}
bx r0
thumb_func_end sub_800D1E8
.align 2, 0 @ Don't pad with nop.
asm/mon_markings.s
+1 -1
View File
@@ -22,7 +22,7 @@ sub_80BE478: @ 80BE478
ldr r0, [r0]
ldrb r0, [r0, 0x14]
lsrs r0, 3
bl sub_8069788
bl GetUserFrameGraphicsInfo
ldr r3, _080BE4B4 @ =gUnknown_20399C0
ldr r2, [r3]
ldr r1, [r0]
asm/option_menu.s
+4 -4
View File
@@ -459,7 +459,7 @@ _0808870C:
b _08088768
_08088716:
ldrb r0, [r0, 0xA]
bl sub_8069788
bl GetUserFrameGraphicsInfo
ldr r1, [r0]
movs r2, 0x90
lsls r2, 1
@@ -470,7 +470,7 @@ _08088716:
b _0808876C
_0808872E:
ldrb r0, [r0, 0xA]
bl sub_8069788
bl GetUserFrameGraphicsInfo
ldr r0, [r0, 0x4]
movs r1, 0x20
b _0808874C
@@ -590,7 +590,7 @@ _08088824:
ldr r4, _08088854 @ =gUnknown_2039620
ldr r0, [r4]
ldrb r0, [r0, 0xA]
bl sub_8069788
bl GetUserFrameGraphicsInfo
ldr r1, [r0]
movs r2, 0x90
lsls r2, 1
@@ -600,7 +600,7 @@ _08088824:
bl LoadBgTiles
ldr r0, [r4]
ldrb r0, [r0, 0xA]
bl sub_8069788
bl GetUserFrameGraphicsInfo
ldr r0, [r0, 0x4]
movs r1, 0x20
movs r2, 0x20
asm/trade.s
+3 -3
View File
@@ -11140,7 +11140,7 @@ _0805230A:
ldr r0, _08052328 @ =CB2_ReturnToField
bl SetMainCallback2
bl sub_8053AE4
bl sub_812B484
bl HelpSystem_Enable
_08052318:
movs r0, 0
_0805231A:
@@ -13365,7 +13365,7 @@ _08053766:
ldr r0, _08053784 @ =CB2_ReturnToField
bl SetMainCallback2
bl sub_8053AE4
bl sub_812B484
bl HelpSystem_Enable
_08053774:
movs r0, 0
_08053776:
@@ -14854,7 +14854,7 @@ sub_8054440: @ 8054440
movs r2, 0
movs r3, 0x10
bl BeginNormalPaletteFade
bl sub_812B478
bl HelpSystem_Disable
add sp, 0x4
pop {r0}
bx r0