summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/battle_1.s16
-rw-r--r--asm/berry_tag_screen.s4
-rwxr-xr-xasm/item_menu.s4
-rwxr-xr-xasm/learn_move.s4
-rw-r--r--asm/menu_helpers.s20
-rwxr-xr-xasm/party_menu.s6
-rw-r--r--asm/pokeblock_feed.s1135
-rwxr-xr-xasm/pokemon_summary_screen.s4
-rwxr-xr-xasm/rayquaza_scene.s20
-rw-r--r--asm/rom6.s46
-rw-r--r--asm/roulette.s8
-rwxr-xr-xasm/use_pokeblock.s332
12 files changed, 82 insertions, 1517 deletions
diff --git a/asm/battle_1.s b/asm/battle_1.s
index 9665b0d11..379f38515 100644
--- a/asm/battle_1.s
+++ b/asm/battle_1.s
@@ -1433,13 +1433,13 @@ DrawMainBattleBackground: @ 8035770
ands r0, r1
cmp r0, 0
beq _080357B0
- ldr r0, =gUnknown_08D7C440
+ ldr r0, =gBattleTerrainTiles_Building
ldr r1, =0x06008000
bl LZDecompressVram
ldr r0, =gUnknown_08D7CA28
ldr r1, =0x0600d000
bl LZDecompressVram
- ldr r0, =gUnknown_08D7C9EC
+ ldr r0, =gBattleTerrainPalette_Frontier
b _08035A52
.pool
_080357B0:
@@ -1502,7 +1502,7 @@ _0803584C:
ldrb r0, [r0, 0x1]
cmp r0, 0x20
bne _08035898
- ldr r0, =gUnknown_08D7C440
+ ldr r0, =gBattleTerrainTiles_Building
ldr r1, =0x06008000
bl LZDecompressVram
ldr r0, =gUnknown_08D7CA28
@@ -1576,7 +1576,7 @@ _08035904:
b _08035A52
.pool
_08035950:
- ldr r0, =gUnknown_08D7C440
+ ldr r0, =gBattleTerrainTiles_Building
ldr r1, =0x06008000
bl LZDecompressVram
ldr r0, =gUnknown_08D7CA28
@@ -1650,13 +1650,13 @@ _08035A52:
b _08035A8A
.pool
_08035A70:
- ldr r0, =gUnknown_08D7C440
+ ldr r0, =gBattleTerrainTiles_Building
ldr r1, =0x06008000
bl LZDecompressVram
ldr r0, =gUnknown_08D7CA28
ldr r1, =0x0600d000
bl LZDecompressVram
- ldr r0, =gUnknown_08D7C9EC
+ ldr r0, =gBattleTerrainPalette_Frontier
movs r1, 0x20
movs r2, 0x60
bl LoadCompressedPalette
@@ -2813,7 +2813,7 @@ _08036510:
b _0803651A
.pool
_08036518:
- ldr r0, =gUnknown_08D7C440
+ ldr r0, =gBattleTerrainTiles_Building
_0803651A:
ldr r1, =0x06008000
bl LZDecompressVram
@@ -3043,7 +3043,7 @@ _08036738:
b _08036742
.pool
_08036740:
- ldr r0, =gUnknown_08D7C9EC
+ ldr r0, =gBattleTerrainPalette_Frontier
_08036742:
movs r1, 0x20
movs r2, 0x60
diff --git a/asm/berry_tag_screen.s b/asm/berry_tag_screen.s
index 422f5f3d6..75e50f88d 100644
--- a/asm/berry_tag_screen.s
+++ b/asm/berry_tag_screen.s
@@ -115,7 +115,7 @@ _08177CD8:
.4byte _08177DC2
_08177D18:
bl SetVBlankHBlankCallbacksToNull
- bl sub_8121DA0
+ bl ResetVramOamAndBgCntRegs
bl clear_scheduled_bg_copies_to_vram
b _08177DDC
_08177D26:
@@ -246,7 +246,7 @@ sub_8177E14: @ 8177E14
adds r1, r0
movs r0, 0x3
bl SetBgTilemapBuffer
- bl sub_8121E10
+ bl ResetAllBgsCoordinates
movs r0, 0x2
bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x3
diff --git a/asm/item_menu.s b/asm/item_menu.s
index 61bd5c6e9..b762e8fed 100755
--- a/asm/item_menu.s
+++ b/asm/item_menu.s
@@ -568,7 +568,7 @@ _081AB046:
thumb_func_start bag_menu_init_bgs
bag_menu_init_bgs: @ 81AB050
push {r4,lr}
- bl sub_8121DA0
+ bl ResetVramOamAndBgCntRegs
ldr r4, =gUnknown_0203CE54
ldr r0, [r4]
adds r0, 0x4
@@ -586,7 +586,7 @@ bag_menu_init_bgs: @ 81AB050
adds r1, 0x4
movs r0, 0x2
bl SetBgTilemapBuffer
- bl sub_8121E10
+ bl ResetAllBgsCoordinates
movs r0, 0x2
bl schedule_bg_copy_tilemap_to_vram
movs r1, 0x82
diff --git a/asm/learn_move.s b/asm/learn_move.s
index 159b16f7e..6d500d7f6 100755
--- a/asm/learn_move.s
+++ b/asm/learn_move.s
@@ -175,14 +175,14 @@ sub_8160740: @ 8160740
thumb_func_start sub_81607EC
sub_81607EC: @ 81607EC
push {lr}
- bl sub_8121DA0
+ bl ResetVramOamAndBgCntRegs
movs r0, 0
bl ResetBgsAndClearDma3BusyFlags
ldr r1, =gUnknown_085CEC28
movs r0, 0
movs r2, 0x2
bl InitBgsFromTemplates
- bl sub_8121E10
+ bl ResetAllBgsCoordinates
movs r1, 0x82
lsls r1, 5
movs r0, 0
diff --git a/asm/menu_helpers.s b/asm/menu_helpers.s
index 423f653d9..c21ddee78 100644
--- a/asm/menu_helpers.s
+++ b/asm/menu_helpers.s
@@ -5,8 +5,8 @@
.text
- thumb_func_start sub_8121DA0
-sub_8121DA0: @ 8121DA0
+ thumb_func_start ResetVramOamAndBgCntRegs
+ResetVramOamAndBgCntRegs: @ 8121DA0
push {r4,lr}
sub sp, 0xC
movs r0, 0
@@ -50,10 +50,10 @@ sub_8121DA0: @ 8121DA0
pop {r0}
bx r0
.pool
- thumb_func_end sub_8121DA0
+ thumb_func_end ResetVramOamAndBgCntRegs
- thumb_func_start sub_8121E10
-sub_8121E10: @ 8121E10
+ thumb_func_start ResetAllBgsCoordinates
+ResetAllBgsCoordinates: @ 8121E10
push {lr}
movs r0, 0
movs r1, 0
@@ -89,7 +89,7 @@ sub_8121E10: @ 8121E10
bl ChangeBgY
pop {r0}
bx r0
- thumb_func_end sub_8121E10
+ thumb_func_end ResetAllBgsCoordinates
thumb_func_start SetVBlankHBlankCallbacksToNull
@ void SetVBlankHBlankCallbacksToNull()
@@ -177,8 +177,8 @@ _08121EC0:
.pool
thumb_func_end DisplayMessageAndContinueTask
- thumb_func_start sub_8121F20
-sub_8121F20: @ 8121F20
+ thumb_func_start RunTextPrintersRetIsActive
+RunTextPrintersRetIsActive: @ 8121F20
push {r4,lr}
adds r4, r0, 0
lsls r4, 24
@@ -191,7 +191,7 @@ sub_8121F20: @ 8121F20
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_8121F20
+ thumb_func_end RunTextPrintersRetIsActive
thumb_func_start Task_ContinueTaskAfterMessagePrints
@ void Task_ContinueTaskAfterMessagePrints(u8 taskId)
@@ -201,7 +201,7 @@ Task_ContinueTaskAfterMessagePrints: @ 8121F3C
lsrs r4, r0, 24
ldr r0, =gUnknown_0203A140
ldrb r0, [r0]
- bl sub_8121F20
+ bl RunTextPrintersRetIsActive
lsls r0, 16
cmp r0, 0
bne _08121F5A
diff --git a/asm/party_menu.s b/asm/party_menu.s
index 4ae689d4d..4214b06fc 100755
--- a/asm/party_menu.s
+++ b/asm/party_menu.s
@@ -98,7 +98,7 @@ _081B0234:
.4byte _081B0474
_081B0290:
bl SetVBlankHBlankCallbacksToNull
- bl sub_8121DA0
+ bl ResetVramOamAndBgCntRegs
bl clear_scheduled_bg_copies_to_vram
ldr r1, =gMain
movs r0, 0x87
@@ -429,7 +429,7 @@ sub_81B0550: @ 81B0550
ldr r1, [r5]
movs r0, 0x1
bl SetBgTilemapBuffer
- bl sub_8121E10
+ bl ResetAllBgsCoordinates
movs r0, 0x1
bl schedule_bg_copy_tilemap_to_vram
movs r1, 0x82
@@ -3161,7 +3161,7 @@ sub_81B1B8C: @ 81B1B8C
lsrs r4, r0, 24
adds r5, r4, 0
movs r0, 0x6
- bl sub_8121F20
+ bl RunTextPrintersRetIsActive
lsls r0, 16
lsrs r0, 16
cmp r0, 0x1
diff --git a/asm/pokeblock_feed.s b/asm/pokeblock_feed.s
index aef726c16..47e20f1a8 100644
--- a/asm/pokeblock_feed.s
+++ b/asm/pokeblock_feed.s
@@ -5,1132 +5,13 @@
.text
- thumb_func_start sub_8179B68
-sub_8179B68: @ 8179B68
- push {lr}
- bl RunTasks
- bl AnimateSprites
- bl BuildOamBuffer
- bl do_scheduled_bg_tilemap_copies_to_vram
- bl UpdatePaletteFade
- pop {r0}
- bx r0
- thumb_func_end sub_8179B68
-
- thumb_func_start sub_8179B84
-sub_8179B84: @ 8179B84
- push {lr}
- bl LoadOam
- bl ProcessSpriteCopyRequests
- bl TransferPlttBuffer
- pop {r0}
- bx r0
- thumb_func_end sub_8179B84
-
- thumb_func_start sub_8179B98
-sub_8179B98: @ 8179B98
- push {r4,lr}
- sub sp, 0x4
- ldr r0, =gMain
- movs r1, 0x87
- lsls r1, 3
- adds r0, r1
- ldrb r0, [r0]
- cmp r0, 0xD
- bls _08179BAC
- b _08179D4C
-_08179BAC:
- lsls r0, 2
- ldr r1, =_08179BC0
- adds r0, r1
- ldr r0, [r0]
- mov pc, r0
- .pool
- .align 2, 0
-_08179BC0:
- .4byte _08179BF8
- .4byte _08179C20
- .4byte _08179C34
- .4byte _08179C48
- .4byte _08179C4E
- .4byte _08179C60
- .4byte _08179C66
- .4byte _08179C78
- .4byte _08179C98
- .4byte _08179CB0
- .4byte _08179CDC
- .4byte _08179CF8
- .4byte _08179CFE
- .4byte _08179D18
-_08179BF8:
- ldr r4, =gUnknown_0203BD18
- ldr r0, =0x00001084
- bl AllocZeroed
- str r0, [r4]
- bl SetVBlankHBlankCallbacksToNull
- bl clear_scheduled_bg_copies_to_vram
- ldr r1, =gMain
- movs r2, 0x87
- lsls r2, 3
- adds r1, r2
- b _08179D3A
- .pool
-_08179C20:
- bl ResetPaletteFade
- ldr r2, =gPaletteFade
- ldrb r0, [r2, 0x8]
- movs r1, 0x80
- orrs r0, r1
- b _08179D30
- .pool
-_08179C34:
- bl ResetSpriteData
- ldr r1, =gMain
- movs r2, 0x87
- lsls r2, 3
- adds r1, r2
- b _08179D3A
- .pool
-_08179C48:
- bl FreeAllSpritePalettes
- b _08179D32
-_08179C4E:
- bl AllocateMonSpritesGfx
- ldr r1, =gMain
- movs r2, 0x87
- lsls r2, 3
- adds r1, r2
- b _08179D3A
- .pool
-_08179C60:
- bl sub_8179D9C
- b _08179D32
-_08179C66:
- bl sub_8179FAC
- ldr r1, =gMain
- movs r2, 0x87
- lsls r2, 3
- adds r1, r2
- b _08179D3A
- .pool
-_08179C78:
- ldr r0, =gUnknown_0203BC9C
- ldrb r1, [r0]
- movs r0, 0x64
- muls r0, r1
- ldr r1, =gPlayerParty
- adds r0, r1
- bl sub_8179DF4
- lsls r0, 24
- cmp r0, 0
- beq _08179D64
- b _08179D32
- .pool
-_08179C98:
- bl sub_817A4A4
- ldr r1, =gUnknown_0203BD18
- ldr r1, [r1]
- ldr r2, =0x0000105e
- adds r1, r2
- strb r0, [r1]
- b _08179D32
- .pool
-_08179CB0:
- ldr r0, =gUnknown_0203BC9C
- ldrb r1, [r0]
- movs r0, 0x64
- muls r0, r1
- ldr r1, =gPlayerParty
- adds r0, r1
- bl sub_817A358
- ldr r1, =gUnknown_0203BD18
- ldr r1, [r1]
- ldr r2, =0x0000105d
- adds r1, r2
- strb r0, [r1]
- b _08179D32
- .pool
-_08179CDC:
- movs r0, 0
- movs r1, 0x1
- movs r2, 0x1
- movs r3, 0xE
- bl SetWindowBorderStyle
- ldr r1, =gMain
- movs r2, 0x87
- lsls r2, 3
- adds r1, r2
- b _08179D3A
- .pool
-_08179CF8:
- bl sub_817A168
- b _08179D32
-_08179CFE:
- movs r0, 0x1
- negs r0, r0
- movs r1, 0x10
- movs r2, 0
- bl BlendPalettes
- ldr r1, =gMain
- movs r2, 0x87
- lsls r2, 3
- adds r1, r2
- b _08179D3A
- .pool
-_08179D18:
- movs r0, 0x1
- negs r0, r0
- movs r1, 0
- str r1, [sp]
- movs r2, 0x10
- movs r3, 0
- bl BeginNormalPaletteFade
- ldr r2, =gPaletteFade
- ldrb r1, [r2, 0x8]
- movs r0, 0x7F
- ands r0, r1
-_08179D30:
- strb r0, [r2, 0x8]
-_08179D32:
- ldr r1, =gMain
- movs r0, 0x87
- lsls r0, 3
- adds r1, r0
-_08179D3A:
- ldrb r0, [r1]
- adds r0, 0x1
- strb r0, [r1]
- b _08179D64
- .pool
-_08179D4C:
- ldr r0, =sub_8179B84
- bl SetVBlankCallback
- ldr r0, =sub_8179B68
- bl SetMainCallback2
- movs r0, 0x1
- b _08179D66
- .pool
-_08179D64:
- movs r0, 0
-_08179D66:
- add sp, 0x4
- pop {r4}
- pop {r1}
- bx r1
- thumb_func_end sub_8179B98
-
- thumb_func_start sub_8179D70
-sub_8179D70: @ 8179D70
- push {lr}
-_08179D72:
- bl sub_81221EC
- lsls r0, 24
- lsrs r0, 24
- cmp r0, 0x1
- beq _08179D96
- bl sub_8179B98
- lsls r0, 24
- lsrs r0, 24
- cmp r0, 0x1
- beq _08179D96
- bl sub_81221AC
- lsls r0, 24
- lsrs r0, 24
- cmp r0, 0x1
- bne _08179D72
-_08179D96:
- pop {r0}
- bx r0
- thumb_func_end sub_8179D70
-
- thumb_func_start sub_8179D9C
-sub_8179D9C: @ 8179D9C
- push {lr}
- bl sub_8121DA0
- movs r0, 0
- bl ResetBgsAndClearDma3BusyFlags
- ldr r1, =gUnknown_085F0550
- movs r0, 0
- movs r2, 0x2
- bl InitBgsFromTemplates
- ldr r0, =gUnknown_0203BD18
- ldr r1, [r0]
- adds r1, 0x48
- movs r0, 0x1
- bl SetBgTilemapBuffer
- bl sub_8121E10
- movs r0, 0x1
- bl schedule_bg_copy_tilemap_to_vram
- movs r1, 0x82
- lsls r1, 5
- movs r0, 0
- bl SetGpuReg
- movs r0, 0
- bl ShowBg
- movs r0, 0x1
- bl ShowBg
- movs r0, 0x50
- movs r1, 0
- bl SetGpuReg
- pop {r0}
- bx r0
- .pool
- thumb_func_end sub_8179D9C
-
- thumb_func_start sub_8179DF4
-sub_8179DF4: @ 8179DF4
- push {r4-r6,lr}
- sub sp, 0x4
- adds r6, r0, 0
- ldr r0, =gUnknown_0203BD18
- ldr r0, [r0]
- ldr r1, =0x0000107e
- adds r0, r1
- movs r1, 0
- ldrsh r0, [r0, r1]
- cmp r0, 0x8
- bls _08179E0C
- b _08179FA0
-_08179E0C:
- lsls r0, 2
- ldr r1, =_08179E24
- adds r0, r1
- ldr r0, [r0]
- mov pc, r0
- .pool
- .align 2, 0
-_08179E24:
- .4byte _08179E48
- .4byte _08179E84
- .4byte _08179EC4
- .4byte _08179ED8
- .4byte _08179EEC
- .4byte _08179F00
- .4byte _08179F20
- .4byte _08179F44
- .4byte _08179F78
-_08179E48:
- adds r0, r6, 0
- movs r1, 0x41
- bl GetMonData
- lsls r0, 16
- lsrs r5, r0, 16
- adds r0, r6, 0
- movs r1, 0
- bl GetMonData
- adds r4, r0, 0
- lsls r0, r5, 3
- ldr r1, =gMonFrontPicTable
- adds r0, r1
- ldr r1, =gMonSpritesGfxPtr
- ldr r1, [r1]
- ldr r1, [r1, 0x8]
- adds r2, r5, 0
- adds r3, r4, 0
- bl HandleLoadSpecialPokePic_2
- ldr r0, =gUnknown_0203BD18
- ldr r1, [r0]
- b _08179F5E
- .pool
-_08179E84:
- adds r0, r6, 0
- movs r1, 0x41
- bl GetMonData
- lsls r0, 16
- lsrs r5, r0, 16
- adds r0, r6, 0
- movs r1, 0
- bl GetMonData
- adds r4, r0, 0
- adds r0, r6, 0
- movs r1, 0x1
- bl GetMonData
- adds r1, r0, 0
- adds r0, r5, 0
- adds r2, r4, 0
- bl GetMonSpritePalStructFromOtIdPersonality
- adds r4, r0, 0
- bl LoadCompressedObjectPalette
- ldrh r0, [r4, 0x4]
- movs r1, 0x1
- bl sub_806A068
- ldr r0, =gUnknown_0203BD18
- ldr r1, [r0]
- b _08179F5E
- .pool
-_08179EC4:
- ldr r0, =gUnknown_085B26F4
- bl LoadCompressedObjectPic
- ldr r0, =gUnknown_0203BD18
- ldr r1, [r0]
- b _08179F5E
- .pool
-_08179ED8:
- ldr r0, =gUnknown_085B26FC
- bl LoadCompressedObjectPalette
- ldr r0, =gUnknown_0203BD18
- ldr r1, [r0]
- b _08179F5E
- .pool
-_08179EEC:
- ldr r0, =gUnknown_085F06A0
- bl LoadCompressedObjectPic
- ldr r0, =gUnknown_0203BD18
- ldr r1, [r0]
- b _08179F5E
- .pool
-_08179F00:
- ldr r0, =gSpecialVar_ItemId
- ldrb r0, [r0]
- bl sub_8179FEC
- ldr r0, =gUnknown_0203BD1C
- bl LoadCompressedObjectPalette
- ldr r0, =gUnknown_0203BD18
- ldr r1, [r0]
- b _08179F5E
- .pool
-_08179F20:
- bl reset_temp_tile_data_buffers
- ldr r1, =gUnknown_08D7C440
- movs r0, 0
- str r0, [sp]
- movs r0, 0x1
- movs r2, 0
- movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
- ldr r0, =gUnknown_0203BD18
- ldr r1, [r0]
- b _08179F5E
- .pool
-_08179F44:
- bl free_temp_tile_data_buffers_if_possible
- lsls r0, 24
- lsrs r0, 24
- cmp r0, 0x1
- beq _08179FA0
- ldr r0, =gUnknown_08D9BA44
- ldr r4, =gUnknown_0203BD18
- ldr r1, [r4]
- adds r1, 0x48
- bl LZDecompressWram
- ldr r1, [r4]
-_08179F5E:
- ldr r0, =0x0000107e
- adds r1, r0
- ldrh r0, [r1]
- adds r0, 0x1
- strh r0, [r1]
- b _08179FA0
- .pool
-_08179F78:
- ldr r0, =gUnknown_08D7C9EC
- movs r1, 0x20
- movs r2, 0x60
- bl LoadCompressedPalette
- ldr r0, =gUnknown_0203BD18
- ldr r0, [r0]
- ldr r1, =0x0000107e
- adds r0, r1
- movs r1, 0
- strh r1, [r0]
- movs r0, 0x1
- b _08179FA2
- .pool
-_08179FA0:
- movs r0, 0
-_08179FA2:
- add sp, 0x4
- pop {r4-r6}
- pop {r1}
- bx r1
- thumb_func_end sub_8179DF4
-
- thumb_func_start sub_8179FAC
-sub_8179FAC: @ 8179FAC
- push {lr}
- ldr r0, =gUnknown_085F0558
- bl InitWindows
- bl DeactivateAllTextPrinters
- movs r0, 0
- movs r1, 0x1
- movs r2, 0xE0
- bl sub_809882C
- ldr r0, =gUnknown_0860F074
- movs r1, 0xF0
- movs r2, 0x20
- bl LoadPalette
- movs r0, 0
- movs r1, 0
- bl FillWindowPixelBuffer
- movs r0, 0
- bl PutWindowTilemap
- movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
- pop {r0}
- bx r0
- .pool
- thumb_func_end sub_8179FAC
-
- thumb_func_start sub_8179FEC
-sub_8179FEC: @ 8179FEC
- push {lr}
- lsls r0, 24
- ldr r1, =gSaveBlock1Ptr
- lsrs r0, 21
- ldr r2, =0x00000848
- adds r0, r2
- ldr r1, [r1]
- adds r1, r0
- adds r0, r1, 0
- movs r1, 0
- bl sub_8136F9C
- lsls r0, 24
- ldr r2, =gUnknown_0203BD1C
- ldr r1, =gUnknown_085F0568
- lsrs r0, 22
- subs r0, 0x4
- adds r0, r1
- ldr r0, [r0]
- str r0, [r2]
- ldr r0, =0x000039e2
- strh r0, [r2, 0x4]
- pop {r0}
- bx r0
- .pool
- thumb_func_end sub_8179FEC
-
- thumb_func_start sub_817A030
-sub_817A030: @ 817A030
- push {r4,r5,lr}
- lsls r0, 24
- lsrs r4, r0, 24
- ldr r0, =gPaletteFade
- ldrb r1, [r0, 0x7]
- movs r0, 0x80
- ands r0, r1
- cmp r0, 0
- beq _0817A044
- b _0817A154
-_0817A044:
- ldr r0, =gTasks
- lsls r2, r4, 2
- adds r1, r2, r4
- lsls r1, 3
- adds r1, r0
- movs r0, 0x8
- ldrsh r3, [r1, r0]
- ldr r0, =0x0000010d
- adds r5, r2, 0
- cmp r3, r0
- beq _0817A0C8
- cmp r3, r0
- bgt _0817A074
- cmp r3, 0
- beq _0817A088
- cmp r3, 0xFF
- beq _0817A0AC
- b _0817A104
- .pool
-_0817A074:
- ldr r0, =0x00000119
- cmp r3, r0
- beq _0817A0E0
- adds r0, 0x10
- cmp r3, r0
- beq _0817A0F8
- b _0817A104
- .pool
-_0817A088:
- ldr r0, =gUnknown_0203BD18
- ldr r1, [r0]
- ldr r2, =0x00001050
- adds r1, r2
- strb r3, [r1]
- ldr r0, [r0]
- ldr r1, =0x00001058
- adds r0, r1
- strh r3, [r0]
- bl sub_817A5CC
- b _0817A104
- .pool
-_0817A0AC:
- ldr r0, =gUnknown_0203BD18
- ldr r0, [r0]
- ldr r2, =0x0000105e
- adds r0, r2
- ldrb r0, [r0]
- ldrb r1, [r1, 0xA]
- bl sub_817A4F8
- b _0817A104
- .pool
-_0817A0C8:
- bl sub_817A56C
- ldr r1, =gUnknown_0203BD18
- ldr r1, [r1]
- ldr r2, =0x0000105f
- adds r1, r2
- strb r0, [r1]
- b _0817A104
- .pool
-_0817A0E0:
- ldr r0, =gUnknown_0203BD18
- ldr r0, [r0]
- ldr r1, =0x0000105d
- adds r0, r1
- ldrb r0, [r0]
- bl sub_817A434
- b _0817A104
- .pool
-_0817A0F8:
- ldr r0, =sub_817A1C4
- str r0, [r1]
- b _0817A154
- .pool
-_0817A104:
- ldr r0, =gUnknown_0203BD18
- ldr r0, [r0]
- ldr r2, =0x00001058
- adds r1, r0, r2
- subs r2, 0x2
- adds r0, r2
- ldrh r1, [r1]
- ldrh r0, [r0]
- cmp r1, r0
- bcs _0817A128
- bl sub_817A634
- b _0817A138
- .pool
-_0817A128:
- cmp r1, r0
- bne _0817A138
- ldr r0, =gTasks
- adds r1, r5, r4
- lsls r1, 3
- adds r1, r0
- movs r0, 0xFE
- strh r0, [r1, 0x8]
-_0817A138:
- ldr r0, =gUnknown_0203BD18
- ldr r1, [r0]
- ldr r0, =0x00001058
- adds r1, r0
- ldrh r0, [r1]
- adds r0, 0x1
- strh r0, [r1]
- ldr r0, =gTasks
- adds r1, r5, r4
- lsls r1, 3
- adds r1, r0
- ldrh r0, [r1, 0x8]
- adds r0, 0x1
- strh r0, [r1, 0x8]
-_0817A154:
- pop {r4,r5}
- pop {r0}
- bx r0
- .pool
- thumb_func_end sub_817A030
-
- thumb_func_start sub_817A168
-sub_817A168: @ 817A168
- push {lr}
- ldr r0, =sub_817A030
- movs r1, 0
- bl CreateTask
- lsls r0, 24
- lsrs r0, 24
- ldr r2, =gTasks
- lsls r1, r0, 2
- adds r1, r0
- lsls r1, 3
- adds r1, r2
- movs r0, 0
- strh r0, [r1, 0x8]
- movs r0, 0x1
- strh r0, [r1, 0xA]
- pop {r0}
- bx r0
- .pool
- thumb_func_end sub_817A168
+
- thumb_func_start sub_817A194
-sub_817A194: @ 817A194
- push {r4,lr}
- lsls r0, 24
- lsrs r4, r0, 24
- movs r0, 0
- bl sub_8121F20
- lsls r0, 16
- lsrs r0, 16
- cmp r0, 0x1
- beq _0817A1B6
- ldr r0, =gTasks
- lsls r1, r4, 2
- adds r1, r4
- lsls r1, 3
- adds r1, r0
- ldr r0, =sub_817A320
- str r0, [r1]
-_0817A1B6:
- pop {r4}
- pop {r0}
- bx r0
- .pool
- thumb_func_end sub_817A194
-
- thumb_func_start sub_817A1C4
-sub_817A1C4: @ 817A1C4
- push {r4-r7,lr}
- sub sp, 0x10
- lsls r0, 24
- lsrs r7, r0, 24
- ldr r0, =gUnknown_0203BC9C
- ldrb r1, [r0]
- movs r0, 0x64
- adds r5, r1, 0
- muls r5, r0
- ldr r0, =gPlayerParty
- adds r5, r0
- ldr r1, =gSaveBlock1Ptr
- ldr r0, =gSpecialVar_ItemId
- ldrh r0, [r0]
- lsls r0, 3
- ldr r2, =0x00000848
- adds r0, r2
- ldr r4, [r1]
- adds r4, r0
- adds r0, r5, 0
- bl GetNature
- lsls r0, 24
- lsrs r0, 24
- adds r1, r4, 0
- bl PokeblockGetGain
- ldr r6, =gUnknown_0203BC9E
- strh r0, [r6]
- ldr r1, =gStringVar1
- adds r0, r5, 0
- bl GetMonNickname
- ldr r1, =gStringVar2
- adds r0, r4, 0
- bl sub_8137044
- movs r1, 0
- ldrsh r0, [r6, r1]
- cmp r0, 0
- bne _0817A248
- ldr r0, =gStringVar4
- ldr r1, =gText_Var1AteTheVar2
- bl StringExpandPlaceholders
- b _0817A268
- .pool
-_0817A248:
- cmp r0, 0
- ble _0817A260
- ldr r0, =gStringVar4
- ldr r1, =gText_Var1HappilyAteVar2
- bl StringExpandPlaceholders
- b _0817A268
- .pool
-_0817A260:
- ldr r0, =gStringVar4
- ldr r1, =gText_Var1DisdainfullyAteVar2
- bl StringExpandPlaceholders
-_0817A268:
- ldr r2, =gTextFlags
- ldrb r0, [r2]
- movs r1, 0x1
- orrs r0, r1
- strb r0, [r2]
- bl GetPlayerTextSpeed
- adds r3, r0, 0
- lsls r3, 24
- lsrs r3, 24
- ldr r2, =gStringVar4
- movs r0, 0
- str r0, [sp]
- movs r0, 0x2
- str r0, [sp, 0x4]
- movs r0, 0x1
- str r0, [sp, 0x8]
- movs r0, 0x3
- str r0, [sp, 0xC]
- movs r0, 0
- movs r1, 0x1
- bl AddTextPrinterParametrized
- ldr r1, =gTasks
- lsls r0, r7, 2
- adds r0, r7
- lsls r0, 3
- adds r0, r1
- ldr r1, =sub_817A194
- str r1, [r0]
- add sp, 0x10
- pop {r4-r7}
- pop {r0}
- bx r0
- .pool
- thumb_func_end sub_817A1C4
-
- thumb_func_start sub_817A2C0
-sub_817A2C0: @ 817A2C0
- push {r4,lr}
- lsls r0, 24
- lsrs r4, r0, 24
- ldr r0, =gPaletteFade
- ldrb r1, [r0, 0x7]
- movs r0, 0x80
- ands r0, r1
- cmp r0, 0
- bne _0817A304
- bl ResetSpriteData
- bl FreeAllSpritePalettes
- ldr r0, =gMPlay_BGM
- ldr r1, =0x0000ffff
- movs r2, 0x80
- lsls r2, 1
- bl m4aMPlayVolumeControl
- ldr r0, =gMain
- ldr r0, [r0, 0x8]
- bl SetMainCallback2
- adds r0, r4, 0
- bl DestroyTask
- bl FreeAllWindowBuffers
- ldr r0, =gUnknown_0203BD18
- ldr r0, [r0]
- bl Free
- bl FreeMonSpritesGfx
-_0817A304:
- pop {r4}
- pop {r0}
- bx r0
- .pool
- thumb_func_end sub_817A2C0
-
- thumb_func_start sub_817A320
-sub_817A320: @ 817A320
- push {r4,lr}
- sub sp, 0x4
- adds r4, r0, 0
- lsls r4, 24
- lsrs r4, 24
- movs r0, 0x1
- negs r0, r0
- movs r1, 0
- str r1, [sp]
- movs r2, 0
- movs r3, 0x10
- bl BeginNormalPaletteFade
- ldr r1, =gTasks
- lsls r0, r4, 2
- adds r0, r4
- lsls r0, 3
- adds r0, r1
- ldr r1, =sub_817A2C0
- str r1, [r0]
- add sp, 0x4
- pop {r4}
- pop {r0}
- bx r0
- .pool
- thumb_func_end sub_817A320
-
- thumb_func_start sub_817A358
-sub_817A358: @ 817A358
- push {r4-r7,lr}
- mov r7, r9
- mov r6, r8
- push {r6,r7}
- adds r5, r0, 0
- movs r1, 0x41
- bl GetMonData
- adds r4, r0, 0
- lsls r4, 16
- lsrs r4, 16
- ldr r0, =gUnknown_0202499C
- movs r1, 0x30
- movs r2, 0x50
- movs r3, 0x2
- bl CreateSprite
- lsls r0, 24
- lsrs r0, 24
- mov r8, r0
- ldr r0, =gUnknown_0203BD18
- mov r9, r0
- ldr r0, [r0]
- ldr r2, =0x00001054
- adds r1, r0, r2
- strh r4, [r1]
- ldr r1, =0x0000105b
- adds r0, r1
- mov r2, r8
- strb r2, [r0]
- adds r0, r5, 0
- bl GetNature
- mov r2, r9
- ldr r1, [r2]
- ldr r2, =0x0000105a
- adds r1, r2
- strb r0, [r1]
- ldr r7, =gSprites
- mov r1, r8
- lsls r0, r1, 4
- add r0, r8
- lsls r5, r0, 2
- adds r6, r5, r7
- strh r4, [r6, 0x32]
- adds r0, r7, 0
- adds r0, 0x1C
- adds r0, r5, r0
- ldr r1, =SpriteCallbackDummy
- str r1, [r0]
- mov r2, r9
- ldr r0, [r2]
- ldr r1, =0x00001053
- adds r0, r1
- movs r1, 0x1
- strb r1, [r0]
- adds r0, r4, 0
- bl IsPokeSpriteNotFlipped
- lsls r0, 24
- cmp r0, 0
- bne _0817A402
- adds r0, r7, 0
- adds r0, 0x10
- adds r0, r5, r0
- ldr r1, =gUnknown_085F05B0
- str r1, [r0]
- ldrb r3, [r6, 0x1]
- movs r0, 0x3
- orrs r3, r0
- strb r3, [r6, 0x1]
- lsrs r1, r3, 6
- ldrb r2, [r6, 0x3]
- lsrs r2, 6
- lsls r3, 30
- lsrs r3, 30
- adds r0, r6, 0
- bl CalcCenterToCornerVec
- mov r2, r9
- ldr r0, [r2]
- ldr r1, =0x00001053
- adds r0, r1
- movs r1, 0
- strb r1, [r0]
-_0817A402:
- mov r0, r8
- pop {r3,r4}
- mov r8, r3
- mov r9, r4
- pop {r4-r7}
- pop {r1}
- bx r1
- .pool
- thumb_func_end sub_817A358
-
- thumb_func_start sub_817A434
-sub_817A434: @ 817A434
- lsls r0, 24
- lsrs r0, 24
- ldr r3, =gSprites
- lsls r1, r0, 4
- adds r1, r0
- lsls r1, 2
- adds r2, r1, r3
- movs r0, 0x30
- strh r0, [r2, 0x20]
- movs r0, 0x50
- strh r0, [r2, 0x22]
- ldr r0, =0x0000fff8
- strh r0, [r2, 0x2E]
- movs r0, 0x1
- strh r0, [r2, 0x30]
- adds r3, 0x1C
- adds r1, r3
- ldr r0, =sub_817A468
- str r0, [r1]
- bx lr
- .pool
- thumb_func_end sub_817A434
-
- thumb_func_start sub_817A468
-sub_817A468: @ 817A468
- push {r4,lr}
- adds r4, r0, 0
- ldrh r0, [r4, 0x20]
- adds r0, 0x4
- strh r0, [r4, 0x20]
- ldrh r0, [r4, 0x2E]
- ldrh r2, [r4, 0x22]
- adds r1, r0, r2
- strh r1, [r4, 0x22]
- ldrh r1, [r4, 0x30]
- adds r0, r1
- strh r0, [r4, 0x2E]
- lsls r0, 16
- cmp r0, 0
- bne _0817A48E
- ldrh r0, [r4, 0x32]
- movs r1, 0
- bl PlayCry1
-_0817A48E:
- movs r1, 0x2E
- ldrsh r0, [r4, r1]
- cmp r0, 0x9
- bne _0817A49A
- ldr r0, =SpriteCallbackDummy
- str r0, [r4, 0x1C]
-_0817A49A:
- pop {r4}
- pop {r0}
- bx r0
- .pool
- thumb_func_end sub_817A468
-
- thumb_func_start sub_817A4A4
-sub_817A4A4: @ 817A4A4
- push {r4,r5,lr}
- movs r0, 0xBC
- movs r1, 0x64
- movs r2, 0x2
- bl sub_8136444
- adds r4, r0, 0
- lsls r4, 24
- lsrs r4, 24
- ldr r5, =gSprites
- lsls r3, r4, 4
- adds r3, r4
- lsls r3, 2
- adds r0, r3, r5
- ldrb r2, [r0, 0x1]
- movs r1, 0x4
- negs r1, r1
- ands r1, r2
- movs r2, 0x1
- orrs r1, r2
- strb r1, [r0, 0x1]
- adds r1, r5, 0
- adds r1, 0x10
- adds r1, r3, r1
- ldr r2, =gUnknown_085F0664
- str r2, [r1]
- adds r5, 0x1C
- adds r3, r5
- ldr r1, =SpriteCallbackDummy
- str r1, [r3]
- bl InitSpriteAffineAnim
- adds r0, r4, 0
- pop {r4,r5}
- pop {r1}
- bx r1
- .pool
- thumb_func_end sub_817A4A4
-
- thumb_func_start sub_817A4F8
-sub_817A4F8: @ 817A4F8
- push {r4-r7,lr}
- mov r7, r8
- push {r7}
- adds r5, r1, 0
- lsls r0, 24
- lsrs r7, r0, 24
- lsls r5, 24
- lsrs r5, 24
- ldr r0, =gSprites
- mov r8, r0
- lsls r0, r7, 4
- adds r0, r7
- lsls r6, r0, 2
- mov r0, r8
- adds r4, r6, r0
- ldrb r0, [r4, 0x3]
- lsls r0, 26
- lsrs r0, 27
- bl FreeOamMatrix
- ldrb r0, [r4, 0x1]
- movs r1, 0x3
- orrs r0, r1
- strb r0, [r4, 0x1]
- cmp r5, 0
- bne _0817A540
- mov r0, r8
- adds r0, 0x10
- adds r0, r6, r0
- ldr r1, =gUnknown_085F0668
- b _0817A548
- .pool
-_0817A540:
- mov r0, r8
- adds r0, 0x10
- adds r0, r6, r0
- ldr r1, =gUnknown_085F066C
-_0817A548:
- str r1, [r0]
- lsls r0, r7, 4
- adds r0, r7
- lsls r0, 2
- ldr r1, =gSprites
- adds r0, r1
- bl InitSpriteAffineAnim
- pop {r3}
- mov r8, r3
- pop {r4-r7}
- pop {r0}
- bx r0
- .pool
- thumb_func_end sub_817A4F8
-
- thumb_func_start sub_817A56C
-sub_817A56C: @ 817A56C
- push {lr}
- ldr r0, =gUnknown_085F06A8
- movs r1, 0xAE
- movs r2, 0x54
- movs r3, 0x1
- bl CreateSprite
- lsls r0, 24
- lsrs r0, 24
- ldr r2, =gSprites
- lsls r1, r0, 4
- adds r1, r0
- lsls r1, 2
- adds r1, r2
- ldr r2, =0x0000fff4
- strh r2, [r1, 0x2E]
- movs r2, 0x1
- strh r2, [r1, 0x30]
- pop {r1}
- bx r1
- .pool
- thumb_func_end sub_817A56C
-
- thumb_func_start sub_817A5A0
-sub_817A5A0: @ 817A5A0
- push {lr}
- adds r2, r0, 0
- ldrh r0, [r2, 0x20]
- subs r0, 0x4
- strh r0, [r2, 0x20]
- ldrh r0, [r2, 0x2E]
- ldrh r3, [r2, 0x22]
- adds r1, r0, r3
- strh r1, [r2, 0x22]
- ldrh r1, [r2, 0x30]
- adds r0, r1
- strh r0, [r2, 0x2E]
- lsls r0, 16
- asrs r0, 16
- cmp r0, 0xA
- bne _0817A5C6
- adds r0, r2, 0
- bl DestroySprite
-_0817A5C6:
- pop {r0}
- bx r0
- thumb_func_end sub_817A5A0
thumb_func_start sub_817A5CC
sub_817A5CC: @ 817A5CC
push {r4-r7,lr}
- ldr r0, =gUnknown_0203BD18
+ ldr r0, =sPokeblockFeed
ldr r1, [r0]
ldr r0, =0x00001056
adds r3, r1, r0
@@ -1179,7 +60,7 @@ _0817A61A:
thumb_func_start sub_817A634
sub_817A634: @ 817A634
push {r4,lr}
- ldr r0, =gUnknown_0203BD18
+ ldr r0, =sPokeblockFeed
ldr r4, [r0]
ldr r1, =0x00001050
adds r0, r4, r1
@@ -1432,7 +313,7 @@ _0817A90E:
thumb_func_start sub_817A91C
sub_817A91C: @ 817A91C
push {r4-r7,lr}
- ldr r0, =gUnknown_0203BD18
+ ldr r0, =sPokeblockFeed
ldr r5, [r0]
movs r4, 0
movs r0, 0x83
@@ -1521,7 +402,7 @@ _0817A9DE:
thumb_func_start sub_817A9E4
sub_817A9E4: @ 817A9E4
push {r4,r5,lr}
- ldr r0, =gUnknown_0203BD18
+ ldr r0, =sPokeblockFeed
ldr r2, [r0]
ldr r1, =0x00001078
adds r0, r2, r1
@@ -1566,7 +447,7 @@ _0817AA36:
thumb_func_start sub_817AA3C
sub_817AA3C: @ 817AA3C
push {lr}
- ldr r0, =gUnknown_0203BD18
+ ldr r0, =sPokeblockFeed
ldr r0, [r0]
ldr r0, [r0]
bl FreeSpriteOamMatrix
@@ -1584,7 +465,7 @@ sub_817AA54: @ 817AA54
mov r5, r8
push {r5-r7}
sub sp, 0x14
- ldr r0, =gUnknown_0203BD18
+ ldr r0, =sPokeblockFeed
ldr r7, [r0]
ldr r1, =0x00001070
adds r0, r7, r1
@@ -1717,7 +598,7 @@ sub_817AB68: @ 817AB68
mov r5, r8
push {r5-r7}
sub sp, 0x8
- ldr r0, =gUnknown_0203BD18
+ ldr r0, =sPokeblockFeed
ldr r6, [r0]
movs r0, 0
str r0, [sp]
diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s
index 4441767db..1f9d25c12 100755
--- a/asm/pokemon_summary_screen.s
+++ b/asm/pokemon_summary_screen.s
@@ -2351,7 +2351,7 @@ _081C51D6:
thumb_func_start sub_81C51DC
sub_81C51DC: @ 81C51DC
push {lr}
- bl sub_8121DA0
+ bl ResetVramOamAndBgCntRegs
movs r0, 0
bl ResetBgsAndClearDma3BusyFlags
ldr r1, =gUnknown_0861F2B4
@@ -2363,7 +2363,7 @@ sub_81C51DC: @ 81C51DC
adds r1, 0x4
movs r0, 0x2
bl SetBgTilemapBuffer
- bl sub_8121E10
+ bl ResetAllBgsCoordinates
movs r0, 0x2
bl schedule_bg_copy_tilemap_to_vram
movs r1, 0x82
diff --git a/asm/rayquaza_scene.s b/asm/rayquaza_scene.s
index f9936f1ca..58380a354 100755
--- a/asm/rayquaza_scene.s
+++ b/asm/rayquaza_scene.s
@@ -1066,7 +1066,7 @@ sub_81D6FD0: @ 81D6FD0
thumb_func_start sub_81D6FE0
sub_81D6FE0: @ 81D6FE0
push {r4,lr}
- bl sub_8121DA0
+ bl ResetVramOamAndBgCntRegs
movs r0, 0
bl ResetBgsAndClearDma3BusyFlags
ldr r1, =gUnknown_0862A888
@@ -1088,7 +1088,7 @@ sub_81D6FE0: @ 81D6FE0
adds r1, r0
movs r0, 0x2
bl SetBgTilemapBuffer
- bl sub_8121E10
+ bl ResetAllBgsCoordinates
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x1
@@ -2758,7 +2758,7 @@ _081D7E08:
thumb_func_start sub_81D7E10
sub_81D7E10: @ 81D7E10
push {r4,lr}
- bl sub_8121DA0
+ bl ResetVramOamAndBgCntRegs
movs r0, 0
bl ResetBgsAndClearDma3BusyFlags
ldr r1, =gUnknown_0862AA54
@@ -2780,7 +2780,7 @@ sub_81D7E10: @ 81D7E10
adds r1, r0
movs r0, 0x2
bl SetBgTilemapBuffer
- bl sub_8121E10
+ bl ResetAllBgsCoordinates
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x1
@@ -3292,7 +3292,7 @@ _081D829A:
thumb_func_start sub_81D82B0
sub_81D82B0: @ 81D82B0
push {r4,lr}
- bl sub_8121DA0
+ bl ResetVramOamAndBgCntRegs
movs r0, 0
bl ResetBgsAndClearDma3BusyFlags
ldr r1, =gUnknown_0862AACC
@@ -3319,7 +3319,7 @@ sub_81D82B0: @ 81D82B0
adds r1, r0
movs r0, 0x3
bl SetBgTilemapBuffer
- bl sub_8121E10
+ bl ResetAllBgsCoordinates
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x1
@@ -3899,7 +3899,7 @@ _081D8818:
thumb_func_start sub_81D8828
sub_81D8828: @ 81D8828
push {r4,lr}
- bl sub_8121DA0
+ bl ResetVramOamAndBgCntRegs
movs r0, 0
bl ResetBgsAndClearDma3BusyFlags
ldr r1, =gUnknown_0862AB44
@@ -3926,7 +3926,7 @@ sub_81D8828: @ 81D8828
adds r1, r0
movs r0, 0x3
bl SetBgTilemapBuffer
- bl sub_8121E10
+ bl ResetAllBgsCoordinates
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x1
@@ -4354,7 +4354,7 @@ _081D8C26:
thumb_func_start sub_81D8C38
sub_81D8C38: @ 81D8C38
push {r4,lr}
- bl sub_8121DA0
+ bl ResetVramOamAndBgCntRegs
movs r0, 0
bl ResetBgsAndClearDma3BusyFlags
ldr r1, =gUnknown_0862AD08
@@ -4376,7 +4376,7 @@ sub_81D8C38: @ 81D8C38
adds r1, r0
movs r0, 0x2
bl SetBgTilemapBuffer
- bl sub_8121E10
+ bl ResetAllBgsCoordinates
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x1
diff --git a/asm/rom6.s b/asm/rom6.s
index 430ed7ee9..b37a01c1f 100644
--- a/asm/rom6.s
+++ b/asm/rom6.s
@@ -728,7 +728,7 @@ _08135A9A:
movs r0, 0x38
movs r1, 0x40
movs r2, 0
- bl sub_8136444
+ bl CreatePokeblockCaseSprite
ldr r1, =gUnknown_0203AB50
ldr r1, [r1]
ldr r2, =0x00000e74
@@ -859,7 +859,7 @@ _08135BD2:
thumb_func_start sub_8135BDC
sub_8135BDC: @ 8135BDC
push {lr}
- bl sub_8121DA0
+ bl ResetVramOamAndBgCntRegs
movs r0, 0
bl ResetBgsAndClearDma3BusyFlags
ldr r1, =gUnknown_085B2620
@@ -870,7 +870,7 @@ sub_8135BDC: @ 8135BDC
ldr r1, [r0]
movs r0, 0x2
bl SetBgTilemapBuffer
- bl sub_8121E10
+ bl ResetAllBgsCoordinates
movs r0, 0x2
bl schedule_bg_copy_tilemap_to_vram
movs r1, 0x82
@@ -949,12 +949,12 @@ _08135CBC:
b _08135CDE
.pool
_08135CCC:
- ldr r0, =gUnknown_085B26F4
+ ldr r0, =gPokeblockCase_SpriteSheet
bl LoadCompressedObjectPic
b _08135CDE
.pool
_08135CD8:
- ldr r0, =gUnknown_085B26FC
+ ldr r0, =gPokeblockCase_SpritePal
bl LoadCompressedObjectPalette
_08135CDE:
ldr r0, =gUnknown_0203AB50
@@ -1313,7 +1313,7 @@ _08136002:
lsls r1, r4, 24
lsrs r1, 24
mov r0, r8
- bl sub_8136F9C
+ bl GetPokeblockData
lsls r0, 16
adds r7, r4, 0
cmp r0, 0
@@ -1842,8 +1842,8 @@ _08136436:
.pool
thumb_func_end sub_8136418
- thumb_func_start sub_8136444
-sub_8136444: @ 8136444
+ thumb_func_start CreatePokeblockCaseSprite
+CreatePokeblockCaseSprite: @ 8136444
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -1864,7 +1864,7 @@ sub_8136444: @ 8136444
pop {r1}
bx r1
.pool
- thumb_func_end sub_8136444
+ thumb_func_end CreatePokeblockCaseSprite
thumb_func_start sub_8136470
sub_8136470: @ 8136470
@@ -2549,7 +2549,7 @@ sub_8136A74: @ 8136A74
ldr r0, [r2]
adds r0, r1
ldr r1, =sub_8136AA0
- bl sub_8166204
+ bl ChooseMonToGivePokeblock
pop {r0}
bx r0
.pool
@@ -3000,7 +3000,7 @@ GetHighestPokeblocksFlavorLevel: @ 8136EA4
push {r4-r6,lr}
adds r6, r0, 0
movs r1, 0x1
- bl sub_8136F9C
+ bl GetPokeblockData
lsls r0, 24
lsrs r5, r0, 24
movs r1, 0x1
@@ -3010,7 +3010,7 @@ _08136EB4:
lsrs r4, r0, 24
adds r0, r6, 0
adds r1, r4, 0
- bl sub_8136F9C
+ bl GetPokeblockData
lsls r0, 24
lsrs r0, 24
cmp r5, r0
@@ -3030,7 +3030,7 @@ _08136ECC:
GetPokeblocksFeel: @ 8136EDC
push {lr}
movs r1, 0x6
- bl sub_8136F9C
+ bl GetPokeblockData
lsls r0, 24
lsrs r0, 24
cmp r0, 0x63
@@ -3130,8 +3130,8 @@ _08136F96:
bx r1
thumb_func_end sub_8136F68
- thumb_func_start sub_8136F9C
-sub_8136F9C: @ 8136F9C
+ thumb_func_start GetPokeblockData
+GetPokeblockData: @ 8136F9C
push {lr}
lsls r1, 24
lsrs r1, 24
@@ -3175,7 +3175,7 @@ _08136FDC:
_08136FDE:
pop {r1}
bx r1
- thumb_func_end sub_8136F9C
+ thumb_func_end GetPokeblockData
thumb_func_start PokeblockGetGain
PokeblockGetGain: @ 8136FE4
@@ -3198,7 +3198,7 @@ _08136FFE:
lsrs r5, r0, 24
mov r0, r8
adds r1, r5, 0
- bl sub_8136F9C
+ bl GetPokeblockData
lsls r0, 16
asrs r1, r0, 16
cmp r1, 0
@@ -3229,12 +3229,12 @@ _0813702A:
.pool
thumb_func_end PokeblockGetGain
- thumb_func_start sub_8137044
-sub_8137044: @ 8137044
+ thumb_func_start PokeblockCopyName
+PokeblockCopyName: @ 8137044
push {r4,lr}
adds r4, r1, 0
movs r1, 0
- bl sub_8136F9C
+ bl GetPokeblockData
lsls r0, 24
ldr r1, =gPokeblockNames
lsrs r0, 22
@@ -3246,7 +3246,7 @@ sub_8137044: @ 8137044
pop {r0}
bx r0
.pool
- thumb_func_end sub_8137044
+ thumb_func_end PokeblockCopyName
thumb_func_start sub_8137068
sub_8137068: @ 8137068
@@ -3298,13 +3298,13 @@ _081370BC:
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
- bl sub_8136F9C
+ bl GetPokeblockData
adds r4, r0, 0
adds r1, r6, 0x1
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
- bl sub_8136F9C
+ bl GetPokeblockData
lsls r4, 16
lsls r0, 16
lsls r1, r6, 16
diff --git a/asm/roulette.s b/asm/roulette.s
index 009f30717..85d857f39 100644
--- a/asm/roulette.s
+++ b/asm/roulette.s
@@ -425,8 +425,8 @@ _08140618:
bl SetVBlankCallback
bl remove_some_task
bl SetVBlankHBlankCallbacksToNull
- bl sub_8121DA0
- bl sub_8121E10
+ bl ResetVramOamAndBgCntRegs
+ bl ResetAllBgsCoordinates
b _081407F8
_08140630:
bl sub_8140388
@@ -3258,8 +3258,8 @@ sub_8141E7C: @ 8141E7C
ldr r0, =gSpriteCoordOffsetY
strh r4, [r0]
strh r4, [r1]
- bl sub_8121DA0
- bl sub_8121E10
+ bl ResetVramOamAndBgCntRegs
+ bl ResetAllBgsCoordinates
movs r0, 0x50
movs r1, 0
bl SetGpuReg
diff --git a/asm/use_pokeblock.s b/asm/use_pokeblock.s
index 4e278a22a..2e96b214a 100755
--- a/asm/use_pokeblock.s
+++ b/asm/use_pokeblock.s
@@ -6,325 +6,9 @@
.text
- thumb_func_start sub_816624C
-sub_816624C: @ 816624C
- push {r4,r5,lr}
- ldr r4, =gUnknown_0203BCAC
- ldr r0, =0x0000806c
- bl AllocZeroed
- str r0, [r4]
- ldr r5, =gUnknown_0203BC90
- ldr r1, =0x00007fd0
- adds r0, r1
- str r0, [r5]
- ldr r1, =gUnknown_0203BC98
- ldr r1, [r1]
- str r1, [r0, 0x8]
- ldr r1, =gUnknown_0203BC94
- ldr r1, [r1]
- str r1, [r0, 0x4]
- ldr r4, =gUnknown_0203BC9C
- ldrb r0, [r4]
- bl sub_81672E4
- strb r0, [r4]
- ldr r5, [r5]
- movs r1, 0
- lsls r0, 24
- lsrs r0, 24
- cmp r0, 0x3
- bls _08166284
- movs r1, 0x1
-_08166284:
- adds r0, r5, 0
- adds r0, 0x56
- strb r1, [r0]
- ldr r0, =sub_8166380
- bl sub_816636C
- ldr r0, =sub_81662C0
- bl SetMainCallback2
- pop {r4,r5}
- pop {r0}
- bx r0
- .pool
- thumb_func_end sub_816624C
-
- thumb_func_start sub_81662C0
-sub_81662C0: @ 81662C0
- push {r4,lr}
- ldr r4, =gUnknown_0203BC90
- ldr r0, [r4]
- ldr r0, [r0]
- bl _call_via_r0
- bl AnimateSprites
- bl BuildOamBuffer
- bl UpdatePaletteFade
- ldr r4, [r4]
- ldr r1, [r4]
- ldr r0, =map_warp_consider_1_to_outside_or_stair_or_dive
- cmp r1, r0
- bne _081662F0
- adds r0, r4, 0
- adds r0, 0x50
- movs r1, 0
- strb r1, [r0]
- ldr r0, =sub_8166304
- bl SetMainCallback2
-_081662F0:
- pop {r4}
- pop {r0}
- bx r0
- .pool
- thumb_func_end sub_81662C0
-
- thumb_func_start sub_8166304
-sub_8166304: @ 8166304
- push {lr}
- bl sub_81668F8
- bl AnimateSprites
- bl BuildOamBuffer
- bl UpdatePaletteFade
- pop {r0}
- bx r0
- thumb_func_end sub_8166304
-
- thumb_func_start sub_816631C
-sub_816631C: @ 816631C
- push {lr}
- ldr r0, =gUnknown_0203BC90
- ldr r0, [r0]
- ldr r0, [r0]
- bl _call_via_r0
- bl AnimateSprites
- bl BuildOamBuffer
- bl RunTextPrinters
- bl UpdatePaletteFade
- pop {r0}
- bx r0
- .pool
- thumb_func_end sub_816631C
-
- thumb_func_start sub_8166340
-sub_8166340: @ 8166340
- push {lr}
- bl LoadOam
- bl ProcessSpriteCopyRequests
- bl TransferPlttBuffer
- ldr r0, =gUnknown_0203BCAC
- ldr r0, [r0]
- ldr r1, =0x00007c58
- adds r0, r1
- bl sub_81D2108
- bl sub_80BA0A8
- pop {r0}
- bx r0
- .pool
- thumb_func_end sub_8166340
-
- thumb_func_start sub_816636C
-sub_816636C: @ 816636C
- ldr r1, =gUnknown_0203BC90
- ldr r1, [r1]
- str r0, [r1]
- adds r1, 0x50
- movs r0, 0
- strb r0, [r1]
- bx lr
- .pool
- thumb_func_end sub_816636C
-
- thumb_func_start sub_8166380
-sub_8166380: @ 8166380
- push {r4,r5,lr}
- sub sp, 0x4
- ldr r1, =gUnknown_0203BC90
- ldr r0, [r1]
- adds r0, 0x50
- ldrb r0, [r0]
- adds r2, r1, 0
- cmp r0, 0xF
- bls _08166394
- b _08166556
-_08166394:
- lsls r0, 2
- ldr r1, =_081663A8
- adds r0, r1
- ldr r0, [r0]
- mov pc, r0
- .pool
- .align 2, 0
-_081663A8:
- .4byte _081663E8
- .4byte _0816640C
- .4byte _08166416
- .4byte _08166434
- .4byte _08166464
- .4byte _08166468
- .4byte _08166474
- .4byte _08166484
- .4byte _08166490
- .4byte _0816649C
- .4byte _081664B8
- .4byte _081664BC
- .4byte _081664E4
- .4byte _08166510
- .4byte _08166528
- .4byte _08166550
-_081663E8:
- ldr r2, =gUnknown_0203BCAC
- ldr r0, [r2]
- ldr r1, =0x00007b10
- adds r0, r1
- movs r1, 0xFF
- strb r1, [r0]
- ldr r0, [r2]
- ldr r2, =0x00007c58
- adds r0, r2
- bl sub_81D1ED4
- b _0816653C
- .pool
-_0816640C:
- bl ResetSpriteData
- bl FreeAllSpritePalettes
- b _0816653C
-_08166416:
- movs r0, 0
- bl SetVBlankCallback
- movs r0, 0
- str r0, [sp]
- movs r1, 0xC0
- lsls r1, 19
- ldr r2, =0x05006000
- mov r0, sp
- bl CpuSet
- b _0816653C
- .pool
-_08166434:
- movs r0, 0
- bl ResetBgsAndClearDma3BusyFlags
- ldr r1, =gUnknown_085DFCCC
- movs r0, 0
- movs r2, 0x4
- bl InitBgsFromTemplates
- ldr r0, =gUnknown_085DFCDC
- bl InitWindows
- bl DeactivateAllTextPrinters
- movs r0, 0
- movs r1, 0x97
- movs r2, 0xE0
- bl sub_809882C
- b _0816653C
- .pool
-_08166464:
- ldr r1, [r2]
- b _08166540
-_08166468:
- bl sub_8168328
- lsls r0, 24
- cmp r0, 0
- bne _08166556
- b _0816653C
-_08166474:
- ldr r1, =gKeyRepeatStartDelay
- movs r0, 0x14
- strh r0, [r1]
- bl sub_8167420
- b _0816653C
- .pool
-_08166484:
- bl sub_8167930
- lsls r0, 24
- cmp r0, 0
- bne _08166556
- b _0816653C
-_08166490:
- movs r0, 0
- bl sub_8167608
- bl sub_8167760
- b _0816653C
-_0816649C:
- ldr r0, =gUnknown_0203BCAC
- ldr r0, [r0]
- ldr r1, =0x00007b0e
- adds r0, r1
- bl sub_81D312C
- lsls r0, 24
- cmp r0, 0
- bne _08166556
- b _0816653C
- .pool
-_081664B8:
- ldr r1, [r2]
- b _08166540
-_081664BC:
- ldr r5, =gUnknown_0203BCAC
- ldr r1, [r5]
- ldr r4, =0x00007c58
- adds r0, r1, r4
- ldr r2, =0x00007c6c
- adds r1, r2
- bl sub_81D2754
- ldr r0, [r5]
- adds r0, r4
- bl sub_81D20AC
- b _0816653C
- .pool
-_081664E4:
- ldr r4, =gUnknown_0203BCAC
- ldr r0, [r4]
- ldr r1, =0x00007c58
- adds r0, r1
- bl sub_81D20BC
- lsls r0, 24
- cmp r0, 0
- bne _08166556
- ldr r2, [r4]
- ldr r1, =0x00007c58
- adds r0, r2, r1
- adds r1, 0x14
- adds r2, r1
- adds r1, r2, 0
- bl sub_81D1F84
- b _0816653C
- .pool
-_08166510:
- ldr r0, =gUnknown_0203BCAC
- ldr r0, [r0]
- ldr r2, =0x00007c58
- adds r0, r2
- bl sub_81D2230
- b _0816653C
- .pool
-_08166528:
- movs r0, 0
- bl PutWindowTilemap
- movs r0, 0x1
- bl PutWindowTilemap
- movs r0, 0
- movs r1, 0x1
- bl sub_8167BA0
-_0816653C:
- ldr r0, =gUnknown_0203BC90
- ldr r1, [r0]
-_08166540:
- adds r1, 0x50
- ldrb r0, [r1]
- adds r0, 0x1
- strb r0, [r1]
- b _08166556
- .pool
-_08166550:
- ldr r0, =map_warp_consider_1_to_outside_or_stair_or_dive
- bl sub_816636C
-_08166556:
- add sp, 0x4
- pop {r4,r5}
- pop {r0}
- bx r0
- .pool
- thumb_func_end sub_8166380
- thumb_func_start map_warp_consider_1_to_outside_or_stair_or_dive
-map_warp_consider_1_to_outside_or_stair_or_dive: @ 8166564
+ thumb_func_start sub_8166564
+sub_8166564: @ 8166564
push {r4,lr}
sub sp, 0x4
ldr r4, =gUnknown_0203BC90
@@ -407,7 +91,7 @@ _08166610:
pop {r0}
bx r0
.pool
- thumb_func_end map_warp_consider_1_to_outside_or_stair_or_dive
+ thumb_func_end sub_8166564
thumb_func_start sub_8166634
sub_8166634: @ 8166634
@@ -632,7 +316,7 @@ _08166838:
adds r0, r1
ldrb r0, [r0]
bl sub_81672A4
- ldr r1, =gUnknown_0203BC9C
+ ldr r1, =gPokeblockMonId
strb r0, [r1]
ldr r1, =gUnknown_0203BC94
ldr r2, [r5]
@@ -684,9 +368,9 @@ _08166888:
str r5, [r4]
bl FreeAllWindowBuffers
ldr r1, =gMain
- ldr r0, =sub_816624C
+ ldr r0, =CB2_ReturnAndChooseMonToGivePokeblock
str r0, [r1, 0x8]
- bl sub_8179D70
+ bl CB2_PreparePokeblockFeedScene
_081668D4:
add sp, 0x4
pop {r4,r5}
@@ -728,7 +412,7 @@ _0816693C:
ldr r0, [r0]
ldr r1, =0x00008041
adds r0, r1
- ldr r1, =gUnknown_0203BC9C
+ ldr r1, =gPokeblockMonId
ldrb r0, [r0]
ldrb r1, [r1]
cmp r0, r1
@@ -1695,7 +1379,7 @@ sub_8167184: @ 8167184
adds r0, r3, 0
adds r0, 0x6E
strh r1, [r0]
- ldr r0, =gUnknown_0203BC9E
+ ldr r0, =gPokeblockGain
movs r1, 0
ldrsh r0, [r0, r1]
cmp r0, 0
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-26 17:51:47 +0000