update asm
This commit is contained in:
3536
asm/emerald.s
3536
asm/emerald.s
File diff suppressed because it is too large
Load Diff
48
asm/gpu_bg.s
48
asm/gpu_bg.s
@@ -635,7 +635,7 @@ _08001796:
|
||||
thumb_func_end SetBgAffineInternal
|
||||
|
||||
thumb_func_start IsInvalidBg
|
||||
; BOOL IsInvalidBg(u8 bg)
|
||||
; bool8 IsInvalidBg(u8 bg)
|
||||
IsInvalidBg: ; 80017A4
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
@@ -1062,7 +1062,7 @@ _08001AC8:
|
||||
thumb_func_end Unused_LoadBgPalette
|
||||
|
||||
thumb_func_start IsDma3ManagerBusyWithBgCopy
|
||||
; BOOL IsDma3ManagerBusyWithBgCopy()
|
||||
; bool8 IsDma3ManagerBusyWithBgCopy()
|
||||
IsDma3ManagerBusyWithBgCopy: ; 8001AD4
|
||||
push {r4-r7,lr}
|
||||
movs r5, 0
|
||||
@@ -1776,7 +1776,7 @@ _0800204A:
|
||||
lsls r0, 8
|
||||
lsrs r1, r0, 16
|
||||
movs r0, 0x12
|
||||
bl SetGpuReg_ScreenOff
|
||||
bl SetGpuReg_ForcedBlank
|
||||
b _080020E0
|
||||
.pool
|
||||
_08002060:
|
||||
@@ -1785,7 +1785,7 @@ _08002060:
|
||||
lsls r0, 8
|
||||
lsrs r1, r0, 16
|
||||
movs r0, 0x16
|
||||
bl SetGpuReg_ScreenOff
|
||||
bl SetGpuReg_ForcedBlank
|
||||
b _080020E0
|
||||
.pool
|
||||
_08002074:
|
||||
@@ -1796,7 +1796,7 @@ _08002074:
|
||||
lsls r0, 8
|
||||
lsrs r1, r0, 16
|
||||
movs r0, 0x1A
|
||||
bl SetGpuReg_ScreenOff
|
||||
bl SetGpuReg_ForcedBlank
|
||||
b _080020E0
|
||||
.pool
|
||||
_0800208C:
|
||||
@@ -1806,10 +1806,10 @@ _0800208C:
|
||||
lsls r0, 16
|
||||
lsrs r4, r0, 16
|
||||
movs r0, 0x2E
|
||||
bl SetGpuReg_ScreenOff
|
||||
bl SetGpuReg_ForcedBlank
|
||||
movs r0, 0x2C
|
||||
adds r1, r4, 0
|
||||
bl SetGpuReg_ScreenOff
|
||||
bl SetGpuReg_ForcedBlank
|
||||
b _080020E0
|
||||
.pool
|
||||
_080020AC:
|
||||
@@ -1820,7 +1820,7 @@ _080020AC:
|
||||
lsls r0, 8
|
||||
lsrs r1, r0, 16
|
||||
movs r0, 0x1E
|
||||
bl SetGpuReg_ScreenOff
|
||||
bl SetGpuReg_ForcedBlank
|
||||
b _080020E0
|
||||
.pool
|
||||
_080020C4:
|
||||
@@ -1832,10 +1832,10 @@ _080020C4:
|
||||
lsls r0, 16
|
||||
lsrs r4, r0, 16
|
||||
movs r0, 0x3E
|
||||
bl SetGpuReg_ScreenOff
|
||||
bl SetGpuReg_ForcedBlank
|
||||
movs r0, 0x3C
|
||||
adds r1, r4, 0
|
||||
bl SetGpuReg_ScreenOff
|
||||
bl SetGpuReg_ForcedBlank
|
||||
_080020E0:
|
||||
ldr r0, =0x030008f8
|
||||
adds r0, 0xC
|
||||
@@ -2038,9 +2038,9 @@ _08002226:
|
||||
bx r1
|
||||
thumb_func_end Unused_AdjustBgMosaic
|
||||
|
||||
thumb_func_start SetBgTilemap
|
||||
; void SetBgTilemap(u8 bg, void *tilemap)
|
||||
SetBgTilemap: ; 8002250
|
||||
thumb_func_start SetBgTilemapBuffer
|
||||
; void SetBgTilemapBuffer(u8 bg, void *tilemap)
|
||||
SetBgTilemapBuffer: ; 8002250
|
||||
push {r4,r5,lr}
|
||||
adds r5, r1, 0
|
||||
lsls r0, 24
|
||||
@@ -2065,11 +2065,11 @@ _0800227A:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end SetBgTilemap
|
||||
thumb_func_end SetBgTilemapBuffer
|
||||
|
||||
thumb_func_start UnsetBgTilemap
|
||||
; void UnsetBgTilemap(u8 bg)
|
||||
UnsetBgTilemap: ; 8002284
|
||||
thumb_func_start UnsetBgTilemapBuffer
|
||||
; void UnsetBgTilemapBuffer(u8 bg)
|
||||
UnsetBgTilemapBuffer: ; 8002284
|
||||
push {r4,r5,lr}
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
@@ -2094,11 +2094,11 @@ _080022AE:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end UnsetBgTilemap
|
||||
thumb_func_end UnsetBgTilemapBuffer
|
||||
|
||||
thumb_func_start GetBgTilemap
|
||||
; void *GetBgTilemap(u8 bg)
|
||||
GetBgTilemap: ; 80022B8
|
||||
thumb_func_start GetBgTilemapBuffer
|
||||
; void *GetBgTilemapBuffer(u8 bg)
|
||||
GetBgTilemapBuffer: ; 80022B8
|
||||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
@@ -2125,7 +2125,7 @@ _080022EA:
|
||||
pop {r4}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end GetBgTilemap
|
||||
thumb_func_end GetBgTilemapBuffer
|
||||
|
||||
thumb_func_start CopyToBgTilemapBuffer
|
||||
; void CopyToBgTilemapBuffer(u8 bg, void *src, u16 mode, u16 destOffset)
|
||||
@@ -3314,7 +3314,7 @@ _08002B90:
|
||||
thumb_func_end GetBgType
|
||||
|
||||
thumb_func_start IsInvalidBg_
|
||||
; BOOL IsInvalidBg_(u8 bg)
|
||||
; bool8 IsInvalidBg_(u8 bg)
|
||||
IsInvalidBg_: ; 8002B9C
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
@@ -3331,7 +3331,7 @@ _08002BAC:
|
||||
thumb_func_end IsInvalidBg_
|
||||
|
||||
thumb_func_start IsTileMapOutsideWram
|
||||
; BOOL IsTileMapOutsideWram(u8 bg)
|
||||
; bool8 IsTileMapOutsideWram(u8 bg)
|
||||
IsTileMapOutsideWram: ; 8002BB0
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
|
||||
@@ -174,9 +174,9 @@ _08001130:
|
||||
.pool
|
||||
thumb_func_end SetGpuReg
|
||||
|
||||
thumb_func_start SetGpuReg_ScreenOff
|
||||
; void SetGpuReg_ScreenOff(u8 reg, u16 value)
|
||||
SetGpuReg_ScreenOff: ; 8001140
|
||||
thumb_func_start SetGpuReg_ForcedBlank
|
||||
; void SetGpuReg_ForcedBlank(u8 reg, u16 value)
|
||||
SetGpuReg_ForcedBlank: ; 8001140
|
||||
push {r4,r5,lr}
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
@@ -235,7 +235,7 @@ _080011A8:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end SetGpuReg_ScreenOff
|
||||
thumb_func_end SetGpuReg_ForcedBlank
|
||||
|
||||
thumb_func_start GetGpuReg
|
||||
; u16 GetGpuReg(u8 reg)
|
||||
@@ -286,9 +286,9 @@ SetGpuRegBits: ; 80011E8
|
||||
.pool
|
||||
thumb_func_end SetGpuRegBits
|
||||
|
||||
thumb_func_start ResetGpuRegBits
|
||||
; void ResetGpuRegBits(u8 reg, u16 mask)
|
||||
ResetGpuRegBits: ; 8001208
|
||||
thumb_func_start ClearGpuRegBits
|
||||
; void ClearGpuRegBits(u8 reg, u16 mask)
|
||||
ClearGpuRegBits: ; 8001208
|
||||
push {lr}
|
||||
adds r2, r1, 0
|
||||
lsls r0, 24
|
||||
@@ -303,11 +303,11 @@ ResetGpuRegBits: ; 8001208
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end ResetGpuRegBits
|
||||
thumb_func_end ClearGpuRegBits
|
||||
|
||||
thumb_func_start SyncIEReg
|
||||
; void SyncIEReg()
|
||||
SyncIEReg: ; 8001228
|
||||
thumb_func_start SyncRegIE
|
||||
; void SyncRegIE()
|
||||
SyncRegIE: ; 8001228
|
||||
push {r4,r5,lr}
|
||||
ldr r5, =0x030008d9
|
||||
ldrb r0, [r5]
|
||||
@@ -328,7 +328,7 @@ _08001246:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end SyncIEReg
|
||||
thumb_func_end SyncRegIE
|
||||
|
||||
thumb_func_start EnableInterrupts
|
||||
; void EnableInterrupts(u16 mask)
|
||||
@@ -343,9 +343,9 @@ EnableInterrupts: ; 800125C
|
||||
ldr r1, =0x030008d9
|
||||
movs r0, 0x1
|
||||
strb r0, [r1]
|
||||
bl SyncIEReg
|
||||
bl SyncRegIE
|
||||
ldrh r0, [r4]
|
||||
bl SetDispstatVBlankHBlankInterrupts
|
||||
bl UpdateRegDispstatIntrBits
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -365,18 +365,18 @@ DisableInterrupts: ; 8001288
|
||||
ldr r1, =0x030008d9
|
||||
movs r0, 0x1
|
||||
strb r0, [r1]
|
||||
bl SyncIEReg
|
||||
bl SyncRegIE
|
||||
ldrh r0, [r4]
|
||||
bl SetDispstatVBlankHBlankInterrupts
|
||||
bl UpdateRegDispstatIntrBits
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end DisableInterrupts
|
||||
|
||||
thumb_func_start SetDispstatVBlankHBlankInterrupts
|
||||
; void SetDispstatVBlankHBlankInterrupts(u16 mask)
|
||||
SetDispstatVBlankHBlankInterrupts: ; 80012B4
|
||||
thumb_func_start UpdateRegDispstatIntrBits
|
||||
; void UpdateRegDispstatIntrBits(u16 mask)
|
||||
UpdateRegDispstatIntrBits: ; 80012B4
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
lsls r4, 16
|
||||
@@ -407,4 +407,4 @@ _080012EA:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end SetDispstatVBlankHBlankInterrupts
|
||||
thumb_func_end UpdateRegDispstatIntrBits
|
||||
|
||||
@@ -187,9 +187,9 @@ StartTimer1: ; 8000554
|
||||
.pool
|
||||
thumb_func_end StartTimer1
|
||||
|
||||
thumb_func_start SetRngAndSetTrainerId
|
||||
; void SetRngAndSetTrainerId()
|
||||
SetRngAndSetTrainerId: ; 8000560
|
||||
thumb_func_start SeedRngAndSetTrainerId
|
||||
; void SeedRngAndSetTrainerId()
|
||||
SeedRngAndSetTrainerId: ; 8000560
|
||||
push {r4,lr}
|
||||
ldr r0, =0x04000104
|
||||
ldrh r4, [r0]
|
||||
@@ -204,7 +204,7 @@ SetRngAndSetTrainerId: ; 8000560
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end SetRngAndSetTrainerId
|
||||
thumb_func_end SeedRngAndSetTrainerId
|
||||
|
||||
thumb_func_start GetTrainerId
|
||||
; u16 GetTrainerId()
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
; void CB2_MainMenu()
|
||||
CB2_MainMenu: ; 802F6B0
|
||||
push {lr}
|
||||
bl run_active_tasks
|
||||
bl RunActiveTasks
|
||||
bl CallObjectCallbacks
|
||||
bl PrepareSpritesForOamLoad
|
||||
bl fade_and_return_progress_probably
|
||||
@@ -42,7 +42,7 @@ CB2_ReinitMainMenu: ; 802F6E8
|
||||
thumb_func_end CB2_ReinitMainMenu
|
||||
|
||||
thumb_func_start InitMainMenu
|
||||
; void InitMainMenu(BOOL affects_palette_maybe)
|
||||
; void InitMainMenu(bool8 affects_palette_maybe)
|
||||
InitMainMenu: ; 802F6F4
|
||||
push {r4,r5,lr}
|
||||
sub sp, 0xC
|
||||
@@ -702,7 +702,7 @@ _0802FCBC:
|
||||
ldr r5, =0x000001d5
|
||||
adds r0, r4, 0
|
||||
adds r1, r5, 0
|
||||
bl DrawMainMenuWindowFrame
|
||||
bl DrawMainMenuWindowBorder
|
||||
adds r4, 0x8
|
||||
b _0802FED4
|
||||
.pool
|
||||
@@ -766,11 +766,11 @@ _0802FD44:
|
||||
ldr r5, =0x000001d5
|
||||
adds r0, r4, 0
|
||||
adds r1, r5, 0
|
||||
bl DrawMainMenuWindowFrame
|
||||
bl DrawMainMenuWindowBorder
|
||||
adds r0, r4, 0
|
||||
adds r0, 0x8
|
||||
adds r1, r5, 0
|
||||
bl DrawMainMenuWindowFrame
|
||||
bl DrawMainMenuWindowBorder
|
||||
adds r4, 0x10
|
||||
b _0802FED4
|
||||
.pool
|
||||
@@ -851,20 +851,20 @@ _0802FE00:
|
||||
ldr r5, =0x000001d5
|
||||
adds r0, r4, 0
|
||||
adds r1, r5, 0
|
||||
bl DrawMainMenuWindowFrame
|
||||
bl DrawMainMenuWindowBorder
|
||||
adds r0, r4, 0
|
||||
adds r0, 0x8
|
||||
adds r1, r5, 0
|
||||
bl DrawMainMenuWindowFrame
|
||||
bl DrawMainMenuWindowBorder
|
||||
adds r0, r4, 0
|
||||
adds r0, 0x10
|
||||
adds r1, r5, 0
|
||||
bl DrawMainMenuWindowFrame
|
||||
bl DrawMainMenuWindowBorder
|
||||
adds r4, 0x18
|
||||
_0802FED4:
|
||||
adds r0, r4, 0
|
||||
adds r1, r5, 0
|
||||
bl DrawMainMenuWindowFrame
|
||||
bl DrawMainMenuWindowBorder
|
||||
b _0803005E
|
||||
.pool
|
||||
_0802FEFC:
|
||||
@@ -961,27 +961,27 @@ _0802FEFC:
|
||||
ldr r4, =0x000001d5
|
||||
adds r0, r5, 0
|
||||
adds r1, r4, 0
|
||||
bl DrawMainMenuWindowFrame
|
||||
bl DrawMainMenuWindowBorder
|
||||
adds r0, r5, 0
|
||||
adds r0, 0x8
|
||||
adds r1, r4, 0
|
||||
bl DrawMainMenuWindowFrame
|
||||
bl DrawMainMenuWindowBorder
|
||||
adds r0, r5, 0
|
||||
adds r0, 0x10
|
||||
adds r1, r4, 0
|
||||
bl DrawMainMenuWindowFrame
|
||||
bl DrawMainMenuWindowBorder
|
||||
adds r0, r5, 0
|
||||
adds r0, 0x18
|
||||
adds r1, r4, 0
|
||||
bl DrawMainMenuWindowFrame
|
||||
bl DrawMainMenuWindowBorder
|
||||
adds r0, r5, 0
|
||||
adds r0, 0x20
|
||||
adds r1, r4, 0
|
||||
bl DrawMainMenuWindowFrame
|
||||
bl DrawMainMenuWindowBorder
|
||||
ldr r0, =gUnknown_082FF0F4
|
||||
ldr r4, =0x02022d06
|
||||
adds r1, r4, 0
|
||||
bl sub_81AF380
|
||||
bl AddScrollIndicatorArrowPair
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r6, 0x1A]
|
||||
@@ -991,7 +991,7 @@ _0802FEFC:
|
||||
adds r0, r1
|
||||
lsls r0, 3
|
||||
add r0, r8
|
||||
ldr r1, =sub_81AF59C
|
||||
ldr r1, =Task_ScrollIndicatorArrowPairOnMainMenu
|
||||
str r1, [r0]
|
||||
ldrh r0, [r4]
|
||||
cmp r0, 0x4
|
||||
@@ -1283,7 +1283,7 @@ _08030292:
|
||||
ldrh r0, [r4, 0x22]
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl sub_81AF620
|
||||
bl RemoveScrollIndicatorArrowPair
|
||||
_080302B0:
|
||||
movs r0, 0
|
||||
movs r1, 0x1
|
||||
@@ -1596,7 +1596,7 @@ Task_HandleMainMenuBPressed: ; 8030544
|
||||
ldrh r0, [r1, 0x22]
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl sub_81AF620
|
||||
bl RemoveScrollIndicatorArrowPair
|
||||
_08030578:
|
||||
ldr r0, =0x02022d06
|
||||
strh r4, [r0]
|
||||
@@ -4408,7 +4408,7 @@ sub_8031D74: ; 8031D74
|
||||
push {lr}
|
||||
ldr r0, =gUnknown_082FF088
|
||||
movs r1, 0xF3
|
||||
bl DrawMainMenuWindowFrame
|
||||
bl DrawMainMenuWindowBorder
|
||||
movs r0, 0x1
|
||||
movs r1, 0x11
|
||||
bl FillWindowPixelBuffer
|
||||
@@ -4510,7 +4510,7 @@ CreateMainMenuErrorWindow: ; 8031E18
|
||||
bl CopyWindowToVram
|
||||
ldr r0, =gUnknown_082FF070
|
||||
ldr r1, =0x000001d5
|
||||
bl DrawMainMenuWindowFrame
|
||||
bl DrawMainMenuWindowBorder
|
||||
ldr r1, =0x000009e7
|
||||
movs r0, 0x40
|
||||
bl SetGpuReg
|
||||
@@ -4797,9 +4797,9 @@ LoadMainMenuWindowFrameTiles: ; 80320A4
|
||||
.pool
|
||||
thumb_func_end LoadMainMenuWindowFrameTiles
|
||||
|
||||
thumb_func_start DrawMainMenuWindowFrame
|
||||
; void DrawMainMenuWindowFrame(struct WindowTemplate *template, u16 baseTileNum)
|
||||
DrawMainMenuWindowFrame: ; 80320EC
|
||||
thumb_func_start DrawMainMenuWindowBorder
|
||||
; void DrawMainMenuWindowBorder(struct WindowTemplate *template, u16 baseTileNum)
|
||||
DrawMainMenuWindowBorder: ; 80320EC
|
||||
push {r4-r7,lr}
|
||||
mov r7, r10
|
||||
mov r6, r9
|
||||
@@ -4969,7 +4969,7 @@ DrawMainMenuWindowFrame: ; 80320EC
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end DrawMainMenuWindowFrame
|
||||
thumb_func_end DrawMainMenuWindowBorder
|
||||
|
||||
thumb_func_start sub_8032250
|
||||
sub_8032250: ; 8032250
|
||||
@@ -5212,7 +5212,7 @@ sub_80323CC: ; 80323CC
|
||||
mov r1, r8
|
||||
adds r2, r6, 0
|
||||
movs r3, 0
|
||||
bl sub_81996C0
|
||||
bl CreateYesNoMenu
|
||||
add sp, 0x20
|
||||
pop {r3}
|
||||
mov r8, r3
|
||||
|
||||
@@ -184,7 +184,7 @@ _08000AB8:
|
||||
thumb_func_end AllocZeroedInternal
|
||||
|
||||
thumb_func_start CheckMemBlockInternal
|
||||
; BOOL CheckMemBlockInternal(struct MemBlock *head, struct MemBlock *node)
|
||||
; bool8 CheckMemBlockInternal(struct MemBlock *head, struct MemBlock *node)
|
||||
CheckMemBlockInternal: ; 8000AC4
|
||||
push {r4,r5,lr}
|
||||
adds r5, r0, 0
|
||||
@@ -289,7 +289,7 @@ Free: ; 8000B60
|
||||
thumb_func_end Free
|
||||
|
||||
thumb_func_start CheckMemBlock
|
||||
; BOOL CheckMemBlock(void *pointer)
|
||||
; bool8 CheckMemBlock(void *pointer)
|
||||
CheckMemBlock: ; 8000B74
|
||||
push {lr}
|
||||
adds r1, r0, 0
|
||||
@@ -302,7 +302,7 @@ CheckMemBlock: ; 8000B74
|
||||
thumb_func_end CheckMemBlock
|
||||
|
||||
thumb_func_start CheckHeap
|
||||
; BOOL CheckHeap()
|
||||
; bool8 CheckHeap()
|
||||
CheckHeap: ; 8000B88
|
||||
push {r4,r5,lr}
|
||||
ldr r0, =0x03000004
|
||||
|
||||
@@ -51,7 +51,7 @@ _0802F11C:
|
||||
thumb_func_end GameFreakRTC_ConvertFromBCD
|
||||
|
||||
thumb_func_start GameFreakRTC_IsLeapYear
|
||||
; BOOL GameFreakRTC_IsLeapYear(u32 year)
|
||||
; bool8 GameFreakRTC_IsLeapYear(u32 year)
|
||||
GameFreakRTC_IsLeapYear: ; 802F120
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
|
||||
@@ -263,7 +263,7 @@ _08008C8E:
|
||||
thumb_func_end CompareString_LimitN
|
||||
|
||||
thumb_func_start IsStringLengthLessThanN
|
||||
; BOOL IsStringLengthLessThanN(u8 *s, s32 n)
|
||||
; bool8 IsStringLengthLessThanN(u8 *s, s32 n)
|
||||
IsStringLengthLessThanN: ; 8008C94
|
||||
push {lr}
|
||||
adds r3, r0, 0
|
||||
@@ -1106,7 +1106,7 @@ _08009218:
|
||||
thumb_func_end WriteColorChangeControlCode
|
||||
|
||||
thumb_func_start sub_8009228
|
||||
; BOOL sub_8009228(u8 *s)
|
||||
; bool8 sub_8009228(u8 *s)
|
||||
sub_8009228: ; 8009228
|
||||
push {lr}
|
||||
adds r2, r0, 0
|
||||
@@ -1133,7 +1133,7 @@ _08009248:
|
||||
thumb_func_end sub_8009228
|
||||
|
||||
thumb_func_start sub_800924C
|
||||
; BOOL sub_800924C(u8 *s, u32 n)
|
||||
; bool8 sub_800924C(u8 *s, u32 n)
|
||||
sub_800924C: ; 800924C
|
||||
push {r4,lr}
|
||||
adds r3, r0, 0
|
||||
@@ -1252,7 +1252,7 @@ _080092FE:
|
||||
thumb_func_end CompareStringWithoutExtendedControlCodes
|
||||
|
||||
thumb_func_start StopMusicWhileStringIsPrinted
|
||||
; void StopMusicWhileStringIsPrinted(u8 *s, BOOL stopMusic)
|
||||
; void StopMusicWhileStringIsPrinted(u8 *s, bool8 stopMusic)
|
||||
StopMusicWhileStringIsPrinted: ; 8009308
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
|
||||
@@ -235,9 +235,9 @@ _080A9106:
|
||||
bx r0
|
||||
thumb_func_end remove_task
|
||||
|
||||
thumb_func_start run_active_tasks
|
||||
; void run_active_tasks()
|
||||
run_active_tasks: ; 80A910C
|
||||
thumb_func_start RunActiveTasks
|
||||
; void RunActiveTasks()
|
||||
RunActiveTasks: ; 80A910C
|
||||
push {r4,r5,lr}
|
||||
bl get_first_active_task
|
||||
lsls r0, 24
|
||||
@@ -260,7 +260,7 @@ _080A9130:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end run_active_tasks
|
||||
thumb_func_end RunActiveTasks
|
||||
|
||||
thumb_func_start get_first_active_task
|
||||
; int get_first_active_task()
|
||||
|
||||
@@ -309,7 +309,7 @@ _080047F6:
|
||||
thumb_func_end RunTextPrinters
|
||||
|
||||
thumb_func_start IsTextPrinterActive
|
||||
; BOOL IsTextPrinterActive(u8 id)
|
||||
; bool8 IsTextPrinterActive(u8 id)
|
||||
IsTextPrinterActive: ; 8004800
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
@@ -2219,7 +2219,7 @@ TextPrinterClearDownArrow: ; 8005600
|
||||
thumb_func_end TextPrinterClearDownArrow
|
||||
|
||||
thumb_func_start TextPrinterWaitAutoMode
|
||||
; BOOL TextPrinterWaitAutoMode(struct TextPrinter *textPrinter)
|
||||
; bool8 TextPrinterWaitAutoMode(struct TextPrinter *textPrinter)
|
||||
TextPrinterWaitAutoMode: ; 8005634
|
||||
push {lr}
|
||||
adds r1, r0, 0
|
||||
@@ -2239,7 +2239,7 @@ _0800564A:
|
||||
thumb_func_end TextPrinterWaitAutoMode
|
||||
|
||||
thumb_func_start TextPrinterWaitWithDownArrow
|
||||
; BOOL TextPrinterWaitWithDownArrow(struct TextPrinter *textPrinter)
|
||||
; bool8 TextPrinterWaitWithDownArrow(struct TextPrinter *textPrinter)
|
||||
TextPrinterWaitWithDownArrow: ; 8005650
|
||||
push {r4,lr}
|
||||
adds r2, r0, 0
|
||||
@@ -2277,7 +2277,7 @@ _0800568E:
|
||||
thumb_func_end TextPrinterWaitWithDownArrow
|
||||
|
||||
thumb_func_start TextPrinterWait
|
||||
; BOOL TextPrinterWait(struct TextPrinter *textPrinter)
|
||||
; bool8 TextPrinterWait(struct TextPrinter *textPrinter)
|
||||
TextPrinterWait: ; 800569C
|
||||
push {r4,lr}
|
||||
adds r2, r0, 0
|
||||
@@ -2313,7 +2313,7 @@ _080056D4:
|
||||
thumb_func_end TextPrinterWait
|
||||
|
||||
thumb_func_start DrawDownArrow
|
||||
; void DrawDownArrow(u8 windowId, u16 x, u16 y, u8 bgColor, BOOL drawArrow, u8 *counter, u8 *yCoordIndex)
|
||||
; void DrawDownArrow(u8 windowId, u16 x, u16 y, u8 bgColor, bool8 drawArrow, u8 *counter, u8 *yCoordIndex)
|
||||
DrawDownArrow: ; 80056E0
|
||||
push {r4-r7,lr}
|
||||
mov r7, r10
|
||||
@@ -4029,7 +4029,7 @@ GetMenuCursorDimensionByFont: ; 8006460
|
||||
thumb_func_end GetMenuCursorDimensionByFont
|
||||
|
||||
thumb_func_start DecompressGlyphFont0
|
||||
; void DecompressGlyphFont0(u16 glyphId, BOOL isJapanese)
|
||||
; void DecompressGlyphFont0(u16 glyphId, bool8 isJapanese)
|
||||
DecompressGlyphFont0: ; 8006478
|
||||
push {r4,r5,lr}
|
||||
lsls r0, 16
|
||||
@@ -4118,7 +4118,7 @@ _08006534:
|
||||
thumb_func_end DecompressGlyphFont0
|
||||
|
||||
thumb_func_start GetGlyphWidthFont0
|
||||
; u8 GetGlyphWidthFont0(u16 glyphId, BOOL isJapanese)
|
||||
; u8 GetGlyphWidthFont0(u16 glyphId, bool8 isJapanese)
|
||||
GetGlyphWidthFont0: ; 8006540
|
||||
push {lr}
|
||||
lsls r0, 16
|
||||
@@ -4138,7 +4138,7 @@ _0800655A:
|
||||
thumb_func_end GetGlyphWidthFont0
|
||||
|
||||
thumb_func_start DecompressGlyphFont7
|
||||
; void DecompressGlyphFont7(u16 glyphId, BOOL isJapanese)
|
||||
; void DecompressGlyphFont7(u16 glyphId, bool8 isJapanese)
|
||||
DecompressGlyphFont7: ; 8006560
|
||||
push {r4-r6,lr}
|
||||
lsls r0, 16
|
||||
@@ -4227,7 +4227,7 @@ _0800661C:
|
||||
thumb_func_end DecompressGlyphFont7
|
||||
|
||||
thumb_func_start GetGlyphWidthFont7
|
||||
; u8 GetGlyphWidthFont7(u16 glyphId, BOOL isJapanese)
|
||||
; u8 GetGlyphWidthFont7(u16 glyphId, bool8 isJapanese)
|
||||
GetGlyphWidthFont7: ; 8006628
|
||||
push {lr}
|
||||
lsls r0, 16
|
||||
@@ -4247,7 +4247,7 @@ _08006642:
|
||||
thumb_func_end GetGlyphWidthFont7
|
||||
|
||||
thumb_func_start DecompressGlyphFont8
|
||||
; void DecompressGlyphFont8(u16 glyphId, BOOL isJapanese)
|
||||
; void DecompressGlyphFont8(u16 glyphId, bool8 isJapanese)
|
||||
DecompressGlyphFont8: ; 8006648
|
||||
push {r4,r5,lr}
|
||||
lsls r0, 16
|
||||
@@ -4336,7 +4336,7 @@ _08006704:
|
||||
thumb_func_end DecompressGlyphFont8
|
||||
|
||||
thumb_func_start GetGlyphWidthFont8
|
||||
; u8 GetGlyphWidthFont8(u16 glyphId, BOOL isJapanese)
|
||||
; u8 GetGlyphWidthFont8(u16 glyphId, bool8 isJapanese)
|
||||
GetGlyphWidthFont8: ; 8006710
|
||||
push {lr}
|
||||
lsls r0, 16
|
||||
@@ -4356,7 +4356,7 @@ _0800672A:
|
||||
thumb_func_end GetGlyphWidthFont8
|
||||
|
||||
thumb_func_start DecompressGlyphFont2
|
||||
; void DecompressGlyphFont2(u16 glyphId, BOOL isJapanese)
|
||||
; void DecompressGlyphFont2(u16 glyphId, bool8 isJapanese)
|
||||
DecompressGlyphFont2: ; 8006730
|
||||
push {r4-r6,lr}
|
||||
lsls r0, 16
|
||||
@@ -4459,7 +4459,7 @@ _08006810:
|
||||
thumb_func_end DecompressGlyphFont2
|
||||
|
||||
thumb_func_start GetGlyphWidthFont2
|
||||
; u8 GetGlyphWidthFont2(u16 glyphId, BOOL isJapanese)
|
||||
; u8 GetGlyphWidthFont2(u16 glyphId, bool8 isJapanese)
|
||||
GetGlyphWidthFont2: ; 800681C
|
||||
push {lr}
|
||||
lsls r0, 16
|
||||
@@ -4480,7 +4480,7 @@ _08006832:
|
||||
thumb_func_end GetGlyphWidthFont2
|
||||
|
||||
thumb_func_start DecompressGlyphFont1
|
||||
; void DecompressGlyphFont1(u16 glyphId, BOOL isJapanese)
|
||||
; void DecompressGlyphFont1(u16 glyphId, bool8 isJapanese)
|
||||
DecompressGlyphFont1: ; 8006840
|
||||
push {r4-r6,lr}
|
||||
lsls r0, 16
|
||||
@@ -4569,7 +4569,7 @@ _080068FC:
|
||||
thumb_func_end DecompressGlyphFont1
|
||||
|
||||
thumb_func_start GetGlyphWidthFont1
|
||||
; u8 GetGlyphWidthFont1(u16 glyphId, BOOL isJapanese)
|
||||
; u8 GetGlyphWidthFont1(u16 glyphId, bool8 isJapanese)
|
||||
GetGlyphWidthFont1: ; 8006908
|
||||
push {lr}
|
||||
lsls r0, 16
|
||||
|
||||
16
asm/window.s
16
asm/window.s
@@ -4,7 +4,7 @@ nullsub_8: ; 80031BC
|
||||
thumb_func_end nullsub_8
|
||||
|
||||
thumb_func_start InitWindows
|
||||
; BOOL16 InitWindows(struct WindowTemplate *templates)
|
||||
; bool16 InitWindows(struct WindowTemplate *templates)
|
||||
InitWindows: ; 80031C0
|
||||
push {r4-r7,lr}
|
||||
mov r7, r10
|
||||
@@ -20,7 +20,7 @@ _080031D4:
|
||||
mov r1, r8
|
||||
lsls r0, r1, 24
|
||||
lsrs r0, 24
|
||||
bl GetBgTilemap
|
||||
bl GetBgTilemapBuffer
|
||||
cmp r0, 0
|
||||
beq _080031E4
|
||||
ldr r0, =nullsub_8
|
||||
@@ -129,7 +129,7 @@ _080032BC:
|
||||
str r4, [r0]
|
||||
adds r0, r7, 0
|
||||
adds r1, r4, 0
|
||||
bl SetBgTilemap
|
||||
bl SetBgTilemapBuffer
|
||||
_080032CA:
|
||||
ldrb r1, [r6, 0x3]
|
||||
ldrb r0, [r6, 0x4]
|
||||
@@ -307,7 +307,7 @@ _08003424:
|
||||
str r4, [r0]
|
||||
adds r0, r7, 0
|
||||
adds r1, r4, 0
|
||||
bl SetBgTilemap
|
||||
bl SetBgTilemapBuffer
|
||||
_08003432:
|
||||
mov r2, r8
|
||||
ldrb r1, [r2, 0x3]
|
||||
@@ -1042,7 +1042,7 @@ BlitBitmapToWindow: ; 80039A4
|
||||
thumb_func_end BlitBitmapToWindow
|
||||
|
||||
thumb_func_start BlitBitmapRectToWindow
|
||||
; void BlitBitmapRectToWindow(u8 rbox_id, u8 *pixels, u16 srcX, u16 srcY, u16 srcWidth, int srcHeight, u16 destX, u16 destY, u16 rectWidth, u16 rectHeight)
|
||||
; void BlitBitmapRectToWindow(u8 windowId, u8 *pixels, u16 srcX, u16 srcY, u16 srcWidth, int srcHeight, u16 destX, u16 destY, u16 rectWidth, u16 rectHeight)
|
||||
BlitBitmapRectToWindow: ; 80039DC
|
||||
push {r4-r7,lr}
|
||||
mov r7, r10
|
||||
@@ -1347,7 +1347,7 @@ _08003C3C:
|
||||
thumb_func_end CopyToWindowPixelBuffer
|
||||
|
||||
thumb_func_start FillWindowPixelBuffer
|
||||
; void FillWindowPixelBuffer(u8 rbox_id, u32 fillValue)
|
||||
; void FillWindowPixelBuffer(u8 windowId, u32 fillValue)
|
||||
FillWindowPixelBuffer: ; 8003C48
|
||||
push {r4,r5,lr}
|
||||
sub sp, 0x4
|
||||
@@ -1955,7 +1955,7 @@ CallWindowFunction: ; 8004058
|
||||
thumb_func_end CallWindowFunction
|
||||
|
||||
thumb_func_start SetWindowAttribute
|
||||
; BOOL SetWindowAttribute(u8 windowId, u8 attributeId, u32 value)
|
||||
; bool8 SetWindowAttribute(u8 windowId, u8 attributeId, u32 value)
|
||||
SetWindowAttribute: ; 80040A8
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
@@ -2247,7 +2247,7 @@ _080042DC:
|
||||
str r4, [r0]
|
||||
adds r0, r7, 0
|
||||
adds r1, r4, 0
|
||||
bl SetBgTilemap
|
||||
bl SetBgTilemapBuffer
|
||||
_080042EA:
|
||||
mov r2, r9
|
||||
ldrb r1, [r2, 0x3]
|
||||
|
||||
Reference in New Issue
Block a user