Game-Decompilation/fireemblem8u
1
0
Fork 0
mirror of https://github.com/FireEmblemUniverse/fireemblem8u.git synced 2024-11-23 13:19:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(prepscreen) code pre-view, split asm code and rename functions

Browse Source
This commit is contained in:
mokhaleee 2023-01-02 19:05:53 +08:00
parent 22f15f56c0
commit e6d938276f
35 changed files with 17740 additions and 17687 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17458
asm/code_80952CC.s
View File

File diff suppressed because it is too large Load Diff

78
asm/code_80A882C.s
View File

@ -630,8 +630,8 @@ _080A8CD0: .4byte gLCDControlBuffer
THUMB_FUNC_END sub_80A8C2C
THUMB_FUNC_START sub_80A8CD4
sub_80A8CD4: @ 0x080A8CD4
THUMB_FUNC_START ProcSaveMenu_InitScreen
ProcSaveMenu_InitScreen: @ 0x080A8CD4
push {r4, r5, r6, r7, lr}
mov r7, sl
mov r6, r9
@ -682,10 +682,10 @@ sub_80A8CD4: @ 0x080A8CD4
ldr r2, _080A8ED8 @ 0x00007260
adds r1, r4, #0
bl CallARM_FillTileRect
ldr r0, _080A8EDC @ gUnknown_08A26A74
ldr r0, _080A8EDC @ Img_SaveScreenSprits
ldr r1, _080A8EE0 @ 0x06010800
bl CopyDataWithPossibleUncomp
ldr r0, _080A8EE4 @ gUnknown_08A27F68
ldr r0, _080A8EE4 @ Pal_SaveScreenSprits
movs r1, #0x90
lsls r1, r1, #2
adds r2, r6, #0
@ -854,9 +854,9 @@ _080A8ECC: .4byte gUnknown_08A268F8
_080A8ED0: .4byte gGenericBuffer
_080A8ED4: .4byte gBG2TilemapBuffer
_080A8ED8: .4byte 0x00007260
_080A8EDC: .4byte gUnknown_08A26A74
_080A8EDC: .4byte Img_SaveScreenSprits
_080A8EE0: .4byte 0x06010800
_080A8EE4: .4byte gUnknown_08A27F68
_080A8EE4: .4byte Pal_SaveScreenSprits
_080A8EE8: .4byte gUnknown_08A295B4
_080A8EEC: .4byte gUnknown_02022AE8
_080A8EF0: .4byte gUnknown_08A2C23C
@ -865,13 +865,13 @@ _080A8EF8: .4byte gLCDControlBuffer
_080A8EFC: .4byte gSinLookup
_080A8F00: .4byte gPaletteBuffer
THUMB_FUNC_END sub_80A8CD4
THUMB_FUNC_END ProcSaveMenu_InitScreen
THUMB_FUNC_START sub_80A8F04
sub_80A8F04: @ 0x080A8F04
push {r4, r5, r6, lr}
adds r5, r0, #0
ldr r0, _080A8F34 @ gUnknown_08A2812C
ldr r0, _080A8F34 @ Img_GameMainMenuObjs
ldr r1, _080A8F38 @ 0x06014000
bl CopyDataWithPossibleUncomp
adds r0, r5, #0
@ -891,7 +891,7 @@ sub_80A8F04: @ 0x080A8F04
adds r4, #0x2e
b _080A8F6A
.align 2, 0
_080A8F34: .4byte gUnknown_08A2812C
_080A8F34: .4byte Img_GameMainMenuObjs
_080A8F38: .4byte 0x06014000
_080A8F3C:
adds r4, r5, #0
@ -2315,7 +2315,7 @@ sub_80A9A18: @ 0x080A9A18
ldrb r0, [r4]
cmp r0, #0xe
bne _080A9A5A
ldr r0, _080A9A60 @ gUnknown_08A2812C
ldr r0, _080A9A60 @ Img_GameMainMenuObjs
ldr r1, _080A9A64 @ 0x06014000
bl CopyDataWithPossibleUncomp
adds r0, r5, #0
@ -2325,7 +2325,7 @@ _080A9A5A:
pop {r0}
bx r0
.align 2, 0
_080A9A60: .4byte gUnknown_08A2812C
_080A9A60: .4byte Img_GameMainMenuObjs
_080A9A64: .4byte 0x06014000
THUMB_FUNC_END sub_80A9A18
@ -3078,7 +3078,7 @@ _080A9FD6:
.align 2, 0
_080A9FF0: .4byte gRAMChapterData
_080A9FF4:
ldr r0, _080AA010 @ gUnknown_08A2812C
ldr r0, _080AA010 @ Img_GameMainMenuObjs
ldr r1, _080AA014 @ 0x06014000
bl CopyDataWithPossibleUncomp
adds r0, r4, #0
@ -3092,7 +3092,7 @@ _080AA00A:
pop {r0}
bx r0
.align 2, 0
_080AA010: .4byte gUnknown_08A2812C
_080AA010: .4byte Img_GameMainMenuObjs
_080AA014: .4byte 0x06014000
THUMB_FUNC_END sub_80A9E1C
@ -3567,10 +3567,10 @@ sub_80AA30C: @ 0x080AA30C
ldr r2, _080AA438 @ 0x00007260
adds r1, r4, #0
bl CallARM_FillTileRect
ldr r0, _080AA43C @ gUnknown_08A26A74
ldr r0, _080AA43C @ Img_SaveScreenSprits
ldr r1, _080AA440 @ 0x06010800
bl CopyDataWithPossibleUncomp
ldr r0, _080AA444 @ gUnknown_08A27F68
ldr r0, _080AA444 @ Pal_SaveScreenSprits
movs r1, #0x90
lsls r1, r1, #2
adds r2, r5, #0
@ -3584,7 +3584,7 @@ sub_80AA30C: @ 0x080AA30C
subs r1, #0x20
movs r2, #1
bl sub_80AA790
ldr r0, _080AA450 @ gUnknown_08A2812C
ldr r0, _080AA450 @ Img_GameMainMenuObjs
ldr r1, _080AA454 @ 0x06014000
bl CopyDataWithPossibleUncomp
bl sub_80AB794
@ -3631,12 +3631,12 @@ _080AA42C: .4byte gUnknown_08A268F8
_080AA430: .4byte gGenericBuffer
_080AA434: .4byte gBG2TilemapBuffer
_080AA438: .4byte 0x00007260
_080AA43C: .4byte gUnknown_08A26A74
_080AA43C: .4byte Img_SaveScreenSprits
_080AA440: .4byte 0x06010800
_080AA444: .4byte gUnknown_08A27F68
_080AA444: .4byte Pal_SaveScreenSprits
_080AA448: .4byte gUnknown_08A295B4
_080AA44C: .4byte gUnknown_02022AE8
_080AA450: .4byte gUnknown_08A2812C
_080AA450: .4byte Img_GameMainMenuObjs
_080AA454: .4byte 0x06014000
THUMB_FUNC_END sub_80AA30C
@ -3712,7 +3712,7 @@ sub_80AA4B4: @ 0x080AA4B4
Make6C_savemenu: @ 0x080AA4C0
push {lr}
adds r1, r0, #0
ldr r0, _080AA4F0 @ gUnknown_08A200B8
ldr r0, _080AA4F0 @ ProcScr_SaveMenu
bl Proc_StartBlocking
adds r3, r0, #0
adds r3, #0x42
@ -3734,7 +3734,7 @@ Make6C_savemenu: @ 0x080AA4C0
pop {r0}
bx r0
.align 2, 0
_080AA4F0: .4byte gUnknown_08A200B8
_080AA4F0: .4byte ProcScr_SaveMenu
_080AA4F4: .4byte gRAMChapterData
THUMB_FUNC_END Make6C_savemenu
@ -3778,7 +3778,7 @@ savemenu_SetDifficultyChoice: @ 0x080AA52C
push {r4, r5, lr}
adds r4, r0, #0
adds r5, r1, #0
ldr r0, _080AA54C @ gUnknown_08A200B8
ldr r0, _080AA54C @ ProcScr_SaveMenu
bl Proc_Find
cmp r0, #0
beq _080AA546
@ -3792,7 +3792,7 @@ _080AA546:
pop {r0}
bx r0
.align 2, 0
_080AA54C: .4byte gUnknown_08A200B8
_080AA54C: .4byte ProcScr_SaveMenu
THUMB_FUNC_END savemenu_SetDifficultyChoice
@ -7443,8 +7443,8 @@ sub_80AC078: @ 0x080AC078
THUMB_FUNC_END sub_80AC078
THUMB_FUNC_START sub_80AC084
sub_80AC084: @ 0x080AC084
THUMB_FUNC_START InitDifficultySelectScreen
InitDifficultySelectScreen: @ 0x080AC084
push {r4, r5, r6, r7, lr}
adds r7, r0, #0
bl Font_ResetAllocation
@ -7472,7 +7472,7 @@ _080AC09A:
movs r1, #0xe0
movs r2, #0x20
bl CopyToPaletteBuffer
ldr r0, _080AC180 @ gUnknown_08A27F68
ldr r0, _080AC180 @ Pal_SaveScreenSprits
movs r1, #0x90
lsls r1, r1, #2
adds r2, r4, #0
@ -7481,10 +7481,10 @@ _080AC09A:
movs r1, #0x40
movs r2, #0x20
bl CopyToPaletteBuffer
ldr r0, _080AC188 @ gUnknown_08A28A0C
ldr r0, _080AC188 @ Img_DifficultyMenuObjs
ldr r1, _080AC18C @ 0x06010800
bl CopyDataWithPossibleUncomp
ldr r0, _080AC190 @ gUnknown_08A29418
ldr r0, _080AC190 @ Pal_DifficultyMenuObjs
movs r1, #0x88
lsls r1, r1, #2
movs r2, #0xa0
@ -7552,18 +7552,18 @@ _080AC09A:
.align 2, 0
_080AC178: .4byte gUnknown_08A25DCC
_080AC17C: .4byte gUnknown_08A268D8
_080AC180: .4byte gUnknown_08A27F68
_080AC180: .4byte Pal_SaveScreenSprits
_080AC184: .4byte gUnknown_08A295B4
_080AC188: .4byte gUnknown_08A28A0C
_080AC188: .4byte Img_DifficultyMenuObjs
_080AC18C: .4byte 0x06010800
_080AC190: .4byte gUnknown_08A29418
_080AC190: .4byte Pal_DifficultyMenuObjs
_080AC194: .4byte gBG0TilemapBuffer
_080AC198: .4byte gBG1TilemapBuffer
_080AC19C: .4byte gUnknown_08A29558
_080AC1A0: .4byte gGenericBuffer
_080AC1A4: .4byte gUnknown_08A209FC
THUMB_FUNC_END sub_80AC084
THUMB_FUNC_END InitDifficultySelectScreen
THUMB_FUNC_START sub_80AC1A8
sub_80AC1A8: @ 0x080AC1A8
@ -7573,7 +7573,7 @@ sub_80AC1A8: @ 0x080AC1A8
movs r1, #0
strb r1, [r2]
str r1, [r0, #0x2c]
bl sub_80AC084
bl InitDifficultySelectScreen
pop {r0}
bx r0
@ -7879,12 +7879,12 @@ nullsub_64: @ 0x080AC3DC
NewNewGameDifficultySelect: @ 0x080AC3E0
push {lr}
adds r1, r0, #0
ldr r0, _080AC3F0 @ gUnknown_08A20A10
ldr r0, _080AC3F0 @ ProcScr_NewGameDiffilcultySelect
bl Proc_StartBlocking
pop {r0}
bx r0
.align 2, 0
_080AC3F0: .4byte gUnknown_08A20A10
_080AC3F0: .4byte ProcScr_NewGameDiffilcultySelect
THUMB_FUNC_END NewNewGameDifficultySelect
@ -16802,7 +16802,7 @@ sub_80B04F8: @ 0x080B04F8
movs r1, #0x40
movs r2, #0x20
bl CopyToPaletteBuffer
ldr r0, _080B0594 @ gUnknown_08B12DB4
ldr r0, _080B0594 @ Img_CommGameBgScreen
ldr r1, _080B0598 @ 0x06001000
bl CopyDataWithPossibleUncomp
ldr r0, _080B059C @ gBG0TilemapBuffer
@ -16861,7 +16861,7 @@ sub_80B04F8: @ 0x080B04F8
.align 2, 0
_080B058C: .4byte gUnknown_08B1754C
_080B0590: .4byte gUnknown_08A295B4
_080B0594: .4byte gUnknown_08B12DB4
_080B0594: .4byte Img_CommGameBgScreen
_080B0598: .4byte 0x06001000
_080B059C: .4byte gBG0TilemapBuffer
_080B05A0: .4byte gUnknown_08A295D4
@ -17572,7 +17572,7 @@ sub_80B0ADC: @ 0x080B0ADC
lsls r1, r1, #1
movs r2, #0x20
bl CopyToPaletteBuffer
ldr r0, _080B0D0C @ gUnknown_08B12DB4
ldr r0, _080B0D0C @ Img_CommGameBgScreen
ldr r1, _080B0D10 @ 0x06008000
bl CopyDataWithPossibleUncomp
ldr r0, _080B0D14 @ gBG3TilemapBuffer
@ -17800,7 +17800,7 @@ _080B0C2A:
.align 2, 0
_080B0D04: .4byte gUnknown_08B1754C
_080B0D08: .4byte gUnknown_08A295B4
_080B0D0C: .4byte gUnknown_08B12DB4
_080B0D0C: .4byte Img_CommGameBgScreen
_080B0D10: .4byte 0x06008000
_080B0D14: .4byte gBG3TilemapBuffer
_080B0D18: .4byte gUnknown_08A295D4

4
asm/code_80B5730.s
View File

@ -2254,7 +2254,7 @@ sub_80B67E8: @ 0x080B67E8
ldr r0, _080B6800 @ gUnknown_08A3F750
ldr r1, _080B6804 @ 0x06004C00
bl CopyDataWithPossibleUncomp
ldr r0, _080B6808 @ gUnknown_08B12DB4
ldr r0, _080B6808 @ Img_CommGameBgScreen
ldr r1, _080B680C @ 0x06008000
bl CopyDataWithPossibleUncomp
pop {r0}
@ -2262,7 +2262,7 @@ sub_80B67E8: @ 0x080B67E8
.align 2, 0
_080B6800: .4byte gUnknown_08A3F750
_080B6804: .4byte 0x06004C00
_080B6808: .4byte gUnknown_08B12DB4
_080B6808: .4byte Img_CommGameBgScreen
_080B680C: .4byte 0x06008000
THUMB_FUNC_END sub_80B67E8

1686
asm/code_prepscreen_80977AC.s Normal file
View File

File diff suppressed because it is too large Load Diff

12
asm/fx_slidingwallbg.s
View File

@ -90,7 +90,7 @@ _08086BFC:
movs r2, #0x40
bl CopyToPaletteBuffer
_08086C06:
ldr r0, _08086C44 @ gUnknown_08B12DB4
ldr r0, _08086C44 @ Img_CommGameBgScreen
adds r1, r4, #0
bl CopyDataWithPossibleUncomp
movs r0, #3
@ -119,7 +119,7 @@ _08086C26:
bx r1
.align 2, 0
_08086C40: .4byte gUnknown_08B1754C
_08086C44: .4byte gUnknown_08B12DB4
_08086C44: .4byte Img_CommGameBgScreen
_08086C48: .4byte 0x0000027F
_08086C4C: .4byte ProcScr_SlidingWallBg
@ -164,7 +164,7 @@ _08086C90:
movs r2, #0x40
bl CopyToPaletteBuffer
_08086C9A:
ldr r0, _08086CDC @ gUnknown_08B12DB4
ldr r0, _08086CDC @ Img_CommGameBgScreen
adds r1, r4, #0
bl CopyDataWithPossibleUncomp
movs r0, #3
@ -195,7 +195,7 @@ _08086CBA:
bx r1
.align 2, 0
_08086CD8: .4byte gUnknown_08B1754C
_08086CDC: .4byte gUnknown_08B12DB4
_08086CDC: .4byte Img_CommGameBgScreen
_08086CE0: .4byte 0x0000027F
_08086CE4: .4byte ProcScr_SlidingWallBg
@ -228,7 +228,7 @@ _08086D0A:
lsls r1, r1, #1
movs r2, #0x40
bl CopyToPaletteBuffer
ldr r0, _08086DB0 @ gUnknown_08B12DB4
ldr r0, _08086DB0 @ Img_CommGameBgScreen
adds r1, r6, #0
bl CopyDataWithPossibleUncomp
movs r0, #3
@ -302,7 +302,7 @@ _08086D94:
.align 2, 0
_08086DA8: .4byte gBG3TilemapBuffer
_08086DAC: .4byte gUnknown_08B1754C
_08086DB0: .4byte gUnknown_08B12DB4
_08086DB0: .4byte Img_CommGameBgScreen
_08086DB4: .4byte 0x0000027F
_08086DB8: .4byte ProcScr_SlidingWallBg

12
asm/hino.s
View File

@ -1172,15 +1172,15 @@ _08013D64: .4byte gUnknown_0859A084
THUMB_FUNC_END sub_8013D50
THUMB_FUNC_START sub_8013D68
sub_8013D68: @ 0x08013D68
THUMB_FUNC_START StartFadeInBlackMedium
StartFadeInBlackMedium: @ 0x08013D68
push {lr}
movs r0, #0x10
bl sub_8013CD0
pop {r0}
bx r0
THUMB_FUNC_END sub_8013D68
THUMB_FUNC_END StartFadeInBlackMedium
THUMB_FUNC_START sub_8013D74
sub_8013D74: @ 0x08013D74
@ -1681,8 +1681,8 @@ _08014064: .4byte sub_801420C
THUMB_FUNC_END sub_8014050
THUMB_FUNC_START ContinueUntilSomeTransistion6CExists
ContinueUntilSomeTransistion6CExists: @ 0x08014068
THUMB_FUNC_START WaitForFade
WaitForFade: @ 0x08014068
push {r4, lr}
adds r4, r0, #0
bl sub_8013C88
@ -1696,7 +1696,7 @@ _0801407C:
pop {r0}
bx r0
THUMB_FUNC_END ContinueUntilSomeTransistion6CExists
THUMB_FUNC_END WaitForFade
THUMB_FUNC_START sub_8014084
sub_8014084: @ 0x08014084

2273
asm/prep_itemlist.s Normal file
View File

File diff suppressed because it is too large Load Diff

4213
asm/prep_itemscreen.s Normal file
View File

File diff suppressed because it is too large Load Diff

3173
asm/prep_itemsupply.s Normal file
View File

File diff suppressed because it is too large Load Diff

1188
asm/prep_itemtrade.s Normal file
View File

File diff suppressed because it is too large Load Diff

2406
asm/prep_itemuse.s Normal file
View File

File diff suppressed because it is too large Load Diff

544
asm/prep_menuscroll.s Normal file
View File

@ -0,0 +1,544 @@
.INCLUDE "macro.inc"
.SYNTAX UNIFIED
THUMB_FUNC_START sub_80973B0
sub_80973B0: @ 0x080973B0
adds r3, r0, #0
movs r2, #0
movs r1, #0
strh r1, [r3, #0x2a]
adds r0, #0x2c
strb r2, [r0]
adds r0, #1
strb r2, [r0]
strh r1, [r3, #0x2e]
strh r1, [r3, #0x32]
adds r0, #7
strb r2, [r0]
ldrh r0, [r3, #0x2e]
strh r0, [r3, #0x30]
movs r0, #0xe4
lsls r0, r0, #2
strh r0, [r3, #0x36]
movs r0, #0x80
lsls r0, r0, #5
strh r0, [r3, #0x38]
adds r0, r3, #0
adds r0, #0x3a
strb r2, [r0]
adds r0, #1
strb r2, [r0]
bx lr
THUMB_FUNC_END sub_80973B0
THUMB_FUNC_START sub_80973E4
sub_80973E4: @ 0x080973E4
push {r4, r5, r6, r7, lr}
mov r7, sl
mov r6, r9
mov r5, r8
push {r5, r6, r7}
sub sp, #0x1c
adds r4, r0, #0
ldrh r1, [r4, #0x36]
ldrh r0, [r4, #0x38]
adds r1, r1, r0
mov r9, r1
adds r1, r4, #0
adds r1, #0x34
ldrh r0, [r4, #0x32]
ldrb r1, [r1]
cmp r0, r1
bhi _08097408
b _0809762A
_08097408:
movs r6, #0
adds r0, r4, #0
adds r0, #0x2d
mov sl, r0
adds r0, #0xd
str r0, [sp, #0x14]
adds r1, r4, #0
adds r1, #0x3b
str r1, [sp, #0x18]
mov r2, sl
ldrb r2, [r2]
cmp r6, r2
bge _08097448
movs r5, #1
_08097424:
ldrh r1, [r4, #0x2a]
adds r1, #1
adds r0, r4, #0
adds r0, #0x2c
ldrb r2, [r0]
adds r2, r2, r5
mov r3, r9
str r3, [sp]
movs r0, #4
ldr r3, _08097534 @ gUnknown_08A18744
bl PutSpriteExt
adds r5, #8
adds r6, #1
mov r0, sl
ldrb r0, [r0]
cmp r6, r0
blt _08097424
_08097448:
cmp r6, #0
bne _0809744E
b _080975D8
_0809744E:
mov r1, sl
ldrb r0, [r1]
lsls r7, r0, #0x13
ldrh r2, [r4, #0x2e]
str r2, [sp, #0xc]
ldrh r5, [r4, #0x32]
adds r0, r4, #0
adds r0, #0x34
ldrb r6, [r0]
str r0, [sp, #0x10]
movs r3, #0x2c
adds r3, r3, r4
mov r8, r3
cmp r5, r6
bhi _0809746E
b _080975A6
_0809746E:
adds r0, r7, #0
adds r1, r5, #0
bl __udivsi3
str r0, [sp, #4]
adds r0, r7, #0
muls r0, r6, r0
adds r1, r5, #0
bl __udivsi3
str r0, [sp, #8]
ldr r5, [sp, #0xc]
cmp r5, #0
beq _080974AE
ldrh r1, [r4, #0x2a]
ldr r6, _08097538 @ 0x00002001
adds r1, r1, r6
mov r0, r8
ldrb r2, [r0]
subs r2, #8
ldr r3, _0809753C @ gUnknown_08A187F0
ldr r5, [sp, #0x14]
ldrb r0, [r5]
lsrs r0, r0, #3
lsls r0, r0, #2
adds r0, r0, r3
ldr r3, [r0]
mov r6, r9
str r6, [sp]
movs r0, #4
bl PutSpriteExt
_080974AE:
movs r6, #0
ldr r0, [sp, #8]
lsrs r5, r0, #0x13
cmp r6, r5
bcs _080974E6
ldr r1, [sp, #4]
ldr r2, [sp, #0xc]
adds r0, r1, #0
muls r0, r2, r0
lsrs r0, r0, #0x14
adds r7, r0, #1
_080974C4:
ldrh r1, [r4, #0x2a]
adds r1, #1
mov r3, r8
ldrb r2, [r3]
adds r2, r2, r7
lsls r0, r6, #3
adds r2, r2, r0
ldr r0, _08097540 @ gUnknown_08A1879C
ldr r3, [r0, #0x20]
mov r0, r9
str r0, [sp]
movs r0, #4
bl PutSpriteExt
adds r6, #1
cmp r6, r5
bcc _080974C4
_080974E6:
ldrh r0, [r4, #0x2e]
lsrs r0, r0, #4
ldr r1, [sp, #0x10]
ldrb r1, [r1]
adds r0, r0, r1
ldrh r2, [r4, #0x32]
cmp r0, r2
bne _08097544
mov r3, sl
ldrb r0, [r3]
lsls r0, r0, #3
ldr r5, [sp, #4]
ldr r2, [sp, #0xc]
adds r1, r5, #0
muls r1, r2, r1
lsrs r2, r1, #0x14
lsls r3, r6, #3
adds r1, r2, r3
subs r0, r0, r1
cmp r0, #0
beq _080975A6
ldrh r1, [r4, #0x2a]
adds r1, #1
adds r2, #1
mov r5, r8
ldrb r5, [r5]
adds r2, r2, r5
adds r2, r2, r3
ldr r3, _08097540 @ gUnknown_08A1879C
lsls r0, r0, #2
adds r0, r0, r3
ldr r3, [r0]
mov r6, r9
str r6, [sp]
movs r0, #4
bl PutSpriteExt
b _080975A6
.align 2, 0
_08097534: .4byte gUnknown_08A18744
_08097538: .4byte 0x00002001
_0809753C: .4byte gUnknown_08A187F0
_08097540: .4byte gUnknown_08A1879C
_08097544:
ldr r0, [sp, #8]
lsrs r5, r0, #0x10
movs r0, #7
ands r5, r0
cmp r5, #0
beq _0809757C
ldrh r1, [r4, #0x2a]
adds r1, #1
ldr r3, [sp, #4]
ldr r0, [sp, #0xc]
adds r2, r3, #0
muls r2, r0, r2
lsrs r2, r2, #0x14
adds r2, #1
mov r3, r8
ldrb r3, [r3]
adds r2, r2, r3
lsls r0, r6, #3
adds r2, r2, r0
ldr r3, _0809763C @ gUnknown_08A1879C
lsls r0, r5, #2
adds r0, r0, r3
ldr r3, [r0]
mov r5, r9
str r5, [sp]
movs r0, #4
bl PutSpriteExt
_0809757C:
ldrh r1, [r4, #0x2a]
adds r1, #1
mov r6, sl
ldrb r2, [r6]
lsls r2, r2, #3
mov r0, r8
ldrb r0, [r0]
adds r2, r2, r0
adds r2, #2
ldr r3, _08097640 @ gUnknown_08A187F0
ldr r5, [sp, #0x18]
ldrb r0, [r5]
lsrs r0, r0, #3
lsls r0, r0, #2
adds r0, r0, r3
ldr r3, [r0]
mov r6, r9
str r6, [sp]
movs r0, #4
bl PutSpriteExt
_080975A6:
ldrh r1, [r4, #0x2a]
adds r1, #1
mov r0, r8
ldrb r2, [r0]
subs r2, #7
ldr r3, _08097644 @ gUnknown_08A1874C
mov r5, r9
str r5, [sp]
movs r0, #4
bl PutSpriteExt
ldrh r1, [r4, #0x2a]
adds r1, #1
mov r6, r8
ldrb r2, [r6]
mov r3, sl
ldrb r0, [r3]
lsls r0, r0, #3
adds r0, #1
adds r2, r2, r0
ldr r3, _08097648 @ gUnknown_08A18754
str r5, [sp]
movs r0, #4
bl PutSpriteExt
_080975D8:
ldrh r1, [r4, #0x30]
ldrh r0, [r4, #0x2e]
cmp r1, r0
beq _08097600
cmp r1, r0
bls _080975EC
ldr r5, [sp, #0x14]
ldrb r0, [r5]
adds r0, #3
strb r0, [r5]
_080975EC:
ldrh r0, [r4, #0x30]
ldrh r6, [r4, #0x2e]
cmp r0, r6
bcs _080975FC
ldr r1, [sp, #0x18]
ldrb r0, [r1]
adds r0, #3
strb r0, [r1]
_080975FC:
ldrh r0, [r4, #0x2e]
strh r0, [r4, #0x30]
_08097600:
ldr r2, [sp, #0x14]
ldrb r0, [r2]
adds r0, #1
movs r2, #0
ldr r3, [sp, #0x14]
strb r0, [r3]
ldr r1, [sp, #0x18]
ldrb r0, [r1]
adds r0, #1
strb r0, [r1]
ldrb r0, [r3]
lsrs r0, r0, #3
cmp r0, #5
bls _0809761E
strb r2, [r3]
_0809761E:
ldr r5, [sp, #0x18]
ldrb r0, [r5]
lsrs r0, r0, #3
cmp r0, #5
bls _0809762A
strb r2, [r5]
_0809762A:
add sp, #0x1c
pop {r3, r4, r5}
mov r8, r3
mov r9, r4
mov sl, r5
pop {r4, r5, r6, r7}
pop {r0}
bx r0
.align 2, 0
_0809763C: .4byte gUnknown_08A1879C
_08097640: .4byte gUnknown_08A187F0
_08097644: .4byte gUnknown_08A1874C
_08097648: .4byte gUnknown_08A18754
THUMB_FUNC_END sub_80973E4
THUMB_FUNC_START sub_809764C
sub_809764C: @ 0x0809764C
push {lr}
ldr r0, _08097664 @ ProcScr_PrepSideBarHandler
bl Proc_Find
cmp r0, #0
beq _0809765E
movs r1, #1
bl Proc_Goto
_0809765E:
pop {r0}
bx r0
.align 2, 0
_08097664: .4byte ProcScr_PrepSideBarHandler
THUMB_FUNC_END sub_809764C
THUMB_FUNC_START sub_8097668
sub_8097668: @ 0x08097668
push {lr}
ldr r0, _08097680 @ ProcScr_PrepSideBarHandler
bl Proc_Find
cmp r0, #0
beq _0809767A
movs r1, #0
bl Proc_Goto
_0809767A:
pop {r0}
bx r0
.align 2, 0
_08097680: .4byte ProcScr_PrepSideBarHandler
THUMB_FUNC_END sub_8097668
THUMB_FUNC_START Delete6CMenuScroll
Delete6CMenuScroll: @ 0x08097684
push {lr}
ldr r0, _08097694 @ ProcScr_PrepSideBarHandler
bl Proc_Find
bl Proc_End
pop {r0}
bx r0
.align 2, 0
_08097694: .4byte ProcScr_PrepSideBarHandler
THUMB_FUNC_END Delete6CMenuScroll
THUMB_FUNC_START Make6CMenuScroll
Make6CMenuScroll: @ 0x08097698
push {lr}
adds r1, r0, #0
ldr r0, _080976A8 @ ProcScr_PrepSideBarHandler
bl Proc_Start
pop {r1}
bx r1
.align 2, 0
_080976A8: .4byte ProcScr_PrepSideBarHandler
THUMB_FUNC_END Make6CMenuScroll
THUMB_FUNC_START sub_80976AC
sub_80976AC: @ 0x080976AC
push {r4, r5, lr}
adds r4, r0, #0
adds r5, r1, #0
ldr r0, _080976C8 @ ProcScr_PrepSideBarHandler
bl Proc_Find
cmp r0, #0
beq _080976C2
strh r4, [r0, #0x2a]
adds r0, #0x2c
strb r5, [r0]
_080976C2:
pop {r4, r5}
pop {r0}
bx r0
.align 2, 0
_080976C8: .4byte ProcScr_PrepSideBarHandler
THUMB_FUNC_END sub_80976AC
THUMB_FUNC_START sub_80976CC
sub_80976CC: @ 0x080976CC
push {r4, r5, r6, r7, lr}
lsls r0, r0, #0x18
lsrs r7, r0, #0x18
lsls r1, r1, #0x10
lsrs r6, r1, #0x10
lsls r2, r2, #0x10
lsrs r4, r2, #0x10
lsls r3, r3, #0x18
lsrs r5, r3, #0x18
ldr r0, _080976FC @ ProcScr_PrepSideBarHandler
bl Proc_Find
cmp r0, #0
beq _080976F6
adds r1, r0, #0
adds r1, #0x2d
strb r7, [r1]
strh r6, [r0, #0x2e]
strh r4, [r0, #0x32]
adds r0, #0x34
strb r5, [r0]
_080976F6:
pop {r4, r5, r6, r7}
pop {r0}
bx r0
.align 2, 0
_080976FC: .4byte ProcScr_PrepSideBarHandler
THUMB_FUNC_END sub_80976CC
THUMB_FUNC_START InitPrepSideBarImg
InitPrepSideBarImg: @ 0x08097700
push {r4, r5, lr}
adds r4, r0, #0
adds r5, r1, #0
ldr r0, _08097738 @ Pal_PrepWindowSideBar
adds r1, #0x10
lsls r1, r1, #5
movs r2, #0x20
bl CopyToPaletteBuffer
ldr r0, _0809773C @ Img_PrepWindowSideBar
ldr r2, _08097740 @ 0x06010000
adds r1, r4, r2
bl CopyDataWithPossibleUncomp
ldr r0, _08097744 @ ProcScr_PrepSideBarHandler
bl Proc_Find
adds r2, r0, #0
cmp r2, #0
beq _08097730
asrs r0, r4, #5
strh r0, [r2, #0x36]
lsls r0, r5, #0xc
strh r0, [r2, #0x38]
_08097730:
pop {r4, r5}
pop {r0}
bx r0
.align 2, 0
_08097738: .4byte Pal_PrepWindowSideBar
_0809773C: .4byte Img_PrepWindowSideBar
_08097740: .4byte 0x06010000
_08097744: .4byte ProcScr_PrepSideBarHandler
THUMB_FUNC_END InitPrepSideBarImg
THUMB_FUNC_START sub_8097748
sub_8097748: @ 0x08097748
push {r4, r5, r6, lr}
mov r6, r9
mov r5, r8
push {r5, r6}
adds r4, r0, #0
mov r8, r1
mov r9, r2
adds r5, r3, #0
ldr r6, [sp, #0x18]
ldr r0, _0809779C @ ProcScr_PrepSideBarHandler
adds r1, r4, #0
bl Proc_Start
adds r4, r0, #0
mov r0, r8
strh r0, [r4, #0x2a]
adds r0, r4, #0
adds r0, #0x2c
mov r1, r9
strb r1, [r0]
ldr r0, _080977A0 @ Pal_PrepWindowSideBar
adds r1, r6, #0
adds r1, #0x10
lsls r1, r1, #5
movs r2, #0x20
bl CopyToPaletteBuffer
ldr r0, _080977A4 @ Img_PrepWindowSideBar
ldr r2, _080977A8 @ 0x06010000
adds r1, r5, r2
bl CopyDataWithPossibleUncomp
asrs r5, r5, #5
strh r5, [r4, #0x36]
lsls r6, r6, #0xc
strh r6, [r4, #0x38]
pop {r3, r4}
mov r8, r3
mov r9, r4
pop {r4, r5, r6}
pop {r1}
bx r1
.align 2, 0
_0809779C: .4byte ProcScr_PrepSideBarHandler
_080977A0: .4byte Pal_PrepWindowSideBar
_080977A4: .4byte Img_PrepWindowSideBar
_080977A8: .4byte 0x06010000
THUMB_FUNC_END sub_8097748
.align 2, 0

2020
asm/prep_unitscreen.s Normal file
View File

File diff suppressed because it is too large Load Diff

8
data/data_599714.s
View File

@ -458,7 +458,7 @@ gProc_BMapMain: @ 0x0859A1F0
.2byte 3
.2byte 0
.4byte ContinueUntilSomeTransistion6CExists
.4byte WaitForFade
.2byte 12
.2byte 5
@ -482,7 +482,7 @@ gProc_BMapMain: @ 0x0859A1F0
.2byte 3
.2byte 0
.4byte ContinueUntilSomeTransistion6CExists
.4byte WaitForFade
.2byte 3
.2byte 0
@ -534,7 +534,7 @@ gProc_BMapMain: @ 0x0859A1F0
.2byte 3
.2byte 0
.4byte ContinueUntilSomeTransistion6CExists
.4byte WaitForFade
.2byte 12
.2byte 9
@ -558,7 +558,7 @@ gProc_BMapMain: @ 0x0859A1F0
.2byte 3
.2byte 0
.4byte ContinueUntilSomeTransistion6CExists
.4byte WaitForFade
.2byte 6
.2byte 1

6
data/data_59B358.s
View File

@ -16,7 +16,7 @@ gUnknown_0859B578: @ 0x0859B578
.word sub_8013D8C
@ PROC_REPEAT
.short 0x3, 0x0
.word ContinueUntilSomeTransistion6CExists
.word WaitForFade
@ PROC_CALL_ARG
.short 0x18, 0x63
.word ChapterIntro_SetSkipTarget
@ -28,10 +28,10 @@ gUnknown_0859B578: @ 0x0859B578
.word 0x0
@ PROC_CALL
.short 0x2, 0x0
.word sub_8013D68
.word StartFadeInBlackMedium
@ PROC_REPEAT
.short 0x3, 0x0
.word ContinueUntilSomeTransistion6CExists
.word WaitForFade
@ PROC_LABEL
.short 0xb, 0x3e7
.word 0x0

22
data/data_A167C8.s
View File

@ -116,7 +116,7 @@ gUnknown_08A177A0: @ 0x08A177A0
.word sub_8013D80
@ PROC_REPEAT
.short 0x3, 0x0
.word ContinueUntilSomeTransistion6CExists
.word WaitForFade
@ PROC_CALL
.short 0x2, 0x0
.word BMapDispSuspend
@ -128,7 +128,7 @@ gUnknown_08A177A0: @ 0x08A177A0
.word sub_8013DA4
@ PROC_REPEAT
.short 0x3, 0x0
.word ContinueUntilSomeTransistion6CExists
.word WaitForFade
@ PROC_LABEL
.short 0xb, 0x1
.word 0x0
@ -143,7 +143,7 @@ gUnknown_08A177A0: @ 0x08A177A0
.word sub_8013D80
@ PROC_REPEAT
.short 0x3, 0x0
.word ContinueUntilSomeTransistion6CExists
.word WaitForFade
@ PROC_CALL
.short 0x2, 0x0
.word sub_8091C00
@ -161,7 +161,7 @@ gUnknown_08A177A0: @ 0x08A177A0
.word sub_8013DA4
@ PROC_REPEAT
.short 0x3, 0x0
.word ContinueUntilSomeTransistion6CExists
.word WaitForFade
@ PROC_CALL
.short 0x2, 0x0
.word SubSkipThread2
@ -228,7 +228,7 @@ gUnknown_08A178C0: @ 0x08A178C0
.word sub_8013D8C
@ PROC_REPEAT
.short 0x3, 0x0
.word ContinueUntilSomeTransistion6CExists
.word WaitForFade
@ PROC_LABEL
.short 0xb, 0x1
.word 0x0
@ -240,10 +240,10 @@ gUnknown_08A178C0: @ 0x08A178C0
.word sub_8091AEC
@ PROC_CALL
.short 0x2, 0x0
.word sub_8013D68
.word StartFadeInBlackMedium
@ PROC_REPEAT
.short 0x3, 0x0
.word ContinueUntilSomeTransistion6CExists
.word WaitForFade
@ PROC_CALL
.short 0x2, 0x0
.word sub_8091C00
@ -307,7 +307,7 @@ gUnknown_08A17990: @ 0x08A17990
.word sub_8013DA4
@ PROC_REPEAT
.short 0x3, 0x0
.word ContinueUntilSomeTransistion6CExists
.word WaitForFade
@ PROC_LABEL
.short 0xb, 0x1
.word 0x0
@ -322,7 +322,7 @@ gUnknown_08A17990: @ 0x08A17990
.word sub_8013D80
@ PROC_REPEAT
.short 0x3, 0x0
.word ContinueUntilSomeTransistion6CExists
.word WaitForFade
@ PROC_CALL
.short 0x2, 0x0
.word sub_8091C00
@ -374,7 +374,7 @@ gUnknown_08A17A30: @ 0x08A17A30
.word sub_8013DA4
@ PROC_REPEAT
.short 0x3, 0x0
.word ContinueUntilSomeTransistion6CExists
.word WaitForFade
@ PROC_LABEL
.short 0xb, 0x1
.word 0x0
@ -389,7 +389,7 @@ gUnknown_08A17A30: @ 0x08A17A30
.word sub_8013D80
@ PROC_REPEAT
.short 0x3, 0x0
.word ContinueUntilSomeTransistion6CExists
.word WaitForFade
@ PROC_CALL
.short 0x2, 0x0
.word sub_8091C00

68
data/data_A184B4.s
View File

@ -176,8 +176,8 @@ gUnknown_08A1898C: @ 0x08A1898C
.word 0x0
.global gUnknown_08A189A4
gUnknown_08A189A4: @ 0x08A189A4
.global ProcScr_PrepItemScreen
ProcScr_PrepItemScreen: @ 0x08A189A4
@ PROC_YIELD
.short 0xe, 0x0
.word 0x0
@ -324,7 +324,7 @@ gUnknown_08A189A4: @ 0x08A189A4
.word FadeOutExists
@ PROC_CALL
.short 0x2, 0x0
.word sub_8099DB8
.word StartPrepItemTradeScreen
@ PROC_YIELD
.short 0xe, 0x0
.word 0x0
@ -363,7 +363,7 @@ gUnknown_08A189A4: @ 0x08A189A4
.word sub_80989BC
@ PROC_CALL
.short 0x2, 0x0
.word sub_8099E30
.word StartPrepItemListScreen
@ PROC_YIELD
.short 0xe, 0x0
.word 0x0
@ -459,7 +459,7 @@ gUnknown_08A189A4: @ 0x08A189A4
.word sub_80989BC
@ PROC_CALL
.short 0x2, 0x0
.word sub_8099E00
.word StartPrepItemSupply
@ PROC_YIELD
.short 0xe, 0x0
.word 0x0
@ -785,8 +785,8 @@ ProcScr_PrepUnitScreen: @ 0x08A18E8C
.word 0x0
.global gUnknown_08A1901C
gUnknown_08A1901C: @ 0x08A1901C
.global ProcScr_PrepItemTradeScreen
ProcScr_PrepItemTradeScreen: @ 0x08A1901C
@ PROC_YIELD
.short 0xe, 0x0
.word 0x0
@ -816,8 +816,8 @@ gUnknown_08A1901C: @ 0x08A1901C
.word 0x0
.global gUnknown_08A19064
gUnknown_08A19064: @ 0x08A19064
.global PrepScr_PrepItemUseScreen
PrepScr_PrepItemUseScreen: @ 0x08A19064
@ PROC_YIELD
.short 0xe, 0x0
.word 0x0
@ -826,7 +826,7 @@ gUnknown_08A19064: @ 0x08A19064
.word 0x0
@ PROC_CALL
.short 0x2, 0x0
.word sub_809C4D8
.word PrepItemUse_OnInit
@ PROC_CALL
.short 0x2, 0x0
.word PrepItemUse_InitDisplay
@ -841,16 +841,16 @@ gUnknown_08A19064: @ 0x08A19064
.word 0x0
@ PROC_REPEAT
.short 0x3, 0x0
.word sub_809C820
.word PrepItemUse_CtrlLoop
@ PROC_LABEL
.short 0xb, 0x2
.word 0x0
@ PROC_CALL
.short 0x2, 0x0
.word sub_809C9F4
.word PrepItemUse_AreUSureBoxInit
@ PROC_REPEAT
.short 0x3, 0x0
.word sub_809CA14
.word PrepItemUse_AreUSureBoxLoop
@ PROC_GOTO
.short 0xc, 0x1
.word 0x0
@ -862,7 +862,7 @@ gUnknown_08A19064: @ 0x08A19064
.word PrepItemUse_HandleItemEffect
@ PROC_START_CHILD_BLOCKING
.short 0x6, 0x1
.word gUnknown_08A191A4
.word ProcScr_PrepItemStatBoosterEffect
@ PROC_GOTO
.short 0xc, 0x1
.word 0x0
@ -871,7 +871,7 @@ gUnknown_08A19064: @ 0x08A19064
.word 0x0
@ PROC_START_CHILD_BLOCKING
.short 0x6, 0x1
.word gUnknown_08A191C4
.word ProcScr_PrepItemJunaFruitEffect
@ PROC_GOTO
.short 0xc, 0x1
.word 0x0
@ -886,13 +886,13 @@ gUnknown_08A19064: @ 0x08A19064
.word FadeOutExists
@ PROC_CALL
.short 0x2, 0x0
.word sub_8013D68
.word StartFadeInBlackMedium
@ PROC_REPEAT
.short 0x3, 0x0
.word ContinueUntilSomeTransistion6CExists
.word WaitForFade
@ PROC_CALL
.short 0x2, 0x0
.word sub_80CC990
.word StartPrepScreenPromotion
@ PROC_SLEEP
.short 0xe, 0x8
.word 0x0
@ -934,13 +934,13 @@ gUnknown_08A19064: @ 0x08A19064
.word 0x0
@ PROC_CALL
.short 0x2, 0x0
.word sub_809C940
.word ProcPrepItemUse_OnEnd
@ PROC_END
.short 0x0, 0x0
.word 0x0
.global gUnknown_08A191A4
gUnknown_08A191A4: @ 0x08A191A4
.global ProcScr_PrepItemStatBoosterEffect
ProcScr_PrepItemStatBoosterEffect: @ 0x08A191A4
@ PROC_SET_END_CB
.short 0x4, 0x0
.word PrepItemBooster_OnEnd
@ -954,8 +954,8 @@ gUnknown_08A191A4: @ 0x08A191A4
.short 0x0, 0x0
.word 0x0
.global gUnknown_08A191C4
gUnknown_08A191C4: @ 0x08A191C4
.global ProcScr_PrepItemJunaFruitEffect
ProcScr_PrepItemJunaFruitEffect: @ 0x08A191C4
@ PROC_SET_END_CB
.short 0x4, 0x0
.word PrepJunaEffect_OnEnd
@ -988,8 +988,8 @@ gUnknown_08A19200: @ 0x08A19200
gUnknown_08A19204: @ 0x08A19204
.incbin "baserom.gba", 0xA19204, 0x8
.global gUnknown_08A1920C
gUnknown_08A1920C: @ 0x08A1920C
.global ProcScr_PrepItemSupplyScreen
ProcScr_PrepItemSupplyScreen: @ 0x08A1920C
@ PROC_YIELD
.short 0xe, 0x0
.word 0x0
@ -1076,8 +1076,8 @@ gUnknown_08A1920C: @ 0x08A1920C
.word 0x0
.global gUnknown_08A192EC
gUnknown_08A192EC: @ 0x08A192EC
.global ProcScr_BmSupplyScreen
ProcScr_BmSupplyScreen: @ 0x08A192EC
@ PROC_CALL
.short 0x2, 0x0
.word AddSkipThread2
@ -1086,7 +1086,7 @@ gUnknown_08A192EC: @ 0x08A192EC
.word sub_8013D80
@ PROC_REPEAT
.short 0x3, 0x0
.word ContinueUntilSomeTransistion6CExists
.word WaitForFade
@ PROC_CALL
.short 0x2, 0x0
.word BMapDispSuspend
@ -1185,7 +1185,7 @@ gUnknown_08A192EC: @ 0x08A192EC
.word sub_8013DA4
@ PROC_REPEAT
.short 0x3, 0x0
.word ContinueUntilSomeTransistion6CExists
.word WaitForFade
@ PROC_YIELD
.short 0xe, 0x0
.word 0x0
@ -1197,8 +1197,8 @@ gUnknown_08A192EC: @ 0x08A192EC
.word 0x0
.global gUnknown_08A19424
gUnknown_08A19424: @ 0x08A19424
.global ProcScr_PrepItemListScreen
ProcScr_PrepItemListScreen: @ 0x08A19424
@ PROC_YIELD
.short 0xe, 0x0
.word 0x0
@ -1498,7 +1498,7 @@ gUnknown_08A1975C: @ 0x08A1975C
.word sub_8013D8C
@ PROC_REPEAT
.short 0x3, 0x0
.word ContinueUntilSomeTransistion6CExists
.word WaitForFade
@ PROC_WHILE
.short 0x14, 0x0
.word MusicProc4Exists
@ -1543,10 +1543,10 @@ gUnknown_08A1975C: @ 0x08A1975C
.word sub_80A1930
@ PROC_CALL
.short 0x2, 0x0
.word sub_8013D68
.word StartFadeInBlackMedium
@ PROC_REPEAT
.short 0x3, 0x0
.word ContinueUntilSomeTransistion6CExists
.word WaitForFade
@ PROC_CALL
.short 0x2, 0x0
.word sub_80A1554

34
data/data_A20050.s
View File

@ -42,8 +42,8 @@ gUnknown_08A20098: @ 0x08A20098
.word 0x0
.global gUnknown_08A200B8
gUnknown_08A200B8: @ 0x08A200B8
.global ProcScr_SaveMenu
ProcScr_SaveMenu: @ 0x08A200B8
@ PROC_NAME
.short 0x1, 0x0
.word 0x8205dd4
@ -61,7 +61,7 @@ gUnknown_08A200B8: @ 0x08A200B8
.word 0x0
@ PROC_CALL
.short 0x2, 0x0
.word sub_80A8CD4
.word ProcSaveMenu_InitScreen
@ PROC_CALL
.short 0x2, 0x0
.word sub_80A8F04
@ -265,7 +265,7 @@ gUnknown_08A200B8: @ 0x08A200B8
.word 0x0
@ PROC_CALL
.short 0x2, 0x0
.word sub_80A8CD4
.word ProcSaveMenu_InitScreen
@ PROC_CALL
.short 0x2, 0x0
.word sub_80A8F04
@ -347,7 +347,7 @@ gUnknown_08A203A8: @ 0x08A203A8
.word 0x0
@ PROC_CALL
.short 0x2, 0x0
.word sub_80A8CD4
.word ProcSaveMenu_InitScreen
@ PROC_YIELD
.short 0xe, 0x0
.word 0x0
@ -678,8 +678,8 @@ gUnknown_08A209FC: @ 0x08A209FC
gUnknown_08A20A08: @ 0x08A20A08
.incbin "baserom.gba", 0xA20A08, 0x8
.global gUnknown_08A20A10
gUnknown_08A20A10: @ 0x08A20A10
.global ProcScr_NewGameDiffilcultySelect
ProcScr_NewGameDiffilcultySelect: @ 0x08A20A10
@ PROC_SET_END_CB
.short 0x4, 0x0
.word sub_80AC078
@ -1422,12 +1422,12 @@ gUnknown_08A268D8: @ 0x08A268D8
gUnknown_08A268F8: @ 0x08A268F8
.incbin "baserom.gba", 0xA268F8, 0x17C
.global gUnknown_08A26A74
gUnknown_08A26A74: @ 0x08A26A74
.global Img_SaveScreenSprits
Img_SaveScreenSprits: @ 0x08A26A74
.incbin "baserom.gba", 0xA26A74, 0x14F4
.global gUnknown_08A27F68
gUnknown_08A27F68: @ 0x08A27F68
.global Pal_SaveScreenSprits
Pal_SaveScreenSprits: @ 0x08A27F68
.incbin "baserom.gba", 0xA27F68, 0x120
.global gUnknown_08A28088
@ -1438,16 +1438,16 @@ gUnknown_08A28088: @ 0x08A28088
gUnknown_08A280A8: @ 0x08A280A8
.incbin "baserom.gba", 0xA280A8, 0x84
.global gUnknown_08A2812C
gUnknown_08A2812C: @ 0x08A2812C
.global Img_GameMainMenuObjs
Img_GameMainMenuObjs: @ 0x08A2812C
.incbin "baserom.gba", 0xA2812C, 0x8E0
.global gUnknown_08A28A0C
gUnknown_08A28A0C: @ 0x08A28A0C
.global Img_DifficultyMenuObjs
Img_DifficultyMenuObjs: @ 0x08A28A0C
.incbin "baserom.gba", 0xA28A0C, 0xA0C
.global gUnknown_08A29418
gUnknown_08A29418: @ 0x08A29418
.global Pal_DifficultyMenuObjs
Pal_DifficultyMenuObjs: @ 0x08A29418
.incbin "baserom.gba", 0xA29418, 0x82
.global gUnknown_08A2949A

30
data/data_A394DC.s
View File

@ -13,10 +13,10 @@ gUnknown_08A394DC: @ 0x08A394DC
.word sub_8014BD0
@ PROC_CALL
.short 0x2, 0x0
.word sub_8013D68
.word StartFadeInBlackMedium
@ PROC_REPEAT
.short 0x3, 0x0
.word ContinueUntilSomeTransistion6CExists
.word WaitForFade
@ PROC_CALL
.short 0x2, 0x0
.word BMapDispSuspend
@ -127,7 +127,7 @@ gUnknown_08A394DC: @ 0x08A394DC
.word sub_8013D8C
@ PROC_REPEAT
.short 0x3, 0x0
.word ContinueUntilSomeTransistion6CExists
.word WaitForFade
@ PROC_CALL
.short 0x2, 0x0
.word SubSkipThread2
@ -221,7 +221,7 @@ gUnknown_08A3963C: @ 0x08A3963C
.word sub_8013D8C
@ PROC_REPEAT
.short 0x3, 0x0
.word ContinueUntilSomeTransistion6CExists
.word WaitForFade
@ PROC_CALL
.short 0x2, 0x0
.word SubSkipThread2
@ -4282,7 +4282,7 @@ gUnknown_08A3D748: @ 0x08A3D748
.word sub_8013D80
@ PROC_REPEAT
.short 0x3, 0x0
.word ContinueUntilSomeTransistion6CExists
.word WaitForFade
@ PROC_CALL
.short 0x2, 0x0
.word sub_80B9810
@ -4306,7 +4306,7 @@ gUnknown_08A3D748: @ 0x08A3D748
.word sub_8013D80
@ PROC_REPEAT
.short 0x3, 0x0
.word ContinueUntilSomeTransistion6CExists
.word WaitForFade
@ PROC_CALL
.short 0x2, 0x0
.word sub_80B9810
@ -4330,7 +4330,7 @@ gUnknown_08A3D748: @ 0x08A3D748
.word sub_8013DA4
@ PROC_REPEAT
.short 0x3, 0x0
.word ContinueUntilSomeTransistion6CExists
.word WaitForFade
@ PROC_GOTO
.short 0xc, 0x3
.word 0x0
@ -4342,7 +4342,7 @@ gUnknown_08A3D748: @ 0x08A3D748
.word sub_8013D80
@ PROC_REPEAT
.short 0x3, 0x0
.word ContinueUntilSomeTransistion6CExists
.word WaitForFade
@ PROC_CALL
.short 0x2, 0x0
.word sub_80B9810
@ -4366,7 +4366,7 @@ gUnknown_08A3D748: @ 0x08A3D748
.word sub_8013DA4
@ PROC_REPEAT
.short 0x3, 0x0
.word ContinueUntilSomeTransistion6CExists
.word WaitForFade
@ PROC_GOTO
.short 0xc, 0x3
.word 0x0
@ -4378,7 +4378,7 @@ gUnknown_08A3D748: @ 0x08A3D748
.word sub_8013D80
@ PROC_REPEAT
.short 0x3, 0x0
.word ContinueUntilSomeTransistion6CExists
.word WaitForFade
@ PROC_CALL
.short 0x2, 0x0
.word sub_80B9810
@ -4402,7 +4402,7 @@ gUnknown_08A3D748: @ 0x08A3D748
.word sub_8013DA4
@ PROC_REPEAT
.short 0x3, 0x0
.word ContinueUntilSomeTransistion6CExists
.word WaitForFade
@ PROC_GOTO
.short 0xc, 0x3
.word 0x0
@ -4414,7 +4414,7 @@ gUnknown_08A3D748: @ 0x08A3D748
.word sub_8013D80
@ PROC_REPEAT
.short 0x3, 0x0
.word ContinueUntilSomeTransistion6CExists
.word WaitForFade
@ PROC_CALL
.short 0x2, 0x0
.word sub_80B9FD4
@ -4639,7 +4639,7 @@ gUnknown_08A3D748: @ 0x08A3D748
.word sub_8013DA4
@ PROC_REPEAT
.short 0x3, 0x0
.word ContinueUntilSomeTransistion6CExists
.word WaitForFade
@ PROC_GOTO
.short 0xc, 0x12
.word 0x0
@ -4657,7 +4657,7 @@ gUnknown_08A3D748: @ 0x08A3D748
.word sub_8013DA4
@ PROC_REPEAT
.short 0x3, 0x0
.word ContinueUntilSomeTransistion6CExists
.word WaitForFade
@ PROC_GOTO
.short 0xc, 0x3
.word 0x0
@ -7301,7 +7301,7 @@ gUnknown_08AA2084: @ 0x08AA2084
.word sub_8013D74
@ PROC_REPEAT
.short 0x3, 0x0
.word ContinueUntilSomeTransistion6CExists
.word WaitForFade
@ PROC_SLEEP
.short 0xe, 0x1e
.word 0x0

20
data/data_B12A60.s
View File

@ -215,7 +215,7 @@ gProcScr_Guide: @ 0x08B12C64
.word sub_8013D80
@ PROC_REPEAT
.short 0x3, 0x0
.word ContinueUntilSomeTransistion6CExists
.word WaitForFade
@ PROC_CALL
.short 0x2, 0x0
.word BMapDispSuspend
@ -233,7 +233,7 @@ gProcScr_Guide: @ 0x08B12C64
.word sub_8013DA4
@ PROC_REPEAT
.short 0x3, 0x0
.word ContinueUntilSomeTransistion6CExists
.word WaitForFade
@ PROC_CALL
.short 0x2, 0x0
.word sub_80CEF10
@ -245,7 +245,7 @@ gProcScr_Guide: @ 0x08B12C64
.word sub_8013D80
@ PROC_REPEAT
.short 0x3, 0x0
.word ContinueUntilSomeTransistion6CExists
.word WaitForFade
@ PROC_CALL
.short 0x2, 0x0
.word EndGreenTextColorManager
@ -266,7 +266,7 @@ gProcScr_Guide: @ 0x08B12C64
.word sub_8013DA4
@ PROC_REPEAT
.short 0x3, 0x0
.word ContinueUntilSomeTransistion6CExists
.word WaitForFade
@ PROC_CALL
.short 0x2, 0x0
.word SubSkipThread2
@ -298,9 +298,9 @@ gUnknown_08B12D1C: @ 0x08B12D1C
@ PROC_CALL(sub_8013DA4)
.short 0x2, 0x0
.word sub_8013DA4
@ PROC_REPEAT(ContinueUntilSomeTransistion6CExists)
@ PROC_REPEAT(WaitForFade)
.short 0x3, 0x0
.word ContinueUntilSomeTransistion6CExists
.word WaitForFade
@ PROC_CALL(sub_80CEF10)
.short 0x2, 0x0
.word sub_80CEF10
@ -310,9 +310,9 @@ gUnknown_08B12D1C: @ 0x08B12D1C
@ PROC_CALL(sub_8013D80)
.short 0x2, 0x0
.word sub_8013D80
@ PROC_REPEAT(ContinueUntilSomeTransistion6CExists)
@ PROC_REPEAT(WaitForFade)
.short 0x3, 0x0
.word ContinueUntilSomeTransistion6CExists
.word WaitForFade
@ PROC_CALL(EndGreenTextColorManager)
.short 0x2, 0x0
.word EndGreenTextColorManager
@ -335,8 +335,8 @@ gUnknown_08B12D1C: @ 0x08B12D1C
.short 0x0, 0x0
.word 0x0
.global gUnknown_08B12DB4
gUnknown_08B12DB4: @ 0x08B12DB4
.global Img_CommGameBgScreen
Img_CommGameBgScreen: @ 0x08B12DB4
.incbin "baserom.gba", 0xB12DB4, 0x4798
.global gUnknown_08B1754C

34
include/functions.h
View File

@ -534,7 +534,7 @@ void sub_8013D08(int speed, struct Proc* parent); // aka NewFadeInBack
// ??? sub_8013D20(???);
// ??? sub_8013D38(???);
// ??? sub_8013D50(???);
void sub_8013D68(ProcPtr);
void StartFadeInBlackMedium(ProcPtr);
void sub_8013D74(void); // StartSlowFadeToBlack
void sub_8013D80(ProcPtr);
void sub_8013D8C(ProcPtr);
@ -574,7 +574,7 @@ void sub_8013FD8(ProcPtr);
// ??? sub_8014028(???);
// ??? sub_801403C(???);
// ??? sub_8014050(???);
void ContinueUntilSomeTransistion6CExists(ProcPtr);
void WaitForFade(ProcPtr);
// ??? sub_8014084(???);
// ??? sub_8014098(???);
// ??? sub_80140E4(???);
@ -4085,11 +4085,11 @@ void sub_8097D68(ProcPtr);
// ??? sub_8099AF8(???);
// ??? sub_8099C60(???);
// ??? sub_8099C70(???);
// ??? sub_8099DB8(???);
// ??? StartPrepItemTradeScreen(???);
// ??? sub_8099DE8(???);
// ??? sub_8099E00(???);
// ??? StartPrepItemSupply(???);
// ??? sub_8099E18(???);
// ??? sub_8099E30(???);
// ??? StartPrepItemListScreen(???);
// ??? sub_8099E48(???);
// ??? sub_8099E68(???);
// ??? sub_8099E98(???);
@ -4145,7 +4145,7 @@ ProcPtr StartPrepItemScreen(ProcPtr);
// ??? sub_809B86C(???);
// ??? sub_809BB34(???);
// ??? sub_809BE24(???);
// ??? sub_809BE3C(???);
// ??? StartPrepItemTradeScreenProc(???);
// ??? sub_809BE60(???);
// ??? sub_809BE80(???);
// ??? DrawPrepScreenItemUseStatLabels(???);
@ -4153,14 +4153,14 @@ ProcPtr StartPrepItemScreen(ProcPtr);
// ??? DrawPrepScreenItemUseStatValues(???);
// ??? DrawPrepScreenItemUseItemUseDesc(???);
// ??? sub_809C4B4(???);
// ??? sub_809C4D8(???);
// ??? PrepItemUse_OnInit(???);
// ??? PrepItemUse_InitDisplay(???);
// ??? sub_809C820(???);
// ??? sub_809C940(???);
// ??? PrepItemUse_CtrlLoop(???);
// ??? ProcPrepItemUse_OnEnd(???);
// ??? sub_809C958(???);
// ??? sub_809C9D8(???);
// ??? sub_809C9F4(???);
// ??? sub_809CA14(???);
// ??? PrepItemUse_AreUSureBoxInit(???);
// ??? PrepItemUse_AreUSureBoxLoop(???);
// ??? PrepItemUse_HandleItemEffect(???);
// ??? sub_809CBA8(???);
// ??? sub_809CC40(???);
@ -4210,10 +4210,10 @@ ProcPtr StartPrepItemScreen(ProcPtr);
// ??? sub_809E85C(???);
// ??? sub_809E974(???);
// ??? sub_809EA7C(???);
// ??? sub_809EAD8(???);
// ??? StartPrepItemSupplyProc(???);
// ??? sub_809EAF4(???);
// ??? sub_809EB14(???);
void sub_809EB38(struct Unit*, ProcPtr);
void StartBmSupply(struct Unit*, ProcPtr);
void MaybeStartSelectConvoyItemProc(int, ProcPtr);
// ??? sub_809EB78(???);
// ??? sub_809EBF0(???);
@ -4234,7 +4234,7 @@ void MaybeStartSelectConvoyItemProc(int, ProcPtr);
// ??? sub_809FB70(???);
// ??? sub_809FC24(???);
// ??? sub_809FD54(???);
// ??? sub_809FD88(???);
// ??? StartPrepItemListScreenProc(???);
// ??? sub_809FDA0(???);
// ??? sub_809FDD4(???);
// ??? sub_809FE1C(???);
@ -4556,7 +4556,7 @@ void sub_80A7374();
// ??? sub_80A8A9C(???);
// ??? sub_80A8AF0(???);
// ??? sub_80A8C2C(???);
// ??? sub_80A8CD4(???);
// ??? ProcSaveMenu_InitScreen(???);
// ??? sub_80A8F04(???);
// ??? sub_80A8F8C(???);
// ??? sub_80A8FD0(???);
@ -4657,7 +4657,7 @@ void Make6C_savemenu2(ProcPtr);
// ??? sub_80ABFE0(???);
// ??? sub_80AC034(???);
// ??? sub_80AC078(???);
// ??? sub_80AC084(???);
// ??? InitDifficultySelectScreen(???);
// ??? sub_80AC1A8(???);
// ??? sub_80AC1BC(???);
// ??? sub_80AC22C(???);
@ -5767,7 +5767,7 @@ void sub_80C6BF0(int, int);
// ??? PromotionInit_SetNullState(???);
// ??? PromotionInit_Loop(???);
void StartBranchedPromoScreen(ProcPtr parent);
// ??? sub_80CC990(???);
// ??? StartPrepScreenPromotion(???);
// ??? sub_80CCA14(???);
// ??? ChangeClassDescription(???);
// ??? LoadClassReelFontPalette(???);

28
include/variables.h
View File

@ -3343,20 +3343,20 @@ extern CONST_DATA struct ProcCmd ProcScr_PrepMenu[];
// extern ??? gUnknown_08A18944
// extern ??? gUnknown_08A18964
// extern ??? gUnknown_08A1898C
// extern ??? gUnknown_08A189A4
// extern ??? ProcScr_PrepItemScreen
// extern ??? gUnknown_08A18E34
extern CONST_DATA u16 gUnknown_08A18E4E[];
extern CONST_DATA u16 gUnknown_08A18E62[];
extern CONST_DATA u16 gUnknown_08A18E76[];
extern CONST_DATA struct ProcCmd ProcScr_PrepUnitScreen[];
// extern ??? gUnknown_08A1901C
// extern ??? gUnknown_08A19064
// extern ??? ProcScr_PrepItemTradeScreen
// extern ??? PrepScr_PrepItemUseScreen
// extern ??? gUnknown_08A191F4
// extern ??? gUnknown_08A19200
// extern ??? gUnknown_08A19204
// extern ??? gUnknown_08A1920C
// extern ??? gUnknown_08A192EC
// extern ??? gUnknown_08A19424
// extern ??? ProcScr_PrepItemSupplyScreen
// extern ??? ProcScr_BmSupplyScreen
// extern ??? ProcScr_PrepItemListScreen
// extern ??? gUnknown_08A1951C
// extern ??? gUnknown_08A19524
// extern ??? gUnknown_08A19528
@ -3433,7 +3433,7 @@ extern u8 Img_PrepWindow[];
// extern ??? gUnknown_08A20050
// extern ??? gUnknown_08A20068
// extern ??? gUnknown_08A20098
// extern ??? gUnknown_08A200B8
// extern ??? ProcScr_SaveMenu
// extern ??? gUnknown_08A203A8
// extern ??? gUnknown_08A204B8
// extern ??? gUnknown_08A204BC
@ -3458,7 +3458,7 @@ extern u8 Img_PrepWindow[];
// extern ??? gUnknown_08A209F0
// extern ??? gUnknown_08A209FC
// extern ??? gUnknown_08A20A08
// extern ??? gUnknown_08A20A10
// extern ??? ProcScr_NewGameDiffilcultySelect
// extern ??? gUnknown_08A20A98
// extern ??? gUnknown_08A20AA0
// extern ??? gUnknown_08A20AAE
@ -3518,13 +3518,13 @@ extern struct ProcCmd CONST_DATA gUnknown_08A20DCC[];
// extern ??? gUnknown_08A26380
// extern ??? gUnknown_08A268D8
// extern ??? gUnknown_08A268F8
// extern ??? gUnknown_08A26A74
// extern ??? gUnknown_08A27F68
// extern ??? Img_SaveScreenSprits
// extern ??? Pal_SaveScreenSprits
// extern ??? gUnknown_08A28088
// extern ??? gUnknown_08A280A8
// extern ??? gUnknown_08A2812C
// extern ??? gUnknown_08A28A0C
// extern ??? gUnknown_08A29418
// extern ??? Img_GameMainMenuObjs
// extern ??? Img_DifficultyMenuObjs
// extern ??? Pal_DifficultyMenuObjs
// extern ??? gUnknown_08A2949A
// extern ??? gUnknown_08A294BA
// extern ??? gUnknown_08A29558
@ -4037,7 +4037,7 @@ extern const struct ProcCmd gUnknown_08B1271C[];
// extern ??? gUnknown_08B12C3C
extern struct ProcCmd CONST_DATA gProcScr_Guide[];
// extern ??? gUnknown_08B12D1C
extern u8 gUnknown_08B12DB4[]; // gfx
extern u8 Img_CommGameBgScreen[]; // gfx
extern u16 gUnknown_08B1754C[]; // pal
extern u16 gUnknown_08B1756C[]; // pal, used in opsubtitle
// extern ??? gUnknown_08B176CC

8
ldscript.txt
View File

@ -158,6 +158,14 @@ SECTIONS
src/prepscreen.o(.text);
src/prep_atmenu.o(.text);
src/prep_menuproc.o(.text);
asm/prep_menuscroll.o(.text);
asm/code_prepscreen_80977AC.o(.text);
asm/prep_itemscreen.o(.text);
asm/prep_unitscreen.o(.text);
asm/prep_itemtrade.o(.text);
asm/prep_itemuse.o(.text);
asm/prep_itemsupply.o(.text);
asm/prep_itemlist.o(.text);
asm/code_80952CC.o(.text);
src/bmsave.o(.text);
asm/code_80A2C3C.o(.text);

2
scripts/dump_proc_cmds.py
View File

@ -280,7 +280,7 @@ def test_resolve_pointer():
assert_eq(resolve_pointer(0xB12C14), "gUnknown_08B12C14")
assert_eq(resolve_pointer(0x591304), "gUnknown_08591304")
# long names aren't complete in the elf. make sure to find the right one
assert_eq(resolve_pointer(0x8014069), "ContinueUntilSomeTransistion6CExists")
assert_eq(resolve_pointer(0x8014069), "WaitForFade")
def read_procs(f, start_off, end_off):

8
src/bmdifficulty.c
View File

@ -436,7 +436,7 @@ struct ProcCmd CONST_DATA sProcScr_DisplayDungeonRecord_FromMenu[] = {
PROC_CALL(PushGlobalTimer),
PROC_CALL(AddSkipThread2),
PROC_CALL(sub_8013D80),
PROC_REPEAT(ContinueUntilSomeTransistion6CExists),
PROC_REPEAT(WaitForFade),
PROC_CALL(BMapDispSuspend),
PROC_SLEEP(0),
PROC_CALL(SetupDungeonRecordUi),
@ -453,7 +453,7 @@ struct ProcCmd CONST_DATA sProcScr_DisplayDungeonRecord_FromMenu[] = {
PROC_CALL(BMapDispResume),
PROC_CALL(RefreshBMapGraphics),
PROC_CALL(sub_8013DA4),
PROC_REPEAT(ContinueUntilSomeTransistion6CExists),
PROC_REPEAT(WaitForFade),
PROC_CALL(SubSkipThread2),
PROC_END,
@ -469,8 +469,8 @@ extern struct ProcCmd CONST_DATA sProcScr_DungeonRecord_UpdateNewRecordValues[];
struct ProcCmd CONST_DATA sProcScr_DisplayDungeonRecord_AfterDungeonClear[] = {
PROC_CALL(PushGlobalTimer),
PROC_CALL(AddSkipThread2),
PROC_CALL(sub_8013D68),
PROC_REPEAT(ContinueUntilSomeTransistion6CExists),
PROC_CALL(StartFadeInBlackMedium),
PROC_REPEAT(WaitForFade),
PROC_CALL(BMapDispSuspend),
PROC_CALL(MU_EndAll),
PROC_SLEEP(0),

2
src/bmmenu.c
View File

@ -1665,7 +1665,7 @@ u8 SupplyCommandEffect(struct MenuProc* menu, struct MenuItemProc* menuItem) {
gActionData.unitActionType = UNIT_ACTION_TRADED_1D;
sub_809EB38(gActiveUnit, NULL);
StartBmSupply(gActiveUnit, NULL);
return MENU_ACT_SKIPCURSOR | MENU_ACT_END | MENU_ACT_SND6A | MENU_ACT_CLEAR;
}

8
src/bmshop.c
View File

@ -95,9 +95,9 @@ struct ProcCmd CONST_DATA gProcScr_ShopFadeIn[] = {
PROC_SLEEP(1),
PROC_CALL_ARG(sub_8014BD0, -1),
PROC_CALL(sub_8013D68),
PROC_CALL(StartFadeInBlackMedium),
PROC_REPEAT(ContinueUntilSomeTransistion6CExists),
PROC_REPEAT(WaitForFade),
PROC_CALL(BMapDispSuspend),
PROC_END,
@ -112,7 +112,7 @@ struct ProcCmd CONST_DATA gProcScr_ShopFadeOut[] = {
PROC_CALL(sub_80160D0),
PROC_CALL(sub_8013D8C),
PROC_REPEAT(ContinueUntilSomeTransistion6CExists),
PROC_REPEAT(WaitForFade),
PROC_CALL(SubSkipThread2),
PROC_END,
@ -1164,7 +1164,7 @@ void ShopProc_Init(struct BmShopProc* proc) {
CopyToPaletteBuffer(gUnknown_08B1754C, 0x1C0, 0x20);
CopyDataWithPossibleUncomp(gUnknown_08B12DB4, (void *)(GetBackgroundTileDataOffset(3) + 0x6000000));
CopyDataWithPossibleUncomp(Img_CommGameBgScreen, (void *)(GetBackgroundTileDataOffset(3) + 0x6000000));
CallARM_FillTileRect(gBG3TilemapBuffer, gUnknown_08A295D4, 0xE000);

20
src/branched_promotion.c
View File

@ -80,8 +80,8 @@ void LoadBattleSpritesForBranchScreen(struct PromoProc3 *proc);
CONST_DATA
const struct ProcCmd gUnknown_08B1271C[] =
{
PROC_CALL(sub_8013D68),
PROC_REPEAT(ContinueUntilSomeTransistion6CExists),
PROC_CALL(StartFadeInBlackMedium),
PROC_REPEAT(WaitForFade),
PROC_NAME("ccramify"),
PROC_LABEL(0),
PROC_CALL(SetupPromotionScreen),
@ -89,19 +89,19 @@ const struct ProcCmd gUnknown_08B1271C[] =
PROC_CALL(sub_80CCF60),
PROC_LABEL(1),
PROC_CALL(sub_8013D8C),
PROC_REPEAT(ContinueUntilSomeTransistion6CExists),
PROC_REPEAT(WaitForFade),
PROC_REPEAT(LoadBattleSpritesForBranchScreen),
PROC_GOTO(3),
PROC_LABEL(2),
PROC_CALL(sub_80CD294),
PROC_CALL(sub_8013D68),
PROC_REPEAT(ContinueUntilSomeTransistion6CExists),
PROC_CALL(StartFadeInBlackMedium),
PROC_REPEAT(WaitForFade),
PROC_LABEL(4),
PROC_CALL(sub_80CD1D4),
PROC_CALL(sub_80CD2CC),
PROC_SET_END_CB(sub_80CD618),
PROC_CALL(sub_8013D68),
PROC_REPEAT(ContinueUntilSomeTransistion6CExists),
PROC_CALL(StartFadeInBlackMedium),
PROC_REPEAT(WaitForFade),
PROC_CALL(sub_80CD218),
PROC_LABEL(5),
PROC_LABEL(3),
@ -113,7 +113,7 @@ const struct ProcCmd gUnknown_08B127EC[] =
{
PROC_NAME("ccramify_end"),
PROC_CALL(sub_8013D8C),
PROC_REPEAT(ContinueUntilSomeTransistion6CExists),
PROC_REPEAT(WaitForFade),
PROC_END,
};
@ -136,7 +136,7 @@ const struct ProcCmd gUnknown_08B1280C[] =
PROC_CALL(sub_80CD6B0),
PROC_LABEL(1),
PROC_CALL(sub_8013D8C),
PROC_REPEAT(ContinueUntilSomeTransistion6CExists),
PROC_REPEAT(WaitForFade),
PROC_CALL(sub_80CD7FC),
PROC_WHILE(sub_808F284),
PROC_CALL(sub_80CD898),
@ -306,7 +306,7 @@ struct Proc_80CC990 {
u32 u30;
};
void sub_80CC990(struct Proc_80CC990 *proc) {
void StartPrepScreenPromotion(struct Proc_80CC990 *proc) {
struct BattleUnit *actor, *target;
struct PromoProc *new_proc;
struct PromoProc2 *parent;

4
src/chapterintrofx.c
View File

@ -25,7 +25,7 @@ void sub_80ADE90(int, s16, s16);
void sub_80ADEE0(int, int, int, int, int);
extern u8 gUnknown_08B12DB4[];
extern u8 Img_CommGameBgScreen[];
extern u8 gUnknown_08B17B64[];
extern u8 gUnknown_08B18D68[];
@ -358,7 +358,7 @@ int ChapterIntro_8020010(ProcPtr proc, void* unk_2, int unk_3) {
}
CopyToPaletteBuffer(gUnknown_08B1754C, unk_3 * 32, 0x40);
CopyDataWithPossibleUncomp(gUnknown_08B12DB4, unk_2);
CopyDataWithPossibleUncomp(Img_CommGameBgScreen, unk_2);
ref1 = TILEREF(0, unk_3 & 0xF);
ref2 = TILEREF(0, (unk_3 + 1) & 0xF);

6
src/gamecontrol.c
View File

@ -238,15 +238,15 @@ PROC_LABEL(18),
PROC_CALL(sub_8009A24),
PROC_CALL(sub_8013D8C),
PROC_REPEAT(ContinueUntilSomeTransistion6CExists),
PROC_REPEAT(WaitForFade),
PROC_CALL(sub_8048850),
PROC_WHILE(EventEngineExists),
PROC_SLEEP(0),
PROC_CALL(sub_8013D68),
PROC_REPEAT(ContinueUntilSomeTransistion6CExists),
PROC_CALL(StartFadeInBlackMedium),
PROC_REPEAT(WaitForFade),
PROC_CALL(EndBG3Slider),

4
src/opinfo.c
View File

@ -805,8 +805,8 @@ struct ProcCmd CONST_DATA gProcScr_opinfoenter[] = {
PROC_REPEAT(ClassIntro_LoopOut),
PROC_CALL(ClassIntro_DisableAllExceptBg1),
PROC_CALL(sub_8013D68),
PROC_REPEAT(ContinueUntilSomeTransistion6CExists),
PROC_CALL(StartFadeInBlackMedium),
PROC_REPEAT(WaitForFade),
PROC_LABEL(4),
PROC_CALL(ClassIntro_OnEnd),

6
src/opsubtitle.c
View File

@ -102,7 +102,7 @@ const struct OpSubtitleEnt gOpSubtitleGfxLut[] = {
void sub_80C488C(int bg) {
int offset = GetBackgroundTileDataOffset(bg);
CopyDataWithPossibleUncomp(gUnknown_08B12DB4, (void*)(offset + 0x6000000));
CopyDataWithPossibleUncomp(Img_CommGameBgScreen, (void*)(offset + 0x6000000));
CpuFastFill(0, (void*)(offset + 0x06005000), 0x20);
@ -827,7 +827,7 @@ PROC_LABEL(5),
PROC_CALL(sub_80C5400),
PROC_CALL(sub_8013D74),
PROC_REPEAT(ContinueUntilSomeTransistion6CExists),
PROC_REPEAT(WaitForFade),
PROC_SLEEP(30),
PROC_GOTO(7),
@ -837,7 +837,7 @@ PROC_LABEL(6), // ended due to Start Button press
PROC_END_EACH(gProcScr_08AA2184),
PROC_CALL(sub_8013D80),
PROC_REPEAT(ContinueUntilSomeTransistion6CExists),
PROC_REPEAT(WaitForFade),
PROC_SLEEP(10),

28
src/sallycursor.c
View File

@ -32,10 +32,10 @@
// hino.s
void ArchiveCurrentPalettes();
void WriteFadedPaletteFromArchive(int, int, int, int);
void ContinueUntilSomeTransistion6CExists(ProcPtr);
void WaitForFade(ProcPtr);
void sub_8013800();
void sub_8013844(ProcPtr);
void sub_8013D68(ProcPtr);
void StartFadeInBlackMedium(ProcPtr);
void sub_8013D80(ProcPtr);
void sub_8013D8C(ProcPtr);
void sub_8013DA4(ProcPtr);
@ -116,8 +116,8 @@ PROC_LABEL(2),
PROC_GOTO(0x32),
PROC_LABEL(0x33),
PROC_CALL(sub_8013D68),
PROC_REPEAT(ContinueUntilSomeTransistion6CExists),
PROC_CALL(StartFadeInBlackMedium),
PROC_REPEAT(WaitForFade),
PROC_CALL(StartPrepAtMenu),
PROC_WHILE(PrepAtMenuExists),
PROC_SLEEP(0),
@ -132,7 +132,7 @@ PROC_LABEL(0x32),
PROC_CALL(PrepScreenProc_InitMapMenu),
PROC_CALL(sub_80334CC),
PROC_CALL(sub_8013D8C),
PROC_REPEAT(ContinueUntilSomeTransistion6CExists),
PROC_REPEAT(WaitForFade),
PROC_GOTO(0x3D),
@ -234,7 +234,7 @@ PROC_LABEL(0xB),
PROC_LABEL(0x39),
PROC_CALL(sub_8013D80),
PROC_REPEAT(ContinueUntilSomeTransistion6CExists),
PROC_REPEAT(WaitForFade),
PROC_CALL(BMapDispSuspend),
PROC_CALL(sub_803334C),
PROC_CALL(sub_8033EC0),
@ -245,7 +245,7 @@ PROC_LABEL(0x39),
PROC_LABEL(0x38),
PROC_CALL(sub_8013D80),
PROC_REPEAT(ContinueUntilSomeTransistion6CExists),
PROC_REPEAT(WaitForFade),
PROC_CALL(BMapDispSuspend),
PROC_CALL(sub_803334C),
PROC_CALL(sub_808E79C),
@ -256,7 +256,7 @@ PROC_LABEL(0x38),
PROC_LABEL(0x3B),
PROC_CALL(sub_8013D80),
PROC_REPEAT(ContinueUntilSomeTransistion6CExists),
PROC_REPEAT(WaitForFade),
PROC_CALL(BMapDispSuspend),
PROC_CALL(sub_803334C),
PROC_CALL(StartPrepSaveScreen),
@ -267,8 +267,8 @@ PROC_LABEL(0x3B),
PROC_GOTO(0x3E),
PROC_LABEL(0x37),
PROC_CALL(sub_8013D68),
PROC_REPEAT(ContinueUntilSomeTransistion6CExists),
PROC_CALL(StartFadeInBlackMedium),
PROC_REPEAT(WaitForFade),
PROC_CALL(sub_8034078),
PROC_CALL(nullsub_20),
PROC_SLEEP(0),
@ -285,13 +285,13 @@ PROC_LABEL(0x3E),
PROC_CALL(PrepScreenProc_StartMapMenu),
PROC_CALL(sub_80334CC),
PROC_CALL(sub_8013DA4),
PROC_REPEAT(ContinueUntilSomeTransistion6CExists),
PROC_REPEAT(WaitForFade),
PROC_GOTO(0x3D),
PROC_LABEL(0x3C),
PROC_CALL(sub_8013D68),
PROC_REPEAT(ContinueUntilSomeTransistion6CExists),
PROC_CALL(StartFadeInBlackMedium),
PROC_REPEAT(WaitForFade),
PROC_CALL(HideMoveRangeGraphics),
PROC_CALL(BMapDispSuspend),
PROC_CALL(CallCursorShop),
@ -304,7 +304,7 @@ PROC_LABEL(0x3C),
PROC_CALL(sub_8034194),
PROC_CALL(sub_8033608),
PROC_CALL(sub_8013D8C),
PROC_REPEAT(ContinueUntilSomeTransistion6CExists),
PROC_REPEAT(WaitForFade),
PROC_GOTO(9),

4
src/uichapterstatus.c
View File

@ -127,7 +127,7 @@ struct ProcCmd CONST_DATA gProcScr_ChapterStatusScreen[] = {
PROC_CALL(AddSkipThread2),
PROC_CALL(sub_8013D80),
PROC_REPEAT(ContinueUntilSomeTransistion6CExists),
PROC_REPEAT(WaitForFade),
PROC_CALL(BMapDispSuspend),
PROC_CALL(ChapterStatus_Init),
@ -147,7 +147,7 @@ PROC_LABEL(1),
PROC_CALL(BMapDispResume),
PROC_CALL(RefreshBMapGraphics),
PROC_CALL(sub_8013DA4),
PROC_REPEAT(ContinueUntilSomeTransistion6CExists),
PROC_REPEAT(WaitForFade),
PROC_CALL(ChapterStatus_MaybeFocusLeaderUnit),
PROC_SLEEP(0),

10
src/uiconfig.c
View File

@ -1085,7 +1085,7 @@ PROC_LABEL(0),
PROC_REPEAT(Config_Loop_KeyHandler),
PROC_CALL(sub_8013D80),
PROC_REPEAT(ContinueUntilSomeTransistion6CExists),
PROC_REPEAT(WaitForFade),
PROC_CALL(EndHelpBox),
PROC_CALL_2(sub_80B2464),
@ -1094,7 +1094,7 @@ PROC_LABEL(0),
PROC_CALL(RefreshBMapGraphics),
PROC_CALL(sub_8013DA4),
PROC_REPEAT(ContinueUntilSomeTransistion6CExists),
PROC_REPEAT(WaitForFade),
PROC_CALL(SubSkipThread2),
@ -1118,7 +1118,7 @@ PROC_LABEL(0),
PROC_REPEAT(Config_Loop_KeyHandler),
PROC_CALL(sub_8013D80),
PROC_REPEAT(ContinueUntilSomeTransistion6CExists),
PROC_REPEAT(WaitForFade),
PROC_CALL(EndHelpBox),
PROC_CALL_2(sub_80B2464),
@ -1141,12 +1141,12 @@ PROC_LABEL(0),
PROC_CALL(sub_80B24C0),
PROC_CALL(sub_8013DA4),
PROC_REPEAT(ContinueUntilSomeTransistion6CExists),
PROC_REPEAT(WaitForFade),
PROC_REPEAT(Config_Loop_KeyHandler),
PROC_CALL(sub_8013D80),
PROC_REPEAT(ContinueUntilSomeTransistion6CExists),
PROC_REPEAT(WaitForFade),
PROC_CALL(EndHelpBox),
PROC_CALL_2(sub_80B2464),