mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2024-12-26 03:34:15 +01:00
update graphics function disasm
This commit is contained in:
YamaArashi
parent
4339dc18fc
commit
fe1076d42c
8711
asm/emerald.s
8711
asm/emerald.s
File diff suppressed because it is too large
Load Diff
124
asm/gpu_bg.s
124
asm/gpu_bg.s
@ -2,7 +2,7 @@
|
||||
; void ResetBgs()
|
||||
ResetBgs: ; 80012F0
|
||||
push {lr}
|
||||
bl ResetWramBgControlStructs
|
||||
bl ResetBgControlStructs
|
||||
ldr r1, =0x030008e0
|
||||
movs r0, 0
|
||||
strh r0, [r1, 0x10]
|
||||
@ -38,12 +38,12 @@ GetBgMode: ; 8001324
|
||||
.pool
|
||||
thumb_func_end GetBgMode
|
||||
|
||||
thumb_func_start ResetWramBgControlStructs
|
||||
; void ResetWramBgControlStructs()
|
||||
ResetWramBgControlStructs: ; 8001334
|
||||
thumb_func_start ResetBgControlStructs
|
||||
; void ResetBgControlStructs()
|
||||
ResetBgControlStructs: ; 8001334
|
||||
push {lr}
|
||||
ldr r2, =0x030008e0
|
||||
ldr r0, =gBgConfigZeroValue
|
||||
ldr r0, =gZeroedBgControlStruct
|
||||
ldr r0, [r0]
|
||||
adds r1, r2, 0
|
||||
adds r1, 0xC
|
||||
@ -55,11 +55,11 @@ ResetWramBgControlStructs: ; 8001334
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end ResetWramBgControlStructs
|
||||
thumb_func_end ResetBgControlStructs
|
||||
|
||||
thumb_func_start Unused_ResetWramBgControlStruct
|
||||
; void Unused_ResetWramBgControlStruct(u8 bg)
|
||||
Unused_ResetWramBgControlStruct: ; 8001354
|
||||
thumb_func_start Unused_ResetBgControlStruct
|
||||
; void Unused_ResetBgControlStruct(u8 bg)
|
||||
Unused_ResetBgControlStruct: ; 8001354
|
||||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
@ -71,7 +71,7 @@ Unused_ResetWramBgControlStruct: ; 8001354
|
||||
ldr r1, =0x030008e0
|
||||
lsls r0, r4, 2
|
||||
adds r0, r1
|
||||
ldr r1, =gBgConfigZeroValue
|
||||
ldr r1, =gZeroedBgControlStruct
|
||||
ldr r1, [r1]
|
||||
str r1, [r0]
|
||||
@08001372:
|
||||
@ -79,7 +79,7 @@ Unused_ResetWramBgControlStruct: ; 8001354
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end Unused_ResetWramBgControlStruct
|
||||
thumb_func_end Unused_ResetBgControlStruct
|
||||
|
||||
thumb_func_start SetBgControlAttributes
|
||||
; void SetBgControlAttributes(u8 bg, u8 tilesBaseBlock, u8 tileMapBaseBlock, u8 screenSize, u8 paletteMode, u8 priority, u8 mosaic, u8 wraparound)
|
||||
@ -696,7 +696,7 @@ InitBgsFromTemplates: ; 80017E8
|
||||
lsls r2, 24
|
||||
lsrs r4, r2, 24
|
||||
bl SetBgModeInternal
|
||||
bl ResetWramBgControlStructs
|
||||
bl ResetBgControlStructs
|
||||
cmp r4, 0
|
||||
beq @08001894
|
||||
movs r7, 0
|
||||
@ -949,9 +949,9 @@ LoadBgTiles: ; 8001944
|
||||
.pool
|
||||
thumb_func_end LoadBgTiles
|
||||
|
||||
thumb_func_start LoadBgTileMap
|
||||
; u8 LoadBgTileMap(u8 bg, void *src, u16 size, u16 destOffset)
|
||||
LoadBgTileMap: ; 80019FC
|
||||
thumb_func_start LoadBgTilemap
|
||||
; u8 LoadBgTilemap(u8 bg, void *src, u16 size, u16 destOffset)
|
||||
LoadBgTilemap: ; 80019FC
|
||||
push {r4,lr}
|
||||
sub sp, 0x4
|
||||
lsls r0, 24
|
||||
@ -989,7 +989,7 @@ LoadBgTileMap: ; 80019FC
|
||||
pop {r1}
|
||||
bx r1
|
||||
.pool
|
||||
thumb_func_end LoadBgTileMap
|
||||
thumb_func_end LoadBgTilemap
|
||||
|
||||
thumb_func_start Unused_LoadBgPalette
|
||||
; u8 Unused_LoadBgPalette(u8 bg, void *src, u16 size, u16 destOffset)
|
||||
@ -2038,9 +2038,9 @@ Unused_AdjustBgMosaic: ; 8002170
|
||||
bx r1
|
||||
thumb_func_end Unused_AdjustBgMosaic
|
||||
|
||||
thumb_func_start SetBgTileMap
|
||||
; void SetBgTileMap(u8 bg, void *tileMap)
|
||||
SetBgTileMap: ; 8002250
|
||||
thumb_func_start SetBgTilemap
|
||||
; void SetBgTilemap(u8 bg, void *tilemap)
|
||||
SetBgTilemap: ; 8002250
|
||||
push {r4,r5,lr}
|
||||
adds r5, r1, 0
|
||||
lsls r0, 24
|
||||
@ -2065,11 +2065,11 @@ SetBgTileMap: ; 8002250
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end SetBgTileMap
|
||||
thumb_func_end SetBgTilemap
|
||||
|
||||
thumb_func_start UnsetBgTileMap
|
||||
; void UnsetBgTileMap(u8 bg)
|
||||
UnsetBgTileMap: ; 8002284
|
||||
thumb_func_start UnsetBgTilemap
|
||||
; void UnsetBgTilemap(u8 bg)
|
||||
UnsetBgTilemap: ; 8002284
|
||||
push {r4,r5,lr}
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
@ -2094,11 +2094,11 @@ UnsetBgTileMap: ; 8002284
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end UnsetBgTileMap
|
||||
thumb_func_end UnsetBgTilemap
|
||||
|
||||
thumb_func_start GetBgTileMap
|
||||
; void *GetBgTileMap(u8 bg)
|
||||
GetBgTileMap: ; 80022B8
|
||||
thumb_func_start GetBgTilemap
|
||||
; void *GetBgTilemap(u8 bg)
|
||||
GetBgTilemap: ; 80022B8
|
||||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
@ -2125,11 +2125,11 @@ GetBgTileMap: ; 80022B8
|
||||
pop {r4}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end GetBgTileMap
|
||||
thumb_func_end GetBgTilemap
|
||||
|
||||
thumb_func_start CopyToBgTileMapBuffer
|
||||
; void CopyToBgTileMapBuffer(u8 bg, void *src, u16 mode, u16 destOffset)
|
||||
CopyToBgTileMapBuffer: ; 80022F0
|
||||
thumb_func_start CopyToBgTilemapBuffer
|
||||
; void CopyToBgTilemapBuffer(u8 bg, void *src, u16 mode, u16 destOffset)
|
||||
CopyToBgTilemapBuffer: ; 80022F0
|
||||
push {r4-r7,lr}
|
||||
mov r7, r10
|
||||
mov r6, r9
|
||||
@ -2187,11 +2187,11 @@ CopyToBgTileMapBuffer: ; 80022F0
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end CopyToBgTileMapBuffer
|
||||
thumb_func_end CopyToBgTilemapBuffer
|
||||
|
||||
thumb_func_start CopyBgTileMapBufferToVram
|
||||
; void CopyBgTileMapBufferToVram(u8 bg)
|
||||
CopyBgTileMapBufferToVram: ; 800236C
|
||||
thumb_func_start CopyBgTilemapBufferToVram
|
||||
; void CopyBgTilemapBufferToVram(u8 bg)
|
||||
CopyBgTilemapBufferToVram: ; 800236C
|
||||
push {r4,lr}
|
||||
sub sp, 0x4
|
||||
lsls r0, 24
|
||||
@ -2242,11 +2242,11 @@ CopyBgTileMapBufferToVram: ; 800236C
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end CopyBgTileMapBufferToVram
|
||||
thumb_func_end CopyBgTilemapBufferToVram
|
||||
|
||||
thumb_func_start CopyToBgTileMapBufferRect
|
||||
; void CopyToBgTileMapBufferRect(u8 bg, void *src, u8 destX, u8 destY, u8 width, u8 height)
|
||||
CopyToBgTileMapBufferRect: ; 80023D4
|
||||
thumb_func_start CopyToBgTilemapBufferRect
|
||||
; void CopyToBgTilemapBufferRect(u8 bg, void *src, u8 destX, u8 destY, u8 width, u8 height)
|
||||
CopyToBgTilemapBufferRect: ; 80023D4
|
||||
push {r4-r7,lr}
|
||||
mov r7, r10
|
||||
mov r6, r9
|
||||
@ -2379,11 +2379,11 @@ CopyToBgTileMapBufferRect: ; 80023D4
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end CopyToBgTileMapBufferRect
|
||||
thumb_func_end CopyToBgTilemapBufferRect
|
||||
|
||||
thumb_func_start CopyToBgTileMapBufferRect_ChangePalette
|
||||
; void CopyToBgTileMapBufferRect_ChangePalette(u8 bg, void *src, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette)
|
||||
CopyToBgTileMapBufferRect_ChangePalette: ; 80024D8
|
||||
thumb_func_start CopyToBgTilemapBufferRect_ChangePalette
|
||||
; void CopyToBgTilemapBufferRect_ChangePalette(u8 bg, void *src, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette)
|
||||
CopyToBgTilemapBufferRect_ChangePalette: ; 80024D8
|
||||
push {r4-r6,lr}
|
||||
sub sp, 0x24
|
||||
ldr r4, [sp, 0x34]
|
||||
@ -2412,16 +2412,16 @@ CopyToBgTileMapBufferRect_ChangePalette: ; 80024D8
|
||||
str r2, [sp, 0x1C]
|
||||
str r2, [sp, 0x20]
|
||||
movs r3, 0
|
||||
bl CopyRectToBgTileMapBufferRect
|
||||
bl CopyRectToBgTilemapBufferRect
|
||||
add sp, 0x24
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end CopyToBgTileMapBufferRect_ChangePalette
|
||||
thumb_func_end CopyToBgTilemapBufferRect_ChangePalette
|
||||
|
||||
thumb_func_start CopyRectToBgTileMapBufferRect
|
||||
; void CopyRectToBgTileMapBufferRect(u8 bg, void *src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette1, u16 tileOffset, u16 palette2)
|
||||
CopyRectToBgTileMapBufferRect: ; 800251C
|
||||
thumb_func_start CopyRectToBgTilemapBufferRect
|
||||
; void CopyRectToBgTilemapBufferRect(u8 bg, void *src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette1, u16 tileOffset, u16 palette2)
|
||||
CopyRectToBgTilemapBufferRect: ; 800251C
|
||||
push {r4-r7,lr}
|
||||
mov r7, r10
|
||||
mov r6, r9
|
||||
@ -2665,11 +2665,11 @@ CopyRectToBgTileMapBufferRect: ; 800251C
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end CopyRectToBgTileMapBufferRect
|
||||
thumb_func_end CopyRectToBgTilemapBufferRect
|
||||
|
||||
thumb_func_start FillBgTileMapBufferRect_Palette0
|
||||
; void FillBgTileMapBufferRect_Palette0(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height)
|
||||
FillBgTileMapBufferRect_Palette0: ; 8002704
|
||||
thumb_func_start FillBgTilemapBufferRect_Palette0
|
||||
; void FillBgTilemapBufferRect_Palette0(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height)
|
||||
FillBgTilemapBufferRect_Palette0: ; 8002704
|
||||
push {r4-r7,lr}
|
||||
mov r7, r10
|
||||
mov r6, r9
|
||||
@ -2800,11 +2800,11 @@ FillBgTileMapBufferRect_Palette0: ; 8002704
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end FillBgTileMapBufferRect_Palette0
|
||||
thumb_func_end FillBgTilemapBufferRect_Palette0
|
||||
|
||||
thumb_func_start FillBgTileMapBufferRect
|
||||
; void FillBgTileMapBufferRect(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height, u8 palette)
|
||||
FillBgTileMapBufferRect: ; 8002804
|
||||
thumb_func_start FillBgTilemapBufferRect
|
||||
; void FillBgTilemapBufferRect(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height, u8 palette)
|
||||
FillBgTilemapBufferRect: ; 8002804
|
||||
push {r4-r6,lr}
|
||||
sub sp, 0x10
|
||||
ldr r4, [sp, 0x20]
|
||||
@ -2829,16 +2829,16 @@ FillBgTileMapBufferRect: ; 8002804
|
||||
str r6, [sp, 0x8]
|
||||
movs r4, 0
|
||||
str r4, [sp, 0xC]
|
||||
bl WriteSequenceToBgTileMapBuffer
|
||||
bl WriteSequenceToBgTilemapBuffer
|
||||
add sp, 0x10
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end FillBgTileMapBufferRect
|
||||
thumb_func_end FillBgTilemapBufferRect
|
||||
|
||||
thumb_func_start WriteSequenceToBgTileMapBuffer
|
||||
; void WriteSequenceToBgTileMapBuffer(u8 bg, u16 firstTileNum, u8 x, u8 y, u8 width, u8 height, u8 paletteSlot, u16 tileNumDelta)
|
||||
WriteSequenceToBgTileMapBuffer: ; 8002840
|
||||
thumb_func_start WriteSequenceToBgTilemapBuffer
|
||||
; void WriteSequenceToBgTilemapBuffer(u8 bg, u16 firstTileNum, u8 x, u8 y, u8 width, u8 height, u8 paletteSlot, u16 tileNumDelta)
|
||||
WriteSequenceToBgTilemapBuffer: ; 8002840
|
||||
push {r4-r7,lr}
|
||||
mov r7, r10
|
||||
mov r6, r9
|
||||
@ -3048,7 +3048,7 @@ WriteSequenceToBgTileMapBuffer: ; 8002840
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end WriteSequenceToBgTileMapBuffer
|
||||
thumb_func_end WriteSequenceToBgTilemapBuffer
|
||||
|
||||
thumb_func_start GetBgMetricTextMode
|
||||
; u16 GetBgMetricTextMode(u8 bg, u8 whichMetric)
|
||||
|
||||
693
asm/gpu_obj.s
693
asm/gpu_obj.s
File diff suppressed because it is too large
Load Diff
@ -91,7 +91,7 @@ Main:
|
||||
bne @080004B2
|
||||
movs r0, 0
|
||||
strh r0, [r7, 0x2E]
|
||||
bl copy_queue_clear
|
||||
bl ClearObjectCopyRequests
|
||||
strb r4, [r5]
|
||||
bl HandleLinkConnectionAndCallMainCallbacks
|
||||
mov r2, r8
|
||||
|
||||
116
asm/main_menu.s
116
asm/main_menu.s
@ -3,8 +3,8 @@
|
||||
CB2_MainMenu: ; 802F6B0
|
||||
push {lr}
|
||||
bl run_active_tasks
|
||||
bl call_obj_callbacks
|
||||
bl obj_sync_something
|
||||
bl CallObjectCallbacks
|
||||
bl PrepareSpritesForOamLoad
|
||||
bl fade_and_return_progress_probably
|
||||
pop {r0}
|
||||
bx r0
|
||||
@ -14,8 +14,8 @@ CB2_MainMenu: ; 802F6B0
|
||||
; void VBlankCB_MainMenu()
|
||||
VBlankCB_MainMenu: ; 802F6C8
|
||||
push {lr}
|
||||
bl copy_super_sprites_to_oam
|
||||
bl copy_queue_process
|
||||
bl LoadOamFromSprites
|
||||
bl ProcessObjectCopyRequests
|
||||
bl copy_pal_bg_faded_to_pal_ram
|
||||
pop {r0}
|
||||
bx r0
|
||||
@ -122,8 +122,8 @@ InitMainMenu: ; 802F6F4
|
||||
bl gpu_pal_apply
|
||||
bl remove_some_task
|
||||
bl clear_tasks
|
||||
bl reset_all_obj_data
|
||||
bl gpu_pal_allocator_reset
|
||||
bl ResetAllObjectData
|
||||
bl ResetObjectPaletteAllocator
|
||||
cmp r4, 0
|
||||
beq @0802F7EC
|
||||
movs r0, 0x1
|
||||
@ -421,7 +421,7 @@ Task_WaitForSaveFileErrorWindow: ; 802FA5C
|
||||
cmp r0, 0
|
||||
beq @0802FA98
|
||||
movs r0, 0x7
|
||||
bl ClearWindowTileMap
|
||||
bl ClearWindowTilemap
|
||||
ldr r0, =gUnknown_082FF070
|
||||
bl sub_8032250
|
||||
ldr r1, =0x03005e00
|
||||
@ -523,7 +523,7 @@ Task_WaitForBatteryDryErrorWindow: ; 802FB50
|
||||
cmp r0, 0
|
||||
beq @0802FB8C
|
||||
movs r0, 0x7
|
||||
bl ClearWindowTileMap
|
||||
bl ClearWindowTilemap
|
||||
ldr r0, =gUnknown_082FF070
|
||||
bl sub_8032250
|
||||
ldr r1, =0x03005e00
|
||||
@ -689,9 +689,9 @@ Task_DisplayMainMenu: ; 802FBA4
|
||||
movs r3, 0x1
|
||||
bl box_print
|
||||
movs r0, 0
|
||||
bl PutWindowTileMap
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0x1
|
||||
bl PutWindowTileMap
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0
|
||||
movs r1, 0x2
|
||||
bl CopyWindowToVram
|
||||
@ -748,11 +748,11 @@ Task_DisplayMainMenu: ; 802FBA4
|
||||
bl box_print
|
||||
bl fmt_savegame
|
||||
movs r0, 0x2
|
||||
bl PutWindowTileMap
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0x3
|
||||
bl PutWindowTileMap
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0x4
|
||||
bl PutWindowTileMap
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0x2
|
||||
movs r1, 0x2
|
||||
bl CopyWindowToVram
|
||||
@ -828,13 +828,13 @@ Task_DisplayMainMenu: ; 802FBA4
|
||||
bl box_print
|
||||
bl fmt_savegame
|
||||
movs r0, 0x2
|
||||
bl PutWindowTileMap
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0x3
|
||||
bl PutWindowTileMap
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0x4
|
||||
bl PutWindowTileMap
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0x5
|
||||
bl PutWindowTileMap
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0x2
|
||||
movs r1, 0x2
|
||||
bl CopyWindowToVram
|
||||
@ -933,15 +933,15 @@ Task_DisplayMainMenu: ; 802FBA4
|
||||
bl box_print
|
||||
bl fmt_savegame
|
||||
movs r0, 0x2
|
||||
bl PutWindowTileMap
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0x3
|
||||
bl PutWindowTileMap
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0x4
|
||||
bl PutWindowTileMap
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0x5
|
||||
bl PutWindowTileMap
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0x6
|
||||
bl PutWindowTileMap
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0x2
|
||||
movs r1, 0x2
|
||||
bl CopyWindowToVram
|
||||
@ -1649,7 +1649,7 @@ Task_DisplayMainMenuInvalidActionError: ; 80305A4
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
movs r3, 0
|
||||
bl FillBgTileMapBufferRect_Palette0
|
||||
bl FillBgTilemapBufferRect_Palette0
|
||||
movs r1, 0x8
|
||||
ldrsh r0, [r4, r1]
|
||||
cmp r0, 0x1
|
||||
@ -1923,8 +1923,8 @@ task_new_game_prof_birch_speech_1: ; 80307B0
|
||||
movs r2, 0x10
|
||||
bl gpu_pal_apply
|
||||
bl remove_some_task
|
||||
bl reset_all_obj_data
|
||||
bl gpu_pal_allocator_reset
|
||||
bl ResetAllObjectData
|
||||
bl ResetObjectPaletteAllocator
|
||||
bl dp13_810BB8C
|
||||
adds r0, r4, 0
|
||||
bl AddBirchSpeechObjects
|
||||
@ -2073,7 +2073,7 @@ task_new_game_prof_birch_speech_3: ; 8030928
|
||||
movs r1, 0x1
|
||||
bl unknown_rbox_to_vram
|
||||
movs r0, 0
|
||||
bl PutWindowTileMap
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0
|
||||
movs r1, 0x2
|
||||
bl CopyWindowToVram
|
||||
@ -3702,8 +3702,8 @@ new_game_prof_birch_speech_part2_start: ; 8031678
|
||||
ldr r0, =0x0000ffc4
|
||||
strh r0, [r4, 0x10]
|
||||
bl remove_some_task
|
||||
bl reset_all_obj_data
|
||||
bl gpu_pal_allocator_reset
|
||||
bl ResetAllObjectData
|
||||
bl ResetObjectPaletteAllocator
|
||||
bl dp13_810BB8C
|
||||
adds r0, r5, 0
|
||||
bl AddBirchSpeechObjects
|
||||
@ -3800,7 +3800,7 @@ new_game_prof_birch_speech_part2_start: ; 8031678
|
||||
movs r2, 0xF0
|
||||
bl copy_textbox_border_tile_patterns_to_vram
|
||||
movs r0, 0
|
||||
bl PutWindowTileMap
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0
|
||||
movs r1, 0x3
|
||||
bl CopyWindowToVram
|
||||
@ -4421,7 +4421,7 @@ sub_8031D74: ; 8031D74
|
||||
movs r2, 0
|
||||
bl InitMenuInUpperLeftCornerPlaySoundWhenAPressed
|
||||
movs r0, 0x1
|
||||
bl PutWindowTileMap
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0x1
|
||||
movs r1, 0x3
|
||||
bl CopyWindowToVram
|
||||
@ -4504,7 +4504,7 @@ CreateMainMenuErrorWindow: ; 8031E18
|
||||
movs r3, 0
|
||||
bl Print
|
||||
movs r0, 0x7
|
||||
bl PutWindowTileMap
|
||||
bl PutWindowTilemap
|
||||
movs r0, 0x7
|
||||
movs r1, 0x2
|
||||
bl CopyWindowToVram
|
||||
@ -4858,7 +4858,7 @@ DrawMainMenuWindowFrame: ; 80320EC
|
||||
movs r7, 0x2
|
||||
mov r8, r7
|
||||
str r7, [sp, 0x8]
|
||||
bl FillBgTileMapBufferRect
|
||||
bl FillBgTilemapBufferRect
|
||||
ldrb r0, [r4]
|
||||
ldrb r2, [r4, 0x1]
|
||||
ldrb r3, [r4, 0x2]
|
||||
@ -4870,7 +4870,7 @@ DrawMainMenuWindowFrame: ; 80320EC
|
||||
str r5, [sp, 0x4]
|
||||
str r7, [sp, 0x8]
|
||||
mov r1, r9
|
||||
bl FillBgTileMapBufferRect
|
||||
bl FillBgTilemapBufferRect
|
||||
ldrb r0, [r4]
|
||||
ldrb r2, [r4, 0x3]
|
||||
ldrb r1, [r4, 0x1]
|
||||
@ -4885,7 +4885,7 @@ DrawMainMenuWindowFrame: ; 80320EC
|
||||
str r5, [sp, 0x4]
|
||||
str r7, [sp, 0x8]
|
||||
mov r1, r10
|
||||
bl FillBgTileMapBufferRect
|
||||
bl FillBgTilemapBufferRect
|
||||
ldrb r0, [r4]
|
||||
ldrb r2, [r4, 0x1]
|
||||
subs r2, 0x1
|
||||
@ -4897,7 +4897,7 @@ DrawMainMenuWindowFrame: ; 80320EC
|
||||
str r1, [sp, 0x4]
|
||||
str r7, [sp, 0x8]
|
||||
ldr r1, [sp, 0x18]
|
||||
bl FillBgTileMapBufferRect
|
||||
bl FillBgTilemapBufferRect
|
||||
ldrb r0, [r4]
|
||||
ldrb r2, [r4, 0x3]
|
||||
ldrb r7, [r4, 0x1]
|
||||
@ -4911,7 +4911,7 @@ DrawMainMenuWindowFrame: ; 80320EC
|
||||
mov r1, r8
|
||||
str r1, [sp, 0x8]
|
||||
ldr r1, [sp, 0xC]
|
||||
bl FillBgTileMapBufferRect
|
||||
bl FillBgTilemapBufferRect
|
||||
ldrb r0, [r4]
|
||||
ldrb r2, [r4, 0x1]
|
||||
subs r2, 0x1
|
||||
@ -4927,7 +4927,7 @@ DrawMainMenuWindowFrame: ; 80320EC
|
||||
mov r1, r8
|
||||
str r1, [sp, 0x8]
|
||||
ldr r1, [sp, 0x10]
|
||||
bl FillBgTileMapBufferRect
|
||||
bl FillBgTilemapBufferRect
|
||||
ldrb r0, [r4]
|
||||
ldrb r2, [r4, 0x1]
|
||||
ldrb r3, [r4, 0x4]
|
||||
@ -4941,7 +4941,7 @@ DrawMainMenuWindowFrame: ; 80320EC
|
||||
mov r1, r8
|
||||
str r1, [sp, 0x8]
|
||||
ldr r1, [sp, 0x14]
|
||||
bl FillBgTileMapBufferRect
|
||||
bl FillBgTilemapBufferRect
|
||||
ldrb r0, [r4]
|
||||
ldrb r2, [r4, 0x3]
|
||||
ldrb r7, [r4, 0x1]
|
||||
@ -4958,9 +4958,9 @@ DrawMainMenuWindowFrame: ; 80320EC
|
||||
mov r7, r8
|
||||
str r7, [sp, 0x8]
|
||||
adds r1, r6, 0
|
||||
bl FillBgTileMapBufferRect
|
||||
bl FillBgTilemapBufferRect
|
||||
ldrb r0, [r4]
|
||||
bl CopyBgTileMapBufferToVram
|
||||
bl CopyBgTilemapBufferToVram
|
||||
add sp, 0x1C
|
||||
pop {r3-r5}
|
||||
mov r8, r3
|
||||
@ -5000,9 +5000,9 @@ sub_8032250: ; 8032250
|
||||
movs r1, 0x2
|
||||
str r1, [sp, 0x8]
|
||||
movs r1, 0
|
||||
bl FillBgTileMapBufferRect
|
||||
bl FillBgTilemapBufferRect
|
||||
ldrb r0, [r6]
|
||||
bl CopyBgTileMapBufferToVram
|
||||
bl CopyBgTilemapBufferToVram
|
||||
add sp, 0xC
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
@ -5041,7 +5041,7 @@ sub_8032298: ; 8032298
|
||||
movs r1, 0
|
||||
adds r2, r4, 0
|
||||
adds r3, r5, 0
|
||||
bl FillBgTileMapBufferRect
|
||||
bl FillBgTilemapBufferRect
|
||||
add sp, 0xC
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
@ -5063,7 +5063,7 @@ sub_80322E0: ; 80322E0
|
||||
movs r1, 0x11
|
||||
bl FillWindowPixelBuffer
|
||||
adds r0, r5, 0
|
||||
bl ClearWindowTileMap
|
||||
bl ClearWindowTilemap
|
||||
cmp r4, 0x1
|
||||
bne @0803230E
|
||||
adds r0, r5, 0
|
||||
@ -5236,7 +5236,7 @@ unknown_rbox_to_vram: ; 803243C
|
||||
movs r1, 0x11
|
||||
bl FillWindowPixelBuffer
|
||||
adds r0, r5, 0
|
||||
bl PutWindowTileMap
|
||||
bl PutWindowTilemap
|
||||
cmp r4, 0x1
|
||||
bne @0803246A
|
||||
adds r0, r5, 0
|
||||
@ -5298,7 +5298,7 @@ sub_8032474: ; 8032474
|
||||
movs r1, 0xFD
|
||||
ldr r2, [sp, 0x14]
|
||||
adds r3, r5, 0
|
||||
bl FillBgTileMapBufferRect
|
||||
bl FillBgTilemapBufferRect
|
||||
ldr r0, [sp, 0xC]
|
||||
subs r0, 0x1
|
||||
lsls r2, r0, 24
|
||||
@ -5310,7 +5310,7 @@ sub_8032474: ; 8032474
|
||||
mov r0, r8
|
||||
movs r1, 0xFF
|
||||
adds r3, r5, 0
|
||||
bl FillBgTileMapBufferRect
|
||||
bl FillBgTilemapBufferRect
|
||||
movs r1, 0x80
|
||||
lsls r1, 1
|
||||
mov r0, r9
|
||||
@ -5320,7 +5320,7 @@ sub_8032474: ; 8032474
|
||||
mov r0, r8
|
||||
ldr r2, [sp, 0xC]
|
||||
adds r3, r5, 0
|
||||
bl FillBgTileMapBufferRect
|
||||
bl FillBgTilemapBufferRect
|
||||
ldr r1, =0x00000101
|
||||
ldr r7, [sp, 0xC]
|
||||
add r7, r9
|
||||
@ -5333,7 +5333,7 @@ sub_8032474: ; 8032474
|
||||
str r6, [sp, 0x8]
|
||||
mov r0, r8
|
||||
adds r3, r5, 0
|
||||
bl FillBgTileMapBufferRect
|
||||
bl FillBgTilemapBufferRect
|
||||
movs r1, 0x81
|
||||
lsls r1, 1
|
||||
lsls r2, r7, 24
|
||||
@ -5344,7 +5344,7 @@ sub_8032474: ; 8032474
|
||||
mov r0, r8
|
||||
adds r2, r7, 0
|
||||
adds r3, r5, 0
|
||||
bl FillBgTileMapBufferRect
|
||||
bl FillBgTilemapBufferRect
|
||||
ldr r1, =0x00000103
|
||||
str r4, [sp]
|
||||
movs r5, 0x5
|
||||
@ -5353,7 +5353,7 @@ sub_8032474: ; 8032474
|
||||
mov r0, r8
|
||||
ldr r2, [sp, 0x14]
|
||||
mov r3, r10
|
||||
bl FillBgTileMapBufferRect
|
||||
bl FillBgTilemapBufferRect
|
||||
ldr r1, =0x00000105
|
||||
mov r0, r9
|
||||
adds r0, 0x1
|
||||
@ -5365,7 +5365,7 @@ sub_8032474: ; 8032474
|
||||
mov r0, r8
|
||||
ldr r2, [sp, 0x18]
|
||||
mov r3, r10
|
||||
bl FillBgTileMapBufferRect
|
||||
bl FillBgTilemapBufferRect
|
||||
movs r1, 0x83
|
||||
lsls r1, 1
|
||||
str r4, [sp]
|
||||
@ -5374,7 +5374,7 @@ sub_8032474: ; 8032474
|
||||
mov r0, r8
|
||||
adds r2, r7, 0
|
||||
mov r3, r10
|
||||
bl FillBgTileMapBufferRect
|
||||
bl FillBgTilemapBufferRect
|
||||
ldr r1, =0x000008fd
|
||||
ldr r2, [sp, 0x10]
|
||||
add r10, r2
|
||||
@ -5388,7 +5388,7 @@ sub_8032474: ; 8032474
|
||||
mov r0, r8
|
||||
ldr r2, [sp, 0x14]
|
||||
mov r3, r10
|
||||
bl FillBgTileMapBufferRect
|
||||
bl FillBgTilemapBufferRect
|
||||
ldr r1, =0x000008ff
|
||||
str r4, [sp]
|
||||
str r4, [sp, 0x4]
|
||||
@ -5396,7 +5396,7 @@ sub_8032474: ; 8032474
|
||||
mov r0, r8
|
||||
ldr r2, [sp, 0x18]
|
||||
mov r3, r10
|
||||
bl FillBgTileMapBufferRect
|
||||
bl FillBgTilemapBufferRect
|
||||
movs r1, 0x90
|
||||
lsls r1, 4
|
||||
movs r2, 0x1
|
||||
@ -5411,7 +5411,7 @@ sub_8032474: ; 8032474
|
||||
mov r0, r8
|
||||
ldr r2, [sp, 0xC]
|
||||
mov r3, r10
|
||||
bl FillBgTileMapBufferRect
|
||||
bl FillBgTilemapBufferRect
|
||||
ldr r1, =0x00000901
|
||||
str r4, [sp]
|
||||
str r4, [sp, 0x4]
|
||||
@ -5419,7 +5419,7 @@ sub_8032474: ; 8032474
|
||||
mov r0, r8
|
||||
ldr r2, [sp, 0x1C]
|
||||
mov r3, r10
|
||||
bl FillBgTileMapBufferRect
|
||||
bl FillBgTilemapBufferRect
|
||||
ldr r1, =0x00000902
|
||||
str r4, [sp]
|
||||
str r4, [sp, 0x4]
|
||||
@ -5427,7 +5427,7 @@ sub_8032474: ; 8032474
|
||||
mov r0, r8
|
||||
adds r2, r7, 0
|
||||
mov r3, r10
|
||||
bl FillBgTileMapBufferRect
|
||||
bl FillBgTilemapBufferRect
|
||||
add sp, 0x20
|
||||
pop {r3-r5}
|
||||
mov r8, r3
|
||||
|
||||
60
asm/window.s
60
asm/window.s
@ -20,7 +20,7 @@ InitWindows: ; 80031C0
|
||||
mov r1, r8
|
||||
lsls r0, r1, 24
|
||||
lsrs r0, 24
|
||||
bl GetBgTileMap
|
||||
bl GetBgTilemap
|
||||
cmp r0, 0
|
||||
beq @080031E4
|
||||
ldr r0, =nullsub_8
|
||||
@ -129,7 +129,7 @@ InitWindows: ; 80031C0
|
||||
str r4, [r0]
|
||||
adds r0, r7, 0
|
||||
adds r1, r4, 0
|
||||
bl SetBgTileMap
|
||||
bl SetBgTilemap
|
||||
@080032CA:
|
||||
ldrb r1, [r6, 0x3]
|
||||
ldrb r0, [r6, 0x4]
|
||||
@ -307,7 +307,7 @@ AddWindow: ; 8003380
|
||||
str r4, [r0]
|
||||
adds r0, r7, 0
|
||||
adds r1, r4, 0
|
||||
bl SetBgTileMap
|
||||
bl SetBgTilemap
|
||||
@08003432:
|
||||
mov r2, r8
|
||||
ldrb r1, [r2, 0x3]
|
||||
@ -610,7 +610,7 @@ CopyWindowToVram: ; 8003658
|
||||
@0800369A:
|
||||
mov r0, sp
|
||||
ldrb r0, [r0]
|
||||
bl CopyBgTileMapBufferToVram
|
||||
bl CopyBgTilemapBufferToVram
|
||||
b @080036CE
|
||||
@080036A4:
|
||||
mov r0, sp
|
||||
@ -631,7 +631,7 @@ CopyWindowToVram: ; 8003658
|
||||
bl LoadBgTiles
|
||||
mov r0, sp
|
||||
ldrb r0, [r0]
|
||||
bl CopyBgTileMapBufferToVram
|
||||
bl CopyBgTilemapBufferToVram
|
||||
@080036CE:
|
||||
add sp, 0xC
|
||||
pop {r4-r6}
|
||||
@ -692,7 +692,7 @@ CopyWindowRectToVram: ; 80036D8
|
||||
@08003736:
|
||||
mov r0, sp
|
||||
ldrb r0, [r0]
|
||||
bl CopyBgTileMapBufferToVram
|
||||
bl CopyBgTilemapBufferToVram
|
||||
b @08003782
|
||||
@08003740:
|
||||
mov r0, sp
|
||||
@ -725,7 +725,7 @@ CopyWindowRectToVram: ; 80036D8
|
||||
bl LoadBgTiles
|
||||
mov r0, sp
|
||||
ldrb r0, [r0]
|
||||
bl CopyBgTileMapBufferToVram
|
||||
bl CopyBgTilemapBufferToVram
|
||||
@08003782:
|
||||
add sp, 0xC
|
||||
pop {r4-r7}
|
||||
@ -733,9 +733,9 @@ CopyWindowRectToVram: ; 80036D8
|
||||
bx r0
|
||||
thumb_func_end CopyWindowRectToVram
|
||||
|
||||
thumb_func_start PutWindowTileMap
|
||||
; void PutWindowTileMap(u8 windowId)
|
||||
PutWindowTileMap: ; 800378C
|
||||
thumb_func_start PutWindowTilemap
|
||||
; void PutWindowTilemap(u8 windowId)
|
||||
PutWindowTilemap: ; 800378C
|
||||
push {r4,lr}
|
||||
sub sp, 0x1C
|
||||
lsls r0, 24
|
||||
@ -775,17 +775,17 @@ PutWindowTileMap: ; 800378C
|
||||
str r4, [sp, 0x8]
|
||||
movs r4, 0x1
|
||||
str r4, [sp, 0xC]
|
||||
bl WriteSequenceToBgTileMapBuffer
|
||||
bl WriteSequenceToBgTilemapBuffer
|
||||
add sp, 0x1C
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end PutWindowTileMap
|
||||
thumb_func_end PutWindowTilemap
|
||||
|
||||
thumb_func_start PutWindowRectTileMapOverridePalette
|
||||
; void PutWindowRectTileMapOverridePalette(u8 windowId, u8 x, u8 y, u8 width, u8 height, u8 palette)
|
||||
PutWindowRectTileMapOverridePalette: ; 80037EC
|
||||
thumb_func_start PutWindowRectTilemapOverridePalette
|
||||
; void PutWindowRectTilemapOverridePalette(u8 windowId, u8 x, u8 y, u8 width, u8 height, u8 palette)
|
||||
PutWindowRectTilemapOverridePalette: ; 80037EC
|
||||
push {r4-r7,lr}
|
||||
mov r7, r10
|
||||
mov r6, r9
|
||||
@ -858,7 +858,7 @@ PutWindowRectTileMapOverridePalette: ; 80037EC
|
||||
str r1, [sp, 0x8]
|
||||
str r7, [sp, 0xC]
|
||||
adds r1, r6, 0
|
||||
bl WriteSequenceToBgTileMapBuffer
|
||||
bl WriteSequenceToBgTilemapBuffer
|
||||
ldrb r0, [r4, 0x3]
|
||||
adds r0, r6, r0
|
||||
lsls r0, 16
|
||||
@ -876,11 +876,11 @@ PutWindowRectTileMapOverridePalette: ; 80037EC
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end PutWindowRectTileMapOverridePalette
|
||||
thumb_func_end PutWindowRectTilemapOverridePalette
|
||||
|
||||
thumb_func_start ClearWindowTileMap
|
||||
; void ClearWindowTileMap(u8 windowId)
|
||||
ClearWindowTileMap: ; 80038A4
|
||||
thumb_func_start ClearWindowTilemap
|
||||
; void ClearWindowTilemap(u8 windowId)
|
||||
ClearWindowTilemap: ; 80038A4
|
||||
push {r4,lr}
|
||||
sub sp, 0x18
|
||||
lsls r0, 24
|
||||
@ -910,17 +910,17 @@ ClearWindowTileMap: ; 80038A4
|
||||
add r4, sp, 0xC
|
||||
ldrb r4, [r4, 0x5]
|
||||
str r4, [sp, 0x8]
|
||||
bl FillBgTileMapBufferRect
|
||||
bl FillBgTilemapBufferRect
|
||||
add sp, 0x18
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end ClearWindowTileMap
|
||||
thumb_func_end ClearWindowTilemap
|
||||
|
||||
thumb_func_start PutWindowRectTileMap
|
||||
; void PutWindowRectTileMap(u8 windowId, u8 x, u8 y, u8 width, u8 height)
|
||||
PutWindowRectTileMap: ; 80038F4
|
||||
thumb_func_start PutWindowRectTilemap
|
||||
; void PutWindowRectTilemap(u8 windowId, u8 x, u8 y, u8 width, u8 height)
|
||||
PutWindowRectTilemap: ; 80038F4
|
||||
push {r4-r7,lr}
|
||||
mov r7, r10
|
||||
mov r6, r9
|
||||
@ -989,7 +989,7 @@ PutWindowRectTileMap: ; 80038F4
|
||||
str r1, [sp, 0x8]
|
||||
str r7, [sp, 0xC]
|
||||
adds r1, r6, 0
|
||||
bl WriteSequenceToBgTileMapBuffer
|
||||
bl WriteSequenceToBgTilemapBuffer
|
||||
ldrb r0, [r4, 0x3]
|
||||
adds r0, r6, r0
|
||||
lsls r0, 16
|
||||
@ -1007,7 +1007,7 @@ PutWindowRectTileMap: ; 80038F4
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end PutWindowRectTileMap
|
||||
thumb_func_end PutWindowRectTilemap
|
||||
|
||||
thumb_func_start BlitBitmapToWindow
|
||||
; void BlitBitmapToWindow(u8 windowId, u8 *pixels, u16 x, u16 y, u16 width, u16 height)
|
||||
@ -2247,7 +2247,7 @@ AddWindow8Bit: ; 8004260
|
||||
str r4, [r0]
|
||||
adds r0, r7, 0
|
||||
adds r1, r4, 0
|
||||
bl SetBgTileMap
|
||||
bl SetBgTilemap
|
||||
@080042EA:
|
||||
mov r2, r9
|
||||
ldrb r1, [r2, 0x3]
|
||||
@ -2547,7 +2547,7 @@ CopyWindowToVram8Bit: ; 8004500
|
||||
b @08004570
|
||||
@08004546:
|
||||
ldrb r0, [r3]
|
||||
bl CopyBgTileMapBufferToVram
|
||||
bl CopyBgTilemapBufferToVram
|
||||
b @08004570
|
||||
@0800454E:
|
||||
ldrb r0, [r3]
|
||||
@ -2564,7 +2564,7 @@ CopyWindowToVram8Bit: ; 8004500
|
||||
bl LoadBgTiles
|
||||
ldr r0, [r6]
|
||||
ldrb r0, [r0]
|
||||
bl CopyBgTileMapBufferToVram
|
||||
bl CopyBgTilemapBufferToVram
|
||||
@08004570:
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
|
||||
@ -31,7 +31,7 @@ gRomInterruptTable: ; 82E9548
|
||||
.4byte DummyIntrHandler
|
||||
.4byte DummyIntrHandler
|
||||
|
||||
gBgConfigZeroValue: ; 82E9580
|
||||
gZeroedBgControlStruct: ; 82E9580
|
||||
.4byte 0
|
||||
|
||||
gDummyWindowTemplate: ; 82E9584
|
||||
|
||||
Loading…
Reference in New Issue
Block a user